qwenproxy-cli 1.4.8 → 1.5.1

package/dist/clean-cache.js

@@ -1915,7 +1915,15 @@ function defaultCooldownDurationMs() {
   return computeQuotaCooldownMs(Date.now());
 }
 function markAccountRateLimited(accountId, cooldownMs, reason, options = {}) {
+  if (cooldownMs !== void 0 && cooldownMs <= 0) {
+    clearAccountCooldown(accountId);
+    return;
+  }
   const duration = cooldownMs ?? defaultCooldownDurationMs();
+  if (duration <= 0) {
+    clearAccountCooldown(accountId);
+    return;
+  }
   const until = Date.now() + duration;
   const cooldownReason = reason ?? "RateLimited";
   cooldowns.set(accountId, {
@@ -1938,6 +1946,19 @@ function markAccountRateLimited(accountId, cooldownMs, reason, options = {}) {
     );
   }
 }
+function clearAccountCooldown(accountId) {
+  cooldowns.delete(accountId);
+  if (accountId !== "global") {
+    try {
+      updateAccountCooldown(accountId, 0, null);
+    } catch (err) {
+      console.error(
+        `\u274C [AccountManager] Failed to clear cooldown in DB for ${accountId}:`,
+        err.message
+      );
+    }
+  }
+}
 function markAccountHeadersReady(accountId) {
   if (!accountId || accountId === "global") return;
   headersReadyAccounts.add(accountId);
@@ -1946,6 +1967,9 @@ function unmarkAccountHeadersReady(accountId) {
   if (!accountId) return;
   headersReadyAccounts.delete(accountId);
 }
+function isAccountHeadersReady(accountId) {
+  return headersReadyAccounts.has(accountId);
+}
 var cooldowns, headersReadyAccounts;
 var init_account_manager = __esm({
   "src/core/account-manager.ts"() {
@@ -2877,26 +2901,6 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
           }
         } catch {
         }
-        try {
-          const refreshRes = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
-            method: "GET",
-            credentials: "include",
-            signal: AbortSignal.timeout(3e3)
-          });
-          if (refreshRes.status === 200) {
-            const refreshJson = await refreshRes.json().catch(() => null);
-            if (refreshJson && refreshJson.success === false) {
-              const code = refreshJson.data?.code || refreshJson.code;
-              const details = String(refreshJson.data?.details || "");
-              if (code === "Unauthorized" || details.includes("revogado") || details.includes("revoked")) {
-                return false;
-              }
-            }
-          } else if (refreshRes.status === 401 || refreshRes.status === 403) {
-            return false;
-          }
-        } catch {
-        }
         return true;
       } catch {
         return false;
@@ -3702,7 +3706,7 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
             `\u26A0\uFE0F  [Playwright] Initial navigation check for ${maskEmail(account.email)}: ${err.message}`
           );
         }
-        if (!options.skipHeaderCapture) {
+        if (!options.skipHeaderCapture && !isAccountHeadersReady(account.id)) {
           acctPage.__qwenChatHomeLoaded = true;
           await captureQwenHeaders(account.id);
         }
@@ -3912,7 +3916,7 @@ async function loginToQwen(accountId, email, password) {
   );
   markAccountRateLimited(
     accountId,
-    24 * 3600 * 1e3,
+    300 * 1e3,
     "AuthFailed: All login methods exhausted"
   );
   return false;
@@ -4189,38 +4193,49 @@ async function loginViaUi(page, email, password) {
       try {
         const emailEl = document.querySelector('input[name="email"], input[type="email"], input[type="text"]');
         const passEl = document.querySelector('input[type="password"], input[name="password"]');
-        if (emailEl) {
-          emailEl.dispatchEvent(new Event("input", { bubbles: true }));
-          emailEl.dispatchEvent(new Event("change", { bubbles: true }));
-          emailEl.dispatchEvent(new Event("blur", { bubbles: true }));
-        }
-        if (passEl) {
-          passEl.dispatchEvent(new Event("input", { bubbles: true }));
-          passEl.dispatchEvent(new Event("change", { bubbles: true }));
-          passEl.dispatchEvent(new Event("blur", { bubbles: true }));
-        }
+        const setReactValue = (el, val) => {
+          const proto = Object.getPrototypeOf(el);
+          const setter = Object.getOwnPropertyDescriptor(proto, "value")?.set;
+          if (setter) {
+            setter.call(el, val);
+          } else {
+            el.value = val;
+          }
+          el.dispatchEvent(new Event("input", { bubbles: true }));
+          el.dispatchEvent(new Event("change", { bubbles: true }));
+          el.dispatchEvent(new Event("blur", { bubbles: true }));
+        };
+        if (emailEl) setReactValue(emailEl, emailEl.value);
+        if (passEl) setReactValue(passEl, passEl.value);
       } catch {
       }
     }).catch(() => {
     });
+    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(() => {
+    });
     try {
-      await page.waitForSelector('button[type="submit"]:not([disabled])', {
-        timeout: 4e3
-      });
-      await submitButton.click();
-    } catch {
-      const isDisabled = await submitButton.isDisabled().catch(() => true);
-      if (!isDisabled) {
-        await submitButton.click({ force: true }).catch(() => {
+      if (await submitButton.isVisible({ timeout: 2e3 }).catch(() => false)) {
+        await submitButton.click({ force: true, timeout: 2e3 }).catch(() => {
         });
-      } else {
-        if (!page.url().includes("/auth") && await isPageLoggedIn(page, 2e3)) {
-          return { success: true };
-        }
       }
+    } 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;

package/dist/delete-chats.js

@@ -1978,7 +1978,15 @@ function defaultCooldownDurationMs() {
   return computeQuotaCooldownMs(Date.now());
 }
 function markAccountRateLimited(accountId, cooldownMs, reason, options = {}) {
+  if (cooldownMs !== void 0 && cooldownMs <= 0) {
+    clearAccountCooldown(accountId);
+    return;
+  }
   const duration = cooldownMs ?? defaultCooldownDurationMs();
+  if (duration <= 0) {
+    clearAccountCooldown(accountId);
+    return;
+  }
   const until = Date.now() + duration;
   const cooldownReason = reason ?? "RateLimited";
   cooldowns.set(accountId, {
@@ -2001,6 +2009,19 @@ function markAccountRateLimited(accountId, cooldownMs, reason, options = {}) {
     );
   }
 }
+function clearAccountCooldown(accountId) {
+  cooldowns.delete(accountId);
+  if (accountId !== "global") {
+    try {
+      updateAccountCooldown(accountId, 0, null);
+    } catch (err) {
+      console.error(
+        `\u274C [AccountManager] Failed to clear cooldown in DB for ${accountId}:`,
+        err.message
+      );
+    }
+  }
+}
 function markAccountHeadersReady(accountId) {
   if (!accountId || accountId === "global") return;
   headersReadyAccounts.add(accountId);
@@ -2009,6 +2030,9 @@ function unmarkAccountHeadersReady(accountId) {
   if (!accountId) return;
   headersReadyAccounts.delete(accountId);
 }
+function isAccountHeadersReady(accountId) {
+  return headersReadyAccounts.has(accountId);
+}
 var cooldowns, headersReadyAccounts;
 var init_account_manager = __esm({
   "src/core/account-manager.ts"() {
@@ -2769,7 +2793,8 @@ function buildQwenRequestHeaders(opts) {
     "bx-v": opts.bxV || "2.5.37",
     source: "web",
     version: opts.version || getQwenWebVersion(),
-    timezone: opts.extra?.timezone || (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+    timezone: opts.extra?.timezone || opts.extra?.Timezone || (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+    Timezone: opts.extra?.Timezone || opts.extra?.timezone || (/* @__PURE__ */ new Date()).toString().split(" (")[0],
     // Use the real browser client-hints when captured (anti-hardcoded); fall
     // back to the static fingerprint otherwise.
     "sec-ch-ua": opts.secChUa || `"Google Chrome";v="${getChromeMajor()}", "Chromium";v="${getChromeMajor()}", "Not.A/Brand";v="99"`,
@@ -3311,26 +3336,6 @@ async function isPageLoggedIn(page, timeoutMs = SESSION_PROBE_NAVIGATION_TIMEOUT
           }
         } catch {
         }
-        try {
-          const refreshRes = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
-            method: "GET",
-            credentials: "include",
-            signal: AbortSignal.timeout(3e3)
-          });
-          if (refreshRes.status === 200) {
-            const refreshJson = await refreshRes.json().catch(() => null);
-            if (refreshJson && refreshJson.success === false) {
-              const code = refreshJson.data?.code || refreshJson.code;
-              const details = String(refreshJson.data?.details || "");
-              if (code === "Unauthorized" || details.includes("revogado") || details.includes("revoked")) {
-                return false;
-              }
-            }
-          } else if (refreshRes.status === 401 || refreshRes.status === 403) {
-            return false;
-          }
-        } catch {
-        }
         return true;
       } catch {
         return false;
@@ -4458,7 +4463,7 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
             `\u26A0\uFE0F  [Playwright] Initial navigation check for ${maskEmail(account.email)}: ${err.message}`
           );
         }
-        if (!options.skipHeaderCapture) {
+        if (!options.skipHeaderCapture && !isAccountHeadersReady(account.id)) {
           acctPage.__qwenChatHomeLoaded = true;
           await captureQwenHeaders(account.id);
         }
@@ -4788,7 +4793,7 @@ async function loginToQwen(accountId, email, password) {
   );
   markAccountRateLimited(
     accountId,
-    24 * 3600 * 1e3,
+    300 * 1e3,
     "AuthFailed: All login methods exhausted"
   );
   return false;
@@ -5065,38 +5070,49 @@ async function loginViaUi(page, email, password) {
       try {
         const emailEl = document.querySelector('input[name="email"], input[type="email"], input[type="text"]');
         const passEl = document.querySelector('input[type="password"], input[name="password"]');
-        if (emailEl) {
-          emailEl.dispatchEvent(new Event("input", { bubbles: true }));
-          emailEl.dispatchEvent(new Event("change", { bubbles: true }));
-          emailEl.dispatchEvent(new Event("blur", { bubbles: true }));
-        }
-        if (passEl) {
-          passEl.dispatchEvent(new Event("input", { bubbles: true }));
-          passEl.dispatchEvent(new Event("change", { bubbles: true }));
-          passEl.dispatchEvent(new Event("blur", { bubbles: true }));
-        }
+        const setReactValue = (el, val) => {
+          const proto = Object.getPrototypeOf(el);
+          const setter = Object.getOwnPropertyDescriptor(proto, "value")?.set;
+          if (setter) {
+            setter.call(el, val);
+          } else {
+            el.value = val;
+          }
+          el.dispatchEvent(new Event("input", { bubbles: true }));
+          el.dispatchEvent(new Event("change", { bubbles: true }));
+          el.dispatchEvent(new Event("blur", { bubbles: true }));
+        };
+        if (emailEl) setReactValue(emailEl, emailEl.value);
+        if (passEl) setReactValue(passEl, passEl.value);
       } catch {
       }
     }).catch(() => {
     });
+    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(() => {
+    });
     try {
-      await page.waitForSelector('button[type="submit"]:not([disabled])', {
-        timeout: 4e3
-      });
-      await submitButton.click();
-    } catch {
-      const isDisabled = await submitButton.isDisabled().catch(() => true);
-      if (!isDisabled) {
-        await submitButton.click({ force: true }).catch(() => {
+      if (await submitButton.isVisible({ timeout: 2e3 }).catch(() => false)) {
+        await submitButton.click({ force: true, timeout: 2e3 }).catch(() => {
         });
-      } else {
-        if (!page.url().includes("/auth") && await isPageLoggedIn(page, 2e3)) {
-          return { success: true };
-        }
       }
+    } 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;
@@ -7623,13 +7639,15 @@ async function createQwenChatSession(headers, model, accountId, chatMode = "thre
       } catch {
       }
     }
-    if (json?.data?.code === "Unauthorized" || json?.code === "Unauthorized" || rawLower.includes("unauthorized") || rawLower.includes("permission to access")) {
+    const isUnauthorized = json?.data?.code?.toLowerCase() === "unauthorized" || json?.code?.toLowerCase() === "unauthorized" || rawLower.includes("unauthorized") || rawLower.includes("permission to access") || rawLower.includes("token has expired") || rawLower.includes("401");
+    if (isUnauthorized) {
       if (accountId) {
         try {
           const { refreshAccountToken: refreshAccountToken2 } = await Promise.resolve().then(() => (init_playwright(), playwright_exports));
           const refreshed = await refreshAccountToken2(accountId);
           if (refreshed.success) {
-            return createQwenChatSession(headers, model, accountId, chatMode);
+            const { headers: freshHeaders } = await getQwenHeaders(false, accountId);
+            return createQwenChatSession(freshHeaders, model, accountId, chatMode);
           }
         } catch {
         }
@@ -9623,8 +9641,18 @@ async function createQwenStreamInternal(prompt, enableThinking, modelId, forcedP
       );
     }
   };
+  let forceRefresh = options?.forceNewChat === true;
+  if (!forceRefresh && accountId) {
+    try {
+      const basic = await getBasicHeaders2(accountId);
+      if (isTokenExpiringSoon(basic.cookie, 3)) {
+        forceRefresh = true;
+      }
+    } catch {
+    }
+  }
   const captured = await getQwenHeaders(
-    options?.forceNewChat === true,
+    forceRefresh,
     accountId
   );
   ensureNotAborted();
@@ -9638,7 +9666,7 @@ async function createQwenStreamInternal(prompt, enableThinking, modelId, forcedP
   if (options && "chatSessionId" in options) {
     if (options.chatSessionId === null || options.chatSessionId === "") {
       const acquired = await acquireNewQwenChatSession(
-        headers,
+        activeHeaders,
         model,
         accountId,
         options?.chatMode ?? "thread"
@@ -9646,6 +9674,11 @@ async function createQwenStreamInternal(prompt, enableThinking, modelId, forcedP
       chatSessionId = acquired.chatId;
       leasedWarmChat = acquired.leasedFromPool;
       createdNewChat = true;
+      try {
+        const fresh = await getQwenHeaders(false, accountId);
+        activeHeaders = fresh.headers;
+      } catch {
+      }
     } else {
       chatSessionId = options.chatSessionId;
     }
@@ -9653,7 +9686,7 @@ async function createQwenStreamInternal(prompt, enableThinking, modelId, forcedP
     chatSessionId = captured.chatSessionId;
     if (!chatSessionId) {
       const acquired = await acquireNewQwenChatSession(
-        headers,
+        activeHeaders,
         model,
         accountId,
         options?.chatMode ?? "thread"
@@ -9661,6 +9694,11 @@ async function createQwenStreamInternal(prompt, enableThinking, modelId, forcedP
       chatSessionId = acquired.chatId;
       leasedWarmChat = acquired.leasedFromPool;
       createdNewChat = true;
+      try {
+        const fresh = await getQwenHeaders(false, accountId);
+        activeHeaders = fresh.headers;
+      } catch {
+      }
     }
   }
   ensureNotAborted();