@onekeyfe/hd-core 1.2.0-alpha.11 → 1.2.0-alpha.13

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

@@ -50,8 +50,26 @@ export const getProtocolV2SeState = (se?: DeviceSEInfo): ProtocolV2SeStateLabel
 export const getProtocolV2SeType = (se?: DeviceSEInfo): string | null =>
   normalizeEnumValue(DeviceSeType, se?.type);
 
+/**
+ * 兼容尚未提供显式 runtime mode 的 Protocol V2 固件。
+ *
+ * 当前 romloader 只上报 hw、fw.romloader 和 fw.bootloader；bootloader
+ * 还会上报 application/application_data、coprocessor 或 SE 信息。
+ */
+export const isProtocolV2RomloaderDeviceInfo = (deviceInfo?: ProtocolV2DeviceInfo | null) =>
+  !!deviceInfo &&
+  deviceInfo.status == null &&
+  deviceInfo.fw?.romloader != null &&
+  deviceInfo.fw?.application == null &&
+  deviceInfo.fw?.application_data == null &&
+  deviceInfo.coprocessor == null &&
+  deviceInfo.se1 == null &&
+  deviceInfo.se2 == null &&
+  deviceInfo.se3 == null &&
+  deviceInfo.se4 == null;
+
 export const isProtocolV2BootloaderDeviceInfo = (deviceInfo?: ProtocolV2DeviceInfo | null) =>
-  !!deviceInfo && deviceInfo.status == null;
+  !!deviceInfo && deviceInfo.status == null && !isProtocolV2RomloaderDeviceInfo(deviceInfo);
 
 export const PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST = {
   targets: {

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

@@ -4,6 +4,8 @@ export {
   PROTOCOL_V2_FEATURES_DEVICE_INFO_REQUEST,
   PROTOCOL_V2_STATUS_DEVICE_INFO_REQUEST,
   PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
+  isProtocolV2BootloaderDeviceInfo,
+  isProtocolV2RomloaderDeviceInfo,
   getProtocolV2SeState,
   getProtocolV2SeType,
 } from './features';

package/src/types/api/getDeviceInfo.ts

@@ -16,7 +16,7 @@ export type GetDeviceInfoParams = {
   includeRaw?: boolean;
 };
 
-export type DeviceInfoMode = 'normal' | 'bootloader' | 'notInitialized' | 'unknown';
+export type DeviceInfoMode = 'normal' | 'bootloader' | 'romloader' | 'notInitialized' | 'unknown';
 
 export type DeviceInfoStatus = {
   mode: DeviceInfoMode;

package/src/types/api/index.ts

@@ -3,6 +3,7 @@ import type {
   deviceFactoryInfoSet,
   deviceFirmwareUpdate,
   deviceGetFirmwareUpdateStatus,
+  deviceGetOnboardingStatus,
   deviceInfoGet,
   deviceReboot,
   deviceSessionGet,
@@ -20,7 +21,6 @@ import type {
   filesystemDirList,
   filesystemDirMake,
   filesystemDirRemove,
-  filesystemDiskControl,
   filesystemFileDelete,
   filesystemFileRead,
   filesystemFileWrite,
@@ -266,6 +266,7 @@ export type CoreApi = {
   deviceReboot: typeof deviceReboot;
   deviceInfoGet: typeof deviceInfoGet;
   deviceStatusGet: typeof deviceStatusGet;
+  deviceGetOnboardingStatus: typeof deviceGetOnboardingStatus;
   deviceSessionGet: typeof deviceSessionGet;
   deviceFirmwareUpdate: typeof deviceFirmwareUpdate;
   deviceGetFirmwareUpdateStatus: typeof deviceGetFirmwareUpdateStatus;
@@ -292,7 +293,6 @@ export type CoreApi = {
   filesystemDirRemove: typeof filesystemDirRemove;
   filesystemPathInfoQuery: typeof filesystemPathInfoQuery;
   filesystemFormat: typeof filesystemFormat;
-  filesystemDiskControl: typeof filesystemDiskControl;
 
   /**
    * All network function

package/src/types/api/protocolV2.ts

@@ -2,6 +2,7 @@ import type { CommonParams, Response } from '../params';
 import type {
   DeviceFactoryInfo,
   DeviceFirmwareUpdateStatus,
+  DevOnboardingStatus,
   DeviceSession,
   DeviceSettings,
   DeviceStatus,
@@ -111,6 +112,11 @@ export declare function deviceStatusGet(
   params?: CommonParams
 ): Response<DeviceStatus>;
 
+export declare function deviceGetOnboardingStatus(
+  connectId: string,
+  params?: CommonParams
+): Response<DevOnboardingStatus>;
+
 export declare function deviceSessionGet(
   connectId: string,
   params?: CommonParams
@@ -231,9 +237,3 @@ export declare const filesystemDirRemove: typeof dirRemove;
 export declare const filesystemPathInfoQuery: typeof pathInfo;
 
 export declare function filesystemFormat(connectId: string): Response<Success>;
-
-export declare function filesystemDiskControl(
-  connectId: string,
-  // enable 收紧为 boolean | 0 | 1（兼容历史的 '0' / '1' 字符串输入，内部归一化为 0/1）
-  params: CommonParams & { enable: boolean | 0 | 1; timeoutMs?: number | string }
-): Response<Success>;

package/src/types/device.ts

@@ -91,6 +91,7 @@ export type DeviceFeaturesProtocol = 'V1' | 'V2' | 'unknown';
 export type DeviceFeaturesMode =
   | 'normal'
   | 'bootloader'
+  | 'romloader'
   | 'notInitialized'
   | 'backupMode'
   | 'unknown';
@@ -128,7 +129,7 @@ export type DeviceFeaturesRaw = {
   protocolV2DeviceInfo?: ProtocolV2DeviceInfo;
 };
 
-export type Features = {
+export type NormalizedFeatures = {
   protocol: DeviceFeaturesProtocol;
   protocolVersion?: number | null;
   deviceType: IDeviceType;
@@ -182,6 +183,10 @@ export type Features = {
   raw?: DeviceFeaturesRaw;
 };
 
+export type Features = NormalizedFeatures &
+  Partial<Omit<PROTO.Features, keyof NormalizedFeatures>> &
+  Partial<Omit<PROTO.OnekeyFeatures, keyof NormalizedFeatures | keyof PROTO.Features>>;
+
 export type OnekeyFeatures = PROTO.OnekeyFeatures;
 
 export type IDeviceType =

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

@@ -1,13 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-export type FilesystemDiskControlParams = {
-    enable?: boolean | 0 | 1;
-    timeoutMs?: number | string;
-};
-export default class FilesystemDiskControl extends BaseMethod<{
-    enable: 0 | 1;
-    timeoutMs?: number;
-}> {
-    init(): void;
-    run(): Promise<any>;
-}
-//# sourceMappingURL=FilesystemDiskControl.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"FilesystemDiskControl.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/FilesystemDiskControl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,MAAM,MAAM,2BAA2B,GAAG;IAExC,MAAM,CAAC,EAAE,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC;AAUF,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC;IAC5D,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;IACA,IAAI;IAWE,GAAG;CAcV"}

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

@@ -1,50 +0,0 @@
-import { BaseMethod } from '../BaseMethod';
-import {
-  invalidParameter,
-  validateOptionalNonNegativeInteger,
-} from '../helpers/filesystemValidation';
-
-export type FilesystemDiskControlParams = {
-  // 收紧为 boolean | 0 | 1；'0' / '1' 字符串仅作为历史输入向后兼容，内部归一化为 0/1
-  enable?: boolean | 0 | 1;
-  timeoutMs?: number | string;
-};
-
-function normalizeDiskControlEnable(value: unknown): 0 | 1 {
-  if (value === undefined || value === null) return 0;
-  if (typeof value === 'boolean') return value ? 1 : 0;
-  if (value === 0 || value === '0') return 0;
-  if (value === 1 || value === '1') return 1;
-  throw invalidParameter('Parameter [enable] must be a boolean or 0 | 1.');
-}
-
-export default class FilesystemDiskControl extends BaseMethod<{
-  enable: 0 | 1;
-  timeoutMs?: number;
-}> {
-  init() {
-    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
-    this.requireProtocolV2 = true;
-    this.skipForceUpdateCheck = true;
-    this.useDevicePassphraseState = false;
-    this.params = {
-      enable: normalizeDiskControlEnable(this.payload.enable),
-      timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
-    };
-  }
-
-  async run() {
-    const typedCall = this.device.commands.typedCall as any;
-    const res = await typedCall(
-      'FilesystemDiskControl',
-      'Success',
-      {
-        enable: this.params.enable,
-      },
-      {
-        timeoutMs: this.params.timeoutMs,
-      }
-    );
-    return Promise.resolve(res.message);
-  }
-}