@onekeyfe/hd-core 1.2.0-alpha.99 → 1.2.1-alpha.0

package/src/api/FirmwareUpdateV3.ts

@@ -609,29 +609,40 @@ 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(
-                  ERRORS.TypedError(
-                    HardwareErrorCode.CallMethodNotResponse,
-                    'GetFeatures timeout',
-                    { method: 'GetFeatures', timeoutMs }
-                  )
-                ),
-              timeoutMs
-            );
-          }),
-        ]);
+        const isBrowserWebUsb = DataManager.isBrowserWebUsb(DataManager.getSettings('env'));
+        const getFeaturesPromise = isBrowserWebUsb
+          ? typedCall('GetFeatures', 'Features', {}, { timeoutMs })
+          : typedCall('GetFeatures', 'Features', {});
+        // WebUSB owns timeout cleanup so a reboot cannot leave a pending transfer blocking reconnect.
+        const featuresRes = isBrowserWebUsb
+          ? await getFeaturesPromise
+          : await Promise.race<TypedResponseMessage<'Features'>>([
+              getFeaturesPromise,
+              new Promise<never>((_, reject) => {
+                setTimeout(
+                  () =>
+                    reject(
+                      ERRORS.TypedError(
+                        HardwareErrorCode.CallMethodNotResponse,
+                        'GetFeatures timeout',
+                        { method: 'GetFeatures', timeoutMs }
+                      )
+                    ),
+                  timeoutMs
+                );
+              }),
+            ]);
         getFeaturesTimeoutCount = 0;
         const features = buildProtocolV1FeaturesPayload(featuresRes.message, this.device.features);
         const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
         const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
         const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
-        // Treat update as complete once firmware version becomes non-zero
-        if (firmwareVersion !== '0.0.0') {
+        // Browser WebUSB may read updater Features before the final reboot. Do not let cached
+        // pre-update versions promote a current 0.0.0 response to install completion.
+        const completionFirmwareVersion = isBrowserWebUsb
+          ? getDeviceFirmwareVersion(featuresRes.message).join('.')
+          : firmwareVersion;
+        if (completionFirmwareVersion !== '0.0.0') {
           this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
           DevicePool.resetState();
           return {
@@ -640,7 +651,6 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
             firmwareVersion,
           };
         }
-        // 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);