@onekeyfe/hd-core 1.1.27-alpha.35 → 1.1.27-alpha.4

package/src/inject.ts

@@ -103,13 +103,12 @@ export const createCoreApi = (
   /**
    * 搜索设备
    */
-  searchDevices: params => call({ ...params, method: 'searchDevices' }),
+  searchDevices: () => call({ method: 'searchDevices' }),
 
   /**
    * 获取设备信息
    */
   getFeatures: (connectId, params) => call({ ...params, connectId, method: 'getFeatures' }),
-  getDeviceInfo: (connectId, params) => call({ ...params, connectId, method: 'getDeviceInfo' }),
   getOnekeyFeatures: (connectId, params) =>
     call({ ...params, connectId, method: 'getOnekeyFeatures' }),
 
@@ -143,53 +142,12 @@ export const createCoreApi = (
 
   testInitializeDeviceDuration: (connectId, params) =>
     call({ ...params, connectId, method: 'testInitializeDeviceDuration' }),
-
+  preInitialize: (connectId, params) => call({ ...params, connectId, method: 'preInitialize' }),
   deviceBackup: connectId => call({ connectId, method: 'deviceBackup' }),
   deviceChangePin: (connectId, params) => call({ ...params, connectId, method: 'deviceChangePin' }),
   deviceFlags: (connectId, params) => call({ ...params, connectId, method: 'deviceFlags' }),
   deviceRebootToBoardloader: connectId => call({ connectId, method: 'deviceRebootToBoardloader' }),
   deviceRebootToBootloader: connectId => call({ connectId, method: 'deviceRebootToBootloader' }),
-
-  // File system & device control API (Protocol V2 only)
-  getProtoVersion: (connectId, params) => call({ ...params, connectId, method: 'getProtoVersion' }),
-  ping: (connectId, params) => call({ ...params, connectId, method: 'ping' }),
-  deviceReboot: (connectId, params) => call({ ...params, connectId, method: 'deviceReboot' }),
-  deviceGetDeviceInfo: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceGetDeviceInfo' }),
-  deviceGetOnboardingStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceGetOnboardingStatus' }),
-  deviceFirmwareUpdate: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceFirmwareUpdate' }),
-  deviceGetFirmwareUpdateStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceGetFirmwareUpdateStatus' }),
-  factoryDeviceInfoSettings: (connectId, params) =>
-    call({ ...params, connectId, method: 'factoryDeviceInfoSettings' }),
-  factoryGetDeviceInfo: connectId => call({ connectId, method: 'factoryGetDeviceInfo' }),
-  filesystemFixPermission: connectId => call({ connectId, method: 'filesystemFixPermission' }),
-  fileRead: (connectId, params) => call({ ...params, connectId, method: 'fileRead' }),
-  fileWrite: (connectId, params) => call({ ...params, connectId, method: 'fileWrite' }),
-  fileDelete: (connectId, params) => call({ ...params, connectId, method: 'fileDelete' }),
-  dirList: (connectId, params) => call({ ...params, connectId, method: 'dirList' }),
-  dirMake: (connectId, params) => call({ ...params, connectId, method: 'dirMake' }),
-  dirRemove: (connectId, params) => call({ ...params, connectId, method: 'dirRemove' }),
-  pathInfo: (connectId, params) => call({ ...params, connectId, method: 'pathInfo' }),
-  filesystemFileRead: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemFileRead' }),
-  filesystemFileWrite: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemFileWrite' }),
-  filesystemFileDelete: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemFileDelete' }),
-  filesystemDirList: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemDirList' }),
-  filesystemDirMake: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemDirMake' }),
-  filesystemDirRemove: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemDirRemove' }),
-  filesystemPathInfoQuery: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemPathInfoQuery' }),
-  filesystemFormat: connectId => call({ connectId, method: 'filesystemFormat' }),
-  filesystemDiskControl: (connectId, params) =>
-    call({ ...params, connectId, method: 'filesystemDiskControl' }),
   deviceRecovery: (connectId, params) => call({ ...params, connectId, method: 'deviceRecovery' }),
   deviceReset: (connectId, params) => call({ ...params, connectId, method: 'deviceReset' }),
   deviceSettings: (connectId, params) => call({ ...params, connectId, method: 'deviceSettings' }),
@@ -302,8 +260,6 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'firmwareUpdateV2' }),
   firmwareUpdateV3: (connectId, params) =>
     call({ ...params, connectId, method: 'firmwareUpdateV3' }),
-  firmwareUpdateV4: (connectId, params) =>
-    call({ ...params, connectId, method: 'firmwareUpdateV4' }),
   promptWebDeviceAccess: params => call({ ...params, method: 'promptWebDeviceAccess' }),
 
   tronGetAddress: (connectId, deviceId, params) =>

package/src/types/api/export.ts

@@ -28,7 +28,6 @@ export type {
   FirmwareUpdateParams,
   FirmwareUpdateBinaryParams,
   FirmwareUpdateV3Params,
-  FirmwareUpdateV4Params,
 } from './firmwareUpdate';
 export type { AllFirmwareRelease } from './checkAllFirmwareRelease';
 

package/src/types/api/firmwareUpdate.ts

@@ -41,7 +41,6 @@ export declare function firmwareUpdateV2(
 export interface FirmwareUpdateV3Params {
   bleVersion?: number[];
   bleBinary?: ArrayBuffer;
-  chunkSize?: number;
 
   firmwareVersion?: number[];
   firmwareBinary?: ArrayBuffer;
@@ -57,8 +56,6 @@ export interface FirmwareUpdateV3Params {
   platform: IPlatform;
 }
 
-export type FirmwareUpdateV4Params = FirmwareUpdateV3Params;
-
 export declare function firmwareUpdateV3(
   connectId: string | undefined,
   params: Params<FirmwareUpdateV3Params>
@@ -67,12 +64,3 @@ export declare function firmwareUpdateV3(
   firmwareVersion: string;
   bootloaderVersion: string;
 }>;
-
-export declare function firmwareUpdateV4(
-  connectId: string | undefined,
-  params: Params<FirmwareUpdateV4Params>
-): Response<{
-  bleVersion: string;
-  firmwareVersion: string;
-  bootloaderVersion: string;
-}>;

package/src/types/api/getPassphraseState.ts

@@ -1,17 +1,6 @@
 import type { CommonParams, Response } from '../params';
 
-export type GetPassphraseStatePayload = {
-  passphrase_state?: string;
-  session_id?: string;
-  unlocked_attach_pin?: boolean;
-  passphrase_protection?: boolean | null;
-};
-
-export type GetPassphraseStateParams = CommonParams & {
-  allowCreateAttachPin?: boolean;
-};
-
 export declare function getPassphraseState(
   connectId?: string,
-  params?: GetPassphraseStateParams
-): Response<GetPassphraseStatePayload>;
+  params?: CommonParams
+): Response<string>;

package/src/types/api/index.ts

@@ -1,35 +1,8 @@
-import type {
-  deviceFirmwareUpdate,
-  deviceGetDeviceInfo,
-  deviceGetFirmwareUpdateStatus,
-  deviceGetOnboardingStatus,
-  deviceReboot,
-  dirList,
-  dirMake,
-  dirRemove,
-  factoryDeviceInfoSettings,
-  factoryGetDeviceInfo,
-  fileDelete,
-  fileRead,
-  fileWrite,
-  filesystemDirList,
-  filesystemDirMake,
-  filesystemDirRemove,
-  filesystemDiskControl,
-  filesystemFileDelete,
-  filesystemFileRead,
-  filesystemFileWrite,
-  filesystemFixPermission,
-  filesystemFormat,
-  filesystemPathInfoQuery,
-  getProtoVersion,
-  pathInfo,
-  ping,
-} from './protocolV2';
 import type { off, on, removeAllListeners } from './event';
 import type { uiResponse } from './uiResponse';
 import type { init, updateSettings } from './init';
 import type { testInitializeDeviceDuration } from './testInitializeDeviceDuration';
+import type { preInitialize } from './preInitialize';
 import type { getLogs } from './getLogs';
 import type { checkBridgeStatus } from './checkBridgeStatus';
 import type { checkBridgeRelease } from './checkBridgeRelease';
@@ -38,17 +11,11 @@ import type { checkAllFirmwareRelease } from './checkAllFirmwareRelease';
 import type { checkFirmwareTypeAvailable } from './checkFirmwareTypeAvailable';
 import type { searchDevices } from './searchDevices';
 import type { getFeatures } from './getFeatures';
-import type { getDeviceInfo } from './getDeviceInfo';
 import type { getOnekeyFeatures } from './getOnekeyFeatures';
 import type { getPassphraseState } from './getPassphraseState';
 import type { checkFirmwareRelease } from './checkFirmwareRelease';
 import type { checkBLEFirmwareRelease } from './checkBLEFirmwareRelease';
-import type {
-  firmwareUpdate,
-  firmwareUpdateV2,
-  firmwareUpdateV3,
-  firmwareUpdateV4,
-} from './firmwareUpdate';
+import type { firmwareUpdate, firmwareUpdateV2, firmwareUpdateV3 } from './firmwareUpdate';
 import type { promptWebDeviceAccess } from './promptWebDeviceAccess';
 import type { deviceReset } from './deviceReset';
 import type { deviceRecovery } from './deviceRecovery';
@@ -164,19 +131,6 @@ import type { neoSignTransaction } from './neoSignTransaction';
 import type { ConnectSettings } from '../settings';
 
 export * from './export';
-export type {
-  DeviceInfoMode,
-  DeviceInfoProtocol,
-  DeviceInfoScope,
-  DeviceInfoSource,
-  DeviceInfoStatus,
-  GetDeviceInfoParams,
-  UnifiedDeviceInfo,
-  UnifiedDeviceInfoRaw,
-  UnifiedDeviceInfoVerify,
-  UnifiedDeviceInfoVersions,
-} from './getDeviceInfo';
-export type { GetPassphraseStateParams, GetPassphraseStatePayload } from './getPassphraseState';
 
 export type CoreApi = {
   /**
@@ -199,6 +153,7 @@ export type CoreApi = {
    * Test function
    */
   testInitializeDeviceDuration: typeof testInitializeDeviceDuration;
+  preInitialize: typeof preInitialize;
 
   /**
    * Core function
@@ -215,7 +170,6 @@ export type CoreApi = {
   searchDevices: typeof searchDevices;
   promptWebDeviceAccess: typeof promptWebDeviceAccess;
   getFeatures: typeof getFeatures;
-  getDeviceInfo: typeof getDeviceInfo;
   getOnekeyFeatures: typeof getOnekeyFeatures;
   getPassphraseState: typeof getPassphraseState;
   deviceBackup: typeof deviceBackup;
@@ -243,39 +197,8 @@ export type CoreApi = {
   firmwareUpdate: typeof firmwareUpdate;
   firmwareUpdateV2: typeof firmwareUpdateV2;
   firmwareUpdateV3: typeof firmwareUpdateV3;
-  firmwareUpdateV4: typeof firmwareUpdateV4;
   cipherKeyValue: typeof cipherKeyValue;
 
-  /**
-   * File system & device control API (Protocol V2 only)
-   */
-  getProtoVersion: typeof getProtoVersion;
-  ping: typeof ping;
-  deviceReboot: typeof deviceReboot;
-  deviceGetDeviceInfo: typeof deviceGetDeviceInfo;
-  deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
-  deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
-  deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
-  factoryDeviceInfoSettings: typeof factoryDeviceInfoSettings;
-  factoryGetDeviceInfo: typeof factoryGetDeviceInfo;
-  filesystemFixPermission: typeof filesystemFixPermission;
-  fileRead: typeof fileRead;
-  fileWrite: typeof fileWrite;
-  fileDelete: typeof fileDelete;
-  dirList: typeof dirList;
-  dirMake: typeof dirMake;
-  dirRemove: typeof dirRemove;
-  pathInfo: typeof pathInfo;
-  filesystemFileRead: typeof filesystemFileRead;
-  filesystemFileWrite: typeof filesystemFileWrite;
-  filesystemFileDelete: typeof filesystemFileDelete;
-  filesystemDirList: typeof filesystemDirList;
-  filesystemDirMake: typeof filesystemDirMake;
-  filesystemDirRemove: typeof filesystemDirRemove;
-  filesystemPathInfoQuery: typeof filesystemPathInfoQuery;
-  filesystemFormat: typeof filesystemFormat;
-  filesystemDiskControl: typeof filesystemDiskControl;
-
   /**
    * All network function
    */

package/src/types/api/preInitialize.ts

@@ -0,0 +1,3 @@
+import type { CommonParams, Response } from '../params';
+
+export declare function preInitialize(connectId: string, params?: CommonParams): Response<boolean>;

package/src/types/api/searchDevices.ts

@@ -1,4 +1,4 @@
 import type { SearchDevice } from '../device';
-import type { CommonParams, Response } from '../params';
+import type { Response } from '../params';
 
-export declare function searchDevices(params?: CommonParams): Response<SearchDevice[]>;
+export declare function searchDevices(): Response<SearchDevice[]>;

package/src/types/device.ts

@@ -85,35 +85,7 @@ export type SearchDevice = {
 
 export type Device = KnownDevice;
 
-type OnekeyFeatureExtensions = Partial<
-  Pick<
-    PROTO.OnekeyFeatures,
-    | 'onekey_board_build_id'
-    | 'onekey_se02_hash'
-    | 'onekey_se03_hash'
-    | 'onekey_se04_hash'
-    | 'onekey_se02_build_id'
-    | 'onekey_se03_build_id'
-    | 'onekey_se04_build_id'
-    | 'onekey_se01_boot_version'
-    | 'onekey_se02_boot_version'
-    | 'onekey_se03_boot_version'
-    | 'onekey_se04_boot_version'
-    | 'onekey_se01_boot_hash'
-    | 'onekey_se02_boot_hash'
-    | 'onekey_se03_boot_hash'
-    | 'onekey_se04_boot_hash'
-    | 'onekey_se01_boot_build_id'
-    | 'onekey_se02_boot_build_id'
-    | 'onekey_se03_boot_build_id'
-    | 'onekey_se04_boot_build_id'
-  >
->;
-
-export type Features = PROTO.Features &
-  OnekeyFeatureExtensions & {
-    protocol_version?: number | null;
-  };
+export type Features = PROTO.Features;
 
 export type OnekeyFeatures = PROTO.OnekeyFeatures;
 
@@ -124,8 +96,7 @@ export type IDeviceType =
   | EDeviceType.ClassicPure
   | EDeviceType.Mini
   | EDeviceType.Touch
-  | EDeviceType.Pro
-  | EDeviceType.Pro2;
+  | EDeviceType.Pro;
 
 /**
  * model_classic: 'classic' | 'classic1s' | 'classicpure'
@@ -153,7 +124,6 @@ export const DeviceTypeToModels: { [deviceType in IDeviceType]: IDeviceModel[] }
   [EDeviceType.Mini]: ['model_mini'],
   [EDeviceType.Touch]: ['model_touch'],
   [EDeviceType.Pro]: ['model_touch'],
-  [EDeviceType.Pro2]: [],
   [EDeviceType.Unknown]: [],
 };
 
@@ -166,7 +136,6 @@ export type ITransportStatus = 'valid' | 'outdated';
 export type IVersionRange = {
   min: string;
   max?: string;
-  unsupported?: boolean;
 };
 
 export type DeviceFirmwareRange = {

package/src/types/params.ts

@@ -1,5 +1,3 @@
-import type { HardwareConnectProtocol } from '@onekeyfe/hd-shared';
-
 export interface CommonParams {
   keepSession?: boolean;
   /**
@@ -51,9 +49,9 @@ export interface CommonParams {
   onlyConnectBleDevice?: boolean;
 
   /**
-   * Expected transport protocol. If omitted, SDK probes Protocol V1 then Protocol V2.
+   * Use pre-initialized device state (BLE only)
    */
-  connectProtocol?: HardwareConnectProtocol;
+  usePreInitialize?: boolean;
 }
 
 export type Params<T> = CommonParams & T & { bundle?: undefined };

package/src/types/settings.ts

@@ -83,7 +83,7 @@ export type IBLEFirmwareReleaseInfo = {
   };
 };
 
-type IKnownDevice = Exclude<IDeviceType, 'unknown' | 'pro2'>;
+type IKnownDevice = Exclude<IDeviceType, 'unknown'>;
 
 /**
  * Device firmware configuration map

package/src/utils/deviceFeaturesUtils.ts

@@ -1,17 +1,11 @@
 import semver from 'semver';
 import { isNaN } from 'lodash';
 import { EDeviceType, type EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import {
-  Enum_Capability,
-  type GetPassphraseState as GetPassphraseStateMessage,
-} from '@onekeyfe/hd-transport';
+import { Enum_Capability } from '@onekeyfe/hd-transport';
 
 import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceModelToTypes, DeviceTypeToModels } from '../types';
-import DataManager, {
-  type IFirmwareField,
-  type ProtocolV1MessageSchema,
-} from '../data-manager/DataManager';
+import DataManager, { type IFirmwareField, type MessageVersion } from '../data-manager/DataManager';
 import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
@@ -21,13 +15,13 @@ import type { Device } from '../device/Device';
 import type { DeviceCommands } from '../device/DeviceCommands';
 import type { Features, SupportFeatureType } from '../types';
 
-export const getSupportProtocolV1MessageSchema = (
+export const getSupportMessageVersion = (
   features: Features | undefined
-): { messages: JSON; protocolV1MessageSchema: ProtocolV1MessageSchema } => {
+): { messages: JSON; messageVersion: MessageVersion } => {
   if (!features)
     return {
-      messages: DataManager.messages.v1CurrentSchema,
-      protocolV1MessageSchema: 'v1CurrentSchema',
+      messages: DataManager.messages.latest,
+      messageVersion: 'latest',
     };
 
   const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
@@ -43,18 +37,18 @@ export const getSupportProtocolV1MessageSchema = (
   const sortedDeviceVersionConfigs =
     deviceVersionConfigs?.sort((a, b) => semver.compare(b.minVersion, a.minVersion)) ?? [];
 
-  for (const { minVersion, protocolV1MessageSchema } of sortedDeviceVersionConfigs) {
+  for (const { minVersion, messageVersion } of sortedDeviceVersionConfigs) {
     if (semver.gte(currentDeviceVersion, minVersion)) {
       return {
-        messages: DataManager.messages[protocolV1MessageSchema],
-        protocolV1MessageSchema,
+        messages: DataManager.messages[messageVersion],
+        messageVersion,
       };
     }
   }
 
   return {
-    messages: DataManager.messages.v1CurrentSchema,
-    protocolV1MessageSchema: 'v1CurrentSchema',
+    messages: DataManager.messages.latest,
+    messageVersion: 'latest',
   };
 };
 
@@ -74,11 +68,7 @@ export const supportNewPassphrase = (features?: Features): SupportFeatureType =>
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
-  if (
-    deviceType === EDeviceType.Touch ||
-    deviceType === EDeviceType.Pro ||
-    deviceType === EDeviceType.Pro2
-  ) {
+  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
     return { support: true };
   }
 
@@ -92,13 +82,10 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
-    allowCreateAttachPin?: boolean;
   }
 ) => {
   const { features, commands } = device;
   const locked = features?.unlocked === false;
-  const deviceType = getDeviceType(features);
-  const isPro2 = deviceType === EDeviceType.Pro2;
 
   const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(
     features,
@@ -108,12 +95,12 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     }
   );
 
-  const isModeT = deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro;
+  const isModeT =
+    getDeviceType(features) === EDeviceType.Touch || getDeviceType(features) === EDeviceType.Pro;
 
   // 如果可以获取到 passphraseState，但是设备 features 显示设备未开启 passphrase，需要刷新设备状态
   // if passphraseState can be obtained, but the device features show that the device has not enabled passphrase, the device status needs to be refreshed
-  const needRefreshWithPassphrase =
-    !isPro2 && passphraseState && features?.passphrase_protection !== true;
+  const needRefreshWithPassphrase = passphraseState && features?.passphrase_protection !== true;
   // 如果 Touch/Pro 在之前是锁定状态，刷新设备状态
   // if Touch/Pro was locked before, refresh the device state
   const needRefreshWithLocked = isModeT && locked;
@@ -123,19 +110,10 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     await device.getFeatures();
   }
 
-  if (isPro2 && device.features) {
-    if (passphraseState) {
-      device.features.passphrase_protection = true;
-    }
-    if (newSession) {
-      device.features.session_id = newSession;
-    }
-  }
-
   // Attach to pin try to fix internal state
   if (features?.device_id) {
     device.updateInternalState(
-      (device.features?.passphrase_protection ?? false) || isPro2,
+      device.features?.passphrase_protection ?? false,
       passphraseState,
       device.features?.device_id ?? '',
       newSession,
@@ -152,7 +130,6 @@ export const getPassphraseState = async (
   options?: {
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
-    allowCreateAttachPin?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
@@ -171,23 +148,12 @@ export const getPassphraseState = async (
   );
   const supportGetPassphraseState =
     supportAttachPinCapability ||
-    // Pro2 V2 暂未从 features 暴露 capabilities，先直连该方法用于固件联调。
-    deviceType === EDeviceType.Pro2 ||
     (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.15.0'));
 
   if (supportGetPassphraseState) {
-    const payload: GetPassphraseStateMessage = options?.onlyMainPin
-      ? { _only_main_pin: true }
-      : { passphrase_state: options?.expectPassphraseState };
-    if (options?.allowCreateAttachPin) {
-      payload.allow_create_attach_pin = true;
-    }
-
-    const { message, type } = await commands.typedCall(
-      'GetPassphraseState',
-      'PassphraseState',
-      payload
-    );
+    const { message, type } = await commands.typedCall('GetPassphraseState', 'PassphraseState', {
+      passphrase_state: options?.onlyMainPin ? undefined : options?.expectPassphraseState,
+    });
 
     // @ts-expect-error
     if (type === 'CallMethodError') {
@@ -231,10 +197,7 @@ export const supportBatchPublicKey = (
 
   const deviceType = getDeviceType(features);
   // btc batch get public key
-  if (
-    !!options?.includeNode &&
-    (deviceType === EDeviceType.Pro || deviceType === EDeviceType.Pro2)
-  ) {
+  if (!!options?.includeNode && deviceType === EDeviceType.Pro) {
     return semver.gte(currentVersion, '4.14.0');
   }
   if (!!options?.includeNode && deviceType === EDeviceType.Touch) {
@@ -251,11 +214,7 @@ export const supportBatchPublicKey = (
   }
 
   // support batch get public key
-  if (
-    deviceType === EDeviceType.Touch ||
-    deviceType === EDeviceType.Pro ||
-    deviceType === EDeviceType.Pro2
-  ) {
+  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
     return semver.gte(currentVersion, '3.1.0');
   }
 

package/src/utils/deviceInfoUtils.ts

@@ -27,9 +27,6 @@ export const getDeviceType = (features?: Features): IDeviceType => {
       return EDeviceType.Touch;
     case 'PRO':
       return EDeviceType.Pro;
-    case 'PRO2':
-    case 'pro2':
-      return EDeviceType.Pro2;
     case 'PURE':
       return EDeviceType.ClassicPure;
     default:
@@ -71,14 +68,13 @@ export const getDeviceType = (features?: Features): IDeviceType => {
 export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
   if (!name) return EDeviceType.Unknown;
 
-  if (/^BixinKey/i.test(name)) return EDeviceType.Classic;
-  if (/^K/i.test(name)) return EDeviceType.Classic;
+  if (name.startsWith('BixinKey')) return EDeviceType.Classic;
+  if (name.startsWith('K')) return EDeviceType.Classic;
 
-  if (/^T/i.test(name)) return EDeviceType.Touch;
-  if (/^Touch/i.test(name)) return EDeviceType.Touch;
+  if (name.startsWith('T')) return EDeviceType.Touch;
+  if (name.startsWith('Touch')) return EDeviceType.Touch;
 
-  if (/\bPro\s*2\b/i.test(name) || /^Pro2/i.test(name)) return EDeviceType.Pro2;
-  if (/\bPro\b/i.test(name) || /^Pro/i.test(name)) return EDeviceType.Pro;
+  if (name.startsWith('Pro')) return EDeviceType.Pro;
 
   return EDeviceType.Unknown;
 };
@@ -132,8 +128,8 @@ export const getMethodVersionRange = (
   getVersionRange: (deviceModel: IDeviceType | IDeviceModel) => IVersionRange | undefined
 ): IVersionRange | undefined => {
   const deviceType = getDeviceType(features);
+  let versionRange: IVersionRange | undefined = getVersionRange(deviceType);
 
-  const versionRange = getVersionRange(deviceType);
   if (versionRange) {
     return versionRange;
   }
@@ -146,19 +142,16 @@ export const getMethodVersionRange = (
   ];
   for (const model of modelFallbacks) {
     if (DeviceModelToTypes[model].includes(deviceType)) {
-      const versionRange = getVersionRange(model);
+      versionRange = getVersionRange(model);
       if (versionRange) {
         return versionRange;
       }
     }
   }
 
-  return undefined;
+  return versionRange;
 };
 
-export const isMethodVersionRangeUnsupported = (versionRange?: IVersionRange): boolean =>
-  versionRange?.unsupported === true;
-
 export const getFirmwareType = (features: Features | undefined) => {
   if (!features) {
     return EFirmwareType.Universal;

package/src/utils/index.ts

@@ -11,7 +11,6 @@ export {
   getDeviceUUID,
   getDeviceLabel,
   getMethodVersionRange,
-  isMethodVersionRangeUnsupported,
   getFirmwareType,
 } from './deviceInfoUtils';
 export {