@onekeyfe/hd-transport-react-native 0.1.4 → 0.1.7

package/dist/constants.d.ts

@@ -1,5 +1,3 @@
-export declare const PERMISSION_ERROR = "Bluetooth required to be turned on";
-export declare const LOCATION_ERROR = "Device is not authorized to use BluetoothLE";
 export declare const IOS_PACKET_LENGTH = 128;
 export declare const ANDROID_PACKET_LENGTH = 192;
 export declare const isOnekeyDevice: (name: string | null, id?: string | undefined) => boolean;

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,uCAAuC,CAAC;AACrE,eAAO,MAAM,cAAc,gDAAgD,CAAC;AAE5E,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAEzC,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,8BAAgB,OAYjE,CAAC;AA8BF,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QAoCtB,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAEzC,eAAO,MAAM,cAAc,SAAU,MAAM,GAAG,IAAI,8BAAgB,OAYjE,CAAC;AA8BF,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QAoCtB,CAAC"}

package/dist/index.d.ts

@@ -1,16 +1,6 @@
-import transport from '@onekeyfe/hd-transport';
 import { BleManager, Device, Characteristic } from 'react-native-ble-plx';
-
-declare const PERMISSION_ERROR = "Bluetooth required to be turned on";
-declare const LOCATION_ERROR = "Device is not authorized to use BluetoothLE";
-
-declare type Deferred<T, I = any, D = any> = {
-    id?: I;
-    data?: D;
-    promise: Promise<T>;
-    resolve: (t: T) => void;
-    reject: (e: Error) => void;
-};
+import transport from '@onekeyfe/hd-transport';
+import { Deferred } from '@onekeyfe/hd-shared';
 
 declare type TransportOptions = {
     scanTimeout?: number;
@@ -42,4 +32,4 @@ declare class ReactNativeBleTransport {
     cancel(): void;
 }
 
-export { LOCATION_ERROR, PERMISSION_ERROR, ReactNativeBleTransport as default };
+export { ReactNativeBleTransport as default };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"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;AAI9B,OAAO,EACL,gBAAgB,EAChB,cAAc,EAMf,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;;;IA4JpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IAmD/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAcpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+EpE,IAAI;IAIJ,MAAM;CAOP;AAED,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,CAAC"}
+{"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,sBAAsB,CAAC;AAE9B,OAAO,SAAiC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAkB,QAAQ,EAA6B,MAAM,qBAAqB,CAAC;AAa1F,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;;;IA+JpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA4D/C,OAAO,CAAC,IAAI,EAAE,MAAM;IAcpB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA+EpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -1,18 +1,17 @@
 'use strict';
 
-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');
 var ByteBuffer = require('bytebuffer');
+var transport = require('@onekeyfe/hd-transport');
+var hdShared = require('@onekeyfe/hd-shared');
 var BleManager = require('react-native-ble-manager');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var transport__default = /*#__PURE__*/_interopDefaultLegacy(transport);
 var ByteBuffer__default = /*#__PURE__*/_interopDefaultLegacy(ByteBuffer);
+var transport__default = /*#__PURE__*/_interopDefaultLegacy(transport);
 var BleManager__default = /*#__PURE__*/_interopDefaultLegacy(BleManager);
 
 /******************************************************************************
@@ -58,49 +57,6 @@ const getBondedDevices = () => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 
-const PERMISSION_ERROR = 'Bluetooth required to be turned on';
-const LOCATION_ERROR = 'Device is not authorized to use BluetoothLE';
-const IOS_PACKET_LENGTH = 128;
-const ANDROID_PACKET_LENGTH = 192;
-const isOnekeyDevice = (name, id) => {
-    var _a;
-    if ((_a = id === null || id === void 0 ? void 0 : id.startsWith) === null || _a === void 0 ? void 0 : _a.call(id, 'MI')) {
-        return true;
-    }
-    const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})/i;
-    if (name && re.exec(name)) {
-        return true;
-    }
-    return false;
-};
-const ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
-const OneKeyServices = {
-    classic: {
-        [ClassicServiceUUID]: {
-            serviceUuid: ClassicServiceUUID,
-            writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
-            notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
-        },
-    },
-};
-const bluetoothServices = [];
-for (const deviceType of Object.keys(OneKeyServices)) {
-    const services = OneKeyServices[deviceType];
-    bluetoothServices.push(...Object.keys(services));
-}
-const getBluetoothServiceUuids = () => bluetoothServices;
-const getInfosForServiceUuid = (serviceUuid, deviceType) => {
-    const services = OneKeyServices[deviceType];
-    if (!services) {
-        return null;
-    }
-    const service = services[serviceUuid];
-    if (!service) {
-        return null;
-    }
-    return service;
-};
-
 const timer = process.env.NODE_ENV === 'development'
     ? {
         timeout: (fn, ms) => {
@@ -140,36 +96,50 @@ const subscribeBleOn = (bleManager, ms = 1000) => new Promise((resolve, reject)
         if (done)
             return;
         subscription.remove();
-        reject(new Error(PERMISSION_ERROR));
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
     }, ms);
 });
 
-function create(arg, data) {
-    let localResolve = (_t) => { };
-    let localReject = (_e) => { };
-    let id;
-    const promise = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-        localResolve = resolve;
-        localReject = reject;
-        if (typeof arg === 'function') {
-            try {
-                yield arg();
-            }
-            catch (error) {
-                reject(error);
-            }
-        }
-        if (typeof arg === 'string')
-            id = arg;
-    }));
-    return {
-        id,
-        data,
-        resolve: localResolve,
-        reject: localReject,
-        promise,
-    };
+const IOS_PACKET_LENGTH = 128;
+const ANDROID_PACKET_LENGTH = 192;
+const isOnekeyDevice = (name, id) => {
+    var _a;
+    if ((_a = id === null || id === void 0 ? void 0 : id.startsWith) === null || _a === void 0 ? void 0 : _a.call(id, 'MI')) {
+        return true;
+    }
+    const re = /(BixinKey\d{10})|(K\d{4})|(T\d{4})/i;
+    if (name && re.exec(name)) {
+        return true;
+    }
+    return false;
+};
+const ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
+const OneKeyServices = {
+    classic: {
+        [ClassicServiceUUID]: {
+            serviceUuid: ClassicServiceUUID,
+            writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
+            notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
+        },
+    },
+};
+const bluetoothServices = [];
+for (const deviceType of Object.keys(OneKeyServices)) {
+    const services = OneKeyServices[deviceType];
+    bluetoothServices.push(...Object.keys(services));
 }
+const getBluetoothServiceUuids = () => bluetoothServices;
+const getInfosForServiceUuid = (serviceUuid, deviceType) => {
+    const services = OneKeyServices[deviceType];
+    if (!services) {
+        return null;
+    }
+    const service = services[serviceUuid];
+    if (!service) {
+        return null;
+    }
+    return service;
+};
 
 const isHeaderChunk = (chunk) => {
     if (chunk.length < 9)
@@ -249,19 +219,19 @@ class ReactNativeBleTransport {
                 blePlxManager.startDeviceScan(null, {
                     scanMode: reactNativeBlePlx.ScanMode.LowLatency,
                 }, (error, device) => {
-                    var _a;
+                    var _a, _b;
                     if (error) {
                         console.log('ble scan manager: ', blePlxManager);
                         console.log('ble scan error: ', error);
                         if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
-                            reject(new Error(PERMISSION_ERROR));
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
                         }
                         else {
-                            reject(error);
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleScanError, (_a = error.reason) !== null && _a !== void 0 ? _a : ''));
                         }
                         return;
                     }
-                    if (isOnekeyDevice((_a = device === null || device === void 0 ? void 0 : device.name) !== null && _a !== void 0 ? _a : null, device === null || device === void 0 ? void 0 : device.id)) {
+                    if (isOnekeyDevice((_b = device === null || device === void 0 ? void 0 : device.name) !== null && _b !== void 0 ? _b : null, device === null || device === void 0 ? void 0 : device.id)) {
                         console.log('search device start ======================');
                         const { name, localName, id } = device !== null && device !== void 0 ? device : {};
                         console.log(`device name: ${name !== null && name !== void 0 ? name : ''}\nlocalName: ${localName !== null && localName !== void 0 ? localName : ''}\nid: ${id !== null && id !== void 0 ? id : ''}`);
@@ -288,10 +258,11 @@ class ReactNativeBleTransport {
         });
     }
     acquire(input) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { uuid } = input;
             if (!uuid) {
-                throw new Error('uuid is required');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
             let device = null;
             if (transportCache[uuid]) {
@@ -329,12 +300,12 @@ class ReactNativeBleTransport {
                         device = yield blePlxManager.connectToDevice(uuid);
                     }
                     else {
-                        throw e;
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = e.reason) !== null && _a !== void 0 ? _a : e);
                     }
                 }
             }
             if (!device) {
-                throw new Error('unable to connect to device');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'unable to connect to device');
             }
             if (!(yield device.isConnected())) {
                 console.log('not connected, try to connect to device: ', uuid);
@@ -349,7 +320,7 @@ class ReactNativeBleTransport {
                         yield device.connect();
                     }
                     else {
-                        throw e;
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_b = e.reason) !== null && _b !== void 0 ? _b : e);
                     }
                 }
             }
@@ -357,7 +328,7 @@ class ReactNativeBleTransport {
                 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');
+                    throw hdShared.ERRORS.TypedError('device is not bonded');
                 }
             }
             yield device.discoverAllServicesAndCharacteristics();
@@ -371,18 +342,19 @@ class ReactNativeBleTransport {
                         break;
                     }
                     catch (e) {
+                        console.log(e);
                     }
                 }
             }
             if (!infos) {
-                throw new Error('BLEServiceNotFound: service not found');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
             const { serviceUuid, writeUuid, notifyUuid } = infos;
             if (!characteristics) {
                 characteristics = yield device.characteristicsForService(serviceUuid);
             }
             if (!characteristics) {
-                throw new Error('BLEServiceNotFound: characteristics not found');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotFound);
             }
             let writeCharacteristic;
             let notifyCharacteristic;
@@ -395,23 +367,24 @@ class ReactNativeBleTransport {
                 }
             }
             if (!writeCharacteristic) {
-                throw new Error('BLECharacteristicNotFound: write characteristic not found');
+                throw hdShared.ERRORS.TypedError('BLECharacteristicNotFound: write characteristic not found');
             }
             if (!notifyCharacteristic) {
-                throw new Error('BLECharacteristicNotFound: notify characteristic not found');
+                throw hdShared.ERRORS.TypedError('BLECharacteristicNotFound: notify characteristic not found');
             }
             if (!writeCharacteristic.isWritableWithResponse) {
-                throw new Error('BLECharacteristicNotWritable: write characteristic not writable');
+                throw hdShared.ERRORS.TypedError('BLECharacteristicNotWritable: write characteristic not writable');
             }
             if (!notifyCharacteristic.isNotifiable) {
-                throw new Error('BLECharacteristicNotNotifiable: notify characteristic not notifiable');
+                throw hdShared.ERRORS.TypedError('BLECharacteristicNotNotifiable: notify characteristic not notifiable');
             }
             const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
             transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
             transportCache[uuid] = transport;
-            device.onDisconnected(() => {
+            const disconnectSubscription = device.onDisconnected(() => {
                 console.log('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
                 this.release(uuid);
+                disconnectSubscription === null || disconnectSubscription === void 0 ? void 0 : disconnectSubscription.remove();
             });
             return { uuid };
         });
@@ -420,13 +393,17 @@ class ReactNativeBleTransport {
         let bufferLength = 0;
         let buffer$1 = [];
         const subscription = characteristic.monitor((error, c) => {
-            var _a, _b;
+            var _a, _b, _c;
             if (error) {
                 console.log(`error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${error}`);
+                if (this.runPromise) {
+                    this.runPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleCharacteristicNotifyError, (_a = error.reason) !== null && _a !== void 0 ? _a : error.message));
+                    console.log('@onekey/hd-ble-sdk: monitor notify error, and has unreleased Promise');
+                }
                 return;
             }
             if (!c) {
-                throw new Error('Monitor Error: characteristic not found');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleMonitorError);
             }
             try {
                 const data = buffer.Buffer.from(c.value, 'base64');
@@ -441,12 +418,12 @@ class ReactNativeBleTransport {
                     const value = buffer.Buffer.from(buffer$1);
                     bufferLength = 0;
                     buffer$1 = [];
-                    (_a = this.runPromise) === null || _a === void 0 ? void 0 : _a.resolve(value.toString('hex'));
+                    (_b = this.runPromise) === null || _b === void 0 ? void 0 : _b.resolve(value.toString('hex'));
                 }
             }
             catch (error) {
                 console.log('monitor data error: ', error);
-                (_b = this.runPromise) === null || _b === void 0 ? void 0 : _b.reject(error);
+                (_c = this.runPromise) === null || _c === void 0 ? void 0 : _c.reject(error);
             }
         });
         return () => {
@@ -471,19 +448,19 @@ class ReactNativeBleTransport {
     call(uuid, name, data) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.stopped) {
-                return Promise.reject('Transport stopped.');
+                return Promise.reject(hdShared.ERRORS.TypedError('Transport stopped.'));
             }
             if (this._messages == null) {
-                throw new Error('Transport not configured.');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             if (this.runPromise) {
-                throw new Error('Transport_CallInProgress');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportCallInProgress);
             }
             const transport = transportCache[uuid];
             if (!transport) {
-                throw new Error('Transport not found.');
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
             }
-            this.runPromise = create();
+            this.runPromise = hdShared.createDeferred();
             const messages = this._messages;
             console.log('transport-react-native', 'call-', ' name: ', name, ' data: ', data);
             const buffers = buildBuffers(messages, name, data);
@@ -519,7 +496,7 @@ class ReactNativeBleTransport {
                     }
                     catch (e) {
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
-                            throw new Error('device is not bonded');
+                            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
                         this.runPromise = null;
                         console.log('writeCharacteristic write error: ', e);
@@ -555,6 +532,4 @@ class ReactNativeBleTransport {
     }
 }
 
-exports.LOCATION_ERROR = LOCATION_ERROR;
-exports.PERMISSION_ERROR = PERMISSION_ERROR;
-exports["default"] = ReactNativeBleTransport;
+module.exports = ReactNativeBleTransport;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,9 +20,10 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.1.4",
+    "@onekeyfe/hd-shared": "^0.1.7",
+    "@onekeyfe/hd-transport": "^0.1.7",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "11d482262e5af9baf45b0b554006cff0aebed97c"
+  "gitHead": "1d3889d02e41afd60cd0388b6e01d7f2ac7c5399"
 }

package/src/constants.ts

@@ -1,6 +1,3 @@
-export const PERMISSION_ERROR = 'Bluetooth required to be turned on';
-export const LOCATION_ERROR = 'Device is not authorized to use BluetoothLE';
-
 export const IOS_PACKET_LENGTH = 128;
 export const ANDROID_PACKET_LENGTH = 192;
 

package/src/index.ts

@@ -1,6 +1,5 @@
 import { Platform } from 'react-native';
 import { Buffer } from 'buffer';
-import transport, { COMMON_HEADER_SIZE } from '@onekeyfe/hd-transport';
 import {
   BleManager as BlePlxManager,
   Device,
@@ -9,18 +8,17 @@ import {
   ScanMode,
 } from 'react-native-ble-plx';
 import ByteBuffer from 'bytebuffer';
+import transport, { COMMON_HEADER_SIZE } from '@onekeyfe/hd-transport';
+import { createDeferred, Deferred, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { initializeBleManager, getConnectedDeviceIds, getBondedDevices } from './BleManager';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
-  PERMISSION_ERROR,
-  LOCATION_ERROR,
   isOnekeyDevice,
   getBluetoothServiceUuids,
   getInfosForServiceUuid,
   IOS_PACKET_LENGTH,
   ANDROID_PACKET_LENGTH,
 } from './constants';
-import { Deferred, create as createDeferred } from './utils/deferred';
 import { isHeaderChunk } from './utils/validateNotify';
 import BleTransport from './BleTransport';
 import timer from './utils/timer';
@@ -111,9 +109,9 @@ export default class ReactNativeBleTransport {
                 error.errorCode
               )
             ) {
-              reject(new Error(PERMISSION_ERROR));
+              reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
             } else {
-              reject(error);
+              reject(ERRORS.TypedError(HardwareErrorCode.BleScanError, error.reason ?? ''));
             }
             return;
           }
@@ -156,7 +154,7 @@ export default class ReactNativeBleTransport {
     const { uuid } = input;
 
     if (!uuid) {
-      throw new Error('uuid is required');
+      throw ERRORS.TypedError(HardwareErrorCode.BleRequiredUUID);
     }
 
     let device: Device | null = null;
@@ -203,13 +201,13 @@ export default class ReactNativeBleTransport {
           connectOptions = {};
           device = await blePlxManager.connectToDevice(uuid);
         } else {
-          throw e;
+          throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
         }
       }
     }
 
     if (!device) {
-      throw new Error('unable to connect to device');
+      throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'unable to connect to device');
     }
 
     if (!(await device.isConnected())) {
@@ -226,7 +224,7 @@ export default class ReactNativeBleTransport {
           connectOptions = {};
           await device.connect();
         } else {
-          throw e;
+          throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
         }
       }
     }
@@ -236,7 +234,7 @@ export default class ReactNativeBleTransport {
       const bondedDevices = await getBondedDevices();
       const hasBonded = !!bondedDevices.find(bondedDevice => bondedDevice.id === device?.id);
       if (!hasBonded) {
-        throw new Error('device is not bonded');
+        throw ERRORS.TypedError('device is not bonded');
       }
     }
 
@@ -251,13 +249,13 @@ export default class ReactNativeBleTransport {
           infos = getInfosForServiceUuid(serviceUuid, 'classic');
           break;
         } catch (e) {
-          // empty
+          console.log(e);
         }
       }
     }
 
     if (!infos) {
-      throw new Error('BLEServiceNotFound: service not found');
+      throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound);
     }
 
     const { serviceUuid, writeUuid, notifyUuid } = infos;
@@ -267,7 +265,7 @@ export default class ReactNativeBleTransport {
     }
 
     if (!characteristics) {
-      throw new Error('BLEServiceNotFound: characteristics not found');
+      throw ERRORS.TypedError(HardwareErrorCode.BleCharacteristicNotFound);
     }
 
     let writeCharacteristic;
@@ -281,28 +279,31 @@ export default class ReactNativeBleTransport {
     }
 
     if (!writeCharacteristic) {
-      throw new Error('BLECharacteristicNotFound: write characteristic not found');
+      throw ERRORS.TypedError('BLECharacteristicNotFound: write characteristic not found');
     }
 
     if (!notifyCharacteristic) {
-      throw new Error('BLECharacteristicNotFound: notify characteristic not found');
+      throw ERRORS.TypedError('BLECharacteristicNotFound: notify characteristic not found');
     }
 
     if (!writeCharacteristic.isWritableWithResponse) {
-      throw new Error('BLECharacteristicNotWritable: write characteristic not writable');
+      throw ERRORS.TypedError('BLECharacteristicNotWritable: write characteristic not writable');
     }
 
     if (!notifyCharacteristic.isNotifiable) {
-      throw new Error('BLECharacteristicNotNotifiable: notify characteristic not notifiable');
+      throw ERRORS.TypedError(
+        'BLECharacteristicNotNotifiable: notify characteristic not notifiable'
+      );
     }
 
     const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
     transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
     transportCache[uuid] = transport;
 
-    device.onDisconnected(() => {
+    const disconnectSubscription = device.onDisconnected(() => {
       console.log('device disconnect: ', device?.id);
       this.release(uuid);
+      disconnectSubscription?.remove();
     });
 
     return { uuid };
@@ -318,11 +319,20 @@ export default class ReactNativeBleTransport {
             error as unknown as string
           }`
         );
+        if (this.runPromise) {
+          this.runPromise.reject(
+            ERRORS.TypedError(
+              HardwareErrorCode.BleCharacteristicNotifyError,
+              error.reason ?? error.message
+            )
+          );
+          console.log('@onekey/hd-ble-sdk: monitor notify error, and has unreleased Promise');
+        }
         return;
       }
 
       if (!c) {
-        throw new Error('Monitor Error: characteristic not found');
+        throw ERRORS.TypedError(HardwareErrorCode.BleMonitorError);
       }
 
       try {
@@ -376,19 +386,19 @@ export default class ReactNativeBleTransport {
   async call(uuid: string, name: string, data: Record<string, unknown>) {
     if (this.stopped) {
       // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject('Transport stopped.');
+      return Promise.reject(ERRORS.TypedError('Transport stopped.'));
     }
     if (this._messages == null) {
-      throw new Error('Transport not configured.');
+      throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
     if (this.runPromise) {
-      throw new Error('Transport_CallInProgress');
+      throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);
     }
 
     const transport = transportCache[uuid] as BleTransport;
     if (!transport) {
-      throw new Error('Transport not found.');
+      throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
     }
 
     this.runPromise = createDeferred();
@@ -425,7 +435,7 @@ export default class ReactNativeBleTransport {
           await transport.writeCharacteristic.writeWithoutResponse(outData);
         } catch (e) {
           if (e.errorCode === BleErrorCode.DeviceDisconnected) {
-            throw new Error('device is not bonded');
+            throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded);
           }
           this.runPromise = null;
           console.log('writeCharacteristic write error: ', e);
@@ -464,5 +474,3 @@ export default class ReactNativeBleTransport {
     this.runPromise = null;
   }
 }
-
-export { PERMISSION_ERROR, LOCATION_ERROR };

package/src/subscribeBleOn.ts

@@ -1,4 +1,4 @@
-import { PERMISSION_ERROR } from './constants';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { BlePlxManager } from './types';
 import timer from './utils/timer';
 
@@ -21,6 +21,6 @@ export const subscribeBleOn = (bleManager: BlePlxManager, ms = 1000): Promise<vo
     const clearTimeout = timer.timeout(() => {
       if (done) return;
       subscription.remove();
-      reject(new Error(PERMISSION_ERROR));
+      reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
     }, ms);
   });

package/dist/utils/deferred.d.ts

@@ -1,9 +0,0 @@
-export declare type Deferred<T, I = any, D = any> = {
-    id?: I;
-    data?: D;
-    promise: Promise<T>;
-    resolve: (t: T) => void;
-    reject: (e: Error) => void;
-};
-export declare function create<T, I = any, D = any>(arg?: I, data?: D): Deferred<T, I, D>;
-//# sourceMappingURL=deferred.d.ts.map

package/dist/utils/deferred.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deferred.d.ts","sourceRoot":"","sources":["../../src/utils/deferred.ts"],"names":[],"mappings":"AAAA,oBAAY,QAAQ,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,IAAI;IAC1C,EAAE,CAAC,EAAE,CAAC,CAAC;IACP,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,CAAC;IACxB,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,CAAC;CAC5B,CAAC;AAEF,wBAAgB,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CA0BhF"}

package/src/utils/deferred.ts

@@ -1,35 +0,0 @@
-export type Deferred<T, I = any, D = any> = {
-  id?: I;
-  data?: D;
-  promise: Promise<T>;
-  resolve: (t: T) => void;
-  reject: (e: Error) => void;
-};
-
-export function create<T, I = any, D = any>(arg?: I, data?: D): Deferred<T, I, D> {
-  let localResolve: (t: T) => void = (_t: T) => {};
-  let localReject: (e?: Error) => void = (_e?: Error) => {};
-  let id: I | undefined;
-
-  // eslint-disable-next-line no-async-promise-executor
-  const promise: Promise<T> = new Promise(async (resolve, reject) => {
-    localResolve = resolve;
-    localReject = reject;
-    if (typeof arg === 'function') {
-      try {
-        await arg();
-      } catch (error) {
-        reject(error);
-      }
-    }
-    if (typeof arg === 'string') id = arg;
-  });
-
-  return {
-    id,
-    data,
-    resolve: localResolve,
-    reject: localReject,
-    promise,
-  };
-}