zevairouter 1.0.35 → 1.0.37

package/src/app/api/oauth/codebuddy-cn/quota-cookie/route.js

@@ -0,0 +1,28 @@
+import { NextResponse } from "next/server";
+
+export const dynamic = "force-dynamic";
+
+/**
+ * CodeBuddy CN quota-cookie probe — STUB.
+ *
+ * The global CodeBuddy (codebuddy.ai) quota-cookie route probes
+ * /billing/meter/get-user-resource with ProductCode "p_tcaca" and a set of
+ * TCACA_code_* package codes. The CN edition (www.codebuddy.cn / copilot.tencent.com)
+ * uses different Tencent product/package codes that are not yet documented.
+ *
+ * This stub returns a "not supported" response so the UI can gracefully hide
+ * or disable the quota-cookie feature for CN connections until the codes are
+ * identified.
+ *
+ * TODO: Populate with CN product codes after identifying the Tencent CN billing
+ * endpoint and package codes (likely different ProductCode + PackageCodes).
+ */
+export async function POST() {
+  return NextResponse.json(
+    {
+      supported: false,
+      error: "CodeBuddy CN quota tracking is not yet supported. The Tencent CN product/package codes need to be identified before quota probing can work.",
+    },
+    { status: 501 }
+  );
+}

package/src/app/api/settings/route.js

@@ -14,8 +14,9 @@ const SETTINGS_RESPONSE_HEADERS = {
 export async function GET() {
   try {
     const settings = await getSettings();
-    const { password, oidcClientSecret, ...safeSettings } = settings;
+    const { password, oidcClientSecret, fiveSimApiKey, ...safeSettings } = settings;
     safeSettings.oidcConfigured = !!(safeSettings.oidcIssuerUrl && safeSettings.oidcClientId && oidcClientSecret);
+    safeSettings.fiveSimApiKeyConfigured = !!fiveSimApiKey;
     
     const enableRequestLogs = process.env.ENABLE_REQUEST_LOGS === "true";
     const enableTranslator = process.env.ENABLE_TRANSLATOR === "true";
@@ -70,6 +71,13 @@ export async function PATCH(request) {
       }
     }
 
+    // Empty fiveSimApiKey means "keep existing" (same pattern as oidcClientSecret)
+    if (Object.prototype.hasOwnProperty.call(body, "fiveSimApiKey")) {
+      if (!body.fiveSimApiKey || !String(body.fiveSimApiKey).trim()) {
+        delete body.fiveSimApiKey;
+      }
+    }
+
     const settings = await updateSettings(body);
 
     // Apply outbound proxy settings immediately (no restart required)
@@ -90,8 +98,9 @@ export async function PATCH(request) {
       resetComboRotation();
     }
 
-    const { password, oidcClientSecret, ...safeSettings } = settings;
+    const { password, oidcClientSecret, fiveSimApiKey, ...safeSettings } = settings;
     safeSettings.oidcConfigured = !!(safeSettings.oidcIssuerUrl && safeSettings.oidcClientId && oidcClientSecret);
+    safeSettings.fiveSimApiKeyConfigured = !!fiveSimApiKey;
     return NextResponse.json(safeSettings, { headers: SETTINGS_RESPONSE_HEADERS });
   } catch (error) {
     console.log("Error updating settings:", error);

package/src/lib/db/repos/settingsRepo.js

@@ -39,6 +39,8 @@ const DEFAULT_SETTINGS = {
   ponytailEnabled: false,
   ponytailLevel: "full",
   contextInjectionEnabled: false,
+  // 5sim.net API key for CodeBuddy CN phone bulk registration (never expose raw in GET)
+  fiveSimApiKey: "",
 };
 
 async function readRaw() {

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

@@ -89,7 +89,7 @@ function wrapBrowserWithStealth(browser) {
   return browser;
 }
 
-async function launchChromium({ proxyUrl } = {}) {
+async function launchChromium({ proxyUrl, headless = true, windowSize = null } = {}) {
   let chromium = null;
   let importErr = null;
   try {
@@ -128,8 +128,10 @@ async function launchChromium({ proxyUrl } = {}) {
     throw friendly;
   }
 
+  const width = windowSize?.width || (headless ? 1920 : 900);
+  const height = windowSize?.height || (headless ? 1080 : 700);
   const options = {
-    headless: true,
+    headless: headless !== false,
     args: [
       "--disable-blink-features=AutomationControlled",
       "--disable-features=IsolateOrigins,site-per-process,AutomationControlled",
@@ -144,17 +146,21 @@ async function launchChromium({ proxyUrl } = {}) {
       "--disable-ipc-flooding-protection",
       "--password-store=basic",
       "--use-mock-keychain",
-      "--window-size=1920,1080",
+      `--window-size=${width},${height}`,
+      ...(headless ? [] : ["--window-position=80,80"]),
     ],
     ignoreDefaultArgs: ["--enable-automation"],
   };
-  if (proxyUrl) options.proxy = { server: proxyUrl };
+  if (proxyUrl) {
+    const { parsePlaywrightProxy } = await import("./proxyUtils.js");
+    options.proxy = parsePlaywrightProxy(proxyUrl) || { server: proxyUrl };
+  }
 
   const browser = await chromium.launch(options);
   return wrapBrowserWithStealth(browser);
 }
 
-async function launchCamoufox({ proxyUrl } = {}) {
+async function launchCamoufox({ proxyUrl, headless = true, windowSize = null } = {}) {
   const runtime = loadRuntimeHelper("camoufoxRuntime");
   if (!runtime?.ensureCamoufoxRuntime) {
     const err = new Error(
@@ -193,21 +199,42 @@ async function launchCamoufox({ proxyUrl } = {}) {
     }
   }
 
-  const camoufoxOptions = await camoufox.launchOptions({ headless: true });
-  const launchOptions = { ...camoufoxOptions };
-  if (proxyUrl) launchOptions.proxy = { server: proxyUrl };
+  // Proxy MUST be on launchOptions for Camoufox/Firefox reliability.
+  // Context-only proxy is flaky (blank pages / half-sessions / 401 on console APIs).
+  const { parsePlaywrightProxy } = await import("./proxyUtils.js");
+  const parsedProxy = proxyUrl ? (parsePlaywrightProxy(proxyUrl) || { server: proxyUrl }) : null;
+  const useHeadless = headless !== false;
+  const camoufoxOptions = await camoufox.launchOptions({
+    headless: useHeadless,
+    ...(parsedProxy ? { proxy: parsedProxy, geoip: true } : {}),
+  });
+  const launchOptions = { ...camoufoxOptions, headless: useHeadless };
+  if (parsedProxy) {
+    launchOptions.proxy = parsedProxy;
+  }
+  // Small visible window for headed CN runs (server desktop)
+  if (!useHeadless) {
+    const width = windowSize?.width || 900;
+    const height = windowSize?.height || 700;
+    launchOptions.args = [...(launchOptions.args || []), `--width=${width}`, `--height=${height}`];
+  }
 
   return firefox.launch(launchOptions);
 }
 
-export async function launchBulkImportBrowser({ engine = DEFAULT_BULK_IMPORT_ENGINE, proxyUrl } = {}) {
+export async function launchBulkImportBrowser({
+  engine = DEFAULT_BULK_IMPORT_ENGINE,
+  proxyUrl,
+  headless = true,
+  windowSize = null,
+} = {}) {
   const normalized = normalizeBulkImportEngine(engine);
   if (normalized === "camoufox") {
-    return launchCamoufox({ proxyUrl });
+    return launchCamoufox({ proxyUrl, headless, windowSize });
   }
-  return launchChromium({ proxyUrl });
+  return launchChromium({ proxyUrl, headless, windowSize });
 }
 
-export function makeBrowserLauncher({ engine, proxyUrl } = {}) {
-  return () => launchBulkImportBrowser({ engine, proxyUrl });
+export function makeBrowserLauncher({ engine, proxyUrl, headless = true, windowSize = null } = {}) {
+  return () => launchBulkImportBrowser({ engine, proxyUrl, headless, windowSize });
 }

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

@@ -96,17 +96,17 @@ async function defaultSaveCodeBuddyConnection({ tokens, email }) {
   return { connection };
 }
 
-async function defaultRequestDeviceCode(providerId) {
+export async function defaultRequestDeviceCode(providerId) {
   const { requestDeviceCode } = await import("../providers.js");
   return requestDeviceCode(providerId);
 }
 
-async function defaultPollForToken(providerId, deviceCode) {
+export async function defaultPollForToken(providerId, deviceCode) {
   const { pollForToken } = await import("../providers.js");
   return pollForToken(providerId, deviceCode);
 }
 
-async function fetchCodeBuddyLoginAccount(accessToken, state, domain = "www.codebuddy.ai") {
+export async function fetchCodeBuddyLoginAccount(accessToken, state, domain = "www.codebuddy.ai") {
   if (!accessToken || !state) return null;
   try {
     const response = await fetch(`https://${domain}/v2/plugin/login/account?state=${encodeURIComponent(state)}`, {
@@ -530,7 +530,7 @@ export async function createCodeBuddyApiKey(page, email, onStep, {
   throw error;
 }
 
-function createCodeBuddyPollPromise({
+export function createCodeBuddyPollPromise({
   deviceCode,
   pollToken,
   onStep,
@@ -538,6 +538,8 @@ function createCodeBuddyPollPromise({
   timeoutMs = CODEBUDDY_POLL_TIMEOUT_MS,
   pollIntervalMs = CODEBUDDY_POLL_INTERVAL_MS,
   maxTransientErrors = CODEBUDDY_MAX_TRANSIENT_POLL_ERRORS,
+  providerId = CODEBUDDY_PROVIDER_ID,
+  domain = "www.codebuddy.ai",
 }) {
   return (async () => {
     const startedAt = Date.now();
@@ -550,10 +552,10 @@ function createCodeBuddyPollPromise({
         lastStepAt = Date.now();
       }
 
-      const result = await pollToken(CODEBUDDY_PROVIDER_ID, deviceCode);
+      const result = await pollToken(providerId, deviceCode);
       if (result.success) {
         const accessToken = result.tokens?.accessToken || result.tokens?.access_token;
-        const loginAccount = await fetchLoginAccount(accessToken, deviceCode);
+        const loginAccount = await fetchLoginAccount(accessToken, deviceCode, domain);
         return {
           tokens: {
             ...result.tokens,
@@ -564,7 +566,7 @@ function createCodeBuddyPollPromise({
               ...(loginAccount?.enterpriseId ? { enterpriseId: loginAccount.enterpriseId } : {}),
               ...(loginAccount?.enterpriseName ? { enterpriseName: loginAccount.enterpriseName } : {}),
               ...(loginAccount?.rawAuth ? { rawAuth: loginAccount.rawAuth } : {}),
-              domain: "www.codebuddy.ai",
+              domain,
               oauthState: deviceCode,
             },
           },