@onekeyfe/hd-transport-react-native 0.0.7 → 0.0.10

package/dist/BleManager.d.ts

@@ -8,4 +8,13 @@ export declare const getConnectedDeviceIds: (serviceUuids: string[]) => Promise<
     id: string;
     name: string | undefined;
 }[]>;
+export declare const getBondedDevices: () => Promise<{
+    isConnectable?: boolean | undefined;
+    localName?: string | undefined;
+    manufacturerData?: any;
+    serviceUUIDs?: string[] | undefined;
+    txPowerLevel?: number | undefined;
+    id: string;
+    name: string | undefined;
+}[]>;
 //# sourceMappingURL=BleManager.d.ts.map

package/dist/BleManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,YAEhC,CAAC;AAOF,eAAO,MAAM,qBAAqB,iBAAwB,MAAM,EAAE;;;;;;;;IAMjE,CAAC"}
+{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,oBAAoB,YAEhC,CAAC;AAOF,eAAO,MAAM,qBAAqB,iBAAwB,MAAM,EAAE;;;;;;;;IAMjE,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;IAM5B,CAAC"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EAIf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAA4B,MAAM,kBAAkB,CAAC;AAItE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAmBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;gBAE5B,OAAO,EAAE,gBAAgB;IAIrC,IAAI;IAEJ,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAoET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAkJpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA+C/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmDpE,IAAI;CAGL;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EAIf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAA4B,MAAM,kBAAkB,CAAC;AAItE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAmBjE,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;gBAE5B,OAAO,EAAE,gBAAgB;IAIrC,IAAI;IAEJ,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAoET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IA2JpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA+C/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAmDpE,IAAI;CAGL;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}

package/dist/index.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var reactNative = require('react-native');
 var buffer = require('buffer');
 var transport = require('@onekeyfe/hd-transport');
 var reactNativeBlePlx = require('react-native-ble-plx');
@@ -47,6 +48,13 @@ const getConnectedDeviceIds = (serviceUuids) => __awaiter(void 0, void 0, void 0
         return Object.assign({ id, name }, advertising);
     });
 });
+const getBondedDevices = () => __awaiter(void 0, void 0, void 0, function* () {
+    const peripherals = yield BleManager__default["default"].getBondedPeripherals();
+    return peripherals.map(peripheral => {
+        const { id, name, advertising = {} } = peripheral;
+        return Object.assign({ id, name }, advertising);
+    });
+});
 
 const PERMISSION_ERROR = 'Bluetooth required to be turned on';
 const LOCATION_ERROR = 'Device is not authorized to use BluetoothLE';
@@ -281,7 +289,7 @@ class ReactNativeBleTransport {
             if (!uuid) {
                 throw new Error('uuid is required');
             }
-            let device;
+            let device = null;
             if (transportCache[uuid]) {
                 console.log('@onekey/hd-ble-sdk transport not be released, will release: ', uuid);
                 yield this.release(uuid);
@@ -341,6 +349,13 @@ class ReactNativeBleTransport {
                     }
                 }
             }
+            if (reactNative.Platform.OS === 'android') {
+                const bondedDevices = yield getBondedDevices();
+                const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === (device === null || device === void 0 ? void 0 : device.id));
+                if (!hasBonded) {
+                    throw new Error('device is not bonded');
+                }
+            }
             yield device.discoverAllServicesAndCharacteristics();
             let infos = tryToGetConfiguration(device);
             let characteristics;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,9 +20,9 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.0.7",
+    "@onekeyfe/hd-transport": "^0.0.10",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "7be7677368fcb50f411891f009367424ea77df33"
+  "gitHead": "b1f3f06c56fda840f4e55f2d033f7b84f16e8873"
 }

package/src/BleManager.ts

@@ -16,3 +16,11 @@ export const getConnectedDeviceIds = async (serviceUuids: string[]) => {
     return { id, name, ...advertising };
   });
 };
+
+export const getBondedDevices = async () => {
+  const peripherals = await BleManager.getBondedPeripherals();
+  return peripherals.map(peripheral => {
+    const { id, name, advertising = {} } = peripheral;
+    return { id, name, ...advertising };
+  });
+};

package/src/index.ts

@@ -1,3 +1,4 @@
+import { Platform } from 'react-native';
 import { Buffer } from 'buffer';
 import transport, { COMMON_HEADER_SIZE } from '@onekeyfe/hd-transport';
 import {
@@ -7,7 +8,7 @@ import {
   Characteristic,
   ScanMode,
 } from 'react-native-ble-plx';
-import { initializeBleManager, getConnectedDeviceIds } from './BleManager';
+import { initializeBleManager, getConnectedDeviceIds, getBondedDevices } from './BleManager';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
   PERMISSION_ERROR,
@@ -155,7 +156,7 @@ export default class ReactNativeBleTransport {
       throw new Error('uuid is required');
     }
 
-    let device;
+    let device: Device | null = null;
 
     if (transportCache[uuid]) {
       /**
@@ -227,6 +228,15 @@ export default class ReactNativeBleTransport {
       }
     }
 
+    // check device is bonded
+    if (Platform.OS === 'android') {
+      const bondedDevices = await getBondedDevices();
+      const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === device?.id);
+      if (!hasBonded) {
+        throw new Error('device is not bonded');
+      }
+    }
+
     await device.discoverAllServicesAndCharacteristics();
     let infos = tryToGetConfiguration(device);
     let characteristics;