qwenproxy-cli 1.6.9 → 1.6.11

package/dist/login.js

@@ -3492,7 +3492,19 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
         if (localStorage.getItem("qwen_token_logged_out_marker")) {
           return false;
         }
-        const res = await fetch("/api/v1/auths/", { method: "GET" });
+        const lsToken = (localStorage.getItem("token") || "").trim();
+        if (lsToken && !/(?:^|;\s*)token=/.test(document.cookie || "")) {
+          try {
+            document.cookie = `token=${encodeURIComponent(lsToken)}; path=/; domain=.qwen.ai; max-age=31536000`;
+          } catch {
+          }
+        }
+        const authHeaders = lsToken ? { Authorization: `Bearer ${lsToken}` } : {};
+        const res = await fetch("/api/v1/auths/", {
+          method: "GET",
+          headers: authHeaders,
+          credentials: "include"
+        });
         if (res.status !== 200) return false;
         const json = await res.json().catch(() => null);
         if (!json) return false;
@@ -3510,6 +3522,7 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
         try {
           const settingsRes = await fetch("/api/v2/users/user/settings", {
             method: "GET",
+            headers: authHeaders,
             credentials: "include",
             signal: AbortSignal.timeout(3e3)
           });
@@ -4297,14 +4310,15 @@ async function getBasicHeaders(accountId) {
           `\u26A0\uFE0F  [Playwright] Header refresh failed for ${accountId}; retaining the previous valid cache: ${getErrorMessage(error)}`
         );
       }
-    } else if (hadUsableHeaders && headersAge > HEADER_CACHE_TTL * HEADER_REFRESH_THRESHOLD && !cache.refreshInProgress) {
-      cache.refreshInProgress = true;
+    } else if (hadUsableHeaders && headersAge > HEADER_CACHE_TTL * HEADER_REFRESH_THRESHOLD && !cache.refreshInProgress && // Header capture types into the chat input and sends a probe message on
+    // the account's page. Doing that while the account is serving a stream
+    // would mutate the live conversation (and can navigate the SPA), so the
+    // proactive refresh waits until the account has no active lease.
+    !hasActiveAccountLease(accountId)) {
       refreshHeadersInternal(accountId).catch((error) => {
         console.warn(
           `\u26A0\uFE0F  [Playwright] Background header refresh failed for ${accountId}: ${getErrorMessage(error)}`
         );
-      }).finally(() => {
-        cache.refreshInProgress = false;
       });
     }
     if (!hasRequiredQwenHeaders(cache.headers)) {
@@ -4442,8 +4456,12 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
       if (accountPages.has(account.id)) {
         return;
       }
-      await evictIdlePlaywrightContextsToLimit().catch(() => {
-      });
+      if (config.playwright.maxActiveContexts > 0) {
+        await evictIdlePlaywrightContextsToLimit(
+          Math.max(1, config.playwright.maxActiveContexts - 1)
+        ).catch(() => {
+        });
+      }
       const profilePath = getAccountProfilePath(account.id);
       const fingerprint = getFingerprintProfile(account.id);
       const { engine, channel } = resolveBrowserEngine(browserType);
@@ -4668,8 +4686,15 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
         const hasAuthCookie = cookies.some(
           (c) => c.name.toLowerCase().includes("token") || c.name.toLowerCase().includes("session")
         );
+        let initialLoginAttempted = false;
         if (!hasAuthCookie && account.email && account.password) {
-          await loginToQwen(account.id, account.email, account.password);
+          initialLoginAttempted = true;
+          const loggedIn = await loginToQwen(account.id, account.email, account.password);
+          if (!loggedIn) {
+            throw new Error(
+              `Authentication failed for account ${maskEmail(account.email)}`
+            );
+          }
         }
         try {
           await acctPage.goto(qwenUrl("/"), {
@@ -4679,13 +4704,21 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
           await sleep2(1500);
           const currentUrl = acctPage.url();
           const isAuthUrl = currentUrl.includes("/auth") || currentUrl.includes("/login");
-          if (isAuthUrl && account.email && account.password) {
+          if (isAuthUrl && !initialLoginAttempted && account.email && account.password) {
             console.log(
               `[Playwright] Initial login needed for ${maskEmail(account.email)}, authenticating...`
             );
-            await loginToQwen(account.id, account.email, account.password);
+            const loggedIn = await loginToQwen(account.id, account.email, account.password);
+            if (!loggedIn) {
+              throw new Error(
+                `Authentication failed for account ${maskEmail(account.email)}`
+              );
+            }
           }
         } catch (err) {
+          if (err?.message?.includes("Authentication failed for account")) {
+            throw err;
+          }
           console.warn(
             `\u26A0\uFE0F  [Playwright] Initial navigation check for ${maskEmail(account.email)}: ${err.message}`
           );
@@ -4697,7 +4730,7 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
         if (!acctPage.isClosed()) {
           try {
             const currentUrl = new URL(acctPage.url());
-            if (currentUrl.origin !== qwenOrigin() || currentUrl.pathname !== "/") {
+            if (currentUrl.origin !== qwenOrigin() || currentUrl.pathname.includes("/auth") || currentUrl.pathname.includes("/login") || currentUrl.pathname.includes("_____tmd_____")) {
               await acctPage.goto(qwenUrl("/"), {
                 waitUntil: "domcontentloaded",
                 timeout: config.timeouts.navigation
@@ -4715,6 +4748,8 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
     } finally {
       release();
     }
+    await evictIdlePlaywrightContextsToLimit().catch(() => {
+    });
   })();
   try {
     await initPromise;
@@ -5234,10 +5269,30 @@ async function loginToQwen(accountId, email, password) {
     const uiResult = await loginViaUi(page, email, password);
     if (uiResult.success) {
       cookieCaches.delete(accountId);
-      await saveStorageState(page.context(), accountId);
       try {
-        const liveCookies = await page.context().cookies();
-        const tokenCookie = liveCookies.find((c) => c.name === "token");
+        let liveCookies = await page.context().cookies();
+        let tokenCookie = liveCookies.find((c) => c.name === "token");
+        if (!tokenCookie) {
+          const lsTok = uiResult.token || await page.evaluate(() => (localStorage.getItem("token") || "").trim()).catch(() => "");
+          if (lsTok) {
+            await page.context().addCookies([
+              {
+                name: "token",
+                value: lsTok,
+                domain: ".qwen.ai",
+                path: "/",
+                expires: Math.floor(Date.now() / 1e3) + 31536e3,
+                httpOnly: false,
+                secure: true,
+                sameSite: "Lax"
+              }
+            ]).catch(() => {
+            });
+            liveCookies = await page.context().cookies();
+            tokenCookie = liveCookies.find((c) => c.name === "token");
+          }
+        }
+        await saveStorageState(page.context(), accountId);
         if (tokenCookie) {
           const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
           const cache = getHeaderCache(accountId);
@@ -5246,7 +5301,7 @@ async function loginToQwen(accountId, email, password) {
           markAccountHeadersReady(accountId);
           const { saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
           const exp = parseJwtExpiry(tokenCookie.value);
-          let rTok = uiResult.refreshToken;
+          let rTok = uiResult.refreshToken || liveCookies.find((c) => c.name === "refresh_token")?.value;
           if (!rTok) {
             try {
               rTok = await page.evaluate(() => localStorage.getItem("refresh_token") || "") || void 0;
@@ -5327,8 +5382,9 @@ async function loginViaApi(page, email, password) {
     }
     const signinUrl = "https://auth.qwen.ai/api/v2/auths/signin";
     const requestId = crypto3.randomUUID();
+    const webVersion = getQwenWebVersion() || "0.3.26";
     const evalRes = await page.evaluate(
-      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2, tz }) => {
+      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2, tz, version }) => {
         try {
           const response = await fetch(signinUrl2, {
             method: "POST",
@@ -5338,7 +5394,7 @@ async function loginViaApi(page, email, password) {
               accept: "application/json, text/plain, */*",
               "content-type": "application/json",
               source: "web",
-              version: getQwenWebVersion() || "0.3.26",
+              version,
               "x-request-origin": "https://chat.qwen.ai",
               timezone: tz,
               "x-request-id": requestId2
@@ -5351,7 +5407,14 @@ async function loginViaApi(page, email, password) {
           return { ok: false, error: e.message };
         }
       },
-      { email, password: hashedPassword, signinUrl, requestId, tz: formatAsciiTimezone() }
+      {
+        email,
+        password: hashedPassword,
+        signinUrl,
+        requestId,
+        tz: formatAsciiTimezone(),
+        version: webVersion
+      }
     ).catch(() => null);
     let data = evalRes?.data;
     let signinSuccess = Boolean(
@@ -5360,7 +5423,7 @@ async function loginViaApi(page, email, password) {
     if (!signinSuccess && !data?.data?.code) {
       const fallbackUrl = qwenUrl("/api/v2/auths/signin");
       const fallbackRes = await page.evaluate(
-        async ({ email: email2, password: password2, fallbackUrl: fallbackUrl2, requestId: requestId2, tz }) => {
+        async ({ email: email2, password: password2, fallbackUrl: fallbackUrl2, requestId: requestId2, tz, version }) => {
           try {
             const response = await fetch(fallbackUrl2, {
               method: "POST",
@@ -5370,7 +5433,7 @@ async function loginViaApi(page, email, password) {
                 accept: "application/json, text/plain, */*",
                 "content-type": "application/json",
                 source: "web",
-                version: getQwenWebVersion() || "0.3.26",
+                version,
                 timezone: tz,
                 "x-request-id": requestId2
               },
@@ -5382,7 +5445,14 @@ async function loginViaApi(page, email, password) {
             return { ok: false, error: e.message };
           }
         },
-        { email, password: hashedPassword, fallbackUrl, requestId, tz: formatAsciiTimezone() }
+        {
+          email,
+          password: hashedPassword,
+          fallbackUrl,
+          requestId,
+          tz: formatAsciiTimezone(),
+          version: webVersion
+        }
       ).catch(() => null);
       if (fallbackRes?.data) {
         data = fallbackRes.data;
@@ -5607,28 +5677,34 @@ async function loginViaUi(page, email, 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"), 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();
-    await page.evaluate((sel) => {
-      try {
-        const btn = document.querySelector(sel);
-        if (btn) {
-          btn.removeAttribute("disabled");
-          btn.classList.remove("ant-btn-disabled");
-          btn.click();
-        }
-      } catch {
-      }
-    }, submitSelector).catch(() => {
-    });
+    let submitted = false;
     try {
       if (await submitButton.isVisible({ timeout: 2e3 }).catch(() => false)) {
-        await submitButton.click({ force: true, timeout: 2e3 }).catch(() => {
+        await submitButton.click({ timeout: 2e3 }).catch(() => {
         });
+        submitted = true;
       }
     } catch {
     }
-    const passInput = page.locator(passwordSelector).first();
-    await passInput.press("Enter", { timeout: 2e3 }).catch(() => {
-    });
+    if (!submitted) {
+      await page.evaluate(() => {
+        try {
+          const btn = document.querySelector(
+            'button.qwenchat-auth-pc-submit-button, button[type="submit"]'
+          );
+          if (btn) {
+            btn.removeAttribute("disabled");
+            btn.classList.remove("ant-btn-disabled");
+            btn.click();
+          }
+        } catch {
+        }
+      }).catch(() => {
+      });
+      const passInput = page.locator(passwordSelector).first();
+      await passInput.press("Enter", { timeout: 2e3 }).catch(() => {
+      });
+    }
     const postSubmitDeadline = Date.now() + 15e3;
     while (Date.now() < postSubmitDeadline) {
       if (page.isClosed()) break;
@@ -5646,9 +5722,12 @@ async function loginViaUi(page, email, password) {
         ".ant-form-item-explain-error",
         ".ant-message-error",
         ".ant-message-notice",
+        ".ant-message-custom-content",
+        ".ant-notification-notice",
         '[role="alert"]',
         ".qwenchat-auth-error",
-        ".auth-error-message"
+        ".auth-error-message",
+        ".qwenchat-toast"
       ].join(", ");
       const errorEl = page.locator(errorSelector).first();
       if (await errorEl.isVisible().catch(() => false)) {
@@ -5662,7 +5741,15 @@ async function loginViaUi(page, email, password) {
           };
         }
       }
-      const codeSelector = 'input[placeholder*="code" i], input[placeholder*="c\xF3digo" i], input[name*="code" i]';
+      const codeSelector = [
+        'input[placeholder*="code" i]',
+        'input[placeholder*="c\xF3digo" i]',
+        'input[name*="code" i]',
+        ".qwenchat-verification-code-input",
+        ".qwenchat-verification-code-input-cell",
+        '[aria-label*="Verification code" i]',
+        '[aria-label*="c\xF3digo de verifica\xE7\xE3o" i]'
+      ].join(", ");
       const codeInput = page.locator(codeSelector).first();
       if (await codeInput.isVisible().catch(() => false)) {
         return {
@@ -5672,16 +5759,44 @@ async function loginViaUi(page, email, password) {
       }
       try {
         const liveCookies = await page.context().cookies();
-        if (liveCookies.some((c) => c.name === "token")) {
-          return { success: true };
+        const rTokCookie = liveCookies.find((c) => c.name === "refresh_token")?.value;
+        const tokCookie = liveCookies.find((c) => c.name === "token")?.value;
+        if (tokCookie) {
+          return { success: true, token: tokCookie, refreshToken: rTokCookie };
         }
-      } catch {
-      }
-      const currentUrl = page.url();
-      if (!currentUrl.includes("/auth") && !currentUrl.includes("/login")) {
-        if (await isPageLoggedIn(page, 3e3)) {
-          return { success: true };
+        const currentUrl = page.url();
+        if (!currentUrl.includes("/auth") && !currentUrl.includes("/login")) {
+          const lsTok = await page.evaluate(() => {
+            const t = (localStorage.getItem("token") || "").trim();
+            if (t) {
+              try {
+                document.cookie = `token=${encodeURIComponent(t)}; path=/; domain=.qwen.ai; max-age=31536000`;
+              } catch {
+              }
+            }
+            return t;
+          }).catch(() => "");
+          if (lsTok) {
+            await page.context().addCookies([
+              {
+                name: "token",
+                value: lsTok,
+                domain: ".qwen.ai",
+                path: "/",
+                expires: Math.floor(Date.now() / 1e3) + 31536e3,
+                httpOnly: false,
+                secure: true,
+                sameSite: "Lax"
+              }
+            ]).catch(() => {
+            });
+            return { success: true, token: lsTok, refreshToken: rTokCookie };
+          }
+          if (await isPageLoggedIn(page, 3e3)) {
+            return { success: true, refreshToken: rTokCookie };
+          }
         }
+      } catch {
       }
       await sleep2(1e3);
     }
@@ -5711,10 +5826,18 @@ async function refreshAccountToken(accountId) {
     } catch {
     }
   }
+  if (!refreshToken) {
+    try {
+      const liveCookies = await page.context().cookies();
+      refreshToken = liveCookies.find((c) => c.name === "refresh_token")?.value;
+    } catch {
+    }
+  }
   if (refreshToken) {
     try {
+      const webVersion = getQwenWebVersion() || "0.3.26";
       const refreshResult = await page.evaluate(
-        async ({ rTok, tz }) => {
+        async ({ rTok, tz, version }) => {
           try {
             const response = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
               method: "GET",
@@ -5722,7 +5845,7 @@ async function refreshAccountToken(accountId) {
               headers: {
                 accept: "application/json, text/plain, */*",
                 source: "web",
-                version: getQwenWebVersion() || "0.3.26",
+                version,
                 "x-request-origin": "https://chat.qwen.ai",
                 timezone: tz,
                 authorization: `Bearer ${rTok}`
@@ -5734,7 +5857,7 @@ async function refreshAccountToken(accountId) {
             return { ok: false, error: e.message };
           }
         },
-        { rTok: refreshToken, tz: formatAsciiTimezone() }
+        { rTok: refreshToken, tz: formatAsciiTimezone(), version: webVersion }
       );
       const json = refreshResult?.data;
       if (json && json.success === true && json.data) {
@@ -6395,19 +6518,26 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
         await executeReauth();
       } else {
         try {
-          await page.goto(qwenUrl("/"), {
-            waitUntil: "domcontentloaded",
-            timeout: Math.min(
-              config.timeouts.navigation,
-              boundedTimeoutMs,
-              SESSION_PROBE_NAVIGATION_TIMEOUT_MS
-            )
-          });
-          await sleep2(2e3);
-          const url = page.url();
+          const currentUrl = typeof page.url === "function" ? page.url() : "";
+          const needsNavigation = !currentUrl.startsWith(qwenOrigin()) || currentUrl.includes("/auth") || currentUrl.includes("/login") || currentUrl.includes("_____tmd_____");
+          if (needsNavigation) {
+            await page.goto(qwenUrl("/"), {
+              waitUntil: "domcontentloaded",
+              timeout: Math.min(
+                config.timeouts.navigation,
+                boundedTimeoutMs,
+                SESSION_PROBE_NAVIGATION_TIMEOUT_MS
+              )
+            });
+            await sleep2(2e3);
+          }
+          const url = typeof page.url === "function" ? page.url() : "";
           const isAuthUrl = url.includes("auth") || url.includes("login");
           if (isAuthUrl) {
-            await executeReauth();
+            const refreshed = await refreshAccountToken(accountId);
+            if (!refreshed.success) {
+              await executeReauth();
+            }
           }
         } catch (navErr) {
           console.warn(
@@ -6464,7 +6594,7 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
     if (capturedPage && !capturedPage.isClosed()) {
       try {
         const currentUrl = new URL(capturedPage.url());
-        if (currentUrl.origin !== qwenOrigin() || currentUrl.pathname !== "/") {
+        if (currentUrl.origin !== qwenOrigin() || currentUrl.pathname.includes("/auth") || currentUrl.pathname.includes("/login") || currentUrl.pathname.includes("_____tmd_____")) {
           await capturedPage.goto(qwenUrl("/"), {
             waitUntil: "domcontentloaded",
             timeout: Math.min(config.timeouts.navigation, boundedTimeoutMs)
@@ -6780,7 +6910,11 @@ function priorityOrderForEviction(accountIds) {
   const ranked = getAccountsByPriority(accountIds.map((id) => ({ id })));
   const rank = /* @__PURE__ */ new Map();
   for (const [index, account] of ranked.entries()) {
-    rank.set(account.id, index);
+    if (getAccountCooldownInfo(account.id)) {
+      rank.set(account.id, Number.MAX_SAFE_INTEGER);
+    } else {
+      rank.set(account.id, index);
+    }
   }
   return orderContextsForEviction(
     accountIds,
@@ -6817,14 +6951,15 @@ async function closeIdlePlaywrightAccounts(idleMs) {
   }
   return closed;
 }
-async function evictIdlePlaywrightContextsToLimit() {
-  const max = config.playwright.maxActiveContexts;
-  if (max <= 0) return 0;
+async function evictIdlePlaywrightContextsToLimit(targetLimit) {
+  const configuredMax = config.playwright.maxActiveContexts;
+  if (configuredMax <= 0) return 0;
+  const max = targetLimit !== void 0 ? Math.max(0, targetLimit) : configuredMax;
   if (accountPages.size <= max) return 0;
   const candidates = priorityOrderForEviction(
     Array.from(accountPages.keys()).filter((accountId) => {
       if (isAccountServingStream(accountId)) return false;
-      if (isAccountRecentlyActive(accountId, 3e4)) return false;
+      if (hasActiveAccountLease(accountId)) return false;
       const mutex = accountMutexes.get(accountId);
       return mutex?.isIdle();
     })
@@ -6837,6 +6972,7 @@ async function evictIdlePlaywrightContextsToLimit() {
   for (const candidate of candidates) {
     if (accountPages.size <= max) break;
     if (isAccountServingStream(candidate.accountId)) continue;
+    if (hasActiveAccountLease(candidate.accountId)) continue;
     const mutex = accountMutexes.get(candidate.accountId);
     if (!mutex?.isIdle()) continue;
     await closePlaywrightForAccount(candidate.accountId).catch((error) => {