@onekeyfe/hwk-ledger-adapter 1.1.26-alpha.101 → 1.1.26-alpha.102

package/dist/index.d.mts

@@ -1,10 +1,18 @@
-import { IHardwareWallet, IConnector, TransportType, IUiHandler, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
+import { IHardwareWallet, IConnector, TransportType, IUiHandler, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit, DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
 import { SignerSolana } from '@ledgerhq/device-signer-kit-solana';
 import Transport from '@ledgerhq/hw-transport';
 
+interface LedgerAdapterOptions {
+    /**
+     * `true` — emit `REQUEST_SELECT_DEVICE` on multi-device discovery and await
+     * `uiResponse({ type: RECEIVE_SELECT_DEVICE, payload: { sdkConnectId } })`.
+     * `false` (default) — silently pick the first device.
+     */
+    handleSelectDevice?: boolean;
+}
 /**
  * Ledger hardware wallet adapter that delegates to an IConnector.
  *
@@ -20,9 +28,11 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly connector;
     private readonly emitter;
     private _uiHandler;
+    private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
-    constructor(connector: IConnector);
+    private readonly _uiRegistry;
+    constructor(connector: IConnector, options?: LedgerAdapterOptions);
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
@@ -35,6 +45,7 @@ declare class LedgerAdapter implements IHardwareWallet {
      */
     resetState(): void;
     dispose(): Promise<void>;
+    uiResponse(response: UiResponseEvent): void;
     searchDevices(): Promise<DeviceInfo[]>;
     connectDevice(connectId: string): Promise<Response<string>>;
     disconnectDevice(connectId: string): Promise<void>;
@@ -97,25 +108,12 @@ declare class LedgerAdapter implements IHardwareWallet {
      * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     private static readonly MAX_DEVICE_RETRY;
-    private _deviceConnectResolve;
     private _connectingPromise;
-    private static readonly DEVICE_CONNECT_TIMEOUT_MS;
-    /**
-     * Wait for user to connect and unlock device.
-     * Emits 'ui-request' event via the adapter's own emitter.
-     * The consumer (monorepo adapter wrapper) listens for this and shows UI.
-     * When user confirms, they call adapter.deviceConnectResponse() which resolves this promise.
-     * Times out after 60 seconds if no response is received.
-     */
     private _waitForDeviceConnect;
-    /**
-     * Called by consumer to respond to ui-request-device-connect.
-     * type='confirm' → retry search, type='cancel' → abort.
-     */
-    deviceConnectResponse(type: 'confirm' | 'cancel'): void;
     private ensureConnected;
     private _doConnect;
     private _connectFirstOrSelect;
+    private _chooseDeviceFromList;
     /**
      * Call the connector with automatic session resolution and disconnect retry.
      *
@@ -223,10 +221,7 @@ declare class LedgerConnectorBase implements IConnector {
     disconnect(sessionId: string): Promise<void>;
     call(sessionId: string, method: string, params: unknown): Promise<unknown>;
     cancel(_sessionId: string): Promise<void>;
-    uiResponse(_response: {
-        type: string;
-        payload: unknown;
-    }): void;
+    uiResponse(_response: UiResponseEvent): void;
     on<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     off<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     reset(): void;

package/dist/index.d.ts

@@ -1,10 +1,18 @@
-import { IHardwareWallet, IConnector, TransportType, IUiHandler, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
+import { IHardwareWallet, IConnector, TransportType, IUiHandler, UiResponseEvent, DeviceInfo, Response, ChainCapability, EvmGetAddressParams, EvmAddress, ProgressCallback, EvmGetPublicKeyParams, EvmPublicKey, EvmSignTxParams, EvmSignedTx, EvmSignMsgParams, EvmSignature, EvmSignTypedDataParams, BtcGetAddressParams, BtcAddress, BtcGetPublicKeyParams, BtcPublicKey, BtcSignTxParams, BtcSignedTx, BtcSignPsbtParams, BtcSignedPsbt, BtcSignMsgParams, BtcSignature, SolGetAddressParams, SolAddress, SolGetPublicKeyParams, SolPublicKey, SolSignTxParams, SolSignedTx, SolSignMsgParams, SolSignature, TronGetAddressParams, TronAddress, TronSignTxParams, TronSignedTx, TronSignMsgParams, TronSignature, HardwareEventMap, DeviceEventListener, ChainForFingerprint, ConnectionType, DeviceDescriptor, ConnectorDevice, ConnectorSession, ConnectorEventType, ConnectorEventMap, DeviceChangeEvent, HardwareErrorCode } from '@onekeyfe/hwk-adapter-core';
 import { DeviceManagementKit, DeviceActionState as DeviceActionState$1, DiscoveredDevice, ExecuteDeviceActionReturnType } from '@ledgerhq/device-management-kit';
 import { Address, Signature, SignerEth as SignerEth$1, TypedData } from '@ledgerhq/device-signer-kit-ethereum';
 import { SignerBtc as SignerBtc$1 } from '@ledgerhq/device-signer-kit-bitcoin';
 import { SignerSolana } from '@ledgerhq/device-signer-kit-solana';
 import Transport from '@ledgerhq/hw-transport';
 
+interface LedgerAdapterOptions {
+    /**
+     * `true` — emit `REQUEST_SELECT_DEVICE` on multi-device discovery and await
+     * `uiResponse({ type: RECEIVE_SELECT_DEVICE, payload: { sdkConnectId } })`.
+     * `false` (default) — silently pick the first device.
+     */
+    handleSelectDevice?: boolean;
+}
 /**
  * Ledger hardware wallet adapter that delegates to an IConnector.
  *
@@ -20,9 +28,11 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly connector;
     private readonly emitter;
     private _uiHandler;
+    private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
-    constructor(connector: IConnector);
+    private readonly _uiRegistry;
+    constructor(connector: IConnector, options?: LedgerAdapterOptions);
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
@@ -35,6 +45,7 @@ declare class LedgerAdapter implements IHardwareWallet {
      */
     resetState(): void;
     dispose(): Promise<void>;
+    uiResponse(response: UiResponseEvent): void;
     searchDevices(): Promise<DeviceInfo[]>;
     connectDevice(connectId: string): Promise<Response<string>>;
     disconnectDevice(connectId: string): Promise<void>;
@@ -97,25 +108,12 @@ declare class LedgerAdapter implements IHardwareWallet {
      * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     private static readonly MAX_DEVICE_RETRY;
-    private _deviceConnectResolve;
     private _connectingPromise;
-    private static readonly DEVICE_CONNECT_TIMEOUT_MS;
-    /**
-     * Wait for user to connect and unlock device.
-     * Emits 'ui-request' event via the adapter's own emitter.
-     * The consumer (monorepo adapter wrapper) listens for this and shows UI.
-     * When user confirms, they call adapter.deviceConnectResponse() which resolves this promise.
-     * Times out after 60 seconds if no response is received.
-     */
     private _waitForDeviceConnect;
-    /**
-     * Called by consumer to respond to ui-request-device-connect.
-     * type='confirm' → retry search, type='cancel' → abort.
-     */
-    deviceConnectResponse(type: 'confirm' | 'cancel'): void;
     private ensureConnected;
     private _doConnect;
     private _connectFirstOrSelect;
+    private _chooseDeviceFromList;
     /**
      * Call the connector with automatic session resolution and disconnect retry.
      *
@@ -223,10 +221,7 @@ declare class LedgerConnectorBase implements IConnector {
     disconnect(sessionId: string): Promise<void>;
     call(sessionId: string, method: string, params: unknown): Promise<unknown>;
     cancel(_sessionId: string): Promise<void>;
-    uiResponse(_response: {
-        type: string;
-        payload: unknown;
-    }): void;
+    uiResponse(_response: UiResponseEvent): void;
     on<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     off<K extends ConnectorEventType>(event: K, handler: (data: ConnectorEventMap[K]) => void): void;
     reset(): void;

package/dist/index.js

@@ -204,7 +204,7 @@ function formatDeviceMismatchError(expected, actual) {
   return `Wrong device: expected ${expected}, got ${actual}`;
 }
 var _LedgerAdapter = class _LedgerAdapter {
-  constructor(connector) {
+  constructor(connector, options) {
     this.vendor = "ledger";
     this.emitter = new import_hwk_adapter_core2.TypedEventEmitter();
     this._uiHandler = null;
@@ -212,8 +212,7 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._discoveredDevices = /* @__PURE__ */ new Map();
     // Session tracking: maps connectId -> sessionId
     this._sessions = /* @__PURE__ */ new Map();
-    // Pending device-connect resolve — set by _waitForDeviceConnect, resolved by uiResponse
-    this._deviceConnectResolve = null;
+    this._uiRegistry = new import_hwk_adapter_core2.UiRequestRegistry();
     // Mutex for ensureConnected — prevents concurrent calls from establishing duplicate connections
     this._connectingPromise = null;
     // ---------------------------------------------------------------------------
@@ -243,6 +242,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       this.handleUiEvent(data);
     };
     this.connector = connector;
+    this._handleSelectDevice = options?.handleSelectDevice ?? false;
     this.registerEventListeners();
   }
   // ---------------------------------------------------------------------------
@@ -278,10 +278,10 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._discoveredDevices.clear();
     this._sessions.clear();
     this._connectingPromise = null;
+    this._uiRegistry.reset();
   }
   async dispose() {
-    this._deviceConnectResolve?.(true);
-    this._deviceConnectResolve = null;
+    this._uiRegistry.reset();
     this.unregisterEventListeners();
     this.connector.reset();
     this._uiHandler = null;
@@ -289,6 +289,9 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._sessions.clear();
     this.emitter.removeAllListeners();
   }
+  uiResponse(response) {
+    this._uiRegistry.resolve(response.type, response.payload);
+  }
   // ---------------------------------------------------------------------------
   // Device management
   // ---------------------------------------------------------------------------
@@ -622,55 +625,24 @@ var _LedgerAdapter = class _LedgerAdapter {
     }
     throw new Error(`Unsupported chain for fingerprint: ${chain}`);
   }
-  /**
-   * Wait for user to connect and unlock device.
-   * Emits 'ui-request' event via the adapter's own emitter.
-   * The consumer (monorepo adapter wrapper) listens for this and shows UI.
-   * When user confirms, they call adapter.deviceConnectResponse() which resolves this promise.
-   * Times out after 60 seconds if no response is received.
-   */
-  _waitForDeviceConnect(attempt) {
-    return new Promise((resolve, reject) => {
-      let settled = false;
-      const timer = setTimeout(() => {
-        if (!settled) {
-          settled = true;
-          this._deviceConnectResolve = null;
-          reject(new Error("Ledger device connect timed out after 60 seconds"));
-        }
-      }, _LedgerAdapter.DEVICE_CONNECT_TIMEOUT_MS);
-      this._deviceConnectResolve = (cancelled) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        this._deviceConnectResolve = null;
-        if (cancelled) {
-          reject(
-            Object.assign(new Error("User cancelled Ledger connection"), {
-              _tag: "DeviceNotRecognizedError"
-            })
-          );
-        } else {
-          resolve();
-        }
-      };
-      this.emitter.emit(import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_CONNECT, {
-        type: import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_CONNECT,
-        payload: {
-          message: "Please connect and unlock your Ledger device",
-          retryCount: attempt,
-          maxRetries: _LedgerAdapter.MAX_DEVICE_RETRY
-        }
-      });
+  // Ledger WebUSB won't expose a locked device, so we can't auto-detect unlock.
+  // The user must press Confirm after unlocking, which triggers a search retry.
+  async _waitForDeviceConnect(attempt) {
+    this.emitter.emit(import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_CONNECT, {
+      type: import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_CONNECT,
+      payload: {
+        message: "Please connect and unlock your Ledger device",
+        retryCount: attempt,
+        maxRetries: _LedgerAdapter.MAX_DEVICE_RETRY
+      }
     });
-  }
-  /**
-   * Called by consumer to respond to ui-request-device-connect.
-   * type='confirm' → retry search, type='cancel' → abort.
-   */
-  deviceConnectResponse(type) {
-    if (this._deviceConnectResolve) {
-      this._deviceConnectResolve(type === "cancel");
+    const payload = await this._uiRegistry.wait(
+      import_hwk_adapter_core2.UI_REQUEST.REQUEST_DEVICE_CONNECT
+    );
+    if (!payload?.confirmed) {
+      throw Object.assign(new Error("User cancelled Ledger connection"), {
+        _tag: "DeviceNotRecognizedError"
+      });
     }
   }
   async ensureConnected(connectId) {
@@ -708,26 +680,39 @@ var _LedgerAdapter = class _LedgerAdapter {
     );
   }
   async _connectFirstOrSelect(devices) {
-    if (devices.length === 1) {
-      const result2 = await this.connectDevice(devices[0].connectId);
-      if (!result2.success) {
-        throw Object.assign(new Error(result2.payload.error), { _tag: "DeviceNotRecognizedError" });
-      }
-      return devices[0].connectId;
+    const chosenConnectId = devices.length === 1 ? devices[0].connectId : await this._chooseDeviceFromList(devices);
+    const result = await this.connectDevice(chosenConnectId);
+    if (!result.success) {
+      throw Object.assign(new Error(result.payload.error), {
+        _tag: "DeviceNotRecognizedError"
+      });
     }
-    if (this._uiHandler?.onSelectDevice) {
-      const selectedConnectId = await this._uiHandler.onSelectDevice(devices);
-      const result2 = await this.connectDevice(selectedConnectId);
-      if (!result2.success) {
-        throw Object.assign(new Error(result2.payload.error), { _tag: "DeviceNotRecognizedError" });
-      }
-      return selectedConnectId;
+    return chosenConnectId;
+  }
+  async _chooseDeviceFromList(devices) {
+    if (!this._handleSelectDevice) {
+      debugLog(
+        `[DMK] Multiple Ledger devices found (${devices.length}); handleSelectDevice=false, picking first (${devices[0].connectId}).`
+      );
+      return devices[0].connectId;
     }
-    const result = await this.connectDevice(devices[0].connectId);
-    if (!result.success) {
-      throw Object.assign(new Error(result.payload.error), { _tag: "DeviceNotRecognizedError" });
+    this.emitter.emit(import_hwk_adapter_core2.UI_REQUEST.REQUEST_SELECT_DEVICE, {
+      type: import_hwk_adapter_core2.UI_REQUEST.REQUEST_SELECT_DEVICE,
+      payload: { devices }
+    });
+    const response = await this._uiRegistry.wait(
+      import_hwk_adapter_core2.UI_REQUEST.REQUEST_SELECT_DEVICE
+    );
+    const chosen = devices.find((d) => d.connectId === response?.sdkConnectId);
+    if (!chosen) {
+      throw Object.assign(
+        new Error(
+          `Selected sdkConnectId '${response?.sdkConnectId}' not in discovered list`
+        ),
+        { _tag: "DeviceNotRecognizedError" }
+      );
     }
-    return devices[0].connectId;
+    return chosen.connectId;
   }
   /**
    * Call the connector with automatic session resolution and disconnect retry.
@@ -910,7 +895,6 @@ var _LedgerAdapter = class _LedgerAdapter {
  * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
  */
 _LedgerAdapter.MAX_DEVICE_RETRY = 3;
-_LedgerAdapter.DEVICE_CONNECT_TIMEOUT_MS = 6e4;
 var LedgerAdapter = _LedgerAdapter;
 
 // src/device/LedgerDeviceManager.ts