@onekeyfe/hd-core 1.1.27-alpha.30 → 1.1.27-alpha.31

package/src/types/api/getPassphraseState.ts

@@ -1,6 +1,15 @@
 import type { CommonParams, Response } from '../params';
 
+export type GetPassphraseStatePayload =
+  | string
+  | {
+      passphrase_state?: string;
+      session_id?: string;
+      unlocked_attach_pin?: boolean;
+      passphrase_protection?: boolean | null;
+    };
+
 export declare function getPassphraseState(
   connectId?: string,
   params?: CommonParams
-): Response<string>;
+): Response<GetPassphraseStatePayload>;

package/src/types/api/index.ts

@@ -1,9 +1,9 @@
 import type {
-  devFirmwareUpdate,
-  devGetDeviceInfo,
-  devGetFirmwareUpdateStatus,
-  devGetOnboardingStatus,
-  devReboot,
+  deviceFirmwareUpdate,
+  deviceGetDeviceInfo,
+  deviceGetFirmwareUpdateStatus,
+  deviceGetOnboardingStatus,
+  deviceReboot,
   dirList,
   dirMake,
   dirRemove,
@@ -162,6 +162,7 @@ import type { neoSignTransaction } from './neoSignTransaction';
 import type { ConnectSettings } from '../settings';
 
 export * from './export';
+export type { GetPassphraseStatePayload } from './getPassphraseState';
 
 export type CoreApi = {
   /**
@@ -235,11 +236,11 @@ export type CoreApi = {
    */
   getProtoVersion: typeof getProtoVersion;
   ping: typeof ping;
-  devReboot: typeof devReboot;
-  devGetDeviceInfo: typeof devGetDeviceInfo;
-  devGetOnboardingStatus: typeof devGetOnboardingStatus;
-  devFirmwareUpdate: typeof devFirmwareUpdate;
-  devGetFirmwareUpdateStatus: typeof devGetFirmwareUpdateStatus;
+  deviceReboot: typeof deviceReboot;
+  deviceGetDeviceInfo: typeof deviceGetDeviceInfo;
+  deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
+  deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
+  deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
   factoryDeviceInfoSettings: typeof factoryDeviceInfoSettings;
   factoryGetDeviceInfo: typeof factoryGetDeviceInfo;
   filesystemFixPermission: typeof filesystemFixPermission;

package/src/types/api/protocolV2.ts

@@ -1,11 +1,11 @@
 import type { CommonParams, Response } from '../params';
 import type {
-  DevFirmwareTarget,
-  DevFirmwareUpdateStatus,
-  DevOnboardingStatus,
-  DevInfoTargets,
-  DevInfoTypes,
-  DevRebootType,
+  DeviceFirmwareTarget,
+  DeviceFirmwareUpdateStatus,
+  DeviceOnboardingStatus,
+  DeviceInfoTargets,
+  DeviceInfoTypes,
+  DeviceRebootType,
   FactoryDeviceInfo,
   ProtoVersion,
   ProtocolV2DeviceInfo,
@@ -48,14 +48,14 @@ export type PathInfoResult = {
   directory?: boolean;
 };
 
-export type DevRebootParams = {
-  rebootType?: DevRebootType | string | number;
-  reboot_type?: DevRebootType | string | number;
+export type DeviceRebootParams = {
+  rebootType?: DeviceRebootType | string | number;
+  reboot_type?: DeviceRebootType | string | number;
 };
 
-export type DevGetDeviceInfoParams = {
-  targets?: DevInfoTargets;
-  types?: DevInfoTypes;
+export type DeviceGetDeviceInfoParams = {
+  targets?: DeviceInfoTargets;
+  types?: DeviceInfoTypes;
   targetHw?: boolean;
   targetFw?: boolean;
   targetBt?: boolean;
@@ -70,10 +70,10 @@ export type DevGetDeviceInfoParams = {
   includeSpecific?: boolean;
 };
 
-export type DevFirmwareUpdateParams = {
-  targets?: DevFirmwareTarget[];
-  targetId?: DevFirmwareTarget['target_id'] | string | number;
-  target_id?: DevFirmwareTarget['target_id'] | string | number;
+export type DeviceFirmwareUpdateParams = {
+  targets?: DeviceFirmwareTarget[];
+  targetId?: DeviceFirmwareTarget['target_id'] | string | number;
+  target_id?: DeviceFirmwareTarget['target_id'] | string | number;
   path?: string;
 };
 
@@ -149,30 +149,30 @@ export declare function ping(
   params?: CommonParams & { message?: string }
 ): Response<Success>;
 
-export declare function devReboot(
+export declare function deviceReboot(
   connectId: string,
-  params: CommonParams & DevRebootParams
+  params: CommonParams & DeviceRebootParams
 ): Response<Success>;
 
-export declare function devGetDeviceInfo(
+export declare function deviceGetDeviceInfo(
   connectId: string,
-  params?: CommonParams & DevGetDeviceInfoParams
+  params?: CommonParams & DeviceGetDeviceInfoParams
 ): Response<ProtocolV2DeviceInfo>;
 
-export declare function devGetOnboardingStatus(
+export declare function deviceGetOnboardingStatus(
   connectId: string,
   params?: CommonParams
-): Response<DevOnboardingStatus>;
+): Response<DeviceOnboardingStatus>;
 
-export declare function devFirmwareUpdate(
+export declare function deviceFirmwareUpdate(
   connectId: string,
-  params: CommonParams & DevFirmwareUpdateParams
-): Response<Success | DevFirmwareUpdateStatus>;
+  params: CommonParams & DeviceFirmwareUpdateParams
+): Response<Success | DeviceFirmwareUpdateStatus>;
 
-export declare function devGetFirmwareUpdateStatus(
+export declare function deviceGetFirmwareUpdateStatus(
   connectId: string,
   params?: CommonParams
-): Response<DevFirmwareUpdateStatus>;
+): Response<DeviceFirmwareUpdateStatus>;
 
 export declare function factoryDeviceInfoSettings(
   connectId: string,

package/src/utils/deviceFeaturesUtils.ts

@@ -5,7 +5,10 @@ import { Enum_Capability } from '@onekeyfe/hd-transport';
 
 import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceModelToTypes, DeviceTypeToModels } from '../types';
-import DataManager, { type IFirmwareField, type MessageVersion } from '../data-manager/DataManager';
+import DataManager, {
+  type IFirmwareField,
+  type ProtocolV1MessageSchema,
+} from '../data-manager/DataManager';
 import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
 import { getDeviceType } from './deviceInfoUtils';
 import { getDeviceFirmwareVersion } from './deviceVersionUtils';
@@ -15,13 +18,13 @@ import type { Device } from '../device/Device';
 import type { DeviceCommands } from '../device/DeviceCommands';
 import type { Features, SupportFeatureType } from '../types';
 
-export const getSupportMessageVersion = (
+export const getSupportProtocolV1MessageSchema = (
   features: Features | undefined
-): { messages: JSON; messageVersion: MessageVersion } => {
+): { messages: JSON; protocolV1MessageSchema: ProtocolV1MessageSchema } => {
   if (!features)
     return {
-      messages: DataManager.messages.latest,
-      messageVersion: 'latest',
+      messages: DataManager.messages.protocolV1Current,
+      protocolV1MessageSchema: 'protocolV1Current',
     };
 
   const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
@@ -37,18 +40,18 @@ export const getSupportMessageVersion = (
   const sortedDeviceVersionConfigs =
     deviceVersionConfigs?.sort((a, b) => semver.compare(b.minVersion, a.minVersion)) ?? [];
 
-  for (const { minVersion, messageVersion } of sortedDeviceVersionConfigs) {
+  for (const { minVersion, protocolV1MessageSchema } of sortedDeviceVersionConfigs) {
     if (semver.gte(currentDeviceVersion, minVersion)) {
       return {
-        messages: DataManager.messages[messageVersion],
-        messageVersion,
+        messages: DataManager.messages[protocolV1MessageSchema],
+        protocolV1MessageSchema,
       };
     }
   }
 
   return {
-    messages: DataManager.messages.latest,
-    messageVersion: 'latest',
+    messages: DataManager.messages.protocolV1Current,
+    protocolV1MessageSchema: 'protocolV1Current',
   };
 };
 
@@ -68,7 +71,11 @@ export const supportNewPassphrase = (features?: Features): SupportFeatureType =>
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
-  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
+  if (
+    deviceType === EDeviceType.Touch ||
+    deviceType === EDeviceType.Pro ||
+    deviceType === EDeviceType.Pro2
+  ) {
     return { support: true };
   }
 
@@ -86,6 +93,8 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
 ) => {
   const { features, commands } = device;
   const locked = features?.unlocked === false;
+  const deviceType = getDeviceType(features);
+  const isPro2 = deviceType === EDeviceType.Pro2;
 
   const { passphraseState, newSession, unlockedAttachPin } = await getPassphraseState(
     features,
@@ -95,12 +104,12 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     }
   );
 
-  const isModeT =
-    getDeviceType(features) === EDeviceType.Touch || getDeviceType(features) === EDeviceType.Pro;
+  const isModeT = deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro;
 
   // 如果可以获取到 passphraseState，但是设备 features 显示设备未开启 passphrase，需要刷新设备状态
   // if passphraseState can be obtained, but the device features show that the device has not enabled passphrase, the device status needs to be refreshed
-  const needRefreshWithPassphrase = passphraseState && features?.passphrase_protection !== true;
+  const needRefreshWithPassphrase =
+    !isPro2 && passphraseState && features?.passphrase_protection !== true;
   // 如果 Touch/Pro 在之前是锁定状态，刷新设备状态
   // if Touch/Pro was locked before, refresh the device state
   const needRefreshWithLocked = isModeT && locked;
@@ -110,10 +119,17 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     await device.getFeatures();
   }
 
+  if (isPro2 && device.features && (passphraseState || newSession)) {
+    device.features.passphrase_protection = true;
+    if (newSession) {
+      device.features.session_id = newSession;
+    }
+  }
+
   // Attach to pin try to fix internal state
   if (features?.device_id) {
     device.updateInternalState(
-      device.features?.passphrase_protection ?? false,
+      (device.features?.passphrase_protection ?? false) || isPro2,
       passphraseState,
       device.features?.device_id ?? '',
       newSession,
@@ -148,6 +164,8 @@ export const getPassphraseState = async (
   );
   const supportGetPassphraseState =
     supportAttachPinCapability ||
+    // Pro2 V2 暂未从 features 暴露 capabilities，先直连该方法用于固件联调。
+    deviceType === EDeviceType.Pro2 ||
     (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.15.0'));
 
   if (supportGetPassphraseState) {

package/dist/api/protocol-v2/DevFirmwareUpdate.d.ts

@@ -1,7 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DevFirmwareUpdateParams } from './helpers';
-export default class DevFirmwareUpdate extends BaseMethod<DevFirmwareUpdateParams> {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").Success | import("packages/hd-transport/dist").DevFirmwareUpdateStatus>;
-}
-//# sourceMappingURL=DevFirmwareUpdate.d.ts.map

package/dist/api/protocol-v2/DevFirmwareUpdate.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevFirmwareUpdate.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevFirmwareUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAChF,IAAI;IAWE,GAAG;CAWV"}

package/dist/api/protocol-v2/DevGetDeviceInfo.d.ts

@@ -1,7 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DevGetDeviceInfoParams } from './helpers';
-export default class DevGetDeviceInfo extends BaseMethod<DevGetDeviceInfoParams> {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").ProtocolV2DeviceInfo | import("packages/hd-transport/dist").DeviceInfo>;
-}
-//# sourceMappingURL=DevGetDeviceInfo.d.ts.map

package/dist/api/protocol-v2/DevGetDeviceInfo.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevGetDeviceInfo.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevGetDeviceInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC9E,IAAI;IAqBE,GAAG;CAOV"}

package/dist/api/protocol-v2/DevGetFirmwareUpdateStatus.d.ts

@@ -1,6 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export default class DevGetFirmwareUpdateStatus extends BaseMethod {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").DevFirmwareUpdateStatus>;
-}
-//# sourceMappingURL=DevGetFirmwareUpdateStatus.d.ts.map

package/dist/api/protocol-v2/DevGetFirmwareUpdateStatus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevGetFirmwareUpdateStatus.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevGetFirmwareUpdateStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,UAAU;IAChE,IAAI;IAME,GAAG;CAQV"}

package/dist/api/protocol-v2/DevGetOnboardingStatus.d.ts

@@ -1,6 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export default class DevGetOnboardingStatus extends BaseMethod {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").DevOnboardingStatus>;
-}
-//# sourceMappingURL=DevGetOnboardingStatus.d.ts.map

package/dist/api/protocol-v2/DevGetOnboardingStatus.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevGetOnboardingStatus.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevGetOnboardingStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,IAAI;IAME,GAAG;CAQV"}

package/dist/api/protocol-v2/DevReboot.d.ts

@@ -1,7 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DevRebootParams } from './helpers';
-export default class DevReboot extends BaseMethod<DevRebootParams> {
-    init(): void;
-    run(): Promise<import("packages/hd-transport/dist").Success>;
-}
-//# sourceMappingURL=DevReboot.d.ts.map

package/dist/api/protocol-v2/DevReboot.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DevReboot.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DevReboot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,UAAU,CAAC,eAAe,CAAC;IAChE,IAAI;IASE,GAAG;CAMV"}