@onekeyfe/hd-core 1.2.0-alpha.30 → 1.2.0-alpha.31

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

@@ -0,0 +1,58 @@
+import FirmwareUpdateV3 from '../../src/api/FirmwareUpdateV3';
+import type { Device } from '../../src/device/Device';
+import { DevicePool } from '../../src/device/DevicePool';
+
+jest.mock('../../src/data/config', () => ({
+  getSDKVersion: jest.fn(() => '1.0.0'),
+  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
+}));
+
+describe('FirmwareUpdateV3 reconnect', () => {
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('keeps transient USB acquire failures inside the reconnect loop', async () => {
+    const acquire = jest.fn().mockResolvedValue(undefined);
+    const commands = {
+      disposed: true,
+      mainId: '',
+    };
+    const cachedDevice = {} as Device;
+    const updateFromCache = jest.fn();
+    jest.spyOn(DevicePool, 'getDevices').mockResolvedValue({
+      devices: {},
+      deviceList: [cachedDevice],
+    });
+
+    const method = new FirmwareUpdateV3({
+      id: 1,
+      payload: {
+        method: 'firmwareUpdateV3',
+        connectId: 'usb-path',
+      },
+    });
+    method.isBleReconnect = jest.fn(() => false);
+    method.device = {
+      deviceConnector: {
+        enumerate: jest.fn().mockResolvedValue({
+          descriptors: [{ path: 'usb-path' }],
+        }),
+      },
+      updateFromCache,
+      acquire,
+      commands,
+      getCommands: () => commands,
+      mainId: 'usb-session',
+    } as unknown as Device;
+
+    await method.waitForDeviceReconnect(1000);
+
+    expect(updateFromCache).toHaveBeenCalledWith(cachedDevice);
+    expect(acquire).toHaveBeenCalledWith(undefined, {
+      throwOnRunPromiseError: true,
+    });
+    expect(commands.disposed).toBe(false);
+    expect(commands.mainId).toBe('usb-session');
+  });
+});

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;AAY/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;IAmFE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAwN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CAuE7C"}
+{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAY/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;IAmFE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAwN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CA2E7C"}

package/dist/index.js

@@ -49474,7 +49474,9 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, this.connectId);
                         if (deviceList.length === 1) {
                             this.device.updateFromCache(deviceList[0]);
-                            yield this.device.acquire();
+                            yield this.device.acquire(undefined, {
+                                throwOnRunPromiseError: true,
+                            });
                             this.device.commands.disposed = false;
                             this.device.getCommands().mainId = (_d = this.device.mainId) !== null && _d !== void 0 ? _d : '';
                             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.30",
+  "version": "1.2.0-alpha.31",
   "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.30",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.30",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.31",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.31",
     "axios": "1.15.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": "07405d2e3dcdd0ba351ae98b7cf4f61690ef2913"
+  "gitHead": "01354bd66a7ef042a47f45c9ba80c49ba5b241de"
 }

package/src/api/FirmwareUpdateV3.ts

@@ -746,7 +746,11 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
 
           if (deviceList.length === 1) {
             this.device.updateFromCache(deviceList[0]);
-            await this.device.acquire();
+            // Reconnect failures are expected while installation still owns USB.
+            // Keep them in this polling loop instead of rejecting the active firmware run.
+            await this.device.acquire(undefined, {
+              throwOnRunPromiseError: true,
+            });
             this.device.commands.disposed = false;
             this.device.getCommands().mainId = this.device.mainId ?? '';
             return;