@onekeyfe/hd-core 1.1.27 → 1.2.0-alpha.0

package/src/api/BaseMethod.ts

@@ -4,20 +4,12 @@ import {
   createNeedUpgradeFirmwareHardwareError,
 } from '@onekeyfe/hd-shared';
 
-import { supportInputPinOnSoftware, supportModifyHomescreen } from '../utils/deviceFeaturesUtils';
 import { createDeviceMessage } from '../events/device';
 import { UI_REQUEST } from '../constants/ui-request';
 import { DEVICE, FIRMWARE, createFirmwareMessage, createUiMessage } from '../events';
 import { getHDPath, toHardened } from './helpers/pathUtils';
 import { getBleFirmwareReleaseInfo, getFirmwareReleaseInfo } from './firmware/releaseHelper';
-import {
-  LoggerNames,
-  getDeviceFirmwareVersion,
-  getDeviceType,
-  getFirmwareType,
-  getLogger,
-  getMethodVersionRange,
-} from '../utils';
+import { LoggerNames, getFirmwareType, getLogger, isMethodVersionRangeUnsupported } from '../utils';
 import { generateInstanceId } from '../utils/tracing';
 import { DeviceModelToTypes } from '../types';
 
@@ -162,6 +154,14 @@ export abstract class BaseMethod<Params = undefined> {
    */
   strictCheckDeviceSupport = false;
 
+  /**
+   * 方法是否仅支持 Protocol V2 设备（Pro2）。
+   * core 调度在设备协议确定（acquire + initialize）后统一守卫，
+   * 非 V2 设备直接抛出 NotSupport 错误，方法内部不必重复判断。
+   * @default false
+   */
+  requireProtocolV2 = false;
+
   // @ts-expect-error: strictPropertyInitialization
   postMessage: (message: CoreMessage) => void;
 
@@ -225,7 +225,10 @@ export abstract class BaseMethod<Params = undefined> {
   }
 
   checkFirmwareRelease() {
-    if (!this.device || !this.device.features) return;
+    // 固件 release 元数据（DataManager remote config）目前只覆盖 Protocol V1 设备；
+    // Pro2 的更新流程由 firmwareUpdateV4 自行管理，这里显式跳过而不是依赖 features 为空。
+    if (!this.device || this.device.isProtocolV2()) return;
+    if (!this.device.features) return;
     const firmwareType = getFirmwareType(this.device.features);
     const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
     this.postMessage(
@@ -244,9 +247,9 @@ export abstract class BaseMethod<Params = undefined> {
   }
 
   checkDeviceSupportFeature() {
-    if (!this.device || !this.device.features) return;
-    const inputPinOnSoftware = supportInputPinOnSoftware(this.device.features);
-    const modifyHomescreen = supportModifyHomescreen(this.device.features);
+    if (!this.device || this.device.isUnacquired()) return;
+    const inputPinOnSoftware = this.device.supportInputPinOnSoftware();
+    const modifyHomescreen = this.device.supportModifyHomescreen();
 
     this.postMessage(
       createDeviceMessage(DEVICE.SUPPORT_FEATURES, {
@@ -268,15 +271,16 @@ export abstract class BaseMethod<Params = undefined> {
       return;
     }
 
-    const firmwareVersion = getDeviceFirmwareVersion(this.device.features)?.join('.');
-    const versionRange = getMethodVersionRange(
-      this.device.features,
-      type => getVersionRange()[type]
-    );
+    const firmwareVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
+    const versionRange = this.device.getCurrentMethodVersionRange(type => getVersionRange()[type]);
+
+    if (isMethodVersionRangeUnsupported(versionRange)) {
+      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+    }
 
     if (!versionRange) {
       if (options?.strictCheckDeviceSupport) {
-        throw createDeviceNotSupportMethodError(this.name, getFirmwareType(this.device.features));
+        throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
       }
       // Equipment that does not need to be repaired
       return;
@@ -287,7 +291,7 @@ export abstract class BaseMethod<Params = undefined> {
         currentVersion: firmwareVersion,
         requireVersion: versionRange.min,
         methodName: this.name,
-        firmwareType: getFirmwareType(this.device.features),
+        firmwareType: this.device.getCurrentFirmwareType(),
       });
     }
   }
@@ -297,7 +301,7 @@ export abstract class BaseMethod<Params = undefined> {
       return false;
     }
 
-    const deviceType = getDeviceType(this.device.features);
+    const deviceType = this.device.getCurrentDeviceType();
     if (!DeviceModelToTypes.model_touch.includes(deviceType)) {
       return false;
     }
@@ -329,7 +333,7 @@ export abstract class BaseMethod<Params = undefined> {
     if (this.shouldPromptSafetyCheckForEvmLedgerLegacyPath()) {
       checkFlag = true;
     }
-    if (checkFlag && this.device.features?.safety_checks === 'Strict') {
+    if (checkFlag && this.device.getCurrentSafetyChecks() === 'Strict') {
       Log.debug('will change safety_checks level');
       await this.device.commands.typedCall('ApplySettings', 'Success', {
         safety_checks: 'PromptTemporarily',

package/src/api/DirList.ts

@@ -0,0 +1,31 @@
+import { BaseMethod } from './BaseMethod';
+import {
+  validateNonEmptyString,
+  validateOptionalNonNegativeInteger,
+} from './helpers/filesystemValidation';
+
+export type DirListParams = {
+  path: string;
+  depth?: number;
+};
+
+export default class DirList extends BaseMethod<DirListParams> {
+  init() {
+    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
+    this.requireProtocolV2 = true;
+    this.skipForceUpdateCheck = true;
+    this.useDevicePassphraseState = false;
+    this.params = {
+      path: validateNonEmptyString(this.payload.path, 'path'),
+      depth: validateOptionalNonNegativeInteger(this.payload.depth, 'depth'),
+    };
+  }
+
+  async run() {
+    const res = await this.device.commands.typedCall('FilesystemDirList', 'FilesystemDir', {
+      path: this.params.path,
+      depth: this.params.depth,
+    });
+    return Promise.resolve(res.message);
+  }
+}

package/src/api/DirMake.ts

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

package/src/api/DirRemove.ts

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

package/src/api/FileDelete.ts

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

package/src/api/FileRead.ts

@@ -0,0 +1,167 @@
+import {
+  PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
+  PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
+} from '@onekeyfe/hd-transport';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import { BaseMethod } from './BaseMethod';
+import {
+  validateNonEmptyString,
+  validateNonNegativeInteger,
+  validateOptionalNonNegativeInteger,
+  validateOptionalPercentage,
+} from './helpers/filesystemValidation';
+import { hexToBytes, isHexString, stripHexPrefix } from './helpers/hexUtils';
+import { DataManager } from '../data-manager';
+
+export type FileReadParams = {
+  path: string;
+  offset?: number;
+  totalSize?: number;
+  chunkLen?: number;
+  uiPercentage?: number;
+};
+
+const MIN_FILE_READ_CHUNK_SIZE = 64;
+
+function getProtocolV2FileReadChunkLimit() {
+  const env = DataManager.getSettings('env');
+  if (env && DataManager.isBleConnect(env)) {
+    return PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+  }
+  return PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+}
+
+function normalizeChunkSize(value: unknown, maxChunkSize: number): number {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric) || numeric <= 0) return maxChunkSize;
+  return Math.min(Math.max(Math.floor(numeric), MIN_FILE_READ_CHUNK_SIZE), maxChunkSize);
+}
+
+function toFiniteNumber(value: unknown): number | undefined {
+  if (typeof value === 'number' && Number.isFinite(value)) return value;
+  if (typeof value === 'string') {
+    const numeric = Number(value);
+    return Number.isFinite(numeric) ? numeric : undefined;
+  }
+  if (value && typeof value === 'object') {
+    const longLike = value as { toNumber?: () => number };
+    if (typeof longLike.toNumber === 'function') {
+      const numeric = longLike.toNumber();
+      return Number.isFinite(numeric) ? numeric : undefined;
+    }
+  }
+  return undefined;
+}
+
+function toUint8Array(value: unknown): Uint8Array {
+  if (value instanceof Uint8Array) return value;
+  if (value instanceof ArrayBuffer) return new Uint8Array(value);
+  if (ArrayBuffer.isView(value)) {
+    return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
+  }
+  if (typeof value === 'string') {
+    const hex = stripHexPrefix(value);
+    if (!hex) return new Uint8Array(0);
+    if (!isHexString(hex) || hex.length % 2 !== 0) return new Uint8Array(0);
+    return hexToBytes(hex);
+  }
+  return new Uint8Array(0);
+}
+
+export default class FileRead extends BaseMethod<FileReadParams> {
+  init() {
+    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
+    this.requireProtocolV2 = true;
+    this.skipForceUpdateCheck = true;
+    this.useDevicePassphraseState = false;
+    const path = validateNonEmptyString(this.payload.path, 'path');
+    this.params = {
+      path,
+      offset: validateNonNegativeInteger(this.payload.offset, 'offset', 0),
+      totalSize: validateNonNegativeInteger(this.payload.totalSize, 'totalSize', 0),
+      chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
+      uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
+    };
+  }
+
+  async run() {
+    const startOffset = this.params.offset ?? 0;
+    const requestedLength = Number(this.params.totalSize);
+    const chunkSize = normalizeChunkSize(this.params.chunkLen, getProtocolV2FileReadChunkLimit());
+    let totalLength = Number.isFinite(requestedLength) && requestedLength > 0 ? requestedLength : 0;
+
+    if (totalLength === 0) {
+      const pathInfoRes = await this.device.commands.typedCall(
+        'FilesystemPathInfoQuery',
+        'FilesystemPathInfo',
+        {
+          path: this.params.path,
+        }
+      );
+      const fileSize = toFiniteNumber(pathInfoRes.message?.size);
+      if (!pathInfoRes.message?.exist || pathInfoRes.message?.directory) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `FilesystemFileRead path is not a file: ${this.params.path}`
+        );
+      }
+      if (fileSize === undefined || fileSize < startOffset) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `FilesystemFileRead invalid offset ${startOffset} for ${this.params.path}`
+        );
+      }
+      totalLength = fileSize - startOffset;
+    }
+
+    const chunks: Uint8Array[] = [];
+    let read = 0;
+    let lastMessage: Record<string, unknown> | undefined;
+
+    while (read < totalLength) {
+      const readLen = Math.min(chunkSize, totalLength - read);
+      const offset = startOffset + read;
+      const progress =
+        this.params.uiPercentage ??
+        Math.min(Math.ceil(((read + readLen) / Math.max(totalLength, 1)) * 100), 99);
+      const res = await this.device.commands.typedCall('FilesystemFileRead', 'FilesystemFile', {
+        file: {
+          path: this.params.path,
+          offset,
+          total_size: 0,
+        },
+        chunk_len: readLen,
+        ui_percentage: progress,
+      });
+      const data = toUint8Array(res.message?.data);
+      lastMessage = res.message;
+
+      if (data.byteLength === 0) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `FilesystemFileRead received empty data at offset ${offset}`
+        );
+      }
+
+      chunks.push(data);
+      read += data.byteLength;
+    }
+
+    const combined = new Uint8Array(read);
+    let cursor = 0;
+    chunks.forEach(chunk => {
+      combined.set(chunk, cursor);
+      cursor += chunk.byteLength;
+    });
+
+    return Promise.resolve({
+      ...lastMessage,
+      path: this.params.path,
+      offset: startOffset,
+      total_size: totalLength,
+      data: combined,
+      chunks: chunks.length,
+    });
+  }
+}

package/src/api/FileWrite.ts

@@ -0,0 +1,216 @@
+import {
+  PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
+  PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
+} from '@onekeyfe/hd-transport';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import { BaseMethod } from './BaseMethod';
+import {
+  validateNonEmptyString,
+  validateNonNegativeInteger,
+  validateOptionalNonNegativeInteger,
+  validateOptionalPercentage,
+  validateRequiredData,
+} from './helpers/filesystemValidation';
+import { UI_REQUEST, createUiMessage } from '../events/ui-request';
+import { DataManager } from '../data-manager';
+
+export type FileWriteParams = {
+  path: string;
+  offset?: number;
+  totalSize?: number;
+  data: ArrayBuffer | Uint8Array | Blob | string;
+  chunkSize?: number;
+  chunkLen?: number;
+  overwrite?: boolean;
+  append?: boolean;
+  uiPercentage?: number;
+  timeoutMs?: number | string;
+};
+
+const MIN_FILE_CHUNK_SIZE = 64;
+
+function getProtocolV2FileChunkLimit() {
+  const env = DataManager.getSettings('env');
+  if (env && DataManager.isBleConnect(env)) {
+    return PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+  }
+  return PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+}
+
+async function dataToUint8Array(data: FileWriteParams['data'] | Blob): Promise<Uint8Array> {
+  if (typeof data === 'string') {
+    return new TextEncoder().encode(data);
+  }
+
+  if (data instanceof ArrayBuffer) {
+    return new Uint8Array(data);
+  }
+
+  if (ArrayBuffer.isView(data)) {
+    return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+  }
+
+  if (typeof Blob !== 'undefined' && data instanceof Blob) {
+    return new Uint8Array(await data.arrayBuffer());
+  }
+
+  throw ERRORS.TypedError(
+    HardwareErrorCode.CallMethodInvalidParameter,
+    'Unsupported FilesystemFileWrite data'
+  );
+}
+
+function normalizeChunkSize(value: unknown, maxChunkSize: number): number {
+  const numeric = Number(value);
+  if (!Number.isFinite(numeric) || numeric <= 0) return maxChunkSize;
+  return Math.min(Math.max(Math.floor(numeric), MIN_FILE_CHUNK_SIZE), maxChunkSize);
+}
+
+function getConfirmedProgress(
+  processedByte: number,
+  totalSize: number,
+  written: number,
+  dataLength: number
+) {
+  if (Number.isFinite(processedByte) && Number.isFinite(totalSize) && totalSize > 0) {
+    if (processedByte >= totalSize) return 100;
+    return Math.min(Math.max(Math.floor((processedByte / totalSize) * 100), 0), 99);
+  }
+  if (dataLength > 0) {
+    if (written >= dataLength) return 100;
+    return Math.min(Math.max(Math.floor((written / dataLength) * 100), 0), 99);
+  }
+  return 100;
+}
+
+export default class FileWrite extends BaseMethod<FileWriteParams> {
+  init() {
+    // Protocol V2 (Pro2) 专属方法，core 调度层统一做非 V2 设备守卫
+    this.requireProtocolV2 = true;
+    this.skipForceUpdateCheck = true;
+    this.useDevicePassphraseState = false;
+    validateRequiredData(this.payload.data, 'data');
+    const path = validateNonEmptyString(this.payload.path, 'path');
+    const offset = validateNonNegativeInteger(this.payload.offset, 'offset', 0);
+    this.params = {
+      path,
+      offset,
+      totalSize: validateNonNegativeInteger(this.payload.totalSize, 'totalSize', 0),
+      data: this.payload.data,
+      chunkSize: validateOptionalNonNegativeInteger(this.payload.chunkSize, 'chunkSize'),
+      chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
+      overwrite: this.payload.overwrite ?? offset === 0,
+      append: this.payload.append ?? false,
+      uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
+      timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
+    };
+  }
+
+  async run() {
+    const data = await dataToUint8Array(this.params.data);
+    const dataLength = data.byteLength;
+    const offsetValue = Number(this.params.offset ?? 0);
+    const startOffset = Number.isFinite(offsetValue) && offsetValue > 0 ? offsetValue : 0;
+    const payloadTotalSize = Number(this.params.totalSize);
+    const totalSize =
+      Number.isFinite(payloadTotalSize) && payloadTotalSize > 0
+        ? payloadTotalSize
+        : startOffset + dataLength;
+
+    if (totalSize < startOffset + dataLength) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${
+          startOffset + dataLength
+        }`
+      );
+    }
+
+    const chunkSize = normalizeChunkSize(
+      this.params.chunkSize ?? this.params.chunkLen,
+      getProtocolV2FileChunkLimit()
+    );
+    const overwrite = this.params.overwrite ?? false;
+    const append = this.params.append ?? false;
+    let written = 0;
+    let chunkIndex = 0;
+    let lastMessage: Record<string, unknown> | undefined;
+    const startTime = Date.now();
+    const timeoutMs =
+      this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs);
+
+    while (written < dataLength) {
+      const chunkEnd = Math.min(written + chunkSize, dataLength);
+      const chunk = data.slice(written, chunkEnd);
+      const offset = startOffset + written;
+      const isFirstChunk = chunkIndex === 0;
+      const progress =
+        this.params.uiPercentage ??
+        Math.min(Math.ceil(((written + chunk.byteLength) / dataLength) * 100), 99);
+
+      const res = await this.device.commands.typedCall(
+        'FilesystemFileWrite',
+        'FilesystemFile',
+        {
+          file: {
+            path: this.params.path,
+            offset,
+            total_size: totalSize,
+            data: chunk,
+          },
+          overwrite: isFirstChunk ? overwrite : false,
+          append,
+          ui_percentage: progress,
+        },
+        {
+          timeoutMs,
+        }
+      );
+
+      lastMessage = res.message;
+      const processedByte = Number(res.message?.processed_byte);
+      if (Number.isFinite(processedByte) && processedByte > offset) {
+        written = processedByte - startOffset;
+      } else {
+        written += chunk.byteLength;
+      }
+
+      if (written > dataLength) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.RuntimeError,
+          `FilesystemFileWrite invalid processed_byte ${processedByte}`
+        );
+      }
+
+      const confirmedProcessedByte =
+        Number.isFinite(processedByte) && processedByte > offset
+          ? processedByte
+          : startOffset + written;
+      if (typeof this.postMessage === 'function') {
+        const elapsedMs = Date.now() - startTime;
+        const transferredBytes = Math.min(written, dataLength);
+        this.postMessage(
+          createUiMessage(UI_REQUEST.DEVICE_PROGRESS, {
+            progress: getConfirmedProgress(confirmedProcessedByte, totalSize, written, dataLength),
+            transferredBytes,
+            totalBytes: dataLength,
+            rateBytesPerSecond:
+              elapsedMs > 0 ? Math.round((transferredBytes / elapsedMs) * 1000) : undefined,
+            elapsedMs,
+          })
+        );
+      }
+      chunkIndex += 1;
+    }
+
+    return Promise.resolve({
+      ...lastMessage,
+      path: this.params.path,
+      offset: startOffset,
+      total_size: totalSize,
+      processed_byte: startOffset + written,
+      chunks: chunkIndex,
+    });
+  }
+}

package/src/api/FirmwareUpdate.ts

@@ -14,7 +14,7 @@ import { uploadFirmware } from './firmware/uploadFirmware';
 import { createUiMessage } from '../events';
 import { DeviceModelToTypes, type KnownDevice } from '../types';
 import { isEnteredManuallyBoot } from './firmware/bootloaderHelper';
-import { LoggerNames, getDeviceType, getDeviceUUID, getLogger, wait } from '../utils';
+import { LoggerNames, getDeviceUUID, getLogger, wait } from '../utils';
 import { DataManager } from '../data-manager';
 import { DevicePool } from '../device/DevicePool';
 
@@ -92,7 +92,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
               true
             );
             await this.device.initialize();
-            if (this.device.features?.bootloader_mode) {
+            if (this.device.isBootloader()) {
               clearInterval(intervalTimer);
               this.checkPromise?.resolve(true);
             }
@@ -105,7 +105,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
           const devicesDescriptor = deviceDiff?.descriptors ?? [];
           const { deviceList } = await DevicePool.getDevices(devicesDescriptor, connectId);
 
-          if (deviceList.length === 1 && deviceList[0]?.features?.bootloader_mode) {
+          if (deviceList.length === 1 && deviceList[0]?.isBootloader()) {
             // should update current device from cache
             // because device was reboot and had some new requests
             this.device.updateFromCache(deviceList[0]);
@@ -131,9 +131,17 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
   async run() {
     const { device, params } = this;
     const { features, commands } = device;
-    const deviceType = getDeviceType(features);
+    const deviceType = device.getCurrentDeviceType();
+
+    // Protocol V2 (Pro2) 固件升级走 DeviceFirmwareUpdate 流程，禁止进入 legacy 入口
+    if (device.isProtocolV2()) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        'Protocol V2 firmware update must use firmwareUpdateV4'
+      );
+    }
 
-    if (!features?.bootloader_mode && features) {
+    if (!device.isBootloader() && features) {
       const uuid = getDeviceUUID(features);
       // should go to bootloader mode manually
       if (isEnteredManuallyBoot(features, params.updateType)) {