feat: 重写 SDK 支持 iOS 12.2，移除 async/await 和 Combine
- 所有公开 API 改为 completion handler (Result<T, Error>) - 状态通知改为 DuooomiBleSDKDelegate 协议 - 移除 Sendable、@MainActor、AsyncStream、CheckedContinuation - 网络请求改为 URLSession.dataTask 回调 - BLE 通信改为 delegate + 闭包模式 - deployment target 降至 iOS 12.2 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
km2023
@@ -1,198 +1,116 @@
|
||||
import CoreBluetooth
|
||||
import Foundation
|
||||
|
||||
/// CoreBluetooth 封装，提供 async API
|
||||
final class BleClient: NSObject, @unchecked Sendable {
|
||||
private var centralManager: CBCentralManager!
|
||||
private let queue = DispatchQueue(label: "com.duooomi.ble.client")
|
||||
/// BLE 客户端内部回调协议
|
||||
protocol BleClientDelegate: AnyObject {
|
||||
func bleClient(_ client: BleClient, didDiscoverDevice device: DiscoveredDevice)
|
||||
func bleClient(_ client: BleClient, didReceiveData data: Data)
|
||||
}
|
||||
|
||||
private(set) var connectedPeripheral: CBPeripheral?
|
||||
private(set) var writeCharacteristic: CBCharacteristic?
|
||||
private(set) var readCharacteristic: CBCharacteristic?
|
||||
|
||||
/// 已发现但尚未连接的外设缓存 (scan 时填充)
|
||||
private var discoveredPeripherals: [UUID: CBPeripheral] = [:]
|
||||
|
||||
// MARK: - Continuations
|
||||
|
||||
private var connectContinuation: CheckedContinuation<CBPeripheral, Error>?
|
||||
private var disconnectContinuation: CheckedContinuation<Void, Error>?
|
||||
|
||||
// MARK: - Streams
|
||||
|
||||
private var scanContinuation: AsyncStream<DiscoveredDevice>.Continuation?
|
||||
private var notificationContinuation: AsyncStream<Data>.Continuation?
|
||||
|
||||
// MARK: - Callbacks
|
||||
final class BleClient: NSObject {
|
||||
|
||||
weak var delegate: BleClientDelegate?
|
||||
var onConnectionStateChange: ((ConnectionState) -> Void)?
|
||||
var onDisconnected: (() -> Void)?
|
||||
|
||||
// MARK: - Init
|
||||
private let queue = DispatchQueue(label: "com.duooomi.ble.client", qos: .userInitiated)
|
||||
private var centralManager: CBCentralManager!
|
||||
private var connectedPeripheral: CBPeripheral?
|
||||
private var writeCharacteristic: CBCharacteristic?
|
||||
private var readCharacteristic: CBCharacteristic?
|
||||
|
||||
override init() {
|
||||
super.init()
|
||||
centralManager = CBCentralManager(delegate: self, queue: queue)
|
||||
BleLog.i("BleClient initialized", "BLE")
|
||||
}
|
||||
// Connect/Disconnect callbacks
|
||||
private var connectCompletion: ((Result<CBPeripheral, Error>) -> Void)?
|
||||
private var disconnectCompletion: ((Result<Void, Error>) -> Void)?
|
||||
private var connectTimeoutWork: DispatchWorkItem?
|
||||
|
||||
// MARK: - Public API
|
||||
|
||||
/// 当前蓝牙状态。
|
||||
var bluetoothState: CBManagerState {
|
||||
centralManager.state
|
||||
}
|
||||
|
||||
/// 当前连接在 `.withoutResponse` 模式下允许写入的最大长度。
|
||||
var maximumWriteLength: Int {
|
||||
connectedPeripheral?.maximumWriteValueLength(for: .withoutResponse) ?? 20
|
||||
connectedPeripheral?.maximumWriteValueLength(for: .withoutResponse) ?? 182
|
||||
}
|
||||
|
||||
/// 扫描包含目标 Service 的外设。
|
||||
/// - Parameter serviceUUIDs: 需要匹配的 Service UUID 列表，默认使用 SDK 预设服务。
|
||||
/// - Returns: 异步设备流；终止时自动停止底层扫描。
|
||||
func scan(serviceUUIDs: [CBUUID] = [BleUUIDs.service]) -> AsyncStream<DiscoveredDevice> {
|
||||
stopScan()
|
||||
discoveredPeripherals.removeAll()
|
||||
|
||||
return AsyncStream { continuation in
|
||||
self.scanContinuation = continuation
|
||||
continuation.onTermination = { [weak self] _ in
|
||||
self?.queue.async {
|
||||
self?.centralManager.stopScan()
|
||||
self?.scanContinuation = nil
|
||||
}
|
||||
}
|
||||
self.queue.async {
|
||||
guard self.centralManager.state == .poweredOn else { return }
|
||||
BleLog.i("CBCentral startScan", "BLE")
|
||||
self.centralManager.scanForPeripherals(
|
||||
withServices: serviceUUIDs,
|
||||
options: [CBCentralManagerScanOptionAllowDuplicatesKey: false]
|
||||
)
|
||||
}
|
||||
}
|
||||
override init() {
|
||||
super.init()
|
||||
centralManager = CBCentralManager(delegate: self, queue: queue)
|
||||
}
|
||||
|
||||
/// 停止扫描。
|
||||
func stopScan() {
|
||||
queue.async { [weak self] in
|
||||
self?.centralManager.stopScan()
|
||||
BleLog.i("CBCentral stopScan", "BLE")
|
||||
}
|
||||
scanContinuation?.finish()
|
||||
scanContinuation = nil
|
||||
}
|
||||
// MARK: - Scan
|
||||
|
||||
/// 连接已发现的外设。
|
||||
/// - Parameters:
|
||||
/// - deviceId: 目标外设的 UUID 字符串（来源于扫描阶段）。
|
||||
/// - timeout: 连接超时，默认 30 秒。
|
||||
/// - Returns: 成功连接的 `CBPeripheral`。
|
||||
/// - Throws: 蓝牙未开启、找不到设备、超时或连接失败等错误。
|
||||
func connect(deviceId: String, timeout: TimeInterval = 30) async throws -> CBPeripheral {
|
||||
func scan(serviceUUIDs: [CBUUID] = [BleUUIDs.service]) {
|
||||
guard centralManager.state == .poweredOn else {
|
||||
throw DuooomiBleError.bluetoothNotPoweredOn(String(describing: centralManager.state))
|
||||
}
|
||||
|
||||
guard let uuid = UUID(uuidString: deviceId),
|
||||
let peripheral = discoveredPeripherals[uuid] else {
|
||||
throw DuooomiBleError.connectionFailed("Device not found: \(deviceId)")
|
||||
}
|
||||
|
||||
return try await withCheckedThrowingContinuation { continuation in
|
||||
self.connectContinuation = continuation
|
||||
self.queue.async {
|
||||
BleLog.i("Connecting to peripheral: \(peripheral.identifier.uuidString)", "BLE")
|
||||
self.centralManager.connect(peripheral, options: nil)
|
||||
}
|
||||
|
||||
// Timeout
|
||||
self.queue.asyncAfter(deadline: .now() + timeout) { [weak self] in
|
||||
if let cont = self?.connectContinuation {
|
||||
self?.connectContinuation = nil
|
||||
self?.centralManager.cancelPeripheralConnection(peripheral)
|
||||
BleLog.w("Connection timeout: \(peripheral.identifier.uuidString)", "BLE")
|
||||
cont.resume(throwing: DuooomiBleError.connectionFailed("Connection timeout after \(Int(timeout))s"))
|
||||
}
|
||||
}
|
||||
BleLog.w("Bluetooth not powered on", "BLE")
|
||||
return
|
||||
}
|
||||
centralManager.scanForPeripherals(
|
||||
withServices: serviceUUIDs,
|
||||
options: [CBCentralManagerScanOptionAllowDuplicatesKey: false]
|
||||
)
|
||||
}
|
||||
|
||||
/// 断开当前连接。
|
||||
/// - Throws: 如在超时后强制清理，仍会完成回调，不抛错；异常流程可能抛底层错误。
|
||||
func disconnect() async throws {
|
||||
guard let peripheral = connectedPeripheral else { return }
|
||||
|
||||
try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, Error>) in
|
||||
self.disconnectContinuation = continuation
|
||||
self.queue.async {
|
||||
BleLog.i("Cancel connection: \(peripheral.identifier.uuidString)", "BLE")
|
||||
self.centralManager.cancelPeripheralConnection(peripheral)
|
||||
}
|
||||
|
||||
// Timeout for disconnect
|
||||
self.queue.asyncAfter(deadline: .now() + 5) { [weak self] in
|
||||
if let cont = self?.disconnectContinuation {
|
||||
self?.disconnectContinuation = nil
|
||||
BleLog.w("Force-finish disconnect after timeout", "BLE")
|
||||
self?.cleanup()
|
||||
cont.resume()
|
||||
}
|
||||
}
|
||||
}
|
||||
func stopScan() {
|
||||
centralManager.stopScan()
|
||||
}
|
||||
|
||||
/// 无响应写入（GATT Write Without Response）。
|
||||
/// - Parameter data: 要写入的二进制数据。
|
||||
/// - Throws: 未连接等错误。
|
||||
// MARK: - Connect
|
||||
|
||||
func connect(deviceId: String, timeout: TimeInterval = 30, completion: @escaping (Result<CBPeripheral, Error>) -> Void) {
|
||||
guard centralManager.state == .poweredOn else {
|
||||
completion(.failure(DuooomiBleError.bluetoothNotPoweredOn("Bluetooth not powered on")))
|
||||
return
|
||||
}
|
||||
|
||||
let peripherals = centralManager.retrievePeripherals(withIdentifiers: [UUID(uuidString: deviceId)!])
|
||||
guard let peripheral = peripherals.first else {
|
||||
completion(.failure(DuooomiBleError.connectionFailed("Device not found: \(deviceId)")))
|
||||
return
|
||||
}
|
||||
|
||||
self.connectCompletion = completion
|
||||
peripheral.delegate = self
|
||||
centralManager.connect(peripheral, options: nil)
|
||||
|
||||
// Timeout
|
||||
let work = DispatchWorkItem { [weak self] in
|
||||
guard let self = self, self.connectCompletion != nil else { return }
|
||||
self.centralManager.cancelPeripheralConnection(peripheral)
|
||||
let cb = self.connectCompletion
|
||||
self.connectCompletion = nil
|
||||
cb?(.failure(DuooomiBleError.connectionFailed("Connection timeout")))
|
||||
}
|
||||
connectTimeoutWork = work
|
||||
queue.asyncAfter(deadline: .now() + timeout, execute: work)
|
||||
}
|
||||
|
||||
// MARK: - Disconnect
|
||||
|
||||
func disconnect(completion: @escaping (Result<Void, Error>) -> Void) {
|
||||
guard let peripheral = connectedPeripheral else {
|
||||
completion(.success(()))
|
||||
return
|
||||
}
|
||||
disconnectCompletion = completion
|
||||
centralManager.cancelPeripheralConnection(peripheral)
|
||||
}
|
||||
|
||||
// MARK: - Write
|
||||
|
||||
func writeWithoutResponse(_ data: Data) throws {
|
||||
guard let peripheral = connectedPeripheral,
|
||||
let characteristic = writeCharacteristic else {
|
||||
guard let peripheral = connectedPeripheral, let char = writeCharacteristic else {
|
||||
throw DuooomiBleError.notConnected
|
||||
}
|
||||
BleLog.d("Write w/o response, len=\(data.count)", "BLE")
|
||||
peripheral.writeValue(data, for: characteristic, type: .withoutResponse)
|
||||
peripheral.writeValue(data, for: char, type: .withoutResponse)
|
||||
}
|
||||
|
||||
/// 查询系统层面已连接、且具备目标 Service 的外设。
|
||||
/// - Returns: 已连接外设的精简信息列表。
|
||||
// MARK: - Retrieve Connected
|
||||
|
||||
func retrieveConnectedDevices() -> [DiscoveredDevice] {
|
||||
let peripherals = centralManager.retrieveConnectedPeripherals(withServices: [BleUUIDs.service])
|
||||
return peripherals.map { peripheral in
|
||||
DiscoveredDevice(
|
||||
id: peripheral.identifier.uuidString,
|
||||
name: peripheral.name,
|
||||
rssi: 0
|
||||
)
|
||||
centralManager.retrieveConnectedPeripherals(withServices: [BleUUIDs.service]).map {
|
||||
DiscoveredDevice(id: $0.identifier.uuidString, name: $0.name, rssi: 0)
|
||||
}
|
||||
}
|
||||
|
||||
/// 订阅并接收通知特征的原始二进制数据流。
|
||||
/// - Returns: 通知数据的异步流。
|
||||
func notifications() -> AsyncStream<Data> {
|
||||
AsyncStream { continuation in
|
||||
self.notificationContinuation = continuation
|
||||
continuation.onTermination = { [weak self] _ in
|
||||
self?.notificationContinuation = nil
|
||||
}
|
||||
BleLog.i("Notifications stream attached", "BLE")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func cleanup() {
|
||||
if let readChar = readCharacteristic, let peripheral = connectedPeripheral {
|
||||
peripheral.setNotifyValue(false, for: readChar)
|
||||
}
|
||||
connectedPeripheral = nil
|
||||
writeCharacteristic = nil
|
||||
readCharacteristic = nil
|
||||
notificationContinuation?.finish()
|
||||
notificationContinuation = nil
|
||||
BleLog.i("Client state cleaned up", "BLE")
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - CBCentralManagerDelegate
|
||||
@@ -200,67 +118,51 @@ final class BleClient: NSObject, @unchecked Sendable {
|
||||
extension BleClient: CBCentralManagerDelegate {
|
||||
|
||||
func centralManagerDidUpdateState(_ central: CBCentralManager) {
|
||||
// If scanning was requested before poweredOn, start now
|
||||
if central.state == .poweredOn, scanContinuation != nil {
|
||||
BleLog.d("State poweredOn; resume scan", "BLE")
|
||||
central.scanForPeripherals(
|
||||
withServices: [BleUUIDs.service],
|
||||
options: [CBCentralManagerScanOptionAllowDuplicatesKey: false]
|
||||
)
|
||||
}
|
||||
BleLog.d("Central state=\(central.state.rawValue)", "BLE")
|
||||
BleLog.i("Bluetooth state: \(central.state.rawValue)", "BLE")
|
||||
}
|
||||
|
||||
func centralManager(
|
||||
_ central: CBCentralManager,
|
||||
didDiscover peripheral: CBPeripheral,
|
||||
advertisementData: [String: Any],
|
||||
rssi RSSI: NSNumber
|
||||
) {
|
||||
discoveredPeripherals[peripheral.identifier] = peripheral
|
||||
|
||||
func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral,
|
||||
advertisementData: [String: Any], rssi RSSI: NSNumber) {
|
||||
let device = DiscoveredDevice(
|
||||
id: peripheral.identifier.uuidString,
|
||||
name: peripheral.name ?? advertisementData[CBAdvertisementDataLocalNameKey] as? String,
|
||||
name: peripheral.name,
|
||||
rssi: RSSI.intValue
|
||||
)
|
||||
BleLog.d("Did discover: id=\(device.id), rssi=\(device.rssi)", "BLE")
|
||||
scanContinuation?.yield(device)
|
||||
delegate?.bleClient(self, didDiscoverDevice: device)
|
||||
}
|
||||
|
||||
func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
|
||||
connectTimeoutWork?.cancel()
|
||||
connectTimeoutWork = nil
|
||||
connectedPeripheral = peripheral
|
||||
peripheral.delegate = self
|
||||
BleLog.i("Did connect: \(peripheral.identifier.uuidString)", "BLE")
|
||||
peripheral.discoverServices([BleUUIDs.service])
|
||||
}
|
||||
|
||||
func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
BleLog.e("Fail to connect: \(peripheral.identifier.uuidString), error=\(error?.localizedDescription ?? "-")", "BLE")
|
||||
cont?.resume(throwing: DuooomiBleError.connectionFailed(error?.localizedDescription ?? "Unknown error"))
|
||||
connectTimeoutWork?.cancel()
|
||||
connectTimeoutWork = nil
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.failure(error ?? DuooomiBleError.connectionFailed("Unknown")))
|
||||
}
|
||||
|
||||
func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
|
||||
// If disconnect happens mid-setup (after didConnect but before discoverCharacteristics
|
||||
// completes), the connect continuation must be resolved or the caller hangs forever.
|
||||
if let connectCont = connectContinuation {
|
||||
connectContinuation = nil
|
||||
connectCont.resume(throwing: DuooomiBleError.connectionFailed(
|
||||
error?.localizedDescription ?? "Disconnected during setup"
|
||||
))
|
||||
connectedPeripheral = nil
|
||||
writeCharacteristic = nil
|
||||
readCharacteristic = nil
|
||||
|
||||
if let cb = disconnectCompletion {
|
||||
disconnectCompletion = nil
|
||||
if let error = error {
|
||||
cb(.failure(error))
|
||||
} else {
|
||||
cb(.success(()))
|
||||
}
|
||||
}
|
||||
|
||||
cleanup()
|
||||
|
||||
if let cont = disconnectContinuation {
|
||||
disconnectContinuation = nil
|
||||
cont.resume()
|
||||
DispatchQueue.main.async { [weak self] in
|
||||
self?.onDisconnected?()
|
||||
}
|
||||
|
||||
BleLog.w("Did disconnect: \(peripheral.identifier.uuidString), error=\(error?.localizedDescription ?? "-")", "BLE")
|
||||
onDisconnected?()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -270,22 +172,17 @@ extension BleClient: CBPeripheralDelegate {
|
||||
|
||||
func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
|
||||
if let error = error {
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
BleLog.e("Discover services error: \(error.localizedDescription)", "BLE")
|
||||
cont?.resume(throwing: DuooomiBleError.connectionFailed(error.localizedDescription))
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.failure(error))
|
||||
return
|
||||
}
|
||||
|
||||
guard let service = peripheral.services?.first(where: { $0.uuid == BleUUIDs.service }) else {
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
BleLog.e("Service not found", "BLE")
|
||||
cont?.resume(throwing: DuooomiBleError.serviceNotFound)
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.failure(DuooomiBleError.serviceNotFound))
|
||||
return
|
||||
}
|
||||
|
||||
BleLog.d("Service found: \(service.uuid.uuidString)", "BLE")
|
||||
peripheral.discoverCharacteristics(
|
||||
[BleUUIDs.writeCharacteristic, BleUUIDs.readCharacteristic],
|
||||
for: service
|
||||
@@ -294,17 +191,15 @@ extension BleClient: CBPeripheralDelegate {
|
||||
|
||||
func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) {
|
||||
if let error = error {
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
BleLog.e("Discover characteristics error: \(error.localizedDescription)", "BLE")
|
||||
cont?.resume(throwing: DuooomiBleError.connectionFailed(error.localizedDescription))
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.failure(error))
|
||||
return
|
||||
}
|
||||
|
||||
guard let characteristics = service.characteristics else {
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
cont?.resume(throwing: DuooomiBleError.characteristicNotFound)
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.failure(DuooomiBleError.characteristicNotFound))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -318,24 +213,19 @@ extension BleClient: CBPeripheralDelegate {
|
||||
}
|
||||
|
||||
guard writeCharacteristic != nil, readCharacteristic != nil else {
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
BleLog.e("Required characteristics missing", "BLE")
|
||||
cont?.resume(throwing: DuooomiBleError.characteristicNotFound)
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.failure(DuooomiBleError.characteristicNotFound))
|
||||
return
|
||||
}
|
||||
|
||||
// Connection fully ready
|
||||
let cont = connectContinuation
|
||||
connectContinuation = nil
|
||||
BleLog.i("Characteristics ready; connection established", "BLE")
|
||||
cont?.resume(returning: peripheral)
|
||||
let cb = connectCompletion
|
||||
connectCompletion = nil
|
||||
cb?(.success(peripheral))
|
||||
}
|
||||
|
||||
func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) {
|
||||
guard error == nil, characteristic.uuid == BleUUIDs.readCharacteristic,
|
||||
let value = characteristic.value else { return }
|
||||
BleLog.d("Notification received, len=\(value.count)", "BLE")
|
||||
notificationContinuation?.yield(value)
|
||||
guard error == nil, let data = characteristic.value else { return }
|
||||
delegate?.bleClient(self, didReceiveData: data)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user