@blockrun/clawrouter 0.12.254 → 0.12.256

package/dist/cli.js

@@ -39252,6 +39252,26 @@ var init_stats = __esm({
   }
 });
 
+// src/timestamp-strip.ts
+function stripLeadingTextBlockTimestamp(blocks) {
+  let stripped = false;
+  return blocks.map((block) => {
+    if (!stripped && block !== null && typeof block === "object" && block.type === "text" && typeof block.text === "string") {
+      stripped = true;
+      const b = block;
+      return { ...b, text: b.text.replace(TIMESTAMP_PATTERN, "") };
+    }
+    return block;
+  });
+}
+var TIMESTAMP_PATTERN;
+var init_timestamp_strip = __esm({
+  "src/timestamp-strip.ts"() {
+    "use strict";
+    TIMESTAMP_PATTERN = /^\[\w{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+\w+\]\s*/;
+  }
+});
+
 // src/dedup.ts
 import { createHash } from "crypto";
 function canonicalize(obj) {
@@ -39278,19 +39298,21 @@ function stripTimestamps(obj) {
   for (const [key2, value] of Object.entries(obj)) {
     if (key2 === "content" && typeof value === "string") {
       result[key2] = value.replace(TIMESTAMP_PATTERN, "");
+    } else if (key2 === "content" && Array.isArray(value)) {
+      result[key2] = stripLeadingTextBlockTimestamp(value.map(stripTimestamps));
     } else {
       result[key2] = stripTimestamps(value);
     }
   }
   return result;
 }
-var DEFAULT_TTL_MS2, MAX_BODY_SIZE, TIMESTAMP_PATTERN, RequestDeduplicator;
+var DEFAULT_TTL_MS2, MAX_BODY_SIZE, RequestDeduplicator;
 var init_dedup = __esm({
   "src/dedup.ts"() {
     "use strict";
+    init_timestamp_strip();
     DEFAULT_TTL_MS2 = 3e4;
     MAX_BODY_SIZE = 1048576;
-    TIMESTAMP_PATTERN = /^\[\w{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+\w+\]\s*/;
     RequestDeduplicator = class {
       inflight = /* @__PURE__ */ new Map();
       completed = /* @__PURE__ */ new Map();
@@ -39408,7 +39430,10 @@ function normalizeForCache(obj) {
         if (typeof msg === "object" && msg !== null) {
           const m = msg;
           if (typeof m.content === "string") {
-            return { ...m, content: m.content.replace(TIMESTAMP_PATTERN2, "") };
+            return { ...m, content: m.content.replace(TIMESTAMP_PATTERN, "") };
+          }
+          if (Array.isArray(m.content)) {
+            return { ...m, content: stripLeadingTextBlockTimestamp(m.content) };
           }
         }
         return msg;
@@ -39419,10 +39444,11 @@ function normalizeForCache(obj) {
   }
   return result;
 }
-var DEFAULT_CONFIG, TIMESTAMP_PATTERN2, ResponseCache;
+var DEFAULT_CONFIG, ResponseCache;
 var init_response_cache = __esm({
   "src/response-cache.ts"() {
     "use strict";
+    init_timestamp_strip();
     DEFAULT_CONFIG = {
       maxSize: 200,
       defaultTTL: 600,
@@ -39430,7 +39456,6 @@ var init_response_cache = __esm({
       // 1MB
       enabled: true
     };
-    TIMESTAMP_PATTERN2 = /^\[\w{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+\w+\]\s*/;
     ResponseCache = class {
       cache = /* @__PURE__ */ new Map();
       expirationHeap = [];
@@ -90441,7 +90466,7 @@ async function startProxy(options) {
                 console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
               } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
                 try {
-                  const imgResp = await fetch(img.url);
+                  const imgResp = await fetch(img.url, { signal: clientAbort.signal });
                   if (imgResp.ok) {
                     const contentType = imgResp.headers.get("content-type") ?? "image/png";
                     const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
@@ -90523,6 +90548,7 @@ async function startProxy(options) {
           img2imgCost = estimateImageCost(img2imgModel, parsed.size, parsed.n || 1);
           reqBody = JSON.stringify(parsed);
         } catch (parseErr) {
+          if (clientAbort.signal.aborted) return;
           const msg = parseErr instanceof Error ? parseErr.message : String(parseErr);
           res.writeHead(400, { "Content-Type": "application/json" });
           res.end(JSON.stringify({ error: "Invalid request", details: msg }));
@@ -90563,7 +90589,7 @@ async function startProxy(options) {
                 console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
               } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
                 try {
-                  const imgResp = await fetch(img.url);
+                  const imgResp = await fetch(img.url, { signal: clientAbort.signal });
                   if (imgResp.ok) {
                     const contentType = imgResp.headers.get("content-type") ?? "image/png";
                     const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
@@ -90809,7 +90835,7 @@ async function startProxy(options) {
             for (const clip of finalResult.data) {
               if (clip.url?.startsWith("https://") || clip.url?.startsWith("http://")) {
                 try {
-                  const videoResp = await fetch(clip.url);
+                  const videoResp = await fetch(clip.url, { signal: clientAbort.signal });
                   if (videoResp.ok) {
                     const contentType = videoResp.headers.get("content-type") ?? "video/mp4";
                     const ext = contentType.includes("webm") ? "webm" : contentType.includes("quicktime") ? "mov" : "mp4";
@@ -91428,6 +91454,10 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         console.log(
           `[ClawRouter] /imagegen command \u2192 ${imageModel} (${imageSize}): ${imagePrompt.slice(0, 80)}...`
         );
+        const imagegenAbort = new AbortController();
+        res.on("close", () => {
+          if (!res.writableEnded) imagegenAbort.abort();
+        });
         try {
           const imageUpstreamUrl = `${apiBase}/v1/images/generations`;
           const imageBody = JSON.stringify({
@@ -91436,10 +91466,6 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
             size: imageSize,
             n: 1
           });
-          const imagegenAbort = new AbortController();
-          res.on("close", () => {
-            if (!res.writableEnded) imagegenAbort.abort();
-          });
           const imageResponse = await payFetch(imageUpstreamUrl, {
             method: "POST",
             headers: { "content-type": "application/json", "user-agent": USER_AGENT },
@@ -91581,6 +91607,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
             );
           }
         } catch (err) {
+          if (imagegenAbort.signal.aborted) return;
           const errMsg = err instanceof Error ? err.message : String(err);
           console.error(`[ClawRouter] /imagegen error: ${errMsg}`);
           if (!res.headersSent) {

package/dist/index.js

@@ -39121,6 +39121,26 @@ var init_stats = __esm({
   }
 });
 
+// src/timestamp-strip.ts
+function stripLeadingTextBlockTimestamp(blocks) {
+  let stripped = false;
+  return blocks.map((block) => {
+    if (!stripped && block !== null && typeof block === "object" && block.type === "text" && typeof block.text === "string") {
+      stripped = true;
+      const b = block;
+      return { ...b, text: b.text.replace(TIMESTAMP_PATTERN, "") };
+    }
+    return block;
+  });
+}
+var TIMESTAMP_PATTERN;
+var init_timestamp_strip = __esm({
+  "src/timestamp-strip.ts"() {
+    "use strict";
+    TIMESTAMP_PATTERN = /^\[\w{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+\w+\]\s*/;
+  }
+});
+
 // src/dedup.ts
 import { createHash } from "crypto";
 function canonicalize(obj) {
@@ -39147,19 +39167,21 @@ function stripTimestamps(obj) {
   for (const [key2, value] of Object.entries(obj)) {
     if (key2 === "content" && typeof value === "string") {
       result[key2] = value.replace(TIMESTAMP_PATTERN, "");
+    } else if (key2 === "content" && Array.isArray(value)) {
+      result[key2] = stripLeadingTextBlockTimestamp(value.map(stripTimestamps));
     } else {
       result[key2] = stripTimestamps(value);
     }
   }
   return result;
 }
-var DEFAULT_TTL_MS2, MAX_BODY_SIZE, TIMESTAMP_PATTERN, RequestDeduplicator;
+var DEFAULT_TTL_MS2, MAX_BODY_SIZE, RequestDeduplicator;
 var init_dedup = __esm({
   "src/dedup.ts"() {
     "use strict";
+    init_timestamp_strip();
     DEFAULT_TTL_MS2 = 3e4;
     MAX_BODY_SIZE = 1048576;
-    TIMESTAMP_PATTERN = /^\[\w{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+\w+\]\s*/;
     RequestDeduplicator = class {
       inflight = /* @__PURE__ */ new Map();
       completed = /* @__PURE__ */ new Map();
@@ -39277,7 +39299,10 @@ function normalizeForCache(obj) {
         if (typeof msg === "object" && msg !== null) {
           const m = msg;
           if (typeof m.content === "string") {
-            return { ...m, content: m.content.replace(TIMESTAMP_PATTERN2, "") };
+            return { ...m, content: m.content.replace(TIMESTAMP_PATTERN, "") };
+          }
+          if (Array.isArray(m.content)) {
+            return { ...m, content: stripLeadingTextBlockTimestamp(m.content) };
           }
         }
         return msg;
@@ -39288,10 +39313,11 @@ function normalizeForCache(obj) {
   }
   return result;
 }
-var DEFAULT_CONFIG, TIMESTAMP_PATTERN2, ResponseCache;
+var DEFAULT_CONFIG, ResponseCache;
 var init_response_cache = __esm({
   "src/response-cache.ts"() {
     "use strict";
+    init_timestamp_strip();
     DEFAULT_CONFIG = {
       maxSize: 200,
       defaultTTL: 600,
@@ -39299,7 +39325,6 @@ var init_response_cache = __esm({
       // 1MB
       enabled: true
     };
-    TIMESTAMP_PATTERN2 = /^\[\w{3}\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}\s+\w+\]\s*/;
     ResponseCache = class {
       cache = /* @__PURE__ */ new Map();
       expirationHeap = [];
@@ -90261,7 +90286,7 @@ async function startProxy(options) {
                 console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
               } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
                 try {
-                  const imgResp = await fetch(img.url);
+                  const imgResp = await fetch(img.url, { signal: clientAbort.signal });
                   if (imgResp.ok) {
                     const contentType = imgResp.headers.get("content-type") ?? "image/png";
                     const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
@@ -90343,6 +90368,7 @@ async function startProxy(options) {
           img2imgCost = estimateImageCost(img2imgModel, parsed.size, parsed.n || 1);
           reqBody = JSON.stringify(parsed);
         } catch (parseErr) {
+          if (clientAbort.signal.aborted) return;
           const msg = parseErr instanceof Error ? parseErr.message : String(parseErr);
           res.writeHead(400, { "Content-Type": "application/json" });
           res.end(JSON.stringify({ error: "Invalid request", details: msg }));
@@ -90383,7 +90409,7 @@ async function startProxy(options) {
                 console.log(`[ClawRouter] Image saved \u2192 ${img.url}`);
               } else if (img.url?.startsWith("https://") || img.url?.startsWith("http://")) {
                 try {
-                  const imgResp = await fetch(img.url);
+                  const imgResp = await fetch(img.url, { signal: clientAbort.signal });
                   if (imgResp.ok) {
                     const contentType = imgResp.headers.get("content-type") ?? "image/png";
                     const ext = contentType.includes("jpeg") || contentType.includes("jpg") ? "jpg" : contentType.includes("webp") ? "webp" : "png";
@@ -90629,7 +90655,7 @@ async function startProxy(options) {
             for (const clip of finalResult.data) {
               if (clip.url?.startsWith("https://") || clip.url?.startsWith("http://")) {
                 try {
-                  const videoResp = await fetch(clip.url);
+                  const videoResp = await fetch(clip.url, { signal: clientAbort.signal });
                   if (videoResp.ok) {
                     const contentType = videoResp.headers.get("content-type") ?? "video/mp4";
                     const ext = contentType.includes("webm") ? "webm" : contentType.includes("quicktime") ? "mov" : "mp4";
@@ -91248,6 +91274,10 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
         console.log(
           `[ClawRouter] /imagegen command \u2192 ${imageModel} (${imageSize}): ${imagePrompt.slice(0, 80)}...`
         );
+        const imagegenAbort = new AbortController();
+        res.on("close", () => {
+          if (!res.writableEnded) imagegenAbort.abort();
+        });
         try {
           const imageUpstreamUrl = `${apiBase}/v1/images/generations`;
           const imageBody = JSON.stringify({
@@ -91256,10 +91286,6 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
             size: imageSize,
             n: 1
           });
-          const imagegenAbort = new AbortController();
-          res.on("close", () => {
-            if (!res.writableEnded) imagegenAbort.abort();
-          });
           const imageResponse = await payFetch(imageUpstreamUrl, {
             method: "POST",
             headers: { "content-type": "application/json", "user-agent": USER_AGENT },
@@ -91401,6 +91427,7 @@ async function proxyRequest(req, res, apiBase, payFetch, options, routerOpts, de
             );
           }
         } catch (err) {
+          if (imagegenAbort.signal.aborted) return;
           const errMsg = err instanceof Error ? err.message : String(err);
           console.error(`[ClawRouter] /imagegen error: ${errMsg}`);
           if (!res.headersSent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockrun/clawrouter",
-  "version": "0.12.254",
+  "version": "0.12.256",
   "description": "Smart LLM router — save 88% on inference costs. 71 models (5 free), one wallet, x402 micropayments.",
   "type": "module",
   "main": "dist/index.js",