qwenproxy-cli 1.4.0 → 1.4.2

package/dist/login.js

@@ -1085,6 +1085,8 @@ __export(config_exports, {
   normalizeChatMode: () => normalizeChatMode,
   setRuntimeChatMode: () => setRuntimeChatMode
 });
+import fs6 from "node:fs";
+import dotenv from "dotenv";
 import { z } from "zod";
 function isStatelessChatMode(mode) {
   if (!mode) return false;
@@ -1134,6 +1136,15 @@ var envSchema, env, config;
 var init_config = __esm({
   "src/core/config.ts"() {
     "use strict";
+    init_paths();
+    if (!isRunningUnderNodeTest()) {
+      const envPath = getEnvFilePath();
+      if (fs6.existsSync(envPath)) {
+        dotenv.config({ path: envPath, quiet: true });
+      } else {
+        dotenv.config({ quiet: true });
+      }
+    }
     envSchema = z.object({
       PORT: z.string().regex(/^\d+$/, "PORT must be a number").refine((value) => {
         const port = Number(value);
@@ -2918,7 +2929,7 @@ __export(clean_cache_exports, {
   getDirStats: () => getDirStats
 });
 import "dotenv/config";
-import fs6 from "node:fs";
+import fs7 from "node:fs";
 import path4 from "node:path";
 import os3 from "node:os";
 import { chromium } from "patchright";
@@ -2933,14 +2944,14 @@ function getDirStats(dir) {
   let files = 0;
   function walk(d) {
     try {
-      const entries = fs6.readdirSync(d, { withFileTypes: true });
+      const entries = fs7.readdirSync(d, { withFileTypes: true });
       for (const e of entries) {
         const full = path4.join(d, e.name);
         if (e.isDirectory()) {
           walk(full);
         } else if (e.isFile()) {
           try {
-            bytes += fs6.statSync(full).size;
+            bytes += fs7.statSync(full).size;
             files++;
           } catch {
           }
@@ -2969,17 +2980,17 @@ async function cleanPlaywrightBrowsers(cleanUnused) {
     }
   } catch {
   }
-  if (!msPlaywrightDir || !fs6.existsSync(msPlaywrightDir)) {
+  if (!msPlaywrightDir || !fs7.existsSync(msPlaywrightDir)) {
     const defaultPlaywrightDir = process.env.PLAYWRIGHT_BROWSERS_PATH || (process.platform === "win32" ? path4.join(os3.homedir(), "AppData", "Local", "ms-playwright") : process.platform === "darwin" ? path4.join(os3.homedir(), "Library", "Caches", "ms-playwright") : path4.join(os3.homedir(), ".cache", "ms-playwright"));
-    if (fs6.existsSync(defaultPlaywrightDir)) {
+    if (fs7.existsSync(defaultPlaywrightDir)) {
       msPlaywrightDir = defaultPlaywrightDir;
     }
   }
   const unusedDirs = [];
   let freedBytes = 0;
-  if (msPlaywrightDir && fs6.existsSync(msPlaywrightDir)) {
+  if (msPlaywrightDir && fs7.existsSync(msPlaywrightDir)) {
     try {
-      const entries = fs6.readdirSync(msPlaywrightDir, { withFileTypes: true });
+      const entries = fs7.readdirSync(msPlaywrightDir, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) continue;
         const folderName = entry.name;
@@ -3002,7 +3013,7 @@ async function cleanPlaywrightBrowsers(cleanUnused) {
       if (cleanUnused && unusedDirs.length > 0) {
         for (const item of unusedDirs) {
           try {
-            fs6.rmSync(item.path, { recursive: true, force: true });
+            fs7.rmSync(item.path, { recursive: true, force: true });
             freedBytes += item.bytes;
           } catch (err) {
             console.warn(`[CleanCache] Warning: could not remove ${item.name}:`, err);
@@ -3138,7 +3149,7 @@ __export(playwright_exports, {
 });
 import { chromium as chromium2 } from "patchright";
 import path5 from "path";
-import fs7 from "fs";
+import fs8 from "fs";
 import crypto3 from "crypto";
 import { spawnSync } from "child_process";
 import { createRequire } from "module";
@@ -3152,7 +3163,7 @@ function autoInstallPlaywrightChromium() {
     try {
       const patchrightEntry = requireLocal.resolve("patchright");
       const cliPath = path5.join(path5.dirname(patchrightEntry), "cli.js");
-      if (fs7.existsSync(cliPath)) {
+      if (fs8.existsSync(cliPath)) {
         console.log("\u23F3 [Playwright] Navegador Chromium n\xE3o encontrado. Instalando automaticamente...");
         const res2 = spawnSync(process.execPath, [cliPath, "install", "chromium"], {
           stdio: "inherit",
@@ -3288,10 +3299,10 @@ function getStorageStatePath(accountId) {
 function loadStorageState(accountId) {
   const p1 = getStorageStatePath(accountId);
   const p2 = path5.join(path5.dirname(p1), `${accountId}_state.json`);
-  const chosenPath = fs7.existsSync(p1) ? p1 : fs7.existsSync(p2) ? p2 : void 0;
+  const chosenPath = fs8.existsSync(p1) ? p1 : fs8.existsSync(p2) ? p2 : void 0;
   if (!chosenPath) return void 0;
   try {
-    const raw = fs7.readFileSync(chosenPath, "utf8");
+    const raw = fs8.readFileSync(chosenPath, "utf8");
     const state = JSON.parse(raw);
     if (!state || typeof state !== "object" || !Array.isArray(state.cookies)) {
       return void 0;
@@ -3305,8 +3316,8 @@ async function saveStorageState(context, accountId, timeoutMs = 5e3) {
   try {
     const stateFile = getStorageStatePath(accountId);
     const dir = path5.dirname(stateFile);
-    if (!fs7.existsSync(dir)) {
-      fs7.mkdirSync(dir, { recursive: true });
+    if (!fs8.existsSync(dir)) {
+      fs8.mkdirSync(dir, { recursive: true });
     }
     await withTimeout(
       context.storageState({ path: stateFile }),
@@ -3415,7 +3426,7 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
     return false;
   }
 }
-async function getOrLaunchSharedBrowser(browserType = "chromium", headless = true) {
+async function getOrLaunchSharedBrowser(browserType = "chromium", headless = config.playwright.headless) {
   if (sharedBrowser && sharedBrowser.isConnected()) {
     return sharedBrowser;
   }
@@ -3475,13 +3486,40 @@ async function getOrLaunchSharedBrowser(browserType = "chromium", headless = tru
   }
 }
 async function clearVisibleChallenge(page) {
-  if (!config.captcha.enabled) return;
-  await solveBaxiaCaptcha(page, {
-    waitForMs: 0,
-    maxAttempts: config.captcha.maxAttempts,
-    retryDelayMs: config.captcha.retryDelayMs,
-    settleMs: config.captcha.settleMs
-  }).catch(() => false);
+  if (page.isClosed()) return;
+  if (config.captcha.enabled) {
+    await solveBaxiaCaptcha(page, {
+      waitForMs: 0,
+      maxAttempts: config.captcha.maxAttempts,
+      retryDelayMs: config.captcha.retryDelayMs,
+      settleMs: config.captcha.settleMs
+    }).catch(() => false);
+  }
+  try {
+    const modalCloseSelectors = [
+      ".ant-modal-close",
+      ".ant-modal-close-x",
+      "button.ant-modal-close",
+      "button[aria-label*='Close' i]",
+      "button[aria-label*='Fechar' i]",
+      ".index-module__whats-new-modal-close",
+      "button:has-text('Cancel')",
+      "button:has-text('Cancelar')",
+      "button:has-text('I understand')",
+      "button:has-text('Entendi')",
+      "button:has-text('OK')"
+    ];
+    for (const sel of modalCloseSelectors) {
+      if (page.isClosed()) return;
+      const btn = page.locator(sel).first();
+      if (await btn.isVisible({ timeout: 150 }).catch(() => false)) {
+        await btn.click({ timeout: 500 }).catch(() => {
+        });
+        await sleep2(200);
+      }
+    }
+  } catch {
+  }
 }
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
@@ -3909,6 +3947,21 @@ function getStealthScript(profile) {
           spoofedFunctions.add(window.performance.getEntriesByType);
         }
       } catch(e) {}
+
+      // --- Auto-resolve birthday compliance & eliminate false logout markers ---
+      try {
+        localStorage.removeItem("qwen_token_logged_out_marker");
+        const b = localStorage.getItem("qwen_account_birthday");
+        if (b) {
+          try {
+            const parsed = JSON.parse(b);
+            if (!parsed.birthday) {
+              parsed.birthday = "1995-06-15";
+              localStorage.setItem("qwen_account_birthday", JSON.stringify(parsed));
+            }
+          } catch {}
+        }
+      } catch(e) {}
     })();
   `;
 }
@@ -4207,7 +4260,7 @@ async function resolveAccountCredentials(account) {
   }
   return account;
 }
-async function initPlaywrightForAccount(rawAccount, headless = true, browserType = "chromium", options = {}) {
+async function initPlaywrightForAccount(rawAccount, headless = config.playwright.headless, browserType = "chromium", options = {}) {
   const account = await resolveAccountCredentials(rawAccount);
   if (accountPages.has(account.id)) {
     console.log(
@@ -4333,7 +4386,7 @@ async function initPlaywrightForAccount(rawAccount, headless = true, browserType
         const storageState = loadStorageState(account.id);
         if (storageState) {
           try {
-            const raw = fs7.readFileSync(storageState, "utf8");
+            const raw = fs8.readFileSync(storageState, "utf8");
             const parsed = JSON.parse(raw);
             if (Array.isArray(parsed.cookies) && parsed.cookies.length > 0) {
               const currentCookies = await acctContext.cookies();
@@ -4420,11 +4473,19 @@ async function initPlaywrightForAccount(rawAccount, headless = true, browserType
         }
         if (restoredFromDb) {
           if (!acctPage.isClosed() && (acctPage.url() === "about:blank" || !acctPage.url().startsWith(qwenOrigin()))) {
-            void acctPage.goto(qwenUrl("/"), {
-              waitUntil: "domcontentloaded",
-              timeout: config.timeouts.navigation
-            }).catch(() => {
-            });
+            try {
+              await acctPage.goto(qwenUrl("/"), {
+                waitUntil: "domcontentloaded",
+                timeout: config.timeouts.navigation
+              });
+              await sleep2(300);
+            } catch (err) {
+              if (!err?.message?.includes("ERR_ABORTED")) {
+                console.warn(
+                  `\u26A0\uFE0F  [Playwright] Background navigation warning for ${maskEmail(account.email)}: ${err.message}`
+                );
+              }
+            }
           }
           return;
         }
@@ -4545,7 +4606,7 @@ async function validateAccountLogin(rawAccount, headless = true, browserType = "
       const storageState = loadStorageState(account.id);
       if (storageState) {
         try {
-          const raw = fs7.readFileSync(storageState, "utf8");
+          const raw = fs8.readFileSync(storageState, "utf8");
           const parsed = JSON.parse(raw);
           if (Array.isArray(parsed.cookies) && parsed.cookies.length > 0) {
             const currentCookies = await acctContext.cookies();
@@ -4664,18 +4725,34 @@ async function loginToQwen(accountId, email, password) {
     const apiResult = await loginViaApi(page, email, password);
     if (apiResult.success) {
       cookieCaches.delete(accountId);
-      const cache = headerCaches.get(accountId);
-      if (cache) {
-        cache.headers = {};
-        cache.lastRefresh = 0;
-      }
-      unmarkAccountHeadersReady(accountId);
+      await saveStorageState(page.context(), accountId);
       try {
-        const { deleteAuthSession: deleteAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
-        deleteAuthSession2(accountId);
+        const liveCookies = await page.context().cookies();
+        const tokenCookie = liveCookies.find((c) => c.name === "token");
+        if (tokenCookie) {
+          const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
+          const cache = getHeaderCache(accountId);
+          cache.headers.cookie = cookieStr;
+          cache.lastRefresh = Date.now();
+          markAccountHeadersReady(accountId);
+          const { saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
+          const exp = parseJwtExpiry(tokenCookie.value);
+          saveAuthSession2(accountId, {
+            cookie: cookieStr,
+            userAgent: cache.headers["user-agent"] || "",
+            bxV: cache.headers["bx-v"] || "2.5.37",
+            bxUa: cache.headers["bx-ua"] || "",
+            bxUmidtoken: cache.headers["bx-umidtoken"] || "",
+            secChUa: cache.headers["sec-ch-ua"] || void 0,
+            secChUaMobile: cache.headers["sec-ch-ua-mobile"] || void 0,
+            secChUaPlatform: cache.headers["sec-ch-ua-platform"] || void 0,
+            version: cache.headers["version"] || void 0,
+            tokenExpiresAt: exp || void 0,
+            capturedAt: Date.now()
+          });
+        }
       } catch {
       }
-      await saveStorageState(page.context(), accountId);
       return true;
     }
     if (apiResult.permanentFailure) {
@@ -4692,18 +4769,34 @@ async function loginToQwen(accountId, email, password) {
     const uiResult = await loginViaUi(page, email, password);
     if (uiResult.success) {
       cookieCaches.delete(accountId);
-      const cache = headerCaches.get(accountId);
-      if (cache) {
-        cache.headers = {};
-        cache.lastRefresh = 0;
-      }
-      unmarkAccountHeadersReady(accountId);
+      await saveStorageState(page.context(), accountId);
       try {
-        const { deleteAuthSession: deleteAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
-        deleteAuthSession2(accountId);
+        const liveCookies = await page.context().cookies();
+        const tokenCookie = liveCookies.find((c) => c.name === "token");
+        if (tokenCookie) {
+          const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
+          const cache = getHeaderCache(accountId);
+          cache.headers.cookie = cookieStr;
+          cache.lastRefresh = Date.now();
+          markAccountHeadersReady(accountId);
+          const { saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
+          const exp = parseJwtExpiry(tokenCookie.value);
+          saveAuthSession2(accountId, {
+            cookie: cookieStr,
+            userAgent: cache.headers["user-agent"] || "",
+            bxV: cache.headers["bx-v"] || "2.5.37",
+            bxUa: cache.headers["bx-ua"] || "",
+            bxUmidtoken: cache.headers["bx-umidtoken"] || "",
+            secChUa: cache.headers["sec-ch-ua"] || void 0,
+            secChUaMobile: cache.headers["sec-ch-ua-mobile"] || void 0,
+            secChUaPlatform: cache.headers["sec-ch-ua-platform"] || void 0,
+            version: cache.headers["version"] || void 0,
+            tokenExpiresAt: exp || void 0,
+            capturedAt: Date.now()
+          });
+        }
       } catch {
       }
-      await saveStorageState(page.context(), accountId);
       return true;
     }
     if (uiResult.permanentFailure) {
@@ -4902,10 +4995,16 @@ async function loginViaUi(page, email, password) {
       );
       return { success: false, reason: "Campo de e-mail n\xE3o encontrado (poss\xEDvel captcha)" };
     }
+    await clearVisibleChallenge(page);
+    const findPasswordModeButton = () => {
+      return page.locator('button, [role="button"], a, div').filter({
+        hasText: /(?:log\s*in\s*with\s*(?:a\s*)?password|fazer\s*login\s*com\s*senha|entrar\s*com\s*(?:uma\s*)?senha|iniciar\s*sesi[oó]n\s*con\s*contrase[nñ]a|密码登录)/i
+      }).first();
+    };
     try {
-      const pwdModeBtn = page.getByText(/Log in with a password/i).first();
-      if (await pwdModeBtn.isVisible({ timeout: 1500 }).catch(() => false)) {
-        await pwdModeBtn.click().catch(() => {
+      const pwdModeBtn = findPasswordModeButton();
+      if (await pwdModeBtn.isVisible({ timeout: 2e3 }).catch(() => false)) {
+        await pwdModeBtn.click({ timeout: 2e3 }).catch(() => {
         });
         await sleep2(500);
       }
@@ -4914,9 +5013,9 @@ async function loginViaUi(page, email, password) {
     await page.fill(emailSelector, email);
     await sleep2(300);
     try {
-      const pwdModeBtn = page.getByText(/Log in with a password/i).first();
-      if (await pwdModeBtn.isVisible({ timeout: 1e3 }).catch(() => false)) {
-        await pwdModeBtn.click().catch(() => {
+      const pwdModeBtn = findPasswordModeButton();
+      if (await pwdModeBtn.isVisible({ timeout: 1500 }).catch(() => false)) {
+        await pwdModeBtn.click({ timeout: 2e3 }).catch(() => {
         });
         await sleep2(500);
       }
@@ -4941,7 +5040,7 @@ async function loginViaUi(page, email, password) {
     }
     await page.fill(passwordSelector, password);
     await sleep2(500);
-    const submitSelector = 'button.qwenchat-auth-pc-submit-button, button[type="submit"], button:has-text("Log in"), button:has-text("Sign in")';
+    const submitSelector = 'button.qwenchat-auth-pc-submit-button, button[type="submit"], button:has-text("Log in"), button:has-text("Sign in"), button:has-text("Fazer login"), button:has-text("Entrar"), button:has-text("Iniciar sesi\xF3n"), button:has-text("\u767B\u5F55")';
     const submitButton = page.locator(submitSelector).first();
     try {
       await page.waitForSelector('button[type="submit"]:not([disabled])', {
@@ -5546,7 +5645,7 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
           await executeReauth();
         }
       }
-      if (reauthExecuted && hasRequiredQwenHeaders(cache.headers)) {
+      if (hasRequiredQwenHeaders(cache.headers)) {
         const liveCookies = await page.context().cookies();
         if (liveCookies.some((c) => c.name === "token")) {
           const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
@@ -5662,12 +5761,12 @@ async function resetPlaywrightProfileLocked(accountId) {
   removePlaywrightProfile(profilePath);
   const stateFile2 = path5.join(path5.dirname(profilePath), `${accountId}_state.json`);
   try {
-    fs7.rmSync(stateFile2, { force: true });
+    fs8.rmSync(stateFile2, { force: true });
   } catch {
   }
 }
 function removePlaywrightProfile(profilePath, rmSyncOverride) {
-  const doRemove = rmSyncOverride ?? ((p, opts) => fs7.rmSync(p, opts));
+  const doRemove = rmSyncOverride ?? ((p, opts) => fs8.rmSync(p, opts));
   try {
     doRemove(profilePath, { recursive: true, force: true });
   } catch (error) {
@@ -5676,7 +5775,7 @@ function removePlaywrightProfile(profilePath, rmSyncOverride) {
     if (message.includes("EPERM") || message.includes("EBUSY") || message.includes("Permission denied")) {
       try {
         const stalePath = `${profilePath}.stale-${Date.now()}`;
-        fs7.renameSync(profilePath, stalePath);
+        fs8.renameSync(profilePath, stalePath);
       } catch {
       }
       return;
@@ -5699,23 +5798,23 @@ function prunePlaywrightProfileCaches(profilePath) {
   let freedFiles = 0;
   try {
     const defaultDir = path5.join(profilePath, "Default");
-    if (!fs7.existsSync(defaultDir)) {
+    if (!fs8.existsSync(defaultDir)) {
       return { freedBytes, freedFiles };
     }
     for (const dirName of transientDirNames) {
       const targetDir = path5.join(defaultDir, dirName);
-      if (fs7.existsSync(targetDir)) {
+      if (fs8.existsSync(targetDir)) {
         try {
           const countAndRemove = (d) => {
             try {
-              const entries = fs7.readdirSync(d, { withFileTypes: true });
+              const entries = fs8.readdirSync(d, { withFileTypes: true });
               for (const e of entries) {
                 const full = path5.join(d, e.name);
                 if (e.isDirectory()) {
                   countAndRemove(full);
                 } else if (e.isFile()) {
                   try {
-                    freedBytes += fs7.statSync(full).size;
+                    freedBytes += fs8.statSync(full).size;
                     freedFiles++;
                   } catch {
                   }
@@ -5725,7 +5824,7 @@ function prunePlaywrightProfileCaches(profilePath) {
             }
           };
           countAndRemove(targetDir);
-          fs7.rmSync(targetDir, { recursive: true, force: true });
+          fs8.rmSync(targetDir, { recursive: true, force: true });
         } catch {
         }
       }
@@ -5739,10 +5838,10 @@ function pruneAllPlaywrightProfiles(baseDir = getProfilesDir()) {
   let totalFreedFiles = 0;
   let profilesCleaned = 0;
   try {
-    if (!fs7.existsSync(baseDir)) {
+    if (!fs8.existsSync(baseDir)) {
       return { totalFreedBytes, totalFreedFiles, profilesCleaned };
     }
-    const entries = fs7.readdirSync(baseDir, { withFileTypes: true });
+    const entries = fs8.readdirSync(baseDir, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory()) {
         const profilePath = path5.join(baseDir, entry.name);
@@ -5762,11 +5861,11 @@ function cleanupOrphanProfiles(baseDir = getProfilesDir(), activeAccountIds) {
   let removedCount = 0;
   let freedBytes = 0;
   try {
-    if (!fs7.existsSync(baseDir)) {
+    if (!fs8.existsSync(baseDir)) {
       return { removedCount, freedBytes };
     }
     const activeIds = activeAccountIds ?? new Set(loadAccounts().map((a) => a.id));
-    const entries = fs7.readdirSync(baseDir, { withFileTypes: true });
+    const entries = fs8.readdirSync(baseDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       const isStale = entry.name.includes(".stale-");
@@ -5777,13 +5876,13 @@ function cleanupOrphanProfiles(baseDir = getProfilesDir(), activeAccountIds) {
           let bytes = 0;
           const countSize = (d) => {
             try {
-              const subEntries = fs7.readdirSync(d, { withFileTypes: true });
+              const subEntries = fs8.readdirSync(d, { withFileTypes: true });
               for (const e of subEntries) {
                 const full = path5.join(d, e.name);
                 if (e.isDirectory()) countSize(full);
                 else if (e.isFile()) {
                   try {
-                    bytes += fs7.statSync(full).size;
+                    bytes += fs8.statSync(full).size;
                   } catch {
                   }
                 }
@@ -5793,7 +5892,7 @@ function cleanupOrphanProfiles(baseDir = getProfilesDir(), activeAccountIds) {
           };
           countSize(targetPath);
           removePlaywrightProfile(targetPath);
-          if (!fs7.existsSync(targetPath)) {
+          if (!fs8.existsSync(targetPath)) {
             removedCount++;
             freedBytes += bytes;
           }
@@ -6252,8 +6351,8 @@ init_accounts();
 init_logger();
 import crypto4 from "crypto";
 import * as readline from "readline";
-import * as dotenv from "dotenv";
-dotenv.config();
+import * as dotenv2 from "dotenv";
+dotenv2.config();
 var rl = readline.createInterface({
   input: process.stdin,
   output: process.stdout