@agentcash/router 1.1.1 → 1.1.3

package/dist/index.cjs

@@ -267,12 +267,12 @@ async function createX402Server(config) {
     facilitatorsByNetwork
   };
 }
-function cachedClient(inner, networks) {
+function cachedClient(inner, kinds) {
   return {
     verify: inner.verify.bind(inner),
     settle: inner.settle.bind(inner),
     getSupported: async () => ({
-      kinds: networks.map((network) => ({ x402Version: 2, scheme: "exact", network })),
+      kinds,
       extensions: [],
       signers: {}
     })
@@ -282,7 +282,19 @@ function createFacilitatorClients(facilitatorsByNetwork, HTTPFacilitatorClient)
   const groups = getResolvedX402FacilitatorGroups(facilitatorsByNetwork);
   return groups.map((group) => {
     const inner = new HTTPFacilitatorClient(group.config);
-    return group.family === "evm" ? cachedClient(inner, group.networks) : inner;
+    const kinds = group.networks.map((network) => ({
+      x402Version: 2,
+      scheme: "exact",
+      network,
+      ...group.family === "solana" ? {
+        extra: {
+          features: {
+            xSettlementAccountSupported: true
+          }
+        }
+      } : {}
+    }));
+    return cachedClient(inner, kinds);
   });
 }
 var init_server = __esm({
@@ -366,6 +378,11 @@ var RouteRegistry = class {
 // src/orchestrate.ts
 var import_server2 = require("next/server");
 
+// src/auth/normalize-wallet.ts
+function normalizeWalletAddress(address) {
+  return address.startsWith("0x") ? address.toLowerCase() : address;
+}
+
 // src/plugin.ts
 function createDefaultContext(meta) {
   const ctx = {
@@ -676,12 +693,33 @@ async function buildExpectedRequirements(server, request, price, accepts) {
   return [...exactRequirements, ...customRequirements];
 }
 async function buildExactRequirements(server, request, price, accepts) {
-  const exactOptions = [
-    ...buildEvmExactOptions(accepts, price),
-    ...buildSolanaExactOptions(accepts, price)
-  ];
-  if (exactOptions.length === 0) return [];
-  return server.buildPaymentRequirementsFromOptions(exactOptions, { request });
+  const exactGroups = [
+    buildEvmExactOptions(accepts, price),
+    buildSolanaExactOptions(accepts, price)
+  ].filter((options) => options.length > 0);
+  if (exactGroups.length === 0) return [];
+  const requirements = [];
+  const failures = [];
+  for (const options of exactGroups) {
+    try {
+      requirements.push(
+        ...await server.buildPaymentRequirementsFromOptions(options, { request })
+      );
+    } catch (error) {
+      const err = error instanceof Error ? error : new Error(String(error));
+      failures.push(err);
+      if (exactGroups.length === 1) {
+        throw err;
+      }
+      console.warn(
+        `[router] Failed to build x402 exact requirements for ${options[0]?.network}: ${err.message}`
+      );
+    }
+  }
+  if (requirements.length > 0) {
+    return requirements;
+  }
+  throw failures[0] ?? new Error("Failed to build x402 exact requirements");
 }
 function buildCustomRequirements(price, accepts) {
   return accepts.filter((accept) => accept.scheme !== "exact").map((accept) => buildCustomRequirement(price, accept));
@@ -877,6 +915,23 @@ function getRequirementNetwork(requirements, fallback) {
   const network = requirements?.network;
   return typeof network === "string" ? network : fallback;
 }
+function siwxSignatureType(network) {
+  return network.startsWith("solana:") ? "ed25519" : "eip191";
+}
+function getSupportedChains(x402Accepts, fallbackNetwork) {
+  const seen = /* @__PURE__ */ new Set();
+  const chains = [];
+  for (const accept of x402Accepts) {
+    if (accept.network && !seen.has(accept.network)) {
+      seen.add(accept.network);
+      chains.push({ chainId: accept.network, type: siwxSignatureType(accept.network) });
+    }
+  }
+  if (chains.length === 0) {
+    chains.push({ chainId: fallbackNetwork, type: siwxSignatureType(fallbackNetwork) });
+  }
+  return chains;
+}
 function createRequestHandler(routeEntry, handler, deps) {
   async function invoke(request, meta, pluginCtx, wallet, account, parsedBody) {
     const ctx = {
@@ -1004,12 +1059,14 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!siwxHeader && routeEntry.authMode === "siwx") {
         const url = new URL(request.url);
         const nonce = crypto.randomUUID().replace(/-/g, "");
+        const supportedChains = getSupportedChains(deps.x402Accepts, deps.network);
+        const primaryChain = supportedChains[0];
         const siwxInfo = {
           domain: url.hostname,
           uri: request.url,
           version: "1",
-          chainId: deps.network,
-          type: "eip191",
+          chainId: primaryChain.chainId,
+          type: primaryChain.type,
           nonce,
           issuedAt: (/* @__PURE__ */ new Date()).toISOString(),
           expirationTime: new Date(Date.now() + SIWX_CHALLENGE_EXPIRY_MS).toISOString(),
@@ -1033,7 +1090,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             "sign-in-with-x": {
               info: siwxInfo,
               // supportedChains at top level required by MCP tools for chain detection
-              supportedChains: [{ chainId: deps.network, type: "eip191" }],
+              supportedChains,
               ...siwxSchema ? { schema: siwxSchema } : {}
             }
           }
@@ -1069,7 +1126,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             return response;
           }
         } else {
-          const wallet = siwx.wallet.toLowerCase();
+          const wallet = normalizeWalletAddress(siwx.wallet);
           pluginCtx.setVerifiedWallet(wallet);
           if (routeEntry.authMode === "siwx") {
             firePluginHook(deps.plugin, "onAuthVerified", pluginCtx, {
@@ -1171,7 +1228,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!verify?.valid) return await build402(request, routeEntry, deps, meta, pluginCtx);
       const { payload: verifyPayload, requirements: verifyRequirements } = verify;
       const matchedNetwork = getRequirementNetwork(verifyRequirements, deps.network);
-      const wallet = verify.payer.toLowerCase();
+      const wallet = normalizeWalletAddress(verify.payer);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "x402",
@@ -1273,7 +1330,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       const rawSource = credential?.source ?? "";
       const didParts = rawSource.split(":");
       const lastPart = didParts[didParts.length - 1];
-      const wallet = ((0, import_viem.isAddress)(lastPart) ? (0, import_viem.getAddress)(lastPart) : rawSource).toLowerCase();
+      const wallet = normalizeWalletAddress((0, import_viem.isAddress)(lastPart) ? (0, import_viem.getAddress)(lastPart) : rawSource);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "mpp",
@@ -1769,16 +1826,16 @@ var MemoryEntitlementStore = class {
   async has(route, wallet) {
     const wallets = this.routeToWallets.get(route);
     if (!wallets) return false;
-    return wallets.has(wallet.toLowerCase());
+    return wallets.has(normalizeWalletAddress(wallet));
   }
   async grant(route, wallet) {
-    const normalizedWallet = wallet.toLowerCase();
+    const normalized = normalizeWalletAddress(wallet);
     let wallets = this.routeToWallets.get(route);
     if (!wallets) {
       wallets = /* @__PURE__ */ new Set();
       this.routeToWallets.set(route, wallets);
     }
-    wallets.add(normalizedWallet);
+    wallets.add(normalized);
   }
 };
 function detectRedisClientType2(client) {
@@ -1801,26 +1858,26 @@ function createRedisEntitlementStore(client, options) {
   return {
     async has(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        const result2 = await redis2.sismember(key, normalizedWallet);
+        const result2 = await redis2.sismember(key, normalized);
         return result2 === 1 || result2 === true;
       }
       const redis = client;
-      const result = await redis.sismember(key, normalizedWallet);
+      const result = await redis.sismember(key, normalized);
       return result === 1;
     },
     async grant(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        await redis2.sadd(key, normalizedWallet);
+        await redis2.sadd(key, normalized);
         return;
       }
       const redis = client;
-      await redis.sadd(key, normalizedWallet);
+      await redis.sadd(key, normalized);
     }
   };
 }

package/dist/index.js

@@ -245,12 +245,12 @@ async function createX402Server(config) {
     facilitatorsByNetwork
   };
 }
-function cachedClient(inner, networks) {
+function cachedClient(inner, kinds) {
   return {
     verify: inner.verify.bind(inner),
     settle: inner.settle.bind(inner),
     getSupported: async () => ({
-      kinds: networks.map((network) => ({ x402Version: 2, scheme: "exact", network })),
+      kinds,
       extensions: [],
       signers: {}
     })
@@ -260,7 +260,19 @@ function createFacilitatorClients(facilitatorsByNetwork, HTTPFacilitatorClient)
   const groups = getResolvedX402FacilitatorGroups(facilitatorsByNetwork);
   return groups.map((group) => {
     const inner = new HTTPFacilitatorClient(group.config);
-    return group.family === "evm" ? cachedClient(inner, group.networks) : inner;
+    const kinds = group.networks.map((network) => ({
+      x402Version: 2,
+      scheme: "exact",
+      network,
+      ...group.family === "solana" ? {
+        extra: {
+          features: {
+            xSettlementAccountSupported: true
+          }
+        }
+      } : {}
+    }));
+    return cachedClient(inner, kinds);
   });
 }
 var init_server = __esm({
@@ -327,6 +339,11 @@ var RouteRegistry = class {
 // src/orchestrate.ts
 import { NextResponse as NextResponse2 } from "next/server";
 
+// src/auth/normalize-wallet.ts
+function normalizeWalletAddress(address) {
+  return address.startsWith("0x") ? address.toLowerCase() : address;
+}
+
 // src/plugin.ts
 function createDefaultContext(meta) {
   const ctx = {
@@ -637,12 +654,33 @@ async function buildExpectedRequirements(server, request, price, accepts) {
   return [...exactRequirements, ...customRequirements];
 }
 async function buildExactRequirements(server, request, price, accepts) {
-  const exactOptions = [
-    ...buildEvmExactOptions(accepts, price),
-    ...buildSolanaExactOptions(accepts, price)
-  ];
-  if (exactOptions.length === 0) return [];
-  return server.buildPaymentRequirementsFromOptions(exactOptions, { request });
+  const exactGroups = [
+    buildEvmExactOptions(accepts, price),
+    buildSolanaExactOptions(accepts, price)
+  ].filter((options) => options.length > 0);
+  if (exactGroups.length === 0) return [];
+  const requirements = [];
+  const failures = [];
+  for (const options of exactGroups) {
+    try {
+      requirements.push(
+        ...await server.buildPaymentRequirementsFromOptions(options, { request })
+      );
+    } catch (error) {
+      const err = error instanceof Error ? error : new Error(String(error));
+      failures.push(err);
+      if (exactGroups.length === 1) {
+        throw err;
+      }
+      console.warn(
+        `[router] Failed to build x402 exact requirements for ${options[0]?.network}: ${err.message}`
+      );
+    }
+  }
+  if (requirements.length > 0) {
+    return requirements;
+  }
+  throw failures[0] ?? new Error("Failed to build x402 exact requirements");
 }
 function buildCustomRequirements(price, accepts) {
   return accepts.filter((accept) => accept.scheme !== "exact").map((accept) => buildCustomRequirement(price, accept));
@@ -838,6 +876,23 @@ function getRequirementNetwork(requirements, fallback) {
   const network = requirements?.network;
   return typeof network === "string" ? network : fallback;
 }
+function siwxSignatureType(network) {
+  return network.startsWith("solana:") ? "ed25519" : "eip191";
+}
+function getSupportedChains(x402Accepts, fallbackNetwork) {
+  const seen = /* @__PURE__ */ new Set();
+  const chains = [];
+  for (const accept of x402Accepts) {
+    if (accept.network && !seen.has(accept.network)) {
+      seen.add(accept.network);
+      chains.push({ chainId: accept.network, type: siwxSignatureType(accept.network) });
+    }
+  }
+  if (chains.length === 0) {
+    chains.push({ chainId: fallbackNetwork, type: siwxSignatureType(fallbackNetwork) });
+  }
+  return chains;
+}
 function createRequestHandler(routeEntry, handler, deps) {
   async function invoke(request, meta, pluginCtx, wallet, account, parsedBody) {
     const ctx = {
@@ -965,12 +1020,14 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!siwxHeader && routeEntry.authMode === "siwx") {
         const url = new URL(request.url);
         const nonce = crypto.randomUUID().replace(/-/g, "");
+        const supportedChains = getSupportedChains(deps.x402Accepts, deps.network);
+        const primaryChain = supportedChains[0];
         const siwxInfo = {
           domain: url.hostname,
           uri: request.url,
           version: "1",
-          chainId: deps.network,
-          type: "eip191",
+          chainId: primaryChain.chainId,
+          type: primaryChain.type,
           nonce,
           issuedAt: (/* @__PURE__ */ new Date()).toISOString(),
           expirationTime: new Date(Date.now() + SIWX_CHALLENGE_EXPIRY_MS).toISOString(),
@@ -994,7 +1051,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             "sign-in-with-x": {
               info: siwxInfo,
               // supportedChains at top level required by MCP tools for chain detection
-              supportedChains: [{ chainId: deps.network, type: "eip191" }],
+              supportedChains,
               ...siwxSchema ? { schema: siwxSchema } : {}
             }
           }
@@ -1030,7 +1087,7 @@ function createRequestHandler(routeEntry, handler, deps) {
             return response;
           }
         } else {
-          const wallet = siwx.wallet.toLowerCase();
+          const wallet = normalizeWalletAddress(siwx.wallet);
           pluginCtx.setVerifiedWallet(wallet);
           if (routeEntry.authMode === "siwx") {
             firePluginHook(deps.plugin, "onAuthVerified", pluginCtx, {
@@ -1132,7 +1189,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (!verify?.valid) return await build402(request, routeEntry, deps, meta, pluginCtx);
       const { payload: verifyPayload, requirements: verifyRequirements } = verify;
       const matchedNetwork = getRequirementNetwork(verifyRequirements, deps.network);
-      const wallet = verify.payer.toLowerCase();
+      const wallet = normalizeWalletAddress(verify.payer);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "x402",
@@ -1234,7 +1291,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       const rawSource = credential?.source ?? "";
       const didParts = rawSource.split(":");
       const lastPart = didParts[didParts.length - 1];
-      const wallet = (isAddress(lastPart) ? getAddress(lastPart) : rawSource).toLowerCase();
+      const wallet = normalizeWalletAddress(isAddress(lastPart) ? getAddress(lastPart) : rawSource);
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "mpp",
@@ -1730,16 +1787,16 @@ var MemoryEntitlementStore = class {
   async has(route, wallet) {
     const wallets = this.routeToWallets.get(route);
     if (!wallets) return false;
-    return wallets.has(wallet.toLowerCase());
+    return wallets.has(normalizeWalletAddress(wallet));
   }
   async grant(route, wallet) {
-    const normalizedWallet = wallet.toLowerCase();
+    const normalized = normalizeWalletAddress(wallet);
     let wallets = this.routeToWallets.get(route);
     if (!wallets) {
       wallets = /* @__PURE__ */ new Set();
       this.routeToWallets.set(route, wallets);
     }
-    wallets.add(normalizedWallet);
+    wallets.add(normalized);
   }
 };
 function detectRedisClientType2(client) {
@@ -1762,26 +1819,26 @@ function createRedisEntitlementStore(client, options) {
   return {
     async has(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        const result2 = await redis2.sismember(key, normalizedWallet);
+        const result2 = await redis2.sismember(key, normalized);
         return result2 === 1 || result2 === true;
       }
       const redis = client;
-      const result = await redis.sismember(key, normalizedWallet);
+      const result = await redis.sismember(key, normalized);
       return result === 1;
     },
     async grant(route, wallet) {
       const key = `${prefix}${route}`;
-      const normalizedWallet = wallet.toLowerCase();
+      const normalized = normalizeWalletAddress(wallet);
       if (clientType === "upstash") {
         const redis2 = client;
-        await redis2.sadd(key, normalizedWallet);
+        await redis2.sadd(key, normalized);
         return;
       }
       const redis = client;
-      await redis.sadd(key, normalizedWallet);
+      await redis.sadd(key, normalized);
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcash/router",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Unified route builder for Next.js App Router APIs with x402, MPP, SIWX, and API key auth",
   "type": "module",
   "exports": {