@onekeyfe/hardware-cli 1.2.0-alpha.97 → 1.2.0-alpha.98

package/dist/cli.d.ts

@@ -53,7 +53,6 @@ export declare function runFirmwareUpdateV4WithRetry({ sdk, globalOpts, params,
 }): Promise<unknown>;
 declare function buildFirmwareUpdateV4Params(opts: {
     chunkSize?: string;
-    resourceFile?: string[];
     romloader?: string;
     bootloader?: string;
     applicationP1?: string;
@@ -63,16 +62,13 @@ declare function buildFirmwareUpdateV4Params(opts: {
     se02?: string;
     se03?: string;
     se04?: string;
+    resourceArchive?: string;
     forcedUpdateRes?: boolean;
 }): {
     platform: "desktop";
     connectProtocol: "V2";
     chunkSize: number | undefined;
     forcedUpdateRes: boolean | undefined;
-    resourceFiles: {
-        binary: ArrayBuffer;
-        devicePath: string;
-    }[] | undefined;
     romloaderBinary: ArrayBuffer | undefined;
     bootloaderBinary: ArrayBuffer | undefined;
     applicationP1Binary: ArrayBuffer | undefined;
@@ -82,5 +78,6 @@ declare function buildFirmwareUpdateV4Params(opts: {
     se02Binary: ArrayBuffer | undefined;
     se03Binary: ArrayBuffer | undefined;
     se04Binary: ArrayBuffer | undefined;
+    resourceArchiveBinary: ArrayBuffer | undefined;
 };
 export { program };

package/dist/cli.js

@@ -485,7 +485,6 @@ program
     .command('firmware-update-v4')
     .description('Run Protocol V2 firmware update through sdk.firmwareUpdateV4')
     .option('--chunk-size <bytes>', 'Transfer chunk size in bytes')
-    .option('--resource-file <spec...>', 'Resource direct-write spec: <localPath>:<devicePath>, e.g. wallpaper.okpkg:vol0:/bundles/images/wallpaper.okpkg')
     .option('--romloader <path>', 'FW_MGMT_TARGET_ROMLOADER binary path')
     .option('--bootloader <path>', 'FW_MGMT_TARGET_BOOTLOADER binary path')
     .option('--application-p1 <path>', 'FW_MGMT_TARGET_APPLICATION_P1 binary path')
@@ -495,6 +494,7 @@ program
     .option('--se02 <path>', 'FW_MGMT_TARGET_SE02 binary path')
     .option('--se03 <path>', 'FW_MGMT_TARGET_SE03 binary path')
     .option('--se04 <path>', 'FW_MGMT_TARGET_SE04 binary path')
+    .option('--resource-archive <path>', 'Complete signed Protocol V2 resource ZIP path')
     .option('--forced-update-res', 'Force resource update')
     .option('--retries <count>', 'Retry count for transient Protocol V2 USB probe failures')
     .action(opts => runCommand({}, async ({ sdk, globalOpts }) => {
@@ -957,24 +957,8 @@ async function resolveLegacyFirmwareConnectId(sdk, explicitConnectId, deviceName
         throw new Error(`BLE device has no connect ID: ${name}`);
     return connectId;
 }
-function parseResourceFileParam(spec) {
-    const sep = spec.indexOf(':');
-    if (sep <= 0 || sep === spec.length - 1) {
-        throw new Error(`Invalid --resource-file value: "${spec}". Expected <localPath>:<devicePath>`);
-    }
-    const localPath = spec.slice(0, sep);
-    const devicePath = spec.slice(sep + 1);
-    if (!devicePath.startsWith('vol')) {
-        throw new Error(`Invalid --resource-file device path: "${devicePath}". Expected a vol*:/... path`);
-    }
-    return {
-        binary: readBinaryParam(localPath),
-        devicePath,
-    };
-}
 function getFirmwareUpdateV4TotalBytes(params) {
     return [
-        ...(params.resourceFiles?.map(item => item.binary) ?? []),
         params.bootloaderBinary,
         params.applicationP1Binary,
         params.applicationP2Binary,
@@ -1209,7 +1193,6 @@ function buildFirmwareUpdateV4Params(opts) {
         connectProtocol: 'V2',
         chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
         forcedUpdateRes: opts.forcedUpdateRes,
-        resourceFiles: opts.resourceFile?.map(parseResourceFileParam),
         romloaderBinary: opts.romloader ? readBinaryParam(opts.romloader) : undefined,
         bootloaderBinary: opts.bootloader ? readBinaryParam(opts.bootloader) : undefined,
         applicationP1Binary: opts.applicationP1 ? readBinaryParam(opts.applicationP1) : undefined,
@@ -1219,9 +1202,9 @@ function buildFirmwareUpdateV4Params(opts) {
         se02Binary: opts.se02 ? readBinaryParam(opts.se02) : undefined,
         se03Binary: opts.se03 ? readBinaryParam(opts.se03) : undefined,
         se04Binary: opts.se04 ? readBinaryParam(opts.se04) : undefined,
+        resourceArchiveBinary: opts.resourceArchive ? readBinaryParam(opts.resourceArchive) : undefined,
     };
     const hasPayload = [
-        params.resourceFiles,
         params.romloaderBinary,
         params.bootloaderBinary,
         params.applicationP1Binary,
@@ -1231,9 +1214,10 @@ function buildFirmwareUpdateV4Params(opts) {
         params.se02Binary,
         params.se03Binary,
         params.se04Binary,
+        params.resourceArchiveBinary,
     ].some(Boolean);
     if (!hasPayload) {
-        const err = new Error('firmware-update-v4 requires at least one binary path');
+        const err = new Error('firmware-update-v4 requires at least one firmware binary or resource archive path');
         err.code = 'MISSING_FIRMWARE_BINARY';
         throw err;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.97",
+  "version": "1.2.0-alpha.98",
   "description": "OneKey hardware wallet CLI for testing device communication",
   "author": "OneKey",
   "license": "Apache-2.0",
@@ -31,12 +31,12 @@
     "test": "jest"
   },
   "dependencies": {
-    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.97",
-    "@onekeyfe/hd-core": "1.2.0-alpha.97",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.97",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.97",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.98",
+    "@onekeyfe/hd-core": "1.2.0-alpha.98",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.98",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.98",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "d68cfec311df84b21124066ce3fe608596e4af0d"
+  "gitHead": "10f2dcaecec17a629216c2402cc9ab8801987297"
 }

package/src/__tests__/firmware-update-v4-command.test.ts

@@ -36,6 +36,7 @@ describe('firmware-update-v4 CLI command', () => {
     expect(command?.description()).toBe(
       'Run Protocol V2 firmware update through sdk.firmwareUpdateV4'
     );
+    expect(command?.options.some(option => option.long === '--resource-archive')).toBe(true);
   });
 
   test('does not expose the pre-release firmware-update-v4-debug command', () => {

package/src/cli.ts

@@ -628,10 +628,6 @@ program
   .command('firmware-update-v4')
   .description('Run Protocol V2 firmware update through sdk.firmwareUpdateV4')
   .option('--chunk-size <bytes>', 'Transfer chunk size in bytes')
-  .option(
-    '--resource-file <spec...>',
-    'Resource direct-write spec: <localPath>:<devicePath>, e.g. wallpaper.okpkg:vol0:/bundles/images/wallpaper.okpkg'
-  )
   .option('--romloader <path>', 'FW_MGMT_TARGET_ROMLOADER binary path')
   .option('--bootloader <path>', 'FW_MGMT_TARGET_BOOTLOADER binary path')
   .option('--application-p1 <path>', 'FW_MGMT_TARGET_APPLICATION_P1 binary path')
@@ -641,6 +637,7 @@ program
   .option('--se02 <path>', 'FW_MGMT_TARGET_SE02 binary path')
   .option('--se03 <path>', 'FW_MGMT_TARGET_SE03 binary path')
   .option('--se04 <path>', 'FW_MGMT_TARGET_SE04 binary path')
+  .option('--resource-archive <path>', 'Complete signed Protocol V2 resource ZIP path')
   .option('--forced-update-res', 'Force resource update')
   .option('--retries <count>', 'Retry count for transient Protocol V2 USB probe failures')
   .action(opts =>
@@ -1253,27 +1250,8 @@ async function resolveLegacyFirmwareConnectId(
   return connectId;
 }
 
-function parseResourceFileParam(spec: string): { binary: ArrayBuffer; devicePath: string } {
-  const sep = spec.indexOf(':');
-  if (sep <= 0 || sep === spec.length - 1) {
-    throw new Error(`Invalid --resource-file value: "${spec}". Expected <localPath>:<devicePath>`);
-  }
-  const localPath = spec.slice(0, sep);
-  const devicePath = spec.slice(sep + 1);
-  if (!devicePath.startsWith('vol')) {
-    throw new Error(
-      `Invalid --resource-file device path: "${devicePath}". Expected a vol*:/... path`
-    );
-  }
-  return {
-    binary: readBinaryParam(localPath),
-    devicePath,
-  };
-}
-
 function getFirmwareUpdateV4TotalBytes(params: ReturnType<typeof buildFirmwareUpdateV4Params>) {
   return [
-    ...(params.resourceFiles?.map(item => item.binary) ?? []),
     params.bootloaderBinary,
     params.applicationP1Binary,
     params.applicationP2Binary,
@@ -1598,7 +1576,6 @@ export async function runFirmwareUpdateV4WithRetry({
 
 function buildFirmwareUpdateV4Params(opts: {
   chunkSize?: string;
-  resourceFile?: string[];
   romloader?: string;
   bootloader?: string;
   applicationP1?: string;
@@ -1608,6 +1585,7 @@ function buildFirmwareUpdateV4Params(opts: {
   se02?: string;
   se03?: string;
   se04?: string;
+  resourceArchive?: string;
   forcedUpdateRes?: boolean;
 }) {
   const params = {
@@ -1615,7 +1593,6 @@ function buildFirmwareUpdateV4Params(opts: {
     connectProtocol: 'V2' as const,
     chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
     forcedUpdateRes: opts.forcedUpdateRes,
-    resourceFiles: opts.resourceFile?.map(parseResourceFileParam),
     romloaderBinary: opts.romloader ? readBinaryParam(opts.romloader) : undefined,
     bootloaderBinary: opts.bootloader ? readBinaryParam(opts.bootloader) : undefined,
     applicationP1Binary: opts.applicationP1 ? readBinaryParam(opts.applicationP1) : undefined,
@@ -1625,10 +1602,10 @@ function buildFirmwareUpdateV4Params(opts: {
     se02Binary: opts.se02 ? readBinaryParam(opts.se02) : undefined,
     se03Binary: opts.se03 ? readBinaryParam(opts.se03) : undefined,
     se04Binary: opts.se04 ? readBinaryParam(opts.se04) : undefined,
+    resourceArchiveBinary: opts.resourceArchive ? readBinaryParam(opts.resourceArchive) : undefined,
   };
 
   const hasPayload = [
-    params.resourceFiles,
     params.romloaderBinary,
     params.bootloaderBinary,
     params.applicationP1Binary,
@@ -1638,10 +1615,13 @@ function buildFirmwareUpdateV4Params(opts: {
     params.se02Binary,
     params.se03Binary,
     params.se04Binary,
+    params.resourceArchiveBinary,
   ].some(Boolean);
 
   if (!hasPayload) {
-    const err = new Error('firmware-update-v4 requires at least one binary path');
+    const err = new Error(
+      'firmware-update-v4 requires at least one firmware binary or resource archive path'
+    );
     (err as Error & { code?: string }).code = 'MISSING_FIRMWARE_BINARY';
     throw err;
   }