@blockrun/clawrouter 0.12.12 → 0.12.16

package/dist/cli.js

@@ -48,7 +48,7 @@ function createPayFetchWithPreAuth(baseFetch, client, ttlMs = DEFAULT_TTL_MS, op
         const responseText = await Promise.race([
           response.text(),
           new Promise(
-            (_, reject) => setTimeout(() => reject(new Error("Body read timeout")), 6e4)
+            (_, reject) => setTimeout(() => reject(new Error("Body read timeout")), 3e4)
           )
         ]);
         if (responseText) body = JSON.parse(responseText);
@@ -1744,6 +1744,13 @@ function resolveModelAlias(model) {
     if (resolvedWithoutPrefix) return resolvedWithoutPrefix;
     return withoutPrefix;
   }
+  if (normalized.startsWith("openai/")) {
+    const withoutPrefix = normalized.slice("openai/".length);
+    const resolvedWithoutPrefix = MODEL_ALIASES[withoutPrefix];
+    if (resolvedWithoutPrefix) return resolvedWithoutPrefix;
+    const isVirtualProfile = BLOCKRUN_MODELS.some((m) => m.id === withoutPrefix);
+    if (isVirtualProfile) return withoutPrefix;
+  }
   return model;
 }
 var BLOCKRUN_MODELS = [
@@ -3027,6 +3034,14 @@ var SolanaBalanceMonitor = class {
   async fetchBalance() {
     const owner = solAddress(this.walletAddress);
     const mint = solAddress(SOLANA_USDC_MINT);
+    for (let attempt = 0; attempt < 2; attempt++) {
+      const result = await this.fetchBalanceOnce(owner, mint);
+      if (result > 0n || attempt === 1) return result;
+      await new Promise((r) => setTimeout(r, 1e3));
+    }
+    return 0n;
+  }
+  async fetchBalanceOnce(owner, mint) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), BALANCE_TIMEOUT_MS);
     try {
@@ -4987,23 +5002,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) {
+var MODEL_BODY_READ_TIMEOUT_MS = 3e5;
+var ERROR_BODY_READ_TIMEOUT_MS = 3e4;
+async function readBodyWithTimeout(body, timeoutMs = MODEL_BODY_READ_TIMEOUT_MS) {
   if (!body) return [];
   const reader = body.getReader();
   const chunks = [];
+  let timer;
   try {
     while (true) {
       const result = await Promise.race([
         reader.read(),
-        new Promise(
-          (_, reject) => setTimeout(() => reject(new Error("Body read timeout")), timeoutMs)
-        )
+        new Promise((_, reject) => {
+          timer = setTimeout(() => reject(new Error("Body read timeout")), timeoutMs);
+        })
       ]);
+      clearTimeout(timer);
       if (result.done) break;
       chunks.push(result.value);
     }
   } finally {
+    clearTimeout(timer);
     reader.releaseLock();
   }
   return chunks;
@@ -5108,6 +5127,8 @@ function canWrite(res) {
 }
 function safeWrite(res, data) {
   if (!canWrite(res)) {
+    const bytes = typeof data === "string" ? Buffer.byteLength(data) : data.length;
+    console.warn(`[ClawRouter] safeWrite: socket not writable, dropping ${bytes} bytes`);
     return false;
   }
   return res.write(data);
@@ -5507,7 +5528,7 @@ async function proxyPartnerRequest(req, res, apiBase, payFetch) {
   });
   res.writeHead(upstream.status, responseHeaders);
   if (upstream.body) {
-    const chunks = await readBodyWithTimeout(upstream.body);
+    const chunks = await readBodyWithTimeout(upstream.body, ERROR_BODY_READ_TIMEOUT_MS);
     for (const chunk of chunks) {
       safeWrite(res, Buffer.from(chunk));
     }
@@ -5957,7 +5978,7 @@ async function tryModelRequest(upstreamUrl, method, headers, body, modelId, maxT
       signal
     });
     if (response.status !== 200) {
-      const errorBodyChunks = await readBodyWithTimeout(response.body);
+      const errorBodyChunks = await readBodyWithTimeout(response.body, ERROR_BODY_READ_TIMEOUT_MS);
       const errorBody = Buffer.concat(errorBodyChunks).toString();
       const isProviderErr = isProviderError(response.status, errorBody);
       return {
@@ -5970,7 +5991,7 @@ 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 clonedChunks = await readBodyWithTimeout(response.clone().body);
+        const clonedChunks = await readBodyWithTimeout(response.clone().body, ERROR_BODY_READ_TIMEOUT_MS);
         const responseBody = Buffer.concat(clonedChunks).toString();
         const degradedReason = detectDegradedSuccessResponse(responseBody);
         if (degradedReason) {
@@ -6355,9 +6376,9 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
       const normalizedModel = typeof parsed.model === "string" ? parsed.model.trim().toLowerCase() : "";
       const resolvedModel = resolveModelAlias(normalizedModel);
       const wasAlias = resolvedModel !== normalizedModel;
-      const isRoutingProfile = ROUTING_PROFILES.has(normalizedModel);
+      const isRoutingProfile = ROUTING_PROFILES.has(normalizedModel) || ROUTING_PROFILES.has(resolvedModel);
       if (isRoutingProfile) {
-        const profileName = normalizedModel.replace("blockrun/", "");
+        const profileName = resolvedModel.replace("blockrun/", "");
         routingProfile = profileName;
       }
       console.log(
@@ -7734,6 +7755,7 @@ ClawRouter Partner APIs (v${VERSION})
     } else {
       console.log(`[ClawRouter] Wallet balance: ${balance.balanceUSD}`);
     }
+    proxy.balanceMonitor.invalidate();
   } catch {
     console.log(`[ClawRouter] Wallet: ${displayAddress} (balance check pending)`);
   }