Repository navigation
friglet-tray: remove dead commands, lifecycle API and UI leftovers (SNB-667) - #48
Closed
setavenger wants to merge 2 commits into
Closed
setavenger wants to merge 2 commits into
setavenger wants to merge 2 commits into
Conversation
Three lifecycle e2e tests wrote a shell script to a temp dir and then ran it as the "daemon binary". The test harness runs tests on parallel threads of one process, so another test's spawn could fork while the script was still open for writing; the forked child holds that write handle until it execs, and running the script in that window fails with "Text file busy" (ETXTBSY, os error 26). The scripts are now committed as executable fixtures under friglet-tray/tests/fixtures/ and located via CARGO_MANIFEST_DIR, so nothing is written while the tests run. The long-running fixture uses `exec sleep 30`, so killing the spawned child no longer leaves a stray sleep behind for 30 s. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…NB-667) Nothing here changes what the tray does: - Tauri commands set_config and set_scan_key: registered, but the UI has saved settings through apply_settings since 8bf4c40 and never invokes them. The SetConfig / SetScanKey protocol requests stay (wire compatibility with separately installed daemons). - lifecycle: decide/Action (used only by its own test), attach_or_spawn (no callers) and QuitAction/quit_action (an enum around one bool; perform_quit now tests the bool). - show_settings_window / show_wallet_window were copies differing only in the tab: one show_window_tab(app, tab). The FRIGLET_TRAY_SHOW_ON_START parse is a pure function of the value, so its test no longer sets the process environment (the unsafe set_var's safety comment was false: tests run in parallel). - get_config and send_with_note share one daemon_request helper (connect, request, map errors); the poller and the poll_once test helper share record_poll. - ErrorBook::event returned "should be logged", which its only caller ignored; it returns nothing now. Doc links point at the constants that exist (STALL_GRACE_SECS, UNREACHABLE_GRACE_SECS). - fake-daemon example: uses friglet_ipc's NETWORKS and one scan-key check instead of copies. - UI: CSS rules already covered by `[hidden] { display: none !important; }`, a `.hint code` rule that matches nothing, and an unused id="recent-errors". - tauri.conf.json: the bundle.linux.deb.depends block. The Tauri CLI adds libwebkit2gtk-4.1-0 and the appindicator package itself (with tauri's tray-icon feature on) and does not de-duplicate, so the .deb listed both packages twice. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 3, 2026
Owner
Author
|
Same set of packages; the duplicates are gone. CI is all green: test, Linux deb/AppImage, macOS dmg and Windows msi/nsis. |
This was referenced Oct 3, 2026
Owner
Author
|
Merged into |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #45; review only the commits after it.
Implements SNB-667. Net −117 lines (81 added, 198 removed).
What was removed or merged, and why it was dead or duplicated
set_configandset_scan_key. They were registered, but the UI has saved settings throughapply_settingssince 8bf4c40 and never invokes them (grepoverui/finds no caller). TheRequest::SetConfig/Request::SetScanKeyprotocol requests stay for wire compatibility with separately installed daemons. Only the Tauri commands go.decide/Action(only its own test used it),attach_or_spawn(no callers;attach_or_spawn_withandattach_spawn_or_setup_withstay), andQuitAction/quit_action(an enum around one bool).perform_quitnow tests the bool directly.show_settings_window/show_wallet_windowdiffered only in the tab name. They are now one function,show_window_tab(app, tab), which evals the same JS. TheFRIGLET_TRAY_SHOW_ON_STARTparse is now a pure function of the value. Its test no longer callsunsafe std::env::set_var, whose safety comment was false because tests run in parallel.get_configandsend_with_noteboth repeated connect, request and error mapping. They now share onedaemon_requesthelper with the same error strings, andResponse::Errorstill becomesErr. The poller and thepoll_oncetest helper now sharerecord_pollinstead of a copied block.ErrorBook::eventreturned "should be logged", and its only caller ignored the value. It now returns nothing, and its test checks the entry count instead. The doc links now name the constants that exist (STALL_GRACE_SECS,UNREACHABLE_GRACE_SECS).friglet_ipc::network::NETWORKS(the same five networks) and one scan-key check, instead of local copies.#view-…[hidden]and.col[hidden](already covered by[hidden] { display: none !important; }),.hint code(no.hintelement ever contains a<code>; hints are set withtextContent), and the unusedid="recent-errors"(JS and CSS use the class).tauri.conf.jsonbundle.linux.deb.depends: a duplicate. The Tauri CLI pinned in release.yml (tauri-cli-v2.11.5,crates/tauri-cli/src/interface/rust.rs:1385-1444) starts from this list and then addslibayatana-appindicator3-1itself (when tauri'stray-iconfeature is on and pkg-config finds ayatana, which release.yml installs) pluslibwebkit2gtk-4.1-0andlibgtk-3-0.tauri-bundler'sdebian.rs:204-207writes the list joined, without de-duplication, so the.deblisted both packages twice. Without the block, the same packages are each listed once.Why behaviour is unchanged
Every removed item either had no caller or is replaced by code that does the same thing. Error strings, the JS evaluated to switch tabs, the quit rule and the env values accepted by
FRIGLET_TRAY_SHOW_ON_STARTare identical. The two removed tests covered only removed code:decide_attaches_when_probe_succeedsandquit_rule_single_boolean. The quit rule itself stays covered by the e2e testquit_shuts_daemon_down_only_when_spawned_by_tray.Verification
cargo check --workspace --all-targets --all-features: 0 warnings.cargo clippy --no-deps -p friglet -p friglet-ipc -p friglet-tray --all-targets -- -D warnings: clean.cargo fmt -p friglet -p friglet-ipc -p friglet-tray -- --check: clean.cargo test --workspace: 252 passed, 1 ignored, 0 failed. That is the baseline of 254 minus the two tests named above.friglet-trayagainstfake-daemonon a private socket under Xvfb withdbus-run-session, withFRIGLET_TRAY_SHOW_ON_STARTset tostatus,settingsandwallet, and took a screenshot of each. All three tabs render. Settings shows the config loaded from the fake daemon overget_config(signet, birthday 890000). The tray log shows it attached to the daemon, with no errors.apply_settingsitself is unchanged; it goes throughsend_with_note, which now usesdaemon_request..debDepends: release.yml runs on this PR becausetauri.conf.jsonchanged. I will checkdpkg-deb -f … Dependson its artifact and add the result in a comment.Left out on purpose
features = []ontauri-buildinfriglet-tray/Cargo.toml. Cargo manifests belong to the library track's manifest PR, which will take it.