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

package/dist/index.d.mts

@@ -354,7 +354,6 @@ declare class LedgerConnectorBase implements IConnector {
      * enumerate() cache survives peripherals going offline.
      */
     protected _discoverDescriptors(dm: LedgerDeviceManager): Promise<DeviceDescriptor[]>;
-    private _assertSingleUsbDescriptor;
     searchDevices(): Promise<ConnectorDevice[]>;
     connect(deviceId?: string): Promise<ConnectorSession>;
     disconnect(sessionId: string): Promise<void>;

package/dist/index.d.ts

@@ -354,7 +354,6 @@ declare class LedgerConnectorBase implements IConnector {
      * enumerate() cache survives peripherals going offline.
      */
     protected _discoverDescriptors(dm: LedgerDeviceManager): Promise<DeviceDescriptor[]>;
-    private _assertSingleUsbDescriptor;
     searchDevices(): Promise<ConnectorDevice[]>;
     connect(deviceId?: string): Promise<ConnectorSession>;
     disconnect(sessionId: string): Promise<void>;

package/dist/index.js

@@ -1066,12 +1066,6 @@ var _LedgerAdapter = class _LedgerAdapter {
     throw new Error("_doConnect aborted");
   }
   async _connectFirstOrSelect(devices, targetConnectId) {
-    if (!isLedgerBleConnectionType(this.connector.connectionType) && devices.length > 1) {
-      debugLog(
-        `[DMK] Multiple Ledger USB devices found (${devices.length}); refusing to auto-select by ephemeral connectId.`
-      );
-      throw createMultipleUsbLedgerDevicesError();
-    }
     if (targetConnectId) {
       const target = devices.find(
         (d) => d.connectId === targetConnectId || d.deviceId === targetConnectId
@@ -1098,6 +1092,9 @@ var _LedgerAdapter = class _LedgerAdapter {
         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
@@ -3088,22 +3085,18 @@ var LedgerConnectorBase = class {
     }
     return descriptors;
   }
-  _assertSingleUsbDescriptor(descriptors) {
-    if (isLedgerBleConnectionType(this.connectionType) || descriptors.length <= 1) {
-      return;
-    }
-    debugLog(
-      `[DMK] Multiple Ledger USB devices found (${descriptors.length}); refusing to choose by ephemeral path. paths=[${descriptors.map((d) => d.path).join(",")}]`
-    );
-    throw createMultipleUsbLedgerDevicesError();
-  }
   // ---------------------------------------------------------------------------
   // 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();
     const descriptors = await this._discoverDescriptors(dm);
-    this._assertSingleUsbDescriptor(descriptors);
     const resolvedDescriptors = descriptors.map((d) => ({
       descriptor: d,
       connectId: this._resolveConnectId(d)
@@ -3129,10 +3122,6 @@ var LedgerConnectorBase = class {
   async connect(deviceId) {
     const callerSuppliedConnectId = Boolean(deviceId);
     let targetPath = deviceId;
-    if (callerSuppliedConnectId && !isLedgerBleConnectionType(this.connectionType)) {
-      const dm = await this._getDeviceManager();
-      this._assertSingleUsbDescriptor(await this._discoverDescriptors(dm));
-    }
     if (!targetPath) {
       const discovered = await this.searchDevices();
       if (discovered.length === 0) {