@onekeyfe/hd-core 1.2.0-alpha.19 → 1.2.0-alpha.20

package/src/types/device.ts

@@ -27,6 +27,12 @@ export type UnavailableCapabilities = { [key: string]: UnavailableCapability };
 
 export type KnownDevice = {
   connectId: string | null;
+  /**
+   * Stable physical-device identity. Current SDK responses always include this
+   * value; it remains optional in the type during the uuid compatibility window.
+   */
+  serialNo?: string;
+  /** @deprecated Use serialNo instead. */
   uuid: string;
   deviceId: string | null;
   deviceType: IDeviceType | null;
@@ -35,14 +41,11 @@ export type KnownDevice = {
   label: string;
   bleName: string | null;
   name: string;
-  /** 用户可见名称：优先设备标签；name 继续表示连接/发现名称。 */
-  displayName?: string;
   error?: typeof undefined;
   mode: EOneKeyDeviceMode;
   features?: Features;
-  /** SDK 统一设备状态快照。features 仅作为旧 API 兼容投影保留。 */
+  /** Unified SDK device-state snapshot; features remains a legacy projection. */
   state?: DeviceState;
-  sessionId?: string | null;
   unavailableCapabilities: UnavailableCapabilities;
   bleFirmwareVersion: IVersionArray | null;
   firmwareVersion: IVersionArray | null;
@@ -55,11 +58,21 @@ export type KnownDevice = {
 
 export type SearchDevice = {
   connectId: string | null;
+  /**
+   * Available after device initialization. BLE discovery does not connect to the
+   * device, so it returns null until a later initialized device response. Current
+   * SDK responses always include the field; it remains optional in the type during
+   * the uuid compatibility window.
+   */
+  serialNo?: string | null;
+  /**
+   * @deprecated Ambiguous legacy identifier. Use serialNo for hardware identity
+   * and connectId for transport routing.
+   */
   uuid: string;
   deviceId: string | null;
   deviceType: IDeviceType;
   name: string;
-  displayName?: string;
   commType: OneKeyDeviceCommType;
 };
 
@@ -170,7 +183,6 @@ export type DeviceStateIdentity = {
   serialNo: string;
   label: string | null;
   bleName: string | null;
-  displayName: string;
 };
 
 export type DeviceStateStatus = {
@@ -217,7 +229,7 @@ export type DeviceStateVersions = {
   bootloader: string | null;
   board: string | null;
   ble: string | null;
-  /** Protocol V1 legacy secure-element firmware version (`se_ver`). */
+  /** @deprecated Kept for legacy consumers; new code should read se01. */
   se?: string | null;
   se01?: string | null;
   se02?: string | null;
@@ -229,17 +241,12 @@ export type DeviceStateVersions = {
   se04Boot?: string | null;
 };
 
-export type DeviceStateSession = {
-  sessionId: string | null;
-  passphraseState?: string;
-};
-
 export type DeviceState = {
   schemaVersion: 1;
   revision: number;
   updatedAt: number;
   protocol: DeviceStateProtocol;
-  /** 设备协议消息中的版本号；与 SDK 的 V1/V2 协议族相互独立。 */
+  /** Device-message protocol version, independent of the SDK V1/V2 protocol family. */
   protocolVersion: number | null;
   identity: DeviceStateIdentity;
   status: DeviceStateStatus;
@@ -258,7 +265,6 @@ export type DeviceStatePatch = {
   versions?: Partial<DeviceStateVersions>;
   capabilities?: Array<number | string>;
   verification?: DeviceFeaturesVerify;
-  session?: Partial<DeviceStateSession> | null;
   raw?: DeviceFeaturesRawPatch;
 };
 

package/src/types/params.ts

@@ -15,7 +15,7 @@ export interface CommonParams {
    */
   timeout?: number;
   /**
-   * Protocol V2 初始化阶段 DeviceInfoGet 超时时间
+   * DeviceInfoGet timeout during Protocol V2 initialization.
    */
   protocolV2DeviceInfoTimeoutMs?: number;
   /**

package/src/types/settings.ts

@@ -58,19 +58,19 @@ export type IProtocolV2FirmwareComponent = {
   version?: IVersionArray;
 };
 
-/** Pro2 RESC bundle okpkg 描述，用于 FileWrite 直写方式增量同步资源 */
+/** Pro2 RESC bundle okpkg descriptor for incremental FileWrite synchronization. */
 export type IProtocolV2ResourceBundle = {
-  /** bundle 名称，如 images / animation / translations / fonts_roobert */
+  /** Bundle name, such as images, animation, translations, or fonts_roobert. */
   name: string;
-  /** 下载 URL */
+  /** Download URL. */
   url: string;
-  /** 设备上的目标路径，如 vol0:/bundles/images/images.okpkg */
+  /** Device target path, such as vol0:/bundles/images/images.okpkg. */
   devicePath: string;
-  /** okpkg container 的 payload_version（用于 FileRead 比对跳过） */
+  /** okpkg payload_version used to skip matching content after FileRead. */
   version?: IVersionArray;
-  /** okpkg container 的 payload_hash（SHA3-512，用于 FileRead 比对） */
+  /** okpkg payload_hash used for SHA3-512 comparison after FileRead. */
   payloadHash?: string;
-  /** okpkg container 的 header_hash（SHA3-512，用于 FileRead 比对） */
+  /** okpkg header_hash used for SHA3-512 comparison after FileRead. */
   headerHash?: string;
 };
 
@@ -95,7 +95,7 @@ export type IFirmwareReleaseInfo = {
   upgradeType?: 'payload-package-set' | string;
   components?: Record<string, IProtocolV2FirmwareComponent>;
   installOrder?: string[];
-  /** Pro2 RESC bundle 列表（FileWrite 直写增量同步模式） */
+  /** Pro2 RESC bundles for incremental direct FileWrite synchronization. */
   resourceBundles?: IProtocolV2ResourceBundle[];
   bootloaderChangelog?: {
     [k in ILocale]: string;

package/src/utils/assets.ts

@@ -1,5 +1,8 @@
 import { httpRequest as browserHttpRequest } from './networkUtils';
 
-export const httpRequest = (url: string, type: string): any => browserHttpRequest(url, type);
+import type { HttpRequestOptions } from './networkUtils';
+
+export const httpRequest = (url: string, type: string, options?: HttpRequestOptions): any =>
+  browserHttpRequest(url, type, options);
 
 export const getTimeStamp = () => new Date().getTime();

package/src/utils/deviceFeaturesCompat.ts

@@ -0,0 +1,173 @@
+import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
+import { Enum_Capability } from '@onekeyfe/hd-transport';
+
+import type { PROTO } from '../constants';
+import type { Features, IDeviceType } from '../types';
+
+export type DeviceFeaturesInput = Features | PROTO.Features;
+
+type CompatibleDeviceFeatures = Partial<Features> &
+  Partial<PROTO.Features> & {
+    onekey_serial?: string;
+    onekey_version?: string;
+  };
+
+const asCompatibleFeatures = (features: DeviceFeaturesInput): CompatibleDeviceFeatures =>
+  features as CompatibleDeviceFeatures;
+
+const firstNonEmptyString = (...values: Array<string | null | undefined>) =>
+  values.find(value => typeof value === 'string' && value.length > 0);
+
+const firstMeaningfulVersion = (...versions: Array<string | null | undefined>) =>
+  versions.find(version => Boolean(version && version !== '0.0.0')) ?? null;
+
+const versionFromParts = (major?: number | null, minor?: number | null, patch?: number | null) =>
+  [major, minor, patch].map(part => Number(part) || 0).join('.');
+
+export const resolveDeviceSerialNo = (features?: DeviceFeaturesInput): string => {
+  if (!features) return '';
+  const compatible = asCompatibleFeatures(features);
+  return (
+    firstNonEmptyString(
+      compatible.serialNo,
+      compatible.onekey_serial_no,
+      compatible.onekey_serial,
+      compatible.serial_no
+    ) ?? ''
+  );
+};
+
+export const resolveDeviceType = (features?: DeviceFeaturesInput): IDeviceType => {
+  if (!features || typeof features !== 'object') {
+    return EDeviceType.Unknown;
+  }
+
+  const compatible = asCompatibleFeatures(features);
+  if (compatible.deviceType && compatible.deviceType !== EDeviceType.Unknown) {
+    return compatible.deviceType;
+  }
+
+  switch (compatible.onekey_device_type?.toString().toUpperCase()) {
+    case 'CLASSIC':
+      return EDeviceType.Classic;
+    case 'CLASSIC1S':
+      return EDeviceType.Classic1s;
+    case 'MINI':
+      return EDeviceType.Mini;
+    case 'TOUCH':
+      return EDeviceType.Touch;
+    case 'PRO':
+      return EDeviceType.Pro;
+    case 'PRO2':
+      return EDeviceType.Pro2;
+    case 'PURE':
+      return EDeviceType.ClassicPure;
+    default:
+      break;
+  }
+
+  if (compatible.model?.toString().toLowerCase() === EDeviceType.Pro2) {
+    return EDeviceType.Pro2;
+  }
+
+  const serialNo = resolveDeviceSerialNo(features);
+  const prefix = serialNo.slice(0, 2).toLowerCase();
+  if (prefix === 'bi' || prefix === 'cl') return EDeviceType.Classic;
+  if (prefix === 'cp') return EDeviceType.ClassicPure;
+  if (prefix === 'mi') return EDeviceType.Mini;
+  if (prefix === 'tc') return EDeviceType.Touch;
+  if (prefix === 'pr') return EDeviceType.Pro;
+  if (prefix === 'p2') return EDeviceType.Pro2;
+
+  const bootloaderMode = compatible.bootloaderMode ?? compatible.bootloader_mode;
+  if (!serialNo && bootloaderMode === true && compatible.model === '1') {
+    return EDeviceType.Classic;
+  }
+
+  return compatible.deviceType ?? EDeviceType.Unknown;
+};
+
+export const resolveDeviceFirmwareType = (features?: DeviceFeaturesInput): EFirmwareType => {
+  if (!features) {
+    return EFirmwareType.Universal;
+  }
+
+  const compatible = asCompatibleFeatures(features);
+  if (compatible.firmwareType) {
+    return compatible.firmwareType;
+  }
+  if (compatible.fw_vendor === 'OneKey Bitcoin-only') {
+    return EFirmwareType.BitcoinOnly;
+  }
+
+  const capabilities = compatible.capabilities as Array<number | string> | null | undefined;
+  const supportsBitcoinLike = capabilities?.some(
+    capability =>
+      capability === Enum_Capability.Capability_Bitcoin_like ||
+      capability === 'Capability_Bitcoin_like'
+  );
+  return capabilities?.length && !supportsBitcoinLike
+    ? EFirmwareType.BitcoinOnly
+    : EFirmwareType.Universal;
+};
+
+export const resolveDeviceBleName = (features?: DeviceFeaturesInput): string | null => {
+  if (!features) return null;
+  const compatible = asCompatibleFeatures(features);
+  return (
+    firstNonEmptyString(compatible.bleName, compatible.onekey_ble_name, compatible.ble_name) ?? null
+  );
+};
+
+export const resolveDeviceFirmwareVersion = (features?: DeviceFeaturesInput): string | null => {
+  if (!features) return null;
+  const compatible = asCompatibleFeatures(features);
+  return firstMeaningfulVersion(
+    compatible.firmwareVersion,
+    compatible.onekey_firmware_version,
+    compatible.onekey_version,
+    versionFromParts(compatible.major_version, compatible.minor_version, compatible.patch_version)
+  );
+};
+
+export const resolveDeviceBootloaderVersion = (features?: DeviceFeaturesInput): string | null => {
+  if (!features) return null;
+  const compatible = asCompatibleFeatures(features);
+  const bootloaderMode = compatible.bootloaderMode ?? compatible.bootloader_mode;
+  return firstMeaningfulVersion(
+    compatible.bootloaderVersion,
+    compatible.onekey_boot_version,
+    compatible.bootloader_version,
+    compatible.onekey_bootloader_version,
+    bootloaderMode
+      ? versionFromParts(
+          compatible.major_version,
+          compatible.minor_version,
+          compatible.patch_version
+        )
+      : null
+  );
+};
+
+export const resolveDeviceBoardVersion = (features?: DeviceFeaturesInput): string | null => {
+  if (!features) return null;
+  const compatible = asCompatibleFeatures(features);
+  return firstMeaningfulVersion(
+    compatible.boardVersion,
+    compatible.onekey_board_version,
+    compatible.boardloader_version,
+    compatible.onekey_romloader_version,
+    compatible.romloader_version
+  );
+};
+
+export const resolveDeviceBleFirmwareVersion = (features?: DeviceFeaturesInput): string | null => {
+  if (!features) return null;
+  const compatible = asCompatibleFeatures(features);
+  return firstMeaningfulVersion(
+    compatible.bleVersion,
+    compatible.onekey_ble_version,
+    compatible.ble_ver,
+    compatible.onekey_coprocessor_version
+  );
+};

package/src/utils/deviceFeaturesUtils.ts

@@ -30,11 +30,12 @@ export const getSupportProtocolV1MessageSchema = (
   const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
   const deviceType = getDeviceType(features);
 
-  if (
-    features.bootloaderMode === true &&
-    features.firmwarePresent === false &&
-    DeviceModelToTypes.model_mini.includes(deviceType)
-  ) {
+  // In bootloader mode the major/minor/patch fields carry the bootloader version, not the
+  // firmware version; normalizing them would mis-route to the legacy schema (e.g. 2.x < 3.3.0).
+  // The legacy getDeviceFirmwareVersion returned 0.0.0 here and landed on v1CurrentSchema, so
+  // force v1CurrentSchema for every bootloader device, including in-place upgrades on
+  // Classic1s/Touch/Pro where firmware is still present.
+  if (features.bootloaderMode === true) {
     return {
       messages: DataManager.messages.v1CurrentSchema,
       protocolV1MessageSchema: 'v1CurrentSchema',
@@ -66,7 +67,7 @@ export const getSupportProtocolV1MessageSchema = (
   };
 };
 
-export const supportInputPinOnSoftware = (features: Features): SupportFeatureType => {
+export const supportInputPinOnSoftware = (features?: Features): SupportFeatureType => {
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
@@ -170,7 +171,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   };
 };
 
-// 仅适用于 Protocol V1 的 Pro：Pro2 走独立版本线，不能套用 4.15.0 门槛
+// Applies to Protocol V1 Pro only; Pro2 has an independent version line.
 const supportProSeriesAttachPinPassphrase = (deviceType: IDeviceType, firmwareVersion: string) =>
   deviceType === EDeviceType.Pro && semver.gte(firmwareVersion, '4.15.0');
 
@@ -188,7 +189,7 @@ export const getPassphraseState = async (
 }> => {
   const { features, commands } = device;
 
-  // 设备尚未建立任何状态时无法判定，保持旧的空返回语义
+  // Preserve legacy empty-result semantics until the device has established state.
   if (!features)
     return { passphraseState: undefined, newSession: undefined, unlockedAttachPin: undefined };
 

package/src/utils/deviceInfoUtils.ts

@@ -1,51 +1,22 @@
 import { isEmpty } from 'lodash';
-import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
-import { Enum_Capability } from '@onekeyfe/hd-transport';
+import { EDeviceType } from '@onekeyfe/hd-shared';
 
 import { DeviceModelToTypes } from '../types';
-import { existCapability } from './capabilitieUtils';
+import {
+  resolveDeviceBleName,
+  resolveDeviceFirmwareType,
+  resolveDeviceSerialNo,
+  resolveDeviceType,
+} from './deviceFeaturesCompat';
 
-import type { Features, IDeviceModel, IDeviceType, IVersionRange } from '../types';
+import type { IDeviceModel, IDeviceType, IVersionRange } from '../types';
+import type { DeviceFeaturesInput } from './deviceFeaturesCompat';
 
 /**
  * get device type by features
  */
-export const getDeviceType = (features?: Features): IDeviceType => {
-  if (!features || typeof features !== 'object') {
-    return EDeviceType.Unknown;
-  }
-  if (features.deviceType) {
-    return features.deviceType;
-  }
-
-  if (features.model === EDeviceType.Pro2 || features.model === 'pro2') {
-    return EDeviceType.Pro2;
-  }
-
-  // low version hardware
-  // onekey_serial_no > onekey_serial > serial_no
-  const serialNo = getDeviceUUID(features);
-
-  // not exist serialNo, bootloader mode, model 1 is classic
-  if (isEmpty(serialNo) && features.bootloaderMode === true && features.model === '1') {
-    return EDeviceType.Classic;
-  }
-
-  if (isEmpty(serialNo)) return EDeviceType.Unknown;
-
-  const miniFlag = serialNo.slice(0, 2);
-  // By May 2021, the miniFlag is 'bixin' for all classic devices
-  if (miniFlag.toLowerCase() === 'bi') return EDeviceType.Classic;
-  if (miniFlag.toLowerCase() === 'cl') return EDeviceType.Classic;
-  if (miniFlag.toLowerCase() === 'cp') return EDeviceType.ClassicPure;
-  if (miniFlag.toLowerCase() === 'mi') return EDeviceType.Mini;
-  if (miniFlag.toLowerCase() === 'tc') return EDeviceType.Touch;
-  if (miniFlag.toLowerCase() === 'pr') return EDeviceType.Pro;
-  if (miniFlag.toLowerCase() === 'p2') return EDeviceType.Pro2;
-
-  // unknown device
-  return EDeviceType.Unknown;
-};
+export const getDeviceType = (features?: DeviceFeaturesInput): IDeviceType =>
+  resolveDeviceType(features);
 
 /**
  * get device type by ble name
@@ -70,28 +41,30 @@ export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
  * Get Connected Device ble name by features
  * @returns
  */
-export const getDeviceBleName = (features?: Features): string | null => {
-  if (features == null) return null;
-  return features.bleName || null;
-};
+export const getDeviceBleName = (features?: DeviceFeaturesInput): string | null =>
+  resolveDeviceBleName(features);
 
 /**
- * Get Connected Device UUID by features
+ * Get Connected Device serial number by features
  */
-export const getDeviceUUID = (features: Features) => {
-  return features.serialNo ?? '';
-};
+export const getDeviceSerialNo = (features?: DeviceFeaturesInput): string =>
+  resolveDeviceSerialNo(features);
+
+/**
+ * @deprecated Use getDeviceSerialNo instead.
+ */
+export const getDeviceUUID = getDeviceSerialNo;
 
 /**
  * Get Connected Device label by features
  */
-export const getDeviceLabel = (features?: Features) => {
+export const getDeviceLabel = (features?: DeviceFeaturesInput) => {
   if (!features) return null;
 
   const deviceType = getDeviceType(features);
   if (deviceType == null) return null;
 
-  if (typeof features.label === 'string' && !isEmpty(features.label)) {
+  if ('label' in features && typeof features.label === 'string' && !isEmpty(features.label)) {
     return features.label;
   }
 
@@ -110,7 +83,7 @@ export const getDeviceLabel = (features?: Features) => {
  * Type has a higher priority than Model
  */
 export const getMethodVersionRange = (
-  features: Features | undefined,
+  features: DeviceFeaturesInput | undefined,
   getVersionRange: (deviceModel: IDeviceType | IDeviceModel) => IVersionRange | undefined
 ): IVersionRange | undefined => {
   const deviceType = getDeviceType(features);
@@ -141,16 +114,5 @@ export const getMethodVersionRange = (
 export const isMethodVersionRangeUnsupported = (versionRange?: IVersionRange): boolean =>
   versionRange?.unsupported === true;
 
-export const getFirmwareType = (features: Features | undefined) => {
-  if (!features) {
-    return EFirmwareType.Universal;
-  }
-  if (features.firmwareType) {
-    return features.firmwareType;
-  }
-  // old firmware
-  return features?.capabilities?.length > 0 &&
-    !existCapability(features, Enum_Capability.Capability_Bitcoin_like)
-    ? EFirmwareType.BitcoinOnly
-    : EFirmwareType.Universal;
-};
+export const getFirmwareType = (features?: DeviceFeaturesInput) =>
+  resolveDeviceFirmwareType(features);

package/src/utils/deviceSettings.ts

@@ -19,19 +19,26 @@ export const LANGUAGE_LABELS = {
 export type LanguageKey = keyof typeof LANGUAGE_LABELS;
 export type LanguageOption = { code: LanguageKey; label: (typeof LANGUAGE_LABELS)[LanguageKey] };
 
+export const PROTOCOL_V2_LANGUAGE_BY_KEY: Record<LanguageKey, string> = {
+  en: 'en-Latn-US',
+  zh_cn: 'zh-Hans-CN',
+  zh_hk: 'zh-Hant-HK',
+  ja: 'ja-Jpan-JP',
+  ko: 'ko-Kore-KR',
+  fr: 'fr-Latn-FR',
+  de: 'de-Latn-DE',
+  ru: 'ru-Cyrl-RU',
+  es: 'es-Latn-ES',
+  it: 'it-Latn-IT',
+  pt_br: 'pt-Latn-BR',
+};
+
+export const mapLanguageToProtocolV2 = (language?: string) =>
+  language ? PROTOCOL_V2_LANGUAGE_BY_KEY[language as LanguageKey] ?? language : undefined;
+
 const PRO2_LANGUAGE_OPTIONS = [
-  { code: 'en-Latn-US', label: 'English' },
-  { code: 'zh-Hans-CN', label: '简体中文' },
-  { code: 'zh-Hant-HK', label: '繁體中文（香港）' },
+  ...Object.entries(LANGUAGE_LABELS).map(([code, label]) => ({ code, label })),
   { code: 'zh-Hant-TW', label: '繁體中文（台灣）' },
-  { code: 'ja-Jpan-JP', label: '日本語' },
-  { code: 'ko-Kore-KR', label: '한국어' },
-  { code: 'fr-Latn-FR', label: 'Français' },
-  { code: 'de-Latn-DE', label: 'Deutsch' },
-  { code: 'ru-Cyrl-RU', label: 'Русский' },
-  { code: 'es-Latn-ES', label: 'Español' },
-  { code: 'it-Latn-IT', label: 'Italiano' },
-  { code: 'pt-Latn-BR', label: 'Portuguese (Brazil)' },
   { code: 'vi-Latn-VN', label: 'Tiếng Việt' },
   { code: 'tr-Latn-TR', label: 'Türkçe' },
   { code: 'id-Latn-ID', label: 'Bahasa Indonesia' },

package/src/utils/deviceVersionUtils.ts

@@ -1,61 +1,42 @@
 import semver from 'semver';
 
-import type { Features, IVersionArray } from '../types';
+import {
+  resolveDeviceBleFirmwareVersion,
+  resolveDeviceBoardVersion,
+  resolveDeviceBootloaderVersion,
+  resolveDeviceFirmwareVersion,
+} from './deviceFeaturesCompat';
 
-/**
- * Get Connected Device version by features
- */
-export const getDeviceFirmwareVersion = (features: Features | undefined): IVersionArray => {
-  if (!features) return [0, 0, 0];
+import type { IVersionArray } from '../types';
+import type { DeviceFeaturesInput } from './deviceFeaturesCompat';
 
-  if (features.firmwareVersion && semver.valid(features.firmwareVersion)) {
-    return features.firmwareVersion.split('.').map(Number) as IVersionArray;
-  }
+const EMPTY_VERSION: IVersionArray = [0, 0, 0];
 
-  return [0, 0, 0];
+const parseDeviceVersion = (version?: string | null): IVersionArray => {
+  const parsed = version ? semver.parse(version) : null;
+  return parsed ? [parsed.major, parsed.minor, parsed.patch] : [...EMPTY_VERSION];
 };
 
 /**
- * Get Connected Device bluetooth firmware version by features
+ * Get Connected Device version by features
  */
-export const getDeviceBLEFirmwareVersion = (features: Features): IVersionArray => {
-  const bleVer = features?.bleVersion;
-
-  if (!bleVer) {
-    return [0, 0, 0];
-  }
-
-  if (!semver.valid(bleVer)) {
-    return [0, 0, 0];
-  }
-
-  if (bleVer) {
-    return bleVer.split('.').map(Number) as IVersionArray;
-  }
-  return [0, 0, 0];
-};
+export const getDeviceFirmwareVersion = (features?: DeviceFeaturesInput): IVersionArray =>
+  parseDeviceVersion(resolveDeviceFirmwareVersion(features));
 
 /**
  * Get Connected Device bootloader version by features
  */
-export const getDeviceBootloaderVersion = (features: Features | undefined): IVersionArray => {
-  if (!features) return [0, 0, 0];
-
-  // classic1s 3.5.0 pro 4.6.0
-  if (features.bootloaderVersion && semver.valid(features.bootloaderVersion)) {
-    return features.bootloaderVersion.split('.').map(Number) as IVersionArray;
-  }
-
-  return [0, 0, 0];
-};
+export const getDeviceBootloaderVersion = (features?: DeviceFeaturesInput): IVersionArray =>
+  parseDeviceVersion(resolveDeviceBootloaderVersion(features));
 
 /**
- * Get Connected Device boardloader version by features
+ * Get Connected Device boardloader/romloader version by features
  */
-export const getDeviceBoardloaderVersion = (features: Features): IVersionArray => {
-  if (features?.boardVersion && semver.valid(features.boardVersion)) {
-    return features.boardVersion.split('.').map(Number) as IVersionArray;
-  }
+export const getDeviceBoardloaderVersion = (features?: DeviceFeaturesInput): IVersionArray =>
+  parseDeviceVersion(resolveDeviceBoardVersion(features));
 
-  return [0, 0, 0];
-};
+/**
+ * Get Connected Device bluetooth firmware version by features
+ */
+export const getDeviceBLEFirmwareVersion = (features?: DeviceFeaturesInput): IVersionArray =>
+  parseDeviceVersion(resolveDeviceBleFirmwareVersion(features));

package/src/utils/findDefectiveBatchDevice.ts

@@ -1,11 +1,11 @@
-import { getDeviceType, getDeviceUUID } from './deviceInfoUtils';
+import { getDeviceSerialNo, getDeviceType } from './deviceInfoUtils';
 
 import type { Features } from '../types';
 
 /**
  * 检测故障固件设备
  * 检测规则：
- * - 序列号范围：21032200001 到 21032201500
+ * - Serial number range: 21032200001 through 21032201500
  * - SE版本为 1.1.0.2
  *
  * 对齐之前版本的检测逻辑
@@ -27,7 +27,7 @@ export const findDefectiveBatchDevice = (features: Features) => {
  */
 export const getDefectiveDeviceInfo = (features: Features) => {
   if (!findDefectiveBatchDevice(features)) return null;
-  const serialNo = getDeviceUUID(features);
+  const serialNo = getDeviceSerialNo(features);
   const deviceType = getDeviceType(features);
   const { seVersion } = features;
 

package/src/utils/index.ts

@@ -8,6 +8,7 @@ export {
   getDeviceTypeByBleName,
   getDeviceType,
   getDeviceBleName,
+  getDeviceSerialNo,
   getDeviceUUID,
   getDeviceLabel,
   getMethodVersionRange,
@@ -38,11 +39,7 @@ export { getHDPath, getScriptType, getOutputScriptType } from '../api/helpers/pa
 export const isBleConnect = (env: string) => env === 'react-native' || env === 'lowlevel';
 
 export { getHomeScreenHex, getHomeScreenDefaultList, getHomeScreenSize } from './homescreen';
-export {
-  encodePro2Wallpaper,
-  PRO2_WALLPAPER_HEIGHT,
-  PRO2_WALLPAPER_WIDTH,
-} from './pro2Wallpaper';
+export { encodePro2Wallpaper, PRO2_WALLPAPER_HEIGHT, PRO2_WALLPAPER_WIDTH } from './pro2Wallpaper';
 export type { Pro2WallpaperColorFormat } from './pro2Wallpaper';
 
 export const wait = (ms: number) =>