@onekeyfe/hwk-trezor-core 1.1.29-alpha.2 → 1.1.29-alpha.4

package/dist/index.d.mts

@@ -241,7 +241,6 @@ declare class TrezorDeviceSession {
     get isThp(): boolean;
     getThpState(): TrezorThpState | undefined;
     initialize(): Promise<Record<string, unknown>>;
-    private handshakeCancel;
     call(name: string, data?: Record<string, unknown>): Promise<{
         type: string;
         message: Record<string, unknown>;

package/dist/index.d.ts

@@ -241,7 +241,6 @@ declare class TrezorDeviceSession {
     get isThp(): boolean;
     getThpState(): TrezorThpState | undefined;
     initialize(): Promise<Record<string, unknown>>;
-    private handshakeCancel;
     call(name: string, data?: Record<string, unknown>): Promise<{
         type: string;
         message: Record<string, unknown>;

package/dist/index.js

@@ -11592,19 +11592,19 @@ var ALWAYS_KEPT_EVENT_PREFIXES = [
   "thp.call.",
   "core.call.",
   "core.send.",
-  "call.dispatch.",
-  "capability.check",
-  "[TrezorSuiteAlignTrace] handshakeCancel.",
-  "[TrezorSuiteAlignTrace] protocolProbe.",
-  "[TrezorSuiteAlignTrace] call.dispatch.",
-  "[TrezorUSBInitTrace] core.call.",
-  "[TrezorUSBInitTrace] core.send."
+  "connector.call.",
+  "webusb.scan.filtered",
+  "webusb.connector.enumerate.filtered",
+  "ble.connector.enumerate.filtered",
+  "capability.check"
 ];
 var DROPPED_EVENT_PREFIXES = [
   "connector.search.",
   "webusb.scan.",
+  "webusb.connector.enumerate.",
   "webusb.closeDevice.",
   "webusb.reset.",
+  "ble.connector.enumerate.",
   "ble.renderer.scan.",
   "ble.main.scan.",
   "ble.scan.",
@@ -11732,7 +11732,7 @@ var TrezorCore = class {
   async call(name4, data = {}, options = {}) {
     const thpState = options.thpState;
     const { message, chunks } = this.buildChunks(name4, data, thpState);
-    this.log("debug", "[TrezorUSBInitTrace] core.call.start", {
+    this.log("debug", "core.call.start", {
       protocol: this.protocol.name,
       name: name4,
       messageBytes: message.length,
@@ -11781,7 +11781,7 @@ var TrezorCore = class {
   async send(name4, data = {}, options = {}) {
     const thpState = options.thpState;
     const { message, chunks } = this.buildChunks(name4, data, thpState);
-    this.log("debug", "[TrezorUSBInitTrace] core.send.start", {
+    this.log("debug", "core.send.start", {
       protocol: this.protocol.name,
       name: name4,
       messageBytes: message.length,
@@ -11899,7 +11899,6 @@ var TrezorThpProtocol = class {
     this.thpState.sync("recv", message.type);
   }
 };
-var TREZOR_PROTOCOL_MALFORMED = "Malformed protocol format";
 var defaultCoreFactory = (transport, protocol, chunkSize, logger) => new TrezorCore({ transport, protocol, chunkSize, logger });
 var normalizePassphrase = (value) => (value ?? "").normalize("NFKD");
 var normalizeCreateAppSessionOptions = (options = {}) => {
@@ -11970,21 +11969,7 @@ var TrezorDeviceSession = class {
     this.protocol = "v1";
     const optsLogger = this.thpOptions?.logger;
     this.core = this.coreFactory(this.transport, protocol_v1_exports, this.chunkSize, optsLogger);
-    const cancelResult = await this.handshakeCancel();
-    if (cancelResult === "thp") {
-      if (!this.thpOptions) {
-        throw new Error(
-          "Trezor THP required but the connector was constructed without `thp` options. Pass `thp: { hostName, appName, ... }` so the device can complete pairing."
-        );
-      }
-      this.protocol = "v1";
-      this.core = void 0;
-      return this.initializeThp();
-    }
     try {
-      this.log("info", "[TrezorSuiteAlignTrace] protocolProbe.v1Initialize.start", {
-        connectionType: this.connectionType ?? "unknown"
-      });
       this.log("debug", "session.call.request", { protocol: "v1", name: "Initialize" });
       const response = await this.core.call("Initialize", {});
       this.log("debug", "session.call.response", {
@@ -11993,15 +11978,8 @@ var TrezorDeviceSession = class {
         responseType: response.type
       });
       this.currentFeatures = expectMessage(response, "Features").message;
-      this.log("info", "[TrezorSuiteAlignTrace] protocolProbe.v1Initialize.done", {
-        responseType: response.type,
-        features: summarizeFeatures(this.currentFeatures)
-      });
     } catch (error2) {
       if (error2 instanceof TrezorFailureError && error2.code === "Failure_InvalidProtocol") {
-        this.log("info", "[TrezorSuiteAlignTrace] protocolProbe.thpFallback", {
-          reason: "Failure_InvalidProtocol"
-        });
         this.log("info", "session.initialize.thp.fallback", {
           reason: "device replied Failure_InvalidProtocol to v1 Initialize"
         });
@@ -12015,10 +11993,6 @@ var TrezorDeviceSession = class {
         return this.initializeThp();
       }
       this.log("error", "session.initialize.error", { error: errorToLog(error2) });
-      this.log("error", "[TrezorSuiteAlignTrace] protocolProbe.error", {
-        attemptedProtocol: "v1",
-        error: errorToLog(error2)
-      });
       throw error2;
     }
     this.log("info", "session.initialize.done", {
@@ -12027,83 +12001,6 @@ var TrezorDeviceSession = class {
     });
     return this.currentFeatures;
   }
-  async handshakeCancel() {
-    if (!this.core) return "v1";
-    this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.start", {
-      connectionType: this.connectionType ?? "unknown"
-    });
-    try {
-      await this.core.send("Cancel", {});
-      this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.send.done", {
-        connectionType: this.connectionType ?? "unknown"
-      });
-    } catch (error2) {
-      this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.send.ignored", {
-        error: errorToLog(error2)
-      });
-      return "v1";
-    }
-    for (let attempt = 0; attempt < 10; attempt += 1) {
-      const abortController = new AbortController();
-      const timeoutId = setTimeout(() => {
-        abortController.abort(new Error("Trezor handshake Cancel read timeout"));
-      }, 1e3);
-      try {
-        this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.read.attempt", {
-          attempt
-        });
-        const response = await this.core.receive({
-          signal: abortController.signal,
-          name: "Cancel"
-        });
-        this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.done", {
-          attempt,
-          responseType: response.type
-        });
-        return "v1";
-      } catch (error2) {
-        if (error2 instanceof TrezorFailureError) {
-          this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.failure", {
-            attempt,
-            code: error2.code
-          });
-          if (error2.code === "Failure_InvalidProtocol") {
-            this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.thpDetected", {
-              reason: "Failure_InvalidProtocol"
-            });
-            return "thp";
-          }
-          if (error2.code === "Failure_Busy") {
-            throw error2;
-          }
-          return "v1";
-        }
-        if (error2 instanceof TrezorProtocolError && error2.code === TREZOR_PROTOCOL_MALFORMED) {
-          this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.read.malformed", {
-            attempt,
-            error: errorToLog(error2)
-          });
-          continue;
-        }
-        if (isHandshakeCancelReadTimeout(error2)) {
-          this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.read.timeout.reconnect", {
-            attempt
-          });
-          await this.transport.reconnect?.();
-          continue;
-        }
-        this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.read.ignored", {
-          attempt,
-          error: errorToLog(error2)
-        });
-        return "v1";
-      } finally {
-        clearTimeout(timeoutId);
-      }
-    }
-    this.log("info", "[TrezorSuiteAlignTrace] handshakeCancel.read.limitReached", {});
-    return "v1";
-  }
   async call(name4, data = {}) {
     if (!this.core) {
       await this.initialize();
@@ -12185,10 +12082,6 @@ var TrezorDeviceSession = class {
       const response = await this.core.call("GetFeatures", {}, { thpState: this.thpState });
       this.log("info", "thp.getFeatures.response", { responseType: response.type });
       this.currentFeatures = expectMessage(response, "Features").message;
-      this.log("info", "[TrezorSuiteAlignTrace] protocolProbe.thpGetFeatures.done", {
-        responseType: response.type,
-        features: summarizeFeatures(this.currentFeatures)
-      });
     } catch (error2) {
       const code = error2?.code;
       if (code === "ThpDeviceLocked" && !hasRetried) {
@@ -12366,7 +12259,9 @@ var TrezorThpSession = class {
       await this.pair();
     }
     if (this.thpState.phase !== "paired") {
-      throw new Error("THP pairing is required before GetFeatures");
+      throw Object.assign(new Error("THP pairing is required before GetFeatures"), {
+        code: "ThpPairingRequired"
+      });
     }
     this.log("info", "thp.session.done", { phase: this.thpState.phase });
   }
@@ -12456,6 +12351,12 @@ var TrezorThpSession = class {
     const completionState = completion.message.state;
     this.thpState.setIsPaired(completionState !== 0);
     this.thpState.setPhase("pairing");
+    if (!completionState && handshakeCredentials.credentials) {
+      this.thpState.removePairingCredential(handshakeCredentials.credentials);
+      await this.options.onPairingCredentialsChanged?.({
+        credentials: this.thpState.pairingCredentials
+      });
+    }
     this.log("info", "thp.handshake.done", {
       completionState,
       isPaired: this.thpState.isPaired,
@@ -12688,9 +12589,6 @@ function errorToLog(error2) {
   }
   return String(error2);
 }
-function isHandshakeCancelReadTimeout(error2) {
-  return error2 instanceof Error && error2.message === "Trezor handshake Cancel read timeout";
-}
 function summarizeFeatures(features) {
   if (!features) return void 0;
   return {