zevairouter 1.0.60 → 1.0.61

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.60",
+  "version": "1.0.61",
   "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

@@ -266,7 +266,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 };

package/cli/package.json

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

package/package.json

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

package/src/app/api/oauth/grok-cli/bulk-import/route.js

@@ -20,6 +20,10 @@ export async function POST(request) {
       accounts,
       concurrency: body?.concurrency ?? 1,
       engine: body?.engine || "cloakbrowser",
+      // Must forward proxy selection from the Automation modal — previously ignored,
+      // so Grok bulk always hit xAI from the VPS IP even when a pool was selected.
+      proxyPoolMode: body?.proxyPoolMode || "none",
+      proxyPoolId: body?.proxyPoolId || null,
     });
 
     return NextResponse.json({

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

@@ -266,7 +266,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 };

package/src/lib/oauth/services/grokCliBulkImportManager.js

@@ -188,7 +188,10 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
     proxyUrl = null,
   } = {}) {
     super({
-      browserLauncher: (job) => browserLauncher(proxyUrl, job?.engine),
+      // Prefer first pool URL from the job so CloakBrowser launches with proxy+geoip
+      // (context-only proxy is not enough for fingerprint/timezone matching).
+      browserLauncher: (job) =>
+        browserLauncher(job?.proxyUrls?.[0] || proxyUrl || null, job?.engine),
       googleAutomation: null,
       socialExchange: null,
       kiroServiceFactory: null,
@@ -263,11 +266,54 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
       return;
     }
 
-    const { context, page } = await createFreshContext(job.browser, account.proxyUrl);
-    account.runtimeSession = { context, page };
+    // CloakBrowser needs proxy+geoip on launch() for antibot. Shared job.browser may
+    // have no proxy or a different one — spawn a dedicated browser when needed.
+    let browser = job.browser;
+    let ownedBrowser = null;
+    const accountProxy = account.proxyUrl || null;
+    const sharedProxy = job.proxyUrls?.[0] || null;
+    const needsOwnBrowser =
+      job.engine === "cloakbrowser"
+      && accountProxy
+      && accountProxy !== sharedProxy;
+
+    if (needsOwnBrowser || (job.engine === "cloakbrowser" && accountProxy && !sharedProxy)) {
+      try {
+        const { launchBulkImportBrowser } = await import("./bulkImportBrowserEngine.js");
+        ownedBrowser = await launchBulkImportBrowser({
+          engine: "cloakbrowser",
+          proxyUrl: accountProxy,
+          headless: false,
+          windowSize: { width: 1280, height: 900 },
+        });
+        browser = ownedBrowser;
+        this.setAccountStep(
+          account,
+          "proxy_browser",
+          `Launched CloakBrowser with account proxy (geoip)`
+        );
+      } catch (error) {
+        this.finalizeAccount(account, "failed", {
+          error: error.message || "Failed to launch browser with proxy",
+          step: "proxy_launch_failed",
+          message: error.message || "Failed to launch browser with proxy",
+        });
+        await this.persistJobSnapshot(job, { forcePreview: true });
+        return;
+      }
+    }
+
+    // If browser already launched with this proxy, don't double-apply on context
+    const contextProxy = ownedBrowser ? null : accountProxy;
+    const { context, page } = await createFreshContext(browser, contextProxy);
+    account.runtimeSession = { context, page, ownedBrowser };
 
     try {
-      this.setAccountStep(account, "preparing_worker", `Worker ${workerId} preparing CloakBrowser / xAI flow`);
+      this.setAccountStep(
+        account,
+        "preparing_worker",
+        `Worker ${workerId} preparing CloakBrowser / xAI flow${accountProxy ? " (proxied)" : " (direct VPS IP — expect blocks)"}`
+      );
       await this.persistJobSnapshot(job, { forcePreview: true });
 
       const onStep = (step, message) => {
@@ -298,14 +344,21 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
         });
 
         if (signup.status === "needs_manual") {
-          account.manualSession = { context, page, opened: false, openedAt: null };
+          account.manualSession = {
+            context,
+            page,
+            opened: false,
+            openedAt: null,
+            ownedBrowser,
+          };
           this.finalizeAccount(account, "needs_manual", {
             error: signup.error,
             step: signup.step || "awaiting_manual",
             message: signup.error,
           });
           await this.persistJobSnapshot(job, { forcePreview: true });
-          // keep session open for manual; no token poll yet
+          // keep session open for manual; do not close ownedBrowser here
+          ownedBrowser = null;
           return;
         }
 
@@ -317,6 +370,7 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
           });
           account.runtimeSession = null;
           await context.close().catch(() => null);
+          if (ownedBrowser) await ownedBrowser.close().catch(() => null);
           await this.persistJobSnapshot(job, { forcePreview: true });
           return;
         }
@@ -347,6 +401,7 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
         await this.finalizeSuccess(job, account, auth.tokens, mode);
         account.runtimeSession = null;
         await context.close().catch(() => null);
+        if (ownedBrowser) await ownedBrowser.close().catch(() => null);
         await this.persistJobSnapshot(job, { forcePreview: true });
         return;
       }
@@ -358,6 +413,7 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
       });
       account.runtimeSession = null;
       await context.close().catch(() => null);
+      if (ownedBrowser) await ownedBrowser.close().catch(() => null);
       await this.persistJobSnapshot(job, { forcePreview: true });
     } catch (error) {
       if (job.cancelRequested) {
@@ -375,9 +431,11 @@ class GrokCliBulkImportManager extends KiroBulkImportManager {
       }
       account.runtimeSession = null;
       await context.close().catch(() => null);
+      if (ownedBrowser) await ownedBrowser.close().catch(() => null);
       await this.persistJobSnapshot(job, { forcePreview: true });
     } finally {
       account.password = undefined;
+      if (ownedBrowser) await ownedBrowser.close().catch(() => null);
     }
   }