67router 1.0.3 → 1.0.7

package/cli.js

@@ -660,6 +660,60 @@ function startServer(updatePromise) {
 
   let server = spawnServer();
 
+  function attachServerEvents() {
+    server.on("error", (err) => {
+      console.error("Failed to start server:", err.message);
+      if (!isShuttingDown) tryRestart();
+      else { cleanup(); process.exit(1); }
+    });
+
+    server.on("close", (code) => {
+      if (isShuttingDown) {
+        process.exit(code || 0);
+        return;
+      }
+      tryRestart(code);
+    });
+  }
+
+  function tryRestart(code) {
+    const aliveMs = Date.now() - serverStartTime;
+    // Reset counter if last run was stable
+    if (aliveMs >= RESTART_RESET_MS) restartCount = 0;
+
+    if (restartCount >= MAX_RESTARTS) {
+      console.error(`\n⚠️  Server crashed ${MAX_RESTARTS} times. Disabling MIT and restarting...`);
+      try {
+        const dbPath = path.join(getAppDataDir(), "db.json");
+        if (fs.existsSync(dbPath)) {
+          const db = JSON.parse(fs.readFileSync(dbPath, "utf-8"));
+          if (db.settings) db.settings.mitmEnabled = false;
+          fs.writeFileSync(dbPath, JSON.stringify(db, null, 2));
+        }
+      } catch { /* best effort */ }
+      restartCount = 0;
+      server = spawnServer();
+      attachServerEvents();
+      return;
+    }
+
+    restartCount++;
+    const delay = Math.min(1000 * restartCount, 10000);
+    console.error(`\n⚠️  Server exited (code=${code ?? "unknown"}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
+    if (crashLog.length) {
+      console.error("\n--- Server crash log ---");
+      crashLog.forEach(l => console.error(l));
+      console.error("--- End crash log ---\n");
+    }
+
+    setTimeout(() => {
+      server = spawnServer();
+      attachServerEvents();
+    }, delay);
+  }
+
+  attachServerEvents();
+
   // Cleanup function - force kill server process
   let isCleaningUp = false;
   function cleanup() {
@@ -838,58 +892,4 @@ function startServer(updatePromise) {
       process.exit(1);
     }
   });
-
-  function attachServerEvents() {
-    server.on("error", (err) => {
-      console.error("Failed to start server:", err.message);
-      if (!isShuttingDown) tryRestart();
-      else { cleanup(); process.exit(1); }
-    });
-
-    server.on("close", (code) => {
-      if (isShuttingDown || code === 0) {
-        process.exit(code || 0);
-        return;
-      }
-      tryRestart(code);
-    });
-  }
-
-  function tryRestart(code) {
-    const aliveMs = Date.now() - serverStartTime;
-    // Reset counter if last run was stable
-    if (aliveMs >= RESTART_RESET_MS) restartCount = 0;
-
-    if (restartCount >= MAX_RESTARTS) {
-      console.error(`\n⚠️  Server crashed ${MAX_RESTARTS} times. Disabling MIT and restarting...`);
-      try {
-        const dbPath = path.join(getAppDataDir(), "db.json");
-        if (fs.existsSync(dbPath)) {
-          const db = JSON.parse(fs.readFileSync(dbPath, "utf-8"));
-          if (db.settings) db.settings.mitmEnabled = false;
-          fs.writeFileSync(dbPath, JSON.stringify(db, null, 2));
-        }
-      } catch { /* best effort */ }
-      restartCount = 0;
-      server = spawnServer();
-      attachServerEvents();
-      return;
-    }
-
-    restartCount++;
-    const delay = Math.min(1000 * restartCount, 10000);
-    console.error(`\n⚠️  Server exited (code=${code ?? "unknown"}). Restarting in ${delay / 1000}s... (${restartCount}/${MAX_RESTARTS})`);
-    if (crashLog.length) {
-      console.error("\n--- Server crash log ---");
-      crashLog.forEach(l => console.error(l));
-      console.error("--- End crash log ---\n");
-    }
-
-    setTimeout(() => {
-      server = spawnServer();
-      attachServerEvents();
-    }, delay);
-  }
-
-  attachServerEvents();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "67router",
-  "version": "1.0.3",
+  "version": "1.0.7",
   "description": "67Router CLI - Start and manage 67Router server",
   "bin": {
     "67router": "./cli.js",
@@ -24,12 +24,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
+    "confbox": "^0.2.4",
     "enquirer": "^2.4.1",
-    "node-forge": "^1.3.3",
     "node-machine-id": "^1.1.12",
     "react": "19.2.1",
-    "react-dom": "19.2.1",
-    "confbox": "^0.2.4"
+    "react-dom": "19.2.1"
   },
   "comment_sqlite": "sql.js + better-sqlite3 are NOT bundled here. They are installed into ~/.9router/runtime/node_modules by hooks/postinstall.js (and re-checked at runtime by cli.js). This avoids Windows EBUSY errors when updating the global CLI, since native .node files no longer live under the locked install dir.",
   "comment_systray": "systray2 is NOT bundled here. It is lazy-installed into ~/.9router/runtime/node_modules by hooks/postinstall.js on macOS/Linux only. Windows uses PowerShell NotifyIcon (zero binary). This avoids shipping unsigned Go binaries that trigger antivirus false positives (Kaspersky). We use the systray2 fork because the legacy systray@1.0.5 ships a 2017 x86_64 binary that fails to load on modern macOS dyld. Neither package ships an arm64 macOS binary, so on Apple Silicon hooks/trayRuntime.js overlays our own arm64 build from the tray-binaries GitHub release; without it the tray requires Rosetta 2.",

package/src/cli/tray/tray.ps1

@@ -6,6 +6,9 @@ $ErrorActionPreference = "Stop"
 
 Add-Type @"
 using System;
+using System.IO;
+using System.Collections.Concurrent;
+using System.Threading;
 using System.Runtime.InteropServices;
 
 public static class WinDpiAwareness {
@@ -24,6 +27,45 @@ public static class WinDpiAwareness {
   [DllImport("user32.dll")]
   public static extern bool SetProcessDPIAware();
 }
+
+public static class StdinReader {
+  private static readonly ConcurrentQueue<string> _queue = new ConcurrentQueue<string>();
+  private static Thread _thread;
+  private static volatile bool _running = false;
+
+  public static void Start() {
+    if (_running) return;
+    _running = true;
+    _thread = new Thread(Run) {
+      IsBackground = true,
+      Name = "StdinReaderThread"
+    };
+    _thread.Start();
+  }
+
+  public static void Stop() {
+    _running = false;
+  }
+
+  private static void Run() {
+    try {
+      string line;
+      while (_running && (line = Console.ReadLine()) != null) {
+        if (!string.IsNullOrWhiteSpace(line)) {
+          _queue.Enqueue(line);
+        }
+      }
+    } catch { }
+  }
+
+  public static string TryReadLine() {
+    string line;
+    if (_queue.TryDequeue(out line)) {
+      return line;
+    }
+    return null;
+  }
+}
 "@
 
 function Enable-HighDpiAwareness {
@@ -61,8 +103,17 @@ $OutputEncoding = [System.Text.Encoding]::UTF8
 [System.Windows.Forms.Application]::EnableVisualStyles()
 [System.Windows.Forms.Application]::SetCompatibleTextRenderingDefault($false)
 
+# Safe tooltip truncation (Win32 NotifyIcon.Text max 63 characters)
+if ($Tooltip -and $Tooltip.Length -gt 63) {
+  $Tooltip = $Tooltip.Substring(0, 63)
+}
+
 $script:notifyIcon = New-Object System.Windows.Forms.NotifyIcon
-$script:notifyIcon.Icon = New-Object System.Drawing.Icon($IconPath)
+try {
+  $script:notifyIcon.Icon = New-Object System.Drawing.Icon($IconPath)
+} catch {
+  $script:notifyIcon.Icon = [System.Drawing.SystemIcons]::Application
+}
 $script:notifyIcon.Text = $Tooltip
 $script:notifyIcon.Visible = $true
 
@@ -71,9 +122,11 @@ $script:notifyIcon.ContextMenuStrip = $script:menu
 $script:items = @()
 
 function Write-Event($obj) {
-  $json = $obj | ConvertTo-Json -Compress
-  [Console]::Out.WriteLine($json)
-  [Console]::Out.Flush()
+  try {
+    $json = $obj | ConvertTo-Json -Compress
+    [Console]::Out.WriteLine($json)
+    [Console]::Out.Flush()
+  } catch {}
 }
 
 function Add-MenuItem($index, $title, $enabled) {
@@ -94,19 +147,19 @@ function Update-MenuItem($index, $title, $enabled) {
 }
 
 function Set-Tooltip($text) {
-  # NotifyIcon.Text max 63 chars
-  if ($text.Length -gt 63) { $text = $text.Substring(0, 63) }
+  if ($text -and $text.Length -gt 63) { $text = $text.Substring(0, 63) }
   $script:notifyIcon.Text = $text
 }
 
-# Background reader thread polls stdin via timer on UI thread
+# Start non-blocking background stdin reader thread
+[StdinReader]::Start()
+
+# UI thread timer polls thread-safe queue without blocking message loop
 $script:timer = New-Object System.Windows.Forms.Timer
 $script:timer.Interval = 100
 $script:timer.Add_Tick({
   try {
-    while ([Console]::In.Peek() -ne -1) {
-      $line = [Console]::In.ReadLine()
-      if ([string]::IsNullOrWhiteSpace($line)) { continue }
+    while ($null -ne ($line = [StdinReader]::TryReadLine())) {
       $cmd = $line | ConvertFrom-Json
       switch ($cmd.action) {
         "add-item"    { Add-MenuItem $cmd.index $cmd.title $cmd.enabled }
@@ -114,6 +167,7 @@ $script:timer.Add_Tick({
         "set-tooltip" { Set-Tooltip $cmd.text }
         "ready"       { Write-Event @{ type = "ready" } }
         "kill"        {
+          [StdinReader]::Stop()
           $script:notifyIcon.Visible = $false
           $script:notifyIcon.Dispose()
           [System.Windows.Forms.Application]::Exit()

package/src/cli/tray/trayWin.js

@@ -2,27 +2,21 @@ const { spawn } = require("child_process");
 const path = require("path");
 const readline = require("readline");
 
-// PowerShell-based tray for Windows (AV-safe, zero binary deps)
-
 let psProcess = null;
 let clickHandler = null;
+let activeOptions = null;
+let isKilled = false;
 
-/**
- * Send JSON command to PowerShell tray process via stdin
- */
 function sendCommand(cmd) {
-  if (psProcess && psProcess.stdin.writable) {
-    psProcess.stdin.write(`${JSON.stringify(cmd)}\n`, "utf8");
+  if (psProcess && psProcess.stdin && psProcess.stdin.writable) {
+    try {
+      psProcess.stdin.write(`${JSON.stringify(cmd)}\n`, "utf8");
+    } catch (e) {}
   }
 }
 
-/**
- * Initialize Windows tray using PowerShell NotifyIcon
- * @param {Object} options - { iconPath, tooltip, items, onClick }
- *   items: [{ title, enabled }]
- * @returns {Object|null} controller with sendAction/kill
- */
-function initWinTray(options) {
+function spawnTray(options) {
+  if (isKilled) return null;
   const { iconPath, tooltip, items, onClick } = options;
   clickHandler = onClick;
 
@@ -60,19 +54,48 @@ function initWinTray(options) {
   psProcess.on("error", () => {});
   psProcess.stderr.on("data", () => {});
 
-  // Send initial menu items
+  psProcess.on("close", () => {
+    psProcess = null;
+    if (!isKilled && activeOptions) {
+      setTimeout(() => {
+        if (!isKilled && activeOptions) {
+          spawnTray(activeOptions);
+        }
+      }, 1500);
+    }
+  });
+
   items.forEach((item, index) => {
     sendCommand({ action: "add-item", index, title: item.title, enabled: item.enabled });
   });
 
+  return psProcess;
+}
+
+function initWinTray(options) {
+  isKilled = false;
+  activeOptions = {
+    ...options,
+    items: options.items.map((it) => ({ ...it }))
+  };
+
+  const proc = spawnTray(activeOptions);
+  if (!proc) return null;
+
   return {
     updateItem(index, title, enabled) {
+      if (activeOptions && activeOptions.items && activeOptions.items[index]) {
+        activeOptions.items[index] = { title, enabled };
+      }
       sendCommand({ action: "update-item", index, title, enabled });
     },
     setTooltip(text) {
+      if (activeOptions) activeOptions.tooltip = text;
       sendCommand({ action: "set-tooltip", text });
     },
     kill() {
+      isKilled = true;
+      activeOptions = null;
       try {
         sendCommand({ action: "kill" });
       } catch (e) {}