@onekeyfe/hd-core 1.2.0-alpha.0 → 1.2.0-alpha.2

package/src/utils/deviceFeaturesUtils.ts

@@ -123,15 +123,13 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
 
   // Attach to pin try to fix internal state
   const deviceId = device.getCurrentDeviceId();
-  if (deviceId) {
-    device.updateInternalState(
-      device.getCurrentPassphraseProtection() ?? false,
-      passphraseState,
-      deviceId,
-      newSession,
-      device.features?.session_id
-    );
-  }
+  device.updateInternalState(
+    device.getCurrentPassphraseProtection() ?? false,
+    passphraseState,
+    deviceId,
+    newSession,
+    device.features?.sessionId
+  );
 
   return { passphraseState, newSession, unlockedAttachPin };
 };
@@ -155,8 +153,8 @@ export const getPassphraseState = async (
 }> => {
   const { features, commands } = device;
 
-  // 设备尚未建立任何状态（V1 无 features 且无 profile）时无法判定，保持旧的空返回语义
-  if (!features && !device.profile)
+  // 设备尚未建立任何状态时无法判定，保持旧的空返回语义
+  if (!features)
     return { passphraseState: undefined, newSession: undefined, unlockedAttachPin: undefined };
 
   const firmwareVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
@@ -340,12 +338,8 @@ export const fixFeaturesFirmwareVersion = (features: Features): Features => {
   // fix Touch、Pro device when bootloader version is lower than 2.5.2, the features returned do not have firmware_version error
   const tempFeatures = { ...features };
 
-  if (tempFeatures.onekey_firmware_version && !semver.valid(tempFeatures.onekey_firmware_version)) {
-    tempFeatures.onekey_firmware_version = fixVersion(tempFeatures.onekey_firmware_version);
-  }
-
-  if (tempFeatures.onekey_version && !semver.valid(tempFeatures.onekey_version)) {
-    tempFeatures.onekey_version = fixVersion(tempFeatures.onekey_version);
+  if (tempFeatures.firmwareVersion && !semver.valid(tempFeatures.firmwareVersion)) {
+    tempFeatures.firmwareVersion = fixVersion(tempFeatures.firmwareVersion);
   }
 
   return tempFeatures;

package/src/utils/deviceInfoUtils.ts

@@ -14,30 +14,12 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   if (!features || typeof features !== 'object') {
     return EDeviceType.Unknown;
   }
+  if (features.deviceType) {
+    return features.deviceType;
+  }
 
-  // classic1s 3.5.0 pro 4.6.0
-  switch (features.onekey_device_type) {
-    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':
-    case 'pro2':
-      return EDeviceType.Pro2;
-    case 'PURE':
-      return EDeviceType.ClassicPure;
-    default:
-      // future And old device onekey_device_type is empty
-      if (!isEmpty(features.onekey_serial_no)) {
-        return EDeviceType.Unknown;
-      }
-    // old device type
+  if (features.model === EDeviceType.Pro2 || features.model === 'pro2') {
+    return EDeviceType.Pro2;
   }
 
   // low version hardware
@@ -45,7 +27,7 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   const serialNo = getDeviceUUID(features);
 
   // not exist serialNo, bootloader mode, model 1 is classic
-  if (isEmpty(serialNo) && features.bootloader_mode === true && features.model === '1') {
+  if (isEmpty(serialNo) && features.bootloaderMode === true && features.model === '1') {
     return EDeviceType.Classic;
   }
 
@@ -59,6 +41,7 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   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;
@@ -89,15 +72,14 @@ export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
  */
 export const getDeviceBleName = (features?: Features): string | null => {
   if (features == null) return null;
-  return features.onekey_ble_name || features.ble_name || null;
+  return features.bleName || null;
 };
 
 /**
  * Get Connected Device UUID by features
  */
 export const getDeviceUUID = (features: Features) => {
-  const serialNo = features.onekey_serial_no || features.onekey_serial || features.serial_no;
-  return serialNo ?? '';
+  return features.serialNo ?? '';
 };
 
 /**
@@ -163,8 +145,8 @@ export const getFirmwareType = (features: Features | undefined) => {
   if (!features) {
     return EFirmwareType.Universal;
   }
-  if (features.fw_vendor === 'OneKey Bitcoin-only') {
-    return EFirmwareType.BitcoinOnly;
+  if (features.firmwareType) {
+    return features.firmwareType;
   }
   // old firmware
   return features?.capabilities?.length > 0 &&

package/src/utils/deviceVersionUtils.ts

@@ -8,12 +8,8 @@ import type { Features, IVersionArray } from '../types';
 export const getDeviceFirmwareVersion = (features: Features | undefined): IVersionArray => {
   if (!features) return [0, 0, 0];
 
-  if (semver.valid(features.onekey_firmware_version)) {
-    return features.onekey_firmware_version?.split('.') as unknown as IVersionArray;
-  }
-
-  if (semver.valid(features.onekey_version)) {
-    return features.onekey_version?.split('.') as unknown as IVersionArray;
+  if (features.firmwareVersion && semver.valid(features.firmwareVersion)) {
+    return features.firmwareVersion.split('.').map(Number) as IVersionArray;
   }
 
   return [0, 0, 0];
@@ -23,7 +19,7 @@ export const getDeviceFirmwareVersion = (features: Features | undefined): IVersi
  * Get Connected Device bluetooth firmware version by features
  */
 export const getDeviceBLEFirmwareVersion = (features: Features): IVersionArray => {
-  const bleVer = features?.onekey_ble_version || features?.ble_ver;
+  const bleVer = features?.bleVersion;
 
   if (!bleVer) {
     return [0, 0, 0];
@@ -46,24 +42,10 @@ export const getDeviceBootloaderVersion = (features: Features | undefined): IVer
   if (!features) return [0, 0, 0];
 
   // classic1s 3.5.0 pro 4.6.0
-  if (semver.valid(features.onekey_boot_version)) {
-    return features.onekey_boot_version?.split('.') as unknown as IVersionArray;
+  if (features.bootloaderVersion && semver.valid(features.bootloaderVersion)) {
+    return features.bootloaderVersion.split('.').map(Number) as IVersionArray;
   }
 
-  // low version hardware
-  if (!features.bootloader_version) {
-    if (features.bootloader_mode) {
-      return [
-        features?.major_version ?? 0,
-        features?.minor_version ?? 0,
-        features?.patch_version ?? 0,
-      ];
-    }
-    return [0, 0, 0];
-  }
-  if (semver.valid(features.bootloader_version)) {
-    return features.bootloader_version?.split('.') as unknown as IVersionArray;
-  }
   return [0, 0, 0];
 };
 
@@ -71,8 +53,8 @@ export const getDeviceBootloaderVersion = (features: Features | undefined): IVer
  * Get Connected Device boardloader version by features
  */
 export const getDeviceBoardloaderVersion = (features: Features): IVersionArray => {
-  if (semver.valid(features?.onekey_board_version)) {
-    return features?.onekey_board_version?.split('.') as unknown as IVersionArray;
+  if (features?.boardVersion && semver.valid(features.boardVersion)) {
+    return features.boardVersion.split('.').map(Number) as IVersionArray;
   }
 
   return [0, 0, 0];

package/src/utils/findDefectiveBatchDevice.ts

@@ -5,7 +5,7 @@ import type { Features } from '../types';
 /**
  * 检测故障固件设备
  * 检测规则：
- * - 序列号范围：21032200001 到 21032201500 (从 onekey_serial 字段提取)
+ * - 序列号范围：21032200001 到 21032201500
  * - SE版本为 1.1.0.2
  *
  * 对齐之前版本的检测逻辑
@@ -13,13 +13,13 @@ import type { Features } from '../types';
 export const findDefectiveBatchDevice = (features: Features) => {
   if (!features) return;
 
-  const { onekey_serial: onekeySerial, se_ver: seVer } = features;
-  if (!onekeySerial) return;
+  const { serialNo, seVersion } = features;
+  if (!serialNo) return;
 
-  const versionNum = +onekeySerial.slice(5);
+  const versionNum = +serialNo.slice(5);
   if (Number.isNaN(versionNum)) return;
 
-  return versionNum >= 21032200001 && versionNum <= 21032201500 && seVer === '1.1.0.2';
+  return versionNum >= 21032200001 && versionNum <= 21032201500 && seVersion === '1.1.0.2';
 };
 
 /**
@@ -29,7 +29,7 @@ export const getDefectiveDeviceInfo = (features: Features) => {
   if (!findDefectiveBatchDevice(features)) return null;
   const serialNo = getDeviceUUID(features);
   const deviceType = getDeviceType(features);
-  const seVersion = features.se_ver;
+  const { seVersion } = features;
 
   return {
     serialNo,

package/dist/deviceProfile/legacyFeaturesView.d.ts

@@ -1,5 +0,0 @@
-import type { Features } from '../types';
-import type { DeviceProfile } from '../types/api/getDeviceInfo';
-import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
-export declare const buildProtocolV2GetFeaturesPayload: (profile: DeviceProfile, deviceInfo?: ProtocolV2DeviceInfo) => Features;
-//# sourceMappingURL=legacyFeaturesView.d.ts.map

package/dist/deviceProfile/legacyFeaturesView.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"legacyFeaturesView.d.ts","sourceRoot":"","sources":["../../src/deviceProfile/legacyFeaturesView.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAmBnE,eAAO,MAAM,iCAAiC,YACnC,aAAa,eACT,oBAAoB,KAChC,QA8FF,CAAC"}

package/src/deviceProfile/legacyFeaturesView.ts

@@ -1,123 +0,0 @@
-import { EDeviceType } from '@onekeyfe/hd-shared';
-
-import { getProtocolV2SeState, getProtocolV2SeType } from '../protocols/protocol-v2/features';
-
-import type { Features } from '../types';
-import type { DeviceProfile } from '../types/api/getDeviceInfo';
-import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
-
-const parseProtocolV2Version = (version?: string | null): [number, number, number] => {
-  if (!version) return [0, 0, 0];
-  const [major = 0, minor = 0, patch = 0] = version.split('.').map(part => Number(part) || 0);
-  return [major, minor, patch];
-};
-
-/**
- * Protocol V2 的 legacy `Features` 兼容视图。
- *
- * SDK 内部标准模型是 DeviceProfile；该函数只为 getFeatures() 等旧 API
- * 临时合成 Features 形状的数据，不应被内部逻辑消费。
- *
- * 注意：以下字段在 V2 协议中没有等价信息，使用保守占位值——
- * bootloader_mode/firmware_present 恒 false、unlocked 恒 false、
- * capabilities 恒空、pin_protection/safety_checks 等恒 null。
- * 内部判断请使用 device.profile / getCurrent* accessor，而不是这些占位值。
- */
-export const buildProtocolV2GetFeaturesPayload = (
-  profile: DeviceProfile,
-  deviceInfo?: ProtocolV2DeviceInfo
-): Features => {
-  const firmwareVersion = profile.versions.firmware;
-  const [fwMajor, fwMinor, fwPatch] = parseProtocolV2Version(firmwareVersion);
-
-  return {
-    vendor: 'onekey.so',
-    major_version: fwMajor,
-    minor_version: fwMinor,
-    patch_version: fwPatch,
-    bootloader_mode: false,
-    device_id: profile.deviceId,
-    pin_protection: null,
-    passphrase_protection: profile.status.passphraseProtection,
-    language: profile.status.language,
-    label: profile.label,
-    initialized: profile.status.initialized ?? false,
-    revision: null,
-    bootloader_hash: null,
-    imported: null,
-    unlocked: false,
-    firmware_present: false,
-    needs_backup: profile.status.backupRequired,
-    flags: null,
-    model: 'pro2',
-    fw_major: fwMajor,
-    fw_minor: fwMinor,
-    fw_patch: fwPatch,
-    fw_vendor: null,
-    unfinished_backup: null,
-    no_backup: null,
-    recovery_mode: null,
-    capabilities: [],
-    backup_type: null,
-    sd_card_present: null,
-    sd_protection: null,
-    wipe_code_protection: null,
-    session_id: null,
-    passphrase_always_on_device: null,
-    safety_checks: null,
-    auto_lock_delay_ms: null,
-    display_rotation: null,
-    experimental_features: null,
-    protocol_version: deviceInfo?.protocol_version ?? null,
-    onekey_device_type: EDeviceType.Pro2,
-    onekey_serial_no: profile.serialNo,
-    serial_no: profile.serialNo,
-    ble_enable: profile.status.bleEnabled ?? undefined,
-    onekey_ble_name: profile.bleName ?? undefined,
-    ble_name: profile.bleName ?? undefined,
-    onekey_firmware_version: firmwareVersion ?? undefined,
-    onekey_firmware_build_id: profile.verify?.firmwareBuildId,
-    onekey_firmware_hash: profile.verify?.firmwareHash,
-    onekey_boot_version: profile.versions.bootloader ?? undefined,
-    bootloader_version: profile.versions.bootloader ?? undefined,
-    onekey_boot_build_id: profile.verify?.bootloaderBuildId,
-    onekey_boot_hash: profile.verify?.bootloaderHash,
-    onekey_board_version: profile.versions.board ?? undefined,
-    onekey_board_build_id: profile.verify?.boardBuildId,
-    onekey_board_hash: profile.verify?.boardHash,
-    onekey_ble_version: profile.versions.ble ?? undefined,
-    ble_ver: profile.versions.ble ?? undefined,
-    onekey_ble_build_id: profile.verify?.bleBuildId,
-    onekey_ble_hash: profile.verify?.bleHash,
-    // Pro2 的 SE 类型在 DevGetDeviceInfo 的 se1.type 上报（如 THD89）
-    onekey_se_type: getProtocolV2SeType(deviceInfo?.se1),
-    onekey_se01_version: profile.versions.se01 ?? undefined,
-    onekey_se01_hash: profile.verify?.se01Hash,
-    onekey_se01_build_id: profile.verify?.se01BuildId,
-    onekey_se01_boot_version: profile.versions.se01Boot ?? undefined,
-    onekey_se01_boot_hash: profile.verify?.se01BootHash,
-    onekey_se01_boot_build_id: profile.verify?.se01BootBuildId,
-    onekey_se01_state: getProtocolV2SeState(deviceInfo?.se1),
-    onekey_se02_version: profile.versions.se02 ?? undefined,
-    onekey_se02_hash: profile.verify?.se02Hash,
-    onekey_se02_build_id: profile.verify?.se02BuildId,
-    onekey_se02_boot_version: profile.versions.se02Boot ?? undefined,
-    onekey_se02_boot_hash: profile.verify?.se02BootHash,
-    onekey_se02_boot_build_id: profile.verify?.se02BootBuildId,
-    onekey_se02_state: getProtocolV2SeState(deviceInfo?.se2),
-    onekey_se03_version: profile.versions.se03 ?? undefined,
-    onekey_se03_hash: profile.verify?.se03Hash,
-    onekey_se03_build_id: profile.verify?.se03BuildId,
-    onekey_se03_boot_version: profile.versions.se03Boot ?? undefined,
-    onekey_se03_boot_hash: profile.verify?.se03BootHash,
-    onekey_se03_boot_build_id: profile.verify?.se03BootBuildId,
-    onekey_se03_state: getProtocolV2SeState(deviceInfo?.se3),
-    onekey_se04_version: profile.versions.se04 ?? undefined,
-    onekey_se04_hash: profile.verify?.se04Hash,
-    onekey_se04_build_id: profile.verify?.se04BuildId,
-    onekey_se04_boot_version: profile.versions.se04Boot ?? undefined,
-    onekey_se04_boot_hash: profile.verify?.se04BootHash,
-    onekey_se04_boot_build_id: profile.verify?.se04BootBuildId,
-    onekey_se04_state: getProtocolV2SeState(deviceInfo?.se4),
-  };
-};