qwenproxy-cli 1.6.4 → 1.6.6

package/dist/clean-cache.js

@@ -1814,6 +1814,7 @@ var init_mutex = __esm({
       locked = false;
       lockedAt = 0;
       lockedByKey = "";
+      epoch = 0;
       async acquire(timeoutMs = 3e5, key = "") {
         const holdLimitMs = this.maxHoldMs;
         if (this.locked && Date.now() - this.lockedAt > holdLimitMs) {
@@ -1824,6 +1825,7 @@ var init_mutex = __esm({
           this.locked = false;
           this.lockedAt = 0;
           this.lockedByKey = "";
+          this.epoch++;
         }
         if (!this.locked) {
           this.locked = true;
@@ -1862,10 +1864,12 @@ var init_mutex = __esm({
         }
       }
       createRelease() {
+        const epoch = this.epoch;
         let released = false;
         return () => {
           if (released) return;
           released = true;
+          if (epoch !== this.epoch) return;
           this.release();
         };
       }
@@ -2673,6 +2677,45 @@ var init_waf_isolation = __esm({
   }
 });
 
+// src/utils/timezone.ts
+function formatAsciiTimezone(date = /* @__PURE__ */ new Date()) {
+  const dayName = DAYS[date.getDay()];
+  const monthName = MONTHS[date.getMonth()];
+  const day = String(date.getDate()).padStart(2, "0");
+  const year = date.getFullYear();
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  const offsetMinutes = -date.getTimezoneOffset();
+  const sign = offsetMinutes >= 0 ? "+" : "-";
+  const absOffset = Math.abs(offsetMinutes);
+  const offsetHours = String(Math.floor(absOffset / 60)).padStart(2, "0");
+  const offsetMins = String(absOffset % 60).padStart(2, "0");
+  const tzOffset = `GMT${sign}${offsetHours}${offsetMins}`;
+  return `${dayName} ${monthName} ${day} ${year} ${hours}:${minutes}:${seconds} ${tzOffset}`;
+}
+var DAYS, MONTHS;
+var init_timezone = __esm({
+  "src/utils/timezone.ts"() {
+    "use strict";
+    DAYS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+    MONTHS = [
+      "Jan",
+      "Feb",
+      "Mar",
+      "Apr",
+      "May",
+      "Jun",
+      "Jul",
+      "Aug",
+      "Sep",
+      "Oct",
+      "Nov",
+      "Dec"
+    ];
+  }
+});
+
 // src/services/qwen-headers.ts
 import { v4 as uuidv4 } from "uuid";
 function getDefaultQwenUserAgent(major = getChromeMajor()) {
@@ -2690,6 +2733,7 @@ var init_qwen_headers = __esm({
     init_qwen_url();
     init_config();
     init_fingerprint();
+    init_timezone();
     dynamicWebVersion = null;
     QWEN_WEB_VERSION = config.qwen.webVersion;
     DEFAULT_QWEN_USER_AGENT = getDefaultQwenUserAgent(151);
@@ -3544,6 +3588,13 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
     await existingInit;
     return;
   }
+  let resolveInit;
+  let rejectInit;
+  const inFlightDeferred = new Promise((res, rej) => {
+    resolveInit = res;
+    rejectInit = rej;
+  });
+  inFlightAccountInits.set(account.id, inFlightDeferred);
   const initPromise = (async () => {
     const release = await acquireAccountMutex(
       account.id,
@@ -3758,6 +3809,22 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
               }
             }
           }
+          const currentCache = getHeaderCache(account.id);
+          const currentCookie = currentCache?.headers?.cookie || "";
+          if (currentCookie && isTokenExpiringSoon(currentCookie, 5)) {
+            try {
+              const refreshRes = await refreshAccountToken(account.id);
+              if (refreshRes.success) {
+                console.log(
+                  `\u26A1 [Playwright] Silently refreshed expired token restored from DB for ${maskEmail(account.email)}`
+                );
+              }
+            } catch (err) {
+              console.warn(
+                `\u26A0\uFE0F  [Playwright] Failed to proactively refresh expired token from DB for ${maskEmail(account.email)}: ${err?.message || err}`
+              );
+            }
+          }
           return;
         }
         const cookies = await acctContext.cookies();
@@ -3812,9 +3879,12 @@ async function initPlaywrightForAccount(rawAccount, headless = config.playwright
       release();
     }
   })();
-  inFlightAccountInits.set(account.id, initPromise);
   try {
     await initPromise;
+    resolveInit();
+  } catch (error) {
+    rejectInit(error);
+    throw error;
   } finally {
     inFlightAccountInits.delete(account.id);
   }
@@ -4015,7 +4085,7 @@ async function loginViaApi(page, email, password) {
     const signinUrl = "https://auth.qwen.ai/api/v2/auths/signin";
     const requestId = crypto3.randomUUID();
     const evalRes = await page.evaluate(
-      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2 }) => {
+      async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2, tz }) => {
         try {
           const response = await fetch(signinUrl2, {
             method: "POST",
@@ -4027,7 +4097,7 @@ async function loginViaApi(page, email, password) {
               source: "web",
               version: "0.3.11",
               "x-request-origin": "https://chat.qwen.ai",
-              timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+              timezone: tz,
               "x-request-id": requestId2
             },
             body: JSON.stringify({ email: email2, password: password2 })
@@ -4038,7 +4108,7 @@ async function loginViaApi(page, email, password) {
           return { ok: false, error: e.message };
         }
       },
-      { email, password: hashedPassword, signinUrl, requestId }
+      { email, password: hashedPassword, signinUrl, requestId, tz: formatAsciiTimezone() }
     ).catch(() => null);
     let data = evalRes?.data;
     let signinSuccess = Boolean(
@@ -4047,7 +4117,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 }) => {
+        async ({ email: email2, password: password2, fallbackUrl: fallbackUrl2, requestId: requestId2, tz }) => {
           try {
             const response = await fetch(fallbackUrl2, {
               method: "POST",
@@ -4058,7 +4128,7 @@ async function loginViaApi(page, email, password) {
                 "content-type": "application/json",
                 source: "web",
                 version: "0.3.11",
-                timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                timezone: tz,
                 "x-request-id": requestId2
               },
               body: JSON.stringify({ email: email2, password: password2 })
@@ -4069,7 +4139,7 @@ async function loginViaApi(page, email, password) {
             return { ok: false, error: e.message };
           }
         },
-        { email, password: hashedPassword, fallbackUrl, requestId }
+        { email, password: hashedPassword, fallbackUrl, requestId, tz: formatAsciiTimezone() }
       ).catch(() => null);
       if (fallbackRes?.data) {
         data = fallbackRes.data;
@@ -4401,7 +4471,7 @@ async function refreshAccountToken(accountId) {
   if (refreshToken) {
     try {
       const refreshResult = await page.evaluate(
-        async ({ rTok }) => {
+        async ({ rTok, tz }) => {
           try {
             const response = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
               method: "GET",
@@ -4411,7 +4481,7 @@ async function refreshAccountToken(accountId) {
                 source: "web",
                 version: "0.3.11",
                 "x-request-origin": "https://chat.qwen.ai",
-                timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                timezone: tz,
                 authorization: `Bearer ${rTok}`
               }
             });
@@ -4421,7 +4491,7 @@ async function refreshAccountToken(accountId) {
             return { ok: false, error: e.message };
           }
         },
-        { rTok: refreshToken }
+        { rTok: refreshToken, tz: formatAsciiTimezone() }
       );
       const json = refreshResult?.data;
       if (json && json.success === true && json.data) {
@@ -4459,6 +4529,7 @@ async function refreshAccountToken(accountId) {
           const cache = getHeaderCache(accountId);
           cache.headers.cookie = cookieStr;
           cache.lastRefresh = Date.now();
+          cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
           markAccountHeadersReady(accountId);
           saveAuthSession2(accountId, {
             cookie: cookieStr,
@@ -4493,6 +4564,7 @@ async function refreshAccountToken(accountId) {
         const cache = getHeaderCache(accountId);
         cache.headers.cookie = cookieStr;
         cache.lastRefresh = Date.now();
+        cookieCaches.set(accountId, { cookie: cookieStr, timestamp: Date.now() });
         markAccountHeadersReady(accountId);
         saveAuthSession2(accountId, {
           cookie: cookieStr,
@@ -5373,6 +5445,7 @@ var init_playwright = __esm({
     init_qwen_headers();
     init_paths();
     init_jwt();
+    init_timezone();
     requireLocal = createRequire(import.meta.url);
     contextInitHooks = [];
     ACCOUNT_MUTEX_MAX_HOLD_MS = 18e4;
@@ -5382,7 +5455,7 @@ var init_playwright = __esm({
     inFlightAccountInits = /* @__PURE__ */ new Map();
     headerCaches = /* @__PURE__ */ new Map();
     HEADER_CACHE_TTL = 24 * 60 * 60 * 1e3;
-    COOKIE_CACHE_TTL = 15 * 60 * 1e3;
+    COOKIE_CACHE_TTL = 60 * 1e3;
     cookieCaches = /* @__PURE__ */ new Map();
     lastAccountActivity = /* @__PURE__ */ new Map();
     lastKeepAliveNavigation = /* @__PURE__ */ new Map();