@onekeyfe/hd-transport-react-native 0.1.21 → 0.1.24

package/dist/BleManager.d.ts

@@ -17,4 +17,5 @@ export declare const getBondedDevices: () => Promise<{
     id: string;
     name: string | undefined;
 }[]>;
+export declare const refreshCache: (peripheralId: string) => Promise<void>;
 //# 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"}
+{"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"}

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;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;gBAEE,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG;IAIhB,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"}
+{"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;IAExC,GAAG,CAAC,EAAE,GAAG,CAAC;gBAEE,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG;IAIhB,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,MAAM;IAIN,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;IAYjC,SAAS;IAsET,OAAO,CAAC,KAAK,EAAE,eAAe;;;IAiKpC,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;IAkFpE,IAAI;IAIJ,MAAM;CAOP"}

package/dist/index.js

@@ -167,7 +167,7 @@ class BleTransport {
 const { check, buildBuffers, receiveOne, parseConfigure } = transport__default["default"];
 const transportCache = {};
 let connectOptions = {
-    requestMTU: 512,
+    requestMTU: 256,
     timeout: 3000,
 };
 const tryToGetConfiguration = (device) => {
@@ -303,6 +303,7 @@ class ReactNativeBleTransport {
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                         connectOptions = {};
                         device = yield blePlxManager.connectToDevice(uuid);
+                        this.Log.debug('first try to reconnect without params');
                     }
                     else {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_a = e.reason) !== null && _a !== void 0 ? _a : e);
@@ -318,11 +319,12 @@ class ReactNativeBleTransport {
                     yield device.connect(connectOptions);
                 }
                 catch (e) {
-                    this.Log.debug('try to connect to device has error: ', e);
+                    this.Log.debug('not connected, try to connect to device has error: ', e);
                     if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceMTUChangeFailed ||
                         e.errorCode === reactNativeBlePlx.BleErrorCode.OperationCancelled) {
                         connectOptions = {};
                         yield device.connect();
+                        this.Log.debug('second try to reconnect without params');
                     }
                     else {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, (_b = e.reason) !== null && _b !== void 0 ? _b : e);
@@ -500,11 +502,14 @@ class ReactNativeBleTransport {
                         yield transport.writeCharacteristic.writeWithoutResponse(outData);
                     }
                     catch (e) {
+                        this.Log.debug('writeCharacteristic write error: ', e);
+                        this.runPromise = null;
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
-                        this.runPromise = null;
-                        this.Log.debug('writeCharacteristic write error: ', e);
+                        if (e.errorCode === reactNativeBlePlx.BleErrorCode.OperationStartFailed) {
+                            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleWriteCharacteristicError, e.reason);
+                        }
                         return;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.1.21",
+  "version": "0.1.24",
   "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.21",
-    "@onekeyfe/hd-transport": "^0.1.21",
+    "@onekeyfe/hd-shared": "^0.1.24",
+    "@onekeyfe/hd-transport": "^0.1.24",
     "react-native-ble-manager": "^8.1.0",
     "react-native-ble-plx": "^2.0.3"
   },
-  "gitHead": "807593129b0b2e55dc2beeb7b824494ec8cb07ad"
+  "gitHead": "20197605d771616de3dbc47013494b60bc0dbd2d"
 }

package/src/BleManager.ts

@@ -24,3 +24,14 @@ export const getBondedDevices = async () => {
     return { id, name, ...advertising };
   });
 };
+
+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/index.ts

@@ -29,7 +29,7 @@ const { check, buildBuffers, receiveOne, parseConfigure } = transport;
 const transportCache: Record<string, any> = {};
 
 let connectOptions: Record<string, unknown> = {
-  requestMTU: 512,
+  requestMTU: 256,
   timeout: 3000,
 };
 
@@ -206,6 +206,7 @@ export default class ReactNativeBleTransport {
         ) {
           connectOptions = {};
           device = await blePlxManager.connectToDevice(uuid);
+          this.Log.debug('first try to reconnect without params');
         } else {
           throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
         }
@@ -222,13 +223,14 @@ export default class ReactNativeBleTransport {
       try {
         await device.connect(connectOptions);
       } catch (e) {
-        this.Log.debug('try to connect to device has error: ', e);
+        this.Log.debug('not connected, try to connect to device has error: ', e);
         if (
           e.errorCode === BleErrorCode.DeviceMTUChangeFailed ||
           e.errorCode === BleErrorCode.OperationCancelled
         ) {
           connectOptions = {};
           await device.connect();
+          this.Log.debug('second try to reconnect without params');
         } else {
           throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, e.reason ?? e);
         }
@@ -440,11 +442,14 @@ export default class ReactNativeBleTransport {
         try {
           await transport.writeCharacteristic.writeWithoutResponse(outData);
         } catch (e) {
+          this.Log.debug('writeCharacteristic write error: ', e);
+          this.runPromise = null;
           if (e.errorCode === BleErrorCode.DeviceDisconnected) {
             throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded);
           }
-          this.runPromise = null;
-          this.Log.debug('writeCharacteristic write error: ', e);
+          if (e.errorCode === BleErrorCode.OperationStartFailed) {
+            throw ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError, e.reason);
+          }
           return;
         }
       }