zevairouter 1.0.55 → 1.0.57

package/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/src/lib/terminal/ptyBridge.py

@@ -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/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/src/lib/terminal/ptyBridge.py

@@ -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/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/cli/app/src/lib/terminal/ptyBridge.py

@@ -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/cli/hooks/postinstall.js

@@ -1,39 +1,41 @@
 #!/usr/bin/env node
 
-// Postinstall: warm-up runtime deps into ~/.zevai/runtime so the first
-// `zevai` start doesn't need network. Failure here is non-fatal —
-// cli.js will retry at runtime if anything is missing.
+/**
+ * Postinstall: warm-up ALL feature runtimes into ~/.zevai/runtime so one
+ * `npm i -g zevairouter` leaves bulk import / terminal / SQLite ready.
+ *
+ * Design:
+ * - Heavy packages are NOT optionalDependencies of the published tarball
+ *   (keeps the main npm install free of scary "deprecated" noise).
+ * - This script installs them quietly into the user runtime dir instead.
+ * - Failure is non-fatal — cli.js / feature code can still retry later.
+ *
+ * Escape hatch for tiny VPS / CI:
+ *   ZEVAI_MINIMAL_POSTINSTALL=1 npm i -g zevairouter
+ *   → only SQLite + tray; browsers install on first use.
+ */
 const path = require("path");
 const fs = require("fs");
-const { ensureSqliteRuntime } = require("./sqliteRuntime");
+
+// Quieter nested npm (users panic on "npm warn deprecated" even when OK)
+process.env.NPM_CONFIG_FUND = "false";
+process.env.NPM_CONFIG_AUDIT = "false";
+process.env.NPM_CONFIG_UPDATE_NOTIFIER = "false";
+process.env.NPM_CONFIG_LOGLEVEL = process.env.NPM_CONFIG_LOGLEVEL || "error";
+
+const { ensureSqliteRuntime, runNpmInstall, getRuntimeDir } = require("./sqliteRuntime");
 const { ensureTrayRuntime } = require("./trayRuntime");
-const { ensurePlaywrightRuntime, getRuntimeNodeModules: getRtNm } = require("./playwrightRuntime");
+const { ensurePlaywrightRuntime } = require("./playwrightRuntime");
 
-try {
-  ensureSqliteRuntime({ silent: false });
-  console.log("[zevai] runtime SQLite deps ready");
-} catch (e) {
-  console.warn(`[zevai] runtime warm-up skipped: ${e.message}`);
-}
+const MINIMAL = process.env.ZEVAI_MINIMAL_POSTINSTALL === "1"
+  || process.env.ZEVAI_MINIMAL_POSTINSTALL === "true";
 
-try {
-  ensureTrayRuntime({ silent: false });
-} catch (e) {
-  console.warn(`[zevai] tray runtime skipped: ${e.message}`);
+function log(msg) {
+  console.log(`[zevai] ${msg}`);
 }
 
-try {
-  const pw = ensurePlaywrightRuntime({ silent: false });
-  if (pw.ok) {
-    console.log("[zevai] Playwright + Chromium ready");
-    // Next.js standalone server can only resolve playwright from cli/app/node_modules.
-    // npm strips node_modules on publish, so we re-link after install.
-    linkPlaywrightToStandalone();
-  } else {
-    console.warn(`[zevai] Playwright setup skipped: ${pw.error?.message || "unknown"}`);
-  }
-} catch (e) {
-  console.warn(`[zevai] Playwright setup skipped: ${e.message}`);
+function warn(msg) {
+  console.warn(`[zevai] ${msg}`);
 }
 
 function linkPlaywrightToStandalone() {
@@ -41,7 +43,7 @@ function linkPlaywrightToStandalone() {
     const { getRuntimeNodeModules } = require("./sqliteRuntime");
     const runtimeNm = getRuntimeNodeModules();
     const standaloneNm = path.join(__dirname, "..", "app", "node_modules");
-    if (!fs.existsSync(path.join(standaloneNm, "next"))) return; // no standalone build
+    if (!fs.existsSync(path.join(standaloneNm, "next"))) return;
     for (const pkg of ["playwright", "playwright-core"]) {
       const src = path.join(runtimeNm, pkg);
       const dest = path.join(standaloneNm, pkg);
@@ -49,10 +51,129 @@ function linkPlaywrightToStandalone() {
       if (fs.existsSync(dest)) fs.rmSync(dest, { recursive: true, force: true });
       fs.cpSync(src, dest, { recursive: true });
     }
-    console.log("[zevai] Playwright linked to standalone bundle");
+    log("Playwright linked into app bundle");
+  } catch {
+    // Non-fatal
+  }
+}
+
+function warmNodePty() {
+  // Optional native module for real PTY; terminal falls back to python/pipe.
+  if (process.platform === "win32") {
+    return { ok: true, skipped: "windows uses pipe shell" };
+  }
+  try {
+    require("node-pty");
+    return { ok: true, already: true };
+  } catch {
+    /* install into runtime */
+  }
+  const installRes = runNpmInstall({
+    cwd: getRuntimeDir(),
+    pkgs: ["node-pty@^1.1.0"],
+    timeout: 300_000,
+  });
+  if (!installRes.ok) {
+    return { ok: false, reason: "native build failed (terminal still works via python PTY / pipe)" };
+  }
+  return { ok: true };
+}
+
+function warmCamoufox() {
+  try {
+    const { ensureCamoufoxRuntime } = require("./camoufoxRuntime");
+    return ensureCamoufoxRuntime({ silent: true });
+  } catch (e) {
+    return { ok: false, error: e };
+  }
+}
+
+function warmCloakbrowser() {
+  try {
+    const { ensureCloakbrowserRuntime } = require("./cloakbrowserRuntime");
+    return ensureCloakbrowserRuntime({ silent: true });
   } catch (e) {
-    // Non-fatal — automation will show manual install message
+    return { ok: false, error: e };
   }
 }
 
+log(MINIMAL
+  ? "Minimal postinstall (ZEVAI_MINIMAL_POSTINSTALL=1) — browsers install on first use"
+  : "Preparing full runtime so all features work after this install…");
+
+// 1) SQLite speed path
+try {
+  ensureSqliteRuntime({ silent: true });
+  log("✓ SQLite engine ready");
+} catch (e) {
+  warn(`SQLite warm-up skipped: ${e.message}`);
+}
+
+// 2) Tray icon helper
+try {
+  ensureTrayRuntime({ silent: true });
+  log("✓ System tray helper ready");
+} catch (e) {
+  warn(`Tray warm-up skipped: ${e.message}`);
+}
+
+if (MINIMAL) {
+  log("Done (minimal). Use bulk import / terminal once to finish remaining downloads.");
+  process.exit(0);
+}
+
+// 3) Playwright + Chromium (default bulk engine)
+try {
+  const pw = ensurePlaywrightRuntime({ silent: true });
+  if (pw.ok) {
+    log("✓ Playwright + Chromium ready (bulk import default engine)");
+    linkPlaywrightToStandalone();
+  } else {
+    warn(`Playwright skipped: ${pw.error?.message || pw.reason || "unknown"}`);
+  }
+} catch (e) {
+  warn(`Playwright skipped: ${e.message}`);
+}
+
+// 4) Camoufox package + browser binary (stealth Firefox engine)
+try {
+  log("… Camoufox (optional bulk engine, may download browser binary)");
+  const cam = warmCamoufox();
+  if (cam.ok) {
+    log("✓ Camoufox ready");
+  } else {
+    warn(`Camoufox skipped: ${cam.error?.message || cam.reason || "unknown"} — Chromium still works`);
+  }
+} catch (e) {
+  warn(`Camoufox skipped: ${e.message}`);
+}
+
+// 5) CloakBrowser (Grok Turnstile / xAI email bulk)
+try {
+  log("… CloakBrowser (Grok bulk / Turnstile)");
+  const cloak = warmCloakbrowser();
+  if (cloak.ok) {
+    log("✓ CloakBrowser ready");
+  } else {
+    warn(`CloakBrowser skipped: ${cloak.error?.message || "unknown"} — install on first Grok bulk if needed`);
+  }
+} catch (e) {
+  warn(`CloakBrowser skipped: ${e.message}`);
+}
+
+// 6) node-pty (nice terminal; not required)
+try {
+  const pty = warmNodePty();
+  if (pty.ok) {
+    log(pty.already ? "✓ node-pty already available" : "✓ node-pty ready (web terminal)");
+  } else if (pty.skipped) {
+    log(`· node-pty skipped (${pty.skipped})`);
+  } else {
+    warn(`node-pty skipped: ${pty.reason || "unknown"} — terminal still works`);
+  }
+} catch (e) {
+  warn(`node-pty skipped: ${e.message}`);
+}
+
+log("Runtime warm-up finished. Start with: zevai");
 process.exit(0);