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

package/src/utils/deviceFeaturesUtils.ts

@@ -1,7 +1,11 @@
 import semver from 'semver';
 import { isNaN } from 'lodash';
 import { EDeviceType, type EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
-import { Enum_Capability, type GetPassphraseState } from '@onekeyfe/hd-transport';
+import {
+  Enum_Capability,
+  type DeviceSessionGet,
+  type GetPassphraseState,
+} from '@onekeyfe/hd-transport';
 
 import { toHardened } from '../api/helpers/pathUtils';
 import { DeviceModelToTypes, DeviceTypeToModels } from '../types';
@@ -17,9 +21,7 @@ import { existCapability } from './capabilitieUtils';
 import type { Device } from '../device/Device';
 import type { Features, IDeviceType, SupportFeatureType } from '../types';
 
-// 生成的 GetPassphraseState 已包含 _only_main_pin / allow_create_attach_pin，
-// 不再需要手动扩展字段。
-type GetPassphraseStateMessage = GetPassphraseState;
+type DeviceSessionGetMessage = DeviceSessionGet;
 
 export const getSupportProtocolV1MessageSchema = (
   features: Features | undefined
@@ -93,12 +95,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,14 +135,17 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
     passphraseState,
     deviceId,
     newSession,
-    device.features?.sessionId
+    options?.initSession ? null : device.features?.sessionId
   );
 
-  return { passphraseState, newSession, unlockedAttachPin };
+  return {
+    passphraseState,
+    newSession,
+    unlockedAttachPin: unlockedAttachPin ?? device.features?.unlockedAttachPin,
+  };
 };
 
 // 仅适用于 Protocol V1 的 Pro：Pro2 走独立版本线，不能套用 4.15.0 门槛
-// （Pro2 在 getPassphraseState 中通过 isProtocolV2 直接判定支持）。
 const supportProSeriesAttachPinPassphrase = (deviceType: IDeviceType, firmwareVersion: string) =>
   deviceType === EDeviceType.Pro && semver.gte(firmwareVersion, '4.15.0');
 
@@ -145,6 +155,7 @@ export const getPassphraseState = async (
     expectPassphraseState?: string;
     onlyMainPin?: boolean;
     allowCreateAttachPin?: boolean;
+    initSession?: boolean;
   }
 ): Promise<{
   passphraseState: string | undefined;
@@ -160,19 +171,42 @@ export const getPassphraseState = async (
   const firmwareVersion = device.getCurrentFirmwareVersionString() ?? '0.0.0';
   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,
+    };
+  }
+
   const supportAttachPinCapability = existCapability(
     features,
     Enum_Capability.Capability_AttachToPin
   );
-  // Pro2 (Protocol V2) 协议自带 GetPassphraseState(10028)，固件从首个版本即支持，
-  // 不依赖 Pro 系列的 4.15.0 版本线；V2 也没有 GetAddress Testnet 探测这条 legacy 回退路径。
   const supportGetPassphraseState =
-    device.isProtocolV2() ||
     supportAttachPinCapability ||
     supportProSeriesAttachPinPassphrase(deviceType, firmwareVersion);
 
   if (supportGetPassphraseState) {
-    const payload: GetPassphraseStateMessage = options?.onlyMainPin
+    const payload: GetPassphraseState = options?.onlyMainPin
       ? { _only_main_pin: true }
       : { passphrase_state: options?.expectPassphraseState };
     if (options?.allowCreateAttachPin) {
@@ -276,6 +310,9 @@ export const getFirmwareUpdateField = ({
   if (deviceType === EDeviceType.Pro) {
     return latestFirmwareField;
   }
+  if (deviceType === EDeviceType.Pro2) {
+    return 'firmware-v1';
+  }
   return 'firmware';
 };
 /**
@@ -319,6 +356,10 @@ export const getFirmwareUpdateFieldArray = (
     return ['firmware-v8'];
   }
 
+  if (deviceType === 'pro2') {
+    return ['firmware-v1'];
+  }
+
   return ['firmware'];
 };
 

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

@@ -1,7 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import type { DeviceRebootParams } from './helpers';
-export default class DevReboot extends BaseMethod<DeviceRebootParams> {
-    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,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,UAAU,CAAC,kBAAkB,CAAC;IACnE,IAAI;IAWE,GAAG;CAMV"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceGetDeviceInfo.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceGetDeviceInfo.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,MAAM,0BAA0B,GAAG;IACvC,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,CAAC,EAAE,0BAA0B,CAAC;IACrC,KAAK,CAAC,EAAE,wBAAwB,CAAC;CAClC,CAAC;AAmDF,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU,CAAC;IAC1D,OAAO,EAAE,0BAA0B,CAAC;IACpC,KAAK,EAAE,wBAAwB,CAAC;CACjC,CAAC;IACA,IAAI;IAmBE,GAAG;CAgBV"}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"DeviceGetOnboardingStatus.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceGetOnboardingStatus.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,UAAU;IAC/D,IAAI;IAQE,GAAG;CAIV"}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"FactoryDeviceInfoSettings.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/FactoryDeviceInfoSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,WAAW,CAAC;AAEjE,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,UAAU,CAAC,+BAA+B,CAAC;IAChG,IAAI;IAeE,GAAG;CAQV"}

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

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

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"FilesystemFixPermission.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/FilesystemFixPermission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,IAAI;IAQE,GAAG;CAIV"}

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

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

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

@@ -1 +0,0 @@
-{"version":3,"file":"GetProtoVersion.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/GetProtoVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU;IACrD,IAAI;IAQE,GAAG;CAIV"}

package/src/api/protocol-v2/DevReboot.ts

@@ -1,24 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import { normalizeRebootType } from './helpers';
-
-import type { DeviceRebootParams } from './helpers';
-
-export default class DevReboot extends BaseMethod<DeviceRebootParams> {
-  init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
-    this.skipForceUpdateCheck = true;
-    this.useDevicePassphraseState = false;
-    this.params = {
-      rebootType: this.payload.rebootType,
-      reboot_type: this.payload.reboot_type,
-    };
-  }
-
-  async run() {
-    const res = await this.device.commands.typedCall('DevReboot', 'Success', {
-      reboot_type: normalizeRebootType(this.params.reboot_type ?? this.params.rebootType),
-    });
-    return Promise.resolve(res.message);
-  }
-}

package/src/api/protocol-v2/DeviceGetOnboardingStatus.ts

@@ -1,16 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-
-export default class DeviceGetOnboardingStatus extends BaseMethod {
-  init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
-    this.skipForceUpdateCheck = true;
-    this.useDevicePassphraseState = false;
-    this.params = undefined;
-  }
-
-  async run() {
-    const res = await this.device.commands.typedCall('GetOnboardingStatus', 'OnboardingStatus', {});
-    return Promise.resolve(res.message);
-  }
-}

package/src/api/protocol-v2/FactoryDeviceInfoSettings.ts

@@ -1,29 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-
-import type { FactoryDeviceInfoSettingsParams } from './helpers';
-
-export default class FactoryDeviceInfoSettings extends BaseMethod<FactoryDeviceInfoSettingsParams> {
-  init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
-    this.skipForceUpdateCheck = true;
-    this.useDevicePassphraseState = false;
-    this.params = {
-      serial_no: this.payload.serial_no,
-      serialNo: this.payload.serialNo,
-      cpu_info: this.payload.cpu_info,
-      cpuInfo: this.payload.cpuInfo,
-      pre_firmware: this.payload.pre_firmware,
-      preFirmware: this.payload.preFirmware,
-    };
-  }
-
-  async run() {
-    const res = await this.device.commands.typedCall('FactoryDeviceInfoSettings', 'Success', {
-      serial_no: this.params.serial_no ?? this.params.serialNo,
-      cpu_info: this.params.cpu_info ?? this.params.cpuInfo,
-      pre_firmware: this.params.pre_firmware ?? this.params.preFirmware,
-    });
-    return Promise.resolve(res.message);
-  }
-}