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

package/src/api/nexa/NexaGetAddress.ts

@@ -45,10 +45,6 @@ export default class NexaGetAddress extends BaseMethod<HardwareNexaGetAddress[]>
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_mini: {
         min: '3.2.0',
       },

package/src/api/nexa/NexaSignTransaction.ts

@@ -9,6 +9,8 @@ import type { TypedCall } from '@onekeyfe/hd-transport';
 import type { DeviceFirmwareRange, NexaSignTransactionParams, NexaSignature } from '../../types';
 
 export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionParams> {
+  checkDeviceId = true;
+
   hasBundle = false;
 
   init() {
@@ -29,10 +31,6 @@ export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionP
 
   getVersionRange(): DeviceFirmwareRange {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_mini: {
         min: '3.2.0',
       },
@@ -73,7 +71,7 @@ export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionP
       const nextIndex = res.message.request_index;
       const input = this.params.inputs[nextIndex];
       const response = await typedCall('NexaTxInputAck', ['NexaTxInputRequest', 'NexaSignedTx'], {
-        // path 为字符串形式，归一为 address_n 数组（与 run() 中首个 input 的处理一致）
+        // Normalize a string path to address_n, matching the first input handled by run().
         address_n: validatePath(input.path, 3),
         raw_message: input.message,
       });

package/src/api/nostr/NostrDecryptMessage.ts

@@ -6,6 +6,10 @@ import { validateParams } from '../helpers/paramsValidator';
 import type { NostrDecryptMessage as DecryptMessage } from '@onekeyfe/hd-transport';
 
 export default class NostrDecryptMessage extends BaseMethod<DecryptMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/nostr/NostrEncryptMessage.ts

@@ -6,6 +6,10 @@ import { validateParams } from '../helpers/paramsValidator';
 import type { NostrEncryptMessage as EncryptMessage } from '@onekeyfe/hd-transport';
 
 export default class NostrEncryptMessage extends BaseMethod<EncryptMessage> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/nostr/NostrGetPublicKey.ts

@@ -8,6 +8,10 @@ import type { BTCGetAddressParams } from '../../types/api/btcGetAddress';
 import type { NostrPublicKey } from '../../types/api/nostrGetPublicKey';
 
 export default class NostrGetPublicKey extends BaseMethod<GetPublicKey[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/nostr/NostrSignEvent.ts

@@ -10,6 +10,10 @@ import { bytesToHex, hexToBytes } from '../helpers/hexUtils';
 import type { NostrSignEvent as SignEvent } from '@onekeyfe/hd-transport';
 
 export default class NostrSignEvent extends BaseMethod<SignEvent> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/nostr/NostrSignSchnorr.ts

@@ -6,6 +6,10 @@ import { validateParams } from '../helpers/paramsValidator';
 import type { NostrSignSchnorr as SignSchnorr } from '@onekeyfe/hd-transport';
 
 export default class NostrSignSchnorr extends BaseMethod<SignSchnorr> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -7,6 +7,10 @@ import type { PolkadotGetAddress as HardwarePolkadotGetAddress } from '@onekeyfe
 import type { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
 
 export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -8,6 +8,10 @@ import type { PolkadotSignTransactionParams } from '../../types';
 import type { PolkadotSignTx as HardwarePolkadotSignTx } from '@onekeyfe/hd-transport';
 
 export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
+  getSupportedProtocols() {
+    return ['V1', 'V2'] as const;
+  }
+
   hasBundle = false;
 
   init() {

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

@@ -1,9 +1,12 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class DeviceFactoryInfoGet extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;

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

@@ -3,9 +3,12 @@ import { BaseMethod } from '../BaseMethod';
 import type { DeviceFactoryInfoSetParams } from './helpers';
 
 export default class DeviceFactoryInfoSet extends BaseMethod<DeviceFactoryInfoSetParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = {

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

@@ -12,9 +12,12 @@ import type { MessageFromOneKey } from '@onekeyfe/hd-transport';
 import type { DeviceFirmwareUpdateParams } from './helpers';
 
 export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdateParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = {
@@ -48,12 +51,12 @@ export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdat
           },
         }
       );
-      return Promise.resolve(res.message);
+      return res.message;
     } catch (error) {
       if (isProtocolV2DeviceDisconnectedError(error)) {
-        return Promise.resolve({
+        return {
           message: 'Device firmware update started',
-        });
+        };
       }
       throw error;
     }

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

@@ -24,19 +24,23 @@ function normalizeStatusFields(
   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.`);
+    if (value !== undefined) {
+      if (typeof value !== 'boolean') {
+        throw invalidParameter(`Parameter [fields.${field}] must be a boolean.`);
+      }
+      normalized[field] = value;
     }
-    normalized[field] = value;
   }
   return normalized;
 }
 
 export default class DeviceGetFirmwareUpdateStatus extends BaseMethod<DeviceFirmwareUpdateStatusGetParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     const fields = normalizeStatusFields(this.payload.fields);

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

@@ -0,0 +1,21 @@
+import { BaseMethod } from '../BaseMethod';
+
+export default class DeviceGetOnboardingStatus extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
+  init() {
+    this.skipForceUpdateCheck = true;
+    this.useDevicePassphraseState = false;
+  }
+
+  async run() {
+    const { message } = await this.device.commands.typedCall(
+      'OnboardingStatusGet',
+      'OnboardingStatus',
+      {}
+    );
+    return message;
+  }
+}

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

@@ -1,5 +1,3 @@
-import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
-
 import { UI_REQUEST } from '../../constants/ui-request';
 import { PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS } from '../../protocols/protocol-v2';
 import { BaseMethod } from '../BaseMethod';
@@ -13,7 +11,6 @@ export type DeviceInfoGetTargets = {
   se2?: boolean;
   se3?: boolean;
   se4?: boolean;
-  status?: boolean;
 };
 
 export type DeviceInfoGetTypes = {
@@ -36,7 +33,6 @@ const TARGET_KEYS: (keyof DeviceInfoGetTargets)[] = [
   'se2',
   'se3',
   'se4',
-  'status',
 ];
 
 const TYPE_KEYS: (keyof DeviceInfoGetTypes)[] = ['version', 'build_id', 'hash', 'specific'];
@@ -45,7 +41,6 @@ const DEFAULT_TARGETS: DeviceInfoGetTargets = {
   hw: true,
   fw: true,
   coprocessor: true,
-  status: true,
 };
 
 const DEFAULT_TYPES: DeviceInfoGetTypes = {
@@ -103,19 +98,21 @@ function normalizeTypes(value: unknown): DeviceInfoGetTypes | undefined {
 }
 
 /**
- * 原生 DeviceInfoGet（Protocol V2 only）。
+ * Raw DeviceInfoGet command for Protocol V2 only.
  *
- * 与 getDeviceInfo 不同：不构建 DeviceProfile、不更新设备缓存，
- * 按调用方给定的 targets/types 原样请求并返回未加工的 DeviceInfo 消息，
- * 用于调试固件字段上报。
+ * The SDK builds targets/types on demand and returns the raw DeviceInfo message.
+ * This command is internal; integrations should use getDeviceState.
  */
 export default class DeviceInfoGet extends BaseMethod<{
   targets: DeviceInfoGetTargets;
   types: DeviceInfoGetTypes;
 }> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    this.unlockPolicy = 'none';
     this.allowDeviceMode = [
       ...this.allowDeviceMode,
       UI_REQUEST.NOT_INITIALIZE,
@@ -130,10 +127,6 @@ export default class DeviceInfoGet extends BaseMethod<{
   }
 
   async run() {
-    if (!this.device.isProtocolV2()) {
-      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
-    }
-
     const res = await this.device.commands.typedCall(
       'DeviceInfoGet',
       'DeviceInfo',

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

@@ -4,9 +4,11 @@ import { normalizeRebootType } from './helpers';
 import type { DeviceRebootParams } from './helpers';
 
 export default class DeviceReboot extends BaseMethod<DeviceRebootParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = {
@@ -16,9 +18,11 @@ export default class DeviceReboot extends BaseMethod<DeviceRebootParams> {
   }
 
   async run() {
+    const rebootType = normalizeRebootType(this.params.reboot_type ?? this.params.rebootType);
     const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
-      reboot_type: normalizeRebootType(this.params.reboot_type ?? this.params.rebootType),
+      reboot_type: rebootType,
     });
+    this.device.markProtocolV2Reboot(rebootType);
     return Promise.resolve(res.message);
   }
 }

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

@@ -0,0 +1,19 @@
+import { BaseMethod } from '../BaseMethod';
+
+export default class DeviceStatusGet extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
+  init() {
+    this.unlockPolicy = 'none';
+    this.useDevicePassphraseState = false;
+    this.skipForceUpdateCheck = true;
+  }
+
+  async run() {
+    const { message } = await this.device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
+    this.device.updateProtocolV2Status(message);
+    return message;
+  }
+}

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

@@ -0,0 +1,134 @@
+import { blake2s } from '@noble/hashes/blake2s';
+import { bytesToHex } from '@noble/hashes/utils';
+
+import { BaseMethod } from '../BaseMethod';
+import { invalidParameter } from '../helpers/filesystemValidation';
+import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
+import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
+import {
+  PRO2_WALLPAPER_HEIGHT,
+  PRO2_WALLPAPER_WIDTH,
+  type Pro2WallpaperColorFormat,
+  encodePro2Wallpaper,
+} from '../../utils/pro2Wallpaper';
+
+export type DeviceUploadWallpaperParams = {
+  width: number;
+  height: number;
+  rgba: Uint8Array | ArrayBuffer;
+  fileName?: string;
+  chunkSize?: number;
+};
+
+export type DeviceUploadWallpaperResponse = {
+  path: string;
+  size: number;
+  colorFormat: Pro2WallpaperColorFormat;
+  message?: string;
+};
+
+const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
+const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
+
+function normalizeFileName(fileName: string | undefined, data: Uint8Array): string {
+  if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
+    throw invalidParameter(
+      'Parameter [fileName] may only contain letters, numbers, underscores, hyphens and an optional .bin suffix.'
+    );
+  }
+  const baseName = fileName ?? `wallpaper-${bytesToHex(blake2s(data)).slice(0, 12)}`;
+  return baseName.endsWith('.bin') ? baseName : `${baseName}.bin`;
+}
+
+export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpaperParams> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
+  private encoded?: { data: Uint8Array; colorFormat: Pro2WallpaperColorFormat };
+
+  private directoryReady = false;
+
+  private uploaded = false;
+
+  private path = '';
+
+  init() {
+    const { width, height, rgba, fileName, chunkSize } = this.payload;
+    if (width !== PRO2_WALLPAPER_WIDTH || height !== PRO2_WALLPAPER_HEIGHT) {
+      throw invalidParameter(
+        `Pro2 wallpaper dimensions must be ${PRO2_WALLPAPER_WIDTH}x${PRO2_WALLPAPER_HEIGHT}.`
+      );
+    }
+    if (!(rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(rgba)) {
+      throw invalidParameter('Parameter [rgba] must be an ArrayBuffer or Uint8Array.');
+    }
+    if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
+      throw invalidParameter('Parameter [chunkSize] must be a positive integer.');
+    }
+
+    const rgbaBytes =
+      rgba instanceof ArrayBuffer
+        ? rgba
+        : new Uint8Array(rgba.buffer, rgba.byteOffset, rgba.byteLength);
+    this.encoded = encodePro2Wallpaper({ width, height, rgba: rgbaBytes });
+    this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
+    this.params = { width, height, rgba: rgbaBytes, fileName, chunkSize };
+    this.unlockPolicy = 'none';
+    this.skipForceUpdateCheck = true;
+    this.useDevicePassphraseState = false;
+  }
+
+  private async ensureDirectory() {
+    if (this.directoryReady) return;
+    try {
+      await this.device.commands.typedCall('FilesystemDirMake', 'Success', {
+        path: WALLPAPER_DIRECTORY,
+      });
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      if (!/exist/i.test(message)) throw error;
+    }
+    this.directoryReady = true;
+  }
+
+  private async upload() {
+    if (this.uploaded) return;
+    const { encoded } = this;
+    if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
+
+    await writeProtocolV2File({
+      commands: this.device.commands,
+      path: this.path,
+      data: encoded.data,
+      totalSize: encoded.data.byteLength,
+      chunkSize: this.params.chunkSize,
+      maxChunkRetries: 3,
+      overwrite: true,
+      append: false,
+      throwIfAborted: () => this.throwIfAborted(),
+      onProgress: payload => {
+        if (typeof this.postMessage === 'function') {
+          this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
+        }
+      },
+    });
+    this.uploaded = true;
+  }
+
+  async run(): Promise<DeviceUploadWallpaperResponse> {
+    const { encoded } = this;
+    if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
+    await this.ensureDirectory();
+    await this.upload();
+    const response = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
+      settings: { wallpaper_path: this.path },
+    });
+    return {
+      path: this.path,
+      size: encoded.data.byteLength,
+      colorFormat: encoded.colorFormat,
+      message: response.message?.message,
+    };
+  }
+}

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

@@ -1,16 +1,22 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class FilesystemFormat extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('FilesystemFormat', 'Success', {});
+    const res = await this.device.commands.typedCall('FilesystemFormat', 'Success', {
+      data: true,
+      user: true,
+    });
     return Promise.resolve(res.message);
   }
 }

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

@@ -1,9 +1,12 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class FilesystemPermissionFix extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;

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

@@ -1,12 +1,46 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
 import { BaseMethod } from '../BaseMethod';
 
+// nanopb max_size:64 includes the terminating NUL for string fields.
+export const PROTOCOL_V2_PING_MAX_MESSAGE_BYTES = 63;
+
+const getUtf8ByteLength = (value: string) =>
+  Array.from(value).reduce((length, character) => {
+    const codePoint = character.codePointAt(0) ?? 0;
+    if (codePoint <= 0x7f) return length + 1;
+    if (codePoint <= 0x7ff) return length + 2;
+    if (codePoint <= 0xffff) return length + 3;
+    return length + 4;
+  }, 0);
+
+export function validateProtocolV2PingMessage(value: unknown): string {
+  if (value !== undefined && typeof value !== 'string') {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodInvalidParameter,
+      'Protocol V2 Ping message must be a string.'
+    );
+  }
+  const message = value ?? '';
+  if (getUtf8ByteLength(message) > PROTOCOL_V2_PING_MAX_MESSAGE_BYTES) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodInvalidParameter,
+      `Protocol V2 Ping message must not exceed ${PROTOCOL_V2_PING_MAX_MESSAGE_BYTES} UTF-8 bytes.`
+    );
+  }
+  return message;
+}
+
 export default class Ping extends BaseMethod<{ message?: string }> {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
-    this.params = { message: this.payload.message };
+    this.params = { message: validateProtocolV2PingMessage(this.payload.message) };
   }
 
   async run() {

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

@@ -1,9 +1,12 @@
 import { BaseMethod } from '../BaseMethod';
 
 export default class ProtocolInfoRequest extends BaseMethod {
+  getSupportedProtocols() {
+    return ['V2'] as const;
+  }
+
   init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
+    // Protocol V2 (Pro2) only; Core rejects non-V2 devices.
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;

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

@@ -5,8 +5,8 @@ import { ProtocolV2FirmwareTargetType } from '../../protocols/protocol-v2/firmwa
 
 import type {
   DeviceFirmwareTarget,
-  DeviceFirmwareUpdateRecordFields,
   DeviceFirmwareTargetType,
+  DeviceFirmwareUpdateRecordFields,
   TransportCallOptions,
 } from '@onekeyfe/hd-transport';
 
@@ -118,9 +118,6 @@ export const isProtocolV2DeviceDisconnectedError = (error: unknown) => {
     message.includes('connection has timed out unexpectedly') ||
     message.includes('connection error has occured') ||
     message.includes('connection error has occurred') ||
-    message.includes('transferIn') ||
-    message.includes('transferin') ||
-    message.includes('usbdevice') ||
     message.includes('multiplatformbleadapter') ||
     message.includes('multipalformebleadapter') ||
     compactMessage.includes('rxerrorerror6') ||
@@ -138,16 +135,21 @@ export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceR
   return DeviceRebootType.Normal;
 }
 
-// 当前 firmware-pro2 子模块的 DeviceFirmwareTargetType 合法值从生成 enum 派生，
-// 避免协议枚举增减时这里继续保留过期手写编号。
-const VALID_FIRMWARE_TARGET_IDS = new Set<number>(
-  Object.values(ProtocolV2FirmwareTargetType).filter(value => typeof value === 'number') as number[]
-);
+// 与 firmware-pro2 的 proto_target_to_firmware_target 安装白名单保持一致。
+const INSTALLABLE_FIRMWARE_TARGET_IDS = new Set<number>([
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03,
+  ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04,
+]);
 const FIRMWARE_TARGET_ID_BY_NAME = new Map<string, DeviceFirmwareTargetType>(
   Object.entries(ProtocolV2FirmwareTargetType).flatMap(([key, value]) =>
-    VALID_FIRMWARE_TARGET_IDS.has(value)
-      ? [[key, value as DeviceFirmwareTargetType]]
-      : []
+    INSTALLABLE_FIRMWARE_TARGET_IDS.has(value) ? [[key, value as DeviceFirmwareTargetType]] : []
   )
 );
 
@@ -160,14 +162,12 @@ function normalizeTargetId(
   }
   const named = typeof value === 'string' ? FIRMWARE_TARGET_ID_BY_NAME.get(value) : undefined;
   const numeric = named ?? (typeof value === 'number' ? value : Number(value));
-  // 校验值域：仅接受 DeviceFirmwareTargetType 中定义的 target id，
-  // 不再放行任意非负整数。
-  if (Number.isSafeInteger(numeric) && VALID_FIRMWARE_TARGET_IDS.has(numeric)) {
+  if (Number.isSafeInteger(numeric) && INSTALLABLE_FIRMWARE_TARGET_IDS.has(numeric)) {
     return numeric as DeviceFirmwareTargetType;
   }
   throw invalidParameter(
-    `Parameter [${name}] must be a valid firmware target id (one of ${[
-      ...VALID_FIRMWARE_TARGET_IDS,
+    `Parameter [${name}] must be an installable firmware target id (one of ${[
+      ...INSTALLABLE_FIRMWARE_TARGET_IDS,
     ].join(', ')}).`
   );
 }