Skip to content

Ignore a connect timeout superseded by a newer attempt on the same peripheral #1676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krishrathi1 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Ignore a connect timeout superseded by a newer attempt on the same peripheral #1676

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7be9aa9
Ignore a connect timeout superseded by a newer attempt on the same pe…
krishrathi1 Aug 16, 2026
822679e
Use monotonic attemptToken for BLE connect timeout & add unit tests
krishrathi1 Aug 29, 2026
55d7cd4
Fix Swift compiler error in BLEConnectTimeoutPolicyTests (missing cou…
krishrathi1 Aug 29, 2026
929a86c
Refactor BLEConnectTimeoutPolicy to use primitive attributes and elim…
krishrathi1 Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion bitchat/Services/BLE/BLERadioController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,14 @@ final class BLERadioController {
guard delegate?.radioIsPanicSuspended() == false else { return }
let peripheral = candidate.peripheral
let peripheralID = candidate.peripheralID
linkStateStore.beginConnecting(to: peripheral, at: Date())
// Captured so the timeout closure below can tell this specific
// attempt apart from a later one: linkStateStore.beginConnecting
// overwrites lastConnectionAttempt on every call for this
// peripheralID (disconnect -> reconnect included), but nothing
// previously distinguished which attempt a given timeout closure was
// scheduled for.
let attemptStartedAt = Date()
linkStateStore.beginConnecting(to: peripheral, at: attemptStartedAt)
peripheral.delegate = peripheralDelegate
let options: [String: Any] = [
CBConnectPeripheralOptionNotifyOnConnectionKey: true,
Expand All @@ -247,6 +254,20 @@ final class BLERadioController {
let state = self.linkStateStore.state(forPeripheralID: peripheralID),
state.isConnecting && !state.isConnected else { return }

// A disconnect + immediate reconnect between this attempt and now
// starts a new attempt with a fresh lastConnectionAttempt (via
// beginConnecting or armPendingBackgroundConnects, which sets it
// nil). Without this check, this now-stale timeout would cancel
// that newer, still-live attempt out from under it and apply a
// connection-timeout penalty to a peer that never actually timed
// out — reproducible any time a peer drops and reconnects while
// this timer is still armed (a few seconds of marginal signal is
// enough).
guard state.lastConnectionAttempt == attemptStartedAt else {
SecureLogger.debug("⏱️ Timeout fired for a superseded connection attempt, ignoring: \(candidate.name)", category: .session)
return
}

guard peripheral.state != .connected else {
SecureLogger.debug("⏱️ Timeout fired but peripheral already connected: \(candidate.name)", category: .session)
return
Expand Down
Loading