rwagenthub-mcp 1.0.8 → 1.0.9

package/index.js

@@ -1,131 +1,231 @@
-#!/usr/bin/env node
-import "dotenv/config";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createWalletClient, http } from "viem";
-import { privateKeyToAccount } from "viem/accounts";
-import { base } from "viem/chains";
-import { wrapFetchWithPayment } from "@x402/fetch";
-import { x402Client } from "@x402/core/client";
-import { registerExactEvmScheme } from "@x402/evm/exact/client";
-import { z } from "zod";
-
-const GATEWAY_URL = "https://agents-production-73c1.up.railway.app";
-
-// ── Payment setup ──────────────────────────────────────────────────────────────
-if (!process.env.MCP_WALLET_PRIVATE_KEY) {
-  console.error("[mcp] ERROR: MCP_WALLET_PRIVATE_KEY not set");
-  console.error("[mcp] Add it to your MCP client config under env.MCP_WALLET_PRIVATE_KEY");
-  process.exit(1);
-}
-
-const account = privateKeyToAccount(process.env.MCP_WALLET_PRIVATE_KEY);
-const walletClient = createWalletClient({ account, chain: base, transport: http() });
-const signer = Object.assign(walletClient, { address: account.address });
-
-const client = new x402Client();
-registerExactEvmScheme(client, { signer });
-const pay = wrapFetchWithPayment(fetch, client);
-
-async function callGateway(api, inputs) {
-  const res = await pay(`${GATEWAY_URL}/v1/call`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ api, inputs }),
-  });
-  if (res.status === 402) {
-    const body = await res.json().catch(() => ({}));
-    const reason = body?.details ?? body?.error?.invalidReason ?? body?.error ?? "payment_failed";
-    throw new Error(`payment_failed:${reason}`);
-  }
-  return res.json();
-}
-
-// ── Type mapper: JSON Schema property → Zod ───────────────────────────────────
-function toZod(propName, prop, requiredList) {
-  let schema;
-  if (prop.type === "number") {
-    schema = z.number();
-  } else if (prop.type === "boolean") {
-    schema = z.boolean();
-  } else if (prop.oneOf) {
-    schema = z.union([z.string(), z.array(z.string())]);
-  } else {
-    schema = z.string();
-  }
-
-  if (prop.description) schema = schema.describe(prop.description);
-  const isRequired = requiredList?.includes(propName);
-  if (!isRequired) schema = schema.optional();
-  if (prop.default !== undefined) schema = schema.default(prop.default);
-  return schema;
-}
-
-// ── Main: fetch schema from gateway, register tools, start server ──────────────
-async function main() {
-  // Fetch live schema + prices from the gateway
-  const res = await fetch(`${GATEWAY_URL}/v1/schema`);
-  if (!res.ok) {
-    console.error(`[mcp] Failed to fetch schema from gateway: ${res.status} ${res.statusText}`);
-    process.exit(1);
-  }
-  const { apis } = await res.json();
-
-  const server = new McpServer({ name: "agenthub", version: "1.0.0" });
-
-  for (const api of apis) {
-    const { properties = {}, required: requiredList = [] } = api.inputSchema ?? {};
-    const zodShape = {};
-    for (const [fieldName, prop] of Object.entries(properties)) {
-      zodShape[fieldName] = toZod(fieldName, prop, requiredList);
-    }
-
-    server.tool(
-      api.name,
-      `${api.description} Costs $${(api.price_usd ?? 0.01).toFixed(2)} USDC per call via x402 on Base.`,
-      zodShape,
-      async (inputs) => {
-        try {
-          const result = await callGateway(api.name, inputs);
-
-          if (!result.success) {
-            return {
-              content: [{ type: "text", text: `Error: ${result.error}${result.message ? ` — ${result.message}` : ""}${result.hint ? `\n${result.hint}` : ""}` }],
-              isError: true,
-            };
-          }
-
-          return {
-            content: [{ type: "text", text: JSON.stringify(result.data, null, 2) }],
-          };
-        } catch (err) {
-          const msg = err.message ?? "";
-          const isPaymentError =
-            msg.startsWith("payment_failed") ||
-            msg.toLowerCase().includes("insufficient funds") ||
-            msg.toLowerCase().includes("insufficient_funds") ||
-            msg.toLowerCase().includes("failed to create payment payload");
-          if (isPaymentError) {
-            return {
-              content: [{ type: "text", text: `Payment failed: insufficient USDC balance on Base.\nWallet: ${account.address}\n\nTop up your wallet with USDC on Base and try again.` }],
-              isError: true,
-            };
-          }
-          return {
-            content: [{ type: "text", text: `Gateway error: ${err.message}` }],
-            isError: true,
-          };
-        }
-      }
-    );
-  }
-
-  const transport = new StdioServerTransport();
-  await server.connect(transport);
-  console.error(`[mcp] AgentHub MCP server running — ${apis.length} tools available`);
-}
-
-main().catch((err) => {
-  console.error("[mcp] Fatal:", err);
-  process.exit(1);
-});
+#!/usr/bin/env node
+import "dotenv/config";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { createWalletClient, http } from "viem";
+import { privateKeyToAccount } from "viem/accounts";
+import { base } from "viem/chains";
+import { wrapFetchWithPayment } from "@x402/fetch";
+import { x402Client } from "@x402/core/client";
+import { registerExactEvmScheme } from "@x402/evm/exact/client";
+import { z } from "zod";
+
+const GATEWAY_URL = "https://agents-production-73c1.up.railway.app";
+
+// ── Payment setup ──────────────────────────────────────────────────────────────
+if (!process.env.MCP_WALLET_PRIVATE_KEY) {
+  console.error("[mcp] ERROR: MCP_WALLET_PRIVATE_KEY not set");
+  console.error("[mcp] Add it to your MCP client config under env.MCP_WALLET_PRIVATE_KEY");
+  process.exit(1);
+}
+
+const account = privateKeyToAccount(process.env.MCP_WALLET_PRIVATE_KEY);
+const walletClient = createWalletClient({ account, chain: base, transport: http() });
+const signer = Object.assign(walletClient, { address: account.address });
+
+const client = new x402Client();
+registerExactEvmScheme(client, { signer });
+const pay = wrapFetchWithPayment(fetch, client);
+
+// ── Balance mode (optional) ────────────────────────────────────────────────────
+// Set MCP_BALANCE_TOKEN to use prepaid balance instead of paying gas per call.
+// Top up via the `topup_balance` tool registered below.
+let balanceToken = process.env.MCP_BALANCE_TOKEN ?? null;
+
+async function callGateway(api, inputs) {
+  // Balance mode: use token, skip x402
+  if (balanceToken) {
+    const res = await fetch(`${GATEWAY_URL}/v1/call`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": `Bearer ${balanceToken}`,
+      },
+      body: JSON.stringify({ api, inputs }),
+    });
+
+    if (res.status === 402) {
+      const body = await res.json().catch(() => ({}));
+      // insufficient_balance — fall through to x402 pay-per-call
+      if (body?.error === "insufficient_balance") {
+        console.error(`[mcp] Balance insufficient ($${body.balance_usd} < $${body.required_usd}). Falling back to x402.`);
+        return callGatewayX402(api, inputs);
+      }
+      throw new Error(`token_error:${body?.error ?? "unknown"}`);
+    }
+    return res.json();
+  }
+
+  return callGatewayX402(api, inputs);
+}
+
+async function callGatewayX402(api, inputs) {
+  const res = await pay(`${GATEWAY_URL}/v1/call`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ api, inputs }),
+  });
+  if (res.status === 402) {
+    const body = await res.json().catch(() => ({}));
+    const reason = body?.details ?? body?.error?.invalidReason ?? body?.error ?? "payment_failed";
+    throw new Error(`payment_failed:${reason}`);
+  }
+  return res.json();
+}
+
+async function topupGateway(amount_usd) {
+  const res = await pay(`${GATEWAY_URL}/v1/topup`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ amount_usd, token: balanceToken ?? undefined }),
+  });
+  if (res.status === 402) {
+    const body = await res.json().catch(() => ({}));
+    const reason = body?.details ?? body?.error ?? "payment_failed";
+    throw new Error(`payment_failed:${reason}`);
+  }
+  return res.json();
+}
+
+async function getBalance() {
+  if (!balanceToken) return { error: "no_token", message: "No balance token set. Use topup_balance first." };
+  const res = await fetch(`${GATEWAY_URL}/v1/user/balance`, {
+    headers: { "Authorization": `Bearer ${balanceToken}` },
+  });
+  return res.json();
+}
+
+// ── Type mapper: JSON Schema property → Zod ───────────────────────────────────
+function toZod(propName, prop, requiredList) {
+  let schema;
+  if (prop.type === "number") {
+    schema = z.number();
+  } else if (prop.type === "boolean") {
+    schema = z.boolean();
+  } else if (prop.oneOf) {
+    schema = z.union([z.string(), z.array(z.string())]);
+  } else {
+    schema = z.string();
+  }
+
+  if (prop.description) schema = schema.describe(prop.description);
+  const isRequired = requiredList?.includes(propName);
+  if (!isRequired) schema = schema.optional();
+  if (prop.default !== undefined) schema = schema.default(prop.default);
+  return schema;
+}
+
+// ── Main: fetch schema from gateway, register tools, start server ──────────────
+async function main() {
+  // Fetch live schema + prices from the gateway
+  const res = await fetch(`${GATEWAY_URL}/v1/schema`);
+  if (!res.ok) {
+    console.error(`[mcp] Failed to fetch schema from gateway: ${res.status} ${res.statusText}`);
+    process.exit(1);
+  }
+  const { apis } = await res.json();
+
+  const server = new McpServer({ name: "agenthub", version: "1.0.0" });
+
+  // ── Balance management tools ───────────────────────────────────────────────
+  server.tool(
+    "topup_balance",
+    `Top up your AgentHub prepaid balance with USDC via x402 (one on-chain payment). Valid amounts: 1, 2, 5, 10, 20, 50 USD. Returns a token for gas-free subsequent calls. If you already have a token (MCP_BALANCE_TOKEN), it will be recharged instead of creating a new one.`,
+    { amount_usd: z.number().describe("Amount in USD to top up. Must be one of: 1, 2, 5, 10, 20, 50") },
+    async ({ amount_usd }) => {
+      try {
+        const result = await topupGateway(amount_usd);
+        if (!result.success) {
+          return { content: [{ type: "text", text: `Topup failed: ${result.error ?? "unknown"}` }], isError: true };
+        }
+        // Store token for this session
+        balanceToken = result.token;
+        return {
+          content: [{ type: "text", text: `Balance topped up successfully!\n\nToken: ${result.token}\nBalance: $${result.balance_usd} USDC\nWallet: ${result.wallet}\n\nSave your token:\n  MCP_BALANCE_TOKEN=${result.token}\n\nAll subsequent API calls in this session will use the prepaid balance (no gas per call).` }],
+        };
+      } catch (err) {
+        const msg = err.message ?? "";
+        const isPaymentError = msg.startsWith("payment_failed") || msg.toLowerCase().includes("insufficient funds");
+        if (isPaymentError) {
+          return {
+            content: [{ type: "text", text: `Payment failed: insufficient USDC on Base.\nWallet: ${account.address}\n\nTop up your wallet with USDC on Base and try again.` }],
+            isError: true,
+          };
+        }
+        return { content: [{ type: "text", text: `Topup error: ${err.message}` }], isError: true };
+      }
+    }
+  );
+
+  server.tool(
+    "get_balance",
+    "Check your current AgentHub prepaid balance. Requires MCP_BALANCE_TOKEN env var or a previous topup_balance call.",
+    {},
+    async () => {
+      const result = await getBalance();
+      if (result.error) {
+        return { content: [{ type: "text", text: `${result.error}: ${result.message ?? ""}` }], isError: true };
+      }
+      return {
+        content: [{ type: "text", text: `AgentHub Balance\n\nToken: ${result.token}\nWallet: ${result.wallet}\nAvailable: $${result.balance_usd} USDC\nTotal topped up: $${result.topup_total} USDC\nTotal spent: $${result.spend_total} USDC` }],
+      };
+    }
+  );
+
+  // ── API tools (dynamic from gateway schema) ────────────────────────────────
+  for (const api of apis) {
+    const { properties = {}, required: requiredList = [] } = api.inputSchema ?? {};
+    const zodShape = {};
+    for (const [fieldName, prop] of Object.entries(properties)) {
+      zodShape[fieldName] = toZod(fieldName, prop, requiredList);
+    }
+
+    server.tool(
+      api.name,
+      `${api.description} Costs $${(api.price_usd ?? 0.01).toFixed(2)} USDC per call via x402 on Base.`,
+      zodShape,
+      async (inputs) => {
+        try {
+          const result = await callGateway(api.name, inputs);
+
+          if (!result.success) {
+            return {
+              content: [{ type: "text", text: `Error: ${result.error}${result.message ? ` — ${result.message}` : ""}${result.hint ? `\n${result.hint}` : ""}` }],
+              isError: true,
+            };
+          }
+
+          return {
+            content: [{ type: "text", text: JSON.stringify(result.data, null, 2) }],
+          };
+        } catch (err) {
+          const msg = err.message ?? "";
+          const isPaymentError =
+            msg.startsWith("payment_failed") ||
+            msg.toLowerCase().includes("insufficient funds") ||
+            msg.toLowerCase().includes("insufficient_funds") ||
+            msg.toLowerCase().includes("failed to create payment payload");
+          if (isPaymentError) {
+            return {
+              content: [{ type: "text", text: `Payment failed: insufficient USDC balance on Base.\nWallet: ${account.address}\n\nTop up your wallet with USDC on Base and try again.` }],
+              isError: true,
+            };
+          }
+          return {
+            content: [{ type: "text", text: `Gateway error: ${err.message}` }],
+            isError: true,
+          };
+        }
+      }
+    );
+  }
+
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+  console.error(`[mcp] AgentHub MCP server running — ${apis.length} tools available`);
+}
+
+main().catch((err) => {
+  console.error("[mcp] Fatal:", err);
+  process.exit(1);
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rwagenthub-mcp",
-  "version": "1.0.8",
-  "description": "MCP server for AgentHub — 34 AI APIs (flights, weather, crypto, stocks, DeFi, web scraping, geocoding, IP reputation, blockchain data...) paid via x402 USDC on Base",
+  "version": "1.0.9",
+  "description": "MCP server for AgentHub — 32 AI APIs (flights, weather, crypto, stocks, DeFi, web scraping, geocoding, IP reputation, blockchain data...) paid via x402 USDC on Base",
   "type": "module",
   "bin": {
     "rwagenthub-mcp": "./index.js"
@@ -35,9 +35,9 @@
   "license": "MIT",
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.27.1",
-    "@x402/core": "^2.3.1",
-    "@x402/evm": "^2.3.1",
-    "@x402/fetch": "^2.3.0",
+    "@x402/core": "^2.6.0",
+    "@x402/evm": "^2.6.0",
+    "@x402/fetch": "^2.6.0",
     "dotenv": "^16.4.0",
     "viem": "^2.46.2",
     "zod": "^3.25.76"