@onekeyfe/hwk-trezor-adapter 1.2.8-alpha.13 → 1.2.8-alpha.131

package/dist/index.mjs

@@ -28,6 +28,7 @@ import {
   resolveHardwareOperationTarget,
   runAllNetworkGetAddress,
   success,
+  summarizeForLog,
   toPhysicalDeviceSearchTarget
 } from "@onekeyfe/hwk-adapter-core";
 import { randomBytes } from "@noble/hashes/utils";
@@ -912,7 +913,8 @@ var _TrezorAdapter = class _TrezorAdapter {
       this._emitter.emit(data.type, { ...data, payload });
     };
     this._onUiEvent = (data) => {
-      this._emitter.emit("ui-event", data);
+      const operationId = this._activeOperationId();
+      this._emitter.emit("ui-event", operationId ? { ...data, operationId } : data);
     };
     this._onThpCredentialsChanged = (data) => {
       this._emitter.emit(DEVICE.TREZOR_THP_CREDENTIALS_CHANGED, {
@@ -984,11 +986,21 @@ var _TrezorAdapter = class _TrezorAdapter {
   static _normalizeLogKey(key) {
     return key.replace(/[_-]/g, "").toLowerCase();
   }
-  // Mirrors hd-core's logBlockEvent: a signing method's body is the user's
-  // transaction, so it is dropped wholesale; other methods redact by key.
-  static _sanitizeForLog(value, methodName) {
-    if (methodName && /sign/i.test(methodName)) return "[redacted]";
-    return _TrezorAdapter._redactForLog(value, /* @__PURE__ */ new WeakSet());
+  // [REQ]/[RES] bodies: paths, chain ids and flags stay readable; transaction
+  // contents, keys and addresses become length + short hash; secrets are redacted.
+  static _sanitizeForLog(value, methodName, role = "params") {
+    return summarizeForLog(value, { method: methodName, role });
+  }
+  // A failure payload is an error record, so its message/error text stays readable.
+  static _responseForLog(response, methodName) {
+    if (response.success) {
+      return _TrezorAdapter._sanitizeForLog(response.payload, methodName, "result");
+    }
+    const out = summarizeForLog(
+      { error: response.payload },
+      { method: methodName, role: "result" }
+    );
+    return out && typeof out === "object" ? out.error : out;
   }
   static _redactForLog(value, seen) {
     if (ArrayBuffer.isView(value) || value instanceof ArrayBuffer) {
@@ -1009,14 +1021,17 @@ var _TrezorAdapter = class _TrezorAdapter {
   static _errorForLog(error) {
     if (!error || typeof error !== "object") return error;
     const typed = error;
-    return _TrezorAdapter._sanitizeForLog({
-      name: typed.name,
-      message: typed.message,
-      code: typed.code,
-      errorCode: typed.errorCode,
-      statusCode: typed.statusCode,
-      response: typed.response
-    });
+    return _TrezorAdapter._redactForLog(
+      {
+        name: typed.name,
+        message: typed.message,
+        code: typed.code,
+        errorCode: typed.errorCode,
+        statusCode: typed.statusCode,
+        response: typed.response
+      },
+      /* @__PURE__ */ new WeakSet()
+    );
   }
   _setPassphraseRequestContext(connectId, context) {
     const previous = this._passphraseRequestContextByConnectId.get(connectId);
@@ -1413,6 +1428,10 @@ var _TrezorAdapter = class _TrezorAdapter {
   }
   async _releaseOperationConnection(operation) {
     const { connectId } = operation;
+    const activeKey = this._jobQueue.getActiveJob()?.deviceId;
+    if (activeKey !== void 0 && !isHardwareOperationId(activeKey) && (activeKey === connectId || activeKey === "" || activeKey === operation.device.deviceId)) {
+      return;
+    }
     const connecting = this._connectingPromises.has(connectId);
     this._connectingPromises.delete(connectId);
     const sessionId = this._sessions.get(connectId);
@@ -1642,15 +1661,19 @@ var _TrezorAdapter = class _TrezorAdapter {
       "getFeatures",
       connectId,
       hasConnectionContext || !connectId ? expectedDeviceId : void 0,
-      hasConnectionContext ? {
-        operationId: commonParams.operationId,
-        knownConnections: commonParams.knownConnections,
-        extra: commonParams.extra,
-        allowDeviceSelection: commonParams.allowDeviceSelection,
-        supportedTransports: commonParams.supportedTransports,
-        passphraseState: commonParams.passphraseState,
-        useEmptyPassphrase: commonParams.useEmptyPassphrase
-      } : {},
+      {
+        // Routing limits always apply: the connection found here is reused by the whole
+        // bundle, so dropping them would let a bundle open a transport the host excluded.
+        operationId: commonParams?.operationId,
+        knownConnections: commonParams?.knownConnections,
+        extra: commonParams?.extra,
+        allowDeviceSelection: commonParams?.allowDeviceSelection,
+        supportedTransports: commonParams?.supportedTransports,
+        ...hasConnectionContext ? {
+          passphraseState: commonParams.passphraseState,
+          useEmptyPassphrase: commonParams.useEmptyPassphrase
+        } : {}
+      },
       false,
       bundleContext
     ) : await this.getFeatures(
@@ -1710,7 +1733,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       for (const key of queueKeys) {
         this._jobQueue.cancelActiveAndPending(key, userAbortReason);
       }
-      if (resolvedConnectId) {
+      if (resolvedConnectId && (activeJobId === void 0 || ownsConnectorInteraction)) {
         void this._connector.cancel(this._sessions.get(resolvedConnectId) ?? resolvedConnectId);
       }
       return;
@@ -1723,8 +1746,7 @@ var _TrezorAdapter = class _TrezorAdapter {
     }
   }
   /**
-   * Operation owning the running job: its queue key when pinned, else the live
-   * operation of its connectId, so a mid-call UI request can name it.
+   * Only the operation explicitly supplied to the running job owns its UI requests.
    */
   _activeOperationId() {
     return this._operations.findOperationIdByJobKey(this._jobQueue.getActiveJob()?.deviceId);
@@ -2145,7 +2167,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       debugLog("[TrezorAdapter][RES]", {
         method: methodName,
         success: response.success,
-        payload: _TrezorAdapter._sanitizeForLog(response.payload, methodName)
+        payload: _TrezorAdapter._responseForLog(response, methodName)
       });
       return response;
     } catch (error) {
@@ -2153,7 +2175,7 @@ var _TrezorAdapter = class _TrezorAdapter {
       debugLog("[TrezorAdapter][RES]", {
         method: methodName,
         success: false,
-        payload: _TrezorAdapter._sanitizeForLog(response.payload, methodName)
+        payload: _TrezorAdapter._responseForLog(response, methodName)
       });
       return response;
     } finally {