@onekeyfe/hd-core 1.2.0-alpha.12 → 1.2.0-alpha.14

package/src/api/FileWrite.ts

@@ -18,6 +18,7 @@ export type FileWriteParams = {
   chunkLen?: number;
   overwrite?: boolean;
   append?: boolean;
+  emitProgress?: boolean;
   uiPercentage?: number;
   timeoutMs?: number | string;
 };
@@ -40,6 +41,7 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
       chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
       overwrite: this.payload.overwrite ?? offset === 0,
       append: this.payload.append ?? false,
+      emitProgress: this.payload.emitProgress ?? true,
       uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
       timeoutMs: validateOptionalNonNegativeInteger(this.payload.timeoutMs, 'timeoutMs'),
     };
@@ -60,7 +62,7 @@ export default class FileWrite extends BaseMethod<FileWriteParams> {
       timeoutMs: this.params.timeoutMs === undefined ? undefined : Number(this.params.timeoutMs),
       throwIfAborted: () => this.throwIfAborted(),
       onProgress: payload => {
-        if (typeof this.postMessage === 'function') {
+        if (this.params.emitProgress && typeof this.postMessage === 'function') {
           this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
         }
       },

package/src/api/FirmwareUpdateV4.ts

@@ -379,6 +379,25 @@ const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | nu
   };
 };
 
+export const assertProtocolV2ReconnectIdentity = (
+  expectedDeviceId?: string,
+  actualDeviceId?: string
+) => {
+  if (!expectedDeviceId) return;
+  if (!actualDeviceId) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      'Protocol V2 reconnect identity unavailable'
+    );
+  }
+  if (actualDeviceId !== expectedDeviceId) {
+    throw ERRORS.TypedError(
+      HardwareErrorCode.DeviceNotFound,
+      `Protocol V2 reconnect identity mismatch: expected ${expectedDeviceId}, received ${actualDeviceId}`
+    );
+  }
+};
+
 /**
  * FirmwareUpdateV4 is the complete Protocol V2 firmware update flow.
  *
@@ -388,6 +407,8 @@ const parseProtocolV2OkppHeader = (bytes: Uint8Array): ProtocolV2OkppHeader | nu
  * - completion waits for target status to finish, reboots to normal, then polls DeviceInfo
  */
 export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareUpdateV4Params> {
+  private protocolV2ExpectedDeviceId?: string;
+
   init() {
     this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
@@ -476,6 +497,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private async runProtocolV2() {
     const deviceFeatures = await this.getProtocolV2DeviceFeatures();
+    this.protocolV2ExpectedDeviceId = deviceFeatures.deviceId ?? undefined;
     const deviceFirmwareType = getFirmwareType(deviceFeatures);
     const firmwareType = this.params.firmwareType ?? deviceFirmwareType;
 
@@ -917,6 +939,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
         });
         const features = this.device.updateProtocolV2Features(deviceInfo);
+        assertProtocolV2ReconnectIdentity(
+          this.protocolV2ExpectedDeviceId,
+          features.deviceId ?? undefined
+        );
         if (features?.bootloaderMode) {
           return features;
         }
@@ -1134,6 +1160,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
     });
     const features = this.device.updateProtocolV2Features(deviceInfo);
+    assertProtocolV2ReconnectIdentity(
+      this.protocolV2ExpectedDeviceId,
+      features.deviceId ?? undefined
+    );
     if (this.isProtocolV2NormalModeFeatures(features)) {
       Log.log('Protocol V2 firmware install finished; device is back in normal mode');
       return true;
@@ -1288,6 +1318,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
           request: PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
         });
         const features = this.device.updateProtocolV2Features(deviceInfo);
+        assertProtocolV2ReconnectIdentity(
+          this.protocolV2ExpectedDeviceId,
+          features.deviceId ?? undefined
+        );
         if (features.bootloaderMode || features.mode === 'bootloader') {
           throw ERRORS.TypedError(
             HardwareErrorCode.DeviceNotFound,
@@ -1334,6 +1368,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       this.device.commands.disposed = false;
       this.device.getCommands().mainId = this.device.mainId ?? '';
       await this.device.initialize();
+      assertProtocolV2ReconnectIdentity(
+        this.protocolV2ExpectedDeviceId,
+        this.device.getCurrentDeviceId()
+      );
       return;
     }
 
@@ -1355,6 +1393,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.device.commands.disposed = false;
     this.device.getCommands().mainId = this.device.mainId ?? '';
     await this.device.initialize();
+    assertProtocolV2ReconnectIdentity(
+      this.protocolV2ExpectedDeviceId,
+      this.device.getCurrentDeviceId()
+    );
   }
 
   private async protocolV2CommonUpdateProcess(params: ProtocolV2FileTransferParams) {
@@ -1416,12 +1458,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         overwrite,
         progress
       );
-      const processedByte = Number(writeRes.message.processed_byte);
-      const nextOffset =
-        Number.isFinite(processedByte) && processedByte > offset
-          ? processedByte
-          : offset + chunkLength;
-      if (nextOffset <= offset || nextOffset > payload.byteLength) {
+      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}`

package/src/api/UploadPortfolio.ts

@@ -6,7 +6,7 @@ export type UploadPortfolioParams = {
   timeoutMs?: number | string;
 };
 
-const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.pfol.pending';
+const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
 
 export default class UploadPortfolio extends FileWrite {
@@ -20,9 +20,11 @@ export default class UploadPortfolio extends FileWrite {
       chunkSize: PORTFOLIO_CHUNK_SIZE,
       overwrite: true,
       append: false,
+      emitProgress: false,
       timeoutMs,
     };
     super.init();
+    this.unlockPolicy = 'retry-on-locked';
   }
 
   async run() {

package/src/api/cardano/CardanoSignMessage.ts

@@ -14,7 +14,7 @@ export default class CardanoSignMessage extends BaseMethod<CardanoSignMessagePar
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
+    this.allowUsePreInitialize = false;
 
     const { payload } = this;
     validateParams(payload, [

package/src/api/cardano/CardanoSignTransaction.ts

@@ -48,7 +48,7 @@ export default class CardanoSignTransaction extends BaseMethod<any> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
+    this.allowUsePreInitialize = false;
 
     this.hasBundle = !!this.payload?.bundle;
 

package/src/api/helpers/protocolV2FileWrite.ts

@@ -129,17 +129,21 @@ export async function writeProtocolV2File(options: ProtocolV2FileWriteOptions) {
     );
     options.throwIfAborted?.();
     lastMessage = response.message;
-    const processedByte = Number(response.message?.processed_byte);
-    written =
-      Number.isFinite(processedByte) && processedByte > offset
-        ? processedByte - startOffset
-        : written + chunk.byteLength;
-    if (written > dataLength) {
+    const rawProcessedByte = response.message?.processed_byte;
+    const processedByte = Number(rawProcessedByte);
+    if (
+      rawProcessedByte !== undefined &&
+      (!Number.isFinite(processedByte) ||
+        processedByte <= offset ||
+        processedByte > offset + chunk.byteLength)
+    ) {
       throw ERRORS.TypedError(
         HardwareErrorCode.RuntimeError,
         `FilesystemFileWrite invalid processed_byte ${processedByte}`
       );
     }
+    written =
+      rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
     chunks += 1;
     const elapsedMs = Date.now() - startTime;
     const transferredBytes = Math.min(written, dataLength);

package/src/api/index.ts

@@ -61,7 +61,6 @@ export { default as deviceSettingsPageShow } from './protocol-v2/DeviceSettingsP
 export { default as deviceUploadWallpaper } from './protocol-v2/DeviceUploadWallpaper';
 export { default as filesystemPermissionFix } from './protocol-v2/FilesystemPermissionFix';
 export { default as filesystemFormat } from './protocol-v2/FilesystemFormat';
-export { default as filesystemDiskControl } from './protocol-v2/FilesystemDiskControl';
 export { default as fileRead } from './FileRead';
 export { default as fileWrite } from './FileWrite';
 export { default as fileDelete } from './FileDelete';

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

@@ -4,11 +4,12 @@ import { bytesToHex } from '@noble/hashes/utils';
 import { BaseMethod } from '../BaseMethod';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
+import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
 import {
-  encodePro2Wallpaper,
   PRO2_WALLPAPER_HEIGHT,
   PRO2_WALLPAPER_WIDTH,
   type Pro2WallpaperColorFormat,
+  encodePro2Wallpaper,
 } from '../../utils/pro2Wallpaper';
 
 export type DeviceUploadWallpaperParams = {
@@ -90,7 +91,7 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
 
   private async upload() {
     if (this.uploaded) return;
-    const encoded = this.encoded;
+    const { encoded } = this;
     if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
 
     await writeProtocolV2File({
@@ -102,12 +103,17 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
       overwrite: true,
       append: false,
       throwIfAborted: () => this.throwIfAborted(),
+      onProgress: payload => {
+        if (typeof this.postMessage === 'function') {
+          this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, payload));
+        }
+      },
     });
     this.uploaded = true;
   }
 
   async run(): Promise<DeviceUploadWallpaperResponse> {
-    const encoded = this.encoded;
+    const { encoded } = this;
     if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
     await this.ensureDirectory();
     await this.upload();

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

@@ -118,9 +118,6 @@ export const isProtocolV2DeviceDisconnectedError = (error: unknown) => {
     message.includes('connection has timed out unexpectedly') ||
     message.includes('connection error has occured') ||
     message.includes('connection error has occurred') ||
-    message.includes('transferIn') ||
-    message.includes('transferin') ||
-    message.includes('usbdevice') ||
     message.includes('multiplatformbleadapter') ||
     message.includes('multipalformebleadapter') ||
     compactMessage.includes('rxerrorerror6') ||