x402scan-mcp 0.0.1 → 0.0.2

package/dist/index.js

@@ -438,6 +438,73 @@ import { randomBytes as randomBytes2 } from "crypto";
 import { x402Client } from "@x402/core/client";
 import { x402HTTPClient } from "@x402/core/http";
 import { registerExactEvmScheme } from "@x402/evm/exact/client";
+
+// src/x402/normalize.ts
+function isV1Response(pr) {
+  if (!pr || typeof pr !== "object") return false;
+  const obj = pr;
+  if (obj.x402Version === 1) return true;
+  const accepts = obj.accepts;
+  if (Array.isArray(accepts) && accepts.length > 0) {
+    return "maxAmountRequired" in accepts[0];
+  }
+  return false;
+}
+function normalizeV1Requirement(req) {
+  if (!req.maxAmountRequired) {
+    throw new Error("v1 requirement missing maxAmountRequired field");
+  }
+  return {
+    scheme: req.scheme,
+    network: req.network,
+    amount: req.maxAmountRequired,
+    // Map to unified 'amount' field
+    asset: req.asset,
+    payTo: req.payTo,
+    maxTimeoutSeconds: req.maxTimeoutSeconds,
+    extra: req.extra,
+    // Preserve v1-specific embedded resource fields
+    resource: req.resource,
+    description: req.description,
+    mimeType: req.mimeType
+  };
+}
+function normalizeV2Requirement(req) {
+  if (!req.amount) {
+    throw new Error("v2 requirement missing amount field");
+  }
+  return {
+    scheme: req.scheme,
+    network: req.network,
+    amount: req.amount,
+    asset: req.asset,
+    payTo: req.payTo,
+    maxTimeoutSeconds: req.maxTimeoutSeconds,
+    extra: req.extra
+  };
+}
+function normalizePaymentRequired(pr) {
+  const version = pr.x402Version ?? 1;
+  if (isV1Response(pr)) {
+    const v1Pr = pr;
+    return {
+      x402Version: 1,
+      error: v1Pr.error,
+      accepts: v1Pr.accepts.map(normalizeV1Requirement)
+    };
+  } else {
+    const v2Pr = pr;
+    return {
+      x402Version: version,
+      error: v2Pr.error,
+      accepts: v2Pr.accepts.map(normalizeV2Requirement),
+      resource: v2Pr.resource,
+      extensions: v2Pr.extensions
+    };
+  }
+}
+
+// src/x402/client.ts
 function createX402Client(config) {
   const { account, preferredNetwork } = config;
   const coreClient = new x402Client(
@@ -502,6 +569,7 @@ async function makeX402Request(httpClient, url, options = {}) {
     }
   }
   log.debug("Got 402 Payment Required, parsing requirements...");
+  let rawPaymentRequired;
   let paymentRequired;
   let responseBody;
   try {
@@ -510,11 +578,12 @@ async function makeX402Request(httpClient, url, options = {}) {
     } catch {
       responseBody = void 0;
     }
-    paymentRequired = httpClient.getPaymentRequiredResponse(
+    rawPaymentRequired = httpClient.getPaymentRequiredResponse(
       (name) => firstResponse.headers.get(name),
       responseBody
     );
-    logPaymentRequired(paymentRequired);
+    paymentRequired = normalizePaymentRequired(rawPaymentRequired);
+    logPaymentRequired(rawPaymentRequired);
   } catch (err) {
     return {
       success: false,
@@ -532,7 +601,7 @@ async function makeX402Request(httpClient, url, options = {}) {
   log.debug("Creating payment payload...");
   let paymentPayload;
   try {
-    paymentPayload = await httpClient.createPaymentPayload(paymentRequired);
+    paymentPayload = await httpClient.createPaymentPayload(rawPaymentRequired);
     log.debug(`Payment created for network: ${paymentPayload.accepted?.network}`);
   } catch (err) {
     return {
@@ -647,10 +716,11 @@ async function queryEndpoint(url, httpClient, options = {}) {
     rawBody = void 0;
   }
   try {
-    const paymentRequired = httpClient.getPaymentRequiredResponse(
+    const rawPaymentRequired = httpClient.getPaymentRequiredResponse(
       (name) => response.headers.get(name),
       rawBody
     );
+    const paymentRequired = normalizePaymentRequired(rawPaymentRequired);
     return {
       success: true,
       statusCode: 402,
@@ -757,12 +827,21 @@ import { z as z2 } from "zod";
 var PaymentRequirementsSchema = z2.object({
   scheme: z2.string(),
   network: z2.string(),
-  amount: z2.string(),
+  amount: z2.string().optional(),
+  // v2 field name
+  maxAmountRequired: z2.string().optional(),
+  // v1 field name
   asset: z2.string(),
   payTo: z2.string(),
   maxTimeoutSeconds: z2.number(),
   extra: z2.record(z2.unknown()).optional()
-});
+}).refine((data) => data.amount || data.maxAmountRequired, {
+  message: "Either amount (v2) or maxAmountRequired (v1) must be provided"
+}).transform((data) => ({
+  ...data,
+  // Normalize to 'amount' internally
+  amount: data.amount ?? data.maxAmountRequired
+}));
 function registerValidatePaymentTool(server) {
   server.tool(
     "validate_payment",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x402scan-mcp",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Generic MCP server for calling x402-protected APIs with automatic payment handling",
   "type": "module",
   "main": "dist/index.js",