@onekeyfe/hd-core 1.2.0-alpha.2 → 1.2.0-alpha.3

package/src/data-manager/connectSettings.ts

@@ -27,6 +27,8 @@ const initialSettings: ConnectSettings = {
   env: 'web',
   lazyLoad: false,
   timestamp: new Date().getTime(),
+  // 临时开关：仅用于本地/测试固件兼容；正式链路默认调用真实 DevGetDeviceInfo。
+  protocolV2DeviceInfoMockEnabled: false,
 };
 
 export const getEnv = () => {
@@ -115,6 +117,10 @@ export const parseConnectSettings = (input: Partial<ConnectSettings> = {}) => {
     settings.fetchConfig = input.fetchConfig;
   }
 
+  if (typeof input.protocolV2DeviceInfoMockEnabled === 'boolean') {
+    settings.protocolV2DeviceInfoMockEnabled = input.protocolV2DeviceInfoMockEnabled;
+  }
+
   return settings;
 };
 

package/src/device/Device.ts

@@ -261,13 +261,14 @@ export class Device extends EventEmitter {
     const bleName = this.getCurrentBleName();
     const label = this.getCurrentLabel();
     const serialNo = this.getCurrentSerialNo();
+    const connectId = this.getConnectId();
     const deviceId = this.getCurrentDeviceId() || null;
 
     const features = this.features;
 
     return {
       /** Android uses Mac address, iOS uses uuid, USB uses uuid  */
-      connectId: DataManager.isBleConnect(env) ? this.mainId || null : serialNo,
+      connectId: DataManager.isBleConnect(env) ? this.mainId || null : connectId,
       /** Hardware ID, will not change at any time */
       uuid: serialNo,
       commType: this.originalDescriptor.commType,
@@ -501,6 +502,16 @@ export class Device extends EventEmitter {
     return this.features ? getDeviceUUID(this.features) : '';
   }
 
+  getConnectId() {
+    const serialNo = this.getCurrentSerialNo();
+    if (serialNo) return serialNo;
+
+    // connectId 是 SDK 内部连接路由 key；Protocol V2 早期固件/mock
+    // 可能还没有 serial_no，此时用 transport descriptor 兜底，不改变
+    // features.serialNo / deviceId 的业务语义。
+    return this.originalDescriptor.path || this.originalDescriptor.id || '';
+  }
+
   getCurrentBleName() {
     return getDeviceBleName(this.features);
   }

package/src/device/DevicePool.ts

@@ -118,14 +118,14 @@ export class DevicePool extends EventEmitter {
     for await (const descriptor of descriptorList) {
       const device = await this._createDevice(descriptor, initOptions);
 
-      const uuid = device.getCurrentSerialNo();
-      if (uuid) {
-        if (this.devicesCache[uuid]) {
-          const cache = this.devicesCache[uuid];
+      const connectId = device.getConnectId();
+      if (connectId) {
+        if (this.devicesCache[connectId]) {
+          const cache = this.devicesCache[connectId];
           cache.updateDescriptor(descriptor, true);
         }
-        this.devicesCache[uuid] = device;
-        devices[uuid] = device;
+        this.devicesCache[connectId] = device;
+        devices[connectId] = device;
       }
 
       deviceList.push(device);

package/src/deviceProfile/buildDeviceFeatures.ts

@@ -250,6 +250,7 @@ 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 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);
@@ -268,7 +269,7 @@ export const buildProtocolV2FeaturesPayload = (
     firmwareType: previous?.firmwareType ?? EFirmwareType.Universal,
     model: 'pro2',
     vendor: 'onekey.so',
-    deviceId: null,
+    deviceId,
     serialNo,
     label,
     bleName: bleName ?? null,

package/src/deviceProfile/buildDeviceProfile.ts

@@ -304,6 +304,7 @@ export function buildProfileFromProtocolV2({
   scope = 'basic',
   includeRaw = false,
 }: BuildProtocolV2ProfileParams): DeviceProfile {
+  const deviceId = deviceInfo?.hw?.device_id || '';
   const serialNo = deviceInfo?.hw?.serial_no || '';
   const label = deviceInfo?.status?.label ?? null;
   const bleName = deviceInfo?.bt?.adv_name ?? null;
@@ -314,9 +315,7 @@ export function buildProfileFromProtocolV2({
     sources,
     deviceType: EDeviceType.Pro2,
     firmwareType: EFirmwareType.Universal,
-    // Protocol V2 的 DevGetDeviceInfo 没有 device_id 字段；serialNo 与 deviceId
-    // 不是等价语义，这里保持空值，避免把稳定硬件序列号误当会随 wipe 轮换的身份。
-    deviceId: '',
+    deviceId,
     serialNo,
     label,
     bleName,

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

@@ -1,6 +1,6 @@
 import { DevSEState, DevSeType } from '@onekeyfe/hd-transport';
 
-import type { DeviceGetDeviceInfo, DevSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { DevGetDeviceInfo, DevSEInfo, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
 import type { DeviceCommands } from '../../device/DeviceCommands';
 
 // 单源类型：直接使用 hd-transport 生成的 ProtocolV2DeviceInfo / DevSEInfo /
@@ -121,15 +121,16 @@ export const PROTOCOL_V2_DEVICE_INFO_REQUEST = PROTOCOL_V2_FULL_DEVICE_INFO_REQU
 export const PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS = 10 * 1000;
 
 /**
- * 临时开关（默认开启）：当前 Pro2 测试固件 / 早期工程板尚未实现 DevGetDeviceInfo，
- * 真实调用只会超时失败。开启时跳过 wire 调用，直接返回 mock DeviceInfo；
+ * 临时开关（默认关闭）：当前正式链路直接调用 DevGetDeviceInfo。
+ * 仅当 Pro2 测试固件 / 早期工程板尚未实现 DevGetDeviceInfo 时，才显式开启 mock。
+ * 开启时跳过 wire 调用，直接返回 mock DeviceInfo；
  * DevGetDeviceInfo 尚未返回的字段保持为空，不再用 transport path 兜底成设备身份。
  *
- * 固件实现 DevGetDeviceInfo 后：把默认值改回 false（或直接删除开关与 mock）。
+ * 固件实现 DevGetDeviceInfo 稳定后：删除开关与 mock。
  * 注意：开启期间 FirmwareUpdateV4 的“升级完成版本比对”拿到的也是 mock 版本，
  * 不能作为升级成功的依据。
  */
-let protocolV2DeviceInfoMockEnabled = true;
+let protocolV2DeviceInfoMockEnabled = false;
 
 export const setProtocolV2DeviceInfoMock = (enabled: boolean) => {
   protocolV2DeviceInfoMockEnabled = enabled;
@@ -163,9 +164,9 @@ export async function requestProtocolV2DeviceInfo({
 }: {
   commands: DeviceCommands;
   timeoutMs?: number;
-  request?: DeviceGetDeviceInfo;
+  request?: DevGetDeviceInfo;
 }): Promise<ProtocolV2DeviceInfo> {
-  if (protocolV2DeviceInfoMockEnabled) {
+  if (isProtocolV2DeviceInfoMockEnabled()) {
     return buildMockProtocolV2DeviceInfo();
   }
   const { message } = await commands.typedCall('DevGetDeviceInfo', 'DeviceInfo', request, {

package/src/types/api/getPassphraseState.ts

@@ -1,10 +1,10 @@
 import type { CommonParams, Response } from '../params';
 
 export type GetPassphraseStatePayload = {
-  passphrase_state?: string;
-  session_id?: string;
-  unlocked_attach_pin?: boolean;
-  passphrase_protection?: boolean | null;
+  passphraseState?: string;
+  sessionId?: string;
+  unlockedAttachPin?: boolean;
+  passphraseProtection?: boolean | null;
 };
 
 export type GetPassphraseStateParams = CommonParams & {

package/src/types/api/protocolV2.ts

@@ -1,6 +1,5 @@
 import type { CommonParams, Response } from '../params';
 import type {
-  DeviceFirmwareUpdateStatus,
   DevFirmwareUpdateStatus,
   FactoryDeviceInfo,
   OnboardingStatus,
@@ -96,12 +95,12 @@ export declare function deviceGetOnboardingStatus(
 export declare function deviceFirmwareUpdate(
   connectId: string,
   params: CommonParams & DeviceFirmwareUpdateParams
-): Response<Success | DevFirmwareUpdateStatus | DeviceFirmwareUpdateStatus>;
+): Response<Success | DevFirmwareUpdateStatus>;
 
 export declare function deviceGetFirmwareUpdateStatus(
   connectId: string,
   params?: CommonParams
-): Response<DevFirmwareUpdateStatus | DeviceFirmwareUpdateStatus>;
+): Response<DevFirmwareUpdateStatus>;
 
 export declare function devReboot(
   connectId: string,

package/src/types/settings.ts

@@ -34,6 +34,11 @@ export type ConnectSettings = {
   fetchConfig?: boolean;
   extension?: string;
   configFetcher?: (url: string) => Promise<RemoteConfigResponse | null>;
+  /**
+   * 临时开关：Protocol V2 DevGetDeviceInfo 未稳定前用于 mock 设备信息。
+   * 正式 app 可显式设置为 false 以调用真实 DevGetDeviceInfo；固件稳定后删除。
+   */
+  protocolV2DeviceInfoMockEnabled?: boolean;
 };
 
 export type IVersionArray = [number, number, number];

package/src/utils/deviceFeaturesUtils.ts

@@ -93,12 +93,17 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
     allowCreateAttachPin?: boolean;
+    initSession?: boolean;
   }
 ) => {
   const { features } = device;
   const locked = features?.unlocked === false;
   const deviceType = device.getCurrentDeviceType();
 
+  if (options?.initSession) {
+    device.clearInternalState();
+  }
+
   const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(device, {
     ...options,
   });
@@ -128,7 +133,7 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     passphraseState,
     deviceId,
     newSession,
-    device.features?.sessionId
+    options?.initSession ? null : device.features?.sessionId
   );
 
   return { passphraseState, newSession, unlockedAttachPin };
@@ -145,6 +150,7 @@ export const getPassphraseState = async (
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
     allowCreateAttachPin?: boolean;
+    initSession?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;