Skip to content

Remove the reconnect refusal window #104

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

Merged
ps2 merged 1 commit into from
Oct 31, 2026
Merged

Remove the reconnect refusal window #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 2 additions & 19 deletions G7SensorKit/G7CGMManager/G7BluetoothManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,6 @@ class G7BluetoothManager: NSObject {
/// Whole seconds: CoreBluetooth rejects a fractional start delay as an invalid parameter.
static let reconnectStartDelay = 30

/// A failure this soon after lodging is CoreBluetooth refusing the request itself; wait before asking again.
static let reconnectRefusalWindow: TimeInterval = 2
static let reconnectRefusalBackoff: TimeInterval = 30

/// When the last delayed reconnect was lodged. Confined to `managerQueue`.
private var reconnectLodgedAt: Date?

/// There is exactly one of these per session, and a pairing run borrows
/// it rather than building a second: only one central per app may claim
/// the restore identifier, and sharing the central is what lets the
Expand Down Expand Up @@ -520,7 +513,6 @@ class G7BluetoothManager: NSObject {
private func reconnectAfterAdvertisingTail(_ peripheral: CBPeripheral) {
dispatchPrecondition(condition: .onQueue(managerQueue))
reconnectLog("Reconnecting with a \(G7BluetoothManager.reconnectStartDelay) s start delay")
reconnectLodgedAt = Date()
handleDiscoveredPeripheral(peripheral, connectOptions: [CBConnectPeripheralOptionStartDelayKey: NSNumber(value: G7BluetoothManager.reconnectStartDelay)])
}

Expand All @@ -531,23 +523,14 @@ class G7BluetoothManager: NSObject {
}

/// Stock path only (no arm): an active peripheral reconnects on its own; anything else rescans.
private func resumeAfterLinkEnded(_ peripheral: CBPeripheral, refusedAt failure: Date? = nil) {
private func resumeAfterLinkEnded(_ peripheral: CBPeripheral) {
dispatchPrecondition(condition: .onQueue(managerQueue))
guard peripheral == activePeripheral, centralManager.state == .poweredOn else {
managerQueue.asyncAfter(deadline: .now() + 2) { [weak self] in
self?.managerQueue_scanForPeripheral()
}
return
}
// Re-lodging a refused request at once would spin; back off and go through the stock scan instead.
if let failure, let lodgedAt = reconnectLodgedAt, failure.timeIntervalSince(lodgedAt) < G7BluetoothManager.reconnectRefusalWindow {
reconnectLodgedAt = nil
reconnectLog("Reconnect refused; retrying in \(Int(G7BluetoothManager.reconnectRefusalBackoff)) s")
managerQueue.asyncAfter(deadline: .now() + G7BluetoothManager.reconnectRefusalBackoff) { [weak self] in
self?.managerQueue_scanForPeripheral()
}
return
}
reconnectAfterAdvertisingTail(peripheral)
}

Expand Down Expand Up @@ -755,7 +738,7 @@ extension G7BluetoothManager: CBCentralManagerDelegate {
managedPeripherals.removeValue(forKey: peripheral.identifier)
}

resumeAfterLinkEnded(peripheral, refusedAt: Date())
resumeAfterLinkEnded(peripheral)
}
}

Expand Down