@todoforai/edge 0.12.13 → 0.12.15

package/dist/index.js

@@ -48418,8 +48418,12 @@ class BrowserExtensionBridge {
         pending.ws.send(JSON.stringify({ type: "browser.command.result", requestId, error: "Browser bridge stopped" }));
     }
     this.pending.clear();
+    if (isOpen(this.extensionWs))
+      this.extensionWs.terminate();
     this.extensionWs = null;
+    this.wss?.clients.forEach((ws) => ws.terminate());
     this.wss?.close();
+    this.server?.closeAllConnections();
     this.server?.close();
     this.wss = undefined;
     this.server = undefined;
@@ -48608,7 +48612,7 @@ import path4 from "path";
 import fs3 from "fs";
 import os3 from "os";
 import path3 from "path";
-import { execSync, spawnSync } from "child_process";
+import { execSync, spawnSync, execFile } from "child_process";
 
 // src/tool-catalog.ts
 import os2 from "os";
@@ -49344,27 +49348,39 @@ function uninstallTool(name) {
     return false;
   }
 }
-function scanCatalogTools() {
+function execShellAsync(cmd, env, timeout) {
+  return new Promise((resolve) => {
+    execFile("sh", ["-c", cmd], { env, timeout, encoding: "utf-8", maxBuffer: 1024 * 1024 }, (err, stdout, stderr) => {
+      resolve({ status: err ? 1 : 0, stdout: (stdout || "").toString(), stderr: (stderr || "").toString() });
+    });
+  });
+}
+async function scanCatalogTools() {
   const result = {};
   const env = buildEnvWithTools();
-  for (const [name, entry] of Object.entries(TOOL_CATALOG)) {
+  const entries = Object.entries(TOOL_CATALOG);
+  const installed = [];
+  for (const [name, entry] of entries) {
     if (!isToolInstalled(name)) {
       result[name] = { installed: false };
-      continue;
+    } else {
+      installed.push([name, entry]);
     }
+  }
+  await Promise.all(installed.map(async ([name, entry]) => {
     const state = { installed: true };
     if (entry.versionCmd) {
       try {
-        const r = spawnSync("sh", ["-c", entry.versionCmd], { env, timeout: 5000, encoding: "utf-8" });
+        const r = await execShellAsync(entry.versionCmd, env, 5000);
         if (r.status === 0)
-          state.version = (r.stdout || "").toString().trim().slice(0, 100);
+          state.version = r.stdout.trim().slice(0, 100);
       } catch {}
     }
     if (entry.statusCmd) {
       try {
-        const r = spawnSync("sh", ["-c", entry.statusCmd], { env, timeout: 1e4, encoding: "utf-8" });
+        const r = await execShellAsync(entry.statusCmd, env, 1e4);
         state.authenticated = r.status === 0;
-        state.statusOutput = (r.stdout || r.stderr || "").toString().trim().slice(0, 200);
+        state.statusOutput = (r.stdout || r.stderr).trim().slice(0, 200);
       } catch {
         state.authenticated = false;
       }
@@ -49372,7 +49388,7 @@ function scanCatalogTools() {
       state.authenticated = true;
     }
     result[name] = state;
-  }
+  }));
   return result;
 }
 var MOUNT_FLAGS = [
@@ -50906,8 +50922,10 @@ async function readFileContent(filePath, rootPath, fallbackRootPaths) {
 import os5 from "os";
 import fs8 from "fs";
 import path5 from "path";
+import { spawn as nodeSpawn } from "child_process";
 var IS_WIN = os5.platform() === "win32";
-var HAS_BUN_TERMINAL = typeof Bun.Terminal === "function";
+var HAS_BUN = typeof globalThis.Bun !== "undefined";
+var HAS_BUN_TERMINAL = HAS_BUN && typeof Bun.Terminal === "function";
 function whichSync(name) {
   const dirs = (process.env.PATH || "").split(path5.delimiter);
   const exts = IS_WIN ? ["", ".exe", ".cmd", ".bat"] : [""];
@@ -51011,6 +51029,13 @@ ${this.lastPart}`;
     }
     const all = current ? [...this.savedSegments, current] : [...this.savedSegments];
     return all.join(`
+`);
+  }
+  getRawIfComplete() {
+    if (this.truncated)
+      return null;
+    const all = this.firstPart ? [...this.savedSegments, this.firstPart] : [...this.savedSegments];
+    return all.join(`
 `);
   }
 }
@@ -51134,29 +51159,51 @@ async function executeBlock(blockId, content, send, todoId, messageId, timeout,
       });
     };
     const spawnWithPipes = () => {
-      const proc = Bun.spawn([sc2.shell, ...sc2.args], {
-        cwd,
-        env,
-        stdin: "pipe",
-        stdout: "pipe",
-        stderr: "pipe"
-      });
-      const handle = { proc, pid: proc.pid };
-      processes.set(blockId, handle);
-      const timer = startTimeout();
-      const pipeStream = async (stream) => {
-        if (!stream)
-          return;
-        const decoder = new TextDecoder;
-        for await (const chunk of stream) {
-          await onData(decoder.decode(chunk, { stream: true }));
-        }
-      };
-      Promise.all([
-        pipeStream(proc.stdout),
-        pipeStream(proc.stderr),
-        proc.exited
-      ]).then(([, , code]) => onExit(code ?? -1, timer)).catch(() => onExit(-1, timer));
+      if (HAS_BUN) {
+        const proc = Bun.spawn([sc2.shell, ...sc2.args], {
+          cwd,
+          env,
+          stdin: "pipe",
+          stdout: "pipe",
+          stderr: "pipe"
+        });
+        const handle = { proc, pid: proc.pid };
+        processes.set(blockId, handle);
+        const timer = startTimeout();
+        const pipeStream = async (stream) => {
+          if (!stream)
+            return;
+          const decoder = new TextDecoder;
+          for await (const chunk of stream) {
+            await onData(decoder.decode(chunk, { stream: true }));
+          }
+        };
+        Promise.all([
+          pipeStream(proc.stdout),
+          pipeStream(proc.stderr),
+          proc.exited
+        ]).then(([, , code]) => onExit(code ?? -1, timer)).catch(() => onExit(-1, timer));
+      } else {
+        const proc = nodeSpawn(sc2.shell, sc2.args, {
+          cwd,
+          env,
+          stdio: ["pipe", "pipe", "pipe"]
+        });
+        const handle = { proc, pid: proc.pid ?? -1 };
+        processes.set(blockId, handle);
+        const timer = startTimeout();
+        let exited = false;
+        const exit = (code) => {
+          if (!exited) {
+            exited = true;
+            onExit(code, timer);
+          }
+        };
+        proc.stdout?.on("data", (chunk) => onData(chunk.toString()));
+        proc.stderr?.on("data", (chunk) => onData(chunk.toString()));
+        proc.on("close", (code) => exit(code ?? -1));
+        proc.on("error", () => exit(-1));
+      }
     };
     if (HAS_BUN_TERMINAL) {
       try {
@@ -51241,6 +51288,9 @@ function waitForCompletion(blockId, timeoutMs) {
 function getBlockOutput(blockId) {
   return outputBuffers.get(blockId)?.getOutput() ?? "";
 }
+function getBlockRawOutput(blockId) {
+  return outputBuffers.get(blockId)?.getRawIfComplete() ?? null;
+}
 function clearBlockOutput(blockId) {
   outputBuffers.delete(blockId);
 }
@@ -51296,7 +51346,7 @@ register("install_tool", async (args) => {
   if (!name || !(name in TOOL_CATALOG)) {
     return { success: false, error: `Unknown tool: ${name}` };
   }
-  const scan = scanCatalogTools();
+  const scan = await scanCatalogTools();
   if (scan[name]?.installed) {
     return { success: true, alreadyInstalled: true, tool: name };
   }
@@ -51306,7 +51356,7 @@ register("install_tool", async (args) => {
   }
   const edge = getGlobalEdgeInstance();
   if (edge) {
-    await edge.updateConfig({ installedTools: scanCatalogTools() });
+    await edge.updateConfig({ installedTools: await scanCatalogTools() });
   }
   return { success: true, tool: name, label: TOOL_CATALOG[name].label };
 });
@@ -51319,7 +51369,7 @@ register("uninstall_tool", async (args) => {
   if (success) {
     const edge = getGlobalEdgeInstance();
     if (edge)
-      await edge.updateConfig({ installedTools: scanCatalogTools() });
+      await edge.updateConfig({ installedTools: await scanCatalogTools() });
   }
   return { success, tool: name };
 });
@@ -51455,6 +51505,19 @@ function extractTrailingTail(cmd) {
 `).slice(-n).join(`
 `) };
 }
+var DATA_URL_IMAGE_REGEX = /^data:(image\/[^;]+);base64,[A-Za-z0-9+/]+=*$/;
+function detectContentType(output, cmd) {
+  const trimmed = output.trim();
+  const match = trimmed.match(DATA_URL_IMAGE_REGEX);
+  if (match) {
+    console.log(`
+\uD83D\uDDBC️  [edge] Image output detected! type=${match[1]} size=${trimmed.length} chars${cmd ? `
+    cmd: ${cmd}` : ""}
+`);
+    return { result: trimmed, contentType: match[1] };
+  }
+  return { result: output };
+}
 register("execute_shell_command", async (args, client) => {
   const { cmd, timeout = 120, root_path = "", todoId = "", messageId = "", blockId = "" } = args;
   const canStream = !!(todoId && blockId && client);
@@ -51465,7 +51528,7 @@ register("execute_shell_command", async (args, client) => {
         resolve((stdout || "") + (stderr || ""));
       });
     });
-    return { cmd, result };
+    return { cmd, ...detectContentType(result, cmd) };
   }
   const { execCmd, postFilter } = extractTrailingTail(cmd);
   try {
@@ -51476,11 +51539,12 @@ register("execute_shell_command", async (args, client) => {
       return { __awaiting_approval__: true };
     }
     await waitForCompletion(blockId, (timeout + 5) * 1000);
-    let output = getBlockOutput(blockId);
+    const rawOutput = getBlockRawOutput(blockId);
+    let output = rawOutput ?? getBlockOutput(blockId);
     clearBlockOutput(blockId);
     if (postFilter)
       output = postFilter(output);
-    return { cmd, result: output };
+    return rawOutput !== null ? { cmd, ...detectContentType(output, cmd) } : { cmd, result: output };
   } catch (e) {
     throw e;
   } finally {
@@ -51908,6 +51972,8 @@ class TODOforAIEdge {
   addWorkspacePath;
   frontendWs = null;
   browserExtensionBridge;
+  stopping = false;
+  reconnectTimer;
   edgeConfig = {
     id: "",
     name: "Name uninitialized",
@@ -52086,7 +52152,7 @@ class TODOforAIEdge {
       id2 += String.fromCharCode(frame[i10]);
     const data = frame.slice(36);
     this.pendingBinaries.set(id2, data);
-    setTimeout(() => this.pendingBinaries.delete(id2), 60000);
+    setTimeout(() => this.pendingBinaries.delete(id2), 60000).unref();
   }
   async handleMessage(raw) {
     let data;
@@ -52118,7 +52184,7 @@ class TODOforAIEdge {
         this.edgeConfig.id = this.edgeId;
         console.log(`\x1B[32m\x1B[1m\uD83D\uDD17 Connected edge=${this.edgeId} user=${this.userId}\x1B[0m`);
         run(async () => {
-          this.updateConfig({ installedTools: scanCatalogTools() });
+          this.updateConfig({ installedTools: await scanCatalogTools() });
           autoMountRcloneRemotes();
         });
         break;
@@ -52258,10 +52324,12 @@ class TODOforAIEdge {
     console.log(`\x1B[36m\x1B[1m\uD83D\uDC46 Fingerprint:\x1B[0m ${this.fingerprint}`);
     const maxAttempts = 20;
     let attempt = 0;
-    while (attempt < maxAttempts) {
+    while (attempt < maxAttempts && !this.stopping) {
       console.log(`[info] Connecting (attempt ${attempt + 1}/${maxAttempts})`);
       try {
         await this.connect();
+        if (this.stopping)
+          break;
         attempt = 0;
       } catch (e) {
         if (e instanceof AuthenticationError) {
@@ -52278,16 +52346,26 @@ class TODOforAIEdge {
         this.connected = false;
         this.ws = null;
       }
-      if (attempt > 0 && attempt < maxAttempts) {
+      if (attempt > 0 && attempt < maxAttempts && !this.stopping) {
         const delay = Math.min(4 + attempt, 20);
         console.log(`[info] Reconnecting in ${delay}s...`);
-        await new Promise((r) => setTimeout(r, delay * 1000));
+        await new Promise((r) => {
+          this.reconnectTimer = setTimeout(r, delay * 1000);
+        });
       }
     }
     if (attempt >= maxAttempts) {
       console.error("\x1B[31mMax reconnection attempts reached.\x1B[0m");
     }
   }
+  stop() {
+    this.stopping = true;
+    clearTimeout(this.reconnectTimer);
+    this.stopHeartbeat();
+    this.browserExtensionBridge.stop();
+    this.frontendWs?.close();
+    this.ws?.terminate();
+  }
   async getFrontendWs() {
     if (!this.frontendWs || !this.frontendWs.connected) {
       this.frontendWs = new FrontendWebSocket(this.api.apiUrl, this.api.apiKey);
@@ -52355,7 +52433,7 @@ function killExistingEdge(lp2) {
         } catch {
           break;
         }
-        Bun.sleepSync(100);
+        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
       }
       try {
         process.kill(pid, "SIGKILL");
@@ -52398,13 +52476,24 @@ async function main() {
     console.error("\x1B[31mAnother edge is already running for this user+server. Use --kill to replace it.\x1B[0m");
     process.exit(1);
   }
+  let cleaned = false;
   const cleanup = () => {
+    if (cleaned)
+      return;
+    cleaned = true;
+    edge.stop();
     unmountAllRclone();
     releaseLock(lp2);
   };
   process.on("exit", cleanup);
-  process.on("SIGINT", () => process.exit(0));
-  process.on("SIGTERM", () => process.exit(0));
+  process.on("SIGINT", () => {
+    cleanup();
+    process.exit(0);
+  });
+  process.on("SIGTERM", () => {
+    cleanup();
+    process.exit(0);
+  });
   await edge.start();
 }
 main().catch((e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todoforai/edge",
-  "version": "0.12.13",
+  "version": "0.12.15",
   "type": "module",
   "bin": {
     "todoforai-edge": "dist/index.js"