Skip to content

fix(ios): Improve reconnection stability (#803) #811

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
peitschie merged 5 commits into from
Mar 11, 2026
Merged

fix(ios): Improve reconnection stability (#803) #811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2b4a51
fix(ios): Simplify threading model (#803)
peitschie Mar 7, 2026
1541bdf
fix(ios): cancel stale timeout work items before scheduling new ones …
peitschie Mar 7, 2026
8641cc2
fix(ios): prevent double-reject of CAPPluginCall during connect (#803)
peitschie Mar 7, 2026
22a4aec
fix(ios): reject connect callback immediately on service discovery er…
peitschie Mar 7, 2026
48dd284
fix(ios): eliminate peripheral.delegate hijacking during concurrent s…
peitschie Mar 7, 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
25 changes: 15 additions & 10 deletions ios/Sources/BluetoothLe/Device.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ class Device: NSObject, CBPeripheralDelegate {
typealias Callback = (_ success: Bool, _ value: String) -> Void

private var peripheral: CBPeripheral!
private let callbackMap = ThreadSafeDictionary<String, Callback>()
private let timeoutMap = ThreadSafeDictionary<String, DispatchWorkItem>()
private var callbackMap = [String: Callback]()
private var timeoutMap = [String: DispatchWorkItem]()
private var servicesCount = 0
private var servicesDiscovered = 0
private var characteristicsCount = 0
Expand Down Expand Up @@ -52,14 +52,10 @@ class Device: NSObject, CBPeripheralDelegate {
_ skipDescriptorDiscovery: Bool,
_ callback: @escaping Callback
) {
// Delegates run on the main queue; this is called from the bridge thread.
// Sync to main so writes are visible before any delegate fires.
DispatchQueue.main.sync {
let key = "connect"
self.skipDescriptorDiscovery = skipDescriptorDiscovery
self.callbackMap[key] = callback
self.setTimeout(key, "Connection timeout", connectionTimeout)
}
let key = "connect"
self.skipDescriptorDiscovery = skipDescriptorDiscovery
self.callbackMap[key] = callback
self.setTimeout(key, "Connection timeout", connectionTimeout)
}

func peripheral(
Expand All @@ -69,6 +65,8 @@ class Device: NSObject, CBPeripheralDelegate {
log("didDiscoverServices", peripheral.services?.count ?? -1)
if let error = error {
log("Error", error.localizedDescription)
self.reject("connect", "Service discovery failed: \(error.localizedDescription)")
self.reject("discoverServices", "Service discovery failed: \(error.localizedDescription)")
return
}
self.servicesCount = peripheral.services?.count ?? 0
Expand Down Expand Up @@ -129,6 +127,12 @@ class Device: NSObject, CBPeripheralDelegate {
}
}

func cancelConnectTimeout() {
let key = "connect"
self.callbackMap.removeValue(forKey: key)
self.timeoutMap.removeValue(forKey: key)?.cancel()
}

func getServices() -> [CBService] {
return self.peripheral.services ?? []
}
Expand Down Expand Up @@ -439,6 +443,7 @@ class Device: NSObject, CBPeripheralDelegate {
_ message: String,
_ timeout: Double
) {
self.timeoutMap.removeValue(forKey: key)?.cancel()
let workItem = DispatchWorkItem {
log("setTimeout",
self.servicesDiscovered, self.servicesCount,
Expand Down
63 changes: 26 additions & 37 deletions ios/Sources/BluetoothLe/DeviceManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ enum DeviceListMode {
class DeviceManager: NSObject, CBCentralManagerDelegate {
typealias Callback = (_ success: Bool, _ message: String) -> Void
typealias StateReceiver = (_ enabled: Bool) -> Void
typealias ScanResultCallback = (_ device: Device, _ advertisementData: [String: Any], _ rssi: NSNumber) -> Void
typealias ScanResultCallback = (_ peripheral: CBPeripheral, _ advertisementData: [String: Any], _ rssi: NSNumber) -> Void

private var centralManager: CBCentralManager!
private let viewController: UIViewController?
private var displayStrings: [String: String]!
private let callbackMap = ThreadSafeDictionary<String, Callback>()
private var callbackMap = [String: Callback]()
private var scanResultCallback: ScanResultCallback?
private var stateReceiver: StateReceiver?
private let timeoutMap = ThreadSafeDictionary<String, DispatchWorkItem>()
private var timeoutMap = [String: DispatchWorkItem]()
private var stopScanWorkItem: DispatchWorkItem?
private var alertController: UIAlertController?
private var deviceListView: DeviceListView?
private var popoverController: UIPopoverPresentationController?
private let discoveredDevices = ThreadSafeDictionary<String, Device>()
private var discoveredPeripherals = [String: CBPeripheral]()
private var deviceNameFilter: String?
private var deviceNamePrefixFilter: String?
private var deviceListMode: DeviceListMode = .none
Expand Down Expand Up @@ -73,9 +73,6 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
return self.centralManager.state == CBManagerState.poweredOn
}

// stateReceiver is written on the bridge thread and read on the main queue
// (via centralManagerDidUpdateState). Same threading issue as startScanning
// below; not fixed as BLE state transitions are too slow for the race to manifest.
func registerStateReceiver( _ stateReceiver: @escaping StateReceiver) {
self.stateReceiver = stateReceiver
}
Expand Down Expand Up @@ -104,19 +101,14 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
self.callbackMap["startScanning"] = callback

if self.centralManager.isScanning == false {
self.discoveredDevices.removeAll()
// These are read from centralManager(_:didDiscover:) on the main queue.
// Delegates run on the main queue; this is called from the bridge thread.
// Sync to main so writes are visible before any delegate fires.
DispatchQueue.main.sync {
self.scanResultCallback = scanResultCallback
self.deviceListMode = deviceListMode
self.allowDuplicates = allowDuplicates
self.deviceNameFilter = name
self.deviceNamePrefixFilter = namePrefix
self.manufacturerDataFilters = manufacturerDataFilters
self.serviceDataFilters = serviceDataFilters
}
self.discoveredPeripherals.removeAll()
self.scanResultCallback = scanResultCallback
self.deviceListMode = deviceListMode
self.allowDuplicates = allowDuplicates
self.deviceNameFilter = name
self.deviceNamePrefixFilter = namePrefix
self.manufacturerDataFilters = manufacturerDataFilters
self.serviceDataFilters = serviceDataFilters

if deviceListMode != .none {
self.showDeviceList()
Expand Down Expand Up @@ -152,13 +144,13 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
guard let self = self else { return }
switch self.deviceListMode {
case .alert:
if self.discoveredDevices.count == 0 {
if self.discoveredPeripherals.count == 0 {
self.alertController?.title = self.displayStrings["noDeviceFound"]
} else {
self.alertController?.title = self.displayStrings["availableDevices"]
}
case .list:
if self.discoveredDevices.count == 0 {
if self.discoveredPeripherals.count == 0 {
self.deviceListView?.setTitle(self.displayStrings["noDeviceFound"])
} else {
self.deviceListView?.setTitle(self.displayStrings["availableDevices"])
Expand Down Expand Up @@ -189,36 +181,31 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
guard ScanFilterUtils.passesServiceDataFilter(advertisementData, filters: self.serviceDataFilters) else { return }

let deviceId = peripheral.identifier.uuidString
let result = self.discoveredDevices.getOrInsert(
key: deviceId,
create: { Device(peripheral) },
update: { $0.updatePeripheral(peripheral) }
)
let device = result.value
let isNew = result.wasInserted
let isNew = self.discoveredPeripherals[deviceId] == nil
self.discoveredPeripherals[deviceId] = peripheral

if isNew || self.allowDuplicates {
log("New device found: ", device.getName() ?? "Unknown")
log("New device found: ", peripheral.name ?? "Unknown")

switch deviceListMode {
case .none:
if let callback = self.scanResultCallback {
callback(device, advertisementData, RSSI)
callback(peripheral, advertisementData, RSSI)
}
case .alert:
DispatchQueue.main.async { [weak self] in
self?.alertController?.addAction(UIAlertAction(title: device.getName() ?? "Unknown", style: UIAlertAction.Style.default, handler: { (_) in
self?.alertController?.addAction(UIAlertAction(title: peripheral.name ?? "Unknown", style: UIAlertAction.Style.default, handler: { (_) in
log("Selected device")
self?.stopScan()
self?.resolve("startScanning", device.getId())
self?.resolve("startScanning", deviceId)
}))
}
case .list:
DispatchQueue.main.async { [weak self] in
self?.deviceListView?.addItem(device.getName() ?? "Unknown", action: {
self?.deviceListView?.addItem(peripheral.name ?? "Unknown", action: {
log("Selected device")
self?.stopScan()
self?.resolve("startScanning", device.getId())
self?.resolve("startScanning", deviceId)
})
}
}
Expand Down Expand Up @@ -364,8 +351,8 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
self.resolve(key, "Successfully disconnected.")
}

func getDevice(_ deviceId: String) -> Device? {
return self.discoveredDevices[deviceId]
func getPeripheral(_ deviceId: String) -> CBPeripheral? {
return self.discoveredPeripherals[deviceId]
}

private func passesNameFilter(peripheralName: String?) -> Bool {
Expand Down Expand Up @@ -400,6 +387,7 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
_ message: String,
_ timeout: Double
) {
self.timeoutMap.removeValue(forKey: key)?.cancel()
let workItem = DispatchWorkItem {
self.reject(key, message)
}
Expand All @@ -413,6 +401,7 @@ class DeviceManager: NSObject, CBCentralManagerDelegate {
_ device: Device,
_ connectionTimeout: Double
) {
self.timeoutMap.removeValue(forKey: connectionKey)?.cancel()
let workItem = DispatchWorkItem {
self.cancelConnect(device)
self.reject(connectionKey, message)
Expand Down
Loading