agent402-tollbooth 0.10.7 → 0.11.0

package/README.md

@@ -186,7 +186,7 @@ import { ExactEvmScheme } from "@x402/evm/exact/server";
 const server = new x402ResourceServer(new HTTPFacilitatorClient({ url: "https://x402.org/facilitator" }))
   .register("eip155:8453", new ExactEvmScheme());
 const x402 = paymentMiddleware(
-  { "GET /*": { accepts: [{ scheme: "exact", network: "eip155:8453", price: "$0.001", payTo: "0xYourWallet" }] } },
+  { "/*": { accepts: [{ scheme: "exact", network: "eip155:8453", price: "$0.001", payTo: "0xYourWallet" }] } },
   server,
 );
 
@@ -211,6 +211,13 @@ What you get on every charged request:
   with the reference client - proven in the parent repo's CI by a real mppx
   purchase through this package.
 - **Proof-of-work first**, unchanged: a walletless agent always has a free path.
+- **Only a taken payment opens the gate.** The middleware calls `next()` for a
+  request it does not price (a method or path outside its routes, OPTIONS on a
+  wildcard). A charged request passes only when it carries a payment and the
+  middleware took it (it buffered the response to settle after the handler, or
+  set a settlement header); anything else gets the gate's 402. Price every
+  method you serve in the middleware's routes (`"/*"` covers every method
+  except OPTIONS).
 
 Set a stable `TOLLBOOTH_SECRET` (or `mppSecret`) so MPP challenge ids verify
 across workers - the same caveat as proof-of-work tokens.
@@ -586,6 +593,22 @@ as drop-in copyable snippets.
   stop relying on detection entirely, use `mode: "all"` / `mode: "strict"`, and
   turn on `adaptive` so high-volume abuse pays escalating proof-of-work.
 
+## Upgrading from 0.10.8 or earlier
+
+In x402 middleware mode, a request the gate charges now needs a payment the
+middleware took. Before, when the middleware did not price the request's method
+it called `next()` and the request passed through unpaid; now it gets the
+gate's 402. With only `"GET /*"` priced, for example, a charged POST, PUT or
+DELETE was served free before and is refused now.
+
+- **Price every method you serve.** `"/*"` prices every method except OPTIONS;
+  list explicit routes (`"POST /*"`, `"PUT /*"`, ...) when a method needs its
+  own price.
+- **OPTIONS:** the middleware's `"/*"` never matches it, so a charged OPTIONS
+  request gets the 402. Price it with an explicit `"OPTIONS /*"` route, or keep
+  it out of the charge with a `charge(req)` predicate.
+- The reverse proxy CLI already prices `"/*"` and needs no change.
+
 ## Notes
 
 - Proof-of-work tokens are HMAC-signed, expiry-checked, single-use, and bound to

package/edge.js

@@ -225,7 +225,7 @@ export function createEdgeTollbooth(config = {}) {
     const resource = origin + u.pathname + u.search;
     // Additionally bind the HTTP METHOD in the PoW challenge (x402 `resource`
     // stays a plain URL for wire compatibility).
-    const powResource = `${request.method || "GET"} ${resource}`;
+    const powResource = `${String(request.method || "GET").toUpperCase()} ${resource}`;
 
     // An x402 payment presented on either header name. @x402/core emits
     // PAYMENT-SIGNATURE while older clients send X-PAYMENT, and a gate that

package/index.js

@@ -507,7 +507,24 @@ export function createTollbooth(config = {}) {
       res.json = guard(realJson);
       res.send = guard(realSend);
       res.end = guard(realEnd);
+      const guardedEnd = res.end;
+      // The middleware calls next() for a request it does not price at all
+      // (@x402/express: a method or path outside its routes, OPTIONS on a
+      // wildcard), not only for a verified payment. This gate has already
+      // decided the request pays, so next() grants only with a payment on the
+      // request AND evidence the middleware took it: it buffered the response
+      // to settle after the handler (res.end wrapped), or set a settlement
+      // header already. Anything else is answered with the gate's 402.
+      const credentialSent = !!(req.headers["payment-signature"] || req.headers["x-payment"]);
+      const paymentTaken = () => res.end !== guardedEnd
+        || !!(res.getHeader("PAYMENT-RESPONSE") || res.getHeader("X-PAYMENT-RESPONSE"));
       const grant = () => {
+        if (!credentialSent || !paymentTaken()) {
+          if (granted || res.headersSent) return undefined;
+          restore();
+          res.setHeader("X-Tollbooth-Error", credentialSent ? "x402-payment-not-taken" : "x402-route-not-priced");
+          return send402();
+        }
         granted = true;
         intercepting = false;
         incr(viaMpp ? "mppPaid" : "x402Paid");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent402-tollbooth",
-  "version": "0.10.7",
+  "version": "0.11.0",
   "description": "Agent402 tollbooth: open-source, self-hostable pay-per-crawl for x402 AND MPP (the sell side of Agentic Finance): charge AI bots per request (USDC via x402, or MPP - the Machine Payments Protocol - through the same settlement, or USDG on Robinhood Chain, or free proof-of-work) while humans browse free. Drop-in Express middleware or reverse proxy that settles both wires from env alone, on your own server with no account or signup.",
   "type": "module",
   "main": "index.js",
@@ -53,10 +53,10 @@
     "express": "^5.0.0"
   },
   "peerDependencies": {
-    "@coinbase/x402": ">=2.0.0",
-    "@x402/core": ">=2.0.0",
-    "@x402/evm": ">=2.0.0",
-    "@x402/express": ">=2.0.0"
+    "@coinbase/x402": ">=2.0.0 <3",
+    "@x402/core": ">=2.0.0 <3",
+    "@x402/evm": ">=2.0.0 <3",
+    "@x402/express": ">=2.0.0 <3"
   },
   "peerDependenciesMeta": {
     "@coinbase/x402": {