@onekeyfe/hd-core 1.2.0-alpha.1 → 1.2.0-alpha.11

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -2,22 +2,8 @@ import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import type { Features } from '../types';
 import type { PROTO } from '../constants';
-import type { DevFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
-
-type ProtocolV2DeviceInfoCompat = ProtocolV2DeviceInfo & {
-  fw?: ProtocolV2DeviceInfo['fw'] & {
-    application?: DevFirmwareImageInfo | null;
-    application_data?: DevFirmwareImageInfo | null;
-    bootloader?: DevFirmwareImageInfo | null;
-    romloader?: DevFirmwareImageInfo | null;
-  };
-  coprocessor?: {
-    application?: DevFirmwareImageInfo | null;
-    bootloader?: DevFirmwareImageInfo | null;
-    bt_adv_name?: string | null;
-    bt_mac?: unknown;
-  } | null;
-};
+import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import { isProtocolV2BootloaderDeviceInfo } from '../protocols/protocol-v2/features';
 
 type ProtocolV1FeaturesCompat = PROTO.Features &
   Partial<PROTO.OnekeyFeatures> & {
@@ -26,7 +12,7 @@ type ProtocolV1FeaturesCompat = PROTO.Features &
     onekey_serial?: string;
   };
 
-const getImageVersion = (image?: DevFirmwareImageInfo | null) => image?.version ?? null;
+const getImageVersion = (image?: DeviceFirmwareImageInfo | null) => image?.version ?? null;
 
 const bytesToHex = (value: unknown): string | undefined => {
   if (!value) return undefined;
@@ -42,9 +28,9 @@ const bytesToHex = (value: unknown): string | undefined => {
   return undefined;
 };
 
-const getImageBuildId = (image?: DevFirmwareImageInfo | null) => image?.build_id ?? undefined;
+const getImageBuildId = (image?: DeviceFirmwareImageInfo | null) => image?.build_id ?? undefined;
 
-const getImageHash = (image?: DevFirmwareImageInfo | null) => bytesToHex(image?.hash);
+const getImageHash = (image?: DeviceFirmwareImageInfo | null) => bytesToHex(image?.hash);
 
 const firstValue = <T>(...values: Array<T | null | undefined>) =>
   values.find(value => value !== undefined && value !== null);
@@ -226,7 +212,7 @@ export const buildProtocolV1FeaturesPayload = (
 /**
  * Protocol V2 的结构化 `Features` 构建器。
  *
- * 这是 Device 内部唯一缓存状态。字段只来自 DevGetDeviceInfo 或前一次 features
+ * 这是 Device 内部唯一缓存状态。字段只来自 DeviceInfoGet 或前一次 features
  * 缓存的同名字段级合并；不存在协议等价语义的字段保持 null/空值，不再通过
  * DeviceProfile 或 transport path 做身份兜底。
  */
@@ -234,11 +220,12 @@ export const buildProtocolV2FeaturesPayload = (
   deviceInfo?: ProtocolV2DeviceInfo,
   previous?: Features
 ): Features => {
-  const info = deviceInfo as ProtocolV2DeviceInfoCompat | undefined;
-  const fwApplication = firstValue(info?.fw?.application, info?.fw?.app);
-  const fwBootloader = firstValue(info?.fw?.bootloader, info?.fw?.boot);
-  const fwBoard = firstValue(info?.fw?.application_data, info?.fw?.board);
-  const bleApplication = firstValue(info?.coprocessor?.application, info?.bt?.app);
+  const info = deviceInfo;
+  const fwApplication = info?.fw?.application;
+  const fwBootloader = info?.fw?.bootloader;
+  const fwBoard = firstValue(info?.fw?.application_data, info?.fw?.romloader);
+  const bleApplication = info?.coprocessor?.application;
+  const status = info?.status;
 
   const firmwareVersion = firstMeaningfulVersion(
     getImageVersion(fwApplication),
@@ -250,17 +237,26 @@ export const buildProtocolV2FeaturesPayload = (
   );
   const boardVersion = firstMeaningfulVersion(getImageVersion(fwBoard), previous?.boardVersion);
   const bleVersion = firstMeaningfulVersion(getImageVersion(bleApplication), previous?.bleVersion);
-  const deviceId = firstValue(info?.hw?.device_id, previous?.deviceId) ?? null;
+  const deviceId = status?.device_id ?? null;
   const serialNo = firstValue(info?.hw?.serial_no, previous?.serialNo) ?? '';
-  const label = firstValue(deviceInfo?.status?.label, previous?.label) ?? null;
-  const bleName = firstValue(info?.coprocessor?.bt_adv_name, info?.bt?.adv_name, previous?.bleName);
-  const initialized = firstValue(deviceInfo?.status?.init_states, previous?.initialized) ?? null;
-  const passphraseProtection =
-    firstValue(deviceInfo?.status?.passphrase_protection, previous?.passphraseProtection) ?? null;
-  const language = firstValue(deviceInfo?.status?.language, previous?.language) ?? null;
-  const backupRequired =
-    firstValue(deviceInfo?.status?.backup_required, previous?.backupRequired) ?? null;
-  const bleEnabled = firstValue(deviceInfo?.status?.bt_enable, previous?.bleEnabled);
+  const label = previous?.label ?? null;
+  const bleName = firstValue(info?.coprocessor?.bt_adv_name, previous?.bleName);
+  const initialized = firstValue(status?.init_states, previous?.initialized) ?? null;
+  const passphraseProtection = status?.passphrase_enabled ?? null;
+  const language = previous?.language ?? null;
+  const backupRequired = firstValue(status?.backup_required, previous?.backupRequired) ?? null;
+  const bleEnabled = previous?.bleEnabled;
+  const unlocked = firstValue(status?.unlocked, previous?.unlocked) ?? null;
+  const attachToPinEnabled = status?.attach_to_pin_enabled ?? null;
+  const unlockedAttachPin = status?.unlocked_by_attach_to_pin ?? undefined;
+  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(info);
+  const mode = bootloaderMode
+    ? 'bootloader'
+    : initialized === false
+    ? 'notInitialized'
+    : initialized === true
+    ? 'normal'
+    : 'unknown';
 
   return {
     protocol: 'V2',
@@ -274,10 +270,10 @@ export const buildProtocolV2FeaturesPayload = (
     label,
     bleName: bleName ?? null,
     capabilities: [],
-    mode: initialized === false ? 'notInitialized' : initialized === true ? 'normal' : 'unknown',
+    mode,
     initialized,
-    bootloaderMode: false,
-    unlocked: previous?.unlocked ?? null,
+    bootloaderMode,
+    unlocked,
     firmwarePresent: previous?.firmwarePresent ?? null,
     passphraseProtection,
     pinProtection: null,
@@ -291,6 +287,7 @@ export const buildProtocolV2FeaturesPayload = (
     sdProtection: null,
     wipeCodeProtection: null,
     passphraseAlwaysOnDevice: null,
+    attachToPinEnabled,
     safetyChecks: null,
     autoLockDelayMs: null,
     displayRotation: null,
@@ -300,35 +297,35 @@ export const buildProtocolV2FeaturesPayload = (
     boardVersion,
     bleVersion,
     se01Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se1?.app),
+      getImageVersion(info?.se1?.application),
       previous?.se01Version
     ),
     se02Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se2?.app),
+      getImageVersion(info?.se2?.application),
       previous?.se02Version
     ),
     se03Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se3?.app),
+      getImageVersion(info?.se3?.application),
       previous?.se03Version
     ),
     se04Version: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se4?.app),
+      getImageVersion(info?.se4?.application),
       previous?.se04Version
     ),
     se01BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se1?.boot),
+      getImageVersion(info?.se1?.bootloader),
       previous?.se01BootVersion
     ),
     se02BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se2?.boot),
+      getImageVersion(info?.se2?.bootloader),
       previous?.se02BootVersion
     ),
     se03BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se3?.boot),
+      getImageVersion(info?.se3?.bootloader),
       previous?.se03BootVersion
     ),
     se04BootVersion: firstMeaningfulVersion(
-      getImageVersion(deviceInfo?.se4?.boot),
+      getImageVersion(info?.se4?.bootloader),
       previous?.se04BootVersion
     ),
     seVersion: previous?.seVersion ?? null,
@@ -341,26 +338,26 @@ export const buildProtocolV2FeaturesPayload = (
       boardHash: getImageHash(fwBoard) ?? previous?.verify?.boardHash,
       bleBuildId: getImageBuildId(bleApplication) ?? previous?.verify?.bleBuildId,
       bleHash: getImageHash(bleApplication) ?? previous?.verify?.bleHash,
-      se01BuildId: getImageBuildId(deviceInfo?.se1?.app) ?? previous?.verify?.se01BuildId,
-      se01Hash: getImageHash(deviceInfo?.se1?.app) ?? previous?.verify?.se01Hash,
-      se02BuildId: getImageBuildId(deviceInfo?.se2?.app) ?? previous?.verify?.se02BuildId,
-      se02Hash: getImageHash(deviceInfo?.se2?.app) ?? previous?.verify?.se02Hash,
-      se03BuildId: getImageBuildId(deviceInfo?.se3?.app) ?? previous?.verify?.se03BuildId,
-      se03Hash: getImageHash(deviceInfo?.se3?.app) ?? previous?.verify?.se03Hash,
-      se04BuildId: getImageBuildId(deviceInfo?.se4?.app) ?? previous?.verify?.se04BuildId,
-      se04Hash: getImageHash(deviceInfo?.se4?.app) ?? previous?.verify?.se04Hash,
-      se01BootBuildId: getImageBuildId(deviceInfo?.se1?.boot) ?? previous?.verify?.se01BootBuildId,
-      se01BootHash: getImageHash(deviceInfo?.se1?.boot) ?? previous?.verify?.se01BootHash,
-      se02BootBuildId: getImageBuildId(deviceInfo?.se2?.boot) ?? previous?.verify?.se02BootBuildId,
-      se02BootHash: getImageHash(deviceInfo?.se2?.boot) ?? previous?.verify?.se02BootHash,
-      se03BootBuildId: getImageBuildId(deviceInfo?.se3?.boot) ?? previous?.verify?.se03BootBuildId,
-      se03BootHash: getImageHash(deviceInfo?.se3?.boot) ?? previous?.verify?.se03BootHash,
-      se04BootBuildId: getImageBuildId(deviceInfo?.se4?.boot) ?? previous?.verify?.se04BootBuildId,
-      se04BootHash: getImageHash(deviceInfo?.se4?.boot) ?? previous?.verify?.se04BootHash,
+      se01BuildId: getImageBuildId(info?.se1?.application) ?? previous?.verify?.se01BuildId,
+      se01Hash: getImageHash(info?.se1?.application) ?? previous?.verify?.se01Hash,
+      se02BuildId: getImageBuildId(info?.se2?.application) ?? previous?.verify?.se02BuildId,
+      se02Hash: getImageHash(info?.se2?.application) ?? previous?.verify?.se02Hash,
+      se03BuildId: getImageBuildId(info?.se3?.application) ?? previous?.verify?.se03BuildId,
+      se03Hash: getImageHash(info?.se3?.application) ?? previous?.verify?.se03Hash,
+      se04BuildId: getImageBuildId(info?.se4?.application) ?? previous?.verify?.se04BuildId,
+      se04Hash: getImageHash(info?.se4?.application) ?? previous?.verify?.se04Hash,
+      se01BootBuildId: getImageBuildId(info?.se1?.bootloader) ?? previous?.verify?.se01BootBuildId,
+      se01BootHash: getImageHash(info?.se1?.bootloader) ?? previous?.verify?.se01BootHash,
+      se02BootBuildId: getImageBuildId(info?.se2?.bootloader) ?? previous?.verify?.se02BootBuildId,
+      se02BootHash: getImageHash(info?.se2?.bootloader) ?? previous?.verify?.se02BootHash,
+      se03BootBuildId: getImageBuildId(info?.se3?.bootloader) ?? previous?.verify?.se03BootBuildId,
+      se03BootHash: getImageHash(info?.se3?.bootloader) ?? previous?.verify?.se03BootHash,
+      se04BootBuildId: getImageBuildId(info?.se4?.bootloader) ?? previous?.verify?.se04BootBuildId,
+      se04BootHash: getImageHash(info?.se4?.bootloader) ?? previous?.verify?.se04BootHash,
     },
     sessionId: previous?.sessionId ?? null,
     passphraseState: previous?.passphraseState,
-    unlockedAttachPin: previous?.unlockedAttachPin,
+    unlockedAttachPin,
     raw: {
       protocolV2DeviceInfo: deviceInfo,
     },

package/src/deviceProfile/buildDeviceProfile.ts

@@ -25,7 +25,8 @@ import type {
   GetDeviceInfoParams,
 } from '../types/api/getDeviceInfo';
 import type { Features, OnekeyFeatures } from '../types';
-import type { DevFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareImageInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import { isProtocolV2BootloaderDeviceInfo } from '../protocols/protocol-v2/features';
 
 type BuildProtocolV1ProfileParams = {
   protocol?: DeviceInfoProtocol;
@@ -68,11 +69,11 @@ const bytesToHex = (value: unknown): string | undefined => {
   return undefined;
 };
 
-const getImageVersion = (image?: DevFirmwareImageInfo | null) => image?.version ?? null;
+const getImageVersion = (image?: DeviceFirmwareImageInfo | null) => image?.version ?? null;
 
-const getImageBuildId = (image?: DevFirmwareImageInfo | null) => image?.build_id ?? undefined;
+const getImageBuildId = (image?: DeviceFirmwareImageInfo | null) => image?.build_id ?? undefined;
 
-const getImageHash = (image?: DevFirmwareImageInfo | null) => bytesToHex(image?.hash);
+const getImageHash = (image?: DeviceFirmwareImageInfo | null) => bytesToHex(image?.hash);
 
 const shouldIncludeVerify = (scope?: GetDeviceInfoParams['scope']) =>
   scope === 'verify' || scope === 'full';
@@ -86,6 +87,7 @@ const getDeviceMode = (features?: Features): DeviceInfoStatus['mode'] => {
 };
 
 const getProtocolV2Mode = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus['mode'] => {
+  if (isProtocolV2BootloaderDeviceInfo(deviceInfo)) return 'bootloader';
   const initialized = deviceInfo?.status?.init_states;
   if (initialized === false) return 'notInitialized';
   if (initialized === true) return 'normal';
@@ -147,20 +149,25 @@ const normalizeV1Versions = (
   ),
 });
 
-const normalizeV2Versions = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVersions => ({
-  firmware: firstMeaningfulVersion(getImageVersion(deviceInfo?.fw?.app)),
-  bootloader: firstMeaningfulVersion(getImageVersion(deviceInfo?.fw?.boot)),
-  board: firstMeaningfulVersion(getImageVersion(deviceInfo?.fw?.board)),
-  ble: firstMeaningfulVersion(getImageVersion(deviceInfo?.bt?.app)),
-  se01: firstMeaningfulVersion(getImageVersion(deviceInfo?.se1?.app)),
-  se02: firstMeaningfulVersion(getImageVersion(deviceInfo?.se2?.app)),
-  se03: firstMeaningfulVersion(getImageVersion(deviceInfo?.se3?.app)),
-  se04: firstMeaningfulVersion(getImageVersion(deviceInfo?.se4?.app)),
-  se01Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se1?.boot)),
-  se02Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se2?.boot)),
-  se03Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se3?.boot)),
-  se04Boot: firstMeaningfulVersion(getImageVersion(deviceInfo?.se4?.boot)),
-});
+const normalizeV2Versions = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVersions => {
+  const info = deviceInfo;
+  return {
+    firmware: firstMeaningfulVersion(getImageVersion(info?.fw?.application)),
+    bootloader: firstMeaningfulVersion(getImageVersion(info?.fw?.bootloader)),
+    board: firstMeaningfulVersion(
+      getImageVersion(info?.fw?.application_data ?? info?.fw?.romloader)
+    ),
+    ble: firstMeaningfulVersion(getImageVersion(info?.coprocessor?.application)),
+    se01: firstMeaningfulVersion(getImageVersion(info?.se1?.application)),
+    se02: firstMeaningfulVersion(getImageVersion(info?.se2?.application)),
+    se03: firstMeaningfulVersion(getImageVersion(info?.se3?.application)),
+    se04: firstMeaningfulVersion(getImageVersion(info?.se4?.application)),
+    se01Boot: firstMeaningfulVersion(getImageVersion(info?.se1?.bootloader)),
+    se02Boot: firstMeaningfulVersion(getImageVersion(info?.se2?.bootloader)),
+    se03Boot: firstMeaningfulVersion(getImageVersion(info?.se3?.bootloader)),
+    se04Boot: firstMeaningfulVersion(getImageVersion(info?.se4?.bootloader)),
+  };
+};
 
 // V2 状态由 normalizeV2Status 处理，这里只服务 buildProfileFromProtocolV1 的 V1 路径。
 const normalizeV1Status = (features?: Features): DeviceInfoStatus => ({
@@ -169,23 +176,31 @@ const normalizeV1Status = (features?: Features): DeviceInfoStatus => ({
   bootloaderMode: features?.bootloaderMode ?? null,
   unlocked: features?.unlocked ?? null,
   passphraseProtection: features?.passphraseProtection ?? null,
+  attachToPinEnabled: features?.attachToPinEnabled ?? null,
+  unlockedAttachPin: features?.unlockedAttachPin ?? null,
   backupRequired: features?.backupRequired ?? null,
   noBackup: features?.noBackup ?? null,
   language: features?.language ?? null,
   bleEnabled: features?.bleEnabled ?? null,
 });
 
-const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus => ({
-  mode: getProtocolV2Mode(deviceInfo),
-  initialized: deviceInfo?.status?.init_states ?? null,
-  bootloaderMode: false,
-  unlocked: null,
-  passphraseProtection: deviceInfo?.status?.passphrase_protection ?? null,
-  backupRequired: deviceInfo?.status?.backup_required ?? null,
-  noBackup: null,
-  language: deviceInfo?.status?.language ?? null,
-  bleEnabled: deviceInfo?.status?.bt_enable ?? null,
-});
+const normalizeV2Status = (deviceInfo?: ProtocolV2DeviceInfo): DeviceInfoStatus => {
+  const status = deviceInfo?.status;
+  const bootloaderMode = isProtocolV2BootloaderDeviceInfo(deviceInfo);
+  return {
+    mode: getProtocolV2Mode(deviceInfo),
+    initialized: status?.init_states ?? null,
+    bootloaderMode,
+    unlocked: status?.unlocked ?? null,
+    passphraseProtection: status?.passphrase_enabled ?? null,
+    attachToPinEnabled: status?.attach_to_pin_enabled ?? null,
+    unlockedAttachPin: status?.unlocked_by_attach_to_pin ?? null,
+    backupRequired: status?.backup_required ?? null,
+    noBackup: null,
+    language: null,
+    bleEnabled: null,
+  };
+};
 
 const normalizeV1Verify = (
   features?: Features,
@@ -223,32 +238,35 @@ const normalizeV1Verify = (
   se04BootHash: protocolV1OneKeyFeatures?.onekey_se04_boot_hash ?? features?.verify?.se04BootHash,
 });
 
-const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVerify => ({
-  firmwareBuildId: getImageBuildId(deviceInfo?.fw?.app),
-  firmwareHash: getImageHash(deviceInfo?.fw?.app),
-  bootloaderBuildId: getImageBuildId(deviceInfo?.fw?.boot),
-  bootloaderHash: getImageHash(deviceInfo?.fw?.boot),
-  boardBuildId: getImageBuildId(deviceInfo?.fw?.board),
-  boardHash: getImageHash(deviceInfo?.fw?.board),
-  bleBuildId: getImageBuildId(deviceInfo?.bt?.app),
-  bleHash: getImageHash(deviceInfo?.bt?.app),
-  se01BuildId: getImageBuildId(deviceInfo?.se1?.app),
-  se01Hash: getImageHash(deviceInfo?.se1?.app),
-  se02BuildId: getImageBuildId(deviceInfo?.se2?.app),
-  se02Hash: getImageHash(deviceInfo?.se2?.app),
-  se03BuildId: getImageBuildId(deviceInfo?.se3?.app),
-  se03Hash: getImageHash(deviceInfo?.se3?.app),
-  se04BuildId: getImageBuildId(deviceInfo?.se4?.app),
-  se04Hash: getImageHash(deviceInfo?.se4?.app),
-  se01BootBuildId: getImageBuildId(deviceInfo?.se1?.boot),
-  se01BootHash: getImageHash(deviceInfo?.se1?.boot),
-  se02BootBuildId: getImageBuildId(deviceInfo?.se2?.boot),
-  se02BootHash: getImageHash(deviceInfo?.se2?.boot),
-  se03BootBuildId: getImageBuildId(deviceInfo?.se3?.boot),
-  se03BootHash: getImageHash(deviceInfo?.se3?.boot),
-  se04BootBuildId: getImageBuildId(deviceInfo?.se4?.boot),
-  se04BootHash: getImageHash(deviceInfo?.se4?.boot),
-});
+const normalizeV2Verify = (deviceInfo?: ProtocolV2DeviceInfo): DeviceProfileVerify => {
+  const info = deviceInfo;
+  return {
+    firmwareBuildId: getImageBuildId(info?.fw?.application),
+    firmwareHash: getImageHash(info?.fw?.application),
+    bootloaderBuildId: getImageBuildId(info?.fw?.bootloader),
+    bootloaderHash: getImageHash(info?.fw?.bootloader),
+    boardBuildId: getImageBuildId(info?.fw?.application_data ?? info?.fw?.romloader),
+    boardHash: getImageHash(info?.fw?.application_data ?? info?.fw?.romloader),
+    bleBuildId: getImageBuildId(info?.coprocessor?.application),
+    bleHash: getImageHash(info?.coprocessor?.application),
+    se01BuildId: getImageBuildId(info?.se1?.application),
+    se01Hash: getImageHash(info?.se1?.application),
+    se02BuildId: getImageBuildId(info?.se2?.application),
+    se02Hash: getImageHash(info?.se2?.application),
+    se03BuildId: getImageBuildId(info?.se3?.application),
+    se03Hash: getImageHash(info?.se3?.application),
+    se04BuildId: getImageBuildId(info?.se4?.application),
+    se04Hash: getImageHash(info?.se4?.application),
+    se01BootBuildId: getImageBuildId(info?.se1?.bootloader),
+    se01BootHash: getImageHash(info?.se1?.bootloader),
+    se02BootBuildId: getImageBuildId(info?.se2?.bootloader),
+    se02BootHash: getImageHash(info?.se2?.bootloader),
+    se03BootBuildId: getImageBuildId(info?.se3?.bootloader),
+    se03BootHash: getImageHash(info?.se3?.bootloader),
+    se04BootBuildId: getImageBuildId(info?.se4?.bootloader),
+    se04BootHash: getImageHash(info?.se4?.bootloader),
+  };
+};
 
 const normalizeRaw = ({
   features,
@@ -304,10 +322,11 @@ export function buildProfileFromProtocolV2({
   scope = 'basic',
   includeRaw = false,
 }: BuildProtocolV2ProfileParams): DeviceProfile {
-  const deviceId = deviceInfo?.hw?.device_id || '';
+  const info = deviceInfo;
+  const deviceId = info?.status?.device_id || '';
   const serialNo = deviceInfo?.hw?.serial_no || '';
-  const label = deviceInfo?.status?.label ?? null;
-  const bleName = deviceInfo?.bt?.adv_name ?? null;
+  const label = null;
+  const bleName = info?.coprocessor?.bt_adv_name ?? null;
   const verify = normalizeV2Verify(deviceInfo);
 
   return {

package/src/events/call.ts

@@ -53,6 +53,12 @@ export interface IFrameCancelMessage {
   payload: { connectId?: string };
 }
 
+export interface IFrameCancelOperationMessage {
+  event: typeof IFRAME.CANCEL_OPERATION;
+  type: typeof IFRAME.CANCEL_OPERATION;
+  payload: { operationId: string };
+}
+
 export interface IFrameSwitchTransportMessage {
   event: typeof IFRAME.SWITCH_TRANSPORT;
   type: typeof IFRAME.SWITCH_TRANSPORT;

package/src/events/core.ts

@@ -5,6 +5,7 @@ import type {
   IFrameCallMessage,
   IFrameCallbackMessage,
   IFrameCancelMessage,
+  IFrameCancelOperationMessage,
   IFrameSwitchTransportMessage,
 } from './call';
 import type { DeviceEventMessage } from './device';
@@ -23,6 +24,7 @@ export type CoreMessage = {
   | IFrameEventMessage
   | IFrameCallMessage
   | IFrameCancelMessage
+  | IFrameCancelOperationMessage
   | IFrameSwitchTransportMessage
   | IFrameCallbackMessage
   | UiResponseMessage

package/src/events/iframe.ts

@@ -8,6 +8,7 @@ export const IFRAME = {
   INIT_BRIDGE: 'iframe-init-bridge',
   CALL: 'iframe-call',
   CANCEL: 'iframe-cancel',
+  CANCEL_OPERATION: 'iframe-cancel-operation',
   SWITCH_TRANSPORT: 'iframe-switch-transport',
   CALLBACK: 'iframe-callback',
 } as const;

package/src/index.ts

@@ -27,6 +27,7 @@ const HardwareSdk = ({
   eventEmitter,
   uiResponse,
   cancel,
+  cancelOperation,
   updateSettings,
   switchTransport,
 }: InjectApi): CoreApi =>
@@ -37,6 +38,7 @@ const HardwareSdk = ({
     eventEmitter,
     uiResponse,
     cancel,
+    cancelOperation,
     updateSettings,
     switchTransport,
   });
@@ -49,6 +51,7 @@ const HardwareSDKLowLevel = ({
   addHardwareGlobalEventListener,
   uiResponse,
   cancel,
+  cancelOperation,
   updateSettings,
   switchTransport,
 }: LowLevelInjectApi): LowLevelCoreApi =>
@@ -60,6 +63,7 @@ const HardwareSDKLowLevel = ({
     addHardwareGlobalEventListener,
     uiResponse,
     cancel,
+    cancelOperation,
     updateSettings,
     switchTransport,
   });

package/src/inject.ts

@@ -36,12 +36,14 @@ export interface InjectApi {
   dispose: CoreApi['dispose'];
   uiResponse: CoreApi['uiResponse'];
   cancel: CoreApi['cancel'];
+  cancelOperation: CoreApi['cancelOperation'];
   switchTransport: CoreApi['switchTransport'];
 }
 
 export const inject = ({
   call,
   cancel,
+  cancelOperation,
   dispose,
   eventEmitter,
   init,
@@ -73,6 +75,7 @@ export const inject = ({
     uiResponse,
 
     cancel,
+    cancelOperation,
 
     updateSettings,
 
@@ -96,10 +99,12 @@ export const createCoreApi = (
   | 'dispose'
   | 'uiResponse'
   | 'cancel'
+  | 'cancelOperation'
   | 'updateSettings'
   | 'switchTransport'
 > => ({
   getLogs: () => call({ method: 'getLogs' }),
+  clearSessionCache: params => call({ ...params, method: 'clearSessionCache' }),
   /**
    * 搜索设备
    */
@@ -151,28 +156,32 @@ export const createCoreApi = (
   deviceRebootToBootloader: connectId => call({ connectId, method: 'deviceRebootToBootloader' }),
 
   // File system & device control API (Protocol V2 only)
-  getProtoVersion: (connectId, params) => call({ ...params, connectId, method: 'getProtoVersion' }),
+  protocolInfoRequest: (connectId, params) =>
+    call({ ...params, connectId, method: 'protocolInfoRequest' }),
   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' }),
+  deviceInfoGet: (connectId, params) => call({ ...params, connectId, method: 'deviceInfoGet' }),
+  deviceStatusGet: (connectId, params) => call({ ...params, connectId, method: 'deviceStatusGet' }),
+  deviceSessionGet: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceSessionGet' }),
   deviceFirmwareUpdate: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceFirmwareUpdate' }),
   deviceGetFirmwareUpdateStatus: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceGetFirmwareUpdateStatus' }),
-  devReboot: (connectId, params) => call({ ...params, connectId, method: 'devReboot' }),
-  devGetDeviceInfo: (connectId, params) =>
-    call({ ...params, connectId, method: 'devGetDeviceInfo' }),
-  devFirmwareUpdate: (connectId, params) =>
-    call({ ...params, connectId, method: 'devFirmwareUpdate' }),
-  devGetFirmwareUpdateStatus: (connectId, params) =>
-    call({ ...params, connectId, method: 'devGetFirmwareUpdateStatus' }),
-  factoryDeviceInfoSettings: (connectId, params) =>
-    call({ ...params, connectId, method: 'factoryDeviceInfoSettings' }),
-  factoryGetDeviceInfo: connectId => call({ connectId, method: 'factoryGetDeviceInfo' }),
-  filesystemFixPermission: connectId => call({ connectId, method: 'filesystemFixPermission' }),
+  deviceFactoryInfoSet: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceFactoryInfoSet' }),
+  deviceFactoryInfoGet: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceFactoryInfoGet' }),
+  deviceSettingsGet: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceSettingsGet' }),
+  deviceSettingsSet: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceSettingsSet' }),
+  deviceSettingsPageShow: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceSettingsPageShow' }),
+  deviceUploadWallpaper: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceUploadWallpaper' }),
+  filesystemPermissionFix: (connectId, params) =>
+    call({ ...params, connectId, method: 'filesystemPermissionFix' }),
   fileRead: (connectId, params) => call({ ...params, connectId, method: 'fileRead' }),
   fileWrite: (connectId, params) => call({ ...params, connectId, method: 'fileWrite' }),
   fileDelete: (connectId, params) => call({ ...params, connectId, method: 'fileDelete' }),
@@ -184,6 +193,7 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'filesystemFileRead' }),
   filesystemFileWrite: (connectId, params) =>
     call({ ...params, connectId, method: 'filesystemFileWrite' }),
+  uploadPortfolio: (connectId, params) => call({ ...params, connectId, method: 'uploadPortfolio' }),
   filesystemFileDelete: (connectId, params) =>
     call({ ...params, connectId, method: 'filesystemFileDelete' }),
   filesystemDirList: (connectId, params) =>

package/src/lowLevelInject.ts

@@ -13,6 +13,7 @@ export interface LowLevelInjectApi {
   dispose: CoreApi['dispose'];
   uiResponse: CoreApi['uiResponse'];
   cancel: CoreApi['cancel'];
+  cancelOperation: CoreApi['cancelOperation'];
   updateSettings: CoreApi['updateSettings'];
   switchTransport: CoreApi['switchTransport'];
   addHardwareGlobalEventListener: (listener: IAddHardwareGlobalEventListener) => void;
@@ -25,6 +26,7 @@ export type LowLevelCoreApi = Omit<CoreApi, 'on' | 'off'> & {
 export const lowLevelInject = ({
   call,
   cancel,
+  cancelOperation,
   dispose,
   eventEmitter,
   init,
@@ -48,6 +50,7 @@ export const lowLevelInject = ({
     uiResponse,
 
     cancel,
+    cancelOperation,
 
     updateSettings,