@onekeyfe/hd-core 1.0.31 → 1.0.32

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;AAClC,OAAO,EAAY,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AA6BnG,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,KAAK,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAsCtD,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA2DvE,CAAC;AA+gBF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA2E9D,CAAC;AAoKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,YAAY,CAAsB;IAG1C,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,cAAc;IAWhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAmDxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAY,6BAA6B,EAAoB,MAAM,wBAAwB,CAAC;AA6BnG,OAAO,EAEL,WAAW,EAWZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,KAAK,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAsCtD,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBA2DvE,CAAC;AA8hBF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SA2E9D,CAAC;AAoKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,YAAY,CAAsB;IAG1C,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,cAAc;IAWhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAmDxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAIzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAoBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/index.js

@@ -38215,18 +38215,29 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
     }
     return onCallDevice(context, message, method);
 });
-const waitForPendingPromise = (getPrePendingCallPromise) => __awaiter(void 0, void 0, void 0, function* () {
+const waitWithTimeout = (promise, timeout) => __awaiter(void 0, void 0, void 0, function* () {
+    const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() => reject(new Error('Request timeout')), timeout);
+    });
+    return Promise.race([promise, timeoutPromise]);
+});
+const waitForPendingPromise = (getPrePendingCallPromise, removePrePendingCallPromise) => __awaiter(void 0, void 0, void 0, function* () {
     const pendingPromise = getPrePendingCallPromise();
     if (pendingPromise) {
         Log.debug('pre pending call promise before call method, wait for it');
-        yield pendingPromise;
+        try {
+            yield waitWithTimeout(pendingPromise, 5 * 1000);
+        }
+        catch (error) {
+        }
+        removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(pendingPromise);
         Log.debug('pre pending call promise before call method done');
     }
 });
 const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     let messageResponse;
-    const { requestQueue, getPrePendingCallPromise } = context;
+    const { requestQueue, getPrePendingCallPromise, setPrePendingCallPromise } = context;
     const connectStateChange = preConnectCache.passphraseState !== method.payload.passphraseState;
     preConnectCache = {
         passphraseState: method.payload.passphraseState,
@@ -38235,7 +38246,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         Log.debug('passphrase state change, clear device cache');
         DevicePool.clearDeviceCache(method.payload.connectId);
     }
-    yield waitForPendingPromise(getPrePendingCallPromise);
+    yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
     const task = requestQueue.createTask(method);
     let device;
     try {
@@ -38265,7 +38276,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
     device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
     try {
-        yield waitForPendingPromise(getPrePendingCallPromise);
+        yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
             var _c, _d, _e;
             const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.31",
+  "version": "1.0.32",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^1.0.31",
-    "@onekeyfe/hd-transport": "^1.0.31",
+    "@onekeyfe/hd-shared": "^1.0.32",
+    "@onekeyfe/hd-transport": "^1.0.32",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "3e31186a4c2969d666a6ea124209075ab7a8e7aa"
+  "gitHead": "b84a301dc0cb1cb39a0b0c33536c21d8f2433755"
 }

package/src/core/index.ts

@@ -151,11 +151,26 @@ export const callAPI = async (context: CoreContext, message: CoreMessage) => {
   return onCallDevice(context, message, method);
 };
 
-const waitForPendingPromise = async (getPrePendingCallPromise: () => Promise<void> | undefined) => {
+const waitWithTimeout = async (promise: Promise<any>, timeout: number) => {
+  const timeoutPromise = new Promise((_, reject) => {
+    setTimeout(() => reject(new Error('Request timeout')), timeout);
+  });
+  return Promise.race([promise, timeoutPromise]);
+};
+
+const waitForPendingPromise = async (
+  getPrePendingCallPromise: () => Promise<void> | undefined,
+  removePrePendingCallPromise?: (promise: Promise<void> | undefined) => void
+) => {
   const pendingPromise = getPrePendingCallPromise();
   if (pendingPromise) {
     Log.debug('pre pending call promise before call method, wait for it');
-    await pendingPromise;
+    try {
+      await waitWithTimeout(pendingPromise, 5 * 1000);
+    } catch (error) {
+      // ignore timeout error
+    }
+    removePrePendingCallPromise?.(pendingPromise);
     Log.debug('pre pending call promise before call method done');
   }
 };
@@ -167,7 +182,7 @@ const onCallDevice = async (
 ): Promise<any> => {
   let messageResponse: any;
 
-  const { requestQueue, getPrePendingCallPromise } = context;
+  const { requestQueue, getPrePendingCallPromise, setPrePendingCallPromise } = context;
 
   const connectStateChange = preConnectCache.passphraseState !== method.payload.passphraseState;
 
@@ -180,7 +195,7 @@ const onCallDevice = async (
     DevicePool.clearDeviceCache(method.payload.connectId);
   }
 
-  await waitForPendingPromise(getPrePendingCallPromise);
+  await waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
 
   const task = requestQueue.createTask(method);
 
@@ -225,7 +240,7 @@ const onCallDevice = async (
   );
 
   try {
-    await waitForPendingPromise(getPrePendingCallPromise);
+    await waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
 
     const inner = async (): Promise<void> => {
       // check firmware version
@@ -928,7 +943,7 @@ export default class Core extends EventEmitter {
       requestQueue: this.requestQueue,
       methodSynchronize: this.methodSynchronize,
       getPrePendingCallPromise: () => this.prePendingCallPromise,
-      setPrePendingCallPromise: (promise: Promise<void>) => {
+      setPrePendingCallPromise: (promise: Promise<void> | undefined) => {
         this.prePendingCallPromise = promise;
       },
     };