react-native-ble-nitro 1.5.0 → 1.7.0

package/README.md

@@ -73,6 +73,15 @@ import { BleNitro, BLEState, AndroidScanMode, type BLEDevice } from 'react-nativ
 
 // Get the singleton instance
 const ble = BleNitro.instance();
+
+// Use custom manager instance (e.g. for iOS state restoration)
+// It is recommended to create this instance in an extra file seperated from other BLE business logic for better fast-refresh support
+const ble = new BleNitroManager({
+  restoreStateIdentifier: 'my-unique-identifier',
+  onRestoreState: (peripherals) => {
+    console.log('Restored peripherals:', peripherals);
+  },
+});
 ```
 
 ### Complete API Reference
@@ -145,6 +154,21 @@ const deviceId = await ble.connect(deviceId, (deviceId, interrupted, error) => {
 // Connect without disconnect callback
 const deviceId = await ble.connect(deviceId);
 
+// You can also use findAndConnect to scan and connect in one step
+// This could be useful for reconnecting after app restart or when device was disconnected unexpectedly
+const deviceId = await ble.findAndConnect(deviceId, {
+  scanTimeout: 4000, // default 5000ms
+  onDisconnect: (deviceId, interrupted, error) => {
+    if (interrupted) {
+      console.log('Connection interrupted:', error);
+      // Handle unexpected disconnection (out of range, etc.)
+    } else {
+      console.log('Disconnected intentionally');
+      // Handle normal disconnection
+    }
+  }
+});
+
 // Disconnect from a device
 await ble.disconnect(deviceId);
 
@@ -185,6 +209,10 @@ const characteristics = ble.getCharacteristics(deviceId, serviceUUID);
 const characteristics1 = ble.getCharacteristics(deviceId, '180d'); // Short form
 const characteristics2 = ble.getCharacteristics(deviceId, '0000180d-0000-1000-8000-00805f9b34fb'); // Long form
 // Both work identically - conversion handled automatically
+
+// Get services with their characteristics
+const servicesWithCharacteristics = await ble.getServicesWithCharacteristics(deviceId);
+// Returns: [{ uuid: '0000180d-0000-1000-8000-00805f9b34fb', characteristics: ['00002a37-0000-1000-8000-00805f9b34fb', ...] }, ...]
 ```
 
 #### 📖 Reading Characteristics
@@ -256,7 +284,16 @@ const HEART_RATE_SERVICE = '180d';
 const HEART_RATE_MEASUREMENT = '2a37';
 
 // Connect and subscribe to heart rate
-const deviceId = await ble.connect(heartRateDeviceId);
+const autoConnectOnAndroid = true; // Optional: auto-reconnect on Android
+const deviceId = await ble.connect(
+  heartRateDeviceId,
+  (deviceId, interrupted, error) => {
+    console.log('Device got Disconnected');
+    console.log('Was Interrupted?', interrupted);
+    console.log('Error:', error);
+  },
+  autoConnectOnAndroid,
+);
 await ble.discoverServices(deviceId);
 
 const subscription = ble.subscribeToCharacteristic(
@@ -336,28 +373,35 @@ const fullUUIDs = BleNitro.normalizeGattUUIDs(['180d', '180f']);
 
 ### iOS Restore State
 
-There are two ways to handle state restoration on iOS:
+There is built-in support for iOS state restoration. You need to provide a unique identifier and a callback to handle restored peripherals. If no unique identifier is provided, state restoration is disabled.
 
-```typescript
-// Enable state restoration in BleNitro singleton
-const ble = BleNitro.instance();
-ble.onRestoreState((peripherals) => {
-  console.log('Restored peripherals:', peripherals);
-});
-```
+> [!CAUTION]
+> From 1.7.0 on you have to create your own instance of `BleNitroManager` if you want to use state restoration. The singleton `BleNitro.instance()` will not have state restoration enabled by default anymore.
 
 ```typescript
-// Or use BleNitroManager with options
-// This way you have to assure that only one instance of BleNitroManager is created and that you always use this instance.
-import { BleNitroManager, BLEDevice } from 'react-native-ble-nitro/manager';
+import { BleNitroManager, BLEDevice } from 'react-native-ble-nitro';
 
 const customBleInstance = new BleNitroManager({
+  restoreStateIdentifier: 'my-unique-identifier', // unique identifier for state restoration
   onRestoreState: (peripherals: BLEDevice[]) => {
     console.log('Restored peripherals:', peripherals);
+    // Handle restored peripherals
   }
 });
 ```
 
+<details>
+<summary><strong>Singleton Restore State before 1.7.0 (<= 1.6.0)</strong></summary>
+
+```typescript
+// Enable state restoration in BleNitro singleton
+const ble = BleNitro.instance();
+ble.onRestoreState((peripherals) => {
+  console.log('Restored peripherals:', peripherals);
+});
+```
+</details>
+
 ### TypeScript Types
 
 ```typescript

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

@@ -33,7 +33,10 @@ import java.util.concurrent.ConcurrentHashMap
  * This class provides the actual BLE functionality for Android devices
  */
 class BleNitroBleManager : HybridNativeBleNitroSpec() {
-    
+
+    // iOS-specific property (not used on Android)
+    override var restoreStateIdentifier: String? = null
+
     private var bluetoothAdapter: BluetoothAdapter? = null
     private var stateCallback: ((state: BLEState) -> Unit)? = null
     private var bluetoothStateReceiver: BroadcastReceiver? = null
@@ -207,7 +210,8 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
             rssi = scanResult.rssi.toDouble(),
             manufacturerData = manufacturerData,
             serviceUUIDs = serviceUUIDs,
-            isConnectable = true // Assume scannable devices are connectable
+            isConnectable = true, // Assume scannable devices are connectable
+            isConnected = false // Scanned devices are not yet connected
         )
     }
     
@@ -491,7 +495,8 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
                     rssi = 0.0, // RSSI not available for already connected devices
                     manufacturerData = ManufacturerData(companyIdentifiers = emptyArray()),
                     serviceUUIDs = emptyArray(), // Service UUIDs not available without service discovery
-                    isConnectable = true
+                    isConnectable = true,
+                    isConnected = true
                 )
             }.toTypedArray()
         } catch (e: Exception) {
@@ -503,7 +508,8 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
     override fun connect(
         deviceId: String,
         callback: (success: Boolean, deviceId: String, error: String) -> Unit,
-        disconnectCallback: ((deviceId: String, interrupted: Boolean, error: String) -> Unit)?
+        disconnectCallback: ((deviceId: String, interrupted: Boolean, error: String) -> Unit)?,
+        autoConnectAndroid: Boolean?
     ) {
         try {
             initializeBluetoothIfNeeded()
@@ -531,7 +537,8 @@ class BleNitroBleManager : HybridNativeBleNitroSpec() {
             // Connect to device
             val context = appContext
             if (context != null) {
-                val gatt = device.connectGatt(context, false, gattCallback)
+                val autoConnect = autoConnectAndroid ?: false
+                val gatt = device.connectGatt(context, autoConnect, gattCallback)
                 connectedDevices[deviceId] = gatt
             } else {
                 callback(false, deviceId, "Context not available")

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

@@ -0,0 +1,21 @@
+package com.margelo.nitro.co.zyke.ble
+
+import com.margelo.nitro.core.*
+
+/**
+ * Android Factory implementation for BLE Nitro Manager
+ * Creates BleNitroBleManager instances
+ *
+ * Note: restoreStateIdentifier and restoreStateCallback are iOS-specific
+ * and ignored on Android
+ */
+class BleNitroBleManagerFactory : HybridNativeBleNitroFactorySpec() {
+
+    override fun create(
+        nativeRestoreStateIdentifier: String?,
+        restoreStateCallback: ((peripherals: Array<BLEDevice>) -> Unit)?
+    ): HybridNativeBleNitroSpec {
+        // Ignore iOS-specific parameters on Android
+        return BleNitroBleManager()
+    }
+}

package/ios/BleNitroBleManager.swift

@@ -5,13 +5,10 @@ import NitroModules
  * iOS implementation of the BLE Nitro Manager
  * Implements the HybridNativeBleNitroSpec protocol for Core Bluetooth operations
  */
-public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleNitroSpec_protocol {
-    
-    // MARK: - Constants
-    private static let restoreStateIdentifier = "react-native-ble-nitro"
-    
+public class BleNitroBleManager: HybridNativeBleNitroSpec {
+
     // MARK: - Static Properties
-    private static var globalRestoreStateCallback: (([BLEDevice]) -> Void)?
+    internal static var globalRestoreStateCallback: (([BLEDevice]) -> Void)?
     
     // MARK: - Private Properties
     private var centralManager: CBCentralManager!
@@ -26,23 +23,30 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
     private var centralManagerDelegate: BleCentralManagerDelegate!
     
     // MARK: - Restore State Properties
-    private var restoreStateCallback: (([BLEDevice]) -> Void)?
+    internal var restoreStateCallback: (([BLEDevice]) -> Void)?
+
+    // MARK: - Public Properties (from spec)
+    public var restoreStateIdentifier: String? = nil
 
     // MARK: - Initialization
-    public override init() {
+    public init(restoreStateIdentifier: String? = nil, restoreStateCallback: (([BLEDevice]) -> Void)? = nil) {
+        self.restoreStateIdentifier = restoreStateIdentifier
+        self.restoreStateCallback = restoreStateCallback
         super.init()
         setupCentralManager()
     }
     
     private func setupCentralManager() {
         centralManagerDelegate = BleCentralManagerDelegate(manager: self)
-        
-        // Create options dictionary for central manager with fixed restore identifier
-        let options: [String: Any] = [
-            CBCentralManagerOptionRestoreIdentifierKey: BleNitroBleManager.restoreStateIdentifier
-        ]
-        
-        centralManager = CBCentralManager(delegate: centralManagerDelegate, queue: DispatchQueue.main, options: options)
+
+        // Create options dictionary for central manager with restore identifier if set
+        var options: [String: Any] = [:]
+        print("Restore Identifier: \(String(describing: restoreStateIdentifier))")
+        if let identifier = restoreStateIdentifier {
+            options[CBCentralManagerOptionRestoreIdentifierKey] = identifier
+        }
+
+        centralManager = CBCentralManager(delegate: centralManagerDelegate, queue: DispatchQueue.main, options: options.isEmpty ? nil : options)
     }
     
     
@@ -72,11 +76,9 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
     
     // MARK: - Restore State Management
     public func setRestoreStateCallback(callback: @escaping ([BLEDevice]) -> Void) throws {
-        print("🔄 setRestoreStateCallback called")
         // Set both static and instance variables
         BleNitroBleManager.globalRestoreStateCallback = callback
         self.restoreStateCallback = callback
-        print("🔄 Callback set successfully")
     }
     
     // MARK: - Scanning Operations
@@ -132,7 +134,8 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
                 rssi: 0, // RSSI not available for connected devices without explicit read
                 manufacturerData: ManufacturerData(companyIdentifiers: []), // Not available for connected devices
                 serviceUUIDs: peripheral.services?.map { $0.uuid.uuidString } ?? [],
-                isConnectable: true // Already connected, so it was connectable
+                isConnectable: true, // Already connected, so it was connectable
+                isConnected: true
             )
             connectedDevices.append(device)
         }
@@ -152,7 +155,8 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
                     rssi: 0,
                     manufacturerData: ManufacturerData(companyIdentifiers: []),
                     serviceUUIDs: peripheral.services?.map { $0.uuid.uuidString } ?? [],
-                    isConnectable: true
+                    isConnectable: true,
+                    isConnected: true
                 )
                 connectedDevices.append(device)
                 
@@ -177,7 +181,8 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
                         rssi: 0,
                         manufacturerData: ManufacturerData(companyIdentifiers: []),
                         serviceUUIDs: peripheral.services?.map { $0.uuid.uuidString } ?? [],
-                        isConnectable: true
+                        isConnectable: true,
+                        isConnected: true
                     )
                     connectedDevices.append(device)
                     
@@ -192,7 +197,7 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
     }
     
     // MARK: - Connection Management
-    public func connect(deviceId: String, callback: @escaping (Bool, String, String) -> Void, disconnectCallback: ((String, Bool, String) -> Void)?) throws {
+    public func connect(deviceId: String, callback: @escaping (Bool, String, String) -> Void, disconnectCallback: ((String, Bool, String) -> Void)?, autoConnectAndroid: Bool?) throws {
         // Find peripheral by identifier
         guard let peripheral = findPeripheral(by: deviceId) else {
             callback(false, "", "Peripheral not found")
@@ -507,7 +512,8 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
                     rssi: 0, // RSSI not available for restored peripherals
                     manufacturerData: ManufacturerData(companyIdentifiers: []),
                     serviceUUIDs: peripheral.services?.map { $0.uuid.uuidString } ?? [],
-                    isConnectable: true
+                    isConnectable: true,
+                    isConnected: peripheral.state == .connected
                 )
                 restoredDevices.append(device)
                 
@@ -634,7 +640,8 @@ public class BleNitroBleManager: HybridNativeBleNitroSpec_base, HybridNativeBleN
             rssi: rssi,
             manufacturerData: manufacturerData,
             serviceUUIDs: serviceUUIDs,
-            isConnectable: isConnectable
+            isConnectable: isConnectable,
+            isConnected: peripheral.state == .connected
         )
     }
     
@@ -719,6 +726,12 @@ class BleCentralManagerDelegate: NSObject, CBCentralManagerDelegate {
     }
     
     func centralManager(_ central: CBCentralManager, willRestoreState dict: [String: Any]) {
-        manager?.handleStateRestoration(dict)
+        // Only handle state restoration if restoreStateIdentifier is set and a callback is registered
+        guard let manager = manager,
+              manager.restoreStateIdentifier != nil,
+              (BleNitroBleManager.globalRestoreStateCallback != nil || manager.restoreStateCallback != nil) else {
+            return
+        }
+        manager.handleStateRestoration(dict)
     }
 }

package/ios/BleNitroBleManagerFactory.swift

@@ -0,0 +1,19 @@
+import Foundation
+import NitroModules
+
+/**
+ * iOS Factory implementation for BLE Nitro Manager
+ * Creates BleNitroBleManager instances with optional state restoration configuration
+ */
+public class BleNitroBleManagerFactory: HybridNativeBleNitroFactorySpec_base, HybridNativeBleNitroFactorySpec_protocol {
+
+    public func create(
+        nativeRestoreStateIdentifier: String?,
+        restoreStateCallback: (([BLEDevice]) -> Void)?
+    ) throws -> any HybridNativeBleNitroSpec {
+        return BleNitroBleManager(
+            restoreStateIdentifier: nativeRestoreStateIdentifier,
+            restoreStateCallback: restoreStateCallback
+        )
+    }
+}

package/lib/commonjs/index.d.ts

@@ -1,6 +1,3 @@
-import { 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 BleNitroManager, type BleNitroManagerOptions, BLEState, AndroidScanMode, } from "./manager";
-export declare class BleNitro extends BleNitroManager {
-    static instance(): BleNitroManager;
-}
+export { type ByteArray, type ScanFilter, type BLEDevice, type ScanCallback, type ManufacturerDataEntry, type ManufacturerData, type ConnectionCallback, type DisconnectEventCallback, type OperationCallback, type CharacteristicUpdateCallback, type Subscription, type BleNitroManagerOptions, BLEState, AndroidScanMode, BleNitroManager, } 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,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C,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,eAAe,EACpB,KAAK,sBAAsB,EAC3B,QAAQ,EACR,eAAe,GAChB,MAAM,WAAW,CAAC;AAInB,qBAAa,QAAS,SAAQ,eAAe;WAC7B,QAAQ;CAMvB"}
+{"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,sBAAsB,EAC3B,QAAQ,EACR,eAAe,EACf,eAAe,GAChB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC"}

package/lib/commonjs/index.js

@@ -1,18 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BleNitro = exports.AndroidScanMode = exports.BLEState = void 0;
-const manager_1 = require("./manager");
-var manager_2 = require("./manager");
-Object.defineProperty(exports, "BLEState", { enumerable: true, get: function () { return manager_2.BLEState; } });
-Object.defineProperty(exports, "AndroidScanMode", { enumerable: true, get: function () { return manager_2.AndroidScanMode; } });
-let _instance;
-class BleNitro extends manager_1.BleNitroManager {
-    static instance() {
-        if (!_instance) {
-            _instance = new BleNitro();
-        }
-        return _instance;
-    }
-}
-exports.BleNitro = BleNitro;
+exports.BleNitro = 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; } });
+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,uCAA4C;AAE5C,qCAgBmB;AAFjB,mGAAA,QAAQ,OAAA;AACR,0GAAA,eAAe,OAAA;AAGjB,IAAI,SAA0B,CAAC;AAE/B,MAAa,QAAS,SAAQ,yBAAe;IACpC,MAAM,CAAC,QAAQ;QACpB,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC7B,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAPD,4BAOC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,qCAgBmB;AAHjB,mGAAA,QAAQ,OAAA;AACR,0GAAA,eAAe,OAAA;AACf,0GAAA,eAAe,OAAA;AAGjB,yCAAuC;AAA9B,qGAAA,QAAQ,OAAA"}

package/lib/commonjs/manager.d.ts

@@ -20,6 +20,7 @@ export interface BLEDevice {
     manufacturerData: ManufacturerData;
     serviceUUIDs: string[];
     isConnectable: boolean;
+    isConnected: boolean;
 }
 export type ScanCallback = (device: BLEDevice) => void;
 export type RestoreStateCallback = (connectedPeripherals: BLEDevice[]) => void;
@@ -45,6 +46,7 @@ export declare enum AndroidScanMode {
     Opportunistic = "Opportunistic"
 }
 export type BleNitroManagerOptions = {
+    restoreIdentifier?: string;
     onRestoredState?: RestoreStateCallback;
 };
 export declare function mapNativeBLEStateToBLEState(nativeState: NativeBLEState): BLEState;
@@ -57,8 +59,15 @@ export declare class BleNitroManager {
     private _connectedDevices;
     private _restoredStateCallback;
     private _restoredState;
+    private _restoreStateIdentifier;
+    private Instance;
     constructor(options?: BleNitroManagerOptions);
     private onNativeRestoreStateCallback;
+    /**
+     *
+     * Registers callback and returns restored peripheral state in it. Not working from 1.7.x upwards for singleton implementation!
+     * @deprecated This method is deprecated and will be removed in 2.x, use onRestoredState option in BleNitroManageroptions instead!
+     */
     onRestoredState(callback: RestoreStateCallback): void;
     /**
      * Converts a 16- oder 32-Bit UUID to a 128-Bit UUID
@@ -72,17 +81,17 @@ export declare class BleNitroManager {
      * Start scanning for Bluetooth devices
      * @param filter Optional scan filter
      * @param callback Callback function called when a device is found
-     * @returns Promise resolving to success state
+     * @returns void
      */
     startScan(filter: ScanFilter | undefined, callback: ScanCallback, onError?: (error: string) => void): void;
     /**
      * Stop scanning for Bluetooth devices
-     * @returns Promise resolving to success state
+     * @returns void
      */
     stopScan(): void;
     /**
      * Check if currently scanning for devices
-     * @returns Promise resolving to scanning state
+     * @returns Boolean indicating if currently scanning
      */
     isScanning(): boolean;
     /**
@@ -95,9 +104,20 @@ export declare class BleNitroManager {
      * Connect to a Bluetooth device
      * @param deviceId ID of the device to connect to
      * @param onDisconnect Optional callback for disconnect events
-     * @returns Promise resolving when connected
+     * @returns Promise resolving deviceId when connected
      */
-    connect(deviceId: string, onDisconnect?: DisconnectEventCallback): Promise<string>;
+    connect(deviceId: string, onDisconnect?: DisconnectEventCallback, autoConnectAndroid?: boolean): Promise<string>;
+    /**
+     * Scans for a device and connects to it
+     * @param deviceId ID of the device to connect to
+     * @param scanTimeout Optional timeout for the scan in milliseconds (default: 5000ms)
+     * @returns Promise resolving deviceId when connected
+     */
+    findAndConnect(deviceId: string, options?: {
+        scanTimeout?: number;
+        autoConnectAndroid?: boolean;
+        onDisconnect?: DisconnectEventCallback;
+    }): Promise<string>;
     /**
      * Disconnect from a Bluetooth device
      * @param deviceId ID of the device to disconnect from
@@ -107,7 +127,7 @@ export declare class BleNitroManager {
     /**
      * Check if connected to a device
      * @param deviceId ID of the device to check
-     * @returns Promise resolving to connection state
+     * @returns Boolean indicating if device is connected
      */
     isConnected(deviceId: string): boolean;
     /**
@@ -139,15 +159,26 @@ export declare class BleNitroManager {
      * Get characteristics for a service
      * @param deviceId ID of the device
      * @param serviceId ID of the service
-     * @returns Promise resolving to array of characteristic UUIDs
+     * @returns array of characteristic UUIDs
      */
     getCharacteristics(deviceId: string, serviceId: string): string[];
+    /**
+     * Get services and characteristics for a connected device
+     * @param deviceId ID of the device
+     * @returns Promise resolving to array of service and characteristic UUIDs
+     * @see getServices
+     * @see getCharacteristics
+     */
+    getServicesWithCharacteristics(deviceId: string): Promise<{
+        uuid: string;
+        characteristics: string[];
+    }[]>;
     /**
      * Read a characteristic value
      * @param deviceId ID of the device
      * @param serviceId ID of the service
      * @param characteristicId ID of the characteristic
-     * @returns Promise resolving to the characteristic data as ArrayBuffer
+     * @returns Promise resolving to the characteristic data as ByteArray
      */
     readCharacteristic(deviceId: string, serviceId: string, characteristicId: string): Promise<ByteArray>;
     /**
@@ -166,7 +197,7 @@ export declare class BleNitroManager {
      * @param serviceId ID of the service
      * @param characteristicId ID of the characteristic
      * @param callback Callback function called when notification is received
-     * @returns Promise resolving when subscription is complete
+     * @returns Subscription
      */
     subscribeToCharacteristic(deviceId: string, serviceId: string, characteristicId: string, callback: CharacteristicUpdateCallback): Subscription;
     /**
@@ -179,7 +210,7 @@ export declare class BleNitroManager {
     unsubscribeFromCharacteristic(deviceId: string, serviceId: string, characteristicId: string): Promise<void>;
     /**
      * Check if Bluetooth is enabled
-     * @returns Promise resolving to Bluetooth state
+     * @returns returns Boolean according to Bluetooth state
      */
     isBluetoothEnabled(): boolean;
     /**
@@ -189,7 +220,7 @@ export declare class BleNitroManager {
     requestBluetoothEnable(): Promise<boolean>;
     /**
      * Get the current Bluetooth state
-     * @returns Promise resolving to Bluetooth state
+     * @returns Bluetooth state
      * @see BLEState
      */
     state(): BLEState;
@@ -197,7 +228,7 @@ export declare class BleNitroManager {
      * Subscribe to Bluetooth state changes
      * @param callback Callback function called when state changes
      * @param emitInitial Whether to emit initial state callback
-     * @returns Promise resolving when subscription is complete
+     * @returns Subscription
      * @see BLEState
      */
     subscribeToStateChange(callback: (state: BLEState) => void, emitInitial?: boolean): Subscription;

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

@@ -1 +1 @@
-{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../src/manager.ts"],"names":[],"mappings":"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"}