@onekeyfe/hd-transport-react-native 1.0.25 → 1.0.26

package/dist/BleManager.d.ts

@@ -1,21 +1,9 @@
-export declare const initializeBleManager: () => void;
-export declare const getConnectedDeviceIds: (serviceUuids: string[]) => Promise<{
-    isConnectable?: boolean | undefined;
-    localName?: string | undefined;
-    manufacturerData?: any;
-    serviceUUIDs?: string[] | undefined;
-    txPowerLevel?: number | undefined;
-    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;
-}[]>;
-export declare const refreshCache: (peripheralId: string) => Promise<void>;
+import { Peripheral } from '@onekeyfe/react-native-ble-utils';
+export declare const getConnectedDeviceIds: (serviceUuids: string[]) => Promise<Peripheral[]>;
+export declare const getBondedDevices: () => Promise<Peripheral[]>;
+export declare const pairDevice: (macAddress: string) => Promise<{
+    bonded: boolean;
+    bonding: boolean;
+}>;
+export declare const onDeviceBondState: (bleMacAddress: string) => Promise<Peripheral | 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;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;IAM5B,CAAC;AAEF,eAAO,MAAM,YAAY,iBAAwB,MAAM,kBAStD,CAAC"}
+{"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAWxE,eAAO,MAAM,qBAAqB,iBAAkB,MAAM,EAAE,0BACZ,CAAC;AAEjD,eAAO,MAAM,gBAAgB,6BAAwC,CAAC;AAEtE,eAAO,MAAM,UAAU,eAAgB,MAAM;;;EAAoC,CAAC;AAElF,eAAO,MAAM,iBAAiB,kBAAmB,MAAM,KAAG,QAAQ,UAAU,GAAG,SAAS,CAmCpF,CAAC"}

package/dist/BleTransport.d.ts

@@ -1,4 +1,4 @@
-import { Device, Characteristic } from '@onekeyfe/react-native-ble-plx';
+import { Device, Characteristic } from 'react-native-ble-plx';
 export default class BleTransport {
     id: string;
     device: Device;

package/dist/BleTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAgB,MAAM,gCAAgC,CAAC;AAMtF,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,SAAM;IAEb,mBAAmB,EAAE,cAAc,CAAC;IAEpC,oBAAoB,EAAE,cAAc,CAAC;IAErC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAEhC,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,WAAW,SAAQ;gBAGxB,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,oBAAoB,EAAE,cAAc;IAehC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,SAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BzF"}
+{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAgB,MAAM,sBAAsB,CAAC;AAM5E,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,SAAM;IAEb,mBAAmB,EAAE,cAAc,CAAC;IAEpC,oBAAoB,EAAE,cAAc,CAAC;IAErC,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAEhC,MAAM,CAAC,WAAW,SAAK;IAEvB,MAAM,CAAC,WAAW,SAAQ;gBAGxB,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,oBAAoB,EAAE,cAAc;IAehC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,SAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BzF"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as transport from '@onekeyfe/hd-transport';
 import transport__default from '@onekeyfe/hd-transport';
-import { BleManager, Device, Characteristic } from '@onekeyfe/react-native-ble-plx';
+import { BleManager, Device, Characteristic } from 'react-native-ble-plx';
 import { Deferred } from '@onekeyfe/hd-shared';
 import EventEmitter from 'events';
 
@@ -15,6 +15,7 @@ type BleAcquireInput = {
 declare class ReactNativeBleTransport {
     blePlxManager: BleManager | undefined;
     _messages: ReturnType<typeof transport__default.parseConfigure> | undefined;
+    name: string;
     configured: boolean;
     stopped: boolean;
     scanTimeout: number;
@@ -32,6 +33,7 @@ declare class ReactNativeBleTransport {
     }>;
     _monitorCharacteristic(characteristic: Characteristic): () => void;
     release(uuid: string): Promise<boolean>;
+    post(session: string, name: string, data: Record<string, unknown>): Promise<void>;
     call(uuid: string, name: string, data: Record<string, unknown>): Promise<transport.MessageFromOneKey>;
     stop(): void;
     cancel(): void;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAEf,MAAM,gCAAgC,CAAC;AAExC,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoBjE,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;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAmNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkF/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;IAwHpE,IAAI;IAIJ,MAAM;CAOP"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,UAAU,IAAI,aAAa,EAC3B,MAAM,EAEN,cAAc,EAIf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAkD,MAAM,wBAAwB,CAAC;AACxF,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAoDjE,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,IAAI,SAA6B;IAEjC,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,WAAW,SAAQ;IAEnB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,OAAO,CAAC,EAAE,YAAY,CAAC;gBAEX,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAWjC,SAAS;IA6FT,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAkNpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAkF/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAepB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAIjE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2HpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -2,18 +2,18 @@
 
 var reactNative = require('react-native');
 var buffer = require('buffer');
-var reactNativeBlePlx = require('@onekeyfe/react-native-ble-plx');
+var reactNativeBlePlx = require('react-native-ble-plx');
 var ByteBuffer = require('bytebuffer');
 var transport = require('@onekeyfe/hd-transport');
 var hdShared = require('@onekeyfe/hd-shared');
-var BleManager = require('react-native-ble-manager');
+var BleUtils = require('@onekeyfe/react-native-ble-utils');
 var hdCore = require('@onekeyfe/hd-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var ByteBuffer__default = /*#__PURE__*/_interopDefaultLegacy(ByteBuffer);
 var transport__default = /*#__PURE__*/_interopDefaultLegacy(transport);
-var BleManager__default = /*#__PURE__*/_interopDefaultLegacy(BleManager);
+var BleUtils__default = /*#__PURE__*/_interopDefaultLegacy(BleUtils);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -45,21 +45,41 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-const initializeBleManager = () => {
-    BleManager__default["default"].start({ showAlert: false });
-};
-const getConnectedDeviceIds = (serviceUuids) => __awaiter(void 0, void 0, void 0, function* () {
-    const connectedPeripherals = yield BleManager__default["default"].getConnectedPeripherals(serviceUuids);
-    return connectedPeripherals.map(peripheral => {
-        const { id, name, advertising = {} } = peripheral;
-        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 Logger = hdCore.getLogger(hdCore.LoggerNames.HdBleTransport);
+const getConnectedDeviceIds = (serviceUuids) => BleUtils__default["default"].getConnectedPeripherals(serviceUuids);
+const pairDevice = (macAddress) => BleUtils__default["default"].pairDevice(macAddress);
+const onDeviceBondState = (bleMacAddress) => new Promise((resolve, reject) => {
+    let timeout;
+    const cleanup = (cleanupListener) => {
+        if (timeout) {
+            clearTimeout(timeout);
+        }
+        if (cleanupListener)
+            cleanupListener();
+    };
+    const cleanupListener = BleUtils__default["default"].onDeviceBondState(peripheral => {
+        var _a;
+        if (((_a = peripheral.id) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== bleMacAddress.toLowerCase()) {
+            return;
+        }
+        const { bondState } = peripheral;
+        if (bondState.preState === 'BOND_NONE' && bondState.state === 'BOND_BONDING') {
+            timeout = setTimeout(() => {
+                cleanup(cleanupListener);
+                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+            }, 60 * 1000);
+        }
+        const hasBonded = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_BONDED';
+        const hasCanceled = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
+        Logger.debug('onDeviceBondState bondState:', bondState);
+        if (hasBonded) {
+            cleanup(cleanupListener);
+            resolve(peripheral);
+        }
+        else if (hasCanceled) {
+            cleanup(cleanupListener);
+            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
+        }
     });
 });
 
@@ -217,9 +237,28 @@ const tryToGetConfiguration = (device) => {
         return null;
     return infos;
 };
+function remapError(error) {
+    var _a;
+    if (error instanceof reactNativeBlePlx.BleError) {
+        if (error.iosErrorCode === reactNativeBlePlx.BleATTErrorCode.UnlikelyError ||
+            error.reason === 'Peer removed pairing information') {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePeerRemovedPairingInformation);
+        }
+        if ((error === null || error === void 0 ? void 0 : error.attErrorCode) === 22) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondError);
+        }
+    }
+    if (error instanceof Error &&
+        error.message &&
+        (error.message.includes('was disconnected') || error.message.includes('not found'))) {
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+    }
+    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = error.reason) !== null && _a !== void 0 ? _a : error);
+}
 class ReactNativeBleTransport {
     constructor(options) {
         var _a;
+        this.name = 'ReactNativeBleTransport';
         this.configured = false;
         this.stopped = false;
         this.scanTimeout = 3000;
@@ -241,7 +280,6 @@ class ReactNativeBleTransport {
         if (this.blePlxManager)
             return Promise.resolve(this.blePlxManager);
         this.blePlxManager = new reactNativeBlePlx.BleManager();
-        initializeBleManager();
         return Promise.resolve(this.blePlxManager);
     }
     enumerate() {
@@ -321,7 +359,7 @@ class ReactNativeBleTransport {
         });
     }
     acquire(input) {
-        var _a, _b, _c;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid, forceCleanRunPromise } = input;
             if (!uuid) {
@@ -344,6 +382,12 @@ class ReactNativeBleTransport {
                 this.Log.debug('subscribeBleOn error: ', error);
                 throw error;
             }
+            if (reactNative.Platform.OS === 'android') {
+                const bondState = yield pairDevice(uuid);
+                if (bondState.bonding) {
+                    yield onDeviceBondState(uuid);
+                }
+            }
             if (!device) {
                 const devices = yield blePlxManager.devices([uuid]);
                 [device] = devices;
@@ -372,7 +416,7 @@ class ReactNativeBleTransport {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleAlreadyConnected);
                     }
                     else {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = e.reason) !== null && _a !== void 0 ? _a : e);
+                        remapError(e);
                     }
                 }
             }
@@ -403,17 +447,10 @@ class ReactNativeBleTransport {
                         }
                     }
                     else {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_b = e.reason) !== null && _b !== void 0 ? _b : e);
+                        remapError(e);
                     }
                 }
             }
-            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 hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
-                }
-            }
             yield device.discoverAllServicesAndCharacteristics();
             let infos = tryToGetConfiguration(device);
             let characteristics;
@@ -472,7 +509,7 @@ class ReactNativeBleTransport {
             const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
             transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
             transportCache[uuid] = transport;
-            (_c = this.emitter) === null || _c === void 0 ? void 0 : _c.emit('device-connect', {
+            (_a = this.emitter) === null || _a === void 0 ? void 0 : _a.emit('device-connect', {
                 name: device.name,
                 id: device.id,
                 connectId: device.id,
@@ -571,6 +608,11 @@ class ReactNativeBleTransport {
             return Promise.resolve(true);
         });
     }
+    post(session, name, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.call(session, name, data);
+        });
+    }
     call(uuid, name, data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped) {
@@ -579,7 +621,9 @@ class ReactNativeBleTransport {
             if (this._messages == null) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            if (this.runPromise) {
+            const forceRun = name === 'Initialize' || name === 'Cancel';
+            this.Log.debug('transport-react-native call this.runPromise', this.runPromise);
+            if (this.runPromise && !forceRun) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);
             }
             const transport$1 = transportCache[uuid];
@@ -681,7 +725,7 @@ class ReactNativeBleTransport {
         this.stopped = true;
     }
     cancel() {
-        this.Log.debug('transport-react-native canceled');
+        this.Log.debug('transport-react-native transport cancel');
         if (this.runPromise) ;
         this.runPromise = null;
     }

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-export type { BleManager as BlePlxManager } from '@onekeyfe/react-native-ble-plx';
+export type { BleManager as BlePlxManager } from 'react-native-ble-plx';
 export type TransportOptions = {
     scanTimeout?: number;
 };

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAElF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,IAAI,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,10 +19,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.25",
-    "@onekeyfe/hd-transport": "^1.0.25",
-    "@onekeyfe/react-native-ble-plx": "3.0.1",
-    "react-native-ble-manager": "^8.1.0"
+    "@onekeyfe/hd-shared": "^1.0.26",
+    "@onekeyfe/hd-transport": "^1.0.26",
+    "@onekeyfe/react-native-ble-utils": "^0.1.3",
+    "react-native-ble-plx": "3.5.0"
   },
-  "gitHead": "25ac0d0194328afee6da6430c72895523e576302"
+  "gitHead": "080a3afa4360f2bc04368567e73ed30ba82ff2d7"
 }

package/src/BleManager.ts

@@ -1,37 +1,54 @@
-import BleManager from 'react-native-ble-manager';
+import BleUtils, { Peripheral } from '@onekeyfe/react-native-ble-utils';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { getLogger, LoggerNames } from '@onekeyfe/hd-core';
 
-export const initializeBleManager = () => {
-  BleManager.start({ showAlert: false });
-};
+const Logger = getLogger(LoggerNames.HdBleTransport);
 
 /**
  * get the device basic info of connected devices
  * @param serviceUuids
  * @returns {Promise<[string[]]>}
  */
-export const getConnectedDeviceIds = async (serviceUuids: string[]) => {
-  const connectedPeripherals = await BleManager.getConnectedPeripherals(serviceUuids);
-  return connectedPeripherals.map(peripheral => {
-    const { id, name, advertising = {} } = peripheral;
-    return { id, name, ...advertising };
-  });
-};
+export const getConnectedDeviceIds = (serviceUuids: string[]) =>
+  BleUtils.getConnectedPeripherals(serviceUuids);
+
+export const getBondedDevices = () => BleUtils.getBondedPeripherals();
+
+export const pairDevice = (macAddress: string) => BleUtils.pairDevice(macAddress);
+
+export const onDeviceBondState = (bleMacAddress: string): Promise<Peripheral | undefined> =>
+  new Promise((resolve, reject) => {
+    let timeout: any | undefined;
+
+    const cleanup = (cleanupListener: (() => void) | undefined) => {
+      if (timeout) {
+        clearTimeout(timeout);
+      }
+      if (cleanupListener) cleanupListener();
+    };
+
+    const cleanupListener = BleUtils.onDeviceBondState(peripheral => {
+      if (peripheral.id?.toLowerCase() !== bleMacAddress.toLowerCase()) {
+        return;
+      }
+      const { bondState } = peripheral;
+
+      if (bondState.preState === 'BOND_NONE' && bondState.state === 'BOND_BONDING') {
+        timeout = setTimeout(() => {
+          cleanup(cleanupListener);
+          reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+        }, 60 * 1000);
+      }
 
-export const getBondedDevices = async () => {
-  const peripherals = await BleManager.getBondedPeripherals();
-  return peripherals.map(peripheral => {
-    const { id, name, advertising = {} } = peripheral;
-    return { id, name, ...advertising };
+      const hasBonded = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_BONDED';
+      const hasCanceled = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
+      Logger.debug('onDeviceBondState bondState:', bondState);
+      if (hasBonded) {
+        cleanup(cleanupListener);
+        resolve(peripheral);
+      } else if (hasCanceled) {
+        cleanup(cleanupListener);
+        reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
+      }
+    });
   });
-};
-
-export const refreshCache = async (peripheralId: string) => {
-  try {
-    await BleManager.connect(peripheralId);
-    await BleManager.refreshCache(peripheralId);
-    await BleManager.disconnect(peripheralId, true);
-    console.log('refreshCache success');
-  } catch (error) {
-    console.log('refreshCache error: ', error);
-  }
-};

package/src/BleTransport.ts

@@ -1,4 +1,4 @@
-import { Device, Characteristic, BleErrorCode } from '@onekeyfe/react-native-ble-plx';
+import { Device, Characteristic, BleErrorCode } from 'react-native-ble-plx';
 import { getLogger, LoggerNames, wait } from '@onekeyfe/hd-core';
 // import { wait } from '@onekeyfe/hd-core/src/utils';
 

package/src/index.ts

@@ -6,12 +6,14 @@ import {
   BleErrorCode,
   Characteristic,
   ScanMode,
-} from '@onekeyfe/react-native-ble-plx';
+  BleATTErrorCode,
+  BleError,
+} from 'react-native-ble-plx';
 import ByteBuffer from 'bytebuffer';
 import transport, { COMMON_HEADER_SIZE, LogBlockCommand } from '@onekeyfe/hd-transport';
 import { createDeferred, Deferred, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import type EventEmitter from 'events';
-import { initializeBleManager, getConnectedDeviceIds, getBondedDevices } from './BleManager';
+import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
   isOnekeyDevice,
@@ -43,11 +45,45 @@ const tryToGetConfiguration = (device: Device) => {
   return infos;
 };
 
+type IOBleErrorRemap = Error | BleError | null | undefined;
+
+function remapError(error: IOBleErrorRemap) {
+  if (error instanceof BleError) {
+    if (
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-expect-error
+      error.iosErrorCode === BleATTErrorCode.UnlikelyError ||
+      error.reason === 'Peer removed pairing information'
+    ) {
+      throw ERRORS.TypedError(HardwareErrorCode.BlePeerRemovedPairingInformation);
+    }
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore It's not documented but seems to match a refusal on Android pairing
+    if (error?.attErrorCode === 22) {
+      throw ERRORS.TypedError(HardwareErrorCode.BleDeviceBondError);
+    }
+  }
+
+  if (
+    error instanceof Error &&
+    error.message &&
+    (error.message.includes('was disconnected') || error.message.includes('not found'))
+  ) {
+    throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+  }
+
+  // @ts-expect-error
+  throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, error.reason ?? error);
+}
+
 export default class ReactNativeBleTransport {
   blePlxManager: BlePlxManager | undefined;
 
   _messages: ReturnType<typeof transport.parseConfigure> | undefined;
 
+  name = 'ReactNativeBleTransport';
+
   configured = false;
 
   stopped = false;
@@ -82,7 +118,6 @@ export default class ReactNativeBleTransport {
   getPlxManager(): Promise<BlePlxManager> {
     if (this.blePlxManager) return Promise.resolve(this.blePlxManager);
     this.blePlxManager = new BlePlxManager();
-    initializeBleManager();
     return Promise.resolve(this.blePlxManager);
   }
 
@@ -218,6 +253,14 @@ export default class ReactNativeBleTransport {
       throw error;
     }
 
+    // check device is bonded
+    if (Platform.OS === 'android') {
+      const bondState = await pairDevice(uuid);
+      if (bondState.bonding) {
+        await onDeviceBondState(uuid);
+      }
+    }
+
     if (!device) {
       const devices = await blePlxManager.devices([uuid]);
       [device] = devices;
@@ -247,7 +290,7 @@ export default class ReactNativeBleTransport {
           this.Log.debug('device already connected');
           throw ERRORS.TypedError(HardwareErrorCode.BleAlreadyConnected);
         } else {
-          throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
+          remapError(e);
         }
       }
     }
@@ -282,20 +325,11 @@ export default class ReactNativeBleTransport {
             }
           }
         } else {
-          throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
+          remapError(e);
         }
       }
     }
 
-    // check device is bonded
-    if (Platform.OS === 'android') {
-      const bondedDevices = await getBondedDevices();
-      const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === device?.id);
-      if (!hasBonded) {
-        throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
-      }
-    }
-
     await device.discoverAllServicesAndCharacteristics();
     let infos = tryToGetConfiguration(device);
     let characteristics;
@@ -492,6 +526,10 @@ export default class ReactNativeBleTransport {
     return Promise.resolve(true);
   }
 
+  async post(session: string, name: string, data: Record<string, unknown>) {
+    await this.call(session, name, data);
+  }
+
   async call(uuid: string, name: string, data: Record<string, unknown>) {
     if (this.stopped) {
       // eslint-disable-next-line prefer-promise-reject-errors
@@ -501,7 +539,10 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    if (this.runPromise) {
+    const forceRun = name === 'Initialize' || name === 'Cancel';
+
+    this.Log.debug('transport-react-native call this.runPromise', this.runPromise);
+    if (this.runPromise && !forceRun) {
       throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);
     }
 
@@ -617,7 +658,7 @@ export default class ReactNativeBleTransport {
   }
 
   cancel() {
-    this.Log.debug('transport-react-native canceled');
+    this.Log.debug('transport-react-native transport cancel');
     if (this.runPromise) {
       // this.runPromise.reject(new Error('Transport_CallCanceled'));
     }

package/src/types.ts

@@ -1,4 +1,4 @@
-export type { BleManager as BlePlxManager } from '@onekeyfe/react-native-ble-plx';
+export type { BleManager as BlePlxManager } from 'react-native-ble-plx';
 
 export type TransportOptions = {
   scanTimeout?: number;