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

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, [
@@ -31,7 +32,6 @@ export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMess
     return {
       pro2: {
         min: '0.0.0',
-        unsupported: true,
       },
       pro: {
         min: '4.12.0',

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, [
@@ -37,7 +38,6 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
     return {
       pro2: {
         min: '0.0.0',
-        unsupported: true,
       },
       pro: {
         min: '4.12.0',

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] };
@@ -44,7 +45,6 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
       return {
         pro2: {
           min: '0.0.0',
-          unsupported: true,
         },
         model_mini: {
           min: '3.1.0',
@@ -58,7 +58,6 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
     return {
       pro2: {
         min: '0.0.0',
-        unsupported: true,
       },
       classic: {
         min: '2.1.9',

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;
     }