zevairouter 1.0.60 → 1.0.62

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/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/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/cloakbrowserRuntime.js

@@ -1,14 +1,22 @@
 // Lazy-install helper for cloakbrowser (stealth Chromium that can pass Turnstile).
 // Same shape as camoufoxRuntime / playwrightRuntime — optional package, install on demand.
+// Also installs mmdb-lib (required by cloakbrowser when geoip: true for proxy timezone match).
 const { createRequire } = require("module");
 const fs = require("fs");
 const path = require("path");
 
-const { runNpmInstall, getRuntimeDir, getRuntimeNodeModules, summarizeNpmError } = require("./sqliteRuntime");
+const {
+  runNpmInstall,
+  getRuntimeDir,
+  getRuntimeNodeModules,
+  summarizeNpmError,
+  buildEnvWithRuntime,
+} = require("./sqliteRuntime");
 
 const CLOAKBROWSER_PACKAGE = "cloakbrowser";
-// Keep in sync with package.json optionalDependencies
 const CLOAKBROWSER_VERSION = "^0.3.32";
+const MMDB_PACKAGE = "mmdb-lib";
+const MMDB_VERSION = "^3.0.2";
 
 const nodeRequire =
   typeof __non_webpack_require__ === "function" ? __non_webpack_require__ : require;
@@ -24,6 +32,10 @@ function getRuntimeRequire() {
 
 let cachedReady = null;
 
+function hasPackage(name) {
+  return fs.existsSync(path.join(getRuntimeNodeModules(), name, "package.json"));
+}
+
 function tryRequireCloakbrowser() {
   try {
     const rreq = getRuntimeRequire();
@@ -41,7 +53,6 @@ function tryRequireCloakbrowser() {
       return nodeRequire(candidate);
     }
   } catch {}
-  // Dev / user global installs
   try {
     const home = process.env.HOME || process.env.USERPROFILE || "";
     const aurix = path.join(home, ".aurix/agent/node_modules", CLOAKBROWSER_PACKAGE);
@@ -52,49 +63,93 @@ function tryRequireCloakbrowser() {
   return null;
 }
 
+function tryRequireMmdb() {
+  try {
+    const rreq = getRuntimeRequire();
+    const candidate = path.join(getRuntimeNodeModules(), MMDB_PACKAGE);
+    if (rreq && fs.existsSync(path.join(candidate, "package.json"))) {
+      return rreq(candidate);
+    }
+  } catch {}
+  try {
+    return nodeRequire(MMDB_PACKAGE);
+  } catch {}
+  return null;
+}
+
 function loadCloakbrowserModule() {
   return tryRequireCloakbrowser();
 }
 
+/**
+ * Ensure cloakbrowser + mmdb-lib are available under ~/.zevai/runtime.
+ * mmdb-lib is required when launching with geoip: true (proxy timezone/locale).
+ */
 function ensureCloakbrowserRuntime({ silent = false } = {}) {
-  if (cachedReady?.ok && cachedReady.module) {
+  if (cachedReady?.ok && cachedReady.module && tryRequireMmdb()) {
     return cachedReady;
   }
 
-  let mod = tryRequireCloakbrowser();
-  if (mod?.launch) {
-    cachedReady = { ok: true, module: mod };
-    return cachedReady;
+  // Inject runtime node_modules into resolution for cloakbrowser's require("mmdb-lib")
+  try {
+    const env = buildEnvWithRuntime(process.env);
+    if (env.NODE_PATH && !process.env.NODE_PATH?.includes(getRuntimeNodeModules())) {
+      process.env.NODE_PATH = env.NODE_PATH;
+      // Re-init module paths for already-running process
+      try {
+        // eslint-disable-next-line no-underscore-dangle
+        require("module").Module._initPaths();
+      } catch {
+        /* ignore */
+      }
+    }
+  } catch {
+    /* ignore */
   }
 
-  if (!silent) {
-    console.log(`[cloakbrowser] Installing ${CLOAKBROWSER_PACKAGE}@${CLOAKBROWSER_VERSION} into runtime…`);
+  let mod = tryRequireCloakbrowser();
+  const needCloak = !mod?.launch;
+  const needMmdb = !tryRequireMmdb() && !hasPackage(MMDB_PACKAGE);
+
+  if (needCloak || needMmdb) {
+    const pkgs = [];
+    if (needCloak) pkgs.push(`${CLOAKBROWSER_PACKAGE}@${CLOAKBROWSER_VERSION}`);
+    if (needMmdb) pkgs.push(`${MMDB_PACKAGE}@${MMDB_VERSION}`);
+
+    if (!silent) {
+      console.log(`[cloakbrowser] Installing ${pkgs.join(", ")} into runtime…`);
+    }
+
+    const installRes = runNpmInstall({
+      cwd: getRuntimeDir(),
+      pkgs,
+      timeout: 300_000,
+    });
+
+    if (!installRes.ok) {
+      const reason = summarizeNpmError(installRes.stderr || installRes.stdout || "");
+      const err = new Error(
+        `Failed to install ${pkgs.join(", ")}. On the host run: cd "${getRuntimeDir()}" && npm install ${pkgs.join(" ")} — ${reason}`
+      );
+      err.code = "CLOAKBROWSER_INSTALL_FAILED";
+      return { ok: false, error: err };
+    }
   }
 
-  // runNpmInstall expects a single options object: { cwd, pkgs, extraArgs, timeout }
-  // (NOT positional args). Wrong call shape caused: "pkgs is not iterable" / toast
-  // "Failed to install cloakbrowser … b is not iterable" on first Grok bulk use.
-  const installRes = runNpmInstall({
-    cwd: getRuntimeDir(),
-    pkgs: [`${CLOAKBROWSER_PACKAGE}@${CLOAKBROWSER_VERSION}`],
-    timeout: 300_000,
-  });
-
-  if (!installRes.ok) {
-    const reason = summarizeNpmError(installRes.stderr || installRes.stdout || "");
+  mod = tryRequireCloakbrowser();
+  if (!mod?.launch) {
     const err = new Error(
-      `Failed to install cloakbrowser. On the host run: cd "${getRuntimeDir()}" && npm install ${CLOAKBROWSER_PACKAGE}@${CLOAKBROWSER_VERSION} — ${reason}`
+      `cloakbrowser installed but launch() is missing. Reinstall: cd "${getRuntimeDir()}" && npm install ${CLOAKBROWSER_PACKAGE}@${CLOAKBROWSER_VERSION} ${MMDB_PACKAGE}@${MMDB_VERSION}`
     );
-    err.code = "CLOAKBROWSER_INSTALL_FAILED";
+    err.code = "CLOAKBROWSER_API_MISMATCH";
     return { ok: false, error: err };
   }
 
-  mod = tryRequireCloakbrowser();
-  if (!mod?.launch) {
+  if (!tryRequireMmdb() && !hasPackage(MMDB_PACKAGE)) {
     const err = new Error(
-      `cloakbrowser installed but launch() is missing. Reinstall: cd "${getRuntimeDir()}" && npm install ${CLOAKBROWSER_PACKAGE}@${CLOAKBROWSER_VERSION}`
+      `mmdb-lib is required for geoip: true. Install: cd "${getRuntimeDir()}" && npm install ${MMDB_PACKAGE}@${MMDB_VERSION}`
     );
-    err.code = "CLOAKBROWSER_API_MISMATCH";
+    err.code = "MMDB_MISSING";
     return { ok: false, error: err };
   }
 
@@ -107,4 +162,6 @@ module.exports = {
   loadCloakbrowserModule,
   CLOAKBROWSER_PACKAGE,
   CLOAKBROWSER_VERSION,
+  MMDB_PACKAGE,
+  MMDB_VERSION,
 };

package/cli/app/cli/hooks/postinstall.js

@@ -148,12 +148,12 @@ try {
   warn(`Camoufox skipped: ${e.message}`);
 }
 
-// 5) CloakBrowser (Grok Turnstile / xAI email bulk)
+// 5) CloakBrowser + mmdb-lib (Grok Turnstile / proxy geoip)
 try {
-  log("… CloakBrowser (Grok bulk / Turnstile)");
+  log("… CloakBrowser + mmdb-lib (Grok bulk / geoip)");
   const cloak = warmCloakbrowser();
   if (cloak.ok) {
-    log("✓ CloakBrowser ready");
+    log("✓ CloakBrowser + mmdb-lib ready");
   } else {
     warn(`CloakBrowser skipped: ${cloak.error?.message || "unknown"} — install on first Grok bulk if needed`);
   }

package/cli/app/package.json

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

package/cli/app/src/lib/oauth/services/bulkImportBrowserEngine.js

@@ -235,6 +235,7 @@ async function launchCloakbrowser({ proxyUrl, headless = false, windowSize = nul
   const runtime = loadRuntimeHelper("cloakbrowserRuntime");
   let cloak = null;
   if (runtime?.ensureCloakbrowserRuntime) {
+    // Also installs mmdb-lib (required when geoip: true for proxy timezone match)
     const ready = runtime.ensureCloakbrowserRuntime({ silent: false });
     if (!ready.ok && ready.error) throw ready.error;
     cloak = ready.module || runtime.loadCloakbrowserModule?.();
@@ -266,7 +267,10 @@ async function launchCloakbrowser({ proxyUrl, headless = false, windowSize = nul
     humanize: true,
   };
   if (proxyUrl) {
+    // CloakBrowser docs: string or { server, username, password }; geoip aligns
+    // timezone/locale to proxy IP (critical for Turnstile / abusive-pattern checks).
     launchOpts.proxy = proxyUrl;
+    launchOpts.geoip = true;
   }
   if (windowSize?.width && windowSize?.height) {
     launchOpts.viewport = { width: windowSize.width, height: windowSize.height };