@blockrun/clawrouter 0.12.10 → 0.12.11

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 {
       }
@@ -5466,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);
@@ -5505,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({
@@ -5953,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();
@@ -5991,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;
@@ -6402,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,
@@ -6414,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 {
@@ -7215,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) {
@@ -7320,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 {
@@ -7469,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);