@onekeyfe/hd-core 1.1.21-alpha.0 → 1.1.21-alpha.1

package/dist/api/FirmwareUpdateV3.d.ts

@@ -16,7 +16,6 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     private prepareFirmwareAndBleBinary;
     private executeUpdate;
     private extractUpdateModeProgress;
-    private shouldSkipReconnect;
     private normalizeErrorMessage;
     waitForDeviceReconnect(timeout: number): Promise<void>;
 }

package/dist/api/FirmwareUpdateV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAG/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAKnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAmCE,GAAG;;;;;IA8CT,OAAO,CAAC,wBAAwB;YAiBlB,qBAAqB;YAoBrB,uBAAuB;YAiBvB,2BAA2B;YAiD3B,aAAa;IA+K3B,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,qBAAqB;IAuBvB,sBAAsB,CAAC,OAAO,EAAE,MAAM;CAoD7C"}
+{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAG/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAKnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IAmCE,GAAG;;;;;IA8CT,OAAO,CAAC,wBAAwB;YAiBlB,qBAAqB;YAoBrB,uBAAuB;YAiBvB,2BAA2B;YAiD3B,aAAa;IA6K3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,qBAAqB;IAuBvB,sBAAsB,CAAC,OAAO,EAAE,MAAM;CAoD7C"}

package/dist/index.js

@@ -30539,13 +30539,11 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     }
                     else {
                         yield hdShared.wait(1000);
-                        if (!this.shouldSkipReconnect(error)) {
-                            const reconnectTimeout = this.isBleReconnect() && (this.params.bleBinary || this.params.bleVersion)
-                                ? 3 * 60 * 1000
-                                : 60 * 1000;
-                            yield this.ensureWebUsbBootloaderReauthPrompt();
-                            yield this.waitForDeviceReconnect(reconnectTimeout);
-                        }
+                        const reconnectTimeout = this.isBleReconnect() && (this.params.bleBinary || this.params.bleVersion)
+                            ? 3 * 60 * 1000
+                            : 60 * 1000;
+                        yield this.ensureWebUsbBootloaderReauthPrompt();
+                        yield this.waitForDeviceReconnect(reconnectTimeout);
                     }
                 }
             }
@@ -30563,21 +30561,6 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         const progress = parseInt(match[1], 10);
         return Number.isNaN(progress) ? null : progress;
     }
-    shouldSkipReconnect(error) {
-        const message = this.normalizeErrorMessage(error);
-        if (!message) {
-            return false;
-        }
-        const normalized = message.toLowerCase();
-        const transientKeywords = [
-            'operation was cancelled',
-            'force clean bluetooth run promise',
-            'getfeatures timeout',
-            'timeout after 3 seconds',
-            'transport cancel',
-        ];
-        return transientKeywords.some(keyword => normalized.includes(keyword));
-    }
     normalizeErrorMessage(error) {
         if (!error) {
             return '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.21-alpha.0",
+  "version": "1.1.21-alpha.1",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "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.1.21-alpha.0",
-    "@onekeyfe/hd-transport": "1.1.21-alpha.0",
+    "@onekeyfe/hd-shared": "1.1.21-alpha.1",
+    "@onekeyfe/hd-transport": "1.1.21-alpha.1",
     "axios": "1.12.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "07cd6d68356b267de165368bba5168ae319ff5fa"
+  "gitHead": "933dbbcf45753b685ba7f76500158de42b68215b"
 }

package/src/api/FirmwareUpdateV3.ts

@@ -377,20 +377,18 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
           await wait(1000);
         } else {
           await wait(1000);
-          if (!this.shouldSkipReconnect(error)) {
-            /**
-             * Needs second reconnect case:
-             * 1. While including 'Ble firmwware' in ble connect type
-             * 2. While including bootloader upgrade
-             */
-            const reconnectTimeout =
-              this.isBleReconnect() && (this.params.bleBinary || this.params.bleVersion)
-                ? 3 * 60 * 1000 // 3 minutes for BLE reconnect
-                : 60 * 1000; // 1 minute for normal reconnect
-
-            await this.ensureWebUsbBootloaderReauthPrompt();
-            await this.waitForDeviceReconnect(reconnectTimeout);
-          }
+          /**
+           * Needs second reconnect case:
+           * 1. While including 'Ble firmwware' in ble connect type
+           * 2. While including bootloader upgrade
+           */
+          const reconnectTimeout =
+            this.isBleReconnect() && (this.params.bleBinary || this.params.bleVersion)
+              ? 3 * 60 * 1000 // 3 minutes for BLE reconnect
+              : 60 * 1000; // 1 minute for normal reconnect
+
+          await this.ensureWebUsbBootloaderReauthPrompt();
+          await this.waitForDeviceReconnect(reconnectTimeout);
         }
       }
     }
@@ -412,25 +410,6 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     return Number.isNaN(progress) ? null : progress;
   }
 
-  /**
-   * Check whether the error is a transient BLE reconnect/timeout hint (e.g., force clean/cancel).
-   */
-  private shouldSkipReconnect(error: unknown): boolean {
-    const message = this.normalizeErrorMessage(error);
-    if (!message) {
-      return false;
-    }
-    const normalized = message.toLowerCase();
-    const transientKeywords = [
-      'operation was cancelled',
-      'force clean bluetooth run promise',
-      'getfeatures timeout',
-      'timeout after 3 seconds',
-      'transport cancel',
-    ];
-    return transientKeywords.some(keyword => normalized.includes(keyword));
-  }
-
   private normalizeErrorMessage(error: unknown): string {
     if (!error) {
       return '';