react-native-ble-nitro 1.11.0 → 1.13.0

package/README.md

@@ -285,6 +285,11 @@ await subscription.remove();
 
 // Or unsubscribe directly
 await ble.unsubscribeFromCharacteristic(deviceId, serviceUUID, characteristicUUID);
+
+// Check if a characteristic is currently subscribed to notifications
+const isSubscribed = ble.isSubscribedToCharacteristic(deviceId, serviceUUID, characteristicUUID);
+// Returns: boolean — synchronous, no async overhead
+// Returns false for disconnected or unknown devices without throwing
 ```
 
 ### Real-World Examples

package/android/src/main/java/com/margelo/nitro/co/zyke/ble/BleNitroBleManager.kt

@@ -75,7 +75,9 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
         var connectCallback: ((success: Boolean, deviceId: String, error: String) -> Unit)? = null,
         var disconnectCallback: ((deviceId: String, interrupted: Boolean, error: String) -> Unit)? = null,
         var serviceDiscoveryCallback: ((success: Boolean, error: String) -> Unit)? = null,
-        var characteristicSubscriptions: MutableMap<String, (characteristicId: String, data: ArrayBuffer) -> Unit> = mutableMapOf()
+        // Key: "serviceId:characteristicId" for correct scoping when the same
+        // characteristic UUID exists under multiple services.
+        var characteristicSubscriptions: MutableMap<String, (characteristicId: String, data: ArrayBuffer) -> Unit> = ConcurrentHashMap()
     )
 
     // Sealed class for GATT operations that need to be queued
@@ -264,18 +266,21 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
     private fun createGattCallback(deviceId: String): BluetoothGattCallback {
         return object : BluetoothGattCallback() {
             override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
-                val callbacks = deviceCallbacks[deviceId]
-                
                 when (newState) {
                     BluetoothProfile.STATE_CONNECTED -> {
-                        callbacks?.connectCallback?.invoke(true, deviceId, "")
+                        var connectCb: ((Boolean, String, String) -> Unit)? = null
+                        deviceCallbacks.compute(deviceId) { _, callbacks ->
+                            connectCb = callbacks?.connectCallback
+                            callbacks?.copy(connectCallback = null)
+                        }
+                        connectCb?.invoke(true, deviceId, "")
                     }
                     BluetoothProfile.STATE_DISCONNECTED -> {
                         // Clean up
                         connectedDevices.remove(deviceId)
                         val interrupted = status != BluetoothGatt.GATT_SUCCESS
-                        callbacks?.disconnectCallback?.invoke(deviceId, interrupted, if (interrupted) "Connection lost" else "")
-                        deviceCallbacks.remove(deviceId)
+                        val cb = deviceCallbacks.remove(deviceId)
+                        cb?.disconnectCallback?.invoke(deviceId, interrupted, if (interrupted) "Connection lost" else "")
                         gatt.close()
                     }
                 }
@@ -352,17 +357,23 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
             override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
                 // Handle characteristic notifications
                 val characteristicId = characteristic.uuid.toString()
+                val serviceId = characteristic.service?.uuid?.toString()
+                if (serviceId == null) {
+                    android.util.Log.w("BleNitro", "onCharacteristicChanged: characteristic.service is null for $characteristicId")
+                    return
+                }
+                val subscriptionKey = "$serviceId:$characteristicId"
                 val value = characteristic.value ?: byteArrayOf()
-                
+
                 // Create direct ByteBuffer as required by ArrayBuffer.wrap()
                 val directBuffer = java.nio.ByteBuffer.allocateDirect(value.size)
                 directBuffer.put(value)
                 directBuffer.flip()
-                
+
                 val data = ArrayBuffer.wrap(directBuffer)
-                
+
                 val callbacks = deviceCallbacks[deviceId]
-                callbacks?.characteristicSubscriptions?.get(characteristicId)?.invoke(characteristicId, data)
+                callbacks?.characteristicSubscriptions?.get(subscriptionKey)?.invoke(characteristicId, data)
             }
             
             override fun onDescriptorWrite(gatt: BluetoothGatt, descriptor: BluetoothGattDescriptor, status: Int) {
@@ -649,6 +660,12 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
         try {
             val gatt = connectedDevices[deviceId]
             if (gatt != null) {
+                var pendingConnect: ((Boolean, String, String) -> Unit)? = null
+                deviceCallbacks.compute(deviceId) { _, callbacks ->
+                    pendingConnect = callbacks?.connectCallback
+                    callbacks?.copy(connectCallback = null)
+                }
+                pendingConnect?.invoke(false, deviceId, "Connection cancelled")
                 gatt.disconnect()
                 callback(true, "")
             } else {
@@ -733,6 +750,12 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
         }
     }
 
+    override fun discoverServicesWithCharacteristics(deviceId: String, callback: (success: Boolean, error: String) -> Unit) {
+        // On Android, discoverServices() already discovers characteristics automatically.
+        // Delegate directly to discoverServices.
+        discoverServices(deviceId, callback)
+    }
+
     override fun getServices(deviceId: String): Array<String> {
         return try {
             val gatt = connectedDevices[deviceId]
@@ -896,14 +919,11 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
                 return
             }
 
-            // Store the update callback
-            val callbacks = deviceCallbacks[deviceId]
-            if (callbacks != null) {
-                callbacks.characteristicSubscriptions[characteristicId] = updateCallback
-            }
+            val subscriptionKey = "$serviceId:$characteristicId"
 
-            // Write to the CCCD descriptor to enable notifications on the remote device
-            // This must be queued to ensure sequential GATT operations
+            // Write to the CCCD descriptor to enable notifications on the remote device.
+            // The update callback is stored only after the descriptor write succeeds
+            // so that isSubscribedToCharacteristic reflects actual BLE state.
             val descriptor = characteristic.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"))
             if (descriptor != null) {
                 enqueueGattOperation(
@@ -912,11 +932,19 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
                         descriptor = descriptor,
                         value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE,
                         deviceId = deviceId,
-                        callback = completionCallback
+                        callback = { success, error ->
+                            if (success) {
+                                val callbacks = deviceCallbacks[deviceId]
+                                callbacks?.characteristicSubscriptions?.set(subscriptionKey, updateCallback)
+                            }
+                            completionCallback(success, error)
+                        }
                     )
                 )
             } else {
-                // No CCCD descriptor - some characteristics may not need it
+                // No CCCD descriptor - store callback and report success
+                val callbacks = deviceCallbacks[deviceId]
+                callbacks?.characteristicSubscriptions?.set(subscriptionKey, updateCallback)
                 completionCallback(true, "")
             }
 
@@ -957,12 +985,12 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
                 return
             }
 
-            // Remove the update callback
-            val callbacks = deviceCallbacks[deviceId]
-            callbacks?.characteristicSubscriptions?.remove(characteristicId)
+            val subscriptionKey = "$serviceId:$characteristicId"
 
-            // Write to the CCCD descriptor to disable notifications on the remote device
-            // This must be queued to ensure sequential GATT operations
+            // Write to the CCCD descriptor to disable notifications on the remote device.
+            // The subscription entry is removed only after the descriptor write succeeds,
+            // mirroring the subscribe pattern to avoid a stale-entry race when
+            // subscribe and unsubscribe are called in rapid succession.
             val descriptor = characteristic.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"))
             if (descriptor != null) {
                 enqueueGattOperation(
@@ -971,11 +999,19 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
                         descriptor = descriptor,
                         value = BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE,
                         deviceId = deviceId,
-                        callback = callback
+                        callback = { success, error ->
+                            if (success) {
+                                val callbacks = deviceCallbacks[deviceId]
+                                callbacks?.characteristicSubscriptions?.remove(subscriptionKey)
+                            }
+                            callback(success, error)
+                        }
                     )
                 )
             } else {
-                // No CCCD descriptor - some characteristics may not need it
+                // No CCCD descriptor - remove immediately
+                val callbacks = deviceCallbacks[deviceId]
+                callbacks?.characteristicSubscriptions?.remove(subscriptionKey)
                 callback(true, "")
             }
 
@@ -984,6 +1020,16 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
         }
     }
 
+    override fun isSubscribedToCharacteristic(
+        deviceId: String,
+        serviceId: String,
+        characteristicId: String
+    ): Boolean {
+        val callbacks = deviceCallbacks[deviceId] ?: return false
+        val subscriptionKey = "$serviceId:$characteristicId"
+        return callbacks.characteristicSubscriptions.containsKey(subscriptionKey)
+    }
+
     // Bluetooth state management
     override fun requestBluetoothEnable(callback: (success: Boolean, error: String) -> Unit) {
         try {

package/ios/BleNitroBleManager.swift

@@ -255,17 +255,22 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec {
     
     public func disconnect(deviceId: String, callback: @escaping (Bool, String) -> Void) throws {
         ensureCentralManager()
-        guard let peripheral = connectedPeripherals[deviceId] else {
-            callback(false, "Peripheral not connected")
+        guard let peripheral = connectedPeripherals[deviceId] ?? findPeripheral(by: deviceId) else {
+            callback(false, "Peripheral not found")
             return
         }
-        
+
+        if peripheral.state == .connecting, let delegate = peripheralDelegates[deviceId] {
+            delegate.connectionCallback?(false, "", "Connection cancelled")
+            delegate.connectionCallback = nil
+        }
+
         // Store disconnect callback in delegate
         peripheralDelegates[deviceId]?.disconnectionCallback = callback
-        
+
         // Mark this as an intentional disconnection
         intentionalDisconnections.insert(deviceId)
-        
+
         centralManager.cancelPeripheralConnection(peripheral)
     }
     
@@ -310,10 +315,50 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec {
             callback(false, "Peripheral not connected")
             return
         }
-        
-        peripheralDelegates[deviceId]?.serviceDiscoveryCallback = callback
+
+        guard let delegate = peripheralDelegates[deviceId] else {
+            callback(false, "Peripheral delegate not found")
+            return
+        }
+
+        // If services already discovered, resolve immediately to avoid
+        // CoreBluetooth silently skipping the didDiscoverServices callback.
+        if delegate.servicesDiscovered, let services = peripheral.services, !services.isEmpty {
+            callback(true, "")
+            return
+        }
+
+        delegate.serviceDiscoveryCallback = callback
         peripheral.discoverServices(nil)
     }
+
+    public func discoverServicesWithCharacteristics(deviceId: String, callback: @escaping (Bool, String) -> Void) throws {
+        guard let peripheral = connectedPeripherals[deviceId] else {
+            callback(false, "Peripheral not connected")
+            return
+        }
+
+        guard let delegate = peripheralDelegates[deviceId] else {
+            callback(false, "Peripheral delegate not found")
+            return
+        }
+
+        // If services and all characteristics are already discovered, resolve immediately.
+        if delegate.servicesDiscovered,
+           let services = peripheral.services, !services.isEmpty,
+           services.allSatisfy({ $0.characteristics != nil }) {
+            callback(true, "")
+            return
+        }
+
+        let isFirstCaller = delegate.fullDiscoveryCallbacks.isEmpty
+        delegate.fullDiscoveryCallbacks.append(callback)
+        // Only trigger discovery if this is the first caller; subsequent
+        // callers piggyback on the in-flight discovery via the callback array.
+        if isFirstCaller {
+            peripheral.discoverServices(nil)
+        }
+    }
     
     public func getServices(deviceId: String) throws -> [String] {
         guard let peripheral = connectedPeripherals[deviceId] else {
@@ -464,7 +509,24 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec {
         
         characteristic.service?.peripheral?.setNotifyValue(false, for: characteristic)
     }
-    
+
+    // `throws` is required by the Nitro-generated HybridNativeBleNitroSpec protocol
+    // for all synchronous methods, even though this implementation never throws.
+    public func isSubscribedToCharacteristic(
+        deviceId: String,
+        serviceId: String,
+        characteristicId: String
+    ) throws -> Bool {
+        guard let characteristic = findCharacteristic(
+            deviceId: deviceId,
+            serviceId: serviceId,
+            characteristicId: characteristicId
+        ) else {
+            return false
+        }
+        return characteristic.isNotifying
+    }
+
     // MARK: - Helper Methods
     private func findPeripheral(by deviceId: String) -> CBPeripheral? {
         ensureCentralManager()
@@ -657,7 +719,7 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec {
         rssi: Double
     ) -> BLEDevice {
         let deviceId = peripheral.identifier.uuidString
-        let deviceName = peripheral.name ?? advertisementData[CBAdvertisementDataLocalNameKey] as? String ?? "Unknown"
+        let deviceName = advertisementData[CBAdvertisementDataLocalNameKey] as? String ?? peripheral.name ?? "Unknown"
         
         // Extract service UUIDs
         let serviceUUIDs = (advertisementData[CBAdvertisementDataServiceUUIDsKey] as? [CBUUID])?.map { $0.uuidString } ?? []

package/ios/BlePeripheralDelegate.swift

@@ -18,7 +18,14 @@ class BlePeripheralDelegate: NSObject, CBPeripheralDelegate {
     var disconnectEventCallback: ((String, Bool, String) -> Void)?
     var serviceDiscoveryCallback: ((Bool, String) -> Void)?
     var characteristicDiscoveryCallbacks: [String: (Bool, String) -> Void] = [:]
-    
+
+    // Full discovery (services + characteristics) callbacks and state
+    var fullDiscoveryCallbacks: [(Bool, String) -> Void] = []
+    var servicesDiscovered = false
+    var characteristicsDiscoveredCount = 0
+    var expectedCharacteristicsCount = 0
+    var characteristicDiscoveryError: String?
+
     // RSSI callback
     var rssiCallback: ((Bool, Double, String) -> Void)?
     
@@ -45,15 +52,34 @@ class BlePeripheralDelegate: NSObject, CBPeripheralDelegate {
     func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
         if let error = error {
             serviceDiscoveryCallback?(false, error.localizedDescription)
+            serviceDiscoveryCallback = nil
+            resolveFullDiscoveryCallbacks(success: false, error: error.localizedDescription)
+            return
+        }
+
+        servicesDiscovered = true
+
+        // Resolve service-only callback immediately
+        serviceDiscoveryCallback?(true, "")
+        serviceDiscoveryCallback = nil
+
+        // Trigger characteristic discovery only for services that still need it.
+        // CoreBluetooth may skip the didDiscoverCharacteristicsFor callback for
+        // services whose characteristics are already cached, which would leave the
+        // counter stuck below expectedCharacteristicsCount.
+        let services = peripheral.services ?? []
+        let undiscovered = services.filter { $0.characteristics == nil }
+
+        if undiscovered.isEmpty {
+            resolveFullDiscoveryCallbacks(success: true, error: "")
         } else {
-            serviceDiscoveryCallback?(true, "")
-            
-            // Automatically discover characteristics for all services
-            peripheral.services?.forEach { service in
+            expectedCharacteristicsCount = undiscovered.count
+            characteristicsDiscoveredCount = 0
+            characteristicDiscoveryError = nil
+            for service in undiscovered {
                 peripheral.discoverCharacteristics(nil, for: service)
             }
         }
-        serviceDiscoveryCallback = nil
     }
     
     func peripheral(
@@ -62,13 +88,27 @@ class BlePeripheralDelegate: NSObject, CBPeripheralDelegate {
         error: Error?
     ) {
         let serviceId = service.uuid.uuidString
-        
+
         if let error = error {
             characteristicDiscoveryCallbacks[serviceId]?(false, error.localizedDescription)
+            // Record the first error for the full discovery callback
+            if characteristicDiscoveryError == nil {
+                characteristicDiscoveryError = "Characteristic discovery failed for service \(serviceId): \(error.localizedDescription)"
+            }
         } else {
             characteristicDiscoveryCallbacks[serviceId]?(true, "")
         }
         characteristicDiscoveryCallbacks.removeValue(forKey: serviceId)
+
+        // Track full discovery progress
+        characteristicsDiscoveredCount += 1
+        if characteristicsDiscoveredCount >= expectedCharacteristicsCount {
+            if let discoveryError = characteristicDiscoveryError {
+                resolveFullDiscoveryCallbacks(success: false, error: discoveryError)
+            } else {
+                resolveFullDiscoveryCallbacks(success: true, error: "")
+            }
+        }
     }
     
     // MARK: - CBPeripheralDelegate - Characteristic Read
@@ -197,10 +237,23 @@ class BlePeripheralDelegate: NSObject, CBPeripheralDelegate {
     // MARK: - CBPeripheralDelegate - Connection Events
     
     func peripheral(_ peripheral: CBPeripheral, didModifyServices invalidatedServices: [CBService]) {
-        // Handle service modifications
-        // This might require re-discovery of services
+        resolveFullDiscoveryCallbacks(success: false, error: "Services were invalidated during discovery")
+        servicesDiscovered = false
+        characteristicsDiscoveredCount = 0
+        expectedCharacteristicsCount = 0
+        characteristicDiscoveryError = nil
     }
     
+    // MARK: - Full Discovery Helpers
+
+    private func resolveFullDiscoveryCallbacks(success: Bool, error: String) {
+        let callbacks = fullDiscoveryCallbacks
+        fullDiscoveryCallbacks.removeAll()
+        for callback in callbacks {
+            callback(success, error)
+        }
+    }
+
     func peripheralIsReady(toSendWriteWithoutResponse peripheral: CBPeripheral) {
         // Handle write without response ready state
         // Can be used to implement queuing for write operations
@@ -208,11 +261,17 @@ class BlePeripheralDelegate: NSObject, CBPeripheralDelegate {
     
     // MARK: - Cleanup
     func cleanup() {
+        // Reject in-flight discovery callbacks before clearing
+        resolveFullDiscoveryCallbacks(success: false, error: "Peripheral disconnected during discovery")
         // Clear all callbacks to prevent memory leaks
         connectionCallback = nil
         disconnectionCallback = nil
         disconnectEventCallback = nil
         serviceDiscoveryCallback = nil
+        servicesDiscovered = false
+        characteristicsDiscoveredCount = 0
+        expectedCharacteristicsCount = 0
+        characteristicDiscoveryError = nil
         characteristicDiscoveryCallbacks.removeAll()
         rssiCallback = nil
         readCallbacks.removeAll()

package/lib/commonjs/index.d.ts

@@ -1,3 +1,3 @@
-export { type ByteArray, type ScanFilter, type BLEDevice, type ScanCallback, type ManufacturerDataEntry, type ManufacturerData, type ConnectionCallback, type DisconnectEventCallback, type OperationCallback, type CharacteristicUpdateCallback, type Subscription, type AsyncSubscription, type BleNitroManagerOptions, BLEState, AndroidScanMode, BleNitroManager, } from "./manager";
+export { type ByteArray, type ScanFilter, type BLEDevice, type ScanCallback, type ManufacturerDataEntry, type ManufacturerData, type ConnectionCallback, type DisconnectEventCallback, type OperationCallback, type CharacteristicUpdateCallback, type Subscription, type AsyncSubscription, type BleNitroManagerOptions, BLEState, AndroidScanMode, BleNitroManager, BleTimeoutError, } from "./manager";
 export { BleNitro } from './singleton';
 //# sourceMappingURL=index.d.ts.map

package/lib/commonjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EACtB,KAAK,4BAA4B,EACjC,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,QAAQ,EACR,eAAe,EACf,eAAe,GAChB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,UAAU,EACf,KAAK,SAAS,EACd,KAAK,YAAY,EACjB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EACtB,KAAK,4BAA4B,EACjC,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,QAAQ,EACR,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}

package/lib/commonjs/index.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BleNitro = exports.BleNitroManager = exports.AndroidScanMode = exports.BLEState = void 0;
+exports.BleNitro = exports.BleTimeoutError = exports.BleNitroManager = exports.AndroidScanMode = exports.BLEState = void 0;
 var manager_1 = require("./manager");
 Object.defineProperty(exports, "BLEState", { enumerable: true, get: function () { return manager_1.BLEState; } });
 Object.defineProperty(exports, "AndroidScanMode", { enumerable: true, get: function () { return manager_1.AndroidScanMode; } });
 Object.defineProperty(exports, "BleNitroManager", { enumerable: true, get: function () { return manager_1.BleNitroManager; } });
+Object.defineProperty(exports, "BleTimeoutError", { enumerable: true, get: function () { return manager_1.BleTimeoutError; } });
 var singleton_1 = require("./singleton");
 Object.defineProperty(exports, "BleNitro", { enumerable: true, get: function () { return singleton_1.BleNitro; } });
 //# sourceMappingURL=index.js.map

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAiBmB;AAHjB,mGAAA,QAAQ,OAAA;AACR,0GAAA,eAAe,OAAA;AACf,0GAAA,eAAe,OAAA;AAGjB,yCAAuC;AAA9B,qGAAA,QAAQ,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAkBmB;AAJjB,mGAAA,QAAQ,OAAA;AACR,0GAAA,eAAe,OAAA;AACf,0GAAA,eAAe,OAAA;AACf,0GAAA,eAAe,OAAA;AAGjB,yCAAuC;AAA9B,qGAAA,QAAQ,OAAA"}

package/lib/commonjs/manager.d.ts

@@ -1,4 +1,7 @@
 import { BLEDevice as NativeBLEDevice, BLEState as NativeBLEState, AndroidScanMode as NativeAndroidScanMode } from './specs/NativeBleNitro';
+export declare class BleTimeoutError extends Error {
+    constructor(operation: string, ms: number);
+}
 export type ByteArray = number[];
 export interface ScanFilter {
     serviceUUIDs?: string[];
@@ -173,7 +176,10 @@ export declare class BleNitroManager {
      */
     getCharacteristics(deviceId: string, serviceId: string): string[];
     /**
-     * Get services and characteristics for a connected device
+     * Get services and characteristics for a connected device.
+     * Uses a native method that waits for both service and characteristic
+     * discovery to complete before reading, avoiding the CoreBluetooth race
+     * where didDiscoverServices may not re-fire for cached services.
      * @param deviceId ID of the device
      * @returns Promise resolving to array of service and characteristic UUIDs
      * @see getServices
@@ -183,6 +189,8 @@ export declare class BleNitroManager {
         uuid: string;
         characteristics: string[];
     }[]>;
+    private static readonly DISCOVERY_TIMEOUT_MS;
+    private _discoverServicesWithCharacteristics;
     /**
      * Read a characteristic value
      * @param deviceId ID of the device
@@ -218,6 +226,14 @@ export declare class BleNitroManager {
      * @returns Promise resolving when unsubscription is complete
      */
     unsubscribeFromCharacteristic(deviceId: string, serviceId: string, characteristicId: string): Promise<void>;
+    /**
+     * Check if currently subscribed to a characteristic's notifications
+     * @param deviceId ID of the device
+     * @param serviceId ID of the service
+     * @param characteristicId ID of the characteristic
+     * @returns Boolean indicating if subscribed to notifications
+     */
+    isSubscribedToCharacteristic(deviceId: string, serviceId: string, characteristicId: string): boolean;
     /**
      * Check if Bluetooth is enabled
      * @returns returns Boolean according to Bluetooth state

package/lib/commonjs/manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manager.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,SAAS,IAAI,eAAe,EAC5B,QAAQ,IAAI,cAAc,EAE1B,eAAe,IAAI,qBAAqB,EACzC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;AAEjC,MAAM,WAAW,UAAU;IACzB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAED,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,qBAAqB,EAAE,CAAC;CAC7C;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;AACvD,MAAM,MAAM,oBAAoB,GAAG,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;AAC/E,MAAM,MAAM,kBAAkB,GAAG,CAC/B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,KACV,IAAI,CAAC;AACV,MAAM,MAAM,uBAAuB,GAAG,CACpC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,OAAO,EACpB,KAAK,EAAE,MAAM,KACV,IAAI,CAAC;AACV,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;AAC1E,MAAM,MAAM,4BAA4B,GAAG,CACzC,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,SAAS,KACZ,IAAI,CAAC;AAEV,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B,CAAA;AAED,oBAAY,QAAQ;IAClB,OAAO,YAAY;IACnB,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,aAAa,kBAAkB;CAChC;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC,CAAC;AAEF,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,cAAc,GAAG,QAAQ,CAUjF;AAED,wBAAgB,yCAAyC,CAAC,QAAQ,EAAE,eAAe,GAAG,qBAAqB,CAQ1G;AAED,wBAAgB,iCAAiC,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,CAW7F;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,CAErE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,SAAS,GAAG,WAAW,CAEnE;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,WAAW,CAAkB;IAErC,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,uBAAuB,CAAuB;IAEtD,OAAO,CAAC,QAAQ,CAAiB;gBAErB,OAAO,CAAC,EAAE,sBAAsB;IAM5C,OAAO,CAAC,4BAA4B;IAUpC;;;;;OAKG;IACI,WAAW,IAAI,IAAI;IAI1B;;;;OAIG;IACI,eAAe,CAAC,QAAQ,EAAE,oBAAoB;IASrD;;;;;OAKG;WACW,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;WAcvC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAI3D;;;;;OAKG;IACI,SAAS,CACd,MAAM,EAAE,UAAU,YAAK,EACvB,QAAQ,EAAE,YAAY,EACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAChC,IAAI;IA+BP;;;OAGG;IACI,QAAQ,IAAI,IAAI;IASvB;;;OAGG;IACI,UAAU,IAAI,OAAO;IAK5B;;;;OAIG;IACI,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE;IAM5D;;;;;OAKG;IACI,OAAO,CACZ,QAAQ,EAAE,MAAM,EAChB,YAAY,CAAC,EAAE,uBAAuB,EACtC,kBAAkB,CAAC,EAAE,OAAO,GAC3B,OAAO,CAAC,MAAM,CAAC;IAyBlB;;;;;OAKG;IACI,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,uBAAuB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IA2BzM;;;;OAIG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBpD;;;;OAIG;IACI,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAI7C;;;;;OAKG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAMxD;;;;OAIG;IACI,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqBlD;;;;OAIG;IACI,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB3D;;;;OAIG;IACI,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBvD;;;;;OAKG;IACI,kBAAkB,CACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,MAAM,EAAE;IAYX;;;;;;OAMG;IACU,8BAA8B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAC;IAWrH;;;;;;OAMG;IACI,kBAAkB,CACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,CAAC;IAuBrB;;;;;;;;OAQG;IACI,mBAAmB,CACxB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,SAAS,EACf,YAAY,GAAE,OAAc,GAC3B,OAAO,CAAC,SAAS,CAAC;IA2BrB;;;;;;;OAOG;IACU,yBAAyB,CACpC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC,iBAAiB,CAAC;IAqC7B;;;;;;OAMG;IACI,6BAA6B,CAClC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC;IAuBhB;;;OAGG;IACI,kBAAkB,IAAI,OAAO;IAIpC;;;OAGG;IACI,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAcjD;;;;OAIG;IACI,KAAK,IAAI,QAAQ;IAIxB;;;;;;OAMG;IACI,sBAAsB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,EAAE,WAAW,UAAQ,GAAG,YAAY;IAiBrG;;;OAGG;IACI,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAGrC"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manager.ts"],"names":[],"mappings":"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"}

package/lib/commonjs/manager.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BleNitroManager = exports.AndroidScanMode = exports.BLEState = void 0;
+exports.BleNitroManager = exports.AndroidScanMode = exports.BLEState = exports.BleTimeoutError = void 0;
 exports.mapNativeBLEStateToBLEState = mapNativeBLEStateToBLEState;
 exports.mapAndroidScanModeToNativeAndroidScanMode = mapAndroidScanModeToNativeAndroidScanMode;
 exports.convertNativeBleDeviceToBleDevice = convertNativeBleDeviceToBleDevice;
@@ -11,6 +11,20 @@ exports.arrayBufferToByteArray = arrayBufferToByteArray;
 exports.byteArrayToArrayBuffer = byteArrayToArrayBuffer;
 const NativeBleNitroFactory_1 = __importDefault(require("./specs/NativeBleNitroFactory"));
 const NativeBleNitro_1 = require("./specs/NativeBleNitro");
+class BleTimeoutError extends Error {
+    constructor(operation, ms) {
+        super(`${operation} timed out after ${ms}ms`);
+        this.name = 'BleTimeoutError';
+    }
+}
+exports.BleTimeoutError = BleTimeoutError;
+function withTimeout(promise, ms, operation) {
+    let timer;
+    const timeout = new Promise((_, reject) => {
+        timer = setTimeout(() => reject(new BleTimeoutError(operation, ms)), ms);
+    });
+    return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
 var BLEState;
 (function (BLEState) {
     BLEState["Unknown"] = "Unknown";
@@ -372,21 +386,39 @@ class BleNitroManager {
         return BleNitroManager.normalizeGattUUIDs(characteristics);
     }
     /**
-     * Get services and characteristics for a connected device
+     * Get services and characteristics for a connected device.
+     * Uses a native method that waits for both service and characteristic
+     * discovery to complete before reading, avoiding the CoreBluetooth race
+     * where didDiscoverServices may not re-fire for cached services.
      * @param deviceId ID of the device
      * @returns Promise resolving to array of service and characteristic UUIDs
      * @see getServices
      * @see getCharacteristics
      */
     async getServicesWithCharacteristics(deviceId) {
-        await this.discoverServices(deviceId);
-        const services = await this.getServices(deviceId);
-        return services.map((service) => {
-            return {
-                uuid: service,
-                characteristics: this.getCharacteristics(deviceId, service),
-            };
+        await this._discoverServicesWithCharacteristics(deviceId);
+        const services = this.Instance.getServices(deviceId);
+        return BleNitroManager.normalizeGattUUIDs(services).map((service) => ({
+            uuid: service,
+            characteristics: this.getCharacteristics(deviceId, service),
+        }));
+    }
+    _discoverServicesWithCharacteristics(deviceId) {
+        const inner = new Promise((resolve, reject) => {
+            if (!this.isConnected(deviceId)) {
+                reject(new Error('Device not connected'));
+                return;
+            }
+            this.Instance.discoverServicesWithCharacteristics(deviceId, (success, error) => {
+                if (success) {
+                    resolve();
+                }
+                else {
+                    reject(new Error(error));
+                }
+            });
         });
+        return withTimeout(inner, BleNitroManager.DISCOVERY_TIMEOUT_MS, 'discoverServicesWithCharacteristics');
     }
     /**
      * Read a characteristic value
@@ -495,6 +527,18 @@ class BleNitroManager {
             });
         });
     }
+    /**
+     * Check if currently subscribed to a characteristic's notifications
+     * @param deviceId ID of the device
+     * @param serviceId ID of the service
+     * @param characteristicId ID of the characteristic
+     * @returns Boolean indicating if subscribed to notifications
+     */
+    isSubscribedToCharacteristic(deviceId, serviceId, characteristicId) {
+        // No isConnected guard — both native implementations already return false
+        // for disconnected devices, and an extra check would introduce a TOCTOU race.
+        return this.Instance.isSubscribedToCharacteristic(deviceId, BleNitroManager.normalizeGattUUID(serviceId), BleNitroManager.normalizeGattUUID(characteristicId));
+    }
     /**
      * Check if Bluetooth is enabled
      * @returns returns Boolean according to Bluetooth state
@@ -556,4 +600,5 @@ class BleNitroManager {
     }
 }
 exports.BleNitroManager = BleNitroManager;
+BleNitroManager.DISCOVERY_TIMEOUT_MS = 30000;
 //# sourceMappingURL=manager.js.map