Skip to content

fix: always check the peer (HOLDS_ONE) before reclaiming, even when bonded #41

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
MegaManSec merged 1 commit into from
Jun 3, 2026
+4 −15
Merged

fix: always check the peer (HOLDS_ONE) before reclaiming, even when bonded #41

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
19 changes: 4 additions & 15 deletions Magic Switch/Model/Store/BluetoothPeripheralStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,9 +994,10 @@ final class BluetoothPeripheralStore: NSObject, ObservableObject, BluetoothPerip
}

/// Checks live IOBluetooth state for `peripheral` off the main queue. If it's
/// already connected, adopts it; if it's back in range and still bonded here,
/// reconnects locally (it's ours); otherwise hands off to
/// `reclaimIfPeerIsFree` to consult the peer before pairing. Marks the id
/// already connected, adopts it; if it's back in range, hands off to
/// `reclaimIfPeerIsFree`, which consults the peer (`HOLDS_ONE`) before
/// reclaiming — Magic devices stay bonded to *both* Macs, so being paired
/// here does not mean the peer isn't actively using it. Marks the id
/// in-flight so overlapping ticks skip it until this resolves.
private func probeAndReclaim(_ peripheral: BluetoothPeripheral) {
let id = peripheral.id
Expand All @@ -1006,13 +1007,11 @@ final class BluetoothPeripheralStore: NSObject, ObservableObject, BluetoothPerip
// RSSI is the "is it back?" signal — `invalidRSSI` (127) means we can't
// see it, the same gate `connectPeripheral` uses. Cheap while absent.
var alreadyConnected = false
var bondedHere = false
var reachable = false
if IOBluetoothHostController.default().powerState != kBluetoothHCIPowerStateOFF,
let device = IOBluetoothDevice(addressString: id)
{
alreadyConnected = device.isConnected()
bondedHere = device.isPaired()
reachable = device.rssi() != Constants.invalidRSSI
}
DispatchQueue.main.async { [weak self] in
Expand Down Expand Up @@ -1044,16 +1043,6 @@ final class BluetoothPeripheralStore: NSObject, ObservableObject, BluetoothPerip
self.reconnectInFlight.remove(id)
return
}
if bondedHere {
// Still bonded to this Mac, so it's ours: the peer can't hold a
// device whose link key lives here. Skip the HOLDS_ONE query and
// reconnect locally — `connectPeripheral` opens the connection
// without re-pairing (re-pairing a bonded device forces a
// disconnect/reconnect cycle and fights macOS's own reconnect).
self.reconnectInFlight.remove(id)
self.connectPeripheral(peripheral, announcePairTimeout: false)
return
}
self.reclaimIfPeerIsFree(peripheral)
}
}
Expand Down