qwenproxy-cli 1.6.10 → 1.6.11

package/dist/clean-cache.js

@@ -2035,6 +2035,26 @@ function clearAccountCooldown(accountId) {
     }
   }
 }
+function getAccountCooldownInfo(accountId) {
+  const entry = cooldowns.get(accountId);
+  if (!entry) return null;
+  const remaining = entry.until - Date.now();
+  if (remaining <= 0) {
+    cooldowns.delete(accountId);
+    if (accountId !== "global") {
+      try {
+        updateAccountCooldown(accountId, 0, null);
+      } catch (err) {
+        console.error(
+          `\u274C [AccountManager] Failed to clear expired cooldown in DB:`,
+          err.message
+        );
+      }
+    }
+    return null;
+  }
+  return { onCooldown: true, remainingMs: remaining, reason: entry.reason };
+}
 function markAccountHeadersReady(accountId) {
   if (!accountId || accountId === "global") return;
   headersReadyAccounts.add(accountId);
@@ -3623,8 +3643,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);
@@ -3893,7 +3917,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
@@ -3911,6 +3935,8 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
     } finally {
       release();
     }
+    await evictIdlePlaywrightContextsToLimit().catch(() => {
+    });
   })();
   try {
     await initPromise;
@@ -5413,7 +5439,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,
@@ -5421,14 +5451,15 @@ function priorityOrderForEviction(accountIds) {
     (id) => lastAccountActivity.get(id) ?? 0
   );
 }
-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();
     })
@@ -5441,6 +5472,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) => {
@@ -5543,10 +5575,6 @@ async function closePlaywrightForAccount(accountId) {
     release();
   }
 }
-function isAccountRecentlyActive(accountId, maxIdleMs = 3e5) {
-  const last = lastAccountActivity.get(accountId) ?? 0;
-  return last > 0 && Date.now() - last < maxIdleMs;
-}
 var requireLocal, contextInitHooks, ACCOUNT_MUTEX_MAX_HOLD_MS, accountMutexes, accountContexts, accountPages, inFlightAccountInits, headerCaches, HEADER_CACHE_TTL, COOKIE_CACHE_TTL, cookieCaches, lastAccountActivity, lastKeepAliveNavigation, lastProactiveTokenRefresh, profileResetQueue, profileResetChain, closingAllPlaywright, sleep2, HEADER_CAPTURE_SETTLE_MS, PLAYWRIGHT_MUTEX_WAIT_MS, ACCOUNT_PAGE_OPERATION_TIMEOUT_MS, SESSION_PROBE_NAVIGATION_TIMEOUT_MS, HEADER_CAPTURE_TRIGGER_GRACE_MS, FIRST_TRIGGER_GRACE_MS, HEADER_CAPTURE_TRIGGER_ATTEMPTS, CHAT_INPUT_APPEAR_TIMEOUT_MS, CHAT_INPUT_ACTION_TIMEOUT_MS, PROFILE_RESET_TIMEOUT_MS;
 var init_playwright = __esm({
   "src/services/playwright.ts"() {

package/dist/delete-chats.js

@@ -2185,6 +2185,26 @@ function clearAccountCooldown(accountId) {
     }
   }
 }
+function getAccountCooldownInfo(accountId) {
+  const entry = cooldowns.get(accountId);
+  if (!entry) return null;
+  const remaining = entry.until - Date.now();
+  if (remaining <= 0) {
+    cooldowns.delete(accountId);
+    if (accountId !== "global") {
+      try {
+        updateAccountCooldown(accountId, 0, null);
+      } catch (err) {
+        console.error(
+          `\u274C [AccountManager] Failed to clear expired cooldown in DB:`,
+          err.message
+        );
+      }
+    }
+    return null;
+  }
+  return { onCooldown: true, remainingMs: remaining, reason: entry.reason };
+}
 function markAccountHeadersReady(accountId) {
   if (!accountId || accountId === "global") return;
   headersReadyAccounts.add(accountId);
@@ -4337,14 +4357,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)) {
@@ -4482,8 +4503,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);
@@ -4752,7 +4777,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
@@ -4770,6 +4795,8 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
     } finally {
       release();
     }
+    await evictIdlePlaywrightContextsToLimit().catch(() => {
+    });
   })();
   try {
     await initPromise;
@@ -6538,19 +6565,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(
@@ -6607,7 +6641,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)
@@ -6923,7 +6957,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,
@@ -6960,14 +6998,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();
     })
@@ -6980,6 +7019,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) => {
@@ -7818,6 +7858,7 @@ var init_model_registry = __esm({
 var captcha_coordinator_exports = {};
 __export(captcha_coordinator_exports, {
   isCaptchaRecoveryActive: () => isCaptchaRecoveryActive,
+  isCaptchaRecoveryInBackoff: () => isCaptchaRecoveryInBackoff,
   recoverBaxiaCaptcha: () => recoverBaxiaCaptcha,
   solveChallengeOnPage: () => solveChallengeOnPage
 });
@@ -7856,6 +7897,11 @@ async function solveChallengeOnPage(page, challengeUrl, waitForMs = config.captc
     }
   }
 }
+function isCaptchaRecoveryInBackoff(accountId) {
+  if (!accountId) return false;
+  const lastFailure = lastFailedRecoveryAt.get(accountId) ?? 0;
+  return Date.now() - lastFailure < FAILED_RECOVERY_BACKOFF_MS;
+}
 async function recoverBaxiaCaptcha(accountId, label, options = {}) {
   if (!config.captcha.enabled || !accountId) return false;
   const solver = "baxia";
@@ -7873,17 +7919,34 @@ async function recoverBaxiaCaptcha(accountId, label, options = {}) {
   const challengeUrl = options.challengeBody ? extractBaxiaChallengeUrl(options.challengeBody, config.qwen.baseUrl) : null;
   activeCaptchaRecoveries.add(accountId);
   try {
-    const { abortActiveBrowserStreamsForAccount: abortActiveBrowserStreamsForAccount2 } = await Promise.resolve().then(() => (init_qwen(), qwen_exports));
-    abortActiveBrowserStreamsForAccount2(
-      accountId,
-      "Account stream interrupted by captcha challenge recovery"
-    );
-  } catch {
-  }
-  try {
+    const { hasActiveBrowserStreamsForAccount: hasActiveBrowserStreamsForAccount2 } = await Promise.resolve().then(() => (init_qwen(), qwen_exports));
+    const hasConcurrentStream = hasActiveBrowserStreamsForAccount2(accountId);
     const solved = await withAccountPage(
       accountId,
-      (page) => solveChallengeOnPage(page, challengeUrl),
+      async (page) => {
+        if (hasConcurrentStream) {
+          const solverOptions = {
+            maxAttempts: config.captcha.maxAttempts,
+            retryDelayMs: config.captcha.retryDelayMs,
+            settleMs: config.captcha.settleMs
+          };
+          if (await solveBaxiaCaptcha(page, { ...solverOptions, waitForMs: 0 })) {
+            return true;
+          }
+          const ctx = typeof page.context === "function" ? page.context() : null;
+          if (ctx && typeof ctx.newPage === "function") {
+            const tempPage = await ctx.newPage();
+            try {
+              return await solveChallengeOnPage(tempPage, challengeUrl);
+            } finally {
+              await tempPage.close({ runBeforeUnload: false }).catch(() => {
+              });
+            }
+          }
+          return false;
+        }
+        return await solveChallengeOnPage(page, challengeUrl);
+      },
       solverOperationTimeoutMs,
       solverOperationTimeoutMs,
       false
@@ -8682,6 +8745,7 @@ __export(qwen_exports, {
   getLogicalThreadState: () => getLogicalThreadState,
   getQwenErrorCode: () => getQwenErrorCode,
   getSessionParent: () => getSessionParent,
+  hasActiveBrowserStreamsForAccount: () => hasActiveBrowserStreamsForAccount,
   invalidateLogicalThreadParent: () => invalidateLogicalThreadParent,
   isChatSessionActive: () => isChatSessionActive,
   isRetryableFetchErrorMessage: () => isRetryableFetchErrorMessage,
@@ -8703,6 +8767,14 @@ __export(qwen_exports, {
 });
 import crypto5 from "crypto";
 import { v4 as uuidv43 } from "uuid";
+function hasActiveBrowserStreamsForAccount(accountId) {
+  for (const state of browserStreamStates.values()) {
+    if (state.accountId === accountId && !state.done) {
+      return true;
+    }
+  }
+  return false;
+}
 function abortActiveBrowserStreamsForAccount(accountId, reason = "Account browser stream interrupted (page context unloaded)") {
   let count = 0;
   for (const [requestId, state] of browserStreamStates) {
@@ -9480,7 +9552,7 @@ async function createQwenBrowserResponse(accountId, url, method, headers, body,
           const onFrameNavigated = (frame) => {
             if (!settled && typeof page.mainFrame === "function" && frame === page.mainFrame()) {
               const url2 = typeof frame.url === "function" ? frame.url() : String(frame.url || "");
-              if (url2.startsWith(qwenOrigin()) && !url2.includes("/auth") && !url2.includes("_____tmd_____") && !url2.includes("/punish")) {
+              if (url2.startsWith(qwenOrigin()) && !url2.includes("/auth") && !url2.includes("/login") && !url2.includes("_____tmd_____") && !url2.includes("/punish")) {
                 return;
               }
               handleBrowserStreamEvent(requestId, {
@@ -9501,10 +9573,12 @@ async function createQwenBrowserResponse(accountId, url, method, headers, body,
           };
           page.on("framenavigated", onFrameNavigated);
           page.on("close", onPageClosed);
+          page.on("crash", onPageClosed);
           pageCleanup = () => {
             try {
               page.off?.("framenavigated", onFrameNavigated);
               page.off?.("close", onPageClosed);
+              page.off?.("crash", onPageClosed);
             } catch {
             }
           };
@@ -11292,6 +11366,7 @@ async function deleteChatsForConfiguredAccounts(keepBrowserOpen = false) {
       const account = accounts[i];
       const currentIdx = i + 1;
       const totalCount = accounts.length;
+      const wasInitialized = isPlaywrightInitialized(account.id);
       try {
         const ok = await deleteChatsForAccount(account, currentIdx, totalCount);
         if (ok) succeeded++;
@@ -11301,7 +11376,7 @@ async function deleteChatsForConfiguredAccounts(keepBrowserOpen = false) {
           error instanceof Error ? error.message : String(error)
         );
       } finally {
-        if (!keepBrowserOpen) {
+        if ((!keepBrowserOpen || !wasInitialized) && !isAuthMockEnabled()) {
           const { closePlaywrightForAccount: closePlaywrightForAccount2 } = await Promise.resolve().then(() => (init_playwright(), playwright_exports));
           await closePlaywrightForAccount2(account.id).catch(() => {
           });