@onekeyfe/hwk-ledger-adapter 1.2.5-alpha.2 → 1.2.5-alpha.4

package/dist/index.d.mts

@@ -102,8 +102,8 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly _operations;
     private _discoveredDevices;
     private _sessions;
-    private readonly _pendingOperationBindings;
-    private readonly _verifiedBleReconnectTargets;
+    private readonly _sessionTransports;
+    private readonly _selectedBleReconnectTargets;
     private readonly _uiRegistry;
     private _btcHighIndexConfirmedThisSession;
     private readonly _jobQueue;
@@ -153,6 +153,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _installProgressLastKey;
     private static _createDeviceBusyError;
     connectDevice(searchTargetId: string): Promise<Response<string>>;
+    /** Ledger binds whichever BLE device the user picks; its wallet is not checked. */
     bindBleDevice(params: BindBleDeviceParams): Promise<Response<string>>;
     acquireOperation(connectId: string, context: IHardwareConnectionContext): Promise<Response<string>>;
     private _createOperation;
@@ -212,8 +213,9 @@ declare class LedgerAdapter implements IHardwareWallet {
     cancel(connectId?: string): void;
     /** A non-empty deviceId is an expected chain fingerprint, not a transport identifier. */
     getChainFingerprint(connectId: string, deviceId: string, chain: ChainForFingerprint): Promise<Response<string>>;
-    /** Discovery may select a BLE target before a later call verifies its wallet. */
-    private _publishVerifiedBleBinding;
+    /** Ledger takes the selected BLE endpoint as the device and binds it right away. */
+    private _saveSelectedBleBinding;
+    private _dropSession;
     /** Verify on the acquired session without re-entering the job queue. */
     private _verifyDeviceFingerprintWithSession;
     /**

package/dist/index.d.ts

@@ -102,8 +102,8 @@ declare class LedgerAdapter implements IHardwareWallet {
     private readonly _operations;
     private _discoveredDevices;
     private _sessions;
-    private readonly _pendingOperationBindings;
-    private readonly _verifiedBleReconnectTargets;
+    private readonly _sessionTransports;
+    private readonly _selectedBleReconnectTargets;
     private readonly _uiRegistry;
     private _btcHighIndexConfirmedThisSession;
     private readonly _jobQueue;
@@ -153,6 +153,7 @@ declare class LedgerAdapter implements IHardwareWallet {
     private _installProgressLastKey;
     private static _createDeviceBusyError;
     connectDevice(searchTargetId: string): Promise<Response<string>>;
+    /** Ledger binds whichever BLE device the user picks; its wallet is not checked. */
     bindBleDevice(params: BindBleDeviceParams): Promise<Response<string>>;
     acquireOperation(connectId: string, context: IHardwareConnectionContext): Promise<Response<string>>;
     private _createOperation;
@@ -212,8 +213,9 @@ declare class LedgerAdapter implements IHardwareWallet {
     cancel(connectId?: string): void;
     /** A non-empty deviceId is an expected chain fingerprint, not a transport identifier. */
     getChainFingerprint(connectId: string, deviceId: string, chain: ChainForFingerprint): Promise<Response<string>>;
-    /** Discovery may select a BLE target before a later call verifies its wallet. */
-    private _publishVerifiedBleBinding;
+    /** Ledger takes the selected BLE endpoint as the device and binds it right away. */
+    private _saveSelectedBleBinding;
+    private _dropSession;
     /** Verify on the acquired session without re-entering the job queue. */
     private _verifyDeviceFingerprintWithSession;
     /**

package/dist/index.js

@@ -892,11 +892,6 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._operations = new import_hwk_adapter_core3.OperationRegistry({
       vendor: "ledger",
       onEnded: (operation, reason) => {
-        const binding = this._pendingOperationBindings.get(operation.operationId);
-        if (binding?.selectedConnection?.requestId === this._bindingSelectionRequestId) {
-          this._finishBleBinding("cancelled");
-        }
-        this._pendingOperationBindings.delete(operation.operationId);
         this.emitter.emit(import_hwk_adapter_core3.SDK.OPERATION_ENDED, {
           type: import_hwk_adapter_core3.SDK.OPERATION_ENDED,
           payload: { operationId: operation.operationId, reason }
@@ -908,8 +903,10 @@ var _LedgerAdapter = class _LedgerAdapter {
     });
     this._discoveredDevices = /* @__PURE__ */ new Map();
     this._sessions = /* @__PURE__ */ new Map();
-    this._pendingOperationBindings = /* @__PURE__ */ new Map();
-    this._verifiedBleReconnectTargets = /* @__PURE__ */ new Map();
+    // Transport each session was opened on, by sessionId. The adapter-wide
+    // `_activeConnectionType` moves with every discovery and can go stale.
+    this._sessionTransports = /* @__PURE__ */ new Map();
+    this._selectedBleReconnectTargets = /* @__PURE__ */ new Map();
     this._uiRegistry = new import_hwk_adapter_core3.UiRequestRegistry();
     // BTC App rejects account index >= 100 unless display=true. Cached per
     // adapter instance: first 100+ path asks the user once via UI request,
@@ -1083,7 +1080,8 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._doConnectAbortController?.abort();
     this._discoveredDevices.clear();
     this._sessions.clear();
-    this._verifiedBleReconnectTargets.clear();
+    this._sessionTransports.clear();
+    this._selectedBleReconnectTargets.clear();
     this._connectingPromise = null;
     this._doConnectAbortController = null;
     this._uiRegistry.reset();
@@ -1193,6 +1191,7 @@ var _LedgerAdapter = class _LedgerAdapter {
     if (this._sessions.size === 0) return;
     const stale = [...this._sessions.values()];
     this._sessions.clear();
+    for (const sid of stale) this._sessionTransports.delete(sid);
     await this._runConnectorTeardown(async () => {
       for (const sid of stale) {
         try {
@@ -1226,14 +1225,11 @@ var _LedgerAdapter = class _LedgerAdapter {
       return this.errorToFailure(error);
     }
   }
+  /** Ledger binds whichever BLE device the user picks; its wallet is not checked. */
   async bindBleDevice(params) {
-    if (params.identity.vendor !== "ledger" || !params.identity.value) {
-      return (0, import_hwk_adapter_core3.failure)(import_hwk_adapter_core3.HardwareErrorCode.InvalidParams, "Ledger wallet identity is required");
-    }
-    const { chain, value: expectedFingerprint } = params.identity;
     try {
       return await this._jobQueue.enqueue(
-        expectedFingerprint,
+        "__ledger_bind_ble__",
         async (signal) => {
           if (!this.getAvailableTransports().includes("ble")) {
             throw (0, import_hwk_adapter_core3.createHwkError)({
@@ -1248,73 +1244,23 @@ var _LedgerAdapter = class _LedgerAdapter {
             bindingReason: "manual-rebind"
           };
           try {
-            for (; ; ) {
-              const connectId = await this._connectFirstOrSelect(
-                [],
-                void 0,
-                true,
-                void 0,
-                attempt,
-                signal
-              );
-              const sessionId = this._sessions.get(connectId);
-              if (!sessionId) {
-                throw (0, import_hwk_adapter_core3.createHwkError)({
-                  code: import_hwk_adapter_core3.HardwareErrorCode.DeviceDisconnected,
-                  message: "Selected Ledger connection ended"
-                });
-              }
-              let saved = false;
-              try {
-                const installContext = {
-                  connection: { connectId, sessionId }
-                };
-                const fingerprint = await this._computeChainFingerprint(
-                  chain,
-                  (method, callParams) => this._runConnectorCall(
-                    connectId,
-                    method,
-                    callParams,
-                    signal,
-                    void 0,
-                    void 0,
-                    { autoInstallApp: true },
-                    installContext
-                  )
-                );
-                if (fingerprint !== expectedFingerprint) {
-                  attempt.rejectedConnectIds ?? (attempt.rejectedConnectIds = /* @__PURE__ */ new Set());
-                  attempt.rejectedConnectIds.add(connectId);
-                  attempt.rejectedConnectId = connectId;
-                } else {
-                  const persisted = await this._publishVerifiedBleBinding(
-                    connectId,
-                    chain,
-                    fingerprint,
-                    attempt,
-                    void 0,
-                    signal
-                  );
-                  if (!persisted) {
-                    throw (0, import_hwk_adapter_core3.createHwkError)({
-                      code: import_hwk_adapter_core3.HardwareErrorCode.UnknownError,
-                      message: "Bluetooth binding could not be saved",
-                      origin: "host"
-                    });
-                  }
-                  saved = true;
-                  return (0, import_hwk_adapter_core3.success)(connectId);
-                }
-              } finally {
-                if (!saved && this._sessions.get(connectId) === sessionId) {
-                  this._sessions.delete(connectId);
-                  const teardown = this._runConnectorTeardown(
-                    () => this.connector.disconnect(sessionId)
-                  ).catch(() => void 0);
-                  if (!signal.aborted) await teardown;
-                }
-              }
+            const connectId = await this._connectFirstOrSelect(
+              [],
+              void 0,
+              true,
+              void 0,
+              attempt,
+              signal
+            );
+            if (!attempt.bindingSaved) {
+              await this._dropSession(connectId, signal);
+              throw (0, import_hwk_adapter_core3.createHwkError)({
+                code: import_hwk_adapter_core3.HardwareErrorCode.UnknownError,
+                message: "Bluetooth binding could not be saved",
+                origin: "host"
+              });
             }
+            return (0, import_hwk_adapter_core3.success)(connectId);
           } catch (error) {
             this._finishBleBinding(signal.aborted ? "cancelled" : "failed");
             throw error;
@@ -1354,11 +1300,7 @@ var _LedgerAdapter = class _LedgerAdapter {
               attempt
             );
             _LedgerAdapter._throwIfAborted(signal);
-            const result = this._createOperation(connectId, resolvedConnectId);
-            if (result.success && attempt.selectedConnection) {
-              this._pendingOperationBindings.set(result.payload, attempt);
-            }
-            return result;
+            return this._createOperation(connectId, resolvedConnectId);
           } catch (error) {
             this._finishBleBinding(signal.aborted ? "cancelled" : "failed");
             throw error;
@@ -1378,7 +1320,7 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._operations.endByConnectionKey(resolvedConnectId, "explicit");
     const sessionId = this._sessions.get(resolvedConnectId);
     if (sessionId) this._operations.endByConnectionKey(sessionId, "explicit");
-    const connectionType = this._isBleConnection() ? "ble" : "usb";
+    const connectionType = sessionId && this._sessionTransports.get(sessionId) || (this._isBleConnection() ? "ble" : "usb");
     const device = this._discoveredDevices.get(resolvedConnectId) ?? {
       vendor: "ledger",
       model: "unknown",
@@ -1444,6 +1386,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       }
       const resolvedConnectId = session.deviceInfo?.connectId || connectId;
       this._sessions.set(resolvedConnectId, session.sessionId);
+      this._sessionTransports.set(session.sessionId, this._isBleConnection() ? "ble" : "usb");
       if (session.deviceInfo) {
         this._discoveredDevices.set(resolvedConnectId, session.deviceInfo);
       }
@@ -1972,10 +1915,6 @@ var _LedgerAdapter = class _LedgerAdapter {
       this._uiRegistry.cancel(void 0, void 0, pendingOperationId);
     }
     this._finishBleBinding("cancelled");
-    if (!connectId) this._pendingOperationBindings.clear();
-    else if (pendingOperationId) {
-      this._pendingOperationBindings.delete(pendingOperationId);
-    }
     const queueKeys = /* @__PURE__ */ new Set();
     if (connectId) queueKeys.add(ledgerQueueKey({ connectId }));
     if (pendingOperationId) queueKeys.add(ledgerQueueKey({ operationId: pendingOperationId }));
@@ -2020,16 +1959,6 @@ var _LedgerAdapter = class _LedgerAdapter {
             formatDeviceMismatchError(deviceId, fingerprint)
           );
         }
-        if ((0, import_hwk_adapter_core3.isHardwareOperationId)(connectId)) {
-          const operation = this._operations.resolve(connectId);
-          await this._publishVerifiedBleBinding(
-            operation.connectId,
-            chain,
-            fingerprint,
-            void 0,
-            connectId
-          );
-        }
       }
       return (0, import_hwk_adapter_core3.success)(fingerprint);
     } catch (err) {
@@ -2037,56 +1966,46 @@ var _LedgerAdapter = class _LedgerAdapter {
       return this.errorToFailure(err);
     }
   }
-  /** Discovery may select a BLE target before a later call verifies its wallet. */
-  async _publishVerifiedBleBinding(connectId, chain, fingerprint, attempt, operationId, signal) {
-    const binding = operationId ? this._pendingOperationBindings.get(operationId) : attempt;
-    if (!this._isBleConnection() || binding?.selectedConnection?.connectId !== connectId) {
-      return false;
-    }
+  /** Ledger takes the selected BLE endpoint as the device and binds it right away. */
+  async _saveSelectedBleBinding(connectId, selectionRequestId, context, operationId, signal) {
     try {
       const outcome = await (0, import_hwk_adapter_core3.requestSaveDeviceBinding)(
         this.emitter,
         this._uiRegistry,
         {
-          selectionRequestId: binding.selectedConnection.requestId,
+          selectionRequestId,
           connection: { transport: "ble", connectId },
-          identity: { vendor: "ledger", type: "chainFingerprint", chain, value: fingerprint },
-          extra: binding.extra,
+          extra: context?.extra,
           operationId
         },
         signal
       );
-      if (operationId) this._operations.resolve(operationId);
+      if (context) context.bindingSaved = outcome.saved;
       if (!outcome.saved) {
         debugLog("[LedgerAdapter] BLE binding not persisted by host", {
           connectId,
           reason: outcome.reason
         });
       }
-      return outcome.saved;
     } catch (error) {
-      if (operationId) {
-        this._pendingOperationBindings.delete(operationId);
-        this._operations.end(operationId, "explicit");
-      }
-      const sessionId = this._sessions.get(connectId);
-      this._sessions.delete(connectId);
-      if (sessionId) {
-        const teardown = this._runConnectorTeardown(
-          () => this.connector.disconnect(sessionId)
-        ).catch(() => void 0);
-        if (!signal?.aborted) await teardown;
-      }
+      await this._dropSession(connectId, signal);
       throw error;
     } finally {
-      if (this._bindingSelectionRequestId === binding.selectedConnection.requestId) {
+      if (this._bindingSelectionRequestId === selectionRequestId) {
         this._bindingSelectionRequestId = void 0;
       }
-      if (operationId) {
-        this._pendingOperationBindings.delete(operationId);
-      }
     }
   }
+  async _dropSession(connectId, signal) {
+    const sessionId = this._sessions.get(connectId);
+    this._sessions.delete(connectId);
+    if (!sessionId) return;
+    this._sessionTransports.delete(sessionId);
+    const teardown = this._runConnectorTeardown(() => this.connector.disconnect(sessionId)).catch(
+      () => void 0
+    );
+    if (!signal.aborted) await teardown;
+  }
   /** Verify on the acquired session without re-entering the job queue. */
   async _verifyDeviceFingerprintWithSession(sessionId, deviceId, chain) {
     if (!deviceId) return { success: true };
@@ -2481,12 +2400,11 @@ var _LedgerAdapter = class _LedgerAdapter {
             ) ?? (usbDevices.length === 1 && usbDevices[0].connectionType === "usb" ? usbDevices[0] : void 0);
             if (candidate) return [candidate];
           }
-          return (await this._searchDevices({ transportType: "ble", waitForAllTransports: true }, signal)).filter((device2) => !context?.rejectedConnectIds?.has(device2.connectId));
+          return this._searchDevices({ transportType: "ble", waitForAllTransports: true }, signal);
         },
         request: {
-          devices: devices.filter((device2) => !context?.rejectedConnectIds?.has(device2.connectId)),
+          devices,
           bindingSessionId,
-          rejectedConnectId: context?.rejectedConnectId,
           context: {
             kind: "bind-connection",
             transport: "ble",
@@ -2499,14 +2417,25 @@ var _LedgerAdapter = class _LedgerAdapter {
       if (device.connectionType === "usb") {
         this._activeConnectionType = "usb";
         if (context) context.selectedConnection = void 0;
-        if (preserveOperationId) this._pendingOperationBindings.delete(preserveOperationId);
         this._bindingSelectionRequestId = requestId;
         this._finishBleBinding("cancelled");
         return this._connectDeviceOrThrow(device.connectId, preserveOperationId, signal);
       }
-      if (context) context.selectedConnection = { connectId: device.connectId, requestId };
       this._bindingSelectionRequestId = requestId;
-      return this._connectDeviceOrThrow(device.connectId, preserveOperationId, signal);
+      const connected = await this._connectDeviceOrThrow(
+        device.connectId,
+        preserveOperationId,
+        signal
+      );
+      if (context) context.selectedConnection = { connectId: connected, requestId };
+      await this._saveSelectedBleBinding(
+        connected,
+        requestId,
+        context,
+        preserveOperationId,
+        signal
+      );
+      return connected;
     }
     if (devices.length > 0 && (devices.length > 1 || requiresBleSelection)) {
       if (context?.allowDeviceSelection === false || !this.emitter.listenerCount(import_hwk_adapter_core3.UI_REQUEST.REQUEST_SELECT_DEVICE)) {
@@ -2801,13 +2730,13 @@ var _LedgerAdapter = class _LedgerAdapter {
     }
     const allowUsbEphemeralFallback = !!fingerprint?.deviceId && !fingerprint.skipFingerprint;
     let businessCallStarted = false;
-    const verifiedBleTarget = connectId ? this._verifiedBleReconnectTargets.get(connectId) : void 0;
+    const selectedBleTarget = connectId ? this._selectedBleReconnectTargets.get(connectId) : void 0;
     const knownTransport = this._isBleConnection() ? "ble" : "usb";
     const hintedConnectId = commonParams?.knownConnections?.find(
       (connection) => connection.transport === knownTransport
     );
     const inputConnectId = hintedConnectId && hintedConnectId.transport !== "qr" ? hintedConnectId.connectId : connectId;
-    const preferredConnectId = fingerprint && !fingerprint.skipFingerprint && verifiedBleTarget?.chain === fingerprint.chain && verifiedBleTarget.fingerprint === fingerprint.deviceId ? verifiedBleTarget.connectId : inputConnectId;
+    const preferredConnectId = fingerprint && !fingerprint.skipFingerprint && selectedBleTarget?.chain === fingerprint.chain && selectedBleTarget.fingerprint === fingerprint.deviceId ? selectedBleTarget.connectId : inputConnectId;
     const connectionAttempt = { ...commonParams };
     const bundleConnection = installContext?.connection;
     if (bundleConnection && this._sessions.get(bundleConnection.connectId) !== bundleConnection.sessionId) {
@@ -2816,14 +2745,14 @@ var _LedgerAdapter = class _LedgerAdapter {
         message: "Ledger all-network connection ended"
       });
     }
-    let resolvedConnectId = operationId ? this._operations.resolve(operationId).connectId : bundleConnection?.connectId ?? await this.ensureConnected(
+    const resolvedConnectId = operationId ? this._operations.resolve(operationId).connectId : bundleConnection?.connectId ?? await this.ensureConnected(
       preferredConnectId,
       signal,
       allowUsbEphemeralFallback,
       void 0,
       connectionAttempt
     );
-    let sessionId = this._sessions.get(resolvedConnectId);
+    const sessionId = this._sessions.get(resolvedConnectId);
     if (sessionId && installContext && !installContext.connection) {
       installContext.connection = { connectId: resolvedConnectId, sessionId };
     }
@@ -2841,74 +2770,29 @@ var _LedgerAdapter = class _LedgerAdapter {
       });
     }
     try {
-      if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId) {
-        for (; ; ) {
-          const fp = await this._abortable(
-            signal,
-            this._verifyDeviceFingerprintWithSession(
-              sessionId,
-              fingerprint.deviceId,
-              fingerprint.chain
-            )
-          );
-          if (fp.success) break;
-          const binding = operationId ? this._pendingOperationBindings.get(operationId) : connectionAttempt;
-          if (!this._isBleConnection() || binding?.selectedConnection?.connectId !== resolvedConnectId) {
-            throw Object.assign(new Error(formatDeviceMismatchError(fp.expected, fp.actual)), {
-              code: import_hwk_adapter_core3.HardwareErrorCode.DeviceMismatch
-            });
-          }
-          binding.rejectedConnectIds ?? (binding.rejectedConnectIds = /* @__PURE__ */ new Set());
-          binding.rejectedConnectIds.add(resolvedConnectId);
-          binding.rejectedConnectId = resolvedConnectId;
-          this._sessions.delete(resolvedConnectId);
-          await this.connector.disconnect(sessionId);
-          if (operationId) this._pendingOperationDisconnects.delete(operationId);
-          _LedgerAdapter._throwIfAborted(signal);
-          resolvedConnectId = await this._connectFirstOrSelect(
-            [],
-            void 0,
-            true,
-            operationId,
-            binding,
-            signal
-          );
-          const selectedSession = this._sessions.get(resolvedConnectId);
-          const selectedDevice = this._discoveredDevices.get(resolvedConnectId);
-          if (!selectedSession || !selectedDevice)
-            throw (0, import_hwk_adapter_core3.createHwkError)({
-              code: import_hwk_adapter_core3.HardwareErrorCode.DeviceDisconnected,
-              message: "Selected Ledger connection ended"
-            });
-          sessionId = selectedSession;
-          if (operationId)
-            this._operations.rebind(operationId, {
-              connectId: resolvedConnectId,
-              device: selectedDevice,
-              // Same source as `_createOperation`: the selected transport, not
-              // the device snapshot a session connect overwrote.
-              connectionType: this._isBleConnection() ? "ble" : "usb",
-              connectionKeys: [sessionId]
-            });
-          if (installContext)
-            installContext.connection = { connectId: resolvedConnectId, sessionId };
-        }
-        await this._publishVerifiedBleBinding(
-          resolvedConnectId,
-          fingerprint.chain,
-          fingerprint.deviceId,
-          connectionAttempt,
-          operationId,
-          signal
+      const isBleSession = this._sessionTransports.get(sessionId) === "ble";
+      if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId && !isBleSession) {
+        const fp = await this._abortable(
+          signal,
+          this._verifyDeviceFingerprintWithSession(
+            sessionId,
+            fingerprint.deviceId,
+            fingerprint.chain
+          )
         );
-        if (!operationId && connectionAttempt.selectedConnection?.connectId === resolvedConnectId && this._isBleConnection()) {
-          this._verifiedBleReconnectTargets.set(connectId, {
-            connectId: resolvedConnectId,
-            chain: fingerprint.chain,
-            fingerprint: fingerprint.deviceId
+        if (!fp.success) {
+          throw Object.assign(new Error(formatDeviceMismatchError(fp.expected, fp.actual)), {
+            code: import_hwk_adapter_core3.HardwareErrorCode.DeviceMismatch
           });
         }
       }
+      if (fingerprint && !fingerprint.skipFingerprint && fingerprint.deviceId && !operationId && isBleSession && connectionAttempt.selectedConnection?.connectId === resolvedConnectId) {
+        this._selectedBleReconnectTargets.set(connectId, {
+          connectId: resolvedConnectId,
+          chain: fingerprint.chain,
+          fingerprint: fingerprint.deviceId
+        });
+      }
       businessCallStarted = true;
       return await this._callConnector(sessionId, method, effectiveParams, signal);
     } catch (err) {