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

package/dist/api/FirmwareUpdateV3.d.ts

@@ -16,6 +16,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     private prepareFirmwareAndBleBinary;
     private executeUpdate;
     private extractUpdateModeProgress;
+    private isGetFeaturesTimeoutError;
     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;IA6K3B,OAAO,CAAC,yBAAyB;IAajC,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;AAI/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAKnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAcxD,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;IA2M3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAuBvB,sBAAsB,CAAC,OAAO,EAAE,MAAM;CA0E7C"}

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

@@ -7,16 +7,14 @@ 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;
     postTipMessage: (message: IFirmwareUpdateTipMessage) => void;
     postProcessingMessage: (type: 'firmware' | 'ble' | 'bootloader' | 'resource') => void;
     postProgressMessage: (progress: number, progressType: IFirmwareUpdateProgressType) => void;
-    private _promptDeviceInBootloaderForWebDevice;
+    protected _promptDeviceInBootloaderForWebDevice(): Promise<unknown>;
     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,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"}
+{"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;cAEc,qCAAqC;IAkBrD,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"}

package/dist/index.js

@@ -29369,7 +29369,6 @@ 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(),
@@ -29477,23 +29476,6 @@ 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* () {
@@ -30504,18 +30486,22 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             this.postProgressMessage(0, 'installingFirmware');
             const installStartTime = Date.now();
             const maxWaitTimeForInstallingFirmware = 5 * 60 * 1000;
+            let getFeaturesTimeoutCount = 0;
+            const maxGetFeaturesTimeoutBeforeReauth = 3;
             while (true) {
                 if (Date.now() - installStartTime > maxWaitTimeForInstallingFirmware) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Firmware update process timeout after 5 minutes');
                 }
                 try {
                     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+                    const timeoutMs = 3000;
                     const featuresRes = yield Promise.race([
                         typedCall('GetFeatures', 'Features', {}),
                         new Promise((_, reject) => {
-                            setTimeout(() => reject(new Error('GetFeatures timeout after 3 seconds')), 3000);
+                            setTimeout(() => reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodNotResponse, 'GetFeatures timeout', { method: 'GetFeatures', timeoutMs })), timeoutMs);
                         }),
                     ]);
+                    getFeaturesTimeoutCount = 0;
                     const features = featuresRes.message;
                     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
                     const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
@@ -30532,17 +30518,31 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     yield hdShared.wait(1000);
                 }
                 catch (error) {
+                    Log$4.log('getFeatures error', error);
+                    let shouldReconnect = true;
                     const progress = this.extractUpdateModeProgress(error);
                     if (progress !== null) {
+                        getFeaturesTimeoutCount = 0;
                         this.postProgressMessage(progress, 'installingFirmware');
                         yield hdShared.wait(1000);
+                        shouldReconnect = false;
+                    }
+                    else if (this.isGetFeaturesTimeoutError(error)) {
+                        getFeaturesTimeoutCount += 1;
+                        if (getFeaturesTimeoutCount <= maxGetFeaturesTimeoutBeforeReauth) {
+                            yield hdShared.wait(1000);
+                            shouldReconnect = false;
+                        }
                     }
                     else {
+                        getFeaturesTimeoutCount = 0;
+                    }
+                    if (shouldReconnect) {
                         yield hdShared.wait(1000);
                         const reconnectTimeout = this.isBleReconnect() && (this.params.bleBinary || this.params.bleVersion)
                             ? 3 * 60 * 1000
                             : 60 * 1000;
-                        yield this.ensureWebUsbBootloaderReauthPrompt();
+                        getFeaturesTimeoutCount = 0;
                         yield this.waitForDeviceReconnect(reconnectTimeout);
                     }
                 }
@@ -30561,6 +30561,12 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         const progress = parseInt(match[1], 10);
         return Number.isNaN(progress) ? null : progress;
     }
+    isGetFeaturesTimeoutError(error) {
+        var _a;
+        return (error instanceof hdShared.HardwareError &&
+            error.errorCode === hdShared.HardwareErrorCode.CallMethodNotResponse &&
+            ((_a = error.params) === null || _a === void 0 ? void 0 : _a.method) === 'GetFeatures');
+    }
     normalizeErrorMessage(error) {
         if (!error) {
             return '';
@@ -30584,6 +30590,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
             const isBleReconnect = this.isBleReconnect();
+            let webUsbCheckCount = 0;
             while (Date.now() - startTime < timeout) {
                 try {
                     if (isBleReconnect) {
@@ -30607,6 +30614,25 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     else {
                         const deviceDiff = yield ((_b = this.device.deviceConnector) === null || _b === void 0 ? void 0 : _b.enumerate());
                         const devicesDescriptor = (_c = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _c !== void 0 ? _c : [];
+                        const canPromptWebUsbBootloader = DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
+                            !this.payload.skipWebDevicePrompt &&
+                            this.device.listenerCount(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE) > 0;
+                        if (canPromptWebUsbBootloader) {
+                            webUsbCheckCount += 1;
+                            if (webUsbCheckCount > 4) {
+                                this.postTipMessage(exports.FirmwareUpdateTipMessage.SelectDeviceInBootloaderForWebDevice);
+                                try {
+                                    yield this._promptDeviceInBootloaderForWebDevice();
+                                }
+                                catch (e) {
+                                    Log$4.log('WebUSB re-authorization failed: ', e);
+                                }
+                                webUsbCheckCount = 0;
+                            }
+                        }
+                        else {
+                            webUsbCheckCount = 0;
+                        }
                         const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, this.connectId);
                         if (deviceList.length === 1) {
                             this.device.updateFromCache(deviceList[0]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.21-alpha.1",
+  "version": "1.1.21-alpha.2",
   "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.1",
-    "@onekeyfe/hd-transport": "1.1.21-alpha.1",
+    "@onekeyfe/hd-shared": "1.1.21-alpha.2",
+    "@onekeyfe/hd-transport": "1.1.21-alpha.2",
     "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": "933dbbcf45753b685ba7f76500158de42b68215b"
+  "gitHead": "ed487b957d52b83b8fb5766578fe6b65f478100a"
 }

package/src/api/FirmwareUpdateV3.ts

@@ -1,4 +1,4 @@
-import { EDeviceType, ERRORS, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
+import { EDeviceType, ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
 import semver from 'semver';
 import JSZip from 'jszip';
 
@@ -17,6 +17,7 @@ import { getBinary, getSysResourceBinary } from './firmware/getBinary';
 import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
+import { DEVICE } from '../events';
 
 import type { FirmwareUpdateV3Params } from '../types/api/firmwareUpdate';
 import type { Deferred, EFirmwareType } from '@onekeyfe/hd-shared';
@@ -26,6 +27,7 @@ const Log = getLogger(LoggerNames.Method);
 
 export const MIN_UPDATE_V3_BOOTLOADER_VERSION = '2.8.0';
 
+
 /**
  * FirmwareUpdateV3 flow
    1. StartDownloadFirmware
@@ -336,6 +338,9 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     const installStartTime = Date.now();
     const maxWaitTimeForInstallingFirmware = 5 * 60 * 1000; // 5 minutes in milliseconds
 
+    let getFeaturesTimeoutCount = 0;
+    const maxGetFeaturesTimeoutBeforeReauth = 3;
+
     // eslint-disable-next-line no-constant-condition
     while (true) {
       // Check if timeout exceeded
@@ -348,12 +353,24 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
 
       try {
         const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+        const timeoutMs = 3000;
         const featuresRes = await Promise.race<TypedResponseMessage<'Features'>>([
           typedCall('GetFeatures', 'Features', {}),
           new Promise<never>((_, reject) => {
-            setTimeout(() => reject(new Error('GetFeatures timeout after 3 seconds')), 3000);
+            setTimeout(
+              () =>
+                reject(
+                  ERRORS.TypedError(
+                    HardwareErrorCode.CallMethodNotResponse,
+                    'GetFeatures timeout',
+                    { method: 'GetFeatures', timeoutMs }
+                  )
+                ),
+              timeoutMs
+            );
           }),
         ]);
+        getFeaturesTimeoutCount = 0;
         const features = featuresRes.message;
         const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
         const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
@@ -371,11 +388,26 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
         // Still in update mode; continue polling (e.g., iOS may return firmwareVersion 0.0.0 during switches)
         await wait(1000);
       } catch (error) {
+        Log.log('getFeatures error', error);
+        let shouldReconnect = true;
         const progress = this.extractUpdateModeProgress(error);
         if (progress !== null) {
+          getFeaturesTimeoutCount = 0;
           this.postProgressMessage(progress, 'installingFirmware');
           await wait(1000);
+          shouldReconnect = false;
+        } else if (this.isGetFeaturesTimeoutError(error)) {
+          getFeaturesTimeoutCount += 1;
+          // Retry transient GetFeatures timeouts to avoid unnecessary WebUSB re-authorization prompts.
+          if (getFeaturesTimeoutCount <= maxGetFeaturesTimeoutBeforeReauth) {
+            await wait(1000);
+            shouldReconnect = false;
+          }
         } else {
+          getFeaturesTimeoutCount = 0;
+        }
+
+        if (shouldReconnect) {
           await wait(1000);
           /**
            * Needs second reconnect case:
@@ -387,7 +419,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
               ? 3 * 60 * 1000 // 3 minutes for BLE reconnect
               : 60 * 1000; // 1 minute for normal reconnect
 
-          await this.ensureWebUsbBootloaderReauthPrompt();
+          getFeaturesTimeoutCount = 0;
           await this.waitForDeviceReconnect(reconnectTimeout);
         }
       }
@@ -410,6 +442,14 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
     return Number.isNaN(progress) ? null : progress;
   }
 
+  private isGetFeaturesTimeoutError(error: unknown): boolean {
+    return (
+      error instanceof HardwareError &&
+      error.errorCode === HardwareErrorCode.CallMethodNotResponse &&
+      error.params?.method === 'GetFeatures'
+    );
+  }
+
   private normalizeErrorMessage(error: unknown): string {
     if (!error) {
       return '';
@@ -436,6 +476,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
   async waitForDeviceReconnect(timeout: number) {
     const startTime = Date.now();
     const isBleReconnect = this.isBleReconnect();
+    let webUsbCheckCount = 0;
     while (Date.now() - startTime < timeout) {
       try {
         if (isBleReconnect) {
@@ -462,6 +503,27 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
         } else {
           const deviceDiff = await this.device.deviceConnector?.enumerate();
           const devicesDescriptor = deviceDiff?.descriptors ?? [];
+
+          const canPromptWebUsbBootloader =
+            DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
+            !this.payload.skipWebDevicePrompt &&
+            this.device.listenerCount(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE) > 0;
+
+          if (canPromptWebUsbBootloader) {
+            webUsbCheckCount += 1;
+            if (webUsbCheckCount > 4) {
+              this.postTipMessage(FirmwareUpdateTipMessage.SelectDeviceInBootloaderForWebDevice);
+              try {
+                await this._promptDeviceInBootloaderForWebDevice();
+              } catch (e) {
+                Log.log('WebUSB re-authorization failed: ', e);
+              }
+              webUsbCheckCount = 0;
+            }
+          } else {
+            webUsbCheckCount = 0;
+          }
+
           const { deviceList } = await DevicePool.getDevices(devicesDescriptor, this.connectId);
 
           if (deviceList.length === 1) {

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -40,8 +40,6 @@ const isDeviceDisconnectedError = (error: unknown) => {
 export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
 
-  protected hasPromptedWebUsbBootloaderReauth = false;
-
   init(): void {}
 
   run(): Promise<any> {
@@ -94,7 +92,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     );
   };
 
-  private async _promptDeviceInBootloaderForWebDevice() {
+  protected async _promptDeviceInBootloaderForWebDevice() {
     return new Promise((resolve, reject) => {
       if (this.device.listenerCount(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE) > 0) {
         this.device.emit(
@@ -195,29 +193,6 @@ 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>,
@@ -455,8 +430,8 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   }
 
   /**
-   * @description 设备重启（Bootloader 侧可用）
-   * @param rebootType 重启类型，参考 RebootType 枚举
+   * @description Device reboot (available in bootloader mode)
+   * @param rebootType Reboot type, see the RebootType enum
    */
   async reboot(rebootType: RebootType) {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());