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

package/__tests__/protocol-v2.test.ts

@@ -10,6 +10,7 @@ import FileWrite from '../src/api/FileWrite';
 import DeviceFactoryInfoGet from '../src/api/protocol-v2/DeviceFactoryInfoGet';
 import DeviceFactoryInfoSet from '../src/api/protocol-v2/DeviceFactoryInfoSet';
 import DeviceFirmwareUpdate from '../src/api/protocol-v2/DeviceFirmwareUpdate';
+import DeviceGetFirmwareUpdateStatus from '../src/api/protocol-v2/DeviceGetFirmwareUpdateStatus';
 import DeviceInfoGet from '../src/api/protocol-v2/DeviceInfoGet';
 import DeviceReboot from '../src/api/protocol-v2/DeviceReboot';
 import FilesystemPermissionFix from '../src/api/protocol-v2/FilesystemPermissionFix';
@@ -2590,6 +2591,7 @@ describe('Protocol V2 firmware update targets', () => {
       resourceBinaryMap: [],
       bootloaderBinary: null,
       fwBinaryMap: [],
+      installItems: [],
     });
     expect(getSysResourceBinarySpy).not.toHaveBeenCalled();
     expect(typedCall.mock.calls[0][2]).toEqual({
@@ -2721,6 +2723,14 @@ describe('Protocol V2 firmware update targets', () => {
       ],
       bootloaderBinary: null,
       fwBinaryMap: [],
+      installItems: [
+        {
+          fileName: 'resource-resource.bin',
+          binary: resourceBinary,
+          targetId: 1,
+          kind: 'resource',
+        },
+      ],
     });
 
     getSysResourceBinarySpy.mockRestore();
@@ -2844,14 +2854,23 @@ describe('Protocol V2 firmware update targets', () => {
       },
     });
 
+    const operations: string[] = [];
     method.postTipMessage = jest.fn();
     method.postProgressMessage = jest.fn();
     (method as any).protocolV2CommonUpdateProcess = jest
       .fn()
-      .mockImplementation(params =>
-        Promise.resolve(Number(params.processedSize ?? 0) + Number(params.payload.byteLength))
+      .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(',')}`
       );
-    (method as any).protocolV2StartFirmwareUpdate = jest.fn().mockResolvedValue(undefined);
+      return Promise.resolve(undefined);
+    });
     (method as any).waitForProtocolV2FirmwareUpdateComplete = jest
       .fn()
       .mockResolvedValue(undefined);
@@ -2888,6 +2907,75 @@ describe('Protocol V2 firmware update targets', () => {
     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 () => {
+    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 () => {
@@ -2944,6 +3032,7 @@ describe('Protocol V2 firmware update targets', () => {
       resourceBinaryMap: [],
       bootloaderBinary: null,
       fwBinaryMap: [],
+      installItems: [],
     });
     expect(getSysResourceBinarySpy).not.toHaveBeenCalled();
 
@@ -3361,6 +3450,44 @@ describe('Protocol V2 firmware update method', () => {
       targets: [{ target_id: 1, path: 'vol0:resource.bin' }],
     });
   });
+
+  test('passes firmware update status fields through to Protocol V2', async () => {
+    const typedCall = jest.fn().mockResolvedValue({
+      message: {
+        records: [{ target_id: 4, status: 2, payload_version: 1, path: 'vol1:application_p1.bin' }],
+      },
+    });
+    const method = new DeviceGetFirmwareUpdateStatus({
+      id: 1,
+      payload: {
+        method: 'deviceGetFirmwareUpdateStatus',
+        fields: {
+          status: true,
+          payload_version: true,
+          path: true,
+        },
+      },
+    });
+    method.init();
+    (method as any).device = stubDevice({
+      commands: { typedCall },
+    });
+
+    await expect(method.run()).resolves.toEqual({
+      records: [{ target_id: 4, status: 2, payload_version: 1, path: 'vol1:application_p1.bin' }],
+    });
+    expect(typedCall).toHaveBeenCalledWith(
+      'DeviceFirmwareUpdateStatusGet',
+      'DeviceFirmwareUpdateStatus',
+      {
+        fields: {
+          status: true,
+          payload_version: true,
+          path: true,
+        },
+      }
+    );
+  });
 });
 
 describe('Protocol V2 reboot methods', () => {

package/dist/api/FirmwareUpdateV4.d.ts

@@ -13,6 +13,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     private prepareResourceBinaries;
     private prepareBootloaderBinary;
     private hasExplicitProtocolV2Payload;
+    private buildProtocolV2InstallItems;
     private getRemoteComponentEntries;
     private getRemoteComponentTarget;
     private getProtocolV2ComponentTargetVersion;
@@ -32,6 +33,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     private waitForProtocolV2BootloaderMode;
     private collectExplicitTargetBinaries;
     private executeProtocolV2Update;
+    private getProtocolV2InstallItemStagingPath;
     private queryProtocolV2FirmwareUpdateStatus;
     private pingProtocolV2Device;
     private isProtocolV2NormalModeFeatures;

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;AA6U1E,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,IAAI;IAwDJ,OAAO,CAAC,8BAA8B;IAgBhC,GAAG;;;;;YAYK,aAAa;YAmDb,2BAA2B;YAW3B,uBAAuB;IAqCrC,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,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;IAqD7C,OAAO,CAAC,0BAA0B;IAO5B,6BAA6B;YAsBrB,+BAA+B;IAsC7C,OAAO,CAAC,6BAA6B;YAkCvB,uBAAuB;YAiIvB,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;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"}

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts

@@ -7,6 +7,7 @@ import type { Deferred } from '@onekeyfe/hd-shared';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 export declare class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     checkPromise: Deferred<any> | null;
+    private shouldPostFirmwareProgress;
     init(): void;
     run(): Promise<any>;
     isBleReconnect(): boolean;

package/dist/api/firmware/FirmwareUpdateBaseMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAQhF;cAEc,qCAAqC;cAkBrC,uCAAuC;IAkBvD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YA0FvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}
+{"version":3,"file":"FirmwareUpdateBaseMethod.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdateBaseMethod.ts"],"names":[],"mappings":";AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,KAAK,EACV,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAexE,qBAAa,wBAAwB,CAAC,MAAM,CAAE,SAAQ,UAAU,CAAC,MAAM,CAAC;IACtE,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,OAAO,CAAC,0BAA0B,CAAoC;IAEtE,IAAI,IAAI,IAAI;IAEZ,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAInB,cAAc,IAAI,OAAO;IASzB,cAAc,YAAa,yBAAyB,UASlD;IAMF,qBAAqB,SAAU,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,UAAU,UAM3E;IAMF,mBAAmB,aAAc,MAAM,gBAAgB,2BAA2B,UAYhF;cAEc,qCAAqC;cAkBrC,uCAAuC;IAkBvD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YA0FvC,4BAA4B;IAuBpC,mBAAmB;IA8CnB,uBAAuB,CAAC,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IA6BlD,8BAA8B,CAAC,IAAI,EAAE,MAAM;IAW3C,uBAAuB,CAAC,EAC5B,OAAO,EACP,QAAQ,EACR,aAAa,EACb,SAAS,GACV,EAAE,KAAK,CAAC,cAAc,GAAG;QACxB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IA4CK,sBAAsB,CAC1B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,WAAW,GAAG,MAAM,EAC3B,SAAS,EAAE,OAAO,EAClB,QAAQ,EAAE,MAAM,GAAG,IAAI;IAwEnB,MAAM,CAAC,UAAU,EAAE,UAAU;CAsBpC"}

package/dist/api/firmware/progressThrottle.d.ts

@@ -0,0 +1,3 @@
+import type { IFirmwareUpdateProgressType } from '../../events/ui-request';
+export declare const createFirmwareProgressThrottle: (intervalMs?: number) => (progress: number, progressType: IFirmwareUpdateProgressType) => boolean;
+//# sourceMappingURL=progressThrottle.d.ts.map

package/dist/api/firmware/progressThrottle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"progressThrottle.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/progressThrottle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAS3E,eAAO,MAAM,8BAA8B,sCAKvB,MAAM,gBAAgB,2BAA2B,YA6BpE,CAAC"}

package/dist/api/protocol-v2/DeviceGetFirmwareUpdateStatus.d.ts

@@ -1,6 +1,7 @@
 import { BaseMethod } from '../BaseMethod';
-export default class DeviceGetFirmwareUpdateStatus extends BaseMethod {
+import type { DeviceFirmwareUpdateStatusGetParams } from './helpers';
+export default class DeviceGetFirmwareUpdateStatus extends BaseMethod<DeviceFirmwareUpdateStatusGetParams> {
     init(): void;
-    run(): Promise<import("packages/hd-transport/dist").DeviceFirmwareUpdateStatus>;
+    run(): Promise<import("@onekeyfe/hd-transport").DeviceFirmwareUpdateStatus>;
 }
 //# sourceMappingURL=DeviceGetFirmwareUpdateStatus.d.ts.map

package/dist/api/protocol-v2/DeviceGetFirmwareUpdateStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceGetFirmwareUpdateStatus.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceGetFirmwareUpdateStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,6BAA8B,SAAQ,UAAU;IACnE,IAAI;IAQE,GAAG;CAQV"}
+{"version":3,"file":"DeviceGetFirmwareUpdateStatus.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceGetFirmwareUpdateStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAgCrE,MAAM,CAAC,OAAO,OAAO,6BAA8B,SAAQ,UAAU,CAAC,mCAAmC,CAAC;IACxG,IAAI;IASE,GAAG;CAQV"}

package/dist/api/protocol-v2/helpers.d.ts

@@ -1,5 +1,5 @@
 import { DeviceRebootType } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareTarget, DeviceFirmwareTargetType, TransportCallOptions } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareTarget, DeviceFirmwareUpdateRecordFields, DeviceFirmwareTargetType, TransportCallOptions } from '@onekeyfe/hd-transport';
 export type RebootTypeInput = DeviceRebootType | keyof typeof DeviceRebootType | string | number;
 export type DeviceRebootParams = {
     rebootType?: RebootTypeInput;
@@ -16,6 +16,9 @@ export type DeviceFirmwareUpdateParams = {
     target_id?: DeviceFirmwareTargetType | string | number;
     path?: string;
 };
+export type DeviceFirmwareUpdateStatusGetParams = {
+    fields?: DeviceFirmwareUpdateRecordFields;
+};
 export type DeviceFactoryInfoSetParams = {
     version?: number;
     serial_number?: string;

package/dist/api/protocol-v2/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACxB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,MAAM,OAAO,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACjC,oBAAoB,GACpB;IACE,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,gBAAgB,CAAC,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAaF,eAAO,MAAM,mCAAmC,EAAE,oBAEjD,CAAC;AAEF,eAAO,MAAM,0CAA0C,EAAE,CACrD,SAAS,GACT,4BAA4B,CAC/B,EAA8C,CAAC;AAEhD,eAAO,MAAM,6BAA6B,UAAW,OAAO,WA6B3D,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAAW,OAAO,YAwBjE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,gBAAgB,CAQxF;AAoCD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,0BAA0B,GACjC,oBAAoB,EAAE,CA0BxB"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EACV,oBAAoB,EACpB,gCAAgC,EAChC,wBAAwB,EACxB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,MAAM,OAAO,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEjG,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GACjC,oBAAoB,GACpB;IACE,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,yBAAyB,EAAE,CAAC;IACtC,QAAQ,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACtD,SAAS,CAAC,EAAE,wBAAwB,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,MAAM,CAAC,EAAE,gCAAgC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,gBAAgB,CAAC,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAaF,eAAO,MAAM,mCAAmC,EAAE,oBAEjD,CAAC;AAEF,eAAO,MAAM,0CAA0C,EAAE,CACrD,SAAS,GACT,4BAA4B,CAC/B,EAA8C,CAAC;AAEhD,eAAO,MAAM,6BAA6B,UAAW,OAAO,WA6B3D,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAAW,OAAO,YAwBjE,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,GAAG,gBAAgB,CAQxF;AAoCD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,0BAA0B,GACjC,oBAAoB,EAAE,CA0BxB"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import EventEmitter, { EventEmitter as EventEmitter$1 } from 'events';
-import { DeviceFirmwareTargetType, DeviceRebootType, DeviceFirmwareTarget, Messages, Transport, TransportCallOptions, OneKeyDeviceInfo, ProtocolV2DeviceInfo, Success as Success$1, LowlevelTransportSharedPlugin, ProtocolInfo, DeviceFirmwareUpdateStatus, DeviceFactoryInfo, OneKeyDeviceCommType, Features as Features$1, ProtocolType, RecoveryDeviceType, SafetyCheckLevel, ResourceType, NextU2FCounter, SetU2FCounter, CipheredKeyValue as CipheredKeyValue$1, UintType, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, SignedPsbt, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, SolanaTxExtraInfo, SolanaOffChainMessageVersion, SolanaOffChainMessageFormat, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, TronResourceCode, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, SuiMessageSignature, CardanoAddressParametersType, CardanoMessageSignature, FilecoinAddress as FilecoinAddress$1, FilecoinSignedTx as FilecoinSignedTx$1, PolkadotAddress as PolkadotAddress$1, PolkadotSignedTx as PolkadotSignedTx$1, KaspaAddress as KaspaAddress$1, NervosAddress as NervosAddress$1, NervosSignedTx as NervosSignedTx$1, DnxAddress as DnxAddress$1, TonWalletVersion, TonWorkChain, TonSignedMessage, TonSignedProof, TonSignDataType, TonSignedData, ScdoAddress as ScdoAddress$1, ScdoSignedMessage, ScdoSignedTx as ScdoSignedTx$1, AlephiumMessageSignature, AlephiumSignedTx as AlephiumSignedTx$1, BenfenAddress as BenfenAddress$1, BenfenMessageSignature, ChangeOutputScriptType } from '@onekeyfe/hd-transport';
+import { DeviceFirmwareTargetType, DeviceFirmwareUpdateRecordFields, DeviceRebootType, DeviceFirmwareTarget, Messages, Transport, TransportCallOptions, OneKeyDeviceInfo, ProtocolV2DeviceInfo, Success as Success$1, LowlevelTransportSharedPlugin, ProtocolInfo, DeviceFirmwareUpdateStatus, DeviceFactoryInfo, OneKeyDeviceCommType, Features as Features$1, ProtocolType, RecoveryDeviceType, SafetyCheckLevel, ResourceType, NextU2FCounter, SetU2FCounter, CipheredKeyValue as CipheredKeyValue$1, UintType, EthereumPublicKey, EthereumMessageSignature, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, SignedPsbt, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx, NEMAddress as NEMAddress$1, NEMSignedTx, SolanaAddress as SolanaAddress$1, SolanaSignedTx as SolanaSignedTx$1, SolanaTxExtraInfo, SolanaOffChainMessageVersion, SolanaOffChainMessageFormat, StellarAddress as StellarAddress$1, StellarSignedTx, TronAddress as TronAddress$1, TronResourceCode, TronSignedTx, TronMessageSignature, ConfluxAddress as ConfluxAddress$1, ConfluxMessageSignature, NearAddress as NearAddress$1, NearSignedTx, AptosAddress as AptosAddress$1, AptosMessageSignature as AptosMessageSignature$1, AptosSignedTx as AptosSignedTx$1, AlgorandAddress, AlgorandSignedTx, CosmosAddress as CosmosAddress$1, CosmosSignedTx as CosmosSignedTx$1, SuiAddress as SuiAddress$1, SuiMessageSignature, CardanoAddressParametersType, CardanoMessageSignature, FilecoinAddress as FilecoinAddress$1, FilecoinSignedTx as FilecoinSignedTx$1, PolkadotAddress as PolkadotAddress$1, PolkadotSignedTx as PolkadotSignedTx$1, KaspaAddress as KaspaAddress$1, NervosAddress as NervosAddress$1, NervosSignedTx as NervosSignedTx$1, DnxAddress as DnxAddress$1, TonWalletVersion, TonWorkChain, TonSignedMessage, TonSignedProof, TonSignDataType, TonSignedData, ScdoAddress as ScdoAddress$1, ScdoSignedMessage, ScdoSignedTx as ScdoSignedTx$1, AlephiumMessageSignature, AlephiumSignedTx as AlephiumSignedTx$1, BenfenAddress as BenfenAddress$1, BenfenMessageSignature, ChangeOutputScriptType } from '@onekeyfe/hd-transport';
 export { Success as DeviceSuccess, HDNodeType, Messages as PROTO, ResourceType, TonSignDataType, TonWalletVersion } from '@onekeyfe/hd-transport';
 import * as _onekeyfe_hd_shared from '@onekeyfe/hd-shared';
 import { HardwareConnectProtocol, Deferred, EFirmwareType, EDeviceType } from '@onekeyfe/hd-shared';
@@ -55,6 +55,9 @@ type DeviceFirmwareUpdateParams = {
     target_id?: DeviceFirmwareTargetType | string | number;
     path?: string;
 };
+type DeviceFirmwareUpdateStatusGetParams = {
+    fields?: DeviceFirmwareUpdateRecordFields;
+};
 type DeviceFactoryInfoSetParams = {
     version?: number;
     serial_number?: string;
@@ -425,7 +428,7 @@ declare function ping(connectId: string, params?: CommonParams & {
 declare function deviceReboot(connectId: string, params: CommonParams & DeviceRebootParams): Response<Success$1>;
 declare function deviceInfoGet(connectId: string, params?: CommonParams & DeviceInfoGetParams): Response<ProtocolV2DeviceInfo>;
 declare function deviceFirmwareUpdate(connectId: string, params: CommonParams & DeviceFirmwareUpdateParams): Response<Success$1 | DeviceFirmwareUpdateStatus>;
-declare function deviceGetFirmwareUpdateStatus(connectId: string, params?: CommonParams): Response<DeviceFirmwareUpdateStatus>;
+declare function deviceGetFirmwareUpdateStatus(connectId: string, params?: CommonParams & DeviceFirmwareUpdateStatusGetParams): Response<DeviceFirmwareUpdateStatus>;
 declare function deviceFactoryInfoSet(connectId: string, params: CommonParams & DeviceFactoryInfoSetParams): Response<Success$1>;
 declare function deviceFactoryInfoGet(connectId: string, params?: CommonParams): Response<DeviceFactoryInfo>;
 declare function filesystemPermissionFix(connectId: string, params?: CommonParams): Response<Success$1>;

package/dist/index.js

@@ -25394,6 +25394,8 @@ var nested = {
 			MessageType_FirmwareHash: 89,
 			MessageType_UnlockPath: 93,
 			MessageType_UnlockedPathRequest: 94,
+			MessageType_UnLockDevice: 10030,
+			MessageType_UnLockDeviceResponse: 10031,
 			MessageType_SetU2FCounter: 63,
 			MessageType_GetNextU2FCounter: 80,
 			MessageType_NextU2FCounter: 81,
@@ -42297,6 +42299,7 @@ class GetFeatures extends BaseMethod {
 }
 
 const ProtocolV2FirmwareTargetType = {
+    FW_MGMT_TARGET_INVALID: 0,
     FW_MGMT_TARGET_CRATE: 1,
     FW_MGMT_TARGET_ROMLOADER: 2,
     FW_MGMT_TARGET_BOOTLOADER: 3,
@@ -43953,6 +43956,35 @@ class DeviceFullyUploadResource extends BaseMethod {
     }
 }
 
+const DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS = 250;
+const createFirmwareProgressThrottle = (intervalMs = DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS) => {
+    const stateByType = new Map();
+    return (progress, progressType) => {
+        if (progressType !== 'transferData') {
+            return true;
+        }
+        const normalizedProgress = Math.max(0, Math.min(100, Math.floor(progress)));
+        if (normalizedProgress === 0 || normalizedProgress === 100) {
+            stateByType.set(progressType, {
+                lastEmittedAt: Date.now(),
+                lastProgress: normalizedProgress,
+            });
+            return true;
+        }
+        const now = Date.now();
+        const state = stateByType.get(progressType);
+        if (state &&
+            (state.lastProgress === normalizedProgress || now - state.lastEmittedAt < intervalMs)) {
+            return false;
+        }
+        stateByType.set(progressType, {
+            lastEmittedAt: now,
+            lastProgress: normalizedProgress,
+        });
+        return true;
+    };
+};
+
 const Log$8 = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR$1 = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
@@ -43966,6 +43998,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
     constructor() {
         super(...arguments);
         this.checkPromise = null;
+        this.shouldPostFirmwareProgress = createFirmwareProgressThrottle();
         this.postTipMessage = (message) => {
             this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_TIP, {
                 device: this.device.toMessageObject(),
@@ -43980,6 +44013,9 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             }));
         };
         this.postProgressMessage = (progress, progressType) => {
+            if (!this.shouldPostFirmwareProgress(progress, progressType)) {
+                return;
+            }
             this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
                 device: this.device.toMessageObject(),
                 progress,
@@ -45763,6 +45799,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let resourceBinaryMap = [];
             let fwBinaryMap = [];
             let bootloaderBinary = null;
+            let installItems;
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
                 resourceBinaryMap = yield this.prepareResourceBinaries(firmwareType, deviceFeatures);
@@ -45773,6 +45810,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     resourceBinaryMap = remoteBinaries.resourceBinaryMap;
                     bootloaderBinary = remoteBinaries.bootloaderBinary;
                     fwBinaryMap = remoteBinaries.fwBinaryMap;
+                    installItems = remoteBinaries.installItems;
                 }
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
@@ -45783,11 +45821,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
             }
             yield this.enterProtocolV2BootloaderMode();
-            yield this.executeProtocolV2Update({
-                resourceBinaryMap,
+            yield this.executeProtocolV2Update(Object.assign({ resourceBinaryMap,
                 fwBinaryMap,
-                bootloaderBinary,
-            });
+                bootloaderBinary }, (installItems ? { installItems } : undefined)));
             yield this.exitProtocolV2BootloaderToNormal();
             const versions = yield this.waitForProtocolV2FinalFeatures();
             this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
@@ -45852,6 +45888,19 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             !!this.params.bootloaderBinary ||
             fwBinaryMap.length > 0);
     }
+    buildProtocolV2InstallItems({ resourceBinaryMap, bootloaderBinary, fwBinaryMap, }) {
+        const installItems = resourceBinaryMap.map(resource => (Object.assign(Object.assign({}, resource), { kind: 'resource' })));
+        if (bootloaderBinary) {
+            installItems.push({
+                fileName: 'bootloader.bin',
+                binary: bootloaderBinary,
+                targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
+                kind: 'bootloader',
+            });
+        }
+        installItems.push(...fwBinaryMap.map(item => (Object.assign(Object.assign({}, item), { kind: 'firmware' }))));
+        return installItems;
+    }
     getRemoteComponentEntries(release) {
         var _a;
         const { components } = release;
@@ -46058,11 +46107,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const resourceBinaryMap = [];
             let bootloaderBinary = null;
             const fwBinaryMap = [];
+            const installItems = [];
             if (!release) {
                 return {
                     resourceBinaryMap,
                     bootloaderBinary,
                     fwBinaryMap,
+                    installItems,
                 };
             }
             const entries = this.getRemoteComponentEntries(release);
@@ -46072,21 +46123,31 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 if (shouldInstall) {
                     const remoteBinary = yield this.downloadRemoteProtocolV2Component(key, component);
                     if (remoteBinary.kind === 'resource') {
-                        resourceBinaryMap.push({
+                        const binaryEntry = {
                             fileName: this.getProtocolV2ResourceComponentFileName(key),
                             binary: remoteBinary.binary,
                             targetId: remoteBinary.targetId,
-                        });
+                        };
+                        resourceBinaryMap.push(binaryEntry);
+                        installItems.push(Object.assign(Object.assign({}, binaryEntry), { kind: remoteBinary.kind }));
                     }
                     else if (remoteBinary.kind === 'bootloader') {
                         bootloaderBinary = remoteBinary.binary;
+                        installItems.push({
+                            fileName: remoteBinary.fileName,
+                            binary: remoteBinary.binary,
+                            targetId: remoteBinary.targetId,
+                            kind: remoteBinary.kind,
+                        });
                     }
                     else {
-                        fwBinaryMap.push({
+                        const binaryEntry = {
                             fileName: remoteBinary.fileName,
                             binary: remoteBinary.binary,
                             targetId: remoteBinary.targetId,
-                        });
+                        };
+                        fwBinaryMap.push(binaryEntry);
+                        installItems.push(Object.assign(Object.assign({}, binaryEntry), { kind: remoteBinary.kind }));
                     }
                 }
             }
@@ -46094,6 +46155,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 resourceBinaryMap,
                 bootloaderBinary,
                 fwBinaryMap,
+                installItems,
             };
         });
     }
@@ -46171,17 +46233,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         push(this.params.se04Binary, 'se04.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04);
         return entries;
     }
-    executeProtocolV2Update({ resourceBinaryMap, fwBinaryMap, bootloaderBinary, }) {
+    executeProtocolV2Update({ resourceBinaryMap, fwBinaryMap, bootloaderBinary, installItems, }) {
         return __awaiter(this, void 0, void 0, function* () {
+            const orderedInstallItems = installItems !== null && installItems !== void 0 ? installItems : this.buildProtocolV2InstallItems({
+                resourceBinaryMap: resourceBinaryMap !== null && resourceBinaryMap !== void 0 ? resourceBinaryMap : [],
+                bootloaderBinary: bootloaderBinary !== null && bootloaderBinary !== void 0 ? bootloaderBinary : null,
+                fwBinaryMap: fwBinaryMap !== null && fwBinaryMap !== void 0 ? fwBinaryMap : [],
+            });
             let totalSize = 0;
             let processedSize = 0;
             let transferredSize = 0;
-            for (const resource of resourceBinaryMap)
-                totalSize += resource.binary.byteLength;
-            for (const fwbinary of fwBinaryMap)
-                totalSize += fwbinary.binary.byteLength;
-            if (bootloaderBinary)
-                totalSize += bootloaderBinary.byteLength;
+            for (const item of orderedInstallItems)
+                totalSize += item.binary.byteLength;
             this.postTipMessage(exports.FirmwareUpdateTipMessage.StartTransferData);
             const transferStartTime = Date.now();
             const transferTransport = this.getProtocolV2FirmwareTransferTransport();
@@ -46190,56 +46253,20 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 transferredSize = bytes;
             };
             Log$4.log(`[FirmwareUpdateV4] transfer started transport=${transferTransport} total=${totalSize} bytes chunk=${chunkSize} bytes`);
-            const resourceTargets = [];
-            const targets = [];
+            const stagedInstallTargets = [];
             try {
-                for (const resource of resourceBinaryMap) {
-                    const resourceFilePath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${resource.fileName}`;
-                    Log$4.log(`[FirmwareUpdateV4] staging resource via FilesystemFileWrite target=${resource.targetId} path=${resourceFilePath} bytes=${resource.binary.byteLength}`);
-                    processedSize = yield this.protocolV2CommonUpdateProcess({
-                        payload: resource.binary,
-                        filePath: resourceFilePath,
-                        processedSize,
-                        totalSize,
-                        onTransferredBytes,
-                    });
-                    transferredSize = processedSize;
-                    resourceTargets.push({
-                        target_id: resource.targetId,
-                        path: resourceFilePath,
-                    });
-                }
-                if (bootloaderBinary) {
-                    const bootloaderPath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}bootloader.bin`;
-                    Log$4.log(`[FirmwareUpdateV4] staging bootloader via FilesystemFileWrite target=${ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER} path=${bootloaderPath} bytes=${bootloaderBinary.byteLength}`);
+                for (const item of orderedInstallItems) {
+                    const filePath = this.getProtocolV2InstallItemStagingPath(item);
+                    Log$4.log(`[FirmwareUpdateV4] staging ${item.kind} via FilesystemFileWrite target=${item.targetId} path=${filePath} source=${item.fileName} bytes=${item.binary.byteLength}`);
                     processedSize = yield this.protocolV2CommonUpdateProcess({
-                        payload: bootloaderBinary,
-                        filePath: bootloaderPath,
+                        payload: item.binary,
+                        filePath,
                         processedSize,
                         totalSize,
                         onTransferredBytes,
                     });
                     transferredSize = processedSize;
-                    targets.push({
-                        target_id: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
-                        path: bootloaderPath,
-                    });
-                }
-                for (const fwbinary of fwBinaryMap) {
-                    const firmwarePath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${fwbinary.fileName}`;
-                    Log$4.log(`[FirmwareUpdateV4] staging firmware via FilesystemFileWrite target=${fwbinary.targetId} path=${firmwarePath} bytes=${fwbinary.binary.byteLength}`);
-                    processedSize = yield this.protocolV2CommonUpdateProcess({
-                        payload: fwbinary.binary,
-                        filePath: firmwarePath,
-                        processedSize,
-                        totalSize,
-                        onTransferredBytes,
-                    });
-                    transferredSize = processedSize;
-                    targets.push({
-                        target_id: fwbinary.targetId,
-                        path: firmwarePath,
-                    });
+                    stagedInstallTargets.push(Object.assign(Object.assign({}, item), { path: filePath }));
                 }
                 if (totalSize > 0) {
                     this.postProgressMessage(100, 'transferData');
@@ -46253,21 +46280,39 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 throw error;
             }
             this.postTipMessage(exports.FirmwareUpdateTipMessage.ConfirmOnDevice);
-            for (const resourceTarget of resourceTargets) {
-                const resourceTargetsBatch = [resourceTarget];
-                Log$4.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest resources=${JSON.stringify(resourceTargetsBatch)}`);
-                const startResponse = yield this.protocolV2StartFirmwareUpdate({
-                    targets: resourceTargetsBatch,
-                });
-                yield this.waitForProtocolV2FirmwareUpdateComplete(resourceTargetsBatch, startResponse);
-            }
-            if (targets.length > 0) {
+            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();
         });
     }
+    getProtocolV2InstallItemStagingPath(item) {
+        return `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${item.fileName}`;
+    }
     queryProtocolV2FirmwareUpdateStatus() {
         return __awaiter(this, void 0, void 0, function* () {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
@@ -46868,16 +46913,40 @@ class DeviceFirmwareUpdate extends BaseMethod {
     }
 }
 
+const DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS = ['status', 'payload_version', 'path'];
+function normalizeStatusFields(fields) {
+    if (fields === undefined || fields === null)
+        return undefined;
+    if (typeof fields !== 'object' || Array.isArray(fields)) {
+        throw invalidParameter('Parameter [fields] must be an object.');
+    }
+    const unknownField = Object.keys(fields).find(field => !DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS.includes(field));
+    if (unknownField) {
+        throw invalidParameter(`Unsupported firmware update status field: ${unknownField}`);
+    }
+    const normalized = {};
+    for (const field of DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS) {
+        const value = fields[field];
+        if (value === undefined)
+            continue;
+        if (typeof value !== 'boolean') {
+            throw invalidParameter(`Parameter [fields.${field}] must be a boolean.`);
+        }
+        normalized[field] = value;
+    }
+    return normalized;
+}
 class DeviceGetFirmwareUpdateStatus extends BaseMethod {
     init() {
         this.requireProtocolV2 = true;
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
-        this.params = undefined;
+        const fields = normalizeStatusFields(this.payload.fields);
+        this.params = fields ? { fields } : {};
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', {});
+            const res = yield this.device.commands.typedCall('DeviceFirmwareUpdateStatusGet', 'DeviceFirmwareUpdateStatus', this.params);
             return Promise.resolve(res.message);
         });
     }

package/dist/protocols/protocol-v2/firmware.d.ts

@@ -1,4 +1,5 @@
 export declare const ProtocolV2FirmwareTargetType: {
+    readonly FW_MGMT_TARGET_INVALID: 0;
     readonly FW_MGMT_TARGET_CRATE: 1;
     readonly FW_MGMT_TARGET_ROMLOADER: 2;
     readonly FW_MGMT_TARGET_BOOTLOADER: 3;

package/dist/protocols/protocol-v2/firmware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firmware.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/firmware.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B;;;;;;;;;;;CAW/B,CAAC;AAEX,MAAM,MAAM,4BAA4B,GACtC,CAAC,OAAO,4BAA4B,CAAC,CAAC,MAAM,OAAO,4BAA4B,CAAC,CAAC"}
+{"version":3,"file":"firmware.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/firmware.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,4BAA4B;;;;;;;;;;;;CAY/B,CAAC;AAEX,MAAM,MAAM,4BAA4B,GACtC,CAAC,OAAO,4BAA4B,CAAC,CAAC,MAAM,OAAO,4BAA4B,CAAC,CAAC"}

package/dist/types/api/protocolV2.d.ts

@@ -1,8 +1,8 @@
 import type { CommonParams, Response } from '../params';
 import type { DeviceFirmwareUpdateStatus, DeviceFactoryInfo, ProtocolInfo, ProtocolV2DeviceInfo, Success } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareUpdateParams, DeviceRebootParams, DeviceFactoryInfoSetParams } from '../../api/protocol-v2/helpers';
+import type { DeviceFirmwareUpdateParams, DeviceFirmwareUpdateStatusGetParams, DeviceRebootParams, DeviceFactoryInfoSetParams } from '../../api/protocol-v2/helpers';
 import type { DeviceInfoGetParams } from '../../api/protocol-v2/DeviceInfoGet';
-export type { DeviceFirmwareTargetInput, DeviceFirmwareUpdateParams, DeviceRebootParams, DeviceFactoryInfoSetParams, RebootTypeInput, } from '../../api/protocol-v2/helpers';
+export type { DeviceFirmwareTargetInput, DeviceFirmwareUpdateParams, DeviceFirmwareUpdateStatusGetParams, DeviceRebootParams, DeviceFactoryInfoSetParams, RebootTypeInput, } from '../../api/protocol-v2/helpers';
 export type { DeviceInfoGetParams, DeviceInfoGetTargets, DeviceInfoGetTypes, } from '../../api/protocol-v2/DeviceInfoGet';
 export type FileOpSuccess = {
     message?: string;
@@ -43,7 +43,7 @@ export declare function ping(connectId: string, params?: CommonParams & {
 export declare function deviceReboot(connectId: string, params: CommonParams & DeviceRebootParams): Response<Success>;
 export declare function deviceInfoGet(connectId: string, params?: CommonParams & DeviceInfoGetParams): Response<ProtocolV2DeviceInfo>;
 export declare function deviceFirmwareUpdate(connectId: string, params: CommonParams & DeviceFirmwareUpdateParams): Response<Success | DeviceFirmwareUpdateStatus>;
-export declare function deviceGetFirmwareUpdateStatus(connectId: string, params?: CommonParams): Response<DeviceFirmwareUpdateStatus>;
+export declare function deviceGetFirmwareUpdateStatus(connectId: string, params?: CommonParams & DeviceFirmwareUpdateStatusGetParams): Response<DeviceFirmwareUpdateStatus>;
 export declare function deviceFactoryInfoSet(connectId: string, params: CommonParams & DeviceFactoryInfoSetParams): Response<Success>;
 export declare function deviceFactoryInfoGet(connectId: string, params?: CommonParams): Response<DeviceFactoryInfo>;
 export declare function filesystemPermissionFix(connectId: string, params?: CommonParams): Response<Success>;

package/dist/types/api/protocolV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocolV2.d.ts","sourceRoot":"","sources":["../../../src/types/api/protocolV2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"protocolV2.d.ts","sourceRoot":"","sources":["../../../src/types/api/protocolV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EACV,0BAA0B,EAC1B,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,OAAO,EACR,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EACV,0BAA0B,EAC1B,mCAAmC,EACnC,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAG/E,YAAY,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,mCAAmC,EACnC,kBAAkB,EAClB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,+BAA+B,CAAC;AACvC,YAAY,EACV,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,qCAAqC,CAAC;AAI7C,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAIF,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,IAAI,CAC1B,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC3C,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,kBAAkB,GACxC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GAAG,mBAAmB,GAC1C,QAAQ,CAAC,oBAAoB,CAAC,CAAC;AAElC,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,OAAO,GAAG,0BAA0B,CAAC,CAAC;AAElD,MAAM,CAAC,OAAO,UAAU,6BAA6B,CACnD,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GAAG,mCAAmC,GAC1D,QAAQ,CAAC,0BAA0B,CAAC,CAAC;AAExC,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAE/B,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IACN,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACA,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEtB,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IACN,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,IAAI,GAAG,MAAM,CAAC;IAC/C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,GACA,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEtB,MAAM,CAAC,OAAO,UAAU,UAAU,CAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GACvB,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACvC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,OAAO,CAC7B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GACvB,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GACvB,QAAQ,CAAC,aAAa,CAAC,CAAC;AAE3B,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GACpD,QAAQ,CAAC,cAAc,CAAC,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,MAAM,kBAAkB,EAAE,OAAO,QAAQ,CAAC;AACzD,MAAM,CAAC,OAAO,CAAC,MAAM,mBAAmB,EAAE,OAAO,SAAS,CAAC;AAC3D,MAAM,CAAC,OAAO,CAAC,MAAM,oBAAoB,EAAE,OAAO,UAAU,CAAC;AAC7D,MAAM,CAAC,OAAO,CAAC,MAAM,iBAAiB,EAAE,OAAO,OAAO,CAAC;AACvD,MAAM,CAAC,OAAO,CAAC,MAAM,iBAAiB,EAAE,OAAO,OAAO,CAAC;AACvD,MAAM,CAAC,OAAO,CAAC,MAAM,mBAAmB,EAAE,OAAO,SAAS,CAAC;AAC3D,MAAM,CAAC,OAAO,CAAC,MAAM,uBAAuB,EAAE,OAAO,QAAQ,CAAC;AAE9D,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;AAE/E,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,SAAS,EAAE,MAAM,EAEjB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,EAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC9E,QAAQ,CAAC,OAAO,CAAC,CAAC"}

package/package.json

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

package/src/api/FirmwareUpdateV4.ts

@@ -100,6 +100,12 @@ type ProtocolV2FirmwareUpdateStartResponse =
   | undefined;
 
 type ProtocolV2TargetBinary = { fileName: string; binary: ArrayBuffer; targetId: number };
+type ProtocolV2InstallItem = ProtocolV2TargetBinary & {
+  kind: ProtocolV2RemoteComponentTarget['kind'];
+};
+type ProtocolV2InstallTarget = ProtocolV2InstallItem & {
+  path: string;
+};
 
 type ProtocolV2RemoteComponentBinary = ProtocolV2RemoteComponentTarget & {
   binary: ArrayBuffer;
@@ -456,6 +462,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     let resourceBinaryMap: ProtocolV2TargetBinary[] = [];
     let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
+    let installItems: ProtocolV2InstallItem[] | undefined;
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
       resourceBinaryMap = await this.prepareResourceBinaries(firmwareType, deviceFeatures);
@@ -469,6 +476,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         resourceBinaryMap = remoteBinaries.resourceBinaryMap;
         bootloaderBinary = remoteBinaries.bootloaderBinary;
         fwBinaryMap = remoteBinaries.fwBinaryMap;
+        installItems = remoteBinaries.installItems;
       }
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
@@ -488,6 +496,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       resourceBinaryMap,
       fwBinaryMap,
       bootloaderBinary,
+      ...(installItems ? { installItems } : undefined),
     });
 
     await this.exitProtocolV2BootloaderToNormal();
@@ -559,6 +568,33 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     );
   }
 
+  private buildProtocolV2InstallItems({
+    resourceBinaryMap,
+    bootloaderBinary,
+    fwBinaryMap,
+  }: {
+    resourceBinaryMap: ProtocolV2TargetBinary[];
+    bootloaderBinary: ArrayBuffer | null;
+    fwBinaryMap: ProtocolV2TargetBinary[];
+  }): ProtocolV2InstallItem[] {
+    const installItems: ProtocolV2InstallItem[] = resourceBinaryMap.map(resource => ({
+      ...resource,
+      kind: 'resource',
+    }));
+
+    if (bootloaderBinary) {
+      installItems.push({
+        fileName: 'bootloader.bin',
+        binary: bootloaderBinary,
+        targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
+        kind: 'bootloader',
+      });
+    }
+
+    installItems.push(...fwBinaryMap.map(item => ({ ...item, kind: 'firmware' as const })));
+    return installItems;
+  }
+
   private getRemoteComponentEntries(release: IFirmwareReleaseInfo) {
     const { components } = release;
     if (!components) return [];
@@ -816,12 +852,14 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const resourceBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
     const fwBinaryMap: ProtocolV2TargetBinary[] = [];
+    const installItems: ProtocolV2InstallItem[] = [];
 
     if (!release) {
       return {
         resourceBinaryMap,
         bootloaderBinary,
         fwBinaryMap,
+        installItems,
       };
     }
 
@@ -839,19 +877,29 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       if (shouldInstall) {
         const remoteBinary = await this.downloadRemoteProtocolV2Component(key, component);
         if (remoteBinary.kind === 'resource') {
-          resourceBinaryMap.push({
+          const binaryEntry = {
             fileName: this.getProtocolV2ResourceComponentFileName(key),
             binary: remoteBinary.binary,
             targetId: remoteBinary.targetId,
-          });
+          };
+          resourceBinaryMap.push(binaryEntry);
+          installItems.push({ ...binaryEntry, kind: remoteBinary.kind });
         } else if (remoteBinary.kind === 'bootloader') {
           bootloaderBinary = remoteBinary.binary;
-        } else {
-          fwBinaryMap.push({
+          installItems.push({
             fileName: remoteBinary.fileName,
             binary: remoteBinary.binary,
             targetId: remoteBinary.targetId,
+            kind: remoteBinary.kind,
           });
+        } else {
+          const binaryEntry = {
+            fileName: remoteBinary.fileName,
+            binary: remoteBinary.binary,
+            targetId: remoteBinary.targetId,
+          };
+          fwBinaryMap.push(binaryEntry);
+          installItems.push({ ...binaryEntry, kind: remoteBinary.kind });
         }
       }
     }
@@ -860,6 +908,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       resourceBinaryMap,
       bootloaderBinary,
       fwBinaryMap,
+      installItems,
     };
   }
 
@@ -968,18 +1017,25 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     resourceBinaryMap,
     fwBinaryMap,
     bootloaderBinary,
+    installItems,
   }: {
-    resourceBinaryMap: ProtocolV2TargetBinary[];
-    fwBinaryMap: ProtocolV2TargetBinary[];
-    bootloaderBinary: ArrayBuffer | null;
+    resourceBinaryMap?: ProtocolV2TargetBinary[];
+    fwBinaryMap?: ProtocolV2TargetBinary[];
+    bootloaderBinary?: ArrayBuffer | null;
+    installItems?: ProtocolV2InstallItem[];
   }) {
+    const orderedInstallItems =
+      installItems ??
+      this.buildProtocolV2InstallItems({
+        resourceBinaryMap: resourceBinaryMap ?? [],
+        bootloaderBinary: bootloaderBinary ?? null,
+        fwBinaryMap: fwBinaryMap ?? [],
+      });
     let totalSize = 0;
     let processedSize = 0;
     let transferredSize = 0;
 
-    for (const resource of resourceBinaryMap) totalSize += resource.binary.byteLength;
-    for (const fwbinary of fwBinaryMap) totalSize += fwbinary.binary.byteLength;
-    if (bootloaderBinary) totalSize += bootloaderBinary.byteLength;
+    for (const item of orderedInstallItems) totalSize += item.binary.byteLength;
 
     this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
     const transferStartTime = Date.now();
@@ -992,64 +1048,26 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       `[FirmwareUpdateV4] transfer started transport=${transferTransport} total=${totalSize} bytes chunk=${chunkSize} bytes`
     );
 
-    const resourceTargets: Array<{ target_id: number; path: string }> = [];
-    const targets: Array<{ target_id: number; path: string }> = [];
+    const stagedInstallTargets: ProtocolV2InstallTarget[] = [];
 
     try {
-      for (const resource of resourceBinaryMap) {
-        const resourceFilePath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${resource.fileName}`;
-        Log.log(
-          `[FirmwareUpdateV4] staging resource via FilesystemFileWrite target=${resource.targetId} path=${resourceFilePath} bytes=${resource.binary.byteLength}`
-        );
-        processedSize = await this.protocolV2CommonUpdateProcess({
-          payload: resource.binary,
-          filePath: resourceFilePath,
-          processedSize,
-          totalSize,
-          onTransferredBytes,
-        });
-        transferredSize = processedSize;
-        resourceTargets.push({
-          target_id: resource.targetId,
-          path: resourceFilePath,
-        });
-      }
-
-      if (bootloaderBinary) {
-        const bootloaderPath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}bootloader.bin`;
+      for (const item of orderedInstallItems) {
+        const filePath = this.getProtocolV2InstallItemStagingPath(item);
         Log.log(
-          `[FirmwareUpdateV4] staging bootloader via FilesystemFileWrite target=${ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER} path=${bootloaderPath} bytes=${bootloaderBinary.byteLength}`
+          `[FirmwareUpdateV4] staging ${item.kind} via FilesystemFileWrite target=${item.targetId} path=${filePath} source=${item.fileName} bytes=${item.binary.byteLength}`
         );
         processedSize = await this.protocolV2CommonUpdateProcess({
-          payload: bootloaderBinary,
-          filePath: bootloaderPath,
+          payload: item.binary,
+          filePath,
           processedSize,
           totalSize,
           onTransferredBytes,
         });
         transferredSize = processedSize;
-        targets.push({
-          target_id: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
-          path: bootloaderPath,
-        });
-      }
 
-      for (const fwbinary of fwBinaryMap) {
-        const firmwarePath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${fwbinary.fileName}`;
-        Log.log(
-          `[FirmwareUpdateV4] staging firmware via FilesystemFileWrite target=${fwbinary.targetId} path=${firmwarePath} bytes=${fwbinary.binary.byteLength}`
-        );
-        processedSize = await this.protocolV2CommonUpdateProcess({
-          payload: fwbinary.binary,
-          filePath: firmwarePath,
-          processedSize,
-          totalSize,
-          onTransferredBytes,
-        });
-        transferredSize = processedSize;
-        targets.push({
-          target_id: fwbinary.targetId,
-          path: firmwarePath,
+        stagedInstallTargets.push({
+          ...item,
+          path: filePath,
         });
       }
 
@@ -1074,23 +1092,43 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
 
     this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
-    for (const resourceTarget of resourceTargets) {
-      const resourceTargetsBatch = [resourceTarget];
-      Log.log(
-        `[FirmwareUpdateV4] DeviceFirmwareUpdateRequest resources=${JSON.stringify(
-          resourceTargetsBatch
-        )}`
-      );
-      const startResponse = await this.protocolV2StartFirmwareUpdate({
-        targets: resourceTargetsBatch,
-      });
-      await this.waitForProtocolV2FirmwareUpdateComplete(resourceTargetsBatch, startResponse);
-    }
-    if (targets.length > 0) {
+
+    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();
+  }
+
+  private getProtocolV2InstallItemStagingPath(item: ProtocolV2InstallItem) {
+    return `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${item.fileName}`;
   }
 
   private async queryProtocolV2FirmwareUpdateStatus() {

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -13,6 +13,7 @@ import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
 import { BaseMethod } from '../BaseMethod';
 import { DEVICE } from '../../events';
+import { createFirmwareProgressThrottle } from './progressThrottle';
 
 import type {
   IFirmwareUpdateProgressType,
@@ -40,6 +41,8 @@ const isDeviceDisconnectedError = (error: unknown) => {
 export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
 
+  private shouldPostFirmwareProgress = createFirmwareProgressThrottle();
+
   init(): void {}
 
   run(): Promise<any> {
@@ -83,6 +86,10 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    * @param progress Post the percentage of the progress
    */
   postProgressMessage = (progress: number, progressType: IFirmwareUpdateProgressType) => {
+    if (!this.shouldPostFirmwareProgress(progress, progressType)) {
+      return;
+    }
+
     this.postMessage(
       createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
         device: this.device.toMessageObject() as KnownDevice,

package/src/api/firmware/progressThrottle.ts

@@ -0,0 +1,44 @@
+import type { IFirmwareUpdateProgressType } from '../../events/ui-request';
+
+const DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS = 250;
+
+type FirmwareProgressThrottleState = {
+  lastEmittedAt: number;
+  lastProgress?: number;
+};
+
+export const createFirmwareProgressThrottle = (
+  intervalMs = DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS
+) => {
+  const stateByType = new Map<IFirmwareUpdateProgressType, FirmwareProgressThrottleState>();
+
+  return (progress: number, progressType: IFirmwareUpdateProgressType) => {
+    if (progressType !== 'transferData') {
+      return true;
+    }
+
+    const normalizedProgress = Math.max(0, Math.min(100, Math.floor(progress)));
+    if (normalizedProgress === 0 || normalizedProgress === 100) {
+      stateByType.set(progressType, {
+        lastEmittedAt: Date.now(),
+        lastProgress: normalizedProgress,
+      });
+      return true;
+    }
+
+    const now = Date.now();
+    const state = stateByType.get(progressType);
+    if (
+      state &&
+      (state.lastProgress === normalizedProgress || now - state.lastEmittedAt < intervalMs)
+    ) {
+      return false;
+    }
+
+    stateByType.set(progressType, {
+      lastEmittedAt: now,
+      lastProgress: normalizedProgress,
+    });
+    return true;
+  };
+};

package/src/api/protocol-v2/DeviceGetFirmwareUpdateStatus.ts

@@ -1,19 +1,53 @@
 import { BaseMethod } from '../BaseMethod';
+import { invalidParameter } from '../helpers/filesystemValidation';
 
-export default class DeviceGetFirmwareUpdateStatus extends BaseMethod {
+import type { DeviceFirmwareUpdateStatusGetParams } from './helpers';
+import type { DeviceFirmwareUpdateRecordFields } from '@onekeyfe/hd-transport';
+
+const DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS = ['status', 'payload_version', 'path'] as const;
+
+function normalizeStatusFields(
+  fields: DeviceFirmwareUpdateStatusGetParams['fields']
+): DeviceFirmwareUpdateRecordFields | undefined {
+  if (fields === undefined || fields === null) return undefined;
+  if (typeof fields !== 'object' || Array.isArray(fields)) {
+    throw invalidParameter('Parameter [fields] must be an object.');
+  }
+
+  const unknownField = Object.keys(fields).find(
+    field => !DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS.includes(field as any)
+  );
+  if (unknownField) {
+    throw invalidParameter(`Unsupported firmware update status field: ${unknownField}`);
+  }
+
+  const normalized: DeviceFirmwareUpdateRecordFields = {};
+  for (const field of DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS) {
+    const value = fields[field];
+    if (value === undefined) continue;
+    if (typeof value !== 'boolean') {
+      throw invalidParameter(`Parameter [fields.${field}] must be a boolean.`);
+    }
+    normalized[field] = value;
+  }
+  return normalized;
+}
+
+export default class DeviceGetFirmwareUpdateStatus extends BaseMethod<DeviceFirmwareUpdateStatusGetParams> {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
     this.requireProtocolV2 = true;
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
-    this.params = undefined;
+    const fields = normalizeStatusFields(this.payload.fields);
+    this.params = fields ? { fields } : {};
   }
 
   async run() {
     const res = await this.device.commands.typedCall(
       'DeviceFirmwareUpdateStatusGet',
       'DeviceFirmwareUpdateStatus',
-      {}
+      this.params
     );
     return Promise.resolve(res.message);
   }

package/src/api/protocol-v2/helpers.ts

@@ -5,6 +5,7 @@ import { ProtocolV2FirmwareTargetType } from '../../protocols/protocol-v2/firmwa
 
 import type {
   DeviceFirmwareTarget,
+  DeviceFirmwareUpdateRecordFields,
   DeviceFirmwareTargetType,
   TransportCallOptions,
 } from '@onekeyfe/hd-transport';
@@ -31,6 +32,10 @@ export type DeviceFirmwareUpdateParams = {
   path?: string;
 };
 
+export type DeviceFirmwareUpdateStatusGetParams = {
+  fields?: DeviceFirmwareUpdateRecordFields;
+};
+
 export type DeviceFactoryInfoSetParams = {
   version?: number;
   serial_number?: string;

package/src/data/messages/messages-protocol-v2.json

@@ -107,6 +107,8 @@
         "MessageType_FirmwareHash": 89,
         "MessageType_UnlockPath": 93,
         "MessageType_UnlockedPathRequest": 94,
+        "MessageType_UnLockDevice": 10030,
+        "MessageType_UnLockDeviceResponse": 10031,
         "MessageType_SetU2FCounter": 63,
         "MessageType_GetNextU2FCounter": 80,
         "MessageType_NextU2FCounter": 81,

package/src/protocols/protocol-v2/firmware.ts

@@ -2,6 +2,7 @@
  * 当前 firmware-pro2 子模块的 DeviceFirmwareTargetType。
  */
 export const ProtocolV2FirmwareTargetType = {
+  FW_MGMT_TARGET_INVALID: 0,
   FW_MGMT_TARGET_CRATE: 1,
   FW_MGMT_TARGET_ROMLOADER: 2,
   FW_MGMT_TARGET_BOOTLOADER: 3,

package/src/types/api/firmwareUpdate.ts

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

package/src/types/api/protocolV2.ts

@@ -8,6 +8,7 @@ import type {
 } from '@onekeyfe/hd-transport';
 import type {
   DeviceFirmwareUpdateParams,
+  DeviceFirmwareUpdateStatusGetParams,
   DeviceRebootParams,
   DeviceFactoryInfoSetParams,
 } from '../../api/protocol-v2/helpers';
@@ -17,6 +18,7 @@ import type { DeviceInfoGetParams } from '../../api/protocol-v2/DeviceInfoGet';
 export type {
   DeviceFirmwareTargetInput,
   DeviceFirmwareUpdateParams,
+  DeviceFirmwareUpdateStatusGetParams,
   DeviceRebootParams,
   DeviceFactoryInfoSetParams,
   RebootTypeInput,
@@ -93,7 +95,7 @@ export declare function deviceFirmwareUpdate(
 
 export declare function deviceGetFirmwareUpdateStatus(
   connectId: string,
-  params?: CommonParams
+  params?: CommonParams & DeviceFirmwareUpdateStatusGetParams
 ): Response<DeviceFirmwareUpdateStatus>;
 
 export declare function deviceFactoryInfoSet(