@onekeyfe/hd-core 0.1.59 → 0.2.0

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA2BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA+PjD,CAAC;AAgLF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA8IF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAqBlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AA2BxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBA+PjD,CAAC;AAqMF,eAAO,MAAM,MAAM,0CAkBlB,CAAC;AA8IF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA8CxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAmBnE,CAAC"}

package/dist/index.js

@@ -16347,6 +16347,26 @@ function initDeviceForBle(method) {
     device.deviceConnector = _connector;
     return device;
 }
+let bleTimeoutRetry = 0;
+function connectDeviceForBle(method, device) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield device.acquire();
+            yield device.initialize(parseInitOptions(method));
+        }
+        catch (err) {
+            if (err.errorCode === hdShared.HardwareErrorCode.BleTimeoutError && bleTimeoutRetry <= 5) {
+                bleTimeoutRetry += 1;
+                Log.debug(`Bletooth connect timeout and will retry, retry count: ${bleTimeoutRetry}`);
+                yield wait(3000);
+                yield connectDeviceForBle(method, device);
+            }
+            else {
+                throw err;
+            }
+        }
+    });
+}
 const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0, function* () {
     let tryCount = 0;
     const MAX_RETRY_COUNT = (method.payload && method.payload.retryCount) || 5;
@@ -16397,8 +16417,8 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
                         clearTimeout(timer);
                     }
                     if (env === 'react-native') {
-                        yield device.acquire();
-                        yield device.initialize(parseInitOptions(method));
+                        bleTimeoutRetry = 0;
+                        yield connectDeviceForBle(method, device);
                     }
                     resolve(device);
                     return;
@@ -16412,6 +16432,7 @@ const ensureConnected = (method, pollingId) => __awaiter(void 0, void 0, void 0,
                     hdShared.HardwareErrorCode.BleLocationServicesDisabled,
                     hdShared.HardwareErrorCode.BleDeviceNotBonded,
                     hdShared.HardwareErrorCode.BleCharacteristicNotifyError,
+                    hdShared.HardwareErrorCode.BleTimeoutError,
                     hdShared.HardwareErrorCode.BleWriteCharacteristicError,
                     hdShared.HardwareErrorCode.BleAlreadyConnected,
                     hdShared.HardwareErrorCode.FirmwareUpdateLimitOneDevice,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.59",
+  "version": "0.2.0",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.1.59",
-    "@onekeyfe/hd-transport": "^0.1.59",
+    "@onekeyfe/hd-shared": "^0.2.0",
+    "@onekeyfe/hd-transport": "^0.2.0",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "jszip": "^3.10.1",
@@ -40,5 +40,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "0c3e0637734a8b23d0553cf3d6a81b1bcd038116"
+  "gitHead": "7d63bbcdd05b277e361b8f6ed52c9c59973c40fa"
 }

package/src/core/index.ts

@@ -19,7 +19,7 @@ import { DeviceList } from '../device/DeviceList';
 import { DevicePool } from '../device/DevicePool';
 import { findMethod } from '../api/utils';
 import { DataManager } from '../data-manager';
-import { enableLog, getLogger, LoggerNames, setLoggerPostMessage } from '../utils';
+import { enableLog, getLogger, LoggerNames, setLoggerPostMessage, wait } from '../utils';
 import {
   CoreMessage,
   createResponseMessage,
@@ -387,6 +387,26 @@ function initDeviceForBle(method: BaseMethod) {
   return device;
 }
 
+/**
+ * If the Bluetooth connection times out, retry 6 times
+ */
+let bleTimeoutRetry = 0;
+async function connectDeviceForBle(method: BaseMethod, device: Device) {
+  try {
+    await device.acquire();
+    await device.initialize(parseInitOptions(method));
+  } catch (err) {
+    if (err.errorCode === HardwareErrorCode.BleTimeoutError && bleTimeoutRetry <= 5) {
+      bleTimeoutRetry += 1;
+      Log.debug(`Bletooth connect timeout and will retry, retry count: ${bleTimeoutRetry}`);
+      await wait(3000);
+      await connectDeviceForBle(method, device);
+    } else {
+      throw err;
+    }
+  }
+}
+
 type IPollFn<T> = (time?: number) => T;
 // eslint-disable-next-line @typescript-eslint/require-await
 const ensureConnected = async (method: BaseMethod, pollingId: number) => {
@@ -455,8 +475,8 @@ const ensureConnected = async (method: BaseMethod, pollingId: number) => {
            * Bluetooth should call initialize here
            */
           if (env === 'react-native') {
-            await device.acquire();
-            await device.initialize(parseInitOptions(method));
+            bleTimeoutRetry = 0;
+            await connectDeviceForBle(method, device);
           }
           resolve(device);
           return;
@@ -470,6 +490,7 @@ const ensureConnected = async (method: BaseMethod, pollingId: number) => {
             HardwareErrorCode.BleLocationServicesDisabled,
             HardwareErrorCode.BleDeviceNotBonded,
             HardwareErrorCode.BleCharacteristicNotifyError,
+            HardwareErrorCode.BleTimeoutError,
             HardwareErrorCode.BleWriteCharacteristicError,
             HardwareErrorCode.BleAlreadyConnected,
             HardwareErrorCode.FirmwareUpdateLimitOneDevice,