Alan-Jowett / sonde / 24618764992

82%

Build Type

push

github

Committed by web-flow

Commit Message

fix(gateway): re-send SET_CHANNEL after modem warm reboot (GW-1103) (#762)

* fix(gateway): re-send SET_CHANNEL to modem after warm reboot (GW-1103)

When the modem firmware warm-reboots (USB CDC stays open), the reader
task received an unexpected \MODEM_READY\ and discarded it. The modem
returns to channel 1 on reset, but the gateway was not re-running the
startup sequence.

Changes:
- modem.rs: unexpected \MODEM_READY\ now cancels all pending waiters,
  sets \warm_reboot_flag\ (AtomicBool), and fires \warm_reboot_notify\
  (Notify). Adds \bort_reader_and_wait()\ to allow the gateway to
  await the reader task before reopening the port.
- ble_pairing.rs: \BlePairingController\ gains \vent_task\ storage,
  \set_event_task()\, and \cancel_and_wait()\ to ensure the
  \open_ble_pairing\ detached task releases its \Arc<transport>\.
- admin.rs: stores the event-forwarding task handle on the controller;
  \close_ble_pairing\ uses \cancel_and_wait()\.
- gateway.rs: \select!\ gains a \warm_reboot_notify.notified()\ arm;
  after \select!\, checks \warm_reboot_flag\ and if set: cancels the
  BLE session, aborts consumer tasks, awaits the reader task
  (\bort_reader_and_wait\) to release the serial port read half,
  drops the transport, then \continue\s without backoff sleep.
- Tests: T-1104d verifies unexpected MODEM_READY fires the notify,
  sets the flag, and cancels a pending \change_channel\ waiter.

Backoff is reset to 1 s on any successful transport creation (existing
behavior), so warm-reboot reconnects proceed immediately.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix(gateway): address PR 762 round-2 review comments

- ble_pairing: cancel_and_wait() now uses a 500ms timeout + abort_handle
  fallback so warm-reboot recovery cannot hang if the event-forwarding
  task is blocked on a full mpsc channel (comment 6)
- gateway: abort all tasks (frame_loop, ble_loop, grpc_handle,
  health_handle) on the normal disconnect path b... (continued)

Coverage Stats

70 of 130 new or added lines in 4 files covered. (53.85%)

6 existing lines in 2 files now uncovered.

24420 of 30241 relevant lines covered (80.75%)

203.67 hits per line