zevairouter 1.0.60 → 1.0.62

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

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

@@ -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 };

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);
     }
   }