@onekeyfe/hd-core 1.2.0-alpha.16 → 1.2.0-alpha.17

package/src/inject.ts

@@ -164,8 +164,8 @@ export const createCoreApi = (
   deviceStatusGet: (connectId, params) => call({ ...params, connectId, method: 'deviceStatusGet' }),
   deviceGetOnboardingStatus: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceGetOnboardingStatus' }),
-  deviceSessionGet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceSessionGet' }),
+  deviceSessionOpen: (connectId, params) =>
+    call({ ...params, connectId, method: 'deviceSessionOpen' }),
   deviceFirmwareUpdate: (connectId, params) =>
     call({ ...params, connectId, method: 'deviceFirmwareUpdate' }),
   deviceGetFirmwareUpdateStatus: (connectId, params) =>

package/src/protocols/protocol-v2/features.ts

@@ -1,6 +1,11 @@
 import { DeviceSEState, DeviceSeType } from '@onekeyfe/hd-transport';
 
-import type { DeviceInfoGet, DeviceSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type {
+  DeviceInfoGet,
+  DeviceSEInfo,
+  DeviceStatus,
+  ProtocolV2DeviceInfo,
+} from '@onekeyfe/hd-transport';
 import type { DeviceCommands } from '../../device/DeviceCommands';
 
 // 单源类型：直接使用 hd-transport 生成的 ProtocolV2DeviceInfo / DeviceSEInfo /
@@ -56,9 +61,12 @@ export const getProtocolV2SeType = (se?: DeviceSEInfo): string | null =>
  * 当前 romloader 只上报 hw、fw.romloader 和 fw.bootloader；bootloader
  * 还会上报 application/application_data、coprocessor 或 SE 信息。
  */
-export const isProtocolV2RomloaderDeviceInfo = (deviceInfo?: ProtocolV2DeviceInfo | null) =>
+export const isProtocolV2RomloaderDeviceInfo = (
+  deviceInfo?: ProtocolV2DeviceInfo | null,
+  deviceStatus?: DeviceStatus | null
+) =>
   !!deviceInfo &&
-  deviceInfo.status == null &&
+  deviceStatus == null &&
   deviceInfo.fw?.romloader != null &&
   deviceInfo.fw?.application == null &&
   deviceInfo.fw?.application_data == null &&
@@ -68,15 +76,19 @@ export const isProtocolV2RomloaderDeviceInfo = (deviceInfo?: ProtocolV2DeviceInf
   deviceInfo.se3 == null &&
   deviceInfo.se4 == null;
 
-export const isProtocolV2BootloaderDeviceInfo = (deviceInfo?: ProtocolV2DeviceInfo | null) =>
-  !!deviceInfo && deviceInfo.status == null && !isProtocolV2RomloaderDeviceInfo(deviceInfo);
+export const isProtocolV2BootloaderDeviceInfo = (
+  deviceInfo?: ProtocolV2DeviceInfo | null,
+  deviceStatus?: DeviceStatus | null
+) =>
+  !!deviceInfo &&
+  deviceStatus == null &&
+  !isProtocolV2RomloaderDeviceInfo(deviceInfo, deviceStatus);
 
 export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
     fw: true,
     coprocessor: true,
-    status: true,
   },
   types: {
     version: true,
@@ -90,18 +102,6 @@ export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
  * status 提供 init_states / passphrase_enabled 等会在设备端变化的字段；
  * hw / coprocessor 提供 serialNo / bleName 等身份字段；不含 fw/SE targets，单帧请求开销很小。
  */
-export const PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST = {
-  targets: {
-    hw: true,
-    coprocessor: true,
-    status: true,
-  },
-  types: {
-    version: true,
-    specific: true,
-  },
-};
-
 export const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
   targets: {
     hw: true,
@@ -111,7 +111,6 @@ export const PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST = {
     se2: true,
     se3: true,
     se4: true,
-    status: true,
   },
   types: {
     version: true,
@@ -128,7 +127,6 @@ export const PROTOCOL_V2_FULL_DEVICE_INFO_REQUEST = {
     se2: true,
     se3: true,
     se4: true,
-    status: true,
   },
   types: {
     version: true,
@@ -157,3 +155,12 @@ export async function requestProtocolV2DeviceInfo({
   // DeviceInfoGet 是 V2-only 消息，这里收窄到 V2 形态。
   return message as ProtocolV2DeviceInfo;
 }
+
+export async function requestProtocolV2DeviceStatus({
+  commands,
+}: {
+  commands: DeviceCommands;
+}): Promise<DeviceStatus> {
+  const { message } = await commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
+  return message;
+}

package/src/protocols/protocol-v2/index.ts

@@ -2,7 +2,6 @@ export {
   PROTOCOL_V2_DEVICE_INFO_REQUEST,
   PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS,
   PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST,
-  PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
   PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
   isProtocolV2BootloaderDeviceInfo,
   isProtocolV2RomloaderDeviceInfo,

package/src/protocols/protocol-v2/uiInteraction.ts

@@ -0,0 +1,209 @@
+import { UI_REQUEST, createUiMessage } from '../../events';
+
+import type { CoreMessage, ProtocolV2UiCompletion } from '../../events';
+import type { Device } from '../../device/Device';
+import type { KnownDevice } from '../../types';
+
+export type ProtocolV2InteractionDescriptor = {
+  request: 'button' | 'pin';
+  source: 'method-lifecycle';
+  reason:
+    | 'change-pin'
+    | 'device-unlock'
+    | 'settings-page'
+    | 'address-confirmation'
+    | 'public-key-confirmation'
+    | 'signing-confirmation'
+    | 'device-management';
+  completion: ProtocolV2UiCompletion;
+  deviceOnly: true;
+  page?: string | number;
+  operation?: string;
+};
+
+type ProtocolV2InteractionMethod = {
+  name?: string;
+  params?: unknown;
+  payload?: unknown;
+  protocolV2UiInteraction?: ProtocolV2InteractionDescriptor;
+};
+
+type InteractionDevice = Pick<Device, 'isProtocolV2' | 'toMessageObject'>;
+type PostMessage = (message: CoreMessage) => void;
+
+export const isProtocolV2UiEnabled = (method: { protocolV2UiMode?: 'auto' | 'none' }) =>
+  method.protocolV2UiMode !== 'none';
+
+const getDisplayState = (value: unknown) => {
+  const visited = new Set<object>();
+  let seen = false;
+  let enabled = false;
+
+  const visit = (current: unknown) => {
+    if (current == null || typeof current !== 'object') return;
+    if (visited.has(current)) return;
+    visited.add(current);
+
+    if (Array.isArray(current)) {
+      current.forEach(visit);
+      return;
+    }
+
+    Object.entries(current).forEach(([key, item]) => {
+      if ((key === 'show_display' || key === 'showOnOneKey') && typeof item === 'boolean') {
+        seen = true;
+        enabled ||= item;
+        return;
+      }
+      visit(item);
+    });
+  };
+
+  visit(value);
+  return { seen, enabled };
+};
+
+const createMethodInteraction = (
+  reason: 'address-confirmation' | 'public-key-confirmation' | 'signing-confirmation',
+  operation: string
+): ProtocolV2InteractionDescriptor => ({
+  request: 'button',
+  source: 'method-lifecycle',
+  reason,
+  completion: 'operation-completed',
+  deviceOnly: true,
+  operation,
+});
+
+const hasCipherConfirmation = (value: unknown): boolean => {
+  if (Array.isArray(value)) return value.some(hasCipherConfirmation);
+  if (value == null || typeof value !== 'object') return false;
+
+  const params = value as {
+    encrypt?: boolean;
+    ask_on_encrypt?: boolean;
+    ask_on_decrypt?: boolean;
+  };
+  return params.encrypt === true ? params.ask_on_encrypt === true : params.ask_on_decrypt === true;
+};
+
+/**
+ * Protocol V2 不再依赖固件 ButtonRequest，因此在统一层根据业务方法生成兼容 UI Event。
+ * 显式声明始终优先；地址和公钥只在设备实际展示时提示，签名统一提示一次。
+ */
+export const resolveProtocolV2UiInteraction = (
+  method: ProtocolV2InteractionMethod
+): ProtocolV2InteractionDescriptor | undefined => {
+  if (method.protocolV2UiInteraction) return method.protocolV2UiInteraction;
+
+  const operation = method.name;
+  if (!operation) return undefined;
+
+  const isAddress = /getAddress(?:ByLoop)?$/i.test(operation);
+  const isPublicKey = /getPublicKey$/i.test(operation);
+  if (isAddress || isPublicKey) {
+    const paramsDisplay = getDisplayState(method.params);
+    const payloadDisplay = getDisplayState(method.payload);
+    const display = paramsDisplay.seen ? paramsDisplay : payloadDisplay;
+
+    // 地址接口通常默认在设备展示；公钥接口存在默认静默读取，优先依赖归一化参数。
+    const shouldDisplay = display.seen ? display.enabled : isAddress;
+    if (!shouldDisplay) return undefined;
+
+    return createMethodInteraction(
+      isAddress ? 'address-confirmation' : 'public-key-confirmation',
+      operation
+    );
+  }
+
+  if (/sign/i.test(operation) || /verifyMessage$/i.test(operation) || operation === 'lnurlAuth') {
+    return createMethodInteraction('signing-confirmation', operation);
+  }
+
+  if (operation === 'nostrEncryptMessage' || operation === 'nostrDecryptMessage') {
+    const display = getDisplayState(method.params);
+    if (!display.enabled) return undefined;
+    return createMethodInteraction('signing-confirmation', operation);
+  }
+
+  if (operation === 'cipherKeyValue' && hasCipherConfirmation(method.params)) {
+    return createMethodInteraction('signing-confirmation', operation);
+  }
+
+  return undefined;
+};
+
+export class ProtocolV2UiInteractionCoordinator {
+  private readonly device: InteractionDevice;
+
+  private readonly postMessage: PostMessage;
+
+  private methodInteraction?: ProtocolV2InteractionDescriptor;
+
+  private currentPhase?: string;
+
+  private opened = false;
+
+  private closed = false;
+
+  constructor(device: InteractionDevice, postMessage: PostMessage) {
+    this.device = device;
+    this.postMessage = postMessage;
+  }
+
+  enterMethodInteraction(interaction?: ProtocolV2InteractionDescriptor) {
+    this.methodInteraction = interaction;
+    if (!interaction) return;
+    const { request, ...metadata } = interaction;
+
+    this.emit(
+      request === 'pin' ? UI_REQUEST.REQUEST_PIN : UI_REQUEST.REQUEST_BUTTON,
+      {
+        device: this.device.toMessageObject() as KnownDevice,
+        ...metadata,
+      },
+      `method:${request}:${interaction.reason}:${interaction.page ?? ''}:${
+        interaction.operation ?? ''
+      }`
+    );
+  }
+
+  enterUnlockInteraction(method?: string) {
+    this.emit(
+      UI_REQUEST.REQUEST_PIN,
+      {
+        device: this.device.toMessageObject() as KnownDevice,
+        source: 'unlock-coordinator',
+        reason: 'device-locked',
+        deviceOnly: true,
+        method,
+      },
+      `unlock:${method ?? ''}`
+    );
+  }
+
+  resumeMethodInteraction() {
+    this.enterMethodInteraction(this.methodInteraction);
+  }
+
+  close() {
+    if (!this.device.isProtocolV2() || !this.opened || this.closed) return;
+    this.closed = true;
+    this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
+  }
+
+  private emit(
+    type: typeof UI_REQUEST.REQUEST_BUTTON | typeof UI_REQUEST.REQUEST_PIN,
+    payload: any,
+    phase: string
+  ) {
+    if (!this.device.isProtocolV2() || this.closed || this.currentPhase === phase) return;
+    this.currentPhase = phase;
+    this.opened = true;
+    const message =
+      type === UI_REQUEST.REQUEST_BUTTON
+        ? createUiMessage(UI_REQUEST.REQUEST_BUTTON, payload)
+        : createUiMessage(UI_REQUEST.REQUEST_PIN, payload);
+    this.postMessage(message);
+  }
+}

package/src/protocols/protocol-v2/unlockRetry.ts

@@ -1,15 +1,49 @@
 import { LoggerNames, getLogger } from '../../utils';
 import { isDeviceLockedError } from './lockedError';
+import { isProtocolV2UiEnabled, resolveProtocolV2UiInteraction } from './uiInteraction';
 
 import type { BaseMethod } from '../../api/BaseMethod';
 import type { Device } from '../../device/Device';
+import type { ProtocolV2UiInteractionCoordinator } from './uiInteraction';
 
 const Log = getLogger(LoggerNames.Core);
 
-type RunnableMethod = Pick<BaseMethod, 'run' | 'unlockPolicy'> & { name?: string };
-type UnlockableDevice = Pick<Device, 'isProtocolV2' | 'unlockDevice'>;
+type RunnableMethod = Pick<
+  BaseMethod,
+  'run' | 'unlockPolicy' | 'protocolV2UiInteraction' | 'protocolV2UiMode' | 'params' | 'payload'
+> & { name?: string };
+type UnlockableDevice = Pick<Device, 'isProtocolV2' | 'unlockDevice' | 'features'>;
+type UiInteractionCoordinator = Pick<
+  ProtocolV2UiInteractionCoordinator,
+  'enterMethodInteraction' | 'enterUnlockInteraction' | 'resumeMethodInteraction'
+>;
 
-export async function runMethodWithUnlockRetry(method: RunnableMethod, device: UnlockableDevice) {
+export async function runMethodWithUnlockRetry(
+  method: RunnableMethod,
+  device: UnlockableDevice,
+  uiCoordinator?: UiInteractionCoordinator
+) {
+  const shouldEmitUi = isProtocolV2UiEnabled(method);
+  const shouldUnlockBeforeRun =
+    device.isProtocolV2() &&
+    method.unlockPolicy === 'retry-on-locked' &&
+    device.features?.unlocked === false;
+
+  if (shouldUnlockBeforeRun) {
+    if (shouldEmitUi) {
+      uiCoordinator?.enterUnlockInteraction(method.name);
+    }
+    await device.unlockDevice();
+    Log.debug('Protocol V2 pre-unlock completed', { method: method.name });
+    if (shouldEmitUi) {
+      uiCoordinator?.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
+    }
+    return method.run();
+  }
+
+  if (shouldEmitUi) {
+    uiCoordinator?.enterMethodInteraction(resolveProtocolV2UiInteraction(method));
+  }
   try {
     return await method.run();
   } catch (error) {
@@ -22,8 +56,14 @@ export async function runMethodWithUnlockRetry(method: RunnableMethod, device: U
     }
 
     Log.debug('Protocol V2 unlock retry triggered', { method: method.name });
+    if (shouldEmitUi) {
+      uiCoordinator?.enterUnlockInteraction(method.name);
+    }
     await device.unlockDevice();
     Log.debug('Protocol V2 unlock completed', { method: method.name });
+    if (shouldEmitUi) {
+      uiCoordinator?.resumeMethodInteraction();
+    }
     try {
       const response = await method.run();
       Log.debug('Protocol V2 method retry completed', { method: method.name, success: true });

package/src/protocols/protocol-v2/walletSession.ts

@@ -1,8 +1,11 @@
 import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
+import { DEVICE, type PassphraseRequestPayload } from '../../events';
 import { isDeviceLockedError } from './lockedError';
 
+import type { DeviceSessionOpen } from '@onekeyfe/hd-transport';
 import type { Device } from '../../device/Device';
+import type { PassphrasePromptResponse } from '../../device/DeviceCommands';
 
 const getErrorText = (error: unknown) => {
   if (error instanceof Error) return `${error.name} ${error.message}`;
@@ -19,6 +22,17 @@ const getErrorText = (error: unknown) => {
 export const isProtocolV2InvalidSessionError = (error: unknown) =>
   getErrorText(error).toLowerCase().includes('failure_invalidsession');
 
+const normalizeHostPassphrase = (passphrase: string | undefined) => {
+  const normalized = (passphrase ?? '').normalize('NFKD');
+  if (!normalized || normalized.includes('\0') || normalized.length > 50) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.CallMethodInvalidParameter,
+      'Invalid hidden wallet passphrase.'
+    );
+  }
+  return normalized;
+};
+
 export async function requestProtocolV2DeviceStatus(device: Device) {
   const { message } = await device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
   return message;
@@ -29,54 +43,131 @@ export async function refreshProtocolV2DeviceStatus(device: Device) {
   return device.updateProtocolV2Status(status);
 }
 
+const openDeviceSession = async (device: Device, request: DeviceSessionOpen) => {
+  try {
+    return await device.commands.typedCall('DeviceSessionOpen', 'DeviceSession', request);
+  } catch (error) {
+    if (!isDeviceLockedError(error)) {
+      throw error;
+    }
+    await device.unlockDevice();
+    return device.commands.typedCall('DeviceSessionOpen', 'DeviceSession', request);
+  }
+};
+
+const createHiddenWalletRequest = (
+  response: PassphrasePromptResponse
+): {
+  request: DeviceSessionOpen;
+  deviceEvent?: typeof DEVICE.PASSPHRASE_ON_DEVICE | typeof DEVICE.ATTACH_PIN_ON_DEVICE;
+} => {
+  if (response.attachPinOnDevice) {
+    return {
+      request: {
+        select: {
+          attach_pin_on_device: {},
+        },
+      },
+      deviceEvent: DEVICE.ATTACH_PIN_ON_DEVICE,
+    };
+  }
+
+  if (response.passphraseOnDevice) {
+    return {
+      request: {
+        select: {
+          passphrase_on_device: {},
+        },
+      },
+      deviceEvent: DEVICE.PASSPHRASE_ON_DEVICE,
+    };
+  }
+
+  return {
+    request: {
+      select: {
+        host_passphrase: { passphrase: normalizeHostPassphrase(response.passphrase) },
+      },
+    },
+  };
+};
+
+const openSelectedHiddenWallet = async (
+  device: Device,
+  promptPayload: PassphraseRequestPayload
+) => {
+  const response = await device.commands.promptPassphrase(promptPayload, {
+    cancelDeviceOnReject: false,
+  });
+  const { request, deviceEvent } = createHiddenWalletRequest(response);
+
+  if (deviceEvent) {
+    device.emit(deviceEvent, device, promptPayload);
+  }
+
+  return openDeviceSession(device, request);
+};
+
 export async function getProtocolV2WalletSession(
   device: Device,
-  options?: { initSession?: boolean; expectedPassphraseState?: string }
+  options?: {
+    initSession?: boolean;
+    expectedPassphraseState?: string;
+    onlyMainPin?: boolean;
+  }
 ) {
   if (options?.initSession) {
     device.clearInternalState();
   }
 
-  let sessionId =
-    typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+  const expectedPassphraseState = options?.expectedPassphraseState ?? device.passphraseState;
 
   try {
-    const requestDeviceSession = (sessionId?: string) =>
-      device.commands.typedCall(
-        'DeviceSessionGet',
-        'DeviceSession',
-        sessionId ? { session_id: sessionId } : {}
-      );
-
-    const requestWalletSession = async () => {
+    // 锁屏时的 passphrase_enabled 不可信。先完成 PIN 解锁，unlockDevice 会立即
+    // 获取并合并一份新的 DeviceStatus，之后再决定打开主钱包还是隐藏钱包。
+    if (device.features?.unlocked === false) {
+      await device.unlockDevice();
+    }
+
+    if (options?.onlyMainPin || device.getCurrentPassphraseProtection() === false) {
+      return {
+        passphraseState: undefined,
+        newSession: undefined,
+        unlockedAttachPin: false,
+      };
+    }
+
+    const cachedSessionId =
+      typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+    let response;
+    let recoveryFailed = false;
+
+    if (cachedSessionId && expectedPassphraseState) {
       try {
-        return await requestDeviceSession(sessionId);
+        response = await openDeviceSession(device, {
+          resume: { session_id: cachedSessionId },
+        });
       } catch (error) {
-        if (!sessionId || !isProtocolV2InvalidSessionError(error)) {
+        if (!isProtocolV2InvalidSessionError(error)) {
           throw error;
         }
         device.clearInternalState();
-        sessionId = undefined;
-        return requestDeviceSession();
+        recoveryFailed = true;
       }
-    };
+    }
 
-    let response;
-    try {
-      response = await requestWalletSession();
-    } catch (error) {
-      if (!isDeviceLockedError(error)) {
-        throw error;
-      }
-      await device.unlockDevice();
-      response = await requestWalletSession();
+    if (!response) {
+      const promptPayload: PassphraseRequestPayload = {
+        source: 'wallet-session-coordinator',
+        reason: recoveryFailed ? 'session-recovery' : 'open-wallet',
+        expectedPassphraseState,
+        existsAttachPinUser: device.features?.attachToPinEnabled === true,
+      };
+      response = await openSelectedHiddenWallet(device, promptPayload);
     }
-    const { message } = response;
 
-    if (
-      options?.expectedPassphraseState &&
-      options.expectedPassphraseState !== message.btc_test_address
-    ) {
+    const { message } = response;
+    if (expectedPassphraseState && expectedPassphraseState !== message.btc_test_address) {
       device.clearInternalState();
       throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
     }
@@ -86,7 +177,7 @@ export async function getProtocolV2WalletSession(
     }
 
     device.updateInternalState(
-      (device.getCurrentPassphraseProtection() ?? false) || Boolean(message.btc_test_address),
+      true,
       message.btc_test_address,
       device.getCurrentDeviceId(),
       message.session_id,

package/src/types/api/getDeviceInfo.ts

@@ -1,7 +1,11 @@
 import type { CommonParams, Response } from '../params';
 import type { Features, IDeviceType, OnekeyFeatures } from '../device';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import type { ProtocolType, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type {
+  DeviceStatus,
+  ProtocolType,
+  ProtocolV2DeviceInfo,
+} from '@onekeyfe/hd-transport';
 
 // 协议类型单源：从 hd-transport 的 ProtocolType 派生，只额外允许 'unknown'。
 export type DeviceInfoProtocol = ProtocolType | 'unknown';
@@ -78,6 +82,7 @@ export type DeviceProfileRaw = {
   features?: Features;
   protocolV1OneKeyFeatures?: OnekeyFeatures;
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
+  protocolV2DeviceStatus?: DeviceStatus;
 };
 
 export type DeviceProfile = {

package/src/types/api/index.ts

@@ -6,7 +6,7 @@ import type {
   deviceGetOnboardingStatus,
   deviceInfoGet,
   deviceReboot,
-  deviceSessionGet,
+  deviceSessionOpen,
   deviceSettingsGet,
   deviceSettingsPageShow,
   deviceSettingsSet,
@@ -267,7 +267,7 @@ export type CoreApi = {
   deviceInfoGet: typeof deviceInfoGet;
   deviceStatusGet: typeof deviceStatusGet;
   deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
-  deviceSessionGet: typeof deviceSessionGet;
+  deviceSessionOpen: typeof deviceSessionOpen;
   deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
   deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
   deviceFactoryInfoSet: typeof deviceFactoryInfoSet;

package/src/types/api/protocolV2.ts

@@ -1,8 +1,8 @@
 import type { CommonParams, Response } from '../params';
 import type {
+  DevOnboardingStatus,
   DeviceFactoryInfo,
   DeviceFirmwareUpdateStatus,
-  DevOnboardingStatus,
   DeviceSession,
   DeviceSettings,
   DeviceStatus,
@@ -17,6 +17,7 @@ import type {
   DeviceRebootParams,
 } from '../../api/protocol-v2/helpers';
 import type { DeviceInfoGetParams } from '../../api/protocol-v2/DeviceInfoGet';
+import type { DeviceSessionOpenParams } from '../../api/protocol-v2/DeviceSessionOpen';
 import type { DeviceSettingsSetParams } from '../../api/protocol-v2/DeviceSettingsSet';
 import type { DeviceSettingsPageShowParams } from '../../api/protocol-v2/DeviceSettingsPageShow';
 import type {
@@ -38,6 +39,7 @@ export type {
   DeviceInfoGetTargets,
   DeviceInfoGetTypes,
 } from '../../api/protocol-v2/DeviceInfoGet';
+export type { DeviceSessionOpenParams } from '../../api/protocol-v2/DeviceSessionOpen';
 export type { DeviceSettingsSetParams } from '../../api/protocol-v2/DeviceSettingsSet';
 export type {
   DeviceSettingsPageShowParams,
@@ -117,9 +119,9 @@ export declare function deviceGetOnboardingStatus(
   params?: CommonParams
 ): Response<DevOnboardingStatus>;
 
-export declare function deviceSessionGet(
+export declare function deviceSessionOpen(
   connectId: string,
-  params?: CommonParams
+  params: CommonParams & DeviceSessionOpenParams
 ): Response<DeviceSession>;
 
 export declare function deviceFirmwareUpdate(