@todoforai/edge 0.12.14 → 0.12.16

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";
@@ -49106,7 +49110,7 @@ function buildEnvWithTools() {
 }
 function whichWithTools(name) {
   const dirs = [...toolPathEntries(), ...(process.env.PATH || "").split(path3.delimiter)];
-  const exts = os3.platform() === "win32" ? ["", ".exe", ".cmd", ".bat"] : [""];
+  const exts = os3.platform() === "win32" ? [".exe", ".cmd", ".bat", ""] : [""];
   for (const dir of dirs) {
     for (const ext of exts) {
       const full = path3.join(dir, name + ext);
@@ -49214,12 +49218,18 @@ function findFileRecursive(dir, names) {
   return null;
 }
 function installWithNpm(name, pkg) {
-  const npm = whichWithTools("npm") || "npm";
   log2("info", `Installing ${name} via npm (${pkg})`);
-  const result = spawnSync(npm, ["install", "--prefix", TOOLS_DIR, pkg], {
+  const result = spawnSync("npm", ["install", "--prefix", TOOLS_DIR, pkg], {
     stdio: "pipe",
-    timeout: 120000
+    timeout: 120000,
+    shell: true
   });
+  if (result.error) {
+    throw new Error(`npm install failed: ${result.error.message}`);
+  }
+  if (result.signal) {
+    throw new Error(`npm install killed by ${result.signal}${result.signal === "SIGTERM" ? " (likely timed out after 120s)" : ""}`);
+  }
   if (result.status !== 0) {
     throw new Error(`npm install failed: ${result.stderr?.toString() || result.stdout?.toString() || `exit code ${result.status}`}`);
   }
@@ -49278,7 +49288,9 @@ function installWithPip(name, pkg) {
   log2("info", `Installing ${name} via pip (${pkg})`);
   const args = useVenv ? ["-m", "pip", "install", pkg] : ["-m", "pip", "install", "--user", pkg];
   const result = spawnSync(python, args, { stdio: "pipe", timeout: 120000 });
-  if (result.status !== 0) {
+  if (result.signal) {
+    log2("error", `Failed to install ${name}: killed by ${result.signal}${result.signal === "SIGTERM" ? " (likely timed out after 120s)" : ""}`);
+  } else if (result.status !== 0) {
     log2("error", `Failed to install ${name}: ${result.stderr?.toString() || result.stdout?.toString()}`);
   }
 }
@@ -49330,8 +49342,7 @@ function uninstallTool(name) {
           fs3.unlinkSync(p);
       }
     } else if (installerType === "npm") {
-      const npm = whichWithTools("npm") || "npm";
-      spawnSync(npm, ["uninstall", "--prefix", TOOLS_DIR, pkg], { stdio: "pipe", timeout: 30000 });
+      spawnSync("npm", ["uninstall", "--prefix", TOOLS_DIR, pkg], { stdio: "pipe", timeout: 30000, shell: true });
     } else if (installerType === "pip") {
       const venvPython = os3.platform() === "win32" ? path3.join(TOOLS_DIR, "venv", "Scripts", "python.exe") : path3.join(TOOLS_DIR, "venv", "bin", "python");
       const python = fs3.existsSync(venvPython) ? venvPython : "python3";
@@ -49344,27 +49355,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 +49395,7 @@ function scanCatalogTools() {
       state.authenticated = true;
     }
     result[name] = state;
-  }
+  }));
   return result;
 }
 var MOUNT_FLAGS = [
@@ -51272,6 +51295,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);
 }
@@ -51327,7 +51353,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 };
   }
@@ -51337,7 +51363,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 };
 });
@@ -51350,7 +51376,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 };
 });
@@ -51486,6 +51512,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);
@@ -51496,7 +51535,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 {
@@ -51507,11 +51546,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 {
@@ -51939,6 +51979,8 @@ class TODOforAIEdge {
   addWorkspacePath;
   frontendWs = null;
   browserExtensionBridge;
+  stopping = false;
+  reconnectTimer;
   edgeConfig = {
     id: "",
     name: "Name uninitialized",
@@ -52117,7 +52159,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;
@@ -52149,7 +52191,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;
@@ -52268,6 +52310,10 @@ class TODOforAIEdge {
         console.log(`[info] WebSocket closed code=${code} clean=${clean} reason=${reasonText}`);
         if (code === 4001) {
           console.log(`\x1B[33m[info] ${reasonText}. Not reconnecting.\x1B[0m`);
+          console.log(`\x1B[33m[info] To replace the existing connection, restart with: todoforai-edge --kill\x1B[0m`);
+          reject(new ServerError(reasonText));
+        } else if (code === 4002) {
+          console.log(`\x1B[33m[info] ${reasonText}. This instance was replaced by a new connection.\x1B[0m`);
           reject(new ServerError(reasonText));
         } else {
           resolve();
@@ -52289,10 +52335,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) {
@@ -52309,16 +52357,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);
@@ -52426,16 +52484,27 @@ async function main() {
   await edge.ensureApiKey(true);
   const lp2 = lockPath(config.apiUrl, edge.userId);
   if (!acquireLock(lp2, config.kill)) {
-    console.error("\x1B[31mAnother edge is already running for this user+server. Use --kill to replace it.\x1B[0m");
+    console.error(`\x1B[31mAnother edge is already running for this user+server. Use --kill to replace it, or delete the lock file: ${lp2}\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.14",
+  "version": "0.12.16",
   "type": "module",
   "bin": {
     "todoforai-edge": "dist/index.js"