@onekeyfe/hwk-ledger-adapter 1.1.26-patch.2 → 1.1.27-alpha.1

package/dist/index.d.mts

@@ -6,17 +6,26 @@ 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;
+}
 declare class LedgerAdapter implements IHardwareWallet {
     readonly vendor: "ledger";
     private readonly connector;
     private readonly emitter;
+    private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
     private readonly _uiRegistry;
     private _btcHighIndexConfirmedThisSession;
     private readonly _jobQueue;
     private _doConnectAbortController;
-    constructor(connector: IConnector);
+    constructor(connector: IConnector, options?: LedgerAdapterOptions);
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
@@ -30,7 +39,6 @@ declare class LedgerAdapter implements IHardwareWallet {
     dispose(): Promise<void>;
     uiResponse(response: UiResponseEvent): void;
     searchDevices(options?: SearchDevicesOptions): Promise<DeviceInfo[]>;
-    private _evictAllSessions;
     private static readonly MAX_BUSINESS_RETRY_BUDGET;
     private static readonly STUCK_APP_RETRY_DELAY_MS;
     private static readonly MAX_DOCONNECT_CONFIRMS;
@@ -90,7 +98,7 @@ declare class LedgerAdapter implements IHardwareWallet {
      *
      * - If a session already exists for the given connectId, reuse it.
      * - If ANY session exists (Ledger IDs are ephemeral), reuse it.
-     * - Otherwise: search → exactly 1 USB device auto-connects; multiple or none throws.
+     * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     private _connectingPromise;
     private _waitForDeviceConnect;
@@ -107,6 +115,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _doConnect;
     private _connectFirstOrSelect;
     private _connectDeviceOrThrow;
+    private _chooseDeviceFromList;
     /**
      * Call the connector with automatic session resolution and disconnect retry.
      *
@@ -364,7 +373,8 @@ declare class LedgerConnectorBase implements IConnector {
      * `LedgerAdapter._sessions` map would hold a dead session entry until
      * the next call hit `DeviceSessionNotFound`.
      *
-     * Subscribe failure is fatal — see the inline note at the subscribe call.
+     * Best-effort: any error subscribing is swallowed so a flaky DMK
+     * doesn't break the connect path.
      */
     private _watchSessionState;
     private _unwatchSessionState;

package/dist/index.d.ts

@@ -6,17 +6,26 @@ 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;
+}
 declare class LedgerAdapter implements IHardwareWallet {
     readonly vendor: "ledger";
     private readonly connector;
     private readonly emitter;
+    private readonly _handleSelectDevice;
     private _discoveredDevices;
     private _sessions;
     private readonly _uiRegistry;
     private _btcHighIndexConfirmedThisSession;
     private readonly _jobQueue;
     private _doConnectAbortController;
-    constructor(connector: IConnector);
+    constructor(connector: IConnector, options?: LedgerAdapterOptions);
     get activeTransport(): TransportType | null;
     getAvailableTransports(): TransportType[];
     switchTransport(_type: TransportType): Promise<void>;
@@ -30,7 +39,6 @@ declare class LedgerAdapter implements IHardwareWallet {
     dispose(): Promise<void>;
     uiResponse(response: UiResponseEvent): void;
     searchDevices(options?: SearchDevicesOptions): Promise<DeviceInfo[]>;
-    private _evictAllSessions;
     private static readonly MAX_BUSINESS_RETRY_BUDGET;
     private static readonly STUCK_APP_RETRY_DELAY_MS;
     private static readonly MAX_DOCONNECT_CONFIRMS;
@@ -90,7 +98,7 @@ declare class LedgerAdapter implements IHardwareWallet {
      *
      * - If a session already exists for the given connectId, reuse it.
      * - If ANY session exists (Ledger IDs are ephemeral), reuse it.
-     * - Otherwise: search → exactly 1 USB device auto-connects; multiple or none throws.
+     * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     private _connectingPromise;
     private _waitForDeviceConnect;
@@ -107,6 +115,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _doConnect;
     private _connectFirstOrSelect;
     private _connectDeviceOrThrow;
+    private _chooseDeviceFromList;
     /**
      * Call the connector with automatic session resolution and disconnect retry.
      *
@@ -364,7 +373,8 @@ declare class LedgerConnectorBase implements IConnector {
      * `LedgerAdapter._sessions` map would hold a dead session entry until
      * the next call hit `DeviceSessionNotFound`.
      *
-     * Subscribe failure is fatal — see the inline note at the subscribe call.
+     * Best-effort: any error subscribing is swallowed so a flaky DMK
+     * doesn't break the connect path.
      */
     private _watchSessionState;
     private _unwatchSessionState;

package/dist/index.js

@@ -57,12 +57,6 @@ var import_hwk_adapter_core2 = require("@onekeyfe/hwk-adapter-core");
 
 // src/errors.ts
 var import_hwk_adapter_core = require("@onekeyfe/hwk-adapter-core");
-var MULTIPLE_USB_LEDGER_DEVICES_ERROR_MESSAGE = "Multiple Ledger USB devices are connected. Please connect only one Ledger device and try again.";
-function createMultipleUsbLedgerDevicesError() {
-  return Object.assign(new Error(MULTIPLE_USB_LEDGER_DEVICES_ERROR_MESSAGE), {
-    code: import_hwk_adapter_core.HardwareErrorCode.DeviceOneDeviceOnly
-  });
-}
 function ledgerFailure(code, error, appName, tag, params) {
   const payload = { error, code };
   if (appName !== void 0) payload.appName = appName;
@@ -494,7 +488,7 @@ function btcAccountIndexFromPath(path) {
   return Number.isFinite(accountIndex) ? accountIndex : null;
 }
 var _LedgerAdapter = class _LedgerAdapter {
-  constructor(connector) {
+  constructor(connector, options) {
     this.vendor = "ledger";
     this.emitter = new import_hwk_adapter_core2.TypedEventEmitter();
     this._discoveredDevices = /* @__PURE__ */ new Map();
@@ -516,7 +510,7 @@ var _LedgerAdapter = class _LedgerAdapter {
      *
      * - If a session already exists for the given connectId, reuse it.
      * - If ANY session exists (Ledger IDs are ephemeral), reuse it.
-     * - Otherwise: search → exactly 1 USB device auto-connects; multiple or none throws.
+     * - Otherwise: search → 1 device: auto-connect, multiple: ask user, 0: throw.
      */
     // Mutex for ensureConnected — prevents concurrent calls from establishing duplicate connections
     this._connectingPromise = null;
@@ -547,6 +541,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       this.emitter.emit("ui-event", event);
     };
     this.connector = connector;
+    this._handleSelectDevice = options?.handleSelectDevice ?? false;
     this._jobQueue = new import_hwk_adapter_core2.DeviceJobQueue();
     this.registerEventListeners();
   }
@@ -620,18 +615,6 @@ var _LedgerAdapter = class _LedgerAdapter {
     );
     return Array.from(this._discoveredDevices.values());
   }
-  // USB single-session invariant: evict all sessions, best-effort (see connectDevice).
-  async _evictAllSessions() {
-    if (this._sessions.size === 0) return;
-    const stale = [...this._sessions.values()];
-    this._sessions.clear();
-    for (const sid of stale) {
-      try {
-        await this.connector.disconnect(sid);
-      } catch {
-      }
-    }
-  }
   static _createDeviceBusyError(method) {
     return Object.assign(new Error(`Ledger device is busy while calling ${method}`), {
       code: import_hwk_adapter_core2.HardwareErrorCode.DeviceBusy
@@ -644,9 +627,6 @@ var _LedgerAdapter = class _LedgerAdapter {
           code: import_hwk_adapter_core2.HardwareErrorCode.DeviceNotFound
         });
       }
-      if (!isLedgerBleConnectionType(this.connector.connectionType)) {
-        await this._evictAllSessions();
-      }
       await this._ensureDevicePermission(connectId);
       const session = await this.connector.connect(connectId);
       this._sessions.set(connectId, session.sessionId);
@@ -974,15 +954,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       });
     }
     if (connectId && this._sessions.has(connectId)) return connectId;
-    if (!connectId && this._sessions.size > 0) {
-      if (!isLedgerBleConnectionType(this.connector.connectionType) && this._sessions.size > 1) {
-        throw Object.assign(
-          new Error(
-            "Ledger USB session invariant violated: more than one session is active. Please reconnect the device."
-          ),
-          { code: import_hwk_adapter_core2.HardwareErrorCode.DeviceOneDeviceOnly }
-        );
-      }
+    if (this._sessions.size > 0) {
       return this._sessions.keys().next().value;
     }
     if (!this._connectingPromise) {
@@ -1070,37 +1042,24 @@ var _LedgerAdapter = class _LedgerAdapter {
       const target = devices.find(
         (d) => d.connectId === targetConnectId || d.deviceId === targetConnectId
       );
-      if (target) {
-        return this._connectDeviceOrThrow(target.connectId);
-      }
-      if (!isLedgerBleConnectionType(this.connector.connectionType) && devices.length === 1) {
-        debugLog(
-          `[LedgerAdapter] target ${targetConnectId} not in fresh enumeration; accepting sole USB device ${devices[0].connectId} (assumed ephemeral path change)`
-        );
-        return this._connectDeviceOrThrow(devices[0].connectId);
-      }
-      const err = Object.assign(new Error(`Target Ledger unavailable: ${targetConnectId}`), {
-        code: import_hwk_adapter_core2.HardwareErrorCode.DeviceNotFound
-      });
-      if (isLedgerBleConnectionType(this.connector.connectionType)) {
-        err._tag = ERROR_TAG.DeviceNotAdvertising;
+      if (!target) {
+        const err = Object.assign(new Error(`Target Ledger unavailable: ${targetConnectId}`), {
+          code: import_hwk_adapter_core2.HardwareErrorCode.DeviceNotFound
+        });
+        if (isLedgerBleConnectionType(this.connector.connectionType)) {
+          err._tag = ERROR_TAG.DeviceNotAdvertising;
+        }
+        throw err;
       }
-      throw err;
+      return this._connectDeviceOrThrow(target.connectId);
     }
     if (isLedgerBleConnectionType(this.connector.connectionType)) {
       throw Object.assign(new Error("Ledger BLE connectId is required."), {
         code: import_hwk_adapter_core2.HardwareErrorCode.DeviceNotFound
       });
     }
-    if (devices.length > 1) {
-      throw createMultipleUsbLedgerDevicesError();
-    }
-    if (devices.length !== 1) {
-      throw Object.assign(new Error("Ledger device not found."), {
-        code: import_hwk_adapter_core2.HardwareErrorCode.DeviceNotFound
-      });
-    }
-    return this._connectDeviceOrThrow(devices[0].connectId);
+    const chosenConnectId = devices.length === 1 ? devices[0].connectId : await this._chooseDeviceFromList(devices);
+    return this._connectDeviceOrThrow(chosenConnectId);
   }
   async _connectDeviceOrThrow(chosenConnectId) {
     const result = await this.connectDevice(chosenConnectId);
@@ -1116,6 +1075,46 @@ var _LedgerAdapter = class _LedgerAdapter {
     }
     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;
+    }
+    let response;
+    try {
+      const waitPromise = this._uiRegistry.wait(
+        import_hwk_adapter_core2.UI_REQUEST.REQUEST_SELECT_DEVICE
+      );
+      this.emitter.emit(import_hwk_adapter_core2.UI_REQUEST.REQUEST_SELECT_DEVICE, {
+        type: import_hwk_adapter_core2.UI_REQUEST.REQUEST_SELECT_DEVICE,
+        payload: { devices }
+      });
+      response = await waitPromise;
+    } catch (err) {
+      if (err?._tag === import_hwk_adapter_core2.UI_REQUEST_PREEMPTED_TAG) {
+        this.emitter.emit(import_hwk_adapter_core2.UI_REQUEST.CLOSE_UI_WINDOW, {
+          type: import_hwk_adapter_core2.UI_REQUEST.CLOSE_UI_WINDOW,
+          payload: {}
+        });
+        throw Object.assign(new Error("Device selection superseded"), {
+          _tag: ERROR_TAG.UserAborted,
+          code: import_hwk_adapter_core2.HardwareErrorCode.UserAborted,
+          cause: err
+        });
+      }
+      throw err;
+    }
+    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: ERROR_TAG.DeviceNotRecognized }
+      );
+    }
+    return chosen.connectId;
+  }
   /**
    * Call the connector with automatic session resolution and disconnect retry.
    *
@@ -1280,7 +1279,8 @@ var _LedgerAdapter = class _LedgerAdapter {
               } catch {
               }
             }
-            const reConnectId = await this.ensureConnected(resolvedConnectId, signal);
+            const retryConnectId = isLedgerBleConnectionType(this.connector.connectionType) ? resolvedConnectId : void 0;
+            const reConnectId = await this.ensureConnected(retryConnectId, signal);
             const reSessionId = this._sessions.get(reConnectId);
             if (!reSessionId) throw lastErr;
             if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId) {
@@ -1348,7 +1348,8 @@ var _LedgerAdapter = class _LedgerAdapter {
    */
   async _retryAfterStuckApp(resolvedConnectId, method, params, signal, originalErr, fingerprint) {
     await this._sleepAbortable(_LedgerAdapter.STUCK_APP_RETRY_DELAY_MS, signal);
-    const retryConnectId = await this.ensureConnected(resolvedConnectId, signal);
+    const retryTargetConnectId = isLedgerBleConnectionType(this.connector.connectionType) ? resolvedConnectId : void 0;
+    const retryConnectId = await this.ensureConnected(retryTargetConnectId, signal);
     const retrySessionId = this._sessions.get(retryConnectId);
     if (!retrySessionId) throw originalErr;
     if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId) {
@@ -3087,12 +3088,6 @@ var LedgerConnectorBase = class {
   }
   // ---------------------------------------------------------------------------
   // IConnector -- Device discovery
-  //
-  // Discovery never throws on multiple USB devices — it returns the full list.
-  // The "connect exactly one device" rule is enforced upstream: an explicit
-  // connectId connects that device (or fails as not-found), and only the
-  // no-connectId USB path rejects when more than one device is present
-  // (see LedgerAdapter._connectFirstOrSelect).
   // ---------------------------------------------------------------------------
   async searchDevices() {
     const dm = await this._getDeviceManager();
@@ -3198,16 +3193,7 @@ var LedgerConnectorBase = class {
         }
         throw err;
       }
-      try {
-        this._watchSessionState(sessionId, externalConnectId);
-      } catch (subErr) {
-        debugLog("[DMK] state subscription failed during connect; disconnecting session:", subErr);
-        try {
-          await dm.disconnect(sessionId);
-        } catch {
-        }
-        throw subErr;
-      }
+      this._watchSessionState(sessionId, externalConnectId);
       const info = dm.getDiscoveredDeviceInfo(path);
       const session = {
         sessionId,
@@ -3273,7 +3259,8 @@ var LedgerConnectorBase = class {
    * `LedgerAdapter._sessions` map would hold a dead session entry until
    * the next call hit `DeviceSessionNotFound`.
    *
-   * Subscribe failure is fatal — see the inline note at the subscribe call.
+   * Best-effort: any error subscribing is swallowed so a flaky DMK
+   * doesn't break the connect path.
    */
   _watchSessionState(sessionId, externalConnectId) {
     const dmk = this._dmk;
@@ -3285,20 +3272,24 @@ var LedgerConnectorBase = class {
       } catch {
       }
     }
-    const sub = dmk.getDeviceSessionState({ sessionId }).subscribe({
-      next: (state) => {
-        if (state?.deviceStatus === "NOT CONNECTED") {
+    try {
+      const sub = dmk.getDeviceSessionState({ sessionId }).subscribe({
+        next: (state) => {
+          if (state?.deviceStatus === "NOT CONNECTED") {
+            this._handleAutonomousDisconnect(sessionId, externalConnectId);
+          }
+        },
+        error: () => {
+          this._handleAutonomousDisconnect(sessionId, externalConnectId);
+        },
+        complete: () => {
           this._handleAutonomousDisconnect(sessionId, externalConnectId);
         }
-      },
-      error: () => {
-        this._handleAutonomousDisconnect(sessionId, externalConnectId);
-      },
-      complete: () => {
-        this._handleAutonomousDisconnect(sessionId, externalConnectId);
-      }
-    });
-    this._sessionStateSubs.set(sessionId, sub);
+      });
+      this._sessionStateSubs.set(sessionId, sub);
+    } catch (err) {
+      debugLog("[DMK] _watchSessionState subscribe failed:", err);
+    }
   }
   _unwatchSessionState(sessionId) {
     const sub = this._sessionStateSubs.get(sessionId);