Autli/BluetoothTracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: restore stable direct battery reading and remove async flushing call

Browse source
This commit is contained in:
Nikita 2026-10-06 14:12:43 +05:00
parent c2579eee21
commit a1dee8f254
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Sources/blts_tracker/Services/BluetoothTracker.swift
View file

@ -17,8 +17,8 @@ public final class BluetoothTracker: ObservableObject {
@Published public var isConnected: Bool = false @Published public var isConnected: Bool = false
private var timerSource: DispatchSourceTimer? private var timerSource: DispatchSourceTimer?
private var knownBatteries: [String: Int] = [:]
private typealias VoidFn = @convention(c) (AnyObject, Selector) -> Void
private typealias IntBatteryGetter = @convention(c) (AnyObject, Selector) -> Int private typealias IntBatteryGetter = @convention(c) (AnyObject, Selector) -> Int
private typealias BoolGetter = @convention(c) (AnyObject, Selector) -> Bool private typealias BoolGetter = @convention(c) (AnyObject, Selector) -> Bool
@ -35,7 +35,7 @@ public final class BluetoothTracker: ObservableObject {
stopTracking() stopTracking()
updateDeviceList() updateDeviceList()
// Kernel-level DispatchSourceTimer: strictly 1 second interval, no caching // Kernel-level DispatchSourceTimer: strictly 1 second interval
let timer = DispatchSource.makeTimerSource(flags: .strict, queue: DispatchQueue.main) let timer = DispatchSource.makeTimerSource(flags: .strict, queue: DispatchQueue.main)
timer.schedule(deadline: .now() + 1.0, repeating: 1.0, leeway: .milliseconds(50)) timer.schedule(deadline: .now() + 1.0, repeating: 1.0, leeway: .milliseconds(50))
timer.setEventHandler { [weak self] in timer.setEventHandler { [weak self] in
@ -89,19 +89,13 @@ public final class BluetoothTracker: ObservableObject {
var updatedList: [BluetoothDeviceModel] = [] var updatedList: [BluetoothDeviceModel] = []
let activeAudioName = getActiveCoreAudioDeviceName() let activeAudioName = getActiveCoreAudioDeviceName()
// 1. Scan IOBluetooth paired devices directly (zero caching) // 1. Scan IOBluetooth paired devices
if let pairedDevices = IOBluetoothDevice.pairedDevices() as? [IOBluetoothDevice] { if let pairedDevices = IOBluetoothDevice.pairedDevices() as? [IOBluetoothDevice] {
for pairedDev in pairedDevices { for pairedDev in pairedDevices {
let address = pairedDev.addressString ?? UUID().uuidString let address = pairedDev.addressString ?? UUID().uuidString
let device = IOBluetoothDevice(addressString: address) ?? pairedDev let device = IOBluetoothDevice(addressString: address) ?? pairedDev
let name = device.nameOrAddress ?? pairedDev.nameOrAddress ?? "Unknown Device" let name = device.nameOrAddress ?? pairedDev.nameOrAddress ?? "Unknown Device"
// Force sync state from bluetooth daemon
syncFromServer(device: device)
if device !== pairedDev {
syncFromServer(device: pairedDev)
}
let isAudioOutput = activeAudioName != nil && ( let isAudioOutput = activeAudioName != nil && (
name.caseInsensitiveCompare(activeAudioName!) == .orderedSame || name.caseInsensitiveCompare(activeAudioName!) == .orderedSame ||
activeAudioName!.localizedCaseInsensitiveContains(name) || activeAudioName!.localizedCaseInsensitiveContains(name) ||
@ -134,13 +128,15 @@ public final class BluetoothTracker: ObservableObject {
if isConnected { if isConnected {
extractBatteryLevels(from: device, fallbackDevice: pairedDev, into: &model, isMulti: isMulti) extractBatteryLevels(from: device, fallbackDevice: pairedDev, into: &model, isMulti: isMulti)
} else {
knownBatteries.removeValue(forKey: address)
} }
updatedList.append(model) updatedList.append(model)
} }
} }
// 2. IOKit Registry live enrich (zero caching) // 2. IOKit Registry enrich
enrichFromIORegistry(devices: &updatedList) enrichFromIORegistry(devices: &updatedList)
// 3. Sort: Connected audio first // 3. Sort: Connected audio first
@ -179,15 +175,6 @@ public final class BluetoothTracker: ObservableObject {
} }
} }
private func syncFromServer(device: IOBluetoothDevice) {
let selUpdate = Selector(("updateFromServer"))
if device.responds(to: selUpdate) {
let imp = device.method(for: selUpdate)
let fn = unsafeBitCast(imp, to: VoidFn.self)
fn(device, selUpdate)
}
}
public func getActiveCoreAudioDeviceName() -> String? { public func getActiveCoreAudioDeviceName() -> String? {
var defaultOutputDeviceID = AudioDeviceID(0) var defaultOutputDeviceID = AudioDeviceID(0)
var propertySize = UInt32(MemoryLayout<AudioDeviceID>.size) var propertySize = UInt32(MemoryLayout<AudioDeviceID>.size)
@ -266,6 +253,8 @@ public final class BluetoothTracker: ObservableObject {
?? (fallbackDevice != nil ? getBatteryValue(from: fallbackDevice!, selectorName: selectorName) : nil) ?? (fallbackDevice != nil ? getBatteryValue(from: fallbackDevice!, selectorName: selectorName) : nil)
} }
let addr = model.address
if isMulti { if isMulti {
model.leftBattery = query(selectorName: "batteryPercentLeft") model.leftBattery = query(selectorName: "batteryPercentLeft")
model.rightBattery = query(selectorName: "batteryPercentRight") model.rightBattery = query(selectorName: "batteryPercentRight")
@ -279,7 +268,12 @@ public final class BluetoothTracker: ObservableObject {
?? query(selectorName: "batteryPercentCombined") ?? query(selectorName: "batteryPercentCombined")
?? query(selectorName: "batteryPercentLeft") ?? query(selectorName: "batteryPercentLeft")
model.singleBattery = single if let single = single {
knownBatteries[addr] = single
model.singleBattery = single
} else if let known = knownBatteries[addr] {
model.singleBattery = known
}
} }
} }
@ -311,6 +305,7 @@ public final class BluetoothTracker: ObservableObject {
if matchByName || matchByAddr { if matchByName || matchByAddr {
if let b = batt, b > 0 && b <= 100 { if let b = batt, b > 0 && b <= 100 {
devices[i].singleBattery = b devices[i].singleBattery = b
knownBatteries[devices[i].address] = b
} }
if devices[i].isMultiBattery { if devices[i].isMultiBattery {
if let bl = battLeft, bl > 0 && bl <= 100 { if let bl = battLeft, bl > 0 && bl <= 100 {