9router-proxy 0.5.83 → 0.5.84

package/cli.js

@@ -65,6 +65,7 @@ function createSpinner(text) {
 const pkg = require("./package.json");
 const { ensureSqliteRuntime, buildEnvWithRuntime } = require("./hooks/sqliteRuntime");
 const { ensureTrayRuntime } = require("./hooks/trayRuntime");
+const { getDataDir } = require("./src/cli/utils/dataDir");
 const args = process.argv.slice(2);
 
 // Subcommands (`9router xai video …`) run against an already-running gateway
@@ -201,13 +202,6 @@ function compareVersions(a, b) {
   return 0;
 }
 
-// Get app data dir (matches app/src/lib/dataDir.js convention)
-function getAppDataDir() {
-  return process.platform === "win32"
-    ? path.join(process.env.APPDATA || "", "9router")
-    : path.join(os.homedir(), ".9router");
-}
-
 // Kill PID from file (best-effort, removes file after)
 function killByPidFile(pidFile) {
   try {
@@ -227,7 +221,7 @@ function killByPidFile(pidFile) {
 
 // Kill tunnel processes (cloudflared/tailscale) by their PID files
 function killTunnelByPidFile() {
-  const tunnelDir = path.join(getAppDataDir(), "tunnel");
+  const tunnelDir = path.join(getDataDir(), "tunnel");
   killByPidFile(path.join(tunnelDir, "cloudflared.pid"));
   killByPidFile(path.join(tunnelDir, "tailscale.pid"));
 }
@@ -379,7 +373,7 @@ function waitForExit(pid, timeoutMs) {
 // Sends SIGTERM first so MIT can clean up host entries before dying.
 function killProxyByPidFile() {
   try {
-    const pidFile = path.join(getAppDataDir(), "mitm", ".mitm.pid");
+    const pidFile = path.join(getDataDir(), "mitm", ".mitm.pid");
     if (!fs.existsSync(pidFile)) return;
     const pid = parseInt(fs.readFileSync(pidFile, "utf8").trim(), 10);
     if (!pid) return;
@@ -703,11 +697,12 @@ function startServer(updatePromise) {
     setTimeout(() => process.exit(0), 100);
   });
 
-  // Initialize tray icon (runs alongside TUI)
+  // Initialize tray icon (runs alongside TUI). Returns false on headless sessions
+  // (e.g. Linux without a display server) so callers can explain the real state.
   const initTrayIcon = () => {
     try {
       const { initTray } = require("./src/cli/tray/tray");
-      initTray({
+      return initTray({
         port,
         onQuit: () => {
           isShuttingDown = true;
@@ -718,7 +713,7 @@ function startServer(updatePromise) {
         onOpenDashboard: () => openBrowser(url)
       });
     } catch (err) {
-      // Tray not available - continue without it
+      return false;
     }
   };
 
@@ -732,9 +727,13 @@ function startServer(updatePromise) {
     console.log(`Server: http://${displayHost}:${port}`);
 
     waitServerReady(port).then(() => {
-      initTrayIcon();
-      console.log("\n💡 Router is now running in system tray. Close this terminal if you want.");
-      console.log("   Right-click tray icon to open dashboard or quit.\n");
+      const tray = initTrayIcon();
+      console.log(tray
+        ? "\n💡 Router is now running in system tray. Close this terminal if you want."
+        : "\n💡 Router is running headless (no system tray on this session).");
+      console.log(tray
+        ? "   Right-click tray icon to open dashboard or quit.\n"
+        : `   Open the dashboard in a browser, or stop it with: 9router-proxy stop\n`);
     });
 
     return;
@@ -745,7 +744,7 @@ function startServer(updatePromise) {
     // Resolve parallel update check (already running); don't block server start on it.
     const latestVersion = await latestVersionPromise;
     // Start tray icon alongside TUI
-    initTrayIcon();
+    const trayActive = !!initTrayIcon();
 
     try {
       while (true) {
@@ -778,9 +777,10 @@ function startServer(updatePromise) {
           clearScreen();
 
           // Enable auto startup on OS boot
+          let autostartOk = false;
           try {
             const { enableAutoStart } = require("./src/cli/tray/autostart");
-            enableAutoStart(__filename);
+            autostartOk = enableAutoStart(__filename) !== false;
           } catch (e) { }
 
           if (process.platform === "darwin") {
@@ -798,8 +798,15 @@ function startServer(updatePromise) {
             return;
           }
 
-          // Windows/Linux: spawn detached bgProcess (systray works fine in child)
-          console.log(`\n⏳ Starting background process... (tray icon will appear in ~3s)`);
+          if (!trayActive) {
+            // No tray session available (e.g. headless Linux): still keep the
+            // server alive in the background, but say so instead of pointing
+            // at an icon that will never appear.
+            console.log(`\n⏳ Starting background process... (no system tray in this session)`);
+          } else {
+            // Windows/Linux: spawn detached bgProcess (systray works fine in child)
+            console.log(`\n⏳ Starting background process... (tray icon will appear in ~3s)`);
+          }
 
           const bgProcess = spawn(process.execPath, ["--dns-result-order=ipv4first", __filename, "--tray", "--skip-update", "-p", port.toString()], {
             detached: true,
@@ -811,7 +818,14 @@ function startServer(updatePromise) {
 
           console.log(`🔔 9Router is now running in background (PID: ${bgProcess.pid})`);
           console.log(`   Server: http://${displayHost}:${port}`);
-          console.log(`\n💡 You can close this terminal. Right-click tray icon to quit.\n`);
+          if (trayActive) {
+            console.log(`\n💡 You can close this terminal. Right-click tray icon to quit.\n`);
+          } else {
+            console.log(`\n💡 You can close this terminal. Stop the server with: 9router-proxy stop\n`);
+          }
+          if (!autostartOk) {
+            console.log(`⚠️  Could not enable auto-start — it needs a desktop login session.\n`);
+          }
 
           // cleanup() kills server so bgProcess can claim the port fresh
           cleanup();
@@ -854,7 +868,7 @@ function startServer(updatePromise) {
     if (restartCount >= MAX_RESTARTS) {
       console.error(`\n⚠️  Server crashed ${MAX_RESTARTS} times. Disabling MIT and restarting...`);
       try {
-        const dbPath = path.join(os.homedir(), process.platform === "win32" ? path.join("AppData", "Roaming", "9router", "db.json") : path.join(".9router", "db.json"));
+        const dbPath = path.join(getDataDir(), "db.json");
         if (fs.existsSync(dbPath)) {
           const db = JSON.parse(fs.readFileSync(dbPath, "utf-8"));
           if (db.settings) db.settings.mitmEnabled = false;

package/hooks/sqliteRuntime.js

@@ -3,8 +3,8 @@
 // sql.js is bundled in bin/app already; node:sqlite / bun:sqlite are built-in.
 const { execSync, spawnSync } = require("child_process");
 const fs = require("fs");
-const os = require("os");
 const path = require("path");
+const { getDataDir } = require("../src/cli/utils/dataDir");
 
 // Gate the pinned version by Node major, mirroring src/lib/db/driver.js gating
 // style: 13.x is N-API and ships per-platform prebuilds inside the package, so
@@ -15,13 +15,6 @@ const USE_NAPI_BUILD = NODE_MAJOR >= 22;
 const BETTER_SQLITE3_VERSION = USE_NAPI_BUILD ? "13.0.3" : "12.6.2";
 const SQL_JS_VERSION = "1.14.1";
 
-function getDataDir() {
-  if (process.env.DATA_DIR) return process.env.DATA_DIR;
-  return process.platform === "win32"
-    ? path.join(process.env.APPDATA || os.homedir(), "9router")
-    : path.join(os.homedir(), ".9router");
-}
-
 function getRuntimeDir() {
   return path.join(getDataDir(), "runtime");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "9router-proxy",
-  "version": "0.5.83",
+  "version": "0.5.84",
   "description": "9Router CLI - Start and manage 9Router server",
   "bin": {
     "9router-proxy": "./cli.js"

package/src/cli/api/client.js

@@ -3,7 +3,6 @@ const https = require("https");
 const crypto = require("crypto");
 const fs = require("node:fs");
 const path = require("node:path");
-const os = require("node:os");
 const { machineIdSync } = require("node-machine-id");
 
 // Default configuration
@@ -15,15 +14,7 @@ const DEFAULT_CONFIG = {
 
 const CLI_TOKEN_HEADER = "x-9r-cli-token";
 const CLI_TOKEN_SALT = "9r-cli-auth";
-const APP_NAME = "9router";
-
-function getDataDir() {
-  if (process.env.DATA_DIR) return process.env.DATA_DIR;
-  if (process.platform === "win32") {
-    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), APP_NAME);
-  }
-  return path.join(os.homedir(), `.${APP_NAME}`);
-}
+const { getDataDir } = require("../utils/dataDir");
 
 const MACHINE_ID_FILE = path.join(getDataDir(), "machine-id");
 const AUTH_DIR = path.join(getDataDir(), "auth");

package/src/cli/commands/daemon.js

@@ -4,8 +4,8 @@
 const path = require("path");
 const fs = require("fs");
 const net = require("net");
-const os = require("os");
 const { spawn, execSync } = require("child_process");
+const { getDataDir } = require("../utils/dataDir");
 const pkg = require("../../../package.json");
 
 const DEFAULT_PORT = 20128;
@@ -15,14 +15,9 @@ const standaloneDir = path.join(cliRoot, "app");
 const customServerPath = path.join(standaloneDir, "custom-server.js");
 const serverPath = fs.existsSync(customServerPath) ? customServerPath : path.join(standaloneDir, "server.js");
 
-function getAppDataDir() {
-  return process.platform === "win32"
-    ? path.join(process.env.APPDATA || "", "9router")
-    : path.join(os.homedir(), ".9router");
-}
-
-const pidFile = path.join(getAppDataDir(), "server.pid");
-const logFile = path.join(getAppDataDir(), "server.log");
+const APP_DATA_DIR = getDataDir();
+const pidFile = path.join(APP_DATA_DIR, "server.pid");
+const logFile = path.join(APP_DATA_DIR, "server.log");
 
 function parseOpts(argv) {
   const opts = { port: DEFAULT_PORT, host: DEFAULT_HOST, help: false };
@@ -53,17 +48,31 @@ function isAlive(pid) {
 }
 
 // Guard against PID reuse: the recorded PID must look like our server process.
-function isOurServer(pid) {
-  if (!isAlive(pid)) return false;
-  if (process.platform === "win32") return true;
+// Windows has no `ps`; CIM is the only way to read another process' command line,
+// and without it a recycled PID would be reported as "running".
+function processCommandLine(pid) {
   try {
-    const cmd = execSync(`ps -p ${pid} -o command=`, { encoding: "utf8", timeout: 3000 }).toLowerCase();
-    return cmd.includes("server.js") || cmd.includes("next-server") || cmd.includes("9router");
+    if (process.platform === "win32") {
+      return execSync(
+        `powershell -NoProfile -NonInteractive -WindowStyle Hidden -Command "(Get-CimInstance Win32_Process -Filter 'ProcessId=${pid}').CommandLine"`,
+        { encoding: "utf8", timeout: 8000, windowsHide: true }
+      );
+    }
+    return execSync(`ps -p ${pid} -o command=`, { encoding: "utf8", timeout: 3000 });
   } catch {
-    return false;
+    return "";
   }
 }
 
+function isOurServer(pid) {
+  if (!isAlive(pid)) return false;
+  const cmd = processCommandLine(pid).toLowerCase();
+  // If CIM/powershell is unavailable, fall back to the old Windows behaviour: refusing to
+  // stop a live server would orphan it, which is worse than a stale-PID false positive.
+  if (!cmd) return process.platform === "win32";
+  return cmd.includes("server.js") || cmd.includes("next-server") || cmd.includes("9router");
+}
+
 function tcpProbe(port, timeoutMs = 1000) {
   return new Promise((resolve) => {
     const socket = net.connect({ host: "127.0.0.1", port }, () => {
@@ -118,7 +127,7 @@ async function cmdStart(opts) {
 
   const { ensureSqliteRuntime, buildEnvWithRuntime } = require("../../../hooks/sqliteRuntime");
   try { ensureSqliteRuntime({ silent: true }); } catch { /* best-effort; server falls back to sql.js */ }
-  fs.mkdirSync(getAppDataDir(), { recursive: true });
+  fs.mkdirSync(APP_DATA_DIR, { recursive: true });
   const fd = fs.openSync(logFile, "a");
   const child = spawn(process.execPath,
     ["--dns-result-order=ipv4first", "--max-old-space-size=6144", serverPath], {
@@ -136,7 +145,7 @@ async function cmdStart(opts) {
   if (!ready) {
     console.error(`❌ Server did not come up on port ${opts.port} within 20s. Last log lines:`);
     console.error(tailLog());
-    try { process.kill(child.pid, "SIGKILL"); } catch { /* already dead */ }
+    terminateTree(child.pid, "SIGKILL");
     try { fs.unlinkSync(pidFile); } catch { /* ignore */ }
     return 1;
   }
@@ -147,6 +156,23 @@ async function cmdStart(opts) {
   return 0;
 }
 
+function terminateTree(pid, signal) {
+  if (process.platform === "win32") {
+    // A detached Windows console process can't be sent SIGTERM, so taskkill is the only
+    // lever. /T walks the process tree — otherwise the MITM/tunnel children survive us.
+    const flags = signal === "SIGKILL" ? "/T /F" : "/T";
+    try {
+      execSync(`taskkill ${flags} /PID ${pid}`, { stdio: "ignore", windowsHide: true, timeout: 8000 });
+    } catch { /* already gone / needs /F */ }
+    return;
+  }
+  // start() spawns detached, so the server is its own process-group leader: signalling
+  // -pid tears down its children in one go. Plain pid covers the non-leader case.
+  for (const target of [-pid, pid]) {
+    try { process.kill(target, signal); } catch { /* not a group leader / already dead */ }
+  }
+}
+
 function cmdStop() {
   const pid = readPid();
   if (!pid || !isOurServer(pid)) {
@@ -154,14 +180,11 @@ function cmdStop() {
     console.log("Not running.");
     return 0;
   }
-  // SIGTERM first so the server can tear down its MITM/tunnel children.
-  try { process.kill(pid, "SIGTERM"); } catch { /* ignore */ }
-  try { process.kill(-pid, "SIGTERM"); } catch { /* not a group leader (win/exec) */ }
+  terminateTree(pid, "SIGTERM");
   let deadline = Date.now() + 5000;
   while (Date.now() < deadline && isAlive(pid)) sleepSync(100);
   if (isAlive(pid)) {
-    try { process.kill(pid, "SIGKILL"); } catch { /* ignore */ }
-    try { process.kill(-pid, "SIGKILL"); } catch { /* ignore */ }
+    terminateTree(pid, "SIGKILL");
     deadline = Date.now() + 2000;
     while (Date.now() < deadline && isAlive(pid)) sleepSync(100);
   }
@@ -216,4 +239,4 @@ async function runDaemon(verb, argv) {
   return cmdStatus(opts);
 }
 
-module.exports = { runDaemon, __test__: { parseOpts, pidFile, logFile, getAppDataDir } };
+module.exports = { runDaemon, __test__: { parseOpts, pidFile, logFile, isOurServer, terminateTree, processCommandLine } };

package/src/cli/tray/tray.js

@@ -318,5 +318,6 @@ function openBrowser(url) {
 
 module.exports = {
   initTray,
+  isTraySupported,
   killTray
 };

package/src/cli/utils/dataDir.js

@@ -0,0 +1,42 @@
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+const APP_NAME = "9router";
+
+function defaultDir() {
+  if (process.platform === "win32") {
+    return path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), APP_NAME);
+  }
+  return path.join(os.homedir(), `.${APP_NAME}`);
+}
+
+/**
+ * Resolve the writable data directory. Mirrors src/lib/dataDir.js (app side) —
+ * keep both in sync; the CLI cannot import ESM from the Next app bundle.
+ */
+function getDataDir() {
+  const configured = process.env.DATA_DIR;
+  if (!configured) return defaultDir();
+
+  // A Unix-style DATA_DIR from a Linux/Docker .env is meaningless on Windows.
+  if (process.platform === "win32" && /^\//.test(configured)) {
+    console.warn(`[DATA_DIR] '${configured}' is a Unix path on Windows → fallback to default`);
+    return defaultDir();
+  }
+
+  try {
+    fs.mkdirSync(configured, { recursive: true });
+    return configured;
+  } catch (e) {
+    // Unlike the app-side copy this never throws: the CLI also runs from
+    // postinstall, where failing the whole npm install over a bad DATA_DIR
+    // would be far worse than falling back.
+    console.warn(`[DATA_DIR] '${configured}' unusable (${e?.code || e}) → fallback ~/${APP_NAME}`);
+    return defaultDir();
+  }
+}
+
+const DATA_DIR = getDataDir();
+
+module.exports = { APP_NAME, DATA_DIR, getDataDir };