@onekeyfe/hd-core 1.1.27-alpha.42 → 1.1.27-alpha.43

package/src/api/evm/EVMSignMessageEIP712.ts

@@ -14,6 +14,7 @@ export default class EVMSignMessageEIP712 extends BaseMethod<EthereumSignMessage
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/evm/EVMSignTransaction.ts

@@ -46,10 +46,12 @@ export default class EVMSignTransaction extends BaseMethod {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
       { name: 'transaction', type: 'object', required: true },
+      { name: 'usePreInitialize', type: 'boolean' },
     ]);
     const { path, transaction } = this.payload;
     this.addressN = validatePath(path, 3);

package/src/api/evm/EVMSignTypedData.ts

@@ -52,6 +52,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },
@@ -60,6 +61,7 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
       { name: 'domainHash', type: 'hexString' },
       { name: 'messageHash', type: 'hexString' },
       { name: 'chainId', type: 'number' },
+      { name: 'usePreInitialize', type: 'boolean' },
     ]);
 
     const { path, data, metamaskV4Compat, domainHash, messageHash, chainId } = this.payload;

package/src/api/filecoin/FilecoinSignTransaction.ts

@@ -12,6 +12,7 @@ export default class FilecoinSignTransaction extends BaseMethod<HardwareFilecoin
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -28,13 +28,6 @@ const Log = getLogger(LoggerNames.Method);
 const SESSION_ERROR = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
 
-type FirmwareProgressMetadata = {
-  transferredBytes?: number;
-  totalBytes?: number;
-  rateBytesPerSecond?: number;
-  elapsedMs?: number;
-};
-
 const isDeviceDisconnectedError = (error: unknown) => {
   const message = error instanceof Error ? error.message : String(error ?? '');
   return (
@@ -89,17 +82,12 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
    * @description Post the progress message
    * @param progress Post the percentage of the progress
    */
-  postProgressMessage = (
-    progress: number,
-    progressType: IFirmwareUpdateProgressType,
-    metadata: FirmwareProgressMetadata = {}
-  ) => {
+  postProgressMessage = (progress: number, progressType: IFirmwareUpdateProgressType) => {
     this.postMessage(
       createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
         device: this.device.toMessageObject() as KnownDevice,
         progress,
         progressType,
-        ...metadata,
       })
     );
   };
@@ -337,12 +325,10 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     filePath,
     processedSize,
     totalSize,
-    transferStartTime = Date.now(),
   }: PROTO.FirmwareUpload & {
     filePath: string;
     processedSize?: number;
     totalSize?: number;
-    transferStartTime?: number;
   }) {
     if (!filePath.startsWith('0:')) {
       throw new Error('filePath must start with 0:');
@@ -352,6 +338,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
     const chunkSize = 1024 * perPackageSize;
     const totalChunks = Math.ceil(payload.byteLength / chunkSize);
     let offset = 0;
+    let currentFileProcessed = 0;
 
     for (let i = 0; i < totalChunks; i++) {
       const chunkStart = i * chunkSize;
@@ -363,7 +350,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
       // Calculate progress based on whether we're tracking overall progress or single file progress
       let progress: number;
       if (totalSize !== undefined && processedSize !== undefined) {
-        const currentFileProcessed = processedSize + chunkEnd;
+        currentFileProcessed = processedSize + chunkEnd;
         progress = Math.min(Math.ceil((currentFileProcessed / totalSize) * 100), 99);
       } else {
         progress = Math.min(Math.ceil(((i + 1) / totalChunks) * 100), 99);
@@ -379,17 +366,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
       );
       // @ts-expect-error
       offset += writeRes.message.processed_byte;
-      const elapsedMs = Date.now() - transferStartTime;
-      const transferredBytes =
-        totalSize !== undefined && processedSize !== undefined ? processedSize + offset : offset;
-      const totalBytes = totalSize ?? payload.byteLength;
-      this.postProgressMessage(progress, 'transferData', {
-        transferredBytes,
-        totalBytes,
-        rateBytesPerSecond:
-          elapsedMs > 0 ? Math.round((transferredBytes / elapsedMs) * 1000) : undefined,
-        elapsedMs,
-      });
+      this.postProgressMessage(progress, 'transferData');
     }
 
     // Return processed size only if we're tracking overall progress

package/src/api/index.ts

@@ -1,4 +1,5 @@
 export { default as testInitializeDeviceDuration } from './test/TestInitializeDeviceDuration';
+export { default as preInitialize } from './device/PreInitialize';
 
 export { default as searchDevices } from './SearchDevices';
 export { default as getFeatures } from './GetFeatures';

package/src/api/kaspa/KaspaSignTransaction.ts

@@ -22,6 +22,7 @@ export default class KaspaSignTransaction extends BaseMethod<KaspaSignTransactio
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     const payload = this.payload as KaspaSignTransactionParams;
 

package/src/api/near/NearSignTransaction.ts

@@ -10,6 +10,7 @@ export default class NearSignTransaction extends BaseMethod<HardwareNearSignTx>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/nem/NEMSignTransaction.ts

@@ -230,6 +230,7 @@ export default class NEMSignTransaction extends BaseMethod<NEMSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/neo/NeoSignTransaction.ts

@@ -11,6 +11,7 @@ export default class NeoSignTransaction extends BaseMethod<NeoSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
     this.strictCheckDeviceSupport = true;
 
     validateParams(this.payload, [

package/src/api/nervos/NervosSignTransaction.ts

@@ -19,6 +19,7 @@ export default class NervosSignTransaction extends BaseMethod<NervosSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/nexa/NexaSignTransaction.ts

@@ -12,6 +12,8 @@ export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionP
   hasBundle = false;
 
   init() {
+    this.allowUsePreInitialize = true;
+
     const payload = this.payload as NexaSignTransactionParams;
 
     payload.inputs.forEach(input => {

package/src/api/nostr/NostrSignEvent.ts

@@ -15,6 +15,7 @@ export default class NostrSignEvent extends BaseMethod<SignEvent> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     if (!validateEvent(payload.event)) {

package/src/api/nostr/NostrSignSchnorr.ts

@@ -11,6 +11,7 @@ export default class NostrSignSchnorr extends BaseMethod<SignSchnorr> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     validateParams(payload, [

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -13,6 +13,7 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/scdo/ScdoSignMessage.ts

@@ -11,6 +11,7 @@ export default class ScdoSignMessage extends BaseMethod<HardwareScdoSignMessage>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/scdo/ScdoSignTransaction.ts

@@ -18,6 +18,7 @@ export default class ScdoSignTransaction extends BaseMethod<HardwareScdoSignTx>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/solana/SolSignMessage.ts

@@ -10,6 +10,7 @@ export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMess
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/solana/SolSignOffchainMessage.ts

@@ -10,6 +10,7 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/solana/SolSignTransaction.ts

@@ -13,6 +13,7 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -10,6 +10,7 @@ export default class StarcoinSignMessage extends BaseMethod<HardwareStarcoinSign
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/starcoin/StarcoinSignTransaction.ts

@@ -10,6 +10,7 @@ export default class StarcoinSignTransaction extends BaseMethod<StarcoinSignTx>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/stellar/StellarSignTransaction.ts

@@ -231,6 +231,7 @@ export default class StellarSignTransaction extends BaseMethod<HardwareStellarSi
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/sui/SuiSignMessage.ts

@@ -10,6 +10,7 @@ export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/sui/SuiSignTransaction.ts

@@ -19,6 +19,7 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/ton/TonSignData.ts

@@ -14,6 +14,7 @@ export default class TonSignData extends BaseMethod<HardwareTonSignData> {
     this.strictCheckDeviceSupport = false;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/ton/TonSignMessage.ts

@@ -26,6 +26,7 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
     this.strictCheckDeviceSupport = true;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // init params
     validateParams(this.payload, [

package/src/api/ton/TonSignProof.ts

@@ -11,6 +11,7 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
     this.strictCheckDeviceSupport = true;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // init params
     validateParams(this.payload, [

package/src/api/tron/TronSignMessage.ts

@@ -14,6 +14,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/tron/TronSignTransaction.ts

@@ -123,6 +123,7 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/xrp/XrpSignTransaction.ts

@@ -11,6 +11,7 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
+    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     validateParams(payload, [

package/src/core/PollingStateManager.ts

@@ -0,0 +1,47 @@
+/**
+ * Manages polling state for device connection attempts.
+ *
+ * Polling is isolated by connectId (device), so:
+ * - New request for device A only stops device A's previous polling
+ * - Device B's polling is unaffected
+ */
+export class PollingStateManager {
+  // connectId -> current polling ID
+  private activePolls = new Map<string, number>();
+
+  /**
+   * Start a new polling session for a device.
+   * Automatically stops the previous polling for the same device.
+   * @param connectId - Device identifier (use empty string for USB without connectId)
+   * @returns The new polling ID
+   */
+  start(connectId: string): number {
+    const currentId = (this.activePolls.get(connectId) ?? 0) + 1;
+    this.activePolls.set(connectId, currentId);
+    return currentId;
+  }
+
+  /**
+   * Check if a polling session is still active.
+   * @param connectId - Device identifier
+   * @param pollingId - The polling ID to check
+   */
+  isActive(connectId: string, pollingId: number): boolean {
+    return this.activePolls.get(connectId) === pollingId;
+  }
+
+  /**
+   * Stop polling for a specific device.
+   * @param connectId - Device identifier
+   */
+  stop(connectId: string): void {
+    this.activePolls.delete(connectId);
+  }
+
+  /**
+   * Stop all active polling sessions.
+   */
+  stopAll(): void {
+    this.activePolls.clear();
+  }
+}

package/src/core/RequestQueue.ts

@@ -113,13 +113,20 @@ export default class RequestQueue {
 
     callbackPromise.promise.finally(() => {
       Log.debug(`Callback task completed for connectId: ${connectId}`);
-      this.pendingCallbackTasks.delete(connectId);
+      // Delete by identity so a newer task that replaced this slot isn't orphaned.
+      if (this.pendingCallbackTasks.get(connectId) === callbackPromise) {
+        this.pendingCallbackTasks.delete(connectId);
+      }
     });
   }
 
-  public async waitForPendingCallbackTasks(connectId: string): Promise<void> {
+  public async waitForPendingCallbackTasks(
+    connectId: string,
+    exceptTask?: Deferred<void>
+  ): Promise<void> {
     const pendingTask = this.pendingCallbackTasks.get(connectId);
-    if (pendingTask) {
+    // Skip only the caller's own task (self-wait); a different one is still awaited.
+    if (pendingTask && pendingTask !== exceptTask) {
       Log.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
       await pendingTask.promise;
     }