@onekeyfe/hd-core 1.2.0-alpha.23 → 1.2.0-alpha.24

package/src/api/FirmwareUpdateV4.ts

@@ -2,6 +2,7 @@ import { ERRORS, HardwareError, HardwareErrorCode, wait } from '@onekeyfe/hd-sha
 import {
   DeviceRebootType,
   PROTOCOL_V2_BLE_FILE_CHUNK_SIZE,
+  PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE,
   PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE,
 } from '@onekeyfe/hd-transport';
 
@@ -29,20 +30,11 @@ import {
   getProtocolV2UnknownErrorText,
   isProtocolV2DeviceDisconnectedError,
 } from './protocol-v2/helpers';
-import { openFirmwareByteSource, writeFirmwareByteSource } from './firmware/FirmwareArtifactSource';
-import { resolveFirmwareUpdateHostBinding } from './firmware/FirmwareHostBinding';
-import {
-  assertFirmwareUpdatePreparedPlanBinding,
-  assertFirmwareUpdatePreparedPlanDeviceIdentity,
-} from './firmware/FirmwareUpdatePreparedPlan';
 
-import type {
-  FirmwareArtifactReference,
-  FirmwareUpdateV4Params,
-  FirmwareUpdateV4Target,
-} from '../types/api/firmwareUpdate';
+import type { FirmwareUpdateV4Params, FirmwareUpdateV4Target } from '../types/api/firmwareUpdate';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
 import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { PROTO } from '../constants';
 import type { TypedResponseMessage } from '../device/DeviceCommands';
 import type {
   Features,
@@ -50,7 +42,6 @@ import type {
   IProtocolV2FirmwareComponent,
   IVersionArray,
 } from '../types';
-import type { FirmwareByteSource } from './firmware/FirmwareArtifactSource';
 
 const Log = getLogger(LoggerNames.Method);
 
@@ -94,6 +85,11 @@ const getProtocolV2DeviceTransferProgress = (
   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 | string;
   status?: number | string;
@@ -107,6 +103,17 @@ type ProtocolV2TargetBinary = { fileName: string; binary: ArrayBuffer; targetId:
 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 written independently to devicePath through FileWrite. */
 type ProtocolV2ResourceBundleBinary = {
   name: string;
@@ -129,35 +136,6 @@ type ProtocolV2RemoteComponentTarget = {
   kind: 'bootloader' | 'firmware';
 };
 
-type ProtocolV2InstallSource = {
-  fileName: string;
-  source: FirmwareByteSource;
-  targetId: number;
-  kind: ProtocolV2RemoteComponentTarget['kind'];
-};
-
-type ProtocolV2ResourceBundleSource = {
-  name: string;
-  source: FirmwareByteSource;
-  devicePath: string;
-  version?: IVersionArray;
-  payloadHash?: string;
-  headerHash?: string;
-};
-
-type ProtocolV2ExecutionPhaseKind =
-  | 'resource-sync'
-  | 'bootloader-install'
-  | 'bootloader-verify'
-  | 'component-install'
-  | 'final-verify';
-
-type ProtocolV2ExecutionPhase = {
-  kind: ProtocolV2ExecutionPhaseKind;
-  installSources: ProtocolV2InstallSource[];
-  resourceSources: ProtocolV2ResourceBundleSource[];
-};
-
 type ProtocolV2OkppHeader = {
   type: string;
   version: IVersionArray;
@@ -393,7 +371,10 @@ export const assertProtocolV2ReconnectIdentity = (
   actualSerialNumber?: string
 ) => {
   if (!expectedSerialNumber || !actualSerialNumber) {
-    return;
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      'Protocol V2 reconnect physical identity is unavailable'
+    );
   }
   if (actualSerialNumber !== expectedSerialNumber) {
     throw ERRORS.TypedError(
@@ -414,14 +395,6 @@ export const assertProtocolV2ReconnectIdentity = (
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {
   private protocolV2ExpectedSerialNumber?: string;
 
-  private protocolV2PreparedSources: FirmwareByteSource[] = [];
-
-  private protocolV2ExecutionInLoader = false;
-
-  private protocolV2CompletedTargetVersions = new Map<number, number>();
-
-  private protocolV2LatestFinalFeatures?: Features;
-
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
@@ -459,62 +432,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       { name: 'firmwareType', type: 'string' },
       { name: 'targetsToUpdate', type: 'array', allowEmpty: true },
       { name: 'platform', type: 'string' },
-      { name: 'expectedDeviceId', type: 'string' },
       { name: 'resourceBundleFiles', type: 'array', allowEmpty: true },
     ]);
-    if (
-      payload.expectedDeviceId !== undefined &&
-      (payload.expectedDeviceId.length === 0 || payload.expectedDeviceId.length > 160)
-    ) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.CallMethodInvalidParameter,
-        'Protocol V2 expected device identity is invalid'
-      );
-    }
-    const hostBinding =
-      payload.preparedPlan || payload.componentArtifacts || payload.resourceBundleArtifacts
-        ? resolveFirmwareUpdateHostBinding(payload.hostBindingGeneration)
-        : undefined;
-    if (hostBinding) {
-      assertFirmwareUpdatePreparedPlanBinding({
-        preparedPlan: payload.preparedPlan,
-        executor: 'v4',
-        platform: payload.platform,
-        scopeTargets: [
-          'boot',
-          'app_v1',
-          'app_v2',
-          'coprocessor',
-          'resource',
-          'se01',
-          'se02',
-          'se03',
-          'se04',
-        ],
-        bindings: [
-          ...Object.entries(payload.componentArtifacts ?? {}).flatMap(([target, artifact]) =>
-            artifact
-              ? [
-                  {
-                    target: target as Exclude<FirmwareUpdateV4Target, 'resource'>,
-                    artifact,
-                  },
-                ]
-              : []
-          ),
-          ...(payload.resourceBundleArtifacts ?? []).map(
-            (entry: { name: string; artifact: FirmwareArtifactReference }) => ({
-              target: 'resource' as const,
-              logicalName: entry.name,
-              artifact: entry.artifact,
-            })
-          ),
-        ],
-      });
-    }
 
     this.params = {
-      preparedPlan: payload.preparedPlan,
       chunkSize: payload.chunkSize,
       forcedUpdateRes: payload.forcedUpdateRes,
       bootloaderBinary: payload.bootloaderBinary,
@@ -529,22 +450,21 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       resourceBundleFiles: payload.resourceBundleFiles,
       firmwareType: payload.firmwareType,
       targetsToUpdate: payload.targetsToUpdate,
-      expectedTargetVersions: payload.expectedTargetVersions,
       platform: payload.platform,
-      expectedDeviceId: payload.expectedDeviceId,
-      artifactReader: hostBinding?.artifactReader ?? payload.artifactReader,
-      componentArtifacts: payload.componentArtifacts,
-      resourceBundleArtifacts: payload.resourceBundleArtifacts,
     };
   }
 
-  private getProtocolV2FirmwareChunkSize() {
+  private getProtocolV2FirmwareChunkSize(direction: 'read' | 'write' = 'write') {
     const payloadChunkSize = Number(this.params?.chunkSize);
     const env = DataManager.getSettings('env');
-    const maxChunkSize =
-      this.params?.platform === 'native' || (env && DataManager.isBleConnect(env))
-        ? PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-        : PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    const isBle = this.params?.platform === 'native' || (env && DataManager.isBleConnect(env));
+    let maxChunkSize = PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+    if (isBle) {
+      maxChunkSize =
+        direction === 'read'
+          ? PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE
+          : PROTOCOL_V2_BLE_FILE_CHUNK_SIZE;
+    }
     if (!Number.isFinite(payloadChunkSize) || payloadChunkSize <= 0) {
       return maxChunkSize;
     }
@@ -571,14 +491,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const deviceFeatures = await this.getProtocolV2DeviceFeatures();
     const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
-    this.validateExpectedTargetVersions();
-
-    if (
-      (this.params.componentArtifacts && Object.keys(this.params.componentArtifacts).length > 0) ||
-      this.params.resourceBundleArtifacts?.length
-    ) {
-      return this.runProtocolV2PreparedArtifacts(deviceFeatures, firmwareType);
-    }
 
     let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
@@ -589,18 +501,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       fwBinaryMap = this.collectExplicitTargetBinaries();
       bootloaderBinary = this.prepareBootloaderBinary();
       if (!this.hasExplicitProtocolV2Payload(fwBinaryMap)) {
-        if (
-          this.params.artifactReader ||
-          DataManager.getSettings('firmwareManifestMode') === 'external-only'
-        ) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.RuntimeError,
-            'Protocol V2 firmware artifacts must be prepared by the external firmware host',
-            {
-              firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
-            }
-          );
-        }
         const remoteBinaries = await this.prepareRemoteProtocolV2Binaries(
           firmwareType,
           deviceFeatures
@@ -609,13 +509,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         fwBinaryMap = remoteBinaries.fwBinaryMap;
         installItems = remoteBinaries.installItems;
       }
-      const resourceDescriptors = this.prepareProtocolV2ResourceBundles(
-        firmwareType,
-        deviceFeatures
-      );
-      resourceBundles = resourceDescriptors?.length
-        ? await this.materializeProtocolV2ResourceBundles(resourceDescriptors)
-        : undefined;
+      resourceBundles = this.prepareProtocolV2ResourceBundles(firmwareType, deviceFeatures);
+      if (resourceBundles?.length) {
+        resourceBundles = await this.prefetchProtocolV2ResourceBundles(resourceBundles);
+      }
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
@@ -628,282 +525,22 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       );
     }
 
-    return this.executeProtocolV2Update({
+    await this.enterProtocolV2BootloaderMode();
+
+    await this.executeProtocolV2Update({
       fwBinaryMap,
       bootloaderBinary,
       ...(installItems ? { installItems } : undefined),
       ...(resourceBundles?.length ? { resourceBundles } : undefined),
     });
-  }
-
-  private async openProtocolV2PreparedSource(artifact: FirmwareArtifactReference) {
-    const source = await openFirmwareByteSource({
-      artifact,
-      reader: this.params.artifactReader,
-    });
-    if (!source) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        `Firmware artifact ${artifact.artifactRef} is not prepared`,
-        {
-          firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
-        }
-      );
-    }
-    this.protocolV2PreparedSources.push(source);
-    return source;
-  }
-
-  private async openProtocolV2MemorySource(binary: ArrayBuffer) {
-    const source = await openFirmwareByteSource({ binary });
-    if (!source) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'Protocol V2 firmware binary is empty'
-      );
-    }
-    this.protocolV2PreparedSources.push(source);
-    return source;
-  }
-
-  private async closeProtocolV2PreparedSources() {
-    const sources = this.protocolV2PreparedSources.splice(0);
-    await Promise.all(sources.map(source => source.close().catch(() => undefined)));
-  }
-
-  private async prepareProtocolV2InstallSources(
-    firmwareType: EFirmwareType,
-    features: Features
-  ): Promise<ProtocolV2InstallSource[]> {
-    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
-    if (!release) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'Protocol V2 firmware release is unavailable'
-      );
-    }
-    const componentArtifacts = this.params.componentArtifacts ?? {};
-    const requestedTargets = new Set(
-      this.params.targetsToUpdate ?? (Object.keys(componentArtifacts) as FirmwareUpdateV4Target[])
-    );
-    const installSources: ProtocolV2InstallSource[] = [];
-    const preparedTargets = new Set<FirmwareUpdateV4Target>();
-
-    for (const [key, component] of this.getRemoteComponentEntries(release)) {
-      const target = this.getRemoteComponentTarget(key, component);
-      const updateTarget = PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(target.targetId);
-      if (updateTarget && updateTarget !== 'resource' && requestedTargets.has(updateTarget)) {
-        const artifact = componentArtifacts[updateTarget];
-        if (!artifact) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.RuntimeError,
-            `Protocol V2 ${updateTarget} artifact is not prepared`,
-            {
-              firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
-              artifactName: updateTarget,
-            }
-          );
-        }
-        installSources.push({
-          ...target,
-          source: await this.openProtocolV2PreparedSource(artifact),
-        });
-        preparedTargets.add(updateTarget);
-      }
-    }
 
-    const unknownTarget = Array.from(requestedTargets).find(
-      target => target !== 'resource' && !preparedTargets.has(target)
-    );
-    if (unknownTarget) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        `Protocol V2 release does not contain requested target ${unknownTarget}`
-      );
-    }
-    return installSources;
-  }
-
-  private async prepareProtocolV2ResourceSources(
-    firmwareType: EFirmwareType,
-    features: Features
-  ): Promise<ProtocolV2ResourceBundleSource[]> {
-    const preparedArtifacts = this.params.resourceBundleArtifacts ?? [];
-    const resourceRequested =
-      this.params.targetsToUpdate?.includes('resource') || preparedArtifacts.length > 0;
-    if (!resourceRequested) {
-      return [];
-    }
-    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
-    const descriptors = release?.resourceBundles ?? [];
-    const artifactByName = new Map(
-      preparedArtifacts.map(item => [item.name, item.artifact] as const)
-    );
-    const sources: ProtocolV2ResourceBundleSource[] = [];
-    for (const descriptor of descriptors) {
-      const artifact = artifactByName.get(descriptor.name);
-      if (!artifact) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.RuntimeError,
-          `Protocol V2 resource bundle ${descriptor.name} is not prepared`,
-          {
-            firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
-            artifactName: descriptor.name,
-          }
-        );
-      }
-      const devicePath = validateProtocolV2FilesystemPath(
-        descriptor.devicePath,
-        'resourceBundles[].devicePath'
-      );
-      sources.push({
-        name: descriptor.name,
-        source: await this.openProtocolV2PreparedSource(artifact),
-        devicePath,
-        version: descriptor.version,
-        payloadHash: descriptor.payloadHash,
-        headerHash: descriptor.headerHash,
-      });
-      artifactByName.delete(descriptor.name);
-    }
-    if (artifactByName.size > 0) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        `Protocol V2 release does not contain resource bundle ${artifactByName.keys().next().value}`
-      );
-    }
-    return sources;
-  }
-
-  private async runProtocolV2PreparedArtifacts(features: Features, firmwareType: EFirmwareType) {
-    try {
-      this.postTipMessage(FirmwareUpdateTipMessage.StartDownloadFirmware);
-      const installSources = await this.prepareProtocolV2InstallSources(firmwareType, features);
-      const resourceSources = await this.prepareProtocolV2ResourceSources(firmwareType, features);
-      if (installSources.length === 0 && resourceSources.length === 0) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.FirmwareUpdateDownloadFailed,
-          'No firmware to update'
-        );
-      }
-      this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
-
-      return await this.executeProtocolV2SourceUpdate({
-        installSources,
-        resourceSources,
-      });
-    } finally {
-      await this.closeProtocolV2PreparedSources();
-    }
-  }
-
-  private validateExpectedTargetVersions() {
-    const expected = this.params.expectedTargetVersions;
-    if (expected === undefined) return;
-    if (typeof expected !== 'object' || expected === null || Array.isArray(expected)) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.RuntimeError,
-        'Protocol V2 expected target versions are invalid'
-      );
-    }
-    for (const [target, version] of Object.entries(expected)) {
-      if (
-        !Array.from(PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.values()).includes(
-          target as FirmwareUpdateV4Target
-        ) ||
-        typeof version !== 'string' ||
-        !/^\d+\.\d+\.\d+(?:[-+][A-Za-z0-9.-]+)?$/u.test(version) ||
-        version.length > 64
-      ) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.RuntimeError,
-          'Protocol V2 expected target version is invalid'
-        );
-      }
-    }
-  }
+    await this.exitProtocolV2BootloaderToNormal();
 
-  private getExpectedProtocolV2TargetVersion(targetId: number) {
-    const target = PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(targetId);
-    const version = target ? this.params?.expectedTargetVersions?.[target] : undefined;
-    if (!version) return undefined;
-    const parts = version.split(/[+-]/u, 1)[0].split('.').map(Number);
-    if (
-      parts.length !== 3 ||
-      parts.some(part => !Number.isSafeInteger(part) || part < 0 || part > 0xff)
-    ) {
-      return undefined;
-    }
-    return parts[0] * 0x10000 + parts[1] * 0x100 + parts[2];
-  }
-
-  private assertExpectedProtocolV2Versions(targets?: readonly FirmwareUpdateV4Target[]) {
-    const expected = this.params?.expectedTargetVersions;
-    if (!expected) return;
-    const features = this.protocolV2LatestFinalFeatures;
-    const requestedTargets = this.getProtocolV2RequestedTargets();
-    const applicationTargets = requestedTargets.filter(
-      target => target === 'app_v1' || target === 'app_v2'
-    );
-    const visibleVersions: Partial<Record<FirmwareUpdateV4Target, string>> = {
-      boot: features ? getDeviceBootloaderVersion(features).join('.') : undefined,
-      coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
-      se01: features?.se01Version ?? undefined,
-      se02: features?.se02Version ?? undefined,
-      se03: features?.se03Version ?? undefined,
-      se04: features?.se04Version ?? undefined,
-    };
-    if (features && applicationTargets.length === 1) {
-      visibleVersions[applicationTargets[0]] = getDeviceFirmwareVersion(features).join('.');
-    }
-    const expectedEntries = (
-      Object.entries(expected) as Array<[FirmwareUpdateV4Target, string]>
-    ).filter(([target]) => !targets || targets.includes(target));
-    for (const [target, expectedVersion] of expectedEntries) {
-      const targetId = Array.from(PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.entries()).find(
-        ([, mappedTarget]) => mappedTarget === target
-      )?.[0];
-      const statusVersion =
-        targetId === undefined ? undefined : this.protocolV2CompletedTargetVersions.get(targetId);
-      const observedVersion =
-        statusVersion === undefined
-          ? visibleVersions[target]
-          : `${Math.floor(statusVersion / 0x10000) % 0x100}.${
-              Math.floor(statusVersion / 0x100) % 0x100
-            }.${statusVersion % 0x100}`;
-      if (!observedVersion) {
-        Log.warn(
-          `Protocol V2 target ${target} has no observable final version; skipping version comparison`
-        );
-      } else if (observedVersion !== expectedVersion) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.FirmwareVerificationFailed,
-          `Protocol V2 target ${target} reached ${observedVersion}, expected ${expectedVersion}`
-        );
-      }
-    }
-  }
+    const versions = await this.waitForProtocolV2FinalFeatures();
+    this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
+    DevicePool.resetState();
 
-  private getProtocolV2RequestedTargets(): FirmwareUpdateV4Target[] {
-    if (this.params.targetsToUpdate?.length) {
-      return [...new Set(this.params.targetsToUpdate)];
-    }
-    const targets = new Set<FirmwareUpdateV4Target>();
-    Object.keys(this.params.componentArtifacts ?? {}).forEach(target =>
-      targets.add(target as FirmwareUpdateV4Target)
-    );
-    if (this.params.resourceBundleArtifacts?.length || this.params.resourceBundleFiles?.length) {
-      targets.add('resource');
-    }
-    if (this.params.bootloaderBinary) targets.add('boot');
-    if (this.params.applicationP1Binary) targets.add('app_v1');
-    if (this.params.applicationP2Binary) targets.add('app_v2');
-    if (this.params.coprocessorBinary) targets.add('coprocessor');
-    if (this.params.se01Binary) targets.add('se01');
-    if (this.params.se02Binary) targets.add('se02');
-    if (this.params.se03Binary) targets.add('se03');
-    if (this.params.se04Binary) targets.add('se04');
-    return Array.from(targets);
+    return versions;
   }
 
   private async getProtocolV2DeviceFeatures(): Promise<Features> {
@@ -939,14 +576,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async captureProtocolV2PhysicalIdentity() {
     const deviceInfo = await this.requestProtocolV2PhysicalIdentity();
     const serialNumber = this.getProtocolV2SerialNumber(deviceInfo);
-    if (this.params?.preparedPlan) {
-      assertFirmwareUpdatePreparedPlanDeviceIdentity({
-        preparedPlan: this.params.preparedPlan,
-        deviceIdentity: serialNumber,
-      });
-    } else {
-      assertProtocolV2ReconnectIdentity(this.params?.expectedDeviceId, serialNumber);
-    }
+    assertProtocolV2ReconnectIdentity(serialNumber, serialNumber);
     this.protocolV2ExpectedSerialNumber = serialNumber;
   }
 
@@ -1047,7 +677,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       return null;
     }
 
-    const chunkSize = this.getProtocolV2FirmwareChunkSize();
+    const chunkSize = this.getProtocolV2FirmwareChunkSize('read');
     const chunks: Uint8Array[] = [];
     let offset = 0;
     while (offset < PROTOCOL_V2_OKPP_HEADER_SIZE) {
@@ -1199,47 +829,98 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     })) as ProtocolV2ResourceBundleBinary[];
   }
 
-  private async materializeProtocolV2ResourceBundles(
+  private async prefetchProtocolV2ResourceBundles(
     bundles: ProtocolV2ResourceBundleBinary[]
   ): Promise<ProtocolV2ResourceBundleBinary[]> {
+    const prefetched: ProtocolV2ResourceBundleBinary[] = [];
     for (const bundle of bundles) {
-      if (bundle.binary.byteLength === 0 && bundle.url) {
-        if (
-          this.params.artifactReader ||
-          DataManager.getSettings('firmwareManifestMode') === 'external-only'
-        ) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.RuntimeError,
-            `Firmware resource bundle ${bundle.name} is not prepared`,
-            {
-              firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
-              artifactName: bundle.name,
-            }
-          );
+      let { binary } = bundle;
+      if (binary.byteLength === 0) {
+        if (!bundle.url) {
+          throw new Error(`Missing Protocol V2 RESC bundle binary: ${bundle.name}`);
         }
-        Log.log(`[FirmwareUpdateV4] preloading RESC bundle ${bundle.name}`);
-        bundle.binary = (await getSysResourceBinary(bundle.url)).binary;
+        Log.log(`[FirmwareUpdateV4] downloading remote RESC bundle ${bundle.name}`);
+        ({ binary } = await getSysResourceBinary(bundle.url));
       }
-      if (bundle.binary.byteLength === 0) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.FirmwareUpdateDownloadFailed,
-          `Protocol V2 RESC bundle is empty: ${bundle.name}`
-        );
+      if (binary.byteLength === 0) {
+        throw new Error(`Protocol V2 RESC bundle is empty: ${bundle.name}`);
       }
+      prefetched.push({ ...bundle, binary });
     }
-    return bundles;
+    return prefetched;
+  }
+
+  /**
+   * Synchronize RESC bundles to the device.
+   *
+   * Manual mode writes supplied binaries directly.
+   * Remote-config mode uses prefetched binaries and skips matching bundles after FileRead.
+   */
+  private async syncProtocolV2ResourceBundles(
+    bundles: ProtocolV2ResourceBundleBinary[],
+    firmwareSize: number
+  ): Promise<{ processedSize: number; totalSize: number }> {
+    const transferStartTime = Date.now();
+    const transferTransport = this.getProtocolV2FirmwareTransferTransport();
+
+    const isRemoteMode = bundles.some(bundle => !!bundle.url);
+    let bundlesToSync = bundles;
+
+    // Remote binaries were prefetched before bootloader entry. Only device-local
+    // header comparison and transfer are allowed in this phase.
+    if (isRemoteMode) {
+      const filtered: ProtocolV2ResourceBundleBinary[] = [];
+      for (const bundle of bundles) {
+        // Compare the existing device 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 };
+    }
+
+    // Write directly to the device through 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 };
   }
 
   /**
    * Compare the existing okpkg OKPP header in remote-config mode.
    */
   private async isProtocolV2ResourceBundleUpToDate(
-    bundle: Pick<
-      ProtocolV2ResourceBundleBinary,
-      'name' | 'devicePath' | 'version' | 'payloadHash' | 'headerHash'
-    >
+    bundle: ProtocolV2ResourceBundleBinary
   ): Promise<boolean> {
-    if (this.params?.forcedUpdateRes) return false;
+    if (this.params.forcedUpdateRes) return false;
     if (!bundle.version && !bundle.payloadHash) return false;
 
     try {
@@ -1277,7 +958,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     // It rejects DeviceRebootType.Bootloader, so reuse the current connection.
     if (this.isProtocolV2BootloaderMode() || this.device.features?.mode === 'romloader') {
       Log.debug('Protocol V2 device is already in loader mode, skip reboot to bootloader');
-      this.protocolV2ExecutionInLoader = true;
       return false;
     }
 
@@ -1287,7 +967,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       this.postTipMessage(FirmwareUpdateTipMessage.GoToBootloaderSuccess);
       await wait(1000);
       await this.waitForProtocolV2BootloaderMode();
-      this.protocolV2ExecutionInLoader = true;
       return true;
     } catch (error) {
       if (error instanceof HardwareError) {
@@ -1376,98 +1055,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return entries;
   }
 
-  private buildProtocolV2ExecutionPhases({
-    installSources,
-    resourceSources,
-  }: {
-    installSources: ProtocolV2InstallSource[];
-    resourceSources: ProtocolV2ResourceBundleSource[];
-  }): ProtocolV2ExecutionPhase[] {
-    const phases: ProtocolV2ExecutionPhase[] = [];
-    if (resourceSources.length > 0) {
-      phases.push({
-        kind: 'resource-sync',
-        installSources: [],
-        resourceSources,
-      });
-    }
-    const bootloaderSources = installSources.filter(source => source.kind === 'bootloader');
-    if (bootloaderSources.length > 0) {
-      phases.push(
-        {
-          kind: 'bootloader-install',
-          installSources: bootloaderSources,
-          resourceSources: [],
-        },
-        {
-          kind: 'bootloader-verify',
-          installSources: [],
-          resourceSources: [],
-        }
-      );
-    }
-    const componentSources = installSources.filter(source => source.kind !== 'bootloader');
-    if (componentSources.length > 0) {
-      phases.push({
-        kind: 'component-install',
-        installSources: componentSources,
-        resourceSources: [],
-      });
-    }
-    phases.push({
-      kind: 'final-verify',
-      installSources: [],
-      resourceSources: [],
-    });
-    return phases;
-  }
-
-  private async executeProtocolV2Phases({
-    installSources,
-    resourceSources,
-  }: {
-    installSources: ProtocolV2InstallSource[];
-    resourceSources: ProtocolV2ResourceBundleSource[];
-  }) {
-    const phases = this.buildProtocolV2ExecutionPhases({
-      installSources,
-      resourceSources,
-    });
-    for (const phase of phases) {
-      if (phase.kind === 'final-verify') {
-        return this.completeProtocolV2FinalVerification();
-      }
-      if (phase.kind === 'resource-sync') {
-        await this.enterProtocolV2BootloaderMode();
-        await this.executeProtocolV2TransferPhase(phase);
-      } else if (phase.kind === 'bootloader-install' || phase.kind === 'component-install') {
-        await this.enterProtocolV2BootloaderMode();
-        await this.executeProtocolV2TransferPhase(phase);
-        await this.exitProtocolV2BootloaderToNormal();
-      } else if (phase.kind === 'bootloader-verify') {
-        await this.waitForProtocolV2FinalFeatures();
-        this.assertExpectedProtocolV2Versions(['boot']);
-      }
-    }
-    throw ERRORS.TypedError(
-      HardwareErrorCode.RuntimeError,
-      'Protocol V2 execution has no final verification phase'
-    );
-  }
-
-  private async executeProtocolV2SourceUpdate({
-    installSources,
-    resourceSources,
-  }: {
-    installSources: ProtocolV2InstallSource[];
-    resourceSources: ProtocolV2ResourceBundleSource[];
-  }) {
-    return this.executeProtocolV2Phases({
-      installSources,
-      resourceSources,
-    });
-  }
-
   private async executeProtocolV2Update({
     fwBinaryMap,
     bootloaderBinary,
@@ -1479,158 +1066,104 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     installItems?: ProtocolV2InstallItem[];
     resourceBundles?: ProtocolV2ResourceBundleBinary[];
   }) {
-    const memoryInstallItems =
+    const orderedInstallItems =
       installItems ??
       this.buildProtocolV2InstallItems({
-        fwBinaryMap: fwBinaryMap ?? [],
         bootloaderBinary: bootloaderBinary ?? null,
+        fwBinaryMap: fwBinaryMap ?? [],
       });
-    try {
-      const installSources = await Promise.all(
-        memoryInstallItems.map(async item => ({
-          fileName: item.fileName,
-          source: await this.openProtocolV2MemorySource(item.binary),
-          targetId: item.targetId,
-          kind: item.kind,
-        }))
-      );
-      const resourceSources = await Promise.all(
-        (resourceBundles ?? []).map(async bundle => ({
-          name: bundle.name,
-          source: await this.openProtocolV2MemorySource(bundle.binary),
-          devicePath: bundle.devicePath,
-          version: bundle.version,
-          payloadHash: bundle.payloadHash,
-          headerHash: bundle.headerHash,
-        }))
-      );
-      return await this.executeProtocolV2Phases({
-        installSources,
-        resourceSources,
-      });
-    } finally {
-      await this.closeProtocolV2PreparedSources();
-    }
-  }
 
-  private async executeProtocolV2TransferPhase({
-    installSources,
-    resourceSources,
-  }: ProtocolV2ExecutionPhase) {
-    let totalSize = installSources.reduce((total, item) => total + item.source.size, 0);
-    const resourcesToSync: ProtocolV2ResourceBundleSource[] = [];
-    for (const resource of resourceSources) {
-      if (await this.isProtocolV2ResourceBundleUpToDate(resource)) {
-        Log.log(`[FirmwareUpdateV4] skip RESC bundle ${resource.name}; already up to date`);
-      } else {
-        resourcesToSync.push(resource);
-        totalSize += resource.source.size;
-      }
-    }
+    let firmwareSize = 0;
+    for (const item of orderedInstallItems) firmwareSize += item.binary.byteLength;
 
     this.postTipMessage(FirmwareUpdateTipMessage.StartTransferData);
+
     let processedSize = 0;
-    for (const resource of resourcesToSync) {
-      processedSize = await this.protocolV2SourceUpdateProcess({
-        source: resource.source,
-        filePath: resource.devicePath,
-        processedSize,
-        totalSize,
-      });
-      await this.verifyProtocolV2StagedFile(resource.devicePath, resource.source.size);
+    let totalSize = firmwareSize;
+    if (resourceBundles?.length) {
+      const resourceTransfer = await this.syncProtocolV2ResourceBundles(
+        resourceBundles,
+        firmwareSize
+      );
+      processedSize = resourceTransfer.processedSize;
+      totalSize = resourceTransfer.totalSize;
     }
 
-    const stagedInstallTargets: Array<{ targetId: number; path: string }> = [];
-    for (const item of installSources) {
-      const filePath = this.getProtocolV2InstallItemStagingPath(item);
-      processedSize = await this.protocolV2SourceUpdateProcess({
-        source: item.source,
-        filePath,
-        processedSize,
-        totalSize,
-      });
-      await this.verifyProtocolV2StagedFile(filePath, item.source.size);
-      stagedInstallTargets.push({
-        targetId: item.targetId,
-        path: filePath,
-      });
+    // Skip staging and installation when the update contains RESC bundles only.
+    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`
+    );
 
-    if (totalSize > 0) {
-      this.postProgressMessage(100, 'transferData');
-    }
-    if (stagedInstallTargets.length === 0) {
-      return;
+    const stagedInstallTargets: ProtocolV2InstallTarget[] = [];
+
+    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 targets = stagedInstallTargets.map(item => ({
+
+    const allTargets = stagedInstallTargets.map(item => ({
       target_id: item.targetId,
       path: item.path,
     }));
-    await this.protocolV2StartFirmwareUpdate({ targets });
-    await this.waitForProtocolV2FirmwareUpdateComplete(targets);
+    Log.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateRequest targets=${JSON.stringify(allTargets)}`);
+    await this.protocolV2StartFirmwareUpdate({ targets: allTargets });
+    await this.waitForProtocolV2FirmwareUpdateComplete(allTargets);
   }
 
-  private async protocolV2SourceUpdateProcess({
-    source,
-    filePath,
-    processedSize,
-    totalSize,
-  }: {
-    source: FirmwareByteSource;
-    filePath: string;
-    processedSize: number;
-    totalSize: number;
-  }) {
-    let lastError: unknown;
-    for (let attempt = 1; attempt <= PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT; attempt += 1) {
-      try {
-        await writeFirmwareByteSource({
-          source,
-          chunkSize: this.getProtocolV2FirmwareChunkSize(),
-          write: async ({ data, sourceOffset, length, first }) => {
-            const chunkEnd = sourceOffset + length;
-            const progress = getProtocolV2DeviceTransferProgress(
-              processedSize + sourceOffset,
-              processedSize + chunkEnd,
-              totalSize
-            );
-            const response = await this.fileWriteChunk(
-              filePath,
-              source.size,
-              sourceOffset,
-              data,
-              first,
-              progress
-            );
-            const rawProcessedByte = response.message.processed_byte;
-            const nextOffset = rawProcessedByte === undefined ? chunkEnd : Number(rawProcessedByte);
-            if (!Number.isFinite(nextOffset) || nextOffset !== chunkEnd) {
-              throw ERRORS.TypedError(
-                HardwareErrorCode.EmmcFileWriteFirmwareError,
-                `invalid processed_byte ${rawProcessedByte} for offset ${sourceOffset}`
-              );
-            }
-            this.postProgressMessage(progress, 'transferData');
-            return length;
-          },
-        });
-        return processedSize + source.size;
-      } catch (error) {
-        lastError = error;
-        if (attempt < PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT) {
-          await this.recoverProtocolV2FileTransfer();
-        }
-      }
-    }
-    throw ERRORS.TypedError(
-      HardwareErrorCode.EmmcFileWriteFirmwareError,
-      `transfer data error: ${getProtocolV2UnknownErrorText(lastError)}`
-    );
-  }
-
-  private getProtocolV2InstallItemStagingPath(item: Pick<ProtocolV2InstallItem, 'fileName'>) {
+  private getProtocolV2InstallItemStagingPath(item: ProtocolV2InstallItem) {
     return `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${item.fileName}`;
   }
 
@@ -1649,8 +1182,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private assertProtocolV2TargetStatus(
     statusTargets: ProtocolV2FirmwareUpdateStatusTarget[],
-    expectedTargetIds: Set<number>,
-    expectedPaths = new Map<number, string>()
+    expectedTargetIds: Set<number>
   ) {
     Log.log(
       `[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`
@@ -1681,47 +1213,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const matchingTargets = statusTargets.filter(target =>
       expectedTargetIds.has(normalizeProtocolV2TargetId(target.target_id) ?? -1)
     );
-    const seenTargetIds = new Set<number>();
-    for (const target of matchingTargets) {
-      const targetId = normalizeProtocolV2TargetId(target.target_id);
-      if (
-        targetId === undefined ||
-        seenTargetIds.has(targetId) ||
-        (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))
-      ) {
-        throw ERRORS.TypedError(
-          HardwareErrorCode.RuntimeError,
-          `Protocol V2 install status conflicts with target ${target.target_id}`
-        );
-      }
-      seenTargetIds.add(targetId);
-    }
     const completedTargets = matchingTargets.filter(target =>
       isProtocolV2TargetStatusFinished(target.status)
     );
     if (completedTargets.length === expectedTargetIds.size && expectedTargetIds.size > 0) {
-      for (const target of completedTargets) {
-        const targetId = normalizeProtocolV2TargetId(target.target_id);
-        const payloadVersion = toProtocolV2FiniteNumber(target.payload_version);
-        if (targetId === undefined) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.RuntimeError,
-            'Protocol V2 completed target identity is invalid'
-          );
-        }
-        const expectedVersion = this.getExpectedProtocolV2TargetVersion(targetId);
-        if (expectedVersion !== undefined && payloadVersion !== undefined) {
-          if (payloadVersion !== expectedVersion) {
-            throw ERRORS.TypedError(
-              HardwareErrorCode.FirmwareVerificationFailed,
-              `Protocol V2 target ${targetId} reached payload version ${payloadVersion}, expected ${expectedVersion}`
-            );
-          }
-        }
-        if (payloadVersion !== undefined) {
-          this.protocolV2CompletedTargetVersions.set(targetId, payloadVersion);
-        }
-      }
       this.postProgressMessage(100, 'installingFirmware');
       return true;
     }
@@ -1746,7 +1241,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     targets: Array<{ target_id: number; path: string }>
   ) {
     const expectedTargetIds = new Set(targets.map(target => target.target_id));
-    const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
     const startTime = Date.now();
     let lastError: unknown;
 
@@ -1770,8 +1264,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           if (
             this.assertProtocolV2TargetStatus(
               (statusResponse.message.records ?? []) as ProtocolV2FirmwareUpdateStatusTarget[],
-              expectedTargetIds,
-              expectedPaths
+              expectedTargetIds
             )
           ) {
             return;
@@ -1788,34 +1281,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           // device already rebooted into App, this endpoint error signals that the
           // install phase ended; the later phase performs the final readiness check.
           if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
-            try {
-              const deviceInfo = await requestProtocolV2DeviceInfo({
-                commands: this.device.getCommands(),
-                timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-              });
-              this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
-              const observed = await this.device.probeProtocolV2RuntimeState(
-                deviceInfo,
-                PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
-              );
-              if (observed.mode === 'normal' && !observed.bootloaderMode) {
-                return;
-              }
-              lastError = new Error(
-                'Protocol V2 status endpoint is unavailable outside normal mode'
-              );
-            } catch (probeError) {
-              lastError = probeError;
-            }
-            throw ERRORS.TypedError(
-              HardwareErrorCode.RuntimeError,
-              `Protocol V2 firmware install status is unavailable: ${this.normalizeErrorMessage(
-                lastError
-              )}`,
-              {
-                firmwareUpdateCode: 'FirmwareInstallStatusUnavailable',
-              }
+            Log.log(
+              '[FirmwareUpdateV4] firmware status endpoint unavailable after reboot; continue with normal-mode verification'
             );
+            return;
           }
           lastError = error;
           Log.log(
@@ -1831,12 +1300,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         if (error instanceof HardwareError && error.errorCode === HardwareErrorCode.FirmwareError) {
           throw error;
         }
-        if (
-          error instanceof HardwareError &&
-          error.params?.firmwareUpdateCode === 'FirmwareInstallStatusUnavailable'
-        ) {
-          throw error;
-        }
         Log.log('Protocol V2 firmware install device readiness probe failed: ', error);
       }
       await wait(1000);
@@ -1854,7 +1317,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     // The connection may still be in bootloader. Request a Normal reboot directly;
     // repeating it after an automatic App reboot is idempotent.
     await this.protocolV2Reboot(DeviceRebootType.Normal);
-    this.protocolV2ExecutionInLoader = false;
   }
 
   private async waitForProtocolV2FinalFeatures() {
@@ -1865,7 +1327,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
     const bleVersion = getDeviceBLEFirmwareVersion(features).join('.');
     const firmwareVersion = getDeviceFirmwareVersion(features).join('.');
-    this.protocolV2LatestFinalFeatures = features;
     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.'
@@ -1879,17 +1340,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     };
   }
 
-  private async completeProtocolV2FinalVerification() {
-    if (this.protocolV2ExecutionInLoader || this.isProtocolV2BootloaderMode()) {
-      await this.exitProtocolV2BootloaderToNormal();
-    }
-    const versions = await this.waitForProtocolV2FinalFeatures();
-    this.assertExpectedProtocolV2Versions();
-    this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
-    DevicePool.resetState();
-    return versions;
-  }
-
   private async waitForProtocolV2ReconnectAndFeatures(timeout: number) {
     const startTime = Date.now();
     let lastError: unknown;
@@ -1996,6 +1446,96 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return this.normalizeErrorMessage(error).includes('Protocol V2 reconnect physical identity');
   }
 
+  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,
+    onTransferredBytes,
+  }: ProtocolV2FileTransferParams) {
+    const chunkSize = this.getProtocolV2FirmwareChunkSize();
+    let offset = 0;
+    const getUploadProgress = (fileOffset: number) => {
+      if (totalSize !== undefined && processedSize !== undefined) {
+        return Math.min(Math.ceil(((processedSize + fileOffset) / totalSize) * 100), 99);
+      }
+      return Math.min(Math.ceil((fileOffset / payload.byteLength) * 100), 99);
+    };
+
+    while (offset < payload.byteLength) {
+      const chunkEnd = Math.min(offset + chunkSize, payload.byteLength);
+      const chunkLength = chunkEnd - offset;
+      const chunk = payload.slice(offset, chunkEnd);
+      const overwrite = offset === 0;
+      const progress = getProtocolV2DeviceTransferProgress(
+        (processedSize ?? 0) + offset,
+        (processedSize ?? 0) + chunkEnd,
+        totalSize ?? payload.byteLength
+      );
+
+      const writeRes = await this.fileWriteChunk(
+        filePath,
+        payload.byteLength,
+        offset,
+        chunk,
+        overwrite,
+        progress
+      );
+      const rawProcessedByte = writeRes.message.processed_byte;
+      const processedByte = Number(rawProcessedByte);
+      const nextOffset = rawProcessedByte === undefined ? offset + chunkLength : processedByte;
+      if (!Number.isFinite(nextOffset) || nextOffset <= offset || nextOffset > chunkEnd) {
+        throw ERRORS.TypedError(
+          HardwareErrorCode.EmmcFileWriteFirmwareError,
+          `invalid processed_byte ${writeRes.message.processed_byte} for offset ${offset}`
+        );
+      }
+      offset = nextOffset;
+      onTransferredBytes?.((processedSize ?? 0) + offset);
+      this.postProgressMessage(getUploadProgress(offset), 'transferData');
+    }
+
+    return totalSize !== undefined ? (processedSize ?? 0) + payload.byteLength : 0;
+  }
+
+  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,