@onekeyfe/hwk-ledger-adapter 1.2.3-alpha.3 → 1.2.3-alpha.4

package/dist/index.js

@@ -491,6 +491,15 @@ function mapLedgerError(err, opts) {
   };
 }
 
+// src/utils/queueKey.ts
+var LEDGER_DEFAULT_QUEUE_KEY = "__ledger_default__";
+function ledgerQueueKey({
+  operationId,
+  connectId
+}) {
+  return (operationId ?? connectId) || LEDGER_DEFAULT_QUEUE_KEY;
+}
+
 // src/adapter/methods/allNetworkGetAddress.ts
 var import_hwk_adapter_core2 = require("@onekeyfe/hwk-adapter-core");
 
@@ -551,7 +560,8 @@ function createAllNetworkGetAddress({
   callChain,
   getChainFingerprint,
   retainOperation,
-  errorToFailure
+  errorToFailure,
+  createCancelScope
 }) {
   return async function allNetworkGetAddress(connectId, _deviceId, params) {
     debugLog("[LedgerAdapter][REQ]", {
@@ -568,6 +578,9 @@ function createAllNetworkGetAddress({
     } catch (error) {
       return errorToFailure(error);
     }
+    const cancelScope = createCancelScope(
+      ledgerQueueKey({ operationId: target.payload.operationId, connectId: effectiveTargetId })
+    );
     const installContext = {};
     const commonParams = {
       autoInstallApp: params.autoInstallApp,
@@ -585,6 +598,7 @@ function createAllNetworkGetAddress({
         normalizeItem: normalizeLedgerAllNetworkItem,
         buildUnsupportedNetworkResponse: (item) => isUnsupportedLedgerAllNetworkNetwork(item) ? buildUnsupportedNetworkResponse(item) : void 0,
         callItem: async ({ method, chain, item }) => {
+          if (cancelScope.signal.aborted) return buildCancelledFailure(cancelScope.signal);
           const itemDeviceId = getItemDeviceId(item) ?? chainFingerprints.get(chain) ?? "";
           return callAllNetworkMethod(
             callChain,
@@ -603,7 +617,8 @@ function createAllNetworkGetAddress({
           chain,
           payload,
           chainFingerprints,
-          installContext
+          installContext,
+          cancelScope.signal
         ),
         shouldAbortBundle: isTopLevelAllNetworkFailure,
         buildTopLevelFailure: (response) => {
@@ -622,10 +637,17 @@ function createAllNetworkGetAddress({
       });
       return result;
     } finally {
+      cancelScope.release();
       releaseOperationRetention?.();
     }
   };
 }
+function buildCancelledFailure(signal) {
+  const reason = signal.reason;
+  const code = typeof reason?.code === "number" ? reason.code : import_hwk_adapter_core2.HardwareErrorCode.UserAborted;
+  const message = typeof reason?.message === "string" ? reason.message : "";
+  return (0, import_hwk_adapter_core2.failure)(code, message || "All-network get-address cancelled");
+}
 function isTopLevelAllNetworkFailure(response) {
   if (response.success) {
     return false;
@@ -661,8 +683,13 @@ function normalizeLedgerAllNetworkItem(method, item) {
   const coin = LEDGER_BTC_NETWORK_COIN_MAP[item.network];
   return coin ? { ...item, coin } : item;
 }
-async function attachLedgerIdentity(getChainFingerprint, connectId, item, chain, payload, chainFingerprints, context) {
-  const fingerprint = getItemDeviceId(item) || chainFingerprints.get(chain) || await bootstrapChainFingerprint(
+async function attachLedgerIdentity(getChainFingerprint, connectId, item, chain, payload, chainFingerprints, context, cancelSignal) {
+  const knownFingerprint = getItemDeviceId(item) || chainFingerprints.get(chain) || "";
+  if (!knownFingerprint && cancelSignal.aborted) {
+    const cancelled = buildCancelledFailure(cancelSignal);
+    return { ...item, success: false, payload: cancelled.payload };
+  }
+  const fingerprint = knownFingerprint || await bootstrapChainFingerprint(
     getChainFingerprint,
     context.connection?.connectId ?? connectId,
     chain,
@@ -851,7 +878,8 @@ var _LedgerAdapter = class _LedgerAdapter {
         }
       },
       retainOperation: (operationId) => this._operations.retain(operationId),
-      errorToFailure: (error) => this.errorToFailure(error)
+      errorToFailure: (error) => this.errorToFailure(error),
+      createCancelScope: (queueKey) => this._jobQueue.createCancelScope(queueKey)
     });
     // ---------------------------------------------------------------------------
     // Private helpers
@@ -1870,14 +1898,23 @@ var _LedgerAdapter = class _LedgerAdapter {
     this._uiRegistry.cancel();
     this._finishBleBinding("cancelled");
     const interactionForPhysicalId = !operationId && connectId ? this._operations.findActiveByConnectionKey(connectId) : void 0;
-    const queueKey = operationId ?? (activeJobId === connectId ? connectId : interactionForPhysicalId?.operationId) ?? connectId;
     const pendingOperationId = operationId ?? interactionForPhysicalId?.operationId;
     if (!connectId) this._pendingOperationBindings.clear();
     else if (pendingOperationId) {
       this._pendingOperationBindings.delete(pendingOperationId);
     }
-    if (queueKey) {
-      this._jobQueue.cancelActiveAndPending(queueKey, userAbortReason);
+    const queueKeys = /* @__PURE__ */ new Set();
+    if (connectId) queueKeys.add(ledgerQueueKey({ connectId }));
+    if (pendingOperationId) queueKeys.add(ledgerQueueKey({ operationId: pendingOperationId }));
+    if (queueKeys.size) {
+      let cancelledAnyJob = false;
+      for (const key of queueKeys) {
+        cancelledAnyJob = this._jobQueue.cancelActiveAndPending(key, userAbortReason) || cancelledAnyJob;
+      }
+      debugLog("[LedgerAdapter] cancel routed to queue keys", {
+        queueKeys: [...queueKeys],
+        cancelledAnyJob
+      });
     } else {
       this._jobQueue.cancelActiveAndPending(void 0, userAbortReason);
     }
@@ -2545,7 +2582,7 @@ var _LedgerAdapter = class _LedgerAdapter {
       connectId: effectiveConnectId || "(empty)",
       params
     });
-    const queueKey = (operationId ?? effectiveConnectId) || "__ledger_default__";
+    const queueKey = ledgerQueueKey({ operationId, connectId: effectiveConnectId });
     try {
       const result = await this._jobQueue.enqueue(
         queueKey,