@onekeyfe/hd-core 1.2.8-alpha.128 → 1.2.8-alpha.129

package/dist/protocols/protocol-v2/resources.d.ts

@@ -3,6 +3,7 @@ export declare const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH = "vol0:/loaders/boo
 export declare const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH: string;
 export declare const PROTOCOL_V2_ROM_PARAMS_PACKAGE_PATH = "vol0:/loaders/rom/params.okpkg";
 export declare const PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE = 24464;
+export declare const PROTOCOL_V2_RESOURCE_PACKAGE_COMPARE_SIZE = 640;
 export declare function parseProtocolV2Resources(value: unknown): IProtocolV2Resources | undefined;
 export declare function isProtocolV2ResourceArchiveEntryName(entryName: string): boolean;
 export type ProtocolV2ResourcePackageHeader = {

package/dist/protocols/protocol-v2/resources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/resources.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvE,eAAO,MAAM,sCAAsC,iDACH,CAAC;AACjD,eAAO,MAAM,8CAA8C,QAAsD,CAAC;AAClH,eAAO,MAAM,mCAAmC,mCAAmC,CAAC;AACpF,eAAO,MAAM,wCAAwC,QAAS,CAAC;AAW/D,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CA8BzF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAoB/E;AA0CD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,OAAO,EAAE,aAAa,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,GAClB,+BAA+B,CAyCjC;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,WAAW,GAAG,UAAU,GAC/B,+BAA+B,CAGjC"}
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/resources.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvE,eAAO,MAAM,sCAAsC,iDACH,CAAC;AACjD,eAAO,MAAM,8CAA8C,QAAsD,CAAC;AAClH,eAAO,MAAM,mCAAmC,mCAAmC,CAAC;AACpF,eAAO,MAAM,wCAAwC,QAAS,CAAC;AAE/D,eAAO,MAAM,yCAAyC,MAAQ,CAAC;AAW/D,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CA8BzF;AAED,wBAAgB,oCAAoC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAoB/E;AA0CD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,OAAO,EAAE,aAAa,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,GAClB,+BAA+B,CAyCjC;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,WAAW,GAAG,UAAU,GAC/B,+BAA+B,CAMjC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.8-alpha.128",
+  "version": "1.2.8-alpha.129",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.8-alpha.128",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.128",
+    "@onekeyfe/hd-shared": "1.2.8-alpha.129",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.129",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "201fda4da9c555f545ff4a776e79abf090ba8bf8"
+  "gitHead": "e340d9447b375a9d79afd737bec50ff8c5a46aba"
 }

package/src/api/FileWrite.ts

@@ -6,7 +6,10 @@ import {
   validateProtocolV2FilesystemPath,
   validateRequiredData,
 } from './helpers/filesystemValidation';
-import { writeProtocolV2File } from './helpers/protocolV2FileWrite';
+import {
+  createProtocolV2AssetFileWriteRecovery,
+  writeProtocolV2File,
+} from './helpers/protocolV2FileWrite';
 import { UI_REQUEST, createUiMessage } from '../events/ui-request';
 
 export type FileWriteParams = {
@@ -63,6 +66,9 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
       append: this.params.append,
       uiPercentage: this.params.uiPercentage,
       timeoutMs: this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs),
+      ...(this.name === 'uploadPortfolio'
+        ? { maxChunkRetries: 3, recoverConnection: createProtocolV2AssetFileWriteRecovery(this) }
+        : {}),
       throwIfAborted: () => this.throwIfAborted(),
       onProgress: payload => {
         if (this.params.emitProgress && typeof this.postMessage === 'function') {

package/src/api/FirmwareUpdateV4.ts

@@ -36,6 +36,7 @@ import { requestProtocolV2DeviceInfo } from '../protocols/protocol-v2/features';
 import {
   PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH,
   PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH,
+  PROTOCOL_V2_RESOURCE_PACKAGE_COMPARE_SIZE,
   PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE,
   type ProtocolV2ResourcePackageHeader,
   isProtocolV2ResourceArchiveEntryName,
@@ -77,6 +78,7 @@ import type {
 import type { FirmwareByteSource } from './firmware/FirmwareArtifactSource';
 
 const Log = getLogger(LoggerNames.Method);
+const TransferLog = getLogger(LoggerNames.Core);
 
 // Restored after a rebase dropped the declaration while keeping its use in
 // fileWriteChunk; without it that error branch throws ReferenceError instead of
@@ -112,6 +114,7 @@ const PROTOCOL_V2_RESOURCE_HEADER_RECOVERY_LIMIT = 2;
 // window. Set it to undefined to keep every transfer serial.
 const PROTOCOL_V2_BLE_FILE_WRITE_WINDOW_MIN_BOOTLOADER_VERSION: string | undefined = '1.0.3';
 const PROTOCOL_V2_TRANSFER_PROGRESS_HEARTBEAT_MS = 1000;
+const PROTOCOL_V2_TRANSFER_LOG_INTERVAL_MS = 10_000;
 const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
 const PROTOCOL_V2_INSTALL_FAILED_CODE = 'FirmwareInstallFailed';
 const PROTOCOL_V2_INSTALL_TIMEOUT_CODE = 'FirmwareInstallTimeout';
@@ -631,9 +634,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private protocolV2LastTransferredBytes = 0;
 
-  /** Set when a windowed FileWrite attempt fails: the rest of this update writes serially. */
-  private protocolV2FileWriteWindowDisabled = false;
-
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
@@ -1868,8 +1868,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const chunkSize = this.getProtocolV2FirmwareChunkSize('read');
     const chunks: Uint8Array[] = [];
     let offset = 0;
-    while (offset < PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE) {
-      const readLen = Math.min(chunkSize, PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE - offset);
+    while (offset < PROTOCOL_V2_RESOURCE_PACKAGE_COMPARE_SIZE) {
+      const readLen = Math.min(chunkSize, PROTOCOL_V2_RESOURCE_PACKAGE_COMPARE_SIZE - offset);
       const res = await typedCall('FilesystemFileRead', 'FilesystemFile', {
         file: {
           path: filePath,
@@ -1880,7 +1880,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         ui_percentage: undefined,
       });
       const data = toProtocolV2Bytes(res.message?.data);
-      if (data.byteLength === 0) return null;
+      if (data.byteLength === 0 || data.byteLength > readLen) return null;
       chunks.push(data);
       offset += data.byteLength;
     }
@@ -1995,6 +1995,9 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       this.postTipMessage(FirmwareUpdateTipMessage.AutoRebootToBootloader);
       await this.protocolV2Reboot(DeviceRebootType.Bootloader);
       await wait(1000);
+      if (this.isBleReconnect()) {
+        await this.device.deviceConnector?.disconnect(this.device.originalDescriptor.id);
+      }
       await this.waitForProtocolV2BootloaderMode();
       this.protocolV2ExecutionInLoader = true;
       this.postTipMessage(FirmwareUpdateTipMessage.GoToBootloaderSuccess);
@@ -2037,12 +2040,19 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     while (Date.now() - startTime < timeout) {
       try {
         if (shouldReconnect) {
-          await this.reconnectProtocolV2Device();
+          if (this.isBleReconnect()) {
+            await this.reconnectProtocolV2Device({ skipProtocolProbe: true });
+          } else {
+            await this.reconnectProtocolV2Device();
+          }
           shouldReconnect = false;
         }
         const deviceInfo = await requestProtocolV2DeviceInfo({
           commands: this.device.getCommands(),
-          timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
+          timeoutMs: Math.min(
+            this.getProtocolV2DeviceInfoTimeout(),
+            PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
+          ),
         });
         this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
         const features = await this.device.probeProtocolV2RuntimeState(
@@ -2335,10 +2345,37 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       this.throwIfAborted();
       const attemptStartedAt = Date.now();
       let windowed = false;
+      let chunkSize = 0;
+      let confirmedBytes = 0;
+      let lastMetricsAt = attemptStartedAt;
+      const logTransfer = (status: 'started' | 'progress' | 'completed' | 'failed') => {
+        const elapsedMs = getProtocolV2ElapsedMs(attemptStartedAt);
+        TransferLog.log('[FirmwareUpdateV4] FileWrite metrics', {
+          status,
+          path: filePath,
+          fileWriteWindow: windowed ? PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW : 1,
+          chunkSize,
+          attempt,
+          retryCount: attempt - 1,
+          transferredBytes: confirmedBytes,
+          totalBytes: source.size,
+          elapsedMs,
+          rateBytesPerSecond: getProtocolV2TransferRate(confirmedBytes, elapsedMs),
+        });
+      };
+      const reportAttemptChunk = (chunkEnd: number) => {
+        confirmedBytes = chunkEnd;
+        reportConfirmedChunk(chunkEnd);
+        const now = Date.now();
+        if (now - lastMetricsAt >= PROTOCOL_V2_TRANSFER_LOG_INTERVAL_MS && chunkEnd < source.size) {
+          logTransfer('progress');
+          lastMetricsAt = now;
+        }
+      };
       try {
-        windowed =
-          !this.protocolV2FileWriteWindowDisabled && this.shouldUseProtocolV2BleFileWriteWindow();
-        const chunkSize = this.getProtocolV2FirmwareChunkSize('write', filePath, windowed);
+        windowed = this.shouldUseProtocolV2BleFileWriteWindow();
+        chunkSize = this.getProtocolV2FirmwareChunkSize('write', filePath, windowed);
+        logTransfer('started');
         if (windowed) {
           await this.writeProtocolV2SourceWindowed({
             source,
@@ -2346,7 +2383,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             chunkSize,
             processedSize,
             totalSize,
-            onChunkConfirmed: reportConfirmedChunk,
+            onChunkConfirmed: reportAttemptChunk,
           });
         } else {
           await writeFirmwareByteSource({
@@ -2377,23 +2414,18 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
                   `invalid processed_byte ${rawProcessedByte} for offset ${sourceOffset}`
                 );
               }
-              reportConfirmedChunk(chunkEnd);
+              reportAttemptChunk(chunkEnd);
               return length;
             },
           });
         }
-        Log.debug('[FirmwareUpdateV4] Protocol V2 file transferred', {
-          path: filePath,
-          bytes: source.size,
-          elapsedMs: getProtocolV2ElapsedMs(attemptStartedAt),
-          attempt,
-          fileWriteWindow: windowed ? PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW : 1,
-        });
+        logTransfer('completed');
         return processedSize + source.size;
       } catch (error) {
         this.throwIfAborted();
         lastError = error;
-        Log.debug('[FirmwareUpdateV4] Protocol V2 file transfer attempt failed', {
+        logTransfer('failed');
+        TransferLog.debug('[FirmwareUpdateV4] Protocol V2 file transfer attempt failed', {
           path: filePath,
           attempt,
           fileWriteWindow: windowed ? PROTOCOL_V2_FILE_WRITE_PIPELINE_WINDOW : 1,
@@ -3346,7 +3378,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     // parsed version keeps major.minor.patch only, so a 1.0.3 prerelease counts as 1.0.3.
     const bootloaderVersion = getDeviceBootloaderVersion(this.device.features).join('.');
     const enabled = supportsProtocolV2BleFileWriteWindow(bootloaderVersion, minBootloaderVersion);
-    Log.debug('[FirmwareUpdateV4] BLE FileWrite window', {
+    TransferLog.debug('[FirmwareUpdateV4] BLE FileWrite window', {
       enabled,
       bootloaderVersion,
       bootloaderBuildId: this.device.features?.verify?.bootloaderBuildId,
@@ -3406,9 +3438,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     if (source.size === 0) return;
     const firstRequest = await readRequest();
 
-    // A failed exchange may mean the running bootloader cannot hold two in-flight frames, so the
-    // retry and every later file of this update are written serially. Source read errors say
-    // nothing about the bootloader and keep the window.
+    // Core retries the whole overwriting file after a verified reconnect. Keep the same
+    // window on retries and subsequent files; the running bootloader version gates support.
     const response = await this.device
       .getCommands()
       .typedCall('FilesystemFileWrite', 'FilesystemFile', firstRequest, {
@@ -3422,16 +3453,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             onChunkConfirmed(Number(confirmed.message.processed_byte));
           },
         },
-      })
-      .catch((error: unknown) => {
-        this.protocolV2FileWriteWindowDisabled = true;
-        throw error;
       });
     this.throwIfAborted();
     if (sourceError) throw sourceError;
     const rawProcessedByte = response.message.processed_byte;
     if (Number(rawProcessedByte) !== source.size) {
-      this.protocolV2FileWriteWindowDisabled = true;
       throw ERRORS.TypedError(
         HardwareErrorCode.EmmcFileWriteFirmwareError,
         `invalid processed_byte ${rawProcessedByte} for file size ${source.size}`

package/src/api/firmware/FirmwareArtifactSource.ts

@@ -212,17 +212,26 @@ export const readVerifiedFirmwareArtifact = async ({
 }): Promise<ArrayBuffer> => {
   assertFirmwareArtifactReference(artifact);
   const source = await ReaderFirmwareByteSource.open(artifact, reader);
+  const hasher = sha256.create();
   try {
-    const binary = await readFirmwareByteSourceFully(source);
-    const actualSha256 = bytesToHex(sha256(new Uint8Array(binary)));
+    const bytes = new Uint8Array(source.size);
+    let offset = 0;
+    while (offset < source.size) {
+      const length = Math.min(MAX_FIRMWARE_ARTIFACT_READ_BYTES, source.size - offset);
+      bytes.set(new Uint8Array(await source.readAt(offset, length)), offset);
+      hasher.update(bytes.subarray(offset, offset + length));
+      offset += length;
+    }
+    const actualSha256 = bytesToHex(hasher.digest());
     if (actualSha256 !== artifact.sha256.toLowerCase()) {
       return artifactError(
         'FirmwareArtifactReceiptMismatch',
         'Firmware artifact bytes do not match the approved SHA-256 receipt'
       );
     }
-    return binary;
+    return bytes.buffer;
   } finally {
+    hasher.destroy();
     await source.close().catch(() => undefined);
   }
 };