@onekeyfe/hardware-cli 1.2.0-alpha.58 → 1.2.0-alpha.59

package/dist/cli.d.ts

@@ -53,7 +53,7 @@ export declare function runFirmwareUpdateV4WithRetry({ sdk, globalOpts, params,
 }): Promise<unknown>;
 declare function buildFirmwareUpdateV4Params(opts: {
     chunkSize?: string;
-    resourceBundle?: string[];
+    resourceFile?: string[];
     romloader?: string;
     bootloader?: string;
     applicationP1?: string;
@@ -69,7 +69,7 @@ declare function buildFirmwareUpdateV4Params(opts: {
     connectProtocol: "V2";
     chunkSize: number | undefined;
     forcedUpdateRes: boolean | undefined;
-    resourceBundleFiles: {
+    resourceFiles: {
         binary: ArrayBuffer;
         devicePath: string;
     }[] | undefined;

package/dist/cli.js

@@ -485,7 +485,7 @@ 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-bundle <spec...>', 'RESC bundle direct-write spec: <localPath>:<devicePath>, e.g. wallpaper.okpkg:vol0:/bundles/images/wallpaper.okpkg')
+    .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')
@@ -957,15 +957,15 @@ async function resolveLegacyFirmwareConnectId(sdk, explicitConnectId, deviceName
         throw new Error(`BLE device has no connect ID: ${name}`);
     return connectId;
 }
-function parseResourceBundleParam(spec) {
+function parseResourceFileParam(spec) {
     const sep = spec.indexOf(':');
     if (sep <= 0 || sep === spec.length - 1) {
-        throw new Error(`Invalid --resource-bundle value: "${spec}". Expected <localPath>:<devicePath>`);
+        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-bundle device path: "${devicePath}". Expected a vol*:/... path`);
+        throw new Error(`Invalid --resource-file device path: "${devicePath}". Expected a vol*:/... path`);
     }
     return {
         binary: readBinaryParam(localPath),
@@ -974,7 +974,7 @@ function parseResourceBundleParam(spec) {
 }
 function getFirmwareUpdateV4TotalBytes(params) {
     return [
-        ...(params.resourceBundleFiles?.map(item => item.binary) ?? []),
+        ...(params.resourceFiles?.map(item => item.binary) ?? []),
         params.bootloaderBinary,
         params.applicationP1Binary,
         params.applicationP2Binary,
@@ -1209,7 +1209,7 @@ function buildFirmwareUpdateV4Params(opts) {
         connectProtocol: 'V2',
         chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
         forcedUpdateRes: opts.forcedUpdateRes,
-        resourceBundleFiles: opts.resourceBundle?.map(parseResourceBundleParam),
+        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,
@@ -1221,7 +1221,7 @@ function buildFirmwareUpdateV4Params(opts) {
         se04Binary: opts.se04 ? readBinaryParam(opts.se04) : undefined,
     };
     const hasPayload = [
-        params.resourceBundleFiles,
+        params.resourceFiles,
         params.romloaderBinary,
         params.bootloaderBinary,
         params.applicationP1Binary,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hardware-cli",
-  "version": "1.2.0-alpha.58",
+  "version": "1.2.0-alpha.59",
   "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.58",
-    "@onekeyfe/hd-core": "1.2.0-alpha.58",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.58",
-    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.58",
+    "@onekeyfe/hd-common-connect-sdk": "1.2.0-alpha.59",
+    "@onekeyfe/hd-core": "1.2.0-alpha.59",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.59",
+    "@onekeyfe/hd-transport-usb": "1.2.0-alpha.59",
     "@stoprocent/noble": "2.3.16",
     "commander": "^12.0.0"
   },
-  "gitHead": "43c11efeb7001741d4258c855b287993bc0a798e"
+  "gitHead": "98794c3032aab55e13fb2afedc645d8281141d5f"
 }

package/src/cli.ts

@@ -629,8 +629,8 @@ program
   .description('Run Protocol V2 firmware update through sdk.firmwareUpdateV4')
   .option('--chunk-size <bytes>', 'Transfer chunk size in bytes')
   .option(
-    '--resource-bundle <spec...>',
-    'RESC bundle direct-write spec: <localPath>:<devicePath>, e.g. wallpaper.okpkg:vol0:/bundles/images/wallpaper.okpkg'
+    '--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')
@@ -1253,18 +1253,16 @@ async function resolveLegacyFirmwareConnectId(
   return connectId;
 }
 
-function parseResourceBundleParam(spec: string): { binary: ArrayBuffer; devicePath: string } {
+function parseResourceFileParam(spec: string): { binary: ArrayBuffer; devicePath: string } {
   const sep = spec.indexOf(':');
   if (sep <= 0 || sep === spec.length - 1) {
-    throw new Error(
-      `Invalid --resource-bundle value: "${spec}". Expected <localPath>:<devicePath>`
-    );
+    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-bundle device path: "${devicePath}". Expected a vol*:/... path`
+      `Invalid --resource-file device path: "${devicePath}". Expected a vol*:/... path`
     );
   }
   return {
@@ -1275,7 +1273,7 @@ function parseResourceBundleParam(spec: string): { binary: ArrayBuffer; devicePa
 
 function getFirmwareUpdateV4TotalBytes(params: ReturnType<typeof buildFirmwareUpdateV4Params>) {
   return [
-    ...(params.resourceBundleFiles?.map(item => item.binary) ?? []),
+    ...(params.resourceFiles?.map(item => item.binary) ?? []),
     params.bootloaderBinary,
     params.applicationP1Binary,
     params.applicationP2Binary,
@@ -1600,7 +1598,7 @@ export async function runFirmwareUpdateV4WithRetry({
 
 function buildFirmwareUpdateV4Params(opts: {
   chunkSize?: string;
-  resourceBundle?: string[];
+  resourceFile?: string[];
   romloader?: string;
   bootloader?: string;
   applicationP1?: string;
@@ -1617,7 +1615,7 @@ function buildFirmwareUpdateV4Params(opts: {
     connectProtocol: 'V2' as const,
     chunkSize: opts.chunkSize ? safeParseInt(opts.chunkSize, '--chunk-size') : undefined,
     forcedUpdateRes: opts.forcedUpdateRes,
-    resourceBundleFiles: opts.resourceBundle?.map(parseResourceBundleParam),
+    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,
@@ -1630,7 +1628,7 @@ function buildFirmwareUpdateV4Params(opts: {
   };
 
   const hasPayload = [
-    params.resourceBundleFiles,
+    params.resourceFiles,
     params.romloaderBinary,
     params.bootloaderBinary,
     params.applicationP1Binary,