@onekeyfe/hd-transport-react-native 0.1.2 → 0.1.5

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;;;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;IA4EpE,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,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"}

package/dist/index.js

@@ -410,6 +410,7 @@ class ReactNativeBleTransport {
             transport.nofitySubscription = this._monitorCharacteristic(transport.notifyCharacteristic);
             transportCache[uuid] = transport;
             device.onDisconnected(() => {
+                console.log('device disconnect: ', device === null || device === void 0 ? void 0 : device.id);
                 this.release(uuid);
             });
             return { uuid };
@@ -421,7 +422,7 @@ class ReactNativeBleTransport {
         const subscription = characteristic.monitor((error, c) => {
             var _a, _b;
             if (error) {
-                console.log(`error monitor ${characteristic.uuid}: ${error}`);
+                console.log(`error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${error}`);
                 return;
             }
             if (!c) {
@@ -454,12 +455,15 @@ class ReactNativeBleTransport {
         };
     }
     release(uuid) {
-        var _a;
+        var _a, _b;
         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));
+                }
             }
             return Promise.resolve(true);
         });
@@ -511,9 +515,12 @@ class ReactNativeBleTransport {
                     const outData = o.toString('base64');
                     console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
                     try {
-                        yield transport.writeCharacteristic.writeWithResponse(outData);
+                        yield transport.writeCharacteristic.writeWithoutResponse(outData);
                     }
                     catch (e) {
+                        if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
+                            throw new Error('device is not bonded');
+                        }
                         this.runPromise = null;
                         console.log('writeCharacteristic write error: ', e);
                         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "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.1.2",
+    "@onekeyfe/hd-transport": "^0.1.5",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "5640e7870a99d8f3bade996fb5f57af055c749d8"
+  "gitHead": "26a2b960d5e1917d3f2217cef449269200a1a376"
 }

package/src/index.ts

@@ -301,6 +301,7 @@ export default class ReactNativeBleTransport {
     transportCache[uuid] = transport;
 
     device.onDisconnected(() => {
+      console.log('device disconnect: ', device?.id);
       this.release(uuid);
     });
 
@@ -312,7 +313,11 @@ export default class ReactNativeBleTransport {
     let buffer: any[] = [];
     const subscription = characteristic.monitor((error, c) => {
       if (error) {
-        console.log(`error monitor ${characteristic.uuid}: ${error as unknown as string}`);
+        console.log(
+          `error monitor ${characteristic.uuid}, deviceId: ${characteristic.deviceID}: ${
+            error as unknown as string
+          }`
+        );
         return;
       }
 
@@ -360,12 +365,11 @@ export default class ReactNativeBleTransport {
     if (transport) {
       delete transportCache[uuid];
       transport.nofitySubscription?.();
+      if (Platform.OS === 'android') {
+        await this.blePlxManager?.cancelDeviceConnection(uuid);
+      }
     }
 
-    /**
-     * The current strategy does not require disconnection
-     */
-    // await blePlxManager.cancelDeviceConnection(uuid);
     return Promise.resolve(true);
   }
 
@@ -418,8 +422,11 @@ export default class ReactNativeBleTransport {
         const outData = o.toString('base64');
         console.log('@onekey/hd-ble-sdk send hex strting: ', o.toString('hex'));
         try {
-          await transport.writeCharacteristic.writeWithResponse(outData);
+          await transport.writeCharacteristic.writeWithoutResponse(outData);
         } catch (e) {
+          if (e.errorCode === BleErrorCode.DeviceDisconnected) {
+            throw new Error('device is not bonded');
+          }
           this.runPromise = null;
           console.log('writeCharacteristic write error: ', e);
           return;