9router 0.4.29 → 0.4.33

package/cli.js

@@ -44,6 +44,7 @@ function createSpinner(text) {
 
 const pkg = require("./package.json");
 const { ensureSqliteRuntime, buildEnvWithRuntime } = require("./hooks/sqliteRuntime");
+const { ensureTrayRuntime } = require("./hooks/trayRuntime");
 const args = process.argv.slice(2);
 
 // Self-heal SQLite runtime deps (sql.js + better-sqlite3) into ~/.9router/runtime
@@ -51,6 +52,9 @@ const args = process.argv.slice(2);
 // better-sqlite3 is optional. Logs to stderr only on failure.
 try { ensureSqliteRuntime({ silent: true }); } catch {}
 
+// Self-heal tray runtime (systray for macOS/Linux only). Windows skipped.
+try { ensureTrayRuntime({ silent: true }); } catch {}
+
 // Configuration constants
 const APP_NAME = pkg.name; // Use from package.json
 const INSTALL_CMD_LATEST = `npm i -g ${APP_NAME}@latest --prefer-online`;

package/hooks/postinstall.js

@@ -4,6 +4,7 @@
 // `9router` start doesn't need network. Failure here is non-fatal —
 // cli.js will retry at runtime if anything is missing.
 const { ensureSqliteRuntime } = require("./sqliteRuntime");
+const { ensureTrayRuntime } = require("./trayRuntime");
 
 try {
   ensureSqliteRuntime({ silent: false });
@@ -12,4 +13,10 @@ try {
   console.warn(`[9router] runtime warm-up skipped: ${e.message}`);
 }
 
+try {
+  ensureTrayRuntime({ silent: false });
+} catch (e) {
+  console.warn(`[9router] tray runtime skipped: ${e.message}`);
+}
+
 process.exit(0);

package/hooks/trayRuntime.js

@@ -0,0 +1,84 @@
+// Lazy install systray for macOS/Linux into USER_DATA_DIR/runtime/node_modules.
+// Windows uses PowerShell NotifyIcon (no binary) → no systray needed.
+// This keeps the published npm tarball free of unsigned Go binaries that
+// trigger antivirus false positives (e.g. Kaspersky flagging tray_windows.exe).
+const { spawnSync } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const { getRuntimeDir, getRuntimeNodeModules } = require("./sqliteRuntime");
+
+const SYSTRAY_VERSION = "1.0.5";
+
+function hasSystray() {
+  return fs.existsSync(path.join(getRuntimeNodeModules(), "systray", "package.json"));
+}
+
+// Remove legacy systray from all known locations on Windows (AV false positive cleanup)
+function cleanupWindowsSystray({ silent = false } = {}) {
+  if (process.platform !== "win32") return;
+  // 1) Runtime dir: %APPDATA%\9router\runtime\node_modules\systray
+  // 2) npm global nested: <npm_prefix>\node_modules\9router\node_modules\systray
+  //    __dirname here = <npm_prefix>\node_modules\9router\hooks → up 1 = pkg root
+  const targets = [
+    path.join(getRuntimeNodeModules(), "systray"),
+    path.join(__dirname, "..", "node_modules", "systray")
+  ];
+  for (const dir of targets) {
+    if (fs.existsSync(dir)) {
+      try {
+        fs.rmSync(dir, { recursive: true, force: true });
+        if (!silent) console.log(`[9router][runtime] removed legacy systray: ${dir}`);
+      } catch (e) {
+        if (!silent) console.warn(`[9router][runtime] failed to remove ${dir}: ${e.message}`);
+      }
+    }
+  }
+}
+
+function ensureRuntimeDir() {
+  const dir = getRuntimeDir();
+  if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+  const pkgPath = path.join(dir, "package.json");
+  if (!fs.existsSync(pkgPath)) {
+    fs.writeFileSync(pkgPath, JSON.stringify({
+      name: "9router-runtime",
+      version: "1.0.0",
+      private: true
+    }, null, 2));
+  }
+  return dir;
+}
+
+function npmInstall(pkgs, { silent = false } = {}) {
+  const cwd = ensureRuntimeDir();
+  const args = ["install", ...pkgs, "--no-audit", "--no-fund", "--no-save", "--prefer-online"];
+  const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
+  if (!silent) console.log(`[9router][runtime] ${npmCmd} ${args.join(" ")}  (cwd: ${cwd})`);
+  const res = spawnSync(npmCmd, args, {
+    cwd,
+    stdio: silent ? "ignore" : "inherit",
+    timeout: 120000,
+    shell: process.platform === "win32"
+  });
+  return res.status === 0;
+}
+
+// Public: ensure systray is installed on macOS/Linux only.
+// Windows skips entirely (uses PowerShell tray).
+function ensureTrayRuntime({ silent = false } = {}) {
+  if (process.platform === "win32") {
+    cleanupWindowsSystray({ silent });
+    return { systray: false, skipped: true };
+  }
+  if (hasSystray()) {
+    if (!silent) console.log("[9router][runtime] systray OK");
+    return { systray: true };
+  }
+  const ok = npmInstall([`systray@${SYSTRAY_VERSION}`], { silent });
+  if (!ok && !silent) {
+    console.warn("[9router][runtime] systray install failed (tray will be disabled)");
+  }
+  return { systray: ok && hasSystray() };
+}
+
+module.exports = { ensureTrayRuntime };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "9router",
-  "version": "0.4.29",
+  "version": "0.4.33",
   "description": "9Router CLI - Start and manage 9Router server",
   "bin": {
     "9router": "./cli.js"
@@ -21,10 +21,10 @@
     "node-forge": "^1.3.3",
     "node-machine-id": "^1.1.12",
     "react": "19.2.1",
-    "react-dom": "19.2.1",
-    "systray": "^1.0.5"
+    "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": "systray 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 the unsigned Go binary tray_windows.exe that triggers antivirus false positives (Kaspersky).",
   "engines": {
     "node": ">=18.0.0"
   },

package/src/cli/menus/settings.js

@@ -50,6 +50,11 @@ async function showSettingsMenu(breadcrumb = []) {
       const rtkOn = data?.settings?.rtkEnabled !== false;
       lines.push(`  RTK:      ${rtkOn ? `${COLORS.green}ON${COLORS.reset}` : `${COLORS.red}OFF${COLORS.reset}`} ${COLORS.dim}(Token Saver)${COLORS.reset}`);
 
+      // Auth mode section
+      const authMode = data?.settings?.authMode || "password";
+      const authColor = authMode === "password" ? COLORS.green : COLORS.yellow;
+      lines.push(`  Auth:     ${authColor}${authMode.toUpperCase()}${COLORS.reset} ${COLORS.dim}(login mode)${COLORS.reset}`);
+
       return lines.join("\n");
     },
     refresh: async () => {
@@ -81,11 +86,39 @@ async function showSettingsMenu(breadcrumb = []) {
       {
         label: "🔑 Reset Password to Default",
         action: async () => { await resetPassword(); return true; }
+      },
+      {
+        label: (d) => {
+          const mode = d?.settings?.authMode || "password";
+          return mode === "password" ? "🔓 Reset Auth Mode (already password)" : `🔓 Reset Auth Mode to Password (current: ${mode})`;
+        },
+        action: async () => { await resetAuthMode(); return true; }
       }
     ]
   });
 }
 
+/**
+ * Reset authMode to "password" via API. Used when OIDC is misconfigured
+ * and user is locked out of dashboard. CLI bypasses auth via x-9r-cli-token.
+ */
+async function resetAuthMode() {
+  const ok = await confirm("Reset auth mode to PASSWORD (disable OIDC)?");
+  if (!ok) {
+    showStatus("Cancelled", "info");
+    await pause();
+    return;
+  }
+
+  const result = await api.updateSettings({ authMode: "password" });
+  if (result.success) {
+    showStatus("Auth mode reset to password. OIDC disabled.", "success");
+  } else {
+    showStatus(`Failed: ${result.error}`, "error");
+  }
+  await pause();
+}
+
 /**
  * Enable tunnel via API
  */

package/src/cli/tray/tray.js

@@ -3,9 +3,10 @@ const fs = require("fs");
 const path = require("path");
 
 let trayInstance = null;
+let isWinTray = false;
 
 /**
- * Get icon base64 from file — use .ico on Windows, .png on macOS/Linux
+ * Get icon base64 from file — used for systray (mac/linux)
  */
 function getIconBase64() {
   const isWin = process.platform === "win32";
@@ -26,11 +27,9 @@ function getIconBase64() {
  */
 function isTraySupported() {
   const platform = process.platform;
-  // Supported platforms: darwin (macOS), win32 (Windows), linux
   if (!["darwin", "win32", "linux"].includes(platform)) {
     return false;
   }
-  // Skip on Linux without display (headless server)
   if (platform === "linux" && !process.env.DISPLAY) {
     return false;
   }
@@ -43,122 +42,156 @@ function isTraySupported() {
  * @returns {Object|null} tray instance or null if not supported/failed
  */
 function initTray(options) {
-  // Check OS support first
   if (!isTraySupported()) {
     return null;
   }
 
-  const { port, onQuit, onOpenDashboard } = options;
+  // Windows uses PowerShell NotifyIcon (AV-safe), others use systray
+  if (process.platform === "win32") {
+    return initWindowsTray(options);
+  }
+  return initUnixTray(options);
+}
+
+/**
+ * Build menu items array shared between platforms
+ */
+function buildMenuItems(port, autostartEnabled) {
+  return [
+    { title: `9Router (Port ${port})`, tooltip: "Server is running", enabled: false },
+    { title: "Open Dashboard", tooltip: "Open in browser", enabled: true },
+    {
+      title: autostartEnabled ? "✓ Auto-start Enabled" : "Enable Auto-start",
+      tooltip: "Run on OS startup",
+      enabled: true
+    },
+    { title: "Quit", tooltip: "Stop server and exit", enabled: true }
+  ];
+}
+
+// Menu item indexes
+const MENU_INDEX = { STATUS: 0, DASHBOARD: 1, AUTOSTART: 2, QUIT: 3 };
 
+/**
+ * Get current autostart state
+ */
+function getAutostartEnabled() {
   try {
-    const SysTray = require("systray").default;
+    const { isAutoStartEnabled } = require("./autostart");
+    return isAutoStartEnabled();
+  } catch (e) {
+    return false;
+  }
+}
 
-    // Check if autostart is enabled
-    let autostartEnabled = false;
+/**
+ * Handle menu item click (shared logic)
+ */
+function handleClick(index, options, onAutostartToggle) {
+  const { onQuit, onOpenDashboard, port } = options;
+  if (index === MENU_INDEX.DASHBOARD) {
+    if (onOpenDashboard) onOpenDashboard();
+    else openBrowser(`http://localhost:${port}/dashboard`);
+  } else if (index === MENU_INDEX.AUTOSTART) {
+    const enabled = getAutostartEnabled();
     try {
-      const { isAutoStartEnabled } = require("./autostart");
-      autostartEnabled = isAutoStartEnabled();
+      const { enableAutoStart, disableAutoStart } = require("./autostart");
+      if (enabled) disableAutoStart();
+      else enableAutoStart();
+      onAutostartToggle(!enabled);
     } catch (e) {}
+  } else if (index === MENU_INDEX.QUIT) {
+    console.log("\n👋 Shutting down...");
+    if (onQuit) onQuit();
+    killTray();
+    setTimeout(() => process.exit(0), 500);
+  }
+}
+
+/**
+ * Windows tray via PowerShell NotifyIcon
+ */
+function initWindowsTray(options) {
+  const { port } = options;
+  try {
+    const { initWinTray } = require("./trayWin");
+    const iconPath = path.join(__dirname, "icon.ico");
+    const autostartEnabled = getAutostartEnabled();
+    const items = buildMenuItems(port, autostartEnabled);
+
+    trayInstance = initWinTray({
+      iconPath,
+      tooltip: `9Router - Port ${port}`,
+      items,
+      onClick: (index) => {
+        handleClick(index, options, (newEnabled) => {
+          const newTitle = newEnabled ? "✓ Auto-start Enabled" : "Enable Auto-start";
+          trayInstance.updateItem(MENU_INDEX.AUTOSTART, newTitle, true);
+        });
+      }
+    });
+
+    isWinTray = true;
+    return trayInstance;
+  } catch (err) {
+    return null;
+  }
+}
+
+/**
+ * macOS/Linux tray via systray binary
+ */
+function resolveSystray() {
+  // Try local first (dev), then runtime dir (production lazy install)
+  try {
+    return require("systray").default;
+  } catch (e) {}
+  try {
+    const { getRuntimeNodeModules } = require("../../../hooks/sqliteRuntime");
+    const systrayPath = path.join(getRuntimeNodeModules(), "systray");
+    return require(systrayPath).default;
+  } catch (e) {
+    return null;
+  }
+}
+
+function initUnixTray(options) {
+  const { port } = options;
+  try {
+    const SysTray = resolveSystray();
+    if (!SysTray) return null;
+    const autostartEnabled = getAutostartEnabled();
+    const items = buildMenuItems(port, autostartEnabled);
 
-    const isWin = process.platform === "win32";
     const menu = {
       icon: getIconBase64(),
-      // macOS requires empty title; Windows uses title as the tray icon tooltip
-      title: isWin ? `9Router - Port ${port}` : "",
+      title: "",
       tooltip: `9Router - Port ${port}`,
-      items: [
-        {
-          title: `9Router (Port ${port})`,
-          tooltip: "Server is running",
-          enabled: false
-        },
-        {
-          title: "Open Dashboard",
-          tooltip: "Open in browser",
-          enabled: true
-        },
-        {
-          title: autostartEnabled ? "✓ Auto-start Enabled" : "Enable Auto-start",
-          tooltip: "Run on OS startup",
-          enabled: true
-        },
-        {
-          title: "Quit",
-          tooltip: "Stop server and exit",
-          enabled: true
-        }
-      ]
+      items
     };
 
-    trayInstance = new SysTray({
-      menu,
-      debug: false,
-      copyDir: true
-    });
-
-    // Menu item index: 0=status, 1=dashboard, 2=autostart, 3=quit
-    const AUTOSTART_INDEX = 2;
+    trayInstance = new SysTray({ menu, debug: false, copyDir: true });
+    isWinTray = false;
 
     trayInstance.onClick((action) => {
-      if (action.item.title === "Open Dashboard") {
-        if (onOpenDashboard) {
-          onOpenDashboard();
-        } else {
-          openBrowser(`http://localhost:${port}/dashboard`);
-        }
-      } else if (action.item.title === "✓ Auto-start Enabled") {
-        // Disable autostart
-        try {
-          const { disableAutoStart } = require("./autostart");
-          disableAutoStart();
-          // Update menu item
-          trayInstance.sendAction({
-            type: "update-item",
-            item: {
-              title: "Enable Auto-start",
-              tooltip: "Run on OS startup",
-              enabled: true
-            },
-            seq_id: AUTOSTART_INDEX
-          });
-        } catch (e) {}
-      } else if (action.item.title === "Enable Auto-start") {
-        // Enable autostart
-        try {
-          const { enableAutoStart } = require("./autostart");
-          enableAutoStart();
-          // Update menu item
-          trayInstance.sendAction({
-            type: "update-item",
-            item: {
-              title: "✓ Auto-start Enabled",
-              tooltip: "Run on OS startup",
-              enabled: true
-            },
-            seq_id: AUTOSTART_INDEX
-          });
-        } catch (e) {}
-      } else if (action.item.title === "Quit") {
-        console.log("\n👋 Shutting down...");
-        if (onQuit) {
-          onQuit();
-        }
-        killTray();
-        setTimeout(() => process.exit(0), 500);
-      }
+      handleClick(action.seq_id, options, (newEnabled) => {
+        trayInstance.sendAction({
+          type: "update-item",
+          item: {
+            title: newEnabled ? "✓ Auto-start Enabled" : "Enable Auto-start",
+            tooltip: "Run on OS startup",
+            enabled: true
+          },
+          seq_id: MENU_INDEX.AUTOSTART
+        });
+      });
     });
 
-    trayInstance.onReady(() => {
-      // Tray ready - silent
-    });
-
-    trayInstance.onError((err) => {
-      // Ignore errors during shutdown
-    });
+    trayInstance.onReady(() => {});
+    trayInstance.onError(() => {});
 
     return trayInstance;
   } catch (err) {
-    // Silent fail - tray is optional, app continues without it
     return null;
   }
 }
@@ -168,15 +201,14 @@ function initTray(options) {
  */
 function killTray() {
   const instance = trayInstance;
-  trayInstance = null; // Set to null first to prevent error handlers
-  
+  const wasWin = isWinTray;
+  trayInstance = null;
+
   if (instance) {
     try {
-      // Kill with silent mode to avoid JSON parse errors
-      instance.kill(true);
-    } catch (e) {
-      // Ignore kill errors - tray binary may already be dead
-    }
+      if (wasWin) instance.kill();
+      else instance.kill(true);
+    } catch (e) {}
   }
 }
 

package/src/cli/tray/tray.ps1

@@ -0,0 +1,79 @@
+# 9Router tray icon for Windows using NotifyIcon
+# IPC: stdin JSON commands, stdout JSON events
+param([string]$IconPath, [string]$Tooltip)
+
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+
+$ErrorActionPreference = "Stop"
+[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+[Console]::InputEncoding = [System.Text.Encoding]::UTF8
+$OutputEncoding = [System.Text.Encoding]::UTF8
+
+$script:notifyIcon = New-Object System.Windows.Forms.NotifyIcon
+$script:notifyIcon.Icon = New-Object System.Drawing.Icon($IconPath)
+$script:notifyIcon.Text = $Tooltip
+$script:notifyIcon.Visible = $true
+
+$script:menu = New-Object System.Windows.Forms.ContextMenuStrip
+$script:notifyIcon.ContextMenuStrip = $script:menu
+$script:items = @()
+
+function Write-Event($obj) {
+  $json = $obj | ConvertTo-Json -Compress
+  [Console]::Out.WriteLine($json)
+  [Console]::Out.Flush()
+}
+
+function Add-MenuItem($index, $title, $enabled) {
+  $item = New-Object System.Windows.Forms.ToolStripMenuItem
+  $item.Text = $title
+  $item.Enabled = $enabled
+  $idx = $index
+  $item.Add_Click({ Write-Event @{ type = "click"; index = $idx } }.GetNewClosure())
+  $script:menu.Items.Add($item) | Out-Null
+  $script:items += $item
+}
+
+function Update-MenuItem($index, $title, $enabled) {
+  if ($index -lt $script:items.Count) {
+    $script:items[$index].Text = $title
+    $script:items[$index].Enabled = $enabled
+  }
+}
+
+function Set-Tooltip($text) {
+  # NotifyIcon.Text max 63 chars
+  if ($text.Length -gt 63) { $text = $text.Substring(0, 63) }
+  $script:notifyIcon.Text = $text
+}
+
+# Background reader thread polls stdin via timer on UI thread
+$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 }
+      $cmd = $line | ConvertFrom-Json
+      switch ($cmd.action) {
+        "add-item"    { Add-MenuItem $cmd.index $cmd.title $cmd.enabled }
+        "update-item" { Update-MenuItem $cmd.index $cmd.title $cmd.enabled }
+        "set-tooltip" { Set-Tooltip $cmd.text }
+        "ready"       { Write-Event @{ type = "ready" } }
+        "kill"        {
+          $script:notifyIcon.Visible = $false
+          $script:notifyIcon.Dispose()
+          [System.Windows.Forms.Application]::Exit()
+        }
+      }
+    }
+  } catch {
+    Write-Event @{ type = "error"; message = $_.Exception.Message }
+  }
+})
+$script:timer.Start()
+
+Write-Event @{ type = "started" }
+[System.Windows.Forms.Application]::Run()

package/src/cli/tray/trayWin.js

@@ -0,0 +1,89 @@
+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;
+
+/**
+ * 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");
+  }
+}
+
+/**
+ * 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) {
+  const { iconPath, tooltip, items, onClick } = options;
+  clickHandler = onClick;
+
+  const scriptPath = path.join(__dirname, "tray.ps1");
+
+  try {
+    psProcess = spawn(
+      "powershell.exe",
+      [
+        "-NoProfile",
+        "-ExecutionPolicy", "Bypass",
+        "-WindowStyle", "Hidden",
+        "-InputFormat", "Text",
+        "-OutputFormat", "Text",
+        "-File", scriptPath,
+        "-IconPath", iconPath,
+        "-Tooltip", tooltip
+      ],
+      { windowsHide: true, stdio: ["pipe", "pipe", "pipe"] }
+    );
+  } catch (err) {
+    return null;
+  }
+
+  const rl = readline.createInterface({ input: psProcess.stdout });
+  rl.on("line", (line) => {
+    try {
+      const evt = JSON.parse(line);
+      if (evt.type === "click" && clickHandler) {
+        clickHandler(evt.index);
+      }
+    } catch (e) {}
+  });
+
+  psProcess.on("error", () => {});
+  psProcess.stderr.on("data", () => {});
+
+  // Send initial menu items
+  items.forEach((item, index) => {
+    sendCommand({ action: "add-item", index, title: item.title, enabled: item.enabled });
+  });
+
+  return {
+    updateItem(index, title, enabled) {
+      sendCommand({ action: "update-item", index, title, enabled });
+    },
+    setTooltip(text) {
+      sendCommand({ action: "set-tooltip", text });
+    },
+    kill() {
+      try {
+        sendCommand({ action: "kill" });
+      } catch (e) {}
+      setTimeout(() => {
+        if (psProcess && !psProcess.killed) {
+          try { psProcess.kill(); } catch (e) {}
+        }
+        psProcess = null;
+      }, 300);
+    }
+  };
+}
+
+module.exports = { initWinTray };