zevairouter 1.0.62 → 1.0.66

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

@@ -31,7 +31,7 @@ import {
 } from "./kiroBulkImportManager.js";
 import { getProxyPools, getProxyPoolById } from "../../../models/index.js";
 import { getSettings } from "../../localDb.js";
-import { getOptimalWorkerCount, isAutoConcurrencyValue } from "../../systemSpecs.js";
+import { getOptimalWorkerCount, getSystemSpecs, isAutoConcurrencyValue } from "../../systemSpecs.js";
 import { CODEBUDDY_CN_CONFIG } from "../constants/oauth.js";
 import { FiveSimClient, FiveSimTimeoutError } from "./fiveSimClient.js";
 import { runCodeBuddyCnPhoneRegistration } from "./codebuddyCnPhoneAutomation.js";
@@ -40,15 +40,18 @@ import {
   defaultPollForToken,
   fetchCodeBuddyLoginAccount,
 } from "./codebuddyBulkImportManager.js";
+import { forceCloseBrowser } from "./bulkImportBrowserEngine.js";
 
 const CODEBUDDY_CN_PROVIDER_ID = "codebuddy-cn";
 const CODEBUDDY_CN_LABEL = "CodeBuddy CN";
 const CODEBUDDY_CN_DOMAIN = "www.codebuddy.cn";
 
-// Override default concurrency to 2 (5sim rating system — keep buys conservative)
-const CODEBUDDY_CN_DEFAULT_CONCURRENCY = 2;
+// Default concurrency 1 — Camoufox alone can pin a 2GB VPS; multi-worker OOM/hang.
+const CODEBUDDY_CN_DEFAULT_CONCURRENCY = 1;
 const CODEBUDDY_CN_MAX_CONCURRENCY = 8;
 const CODEBUDDY_CN_MIN_CONCURRENCY = 1;
+// Hosts under this RAM hard-cap concurrency at 1 (typical cheap VPS = 1.9–2GB).
+const CODEBUDDY_CN_LOW_MEM_GB = 3;
 
 // Cap on count per job (bound cost/rate)
 const CODEBUDDY_CN_MAX_COUNT = 200;
@@ -61,6 +64,13 @@ const CODEBUDDY_CN_POLL_TIMEOUT_MS = 15 * 60_000;
 // input phone, click send code takes ~15-20s before SMS is actually requested).
 const CODEBUDDY_CN_SMS_TIMEOUT_MS = 90_000;
 
+// Hard wall-clock per account (nav + form + SMS + API key). Prevents infinite
+// Camoufox spin when proxy/nav blackholes and Playwright timeouts do not fire.
+const CODEBUDDY_CN_ACCOUNT_HARD_TIMEOUT_MS = Number.parseInt(
+  process.env.ZEVAI_CN_ACCOUNT_TIMEOUT_MS || "",
+  10,
+) || 12 * 60_000;
+
 // Supported 5sim regions
 const SUPPORTED_REGIONS = new Set(["hongkong", "china", "any"]);
 const DEFAULT_REGION = "hongkong";
@@ -81,14 +91,26 @@ function defaultPhoneFormatter(phone) {
   return String(phone || "").trim();
 }
 
+function isLowMemHost() {
+  try {
+    const { totalMemGb } = getSystemSpecs();
+    return Number.isFinite(totalMemGb) && totalMemGb > 0 && totalMemGb < CODEBUDDY_CN_LOW_MEM_GB;
+  } catch {
+    return false;
+  }
+}
+
 function clampCnConcurrency(value) {
+  const lowMem = isLowMemHost();
+  const hardMax = lowMem ? 1 : CODEBUDDY_CN_MAX_CONCURRENCY;
+  const def = lowMem ? 1 : CODEBUDDY_CN_DEFAULT_CONCURRENCY;
   if (isAutoConcurrencyValue(value)) {
     const optimal = getOptimalWorkerCount();
-    return Math.min(CODEBUDDY_CN_MAX_CONCURRENCY, Math.max(CODEBUDDY_CN_MIN_CONCURRENCY, optimal));
+    return Math.min(hardMax, Math.max(CODEBUDDY_CN_MIN_CONCURRENCY, optimal));
   }
   const parsed = Number.parseInt(value, 10);
-  if (!Number.isFinite(parsed)) return CODEBUDDY_CN_DEFAULT_CONCURRENCY;
-  return Math.min(CODEBUDDY_CN_MAX_CONCURRENCY, Math.max(CODEBUDDY_CN_MIN_CONCURRENCY, parsed));
+  if (!Number.isFinite(parsed)) return Math.min(hardMax, def);
+  return Math.min(hardMax, Math.max(CODEBUDDY_CN_MIN_CONCURRENCY, parsed));
 }
 
 /**
@@ -140,17 +162,23 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
     pollIntervalMs = CODEBUDDY_CN_CONFIG.pollInterval,
     storageName = "codebuddy-cn-bulk-import",
   } = {}) {
-    // Camoufox needs proxy on browser launch (not context-only). Headed small
-    // window so operator can watch like other bulk automations (not fullscreen).
+    // Camoufox needs proxy on browser launch (not context-only).
+    // Linux VPS: default headless to cut RAM/CPU (2GB boxes OOM on headed+Xvfb).
+    // Desktop (macOS/Windows): headed so the operator can watch / solve captcha.
+    // Override: ZEVAI_CN_HEADLESS=0|1
     const cnBrowserLauncher = browserLauncher || (async (job) => {
       const { launchBulkImportBrowser } = await import("./bulkImportBrowserEngine.js");
       const proxyUrl = Array.isArray(job?.proxyUrls) && job.proxyUrls.length
         ? job.proxyUrls[0]
         : null;
+      const envHeadless = process.env.ZEVAI_CN_HEADLESS;
+      let headless = process.platform === "linux";
+      if (envHeadless === "0" || envHeadless === "false") headless = false;
+      if (envHeadless === "1" || envHeadless === "true") headless = true;
       return launchBulkImportBrowser({
         engine: job?.engine || "camoufox",
         proxyUrl,
-        headless: false,
+        headless,
         windowSize: { width: 900, height: 700 },
       });
     });
@@ -338,60 +366,94 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
       this.setAccountStep(account, "registering", "Running phone registration on CodeBuddy CN");
       await this.persistJobSnapshot(job, { forcePreview: true });
 
-      const automationResult = await this.phoneAutomation({
-        page,
-        resolvePhone: async () => {
-          if (job.cancelRequested) {
-            throw new Error("Job cancelled before ordering phone number");
-          }
-          this.setAccountStep(
-            account,
-            "ordering_number",
-            `Form ready — ordering ${job.region} phone from 5sim (single buy)`,
-          );
-          await this.persistJobSnapshot(job, { forcePreview: true });
+      // Page-level timeouts so a stuck network never outlives the hard wall-clock.
+      try {
+        page.setDefaultTimeout(20_000);
+        page.setDefaultNavigationTimeout(45_000);
+      } catch {
+        // older playwright builds may not expose these
+      }
 
-          const numberData = await fiveSimClient.buyNumber({
-            country: job.region,
-            product: "codebuddy",
-            allowProductFallback: false,
-          });
-          fiveSimOrderId = numberData.id;
-          account.phone = numberData.phone;
-          account.fiveSimOrderId = numberData.id;
-          account.fiveSimActivationId = numberData.id;
-          this.setAccountStep(
-            account,
-            "number_ordered",
-            `Phone number ordered: ${numberData.phone} (1 buy, no re-order)`,
-          );
-          await this.persistJobSnapshot(job, { forcePreview: true });
-          return numberData.phone;
-        },
-        waitForSms: async () => {
-          if (!fiveSimOrderId) {
-            throw new Error("Cannot poll SMS — no 5sim order id");
-          }
-          this.setAccountStep(
-            account,
-            "sms_poll_started",
-            `SMS poll started (full ${CODEBUDDY_CN_SMS_TIMEOUT_MS / 1000}s window after send-code)`,
+      const hardTimeoutMs = CODEBUDDY_CN_ACCOUNT_HARD_TIMEOUT_MS;
+      let hardTimer = null;
+      const hardTimeoutPromise = new Promise((_, reject) => {
+        hardTimer = setTimeout(() => {
+          reject(
+            Object.assign(
+              new Error(
+                `CodeBuddy CN account hard timeout after ${Math.round(hardTimeoutMs / 1000)}s (browser will be force-closed)`,
+              ),
+              { code: "CN_ACCOUNT_HARD_TIMEOUT" },
+            ),
           );
-          await this.persistJobSnapshot(job, { forcePreview: false });
-          const code = await fiveSimClient.pollCode(fiveSimOrderId, {
-            timeoutMs: CODEBUDDY_CN_SMS_TIMEOUT_MS,
-            signal: account.abortController?.signal,
-          });
-          smsReceived = true;
-          return code;
-        },
-        onStep: (step, message) => {
-          this.setAccountStep(account, step, message);
-          void this.persistJobSnapshot(job, { forcePreview: false });
-        },
-        phoneFormatter: this.phoneFormatter,
+        }, hardTimeoutMs);
+        if (typeof hardTimer.unref === "function") hardTimer.unref();
       });
 
+      let automationResult;
+      try {
+        automationResult = await Promise.race([
+          this.phoneAutomation({
+            page,
+            signal: account.abortController?.signal,
+            isCancelled: () => job.cancelRequested === true,
+            resolvePhone: async () => {
+              if (job.cancelRequested) {
+                throw new Error("Job cancelled before ordering phone number");
+              }
+              this.setAccountStep(
+                account,
+                "ordering_number",
+                `Form ready — ordering ${job.region} phone from 5sim (single buy)`,
+              );
+              await this.persistJobSnapshot(job, { forcePreview: true });
+
+              const numberData = await fiveSimClient.buyNumber({
+                country: job.region,
+                product: "codebuddy",
+                allowProductFallback: false,
+              });
+              fiveSimOrderId = numberData.id;
+              account.phone = numberData.phone;
+              account.fiveSimOrderId = numberData.id;
+              account.fiveSimActivationId = numberData.id;
+              this.setAccountStep(
+                account,
+                "number_ordered",
+                `Phone number ordered: ${numberData.phone} (1 buy, no re-order)`,
+              );
+              await this.persistJobSnapshot(job, { forcePreview: true });
+              return numberData.phone;
+            },
+            waitForSms: async () => {
+              if (!fiveSimOrderId) {
+                throw new Error("Cannot poll SMS — no 5sim order id");
+              }
+              this.setAccountStep(
+                account,
+                "sms_poll_started",
+                `SMS poll started (full ${CODEBUDDY_CN_SMS_TIMEOUT_MS / 1000}s window after send-code)`,
+              );
+              await this.persistJobSnapshot(job, { forcePreview: false });
+              const code = await fiveSimClient.pollCode(fiveSimOrderId, {
+                timeoutMs: CODEBUDDY_CN_SMS_TIMEOUT_MS,
+                signal: account.abortController?.signal,
+              });
+              smsReceived = true;
+              return code;
+            },
+            onStep: (step, message) => {
+              this.setAccountStep(account, step, message);
+              void this.persistJobSnapshot(job, { forcePreview: false });
+            },
+            phoneFormatter: this.phoneFormatter,
+          }),
+          hardTimeoutPromise,
+        ]);
+      } finally {
+        if (hardTimer) clearTimeout(hardTimer);
+      }
+
       // Step 6: Try API key capture only if automation reached at least the submit step.
       // If automation failed early (e.g. page.goto timeout), the session won't be logged in
       // and API key creation will 401 — so don't waste time. Only try bypass if automation
@@ -446,6 +508,15 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
       }
       account.runtimeSession = null;
       if (context) await context.close().catch(() => null);
+      // Hard timeout / blackhole nav: kill the shared browser so the worker unblocks
+      // and Camoufox cannot pin 100% CPU on a 2GB VPS until reboot.
+      if (error?.code === "CN_ACCOUNT_HARD_TIMEOUT" || job.cancelRequested) {
+        if (job.browser) {
+          const b = job.browser;
+          job.browser = null;
+          await forceCloseBrowser(b).catch(() => null);
+        }
+      }
       await this.persistJobSnapshot(job, { forcePreview: true });
     }
   }
@@ -527,7 +598,9 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
       let accountsProbe = null;
       let sessionReady = false;
 
-      for (let attempt = 0; attempt < 18; attempt += 1) {
+      // Cap OIDC nudge loop — 18 × multi-second waits was too long on 2GB VPS.
+      const OIDC_MAX_ATTEMPTS = 8;
+      for (let attempt = 0; attempt < OIDC_MAX_ATTEMPTS; attempt += 1) {
         if (job.cancelRequested) {
           throw new Error("Job cancelled while establishing session");
         }
@@ -538,29 +611,29 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
 
         // Progressive navigation to complete half-finished Keycloak login
         const path = oIDCNudgePaths[Math.min(attempt, oIDCNudgePaths.length - 1)];
-        if (attempt === 0 || attempt === 2 || attempt === 5 || attempt === 8 || attempt === 12) {
+        if (attempt === 0 || attempt === 2 || attempt === 4 || attempt === 6) {
           this.setAccountStep(
             account,
             "waiting_session",
-            `OIDC handoff attempt ${attempt + 1}/18 → ${path} (cookies: ${strong ? "KEYCLOAK" : soft ? "soft-session" : "weak"})`,
+            `OIDC handoff attempt ${attempt + 1}/${OIDC_MAX_ATTEMPTS} → ${path} (cookies: ${strong ? "KEYCLOAK" : soft ? "soft-session" : "weak"})`,
           );
           await this.persistJobSnapshot(job, { forcePreview: false });
-          await page.goto(path, { waitUntil: "domcontentloaded", timeout: 45_000 }).catch(() => null);
-          await page.waitForTimeout(2_500);
+          await page.goto(path, { waitUntil: "domcontentloaded", timeout: 25_000 }).catch(() => null);
+          await page.waitForTimeout(1_500);
 
           // If Keycloak login iframe reappears, user session is not complete —
           // don't treat blank SPA as success; keep probing.
         } else {
-          await page.waitForTimeout(1_500);
+          await page.waitForTimeout(1_000);
         }
 
         // Prefer landing on console for the API probe
-        if (attempt >= 3 && !String(page.url() || "").includes("/console")) {
+        if (attempt >= 2 && !String(page.url() || "").includes("/console")) {
           await page.goto("https://www.codebuddy.cn/console", {
             waitUntil: "domcontentloaded",
-            timeout: 45_000,
+            timeout: 25_000,
           }).catch(() => null);
-          await page.waitForTimeout(1_500);
+          await page.waitForTimeout(1_000);
         }
 
         accountsProbe = await probeConsoleAccounts();
@@ -579,7 +652,7 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
         this.setAccountStep(
           account,
           "resolving_enterprise",
-          `Console not ready (HTTP ${accountsProbe?.status || 0}) — retry ${attempt + 1}/18`,
+          `Console not ready (HTTP ${accountsProbe?.status || 0}) — retry ${attempt + 1}/${OIDC_MAX_ATTEMPTS}`,
         );
         await this.persistJobSnapshot(job, { forcePreview: false });
       }
@@ -854,7 +927,8 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
   }
 
   /**
-   * Override cancelJob to abort in-flight 5sim polls and clean up orders.
+   * Override cancelJob to abort in-flight 5sim polls AND force-close the browser.
+   * Previous CN override only aborted controllers — Camoufox kept spinning (VPS hang).
    */
   cancelJob(jobId) {
     const job = this.jobs.get(jobId);
@@ -862,11 +936,24 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
 
     job.cancelRequested = true;
 
-    // Abort in-flight 5sim polls for all running accounts
+    // Abort in-flight 5sim polls + close per-account contexts
     for (const account of job.accounts) {
       if (account.abortController && !account.abortController.signal.aborted) {
         account.abortController.abort();
       }
+      const ctx = account.runtimeSession?.context;
+      if (ctx) {
+        void ctx.close().catch(() => null);
+      }
+      account.runtimeSession = null;
+      account.manualSession = null;
+    }
+
+    // CRITICAL: force-kill Camoufox/Chromium. Graceful close alone hangs when nav is stuck.
+    if (job.browser) {
+      const browser = job.browser;
+      job.browser = null;
+      void forceCloseBrowser(browser).catch(() => null);
     }
 
     if (job.status === "queued") {
@@ -876,7 +963,9 @@ export class CodeBuddyCnBulkImportManager extends KiroBulkImportManager {
         if (account.status === "queued") account.status = "cancelled";
       });
     }
-    return job;
+
+    void this.persistJobSnapshot(job, { forcePreview: true });
+    return sanitizeCnJob(job);
   }
 }