@agentcash/router 0.6.2 → 0.6.4

package/dist/index.cjs

@@ -382,7 +382,8 @@ async function buildX402Challenge(server, routeEntry, request, price, payeeAddre
   const resource = {
     url: request.url,
     method: routeEntry.method,
-    description: routeEntry.description
+    description: routeEntry.description,
+    mimeType: "application/json"
   };
   const requirements = await server.buildPaymentRequirementsFromOptions([options], {
     request
@@ -536,13 +537,13 @@ function createRequestHandler(routeEntry, handler, deps) {
     }, ctx);
     return { response, rawResult };
   }
-  function finalize(response, rawResult, meta, pluginCtx) {
+  function finalize(response, rawResult, meta, pluginCtx, requestBody) {
     fireProviderQuota(routeEntry, response, rawResult, deps, pluginCtx);
-    firePluginResponse(deps, pluginCtx, meta, response);
+    firePluginResponse(deps, pluginCtx, meta, response, requestBody, rawResult);
   }
-  function fail(status, message, meta, pluginCtx) {
+  function fail(status, message, meta, pluginCtx, requestBody) {
     const response = import_server2.NextResponse.json({ success: false, error: message }, { status });
-    firePluginResponse(deps, pluginCtx, meta, response);
+    firePluginResponse(deps, pluginCtx, meta, response, requestBody);
     return response;
   }
   return async (request) => {
@@ -561,7 +562,7 @@ function createRequestHandler(routeEntry, handler, deps) {
         } catch (err) {
           const status = err.status ?? 400;
           const message = err instanceof Error ? err.message : "Validation failed";
-          return fail(status, message, meta, pluginCtx);
+          return fail(status, message, meta, pluginCtx, body2.data);
         }
       }
       const { response, rawResult } = await invoke(
@@ -572,7 +573,7 @@ function createRequestHandler(routeEntry, handler, deps) {
         account2,
         body2.data
       );
-      finalize(response, rawResult, meta, pluginCtx);
+      finalize(response, rawResult, meta, pluginCtx, body2.data);
       return response;
     }
     if (routeEntry.authMode === "unprotected") {
@@ -605,18 +606,16 @@ function createRequestHandler(routeEntry, handler, deps) {
     if (needsEarlyParse) {
       const requestForPricing = request.clone();
       const earlyBodyResult = await parseBody(requestForPricing, routeEntry);
-      if (!earlyBodyResult.ok) {
-        firePluginResponse(deps, pluginCtx, meta, earlyBodyResult.response);
-        return earlyBodyResult.response;
-      }
-      earlyBodyData = earlyBodyResult.data;
-      if (routeEntry.validateFn) {
-        try {
-          await routeEntry.validateFn(earlyBodyData);
-        } catch (err) {
-          const status = err.status ?? 400;
-          const message = err instanceof Error ? err.message : "Validation failed";
-          return fail(status, message, meta, pluginCtx);
+      if (earlyBodyResult.ok) {
+        earlyBodyData = earlyBodyResult.data;
+        if (routeEntry.validateFn) {
+          try {
+            await routeEntry.validateFn(earlyBodyData);
+          } catch (err) {
+            const status = err.status ?? 400;
+            const message = err instanceof Error ? err.message : "Validation failed";
+            return fail(status, message, meta, pluginCtx, earlyBodyData);
+          }
         }
       }
     }
@@ -624,16 +623,14 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (routeEntry.validateFn && routeEntry.bodySchema && !request.headers.get("SIGN-IN-WITH-X")) {
         const requestForValidation = request.clone();
         const earlyBodyResult = await parseBody(requestForValidation, routeEntry);
-        if (!earlyBodyResult.ok) {
-          firePluginResponse(deps, pluginCtx, meta, earlyBodyResult.response);
-          return earlyBodyResult.response;
-        }
-        try {
-          await routeEntry.validateFn(earlyBodyResult.data);
-        } catch (err) {
-          const status = err.status ?? 400;
-          const message = err instanceof Error ? err.message : "Validation failed";
-          return fail(status, message, meta, pluginCtx);
+        if (earlyBodyResult.ok) {
+          try {
+            await routeEntry.validateFn(earlyBodyResult.data);
+          } catch (err) {
+            const status = err.status ?? 400;
+            const message = err instanceof Error ? err.message : "Validation failed";
+            return fail(status, message, meta, pluginCtx, earlyBodyResult.data);
+          }
         }
       }
       if (!request.headers.get("SIGN-IN-WITH-X")) {
@@ -739,7 +736,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       } catch (err) {
         const status = err.status ?? 400;
         const message = err instanceof Error ? err.message : "Validation failed";
-        return fail(status, message, meta, pluginCtx);
+        return fail(status, message, meta, pluginCtx, body.data);
       }
     }
     let price;
@@ -750,7 +747,8 @@ function createRequestHandler(routeEntry, handler, deps) {
         err.status ?? 500,
         err instanceof Error ? err.message : "Price resolution failed",
         meta,
-        pluginCtx
+        pluginCtx,
+        body.data
       );
     }
     if (!routeEntry.protocols.includes(protocol)) {
@@ -762,14 +760,15 @@ function createRequestHandler(routeEntry, handler, deps) {
         400,
         `This route does not accept ${protocol} payments. Accepted protocols: ${accepted}`,
         meta,
-        pluginCtx
+        pluginCtx,
+        body.data
       );
     }
     if (protocol === "x402") {
       if (!deps.x402Server) {
         const reason = deps.x402InitError ? `x402 facilitator initialization failed: ${deps.x402InitError}` : "x402 server not initialized \u2014 ensure @x402/core, @x402/evm, and @coinbase/x402 are installed";
         console.error(`[router] ${routeEntry.key}: ${reason}`);
-        return fail(500, reason, meta, pluginCtx);
+        return fail(500, reason, meta, pluginCtx, body.data);
       }
       const payTo = await resolvePayTo(routeEntry, request, deps.payeeAddress);
       const verify = await verifyX402Payment(
@@ -835,17 +834,17 @@ function createRequestHandler(routeEntry, handler, deps) {
             message: `Settlement failed: ${err instanceof Error ? err.message : String(err)}`,
             route: routeEntry.key
           });
-          return fail(500, "Settlement failed", meta, pluginCtx);
+          return fail(500, "Settlement failed", meta, pluginCtx, body.data);
         }
       }
-      finalize(response, rawResult, meta, pluginCtx);
+      finalize(response, rawResult, meta, pluginCtx, body.data);
       return response;
     }
     if (protocol === "mpp") {
       if (!deps.mppx) {
         const reason = deps.mppInitError ? `MPP initialization failed: ${deps.mppInitError}` : "MPP not initialized \u2014 ensure mppx is installed and mpp config (secretKey, currency, recipient) is correct";
         console.error(`[router] ${routeEntry.key}: ${reason}`);
-        return fail(500, reason, meta, pluginCtx);
+        return fail(500, reason, meta, pluginCtx, body.data);
       }
       let mppResult;
       try {
@@ -858,7 +857,7 @@ function createRequestHandler(routeEntry, handler, deps) {
           message: `MPP charge failed: ${message}`,
           route: routeEntry.key
         });
-        return fail(500, `MPP payment processing failed: ${message}`, meta, pluginCtx);
+        return fail(500, `MPP payment processing failed: ${message}`, meta, pluginCtx, body.data);
       }
       if (mppResult.status === 402) {
         console.warn(
@@ -890,10 +889,10 @@ function createRequestHandler(routeEntry, handler, deps) {
       );
       if (response.status < 400) {
         const receiptResponse = mppResult.withReceipt(response);
-        finalize(receiptResponse, rawResult, meta, pluginCtx);
+        finalize(receiptResponse, rawResult, meta, pluginCtx, body.data);
         return receiptResponse;
       }
-      finalize(response, rawResult, meta, pluginCtx);
+      finalize(response, rawResult, meta, pluginCtx, body.data);
       return response;
     }
     return await build402(request, routeEntry, deps, meta, pluginCtx);
@@ -1056,13 +1055,15 @@ async function build402(request, routeEntry, deps, meta, pluginCtx, bodyData) {
   firePluginResponse(deps, pluginCtx, meta, response);
   return response;
 }
-function firePluginResponse(deps, pluginCtx, meta, response) {
+function firePluginResponse(deps, pluginCtx, meta, response, requestBody, responseBody) {
   firePluginHook(deps.plugin, "onResponse", pluginCtx, {
     statusCode: response.status,
     statusText: response.statusText,
     duration: Date.now() - meta.startTime,
     contentType: response.headers.get("content-type"),
-    headers: Object.fromEntries(response.headers.entries())
+    headers: Object.fromEntries(response.headers.entries()),
+    requestBody,
+    responseBody
   });
   if (response.status >= 400 && response.status !== 402) {
     firePluginHook(deps.plugin, "onError", pluginCtx, {

package/dist/index.d.cts

@@ -89,6 +89,10 @@ interface ResponseMeta {
     duration: number;
     contentType: string | null;
     headers: Record<string, string>;
+    /** Parsed request body (when .body() was used). undefined when no body was parsed. */
+    requestBody?: unknown;
+    /** Handler return value. undefined for raw Response returns (streams) or error paths. */
+    responseBody?: unknown;
 }
 interface ErrorEvent {
     status: number;

package/dist/index.d.ts

@@ -89,6 +89,10 @@ interface ResponseMeta {
     duration: number;
     contentType: string | null;
     headers: Record<string, string>;
+    /** Parsed request body (when .body() was used). undefined when no body was parsed. */
+    requestBody?: unknown;
+    /** Handler return value. undefined for raw Response returns (streams) or error paths. */
+    responseBody?: unknown;
 }
 interface ErrorEvent {
     status: number;

package/dist/index.js

@@ -345,7 +345,8 @@ async function buildX402Challenge(server, routeEntry, request, price, payeeAddre
   const resource = {
     url: request.url,
     method: routeEntry.method,
-    description: routeEntry.description
+    description: routeEntry.description,
+    mimeType: "application/json"
   };
   const requirements = await server.buildPaymentRequirementsFromOptions([options], {
     request
@@ -499,13 +500,13 @@ function createRequestHandler(routeEntry, handler, deps) {
     }, ctx);
     return { response, rawResult };
   }
-  function finalize(response, rawResult, meta, pluginCtx) {
+  function finalize(response, rawResult, meta, pluginCtx, requestBody) {
     fireProviderQuota(routeEntry, response, rawResult, deps, pluginCtx);
-    firePluginResponse(deps, pluginCtx, meta, response);
+    firePluginResponse(deps, pluginCtx, meta, response, requestBody, rawResult);
   }
-  function fail(status, message, meta, pluginCtx) {
+  function fail(status, message, meta, pluginCtx, requestBody) {
     const response = NextResponse2.json({ success: false, error: message }, { status });
-    firePluginResponse(deps, pluginCtx, meta, response);
+    firePluginResponse(deps, pluginCtx, meta, response, requestBody);
     return response;
   }
   return async (request) => {
@@ -524,7 +525,7 @@ function createRequestHandler(routeEntry, handler, deps) {
         } catch (err) {
           const status = err.status ?? 400;
           const message = err instanceof Error ? err.message : "Validation failed";
-          return fail(status, message, meta, pluginCtx);
+          return fail(status, message, meta, pluginCtx, body2.data);
         }
       }
       const { response, rawResult } = await invoke(
@@ -535,7 +536,7 @@ function createRequestHandler(routeEntry, handler, deps) {
         account2,
         body2.data
       );
-      finalize(response, rawResult, meta, pluginCtx);
+      finalize(response, rawResult, meta, pluginCtx, body2.data);
       return response;
     }
     if (routeEntry.authMode === "unprotected") {
@@ -568,18 +569,16 @@ function createRequestHandler(routeEntry, handler, deps) {
     if (needsEarlyParse) {
       const requestForPricing = request.clone();
       const earlyBodyResult = await parseBody(requestForPricing, routeEntry);
-      if (!earlyBodyResult.ok) {
-        firePluginResponse(deps, pluginCtx, meta, earlyBodyResult.response);
-        return earlyBodyResult.response;
-      }
-      earlyBodyData = earlyBodyResult.data;
-      if (routeEntry.validateFn) {
-        try {
-          await routeEntry.validateFn(earlyBodyData);
-        } catch (err) {
-          const status = err.status ?? 400;
-          const message = err instanceof Error ? err.message : "Validation failed";
-          return fail(status, message, meta, pluginCtx);
+      if (earlyBodyResult.ok) {
+        earlyBodyData = earlyBodyResult.data;
+        if (routeEntry.validateFn) {
+          try {
+            await routeEntry.validateFn(earlyBodyData);
+          } catch (err) {
+            const status = err.status ?? 400;
+            const message = err instanceof Error ? err.message : "Validation failed";
+            return fail(status, message, meta, pluginCtx, earlyBodyData);
+          }
         }
       }
     }
@@ -587,16 +586,14 @@ function createRequestHandler(routeEntry, handler, deps) {
       if (routeEntry.validateFn && routeEntry.bodySchema && !request.headers.get("SIGN-IN-WITH-X")) {
         const requestForValidation = request.clone();
         const earlyBodyResult = await parseBody(requestForValidation, routeEntry);
-        if (!earlyBodyResult.ok) {
-          firePluginResponse(deps, pluginCtx, meta, earlyBodyResult.response);
-          return earlyBodyResult.response;
-        }
-        try {
-          await routeEntry.validateFn(earlyBodyResult.data);
-        } catch (err) {
-          const status = err.status ?? 400;
-          const message = err instanceof Error ? err.message : "Validation failed";
-          return fail(status, message, meta, pluginCtx);
+        if (earlyBodyResult.ok) {
+          try {
+            await routeEntry.validateFn(earlyBodyResult.data);
+          } catch (err) {
+            const status = err.status ?? 400;
+            const message = err instanceof Error ? err.message : "Validation failed";
+            return fail(status, message, meta, pluginCtx, earlyBodyResult.data);
+          }
         }
       }
       if (!request.headers.get("SIGN-IN-WITH-X")) {
@@ -702,7 +699,7 @@ function createRequestHandler(routeEntry, handler, deps) {
       } catch (err) {
         const status = err.status ?? 400;
         const message = err instanceof Error ? err.message : "Validation failed";
-        return fail(status, message, meta, pluginCtx);
+        return fail(status, message, meta, pluginCtx, body.data);
       }
     }
     let price;
@@ -713,7 +710,8 @@ function createRequestHandler(routeEntry, handler, deps) {
         err.status ?? 500,
         err instanceof Error ? err.message : "Price resolution failed",
         meta,
-        pluginCtx
+        pluginCtx,
+        body.data
       );
     }
     if (!routeEntry.protocols.includes(protocol)) {
@@ -725,14 +723,15 @@ function createRequestHandler(routeEntry, handler, deps) {
         400,
         `This route does not accept ${protocol} payments. Accepted protocols: ${accepted}`,
         meta,
-        pluginCtx
+        pluginCtx,
+        body.data
       );
     }
     if (protocol === "x402") {
       if (!deps.x402Server) {
         const reason = deps.x402InitError ? `x402 facilitator initialization failed: ${deps.x402InitError}` : "x402 server not initialized \u2014 ensure @x402/core, @x402/evm, and @coinbase/x402 are installed";
         console.error(`[router] ${routeEntry.key}: ${reason}`);
-        return fail(500, reason, meta, pluginCtx);
+        return fail(500, reason, meta, pluginCtx, body.data);
       }
       const payTo = await resolvePayTo(routeEntry, request, deps.payeeAddress);
       const verify = await verifyX402Payment(
@@ -798,17 +797,17 @@ function createRequestHandler(routeEntry, handler, deps) {
             message: `Settlement failed: ${err instanceof Error ? err.message : String(err)}`,
             route: routeEntry.key
           });
-          return fail(500, "Settlement failed", meta, pluginCtx);
+          return fail(500, "Settlement failed", meta, pluginCtx, body.data);
         }
       }
-      finalize(response, rawResult, meta, pluginCtx);
+      finalize(response, rawResult, meta, pluginCtx, body.data);
       return response;
     }
     if (protocol === "mpp") {
       if (!deps.mppx) {
         const reason = deps.mppInitError ? `MPP initialization failed: ${deps.mppInitError}` : "MPP not initialized \u2014 ensure mppx is installed and mpp config (secretKey, currency, recipient) is correct";
         console.error(`[router] ${routeEntry.key}: ${reason}`);
-        return fail(500, reason, meta, pluginCtx);
+        return fail(500, reason, meta, pluginCtx, body.data);
       }
       let mppResult;
       try {
@@ -821,7 +820,7 @@ function createRequestHandler(routeEntry, handler, deps) {
           message: `MPP charge failed: ${message}`,
           route: routeEntry.key
         });
-        return fail(500, `MPP payment processing failed: ${message}`, meta, pluginCtx);
+        return fail(500, `MPP payment processing failed: ${message}`, meta, pluginCtx, body.data);
       }
       if (mppResult.status === 402) {
         console.warn(
@@ -853,10 +852,10 @@ function createRequestHandler(routeEntry, handler, deps) {
       );
       if (response.status < 400) {
         const receiptResponse = mppResult.withReceipt(response);
-        finalize(receiptResponse, rawResult, meta, pluginCtx);
+        finalize(receiptResponse, rawResult, meta, pluginCtx, body.data);
         return receiptResponse;
       }
-      finalize(response, rawResult, meta, pluginCtx);
+      finalize(response, rawResult, meta, pluginCtx, body.data);
       return response;
     }
     return await build402(request, routeEntry, deps, meta, pluginCtx);
@@ -1019,13 +1018,15 @@ async function build402(request, routeEntry, deps, meta, pluginCtx, bodyData) {
   firePluginResponse(deps, pluginCtx, meta, response);
   return response;
 }
-function firePluginResponse(deps, pluginCtx, meta, response) {
+function firePluginResponse(deps, pluginCtx, meta, response, requestBody, responseBody) {
   firePluginHook(deps.plugin, "onResponse", pluginCtx, {
     statusCode: response.status,
     statusText: response.statusText,
     duration: Date.now() - meta.startTime,
     contentType: response.headers.get("content-type"),
-    headers: Object.fromEntries(response.headers.entries())
+    headers: Object.fromEntries(response.headers.entries()),
+    requestBody,
+    responseBody
   });
   if (response.status >= 400 && response.status !== 402) {
     firePluginHook(deps.plugin, "onError", pluginCtx, {

package/package.json

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