@parallel-protocol/x402 0.6.0 → 0.7.0

package/dist/{chunk-K6QETMQA.cjs → chunk-POU7EH3E.cjs}

@@ -1,29 +1,53 @@
 'use strict';
 
-var zod = require('zod');
+var chunkJPMK5YBU_cjs = require('./chunk-JPMK5YBU.cjs');
 var chains = require('@parallel-protocol/chains');
+var zod = require('zod');
 
-// src/errors.ts
-var X402_ERROR_CODES = {
-  FACILITATOR_UNAVAILABLE: "FACILITATOR_UNAVAILABLE",
-  FACILITATOR_INVALID_RESPONSE: "FACILITATOR_INVALID_RESPONSE",
-  INVALID_PAYMENT: "INVALID_PAYMENT"
-};
-var X402ConfigError = class extends Error {
-  constructor(message, cause) {
-    super(message);
-    this.name = "X402ConfigError";
-    this.cause = cause;
-  }
-};
-var X402RuntimeError = class extends Error {
-  constructor(code) {
-    super(code);
-    this.code = code;
-    this.name = "X402RuntimeError";
+var PARALLEL_TOKENS = {
+  ethereum: {
+    usdp: "0x9B3a8f7CEC208e247d97dEE13313690977e24459",
+    susdp: "0xd3a452B305C8285c0Dd7b8537665c734d3D279eF",
+    usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+    frxUSD: "0xCAcd6fd266aF91b8AeD52aCCc382b4e165586E29",
+    sfrxUSD: "0xcf62F905562626CfcDD2261162a51fd02Fc9c5b6",
+    USDe: "0x4c9EDD5852cd905f086C759E8383e09bff1E68B3",
+    sUSDe: "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497"
+  },
+  base: {
+    usdp: "0x76A9A0062ec6712b99B4f63bD2b4270185759dd5",
+    susdp: "0x472eD57b376fE400259FB28e5C46eB53f0E3e7E7",
+    usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    USDS: "0x820C137fa70C8691f0e44Dc420a5e53c168921Dc",
+    sUSDS: "0x5875eEE11Cf8398102FdAd704C9E96607675467a"
+  },
+  avalanche: {
+    usdp: "0x9eE1963f05553eF838604Dd39403be21ceF26AA4",
+    susdp: "0x9d92c21205383651610f90722131655a5b8ed3e0",
+    usdc: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+    ygamiUSDC: "0x9fD32FD5e32C6B95483d36C5E724C5C5250Ce010"
+  },
+  hyperevm: {
+    usdp: "0xBE65F0F410A72BeC163dC65d46c83699e957D588",
+    susdp: "0x9B3a8f7CEC208e247d97dEE13313690977e24459",
+    usdc: "0xb88339cb7199b77e23db6e890353e22632ba630f",
+    USDe: "0x5d3a1Ff2b6BAb83b63cd9AD0787074081a52ef34",
+    sUSDe: "0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2"
   }
-  code;
 };
+function getDefaultAcceptedTokens(network) {
+  const entry = PARALLEL_TOKENS[network];
+  if (!entry) return void 0;
+  return [entry.usdp, entry.usdc, entry.susdp];
+}
+function getMeteredAcceptedTokens(network) {
+  const entry = PARALLEL_TOKENS[network];
+  if (!entry) return void 0;
+  return [entry.usdp];
+}
+function getTokenDecimals(network, address) {
+  return chains.getTokenDecimals(network, address);
+}
 
 // src/utils.ts
 var EIP155_NETWORKS = {
@@ -47,6 +71,28 @@ function parsePrice(price, decimals = 18) {
     `Invalid price format: "${price}". Expected "0.01" or a bigint.`
   );
 }
+function isJsonContentType(contentType) {
+  return /^application\/(?:[\w.-]+\+)?json(?:\s*;.*)?$/i.test(
+    contentType?.trim() ?? ""
+  );
+}
+function parseJsonBody(contentType, text) {
+  if (text === void 0 || !isJsonContentType(contentType)) return void 0;
+  try {
+    return JSON.parse(text);
+  } catch {
+    return void 0;
+  }
+}
+async function jsonFromResponse(res) {
+  const contentType = res.headers.get("content-type") ?? void 0;
+  if (!isJsonContentType(contentType)) return void 0;
+  try {
+    return parseJsonBody(contentType, await res.clone().text());
+  } catch {
+    return void 0;
+  }
+}
 function validateAddress(address) {
   return /^0x[0-9a-fA-F]{40}$/.test(address);
 }
@@ -76,7 +122,12 @@ var ethereumAddressSchema = zod.z.string().regex(/^0x[0-9a-fA-F]{40}$/, "Invalid
 var txHashSchema = zod.z.string().regex(/^0x[0-9a-fA-F]{64}$/);
 var priceSchema = zod.z.union([
   zod.z.bigint().positive("Price must be greater than 0"),
-  zod.z.string().regex(/^\d+(?:\.\d+)?$/, 'Price must be in format "0.01"').refine((price) => Number(price) > 0, "Price must be greater than 0")
+  zod.z.string().regex(/^\d+(?:\.\d+)?$/, 'Price must be in format "0.01"').refine((price) => Number(price) > 0, "Price must be greater than 0"),
+  // A per-request price function; its return value is checked per request.
+  zod.z.custom(
+    (value) => typeof value === "function",
+    "Price must be a string, a bigint or a function of the request"
+  )
 ]);
 var facilitatorConfigSchema = zod.z.object({
   url: zod.z.string().refine((v) => URL.canParse(v), "Invalid facilitator URL"),
@@ -90,11 +141,25 @@ var routeConfigSchema = zod.z.object({
   acceptedTokens: zod.z.array(ethereumAddressSchema).optional(),
   description: zod.z.string().optional(),
   scheme: zod.z.enum(["exact", "upto"]).optional(),
-  maxTimeoutSeconds: zod.z.number().int().positive().optional()
+  maxTimeoutSeconds: zod.z.number().int().positive().optional(),
+  meter: zod.z.custom(
+    (value) => typeof value === "function",
+    "meter must be a function of the response"
+  ).optional()
 }).refine(
+  (route) => route.meter === void 0 || route.scheme === "upto",
+  "meter only applies to upto routes"
+).refine(
   (route) => route.scheme !== "upto" || (route.maxTimeoutSeconds ?? 300) <= UPTO_MAX_TIMEOUT_SECONDS,
   `maxTimeoutSeconds must be at most ${UPTO_MAX_TIMEOUT_SECONDS} on an upto route`
-);
+).refine((route) => {
+  if (route.scheme !== "upto" || !route.acceptedTokens?.length) return true;
+  const usdp = PARALLEL_TOKENS[route.network]?.usdp;
+  if (!usdp) return true;
+  return route.acceptedTokens.every(
+    (token) => token.toLowerCase() === usdp.toLowerCase()
+  );
+}, "acceptedTokens on an upto route may only list the network's USDp");
 var paymentMiddlewareConfigSchema = zod.z.object({
   facilitator: facilitatorConfigSchema,
   routes: zod.z.record(zod.z.string(), routeConfigSchema).refine((r) => Object.keys(r).length > 0, "At least one route is required")
@@ -144,7 +209,7 @@ function decodePaymentHeader(paymentHeader) {
   try {
     return decodeBase64(paymentHeader);
   } catch {
-    throw new X402RuntimeError(X402_ERROR_CODES.INVALID_PAYMENT);
+    throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.INVALID_PAYMENT);
   }
 }
 var FacilitatorClient = class {
@@ -164,18 +229,18 @@ var FacilitatorClient = class {
       });
       if (!response.ok) {
         const errorBody = await response.json().catch(() => null);
-        const code = errorBody?.error ?? X402_ERROR_CODES.FACILITATOR_UNAVAILABLE;
-        throw new X402RuntimeError(code);
+        const code = errorBody?.error ?? chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_UNAVAILABLE;
+        throw new chunkJPMK5YBU_cjs.X402RuntimeError(code);
       }
       json = await response.json();
     } catch (e) {
-      if (e instanceof X402RuntimeError) throw e;
-      throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
+      if (e instanceof chunkJPMK5YBU_cjs.X402RuntimeError) throw e;
+      throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
     }
     try {
       verifyResponseSchema.parse(json);
     } catch {
-      throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_INVALID_RESPONSE);
+      throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_INVALID_RESPONSE);
     }
   }
   async settle(paymentHeader, paymentRequirements, options) {
@@ -203,8 +268,8 @@ var FacilitatorClient = class {
       }
       json = await response.json();
     } catch (e) {
-      if (e instanceof X402RuntimeError) throw e;
-      throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
+      if (e instanceof chunkJPMK5YBU_cjs.X402RuntimeError) throw e;
+      throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
     }
     try {
       const parsed = settleResponseSchema.parse(json);
@@ -226,7 +291,7 @@ var FacilitatorClient = class {
         error: { code: parsed.error, message: parsed.message }
       };
     } catch {
-      throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_INVALID_RESPONSE);
+      throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_INVALID_RESPONSE);
     }
   }
   async pay(paymentHeader) {
@@ -240,17 +305,17 @@ var FacilitatorClient = class {
         signal: AbortSignal.timeout(FACILITATOR_TIMEOUT_MS)
       });
       if (!response.ok) {
-        throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
+        throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
       }
       json = await response.json();
     } catch (e) {
-      if (e instanceof X402RuntimeError) throw e;
-      throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
+      if (e instanceof chunkJPMK5YBU_cjs.X402RuntimeError) throw e;
+      throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_UNAVAILABLE);
     }
     try {
       return facilitatorResponseSchema.parse(json);
     } catch {
-      throw new X402RuntimeError(X402_ERROR_CODES.FACILITATOR_INVALID_RESPONSE);
+      throw new chunkJPMK5YBU_cjs.X402RuntimeError(chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_INVALID_RESPONSE);
     }
   }
   buildHeaders() {
@@ -279,47 +344,41 @@ async function raceTimeout(promise, ms = HANDLER_TIMEOUT_MS) {
     clearTimeout(timer);
   }
 }
-var PARALLEL_TOKENS = {
-  ethereum: {
-    usdp: "0x9B3a8f7CEC208e247d97dEE13313690977e24459",
-    susdp: "0xd3a452B305C8285c0Dd7b8537665c734d3D279eF",
-    usdc: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    frxUSD: "0xCAcd6fd266aF91b8AeD52aCCc382b4e165586E29",
-    sfrxUSD: "0xcf62F905562626CfcDD2261162a51fd02Fc9c5b6",
-    USDe: "0x4c9EDD5852cd905f086C759E8383e09bff1E68B3",
-    sUSDe: "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497"
-  },
-  base: {
-    usdp: "0x76A9A0062ec6712b99B4f63bD2b4270185759dd5",
-    susdp: "0x472eD57b376fE400259FB28e5C46eB53f0E3e7E7",
-    usdc: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-    USDS: "0x820C137fa70C8691f0e44Dc420a5e53c168921Dc",
-    sUSDS: "0x5875eEE11Cf8398102FdAd704C9E96607675467a"
-  },
-  avalanche: {
-    usdp: "0x9eE1963f05553eF838604Dd39403be21ceF26AA4",
-    susdp: "0x9d92c21205383651610f90722131655a5b8ed3e0",
-    usdc: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
-    ygamiUSDC: "0x9fD32FD5e32C6B95483d36C5E724C5C5250Ce010"
-  },
-  hyperevm: {
-    usdp: "0xBE65F0F410A72BeC163dC65d46c83699e957D588",
-    susdp: "0x9B3a8f7CEC208e247d97dEE13313690977e24459",
-    usdc: "0xb88339cb7199b77e23db6e890353e22632ba630f",
-    USDe: "0x5d3a1Ff2b6BAb83b63cd9AD0787074081a52ef34",
-    sUSDe: "0x211Cc4DD073734dA055fbF44a2b4667d5E5fE5d2"
-  }
-};
-function getDefaultAcceptedTokens(network) {
-  const entry = PARALLEL_TOKENS[network];
-  if (!entry) return void 0;
-  return [entry.usdp, entry.usdc, entry.susdp];
-}
-function getTokenDecimals(network, address) {
-  return chains.getTokenDecimals(network, address);
-}
 
 // src/middleware.ts
+var PRICE_FORMAT = /^\d+(?:\.\d+)?$/;
+async function requestContext(adapter) {
+  return {
+    method: adapter.getMethod(),
+    path: adapter.getPath(),
+    url: adapter.getUrl(),
+    header: (name) => adapter.getHeader(name),
+    body: adapter.getBody ? await adapter.getBody() : void 0
+  };
+}
+async function resolvePrice(config, ctx) {
+  if (typeof config.price !== "function") return config.price;
+  if (!ctx) throw new chunkJPMK5YBU_cjs.X402ConfigError("A price function needs the request");
+  let price;
+  try {
+    price = await config.price(ctx);
+  } catch (cause) {
+    if (chunkJPMK5YBU_cjs.isPriceRejection(cause)) throw cause;
+    throw new chunkJPMK5YBU_cjs.X402ConfigError(
+      `The price function of route "${config.network}${ctx.path}" threw`,
+      cause
+    );
+  }
+  const valid = typeof price === "bigint" ? price > 0n : typeof price === "string" && PRICE_FORMAT.test(price) && Number(price) > 0;
+  if (!valid) {
+    throw new chunkJPMK5YBU_cjs.X402ConfigError(
+      `The price function of route "${config.network}${ctx.path}" returned ${JSON.stringify(
+        typeof price === "bigint" ? price.toString() : price
+      )} \u2014 expected a positive amount like "0.01" or a bigint`
+    );
+  }
+  return price;
+}
 var SETTLE_AMOUNT_HEADER = "payment-settle-amount";
 var DEFAULT_MAX_TIMEOUT_SECONDS = 300;
 function handlerTimeoutFor(config) {
@@ -348,26 +407,91 @@ var INVALID_SETTLE_AMOUNT_RESPONSE = {
   error: "INVALID_SETTLE_AMOUNT",
   message: `The handler set an invalid ${SETTLE_AMOUNT_HEADER} header \u2014 expected a decimal amount in token units, formatted like the route price and within the token's precision, at most the route price.`
 };
+var INVALID_METER_RESPONSE = {
+  error: "INVALID_SETTLE_AMOUNT",
+  message: "The route's meter function failed or returned something that is not an amount; the response was discarded and nothing was charged."
+};
+function invalidSettleAmountResponse(reason) {
+  return reason === "meter" ? INVALID_METER_RESPONSE : INVALID_SETTLE_AMOUNT_RESPONSE;
+}
+var AMOUNT_FORMAT = /^\d+(?:\.\d+)?$/;
+async function resolveCharge(verified, settleHeader, response) {
+  if (verified.meter) {
+    if (!verified.request) {
+      throw new chunkJPMK5YBU_cjs.X402ConfigError(
+        "A metered payment carries a meter but no request context"
+      );
+    }
+    let result;
+    try {
+      const body = await raceTimeout(
+        response.body(),
+        verified.handlerTimeoutMs
+      );
+      if (body === HANDLER_TIMEOUT) return { kind: "invalid", reason: "meter" };
+      result = await verified.meter({
+        status: response.status,
+        header: response.header,
+        body,
+        request: verified.request
+      });
+    } catch {
+      return { kind: "invalid", reason: "meter" };
+    }
+    if (result != null) {
+      let amount;
+      if (typeof result === "bigint") {
+        if (result < 0n) return { kind: "invalid", reason: "meter" };
+        amount = result;
+      } else if (typeof result === "string" && AMOUNT_FORMAT.test(result)) {
+        const fraction = result.split(".")[1] ?? "";
+        if (fraction.length > verified.decimals) {
+          return { kind: "invalid", reason: "meter" };
+        }
+        amount = parsePrice(result, verified.decimals);
+      } else {
+        return { kind: "invalid", reason: "meter" };
+      }
+      if (amount === 0n) return { kind: "skip" };
+      if (amount > verified.maxAmount) amount = verified.maxAmount;
+      return { kind: "settle", amount: amount.toString() };
+    }
+  }
+  return resolveSettleAmount(
+    settleHeader,
+    verified.maxAmount,
+    verified.decimals
+  );
+}
 function resolveAcceptedTokens(config) {
   if (config.acceptedTokens?.length) {
     return config.acceptedTokens;
   }
-  const defaults = getDefaultAcceptedTokens(config.network);
+  const defaults = config.scheme === "upto" ? getMeteredAcceptedTokens(config.network) : getDefaultAcceptedTokens(config.network);
   if (defaults) return defaults;
-  throw new X402ConfigError(
+  throw new chunkJPMK5YBU_cjs.X402ConfigError(
     `acceptedTokens is required for network "${config.network}" \u2014 no defaults available for this chain`
   );
 }
 function resolveDecimals(config, asset) {
   const decimals = config.decimals ?? getTokenDecimals(config.network, asset);
   if (decimals === void 0) {
-    throw new X402ConfigError(
+    throw new chunkJPMK5YBU_cjs.X402ConfigError(
       `Unknown decimals for token ${asset} on "${config.network}" \u2014 add it to the @parallel-protocol/chains catalog or set the route's \`decimals\` explicitly`
     );
   }
   return decimals;
 }
-function buildPaymentRequired(url, config, resolvedTokens) {
+function priceInUnits(price, decimals, asset) {
+  const units = parsePrice(price, decimals);
+  if (units === 0n) {
+    throw new chunkJPMK5YBU_cjs.X402ConfigError(
+      `Price ${typeof price === "bigint" ? price.toString() : `"${price}"`} is below the precision of token ${asset} (${decimals} decimals)`
+    );
+  }
+  return units.toString();
+}
+function buildPaymentRequired(url, config, resolvedTokens, price) {
   const network = toEip155Network(config.network);
   const accepts = resolvedTokens.map((asset) => {
     const decimals = resolveDecimals(config, asset);
@@ -375,7 +499,7 @@ function buildPaymentRequired(url, config, resolvedTokens) {
       scheme: config.scheme ?? "exact",
       network,
       asset,
-      amount: parsePrice(config.price, decimals).toString(),
+      amount: priceInUnits(price, decimals, asset),
       payTo: config.payTo,
       maxTimeoutSeconds: config.maxTimeoutSeconds ?? DEFAULT_MAX_TIMEOUT_SECONDS,
       extra: { decimals }
@@ -421,11 +545,11 @@ function resolveDeliveredAsset(header, config, resolvedTokens) {
   const lower = target?.toLowerCase();
   return resolvedTokens.find((token) => token.toLowerCase() === lower) ?? resolvedTokens[0];
 }
-function buildFacilitatorRequirements(config, asset) {
+function buildFacilitatorRequirements(config, asset, price) {
   const decimals = resolveDecimals(config, asset);
   const scheme = config.scheme ?? "exact";
   return {
-    maxAmountRequired: parsePrice(config.price, decimals).toString(),
+    maxAmountRequired: priceInUnits(price, decimals, asset),
     asset,
     payTo: config.payTo,
     network: config.network,
@@ -436,8 +560,13 @@ function buildFacilitatorRequirements(config, asset) {
     }
   };
 }
-function paymentRequiredResponse(url, config, resolvedTokens, error) {
-  const paymentRequired = buildPaymentRequired(url, config, resolvedTokens);
+function paymentRequiredResponse(url, config, resolvedTokens, price, error) {
+  const paymentRequired = buildPaymentRequired(
+    url,
+    config,
+    resolvedTokens,
+    price
+  );
   if (error) paymentRequired.error = error;
   return {
     status: 402,
@@ -453,7 +582,7 @@ function createPaymentGate(config) {
   try {
     paymentMiddlewareConfigSchema.parse(config);
   } catch (cause) {
-    throw new X402ConfigError(
+    throw new chunkJPMK5YBU_cjs.X402ConfigError(
       "Invalid paymentMiddleware config \u2014 check your routes, facilitator URL and payTo addresses",
       cause
     );
@@ -465,6 +594,22 @@ function createPaymentGate(config) {
     const routeConfig = matchRoute(adapter.getPath(), config.routes);
     if (!routeConfig) return { type: "pass" };
     const resolvedTokens = resolveAcceptedTokens(routeConfig);
+    let request = typeof routeConfig.price === "function" ? await requestContext(adapter) : void 0;
+    let price;
+    try {
+      price = await resolvePrice(routeConfig, request);
+    } catch (err) {
+      if (!chunkJPMK5YBU_cjs.isPriceRejection(err)) throw err;
+      const status = Number.isInteger(err.status) && err.status >= 400 && err.status <= 599 ? err.status : 400;
+      return {
+        type: "error",
+        result: {
+          status,
+          headers: { "Content-Type": "application/json" },
+          body: { error: err.code, message: err.message }
+        }
+      };
+    }
     const paymentHeader = adapter.getHeader("payment-signature") ?? adapter.getHeader("x-payment");
     if (!paymentHeader) {
       return {
@@ -472,7 +617,8 @@ function createPaymentGate(config) {
         result: paymentRequiredResponse(
           adapter.getUrl(),
           routeConfig,
-          resolvedTokens
+          resolvedTokens,
+          price
         )
       };
     }
@@ -481,21 +627,27 @@ function createPaymentGate(config) {
       routeConfig,
       resolvedTokens
     );
-    const requirements = buildFacilitatorRequirements(routeConfig, asset);
+    const requirements = buildFacilitatorRequirements(
+      routeConfig,
+      asset,
+      price
+    );
     try {
       await client.verify(paymentHeader, requirements);
     } catch (e) {
-      const code = e instanceof X402RuntimeError ? e.code : X402_ERROR_CODES.FACILITATOR_UNAVAILABLE;
+      const code = e instanceof chunkJPMK5YBU_cjs.X402RuntimeError ? e.code : chunkJPMK5YBU_cjs.X402_ERROR_CODES.FACILITATOR_UNAVAILABLE;
       return {
         type: "error",
         result: paymentRequiredResponse(
           adapter.getUrl(),
           routeConfig,
           resolvedTokens,
+          price,
           code
         )
       };
     }
+    if (routeConfig.meter && !request) request = await requestContext(adapter);
     return {
       type: "verified",
       scheme: routeConfig.scheme ?? "exact",
@@ -503,7 +655,8 @@ function createPaymentGate(config) {
       decimals: resolveDecimals(routeConfig, asset),
       handlerTimeoutMs: handlerTimeoutFor(routeConfig),
       // Exact routes keep the historical two-argument client call.
-      settle: (options) => options ? client.settle(paymentHeader, requirements, options) : client.settle(paymentHeader, requirements)
+      settle: (options) => options ? client.settle(paymentHeader, requirements, options) : client.settle(paymentHeader, requirements),
+      ...routeConfig.meter && { meter: routeConfig.meter, request }
     };
   };
 }
@@ -529,17 +682,17 @@ function createPaymentMiddleware(config) {
     if (handlerResult.status >= 200 && handlerResult.status < 300) {
       let settleOptions;
       if (gateResult.scheme === "upto") {
-        const resolved = resolveSettleAmount(
-          raw,
-          gateResult.maxAmount,
-          gateResult.decimals
-        );
+        const resolved = await resolveCharge(gateResult, raw, {
+          status: handlerResult.status,
+          header: (name) => handlerResult.getResponseHeader?.(name),
+          body: async () => handlerResult.getResponseBody?.()
+        });
         if (resolved.kind === "invalid") {
           handlerResult.discardResponse();
           return {
             status: 402,
             headers: { "Content-Type": "application/json" },
-            body: INVALID_SETTLE_AMOUNT_RESPONSE
+            body: invalidSettleAmountResponse(resolved.reason)
           };
         }
         if (resolved.kind === "skip") {
@@ -583,18 +736,20 @@ function createPaymentMiddleware(config) {
 
 exports.FacilitatorClient = FacilitatorClient;
 exports.HANDLER_TIMEOUT = HANDLER_TIMEOUT;
-exports.INVALID_SETTLE_AMOUNT_RESPONSE = INVALID_SETTLE_AMOUNT_RESPONSE;
 exports.PARALLEL_TOKENS = PARALLEL_TOKENS;
 exports.SETTLE_AMOUNT_HEADER = SETTLE_AMOUNT_HEADER;
-exports.X402ConfigError = X402ConfigError;
-exports.X402RuntimeError = X402RuntimeError;
-exports.X402_ERROR_CODES = X402_ERROR_CODES;
 exports.createPaymentGate = createPaymentGate;
 exports.createPaymentMiddleware = createPaymentMiddleware;
 exports.encodeBase64 = encodeBase64;
 exports.getDefaultAcceptedTokens = getDefaultAcceptedTokens;
+exports.invalidSettleAmountResponse = invalidSettleAmountResponse;
+exports.isJsonContentType = isJsonContentType;
+exports.jsonFromResponse = jsonFromResponse;
+exports.matchRoute = matchRoute;
+exports.parseJsonBody = parseJsonBody;
 exports.parsePrice = parsePrice;
 exports.raceTimeout = raceTimeout;
+exports.resolveCharge = resolveCharge;
 exports.resolveSettleAmount = resolveSettleAmount;
 exports.toEip155Network = toEip155Network;
 exports.validateAddress = validateAddress;

package/dist/express.cjs

@@ -1,12 +1,38 @@
 'use strict';
 
-var chunkK6QETMQA_cjs = require('./chunk-K6QETMQA.cjs');
+var chunkPOU7EH3E_cjs = require('./chunk-POU7EH3E.cjs');
+require('./chunk-JPMK5YBU.cjs');
 
 // src/express/adapter.ts
+function chunkBytes(args) {
+  const [chunk, encoding] = args;
+  if (typeof chunk === "string") {
+    return Buffer.from(
+      chunk,
+      typeof encoding === "string" ? encoding : "utf8"
+    );
+  }
+  if (chunk instanceof Uint8Array) return Buffer.from(chunk);
+  return void 0;
+}
 function headerValue(value) {
   if (value === void 0) return void 0;
   return Array.isArray(value) ? value[0] : String(value);
 }
+function writeHeadContentType(args) {
+  const headers = args.find((arg) => typeof arg === "object" && arg !== null);
+  if (!headers) return void 0;
+  if (Array.isArray(headers)) {
+    const index = headers.findIndex(
+      (entry, i) => i % 2 === 0 && typeof entry === "string" && entry.toLowerCase() === "content-type"
+    );
+    return index === -1 ? void 0 : headerValue(headers[index + 1]);
+  }
+  for (const [name, value] of Object.entries(headers)) {
+    if (name.toLowerCase() === "content-type") return headerValue(value);
+  }
+  return void 0;
+}
 var TIMEOUT_BODY = JSON.stringify({
   error: "HANDLER_TIMEOUT",
   message: "The resource handler did not respond in time."
@@ -33,6 +59,11 @@ var ExpressAdapter = class {
   getUrl() {
     return `${this.req.protocol}://${this.req.headers.host}${this.req.originalUrl}`;
   }
+  // Whatever a body parser mounted before this middleware left on `req.body`
+  // (`express.json()` for JSON); `undefined` when none ran.
+  async getBody() {
+    return this.req.body;
+  }
   async runHandler(options) {
     const res = this.res;
     const next = this.next;
@@ -77,8 +108,8 @@ var ExpressAdapter = class {
       return originalEnd(...args);
     });
     next();
-    const outcome = await chunkK6QETMQA_cjs.raceTimeout(endPromise, options?.timeoutMs);
-    if (outcome === chunkK6QETMQA_cjs.HANDLER_TIMEOUT) {
+    const outcome = await chunkPOU7EH3E_cjs.raceTimeout(endPromise, options?.timeoutMs);
+    if (outcome === chunkPOU7EH3E_cjs.HANDLER_TIMEOUT) {
       discarded = true;
       return {
         status: 504,
@@ -102,6 +133,24 @@ var ExpressAdapter = class {
       setResponseHeader: (name, value) => res.setHeader(name, value),
       getResponseHeader: (name) => headerValue(res.getHeader(name)),
       removeResponseHeader: (name) => res.removeHeader(name),
+      // The buffered chunks are the whole response: parse them when the
+      // handler declared JSON.
+      getResponseBody: async () => {
+        const bytes = [];
+        let contentType = headerValue(res.getHeader("content-type"));
+        for (const [method, args] of buffered) {
+          if (method === "writeHead") {
+            contentType ??= writeHeadContentType(args);
+            continue;
+          }
+          const chunk = chunkBytes(args);
+          if (chunk) bytes.push(chunk);
+        }
+        return chunkPOU7EH3E_cjs.parseJsonBody(
+          contentType,
+          Buffer.concat(bytes).toString("utf8")
+        );
+      },
       sendResponse: () => {
         settled = true;
         restore();
@@ -121,7 +170,7 @@ var ExpressAdapter = class {
 
 // src/express/index.ts
 function paymentMiddleware(config) {
-  const middleware = chunkK6QETMQA_cjs.createPaymentMiddleware(config);
+  const middleware = chunkPOU7EH3E_cjs.createPaymentMiddleware(config);
   return async (req, res, next) => {
     const result = await middleware(new ExpressAdapter(req, res, next));
     if ("pass" in result) {

package/dist/express.d.cts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from 'express';
-import { H as HTTPAdapter, R as RunHandlerOptions, a as RunHandlerResult, P as PaymentMiddlewareConfig } from './types-CBzm5CtM.cjs';
+import { H as HTTPAdapter, R as RunHandlerOptions, a as RunHandlerResult, P as PaymentMiddlewareConfig } from './types-q_gu5wjz.cjs';
 import 'viem';
 
 declare class ExpressAdapter implements HTTPAdapter {
@@ -11,6 +11,7 @@ declare class ExpressAdapter implements HTTPAdapter {
     getMethod(): string;
     getPath(): string;
     getUrl(): string;
+    getBody(): Promise<unknown>;
     runHandler(options?: RunHandlerOptions): Promise<RunHandlerResult>;
 }
 

package/dist/express.d.ts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from 'express';
-import { H as HTTPAdapter, R as RunHandlerOptions, a as RunHandlerResult, P as PaymentMiddlewareConfig } from './types-CBzm5CtM.js';
+import { H as HTTPAdapter, R as RunHandlerOptions, a as RunHandlerResult, P as PaymentMiddlewareConfig } from './types-q_gu5wjz.js';
 import 'viem';
 
 declare class ExpressAdapter implements HTTPAdapter {
@@ -11,6 +11,7 @@ declare class ExpressAdapter implements HTTPAdapter {
     getMethod(): string;
     getPath(): string;
     getUrl(): string;
+    getBody(): Promise<unknown>;
     runHandler(options?: RunHandlerOptions): Promise<RunHandlerResult>;
 }