@agentcash/router 1.2.0 → 1.2.2

package/dist/index.cjs

@@ -626,6 +626,8 @@ function resolveMaxPrice(pricing) {
 
 // src/orchestrate.ts
 var import_mppx2 = require("mppx");
+var import_actions = require("viem/actions");
+var import_tempo = require("viem/tempo");
 var import_viem2 = require("viem");
 
 // src/protocols/x402.ts
@@ -739,30 +741,53 @@ async function buildChallengeRequirements(server, request, price, accepts, resou
 function needsFacilitatorEnrichment(accepts) {
   return accepts.some((accept) => accept.scheme !== "exact") || hasSolanaAccepts(accepts);
 }
+async function enrichGroup(group, resource) {
+  const accepted = await enrichRequirementsWithFacilitatorAccepts(
+    group.facilitator,
+    resource,
+    group.items.map(({ requirement }) => requirement)
+  );
+  if (accepted.length !== group.items.length) {
+    throw new Error(
+      `Facilitator /accepts returned ${accepted.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
+    );
+  }
+  return accepted;
+}
 async function enrichChallengeRequirements(requirements, resource, facilitatorsByNetwork) {
   const groups = collectEnrichmentGroups(requirements, facilitatorsByNetwork);
   if (groups.length === 0) return requirements;
-  const enrichedRequirements = [...requirements];
-  await Promise.all(
+  const results = await Promise.all(
     groups.map(async (group) => {
-      const enriched = await enrichRequirementsWithFacilitatorAccepts(
-        group.facilitator,
-        resource,
-        group.items.map(({ requirement }) => requirement)
-      );
-      if (enriched.length !== group.items.length) {
-        throw new Error(
-          `Facilitator /accepts returned ${enriched.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
+      try {
+        return { success: true, group, accepted: await enrichGroup(group, resource) };
+      } catch (err) {
+        const label = group.facilitator.url ?? group.facilitator.network;
+        const reason = err instanceof Error ? err.message : String(err);
+        console.warn(
+          `[router] ${label} /accepts failed, dropping ${group.items.length} requirement(s): ${reason}`
         );
+        return { success: false, group };
       }
-      enriched.forEach((requirement, offset) => {
-        const index = group.items[offset]?.index;
-        if (index === void 0) return;
-        enrichedRequirements[index] = requirement;
-      });
     })
   );
-  return enrichedRequirements;
+  const enriched = [...requirements];
+  results.filter((r) => r.success).forEach(({ group, accepted }) => {
+    accepted.forEach((req, offset) => {
+      const index = group.items[offset]?.index;
+      if (index !== void 0) enriched[index] = req;
+    });
+  });
+  const failedIndices = new Set(
+    results.filter((r) => !r.success).flatMap(({ group }) => group.items.map(({ index }) => index))
+  );
+  const remaining = enriched.filter((_, i) => !failedIndices.has(i));
+  if (remaining.length === 0) {
+    throw new Error(
+      "All facilitator enrichments failed; no payment requirements remain for challenge"
+    );
+  }
+  return remaining;
 }
 function collectEnrichmentGroups(requirements, facilitatorsByNetwork) {
   const groups = [];
@@ -1364,6 +1389,122 @@ function createRequestHandler(routeEntry, handler, deps) {
         console.error(`[router] ${routeEntry.key}: ${reason}`);
         return fail(500, reason, meta, pluginCtx, body.data);
       }
+      const mppCredential = import_mppx2.Credential.fromRequest(request);
+      const rawSource = mppCredential?.source ?? "";
+      const didParts = rawSource.split(":");
+      const lastPart = didParts[didParts.length - 1];
+      const wallet = normalizeWalletAddress((0, import_viem2.isAddress)(lastPart) ? (0, import_viem2.getAddress)(lastPart) : rawSource);
+      const payloadType = mppCredential?.payload?.type;
+      if (payloadType === "transaction" && deps.tempoClient) {
+        try {
+          const serializedTx = mppCredential.payload.signature;
+          const transaction = import_tempo.Transaction.deserialize(serializedTx);
+          await (0, import_actions.call)(deps.tempoClient, {
+            ...transaction,
+            account: transaction.from,
+            calls: transaction.calls ?? []
+          });
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          console.warn(`[router] ${routeEntry.key}: MPP simulation failed \u2014 ${message}`);
+          firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+            level: "warn",
+            message: `MPP simulation failed: ${message}`,
+            route: routeEntry.key
+          });
+          return await build402(request, routeEntry, deps, meta, pluginCtx, body.data);
+        }
+        pluginCtx.setVerifiedWallet(wallet);
+        firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
+          protocol: "mpp",
+          payer: wallet,
+          amount: price,
+          network: "tempo:4217"
+        });
+        const { response: response2, rawResult: rawResult2 } = await invoke(
+          request,
+          meta,
+          pluginCtx,
+          wallet,
+          account,
+          body.data
+        );
+        if (response2.status < 400) {
+          let mppResult2;
+          try {
+            mppResult2 = await deps.mppx.charge({ amount: price })(request);
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            console.error(
+              `[router] ${routeEntry.key}: MPP broadcast failed after handler: ${message}`
+            );
+            firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+              level: "critical",
+              message: `MPP broadcast failed after handler: ${message}`,
+              route: routeEntry.key
+            });
+            return fail(
+              500,
+              `MPP payment processing failed: ${message}`,
+              meta,
+              pluginCtx,
+              body.data
+            );
+          }
+          if (mppResult2.status === 402) {
+            let rejectReason = "";
+            try {
+              const problemBody = await mppResult2.challenge.clone().text();
+              if (problemBody) {
+                const problem = JSON.parse(problemBody);
+                rejectReason = problem.detail || problem.title || "";
+              }
+            } catch {
+            }
+            const detail = rejectReason || "transaction reverted on-chain after handler execution";
+            console.error(
+              `[router] ${routeEntry.key}: MPP payment failed after handler \u2014 ${detail}`
+            );
+            firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+              level: "critical",
+              message: `MPP payment failed after handler: ${detail}`,
+              route: routeEntry.key
+            });
+            return fail(500, `MPP payment failed: ${detail}`, meta, pluginCtx, body.data);
+          }
+          const receiptResponse = mppResult2.withReceipt(response2);
+          receiptResponse.headers.set("Cache-Control", "private");
+          let txHash2 = "";
+          const receiptHeader2 = receiptResponse.headers.get("Payment-Receipt");
+          if (receiptHeader2) {
+            try {
+              txHash2 = import_mppx2.Receipt.deserialize(receiptHeader2).reference;
+            } catch {
+            }
+          }
+          if (routeEntry.siwxEnabled) {
+            try {
+              await deps.entitlementStore.grant(routeEntry.key, wallet);
+            } catch (error) {
+              firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+                level: "warn",
+                message: `Entitlement grant failed: ${error instanceof Error ? error.message : String(error)}`,
+                route: routeEntry.key
+              });
+            }
+          }
+          firePluginHook(deps.plugin, "onPaymentSettled", pluginCtx, {
+            protocol: "mpp",
+            payer: wallet,
+            transaction: txHash2,
+            network: "tempo:4217"
+          });
+          finalize(receiptResponse, rawResult2, meta, pluginCtx, body.data);
+          return receiptResponse;
+        }
+        finalize(response2, rawResult2, meta, pluginCtx, body.data);
+        return response2;
+      }
       let mppResult;
       try {
         mppResult = await deps.mppx.charge({ amount: price })(request);
@@ -1396,11 +1537,16 @@ function createRequestHandler(routeEntry, handler, deps) {
         });
         return await build402(request, routeEntry, deps, meta, pluginCtx, body.data);
       }
-      const credential = import_mppx2.Credential.fromRequest(request);
-      const rawSource = credential?.source ?? "";
-      const didParts = rawSource.split(":");
-      const lastPart = didParts[didParts.length - 1];
-      const wallet = normalizeWalletAddress((0, import_viem2.isAddress)(lastPart) ? (0, import_viem2.getAddress)(lastPart) : rawSource);
+      let txHash = "";
+      const receiptHeader = mppResult.withReceipt(new Response()).headers.get(
+        "Payment-Receipt"
+      );
+      if (receiptHeader) {
+        try {
+          txHash = import_mppx2.Receipt.deserialize(receiptHeader).reference;
+        } catch {
+        }
+      }
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "mpp",
@@ -1430,6 +1576,12 @@ function createRequestHandler(routeEntry, handler, deps) {
         }
         const receiptResponse = mppResult.withReceipt(response);
         receiptResponse.headers.set("Cache-Control", "private");
+        firePluginHook(deps.plugin, "onPaymentSettled", pluginCtx, {
+          protocol: "mpp",
+          payer: wallet,
+          transaction: txHash,
+          network: "tempo:4217"
+        });
         finalize(receiptResponse, rawResult, meta, pluginCtx, body.data);
         return receiptResponse;
       }
@@ -2291,7 +2443,8 @@ function createRouter(config) {
     network,
     x402FacilitatorsByNetwork: void 0,
     x402Accepts,
-    mppx: null
+    mppx: null,
+    tempoClient: null
   };
   deps.initPromise = (async () => {
     if (x402ConfigError) {
@@ -2314,11 +2467,10 @@ function createRouter(config) {
       try {
         const { Mppx, tempo } = await import("mppx/server");
         const rpcUrl = config.mpp.rpcUrl ?? process.env.TEMPO_RPC_URL;
-        const getClient = async () => {
-          const { createClient, http } = await import("viem");
-          const { tempo: tempoChain } = await import("viem/chains");
-          return createClient({ chain: tempoChain, transport: http(rpcUrl) });
-        };
+        const { createClient, http } = await import("viem");
+        const { tempo: tempoChain } = await import("viem/chains");
+        deps.tempoClient = createClient({ chain: tempoChain, transport: http(rpcUrl) });
+        const getClient = async () => deps.tempoClient;
         let feePayerAccount;
         if (config.mpp.feePayerKey) {
           const { Account } = await import("viem/tempo");

package/dist/index.d.cts

@@ -2,6 +2,7 @@ import { FacilitatorConfig } from '@x402/core/http';
 import { NextRequest, NextResponse } from 'next/server';
 import { ZodType } from 'zod';
 import { PaymentRequirements, PaymentRequired, SettleResponse, Network } from '@x402/core/types';
+import * as viem from 'viem';
 export { S as SIWX_ERROR_MESSAGES, a as SiwxErrorCode } from './siwx-BMlja_nt.cjs';
 
 interface EntitlementStore {
@@ -423,6 +424,7 @@ interface OrchestrateDeps {
             withReceipt: (response: Response) => Response;
         }>;
     } | null;
+    tempoClient?: viem.Client | null;
 }
 
 type True = true;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { FacilitatorConfig } from '@x402/core/http';
 import { NextRequest, NextResponse } from 'next/server';
 import { ZodType } from 'zod';
 import { PaymentRequirements, PaymentRequired, SettleResponse, Network } from '@x402/core/types';
+import * as viem from 'viem';
 export { S as SIWX_ERROR_MESSAGES, a as SiwxErrorCode } from './siwx-BMlja_nt.js';
 
 interface EntitlementStore {
@@ -423,6 +424,7 @@ interface OrchestrateDeps {
             withReceipt: (response: Response) => Response;
         }>;
     } | null;
+    tempoClient?: viem.Client | null;
 }
 
 type True = true;

package/dist/index.js

@@ -586,7 +586,9 @@ function resolveMaxPrice(pricing) {
 }
 
 // src/orchestrate.ts
-import { Credential as Credential2 } from "mppx";
+import { Credential as Credential2, Receipt } from "mppx";
+import { call as viemCall } from "viem/actions";
+import { Transaction as TempoTransaction } from "viem/tempo";
 import { isAddress as isAddress2, getAddress as getAddress2 } from "viem";
 
 // src/protocols/x402.ts
@@ -700,30 +702,53 @@ async function buildChallengeRequirements(server, request, price, accepts, resou
 function needsFacilitatorEnrichment(accepts) {
   return accepts.some((accept) => accept.scheme !== "exact") || hasSolanaAccepts(accepts);
 }
+async function enrichGroup(group, resource) {
+  const accepted = await enrichRequirementsWithFacilitatorAccepts(
+    group.facilitator,
+    resource,
+    group.items.map(({ requirement }) => requirement)
+  );
+  if (accepted.length !== group.items.length) {
+    throw new Error(
+      `Facilitator /accepts returned ${accepted.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
+    );
+  }
+  return accepted;
+}
 async function enrichChallengeRequirements(requirements, resource, facilitatorsByNetwork) {
   const groups = collectEnrichmentGroups(requirements, facilitatorsByNetwork);
   if (groups.length === 0) return requirements;
-  const enrichedRequirements = [...requirements];
-  await Promise.all(
+  const results = await Promise.all(
     groups.map(async (group) => {
-      const enriched = await enrichRequirementsWithFacilitatorAccepts(
-        group.facilitator,
-        resource,
-        group.items.map(({ requirement }) => requirement)
-      );
-      if (enriched.length !== group.items.length) {
-        throw new Error(
-          `Facilitator /accepts returned ${enriched.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
+      try {
+        return { success: true, group, accepted: await enrichGroup(group, resource) };
+      } catch (err) {
+        const label = group.facilitator.url ?? group.facilitator.network;
+        const reason = err instanceof Error ? err.message : String(err);
+        console.warn(
+          `[router] ${label} /accepts failed, dropping ${group.items.length} requirement(s): ${reason}`
         );
+        return { success: false, group };
       }
-      enriched.forEach((requirement, offset) => {
-        const index = group.items[offset]?.index;
-        if (index === void 0) return;
-        enrichedRequirements[index] = requirement;
-      });
     })
   );
-  return enrichedRequirements;
+  const enriched = [...requirements];
+  results.filter((r) => r.success).forEach(({ group, accepted }) => {
+    accepted.forEach((req, offset) => {
+      const index = group.items[offset]?.index;
+      if (index !== void 0) enriched[index] = req;
+    });
+  });
+  const failedIndices = new Set(
+    results.filter((r) => !r.success).flatMap(({ group }) => group.items.map(({ index }) => index))
+  );
+  const remaining = enriched.filter((_, i) => !failedIndices.has(i));
+  if (remaining.length === 0) {
+    throw new Error(
+      "All facilitator enrichments failed; no payment requirements remain for challenge"
+    );
+  }
+  return remaining;
 }
 function collectEnrichmentGroups(requirements, facilitatorsByNetwork) {
   const groups = [];
@@ -1325,6 +1350,122 @@ function createRequestHandler(routeEntry, handler, deps) {
         console.error(`[router] ${routeEntry.key}: ${reason}`);
         return fail(500, reason, meta, pluginCtx, body.data);
       }
+      const mppCredential = Credential2.fromRequest(request);
+      const rawSource = mppCredential?.source ?? "";
+      const didParts = rawSource.split(":");
+      const lastPart = didParts[didParts.length - 1];
+      const wallet = normalizeWalletAddress(isAddress2(lastPart) ? getAddress2(lastPart) : rawSource);
+      const payloadType = mppCredential?.payload?.type;
+      if (payloadType === "transaction" && deps.tempoClient) {
+        try {
+          const serializedTx = mppCredential.payload.signature;
+          const transaction = TempoTransaction.deserialize(serializedTx);
+          await viemCall(deps.tempoClient, {
+            ...transaction,
+            account: transaction.from,
+            calls: transaction.calls ?? []
+          });
+        } catch (err) {
+          const message = err instanceof Error ? err.message : String(err);
+          console.warn(`[router] ${routeEntry.key}: MPP simulation failed \u2014 ${message}`);
+          firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+            level: "warn",
+            message: `MPP simulation failed: ${message}`,
+            route: routeEntry.key
+          });
+          return await build402(request, routeEntry, deps, meta, pluginCtx, body.data);
+        }
+        pluginCtx.setVerifiedWallet(wallet);
+        firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
+          protocol: "mpp",
+          payer: wallet,
+          amount: price,
+          network: "tempo:4217"
+        });
+        const { response: response2, rawResult: rawResult2 } = await invoke(
+          request,
+          meta,
+          pluginCtx,
+          wallet,
+          account,
+          body.data
+        );
+        if (response2.status < 400) {
+          let mppResult2;
+          try {
+            mppResult2 = await deps.mppx.charge({ amount: price })(request);
+          } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            console.error(
+              `[router] ${routeEntry.key}: MPP broadcast failed after handler: ${message}`
+            );
+            firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+              level: "critical",
+              message: `MPP broadcast failed after handler: ${message}`,
+              route: routeEntry.key
+            });
+            return fail(
+              500,
+              `MPP payment processing failed: ${message}`,
+              meta,
+              pluginCtx,
+              body.data
+            );
+          }
+          if (mppResult2.status === 402) {
+            let rejectReason = "";
+            try {
+              const problemBody = await mppResult2.challenge.clone().text();
+              if (problemBody) {
+                const problem = JSON.parse(problemBody);
+                rejectReason = problem.detail || problem.title || "";
+              }
+            } catch {
+            }
+            const detail = rejectReason || "transaction reverted on-chain after handler execution";
+            console.error(
+              `[router] ${routeEntry.key}: MPP payment failed after handler \u2014 ${detail}`
+            );
+            firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+              level: "critical",
+              message: `MPP payment failed after handler: ${detail}`,
+              route: routeEntry.key
+            });
+            return fail(500, `MPP payment failed: ${detail}`, meta, pluginCtx, body.data);
+          }
+          const receiptResponse = mppResult2.withReceipt(response2);
+          receiptResponse.headers.set("Cache-Control", "private");
+          let txHash2 = "";
+          const receiptHeader2 = receiptResponse.headers.get("Payment-Receipt");
+          if (receiptHeader2) {
+            try {
+              txHash2 = Receipt.deserialize(receiptHeader2).reference;
+            } catch {
+            }
+          }
+          if (routeEntry.siwxEnabled) {
+            try {
+              await deps.entitlementStore.grant(routeEntry.key, wallet);
+            } catch (error) {
+              firePluginHook(deps.plugin, "onAlert", pluginCtx, {
+                level: "warn",
+                message: `Entitlement grant failed: ${error instanceof Error ? error.message : String(error)}`,
+                route: routeEntry.key
+              });
+            }
+          }
+          firePluginHook(deps.plugin, "onPaymentSettled", pluginCtx, {
+            protocol: "mpp",
+            payer: wallet,
+            transaction: txHash2,
+            network: "tempo:4217"
+          });
+          finalize(receiptResponse, rawResult2, meta, pluginCtx, body.data);
+          return receiptResponse;
+        }
+        finalize(response2, rawResult2, meta, pluginCtx, body.data);
+        return response2;
+      }
       let mppResult;
       try {
         mppResult = await deps.mppx.charge({ amount: price })(request);
@@ -1357,11 +1498,16 @@ function createRequestHandler(routeEntry, handler, deps) {
         });
         return await build402(request, routeEntry, deps, meta, pluginCtx, body.data);
       }
-      const credential = Credential2.fromRequest(request);
-      const rawSource = credential?.source ?? "";
-      const didParts = rawSource.split(":");
-      const lastPart = didParts[didParts.length - 1];
-      const wallet = normalizeWalletAddress(isAddress2(lastPart) ? getAddress2(lastPart) : rawSource);
+      let txHash = "";
+      const receiptHeader = mppResult.withReceipt(new Response()).headers.get(
+        "Payment-Receipt"
+      );
+      if (receiptHeader) {
+        try {
+          txHash = Receipt.deserialize(receiptHeader).reference;
+        } catch {
+        }
+      }
       pluginCtx.setVerifiedWallet(wallet);
       firePluginHook(deps.plugin, "onPaymentVerified", pluginCtx, {
         protocol: "mpp",
@@ -1391,6 +1537,12 @@ function createRequestHandler(routeEntry, handler, deps) {
         }
         const receiptResponse = mppResult.withReceipt(response);
         receiptResponse.headers.set("Cache-Control", "private");
+        firePluginHook(deps.plugin, "onPaymentSettled", pluginCtx, {
+          protocol: "mpp",
+          payer: wallet,
+          transaction: txHash,
+          network: "tempo:4217"
+        });
         finalize(receiptResponse, rawResult, meta, pluginCtx, body.data);
         return receiptResponse;
       }
@@ -2252,7 +2404,8 @@ function createRouter(config) {
     network,
     x402FacilitatorsByNetwork: void 0,
     x402Accepts,
-    mppx: null
+    mppx: null,
+    tempoClient: null
   };
   deps.initPromise = (async () => {
     if (x402ConfigError) {
@@ -2275,11 +2428,10 @@ function createRouter(config) {
       try {
         const { Mppx, tempo } = await import("mppx/server");
         const rpcUrl = config.mpp.rpcUrl ?? process.env.TEMPO_RPC_URL;
-        const getClient = async () => {
-          const { createClient, http } = await import("viem");
-          const { tempo: tempoChain } = await import("viem/chains");
-          return createClient({ chain: tempoChain, transport: http(rpcUrl) });
-        };
+        const { createClient, http } = await import("viem");
+        const { tempo: tempoChain } = await import("viem/chains");
+        deps.tempoClient = createClient({ chain: tempoChain, transport: http(rpcUrl) });
+        const getClient = async () => deps.tempoClient;
         let feePayerAccount;
         if (config.mpp.feePayerKey) {
           const { Account } = await import("viem/tempo");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcash/router",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Unified route builder for Next.js App Router APIs with x402, MPP, SIWX, and API key auth",
   "type": "module",
   "exports": {
@@ -61,7 +61,7 @@
     "@x402/extensions": "^2.3.0",
     "@x402/svm": "2.3.0",
     "eslint": "^10.0.0",
-    "mppx": "^0.4.2",
+    "mppx": "^0.4.8",
     "next": "^15.0.0",
     "prettier": "^3.8.1",
     "react": "^19.0.0",