@onekeyfe/hd-core 1.2.0-alpha.5 → 1.2.0-alpha.7

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

@@ -2917,6 +2917,67 @@ describe('Protocol V2 firmware update targets', () => {
     ]);
   });
 
+  test('installs merged Pro2 resource crate as one CRATE request before firmware targets', 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-resource.bin',
+          binary: new Uint8Array([1, 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-resource.bin' }],
+    });
+    expect((method as any).protocolV2StartFirmwareUpdate).toHaveBeenNthCalledWith(2, {
+      targets: [{ target_id: 4, path: 'vol1:application_p1.bin' }],
+    });
+    expect(operations).toEqual([
+      'write:vol1:resource-resource.bin',
+      'write:vol1:application_p1.bin',
+      'install:vol1:resource-resource.bin',
+      'install:vol1:application_p1.bin',
+    ]);
+  });
+
   test('skips Pro2 firmware components when configured versions are already installed', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.5",
+  "version": "1.2.0-alpha.7",
   "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.5",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.5",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.7",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.7",
     "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": "703cfb4e17c6f9315afcb0522ee23ea016ede659"
+  "gitHead": "001372047f518aaeed5fcbe87b990b8b619a9a65"
 }

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

package/src/types/api/firmwareUpdate.ts

@@ -81,7 +81,7 @@ export interface FirmwareUpdateV4Params {
   se02Binary?: ArrayBuffer;
   se03Binary?: ArrayBuffer;
   se04Binary?: ArrayBuffer;
-  /** 资源包通过 FW_MGMT_TARGET_CRATE = 1 安装；每个元素是一个独立资源包 */
+  /** 资源包通过 FW_MGMT_TARGET_CRATE = 1 安装；Pro2 正常升级推荐传入单个合并 CRATE，多个元素仅用于调试/兼容 */
   resourceBinaries?: ArrayBuffer[];
   forcedUpdateRes?: boolean;
 }