@onekeyfe/hd-transport-react-native 0.1.6 → 0.1.9

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,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;;;IA8JpC,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"}
+{"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;IAsET,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

@@ -226,6 +226,9 @@ class ReactNativeBleTransport {
                         if ([reactNativeBlePlx.BleErrorCode.BluetoothPoweredOff, reactNativeBlePlx.BleErrorCode.BluetoothInUnknownState].includes(error.errorCode)) {
                             reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlePermissionError));
                         }
+                        else if (error.errorCode === reactNativeBlePlx.BleErrorCode.BluetoothUnauthorized) {
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleLocationError));
+                        }
                         else {
                             reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleScanError, (_a = error.reason) !== null && _a !== void 0 ? _a : ''));
                         }
@@ -381,9 +384,10 @@ class ReactNativeBleTransport {
             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 };
         });
@@ -392,9 +396,13 @@ 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) {
@@ -413,12 +421,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 () => {

package/package.json

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

package/src/index.ts

@@ -110,6 +110,8 @@ export default class ReactNativeBleTransport {
               )
             ) {
               reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
+            } else if (error.errorCode === BleErrorCode.BluetoothUnauthorized) {
+              reject(ERRORS.TypedError(HardwareErrorCode.BleLocationError));
             } else {
               reject(ERRORS.TypedError(HardwareErrorCode.BleScanError, error.reason ?? ''));
             }
@@ -300,9 +302,10 @@ export default class ReactNativeBleTransport {
     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,6 +321,15 @@ 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;
       }