fix: separate retry counter for device info disconnect #6

Closed

schwifty wants to merge 0 commits from schwifty/fix-device-info-retry-counter into main

schwifty commented

2026-03-21 23:35:30 +00:00

Collaborator

Problem

The device info disconnect handler was sharing connectionRetryCount with the initial connection retry logic. If earlier connection attempts used retries, the device info handler had zero retries left and immediately failed with "Disconnected while reading device information (retries exhausted)".

This is the error John reported — the awaitingDeviceInfoForProvisioning guard from PR #4 was catching the disconnect correctly, but the shared counter meant it had no retries to use.

Fix

Added dedicated deviceInfoRetryCount (max 2) so device info retries are independent of connection retries
Reset in all the same places as connectionRetryCount
Better logging includes the device-info-specific counter

Test plan

Beacon disconnect during MAC read (~3s window) should reconnect and skip MAC
Multiple initial connection failures followed by successful connect + device info disconnect should still retry
Happy path provisioning unaffected

## Problem The device info disconnect handler was sharing `connectionRetryCount` with the initial connection retry logic. If earlier connection attempts used retries, the device info handler had zero retries left and immediately failed with "Disconnected while reading device information (retries exhausted)". This is the error John reported — the `awaitingDeviceInfoForProvisioning` guard from PR #4 was catching the disconnect correctly, but the shared counter meant it had no retries to use. ## Fix - Added dedicated `deviceInfoRetryCount` (max 2) so device info retries are independent of connection retries - Reset in all the same places as `connectionRetryCount` - Better logging includes the device-info-specific counter ## Test plan - [ ] Beacon disconnect during MAC read (~3s window) should reconnect and skip MAC - [ ] Multiple initial connection failures followed by successful connect + device info disconnect should still retry - [ ] Happy path provisioning unaffected

schwifty added 4 commits 2026-03-21 23:35:30 +00:00

fix: prevent re-entrant disconnect callbacks and handle all disconnect states 54fa973d34

- Add isTerminating flag to guard succeed()/fail() against double invocation
  from racing didWriteValueFor + didDisconnectPeripheral callbacks
- Only call cancelPeripheralConnection when peripheral.state == .connected
  (avoids triggering spurious didDisconnectPeripheral on already-disconnected peripheral)
- Handle disconnect during device info read (post-auth) with specific error message
- Include state info in unexpected disconnect errors for easier debugging
- Early-return structure in disconnect handler for clearer control flow

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

docs: fix misleading comment on post-auth disconnect path 58be00cb38

The comment said "treat as non-fatal" but the code calls fail() — which
is correct behavior since we can't write config without a connection.
Updated comment to accurately describe the fail-with-retry-prompt flow.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: auto-reconnect on disconnect during device info read instead of failing 3d56a1e31d

The beacon sometimes drops BLE connection during the optional MAC address
query (0x30) after auth. Previously this failed with "Disconnected after
auth during device info read". Now we reconnect and skip the MAC read on
retry, going straight to config write. MAC is nice-to-have, not required.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fix: use dedicated retry counter for device info disconnect 64e3684209

The device info disconnect handler was sharing connectionRetryCount with
the initial connection retry logic. If earlier connection attempts burned
through retries, the device info handler had zero retries left and
immediately hit "retries exhausted" — causing the "Disconnected while
reading device information" error John reported.

Now uses a separate deviceInfoRetryCount (max 2) so device info retries
are independent of connection retries.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>