@onekeyfe/hd-core 1.2.0-alpha.27 → 1.2.0-alpha.29

package/__tests__/firmware-update/check-all-firmware-release.test.ts

@@ -1,4 +1,4 @@
-import { ERRORS, EDeviceType, EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EDeviceType, EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import CheckAllFirmwareRelease from '../../src/api/CheckAllFirmwareRelease';
 import { buildFirmwareUpdatePlan } from '../../src/api/firmware/FirmwareUpdatePlan';
@@ -15,6 +15,7 @@ jest.mock('../../src/data/config', () => ({
 
 jest.mock('../../src/api/firmware/FirmwareUpdatePlan', () => ({
   buildFirmwareUpdatePlan: jest.fn(),
+  validateFirmwareUpdatePlanForceTargets: jest.fn(value => value ?? []),
 }));
 
 jest.mock('../../src/api/firmware/releaseHelper', () => ({
@@ -147,6 +148,21 @@ describe('CheckAllFirmwareRelease', () => {
     );
   });
 
+  test('does not hide a Plan failure for an explicitly forced target', async () => {
+    const planError = ERRORS.TypedError(
+      HardwareErrorCode.RuntimeError,
+      'Forced firmware target is unavailable',
+      {
+        firmwareUpdateCode: 'FirmwarePlanInvalid',
+      }
+    );
+    mockBuildFirmwareUpdatePlan.mockImplementation(() => {
+      throw planError;
+    });
+
+    await expect(createMethodWithForceTargets().run()).rejects.toBe(planError);
+  });
+
   test('does not hide unexpected Plan builder failures', async () => {
     const unexpectedError = new Error('unexpected builder failure');
     mockBuildFirmwareUpdatePlan.mockImplementation(() => {

package/__tests__/firmware-update/firmware-preparation-error.test.ts

@@ -0,0 +1,27 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import { normalizeFirmwarePreparationError } from '../../src/api/firmware/FirmwarePreparationError';
+
+describe('normalizeFirmwarePreparationError', () => {
+  test('preserves structured firmware invariant errors', () => {
+    const error = ERRORS.TypedError(
+      HardwareErrorCode.RuntimeError,
+      'Firmware must be prepared by the external firmware host',
+      {
+        firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+        artifactName: 'firmware',
+      }
+    );
+
+    expect(normalizeFirmwarePreparationError(error)).toBe(error);
+  });
+
+  test('wraps ordinary preparation failures as firmware download errors', () => {
+    const error = normalizeFirmwarePreparationError(new Error('request failed'));
+
+    expect(error).toMatchObject({
+      errorCode: HardwareErrorCode.FirmwareUpdateDownloadFailed,
+      message: 'request failed',
+    });
+  });
+});

package/__tests__/firmware-update/firmware-update-plan.test.ts

@@ -25,6 +25,63 @@ const noUpdate = {
   release: undefined,
 };
 
+const expectFirmwarePlanInvalid = (build: () => unknown, expectedMessage?: string) => {
+  let thrown: unknown;
+  try {
+    build();
+  } catch (error) {
+    thrown = error;
+  }
+  expect(thrown).toMatchObject({
+    params: {
+      firmwareUpdateCode: 'FirmwarePlanInvalid',
+    },
+  });
+  if (expectedMessage) {
+    expect(thrown).toBeInstanceOf(Error);
+    expect((thrown as Error).message).toContain(expectedMessage);
+  }
+};
+
+type BuildPlanInput = Parameters<typeof buildFirmwareUpdatePlan>[0];
+
+const createLegacyForceInput = (
+  forceUpdateTargets: unknown,
+  release: Record<string, unknown> = {
+    url: 'https://firmware.onekey.so/pro/firmware.bin',
+    version: [4, 21, 0],
+  }
+): BuildPlanInput => ({
+  features: createFeatures({
+    deviceType: EDeviceType.Pro,
+    firmwareVersion: '4.21.0',
+    bootloaderVersion: '2.8.4',
+  }),
+  firmwareType: EFirmwareType.Universal,
+  platform: 'desktop',
+  firmware: { status: 'valid', release },
+  ble: noUpdate,
+  bootloader: noUpdate,
+  forceUpdateTargets: forceUpdateTargets as BuildPlanInput['forceUpdateTargets'],
+});
+
+const createProtocolV2ForceInput = (
+  forceUpdateTargets: unknown,
+  release: Record<string, unknown>
+): BuildPlanInput => ({
+  features: createFeatures({
+    deviceType: EDeviceType.Pro2,
+    firmwareVersion: '1.0.0',
+    bootloaderVersion: '1.0.0',
+  }),
+  firmwareType: EFirmwareType.Universal,
+  platform: 'desktop',
+  firmware: { status: 'valid', release },
+  ble: noUpdate,
+  bootloader: noUpdate,
+  forceUpdateTargets: forceUpdateTargets as BuildPlanInput['forceUpdateTargets'],
+});
+
 describe('buildFirmwareUpdatePlan', () => {
   test('selects all legacy artifacts before execution and chooses the desktop full resource', () => {
     const plan = buildFirmwareUpdatePlan({
@@ -192,6 +249,118 @@ describe('buildFirmwareUpdatePlan', () => {
     expect(plan.targetsToUpdate).toEqual(['firmware']);
   });
 
+  test.each([
+    {
+      label: 'a non-array value',
+      forceUpdateTargets: 'firmware',
+    },
+    {
+      label: 'an unknown target',
+      forceUpdateTargets: ['firmware', 'unknown'],
+    },
+    {
+      label: 'a duplicate target',
+      forceUpdateTargets: ['firmware', 'firmware'],
+    },
+  ])('rejects $label in forceUpdateTargets', ({ forceUpdateTargets }) => {
+    expectFirmwarePlanInvalid(() =>
+      buildFirmwareUpdatePlan(createLegacyForceInput(forceUpdateTargets))
+    );
+  });
+
+  test('rejects an explicitly forced legacy resource without a resource artifact', () => {
+    expectFirmwarePlanInvalid(() => buildFirmwareUpdatePlan(createLegacyForceInput(['resource'])));
+  });
+
+  test.each(['ble', 'bootloader'] as const)(
+    'rejects the unsupported Pro2 %s force target',
+    forceTarget => {
+      expectFirmwarePlanInvalid(
+        () =>
+          buildFirmwareUpdatePlan(
+            createProtocolV2ForceInput([forceTarget], {
+              components: {
+                applicationP1: {
+                  target: 'APPLICATION_P1',
+                  url: 'https://firmware.onekey.so/pro2/application-p1.bin',
+                },
+              },
+            })
+          ),
+        'does not support forced'
+      );
+    }
+  );
+
+  test.each([
+    {
+      forceTarget: 'firmware' as const,
+      release: {
+        components: {},
+        resourceBundles: [
+          {
+            name: 'images',
+            url: 'https://firmware.onekey.so/pro2/images.okpkg',
+          },
+        ],
+      },
+    },
+    {
+      forceTarget: 'resource' as const,
+      release: {
+        components: {
+          applicationP1: {
+            target: 'APPLICATION_P1',
+            url: 'https://firmware.onekey.so/pro2/application-p1.bin',
+          },
+        },
+      },
+    },
+  ])(
+    'rejects a Pro2 $forceTarget force target not represented by an artifact',
+    ({ forceTarget, release }) => {
+      expectFirmwarePlanInvalid(() =>
+        buildFirmwareUpdatePlan(createProtocolV2ForceInput([forceTarget], release))
+      );
+    }
+  );
+
+  test.each([
+    {
+      forceTarget: 'firmware' as const,
+      expectedArtifactIds: ['component:app_v1'],
+      expectedTargets: ['app_v1'],
+    },
+    {
+      forceTarget: 'resource' as const,
+      expectedArtifactIds: ['resourceBundle:images'],
+      expectedTargets: ['resource'],
+    },
+  ])(
+    'limits a Pro2 $forceTarget force to the selected artifact role',
+    ({ forceTarget, expectedArtifactIds, expectedTargets }) => {
+      const plan = buildFirmwareUpdatePlan(
+        createProtocolV2ForceInput([forceTarget], {
+          components: {
+            applicationP1: {
+              target: 'APPLICATION_P1',
+              url: 'https://firmware.onekey.so/pro2/application-p1.bin',
+            },
+          },
+          resourceBundles: [
+            {
+              name: 'images',
+              url: 'https://firmware.onekey.so/pro2/images.okpkg',
+            },
+          ],
+        })
+      );
+
+      expect(plan.artifacts.map(artifact => artifact.artifactId)).toEqual(expectedArtifactIds);
+      expect(plan.targetsToUpdate).toEqual(expectedTargets);
+    }
+  );
+
   test('rejects a prepared native plan without a stable device identity', () => {
     const features = createFeatures({
       deviceType: EDeviceType.Classic1s,

package/__tests__/firmware-update/firmware-update-v2-download-before-boot.test.ts

@@ -1,4 +1,4 @@
-import { EDeviceType, EFirmwareType, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EDeviceType, EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import FirmwareUpdateV2 from '../../src/api/FirmwareUpdateV2';
 import { getBinary } from '../../src/api/firmware/getBinary';
@@ -181,6 +181,25 @@ describe('FirmwareUpdateV2 download-before-reboot safety', () => {
     expect(mockUploadFirmwareFromSource).not.toHaveBeenCalled();
   });
 
+  it('preserves structured preparation errors before any firmware mutation', async () => {
+    const preparationError = ERRORS.TypedError(
+      HardwareErrorCode.RuntimeError,
+      'Firmware must be prepared by the external firmware host',
+      {
+        firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+        artifactName: 'firmware',
+      }
+    );
+    mockGetBinary.mockRejectedValue(preparationError);
+    const { method, typedCall, acquire } = createMethod();
+
+    await expect(method.run()).rejects.toBe(preparationError);
+
+    expectNoFirmwareMutationCalls(typedCall);
+    expect(acquire).not.toHaveBeenCalled();
+    expect(mockUploadFirmwareFromSource).not.toHaveBeenCalled();
+  });
+
   it.each([
     {
       mode: 'firmware release.url',

package/__tests__/open-wallet-session.test.ts

@@ -184,7 +184,6 @@ describe('openWalletSession', () => {
       walletType: 'standard',
       deviceId: 'device-1',
       passphraseState: null,
-      sessionId: 'main-wallet-session',
       resumed: false,
     });
     expect(method.payload.useEmptyPassphrase).toBe(true);
@@ -261,7 +260,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state-after-unlock',
-      sessionId: 'hidden-session-after-unlock',
       resumed: false,
     });
     expect(device.unlockDevice).toHaveBeenCalledWith(DeviceSessionPinType.Main);
@@ -295,7 +293,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'new-hidden-state',
-      sessionId: 'new-hidden-session',
       resumed: false,
     });
     expect(typedCall).toHaveBeenCalledWith('ProtocolInfoRequest', 'ProtocolInfo', {
@@ -369,7 +366,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state',
-      sessionId: 'renewed-session',
       resumed: true,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {
@@ -567,7 +563,7 @@ describe('openWalletSession', () => {
     expect(device.clearInternalState).toHaveBeenCalled();
   });
 
-  test('selects a hidden wallet and returns the CLI compatibility session', async () => {
+  test('selects a hidden wallet without exposing the internal device session', async () => {
     const typedCall = jest
       .fn()
       .mockResolvedValueOnce({ message: { version: 2 } })
@@ -592,7 +588,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state',
-      sessionId: 'hidden-session',
       resumed: false,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionAskPassphrase', 'Success', {});
@@ -759,7 +754,6 @@ describe('openWalletSession', () => {
       walletType: 'hidden',
       deviceId: 'device-1',
       passphraseState: 'hidden-state',
-      sessionId: 'renewed-session',
       resumed: true,
     });
     expect(typedCall).toHaveBeenCalledWith('DeviceSessionGet', 'DeviceSession', {

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

@@ -1 +1 @@
-{"version":3,"file":"CheckAllFirmwareRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckAllFirmwareRelease.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAiB1C,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,sCAAsC,CAAC;AAK9C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,IAAI;IAME,GAAG;CAgFV"}
+{"version":3,"file":"CheckAllFirmwareRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckAllFirmwareRelease.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAoB1C,OAAO,KAAK,EACV,kBAAkB,EAEnB,MAAM,sCAAsC,CAAC;AAK9C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,IAAI;IAME,GAAG;CAkFV"}

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsB1C,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,UAAU,CAAC;AAEtD,OAAO,KAAK,EACV,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAC7C,eAAe,CAAC,EAAE,KAAK,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,yBAAyB,CAAC;KACrC,CAAC,CAAC;IACH,cAAc,CAAC,EAAE,sBAAsB,CAAC;IACxC,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAClD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAkFF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IA6EJ,cAAc,YAAa,MAAM,UAS/B;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YAkFvC,4BAA4B;IAuB1C,qBAAqB;IAUrB,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAc1C,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,YAAY,EAAE,aAAa;IAwBtF,GAAG;CA4QV"}
+{"version":3,"file":"FirmwareUpdateV2.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,QAAQ,EAEb,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAuB1C,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,UAAU,CAAC;AAEtD,OAAO,KAAK,EACV,sBAAsB,EACtB,yBAAyB,EAC1B,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yCAAyC,CAAC;AAE1F,KAAK,MAAM,GAAG;IACZ,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,QAAQ,CAAC,EAAE,yBAAyB,CAAC;IACrC,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAC7C,eAAe,CAAC,EAAE,KAAK,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,yBAAyB,CAAC;KACrC,CAAC,CAAC;IACH,cAAc,CAAC,EAAE,sBAAsB,CAAC;IACxC,YAAY,CAAC,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;IAClD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,UAAU,GAAG,KAAK,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,aAAa,CAAC;CAC9B,CAAC;AAkFF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,MAAM,CAAC;IAC9D,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,IAAI;IA6EJ,cAAc,YAAa,MAAM,UAS/B;YAEY,qCAAqC;IAkBnD,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS;YAkFvC,4BAA4B;IAuB1C,qBAAqB;IAUrB,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAc1C,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAAE,YAAY,EAAE,aAAa;IAwBtF,GAAG;CAyQV"}

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAY/E,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAMnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,eAAe,CAA4B;IAEnD,IAAI;IAmFE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAwN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CAuE7C"}
+{"version":3,"file":"FirmwareUpdateV3.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV3.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAY/E,OAAO,KAAK,EAEV,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAiB,MAAM,qBAAqB,CAAC;AAMnE,eAAO,MAAM,gCAAgC,UAAU,CAAC;AAaxD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAE1C,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,eAAe,CAA4B;IAEnD,IAAI;IAmFE,GAAG;;;;;YAQK,aAAa;IA6D3B,OAAO,CAAC,wBAAwB;YAiBlB,kBAAkB;YAelB,oBAAoB;IAKlC,OAAO,CAAC,wBAAwB;YAgBlB,oBAAoB;YA2DpB,uBAAuB;YAuBvB,4BAA4B;YA+E5B,aAAa;IAwN3B,OAAO,CAAC,yBAAyB;IAajC,OAAO,CAAC,yBAAyB;IAQjC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,sCAAsC;IAexC,sBAAsB,CAAC,OAAO,EAAE,MAAM;CAuE7C"}

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAkB/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AA4VrC,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,SAc5B,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,IAAI;IAoHJ,OAAO,CAAC,8BAA8B;IAoBhC,GAAG;;;;;YAKK,aAAa;YAsEb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqD/B,gCAAgC;YAmDhC,8BAA8B;IAsB5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,kCAAkC;YAO5B,iCAAiC;YAOjC,iCAAiC;YAgBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA6C9B,iCAAiC;YAmBjC,+BAA+B;IA+D7C,OAAO,CAAC,gCAAgC;YAyC1B,oCAAoC;YAkCpC,kCAAkC;IAgChD,OAAO,CAAC,0BAA0B;IAO5B,6BAA6B;YA0BrB,+BAA+B;IA4C7C,OAAO,CAAC,6BAA6B;IAkCrC,OAAO,CAAC,8BAA8B;YA8CxB,uBAAuB;YAiCvB,6BAA6B;YAa7B,uBAAuB;YA6CvB,8BAA8B;YA2D9B,6BAA6B;IA0D3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;YA+FtB,uCAAuC;YA4GvC,gCAAgC;YAShC,8BAA8B;YAsB9B,mCAAmC;YAWnC,qCAAqC;YA2CrC,yBAAyB;YAiDzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAI5B,cAAc;YA+Bd,6BAA6B;YAU7B,0BAA0B;YAS1B,6BAA6B;YAmB7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAkB/E,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AA4VrC,eAAO,MAAM,iCAAiC,0BACrB,MAAM,uBACR,MAAM,SAc5B,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,wBAAwB,CAAC,sBAAsB,CAAC;IAC5F,OAAO,CAAC,8BAA8B,CAAC,CAAS;IAEhD,qBAAqB;IAIrB,OAAO,CAAC,yBAAyB,CAA4B;IAE7D,OAAO,CAAC,2BAA2B,CAAS;IAE5C,OAAO,CAAC,iCAAiC,CAA6B;IAEtE,OAAO,CAAC,6BAA6B,CAAC,CAAW;IAEjD,OAAO,CAAC,6BAA6B,CAAS;IAE9C,IAAI;IAoHJ,OAAO,CAAC,8BAA8B;IAoBhC,GAAG;;;;;YAKK,aAAa;YAsEb,4BAA4B;YAkB5B,0BAA0B;YAY1B,8BAA8B;YAK9B,+BAA+B;YAqD/B,gCAAgC;YAmDhC,8BAA8B;IAsB5C,OAAO,CAAC,8BAA8B;IA0BtC,OAAO,CAAC,kCAAkC;IAc1C,OAAO,CAAC,gCAAgC;IAsDxC,OAAO,CAAC,6BAA6B;YAsBvB,2BAA2B;IAWzC,OAAO,CAAC,yBAAyB;IAKjC,OAAO,CAAC,kCAAkC;YAO5B,iCAAiC;YAOjC,iCAAiC;YAgBjC,iCAAiC;IAM/C,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,4BAA4B;IAQpC,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,wBAAwB;IAkBhC,OAAO,CAAC,6BAA6B;YAMvB,8BAA8B;YA6C9B,iCAAiC;YAmBjC,+BAA+B;IA+D7C,OAAO,CAAC,gCAAgC;YAyC1B,oCAAoC;YAkCpC,kCAAkC;IAgChD,OAAO,CAAC,0BAA0B;IAO5B,6BAA6B;YA0BrB,+BAA+B;IA4C7C,OAAO,CAAC,6BAA6B;IAkCrC,OAAO,CAAC,8BAA8B;YA8CxB,uBAAuB;YAiCvB,6BAA6B;YAa7B,uBAAuB;YA6CvB,8BAA8B;YA2D9B,6BAA6B;IA0D3C,OAAO,CAAC,mCAAmC;YAI7B,0BAA0B;IAaxC,OAAO,CAAC,4BAA4B;YA+FtB,uCAAuC;YA4GvC,gCAAgC;YAShC,8BAA8B;YAsB9B,mCAAmC;YAWnC,qCAAqC;YA2CrC,yBAAyB;YAiDzB,8BAA8B;IAU5C,OAAO,CAAC,kCAAkC;YAI5B,cAAc;YA+Bd,6BAA6B;YAU7B,0BAA0B;YAS1B,6BAA6B;YAmB7B,gBAAgB;IAiB9B,OAAO,CAAC,qBAAqB;CAM9B"}

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

@@ -1 +1 @@
-{"version":3,"file":"OpenWalletSession.d.ts","sourceRoot":"","sources":["../../src/api/OpenWalletSession.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AAsExC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,qBAAqB;IAIrB,IAAI;IAOE,GAAG,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAqH/C"}
+{"version":3,"file":"OpenWalletSession.d.ts","sourceRoot":"","sources":["../../src/api/OpenWalletSession.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,gCAAgC,CAAC;AA+DxC,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,qBAAqB;IAIrB,IAAI;IAOE,GAAG,IAAI,OAAO,CAAC,wBAAwB,CAAC;CAmH/C"}

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

@@ -0,0 +1,3 @@
+import { HardwareError } from '@onekeyfe/hd-shared';
+export declare const normalizeFirmwarePreparationError: (error: unknown) => HardwareError;
+//# sourceMappingURL=FirmwarePreparationError.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"FirmwarePreparationError.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwarePreparationError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,aAAa,EAAqB,MAAM,qBAAqB,CAAC;AAE/E,eAAO,MAAM,iCAAiC,UAAW,OAAO,kBAS/D,CAAC"}

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

@@ -8,6 +8,7 @@ type ReleaseSelection = {
     release?: unknown;
 };
 export declare const digestFirmwareUpdateContract: (value: unknown) => string;
+export declare const validateFirmwareUpdatePlanForceTargets: (value: unknown) => FirmwareUpdatePlanForceTarget[];
 export declare const FIRMWARE_UPDATE_PLAN_TARGETS: Set<FirmwareUpdatePlanTarget>;
 export declare const FIRMWARE_UPDATE_PLAN_ROLES: Set<string>;
 export declare const assertFirmwareUpdatePlan: (value: unknown) => FirmwareUpdatePlan;

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

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdatePlan.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdatePlan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,aAAa,EAA6B,MAAM,qBAAqB,CAAC;AAS5F,OAAO,KAAK,EACV,kBAAkB,EAElB,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,KAAK,sBAAsB,GAAG,QAAQ,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,WAAW,CAAC;AAyBjF,KAAK,gBAAgB,GAAG;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AA0GF,eAAO,MAAM,4BAA4B,UAAW,OAAO,KAAG,MAG3D,CAAC;AAgCJ,eAAO,MAAM,4BAA4B,+BAavC,CAAC;AAEH,eAAO,MAAM,0BAA0B,aAOrC,CAAC;AAYH,eAAO,MAAM,wBAAwB,UAAW,OAAO,KAAG,kBAoHzD,CAAC;AA2JF,eAAO,MAAM,uBAAuB;cASxB,QAAQ;kBACJ,aAAa;cACjB,sBAAsB;cACtB,gBAAgB;SACrB,gBAAgB;;;MAGnB,kBA+HH,CAAC"}
+{"version":3,"file":"FirmwareUpdatePlan.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwareUpdatePlan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,aAAa,EAA6B,MAAM,qBAAqB,CAAC;AAS5F,OAAO,KAAK,EACV,kBAAkB,EAElB,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,KAAK,sBAAsB,GAAG,QAAQ,GAAG,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,WAAW,CAAC;AAyBjF,KAAK,gBAAgB,GAAG;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AA0GF,eAAO,MAAM,4BAA4B,UAAW,OAAO,KAAG,MAG3D,CAAC;AAkBJ,eAAO,MAAM,sCAAsC,UAC1C,OAAO,KACb,6BAA6B,EAa/B,CAAC;AAuBF,eAAO,MAAM,4BAA4B,+BAavC,CAAC;AAEH,eAAO,MAAM,0BAA0B,aAOrC,CAAC;AAYH,eAAO,MAAM,wBAAwB,UAAW,OAAO,KAAG,kBAoHzD,CAAC;AA4NF,eAAO,MAAM,uBAAuB;cASxB,QAAQ;kBACJ,aAAa;cACjB,sBAAsB;cACtB,gBAAgB;SACrB,gBAAgB;;;MAGnB,kBAiJH,CAAC"}

package/dist/index.d.ts

@@ -1423,8 +1423,6 @@ type OpenWalletSessionPayloadBase = {
     protocol: 'V1' | 'V2';
     deviceId: string;
     resumed: boolean;
-    /** Forwarded only when the firmware response contains a wallet session id. */
-    sessionId?: string;
 };
 type OpenWalletSessionPayload = OpenWalletSessionPayloadBase & ({
     walletType: 'standard';

package/dist/index.js

@@ -564,6 +564,24 @@ const planError = (message) => {
         firmwareUpdateCode: 'FirmwarePlanInvalid',
     });
 };
+const FIRMWARE_UPDATE_PLAN_FORCE_TARGETS = new Set([
+    'firmware',
+    'ble',
+    'bootloader',
+    'resource',
+]);
+const validateFirmwareUpdatePlanForceTargets = (value) => {
+    if (value === undefined) {
+        return [];
+    }
+    if (!Array.isArray(value) ||
+        value.length > FIRMWARE_UPDATE_PLAN_FORCE_TARGETS.size ||
+        value.some(target => !FIRMWARE_UPDATE_PLAN_FORCE_TARGETS.has(target)) ||
+        new Set(value).size !== value.length) {
+        return planError('Firmware update force targets are invalid');
+    }
+    return [...value];
+};
 const assertExactKeys = (value, required, optional = []) => {
     const allowed = new Set([...required, ...optional]);
     if (required.some(key => !Object.prototype.hasOwnProperty.call(value, key)) ||
@@ -736,24 +754,23 @@ const getExecutor = (features) => {
     }
     return 'v2';
 };
-const buildProtocolV2Artifacts = (release) => {
+const buildProtocolV2Artifacts = (release, { includeComponents = true, includeResources = true, } = {}) => {
     var _a;
     const components = asRecord(release.components);
-    if (!components) {
+    if (includeComponents && !components) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 release has no component set', { firmwareUpdateCode: 'FirmwarePlanInvalid' });
     }
     const installOrder = Array.isArray(release.installOrder)
         ? release.installOrder.filter((key) => typeof key === 'string')
         : [];
-    const componentKeys = [
-        ...installOrder,
-        ...Object.keys(components).filter(key => !installOrder.includes(key)),
-    ];
+    const componentKeys = includeComponents && components
+        ? [...installOrder, ...Object.keys(components).filter(key => !installOrder.includes(key))]
+        : [];
     const artifacts = [];
     const targets = [];
     const componentTargets = new Set();
     for (const key of componentKeys) {
-        const component = asRecord(components[key]);
+        const component = asRecord(components === null || components === void 0 ? void 0 : components[key]);
         const targetName = (_a = asString(component === null || component === void 0 ? void 0 : component.target)) === null || _a === void 0 ? void 0 : _a.toUpperCase();
         if (targetName === 'ROMLOADER') {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 ROMLOADER requires its dedicated loader flow', { firmwareUpdateCode: 'FirmwarePlanInvalid' });
@@ -772,7 +789,7 @@ const buildProtocolV2Artifacts = (release) => {
         })), (asVersion(component.version) ? { targetVersion: asVersion(component.version) } : {})));
         targets.push(target);
     }
-    const bundles = Array.isArray(release.resourceBundles) ? release.resourceBundles : [];
+    const bundles = includeResources && Array.isArray(release.resourceBundles) ? release.resourceBundles : [];
     const resourceBundleNames = new Set();
     for (const value of bundles) {
         const bundle = asRecord(value);
@@ -794,17 +811,51 @@ const buildProtocolV2Artifacts = (release) => {
     }
     return { artifacts, targets: [...new Set(targets)] };
 };
+const isForcedTargetRepresented = ({ executor, forcedTarget, artifacts, targetsToUpdate, }) => {
+    if (executor !== 'v4') {
+        return artifacts.some(artifact => artifact.target === forcedTarget && targetsToUpdate.includes(forcedTarget));
+    }
+    if (forcedTarget === 'firmware') {
+        return artifacts.some(artifact => artifact.role === 'component' && targetsToUpdate.includes(artifact.target));
+    }
+    if (forcedTarget === 'resource') {
+        return artifacts.some(artifact => artifact.role === 'resourceBundle' &&
+            artifact.target === 'resource' &&
+            targetsToUpdate.includes('resource'));
+    }
+    return false;
+};
+const assertForcedTargetsRepresented = ({ executor, forcedTargets, artifacts, targetsToUpdate, }) => {
+    for (const forcedTarget of forcedTargets) {
+        if (!isForcedTargetRepresented({
+            executor,
+            forcedTarget,
+            artifacts,
+            targetsToUpdate,
+        })) {
+            planError(`Forced firmware update target ${forcedTarget} is not represented by the plan`);
+        }
+    }
+};
 const buildFirmwareUpdatePlan = ({ features, firmwareType, platform, firmware, ble, bootloader, forceUpdateTargets, }) => {
     var _a, _b, _c, _d, _e, _f, _g;
     const executor = getExecutor(features);
     let artifacts = [];
     let targetsToUpdate = [];
     const firmwareRelease = asRelease(firmware);
-    const forcedTargets = new Set(forceUpdateTargets);
+    const validatedForceTargets = validateFirmwareUpdatePlanForceTargets(forceUpdateTargets);
+    const forcedTargets = new Set(validatedForceTargets);
     const shouldUpdateFirmware = isUpgrade(firmware) || forcedTargets.has('firmware');
     const shouldUpdateResource = isUpgrade(firmware) || forcedTargets.has('resource');
+    if (executor === 'v4' &&
+        validatedForceTargets.some(target => target === 'ble' || target === 'bootloader')) {
+        planError('Protocol V2 does not support forced BLE or legacy bootloader targets');
+    }
     if (executor === 'v4' && (shouldUpdateFirmware || shouldUpdateResource)) {
-        const protocolV2 = buildProtocolV2Artifacts(firmwareRelease !== null && firmwareRelease !== void 0 ? firmwareRelease : {});
+        const protocolV2 = buildProtocolV2Artifacts(firmwareRelease !== null && firmwareRelease !== void 0 ? firmwareRelease : {}, {
+            includeComponents: shouldUpdateFirmware,
+            includeResources: shouldUpdateResource,
+        });
         artifacts = protocolV2.artifacts;
         targetsToUpdate = protocolV2.targets;
     }
@@ -862,6 +913,12 @@ const buildFirmwareUpdatePlan = ({ features, firmwareType, platform, firmware, b
         }
         targetsToUpdate = [...new Set(artifacts.map(artifact => artifact.target))];
     }
+    assertForcedTargetsRepresented({
+        executor,
+        forcedTargets: validatedForceTargets,
+        artifacts,
+        targetsToUpdate,
+    });
     const deviceIdentity = getDeviceUUID(features);
     if (artifacts.length > 0 &&
         (platform === 'native' || platform === 'desktop') &&
@@ -878,7 +935,7 @@ const buildFirmwareUpdatePlan = ({ features, firmwareType, platform, firmware, b
         artifacts,
         targetsToUpdate,
     };
-    return Object.assign(Object.assign({}, planWithoutDigest), { planDigest: digestFirmwareUpdatePlan(planWithoutDigest) });
+    return assertFirmwareUpdatePlan(Object.assign(Object.assign({}, planWithoutDigest), { planDigest: digestFirmwareUpdatePlan(planWithoutDigest) }));
 };
 
 const preparedPlanError = (message) => {
@@ -45796,12 +45853,13 @@ const wasResumed = (session) => !!session &&
     typeof session === 'object' &&
     'resumed' in session &&
     session.resumed === true;
-const forwardSessionId = (session) => session.newSession ? { sessionId: session.newSession } : {};
 const requireHiddenWalletResponse = (session) => {
     if (!session.passphraseState) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, 'Hidden wallet response is missing passphraseState');
     }
-    return Object.assign({ passphraseState: session.passphraseState }, forwardSessionId(session));
+    return {
+        passphraseState: session.passphraseState,
+    };
 };
 const normalizeParams = (payload) => {
     if (payload.mode === undefined) {
@@ -45873,7 +45931,13 @@ class OpenWalletSession extends BaseMethod {
                     this.device.clearInternalState();
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
                 }
-                return Object.assign(Object.assign({ protocol, walletType: 'standard', deviceId, passphraseState: null }, forwardSessionId(session)), { resumed: wasResumed(session) });
+                return {
+                    protocol,
+                    walletType: 'standard',
+                    deviceId,
+                    passphraseState: null,
+                    resumed: wasResumed(session),
+                };
             }
             if (this.params.mode === 'resume-hidden') {
                 if (isProtocolV2) {
@@ -45925,7 +45989,7 @@ class OpenWalletSession extends BaseMethod {
                 resumed: wasResumed(session),
             };
             return this.device.getCurrentPassphraseProtection() === false
-                ? Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'standard', passphraseState: null }), forwardSessionId(session)) : Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'hidden' }), requireHiddenWalletResponse(session));
+                ? Object.assign(Object.assign({}, responseBase), { walletType: 'standard', passphraseState: null }) : Object.assign(Object.assign(Object.assign({}, responseBase), { walletType: 'hidden' }), requireHiddenWalletResponse(session));
         });
     }
 }
@@ -46172,6 +46236,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const { features } = this.device;
             const { checkBridgeRelease, firmwareType: firmwareTypeParams, platform, forceUpdateTargets, } = this.payload;
+            const validatedForceUpdateTargets = validateFirmwareUpdatePlanForceTargets(forceUpdateTargets);
             if (!features) {
                 return Promise.resolve(null);
             }
@@ -46205,11 +46270,12 @@ class CheckAllFirmwareRelease extends BaseMethod {
                     firmware: firmwareRelease,
                     ble: bleFirmwareReleaseInfo,
                     bootloader: bootloaderRelease,
-                    forceUpdateTargets,
+                    forceUpdateTargets: validatedForceUpdateTargets,
                 });
             }
             catch (error) {
-                if (!(error instanceof hdShared.HardwareError) ||
+                if (validatedForceUpdateTargets.length > 0 ||
+                    !(error instanceof hdShared.HardwareError) ||
                     ((_c = error.params) === null || _c === void 0 ? void 0 : _c.firmwareUpdateCode) !== 'FirmwarePlanInvalid') {
                     throw error;
                 }
@@ -48369,6 +48435,14 @@ class FirmwareUpdate extends BaseMethod {
     }
 }
 
+const normalizeFirmwarePreparationError = (error) => {
+    var _a;
+    if (error instanceof hdShared.HardwareError && ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode)) {
+        return error;
+    }
+    return hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, error instanceof Error ? error.message : String(error));
+};
+
 const Log$7 = getLogger(exports.LoggerNames.Method);
 const FIRMWARE_DOWNLOAD_REQUEST_OPTIONS = {
     connectTimeoutMs: 60000,
@@ -48651,7 +48725,6 @@ class FirmwareUpdateV2 extends BaseMethod {
             let preparedSource;
             try {
                 const acquireFirmwareSource = () => __awaiter(this, void 0, void 0, function* () {
-                    var _k;
                     try {
                         if (preparedSource) {
                             return preparedSource;
@@ -48715,7 +48788,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                         return source;
                     }
                     catch (err) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_k = err.message) !== null && _k !== void 0 ? _k : err);
+                        throw normalizeFirmwarePreparationError(err);
                     }
                 });
                 if (!device.isBootloader() && features) {
@@ -48916,7 +48989,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
         });
     }
     runProtocolV1() {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
@@ -48950,7 +49023,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             }
             catch (err) {
                 yield this.closeArtifactSources();
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_c = err.message) !== null && _c !== void 0 ? _c : err);
+                throw normalizeFirmwarePreparationError(err);
             }
             if (!bootloaderSource && fwSources.length === 0) {
                 yield this.closeArtifactSources();
@@ -49874,7 +49947,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     runProtocolV2() {
-        var _a, _b, _c;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             yield this.captureProtocolV2PhysicalIdentity();
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
@@ -49912,7 +49985,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
             catch (err) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_c = err.message) !== null && _c !== void 0 ? _c : err);
+                throw normalizeFirmwarePreparationError(err);
             }
             if (!bootloaderBinary && fwBinaryMap.length === 0 && !(resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length)) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');

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

@@ -16,7 +16,6 @@ type OpenWalletSessionPayloadBase = {
     protocol: 'V1' | 'V2';
     deviceId: string;
     resumed: boolean;
-    sessionId?: string;
 };
 export type OpenWalletSessionPayload = OpenWalletSessionPayloadBase & ({
     walletType: 'standard';

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

@@ -1 +1 @@
-{"version":3,"file":"openWalletSession.d.ts","sourceRoot":"","sources":["../../../src/types/api/openWalletSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAC/B;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IAEjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GACjE,CACI;IACE,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,IAAI,CAAC;CACvB,GACD;IACE,UAAU,EAAE,QAAQ,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB,CACJ,CAAC;AAMJ,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"openWalletSession.d.ts","sourceRoot":"","sources":["../../../src/types/api/openWalletSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,uBAAuB,GAC/B;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,CAAC;IACjB,eAAe,CAAC,EAAE,KAAK,CAAC;CACzB,GACD;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEN,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,GACjE,CACI;IACE,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,IAAI,CAAC;CACvB,GACD;IACE,UAAU,EAAE,QAAQ,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;CACzB,CACJ,CAAC;AAMJ,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,wBAAwB,CAAC,CAAC"}

package/package.json

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

package/src/api/CheckAllFirmwareRelease.ts

@@ -7,7 +7,10 @@ import {
   getBootloaderReleaseInfo,
   getFirmwareReleaseInfo,
 } from './firmware/releaseHelper';
-import { buildFirmwareUpdatePlan } from './firmware/FirmwareUpdatePlan';
+import {
+  buildFirmwareUpdatePlan,
+  validateFirmwareUpdatePlanForceTargets,
+} from './firmware/FirmwareUpdatePlan';
 import { getBridgeReleaseInfo } from '../utils/bridgeUpdate';
 import {
   LoggerNames,
@@ -40,6 +43,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       platform,
       forceUpdateTargets,
     } = this.payload as CheckAllFirmwareReleaseParams;
+    const validatedForceUpdateTargets = validateFirmwareUpdatePlanForceTargets(forceUpdateTargets);
 
     if (!features) {
       return Promise.resolve(null);
@@ -79,10 +83,11 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
         firmware: firmwareRelease,
         ble: bleFirmwareReleaseInfo,
         bootloader: bootloaderRelease,
-        forceUpdateTargets,
+        forceUpdateTargets: validatedForceUpdateTargets,
       });
     } catch (error) {
       if (
+        validatedForceUpdateTargets.length > 0 ||
         !(error instanceof HardwareError) ||
         error.params?.firmwareUpdateCode !== 'FirmwarePlanInvalid'
       ) {

package/src/api/FirmwareUpdateV2.ts

@@ -14,6 +14,7 @@ import { BaseMethod } from './BaseMethod';
 import { validateParams } from './helpers/paramsValidator';
 import { DevicePool } from '../device/DevicePool';
 import { getBinary, getInfo, getSysResourceBinary } from './firmware/getBinary';
+import { normalizeFirmwarePreparationError } from './firmware/FirmwarePreparationError';
 import {
   updateResources,
   updateResourcesFromSources,
@@ -27,8 +28,8 @@ import { DEVICE } from '../events';
 import { type FirmwareByteSource, openFirmwareByteSource } from './firmware/FirmwareArtifactSource';
 import { resolveFirmwareUpdateHostBinding } from './firmware/FirmwareHostBinding';
 import {
-  assertFirmwareUpdatePreparedPlanDeviceIdentity,
   assertFirmwareUpdatePreparedPlanBinding,
+  assertFirmwareUpdatePreparedPlanDeviceIdentity,
   getFirmwareUpdateResourceName,
 } from './firmware/FirmwareUpdatePreparedPlan';
 
@@ -503,10 +504,7 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
           this.postTipMessage('DownloadFirmwareSuccess');
           return source;
         } catch (err) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.FirmwareUpdateDownloadFailed,
-            err.message ?? err
-          );
+          throw normalizeFirmwarePreparationError(err);
         }
       };
 

package/src/api/FirmwareUpdateV3.ts

@@ -13,6 +13,7 @@ import {
   getLogger,
 } from '../utils';
 import { getBinary, getSysResourceBinary } from './firmware/getBinary';
+import { normalizeFirmwarePreparationError } from './firmware/FirmwarePreparationError';
 import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
@@ -21,8 +22,8 @@ import { buildProtocolV1FeaturesPayload } from '../deviceProfile';
 import { openFirmwareByteSource } from './firmware/FirmwareArtifactSource';
 import { resolveFirmwareUpdateHostBinding } from './firmware/FirmwareHostBinding';
 import {
-  assertFirmwareUpdatePreparedPlanDeviceIdentity,
   assertFirmwareUpdatePreparedPlanBinding,
+  assertFirmwareUpdatePreparedPlanDeviceIdentity,
   getFirmwareUpdateResourceName,
 } from './firmware/FirmwareUpdatePreparedPlan';
 
@@ -184,7 +185,7 @@ export default class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod<FirmwareU
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
       await this.closeArtifactSources();
-      throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
+      throw normalizeFirmwarePreparationError(err);
     }
 
     if (!bootloaderSource && fwSources.length === 0) {

package/src/api/FirmwareUpdateV4.ts

@@ -18,6 +18,7 @@ import {
   getLogger,
 } from '../utils';
 import { getSysResourceBinary } from './firmware/getBinary';
+import { normalizeFirmwarePreparationError } from './firmware/FirmwarePreparationError';
 import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
@@ -625,7 +626,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         : undefined;
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
-      throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
+      throw normalizeFirmwarePreparationError(err);
     }
 
     if (!bootloaderBinary && fwBinaryMap.length === 0 && !resourceBundles?.length) {

package/src/api/OpenWalletSession.ts

@@ -27,13 +27,7 @@ const wasResumed = (session: unknown) =>
   'resumed' in session &&
   (session as { resumed?: unknown }).resumed === true;
 
-const forwardSessionId = (session: { newSession?: string }) =>
-  session.newSession ? { sessionId: session.newSession } : {};
-
-const requireHiddenWalletResponse = (session: {
-  passphraseState?: string;
-  newSession?: string;
-}) => {
+const requireHiddenWalletResponse = (session: { passphraseState?: string }) => {
   if (!session.passphraseState) {
     throw ERRORS.TypedError(
       HardwareErrorCode.DeviceInitializeFailed,
@@ -42,7 +36,6 @@ const requireHiddenWalletResponse = (session: {
   }
   return {
     passphraseState: session.passphraseState,
-    ...forwardSessionId(session),
   };
 };
 
@@ -132,7 +125,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
         walletType: 'standard',
         deviceId,
         passphraseState: null,
-        ...forwardSessionId(session),
         resumed: wasResumed(session),
       };
     }
@@ -200,7 +192,6 @@ export default class OpenWalletSession extends BaseMethod<OpenWalletSessionParam
           ...responseBase,
           walletType: 'standard',
           passphraseState: null,
-          ...forwardSessionId(session),
         }
       : {
           ...responseBase,

package/src/api/firmware/FirmwarePreparationError.ts

@@ -0,0 +1,12 @@
+import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+export const normalizeFirmwarePreparationError = (error: unknown) => {
+  if (error instanceof HardwareError && error.params?.firmwareUpdateCode) {
+    return error;
+  }
+
+  return ERRORS.TypedError(
+    HardwareErrorCode.FirmwareUpdateDownloadFailed,
+    error instanceof Error ? error.message : String(error)
+  );
+};

package/src/api/firmware/FirmwareUpdatePlan.ts

@@ -166,6 +166,30 @@ const planError = (message: string): never => {
   });
 };
 
+const FIRMWARE_UPDATE_PLAN_FORCE_TARGETS = new Set<FirmwareUpdatePlanForceTarget>([
+  'firmware',
+  'ble',
+  'bootloader',
+  'resource',
+]);
+
+export const validateFirmwareUpdatePlanForceTargets = (
+  value: unknown
+): FirmwareUpdatePlanForceTarget[] => {
+  if (value === undefined) {
+    return [];
+  }
+  if (
+    !Array.isArray(value) ||
+    value.length > FIRMWARE_UPDATE_PLAN_FORCE_TARGETS.size ||
+    value.some(target => !FIRMWARE_UPDATE_PLAN_FORCE_TARGETS.has(target)) ||
+    new Set(value).size !== value.length
+  ) {
+    return planError('Firmware update force targets are invalid');
+  }
+  return [...value] as FirmwareUpdatePlanForceTarget[];
+};
+
 const assertExactKeys = (
   value: Record<string, unknown>,
   required: readonly string[],
@@ -388,13 +412,20 @@ const getExecutor = (features: Features): FirmwareUpdatePlan['executor'] => {
 };
 
 const buildProtocolV2Artifacts = (
-  release: ReleaseRecord
+  release: ReleaseRecord,
+  {
+    includeComponents = true,
+    includeResources = true,
+  }: {
+    includeComponents?: boolean;
+    includeResources?: boolean;
+  } = {}
 ): {
   artifacts: FirmwareUpdatePlanArtifact[];
   targets: FirmwareUpdatePlanTarget[];
 } => {
   const components = asRecord(release.components);
-  if (!components) {
+  if (includeComponents && !components) {
     throw ERRORS.TypedError(
       HardwareErrorCode.RuntimeError,
       'Protocol V2 release has no component set',
@@ -404,15 +435,15 @@ const buildProtocolV2Artifacts = (
   const installOrder = Array.isArray(release.installOrder)
     ? release.installOrder.filter((key): key is string => typeof key === 'string')
     : [];
-  const componentKeys = [
-    ...installOrder,
-    ...Object.keys(components).filter(key => !installOrder.includes(key)),
-  ];
+  const componentKeys =
+    includeComponents && components
+      ? [...installOrder, ...Object.keys(components).filter(key => !installOrder.includes(key))]
+      : [];
   const artifacts: FirmwareUpdatePlanArtifact[] = [];
   const targets: FirmwareUpdatePlanTarget[] = [];
   const componentTargets = new Set<FirmwareUpdatePlanTarget>();
   for (const key of componentKeys) {
-    const component = asRecord(components[key]);
+    const component = asRecord(components?.[key]);
     const targetName = asString(component?.target)?.toUpperCase();
     if (targetName === 'ROMLOADER') {
       throw ERRORS.TypedError(
@@ -453,7 +484,8 @@ const buildProtocolV2Artifacts = (
     targets.push(target);
   }
 
-  const bundles = Array.isArray(release.resourceBundles) ? release.resourceBundles : [];
+  const bundles =
+    includeResources && Array.isArray(release.resourceBundles) ? release.resourceBundles : [];
   const resourceBundleNames = new Set<string>();
   for (const value of bundles) {
     const bundle = asRecord(value);
@@ -492,6 +524,63 @@ const buildProtocolV2Artifacts = (
   return { artifacts, targets: [...new Set(targets)] };
 };
 
+const isForcedTargetRepresented = ({
+  executor,
+  forcedTarget,
+  artifacts,
+  targetsToUpdate,
+}: {
+  executor: FirmwareUpdatePlan['executor'];
+  forcedTarget: FirmwareUpdatePlanForceTarget;
+  artifacts: readonly FirmwareUpdatePlanArtifact[];
+  targetsToUpdate: readonly FirmwareUpdatePlanTarget[];
+}): boolean => {
+  if (executor !== 'v4') {
+    return artifacts.some(
+      artifact => artifact.target === forcedTarget && targetsToUpdate.includes(forcedTarget)
+    );
+  }
+  if (forcedTarget === 'firmware') {
+    return artifacts.some(
+      artifact => artifact.role === 'component' && targetsToUpdate.includes(artifact.target)
+    );
+  }
+  if (forcedTarget === 'resource') {
+    return artifacts.some(
+      artifact =>
+        artifact.role === 'resourceBundle' &&
+        artifact.target === 'resource' &&
+        targetsToUpdate.includes('resource')
+    );
+  }
+  return false;
+};
+
+const assertForcedTargetsRepresented = ({
+  executor,
+  forcedTargets,
+  artifacts,
+  targetsToUpdate,
+}: {
+  executor: FirmwareUpdatePlan['executor'];
+  forcedTargets: readonly FirmwareUpdatePlanForceTarget[];
+  artifacts: readonly FirmwareUpdatePlanArtifact[];
+  targetsToUpdate: readonly FirmwareUpdatePlanTarget[];
+}) => {
+  for (const forcedTarget of forcedTargets) {
+    if (
+      !isForcedTargetRepresented({
+        executor,
+        forcedTarget,
+        artifacts,
+        targetsToUpdate,
+      })
+    ) {
+      planError(`Forced firmware update target ${forcedTarget} is not represented by the plan`);
+    }
+  }
+};
+
 export const buildFirmwareUpdatePlan = ({
   features,
   firmwareType,
@@ -513,12 +602,23 @@ export const buildFirmwareUpdatePlan = ({
   let artifacts: FirmwareUpdatePlanArtifact[] = [];
   let targetsToUpdate: FirmwareUpdatePlanTarget[] = [];
   const firmwareRelease = asRelease(firmware);
-  const forcedTargets = new Set(forceUpdateTargets);
+  const validatedForceTargets = validateFirmwareUpdatePlanForceTargets(forceUpdateTargets);
+  const forcedTargets = new Set(validatedForceTargets);
   const shouldUpdateFirmware = isUpgrade(firmware) || forcedTargets.has('firmware');
   const shouldUpdateResource = isUpgrade(firmware) || forcedTargets.has('resource');
 
+  if (
+    executor === 'v4' &&
+    validatedForceTargets.some(target => target === 'ble' || target === 'bootloader')
+  ) {
+    planError('Protocol V2 does not support forced BLE or legacy bootloader targets');
+  }
+
   if (executor === 'v4' && (shouldUpdateFirmware || shouldUpdateResource)) {
-    const protocolV2 = buildProtocolV2Artifacts(firmwareRelease ?? {});
+    const protocolV2 = buildProtocolV2Artifacts(firmwareRelease ?? {}, {
+      includeComponents: shouldUpdateFirmware,
+      includeResources: shouldUpdateResource,
+    });
     artifacts = protocolV2.artifacts;
     targetsToUpdate = protocolV2.targets;
   } else {
@@ -609,6 +709,13 @@ export const buildFirmwareUpdatePlan = ({
     targetsToUpdate = [...new Set(artifacts.map(artifact => artifact.target))];
   }
 
+  assertForcedTargetsRepresented({
+    executor,
+    forcedTargets: validatedForceTargets,
+    artifacts,
+    targetsToUpdate,
+  });
+
   const deviceIdentity = getDeviceUUID(features);
   if (
     artifacts.length > 0 &&
@@ -631,8 +738,8 @@ export const buildFirmwareUpdatePlan = ({
     artifacts,
     targetsToUpdate,
   };
-  return {
+  return assertFirmwareUpdatePlan({
     ...planWithoutDigest,
     planDigest: digestFirmwareUpdatePlan(planWithoutDigest),
-  };
+  });
 };

package/src/types/api/openWalletSession.ts

@@ -21,8 +21,6 @@ type OpenWalletSessionPayloadBase = {
   protocol: 'V1' | 'V2';
   deviceId: string;
   resumed: boolean;
-  /** Forwarded only when the firmware response contains a wallet session id. */
-  sessionId?: string;
 };
 
 export type OpenWalletSessionPayload = OpenWalletSessionPayloadBase &