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

package/src/api/FirmwareUpdateV4.ts

@@ -1,24 +1,29 @@
 import { ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-shared';
 import {
-  DevRebootType,
+  DeviceRebootType,
   PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
   PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
 } from '@onekeyfe/hd-transport';
 
 import { FirmwareUpdateTipMessage, UI_REQUEST } from '../events/ui-request';
 import { validateParams } from './helpers/paramsValidator';
-import { LoggerNames, getFirmwareType, getLogger } from '../utils';
-import { getBinary, getSysResourceBinary } from './firmware/getBinary';
+import {
+  LoggerNames,
+  getDeviceBLEFirmwareVersion,
+  getDeviceBootloaderVersion,
+  getDeviceFirmwareVersion,
+  getFirmwareType,
+  getLogger,
+} from '../utils';
+import { getSysResourceBinary } from './firmware/getBinary';
 import { DataManager } from '../data-manager';
 import { FirmwareUpdateBaseMethod } from './firmware/FirmwareUpdateBaseMethod';
 import { DevicePool } from '../device/DevicePool';
 import {
   PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
   ProtocolV2FirmwareTargetType,
-  protocolV2FileNameToTargetId,
 } from '../protocols/protocol-v2';
 import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
-import { buildProfileFromProtocolV2 } from '../deviceProfile';
 import {
   PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
   getProtocolV2UnknownErrorText,
@@ -29,31 +34,182 @@ import type { FirmwareUpdateV4Params } from '../types/api/firmwareUpdate';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
 import type { PROTO } from '../constants';
 import type { TypedResponseMessage } from '../device/DeviceCommands';
-import type { Features } from '../types';
+import type {
+  Features,
+  IFirmwareReleaseInfo,
+  IProtocolV2FirmwareComponent,
+  IVersionArray,
+} from '../types';
 
 const Log = getLogger(LoggerNames.Method);
 
 const SESSION_ERROR = 'session not found';
 const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
+const PROTOCOL_V2_START_UPDATE_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
-const PROTOCOL_V2_TARGET_STATUS_FINISHED = 0;
+const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
-const PROTOCOL_V2_TARGET_STATUS_FAILED = 2;
+const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
+const PROTOCOL_V2_TARGET_STATUS_FAILED_MIN = 3;
 const PROTOCOL_V2_CONNECT_PROTOCOL = 'V2';
-const PROTOCOL_V2_FIRMWARE_STAGING_VOLUME = 'vol1:';
+const PROTOCOL_V2_FIRMWARE_STAGING_VOLUME = 'vol0:/';
 const PROTOCOL_V2_MIN_FILE_CHUNK_SIZE = 64;
+const PROTOCOL_V2_CONNECT_RETRY_COUNT = 10;
+const PROTOCOL_V2_CONNECT_POLL_INTERVAL = 500;
+const PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT = 75 * 1000;
+const PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT = 60 * 1000;
+const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
+const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
+const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
+const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
+const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
+
+const getProtocolV2DeviceTransferProgress = (
+  bytesBeforeChunk: number,
+  bytesAfterChunk: number,
+  totalBytes: number
+) => {
+  if (!Number.isFinite(totalBytes) || totalBytes <= 0) {
+    return 100;
+  }
+  if (bytesBeforeChunk <= 0 && bytesAfterChunk < totalBytes) {
+    return 0;
+  }
+  if (bytesAfterChunk >= totalBytes) {
+    return 100;
+  }
+  return Math.min(Math.max(Math.ceil((bytesAfterChunk / totalBytes) * 100), 1), 99);
+};
+
+const formatProtocolV2TransferSpeed = (bytes: number, elapsedMs: number) => {
+  const safeElapsedMs = Math.max(elapsedMs, 1);
+  return (bytes / 1024 / (safeElapsedMs / 1000)).toFixed(2);
+};
 
 type ProtocolV2FirmwareUpdateStatusTarget = {
-  target_id: number;
-  status: number;
+  target_id: number | string;
+  status?: number | string;
+  payload_version?: number;
+  path?: string;
 };
 
 type ProtocolV2FirmwareUpdateStartResponse =
   | TypedResponseMessage<'Success'>
-  | TypedResponseMessage<'DevFirmwareUpdateStatus'>
+  | TypedResponseMessage<'DeviceFirmwareUpdateStatus'>
   | undefined;
 
+type ProtocolV2TargetBinary = { fileName: string; binary: ArrayBuffer; targetId: number };
+type ProtocolV2InstallItem = ProtocolV2TargetBinary & {
+  kind: ProtocolV2RemoteComponentTarget['kind'];
+};
+type ProtocolV2InstallTarget = ProtocolV2InstallItem & {
+  path: string;
+};
+
+type ProtocolV2FileTransferParams = PROTO.FirmwareUpload & {
+  filePath: string;
+  processedSize?: number;
+  totalSize?: number;
+  onTransferredBytes?: (transferredBytes: number) => void;
+};
+
+/** RESC bundle okpkg（FileWrite 直写模式），每个独立同步到 devicePath */
+type ProtocolV2ResourceBundleBinary = {
+  name: string;
+  binary: ArrayBuffer;
+  devicePath: string;
+  /** 远端配置模式下的下载 URL（手动模式不填） */
+  url?: string;
+  version?: IVersionArray;
+  payloadHash?: string;
+  headerHash?: string;
+};
+
+type ProtocolV2RemoteComponentBinary = ProtocolV2RemoteComponentTarget & {
+  binary: ArrayBuffer;
+};
+
+type ProtocolV2RemoteComponentTarget = {
+  fileName: string;
+  targetId: number;
+  kind: 'bootloader' | 'firmware';
+};
+
+type ProtocolV2OkppHeader = {
+  type: string;
+  version: IVersionArray;
+  payloadHash: string;
+  headerHash: string;
+};
+
+const PROTOCOL_V2_REMOTE_COMPONENT_TARGETS: Readonly<
+  Record<string, ProtocolV2RemoteComponentTarget>
+> = {
+  BOOTLOADER: {
+    fileName: 'bootloader.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
+    kind: 'bootloader',
+  },
+  APPLICATION_P1: {
+    fileName: 'application_p1.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1,
+    kind: 'firmware',
+  },
+  APPLICATION_P2: {
+    fileName: 'application_p2.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2,
+    kind: 'firmware',
+  },
+  COPROCESSOR: {
+    fileName: 'coprocessor.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR,
+    kind: 'firmware',
+  },
+  SE01: {
+    fileName: 'se01.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01,
+    kind: 'firmware',
+  },
+  SE02: {
+    fileName: 'se02.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02,
+    kind: 'firmware',
+  },
+  SE03: {
+    fileName: 'se03.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03,
+    kind: 'firmware',
+  },
+  SE04: {
+    fileName: 'se04.bin',
+    targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04,
+    kind: 'firmware',
+  },
+};
+
+const PROTOCOL_V2_ROMLOADER_UNSUPPORTED_MESSAGE =
+  'FW_MGMT_TARGET_ROMLOADER is not accepted by the current Pro2 bootloader update request. Flash romloader with the loader-specific flow instead of firmwareUpdateV4.';
+
+// hd-transport 的历史 decode 行为会把单值 enum 输出为枚举名字符串；
+// Protocol V2 沿用这个 SDK 语义，内部比较前再映射回固件协议数值。
+const PROTOCOL_V2_TARGET_ID_BY_DECODED_NAME = new Map<string, number>(
+  Object.entries(ProtocolV2FirmwareTargetType).map(([key, value]) => [key, value])
+);
+const PROTOCOL_V2_TARGET_STATUS_BY_DECODED_NAME = new Map<string, number>([
+  ['FW_MGMT_UPDATER_TASK_STATUS_PENDING', PROTOCOL_V2_TARGET_STATUS_PENDING],
+  ['FW_MGMT_UPDATER_TASK_STATUS_IN_PROGRESS', PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FINISHED', PROTOCOL_V2_TARGET_STATUS_FINISHED],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_FILE_NOT_FOUND', 3],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_FILE_READ', 4],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_FILE_WRITE', 5],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_VERIFY', 6],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_INSTALL', 7],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_ABORT', 8],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_BUSY', 9],
+  ['FW_MGMT_UPDATER_TASK_STATUS_FAILED_ENTRY_OUT_OF_BOUNDS', 10],
+]);
+
 const isProtocolV2ReconnectProbeError = (error: unknown) => {
   const message = getProtocolV2UnknownErrorText(error).toLowerCase();
   return (
@@ -67,19 +223,165 @@ const isProtocolV2PollingTransientError = (error: unknown) => {
   return (
     isProtocolV2DeviceDisconnectedError(error) ||
     isProtocolV2ReconnectProbeError(error) ||
-    (message.includes('response timeout') && message.includes('devicegetfirmwareupdatestatus')) ||
+    message.includes('libusb_transfer_timed_out') ||
+    (message.includes('response timeout') && message.includes('devicefirmwareupdatestatusget')) ||
     message.includes('device not found') ||
     message.includes('transportnotfound')
   );
 };
 
+const isProtocolV2StartUpdateTransientError = (error: unknown) => {
+  const message = getProtocolV2UnknownErrorText(error).toLowerCase();
+  return (
+    isProtocolV2DeviceDisconnectedError(error) ||
+    isProtocolV2ReconnectProbeError(error) ||
+    message.includes('libusb_transfer_timed_out') ||
+    (message.includes('response timeout') && message.includes('devicefirmwareupdaterequest'))
+  );
+};
+
+const isProtocolV2TargetStatusFinished = (status: ProtocolV2FirmwareUpdateStatusTarget['status']) =>
+  normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_FINISHED;
+
+const isProtocolV2TargetStatusInProgress = (
+  status: ProtocolV2FirmwareUpdateStatusTarget['status']
+) =>
+  normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_PENDING ||
+  normalizeProtocolV2TargetStatus(status) === PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS;
+
+const isProtocolV2TargetStatusFailed = (status: ProtocolV2FirmwareUpdateStatusTarget['status']) => {
+  const normalizedStatus = normalizeProtocolV2TargetStatus(status);
+  return (
+    typeof normalizedStatus === 'number' && normalizedStatus >= PROTOCOL_V2_TARGET_STATUS_FAILED_MIN
+  );
+};
+
+const normalizeProtocolV2TargetId = (targetId: number | string) => {
+  if (typeof targetId === 'number') {
+    return targetId;
+  }
+  return PROTOCOL_V2_TARGET_ID_BY_DECODED_NAME.get(targetId);
+};
+
+const normalizeProtocolV2TargetStatus = (
+  status: ProtocolV2FirmwareUpdateStatusTarget['status']
+) => {
+  if (typeof status === 'number') {
+    return status;
+  }
+  if (typeof status === 'string') {
+    return PROTOCOL_V2_TARGET_STATUS_BY_DECODED_NAME.get(status);
+  }
+  return undefined;
+};
+
+const normalizeProtocolV2Hex = (value?: string) => value?.replace(/^0x/i, '').toLowerCase();
+
+const versionArrayToNumber = (version?: IVersionArray) => {
+  if (!version) return undefined;
+  return version[0] * 0x10000 + version[1] * 0x100 + version[2];
+};
+
+const versionStringToArray = (version?: string | null): IVersionArray | undefined => {
+  if (!version) return undefined;
+  const parts = version.split('.').map(part => Number(part));
+  if (parts.length !== 3 || parts.some(part => !Number.isFinite(part))) return undefined;
+  return parts as IVersionArray;
+};
+
+const compareProtocolV2Versions = (current?: IVersionArray, target?: IVersionArray) => {
+  const currentNumber = versionArrayToNumber(current);
+  const targetNumber = versionArrayToNumber(target);
+  if (currentNumber === undefined || targetNumber === undefined) return undefined;
+  return currentNumber - targetNumber;
+};
+
+const bytesToHex = (bytes: Uint8Array) =>
+  Array.from(bytes)
+    .map(byte => byte.toString(16).padStart(2, '0'))
+    .join('');
+
+const hexToProtocolV2Bytes = (hex: string) => {
+  const normalized = hex.replace(/^0x/i, '');
+  if (!normalized || normalized.length % 2 !== 0 || /[^0-9a-f]/i.test(normalized)) {
+    return new Uint8Array(0);
+  }
+  const bytes = new Uint8Array(normalized.length / 2);
+  for (let i = 0; i < bytes.length; i++) {
+    bytes[i] = Number.parseInt(normalized.slice(i * 2, i * 2 + 2), 16);
+  }
+  return bytes;
+};
+
+const toProtocolV2Bytes = (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') return hexToProtocolV2Bytes(value);
+  return new Uint8Array(0);
+};
+
+const toProtocolV2FiniteNumber = (value: unknown) => {
+  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;
+};
+
+const readProtocolV2Ascii = (bytes: Uint8Array, offset: number, length: number) =>
+  Array.from(bytes.slice(offset, offset + length))
+    .map(byte => String.fromCharCode(byte))
+    .join('');
+
+const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | null => {
+  if (bytes.byteLength < PROTOCOL_V2_OKPP_HEADER_SIZE) return null;
+  if (readProtocolV2Ascii(bytes, 0, 4) !== 'OKPP') return null;
+
+  const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+  const headerLen = view.getUint32(0x0c, true);
+  if (headerLen !== PROTOCOL_V2_OKPP_HEADER_SIZE) return null;
+
+  const packedVersion = view.getUint32(0x10, true);
+  return {
+    type: readProtocolV2Ascii(bytes, 0x08, 4),
+    version: [
+      Math.floor(packedVersion / 0x10000) % 0x100,
+      Math.floor(packedVersion / 0x100) % 0x100,
+      packedVersion % 0x100,
+    ],
+    payloadHash: bytesToHex(
+      bytes.slice(
+        PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET,
+        PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET + PROTOCOL_V2_OKPP_HASH_SIZE
+      )
+    ),
+    headerHash: bytesToHex(
+      bytes.slice(
+        PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET,
+        PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET + PROTOCOL_V2_OKPP_HASH_SIZE
+      )
+    ),
+  };
+};
+
 /**
  * FirmwareUpdateV4 is the complete Protocol V2 firmware update flow.
  *
  * It intentionally does not fall back to FirmwareUpdateV3/V1 behavior:
  * - upload uses FilesystemFileWrite
- * - install uses DevFirmwareUpdate
- * - completion reboots to normal, then polls Ping
+ * - install uses DeviceFirmwareUpdateRequest
+ * - completion waits for target status to finish, reboots to normal, then polls DeviceInfo
  */
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {
   init() {
@@ -90,15 +392,22 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     const { payload } = this;
 
+    if (typeof payload.retryCount !== 'number') {
+      payload.retryCount = PROTOCOL_V2_CONNECT_RETRY_COUNT;
+    }
+    if (typeof payload.pollIntervalTime !== 'number') {
+      payload.pollIntervalTime = PROTOCOL_V2_CONNECT_POLL_INTERVAL;
+    }
+    if (typeof payload.timeout !== 'number') {
+      payload.timeout = PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT;
+    }
+    if (typeof payload.protocolV2DeviceInfoTimeoutMs !== 'number') {
+      payload.protocolV2DeviceInfoTimeoutMs = PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT;
+    }
+
     validateParams(payload, [
-      { name: 'bleVersion', type: 'array' },
-      { name: 'bleBinary', type: 'buffer' },
       { name: 'chunkSize', type: 'number' },
-      { name: 'firmwareVersion', type: 'array' },
-      { name: 'firmwareBinary', type: 'buffer' },
-      { name: 'resourceBinary', type: 'buffer' },
       { name: 'forcedUpdateRes', type: 'boolean' },
-      { name: 'bootloaderVersion', type: 'array' },
       { name: 'bootloaderBinary', type: 'buffer' },
       { name: 'romloaderBinary', type: 'buffer' },
       { name: 'applicationP1Binary', type: 'buffer' },
@@ -110,15 +419,12 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       { name: 'se04Binary', type: 'buffer' },
       { name: 'firmwareType', type: 'string' },
       { name: 'platform', type: 'string' },
+      { name: 'resourceBundleFiles', type: 'array', allowEmpty: true },
     ]);
 
     this.params = {
-      bleBinary: payload.bleBinary,
       chunkSize: payload.chunkSize,
-      firmwareBinary: payload.firmwareBinary,
       forcedUpdateRes: payload.forcedUpdateRes,
-      bleVersion: payload.bleVersion,
-      bootloaderVersion: payload.bootloaderVersion,
       bootloaderBinary: payload.bootloaderBinary,
       romloaderBinary: payload.romloaderBinary,
       applicationP1Binary: payload.applicationP1Binary,
@@ -128,8 +434,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       se02Binary: payload.se02Binary,
       se03Binary: payload.se03Binary,
       se04Binary: payload.se04Binary,
-      firmwareVersion: payload.firmwareVersion,
-      resourceBinary: payload.resourceBinary,
+      resourceBundleFiles: payload.resourceBundleFiles,
       firmwareType: payload.firmwareType,
       platform: payload.platform,
     };
@@ -164,39 +469,47 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   }
 
   private async runProtocolV2() {
-    const legacyFeatures = await this.getProtocolV2LegacyFeatures();
-    const deviceFirmwareType = getFirmwareType(legacyFeatures);
+    const deviceFeatures = await this.getProtocolV2DeviceFeatures();
+    const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
 
-    let resourceBinary: ArrayBuffer | null = null;
-    let fwBinaryMap: { fileName: string; binary: ArrayBuffer; targetId?: number }[] = [];
+    let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
+    let installItems: ProtocolV2InstallItem[] | undefined;
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
-      resourceBinary = await this.prepareResourceBinary(firmwareType, legacyFeatures);
-      fwBinaryMap = await this.prepareFirmwareAndBleBinary(firmwareType, legacyFeatures);
-      bootloaderBinary = await this.prepareBootloaderBinary(firmwareType, legacyFeatures);
-      // 按 DevFirmwareTargetType 拆分的目标二进制（显式 target_id，不走文件名推断）
-      fwBinaryMap.push(...this.collectExplicitTargetBinaries());
+      fwBinaryMap = this.collectExplicitTargetBinaries();
+      bootloaderBinary = this.prepareBootloaderBinary();
+      if (!this.hasExplicitProtocolV2Payload(fwBinaryMap)) {
+        const remoteBinaries = await this.prepareRemoteProtocolV2Binaries(
+          firmwareType,
+          deviceFeatures
+        );
+        bootloaderBinary = remoteBinaries.bootloaderBinary;
+        fwBinaryMap = remoteBinaries.fwBinaryMap;
+        installItems = remoteBinaries.installItems;
+      }
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
     }
 
-    if (!resourceBinary && !bootloaderBinary && fwBinaryMap.length === 0) {
+    const resourceBundles = this.prepareProtocolV2ResourceBundles(firmwareType, deviceFeatures);
+
+    if (!bootloaderBinary && fwBinaryMap.length === 0 && !resourceBundles?.length) {
       throw ERRORS.TypedError(
         HardwareErrorCode.FirmwareUpdateDownloadFailed,
         'No firmware to update'
       );
     }
 
-    // TODO: 当前 firmware-pro2 子模块的 reboot/bootloader 流程还未稳定，先暂停自动进 bootloader。
-    // await this.enterProtocolV2BootloaderMode();
+    await this.enterProtocolV2BootloaderMode();
 
     await this.executeProtocolV2Update({
-      resourceBinary,
       fwBinaryMap,
       bootloaderBinary,
+      ...(installItems ? { installItems } : undefined),
+      ...(resourceBundles?.length ? { resourceBundles } : undefined),
     });
 
     await this.exitProtocolV2BootloaderToNormal();
@@ -208,77 +521,447 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return versions;
   }
 
-  private async getProtocolV2LegacyFeatures() {
-    if (typeof this.device.getFeatures === 'function') {
-      return this.device.getFeatures();
-    }
+  private async getProtocolV2DeviceFeatures(): Promise<Features> {
     if (this.device.features) {
       return this.device.features;
     }
+    if (typeof this.device.getFeatures === 'function') {
+      const features = await this.device.getFeatures();
+      if (features) return features;
+    }
     throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'Device features not available');
   }
 
-  private async prepareResourceBinary(firmwareType: EFirmwareType, features: Features) {
-    if (this.params.resourceBinary) {
-      return this.params.resourceBinary;
+  private prepareBootloaderBinary(): ArrayBuffer | null {
+    return this.params.bootloaderBinary ?? null;
+  }
+
+  private hasExplicitProtocolV2Payload(fwBinaryMap: ProtocolV2TargetBinary[]) {
+    return (
+      !!this.params.resourceBundleFiles?.length ||
+      !!this.params.bootloaderBinary ||
+      fwBinaryMap.length > 0
+    );
+  }
+
+  private buildProtocolV2InstallItems({
+    bootloaderBinary,
+    fwBinaryMap,
+  }: {
+    bootloaderBinary: ArrayBuffer | null;
+    fwBinaryMap: ProtocolV2TargetBinary[];
+  }): ProtocolV2InstallItem[] {
+    const installItems: ProtocolV2InstallItem[] = [];
+
+    if (bootloaderBinary) {
+      installItems.push({
+        fileName: 'bootloader.bin',
+        binary: bootloaderBinary,
+        targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
+        kind: 'bootloader',
+      });
+    }
+
+    installItems.push(...fwBinaryMap.map(item => ({ ...item, kind: 'firmware' as const })));
+    return installItems;
+  }
+
+  private getRemoteComponentEntries(release: IFirmwareReleaseInfo) {
+    const { components } = release;
+    if (!components) return [];
+
+    const orderedKeys = [
+      ...(release.installOrder ?? []),
+      ...Object.keys(components).filter(key => !release.installOrder?.includes(key)),
+    ];
+
+    return orderedKeys
+      .map(key => {
+        const component = components[key];
+        return component ? ([key, component] as const) : undefined;
+      })
+      .filter((entry): entry is readonly [string, IProtocolV2FirmwareComponent] => !!entry);
+  }
+
+  private getRemoteComponentTarget(key: string, component: IProtocolV2FirmwareComponent) {
+    const targetName = component.target?.toUpperCase();
+    if (targetName === 'ROMLOADER') {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        PROTOCOL_V2_ROMLOADER_UNSUPPORTED_MESSAGE
+      );
+    }
+    const target = PROTOCOL_V2_REMOTE_COMPONENT_TARGETS[targetName];
+    if (!target) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Unsupported Protocol V2 firmware component target: ${key}/${component.target}`
+      );
+    }
+    return target;
+  }
+
+  private getProtocolV2ComponentTargetVersion(
+    release: IFirmwareReleaseInfo,
+    component: IProtocolV2FirmwareComponent,
+    target: ProtocolV2RemoteComponentTarget
+  ) {
+    if (component.version) return component.version;
+    if (target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER) {
+      return release.bootloaderVersion;
+    }
+    if (
+      target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1 ||
+      target.targetId === ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2
+    ) {
+      return release.version;
+    }
+    return undefined;
+  }
+
+  private getProtocolV2ComponentCurrentVersion(
+    features: Features,
+    target: ProtocolV2RemoteComponentTarget
+  ) {
+    switch (target.targetId) {
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER:
+        return getDeviceBootloaderVersion(features);
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1:
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2:
+        return getDeviceFirmwareVersion(features);
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR:
+        return getDeviceBLEFirmwareVersion(features);
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01:
+        return versionStringToArray(features.se01Version);
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02:
+        return versionStringToArray(features.se02Version);
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03:
+        return versionStringToArray(features.se03Version);
+      case ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04:
+        return versionStringToArray(features.se04Version);
+      default:
+        return undefined;
+    }
+  }
+
+  private isProtocolV2ComponentVersionSatisfied(
+    release: IFirmwareReleaseInfo,
+    component: IProtocolV2FirmwareComponent,
+    target: ProtocolV2RemoteComponentTarget,
+    features: Features
+  ) {
+    const targetVersion = this.getProtocolV2ComponentTargetVersion(release, component, target);
+    if (!targetVersion) return false;
+
+    const currentVersion = this.getProtocolV2ComponentCurrentVersion(features, target);
+    const compareResult = compareProtocolV2Versions(currentVersion, targetVersion);
+    return compareResult !== undefined && compareResult >= 0;
+  }
+
+  private getProtocolV2ResourceFilePath(path: string) {
+    if (path.startsWith('vol')) return path;
+    if (path.startsWith('/')) return `vol0:${path}`;
+    return `vol0:/${path}`;
+  }
+
+  private async readProtocolV2DeviceFileHeader(path: string) {
+    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    const filePath = this.getProtocolV2ResourceFilePath(path);
+    const pathInfoRes = await typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', {
+      path: filePath,
+    });
+    const fileSize = toProtocolV2FiniteNumber(pathInfoRes.message?.size);
+    if (
+      !pathInfoRes.message?.exist ||
+      pathInfoRes.message?.directory ||
+      fileSize === undefined ||
+      fileSize < PROTOCOL_V2_OKPP_HEADER_SIZE
+    ) {
+      return null;
     }
-    const resourceUrl = DataManager.getSysResourcesLatestRelease({
-      features,
-      forcedUpdateRes: this.params.forcedUpdateRes,
-      firmwareType,
+
+    const chunkSize = this.getProtocolV2FirmwareChunkSize();
+    const chunks: Uint8Array[] = [];
+    let offset = 0;
+    while (offset < PROTOCOL_V2_OKPP_HEADER_SIZE) {
+      const readLen = Math.min(chunkSize, PROTOCOL_V2_OKPP_HEADER_SIZE - offset);
+      const res = await typedCall('FilesystemFileRead', 'FilesystemFile', {
+        file: {
+          path: filePath,
+          offset,
+          total_size: 0,
+        },
+        chunk_len: readLen,
+        ui_percentage: undefined,
+      });
+      const data = toProtocolV2Bytes(res.message?.data);
+      if (data.byteLength === 0) return null;
+      chunks.push(data);
+      offset += data.byteLength;
+    }
+
+    const headerBytes = new Uint8Array(offset);
+    let cursor = 0;
+    chunks.forEach(chunk => {
+      headerBytes.set(chunk, cursor);
+      cursor += chunk.byteLength;
     });
+    return parseProtocolV2OkppHeader(headerBytes);
+  }
+
+  private shouldInstallRemoteProtocolV2Component(
+    release: IFirmwareReleaseInfo,
+    key: string,
+    component: IProtocolV2FirmwareComponent,
+    target: ProtocolV2RemoteComponentTarget,
+    features: Features
+  ) {
+    const versionSatisfied = this.isProtocolV2ComponentVersionSatisfied(
+      release,
+      component,
+      target,
+      features
+    );
+    if (versionSatisfied) {
+      Log.log(`[FirmwareUpdateV4] skip Protocol V2 component ${key}; version is up to date`);
+    }
+    return !versionSatisfied;
+  }
 
-    if (resourceUrl) {
-      const resource = (await getSysResourceBinary(resourceUrl)).binary;
-      return resource;
+  private async downloadRemoteProtocolV2Component(
+    key: string,
+    component: IProtocolV2FirmwareComponent
+  ): Promise<ProtocolV2RemoteComponentBinary> {
+    const target = this.getRemoteComponentTarget(key, component);
+    if (!component.url) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        `Missing Protocol V2 firmware component url: ${key}/${component.target}`
+      );
     }
-    Log.warn('No resource url found');
-    return null;
+
+    const { binary } = await getSysResourceBinary(component.url);
+    return {
+      ...target,
+      binary,
+    };
+  }
+
+  private async prepareRemoteProtocolV2Binaries(firmwareType: EFirmwareType, features: Features) {
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+
+    let bootloaderBinary: ArrayBuffer | null = null;
+    const fwBinaryMap: ProtocolV2TargetBinary[] = [];
+    const installItems: ProtocolV2InstallItem[] = [];
+
+    if (!release) {
+      return {
+        bootloaderBinary,
+        fwBinaryMap,
+        installItems,
+      };
+    }
+
+    const entries = this.getRemoteComponentEntries(release);
+
+    for (const [key, component] of entries) {
+      const target = this.getRemoteComponentTarget(key, component);
+      const shouldInstall = this.shouldInstallRemoteProtocolV2Component(
+        release,
+        key,
+        component,
+        target,
+        features
+      );
+      if (shouldInstall) {
+        const remoteBinary = await this.downloadRemoteProtocolV2Component(key, component);
+        if (remoteBinary.kind === 'bootloader') {
+          bootloaderBinary = remoteBinary.binary;
+          installItems.push({
+            fileName: remoteBinary.fileName,
+            binary: remoteBinary.binary,
+            targetId: remoteBinary.targetId,
+            kind: remoteBinary.kind,
+          });
+        } else {
+          const binaryEntry = {
+            fileName: remoteBinary.fileName,
+            binary: remoteBinary.binary,
+            targetId: remoteBinary.targetId,
+          };
+          fwBinaryMap.push(binaryEntry);
+          installItems.push({ ...binaryEntry, kind: remoteBinary.kind });
+        }
+      }
+    }
+
+    return {
+      bootloaderBinary,
+      fwBinaryMap,
+      installItems,
+    };
   }
 
-  private async prepareBootloaderBinary(
+  // ============================================================
+  // RESC bundle 直写增量同步（FileRead 比对 + FilesystemFileWrite 直写）
+  // ============================================================
+
+  /**
+   * 准备 RESC bundle 列表。
+   *
+   * 两种模式（同 FirmwareUpdateV3 的 binary vs version 模式）：
+   * - 用户传了 resourceBundleFiles（binary 数组）：直接用，不做版本比对。
+   * - 用户没传：从远端 config.json 的 release.resourceBundles 拉取，
+   *   此时 syncProtocolV2ResourceBundles 会按需下载 + 比对设备已有 header 跳过。
+   */
+  private prepareProtocolV2ResourceBundles(
     firmwareType: EFirmwareType,
     features: Features
-  ): Promise<ArrayBuffer | null> {
-    if (this.params.bootloaderBinary) {
-      return this.params.bootloaderBinary;
+  ): ProtocolV2ResourceBundleBinary[] | undefined {
+    // 模式1：用户手动传入 binary，直接安装，不比对
+    if (this.params.resourceBundleFiles?.length) {
+      return this.params.resourceBundleFiles.map(file => ({
+        name: file.devicePath.split('/').pop() ?? file.devicePath,
+        binary: file.binary,
+        devicePath: file.devicePath,
+      }));
     }
 
-    if (this.params.bootloaderVersion) {
-      const bootResourceUrl = DataManager.getBootloaderResource(features, firmwareType);
-      if (bootResourceUrl) {
-        const bootBinary = (await getSysResourceBinary(bootResourceUrl)).binary;
-        return bootBinary;
+    // 模式2：远端配置模式，后续按需下载 + 比对
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+    if (!release?.resourceBundles?.length) return undefined;
+
+    return release.resourceBundles.map(bundle => ({
+      name: bundle.name,
+      binary: new ArrayBuffer(0),
+      devicePath: bundle.devicePath,
+      url: bundle.url,
+      version: bundle.version,
+      payloadHash: bundle.payloadHash,
+      headerHash: bundle.headerHash,
+    })) as ProtocolV2ResourceBundleBinary[];
+  }
+
+  /**
+   * 同步 RESC bundles 到设备。
+   *
+   * 手动传入模式（有 binary）：直接 FileWrite 直写，不比对。
+   * 远端配置模式（无 binary，有 url）：按需下载 + FileRead 比对跳过已更新的。
+   */
+  private async syncProtocolV2ResourceBundles(
+    bundles: ProtocolV2ResourceBundleBinary[],
+    firmwareSize: number
+  ): Promise<{ processedSize: number; totalSize: number }> {
+    const transferStartTime = Date.now();
+    const transferTransport = this.getProtocolV2FirmwareTransferTransport();
+
+    const isManualMode = bundles.every(b => b.binary.byteLength > 0);
+    let bundlesToSync = bundles;
+
+    // 远端配置模式：按需下载 + 比对跳过
+    if (!isManualMode) {
+      const filtered: ProtocolV2ResourceBundleBinary[] = [];
+      for (const bundle of bundles) {
+        // 下载 binary
+        if (bundle.binary.byteLength === 0 && bundle.url) {
+          Log.log(`[FirmwareUpdateV4] downloading RESC bundle ${bundle.name} from ${bundle.url}`);
+          const { binary } = await getSysResourceBinary(bundle.url);
+          bundle.binary = binary;
+        }
+        // 比对设备上已有 header
+        const upToDate = await this.isProtocolV2ResourceBundleUpToDate(bundle);
+        if (upToDate) {
+          Log.log(`[FirmwareUpdateV4] skip RESC bundle ${bundle.name}; already up to date`);
+        } else {
+          filtered.push(bundle);
+        }
       }
+      bundlesToSync = filtered;
+    }
+
+    if (bundlesToSync.length === 0) {
+      Log.log('[FirmwareUpdateV4] all RESC bundles up to date, nothing to sync');
+      return { processedSize: 0, totalSize: firmwareSize };
+    }
+
+    // FileWrite 直写到设备
+    let totalSize = 0;
+    for (const b of bundlesToSync) totalSize += b.binary.byteLength;
+
+    const transferTotalSize = totalSize + firmwareSize;
+    let processedSize = 0;
+    for (const bundle of bundlesToSync) {
+      Log.log(
+        `[FirmwareUpdateV4] syncing RESC bundle ${bundle.name} -> ${bundle.devicePath} bytes=${bundle.binary.byteLength}`
+      );
+      processedSize = await this.protocolV2CommonUpdateProcess({
+        payload: bundle.binary,
+        filePath: bundle.devicePath,
+        processedSize,
+        totalSize: transferTotalSize,
+      });
+    }
+
+    const elapsedMs = Date.now() - transferStartTime;
+    Log.log(
+      `[FirmwareUpdateV4] RESC bundle sync finished transport=${transferTransport} bytes=${totalSize} elapsed=${(
+        elapsedMs / 1000
+      ).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(totalSize, elapsedMs)} KB/s`
+    );
+    return { processedSize, totalSize: transferTotalSize };
+  }
+
+  /**
+   * 比对设备上已有 okpkg 的 OKPP header（仅远端配置模式使用）。
+   */
+  private async isProtocolV2ResourceBundleUpToDate(
+    bundle: ProtocolV2ResourceBundleBinary
+  ): Promise<boolean> {
+    if (this.params.forcedUpdateRes) return false;
+    if (!bundle.version && !bundle.payloadHash) return false;
+
+    try {
+      const header = await this.readProtocolV2DeviceFileHeader(bundle.devicePath);
+      if (!header) return false;
+
+      if (bundle.version) {
+        const cmp = compareProtocolV2Versions(header.version, bundle.version);
+        if (cmp === undefined || cmp !== 0) return false;
+      }
+      if (bundle.payloadHash) {
+        const expected = normalizeProtocolV2Hex(bundle.payloadHash);
+        if (expected && header.payloadHash !== expected) return false;
+      }
+      if (bundle.headerHash) {
+        const expected = normalizeProtocolV2Hex(bundle.headerHash);
+        if (expected && header.headerHash !== expected) return false;
+      }
+      return true;
+    } catch (error) {
+      Log.log(`[FirmwareUpdateV4] RESC bundle ${bundle.name} header check failed: `, error);
+      return false;
     }
-    return null;
   }
 
   private isProtocolV2BootloaderMode() {
     if (typeof this.device.isBootloader === 'function') {
       return this.device.isBootloader();
     }
-    const profile = this.device.profile;
-    if (profile?.status?.mode === 'bootloader' || profile?.status?.bootloaderMode === true) {
-      return true;
-    }
-    return !!this.device.features?.bootloader_mode;
+    return !!this.device.features?.bootloaderMode;
   }
 
   async enterProtocolV2BootloaderMode() {
     if (this.isProtocolV2BootloaderMode()) {
+      Log.debug('Protocol V2 device is already in bootloader mode, skip reboot to bootloader');
       return false;
     }
 
     try {
       this.postTipMessage(FirmwareUpdateTipMessage.AutoRebootToBootloader);
-      await this.protocolV2Reboot(DevRebootType.Bootloader);
+      await this.protocolV2Reboot(DeviceRebootType.Bootloader);
       this.postTipMessage(FirmwareUpdateTipMessage.GoToBootloaderSuccess);
-      this.checkDeviceToBootloader(this.payload.connectId);
-      await this.checkPromise?.promise;
-      this.checkPromise = null;
-      await wait(1500);
-      await this.device.acquire?.();
+      await wait(1000);
+      await this.waitForProtocolV2BootloaderMode();
       return true;
     } catch (error) {
       if (error instanceof HardwareError) {
@@ -289,164 +972,208 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
   }
 
+  private async waitForProtocolV2BootloaderMode(
+    timeout = PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT,
+    retryInterval = 1000
+  ) {
+    const startTime = Date.now();
+    let lastError: unknown;
+
+    while (Date.now() - startTime < timeout) {
+      try {
+        await this.reconnectProtocolV2Device();
+        const deviceInfo = await requestProtocolV2DeviceInfo({
+          commands: this.device.getCommands(),
+          timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
+        });
+        const features = this.device.updateProtocolV2Features(deviceInfo);
+        if (features?.bootloaderMode) {
+          return features;
+        }
+        lastError = new Error('Protocol V2 device is reachable but is not in bootloader mode');
+      } catch (error) {
+        lastError = error;
+        Log.log('Protocol V2 bootloader mode not ready, polling reconnect: ', error);
+      }
+      await wait(retryInterval);
+    }
+
+    throw ERRORS.TypedError(
+      HardwareErrorCode.FirmwareUpdateAutoEnterBootFailure,
+      `Protocol V2 bootloader not ready within ${timeout / 1000}s: ${this.normalizeErrorMessage(
+        lastError
+      )}`
+    );
+  }
+
   /**
-   * 收集按 DevFirmwareTargetType 拆分的显式目标二进制。
+   * 收集按 DeviceFirmwareTargetType 拆分的显式目标二进制。
    * 文件名仅用于 staging 路径展示，target_id 已显式给定。
    */
   private collectExplicitTargetBinaries() {
-    const entries: { fileName: string; binary: ArrayBuffer; targetId: number }[] = [];
+    const entries: ProtocolV2TargetBinary[] = [];
     const push = (binary: ArrayBuffer | undefined, fileName: string, targetId: number) => {
       if (binary) entries.push({ fileName, binary, targetId });
     };
 
-    push(
-      this.params.romloaderBinary,
-      'romloader.bin',
-      ProtocolV2FirmwareTargetType.TARGET_MAIN_BOOT
-    );
+    if (this.params.romloaderBinary) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.RuntimeError,
+        PROTOCOL_V2_ROMLOADER_UNSUPPORTED_MESSAGE
+      );
+    }
     push(
       this.params.applicationP1Binary,
       'application_p1.bin',
-      ProtocolV2FirmwareTargetType.TARGET_MAIN_APP
+      ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1
     );
     push(
       this.params.applicationP2Binary,
       'application_p2.bin',
-      ProtocolV2FirmwareTargetType.TARGET_MAIN_APP
+      ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2
     );
     push(
       this.params.coprocessorBinary,
       'coprocessor.bin',
-      ProtocolV2FirmwareTargetType.TARGET_BT
+      ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR
     );
-    push(this.params.se01Binary, 'se01.bin', ProtocolV2FirmwareTargetType.TARGET_SE1);
-    push(this.params.se02Binary, 'se02.bin', ProtocolV2FirmwareTargetType.TARGET_SE2);
-    push(this.params.se03Binary, 'se03.bin', ProtocolV2FirmwareTargetType.TARGET_SE3);
-    push(this.params.se04Binary, 'se04.bin', ProtocolV2FirmwareTargetType.TARGET_SE4);
+    push(this.params.se01Binary, 'se01.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01);
+    push(this.params.se02Binary, 'se02.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE02);
+    push(this.params.se03Binary, 'se03.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE03);
+    push(this.params.se04Binary, 'se04.bin', ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE04);
     return entries;
   }
 
-  private async prepareFirmwareAndBleBinary(firmwareType: EFirmwareType, features: Features) {
-    const fwBinaryMap: { fileName: string; binary: ArrayBuffer; targetId?: number }[] = [];
-    if (this.params.firmwareBinary) {
-      fwBinaryMap.push({
-        fileName: 'firmware.bin',
-        binary: this.params.firmwareBinary,
-      });
-    } else if (this.params.firmwareVersion) {
-      const firmwareBinary = (
-        await getBinary({
-          features,
-          version: this.params.firmwareVersion,
-          updateType: 'firmware',
-          isUpdateBootloader: false,
-          firmwareType,
-        })
-      ).binary;
-      fwBinaryMap.push({
-        fileName: 'firmware.bin',
-        binary: firmwareBinary,
-      });
-    }
-
-    if (this.params.bleBinary) {
-      fwBinaryMap.push({
-        fileName: 'ble-firmware.bin',
-        binary: this.params.bleBinary,
-      });
-    } else if (this.params.bleVersion) {
-      const bleBinary = await getBinary({
-        features,
-        version: this.params.bleVersion,
-        updateType: 'ble',
-        firmwareType,
-      });
-      fwBinaryMap.push({
-        fileName: 'ble-firmware.bin',
-        binary: bleBinary.binary,
-      });
-    }
-
-    return fwBinaryMap;
-  }
-
   private async executeProtocolV2Update({
-    resourceBinary,
     fwBinaryMap,
     bootloaderBinary,
+    installItems,
+    resourceBundles,
   }: {
-    resourceBinary: ArrayBuffer | null;
-    fwBinaryMap: { fileName: string; binary: ArrayBuffer; targetId?: number }[];
-    bootloaderBinary: ArrayBuffer | null;
+    fwBinaryMap?: ProtocolV2TargetBinary[];
+    bootloaderBinary?: ArrayBuffer | null;
+    installItems?: ProtocolV2InstallItem[];
+    resourceBundles?: ProtocolV2ResourceBundleBinary[];
   }) {
-    let totalSize = 0;
-    let processedSize = 0;
+    const orderedInstallItems =
+      installItems ??
+      this.buildProtocolV2InstallItems({
+        bootloaderBinary: bootloaderBinary ?? null,
+        fwBinaryMap: fwBinaryMap ?? [],
+      });
 
-    if (resourceBinary) totalSize += resourceBinary.byteLength;
-    for (const fwbinary of fwBinaryMap) totalSize += fwbinary.binary.byteLength;
-    if (bootloaderBinary) totalSize += bootloaderBinary.byteLength;
+    let firmwareSize = 0;
+    for (const item of orderedInstallItems) firmwareSize += item.binary.byteLength;
 
     this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
 
-    const targets: Array<{ target_id: number; path: string }> = [];
-
-    if (resourceBinary) {
-      // resource 仅支持单文件 .bin：整文件一次上传，target path 指向该文件
-      const resourceFilePath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}resource.bin`;
-      processedSize = await this.protocolV2CommonUpdateProcess({
-        payload: resourceBinary,
-        filePath: resourceFilePath,
-        processedSize,
-        totalSize,
-      });
-      targets.push({
-        target_id: ProtocolV2FirmwareTargetType.TARGET_RESOURCE,
-        path: resourceFilePath,
-      });
+    let processedSize = 0;
+    let totalSize = firmwareSize;
+    if (resourceBundles?.length) {
+      const resourceTransfer = await this.syncProtocolV2ResourceBundles(
+        resourceBundles,
+        firmwareSize
+      );
+      processedSize = resourceTransfer.processedSize;
+      totalSize = resourceTransfer.totalSize;
     }
 
-    if (bootloaderBinary) {
-      const bootloaderPath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}bootloader.bin`;
-      processedSize = await this.protocolV2CommonUpdateProcess({
-        payload: bootloaderBinary,
-        filePath: bootloaderPath,
-        processedSize,
-        totalSize,
-      });
-      targets.push({
-        target_id: ProtocolV2FirmwareTargetType.TARGET_MAIN_BOOT,
-        path: bootloaderPath,
-      });
+    // 只有 RESC bundle、没有固件 target 时跳过 staging/install 阶段
+    if (orderedInstallItems.length === 0) {
+      Log.log('[FirmwareUpdateV4] no firmware targets to install (RESC bundles only)');
+      if (totalSize > 0) {
+        this.postProgressMessage(100, 'transferData');
+      }
+      return;
     }
+    let transferredSize = processedSize;
+    const transferStartTime = Date.now();
+    const transferTransport = this.getProtocolV2FirmwareTransferTransport();
+    const chunkSize = this.getProtocolV2FirmwareChunkSize();
+    const onTransferredBytes = (bytes: number) => {
+      transferredSize = bytes;
+    };
+    Log.log(
+      `[FirmwareUpdateV4] transfer started transport=${transferTransport} total=${totalSize} bytes chunk=${chunkSize} bytes`
+    );
 
-    for (const fwbinary of fwBinaryMap) {
-      const firmwarePath = `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${fwbinary.fileName}`;
-      processedSize = await this.protocolV2CommonUpdateProcess({
-        payload: fwbinary.binary,
-        filePath: firmwarePath,
-        processedSize,
-        totalSize,
-      });
-      targets.push({
-        target_id: fwbinary.targetId ?? protocolV2FileNameToTargetId(fwbinary.fileName),
-        path: firmwarePath,
-      });
-    }
+    const stagedInstallTargets: ProtocolV2InstallTarget[] = [];
 
-    if (totalSize > 0) {
-      this.postProgressMessage(100, 'transferData');
+    try {
+      for (const item of orderedInstallItems) {
+        const filePath = this.getProtocolV2InstallItemStagingPath(item);
+        Log.log(
+          `[FirmwareUpdateV4] staging ${item.kind} via FilesystemFileWrite target=${item.targetId} path=${filePath} source=${item.fileName} bytes=${item.binary.byteLength}`
+        );
+        processedSize = await this.protocolV2CommonUpdateProcess({
+          payload: item.binary,
+          filePath,
+          processedSize,
+          totalSize,
+          onTransferredBytes,
+        });
+        transferredSize = processedSize;
+        await this.verifyProtocolV2StagedFile(filePath, item.binary.byteLength);
+
+        stagedInstallTargets.push({
+          ...item,
+          path: filePath,
+        });
+      }
+
+      if (totalSize > 0) {
+        this.postProgressMessage(100, 'transferData');
+      }
+
+      const elapsedMs = Date.now() - transferStartTime;
+      Log.log(
+        `[FirmwareUpdateV4] transfer finished transport=${transferTransport} bytes=${totalSize} elapsed=${(
+          elapsedMs / 1000
+        ).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(totalSize, elapsedMs)} KB/s`
+      );
+    } catch (error) {
+      const elapsedMs = Date.now() - transferStartTime;
+      Log.warn(
+        `[FirmwareUpdateV4] transfer failed transport=${transferTransport} bytes=${transferredSize}/${totalSize} elapsed=${(
+          elapsedMs / 1000
+        ).toFixed(2)}s speed=${formatProtocolV2TransferSpeed(transferredSize, elapsedMs)} KB/s`
+      );
+      throw error;
     }
 
     this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
-    const startResponse = await this.protocolV2StartFirmwareUpdate({ targets });
-    await this.waitForProtocolV2FirmwareUpdateComplete(targets, startResponse);
+
+    const allTargets = stagedInstallTargets.map(item => ({
+      target_id: item.targetId,
+      path: item.path,
+    }));
+    Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(allTargets)}`);
+    const startResponse = await this.protocolV2StartFirmwareUpdate({ targets: allTargets });
+    await this.waitForProtocolV2FirmwareUpdateComplete(allTargets, startResponse);
+  }
+
+  private getProtocolV2InstallItemStagingPath(item: ProtocolV2InstallItem) {
+    return `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${item.fileName}`;
+  }
+
+  private async verifyProtocolV2StagedFile(path: string, expectedSize: number) {
+    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    const response = await typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', { path });
+    const actualSize = toProtocolV2FiniteNumber(response.message?.size);
+    if (!response.message?.exist || response.message?.directory || actualSize !== expectedSize) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.EmmcFileWriteFirmwareError,
+        `staged file verification failed: path=${path} exist=${!!response.message
+          ?.exist} expected=${expectedSize} actual=${actualSize ?? 'unknown'}`
+      );
+    }
   }
 
   private async queryProtocolV2FirmwareUpdateStatus() {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
     return typedCall(
-      'DevGetFirmwareUpdateStatus',
-      'DevFirmwareUpdateStatus',
+      'DeviceFirmwareUpdateStatusGet',
+      'DeviceFirmwareUpdateStatus',
       {},
       {
         timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
@@ -466,14 +1193,32 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     );
   }
 
+  private isProtocolV2NormalModeFeatures(features?: Features | null) {
+    return !!features && !features.bootloaderMode && features.mode !== 'bootloader';
+  }
+
+  private async probeProtocolV2NormalMode() {
+    const deviceInfo = await requestProtocolV2DeviceInfo({
+      commands: this.device.getCommands(),
+      timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
+      request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
+    });
+    const features = this.device.updateProtocolV2Features(deviceInfo);
+    if (this.isProtocolV2NormalModeFeatures(features)) {
+      Log.log('Protocol V2 firmware install finished; device is back in normal mode');
+      return true;
+    }
+    return false;
+  }
+
   private assertProtocolV2TargetStatus(
     statusTargets: ProtocolV2FirmwareUpdateStatusTarget[],
     expectedTargetIds: Set<number>
   ) {
     const failedTarget = statusTargets.find(
       target =>
-        expectedTargetIds.has(target.target_id) &&
-        target.status === PROTOCOL_V2_TARGET_STATUS_FAILED
+        expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1) &&
+        isProtocolV2TargetStatusFailed(target.status)
     );
     if (failedTarget) {
       throw ERRORS.TypedError(
@@ -484,8 +1229,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     const completedTargets = statusTargets.filter(
       target =>
-        expectedTargetIds.has(target.target_id) &&
-        target.status === PROTOCOL_V2_TARGET_STATUS_FINISHED
+        expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1) &&
+        isProtocolV2TargetStatusFinished(target.status)
     );
     if (completedTargets.length === expectedTargetIds.size && expectedTargetIds.size > 0) {
       return true;
@@ -493,8 +1238,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     const inProgressTarget = statusTargets.find(
       target =>
-        expectedTargetIds.has(target.target_id) &&
-        target.status === PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS
+        expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1) &&
+        isProtocolV2TargetStatusInProgress(target.status)
     );
     if (inProgressTarget) {
       this.postProgressMessage(99, 'installingFirmware');
@@ -508,11 +1253,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     startResponse?: ProtocolV2FirmwareUpdateStartResponse
   ) {
     const expectedTargetIds = new Set(targets.map(target => target.target_id));
-    if (startResponse?.type === 'Success') {
-      return;
-    }
-    if (startResponse?.type === 'DevFirmwareUpdateStatus') {
-      const statusTargets = (startResponse.message.targets ??
+    if (startResponse?.type === 'DeviceFirmwareUpdateStatus') {
+      const statusTargets = (startResponse.message.records ??
         []) as ProtocolV2FirmwareUpdateStatusTarget[];
       if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds)) {
         return;
@@ -525,7 +1267,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
       try {
         const statusRes = await this.queryProtocolV2FirmwareUpdateStatus();
-        const statusTargets = (statusRes.message.targets ??
+        const statusTargets = (statusRes.message.records ??
           []) as ProtocolV2FirmwareUpdateStatusTarget[];
         if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds)) {
           return;
@@ -539,17 +1281,19 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         if (isProtocolV2PollingTransientError(error)) {
           try {
             await this.reconnectProtocolV2Device();
+            if (await this.probeProtocolV2NormalMode()) {
+              return;
+            }
           } catch (reconnectError) {
             lastError = reconnectError;
             Log.log(
-              'Protocol V2 firmware install reconnect/status polling failed: ',
+              'Protocol V2 firmware install reconnect/normal-mode probe failed: ',
               reconnectError
             );
           }
           try {
             await this.pingProtocolV2Device();
             Log.log('Protocol V2 firmware status unavailable, Ping is ready');
-            return;
           } catch (pingError) {
             lastError = pingError;
             Log.log('Protocol V2 firmware install Ping polling failed: ', pingError);
@@ -567,18 +1311,26 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private async exitProtocolV2BootloaderToNormal() {
     this.postTipMessage(FirmwareUpdateTipMessage.SwitchFirmwareReconnectDevice);
-    await this.protocolV2Reboot(DevRebootType.Normal);
+    try {
+      await this.reconnectProtocolV2Device();
+      if (await this.probeProtocolV2NormalMode()) {
+        Log.log('Protocol V2 device is already in normal mode, skip normal reboot');
+        return;
+      }
+    } catch (error) {
+      Log.log('Protocol V2 normal-mode probe before reboot failed: ', error);
+    }
+    await this.protocolV2Reboot(DeviceRebootType.Normal);
   }
 
   private async waitForProtocolV2FinalFeatures() {
-    const profile = await this.waitForProtocolV2ReconnectAndProfile(
+    const features = await this.waitForProtocolV2ReconnectAndFeatures(
       PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT
     );
-    this.device.updateProfile?.(profile);
 
-    const bootloaderVersion = profile.versions.bootloader ?? '0.0.0';
-    const bleVersion = profile.versions.ble ?? '0.0.0';
-    const firmwareVersion = profile.versions.firmware ?? '0.0.0';
+    const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
+    const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
+    const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
     if (firmwareVersion === '0.0.0') {
       Log.warn(
         'Protocol V2 firmware update finished but app firmware version is still 0.0.0. This is allowed for Pro2 debug BLE-only update flows.'
@@ -592,7 +1344,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     };
   }
 
-  private async waitForProtocolV2ReconnectAndProfile(timeout: number) {
+  private async waitForProtocolV2ReconnectAndFeatures(timeout: number) {
     const startTime = Date.now();
     let lastError: unknown;
 
@@ -605,12 +1357,14 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           // 更新完成判定只需要各 target 版本号；scope 与请求内容保持一致
           request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
         });
-        return buildProfileFromProtocolV2({
-          deviceInfo,
-          sources: ['deviceInfo'],
-          scope: 'versions',
-          fallbackSerialNo: this.device.originalDescriptor?.path,
-        });
+        const features = this.device.updateProtocolV2Features(deviceInfo);
+        if (features.bootloaderMode || features.mode === 'bootloader') {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.DeviceNotFound,
+            'Protocol V2 device is still in bootloader mode'
+          );
+        }
+        return features;
       } catch (error) {
         lastError = error;
         Log.log('Protocol V2 normal mode not ready, polling Ping: ', error);
@@ -635,27 +1389,75 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const deviceDiff = await this.device.deviceConnector?.enumerate();
     const devicesDescriptor = deviceDiff?.descriptors ?? [];
 
-    const { deviceList } = await DevicePool.getDevices(devicesDescriptor, this.connectId);
+    if (
+      DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
+      devicesDescriptor.length === 1
+    ) {
+      this.device.updateDescriptor(
+        {
+          ...devicesDescriptor[0],
+          protocolType: PROTOCOL_V2_CONNECT_PROTOCOL,
+        },
+        true
+      );
+      await this.device.acquire(PROTOCOL_V2_CONNECT_PROTOCOL, { throwOnRunPromiseError: true });
+      this.device.commands.disposed = false;
+      this.device.getCommands().mainId = this.device.mainId ?? '';
+      await this.device.initialize();
+      return;
+    }
+
+    // App 与 bootloader 序列号暂时可能不一致。V4 升级重连阶段只接受唯一枚举设备，
+    // 避免继续按旧 app connectId 查缓存导致反复输出 path mismatch 日志。
+    const { deviceList } = await DevicePool.getDevices(devicesDescriptor, undefined, {
+      connectProtocol: PROTOCOL_V2_CONNECT_PROTOCOL,
+    });
     if (deviceList.length !== 1) {
       throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound);
     }
 
+    Log.debug(
+      'Protocol V2 firmware reconnect using single enumerated device:',
+      deviceList[0].getConnectId()
+    );
     this.device.updateFromCache(deviceList[0]);
-    await this.device.acquire();
+    await this.device.acquire(PROTOCOL_V2_CONNECT_PROTOCOL, { throwOnRunPromiseError: true });
     this.device.commands.disposed = false;
     this.device.getCommands().mainId = this.device.mainId ?? '';
+    await this.device.initialize();
   }
 
-  private async protocolV2CommonUpdateProcess({
+  private async protocolV2CommonUpdateProcess(params: ProtocolV2FileTransferParams) {
+    let lastError: unknown;
+    for (let attempt = 1; attempt <= PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT; attempt += 1) {
+      try {
+        return await this.protocolV2WriteWholeFile(params);
+      } catch (error) {
+        lastError = error;
+        Log.error(
+          `Protocol V2 file transfer failed path=${params.filePath} attempt=${attempt}/${PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT}; restarting from offset 0`,
+          error
+        );
+        if (attempt === PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
+          break;
+        }
+        await this.recoverProtocolV2FileTransfer();
+      }
+    }
+
+    throw ERRORS.TypedError(
+      HardwareErrorCode.EmmcFileWriteFirmwareError,
+      `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`
+    );
+  }
+
+  private async protocolV2WriteWholeFile({
     payload,
     filePath,
     processedSize,
     totalSize,
-  }: PROTO.FirmwareUpload & {
-    filePath: string;
-    processedSize?: number;
-    totalSize?: number;
-  }) {
+    onTransferredBytes,
+  }: ProtocolV2FileTransferParams) {
     const chunkSize = this.getProtocolV2FirmwareChunkSize();
     let offset = 0;
     const getUploadProgress = (fileOffset: number) => {
@@ -670,9 +1472,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       const chunkLength = chunkEnd - offset;
       const chunk = payload.slice(offset, chunkEnd);
       const overwrite = offset === 0;
-      const progress = getUploadProgress(chunkEnd);
+      const progress = getProtocolV2DeviceTransferProgress(
+        (processedSize ?? 0) + offset,
+        (processedSize ?? 0) + chunkEnd,
+        totalSize ?? payload.byteLength
+      );
 
-      const writeRes = await this.fileWriteWithRetry(
+      const writeRes = await this.fileWriteChunk(
         filePath,
         payload.byteLength,
         offset,
@@ -692,13 +1498,28 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         );
       }
       offset = nextOffset;
+      onTransferredBytes?.((processedSize ?? 0) + offset);
       this.postProgressMessage(getUploadProgress(offset), 'transferData');
     }
 
     return totalSize !== undefined ? (processedSize ?? 0) + payload.byteLength : 0;
   }
 
-  private async fileWriteWithRetry(
+  private getProtocolV2FirmwareTransferTransport() {
+    const env = DataManager.getSettings('env');
+    if (env && DataManager.isBleConnect(env)) {
+      return 'BLE';
+    }
+    if (
+      env &&
+      (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env) || env === 'web')
+    ) {
+      return 'WebUSB';
+    }
+    return env ?? 'unknown';
+  }
+
+  private async fileWriteChunk(
     filePath: string,
     totalFileSize: number,
     offset: number,
@@ -706,57 +1527,37 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     overwrite: boolean,
     progress: number | null
   ): Promise<TypedResponseMessage<'FilesystemFile'>> {
-    const writeFunc = async () => {
-      const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-      const writeRes = await typedCall('FilesystemFileWrite', 'FilesystemFile', {
-        file: {
-          path: filePath,
-          offset,
-          total_size: totalFileSize,
-          data: chunk,
-        },
-        overwrite,
-        append: false,
-        ui_percentage: progress ?? undefined,
-      });
-      if (writeRes.type !== 'FilesystemFile') {
-        if ((writeRes as any).type === 'CallMethodError') {
-          if (((writeRes as any).message.error ?? '').indexOf(SESSION_ERROR) > -1) {
-            throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, SESSION_ERROR);
-          }
+    const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    const writeRes = await typedCall('FilesystemFileWrite', 'FilesystemFile', {
+      file: {
+        path: filePath,
+        offset,
+        total_size: totalFileSize,
+        data: chunk,
+      },
+      overwrite,
+      append: false,
+      ui_percentage: progress ?? undefined,
+    });
+    if (writeRes.type !== 'FilesystemFile') {
+      if ((writeRes as any).type === 'CallMethodError') {
+        if (((writeRes as any).message.error ?? '').indexOf(SESSION_ERROR) > -1) {
+          throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, SESSION_ERROR);
         }
-        throw ERRORS.TypedError(
-          HardwareErrorCode.EmmcFileWriteFirmwareError,
-          'transfer data error'
-        );
       }
-      return writeRes;
-    };
+      throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
+    }
+    return writeRes;
+  }
 
-    let retryCount = 10;
-    while (retryCount > 0) {
-      try {
-        const result = await writeFunc();
-        return result;
-      } catch (error) {
-        Log.error(`fileWrite error: `, error);
-        retryCount--;
-        if (retryCount === 0) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.EmmcFileWriteFirmwareError,
-            'transfer data error'
-          );
-        }
-        const env = DataManager.getSettings('env');
-        if (DataManager.isBleConnect(env)) {
-          await wait(3000);
-          await this.acquireProtocolV2BleDevice();
-          await this.device.initialize();
-        }
-        await wait(2000);
-      }
+  private async recoverProtocolV2FileTransfer() {
+    const env = DataManager.getSettings('env');
+    if (DataManager.isBleConnect(env)) {
+      await wait(3000);
+      await this.acquireProtocolV2BleDevice();
+      await this.device.initialize();
     }
-    throw ERRORS.TypedError(HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
+    await wait(2000);
   }
 
   private async acquireProtocolV2BleDevice() {
@@ -777,24 +1578,27 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     let response: ProtocolV2FirmwareUpdateStartResponse;
     try {
       response = await commands.typedCall(
-        'DevFirmwareUpdate',
+        'DeviceFirmwareUpdateRequest',
         PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES,
         {
           targets,
         },
         {
-          intermediateTypes: ['DevFirmwareInstallProgress'],
-          onIntermediateResponse: (response: { message?: { progress?: number } }) => {
-            const progress = Number(response.message?.progress);
-            if (Number.isFinite(progress)) {
-              this.postProgressMessage(Math.min(progress, 99), 'installingFirmware');
+          intermediateTypes: ['DeviceFirmwareUpdateStatus'],
+          timeoutMs: PROTOCOL_V2_START_UPDATE_TIMEOUT,
+          onIntermediateResponse: (response: { type?: string }) => {
+            if (response.type === 'DeviceFirmwareUpdateStatus') {
+              this.postProgressMessage(99, 'installingFirmware');
             }
           },
         }
       );
     } catch (error) {
-      if (isProtocolV2DeviceDisconnectedError(error)) {
-        Log.log('Rebooting device');
+      if (isProtocolV2StartUpdateTransientError(error)) {
+        Log.log(
+          'Protocol V2 firmware update request did not return; continue status polling',
+          error
+        );
       } else {
         throw error;
       }
@@ -803,10 +1607,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return response;
   }
 
-  private async protocolV2Reboot(rebootType: DevRebootType) {
+  private async protocolV2Reboot(rebootType: DeviceRebootType) {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
     try {
-      const res = await typedCall('DevReboot', 'Success', {
+      const res = await typedCall('DeviceReboot', 'Success', {
         reboot_type: rebootType,
       });
       return res.message;