@onekeyfe/hd-core 1.2.0-alpha.111 → 1.2.0-alpha.113

package/__tests__/firmware-update/firmware-update-v3-reconnect.test.ts

@@ -1,6 +1,7 @@
 import * as hdShared from '@onekeyfe/hd-shared';
 
 import FirmwareUpdateV3 from '../../src/api/FirmwareUpdateV3';
+import { DataManager } from '../../src/data-manager';
 import { DevicePool } from '../../src/device/DevicePool';
 
 import type { Device } from '../../src/device/Device';
@@ -112,10 +113,125 @@ describe('FirmwareUpdateV3 reconnect', () => {
         })
       ).rejects.toBe(reconnectError);
 
+      expect(commands.typedCall).toHaveBeenCalledWith('GetFeatures', 'Features', {});
       expect(waitForDeviceReconnect).toHaveBeenCalledWith(3 * 60 * 1000);
     } finally {
       jest.clearAllTimers();
       jest.useRealTimers();
     }
   });
+
+  it('lets Browser WebUSB clean up a timed out install probe before reconnecting', async () => {
+    jest.spyOn(hdShared, 'wait').mockResolvedValue(undefined);
+    jest.spyOn(DataManager, 'getSettings').mockReturnValue('webusb' as never);
+    jest.spyOn(DataManager, 'isBrowserWebUsb').mockReturnValue(true);
+    const method = new FirmwareUpdateV3({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV3',
+        connectId: 'webusb-device',
+      },
+    });
+    const reconnectError = new Error('stop after WebUSB reconnect assertion');
+    const waitForDeviceReconnect = jest
+      .spyOn(method, 'waitForDeviceReconnect')
+      .mockRejectedValue(reconnectError);
+    method.isBleReconnect = jest.fn(() => false);
+    method.params = {
+      platform: 'web',
+    } as any;
+    const commands = {
+      typedCall: jest.fn().mockRejectedValue(new Error('Protocol V1 read timeout after 3000ms')),
+    };
+    method.device = {
+      features: {},
+      getCommands: () => commands,
+    } as unknown as Device;
+    (method as any).createUpdatesFolderIfNotExists = jest.fn().mockResolvedValue(undefined);
+    (method as any).startEmmcFirmwareUpdate = jest.fn().mockResolvedValue(undefined);
+    method.postTipMessage = jest.fn();
+    method.postProcessingMessage = jest.fn();
+    method.postProgressMessage = jest.fn();
+
+    await expect(
+      (method as any).executeUpdate({
+        resourceBinary: null,
+        resourceEntries: [],
+        fwSources: [],
+        bootloaderSource: null,
+      })
+    ).rejects.toBe(reconnectError);
+
+    expect(commands.typedCall).toHaveBeenCalledWith(
+      'GetFeatures',
+      'Features',
+      {},
+      {
+        timeoutMs: 3000,
+      }
+    );
+    expect(waitForDeviceReconnect).toHaveBeenCalledWith(60 * 1000);
+  });
+
+  it('does not treat cached firmware versions as Browser WebUSB install completion', async () => {
+    jest.spyOn(hdShared, 'wait').mockResolvedValue(undefined);
+    jest.spyOn(DataManager, 'getSettings').mockReturnValue('webusb' as never);
+    jest.spyOn(DataManager, 'isBrowserWebUsb').mockReturnValue(true);
+    const method = new FirmwareUpdateV3({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV3',
+        connectId: 'webusb-device',
+      },
+    });
+    method.params = {
+      platform: 'web',
+    } as any;
+    const commands = {
+      typedCall: jest
+        .fn()
+        .mockResolvedValueOnce({
+          type: 'Features',
+          message: {
+            major_version: 0,
+            minor_version: 0,
+            patch_version: 0,
+          },
+        })
+        .mockResolvedValueOnce({
+          type: 'Features',
+          message: {
+            major_version: 4,
+            minor_version: 21,
+            patch_version: 0,
+            onekey_ble_version: '2.3.7',
+          },
+        }),
+    };
+    method.device = {
+      features: {
+        firmwareVersion: '4.21.0',
+        bleVersion: '2.3.7',
+      },
+      getCommands: () => commands,
+    } as unknown as Device;
+    (method as any).createUpdatesFolderIfNotExists = jest.fn().mockResolvedValue(undefined);
+    (method as any).startEmmcFirmwareUpdate = jest.fn().mockResolvedValue(undefined);
+    method.postTipMessage = jest.fn();
+    method.postProcessingMessage = jest.fn();
+    method.postProgressMessage = jest.fn();
+
+    const result = await (method as any).executeUpdate({
+      resourceBinary: null,
+      resourceEntries: [],
+      fwSources: [],
+      bootloaderSource: null,
+    });
+
+    expect(commands.typedCall).toHaveBeenCalledTimes(2);
+    expect(result).toMatchObject({
+      firmwareVersion: '4.21.0',
+      bleVersion: '2.3.7',
+    });
+  });
 });

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;AAc/E,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAMnE,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,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,eAAe,CAA4B;IAEnD,IAAI;IA8HE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAyN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CA+E7C"}
+{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAc/E,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAMnE,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,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,eAAe,CAA4B;IAEnD,IAAI;IA8HE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAmO3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CA+E7C"}

package/dist/index.js

@@ -51318,18 +51318,27 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 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(hdShared.ERRORS.TypedError(hdShared.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', {});
+                    const featuresRes = isBrowserWebUsb
+                        ? yield getFeaturesPromise
+                        : yield Promise.race([
+                            getFeaturesPromise,
+                            new Promise((_, reject) => {
+                                setTimeout(() => reject(hdShared.ERRORS.TypedError(hdShared.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('.');
-                    if (firmwareVersion !== '0.0.0') {
+                    const completionFirmwareVersion = isBrowserWebUsb
+                        ? getDeviceFirmwareVersion(featuresRes.message).join('.')
+                        : firmwareVersion;
+                    if (completionFirmwareVersion !== '0.0.0') {
                         this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
                         DevicePool.resetState();
                         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.111",
+  "version": "1.2.0-alpha.113",
   "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.2.0-alpha.111",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.111",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.113",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.113",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "7619f316471ad423fb83f68e82e1aec89f34ac0a"
+  "gitHead": "859d0105877f964acb536cd6f337d2d3999d22d5"
 }

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);