@onekeyfe/hd-transport-react-native 0.1.36 → 0.1.37

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;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,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;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;IAyET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAuLpC,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;IAmFpE,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;AAC1F,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AAavC,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;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;IAyET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAgMpC,sBAAsB,CAAC,cAAc,EAAE,cAAc;IA4D/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;IAmFpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -309,6 +309,10 @@ class ReactNativeBleTransport {
                         this.Log.debug('first try to reconnect without params');
                         device = yield blePlxManager.connectToDevice(uuid);
                     }
+                    else if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceAlreadyConnected) {
+                        this.Log.debug('device already connected');
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleAlreadyConnected);
+                    }
                     else {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = e.reason) !== null && _a !== void 0 ? _a : e);
                     }
@@ -368,6 +372,13 @@ class ReactNativeBleTransport {
                 }
             }
             if (!infos) {
+                try {
+                    this.Log.debug('cancel connection when service not found');
+                    yield device.cancelConnection();
+                }
+                catch (e) {
+                    this.Log.debug('cancel connection error when service not found: ', e.message || e.reason);
+                }
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleServiceNotFound);
             }
             const { serviceUuid, writeUuid, notifyUuid } = infos;
@@ -464,15 +475,13 @@ class ReactNativeBleTransport {
         };
     }
     release(uuid) {
-        var _a, _b;
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const transport = transportCache[uuid];
             if (transport) {
                 delete transportCache[uuid];
                 (_a = transport.nofitySubscription) === null || _a === void 0 ? void 0 : _a.call(transport);
-                if (reactNative.Platform.OS === 'android') {
-                    yield ((_b = this.blePlxManager) === null || _b === void 0 ? void 0 : _b.cancelDeviceConnection(uuid));
-                }
+                if (reactNative.Platform.OS === 'android') ;
             }
             return Promise.resolve(true);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "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.36",
-    "@onekeyfe/hd-transport": "^0.1.36",
+    "@onekeyfe/hd-shared": "^0.1.37",
+    "@onekeyfe/hd-transport": "^0.1.37",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "46ed925a322c0717c74c6bb2e0bb5e7f5df21fcf"
+  "gitHead": "c7aaa0d4af5ade4c9e07229f142ed85ee14db096"
 }

package/src/index.ts

@@ -214,6 +214,9 @@ export default class ReactNativeBleTransport {
           connectOptions = {};
           this.Log.debug('first try to reconnect without params');
           device = await blePlxManager.connectToDevice(uuid);
+        } else if (e.errorCode === BleErrorCode.DeviceAlreadyConnected) {
+          this.Log.debug('device already connected');
+          throw ERRORS.TypedError(HardwareErrorCode.BleAlreadyConnected);
         } else {
           throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
         }
@@ -281,6 +284,12 @@ export default class ReactNativeBleTransport {
     }
 
     if (!infos) {
+      try {
+        this.Log.debug('cancel connection when service not found');
+        await device.cancelConnection();
+      } catch (e) {
+        this.Log.debug('cancel connection error when service not found: ', e.message || e.reason);
+      }
       throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound);
     }
 
@@ -412,8 +421,9 @@ export default class ReactNativeBleTransport {
     if (transport) {
       delete transportCache[uuid];
       transport.nofitySubscription?.();
+      // Temporary close the Android disconnect after each request
       if (Platform.OS === 'android') {
-        await this.blePlxManager?.cancelDeviceConnection(uuid);
+        // await this.blePlxManager?.cancelDeviceConnection(uuid);
       }
     }