@bankofai/x402-cli 1.0.0-beta.8 → 1.0.0-beta.9

package/dist/cli.js

@@ -12,6 +12,8 @@ import { createPaymentPayload, decodeRequired, decodeResponse, decodeSignature,
 import { assertRawAmount, findTokenByAddress, getToken, normalizeNetwork, toSmallestUnit } from "./tokens.js";
 const BOOLEAN_FLAGS = new Set(["daemon", "dry-run", "force", "help", "human", "include-blocked", "json", "raw", "version"]);
 const require = createRequire(import.meta.url);
+const DEFAULT_TIMEOUT_MS = 30_000;
+const CATALOG_UPDATE_RETRIES = 3;
 class CliError extends Error {
     code;
     hint;
@@ -263,7 +265,7 @@ function classify(error) {
             hint: "Increase the max amount flag only if this provider price is expected.",
         };
     }
-    if (lower.includes("failed to fetch") || lower.includes("fetch failed") || lower.includes("econnrefused")) {
+    if (lower.includes("failed to fetch") || lower.includes("fetch failed") || lower.includes("econnrefused") || lower.includes("timed out")) {
         return {
             code: "NETWORK_ERROR",
             message,
@@ -318,6 +320,7 @@ Options:
   --dry-run                 Read requirements but do not sign or pay
   --private-key <hex>       Explicit payer private key (or PRIVATE_KEY/TRON_PRIVATE_KEY/EVM_PRIVATE_KEY)
   --rpc-url <url>           Explicit network RPC URL
+  --timeout-ms <ms>         Network timeout in milliseconds (default: 30000)
   --json                    Print JSON envelope
 
 Examples:
@@ -339,6 +342,7 @@ Options:
   --port <port>             Bind port (default: 4020)
   --resource-url <url>      URL advertised in payment requirements
   --facilitator-url <url>   Facilitator base URL
+  --timeout-ms <ms>         Facilitator timeout in milliseconds (default: 30000)
   --daemon                  Run in background and print the child pid
   --json                    Print JSON envelope
 
@@ -385,6 +389,7 @@ Options:
   --provider <fqn>          Provider FQN for export-gateway
   --output-dir <dir>        Output directory for generated files
   -n, --limit <count>       Search result limit
+  --timeout-ms <ms>         Network timeout in milliseconds (default: 30000)
   --include-blocked         Include blocked providers in search
   --json                    Print JSON envelope
 `,
@@ -394,6 +399,7 @@ Options:
 Options:
   --catalog <source>        catalog.json path or URL
   -n, --limit <count>       Search result limit
+  --timeout-ms <ms>         Network timeout in milliseconds (default: 30000)
   --include-blocked         Include blocked providers in search
   --json                    Print JSON envelope
 `,
@@ -402,6 +408,7 @@ Options:
 
 Options:
   --catalog <source>        catalog.json path or URL
+  --timeout-ms <ms>         Network timeout in milliseconds (default: 30000)
   --json                    Print JSON envelope
 `,
         "catalog-pay-json": `Usage:
@@ -409,6 +416,7 @@ Options:
 
 Options:
   --catalog <source>        catalog.json path or URL
+  --timeout-ms <ms>         Network timeout in milliseconds (default: 30000)
   --raw                     Print raw pay payload instead of JSON envelope
   --json                    Print JSON envelope
 `,
@@ -417,6 +425,7 @@ Options:
 
 Options:
   --catalog <source>        catalog.json path or URL
+  --timeout-ms <ms>         Network timeout in milliseconds (default: 30000)
   --json                    Print JSON envelope
 `,
         "catalog-export-gateway": `Usage:
@@ -607,8 +616,8 @@ function scoreFields(terms, fields) {
     }
     return { score, matchedFields };
 }
-async function readCatalog(source) {
-    const text = await readText(source);
+async function readCatalog(source, options) {
+    const text = await readText(source, options);
     const parsed = JSON.parse(text);
     if (Array.isArray(parsed))
         return parsed;
@@ -618,24 +627,24 @@ async function readCatalog(source) {
         return parsed.items;
     return [];
 }
-async function readCatalogObject(source) {
-    const parsed = JSON.parse(await readText(source));
+async function readCatalogObject(source, options) {
+    const parsed = JSON.parse(await readText(source, options));
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
         throw new Error(`expected JSON object from ${source}`);
     }
     return parsed;
 }
-async function readText(source) {
+async function readText(source, options) {
     if (!source.startsWith("http://") && !source.startsWith("https://")) {
         return fs.readFileSync(source, "utf8");
     }
-    const response = await fetch(source);
+    const response = await fetchWithTimeout(source, {}, timeoutMs(options), `fetch ${source}`);
     if (!response.ok)
         throw new Error(`failed to fetch ${source}: ${response.status}`);
     return response.text();
 }
-async function readJson(source) {
-    return JSON.parse(await readText(source));
+async function readJson(source, options) {
+    return JSON.parse(await readText(source, options));
 }
 function writeJson(file, value) {
     fs.mkdirSync(path.dirname(file), { recursive: true });
@@ -713,11 +722,29 @@ function positiveIntegerOption(options, key, fallback) {
         throw new CliError("INVALID_ARGUMENT", `--${key} must be a positive integer`, `Pass --${key} with a value greater than zero.`, 2);
     return parsed;
 }
+function timeoutMs(options) {
+    return options ? positiveIntegerOption(options, "timeout-ms", DEFAULT_TIMEOUT_MS) : DEFAULT_TIMEOUT_MS;
+}
+async function fetchWithTimeout(input, init = {}, timeout = DEFAULT_TIMEOUT_MS, label = "request") {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeout);
+    try {
+        return await fetch(input, { ...init, signal: controller.signal });
+    }
+    catch (error) {
+        if (error?.name === "AbortError")
+            throw new Error(`${label} timed out after ${timeout}ms`);
+        throw error;
+    }
+    finally {
+        clearTimeout(timer);
+    }
+}
 function remoteBaseFromCatalogPayload(payload) {
     const base = payload.base_url ?? payload.baseUrl;
     return typeof base === "string" && /^https?:\/\//.test(base) ? `${base.replace(/\/+$/, "")}/` : undefined;
 }
-async function remoteBaseFromSource(source, payload) {
+async function remoteBaseFromSource(source, payload, options) {
     const fromPayload = payload ? remoteBaseFromCatalogPayload(payload) : undefined;
     if (fromPayload)
         return fromPayload;
@@ -725,7 +752,7 @@ async function remoteBaseFromSource(source, payload) {
         return `${source.slice(0, source.lastIndexOf("/") + 1)}`;
     }
     try {
-        return remoteBaseFromCatalogPayload(await readCatalogObject(source));
+        return remoteBaseFromCatalogPayload(await readCatalogObject(source, options));
     }
     catch {
         return undefined;
@@ -751,36 +778,37 @@ function catalogDetailSource(source, section, name) {
         return direct;
     return path.join(root, section, providerFilename(name));
 }
-async function readCatalogProvider(source, name) {
-    const providers = await readCatalog(source);
+async function readCatalogProvider(source, name, options) {
+    const providers = await readCatalog(source, options);
     const summary = providers.find((item) => item.name === name || item.fqn === name);
     if (!summary)
         throw new Error(`provider not found: ${name}`);
     const fqn = summary.fqn ?? summary.name ?? name;
     try {
-        return await readJson(catalogDetailSource(source, "providers", fqn));
+        return await readJson(catalogDetailSource(source, "providers", fqn), options);
     }
     catch {
         return summary;
     }
 }
-async function readCatalogPayProvider(source, name) {
-    const providers = await readCatalog(source);
+async function readCatalogPayProvider(source, name, options) {
+    const providers = await readCatalog(source, options);
     const summary = providers.find((item) => item.name === name || item.fqn === name);
     const fqn = summary?.fqn ?? summary?.name ?? name;
     try {
-        return await readJson(catalogDetailSource(source, "pay", fqn));
+        return await readJson(catalogDetailSource(source, "pay", fqn), options);
     }
     catch {
         if (summary)
-            return readCatalogProvider(source, name);
+            return readCatalogProvider(source, name, options);
         throw new Error(`provider not found: ${name}`);
     }
 }
-async function cacheProviderAssets(source, catalogPayload) {
-    const base = await remoteBaseFromSource(source, catalogPayload);
+async function cacheProviderAssets(source, catalogPayload, options) {
+    const base = await remoteBaseFromSource(source, catalogPayload, options);
+    const warnings = [];
     if (!base)
-        return { detailCount: 0, payCount: 0 };
+        return { detailCount: 0, payCount: 0, warnings };
     let detailCount = 0;
     let payCount = 0;
     for (const provider of catalogPayload.providers ?? []) {
@@ -789,34 +817,51 @@ async function cacheProviderAssets(source, catalogPayload) {
             continue;
         const filename = providerFilename(fqn);
         try {
-            const detail = await readJson(new URL(`providers/${filename}`, base).toString());
+            const detail = await readJson(new URL(`providers/${filename}`, base).toString(), options);
             writeJson(path.join(cacheDir(), "providers", filename), detail);
             detailCount += 1;
         }
-        catch {
-            // A partial cache is still useful.
+        catch (error) {
+            warnings.push(`failed to cache provider detail ${fqn}: ${error instanceof Error ? error.message : String(error)}`);
         }
         try {
-            const pay = await readJson(new URL(`pay/${filename}`, base).toString());
+            const pay = await readJson(new URL(`pay/${filename}`, base).toString(), options);
             writeJson(path.join(cacheDir(), "pay", filename), pay);
             payCount += 1;
         }
-        catch {
-            // A partial cache is still useful.
+        catch (error) {
+            warnings.push(`failed to cache pay JSON ${fqn}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    return { detailCount, payCount };
+    return { detailCount, payCount, warnings };
 }
 async function catalogUpdate(source, options) {
-    const payload = await readCatalogObject(source);
+    let payload;
+    const warnings = [];
+    for (let attempt = 1; attempt <= CATALOG_UPDATE_RETRIES; attempt += 1) {
+        try {
+            payload = await readCatalogObject(source, options);
+            break;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (attempt === CATALOG_UPDATE_RETRIES)
+                throw error;
+            warnings.push(`catalog update attempt ${attempt} failed: ${message}`);
+            await delay(250 * attempt);
+        }
+    }
+    if (!payload)
+        throw new Error(`failed to read catalog from ${source}`);
     writeJson(cachedCatalogPath(), payload);
-    const cached = await cacheProviderAssets(source, payload);
+    const cached = await cacheProviderAssets(source, payload, options);
     const result = {
         source,
         path: cachedCatalogPath(),
         providerCount: payload.provider_count ?? payload.providerCount ?? (payload.providers ?? []).length,
         detailCount: cached.detailCount,
         payCount: cached.payCount,
+        warnings: [...warnings, ...cached.warnings],
     };
     emit({ command: "catalog update", mode: outputMode(options), result });
 }
@@ -903,7 +948,7 @@ async function catalogExportGateway(gatewayUrl, options) {
     const providerFqn = requireArgument(opt(options, "provider"), "--provider", "x402-cli catalog export-gateway <gateway-url> --provider <fqn> [options]");
     sanitizeProviderName(providerFqn);
     const base = gatewayUrl.replace(/\/+$/, "");
-    const detail = await readJson(`${base}/__402/catalog/providers/${providerFilename(providerFqn)}`);
+    const detail = await readJson(`${base}/__402/catalog/providers/${providerFilename(providerFqn)}`, options);
     const outputRoot = opt(options, "output-dir", "providers");
     const target = opt(options, "output-dir")
         ? path.resolve(outputRoot)
@@ -950,12 +995,12 @@ function buildRequirement(options) {
         extra: assetTransferMethod ? { assetTransferMethod } : {},
     };
 }
-async function facilitatorPost(baseUrl, path, body) {
-    const response = await fetch(new URL(path, baseUrl), {
+async function facilitatorPost(baseUrl, path, body, options) {
+    const response = await fetchWithTimeout(new URL(path, baseUrl), {
         method: "POST",
         headers: { "content-type": "application/json" },
         body: JSON.stringify(body),
-    });
+    }, timeoutMs(options), `facilitator ${path}`);
     const text = await response.text();
     const data = text ? JSON.parse(text) : {};
     if (!response.ok)
@@ -1075,7 +1120,7 @@ async function serve(options) {
             const verify = await facilitatorPost(facilitatorUrl, "/verify", {
                 paymentPayload: payload,
                 paymentRequirements: requirement,
-            });
+            }, options);
             if (!(verify?.valid === true || verify?.isValid === true)) {
                 response.writeHead(400, { "content-type": "application/json" });
                 response.end(JSON.stringify({ error: "payment verification failed" }));
@@ -1084,7 +1129,7 @@ async function serve(options) {
             const settle = await facilitatorPost(facilitatorUrl, "/settle", {
                 paymentPayload: payload,
                 paymentRequirements: requirement,
-            });
+            }, options);
             if (!(settle?.success === true || settle?.settled === true || typeof settle?.transaction === "string" || typeof settle?.txHash === "string")) {
                 response.writeHead(502, { "content-type": "application/json" });
                 response.end(JSON.stringify({ error: "settlement failed" }));
@@ -1140,11 +1185,11 @@ async function pay(url, options) {
     requireArgument(url, "URL", "x402-cli pay <url> [options]");
     const method = opt(options, "method", "GET");
     const baseHeaders = requestHeaders(options);
-    const probe = await fetch(url, {
+    const probe = await fetchWithTimeout(url, {
         method,
         headers: baseHeaders,
         body: ["GET", "HEAD"].includes(method.toUpperCase()) ? undefined : opt(options, "body"),
-    });
+    }, timeoutMs(options), `fetch ${url}`);
     if (probe.status !== 402) {
         emit({
             command: "client",
@@ -1188,11 +1233,11 @@ async function pay(url, options) {
     }));
     const retryHeaders = new Headers(baseHeaders);
     retryHeaders.set(headers.signature, encodeSignature(payload));
-    const paid = await fetch(url, {
+    const paid = await fetchWithTimeout(url, {
         method,
         headers: retryHeaders,
         body: ["GET", "HEAD"].includes(method.toUpperCase()) ? undefined : opt(options, "body"),
-    });
+    }, timeoutMs(options), `fetch ${url}`);
     const body = await responsePayload(paid);
     const paymentResponse = paid.headers.get(headers.response);
     const result = {
@@ -1372,16 +1417,16 @@ function catalogPayAssets(target, options) {
         result: { count: rows.length, assets: rows },
     });
 }
-async function readProviderDetailForSearch(source, fqn) {
+async function readProviderDetailForSearch(source, fqn, options) {
     try {
-        return await readJson(catalogDetailSource(source, "providers", fqn));
+        return await readJson(catalogDetailSource(source, "providers", fqn), options);
     }
     catch {
         return {};
     }
 }
 async function searchCatalog(source, query, options) {
-    const providers = await readCatalog(source);
+    const providers = await readCatalog(source, options);
     const terms = query.toLowerCase().split(/\s+/).filter(Boolean);
     if (!terms.length)
         return [];
@@ -1393,7 +1438,7 @@ async function searchCatalog(source, query, options) {
         const fqn = String(provider.fqn ?? provider.name ?? "");
         if (!fqn)
             continue;
-        const detail = await readProviderDetailForSearch(source, fqn);
+        const detail = await readProviderDetailForSearch(source, fqn, options);
         const tags = stringList(detail.featured_tags ?? provider.featured_tags ?? detail.tags ?? provider.tags);
         const endpoints = Array.isArray(detail.endpoints) ? detail.endpoints : Array.isArray(provider.endpoints) ? provider.endpoints : [];
         const categoryMeta = detail.category_meta ?? provider.category_meta;
@@ -1504,7 +1549,7 @@ async function catalogSearch(source, query, options) {
 }
 async function catalogShow(source, name, options) {
     requireArgument(name, "provider", "x402-cli catalog show <provider> [--catalog <source>]");
-    const provider = await readCatalogProvider(source, name);
+    const provider = await readCatalogProvider(source, name, options);
     if (outputMode(options) === "json") {
         emit({ command: "catalog show", mode: "json", result: provider });
         return;
@@ -1519,7 +1564,7 @@ async function catalogShow(source, name, options) {
 }
 async function catalogEndpoints(source, name, options) {
     requireArgument(name, "provider", "x402-cli catalog endpoints <provider> [--catalog <source>]");
-    const provider = await readCatalogProvider(source, name);
+    const provider = await readCatalogProvider(source, name, options);
     const endpoints = provider.endpoints ?? [];
     if (outputMode(options) === "json") {
         emit({ command: "catalog endpoints", mode: "json", result: { provider: provider.fqn ?? provider.name, endpoints } });
@@ -1533,7 +1578,7 @@ async function catalogEndpoints(source, name, options) {
 }
 async function catalogPayJson(source, name, options) {
     requireArgument(name, "provider", "x402-cli catalog pay-json <provider> [--catalog <source>]");
-    const provider = await readCatalogPayProvider(source, name);
+    const provider = await readCatalogPayProvider(source, name, options);
     const endpoint = (provider.endpoints ?? []).find((item) => item.paid || item.x402_routes?.length || item.x402Routes?.length) ?? provider.endpoints?.[0];
     if (!endpoint)
         throw new Error(`provider has no endpoints: ${name}`);

package/dist/x402.js

@@ -112,7 +112,7 @@ async function createTronWallet(privateKey) {
     return {
         getAddress: () => address,
         async signTypedData(args) {
-            const signature = await tronWeb.trx._signTypedData(args.domain, args.types, args.message, rawKey);
+            const signature = await signTronTypedData(tronWeb, args, rawKey);
             return signature.startsWith("0x") ? signature : `0x${signature}`;
         },
         async signTransaction(tx) {
@@ -120,6 +120,13 @@ async function createTronWallet(privateKey) {
         },
     };
 }
+export async function signTronTypedData(tronWeb, args, rawPrivateKey) {
+    const trx = tronWeb.trx;
+    const signer = typeof trx.signTypedData === "function" ? trx.signTypedData.bind(trx) : trx._signTypedData?.bind(trx);
+    if (!signer)
+        throw new Error("tronweb typed-data signing is not available");
+    return signer(args.domain, args.types, args.message, rawPrivateKey);
+}
 export async function createPaymentPayload(args) {
     const selected = ensurePermit2(args.selected);
     const required = paymentRequired(selected, args.resource, args.extensions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bankofai/x402-cli",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0-beta.9",
   "type": "module",
   "files": [
     "dist"