opentool 0.7.6 → 0.7.8

package/dist/cli/index.js

@@ -535,6 +535,7 @@ function extractX402Attempt(request) {
 }
 async function verifyX402Payment(attempt, definition, options = {}) {
   const fetchImpl = options.fetchImpl ?? fetch;
+  const timeout = options.timeout ?? 25e3;
   const facilitator = definition.facilitator;
   const verifierUrl = new URL(
     facilitator.verifyPath ?? "/verify",
@@ -543,22 +544,33 @@ async function verifyX402Payment(attempt, definition, options = {}) {
   const requirement = toX402Requirement(definition);
   const headers = buildFacilitatorHeaders(facilitator);
   try {
-    console.log("[x402] Calling facilitator /verify", { url: verifierUrl });
-    const verifyResponse = await fetchImpl(verifierUrl, {
-      method: "POST",
-      headers,
-      body: JSON.stringify({
-        x402Version: attempt.payload.x402Version,
-        paymentPayload: attempt.payload,
-        paymentRequirements: requirement
-      })
+    const verifyBody = {
+      x402Version: attempt.payload.x402Version,
+      paymentPayload: attempt.payload,
+      paymentRequirements: requirement
+    };
+    console.log("[x402] Calling facilitator /verify", {
+      url: verifierUrl,
+      fullBody: JSON.stringify(verifyBody, null, 2)
     });
+    const verifyResponse = await Promise.race([
+      fetchImpl(verifierUrl, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(verifyBody)
+      }),
+      new Promise(
+        (_, reject) => setTimeout(() => reject(new Error(`Verification timeout after ${timeout}ms`)), timeout)
+      )
+    ]);
     console.log("[x402] Facilitator /verify response", { status: verifyResponse.status });
     if (!verifyResponse.ok) {
+      const errorText = await verifyResponse.text().catch(() => "");
+      console.error("[x402] Facilitator /verify error", { status: verifyResponse.status, body: errorText });
       return {
         success: false,
         failure: {
-          reason: `Facilitator verify request failed: ${verifyResponse.status}`,
+          reason: `Facilitator verify request failed: ${verifyResponse.status}${errorText ? ` - ${errorText}` : ""}`,
           code: "verification_failed"
         }
       };
@@ -580,27 +592,39 @@ async function verifyX402Payment(attempt, definition, options = {}) {
         ensureTrailingSlash(facilitator.url)
       ).toString();
       try {
-        console.log("[x402] Calling facilitator /settle", { url: settleUrl });
-        const settleResponse = await fetchImpl(settleUrl, {
-          method: "POST",
-          headers,
-          body: JSON.stringify({
-            x402Version: attempt.payload.x402Version,
-            paymentPayload: attempt.payload,
-            paymentRequirements: requirement
-          })
+        const settleBody = {
+          x402Version: attempt.payload.x402Version,
+          paymentPayload: attempt.payload,
+          paymentRequirements: requirement
+        };
+        console.log("[x402] Calling facilitator /settle", {
+          url: settleUrl,
+          bodyPreview: JSON.stringify(settleBody).substring(0, 300)
         });
+        const settleResponse = await Promise.race([
+          fetchImpl(settleUrl, {
+            method: "POST",
+            headers,
+            body: JSON.stringify(settleBody)
+          }),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error(`Settlement timeout after ${timeout}ms`)), timeout)
+          )
+        ]);
         console.log("[x402] Facilitator /settle response", { status: settleResponse.status });
         if (!settleResponse.ok) {
+          const errorText = await settleResponse.text().catch(() => "");
+          console.error("[x402] Facilitator /settle error", { status: settleResponse.status, body: errorText });
           return {
             success: false,
             failure: {
-              reason: `Facilitator settlement failed: ${settleResponse.status}`,
+              reason: `Facilitator settlement failed: ${settleResponse.status}${errorText ? ` - ${errorText}` : ""}`,
               code: "settlement_failed"
             }
           };
         }
         const settlePayload = await settleResponse.json();
+        console.log("[x402] Facilitator /settle success", { txHash: settlePayload.txHash });
         if (settlePayload.txHash) {
           responseHeaders[HEADER_PAYMENT_RESPONSE] = JSON.stringify({
             settled: true,
@@ -608,6 +632,7 @@ async function verifyX402Payment(attempt, definition, options = {}) {
           });
         }
       } catch (error) {
+        console.error("[x402] Settlement exception", { error: error instanceof Error ? error.message : String(error) });
         return {
           success: false,
           failure: {