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

package/src/api/GetOnekeyFeatures.ts

@@ -1,83 +1,21 @@
 import semver from 'semver';
+import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../constants/ui-request';
 import { fixVersion } from '../utils/deviceFeaturesUtils';
-import { PROTOCOL_V2_DEVICE_INFO_REQUEST } from '../protocols/protocol-v2';
-import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
 import { BaseMethod } from './BaseMethod';
 
 import type { OnekeyFeatures } from '../types';
 
-const ONEKEY_FEATURE_KEYS: Array<keyof OnekeyFeatures> = [
-  'onekey_device_type',
-  'onekey_board_version',
-  'onekey_boot_version',
-  'onekey_firmware_version',
-  'onekey_board_hash',
-  'onekey_boot_hash',
-  'onekey_firmware_hash',
-  'onekey_board_build_id',
-  'onekey_boot_build_id',
-  'onekey_firmware_build_id',
-  'onekey_serial_no',
-  'onekey_ble_name',
-  'onekey_ble_version',
-  'onekey_ble_build_id',
-  'onekey_ble_hash',
-  'onekey_se_type',
-  'onekey_se01_state',
-  'onekey_se02_state',
-  'onekey_se03_state',
-  'onekey_se04_state',
-  'onekey_se01_version',
-  'onekey_se02_version',
-  'onekey_se03_version',
-  'onekey_se04_version',
-  'onekey_se01_hash',
-  'onekey_se02_hash',
-  'onekey_se03_hash',
-  'onekey_se04_hash',
-  'onekey_se01_build_id',
-  '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',
-];
-
 function normalizeOnekeyFirmwareVersion(message: OnekeyFeatures) {
   if (message.onekey_firmware_version && !semver.valid(message.onekey_firmware_version)) {
     message.onekey_firmware_version = fixVersion(message.onekey_firmware_version);
   }
 }
 
-function pickOnekeyFeatures(features?: OnekeyFeatures | null): OnekeyFeatures {
-  const message: OnekeyFeatures = {};
-  if (!features) return message;
-
-  for (const key of ONEKEY_FEATURE_KEYS) {
-    const value = features[key];
-    if (value !== undefined && value !== null) {
-      (message as Record<string, unknown>)[key] = value;
-    }
-  }
-
-  normalizeOnekeyFirmwareVersion(message);
-  return message;
-}
-
 export default class GetOnekeyFeatures extends BaseMethod {
   init() {
+    this.unlockPolicy = 'none';
     this.allowDeviceMode = [
       ...this.allowDeviceMode,
       UI_REQUEST.NOT_INITIALIZE,
@@ -89,14 +27,7 @@ export default class GetOnekeyFeatures extends BaseMethod {
 
   async run() {
     if (this.device.isProtocolV2()) {
-      // V2 没有 OnekeyGetFeatures 消息：
-      // 取完整 DeviceInfoGet（含 SE/hash/build_id）后刷新结构化 features 缓存。
-      const deviceInfo = await requestProtocolV2DeviceInfo({
-        commands: this.device.commands,
-        request: PROTOCOL_V2_DEVICE_INFO_REQUEST,
-      });
-      const features = this.device.updateProtocolV2Features(deviceInfo);
-      return pickOnekeyFeatures(features as OnekeyFeatures);
+      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
     }
 
     const { message } = await this.device.commands.typedCall('OnekeyGetFeatures', 'OnekeyFeatures');

package/src/api/GetPassphraseState.ts

@@ -21,7 +21,9 @@ export default class GetPassphraseState extends BaseMethod {
     const deviceType = this.device.getCurrentDeviceType();
 
     if (deviceType === EDeviceType.Pro2) {
-      return Promise.resolve(passphraseProtection === true ? passphraseState : undefined);
+      // Protocol V2 的钱包身份由 DeviceSession 返回的 btc_test_address 决定，
+      // 不依赖固件 passphrase_enabled 状态。
+      return Promise.resolve(passphraseState);
     }
 
     return Promise.resolve(

package/src/api/SearchDevices.ts

@@ -1,11 +1,13 @@
 import { BaseMethod } from './BaseMethod';
 import TransportManager from '../data-manager/TransportManager';
 import { DataManager } from '../data-manager';
-import { getDeviceTypeByBleName } from '../utils';
+import { LoggerNames, getDeviceTypeByBleName, getLogger } from '../utils';
 import { DevicePool } from '../device/DevicePool';
 
 import type DeviceConnector from '../device/DeviceConnector';
 
+const Log = getLogger(LoggerNames.DevicePool);
+
 export default class SearchDevices extends BaseMethod {
   connector?: DeviceConnector;
 
@@ -47,9 +49,28 @@ export default class SearchDevices extends BaseMethod {
       return devices;
     }
 
-    const { deviceList } = await DevicePool.getDevices(devicesDescriptor, undefined, {
-      connectProtocol: this.payload.connectProtocol,
-    });
+    const deviceList = [];
+    for (const descriptor of devicesDescriptor) {
+      try {
+        // 设备发现是尽力而为的操作。浏览器可能保留已经离线、忙碌或尚未就绪的
+        // WebUSB 授权记录，单个描述符初始化失败不应中断其余设备的发现。
+        const result = await DevicePool.getDevices([descriptor], descriptor.path, {
+          connectProtocol: this.payload.connectProtocol,
+          refreshRuntimeState: true,
+        });
+        deviceList.push(...result.deviceList);
+      } catch (error) {
+        const errorCode =
+          error && typeof error === 'object' && 'errorCode' in error
+            ? (error as { errorCode?: unknown }).errorCode
+            : undefined;
+        Log.debug('Skip unavailable device during search', {
+          path: descriptor.path,
+          ...(errorCode !== undefined ? { errorCode } : {}),
+        });
+      }
+    }
+
     return deviceList.map(device => device.toMessageObject());
   }
 }

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -28,6 +28,7 @@ export default class DeviceRebootToBoardloader extends BaseMethod<RebootToBoardl
       const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
         reboot_type: DeviceRebootType.Romloader,
       });
+      this.device.markProtocolV2Reboot(DeviceRebootType.Romloader);
       return Promise.resolve(res.message);
     }
 

package/src/api/device/DeviceRebootToBootloader.ts

@@ -28,6 +28,7 @@ export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloa
       const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
         reboot_type: DeviceRebootType.Bootloader,
       });
+      this.device.markProtocolV2Reboot(DeviceRebootType.Bootloader);
       return Promise.resolve(res.message);
     }
 

package/src/api/device/DeviceSettings.ts

@@ -1,7 +1,13 @@
 import { HardwareErrorCode, TypedError } from '@onekeyfe/hd-shared';
 
 import { BaseMethod } from '../BaseMethod';
+import { invalidParameter } from '../helpers/filesystemValidation';
 import { validateParams } from '../helpers/paramsValidator';
+import {
+  mapApplySettingsToState,
+  mapCommonSettingsToProtocolV2,
+  mapDeviceSettingsToState,
+} from '../../device/DeviceStateMapper';
 import { LANGUAGE_LABELS } from '../../utils/deviceSettings';
 
 import type { ApplySettings } from '@onekeyfe/hd-transport';
@@ -24,7 +30,15 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
       { name: 'experimentalFeatures', type: 'boolean' },
       { name: 'autoShutdownDelayMs', type: 'number' },
       { name: 'changeBrightness', type: 'boolean' },
+      { name: 'brightness', type: 'number' },
       { name: 'hapticFeedback', type: 'boolean' },
+      { name: 'bluetoothEnabled', type: 'boolean' },
+      { name: 'animationEnabled', type: 'boolean' },
+      { name: 'tapToWake', type: 'boolean' },
+      { name: 'deviceNameDisplayEnabled', type: 'boolean' },
+      { name: 'fidoEnabled', type: 'boolean' },
+      { name: 'usbLockEnabled', type: 'boolean' },
+      { name: 'randomKeypad', type: 'boolean' },
     ]);
 
     // init params
@@ -60,9 +74,23 @@ export default class DeviceSettings extends BaseMethod<ApplySettings> {
 
   async run() {
     try {
+      if (this.device.isProtocolV2()) {
+        const settings = mapCommonSettingsToProtocolV2(this.payload);
+        if (Object.keys(settings).length === 0) {
+          throw invalidParameter('No Protocol V2 compatible setting provided.');
+        }
+
+        const res = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
+          settings,
+        });
+        this.device.updateState(mapDeviceSettingsToState(settings), 'apply-settings');
+        return res.message;
+      }
+
       const res = await this.device.commands.typedCall('ApplySettings', 'Success', {
         ...this.params,
       });
+      this.device.updateState(mapApplySettingsToState(this.params), 'apply-settings');
       return res.message;
     } catch (error) {
       if (error.message?.toLowerCase().includes('no setting provided')) {

package/src/api/index.ts

@@ -3,7 +3,7 @@ export { default as preInitialize } from './device/PreInitialize';
 
 export { default as searchDevices } from './SearchDevices';
 export { default as getFeatures } from './GetFeatures';
-export { default as getDeviceInfo } from './GetDeviceInfo';
+export { default as getDeviceState } from './GetDeviceState';
 export { default as getOnekeyFeatures } from './GetOnekeyFeatures';
 export { default as getPassphraseState } from './GetPassphraseState';
 export { default as getLogs } from './GetLogs';
@@ -47,15 +47,12 @@ export { default as promptWebDeviceAccess } from './PromptWebDeviceAccess';
 export { default as protocolInfoRequest } from './protocol-v2/ProtocolInfoRequest';
 export { default as ping } from './protocol-v2/Ping';
 export { default as deviceReboot } from './protocol-v2/DeviceReboot';
-export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
-export { default as deviceStatusGet } from './protocol-v2/DeviceStatusGet';
 export { default as deviceGetOnboardingStatus } from './protocol-v2/DeviceGetOnboardingStatus';
 export { default as deviceSessionOpen } from './protocol-v2/DeviceSessionOpen';
 export { default as deviceFirmwareUpdate } from './protocol-v2/DeviceFirmwareUpdate';
 export { default as deviceGetFirmwareUpdateStatus } from './protocol-v2/DeviceGetFirmwareUpdateStatus';
 export { default as deviceFactoryInfoSet } from './protocol-v2/DeviceFactoryInfoSet';
 export { default as deviceFactoryInfoGet } from './protocol-v2/DeviceFactoryInfoGet';
-export { default as deviceSettingsGet } from './protocol-v2/DeviceSettingsGet';
 export { default as deviceSettingsSet } from './protocol-v2/DeviceSettingsSet';
 export { default as deviceSettingsPageShow } from './protocol-v2/DeviceSettingsPageShow';
 export { default as deviceUploadWallpaper } from './protocol-v2/DeviceUploadWallpaper';

package/src/api/internal.ts

@@ -0,0 +1,9 @@
+/**
+ * SDK 内部原生命令注册表。
+ *
+ * 这些方法允许开发工具通过低层 `call` 调试 Protocol V2，但不会进入
+ * `CoreApi` 或公开的便捷方法集合；业务接入仍应使用统一 DeviceState API。
+ */
+export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
+export { default as deviceStatusGet } from './protocol-v2/DeviceStatusGet';
+export { default as deviceSettingsGet } from './protocol-v2/DeviceSettingsGet';

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

@@ -13,7 +13,6 @@ export type DeviceInfoGetTargets = {
   se2?: boolean;
   se3?: boolean;
   se4?: boolean;
-  status?: boolean;
 };
 
 export type DeviceInfoGetTypes = {
@@ -36,7 +35,6 @@ const TARGET_KEYS: (keyof DeviceInfoGetTargets)[] = [
   'se2',
   'se3',
   'se4',
-  'status',
 ];
 
 const TYPE_KEYS: (keyof DeviceInfoGetTypes)[] = ['version', 'build_id', 'hash', 'specific'];
@@ -104,9 +102,8 @@ function normalizeTypes(value: unknown): DeviceInfoGetTypes | undefined {
 /**
  * 原生 DeviceInfoGet（Protocol V2 only）。
  *
- * 与 getDeviceInfo 不同：不构建 DeviceProfile、不更新设备缓存，
- * 按调用方给定的 targets/types 原样请求并返回未加工的 DeviceInfo 消息，
- * 用于调试固件字段上报。
+ * SDK 内部按需构造 targets/types，并返回未加工的 DeviceInfo 消息。
+ * 该 command 不属于公共 CoreApi；业务接入统一使用 getDeviceState。
  */
 export default class DeviceInfoGet extends BaseMethod<{
   targets: DeviceInfoGetTargets;
@@ -115,6 +112,7 @@ export default class DeviceInfoGet extends BaseMethod<{
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
     this.requireProtocolV2 = true;
+    this.unlockPolicy = 'none';
     this.allowDeviceMode = [
       ...this.allowDeviceMode,
       UI_REQUEST.NOT_INITIALIZE,

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

@@ -16,9 +16,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/DeviceSettingsGet.ts

@@ -1,9 +1,10 @@
 import { BaseMethod } from '../BaseMethod';
+import { mapDeviceSettingsToState } from '../../device/DeviceStateMapper';
 
 export default class DeviceSettingsGet extends BaseMethod {
   init() {
     this.requireProtocolV2 = true;
-    this.unlockPolicy = 'retry-on-locked';
+    this.unlockPolicy = 'none';
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
     this.params = undefined;
@@ -11,6 +12,7 @@ export default class DeviceSettingsGet extends BaseMethod {
 
   async run() {
     const res = await this.device.commands.typedCall('DeviceSettingsGet', 'DeviceSettings', {});
+    this.device.updateState(mapDeviceSettingsToState(res.message), 'apply-settings');
     return Promise.resolve(res.message);
   }
 }

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

@@ -1,4 +1,5 @@
 import { BaseMethod } from '../BaseMethod';
+import { mapDeviceSettingsToState } from '../../device/DeviceStateMapper';
 import { invalidParameter } from '../helpers/filesystemValidation';
 
 import type { DeviceSettings } from '@onekeyfe/hd-transport';
@@ -44,6 +45,7 @@ export default class DeviceSettingsSet extends BaseMethod<{
 
   async run() {
     const res = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', this.params);
+    this.device.updateState(mapDeviceSettingsToState(this.params.settings), 'apply-settings');
     return Promise.resolve(res.message);
   }
 }

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

@@ -3,6 +3,7 @@ import { BaseMethod } from '../BaseMethod';
 export default class DeviceStatusGet extends BaseMethod {
   init() {
     this.requireProtocolV2 = true;
+    this.unlockPolicy = 'none';
     this.useDevicePassphraseState = false;
     this.skipForceUpdateCheck = true;
   }

package/src/api/utils.ts

@@ -1,17 +1,23 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import * as ApiMethods from './index';
+import * as InternalApiMethods from './internal';
 
+import type { BaseMethod } from './BaseMethod';
 import type { IFrameCallMessage } from '../events';
 
-export function findMethod(message: IFrameCallMessage & { id?: number }) {
+type MethodConstructor = new (message: IFrameCallMessage & { id?: number }) => BaseMethod<any>;
+
+const publicMethodRegistry = ApiMethods as unknown as Record<string, MethodConstructor>;
+const internalMethodRegistry = InternalApiMethods as unknown as Record<string, MethodConstructor>;
+
+export function findMethod(message: IFrameCallMessage & { id?: number }): BaseMethod<any> {
   const { method } = message.payload;
   if (typeof method !== 'string') {
     throw ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, 'Method is not set');
   }
 
-  // @ts-expect-error
-  const MethodConstructor = ApiMethods[method];
+  const MethodConstructor = publicMethodRegistry[method] ?? internalMethodRegistry[method];
   if (MethodConstructor) {
     return new MethodConstructor(message);
   }

package/src/constants/index.ts

@@ -5,7 +5,4 @@ export {
   TonSignDataType,
   TonWalletVersion,
 } from '@onekeyfe/hd-transport';
-export type {
-  HDNodeType,
-  Success as DeviceSuccess,
-} from '@onekeyfe/hd-transport';
+export type { HDNodeType, Success as DeviceSuccess } from '@onekeyfe/hd-transport';

package/src/core/index.ts

@@ -36,6 +36,7 @@ import {
   updateRequestContext,
 } from '../utils/tracing';
 import { Device } from '../device/Device';
+import { checkLiveDeviceId } from '../device/deviceIdentity';
 import { DeviceList } from '../device/DeviceList';
 import { DevicePool } from '../device/DevicePool';
 import { PollingStateManager } from './PollingStateManager';
@@ -410,6 +411,7 @@ const onCallDevice = async (
     attachPinOnDevice: onEnterAttachPinOnDeviceHandler,
   });
   device.on(DEVICE.FEATURES, onDeviceFeaturesHandler);
+  device.on(DEVICE.STATE, onDeviceStateHandler);
   device.on(
     DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE,
     onSelectDeviceInBootloaderForWebDeviceHandler
@@ -549,7 +551,7 @@ const onCallDevice = async (
       }
 
       if (method.deviceId && method.checkDeviceId) {
-        const isSameDeviceID = device.checkDeviceId(method.deviceId);
+        const isSameDeviceID = await checkLiveDeviceId(device, method.deviceId);
         if (!isSameDeviceID) {
           return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceCheckDeviceIdError));
         }
@@ -1240,6 +1242,10 @@ const onDeviceFeaturesHandler = (...[_, features]: [...DeviceEvents['features']]
   postMessage(createDeviceMessage(DEVICE.FEATURES, { ...features }));
 };
 
+const onDeviceStateHandler = (...[_, stateEvent]: [...DeviceEvents['state']]) => {
+  postMessage(createDeviceMessage(DEVICE.STATE, stateEvent));
+};
+
 const onDevicePassphraseHandler = async (
   ...[device, requestPayload, callback]: DeviceEvents['passphrase']
 ) => {

package/src/data/messages/messages-protocol-v2.json

@@ -11586,7 +11586,8 @@
         "LayoutSafeTxCreate": 1,
         "LayoutFinalConfirm": 2,
         "Layout7702": 3,
-        "LayoutFlat": 4
+        "LayoutFlat": 4,
+        "LayoutEthApprove": 5
       }
     },
     "ViewSignPage": {
@@ -11645,6 +11646,18 @@
           "rule": "required",
           "type": "string",
           "id": 3
+        },
+        "network": {
+          "type": "string",
+          "id": 4
+        },
+        "derive_type": {
+          "type": "string",
+          "id": 5
+        },
+        "value_key": {
+          "type": "uint32",
+          "id": 6
         }
       }
     },
@@ -11852,10 +11865,6 @@
           "type": "string",
           "id": 4
         },
-        "passphrase_enable": {
-          "type": "bool",
-          "id": 6
-        },
         "brightness": {
           "type": "uint32",
           "id": 7
@@ -11888,14 +11897,6 @@
           "type": "bool",
           "id": 14
         },
-        "fido_enabled": {
-          "type": "bool",
-          "id": 15
-        },
-        "experimental_features": {
-          "type": "bool",
-          "id": 16
-        },
         "usb_lock_enable": {
           "type": "bool",
           "id": 17
@@ -11903,6 +11904,14 @@
         "random_keypad": {
           "type": "bool",
           "id": 18
+        },
+        "passphrase_enable": {
+          "type": "bool",
+          "id": 100
+        },
+        "fido_enabled": {
+          "type": "bool",
+          "id": 101
         }
       }
     },