@bankofai/x402-cli 1.0.1-beta.1 → 1.0.1-beta.3

package/README.md

@@ -3,9 +3,9 @@
 TypeScript command-line client for BankofAI x402 payments. This version uses
 the npm TypeScript SDK packages only:
 
-- `@bankofai/x402-core@1.0.1-beta.2`
-- `@bankofai/x402-evm@1.0.1-beta.2`
-- `@bankofai/x402-tron@1.0.1-beta.2`
+- `@bankofai/x402-core@1.0.1-beta.4`
+- `@bankofai/x402-evm@1.0.1-beta.4`
+- `@bankofai/x402-tron@1.0.1-beta.4`
 
 Stablecoin payments support `scheme=exact` and TRON `scheme=exact_gasfree`.
 The GasFree flow lets the relayer pay network energy while deducting its fee
@@ -21,7 +21,7 @@ npm run build
 Run from source during development:
 
 ```bash
-npm run dev -- serve --pay-to <recipient> --amount 0.0001 --network tron:nile --token USDT
+npm run dev -- serve --pay-to <recipient> --amount 0.0001 --network tron:0xcd8690dc --token USDT
 ```
 
 Run the compiled CLI:
@@ -52,7 +52,7 @@ Start a local x402 paywall endpoint:
 node dist/cli.js serve \
   --pay-to <recipient> \
   --amount 0.0001 \
-  --network tron:nile \
+  --network tron:0xcd8690dc \
   --token USDT \
   --port 4020
 ```
@@ -71,7 +71,7 @@ Pay an x402-protected URL:
 ```bash
 TRON_PRIVATE_KEY=<hex> \
 node dist/cli.js pay http://127.0.0.1:4020/pay \
-  --network tron:nile \
+  --network tron:0xcd8690dc \
   --token USDT
 ```
 
@@ -81,7 +81,7 @@ the server challenge):
 ```bash
 TRON_PRIVATE_KEY=<hex> \
 node dist/cli.js pay https://api.example.com/pay \
-  --network tron:nile \
+  --network tron:0xcd8690dc \
   --token USDT \
   --scheme exact_gasfree
 ```
@@ -100,7 +100,7 @@ TRON_PRIVATE_KEY=<hex> \
 node dist/cli.js roundtrip \
   --pay-to <recipient> \
   --amount 0.0001 \
-  --network tron:nile \
+  --network tron:0xcd8690dc \
   --token USDT
 ```
 
@@ -108,16 +108,17 @@ node dist/cli.js roundtrip \
 
 Supported built-in token registry:
 
-- `tron:mainnet` USDT, USDD
-- `tron:nile` USDT, USDD
-- `tron:shasta` USDT
+- `tron:0x2b6653dc` USDT, USDD
+- `tron:0xcd8690dc` USDT, USDD
+- `tron:0x94a9059e` USDT
 - `eip155:56` USDT
 - `eip155:97` USDT, USDC
 
-Aliases accepted:
+Legacy aliases remain accepted for backward compatibility, but new commands and
+configuration should use the canonical IDs above:
 
-- `tron-mainnet` -> `tron:mainnet`
-- `tron-nile` -> `tron:nile`
+- `tron-mainnet` -> `tron:0x2b6653dc`
+- `tron-nile` -> `tron:0xcd8690dc`
 - `bsc-mainnet` -> `eip155:56`
 - `bsc-testnet` -> `eip155:97`
 

package/dist/cli.js

@@ -335,7 +335,7 @@ Options:
   --pay-to <address>        Recipient wallet address
   --amount <amount>         Human-readable token amount (default: 0.0001)
   --raw-amount <amount>     Smallest-unit amount
-  --network <caip2>         Payment network (default: tron:nile)
+  --network <caip2>         Payment network (default: tron:0xcd8690dc)
   --scheme <scheme>         Payment scheme: exact or exact_gasfree (default: exact)
   --token <symbol>          Token symbol (default: USDT)
   --asset <address>         Explicit token address
@@ -349,7 +349,7 @@ Options:
   --json                    Print JSON envelope
 
 Examples:
-  x402-cli serve --pay-to T... --network tron:nile --token USDT
+  x402-cli serve --pay-to T... --network tron:0xcd8690dc --token USDT
   x402-cli serve --pay-to 0x... --network eip155:97 --token USDT --amount 0.0001
 `,
         roundtrip: `Usage:
@@ -968,7 +968,7 @@ async function catalogExportGateway(gatewayUrl, options) {
     emit({ command: "catalog export-gateway", mode: outputMode(options), result: { provider: providerFqn, catalog: catalogPath, payMd: payMdPath } });
 }
 function buildRequirement(options) {
-    const network = normalizeNetwork(opt(options, "network", "tron:nile"));
+    const network = normalizeNetwork(opt(options, "network", "tron:0xcd8690dc"));
     const scheme = opt(options, "scheme", "exact");
     if (!["exact", "exact_gasfree"].includes(scheme))
         throw new Error(`unsupported scheme ${scheme}`);
@@ -1202,6 +1202,11 @@ async function pay(url, options) {
         body: ["GET", "HEAD"].includes(method.toUpperCase()) ? undefined : opt(options, "body"),
     }, timeoutMs(options), `fetch ${url}`);
     if (probe.status !== 402) {
+        const body = await responsePayload(probe);
+        if (!probe.ok) {
+            const retryAfter = probe.headers.get("retry-after");
+            throw new Error(`HTTP ${probe.status} from ${url}${retryAfter ? ` (retry after ${retryAfter}s)` : ""}: ${typeof body === "string" ? body.slice(0, 500) : JSON.stringify(body).slice(0, 500)}`);
+        }
         emit({
             command: "client",
             mode: outputMode(options),
@@ -1209,7 +1214,7 @@ async function pay(url, options) {
                 url,
                 status: probe.status,
                 message: "Not a payment-required endpoint",
-                response: await responsePayload(probe),
+                response: body,
             },
         });
         return;
@@ -1260,7 +1265,8 @@ async function pay(url, options) {
         ...(paymentResponse ? { paymentResponse: decodeResponse(paymentResponse) } : {}),
     };
     if (!paid.ok) {
-        throw new Error(`HTTP ${paid.status} from ${url}: ${typeof body === "string" ? body.slice(0, 500) : JSON.stringify(body).slice(0, 500)}`);
+        const retryAfter = paid.headers.get("retry-after");
+        throw new Error(`HTTP ${paid.status} from ${url}${retryAfter ? ` (retry after ${retryAfter}s)` : ""}: ${typeof body === "string" ? body.slice(0, 500) : JSON.stringify(body).slice(0, 500)}`);
     }
     emit({
         command: "client",
@@ -1366,7 +1372,7 @@ routing:
   type: proxy
 
 operator:
-  network: tron-nile
+  network: tron:0xcd8690dc
   currencies:
     usd: ["USDT"]
   recipient: <provider-recipient-address>

package/dist/gateway/server.js

@@ -5,10 +5,12 @@ import { decodeSignature, encodeRequired, encodeResponse, headers, matchRequirem
 class HttpError extends Error {
     status;
     publicMessage;
-    constructor(status, publicMessage, message = publicMessage) {
+    responseHeaders;
+    constructor(status, publicMessage, message = publicMessage, responseHeaders = {}) {
         super(message);
         this.status = status;
         this.publicMessage = publicMessage;
+        this.responseHeaders = responseHeaders;
     }
 }
 class RequestTooLargeError extends HttpError {
@@ -102,10 +104,21 @@ async function facilitatorPost(entry, path, body) {
     }
     if (!response.ok) {
         logFacilitatorFailure(entry, path, response, body, data);
+        if (response.status === 429) {
+            const retryAfter = response.headers.get("retry-after");
+            throw new HttpError(429, "facilitator rate limited", `facilitator ${path} rate limited`, retryAfter ? { "retry-after": retryAfter } : {});
+        }
         throw new HttpError(502, "facilitator request failed", `facilitator ${path} failed: ${response.status}`);
     }
     return data;
 }
+function resourceUrl(url) {
+    const path = `${url.pathname}${url.search}`;
+    const publicBaseUrl = process.env.X402_GATEWAY_PUBLIC_BASE_URL?.trim();
+    if (!publicBaseUrl)
+        return path;
+    return new URL(path, `${publicBaseUrl.replace(/\/+$/, "")}/`).toString();
+}
 function logFacilitatorFailure(entry, path, response, body, data) {
     const requirement = body?.paymentRequirements;
     const nestedError = data?.error && typeof data.error === "object" ? data.error : undefined;
@@ -298,7 +311,7 @@ export function createGatewayServer(providers) {
                 const challenge = {
                     x402Version: 2,
                     error: "Payment required",
-                    resource: { url: url.pathname },
+                    resource: { url: resourceUrl(url) },
                     accepts,
                 };
                 json(response, 402, challenge, { [headers.required]: encodeRequired(challenge) });
@@ -347,7 +360,7 @@ export function createGatewayServer(providers) {
         }
         catch (error) {
             if (error instanceof HttpError) {
-                json(response, error.status, { error: error.publicMessage });
+                json(response, error.status, { error: error.publicMessage }, error.responseHeaders);
                 return;
             }
             console.error(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bankofai/x402-cli",
-  "version": "1.0.1-beta.1",
+  "version": "1.0.1-beta.3",
   "type": "module",
   "files": [
     "dist"
@@ -22,7 +22,7 @@
   "dependencies": {
     "@bankofai/x402-core": "1.0.1-beta.4",
     "@bankofai/x402-evm": "1.0.1-beta.4",
-    "@bankofai/x402-gateway": "1.0.1-beta.1",
+    "@bankofai/x402-gateway": "1.0.1-beta.3",
     "@bankofai/x402-tron": "1.0.1-beta.4",
     "tronweb": "6.4.0",
     "viem": "^2.55.0",