@onekeyfe/hd-core 1.2.0-alpha.7 → 1.2.0-alpha.9

package/src/device/DeviceWalletSessionStore.ts

@@ -0,0 +1,78 @@
+export class DeviceWalletSessionStore {
+  private readonly walletSessions = new Map<string, Map<string, string>>();
+
+  private readonly pendingSessions = new Map<string, string>();
+
+  get(deviceKey: string, passphraseState?: string) {
+    if (!deviceKey || !passphraseState) return undefined;
+    return this.walletSessions.get(deviceKey)?.get(passphraseState);
+  }
+
+  set(deviceKey: string, passphraseState?: string, sessionId?: string) {
+    if (!deviceKey || !passphraseState || !sessionId) return;
+    let deviceSessions = this.walletSessions.get(deviceKey);
+    if (!deviceSessions) {
+      deviceSessions = new Map<string, string>();
+      this.walletSessions.set(deviceKey, deviceSessions);
+    }
+    deviceSessions.set(passphraseState, sessionId);
+  }
+
+  setPending(deviceKey: string, sessionId?: string) {
+    if (!deviceKey || !sessionId) return;
+    this.pendingSessions.set(deviceKey, sessionId);
+  }
+
+  getPending(deviceKey: string) {
+    if (!deviceKey) return undefined;
+    return this.pendingSessions.get(deviceKey);
+  }
+
+  delete(deviceKey: string, passphraseState?: string) {
+    if (!deviceKey || !passphraseState) return;
+    const deviceSessions = this.walletSessions.get(deviceKey);
+    if (!deviceSessions) return;
+    deviceSessions.delete(passphraseState);
+    if (deviceSessions.size === 0) {
+      this.walletSessions.delete(deviceKey);
+    }
+  }
+
+  deletePending(deviceKey: string) {
+    if (!deviceKey) return;
+    this.pendingSessions.delete(deviceKey);
+  }
+
+  deleteDevice(deviceKey: string) {
+    if (!deviceKey) return;
+    this.walletSessions.delete(deviceKey);
+    this.pendingSessions.delete(deviceKey);
+  }
+
+  migrateDeviceKey(from: string, to: string) {
+    if (!from || !to || from === to) return;
+
+    const sourceSessions = this.walletSessions.get(from);
+    if (sourceSessions) {
+      const targetSessions = this.walletSessions.get(to) ?? new Map<string, string>();
+      this.walletSessions.set(to, targetSessions);
+      sourceSessions.forEach((sessionId, passphraseState) => {
+        targetSessions.set(passphraseState, sessionId);
+      });
+      this.walletSessions.delete(from);
+    }
+
+    const pendingSession = this.pendingSessions.get(from);
+    if (pendingSession) {
+      this.pendingSessions.set(to, pendingSession);
+      this.pendingSessions.delete(from);
+    }
+  }
+
+  clear() {
+    this.walletSessions.clear();
+    this.pendingSessions.clear();
+  }
+}
+
+export const deviceWalletSessionStore = new DeviceWalletSessionStore();

package/src/inject.ts

@@ -100,6 +100,7 @@ export const createCoreApi = (
   | 'switchTransport'
 > => ({
   getLogs: () => call({ method: 'getLogs' }),
+  clearSessionCache: params => call({ ...params, method: 'clearSessionCache' }),
   /**
    * 搜索设备
    */
@@ -155,8 +156,10 @@ export const createCoreApi = (
     call({ ...params, connectId, method: 'protocolInfoRequest' }),
   ping: (connectId, params) => call({ ...params, connectId, method: 'ping' }),
   deviceReboot: (connectId, params) => call({ ...params, connectId, method: 'deviceReboot' }),
-  deviceInfoGet: (connectId, params) =>
-    call({ ...params, connectId, method: 'deviceInfoGet' }),
+  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) =>

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

@@ -14,3 +14,4 @@ export type {
   ProtocolV2SeStateLabel,
 } from './features';
 export * from './firmware';
+export * from './walletSession';

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

@@ -0,0 +1,83 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import type { Device } from '../../device/Device';
+
+const getErrorText = (error: unknown) => {
+  if (error instanceof Error) return `${error.name} ${error.message}`;
+  if (typeof error === 'string') return error;
+  if (error && typeof error === 'object') {
+    const record = error as Record<string, unknown>;
+    return [record.code, record.errorCode, record.message, record.reason]
+      .filter(value => value !== undefined && value !== null)
+      .join(' ');
+  }
+  return String(error ?? '');
+};
+
+export const isProtocolV2InvalidSessionError = (error: unknown) =>
+  getErrorText(error).toLowerCase().includes('failure_invalidsession');
+
+export async function requestProtocolV2DeviceStatus(device: Device) {
+  const { message } = await device.commands.typedCall('DeviceStatusGet', 'DeviceStatus', {});
+  return message;
+}
+
+export async function refreshProtocolV2DeviceStatus(device: Device) {
+  const status = await requestProtocolV2DeviceStatus(device);
+  return device.updateProtocolV2Status(status);
+}
+
+export async function getProtocolV2WalletSession(
+  device: Device,
+  options?: { initSession?: boolean; expectedPassphraseState?: string }
+) {
+  if (device.features?.unlocked === false) {
+    throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device is locked');
+  }
+
+  if (options?.initSession) {
+    device.clearInternalState();
+  }
+
+  const cachedSessionId =
+    typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
+
+  try {
+    const { message } = await device.commands.typedCall(
+      'DeviceSessionGet',
+      'DeviceSession',
+      cachedSessionId ? { session_id: cachedSessionId } : {}
+    );
+
+    if (
+      options?.expectedPassphraseState &&
+      options.expectedPassphraseState !== message.btc_test_address
+    ) {
+      device.clearInternalState();
+      throw ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError);
+    }
+
+    if (message.btc_test_address && device.getCurrentPassphraseProtection() !== true) {
+      await refreshProtocolV2DeviceStatus(device);
+    }
+
+    device.updateInternalState(
+      (device.getCurrentPassphraseProtection() ?? false) || Boolean(message.btc_test_address),
+      message.btc_test_address,
+      device.getCurrentDeviceId(),
+      message.session_id,
+      options?.initSession ? null : device.features?.sessionId
+    );
+
+    return {
+      passphraseState: message.btc_test_address,
+      newSession: message.session_id,
+      unlockedAttachPin: device.features?.unlockedAttachPin ?? undefined,
+    };
+  } catch (error) {
+    if (isProtocolV2InvalidSessionError(error)) {
+      device.clearInternalState();
+    }
+    throw error;
+  }
+}

package/src/types/api/firmwareUpdate.ts

@@ -81,9 +81,15 @@ export interface FirmwareUpdateV4Params {
   se02Binary?: ArrayBuffer;
   se03Binary?: ArrayBuffer;
   se04Binary?: ArrayBuffer;
-  /** 资源包通过 FW_MGMT_TARGET_CRATE = 1 安装；Pro2 正常升级推荐传入单个合并 CRATE，多个元素仅用于调试/兼容 */
-  resourceBinaries?: ArrayBuffer[];
   forcedUpdateRes?: boolean;
+  /**
+   * RESC bundle okpkg 列表，通过 FilesystemFileWrite 直写到 devicePath（vol0:/bundles/...）。
+   * 手动传入模式：SDK 直接 FileWrite 安装，不做版本比对。
+   */
+  resourceBundleFiles?: Array<{
+    binary: ArrayBuffer;
+    devicePath: string;
+  }>;
 }
 
 export declare function firmwareUpdateV3(

package/src/types/api/index.ts

@@ -1,10 +1,12 @@
 import type {
-  deviceFirmwareUpdate,
   deviceFactoryInfoGet,
   deviceFactoryInfoSet,
-  deviceInfoGet,
+  deviceFirmwareUpdate,
   deviceGetFirmwareUpdateStatus,
+  deviceInfoGet,
   deviceReboot,
+  deviceSessionGet,
+  deviceStatusGet,
   dirList,
   dirMake,
   dirRemove,
@@ -18,9 +20,9 @@ import type {
   filesystemFileDelete,
   filesystemFileRead,
   filesystemFileWrite,
-  filesystemPermissionFix,
   filesystemFormat,
   filesystemPathInfoQuery,
+  filesystemPermissionFix,
   pathInfo,
   ping,
   protocolInfoRequest,
@@ -31,6 +33,7 @@ import type { init, updateSettings } from './init';
 import type { testInitializeDeviceDuration } from './testInitializeDeviceDuration';
 import type { preInitialize } from './preInitialize';
 import type { getLogs } from './getLogs';
+import type { clearSessionCache } from './sessionCache';
 import type { checkBridgeStatus } from './checkBridgeStatus';
 import type { checkBridgeRelease } from './checkBridgeRelease';
 import type { checkBootloaderRelease } from './checkBootloaderRelease';
@@ -177,6 +180,7 @@ export type {
   DeviceProfileVersions,
 } from './getDeviceInfo';
 export type { GetPassphraseStateParams, GetPassphraseStatePayload } from './getPassphraseState';
+export type { ClearSessionCacheParams, ClearSessionCachePayload } from './sessionCache';
 
 export type CoreApi = {
   /**
@@ -194,6 +198,7 @@ export type CoreApi = {
   updateSettings: typeof updateSettings;
   switchTransport: (env: ConnectSettings['env']) => Promise<{ success: boolean }>;
   getLogs: typeof getLogs;
+  clearSessionCache: typeof clearSessionCache;
 
   /**
    * Test function
@@ -254,6 +259,8 @@ export type CoreApi = {
   ping: typeof ping;
   deviceReboot: typeof deviceReboot;
   deviceInfoGet: typeof deviceInfoGet;
+  deviceStatusGet: typeof deviceStatusGet;
+  deviceSessionGet: typeof deviceSessionGet;
   deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
   deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
   deviceFactoryInfoSet: typeof deviceFactoryInfoSet;

package/src/types/api/protocolV2.ts

@@ -1,18 +1,21 @@
 import type { CommonParams, Response } from '../params';
 import type {
-  DeviceFirmwareUpdateStatus,
   DeviceFactoryInfo,
+  DeviceFirmwareUpdateStatus,
+  DeviceSession,
+  DeviceStatus,
   ProtocolInfo,
   ProtocolV2DeviceInfo,
   Success,
 } from '@onekeyfe/hd-transport';
 import type {
+  DeviceFactoryInfoSetParams,
   DeviceFirmwareUpdateParams,
   DeviceFirmwareUpdateStatusGetParams,
   DeviceRebootParams,
-  DeviceFactoryInfoSetParams,
 } from '../../api/protocol-v2/helpers';
 import type { DeviceInfoGetParams } from '../../api/protocol-v2/DeviceInfoGet';
+import type { DeviceSessionGetParams } from '../../api/protocol-v2/DeviceSessionGet';
 
 // 参数类型单源：以 api/protocol-v2 的实现为准（type-only re-export，无运行时依赖）
 export type {
@@ -28,6 +31,7 @@ export type {
   DeviceInfoGetTargets,
   DeviceInfoGetTypes,
 } from '../../api/protocol-v2/DeviceInfoGet';
+export type { DeviceSessionGetParams } from '../../api/protocol-v2/DeviceSessionGet';
 
 // ── Shared response shapes (Protocol V2 file system) ────────────────────
 
@@ -88,6 +92,16 @@ export declare function deviceInfoGet(
   params?: CommonParams & DeviceInfoGetParams
 ): Response<ProtocolV2DeviceInfo>;
 
+export declare function deviceStatusGet(
+  connectId: string,
+  params?: CommonParams
+): Response<DeviceStatus>;
+
+export declare function deviceSessionGet(
+  connectId: string,
+  params?: CommonParams & DeviceSessionGetParams
+): Response<DeviceSession>;
+
 export declare function deviceFirmwareUpdate(
   connectId: string,
   params: CommonParams & DeviceFirmwareUpdateParams

package/src/types/api/sessionCache.ts

@@ -0,0 +1,14 @@
+import type { Response } from '../params';
+
+export type ClearSessionCacheParams = {
+  deviceId?: string;
+  passphraseState?: string;
+};
+
+export type ClearSessionCachePayload = {
+  cleared: true;
+};
+
+export declare function clearSessionCache(
+  params?: ClearSessionCacheParams
+): Response<ClearSessionCachePayload>;

package/src/types/settings.ts

@@ -49,34 +49,31 @@ export type IProtocolV2FirmwareComponentTarget =
   | 'SE01'
   | 'SE02'
   | 'SE03'
-  | 'SE04'
-  | 'CRATE';
+  | 'SE04';
 
 export type IProtocolV2FirmwareComponent = {
   target: IProtocolV2FirmwareComponentTarget;
   url: string;
   fingerprint?: string;
   version?: IVersionArray;
-  resourceManifest?: IProtocolV2ResourceManifest;
 };
 
-export type IProtocolV2ResourceManifestPackage = {
-  name?: string;
-  path: string;
-  type?: string;
+/** Pro2 RESC bundle okpkg 描述，用于 FileWrite 直写方式增量同步资源 */
+export type IProtocolV2ResourceBundle = {
+  /** bundle 名称，如 images / animation / translations / fonts_roobert */
+  name: string;
+  /** 下载 URL */
+  url: string;
+  /** 设备上的目标路径，如 vol0:/bundles/images/images.okpkg */
+  devicePath: string;
+  /** okpkg container 的 payload_version（用于 FileRead 比对跳过） */
   version?: IVersionArray;
-  sha256?: string;
+  /** okpkg container 的 payload_hash（SHA3-512，用于 FileRead 比对） */
   payloadHash?: string;
+  /** okpkg container 的 header_hash（SHA3-512，用于 FileRead 比对） */
   headerHash?: string;
 };
 
-export type IProtocolV2ResourceManifest = {
-  format?: 'okpkg-crate' | string;
-  target?: 'CRATE' | string;
-  version?: IVersionArray;
-  packages: IProtocolV2ResourceManifestPackage[];
-};
-
 /** STM32 firmware config */
 export type IFirmwareReleaseInfo = {
   required: boolean;
@@ -98,7 +95,8 @@ export type IFirmwareReleaseInfo = {
   upgradeType?: 'payload-package-set' | string;
   components?: Record<string, IProtocolV2FirmwareComponent>;
   installOrder?: string[];
-  resourceManifest?: IProtocolV2ResourceManifest;
+  /** Pro2 RESC bundle 列表（FileWrite 直写增量同步模式） */
+  resourceBundles?: IProtocolV2ResourceBundle[];
   bootloaderChangelog?: {
     [k in ILocale]: string;
   };

package/src/utils/deviceFeaturesUtils.ts

@@ -1,11 +1,7 @@
 import semver from 'semver';
 import { isNaN } from 'lodash';
 import { EDeviceType, type EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import {
-  Enum_Capability,
-  type DeviceSessionGet,
-  type GetPassphraseState,
-} from '@onekeyfe/hd-transport';
+import { Enum_Capability, type GetPassphraseState } from '@onekeyfe/hd-transport';
 
 import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceModelToTypes, DeviceTypeToModels } from '../types';
@@ -17,12 +13,11 @@ import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
 import { existCapability } from './capabilitieUtils';
+import { getProtocolV2WalletSession } from '../protocols/protocol-v2/walletSession';
 
 import type { Device } from '../device/Device';
 import type { Features, IDeviceType, SupportFeatureType } from '../types';
 
-type DeviceSessionGetMessage = DeviceSessionGet;
-
 export const getSupportProtocolV1MessageSchema = (
   features: Features | undefined
 ): { messages: JSON; protocolV1MessageSchema: ProtocolV1MessageSchema } => {
@@ -98,6 +93,21 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     initSession?: boolean;
   }
 ) => {
+  if (device.isProtocolV2()) {
+    if (!device.features) {
+      return {
+        passphraseState: undefined,
+        newSession: undefined,
+        unlockedAttachPin: undefined,
+      };
+    }
+
+    return getProtocolV2WalletSession(device, {
+      initSession: options?.initSession,
+      expectedPassphraseState: options?.expectPassphraseState,
+    });
+  }
+
   const { features } = device;
   const locked = features?.unlocked === false;
   const deviceType = device.getCurrentDeviceType();
@@ -172,29 +182,10 @@ export const getPassphraseState = async (
   const deviceType = device.getCurrentDeviceType();
 
   if (device.isProtocolV2()) {
-    const payload: DeviceSessionGetMessage = {};
-    const cachedSessionId =
-      typeof device.getInternalState === 'function' ? device.getInternalState() : undefined;
-    if (cachedSessionId) {
-      payload.session_id = cachedSessionId;
-    }
-
-    const { message, type } = await commands.typedCall(
-      'DeviceSessionGet',
-      'DeviceSession',
-      payload
-    );
-
-    // @ts-expect-error
-    if (type === 'CallMethodError') {
-      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
-    }
-
-    return {
-      passphraseState: message.btc_test_address,
-      newSession: message.session_id,
-      unlockedAttachPin: features.unlockedAttachPin ?? undefined,
-    };
+    return getProtocolV2WalletSession(device, {
+      initSession: options?.initSession,
+      expectedPassphraseState: options?.expectPassphraseState,
+    });
   }
 
   const supportAttachPinCapability = existCapability(
@@ -202,8 +193,7 @@ export const getPassphraseState = async (
     Enum_Capability.Capability_AttachToPin
   );
   const supportGetPassphraseState =
-    supportAttachPinCapability ||
-    supportProSeriesAttachPinPassphrase(deviceType, firmwareVersion);
+    supportAttachPinCapability || supportProSeriesAttachPinPassphrase(deviceType, firmwareVersion);
 
   if (supportGetPassphraseState) {
     const payload: GetPassphraseState = options?.onlyMainPin