@onekeyfe/hd-core 1.2.8-alpha.10 → 1.2.8-alpha.101

package/__tests__/DeviceCommands.test.ts

@@ -130,19 +130,6 @@ describe('DeviceCommands failure mapping', () => {
     );
   });
 
-  it('preserves the Protocol V2 peer-removed pairing error code', async () => {
-    const commands = createCommands();
-    const transportError = Object.assign(new Error('Peer removed pairing information'), {
-      errorCode: HardwareErrorCode.BlePeerRemovedPairingInformation,
-    });
-    commands.mainId = 'main-id';
-    commands.transport = {
-      call: jest.fn().mockRejectedValue(transportError),
-    } as any;
-
-    await expect(commands._commonCall('DeviceInfoGet', {})).rejects.toBe(transportError);
-  });
-
   it('logs canonical DeviceStatus response fields without exposing the device ID', async () => {
     const commands = createCommands();
     const log = getLogger(LoggerNames.DeviceCommands);
@@ -414,6 +401,27 @@ describe('DeviceCommands failure mapping', () => {
     ).rejects.toMatchObject({ errorCode: HardwareErrorCode.DeviceBusy });
   });
 
+  it('maps commands rejected during a Protocol V2 firmware update to DeviceBusy', async () => {
+    const commands = createCommands();
+    const message = 'Requested command not allowed while a firmware update is in progress';
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'Failure',
+          message: { code: 'Failure_ProcessError', message },
+        } as any,
+        'ProtocolInfoRequest'
+      )
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.DeviceBusy,
+      params: {
+        failureCode: 'Failure_ProcessError',
+        firmwareMessage: message,
+      },
+    });
+  });
+
   it('maps the current AskPin passphrase-disabled response without relying on a subcode', async () => {
     const commands = createCommands();
 
@@ -551,6 +559,51 @@ describe('DeviceCommands failure mapping', () => {
     }
   );
 
+  it('maps the Protocol V2 seed-session busy response to DeviceBusy', async () => {
+    const commands = createCommands();
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'Failure',
+          message: {
+            code: 'Failure_ProcessError',
+            subcode: DeviceSessionErrorCode.DeviceSessionError_UserCancelled,
+            message: 'PIN cancelled',
+          },
+        } as any,
+        'SignTx'
+      )
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.DeviceBusy,
+      params: {
+        failureCode: 'Failure_ProcessError',
+        subcode: DeviceSessionErrorCode.DeviceSessionError_UserCancelled,
+        firmwareMessage: 'PIN cancelled',
+      },
+    });
+  });
+
+  it('keeps the same Protocol V2 response as ActionCancelled for DeviceSession calls', async () => {
+    const commands = createCommands();
+
+    await expect(
+      commands._filterCommonTypes(
+        {
+          type: 'Failure',
+          message: {
+            code: 'Failure_ProcessError',
+            subcode: DeviceSessionErrorCode.DeviceSessionError_UserCancelled,
+            message: 'PIN cancelled',
+          },
+        } as any,
+        'DeviceSessionAskPin'
+      )
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.ActionCancelled,
+    });
+  });
+
   it('does not use the legacy cancellation-message fallback for Protocol V1', async () => {
     const commands = createCommands();
     (commands.device.isProtocolV2 as jest.Mock).mockReturnValue(false);

package/__tests__/core-dispose.test.ts

@@ -1,4 +1,7 @@
-import Core, { initConnector } from '../src/core';
+import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
+
+import Core, { init, initConnector, initCore, switchTransport } from '../src/core';
+import DataManager from '../src/data-manager/DataManager';
 import TransportManager from '../src/data-manager/TransportManager';
 import { DevicePool } from '../src/device/DevicePool';
 
@@ -31,4 +34,114 @@ describe('Core.dispose', () => {
     expect(transportStop).toHaveBeenCalledTimes(1);
     expect(disposeDevicePool).toHaveBeenCalledTimes(1);
   });
+
+  test('disposal rejects a queued switch without recreating a transport or connector', async () => {
+    const previous = TransportManager.transport;
+    const { settings } = DataManager;
+    const active = { stop: jest.fn().mockResolvedValue(undefined) };
+    const replacement = jest.fn(() => ({ stop: jest.fn().mockResolvedValue(undefined) }));
+    TransportManager.transport = active as never;
+    const core = initCore();
+    initConnector();
+    const switching = switchTransport({ env: 'emulator', Transport: replacement });
+    const rejected = expect(switching).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.NotInitialized,
+    });
+    try {
+      await core.dispose();
+      await rejected;
+      expect(replacement).not.toHaveBeenCalled();
+      expect(TransportManager.transport).toBe(active);
+      expect(DataManager.settings).toBe(settings);
+      expect(DevicePool.emitter.eventNames()).toHaveLength(0);
+    } finally {
+      await Promise.allSettled([switching]);
+      await core.dispose();
+      TransportManager.transport = previous;
+      DataManager.settings = settings;
+    }
+  });
+
+  test.each(['dispose/reinit', 'init', 'initCore'] as const)(
+    '%s invalidates running and queued switches without blocking a new lifecycle',
+    async lifecycle => {
+      const previous = TransportManager.transport;
+      const { settings } = DataManager;
+      const entered = createDeferred<void>();
+      const closing = createDeferred<void>();
+      const loading = createDeferred<void>();
+      const active = {
+        stop: jest.fn(() => {
+          entered.resolve();
+          return closing.promise;
+        }),
+      };
+      const intermediate = jest.fn(() => ({ stop: jest.fn().mockResolvedValue(undefined) }));
+      const stale = jest.fn(() => ({ stop: jest.fn().mockResolvedValue(undefined) }));
+      const fresh = { stop: jest.fn().mockResolvedValue(undefined) };
+      const current = { stop: jest.fn().mockResolvedValue(undefined) };
+      const Fresh = jest.fn(() => fresh);
+      jest.spyOn(DataManager, 'load').mockImplementation(async next => {
+        await loading.promise;
+        DataManager.settings = next;
+      });
+      TransportManager.transport = active as never;
+      let core = initCore();
+      initConnector();
+      const first = switchTransport({ env: 'emulator', Transport: intermediate });
+      await entered.promise;
+      const second = switchTransport({ env: 'webusb', Transport: stale });
+      const rejected = Promise.all([
+        expect(first).rejects.toMatchObject({ errorCode: HardwareErrorCode.NotInitialized }),
+        expect(second).rejects.toMatchObject({ errorCode: HardwareErrorCode.NotInitialized }),
+      ]);
+      rejected.catch(() => undefined);
+      let initializing: ReturnType<typeof init> | undefined;
+      try {
+        if (lifecycle === 'dispose/reinit') {
+          const disposing = core.dispose();
+          closing.resolve();
+          await disposing;
+        }
+        if (lifecycle === 'initCore') {
+          TransportManager.transport = fresh as never;
+          DataManager.settings = { ...settings, env: 'desktop-web-ble' };
+          core = initCore();
+          initConnector();
+        } else {
+          initializing = init({ ...settings, env: 'desktop-web-ble' }, Fresh);
+          if (lifecycle === 'init') {
+            closing.resolve();
+            await rejected;
+          }
+          loading.resolve();
+          const initialized = await initializing;
+          if (!initialized) throw new Error('Core initialization failed');
+          core = initialized;
+        }
+        await switchTransport({
+          env: 'emulator',
+          Transport: function Current() {
+            return current;
+          },
+        });
+        closing.resolve();
+        await rejected;
+        expect(intermediate).not.toHaveBeenCalled();
+        expect(stale).not.toHaveBeenCalled();
+        expect(TransportManager.transport).toBe(current);
+        expect(DataManager.getSettings('env')).toBe('emulator');
+        expect(fresh.stop).toHaveBeenCalledTimes(1);
+        expect(current.stop).not.toHaveBeenCalled();
+      } finally {
+        closing.resolve();
+        loading.resolve();
+        await initializing;
+        await Promise.allSettled([first, second, rejected]);
+        await core.dispose();
+        TransportManager.transport = previous;
+        DataManager.settings = settings;
+      }
+    }
+  );
 });

package/__tests__/core-error-output.test.ts

@@ -3,7 +3,7 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { initConnector, initCore } from '../src/core';
 import { DataManager } from '../src/data-manager';
 import TransportManager from '../src/data-manager/TransportManager';
-import { IFRAME } from '../src/events';
+import { IFRAME, createErrorMessage } from '../src/events';
 import SearchDevices from '../src/api/SearchDevices';
 import { DeviceList } from '../src/device/DeviceList';
 import { Device } from '../src/device/Device';
@@ -28,6 +28,40 @@ describe('Core 错误输出边界', () => {
     jest.restoreAllMocks();
   });
 
+  test('entry-point errors preserve USB recovery context across JSON serialization', () => {
+    const params = {
+      operation: 'open',
+      nativeErrorName: 'SecurityError',
+      nativeErrorMessage: 'Access denied',
+    };
+    const error = ERRORS.TypedError(
+      HardwareErrorCode.BridgeNeedsPermission,
+      'Access denied',
+      params
+    );
+    expect(JSON.parse(JSON.stringify(createErrorMessage(error)))).toEqual({
+      success: false,
+      payload: { code: HardwareErrorCode.BridgeNeedsPermission, error: 'Access denied', params },
+    });
+  });
+
+  test.each([
+    [HardwareErrorCode.TransportProtocolProbeFailed, { expectedProtocol: 'V1' }],
+    [
+      HardwareErrorCode.TransportProtocolMismatch,
+      { expectedProtocol: 'V2', detectedProtocol: 'V1' },
+    ],
+  ] as const)(
+    'preserves protocol error %s and structured context across the public boundary',
+    (code, params) => {
+      const error = ERRORS.TypedError(code, undefined, params);
+      expect(JSON.parse(JSON.stringify(createErrorMessage(error)))).toEqual({
+        success: false,
+        payload: { code, error: error.message, params },
+      });
+    }
+  );
+
   test.each([
     ['webusb', false],
     ['desktop-webusb', false],
@@ -108,14 +142,32 @@ describe('Core 错误输出边界', () => {
     HardwareErrorCode.BleDeviceBondedCanceled,
     HardwareErrorCode.BleDeviceDisconnected,
     HardwareErrorCode.PollingTimeout,
+    HardwareErrorCode.BlePoweredOff,
+    HardwareErrorCode.BleUnsupported,
+    HardwareErrorCode.BridgeNeedsPermission,
+    HardwareErrorCode.WebUsbDeviceAccessError,
+    HardwareErrorCode.TransportProtocolProbeFailed,
+    HardwareErrorCode.TransportProtocolMismatch,
   ])(
-    'preserves terminal BLE error %s in the public response without polling again',
+    'preserves terminal transport error %s in the public response without polling again',
     async errorCode => {
-      jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);
+      jest
+        .spyOn(DataManager, 'getSettings')
+        .mockReturnValue(
+          [
+            HardwareErrorCode.BridgeNeedsPermission,
+            HardwareErrorCode.WebUsbDeviceAccessError,
+            HardwareErrorCode.TransportProtocolProbeFailed,
+            HardwareErrorCode.TransportProtocolMismatch,
+          ].includes(errorCode)
+            ? ('desktop-webusb' as never)
+            : ('react-native' as never)
+        );
       const error = ERRORS.TypedError(errorCode);
       const acquire = jest.fn().mockRejectedValue(error);
       jest.spyOn(TransportManager, 'getTransport').mockReturnValue({
         acquire,
+        enumerate: jest.fn().mockResolvedValue([{ path: 'ble-pairing-test' }]),
         release: jest.fn().mockResolvedValue(true),
         stop: jest.fn().mockResolvedValue(undefined),
       } as never);

package/__tests__/device-connector-protocol.test.ts

@@ -75,8 +75,11 @@ describe('DeviceConnector protocol validation', () => {
     });
     const connector = new DeviceConnector();
 
-    await expect(connector.acquire('classic-id', undefined, undefined, 'V2')).rejects.toThrow(
-      'Device protocol mismatch: expected V2, detected V1'
+    await expect(connector.acquire('classic-id', undefined, undefined, 'V2')).rejects.toMatchObject(
+      {
+        errorCode: HardwareErrorCode.TransportProtocolMismatch,
+        params: { expectedProtocol: 'V2', detectedProtocol: 'V1' },
+      }
     );
   });
 

package/__tests__/device-lifecycle-events.test.ts

@@ -10,7 +10,6 @@ import {
   isMissingDetectedProtocolV2Error,
   isRetryableBleConnectionError,
   isRetryableBleProtocolV2ProbeError,
-  isTerminalBleStaleBondError,
   resolveBleConnectProtocol,
 } from '../src/core';
 import { DataManager } from '../src/data-manager';
@@ -611,17 +610,18 @@ describe('public device lifecycle events', () => {
   );
 
   test.each([
-    [HardwareErrorCode.RuntimeError, true],
+    [HardwareErrorCode.TransportProtocolProbeFailed, true],
+    [HardwareErrorCode.TransportProtocolMismatch, false],
+    [HardwareErrorCode.RuntimeError, false],
     [HardwareErrorCode.BleDeviceBondError, false],
-    [HardwareErrorCode.BlePeerRemovedPairingInformation, false],
   ] as const)(
     'retries a Protocol V2 probe mismatch with error code %s: %s',
     (errorCode, expected) => {
       const method = { payload: { connectProtocol: 'V2' } } as never;
       const error = {
         errorCode,
-        message:
-          'Device protocol mismatch: expected V2, but device did not respond to expected protocol',
+        message: 'diagnostic wording is not used for classification',
+        params: { expectedProtocol: 'V2' },
       };
 
       expect(isRetryableBleProtocolV2ProbeError(method, error)).toBe(expected);
@@ -631,10 +631,10 @@ describe('public device lifecycle events', () => {
   test.each([
     [HardwareErrorCode.BleConnectedError, true],
     [HardwareErrorCode.BleTimeoutError, true],
+    [HardwareErrorCode.TransportProtocolProbeFailed, true],
+    [HardwareErrorCode.TransportProtocolMismatch, false],
     [HardwareErrorCode.PollingTimeout, false],
     [HardwareErrorCode.BleDeviceBondError, false],
-    [HardwareErrorCode.BlePeerRemovedPairingInformation, false],
-    [HardwareErrorCode.BleBondInvalid, false],
   ] as const)('retries a BLE connection error with error code %s: %s', (errorCode, expected) => {
     const method = { payload: { connectProtocol: 'V2' } } as never;
     const error = {
@@ -645,6 +645,21 @@ describe('public device lifecycle events', () => {
     expect(isRetryableBleConnectionError(method, error)).toBe(expected);
   });
 
+  test('does not retry a failed strict V1 probe as a V2 probe or after user cancellation', () => {
+    const error = ERRORS.TypedError(HardwareErrorCode.TransportProtocolProbeFailed, undefined, {
+      expectedProtocol: 'V1',
+    });
+    const method = { payload: { connectProtocol: 'V2' } } as never;
+    expect(isRetryableBleProtocolV2ProbeError(method, error)).toBe(false);
+    expect(isRetryableBleConnectionError(method, error)).toBe(false);
+    expect(
+      isRetryableBleConnectionError(
+        { payload: {}, device: { wasInterruptedByUser: () => true } } as never,
+        ERRORS.TypedError(HardwareErrorCode.TransportProtocolProbeFailed)
+      )
+    ).toBe(false);
+  });
+
   test('does not retry the desktop acquire deadline fallback', () => {
     const method = { payload: { connectProtocol: 'V2' } } as never;
     const error = {
@@ -687,19 +702,6 @@ describe('public device lifecycle events', () => {
     }
   );
 
-  test.each([
-    [HardwareErrorCode.BleDeviceBondError, true],
-    [HardwareErrorCode.BlePeerRemovedPairingInformation, true],
-    [HardwareErrorCode.BleBondInvalid, true],
-    [HardwareErrorCode.DeviceNotFound, false],
-  ] as const)('treats BLE stale-bond error code %s as terminal: %s', (errorCode, expected) => {
-    const error = {
-      errorCode,
-    };
-
-    expect(isTerminalBleStaleBondError(error)).toBe(expected);
-  });
-
   test.each([
     [HardwareErrorCode.DeviceCheckDeviceIdError, true],
     [HardwareErrorCode.DeviceNotFound, false],
@@ -1058,6 +1060,28 @@ describe('public device lifecycle events', () => {
     expect(device.wasInterruptedByUser()).toBe(false);
   });
 
+  test.each(['V1', 'V2'] as const)(
+    'retires a failed USB %s session before the next user attempt',
+    async protocol => {
+      jest.spyOn(DataManager, 'getSettings').mockReturnValue('desktop-webusb' as never);
+      const device = createInitializedDevice(protocol);
+      device.originalDescriptor = { ...device.originalDescriptor, session: device.mainId };
+      const disconnect = jest.fn().mockResolvedValue(undefined);
+      const release = jest.fn().mockResolvedValue(undefined);
+      device.deviceConnector = { disconnect, release } as never;
+      device.commands = { disposed: false, dispose: jest.fn() } as never;
+      (device as unknown as { deviceAcquired: boolean }).deviceAcquired = true;
+      const error = ERRORS.TypedError(HardwareErrorCode.WebUsbDeviceAccessError);
+      await expect(device.run(() => Promise.reject(error))).rejects.toBe(error);
+      await new Promise(resolve => {
+        setImmediate(resolve);
+      });
+      expect(disconnect).toHaveBeenCalledWith(device.mainId);
+      expect(release).toHaveBeenCalledTimes(1);
+      expect(device.hasDeviceAcquire()).toBe(false);
+    }
+  );
+
   test('waits for the canceled run to finish releasing before cancellation completes', async () => {
     jest.spyOn(DataManager, 'getSettings').mockReturnValue('react-native' as never);
     const device = createInitializedDevice('V2');

package/__tests__/logBlockEvent.test.ts

@@ -5,6 +5,7 @@ import {
   getLogBlockLabel,
   getSafeLogPayload,
 } from '../src/events';
+import { getLog, initLog, setLoggerPostMessage } from '../src/utils/logger';
 
 describe('getLogBlockLabel', () => {
   it('keeps existing sensitive UI response blocking', () => {
@@ -96,4 +97,46 @@ describe('getLogBlockLabel', () => {
   it('does not classify events without an API method as method calls', () => {
     expect(getLogBlockLabel({ event: 'DEVICE_EVENT', type: 'device-connect' })).toBeUndefined();
   });
+
+  it.each(['zcashGetAddress', 'zcashSignPczt'])(
+    'keeps %s wallet data out of logger caches and events with debug disabled',
+    method => {
+      const postMessage = jest.fn();
+      const prefix = `sensitive-zcash-${method}`;
+      const logger = initLog(prefix, false);
+      setLoggerPostMessage(postMessage);
+      const request = {
+        event: 'iframe-call',
+        payload: { method, pczt: 'synthetic-pczt-marker', includeUfvk: true },
+      };
+      const response = {
+        success: true,
+        payload: [
+          {
+            ufvk: 'synthetic-viewing-key-marker',
+            seedFingerprint: 'synthetic-fingerprint-marker',
+            pczt: 'synthetic-signed-pczt-marker',
+          },
+        ],
+      };
+      const blockLabel = getLogBlockLabel(request);
+
+      expect(blockLabel).toBe(method);
+      expect(getLogBlockLabel(request.payload)).toBe(method);
+      logger.debug('request:', getSafeLogPayload(request, blockLabel));
+      logger.debug('response:', getSafeLogPayload(response, blockLabel));
+
+      const cached = getLog().filter(entry => entry.prefix === prefix);
+      expect(cached.map(entry => entry.message[1])).toEqual([
+        { method, payload: '[REDACTED]' },
+        { method, payload: '[REDACTED]' },
+      ]);
+      expect(postMessage).toHaveBeenCalledTimes(2);
+      for (const output of [JSON.stringify(cached), JSON.stringify(postMessage.mock.calls)]) {
+        expect(output).not.toContain('synthetic-');
+        expect(output).toContain('[REDACTED]');
+      }
+      expect(response.payload[0].ufvk).toBe('synthetic-viewing-key-marker');
+    }
+  );
 });

package/__tests__/protocol-v2-bootloader-mode.test.ts

@@ -1,3 +1,6 @@
+import { EDeviceType } from '@onekeyfe/hd-shared';
+
+import DeviceReboot from '../src/api/protocol-v2/DeviceReboot';
 import { Device } from '../src/device/Device';
 import { UI_REQUEST } from '../src/events/ui-request';
 
@@ -23,12 +26,50 @@ const createBootloaderDevice = (protocolType: 'V1' | 'V2') => {
 };
 
 describe('Pro2 bootloader mode', () => {
-  test('does not block Protocol V2 methods in bootloader mode', () => {
+  test('allows deviceReboot to return a Protocol V2 bootloader to normal mode', () => {
+    const device = createBootloaderDevice('V2');
+    const method = new DeviceReboot({
+      id: 1,
+      payload: { method: 'deviceReboot', rebootType: 'normal' },
+    });
+    method.init();
+
+    expect(device.hasUnexpectedMode(method.allowDeviceMode, method.requireDeviceMode)).toBeNull();
+  });
+
+  test('blocks Protocol V2 methods that are not allowed in bootloader mode', () => {
+    const device = createBootloaderDevice('V2');
+
+    expect(device.hasUnexpectedMode([], [])).toBe(UI_REQUEST.BOOTLOADER);
+  });
+
+  test('allows Protocol V2 methods that explicitly support bootloader mode', () => {
     const device = createBootloaderDevice('V2');
 
-    expect(device.hasUnexpectedMode([], [])).toBeNull();
+    expect(device.hasUnexpectedMode([UI_REQUEST.BOOTLOADER], [])).toBeNull();
   });
 
+  test.each([EDeviceType.Pro2, EDeviceType.Neo])(
+    'blocks unsupported Protocol V2 methods in %s romloader mode',
+    deviceType => {
+      const device = createBootloaderDevice('V2');
+      device.updateState(
+        {
+          protocol: 'V2',
+          identity: { deviceType },
+          status: { mode: 'romloader', initialized: null },
+        },
+        'initialize'
+      );
+
+      expect(device.hasUnexpectedMode([], [])).toBe(UI_REQUEST.BOOTLOADER);
+      expect(device.hasUnexpectedMode([UI_REQUEST.NOT_INITIALIZE], [])).toBe(UI_REQUEST.BOOTLOADER);
+      expect(
+        device.hasUnexpectedMode([UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE], [])
+      ).toBeNull();
+    }
+  );
+
   test('keeps the Protocol V1 bootloader restriction', () => {
     const device = createBootloaderDevice('V1');
 

package/__tests__/protocol-v2.test.ts

@@ -4991,23 +4991,6 @@ describe('Protocol V2 firmware update targets', () => {
     expect(typedCall.mock.calls.map(call => call[0])).toEqual(['DeviceInfoGet']);
   });
 
-  test('stops V4 bootloader reconnect polling on a stale BLE bond', async () => {
-    const method = new FirmwareUpdateV4({
-      id: 1,
-      payload: {
-        method: 'firmwareUpdateV4',
-      },
-    });
-    const staleBondError = ERRORS.TypedError(HardwareErrorCode.BlePeerRemovedPairingInformation);
-    const reconnectProtocolV2Device = jest.fn().mockRejectedValue(staleBondError);
-    (method as any).reconnectProtocolV2Device = reconnectProtocolV2Device;
-
-    await expect((method as any).waitForProtocolV2BootloaderMode(60_000, 0)).rejects.toBe(
-      staleBondError
-    );
-    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(1);
-  });
-
   test('polls again when Protocol V2 bootloader serial is temporarily unavailable', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
@@ -9009,36 +8992,6 @@ describe('Protocol V2 firmware update targets', () => {
     );
   });
 
-  test('does not retry or wrap a stale BLE bond during a V4 file transfer', async () => {
-    const method = new FirmwareUpdateV4({
-      id: 1,
-      payload: {
-        method: 'firmwareUpdateV4',
-      },
-    });
-    const staleBondError = ERRORS.TypedError(HardwareErrorCode.BlePeerRemovedPairingInformation);
-    (method as any).fileWriteChunk = jest.fn().mockRejectedValue(staleBondError);
-    const recoverProtocolV2FileTransfer = jest.fn();
-    (method as any).recoverProtocolV2FileTransfer = recoverProtocolV2FileTransfer;
-    const source = await openFirmwareByteSource({
-      binary: new Uint8Array([1]).buffer,
-    });
-
-    try {
-      await expect(
-        (method as any).protocolV2SourceUpdateProcess({
-          source,
-          filePath: 'vol1:firmware.bin',
-          processedSize: 0,
-          totalSize: 1,
-        })
-      ).rejects.toBe(staleBondError);
-    } finally {
-      await source?.close();
-    }
-    expect(recoverProtocolV2FileTransfer).not.toHaveBeenCalled();
-  });
-
   test('does not recover or wrap a cancelled V4 file transfer', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,

package/__tests__/refresh-device-state.test.ts

@@ -73,24 +73,26 @@ describe('live device state reads', () => {
     }
   );
 
-  test('rejects settings scope in loader mode after minimal mode detection', async () => {
-    const getDeviceState = jest.fn().mockResolvedValue({ status: { mode: 'bootloader' } });
-    const method = new GetDeviceState({
-      id: 1,
-      payload: { method: 'getDeviceState', scope: 'settings' },
-    });
-    method.init();
-    (method as any).device = {
-      isProtocolV2: () => true,
-      getCurrentFirmwareType: () => 'universal',
-      getDeviceState,
-    };
+  test.each(['bootloader', 'romloader'] as const)(
+    'reports %s mode for settings scope after minimal mode detection',
+    async mode => {
+      const getDeviceState = jest.fn().mockResolvedValue({ status: { mode } });
+      const method = new GetDeviceState({
+        id: 1,
+        payload: { method: 'getDeviceState', scope: 'settings' },
+      });
+      method.init();
+      (method as any).device = {
+        isProtocolV2: () => true,
+        getDeviceState,
+      };
 
-    await expect(method.run()).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.DeviceNotSupportMethod,
-    });
-    expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['status', 'settings'] });
-  });
+      await expect(method.run()).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.NotAllowInBootloaderMode,
+      });
+      expect(getDeviceState).toHaveBeenCalledWith({ refreshSections: ['status', 'settings'] });
+    }
+  );
 
   test('rejects an unknown scope', () => {
     const method = new GetDeviceState({