@blockrun/clawrouter 0.12.9 → 0.12.11

package/dist/index.d.ts

@@ -1284,6 +1284,12 @@ declare function getStats(days?: number): Promise<AggregatedStats>;
  * Format stats as ASCII table for terminal display.
  */
 declare function formatStatsAscii(stats: AggregatedStats): string;
+/**
+ * Delete all usage log files, resetting stats to zero.
+ */
+declare function clearStats(): Promise<{
+    deletedFiles: number;
+}>;
 
 /**
  * Partner Service Registry
@@ -1381,4 +1387,4 @@ declare function buildPartnerTools(proxyBaseUrl: string): PartnerToolDefinition[
 
 declare const plugin: OpenClawPluginDefinition;
 
-export { type AggregatedStats, BALANCE_THRESHOLDS, BLOCKRUN_MODELS, type BalanceInfo, BalanceMonitor, type CachedLLMResponse, type CachedResponse, type CheckResult, DEFAULT_RETRY_CONFIG, DEFAULT_ROUTING_CONFIG, DEFAULT_SESSION_CONFIG, type DailyStats, type DerivedKeys, EmptyWalletError, FileSpendControlStorage, InMemorySpendControlStorage, InsufficientFundsError, type InsufficientFundsInfo, type LowBalanceInfo, MODEL_ALIASES, OPENCLAW_MODELS, PARTNER_SERVICES, type PartnerServiceDefinition, type PartnerToolDefinition, type PaymentChain, type ProxyHandle, type ProxyOptions, RequestDeduplicator, ResponseCache, type ResponseCacheConfig, type RetryConfig, type RoutingConfig, type RoutingDecision, RpcError, type SessionConfig, type SessionEntry, SessionStore, type SolanaBalanceInfo, SolanaBalanceMonitor, SpendControl, type SpendControlOptions, type SpendControlStorage, type SpendLimits, type SpendRecord, type SpendWindow, type SpendingStatus, type SufficiencyResult, type SweepError, type SweepResult, type Tier, type UsageEntry, type WalletConfig, type WalletResolution, blockrunProvider, buildPartnerTools, buildProviderModels, calculateModelCost, plugin as default, deriveAllKeys, deriveEvmKey, deriveSolanaKeyBytes, deriveSolanaKeyBytesLegacy, fetchWithRetry, formatDuration, formatStatsAscii, generateWalletMnemonic, getAgenticModels, getFallbackChain, getFallbackChainFiltered, getModelContextWindow, getPartnerService, getProxyPort, getSessionId, getStats, hashRequestContent, isAgenticModel, isBalanceError, isEmptyWalletError, isInsufficientFundsError, isRetryable, isRpcError, isValidMnemonic, loadPaymentChain, logUsage, resolveModelAlias, resolvePaymentChain, route, savePaymentChain, setupSolana, startProxy, sweepSolanaWallet };
+export { type AggregatedStats, BALANCE_THRESHOLDS, BLOCKRUN_MODELS, type BalanceInfo, BalanceMonitor, type CachedLLMResponse, type CachedResponse, type CheckResult, DEFAULT_RETRY_CONFIG, DEFAULT_ROUTING_CONFIG, DEFAULT_SESSION_CONFIG, type DailyStats, type DerivedKeys, EmptyWalletError, FileSpendControlStorage, InMemorySpendControlStorage, InsufficientFundsError, type InsufficientFundsInfo, type LowBalanceInfo, MODEL_ALIASES, OPENCLAW_MODELS, PARTNER_SERVICES, type PartnerServiceDefinition, type PartnerToolDefinition, type PaymentChain, type ProxyHandle, type ProxyOptions, RequestDeduplicator, ResponseCache, type ResponseCacheConfig, type RetryConfig, type RoutingConfig, type RoutingDecision, RpcError, type SessionConfig, type SessionEntry, SessionStore, type SolanaBalanceInfo, SolanaBalanceMonitor, SpendControl, type SpendControlOptions, type SpendControlStorage, type SpendLimits, type SpendRecord, type SpendWindow, type SpendingStatus, type SufficiencyResult, type SweepError, type SweepResult, type Tier, type UsageEntry, type WalletConfig, type WalletResolution, blockrunProvider, buildPartnerTools, buildProviderModels, calculateModelCost, clearStats, plugin as default, deriveAllKeys, deriveEvmKey, deriveSolanaKeyBytes, deriveSolanaKeyBytesLegacy, fetchWithRetry, formatDuration, formatStatsAscii, generateWalletMnemonic, getAgenticModels, getFallbackChain, getFallbackChainFiltered, getModelContextWindow, getPartnerService, getProxyPort, getSessionId, getStats, hashRequestContent, isAgenticModel, isBalanceError, isEmptyWalletError, isInsufficientFundsError, isRetryable, isRpcError, isValidMnemonic, loadPaymentChain, logUsage, resolveModelAlias, resolvePaymentChain, route, savePaymentChain, setupSolana, startProxy, sweepSolanaWallet };

package/dist/index.js

@@ -1662,7 +1662,12 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
       const getHeader = (name) => response.headers.get(name);
       let body;
       try {
-        const responseText = await response.text();
+        const responseText = await Promise.race([
+          response.text(),
+          new Promise(
+            (_, reject) => setTimeout(() => reject(new Error("Body read timeout")), 6e4)
+          )
+        ]);
         if (responseText) body = JSON.parse(responseText);
       } catch {
       }
@@ -3305,7 +3310,7 @@ async function logUsage(entry) {
 }
 
 // src/stats.ts
-import { readdir } from "fs/promises";
+import { readdir, unlink } from "fs/promises";
 
 // src/fs-read.ts
 import { open } from "fs/promises";
@@ -3545,6 +3550,16 @@ function formatStatsAscii(stats) {
   lines.push("\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
   return lines.join("\n");
 }
+async function clearStats() {
+  try {
+    const files = await readdir(LOG_DIR2);
+    const logFiles = files.filter((f) => f.startsWith("usage-") && f.endsWith(".jsonl"));
+    await Promise.all(logFiles.map((f) => unlink(join3(LOG_DIR2, f))));
+    return { deletedFiles: logFiles.length };
+  } catch {
+    return { deletedFiles: 0 };
+  }
+}
 
 // src/dedup.ts
 import { createHash } from "crypto";
@@ -5456,6 +5471,27 @@ var HEALTH_CHECK_TIMEOUT_MS = 2e3;
 var RATE_LIMIT_COOLDOWN_MS = 6e4;
 var PORT_RETRY_ATTEMPTS = 5;
 var PORT_RETRY_DELAY_MS = 1e3;
+var BODY_READ_TIMEOUT_MS = 6e4;
+async function readBodyWithTimeout(body, timeoutMs = BODY_READ_TIMEOUT_MS) {
+  if (!body) return [];
+  const reader = body.getReader();
+  const chunks = [];
+  try {
+    while (true) {
+      const result = await Promise.race([
+        reader.read(),
+        new Promise(
+          (_, reject) => setTimeout(() => reject(new Error("Body read timeout")), timeoutMs)
+        )
+      ]);
+      if (result.done) break;
+      chunks.push(result.value);
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  return chunks;
+}
 function transformPaymentError(errorBody) {
   try {
     const parsed = JSON.parse(errorBody);
@@ -5495,9 +5531,21 @@ function transformPaymentError(errorBody) {
             }
           });
         }
+        if (innerJson.invalidReason === "transaction_simulation_failed") {
+          console.error(
+            `[ClawRouter] Solana transaction simulation failed: ${innerJson.invalidMessage || "unknown"}`
+          );
+          return JSON.stringify({
+            error: {
+              message: "Solana payment simulation failed. Retrying with a different model.",
+              type: "transaction_simulation_failed",
+              help: "This is usually temporary. If it persists, check your Solana USDC balance or try: /model free"
+            }
+          });
+        }
       }
     }
-    if (parsed.error === "Settlement failed" || parsed.details?.includes("Settlement failed")) {
+    if (parsed.error === "Settlement failed" || parsed.error === "Payment settlement failed" || parsed.details?.includes("Settlement failed") || parsed.details?.includes("transaction_simulation_failed")) {
       const details = parsed.details || "";
       const gasError = details.includes("unable to estimate gas");
       return JSON.stringify({
@@ -5943,15 +5991,9 @@ async function proxyPartnerRequest(req, res, apiBase, payFetch) {
   });
   res.writeHead(upstream.status, responseHeaders);
   if (upstream.body) {
-    const reader = upstream.body.getReader();
-    try {
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-        safeWrite(res, Buffer.from(value));
-      }
-    } finally {
-      reader.releaseLock();
+    const chunks = await readBodyWithTimeout(upstream.body);
+    for (const chunk of chunks) {
+      safeWrite(res, Buffer.from(chunk));
     }
   }
   res.end();
@@ -5981,16 +6023,23 @@ async function uploadDataUriToHost(dataUri) {
   const form = new FormData();
   form.append("reqtype", "fileupload");
   form.append("fileToUpload", blob, `image.${ext}`);
-  const resp = await fetch("https://catbox.moe/user/api.php", {
-    method: "POST",
-    body: form
-  });
-  if (!resp.ok) throw new Error(`catbox.moe upload failed: HTTP ${resp.status}`);
-  const result = await resp.text();
-  if (result.startsWith("https://")) {
-    return result.trim();
+  const uploadController = new AbortController();
+  const uploadTimeout = setTimeout(() => uploadController.abort(), 3e4);
+  try {
+    const resp = await fetch("https://catbox.moe/user/api.php", {
+      method: "POST",
+      body: form,
+      signal: uploadController.signal
+    });
+    if (!resp.ok) throw new Error(`catbox.moe upload failed: HTTP ${resp.status}`);
+    const result = await resp.text();
+    if (result.startsWith("https://")) {
+      return result.trim();
+    }
+    throw new Error(`catbox.moe upload failed: ${result}`);
+  } finally {
+    clearTimeout(uploadTimeout);
   }
-  throw new Error(`catbox.moe upload failed: ${result}`);
 }
 async function startProxy(options) {
   const walletKey = typeof options.wallet === "string" ? options.wallet : options.wallet.key;
@@ -6131,6 +6180,21 @@ async function startProxy(options) {
       res.end(JSON.stringify(stats, null, 2));
       return;
     }
+    if (req.url === "/stats" && req.method === "DELETE") {
+      try {
+        const result = await clearStats();
+        res.writeHead(200, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ cleared: true, deletedFiles: result.deletedFiles }));
+      } catch (err) {
+        res.writeHead(500, { "Content-Type": "application/json" });
+        res.end(
+          JSON.stringify({
+            error: `Failed to clear stats: ${err instanceof Error ? err.message : String(err)}`
+          })
+        );
+      }
+      return;
+    }
     if (req.url === "/stats" || req.url?.startsWith("/stats?")) {
       try {
         const url = new URL(req.url, "http://localhost");
@@ -6377,7 +6441,8 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
       signal
     });
     if (response.status !== 200) {
-      const errorBody = await response.text();
+      const errorBodyChunks = await readBodyWithTimeout(response.body);
+      const errorBody = Buffer.concat(errorBodyChunks).toString();
       const isProviderErr = isProviderError(response.status, errorBody);
       return {
         success: false,
@@ -6389,7 +6454,8 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
     const contentType = response.headers.get("content-type") || "";
     if (contentType.includes("json") || contentType.includes("text")) {
       try {
-        const responseBody = await response.clone().text();
+        const clonedChunks = await readBodyWithTimeout(response.clone().body);
+        const responseBody = Buffer.concat(clonedChunks).toString();
         const degradedReason = detectDegradedSuccessResponse(responseBody);
         if (degradedReason) {
           return {
@@ -7190,7 +7256,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         if (result.errorStatus === 429) {
           markRateLimited(tryModel);
         }
-        const isPaymentErr = /payment.*verification.*failed|insufficient.*funds/i.test(
+        const isPaymentErr = /payment.*verification.*failed|payment.*settlement.*failed|insufficient.*funds|transaction_simulation_failed/i.test(
           result.errorBody || ""
         );
         if (isPaymentErr && tryModel !== FREE_MODEL) {
@@ -7295,17 +7361,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
     const responseChunks = [];
     if (headersSentEarly) {
       if (upstream.body) {
-        const reader = upstream.body.getReader();
-        const chunks = [];
-        try {
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            chunks.push(value);
-          }
-        } finally {
-          reader.releaseLock();
-        }
+        const chunks = await readBodyWithTimeout(upstream.body);
         const jsonBody = Buffer.concat(chunks);
         const jsonStr = jsonBody.toString();
         try {
@@ -7444,15 +7500,9 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       }
       const bodyParts = [];
       if (upstream.body) {
-        const reader = upstream.body.getReader();
-        try {
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            bodyParts.push(Buffer.from(value));
-          }
-        } finally {
-          reader.releaseLock();
+        const chunks = await readBodyWithTimeout(upstream.body);
+        for (const chunk of chunks) {
+          bodyParts.push(Buffer.from(chunk));
         }
       }
       let responseBody = Buffer.concat(bodyParts);
@@ -8293,6 +8343,19 @@ async function createStatsCommand() {
     requireAuth: false,
     handler: async (ctx) => {
       const arg = ctx.args?.trim().toLowerCase() || "7";
+      if (arg === "clear" || arg === "reset") {
+        try {
+          const { deletedFiles } = await clearStats();
+          return {
+            text: `Stats cleared \u2014 ${deletedFiles} log file(s) deleted. Fresh start!`
+          };
+        } catch (err) {
+          return {
+            text: `Failed to clear stats: ${err instanceof Error ? err.message : String(err)}`,
+            isError: true
+          };
+        }
+      }
       const days = parseInt(arg, 10) || 7;
       try {
         const stats = await getStats(Math.min(days, 30));
@@ -8761,6 +8824,7 @@ export {
   buildPartnerTools,
   buildProviderModels,
   calculateModelCost,
+  clearStats,
   index_default as default,
   deriveAllKeys,
   deriveEvmKey,