@onekeyfe/hd-core 1.2.0-alpha.6 → 1.2.0-alpha.8

package/__tests__/connectSettings.test.ts

@@ -0,0 +1,19 @@
+import { parseConnectSettings } from '../src/data-manager/connectSettings';
+
+jest.mock('../src/data/config', () => ({
+  getSDKVersion: jest.fn(() => '1.0.0'),
+  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
+}));
+
+describe('parseConnectSettings', () => {
+  it('keeps custom configFetcher in parsed settings', () => {
+    const configFetcher = jest.fn();
+
+    const settings = parseConnectSettings({
+      fetchConfig: true,
+      configFetcher,
+    });
+
+    expect(settings.configFetcher).toBe(configFetcher);
+  });
+});

package/__tests__/protocol-v2.test.ts

@@ -2288,11 +2288,10 @@ describe('Protocol V2 firmware update targets', () => {
       'vol1:se01.bin',
       'vol1:application_p1.bin',
     ]);
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(1, {
-      targets: [{ target_id: 1, path: 'vol1:resource.bin' }],
-    });
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(2, {
+    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenCalledTimes(1);
+    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenCalledWith({
       targets: [
+        { target_id: 1, path: 'vol1:resource.bin' },
         { target_id: 3, path: 'vol1:bootloader.bin' },
         { target_id: 6, path: 'vol1:coprocessor.bin' },
         { target_id: 7, path: 'vol1:se01.bin' },
@@ -2659,7 +2658,7 @@ describe('Protocol V2 firmware update targets', () => {
 
     expect(remoteBinaries.resourceBinaryMap).toEqual([
       {
-        fileName: 'resource-resource.bin',
+        fileName: 'resource.bin',
         binary: resourceBinary,
         targetId: 1,
       },
@@ -2716,7 +2715,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(remoteBinaries).toEqual({
       resourceBinaryMap: [
         {
-          fileName: 'resource-resource.bin',
+          fileName: 'resource.bin',
           binary: resourceBinary,
           targetId: 1,
         },
@@ -2725,7 +2724,7 @@ describe('Protocol V2 firmware update targets', () => {
       fwBinaryMap: [],
       installItems: [
         {
-          fileName: 'resource-resource.bin',
+          fileName: 'resource.bin',
           binary: resourceBinary,
           targetId: 1,
           kind: 'resource',
@@ -2846,78 +2845,7 @@ describe('Protocol V2 firmware update targets', () => {
     getFirmwareLatestReleaseSpy.mockRestore();
   });
 
-  test('installs multiple Pro2 resource crates as separate update requests', async () => {
-    const method = new FirmwareUpdateV4({
-      id: 1,
-      payload: {
-        method: 'firmwareUpdateV4',
-      },
-    });
-
-    const operations: string[] = [];
-    method.postTipMessage = jest.fn();
-    method.postProgressMessage = jest.fn();
-    (method as any).protocolV2CommonUpdateProcess = jest
-      .fn()
-      .mockImplementation(params => {
-        operations.push(`write:${params.filePath}`);
-        return Promise.resolve(
-          Number(params.processedSize ?? 0) + Number(params.payload.byteLength)
-        );
-      });
-    (method as any).protocolV2StartFirmwareUpdate = jest.fn().mockImplementation(({ targets }) => {
-      operations.push(
-        `install:${targets.map((target: { path: string }) => target.path).join(',')}`
-      );
-      return Promise.resolve(undefined);
-    });
-    (method as any).waitForProtocolV2FirmwareUpdateComplete = jest
-      .fn()
-      .mockResolvedValue(undefined);
-
-    await (method as any).executeProtocolV2Update({
-      resourceBinaryMap: [
-        {
-          fileName: 'resource-images.bin',
-          binary: new Uint8Array([1]).buffer,
-          targetId: 1,
-        },
-        {
-          fileName: 'resource-fonts.bin',
-          binary: new Uint8Array([2]).buffer,
-          targetId: 1,
-        },
-      ],
-      bootloaderBinary: null,
-      fwBinaryMap: [
-        {
-          fileName: 'application_p1.bin',
-          binary: new Uint8Array([3]).buffer,
-          targetId: 4,
-        },
-      ],
-    });
-
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(1, {
-      targets: [{ target_id: 1, path: 'vol1:resource-images.bin' }],
-    });
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(2, {
-      targets: [{ target_id: 1, path: 'vol1:resource-fonts.bin' }],
-    });
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(3, {
-      targets: [{ target_id: 4, path: 'vol1:application_p1.bin' }],
-    });
-    expect(operations).toEqual([
-      'write:vol1:resource-images.bin',
-      'write:vol1:resource-fonts.bin',
-      'write:vol1:application_p1.bin',
-      'install:vol1:resource-images.bin',
-      'install:vol1:resource-fonts.bin',
-      'install:vol1:application_p1.bin',
-    ]);
-  });
-
-  test('installs merged Pro2 resource crate as one CRATE request before firmware targets', async () => {
+  test('installs merged Pro2 resource crate and firmware targets in one update request', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -2949,7 +2877,7 @@ describe('Protocol V2 firmware update targets', () => {
     await (method as any).executeProtocolV2Update({
       resourceBinaryMap: [
         {
-          fileName: 'resource-resource.bin',
+          fileName: 'resource.bin',
           binary: new Uint8Array([1, 2]).buffer,
           targetId: 1,
         },
@@ -2964,17 +2892,17 @@ describe('Protocol V2 firmware update targets', () => {
       ],
     });
 
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(1, {
-      targets: [{ target_id: 1, path: 'vol1:resource-resource.bin' }],
-    });
-    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(2, {
-      targets: [{ target_id: 4, path: 'vol1:application_p1.bin' }],
+    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenCalledTimes(1);
+    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenCalledWith({
+      targets: [
+        { target_id: 1, path: 'vol1:resource.bin' },
+        { target_id: 4, path: 'vol1:application_p1.bin' },
+      ],
     });
     expect(operations).toEqual([
-      'write:vol1:resource-resource.bin',
+      'write:vol1:resource.bin',
       'write:vol1:application_p1.bin',
-      'install:vol1:resource-resource.bin',
-      'install:vol1:application_p1.bin',
+      'install:vol1:resource.bin,vol1:application_p1.bin',
     ]);
   });
 

package/dist/api/FirmwareUpdateV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAa/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAmV1E,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,IAAI;IAwDJ,OAAO,CAAC,8BAA8B;IAgBhC,GAAG;;;;;YAYK,aAAa;YAsDb,2BAA2B;YAW3B,uBAAuB;IAqCrC,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,mCAAmC;IAkB3C,OAAO,CAAC,oCAAoC;IAyB5C,OAAO,CAAC,qCAAqC;IAc7C,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA6C9B,kCAAkC;YA4BlC,qCAAqC;IAanD,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,sCAAsC;YAKhC,sCAAsC;YAoCtC,iCAAiC;YAmBjC,+BAA+B;IAkE7C,OAAO,CAAC,0BAA0B;IAO5B,6BAA6B;YAsBrB,+BAA+B;IAsC7C,OAAO,CAAC,6BAA6B;YAkCvB,uBAAuB;IAkHrC,OAAO,CAAC,mCAAmC;YAI7B,mCAAmC;YAYnC,oBAAoB;IAYlC,OAAO,CAAC,8BAA8B;YAIxB,yBAAyB;IAcvC,OAAO,CAAC,4BAA4B;YAqCtB,uCAAuC;YA6DvC,gCAAgC;YAchC,8BAA8B;YAqB9B,qCAAqC;YAoCrC,yBAAyB;YA+CzB,6BAA6B;IA2D3C,OAAO,CAAC,sCAAsC;YAchC,kBAAkB;YA6DlB,0BAA0B;YAS1B,6BAA6B;YAsC7B,gBAAgB;IAe9B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAa/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAmV1E,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,IAAI;IAwDJ,OAAO,CAAC,8BAA8B;IAgBhC,GAAG;;;;;YAYK,aAAa;YAsDb,2BAA2B;YAW3B,uBAAuB;IAqCrC,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,mCAAmC;IAkB3C,OAAO,CAAC,oCAAoC;IAyB5C,OAAO,CAAC,qCAAqC;IAc7C,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA6C9B,kCAAkC;YA4BlC,qCAAqC;IAanD,OAAO,CAAC,6BAA6B;IAOrC,OAAO,CAAC,sCAAsC;YAQhC,sCAAsC;YAoCtC,iCAAiC;YAmBjC,+BAA+B;IAkE7C,OAAO,CAAC,0BAA0B;IAO5B,6BAA6B;YAsBrB,+BAA+B;IAsC7C,OAAO,CAAC,6BAA6B;YAkCvB,uBAAuB;IAyFrC,OAAO,CAAC,mCAAmC;YAI7B,mCAAmC;YAYnC,oBAAoB;IAYlC,OAAO,CAAC,8BAA8B;YAIxB,yBAAyB;IAcvC,OAAO,CAAC,4BAA4B;YAqCtB,uCAAuC;YA6DvC,gCAAgC;YAchC,8BAA8B;YAqB9B,qCAAqC;YAoCrC,yBAAyB;YA+CzB,6BAA6B;IA2D3C,OAAO,CAAC,sCAAsC;YAchC,kBAAkB;YA6DlB,0BAA0B;YAS1B,6BAA6B;YAsC7B,gBAAgB;IAe9B,OAAO,CAAC,qBAAqB;CAM9B"}

package/dist/data-manager/connectSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connectSettings.d.ts","sourceRoot":"","sources":["../../src/data-manager/connectSettings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAGlC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,kBAAkB,EAAE,MAAM,CAAC;CAChC;AAmBD,eAAO,MAAM,MAAM,4DAqBlB,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,MAAM,uBAKzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAW,QAAQ,eAAe,CAAC,oBAyDnE,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"connectSettings.d.ts","sourceRoot":"","sources":["../../src/data-manager/connectSettings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAGlC,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,kBAAkB,EAAE,MAAM,CAAC;CAChC;AAmBD,eAAO,MAAM,MAAM,4DAqBlB,CAAC;AAEF,eAAO,MAAM,aAAa,SAAU,MAAM,uBAKzC,CAAC;AAEF,eAAO,MAAM,oBAAoB,WAAW,QAAQ,eAAe,CAAC,oBA6DnE,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,CAAC"}

package/dist/index.js

@@ -38916,6 +38916,9 @@ const parseConnectSettings = (input = {}) => {
     if (input.fetchConfig) {
         settings.fetchConfig = input.fetchConfig;
     }
+    if (input.configFetcher) {
+        settings.configFetcher = input.configFetcher;
+    }
     return settings;
 };
 
@@ -46068,6 +46071,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     getProtocolV2ResourceComponentFileName(key) {
         const safeKey = key.replace(/[^a-z0-9_-]/gi, '_') || 'resource';
+        if (safeKey === 'resource') {
+            return PROTOCOL_V2_REMOTE_COMPONENT_TARGETS.CRATE.fileName;
+        }
         return `resource-${safeKey}.bin`;
     }
     shouldInstallRemoteProtocolV2Component(release, key, component, target, features) {
@@ -46280,34 +46286,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 throw error;
             }
             this.postTipMessage(exports.FirmwareUpdateTipMessage.ConfirmOnDevice);
-            const firmwareTargets = [];
-            const flushFirmwareTargets = () => __awaiter(this, void 0, void 0, function* () {
-                if (firmwareTargets.length === 0)
-                    return;
-                const targets = firmwareTargets.splice(0, firmwareTargets.length);
-                Log$4.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(targets)}`);
-                const startResponse = yield this.protocolV2StartFirmwareUpdate({ targets });
-                yield this.waitForProtocolV2FirmwareUpdateComplete(targets, startResponse);
-            });
-            for (const item of stagedInstallTargets) {
-                const target = {
-                    target_id: item.targetId,
-                    path: item.path,
-                };
-                if (item.kind === 'resource') {
-                    yield flushFirmwareTargets();
-                    const resourceTargets = [target];
-                    Log$4.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest resources=${JSON.stringify(resourceTargets)}`);
-                    const startResponse = yield this.protocolV2StartFirmwareUpdate({
-                        targets: resourceTargets,
-                    });
-                    yield this.waitForProtocolV2FirmwareUpdateComplete(resourceTargets, startResponse);
-                }
-                else {
-                    firmwareTargets.push(target);
-                }
-            }
-            yield flushFirmwareTargets();
+            const allTargets = stagedInstallTargets.map(item => ({
+                target_id: item.targetId,
+                path: item.path,
+            }));
+            Log$4.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(allTargets)}`);
+            const startResponse = yield this.protocolV2StartFirmwareUpdate({ targets: allTargets });
+            yield this.waitForProtocolV2FirmwareUpdateComplete(allTargets, startResponse);
         });
     }
     getProtocolV2InstallItemStagingPath(item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.6",
+  "version": "1.2.0-alpha.8",
   "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.6",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.6",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.8",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.8",
     "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": "b0a8d032546250b02bc737d72ac23932bdc07a61"
+  "gitHead": "d2b1323e5ad9c373e72d4d092f35c9f274c1fd74"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -788,6 +788,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private getProtocolV2ResourceComponentFileName(key: string) {
     const safeKey = key.replace(/[^a-z0-9_-]/gi, '_') || 'resource';
+    if (safeKey === 'resource') {
+      return PROTOCOL_V2_REMOTE_COMPONENT_TARGETS.CRATE.fileName;
+    }
     return `resource-${safeKey}.bin`;
   }
 
@@ -1093,38 +1096,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
 
-    const firmwareTargets: Array<{ target_id: number; path: string }> = [];
-    const flushFirmwareTargets = async () => {
-      if (firmwareTargets.length === 0) return;
-      const targets = firmwareTargets.splice(0, firmwareTargets.length);
-      Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(targets)}`);
-      const startResponse = await this.protocolV2StartFirmwareUpdate({ targets });
-      await this.waitForProtocolV2FirmwareUpdateComplete(targets, startResponse);
-    };
-
-    for (const item of stagedInstallTargets) {
-      const target = {
-        target_id: item.targetId,
-        path: item.path,
-      };
-      if (item.kind === 'resource') {
-        await flushFirmwareTargets();
-        const resourceTargets = [target];
-        Log.log(
-          `[FirmwareUpdateV4] DeviceFirmwareUpdateRequest resources=${JSON.stringify(
-            resourceTargets
-          )}`
-        );
-        const startResponse = await this.protocolV2StartFirmwareUpdate({
-          targets: resourceTargets,
-        });
-        await this.waitForProtocolV2FirmwareUpdateComplete(resourceTargets, startResponse);
-      } else {
-        firmwareTargets.push(target);
-      }
-    }
-
-    await flushFirmwareTargets();
+    const allTargets = stagedInstallTargets.map(item => ({
+      target_id: item.targetId,
+      path: item.path,
+    }));
+    Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(allTargets)}`);
+    const startResponse = await this.protocolV2StartFirmwareUpdate({ targets: allTargets });
+    await this.waitForProtocolV2FirmwareUpdateComplete(allTargets, startResponse);
   }
 
   private getProtocolV2InstallItemStagingPath(item: ProtocolV2InstallItem) {

package/src/data-manager/connectSettings.ts

@@ -115,6 +115,10 @@ export const parseConnectSettings = (input: Partial<ConnectSettings> = {}) => {
     settings.fetchConfig = input.fetchConfig;
   }
 
+  if (input.configFetcher) {
+    settings.configFetcher = input.configFetcher;
+  }
+
   return settings;
 };