@onekeyfe/hd-core 1.2.0-alpha.3 → 1.2.0-alpha.30

package/src/utils/deviceSettings.ts

@@ -1,6 +1,52 @@
 import { EDeviceType } from '@onekeyfe/hd-shared';
+import { Enum_SafetyCheckLevel } from '@onekeyfe/hd-transport';
 
 import type { IDeviceType } from '../types';
+import type { DeviceSettingsParams } from '../types/api/deviceSettings';
+import type { SafetyCheckLevel } from '@onekeyfe/hd-transport';
+
+export type DeviceSettingsProtocol = 'V1' | 'V2';
+export type DeviceSettingsField = keyof DeviceSettingsParams;
+
+export const DEVICE_SETTINGS_SHARED_FIELDS = [
+  'language',
+  'label',
+  'usePassphrase',
+  'autoLockDelayMs',
+  'autoShutdownDelayMs',
+  'hapticFeedback',
+  'bluetoothEnabled',
+] as const satisfies readonly DeviceSettingsField[];
+
+export const DEVICE_SETTINGS_V1_ONLY_FIELDS = [
+  'homescreen',
+  'passphraseSource',
+  'displayRotation',
+  'passphraseAlwaysOnDevice',
+  'safetyChecks',
+  'experimentalFeatures',
+  'changeBrightness',
+] as const satisfies readonly DeviceSettingsField[];
+
+export const DEVICE_SETTINGS_V2_ONLY_FIELDS = [
+  'brightness',
+  'airgapMode',
+  'animationEnabled',
+  'tapToWake',
+  'deviceNameDisplayEnabled',
+  'fidoEnabled',
+  'usbLockEnabled',
+  'randomKeypad',
+] as const satisfies readonly DeviceSettingsField[];
+
+export const PROTOCOL_V2_NEVER_TIMEOUT_MS = 0x10000000;
+
+export const normalizeSafetyCheckLevel = (
+  value: SafetyCheckLevel | null | undefined
+): Enum_SafetyCheckLevel | null | undefined => {
+  if (typeof value === 'number' || value === null || value === undefined) return value;
+  return Enum_SafetyCheckLevel[value];
+};
 
 export const LANGUAGE_LABELS = {
   en: 'English',
@@ -19,6 +65,50 @@ 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 PROTOCOL_V2_LANGUAGE_KEY_BY_TAG = Object.fromEntries(
+  Object.entries(PROTOCOL_V2_LANGUAGE_BY_KEY).map(([key, tag]) => [tag, key])
+) as Record<string, LanguageKey>;
+
+export const mapLanguageFromProtocolV2 = (language?: string) =>
+  language ? PROTOCOL_V2_LANGUAGE_KEY_BY_TAG[language] ?? language : undefined;
+
+const PRO2_LANGUAGE_OPTIONS = [
+  { code: 'en', label: 'English' },
+  { code: 'zh_cn', label: '简体中文' },
+  { code: 'zh_hk', label: '繁體中文（香港）' },
+  { code: 'zh-Hant-TW', label: '繁體中文（台灣）' },
+  { code: 'ja', label: '日本語' },
+  { code: 'ko', label: '한국어' },
+  { code: 'fr', label: 'Français' },
+  { code: 'de', label: 'Deutsch' },
+  { code: 'ru', label: 'Русский' },
+  { code: 'es', label: 'Español' },
+  { code: 'it', label: 'Italiano' },
+  { code: 'pt_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' },
+  { code: 'fil-Latn-PH', label: 'Filipino' },
+  { code: 'uk-Cyrl-UA', label: 'Українська' },
+] as const;
+
 export const getLanguageConfig = (deviceType: IDeviceType): Record<string, string>[] => {
   let keys: LanguageKey[] = [];
 
@@ -36,6 +126,8 @@ export const getLanguageConfig = (deviceType: IDeviceType): Record<string, strin
     case EDeviceType.Pro:
       keys = Object.keys(LANGUAGE_LABELS) as LanguageKey[];
       break;
+    case EDeviceType.Pro2:
+      return PRO2_LANGUAGE_OPTIONS.map(option => ({ ...option }));
     default:
       keys = [];
       break;
@@ -44,66 +136,106 @@ export const getLanguageConfig = (deviceType: IDeviceType): Record<string, strin
   return keys.map(key => ({ code: key, label: LANGUAGE_LABELS[key] }));
 };
 
-export type DurationParts = {
-  seconds: number;
-  minute: number;
-  hour: number;
-  day: number;
+export type DeviceSettingsDurationOption = {
+  label: string;
+  valueMs: number;
 };
 
-export const getAutoLockOptions = (_deviceType: IDeviceType): DurationParts[] => {
-  switch (_deviceType) {
+export type DeviceSettingsValueOption<T> = {
+  label: string;
+  value: T;
+};
+
+const durationOption = (valueMs: number): DeviceSettingsDurationOption => {
+  if (valueMs === 0 || valueMs === PROTOCOL_V2_NEVER_TIMEOUT_MS) {
+    return { label: 'Never', valueMs };
+  }
+  if (valueMs < 60_000) {
+    return { label: `${valueMs / 1000} seconds`, valueMs };
+  }
+  const minutes = valueMs / 60_000;
+  return { label: `${minutes} ${minutes === 1 ? 'minute' : 'minutes'}`, valueMs };
+};
+
+const withNever = (
+  values: readonly number[],
+  protocol: DeviceSettingsProtocol
+): DeviceSettingsDurationOption[] =>
+  [...values, protocol === 'V2' ? PROTOCOL_V2_NEVER_TIMEOUT_MS : 0].map(durationOption);
+
+export const getAutoLockOptions = (
+  deviceType: IDeviceType,
+  protocol: DeviceSettingsProtocol
+): DeviceSettingsDurationOption[] => {
+  switch (deviceType) {
     case EDeviceType.Mini:
     case EDeviceType.Classic:
     case EDeviceType.Classic1s:
     case EDeviceType.ClassicPure:
-      return [
-        { seconds: 0, minute: 1, hour: 0, day: 0 },
-        { seconds: 0, minute: 2, hour: 0, day: 0 },
-        { seconds: 0, minute: 5, hour: 0, day: 0 },
-        { seconds: 0, minute: 10, hour: 0, day: 0 },
-        { seconds: 0, minute: 0, hour: 0, day: 0 },
-      ];
+      return withNever([60_000, 120_000, 300_000, 600_000], protocol);
     case EDeviceType.Touch:
     case EDeviceType.Pro:
-      return [
-        { seconds: 30, minute: 0, hour: 0, day: 0 },
-        { seconds: 0, minute: 1, hour: 0, day: 0 },
-        { seconds: 0, minute: 2, hour: 0, day: 0 },
-        { seconds: 0, minute: 5, hour: 0, day: 0 },
-        { seconds: 0, minute: 10, hour: 0, day: 0 },
-        { seconds: 0, minute: 30, hour: 0, day: 0 },
-        { seconds: 0, minute: 0, hour: 0, day: 0 },
-      ];
+    case EDeviceType.Pro2:
+      return withNever([30_000, 60_000, 120_000, 300_000, 600_000, 1_800_000], protocol);
     default:
       return [];
   }
 };
 
-export const getAutoShutDownOptions = (_deviceType: IDeviceType): DurationParts[] => {
-  switch (_deviceType) {
+export const getAutoShutDownOptions = (
+  deviceType: IDeviceType,
+  protocol: DeviceSettingsProtocol
+): DeviceSettingsDurationOption[] => {
+  switch (deviceType) {
     case EDeviceType.Mini:
       return [];
     case EDeviceType.Classic:
     case EDeviceType.Classic1s:
     case EDeviceType.ClassicPure:
-      return [
-        { seconds: 0, minute: 1, hour: 0, day: 0 },
-        { seconds: 0, minute: 3, hour: 0, day: 0 },
-        { seconds: 0, minute: 5, hour: 0, day: 0 },
-        { seconds: 0, minute: 10, hour: 0, day: 0 },
-        { seconds: 0, minute: 0, hour: 0, day: 0 },
-      ];
+      return withNever([60_000, 180_000, 300_000, 600_000], protocol);
     case EDeviceType.Touch:
     case EDeviceType.Pro:
-      return [
-        { seconds: 0, minute: 1, hour: 0, day: 0 },
-        { seconds: 0, minute: 2, hour: 0, day: 0 },
-        { seconds: 0, minute: 5, hour: 0, day: 0 },
-        { seconds: 0, minute: 10, hour: 0, day: 0 },
-        { seconds: 0, minute: 0, hour: 0, day: 0 },
-      ];
+      return withNever([60_000, 120_000, 300_000, 600_000], protocol);
+    case EDeviceType.Pro2:
+      return withNever([60_000, 120_000, 300_000, 600_000, 1_800_000], protocol);
     default:
       return [];
   }
 };
+
+export type DeviceSettingsCapabilities = {
+  protocol: DeviceSettingsProtocol;
+  supportedFields: readonly DeviceSettingsField[];
+  languageOptions: ReadonlyArray<Record<string, string>>;
+  autoLockDelayOptions: readonly DeviceSettingsDurationOption[];
+  autoShutdownDelayOptions: readonly DeviceSettingsDurationOption[];
+  ranges: {
+    brightness?: { min: number; max: number };
+  };
+  safetyCheckOptions: ReadonlyArray<DeviceSettingsValueOption<Enum_SafetyCheckLevel>>;
+  onDeviceConfirmationFields: readonly DeviceSettingsField[];
+};
+
+export const getDeviceSettingsCapabilities = (
+  deviceType: IDeviceType,
+  protocol: DeviceSettingsProtocol
+): DeviceSettingsCapabilities => ({
+  protocol,
+  supportedFields:
+    protocol === 'V2'
+      ? [...DEVICE_SETTINGS_SHARED_FIELDS, ...DEVICE_SETTINGS_V2_ONLY_FIELDS]
+      : [...DEVICE_SETTINGS_SHARED_FIELDS, ...DEVICE_SETTINGS_V1_ONLY_FIELDS],
+  languageOptions: getLanguageConfig(deviceType),
+  autoLockDelayOptions: getAutoLockOptions(deviceType, protocol),
+  autoShutdownDelayOptions: getAutoShutDownOptions(deviceType, protocol),
+  ranges: protocol === 'V2' ? { brightness: { min: 10, max: 100 } } : {},
+  safetyCheckOptions:
+    protocol === 'V1'
+      ? [
+          { label: 'Strict', value: Enum_SafetyCheckLevel.Strict },
+          { label: 'Prompt Always', value: Enum_SafetyCheckLevel.PromptAlways },
+          { label: 'Prompt Temporarily', value: Enum_SafetyCheckLevel.PromptTemporarily },
+        ]
+      : [],
+  onDeviceConfirmationFields: protocol === 'V2' ? ['usePassphrase', 'airgapMode'] : [],
+});

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];
+export 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/homescreen.ts

@@ -3,6 +3,7 @@ import { EDeviceType } from '@onekeyfe/hd-shared';
 
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
+import { PRO2_WALLPAPER_HEIGHT, PRO2_WALLPAPER_WIDTH } from './pro2Wallpaper';
 
 import type { Features, IDeviceType } from '../types';
 
@@ -310,6 +311,15 @@ export const getHomeScreenSize = ({
   homeScreenType: 'WallPaper' | 'Nft';
   thumbnail?: boolean;
 }) => {
+  if (deviceType === EDeviceType.Pro2) {
+    return thumbnail
+      ? undefined
+      : {
+          width: PRO2_WALLPAPER_WIDTH,
+          height: PRO2_WALLPAPER_HEIGHT,
+        };
+  }
+
   const sizes: Partial<
     Record<
       IDeviceType,

package/src/utils/index.ts

@@ -8,10 +8,10 @@ export {
   getDeviceTypeByBleName,
   getDeviceType,
   getDeviceBleName,
+  getDeviceSerialNo,
   getDeviceUUID,
   getDeviceLabel,
   getMethodVersionRange,
-  isMethodVersionRangeUnsupported,
   getFirmwareType,
 } from './deviceInfoUtils';
 export {
@@ -29,7 +29,24 @@ export {
   checkNeedUpdateBootForTouch,
   checkNeedUpdateBootForClassicAndMini,
 } from '../api/firmware/updateBootloader';
-export { getLanguageConfig, getAutoLockOptions, getAutoShutDownOptions } from './deviceSettings';
+export {
+  DEVICE_SETTINGS_SHARED_FIELDS,
+  DEVICE_SETTINGS_V1_ONLY_FIELDS,
+  DEVICE_SETTINGS_V2_ONLY_FIELDS,
+  PROTOCOL_V2_NEVER_TIMEOUT_MS,
+  getAutoLockOptions,
+  getAutoShutDownOptions,
+  getDeviceSettingsCapabilities,
+  getLanguageConfig,
+  normalizeSafetyCheckLevel,
+} from './deviceSettings';
+export type {
+  DeviceSettingsCapabilities,
+  DeviceSettingsDurationOption,
+  DeviceSettingsField,
+  DeviceSettingsProtocol,
+  DeviceSettingsValueOption,
+} from './deviceSettings';
 
 // Helpers utils
 
@@ -38,6 +55,8 @@ 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 type { Pro2WallpaperColorFormat } from './pro2Wallpaper';
 
 export const wait = (ms: number) =>
   new Promise(resolve => {