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

package/dist/api/FirmwareUpdateV3.d.ts

@@ -15,6 +15,9 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     private prepareBootloaderBinary;
     private prepareFirmwareAndBleBinary;
     private executeUpdate;
+    private extractUpdateModeProgress;
+    private shouldSkipReconnect;
+    private normalizeErrorMessage;
     waitForDeviceReconnect(timeout: number): Promise<void>;
 }
 //# sourceMappingURL=FirmwareUpdateV3.d.ts.map

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;IA2KrB,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;IA+K3B,OAAO,CAAC,yBAAyB;IAgBjC,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,qBAAqB;IAuBvB,sBAAsB,CAAC,OAAO,EAAE,MAAM;CAoD7C"}

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts

@@ -7,6 +7,7 @@ import type { Deferred } from '@onekeyfe/hd-shared';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 export declare class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     checkPromise: Deferred<any> | null;
+    protected hasPromptedWebUsbBootloaderReauth: boolean;
     init(): void;
     run(): Promise<any>;
     isBleReconnect(): boolean;
@@ -15,6 +16,7 @@ export declare class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params>
     postProgressMessage: (progress: number, progressType: IFirmwareUpdateProgressType) => void;
     private _promptDeviceInBootloaderForWebDevice;
     checkDeviceToBootloader(connectId: string | undefined): void;
+    protected ensureWebUsbBootloaderReauthPrompt(): Promise<void>;
     private _checkDeviceInBootloaderMode;
     enterBootloaderMode(): Promise<true | undefined>;
     startEmmcFirmwareUpdate({ path }: {

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAQhF;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YAmFvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}
+{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,SAAS,CAAC,iCAAiC,UAAS;IAEpD,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAQhF;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;cAuFrC,kCAAkC;YAmBpC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}

package/dist/data-manager/DataManager.d.ts

@@ -1,6 +1,6 @@
 import { EFirmwareType } from '@onekeyfe/hd-shared';
 import type { AssetsMap, ConnectSettings, DeviceTypeMap, Features, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, ITransportStatus, IVersionArray } from '../types';
-export declare const FIRMWARE_FIELDS: readonly ["firmware", "firmware-v2", "firmware-v7", "firmware-btc-v7"];
+export declare const FIRMWARE_FIELDS: readonly ["firmware", "firmware-v2", "firmware-v8", "firmware-btc-v8"];
 export type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
 export type MessageVersion = 'latest' | 'v1';
 export default class DataManager {

package/dist/index.d.ts

@@ -224,8 +224,8 @@ type DeviceTypeMap = {
     [k in IKnownDevice]: {
         firmware: IFirmwareReleaseInfo[];
         'firmware-v2'?: IFirmwareReleaseInfo[];
-        'firmware-v7'?: IFirmwareReleaseInfo[];
-        'firmware-btc-v7'?: IFirmwareReleaseInfo[];
+        'firmware-v8'?: IFirmwareReleaseInfo[];
+        'firmware-btc-v8'?: IFirmwareReleaseInfo[];
         ble: IBLEFirmwareReleaseInfo[];
     };
 };
@@ -3241,7 +3241,7 @@ declare const getDeviceBLEFirmwareVersion: (features: Features) => IVersionArray
 declare const getDeviceBootloaderVersion: (features: Features | undefined) => IVersionArray;
 declare const getDeviceBoardloaderVersion: (features: Features) => IVersionArray;
 
-declare const FIRMWARE_FIELDS: readonly ["firmware", "firmware-v2", "firmware-v7", "firmware-btc-v7"];
+declare const FIRMWARE_FIELDS: readonly ["firmware", "firmware-v2", "firmware-v8", "firmware-btc-v8"];
 type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
 type MessageVersion = 'latest' | 'v1';
 declare class DataManager {

package/dist/index.js

@@ -25050,14 +25050,14 @@ const Log$e = getLogger(exports.LoggerNames.Core);
 const FIRMWARE_FIELDS = [
     'firmware',
     'firmware-v2',
-    'firmware-v7',
-    'firmware-btc-v7',
+    'firmware-v8',
+    'firmware-btc-v8',
 ];
 const FIRMWARE_FIELD_TYPE_MAP = {
     firmware: hdShared.EFirmwareType.Universal,
     'firmware-v2': hdShared.EFirmwareType.Universal,
-    'firmware-v7': hdShared.EFirmwareType.Universal,
-    'firmware-btc-v7': hdShared.EFirmwareType.BitcoinOnly,
+    'firmware-v8': hdShared.EFirmwareType.Universal,
+    'firmware-btc-v8': hdShared.EFirmwareType.BitcoinOnly,
 };
 function getFirmwareTypeFromField(firmwareField) {
     const firmwareType = FIRMWARE_FIELD_TYPE_MAP[firmwareField];
@@ -25561,9 +25561,9 @@ const supportModifyHomescreen = (features) => {
 };
 const getLatestFirmwareField = (firmwareType) => {
     if (firmwareType === 'bitcoinonly') {
-        return `firmware-btc-v7`;
+        return `firmware-btc-v8`;
     }
-    return `firmware-v7`;
+    return `firmware-v8`;
 };
 const getFirmwareUpdateField = ({ features, updateType, targetVersion, firmwareType, }) => {
     const deviceType = getDeviceType(features);
@@ -25600,23 +25600,23 @@ const getFirmwareUpdateFieldArray = (features, updateType) => {
         deviceType === 'classic1s' ||
         deviceType === 'mini' ||
         deviceType === 'classicpure') {
-        return ['firmware-v7'];
+        return ['firmware-v8'];
     }
     if (deviceType === 'touch') {
         const currentVersion = getDeviceFirmwareVersion(features).join('.');
         if (semver__default["default"].gt(currentVersion, '4.0.0')) {
-            return ['firmware-v7', 'firmware'];
+            return ['firmware-v8', 'firmware'];
         }
         if (semver__default["default"].gte(currentVersion, '4.0.0')) {
             return ['firmware-v2', 'firmware'];
         }
         if (!currentVersion || semver__default["default"].lt(currentVersion, '3.0.0')) {
-            return ['firmware-v7', 'firmware-v2', 'firmware'];
+            return ['firmware-v8', 'firmware-v2', 'firmware'];
         }
         return ['firmware'];
     }
     if (deviceType === 'pro') {
-        return ['firmware-v7'];
+        return ['firmware-v8'];
     }
     return ['firmware'];
 };
@@ -29369,6 +29369,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
     constructor() {
         super(...arguments);
         this.checkPromise = null;
+        this.hasPromptedWebUsbBootloaderReauth = false;
         this.postTipMessage = (message) => {
             this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_TIP, {
                 device: this.device.toMessageObject(),
@@ -29447,7 +29448,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$7.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] promptDeviceInBootloaderForWebDevice failed: ', e);
+                    Log$7.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ', e);
                     (_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.reject(e);
                 }
                 return;
@@ -29476,6 +29477,23 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             }
         }, 30000);
     }
+    ensureWebUsbBootloaderReauthPrompt() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.hasPromptedWebUsbBootloaderReauth ||
+                !DataManager.isBrowserWebUsb(DataManager.getSettings('env')) ||
+                this.device.listenerCount(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE) === 0) {
+                return;
+            }
+            this.hasPromptedWebUsbBootloaderReauth = true;
+            this.postTipMessage(exports.FirmwareUpdateTipMessage.SelectDeviceInBootloaderForWebDevice);
+            try {
+                yield this._promptDeviceInBootloaderForWebDevice();
+            }
+            catch (error) {
+                Log$7.log('WebUSB 设备重新授权失败: ', error);
+            }
+        });
+    }
     _checkDeviceInBootloaderMode(connectId, intervalTimer, timeoutTimer) {
         var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
@@ -30402,7 +30420,6 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         });
     }
     executeUpdate({ resourceBinary, fwBinaryMap, bootloaderBinary, }) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let totalSize = 0;
             let processedSize = 0;
@@ -30503,33 +30520,82 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
                     const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
                     const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
-                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
-                    DevicePool.resetState();
-                    return {
-                        bootloaderVersion,
-                        bleVersion,
-                        firmwareVersion,
-                    };
+                    if (firmwareVersion !== '0.0.0') {
+                        this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
+                        DevicePool.resetState();
+                        return {
+                            bootloaderVersion,
+                            bleVersion,
+                            firmwareVersion,
+                        };
+                    }
+                    yield hdShared.wait(1000);
                 }
                 catch (error) {
-                    if (error.message && error.message.includes('Update mode')) {
-                        const updateParts = error.message.split('Update mode ');
-                        const progressValue = (_a = updateParts[1]) !== null && _a !== void 0 ? _a : '0';
-                        const progress = parseInt(progressValue, 10) || 0;
+                    const progress = this.extractUpdateModeProgress(error);
+                    if (progress !== null) {
                         this.postProgressMessage(progress, 'installingFirmware');
                         yield hdShared.wait(1000);
                     }
                     else {
                         yield hdShared.wait(1000);
-                        const reconnectTimeout = this.isBleReconnect() && (this.params.bleBinary || this.params.bleVersion)
-                            ? 3 * 60 * 1000
-                            : 60 * 1000;
-                        yield this.waitForDeviceReconnect(reconnectTimeout);
+                        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);
+                        }
                     }
                 }
             }
         });
     }
+    extractUpdateModeProgress(error) {
+        const message = this.normalizeErrorMessage(error);
+        if (!message) {
+            return null;
+        }
+        const match = message.match(/Update mode\s*(\d+)/i);
+        if (!match) {
+            return null;
+        }
+        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 '';
+        }
+        if (typeof error === 'string') {
+            return error;
+        }
+        if (typeof error === 'object') {
+            const { message } = error;
+            if (typeof message === 'string') {
+                return message;
+            }
+            if (message !== undefined && message !== null) {
+                return String(message);
+            }
+        }
+        return '';
+    }
     waitForDeviceReconnect(timeout) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {

package/dist/types/settings.d.ts

@@ -60,8 +60,8 @@ export type DeviceTypeMap = {
     [k in IKnownDevice]: {
         firmware: IFirmwareReleaseInfo[];
         'firmware-v2'?: IFirmwareReleaseInfo[];
-        'firmware-v7'?: IFirmwareReleaseInfo[];
-        'firmware-btc-v7'?: IFirmwareReleaseInfo[];
+        'firmware-v8'?: IFirmwareReleaseInfo[];
+        'firmware-btc-v8'?: IFirmwareReleaseInfo[];
         ble: IBLEFirmwareReleaseInfo[];
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.20",
+  "version": "1.1.21-alpha.0",
   "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.20",
-    "@onekeyfe/hd-transport": "1.1.20",
+    "@onekeyfe/hd-shared": "1.1.21-alpha.0",
+    "@onekeyfe/hd-transport": "1.1.21-alpha.0",
     "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": "3f1367f1ad5253e2207442e74fa47361df7ff442"
+  "gitHead": "07cd6d68356b267de165368bba5168ae319ff5fa"
 }

package/src/api/FirmwareUpdateV3.ts

@@ -247,7 +247,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     }
 
     this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
-    // 处理资源文件
+    // Process resource zip contents
     if (resourceBinary) {
       const file = await JSZip.loadAsync(resourceBinary);
       const files = Object.entries(file.files);
@@ -358,39 +358,98 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
         const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
         const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
         const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
-        this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
-        DevicePool.resetState();
-        return {
-          bootloaderVersion,
-          bleVersion,
-          firmwareVersion,
-        };
+        // Treat update as complete once firmware version becomes non-zero
+        if (firmwareVersion !== '0.0.0') {
+          this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
+          DevicePool.resetState();
+          return {
+            bootloaderVersion,
+            bleVersion,
+            firmwareVersion,
+          };
+        }
+        // Still in update mode; continue polling (e.g., iOS may return firmwareVersion 0.0.0 during switches)
+        await wait(1000);
       } catch (error) {
-        // Hardware install firmware progress message
-        if (error.message && error.message.includes('Update mode')) {
-          const updateParts = error.message.split('Update mode ');
-          const progressValue = updateParts[1] ?? '0';
-          const progress = parseInt(progressValue, 10) || 0;
+        const progress = this.extractUpdateModeProgress(error);
+        if (progress !== null) {
           this.postProgressMessage(progress, 'installingFirmware');
           await wait(1000);
         } else {
           await wait(1000);
-          /**
-           * 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.waitForDeviceReconnect(reconnectTimeout);
+          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);
+          }
         }
       }
     }
   }
 
+  /**
+   * Parse “Update mode XX” progress value from device errors to avoid hardcoded message.includes.
+   */
+  private extractUpdateModeProgress(error: unknown): number | null {
+    const message = this.normalizeErrorMessage(error);
+    if (!message) {
+      return null;
+    }
+    const match = message.match(/Update mode\s*(\d+)/i);
+    if (!match) {
+      return null;
+    }
+    const progress = parseInt(match[1], 10);
+    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 '';
+    }
+    if (typeof error === 'string') {
+      return error;
+    }
+    if (typeof error === 'object') {
+      const { message } = error as { message?: unknown };
+      if (typeof message === 'string') {
+        return message;
+      }
+      if (message !== undefined && message !== null) {
+        return String(message);
+      }
+    }
+    return '';
+  }
+
   /**
    * @description Reconnect device - While update with bootloader, it will reconnect device
    * @param {number} timeout - The timeout for the reconnection

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -40,6 +40,8 @@ const isDeviceDisconnectedError = (error: unknown) => {
 export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
 
+  protected hasPromptedWebUsbBootloaderReauth = false;
+
   init(): void {}
 
   run(): Promise<any> {
@@ -153,7 +155,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
             }
           } catch (e) {
             Log.log(
-              'FirmwareUpdateBaseMethod [checkDeviceToBootloader] promptDeviceInBootloaderForWebDevice failed: ',
+              'FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ',
               e
             );
             this.checkPromise?.reject(e);
@@ -193,6 +195,29 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     }, 30000);
   }
 
+  /**
+   * 仅在 firmware 被抹掉、需要重新授权的 bootloader 场景下才提示 WebUSB
+   * （比如 BTC-only 与通用固件互转后算作新设备）。
+   */
+  protected async ensureWebUsbBootloaderReauthPrompt() {
+    if (
+      this.hasPromptedWebUsbBootloaderReauth ||
+      !DataManager.isBrowserWebUsb(DataManager.getSettings('env')) ||
+      this.device.listenerCount(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE) === 0
+    ) {
+      return;
+    }
+
+    this.hasPromptedWebUsbBootloaderReauth = true;
+    this.postTipMessage(FirmwareUpdateTipMessage.SelectDeviceInBootloaderForWebDevice);
+
+    try {
+      await this._promptDeviceInBootloaderForWebDevice();
+    } catch (error) {
+      Log.log('WebUSB 设备重新授权失败: ', error);
+    }
+  }
+
   private async _checkDeviceInBootloaderMode(
     connectId: string | undefined,
     intervalTimer?: ReturnType<typeof setInterval>,

package/src/data-manager/DataManager.ts

@@ -34,8 +34,8 @@ const Log = getLogger(LoggerNames.Core);
 export const FIRMWARE_FIELDS = [
   'firmware',
   'firmware-v2',
-  'firmware-v7',
-  'firmware-btc-v7',
+  'firmware-v8',
+  'firmware-btc-v8',
 ] as const;
 
 export type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
@@ -45,8 +45,8 @@ export type MessageVersion = 'latest' | 'v1';
 const FIRMWARE_FIELD_TYPE_MAP: Readonly<Record<IFirmwareField, EFirmwareType>> = {
   firmware: EFirmwareType.Universal,
   'firmware-v2': EFirmwareType.Universal,
-  'firmware-v7': EFirmwareType.Universal,
-  'firmware-btc-v7': EFirmwareType.BitcoinOnly,
+  'firmware-v8': EFirmwareType.Universal,
+  'firmware-btc-v8': EFirmwareType.BitcoinOnly,
 } as const;
 
 function getFirmwareTypeFromField(firmwareField: IFirmwareField): EFirmwareType {

package/src/types/settings.ts

@@ -98,9 +98,9 @@ type IKnownDevice = Exclude<IDeviceType, 'unknown'>;
  * // {
  * //   firmware: IFirmwareReleaseInfo[];
  * //   'firmware-v2'?: IFirmwareReleaseInfo[];
- * //   'firmware-v7'?: IFirmwareReleaseInfo[];
+ * //   'firmware-v8'?: IFirmwareReleaseInfo[];
  * //   'firmware-v8'?: IFirmwareReleaseInfo[];      // New
- * //   'firmware-btc-v7'?: IFirmwareReleaseInfo[];
+ * //   'firmware-btc-v8'?: IFirmwareReleaseInfo[];
  * //   'firmware-btc-v8'?: IFirmwareReleaseInfo[];  // New
  * //   ble: IBLEFirmwareReleaseInfo[];
  * // }
@@ -112,9 +112,9 @@ export type DeviceTypeMap = {
     /** Firmware v2 (Touch/Pro specific) */
     'firmware-v2'?: IFirmwareReleaseInfo[];
     /** Universal firmware v7 */
-    'firmware-v7'?: IFirmwareReleaseInfo[];
+    'firmware-v8'?: IFirmwareReleaseInfo[];
     /** Bitcoin-only firmware v7 */
-    'firmware-btc-v7'?: IFirmwareReleaseInfo[];
+    'firmware-btc-v8'?: IFirmwareReleaseInfo[];
     // Future firmware versions should be added here as optional fields:
     // 'firmware-v8'?: IFirmwareReleaseInfo[];
     // 'firmware-btc-v8'?: IFirmwareReleaseInfo[];

package/src/utils/deviceFeaturesUtils.ts

@@ -235,9 +235,9 @@ export const supportModifyHomescreen = (features?: Features): SupportFeatureType
 
 export const getLatestFirmwareField = (firmwareType?: EFirmwareType): IFirmwareField => {
   if (firmwareType === 'bitcoinonly') {
-    return `firmware-btc-v7`;
+    return `firmware-btc-v8`;
   }
-  return `firmware-v7`;
+  return `firmware-v8`;
 };
 
 /**
@@ -300,25 +300,25 @@ export const getFirmwareUpdateFieldArray = (
     deviceType === 'mini' ||
     deviceType === 'classicpure'
   ) {
-    return ['firmware-v7'];
+    return ['firmware-v8'];
   }
 
   if (deviceType === 'touch') {
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     if (semver.gt(currentVersion, '4.0.0')) {
-      return ['firmware-v7', 'firmware'];
+      return ['firmware-v8', 'firmware'];
     }
     if (semver.gte(currentVersion, '4.0.0')) {
       return ['firmware-v2', 'firmware'];
     }
     if (!currentVersion || semver.lt(currentVersion, '3.0.0')) {
-      return ['firmware-v7', 'firmware-v2', 'firmware'];
+      return ['firmware-v8', 'firmware-v2', 'firmware'];
     }
     return ['firmware'];
   }
 
   if (deviceType === 'pro') {
-    return ['firmware-v7'];
+    return ['firmware-v8'];
   }
 
   return ['firmware'];