GRI-2215: fix curl fallback and hostname update on reconnect #330

Merged
vivy merged 5 commits from fix/GRI-2215-curl-fallback-and-hostname-update into dev 2026-11-18 18:30:44 +00:00
Member

Summary

Fixes grimoire-of-digital-signage#325: two fresh-install defects found on a Dell OptiPlex 3060 running Ubuntu Desktop 26.04.1 (GRI-2051).

  1. README install command fails with no curl. Ubuntu Desktop 26.04 ships wget, not curl. The three bootstrap one-liners (server install, client install, download-first fallback) now use wget -qO-/wget -qO. The remaining internal curl uses in install.sh (rustup, Node download, health check) run after fetch_source has already apt-get installed curl, so they are unaffected.
  2. A renamed PC keeps its old hostname. The client now resends its Registration frame on every Accepted hello (not only while Pending), and the server applies it via a new devices::update_reported_info that updates hostname/reported_info without touching the admin-set name. Documented in plan/shared/protocol.md and plan/server/enrolment.md.

A pre-existing client test (sync_survives_restart.rs) needed its receive() helper's handling of the new unconditional post-Accepted Registration echo fixed: an earlier attempt filtered every Registration frame out of receive(), which deadlocked the a_pending_device_registers_and_reconnects_with_its_temporary_id test (it explicitly expects to receive that frame). Fixed by reverting receive() to filter only heartbeats, and draining the post-Accepted echo explicitly at each call site that triggers it.

Test plan

  • cargo fmt --check
  • cargo clippy -p client -p server --all-targets -- -D warnings
  • cargo test -p client (103 tests, including the fixed sync_survives_restart suite)
  • cargo test -p server --test ws_integration (17/17, including a_reconnect_with_a_changed_hostname_updates_it_but_not_the_panel_name)
## Summary Fixes grimoire-of-digital-signage#325: two fresh-install defects found on a Dell OptiPlex 3060 running Ubuntu Desktop 26.04.1 (GRI-2051). 1. **README install command fails with no `curl`.** Ubuntu Desktop 26.04 ships `wget`, not `curl`. The three bootstrap one-liners (server install, client install, download-first fallback) now use `wget -qO-`/`wget -qO`. The remaining internal `curl` uses in `install.sh` (rustup, Node download, health check) run after `fetch_source` has already `apt-get install`ed `curl`, so they are unaffected. 2. **A renamed PC keeps its old hostname.** The client now resends its `Registration` frame on every `Accepted` hello (not only while `Pending`), and the server applies it via a new `devices::update_reported_info` that updates `hostname`/`reported_info` without touching the admin-set `name`. Documented in `plan/shared/protocol.md` and `plan/server/enrolment.md`. A pre-existing client test (`sync_survives_restart.rs`) needed its `receive()` helper's handling of the new unconditional post-`Accepted` `Registration` echo fixed: an earlier attempt filtered every `Registration` frame out of `receive()`, which deadlocked the `a_pending_device_registers_and_reconnects_with_its_temporary_id` test (it explicitly expects to receive that frame). Fixed by reverting `receive()` to filter only heartbeats, and draining the post-`Accepted` echo explicitly at each call site that triggers it. ## Test plan - [x] `cargo fmt --check` - [x] `cargo clippy -p client -p server --all-targets -- -D warnings` - [x] `cargo test -p client` (103 tests, including the fixed `sync_survives_restart` suite) - [x] `cargo test -p server --test ws_integration` (17/17, including `a_reconnect_with_a_changed_hostname_updates_it_but_not_the_panel_name`)
- install.sh and README bootstrap commands use wget instead of curl, since
  Ubuntu Desktop 26.04 ships wget but not curl
- client resends its Registration frame on every Accepted hello, not only
  while Pending
- server applies reported hostname/reported_info on reconnect via
  devices::update_reported_info, leaving the admin-set name untouched
GRI-2215: fix test deadlock from filtering Registration in receive()
All checks were successful
CI / the pre-push hook (pull_request) Successful in 4s
CI / cargo fmt (pull_request) Successful in 4s
CI / install.sh client upgrade (pull_request) Successful in 12s
CI / cargo deny (pull_request) Successful in 12s
CI / cargo deny advisories (pull_request) Successful in 15s
CI / repository boundary (pull_request) Successful in 4s
CI / cargo clippy (pull_request) Successful in 1m7s
CI / frontend-web (pull_request) Successful in 58s
CI / cargo test (pull_request) Successful in 3m35s
CI / Notify gate failed (pull_request) Has been skipped
CI / CI (pull_request) Successful in 1s
fbb806283e
receive() skipped every Registration frame, but the pending-device test
expects to receive exactly one. Stop filtering it generically and instead
drain the post-Accepted Registration echo explicitly where it occurs.
vivy merged commit f6d98ca30f into dev 2026-11-18 18:30:44 +00:00
vivy deleted branch fix/GRI-2215-curl-fallback-and-hostname-update 2026-11-18 18:30:45 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
Grimoirix/grimoire-of-digital-signage!330
No description provided.