qwenproxy-cli 1.6.3 → 1.6.4

package/dist/clean-cache.js

@@ -2841,9 +2841,10 @@ function getAccountMutex(accountId) {
 async function recoverStuckAccountMutex(accountId, mutex, key) {
   if (accountMutexes.get(accountId) !== mutex) return;
   const lockState = mutex.state();
-  if (lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS || lockState.heldBy.startsWith("init:") || isAccountServingStream(accountId)) {
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
+  if (lockState.heldForMs < minLockTimeout || lockState.heldBy.startsWith("init:") || lockState.heldBy.startsWith("headers:") || lockState.heldBy.startsWith("refresh:") || lockState.heldBy.startsWith("profile-reset:") || isAccountServingStream(accountId)) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`
     );
     return;
   }

package/dist/delete-chats.js

@@ -3213,6 +3213,7 @@ __export(playwright_exports, {
   closeIdlePlaywrightAccounts: () => closeIdlePlaywrightAccounts,
   closePlaywrightForAccount: () => closePlaywrightForAccount,
   evictIdlePlaywrightContextsToLimit: () => evictIdlePlaywrightContextsToLimit,
+  getAccountMutex: () => getAccountMutex,
   getActivePlaywrightAccountIds: () => getActivePlaywrightAccountIds,
   getBasicHeaders: () => getBasicHeaders,
   getCookies: () => getCookies,
@@ -3362,9 +3363,10 @@ function getAccountMutex(accountId) {
 async function recoverStuckAccountMutex(accountId, mutex, key) {
   if (accountMutexes.get(accountId) !== mutex) return;
   const lockState = mutex.state();
-  if (lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS || lockState.heldBy.startsWith("init:") || isAccountServingStream(accountId)) {
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
+  if (lockState.heldForMs < minLockTimeout || lockState.heldBy.startsWith("init:") || lockState.heldBy.startsWith("headers:") || lockState.heldBy.startsWith("refresh:") || lockState.heldBy.startsWith("profile-reset:") || isAccountServingStream(accountId)) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`
     );
     return;
   }
@@ -4166,7 +4168,8 @@ async function getBasicHeaders(accountId) {
   }
   const release = await acquireAccountMutex(
     accountId,
-    `headers:${accountId.substring(0, 12)}`
+    `headers:${accountId.substring(0, 12)}`,
+    Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers + 3e4)
   );
   try {
     touchAccountActivity(accountId);
@@ -4259,8 +4262,10 @@ async function getBasicHeaders(accountId) {
         return { cookie: cookie2, userAgent, bxV: bxV2, bxUa: bxUa2, bxUmidtoken: bxUmidtoken2, ...clientHints };
       }
     }
+    let refreshedInThisCall = false;
     if (headersAge > HEADER_CACHE_TTL && !cache.refreshInProgress) {
       try {
+        refreshedInThisCall = true;
         await refreshHeadersInternal(accountId);
       } catch (error) {
         if (!hadUsableHeaders) throw error;
@@ -4329,7 +4334,7 @@ async function getBasicHeaders(accountId) {
       } catch {
       }
     }
-    if (!hasRequiredQwenHeaders(cache.headers)) {
+    if (!hasRequiredQwenHeaders(cache.headers) && !refreshedInThisCall) {
       console.log(
         `\u{1F504} [Playwright] Missing required anti-bot headers for ${accountId}, triggering header interception...`
       );
@@ -8857,7 +8862,7 @@ async function withQwenBrowserPage(accountId, fn, targetPath, operationTimeoutMs
       return fn(page);
     },
     operationTimeoutMs,
-    Math.min(config.timeouts.page, 3e4),
+    Math.max(6e4, operationTimeoutMs),
     recoverOnTimeout
   );
 }

package/dist/index.js

@@ -4323,6 +4323,7 @@ __export(playwright_exports, {
   closeIdlePlaywrightAccounts: () => closeIdlePlaywrightAccounts,
   closePlaywrightForAccount: () => closePlaywrightForAccount,
   evictIdlePlaywrightContextsToLimit: () => evictIdlePlaywrightContextsToLimit,
+  getAccountMutex: () => getAccountMutex,
   getActivePlaywrightAccountIds: () => getActivePlaywrightAccountIds,
   getBasicHeaders: () => getBasicHeaders,
   getCookies: () => getCookies,
@@ -4472,9 +4473,10 @@ function getAccountMutex(accountId) {
 async function recoverStuckAccountMutex(accountId, mutex, key) {
   if (accountMutexes.get(accountId) !== mutex) return;
   const lockState = mutex.state();
-  if (lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS || lockState.heldBy.startsWith("init:") || isAccountServingStream(accountId)) {
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
+  if (lockState.heldForMs < minLockTimeout || lockState.heldBy.startsWith("init:") || lockState.heldBy.startsWith("headers:") || lockState.heldBy.startsWith("refresh:") || lockState.heldBy.startsWith("profile-reset:") || isAccountServingStream(accountId)) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`
     );
     return;
   }
@@ -5276,7 +5278,8 @@ async function getBasicHeaders(accountId) {
   }
   const release = await acquireAccountMutex(
     accountId,
-    `headers:${accountId.substring(0, 12)}`
+    `headers:${accountId.substring(0, 12)}`,
+    Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers + 3e4)
   );
   try {
     touchAccountActivity(accountId);
@@ -5369,8 +5372,10 @@ async function getBasicHeaders(accountId) {
         return { cookie: cookie2, userAgent, bxV: bxV2, bxUa: bxUa2, bxUmidtoken: bxUmidtoken2, ...clientHints };
       }
     }
+    let refreshedInThisCall = false;
     if (headersAge > HEADER_CACHE_TTL && !cache3.refreshInProgress) {
       try {
+        refreshedInThisCall = true;
         await refreshHeadersInternal(accountId);
       } catch (error) {
         if (!hadUsableHeaders) throw error;
@@ -5439,7 +5444,7 @@ async function getBasicHeaders(accountId) {
       } catch {
       }
     }
-    if (!hasRequiredQwenHeaders(cache3.headers)) {
+    if (!hasRequiredQwenHeaders(cache3.headers) && !refreshedInThisCall) {
       console.log(
         `\u{1F504} [Playwright] Missing required anti-bot headers for ${accountId}, triggering header interception...`
       );
@@ -9825,7 +9830,7 @@ function isModelNotFoundError(err) {
 function isNetworkLikeError(err) {
   if (err instanceof QwenNetworkError) return true;
   const message = errMessage(err).toLowerCase();
-  return message === "network error" || message.includes("failed to fetch") || message.includes("fetch failed") || message.includes("network connection was lost") || message.includes("connection reset") || message.includes("connection closed") || message.includes("socket hang up") || message.includes("econnreset") || message.includes("econnrefused") || message.includes("etimedout");
+  return message === "network error" || message.includes("failed to fetch") || message.includes("fetch failed") || message.includes("network connection was lost") || message.includes("connection reset") || message.includes("connection closed") || message.includes("socket hang up") || message.includes("econnreset") || message.includes("econnrefused") || message.includes("etimedout") || message.includes("stream ended before response headers") || message.includes("timed out waiting for response headers");
 }
 function isCorruptedChatHistoryError(err) {
   const message = errMessage(err).toLowerCase();
@@ -12047,7 +12052,7 @@ async function withQwenBrowserPage(accountId, fn, targetPath, operationTimeoutMs
       return fn(page);
     },
     operationTimeoutMs,
-    Math.min(config.timeouts.page, 3e4),
+    Math.max(6e4, operationTimeoutMs),
     recoverOnTimeout
   );
 }
@@ -26823,7 +26828,7 @@ function getAppVersion() {
     }
   } catch {
   }
-  cachedVersion = "v1.6.3";
+  cachedVersion = "v1.6.4";
   return cachedVersion;
 }
 var cachedVersion;

package/dist/login.js

@@ -3190,6 +3190,7 @@ __export(playwright_exports, {
   closeIdlePlaywrightAccounts: () => closeIdlePlaywrightAccounts,
   closePlaywrightForAccount: () => closePlaywrightForAccount,
   evictIdlePlaywrightContextsToLimit: () => evictIdlePlaywrightContextsToLimit,
+  getAccountMutex: () => getAccountMutex,
   getActivePlaywrightAccountIds: () => getActivePlaywrightAccountIds,
   getBasicHeaders: () => getBasicHeaders,
   getCookies: () => getCookies,
@@ -3339,9 +3340,10 @@ function getAccountMutex(accountId) {
 async function recoverStuckAccountMutex(accountId, mutex, key) {
   if (accountMutexes.get(accountId) !== mutex) return;
   const lockState = mutex.state();
-  if (lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS || lockState.heldBy.startsWith("init:") || isAccountServingStream(accountId)) {
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
+  if (lockState.heldForMs < minLockTimeout || lockState.heldBy.startsWith("init:") || lockState.heldBy.startsWith("headers:") || lockState.heldBy.startsWith("refresh:") || lockState.heldBy.startsWith("profile-reset:") || isAccountServingStream(accountId)) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`
     );
     return;
   }
@@ -4143,7 +4145,8 @@ async function getBasicHeaders(accountId) {
   }
   const release = await acquireAccountMutex(
     accountId,
-    `headers:${accountId.substring(0, 12)}`
+    `headers:${accountId.substring(0, 12)}`,
+    Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers + 3e4)
   );
   try {
     touchAccountActivity(accountId);
@@ -4236,8 +4239,10 @@ async function getBasicHeaders(accountId) {
         return { cookie: cookie2, userAgent, bxV: bxV2, bxUa: bxUa2, bxUmidtoken: bxUmidtoken2, ...clientHints };
       }
     }
+    let refreshedInThisCall = false;
     if (headersAge > HEADER_CACHE_TTL && !cache.refreshInProgress) {
       try {
+        refreshedInThisCall = true;
         await refreshHeadersInternal(accountId);
       } catch (error) {
         if (!hadUsableHeaders) throw error;
@@ -4306,7 +4311,7 @@ async function getBasicHeaders(accountId) {
       } catch {
       }
     }
-    if (!hasRequiredQwenHeaders(cache.headers)) {
+    if (!hasRequiredQwenHeaders(cache.headers) && !refreshedInThisCall) {
       console.log(
         `\u{1F504} [Playwright] Missing required anti-bot headers for ${accountId}, triggering header interception...`
       );

package/dist/reset-cooldowns.js

@@ -3104,9 +3104,10 @@ function getAccountMutex(accountId) {
 async function recoverStuckAccountMutex(accountId, mutex, key) {
   if (accountMutexes.get(accountId) !== mutex) return;
   const lockState = mutex.state();
-  if (lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS || lockState.heldBy.startsWith("init:") || isAccountServingStream(accountId)) {
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
+  if (lockState.heldForMs < minLockTimeout || lockState.heldBy.startsWith("init:") || lockState.heldBy.startsWith("headers:") || lockState.heldBy.startsWith("refresh:") || lockState.heldBy.startsWith("profile-reset:") || isAccountServingStream(accountId)) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`
     );
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwenproxy-cli",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "description": "High-performance OpenAI & Anthropic compatible API gateway for Qwen with multi-account rotation, interactive TUI, and resilient tool calling.",
   "main": "src/index.ts",
   "bin": {

package/src/core/version.ts

@@ -17,6 +17,6 @@ export function getAppVersion(): string {
       }
     }
   } catch {}
-  cachedVersion = "v1.6.3";
+  cachedVersion = "v1.6.4";
   return cachedVersion;
 }

package/src/routes/chat/retry-policy.ts

@@ -390,7 +390,9 @@ export function isNetworkLikeError(err: unknown): boolean {
     message.includes("socket hang up") ||
     message.includes("econnreset") ||
     message.includes("econnrefused") ||
-    message.includes("etimedout")
+    message.includes("etimedout") ||
+    message.includes("stream ended before response headers") ||
+    message.includes("timed out waiting for response headers")
   );
 }
 

package/src/services/playwright.ts

@@ -166,7 +166,7 @@ export function buildChromiumLaunchArgs(viewport: {
 const ACCOUNT_MUTEX_MAX_HOLD_MS = 180_000;
 const accountMutexes = new Map<string, Mutex>();
 
-function getAccountMutex(accountId: string): Mutex {
+export function getAccountMutex(accountId: string): Mutex {
   let mutex = accountMutexes.get(accountId);
   if (!mutex) {
     mutex = new Mutex(`playwright:${accountId.substring(0, 8)}`, ACCOUNT_MUTEX_MAX_HOLD_MS);
@@ -189,15 +189,20 @@ async function recoverStuckAccountMutex(
   const lockState = mutex.state();
   // A lock is only considered stuck if it has been held for at least PLAYWRIGHT_MUTEX_WAIT_MS (60s).
   // A waiter with a short timeout (e.g. 5s) timing out does NOT mean the lock holder is stuck!
-  // Furthermore, never nuke an account while it is initializing (init: takes 20-30s)
-  // or while it is actively serving a stream to a user.
+  // Furthermore, never nuke an account while it is initializing (init: takes 20-30s),
+  // capturing/refreshing headers (headers/refresh can take up to HEADERS_TIMEOUT),
+  // running page operations, or while it is actively serving a stream to a user.
+  const minLockTimeout = Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers);
   if (
-    lockState.heldForMs < PLAYWRIGHT_MUTEX_WAIT_MS ||
+    lockState.heldForMs < minLockTimeout ||
     lockState.heldBy.startsWith("init:") ||
+    lockState.heldBy.startsWith("headers:") ||
+    lockState.heldBy.startsWith("refresh:") ||
+    lockState.heldBy.startsWith("profile-reset:") ||
     isAccountServingStream(accountId)
   ) {
     logger.warn(
-      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${PLAYWRIGHT_MUTEX_WAIT_MS}ms | servingStream=${isAccountServingStream(accountId)}`,
+      `[Playwright] Skipping destructive mutex recovery | account=${accountId} | heldBy=${lockState.heldBy} | heldFor=${lockState.heldForMs}ms | limit=${minLockTimeout}ms | servingStream=${isAccountServingStream(accountId)}`,
     );
     return;
   }
@@ -1246,6 +1251,7 @@ export async function getBasicHeaders(accountId: string): Promise<{
   const release = await acquireAccountMutex(
     accountId,
     `headers:${accountId.substring(0, 12)}`,
+    Math.max(PLAYWRIGHT_MUTEX_WAIT_MS, config.timeouts.headers + 30_000),
   );
   try {
     touchAccountActivity(accountId);
@@ -1369,8 +1375,10 @@ export async function getBasicHeaders(accountId: string): Promise<{
 
     // Refresh headers if stale. A valid cached set remains usable when a
     // browser recapture transiently fails; a cold/partial cache must fail.
+    let refreshedInThisCall = false;
     if (headersAge > HEADER_CACHE_TTL && !cache.refreshInProgress) {
       try {
+        refreshedInThisCall = true;
         await refreshHeadersInternal(accountId);
       } catch (error) {
         if (!hadUsableHeaders) throw error;
@@ -1443,7 +1451,7 @@ export async function getBasicHeaders(accountId: string): Promise<{
       } catch {}
     }
 
-    if (!hasRequiredQwenHeaders(cache.headers)) {
+    if (!hasRequiredQwenHeaders(cache.headers) && !refreshedInThisCall) {
       console.log(
         `🔄 [Playwright] Missing required anti-bot headers for ${accountId}, triggering header interception...`,
       );

package/src/services/qwen.ts

@@ -818,7 +818,7 @@ async function withQwenBrowserPage<T>(
       return fn(page);
     },
     operationTimeoutMs,
-    Math.min(config.timeouts.page, 30_000),
+    Math.max(60_000, operationTimeoutMs),
     recoverOnTimeout,
   );
 }