react-native-ble-nitro 1.6.0 → 1.7.0

package/src/__tests__/index.test.ts

@@ -1,31 +1,34 @@
 // Mock the native module import
+const mockNativeInstance = {
+  setRestoreStateCallback: jest.fn(),
+  startScan: jest.fn(),
+  stopScan: jest.fn(),
+  isScanning: jest.fn(),
+  connect: jest.fn(),
+  disconnect: jest.fn(),
+  isConnected: jest.fn(),
+  requestMTU: jest.fn(),
+  readRSSI: jest.fn(),
+  discoverServices: jest.fn(),
+  getServices: jest.fn(),
+  getCharacteristics: jest.fn(),
+  readCharacteristic: jest.fn(),
+  writeCharacteristic: jest.fn(),
+  subscribeToCharacteristic: jest.fn(),
+  unsubscribeFromCharacteristic: jest.fn(),
+  getConnectedDevices: jest.fn(),
+  requestBluetoothEnable: jest.fn(),
+  state: jest.fn(),
+  subscribeToStateChange: jest.fn(),
+  unsubscribeFromStateChange: jest.fn(),
+  openSettings: jest.fn(),
+  restoreStateIdentifier: null,
+};
+
 jest.mock('../specs/NativeBleNitro', () => ({
   __esModule: true,
-  default: {
-    setRestoreStateCallback: jest.fn(),
-    startScan: jest.fn(),
-    stopScan: jest.fn(),
-    isScanning: jest.fn(),
-    connect: jest.fn(),
-    disconnect: jest.fn(),
-    isConnected: jest.fn(),
-    requestMTU: jest.fn(),
-    readRSSI: jest.fn(),
-    discoverServices: jest.fn(),
-    getServices: jest.fn(),
-    getCharacteristics: jest.fn(),
-    readCharacteristic: jest.fn(),
-    writeCharacteristic: jest.fn(),
-    subscribeToCharacteristic: jest.fn(),
-    unsubscribeFromCharacteristic: jest.fn(),
-    getConnectedDevices: jest.fn(),
-    requestBluetoothEnable: jest.fn(),
-    state: jest.fn(),
-    subscribeToStateChange: jest.fn(),
-    unsubscribeFromStateChange: jest.fn(),
-    openSettings: jest.fn(),
-  },
-  BLEState: { 
+  default: mockNativeInstance,
+  BLEState: {
     Unknown: 0,
     Resetting: 1,
     Unsupported: 2,
@@ -41,10 +44,17 @@ jest.mock('../specs/NativeBleNitro', () => ({
   },
 }));
 
+jest.mock('../specs/NativeBleNitroFactory', () => ({
+  __esModule: true,
+  default: {
+    create: jest.fn(() => mockNativeInstance),
+  },
+}));
+
 import { BleNitro } from '../index';
 
 // Get reference to the mocked module
-const mockNative = require('../specs/NativeBleNitro').default; // eslint-disable-line @typescript-eslint/no-var-requires
+const mockNative = mockNativeInstance;
 
 // Get BLE instance
 const BleManager = BleNitro.instance();

package/src/index.ts

@@ -1,5 +1,3 @@
-import { BleNitroManager } from "./manager";
-
 export {
   type ByteArray,
   type ScanFilter,
@@ -12,19 +10,10 @@ export {
   type OperationCallback,
   type CharacteristicUpdateCallback,
   type Subscription,
-  type BleNitroManager,
   type BleNitroManagerOptions,
   BLEState,
   AndroidScanMode,
+  BleNitroManager,
 } from "./manager";
 
-let _instance: BleNitroManager;
-
-export class BleNitro extends BleNitroManager {
-  public static instance() {
-    if (!_instance) {
-      _instance = new BleNitro();
-    }
-    return _instance;
-  }
-}
+export { BleNitro } from './singleton';

package/src/manager.ts

@@ -1,4 +1,4 @@
-import BleNitroNative from './specs/NativeBleNitro';
+import BleNitroNativeFactory, { NativeBleNitro } from './specs/NativeBleNitroFactory';
 import {
   ScanFilter as NativeScanFilter,
   BLEDevice as NativeBLEDevice,
@@ -32,6 +32,7 @@ export interface BLEDevice {
   manufacturerData: ManufacturerData;
   serviceUUIDs: string[];
   isConnectable: boolean;
+  isConnected: boolean;
 }
 
 export type ScanCallback = (device: BLEDevice) => void;
@@ -73,6 +74,7 @@ export enum AndroidScanMode {
 }
 
 export type BleNitroManagerOptions = {
+  restoreIdentifier?: string;
   onRestoredState?: RestoreStateCallback;
 };
 
@@ -123,16 +125,24 @@ export class BleNitroManager {
   private _isScanning: boolean = false;
   private _connectedDevices: { [deviceId: string]: boolean } = {};
 
-  private _restoredStateCallback: RestoreStateCallback | null = null;
+  private _restoredStateCallback: RestoreStateCallback | null;
   private _restoredState: BLEDevice[] | null = null;
+  private _restoreStateIdentifier: string | null = null;
+
+  private Instance: NativeBleNitro;
 
   constructor(options?: BleNitroManagerOptions) {
-    this._restoredStateCallback = options?.onRestoredState || null;
-    BleNitroNative.setRestoreStateCallback((peripherals: NativeBLEDevice[]) => this.onNativeRestoreStateCallback(peripherals));
+    this._restoredStateCallback = options?.onRestoredState ?? null;
+    this._restoreStateIdentifier = options?.restoreIdentifier ?? null;
+    this.Instance = BleNitroNativeFactory.create(options?.restoreIdentifier, (peripherals: NativeBLEDevice[]) => this.onNativeRestoreStateCallback(peripherals));
   }
 
   private onNativeRestoreStateCallback(peripherals: NativeBLEDevice[]) {
+    if (!this._restoreStateIdentifier) return;
     const bleDevices = peripherals.map((peripheral) => convertNativeBleDeviceToBleDevice(peripheral));
+    bleDevices.forEach((device) => {
+      this._connectedDevices[device.id] = device.isConnected;
+    });
     if (this._restoredStateCallback) {
       this._restoredStateCallback(bleDevices);
     } else {
@@ -140,7 +150,13 @@ export class BleNitroManager {
     }
   }
 
+  /**
+   * 
+   * 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!
+   */
   public onRestoredState(callback: RestoreStateCallback) {
+    if (!this._restoreStateIdentifier) return;
     if (this._restoredState) {
       callback(this._restoredState);
       this._restoredState = null;
@@ -209,7 +225,7 @@ export class BleNitroManager {
     };
 
     // Start scan
-    BleNitroNative.startScan(nativeFilter, scanCallback);
+    this.Instance.startScan(nativeFilter, scanCallback);
     this._isScanning = true;
   }
 
@@ -222,7 +238,7 @@ export class BleNitroManager {
       return;
     }
 
-    BleNitroNative.stopScan();
+    this.Instance.stopScan();
     this._isScanning = false;
   }
 
@@ -231,7 +247,7 @@ export class BleNitroManager {
    * @returns Boolean indicating if currently scanning
    */
   public isScanning(): boolean {
-    this._isScanning = BleNitroNative.isScanning();
+    this._isScanning = this.Instance.isScanning();
     return this._isScanning;
   }
 
@@ -241,7 +257,7 @@ export class BleNitroManager {
    * @returns Array of connected devices
    */
   public getConnectedDevices(services?: string[]): BLEDevice[] {
-    const devices = BleNitroNative.getConnectedDevices(services || []);
+    const devices = this.Instance.getConnectedDevices(services || []);
     // Normalize service UUIDs - manufacturer data already comes as ArrayBuffers
     return devices.map(device => convertNativeBleDeviceToBleDevice(device));
   }
@@ -264,7 +280,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.connect(
+      this.Instance.connect(
         deviceId,
         (success: boolean, connectedDeviceId: string, error: string) => {
           if (success) {
@@ -330,7 +346,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.disconnect(
+      this.Instance.disconnect(
         deviceId,
         (success: boolean, error: string) => {
           if (success) {
@@ -350,7 +366,7 @@ export class BleNitroManager {
    * @returns Boolean indicating if device is connected
    */
   public isConnected(deviceId: string): boolean {
-    return BleNitroNative.isConnected(deviceId);
+    return this.Instance.isConnected(deviceId);
   }
 
   /**
@@ -361,7 +377,7 @@ export class BleNitroManager {
    */
   public requestMTU(deviceId: string, mtu: number): number {
     mtu = parseInt(mtu.toString(), 10);
-    const deviceMtu = BleNitroNative.requestMTU(deviceId, mtu);
+    const deviceMtu = this.Instance.requestMTU(deviceId, mtu);
     return deviceMtu;
   }
 
@@ -378,7 +394,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.readRSSI(
+      this.Instance.readRSSI(
         deviceId,
         (success: boolean, rssi: number, error: string) => {
           if (success) {
@@ -404,7 +420,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.discoverServices(
+      this.Instance.discoverServices(
         deviceId,
         (success: boolean, error: string) => {
           if (success) {
@@ -435,7 +451,7 @@ export class BleNitroManager {
         reject(new Error('Failed to discover services'));
         return;
       }
-      const services = BleNitroNative.getServices(deviceId);
+      const services = this.Instance.getServices(deviceId);
       resolve(BleNitroManager.normalizeGattUUIDs(services));
     });
   }
@@ -454,7 +470,7 @@ export class BleNitroManager {
       throw new Error('Device not connected');
     }
 
-    const characteristics = BleNitroNative.getCharacteristics(
+    const characteristics = this.Instance.getCharacteristics(
       deviceId,
       BleNitroManager.normalizeGattUUID(serviceId),
     );
@@ -498,7 +514,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.readCharacteristic(
+      this.Instance.readCharacteristic(
         deviceId,
         BleNitroManager.normalizeGattUUID(serviceId),
         BleNitroManager.normalizeGattUUID(characteristicId),
@@ -536,7 +552,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.writeCharacteristic(
+      this.Instance.writeCharacteristic(
         deviceId,
         BleNitroManager.normalizeGattUUID(serviceId),
         BleNitroManager.normalizeGattUUID(characteristicId),
@@ -576,7 +592,7 @@ export class BleNitroManager {
 
     let _success = false;
 
-    BleNitroNative.subscribeToCharacteristic(
+    this.Instance.subscribeToCharacteristic(
       deviceId,
       BleNitroManager.normalizeGattUUID(serviceId),
       BleNitroManager.normalizeGattUUID(characteristicId),
@@ -624,7 +640,7 @@ export class BleNitroManager {
         return;
       }
 
-      BleNitroNative.unsubscribeFromCharacteristic(
+      this.Instance.unsubscribeFromCharacteristic(
         deviceId,
         BleNitroManager.normalizeGattUUID(serviceId),
         BleNitroManager.normalizeGattUUID(characteristicId),
@@ -653,7 +669,7 @@ export class BleNitroManager {
    */
   public requestBluetoothEnable(): Promise<boolean> {
     return new Promise((resolve, reject) => {
-      BleNitroNative.requestBluetoothEnable(
+      this.Instance.requestBluetoothEnable(
         (success: boolean, error: string) => {
           if (success) {
             resolve(true);
@@ -671,7 +687,7 @@ export class BleNitroManager {
    * @see BLEState
    */
   public state(): BLEState {
-    return mapNativeBLEStateToBLEState(BleNitroNative.state());
+    return mapNativeBLEStateToBLEState(this.Instance.state());
   }
 
   /**
@@ -687,13 +703,13 @@ export class BleNitroManager {
         callback(state);
       }
 
-      BleNitroNative.subscribeToStateChange((nativeState: NativeBLEState) => {
+      this.Instance.subscribeToStateChange((nativeState: NativeBLEState) => {
         callback(mapNativeBLEStateToBLEState(nativeState));
       });
 
       return {
         remove: () => {
-          BleNitroNative.unsubscribeFromStateChange();
+          this.Instance.unsubscribeFromStateChange();
         },
       };
   }
@@ -703,6 +719,6 @@ export class BleNitroManager {
    * @returns Promise resolving when settings are opened
    */
   public openSettings(): Promise<void> {
-    return BleNitroNative.openSettings();
+    return this.Instance.openSettings();
   }
 }

package/src/singleton.ts

@@ -0,0 +1,17 @@
+import { BleNitroManager } from "./manager";
+
+let _instance: BleNitroManager;
+
+export class BleNitro extends BleNitroManager {
+  /**
+   * Get a singleton instance of BleNitro, will create one if it does not exist.
+   * Singleton implementation does not allow to use state restoration on iOS!
+   * @returns {BleNitroManager} An instance of BleNitro
+   */
+  public static instance(): BleNitroManager {
+    if (!_instance) {
+      _instance = new BleNitro();
+    }
+    return _instance;
+  }
+}

package/src/specs/NativeBleNitro.nitro.ts

@@ -29,6 +29,7 @@ export interface BLEDevice {
   manufacturerData: ManufacturerData;
   serviceUUIDs: string[];
   isConnectable: boolean;
+  isConnected: boolean;
 }
 
 export enum AndroidScanMode {
@@ -70,6 +71,7 @@ export type OperationResult = {
  */
 export interface NativeBleNitro extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
   // ios only
+  restoreStateIdentifier?: string;
   setRestoreStateCallback(callback: RestoreCallback): void;
 
   // Scanning operations

package/src/specs/NativeBleNitro.ts

@@ -1,8 +1,9 @@
 import { NitroModules } from 'react-native-nitro-modules';
-import type { NativeBleNitro } from './NativeBleNitro.nitro';
+import { NativeBleNitro } from './NativeBleNitro.nitro';
 
 // Export the native implementation
 const NativeBleNitroImpl = NitroModules.createHybridObject<NativeBleNitro>('NativeBleNitro');
 
+// export default NativeBleNitroImpl;
 export default NativeBleNitroImpl;
 export * from './NativeBleNitro.nitro';

package/src/specs/NativeBleNitroFactory.nitro.ts

@@ -0,0 +1,6 @@
+import { HybridObject } from "react-native-nitro-modules";
+import { BLEDevice, NativeBleNitro } from "./NativeBleNitro.nitro";
+
+export interface NativeBleNitroFactory extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
+  create(nativeRestoreStateIdentifier?: string, restoreStateCallback?: (peripherals: BLEDevice[]) => void): NativeBleNitro;
+}

package/src/specs/NativeBleNitroFactory.ts

@@ -0,0 +1,9 @@
+import { NitroModules } from 'react-native-nitro-modules';
+import { NativeBleNitroFactory } from './NativeBleNitroFactory.nitro';
+
+// Export the native implementation
+const NativeBleNitroFactoryImpl = NitroModules.createHybridObject<NativeBleNitroFactory>('NativeBleNitroFactory');
+
+// export default NativeBleNitroImpl;
+export default NativeBleNitroFactoryImpl;
+export * from './NativeBleNitro.nitro';