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

package/src/api/GetOnekeyFeatures.ts

@@ -90,7 +90,7 @@ export default class GetOnekeyFeatures extends BaseMethod {
   async run() {
     if (this.device.isProtocolV2()) {
       // V2 没有 OnekeyGetFeatures 消息：
-      // 取完整 DevGetDeviceInfo（含 SE/hash/build_id）后刷新结构化 features 缓存。
+      // 取完整 DeviceInfoGet（含 SE/hash/build_id）后刷新结构化 features 缓存。
       const deviceInfo = await requestProtocolV2DeviceInfo({
         commands: this.device.commands,
         request: PROTOCOL_V2_DEVICE_INFO_REQUEST,

package/src/api/device/DeviceRebootToBoardloader.ts

@@ -1,4 +1,4 @@
-import { DevRebootType } from '@onekeyfe/hd-transport';
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
 
 import { BaseMethod } from '../BaseMethod';
 
@@ -23,10 +23,10 @@ export default class DeviceRebootToBoardloader extends BaseMethod<RebootToBoardl
   }
 
   async run() {
-    // Protocol V2 submodule firmware uses DevReboot with reboot_type enum.
+    // Protocol V2 submodule firmware uses DeviceReboot with reboot_type enum.
     if (this.device.isProtocolV2()) {
-      const res = await this.device.commands.typedCall('DevReboot', 'Success', {
-        reboot_type: DevRebootType.Boardloader,
+      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
+        reboot_type: DeviceRebootType.Romloader,
       });
       return Promise.resolve(res.message);
     }

package/src/api/device/DeviceRebootToBootloader.ts

@@ -1,4 +1,4 @@
-import { DevRebootType } from '@onekeyfe/hd-transport';
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
 
 import { BaseMethod } from '../BaseMethod';
 
@@ -23,10 +23,10 @@ export default class DeviceRebootToBootloader extends BaseMethod<RebootToBootloa
   }
 
   async run() {
-    // Protocol V2 submodule firmware uses DevReboot with reboot_type enum.
+    // Protocol V2 submodule firmware uses DeviceReboot with reboot_type enum.
     if (this.device.isProtocolV2()) {
-      const res = await this.device.commands.typedCall('DevReboot', 'Success', {
-        reboot_type: DevRebootType.Bootloader,
+      const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
+        reboot_type: DeviceRebootType.Bootloader,
       });
       return Promise.resolve(res.message);
     }

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -13,6 +13,7 @@ import { DeviceModelToTypes } from '../../types';
 import { DataManager } from '../../data-manager';
 import { BaseMethod } from '../BaseMethod';
 import { DEVICE } from '../../events';
+import { createFirmwareProgressThrottle } from './progressThrottle';
 
 import type {
   IFirmwareUpdateProgressType,
@@ -40,6 +41,8 @@ const isDeviceDisconnectedError = (error: unknown) => {
 export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
   checkPromise: Deferred<any> | null = null;
 
+  private shouldPostFirmwareProgress = createFirmwareProgressThrottle();
+
   init(): void {}
 
   run(): Promise<any> {
@@ -83,6 +86,10 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    * @param progress Post the percentage of the progress
    */
   postProgressMessage = (progress: number, progressType: IFirmwareUpdateProgressType) => {
+    if (!this.shouldPostFirmwareProgress(progress, progressType)) {
+      return;
+    }
+
     this.postMessage(
       createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
         device: this.device.toMessageObject() as KnownDevice,
@@ -138,6 +145,8 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     // check device goto bootloader mode
     let isFirstCheck = true;
     let checkCount = 0;
+    let hasPromptedWebDevice = false;
+    let isPromptingWebDevice = false;
     // eslint-disable-next-line prefer-const
     let timeoutTimer: ReturnType<typeof setTimeout> | undefined;
 
@@ -158,23 +167,28 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
         if (
           checkCount > 4 &&
           DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
-          !this.payload.skipWebDevicePrompt
+          !this.payload.skipWebDevicePrompt &&
+          !hasPromptedWebDevice &&
+          !isPromptingWebDevice
         ) {
-          clearInterval(intervalTimer);
-          clearTimeout(timeoutTimer);
-
+          isPromptingWebDevice = true;
           try {
             this.postTipMessage(FirmwareUpdateTipMessage.SelectDeviceInBootloaderForWebDevice);
             const confirmed = await this._promptDeviceInBootloaderForWebDevice();
+            hasPromptedWebDevice = true;
             if (confirmed) {
               await this._checkDeviceInBootloaderMode(connectId, intervalTimer, timeoutTimer);
             }
           } catch (e) {
+            clearInterval(intervalTimer);
+            clearTimeout(timeoutTimer);
             Log.log(
               'FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ',
               e
             );
             this.checkPromise?.reject(e);
+          } finally {
+            isPromptingWebDevice = false;
           }
           return;
         }

package/src/api/firmware/progressThrottle.ts

@@ -0,0 +1,44 @@
+import type { IFirmwareUpdateProgressType } from '../../events/ui-request';
+
+const DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS = 250;
+
+type FirmwareProgressThrottleState = {
+  lastEmittedAt: number;
+  lastProgress?: number;
+};
+
+export const createFirmwareProgressThrottle = (
+  intervalMs = DEFAULT_FIRMWARE_PROGRESS_INTERVAL_MS
+) => {
+  const stateByType = new Map<IFirmwareUpdateProgressType, FirmwareProgressThrottleState>();
+
+  return (progress: number, progressType: IFirmwareUpdateProgressType) => {
+    if (progressType !== 'transferData') {
+      return true;
+    }
+
+    const normalizedProgress = Math.max(0, Math.min(100, Math.floor(progress)));
+    if (normalizedProgress === 0 || normalizedProgress === 100) {
+      stateByType.set(progressType, {
+        lastEmittedAt: Date.now(),
+        lastProgress: normalizedProgress,
+      });
+      return true;
+    }
+
+    const now = Date.now();
+    const state = stateByType.get(progressType);
+    if (
+      state &&
+      (state.lastProgress === normalizedProgress || now - state.lastEmittedAt < intervalMs)
+    ) {
+      return false;
+    }
+
+    stateByType.set(progressType, {
+      lastEmittedAt: now,
+      lastProgress: normalizedProgress,
+    });
+    return true;
+  };
+};

package/src/api/index.ts

@@ -43,20 +43,15 @@ export { default as firmwareUpdateV4 } from './FirmwareUpdateV4';
 export { default as promptWebDeviceAccess } from './PromptWebDeviceAccess';
 
 // File system & device control API (Protocol V2 only)
-export { default as getProtoVersion } from './protocol-v2/GetProtoVersion';
+export { default as protocolInfoRequest } from './protocol-v2/ProtocolInfoRequest';
 export { default as ping } from './protocol-v2/Ping';
 export { default as deviceReboot } from './protocol-v2/DeviceReboot';
-export { default as deviceGetDeviceInfo } from './protocol-v2/DeviceGetDeviceInfo';
-export { default as deviceGetOnboardingStatus } from './protocol-v2/DeviceGetOnboardingStatus';
+export { default as deviceInfoGet } from './protocol-v2/DeviceInfoGet';
 export { default as deviceFirmwareUpdate } from './protocol-v2/DeviceFirmwareUpdate';
 export { default as deviceGetFirmwareUpdateStatus } from './protocol-v2/DeviceGetFirmwareUpdateStatus';
-export { default as devReboot } from './protocol-v2/DevReboot';
-export { default as devGetDeviceInfo } from './protocol-v2/DeviceGetDeviceInfo';
-export { default as devFirmwareUpdate } from './protocol-v2/DeviceFirmwareUpdate';
-export { default as devGetFirmwareUpdateStatus } from './protocol-v2/DeviceGetFirmwareUpdateStatus';
-export { default as factoryDeviceInfoSettings } from './protocol-v2/FactoryDeviceInfoSettings';
-export { default as factoryGetDeviceInfo } from './protocol-v2/FactoryGetDeviceInfo';
-export { default as filesystemFixPermission } from './protocol-v2/FilesystemFixPermission';
+export { default as deviceFactoryInfoSet } from './protocol-v2/DeviceFactoryInfoSet';
+export { default as deviceFactoryInfoGet } from './protocol-v2/DeviceFactoryInfoGet';
+export { default as filesystemPermissionFix } from './protocol-v2/FilesystemPermissionFix';
 export { default as filesystemFormat } from './protocol-v2/FilesystemFormat';
 export { default as filesystemDiskControl } from './protocol-v2/FilesystemDiskControl';
 export { default as fileRead } from './FileRead';

package/src/api/protocol-v2/{FactoryGetDeviceInfo.ts → DeviceFactoryInfoGet.ts}

@@ -1,6 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
 
-export default class FactoryGetDeviceInfo extends BaseMethod {
+export default class DeviceFactoryInfoGet extends BaseMethod {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
     this.requireProtocolV2 = true;
@@ -11,8 +11,8 @@ export default class FactoryGetDeviceInfo extends BaseMethod {
 
   async run() {
     const res = await this.device.commands.typedCall(
-      'FactoryGetDeviceInfo',
-      'FactoryDeviceInfo',
+      'DeviceFactoryInfoGet',
+      'DeviceFactoryInfo',
       {}
     );
     return Promise.resolve(res.message);

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

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

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

@@ -29,7 +29,7 @@ export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdat
     const targets = normalizeFirmwareTargets(this.params);
     try {
       const res = await this.device.commands.typedCall(
-        'DevFirmwareUpdate',
+        'DeviceFirmwareUpdateRequest',
         PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
         {
           targets,
@@ -37,13 +37,11 @@ export default class DeviceFirmwareUpdate extends BaseMethod<DeviceFirmwareUpdat
         {
           ...PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS,
           onIntermediateResponse: (response: MessageFromOneKey) => {
-            if (response.type !== 'DevFirmwareInstallProgress') return;
-            const progress = Number(response.message?.progress);
-            if (!Number.isFinite(progress)) return;
+            if (response.type !== 'DeviceFirmwareUpdateStatus') return;
             this.postMessage(
               createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
                 device: this.device.toMessageObject() as KnownDevice,
-                progress: Math.min(Math.max(progress, 0), 100),
+                progress: 99,
                 progressType: 'installingFirmware',
               })
             );

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

@@ -1,19 +1,53 @@
 import { BaseMethod } from '../BaseMethod';
+import { invalidParameter } from '../helpers/filesystemValidation';
 
-export default class DeviceGetFirmwareUpdateStatus extends BaseMethod {
+import type { DeviceFirmwareUpdateStatusGetParams } from './helpers';
+import type { DeviceFirmwareUpdateRecordFields } from '@onekeyfe/hd-transport';
+
+const DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS = ['status', 'payload_version', 'path'] as const;
+
+function normalizeStatusFields(
+  fields: DeviceFirmwareUpdateStatusGetParams['fields']
+): DeviceFirmwareUpdateRecordFields | undefined {
+  if (fields === undefined || fields === null) return undefined;
+  if (typeof fields !== 'object' || Array.isArray(fields)) {
+    throw invalidParameter('Parameter [fields] must be an object.');
+  }
+
+  const unknownField = Object.keys(fields).find(
+    field => !DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS.includes(field as any)
+  );
+  if (unknownField) {
+    throw invalidParameter(`Unsupported firmware update status field: ${unknownField}`);
+  }
+
+  const normalized: DeviceFirmwareUpdateRecordFields = {};
+  for (const field of DEVICE_FIRMWARE_UPDATE_STATUS_FIELDS) {
+    const value = fields[field];
+    if (value === undefined) continue;
+    if (typeof value !== 'boolean') {
+      throw invalidParameter(`Parameter [fields.${field}] must be a boolean.`);
+    }
+    normalized[field] = value;
+  }
+  return normalized;
+}
+
+export default class DeviceGetFirmwareUpdateStatus extends BaseMethod<DeviceFirmwareUpdateStatusGetParams> {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
     this.requireProtocolV2 = true;
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
-    this.params = undefined;
+    const fields = normalizeStatusFields(this.payload.fields);
+    this.params = fields ? { fields } : {};
   }
 
   async run() {
     const res = await this.device.commands.typedCall(
-      'DevGetFirmwareUpdateStatus',
-      'DevFirmwareUpdateStatus',
-      {}
+      'DeviceFirmwareUpdateStatusGet',
+      'DeviceFirmwareUpdateStatus',
+      this.params
     );
     return Promise.resolve(res.message);
   }

package/src/api/protocol-v2/{DeviceGetDeviceInfo.ts → DeviceInfoGet.ts}

@@ -3,11 +3,12 @@ import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { PROTOCOL_V2_DEVICE_INFO_TIMEOUT_MS } from '../../protocols/protocol-v2';
 import { BaseMethod } from '../BaseMethod';
+import { invalidParameter } from '../helpers/filesystemValidation';
 
-export type DeviceGetDeviceInfoTargets = {
+export type DeviceInfoGetTargets = {
   hw?: boolean;
   fw?: boolean;
-  bt?: boolean;
+  coprocessor?: boolean;
   se1?: boolean;
   se2?: boolean;
   se3?: boolean;
@@ -15,22 +16,22 @@ export type DeviceGetDeviceInfoTargets = {
   status?: boolean;
 };
 
-export type DeviceGetDeviceInfoTypes = {
+export type DeviceInfoGetTypes = {
   version?: boolean;
   build_id?: boolean;
   hash?: boolean;
   specific?: boolean;
 };
 
-export type DeviceGetDeviceInfoParams = {
-  targets?: DeviceGetDeviceInfoTargets;
-  types?: DeviceGetDeviceInfoTypes;
+export type DeviceInfoGetParams = {
+  targets?: DeviceInfoGetTargets;
+  types?: DeviceInfoGetTypes;
 };
 
-const TARGET_KEYS: (keyof DeviceGetDeviceInfoTargets)[] = [
+const TARGET_KEYS: (keyof DeviceInfoGetTargets)[] = [
   'hw',
   'fw',
-  'bt',
+  'coprocessor',
   'se1',
   'se2',
   'se3',
@@ -38,16 +39,16 @@ const TARGET_KEYS: (keyof DeviceGetDeviceInfoTargets)[] = [
   'status',
 ];
 
-const TYPE_KEYS: (keyof DeviceGetDeviceInfoTypes)[] = ['version', 'build_id', 'hash', 'specific'];
+const TYPE_KEYS: (keyof DeviceInfoGetTypes)[] = ['version', 'build_id', 'hash', 'specific'];
 
-const DEFAULT_TARGETS: DeviceGetDeviceInfoTargets = {
+const DEFAULT_TARGETS: DeviceInfoGetTargets = {
   hw: true,
   fw: true,
-  bt: true,
+  coprocessor: true,
   status: true,
 };
 
-const DEFAULT_TYPES: DeviceGetDeviceInfoTypes = {
+const DEFAULT_TYPES: DeviceInfoGetTypes = {
   version: true,
   specific: true,
 };
@@ -69,16 +70,48 @@ function pickBooleanKeys<T extends Record<string, boolean | undefined>>(
   return hasKey ? result : undefined;
 }
 
+function assertKnownKeys(value: unknown, keys: string[], name: string) {
+  if (value == null) return;
+  if (typeof value !== 'object' || Array.isArray(value)) {
+    throw invalidParameter(`Parameter [${name}] must be an object.`);
+  }
+  const allowed = new Set(keys);
+  const unknownKeys = Object.keys(value).filter(key => !allowed.has(key));
+  if (unknownKeys.length > 0) {
+    throw invalidParameter(
+      `Parameter [${name}] contains unsupported key(s): ${unknownKeys.join(', ')}.`
+    );
+  }
+}
+
+function normalizeTargets(value: unknown): DeviceInfoGetTargets | undefined {
+  assertKnownKeys(
+    value,
+    TARGET_KEYS.map(key => String(key)),
+    'targets'
+  );
+  return pickBooleanKeys<DeviceInfoGetTargets>(value, TARGET_KEYS);
+}
+
+function normalizeTypes(value: unknown): DeviceInfoGetTypes | undefined {
+  assertKnownKeys(
+    value,
+    TYPE_KEYS.map(key => String(key)),
+    'types'
+  );
+  return pickBooleanKeys<DeviceInfoGetTypes>(value, TYPE_KEYS);
+}
+
 /**
- * 原生 DevGetDeviceInfo（Protocol V2 only）。
+ * 原生 DeviceInfoGet（Protocol V2 only）。
  *
  * 与 getDeviceInfo 不同：不构建 DeviceProfile、不更新设备缓存，
  * 按调用方给定的 targets/types 原样请求并返回未加工的 DeviceInfo 消息，
  * 用于调试固件字段上报。
  */
-export default class DeviceGetDeviceInfo extends BaseMethod<{
-  targets: DeviceGetDeviceInfoTargets;
-  types: DeviceGetDeviceInfoTypes;
+export default class DeviceInfoGet extends BaseMethod<{
+  targets: DeviceInfoGetTargets;
+  types: DeviceInfoGetTypes;
 }> {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
@@ -91,11 +124,8 @@ export default class DeviceGetDeviceInfo extends BaseMethod<{
     this.useDevicePassphraseState = false;
     this.skipForceUpdateCheck = true;
     this.params = {
-      targets:
-        pickBooleanKeys<DeviceGetDeviceInfoTargets>(this.payload.targets, TARGET_KEYS) ??
-        DEFAULT_TARGETS,
-      types:
-        pickBooleanKeys<DeviceGetDeviceInfoTypes>(this.payload.types, TYPE_KEYS) ?? DEFAULT_TYPES,
+      targets: normalizeTargets(this.payload.targets) ?? DEFAULT_TARGETS,
+      types: normalizeTypes(this.payload.types) ?? DEFAULT_TYPES,
     };
   }
 
@@ -105,7 +135,7 @@ export default class DeviceGetDeviceInfo extends BaseMethod<{
     }
 
     const res = await this.device.commands.typedCall(
-      'DevGetDeviceInfo',
+      'DeviceInfoGet',
       'DeviceInfo',
       {
         targets: this.params.targets,

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

@@ -16,7 +16,7 @@ export default class DeviceReboot extends BaseMethod<DeviceRebootParams> {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('DevReboot', 'Success', {
+    const res = await this.device.commands.typedCall('DeviceReboot', 'Success', {
       reboot_type: normalizeRebootType(this.params.reboot_type ?? this.params.rebootType),
     });
     return Promise.resolve(res.message);

package/src/api/protocol-v2/{FilesystemFixPermission.ts → FilesystemPermissionFix.ts}

@@ -1,6 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
 
-export default class FilesystemFixPermission extends BaseMethod {
+export default class FilesystemPermissionFix extends BaseMethod {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
     this.requireProtocolV2 = true;
@@ -10,7 +10,7 @@ export default class FilesystemFixPermission extends BaseMethod {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('FilesystemFixPermission', 'Success', {});
+    const res = await this.device.commands.typedCall('FilesystemPermissionFix', 'Success', {});
     return Promise.resolve(res.message);
   }
 }

package/src/api/protocol-v2/{GetProtoVersion.ts → ProtocolInfoRequest.ts}

@@ -1,6 +1,6 @@
 import { BaseMethod } from '../BaseMethod';
 
-export default class GetProtoVersion extends BaseMethod {
+export default class ProtocolInfoRequest extends BaseMethod {
   init() {
     // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
     this.requireProtocolV2 = true;
@@ -10,7 +10,7 @@ export default class GetProtoVersion extends BaseMethod {
   }
 
   async run() {
-    const res = await this.device.commands.typedCall('GetProtoVersion', 'ProtoVersion', {});
+    const res = await this.device.commands.typedCall('ProtocolInfoRequest', 'ProtocolInfo', {});
     return Promise.resolve(res.message);
   }
 }