npm - zevairouter - Versions diffs - 1.0.96 → 1.0.98 - Mend

zevairouter 1.0.96 → 1.0.98

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (318) hide show

@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""
+Minimal PTY bridge for ZevaiRouter web terminal.
+stdin  -> PTY master (keystrokes)
+stdout <- PTY master (shell output), raw binary
+stderr  = control / errors (utf-8 text lines)
+Optional control on a side channel is not needed: resize arrives as
+OSC-like escape on stdin:  \\x1b]9999;<cols>;<rows>\\x07
+"""
+from __future__ import annotations
+import errno
+import fcntl
+import os
+import select
+import signal
+import struct
+import sys
+import termios
+def set_winsize(fd: int, rows: int, cols: int) -> None:
+    try:
+        packed = struct.pack("HHHH", max(5, rows), max(20, cols), 0, 0)
+        fcntl.ioctl(fd, termios.TIOCSWINSZ, packed)
+    except Exception:
+        pass
+def main() -> int:
+    cols = int(sys.argv[1]) if len(sys.argv) > 1 else 120
+    rows = int(sys.argv[2]) if len(sys.argv) > 2 else 40
+    shell = os.environ.get("SHELL") or ("/bin/bash" if os.path.exists("/bin/bash") else "/bin/sh")
+    cwd = os.path.expanduser("~")
+    pid, master = pty_fork = _fork_pty()
+    if pid == 0:
+        # child
+        try:
+            os.chdir(cwd)
+        except Exception:
+            pass
+        os.environ.setdefault("TERM", "xterm-256color")
+        os.environ.setdefault("COLORTERM", "truecolor")
+        os.environ.setdefault("FORCE_COLOR", "1")
+        try:
+            os.execv(shell, [shell, "-il"])
+        except Exception:
+            os.execv("/bin/sh", ["/bin/sh", "-i"])
+        return 1
+    set_winsize(master, rows, cols)
+    # Non-blocking master + stdin
+    for fd in (master, sys.stdin.fileno()):
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+    # Binary stdout
+    stdout = sys.stdout.buffer
+    stdin = sys.stdin.buffer
+    resize_buf = b""
+    def handle_resize_escape(chunk: bytes) -> bytes:
+        """Strip and apply embedded resize escapes, return remaining bytes."""
+        nonlocal resize_buf
+        data = resize_buf + chunk
+        out = bytearray()
+        i = 0
+        while i < len(data):
+            # ESC ] 9999 ; cols ; rows BEL
+            if data[i] == 0x1B and data[i : i + 6] == b"\x1b]9999;":
+                end = data.find(b"\x07", i + 6)
+                if end < 0:
+                    resize_buf = data[i:]
+                    return bytes(out)
+                payload = data[i + 6 : end].decode("ascii", "ignore")
+                try:
+                    c_s, r_s = payload.split(";", 1)
+                    set_winsize(master, int(r_s), int(c_s))
+                except Exception:
+                    pass
+                i = end + 1
+                resize_buf = b""
+                continue
+            out.append(data[i])
+            i += 1
+        resize_buf = b""
+        return bytes(out)
+    alive = True
+    def on_chld(signum, frame):  # noqa: ARG001
+        nonlocal alive
+        alive = False
+    signal.signal(signal.SIGCHLD, on_chld)
+    try:
+        while alive:
+            try:
+                r, _, _ = select.select([master, sys.stdin.fileno()], [], [], 0.25)
+            except InterruptedError:
+                continue
+            if master in r:
+                try:
+                    data = os.read(master, 8192)
+                except OSError as e:
+                    if e.errno in (errno.EIO, errno.EAGAIN, errno.EWOULDBLOCK):
+                        data = b""
+                    else:
+                        break
+                if not data:
+                    # EIO often means child exited
+                    if not alive:
+                        break
+                else:
+                    stdout.write(data)
+                    stdout.flush()
+            if sys.stdin.fileno() in r:
+                try:
+                    data = stdin.read(8192)
+                except Exception:
+                    data = b""
+                if data is None:
+                    data = b""
+                if data == b"" and not alive:
+                    break
+                if data:
+                    cleaned = handle_resize_escape(data)
+                    if cleaned:
+                        try:
+                            os.write(master, cleaned)
+                        except OSError:
+                            break
+    finally:
+        try:
+            os.close(master)
+        except Exception:
+            pass
+        try:
+            os.waitpid(pid, 0)
+        except Exception:
+            pass
+    return 0
+def _fork_pty():
+    import pty
+    return pty.fork()
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        raise SystemExit(0)

@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""
+Minimal PTY bridge for ZevaiRouter web terminal.
+stdin  -> PTY master (keystrokes)
+stdout <- PTY master (shell output), raw binary
+stderr  = control / errors (utf-8 text lines)
+Optional control on a side channel is not needed: resize arrives as
+OSC-like escape on stdin:  \\x1b]9999;<cols>;<rows>\\x07
+"""
+from __future__ import annotations
+import errno
+import fcntl
+import os
+import select
+import signal
+import struct
+import sys
+import termios
+def set_winsize(fd: int, rows: int, cols: int) -> None:
+    try:
+        packed = struct.pack("HHHH", max(5, rows), max(20, cols), 0, 0)
+        fcntl.ioctl(fd, termios.TIOCSWINSZ, packed)
+    except Exception:
+        pass
+def main() -> int:
+    cols = int(sys.argv[1]) if len(sys.argv) > 1 else 120
+    rows = int(sys.argv[2]) if len(sys.argv) > 2 else 40
+    shell = os.environ.get("SHELL") or ("/bin/bash" if os.path.exists("/bin/bash") else "/bin/sh")
+    cwd = os.path.expanduser("~")
+    pid, master = pty_fork = _fork_pty()
+    if pid == 0:
+        # child
+        try:
+            os.chdir(cwd)
+        except Exception:
+            pass
+        os.environ.setdefault("TERM", "xterm-256color")
+        os.environ.setdefault("COLORTERM", "truecolor")
+        os.environ.setdefault("FORCE_COLOR", "1")
+        try:
+            os.execv(shell, [shell, "-il"])
+        except Exception:
+            os.execv("/bin/sh", ["/bin/sh", "-i"])
+        return 1
+    set_winsize(master, rows, cols)
+    # Non-blocking master + stdin
+    for fd in (master, sys.stdin.fileno()):
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+    # Binary stdout
+    stdout = sys.stdout.buffer
+    stdin = sys.stdin.buffer
+    resize_buf = b""
+    def handle_resize_escape(chunk: bytes) -> bytes:
+        """Strip and apply embedded resize escapes, return remaining bytes."""
+        nonlocal resize_buf
+        data = resize_buf + chunk
+        out = bytearray()
+        i = 0
+        while i < len(data):
+            # ESC ] 9999 ; cols ; rows BEL
+            if data[i] == 0x1B and data[i : i + 6] == b"\x1b]9999;":
+                end = data.find(b"\x07", i + 6)
+                if end < 0:
+                    resize_buf = data[i:]
+                    return bytes(out)
+                payload = data[i + 6 : end].decode("ascii", "ignore")
+                try:
+                    c_s, r_s = payload.split(";", 1)
+                    set_winsize(master, int(r_s), int(c_s))
+                except Exception:
+                    pass
+                i = end + 1
+                resize_buf = b""
+                continue
+            out.append(data[i])
+            i += 1
+        resize_buf = b""
+        return bytes(out)
+    alive = True
+    def on_chld(signum, frame):  # noqa: ARG001
+        nonlocal alive
+        alive = False
+    signal.signal(signal.SIGCHLD, on_chld)
+    try:
+        while alive:
+            try:
+                r, _, _ = select.select([master, sys.stdin.fileno()], [], [], 0.25)
+            except InterruptedError:
+                continue
+            if master in r:
+                try:
+                    data = os.read(master, 8192)
+                except OSError as e:
+                    if e.errno in (errno.EIO, errno.EAGAIN, errno.EWOULDBLOCK):
+                        data = b""
+                    else:
+                        break
+                if not data:
+                    # EIO often means child exited
+                    if not alive:
+                        break
+                else:
+                    stdout.write(data)
+                    stdout.flush()
+            if sys.stdin.fileno() in r:
+                try:
+                    data = stdin.read(8192)
+                except Exception:
+                    data = b""
+                if data is None:
+                    data = b""
+                if data == b"" and not alive:
+                    break
+                if data:
+                    cleaned = handle_resize_escape(data)
+                    if cleaned:
+                        try:
+                            os.write(master, cleaned)
+                        except OSError:
+                            break
+    finally:
+        try:
+            os.close(master)
+        except Exception:
+            pass
+        try:
+            os.waitpid(pid, 0)
+        except Exception:
+            pass
+    return 0
+def _fork_pty():
+    import pty
+    return pty.fork()
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        raise SystemExit(0)

package/cli/app/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"

package/cli/cli.js CHANGED Viewed

@@ -320,18 +320,36 @@ WantedBy=multi-user.target
   }
 }
+// Headless VPS/server launch: NEVER flip into tray mode.
+// --no-browser / --log / --port / ZEVAI_SERVER_MODE mean "daemon", not tray.
+// Old heuristic only checked process.env.PORT (argv --port did not set it) →
+// nohup zevai --port 1997 --no-browser became tray, then SIGHUP/menu exit killed
+// next-server ("Ready" then "Exiting...") on 2GB VPS.
+const explicitPort = args.includes("--port") || args.includes("-p");
+const serverDaemon =
+  process.env.ZEVAI_SERVER_MODE === "1"
+  || (noBrowser && !trayMode)
+  || (skipUpdate && explicitPort && !trayMode && !process.stdin.isTTY)
+  || (showLog && !trayMode && !process.stdin.isTTY);
+if (serverDaemon) {
+  process.env.ZEVAI_SERVER_MODE = "1";
+  process.env.TRAY_MODE = "0";
+}
 // Auto-relaunch after update: detached process has no TTY → fallback to tray
 // ONLY for desktop/tray flows. VPS server mode must stay server.
 if (
   skipUpdate
   && !trayMode
+  && !serverDaemon
   && !process.stdin.isTTY
   && process.env.ZEVAI_SERVER_MODE !== "1"
   && !process.env.PORT
+  && !explicitPort
+  && !noBrowser
   && process.env.TRAY_MODE !== "0"
 ) {
-  // Heuristic: systemd / nohup restarts often set PORT or ZEVAI_SERVER_MODE.
-  // If neither is set and no TTY, assume desktop tray (legacy 9router behaviour).
   trayMode = true;
   process.env.TRAY_MODE = "1";
 }
@@ -1032,12 +1050,19 @@ function startServer(latestVersion) {
     cleanup();
     setTimeout(() => process.exit(0), 100);
   });
-  process.on("SIGHUP", () => {
-    if (isShuttingDown) return;
-    isShuttingDown = true;
-    cleanup();
-    setTimeout(() => process.exit(0), 100);
-  });
+  // VPS/nohup: ignore SIGHUP so disconnecting SSH does not kill next-server.
+  // (Tray mode already no-ops SIGHUP below.)
+  if (process.env.ZEVAI_SERVER_MODE === "1" || process.env.TRAY_MODE === "1") {
+    process.removeAllListeners("SIGHUP");
+    process.on("SIGHUP", () => {});
+  } else {
+    process.on("SIGHUP", () => {
+      if (isShuttingDown) return;
+      isShuttingDown = true;
+      cleanup();
+      setTimeout(() => process.exit(0), 100);
+    });
+  }
   // Initialize tray icon (runs alongside TUI)
   const initTrayIcon = () => {
@@ -1076,6 +1101,20 @@ function startServer(latestVersion) {
     return;
   }
+  // Headless server daemon (VPS / nohup / systemd): keep event loop alive, no menu.
+  // Without this, non-TTY hits the TUI menu, fails or auto-exits, and kills next-server.
+  if (process.env.ZEVAI_SERVER_MODE === "1" || !process.stdin.isTTY) {
+    process.removeAllListeners("SIGHUP");
+    process.on("SIGHUP", () => {});
+    console.log(`\n🚀 ZevaiRouter v${pkg.version} (server mode)`);
+    console.log(`Server: http://${displayHost}:${port}`);
+    console.log(`Dashboard: ${url}`);
+    console.log(`Daemon: keep-alive (no TUI). Stop with: systemctl stop zevairouter | kill <pid>\n`);
+    // Keep process alive indefinitely.
+    setInterval(() => {}, 60_000);
+    return;
+  }
   // Wait for server to be ready, then show interface menu loop + tray
   setTimeout(async () => {
     // Start tray icon alongside TUI

package/cli/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter-cli",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "description": "ZevaiRouter CLI - Start and manage ZevaiRouter server",
   "bin": {
     "zevai": "./cli.js"

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"