@onekeyfe/react-native-ble-utils 0.1.4 → 0.1.6

package/android/src/main/java/so/onekey/lib/ble/utils/BleUtilsModule.kt

@@ -192,9 +192,19 @@ class BleUtilsModule(private val reactContext: ReactApplicationContext) :
       return
     }
 
+    val wantedServiceUuids = HashSet<String>()
+    if (serviceUUIDs != null) {
+      for (i in 0 until serviceUUIDs.size()) {
+        serviceUUIDs.getString(i)?.let { wantedServiceUuids.add(it.lowercase()) }
+      }
+    }
+
     val peripherals: List<BluetoothDevice> =
       getBluetoothManager()?.getConnectedDevices(GATT) ?: emptyList()
     for (entry in peripherals) {
+      if (wantedServiceUuids.isNotEmpty() && !deviceExposesService(entry, wantedServiceUuids)) {
+        continue
+      }
       val peripheral = Peripheral(entry)
       val jsonBundle: WritableMap = peripheral.asWritableMap()
       map.pushMap(jsonBundle)
@@ -202,6 +212,16 @@ class BleUtilsModule(private val reactContext: ReactApplicationContext) :
     callback.invoke(null, map)
   }
 
+  @SuppressLint("MissingPermission")
+  private fun deviceExposesService(
+    device: BluetoothDevice,
+    wantedServiceUuids: Set<String>
+  ): Boolean {
+    val uuids = device.uuids
+    if (uuids.isNullOrEmpty()) return true
+    return uuids.any { wantedServiceUuids.contains(it.uuid.toString().lowercase()) }
+  }
+
   private class MyBroadcastReceiver(private val module: BleUtilsModule) : BroadcastReceiver() {
     @SuppressLint("MissingPermission")
     override fun onReceive(context: Context, intent: Intent) {

package/android/src/main/java/so/onekey/lib/ble/utils/data/Peripheral.kt

@@ -26,6 +26,10 @@ class Peripheral(
       advertising.putBoolean("isConnectable", true)
 
       map.putMap("advertising", advertising)
+
+      val serviceUUIDs = Arguments.createArray()
+      device.uuids?.forEach { serviceUUIDs.pushString(it.uuid.toString()) }
+      map.putArray("serviceUUIDs", serviceUUIDs)
     } catch (e: Exception) { // this shouldn't happen
       Log.e("BleUtils", "Unexpected error on asWritableMap", e)
     }

package/dist/commonjs/index.js

@@ -52,7 +52,7 @@ class BleUtils {
 
   /**
    *
-   * @param serviceUUIDs [optional] not used on android, optional on ios.
+   * @param serviceUUIDs [optional] filter by service UUID (android + ios); empty = no filter.
    * @returns
    */
   getConnectedPeripherals(serviceUUIDs = []) {

package/dist/module/index.js

@@ -48,7 +48,7 @@ class BleUtils {
 
   /**
    *
-   * @param serviceUUIDs [optional] not used on android, optional on ios.
+   * @param serviceUUIDs [optional] filter by service UUID (android + ios); empty = no filter.
    * @returns
    */
   getConnectedPeripherals(serviceUUIDs = []) {

package/dist/typescript/commonjs/src/index.d.ts

@@ -16,7 +16,7 @@ declare class BleUtils {
     pairDevice(macAddress: string): Promise<PairDeviceResult>;
     /**
      *
-     * @param serviceUUIDs [optional] not used on android, optional on ios.
+     * @param serviceUUIDs [optional] filter by service UUID (android + ios); empty = no filter.
      * @returns
      */
     getConnectedPeripherals(serviceUUIDs?: string[]): Promise<Peripheral[]>;

package/dist/typescript/commonjs/src/type.d.ts

@@ -32,6 +32,7 @@ export interface Peripheral {
     name?: string;
     advertising: AdvertisingData;
     bondState: BondState;
+    serviceUUIDs?: string[];
 }
 export interface BondState {
     state: string;

package/dist/typescript/commonjs/src/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/type.ts"],"names":[],"mappings":"AAAA;;;KAGK;AACL,oBAAY,QAAQ;IAClB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B;;OAEG;IACH,YAAY,iBAAiB;IAC7B,EAAE,OAAO;IACT,GAAG,QAAQ;IACX;;OAEG;IACH,SAAS,eAAe;IACxB;;OAEG;IACH,UAAU,gBAAgB;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,eAAe,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/type.ts"],"names":[],"mappings":"AAAA;;;KAGK;AACL,oBAAY,QAAQ;IAClB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B;;OAEG;IACH,YAAY,iBAAiB;IAC7B,EAAE,OAAO;IACT,GAAG,QAAQ;IACX;;OAEG;IACH,SAAS,eAAe;IACxB;;OAEG;IACH,UAAU,gBAAgB;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,eAAe,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}

package/dist/typescript/module/src/index.d.ts

@@ -16,7 +16,7 @@ declare class BleUtils {
     pairDevice(macAddress: string): Promise<PairDeviceResult>;
     /**
      *
-     * @param serviceUUIDs [optional] not used on android, optional on ios.
+     * @param serviceUUIDs [optional] filter by service UUID (android + ios); empty = no filter.
      * @returns
      */
     getConnectedPeripherals(serviceUUIDs?: string[]): Promise<Peripheral[]>;

package/dist/typescript/module/src/type.d.ts

@@ -32,6 +32,7 @@ export interface Peripheral {
     name?: string;
     advertising: AdvertisingData;
     bondState: BondState;
+    serviceUUIDs?: string[];
 }
 export interface BondState {
     state: string;

package/dist/typescript/module/src/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/type.ts"],"names":[],"mappings":"AAAA;;;KAGK;AACL,oBAAY,QAAQ;IAClB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B;;OAEG;IACH,YAAY,iBAAiB;IAC7B,EAAE,OAAO;IACT,GAAG,QAAQ;IACX;;OAEG;IACH,SAAS,eAAe;IACxB;;OAEG;IACH,UAAU,gBAAgB;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,eAAe,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../src/type.ts"],"names":[],"mappings":"AAAA;;;KAGK;AACL,oBAAY,QAAQ;IAClB;;OAEG;IACH,OAAO,YAAY;IACnB;;OAEG;IACH,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B;;OAEG;IACH,YAAY,iBAAiB;IAC7B,EAAE,OAAO;IACT,GAAG,QAAQ;IACX;;OAEG;IACH,SAAS,eAAe;IACxB;;OAEG;IACH,UAAU,gBAAgB;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,eAAe,CAAC;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB"}

package/ios/BleUtils.swift

@@ -14,7 +14,14 @@ class BleUtilsModule: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate {
 
     override init() {
       super.init()
-      manager = CBCentralManager(delegate: self, queue: nil)
+      // Lazy CBCentralManager: avoid triggering iOS BT dialog on module init.
+    }
+
+    private func ensureManager() -> CBCentralManager {
+      if let m = manager { return m }
+      let m = CBCentralManager(delegate: self, queue: nil)
+      manager = m
+      return m
     }
 
     func centralManagerDidUpdateState(_ central: CBCentralManager) {
@@ -28,13 +35,12 @@ class BleUtilsModule: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate {
     }
 
     @objc public func checkState(_ callback: @escaping RCTResponseSenderBlock) {
-        if let manager = manager {
-            if manager.state == .unknown {
-                stateChangedCallbacks.append(callback)
-            } else {
-                let stateName = Helper.centralManagerStateToString(manager.state)
-                callback([stateName])
-            }
+        let manager = ensureManager()
+        if manager.state == .unknown {
+            stateChangedCallbacks.append(callback)
+        } else {
+            let stateName = Helper.centralManagerStateToString(manager.state)
+            callback([stateName])
         }
     }
 
@@ -49,7 +55,7 @@ class BleUtilsModule: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate {
 
         var connectedPeripherals: [Peripheral] = []
 
-        let connectedCBPeripherals: [CBPeripheral] = manager?.retrieveConnectedPeripherals(withServices: serviceUUIDs) ?? []
+        let connectedCBPeripherals: [CBPeripheral] = ensureManager().retrieveConnectedPeripherals(withServices: serviceUUIDs)
 
         serialQueue.sync {
             for ph in connectedCBPeripherals {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-ble-utils",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "ble uilts",
   "source": "./src/index.tsx",
   "main": "./dist/commonjs/index.js",

package/src/index.ts

@@ -57,7 +57,7 @@ class BleUtils {
 
   /**
    *
-   * @param serviceUUIDs [optional] not used on android, optional on ios.
+   * @param serviceUUIDs [optional] filter by service UUID (android + ios); empty = no filter.
    * @returns
    */
   getConnectedPeripherals(serviceUUIDs: string[] = []) {

package/src/type.ts

@@ -33,6 +33,7 @@ export interface Peripheral {
   name?: string;
   advertising: AdvertisingData;
   bondState: BondState;
+  serviceUUIDs?: string[];
 }
 
 export interface BondState {