Repository navigation
friglet-tray: use the control_socket config key like the daemon (SNB-681) - #58
Closed
setavenger wants to merge 6 commits into
Closed
setavenger wants to merge 6 commits into
setavenger wants to merge 6 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>
- lib.rs tests: spawn_fake_daemon / spawn_fake_daemon_owned were a second fake next to spawn_stoppable_fake_daemon, differing only in canned GetStatus fields no test reads. Their four users never send Shutdown or check the pid, so they now use the one fake. - lifecycle_e2e: attaches_when_daemon_already_running is covered by attach_carries_daemons_self_reported_ownership, which attaches the same way (the locator panics if consulted) and also checks the carried ownership. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The fake daemons in the lib tests and the lifecycle e2e tests bound their socket inside the task they spawned, so every test slept a fixed 100 ms after starting one and hoped the bind had happened by then. The helpers now bind (friglet_ipc::listen) before spawning the accept loop and return with the socket up, and the eleven sleeps are gone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…681) The daemon listens on FRIGLET_CONTROL_SOCKET, else the config file's control_socket, else the platform default (its env layer is merged over the file). The tray only looked at the env variable and the default, so with control_socket set in config.toml it never reached the daemon: it went into first-run setup mode when nothing answered at the default path, or spawned a daemon, waited 30 s for a socket that came up elsewhere, killed it and kept restarting it. setup::control_socket_path resolves the path in the daemon's order from the default config file, and the tray uses it at startup. A daemon the tray spawns already reads the same config file and inherits the tray's environment, so nothing is passed to it, and nothing new is written to the user's config.toml. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…env (SNB-681) Only the first lookup in control_socket_path goes through the injected env; the final fallback, friglet_ipc::default_socket_path, reads the real FRIGLET_CONTROL_SOCKET again. Say so in the doc comment. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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 #54; review only the commits after it.
Fixes SNB-681 (Bug). +66 / −1 lines, of which 38 are the new test.
What and why
The daemon listens on
FRIGLET_CONTROL_SOCKET, else the config file'scontrol_socket, else the platform default. Its figment env layer is merged over the TOML file (friglet/src/config.rs:230-238,338-341). The tray usedfriglet_ipc::default_socket_path(), which only knows the env variable and the default. So withcontrol_socketset inconfig.toml, the tray never reached the daemon:The new
setup::control_socket_path(config_path, env)resolves the path in the daemon's order. It reads the default config file, the same file a zero-argument daemon loads, andrun()uses it forAppState's socket path.No
FRIGLET_CONTROL_SOCKETis passed to a spawned daemon. It reads the same config file and inherits the tray's environment, so it already binds the path the tray probes; the run below shows this with the real daemon. Not passing it also means the env value cannot reachGetConfig, and from there the settings save cannot writecontrol_socketinto the user'sconfig.toml.Behaviour change (intended) and what stays
control_socketin the config file and no env override, the tray now uses the key.control_socketwhile the tray runs needs a tray restart, as an env change does today.Verification
New unit test
setup::tests::control_socket_follows_the_daemons_ordercovers:The old resolution (
default_socket_path()) returns the default in the "key" case, so the key assertion fails against it.Runtime, real binaries under Xvfb with
dbus-run-session, tempHOME/XDG_CONFIG_HOME, noFRIGLET_CONTROL_SOCKETin the tray's environment,control_socketset only inconfig.toml:Attach (fake daemon listening on the configured path):
daemon not configured yet; entering first-run setup mode;attached to already-running daemon, labelScan: paused (height 899000).Spawn (
FRIGLET_DAEMON_BINpointing at the realfrigletdebug build, full signet config):control socket listening path=<configured path>, but the tray had not connected after 12 s; it would kill the daemon after 30 s;spawned daemon and connected0.25 s after the spawn.All spawned daemons were killed afterwards.
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 (friglet-tray: bind the test fakes' sockets before spawning (SNB-679) #54's 251 plus the new test).No friglet-ipc changes were needed.