qwenproxy-cli 1.4.7 → 1.4.8

package/dist/index.js

@@ -1608,6 +1608,7 @@ function runMigrations(db2) {
     "sec_ch_ua_mobile TEXT",
     "sec_ch_ua_platform TEXT",
     "version TEXT",
+    "refresh_token TEXT",
     "captured_at INTEGER DEFAULT 0"
   ];
   for (const col of authSessionCols) {
@@ -1686,11 +1687,11 @@ function saveAuthSession(accountId, session) {
     INSERT OR REPLACE INTO qwen_auth_sessions (
       account_id, cookie, user_agent, bx_v, bx_ua, bx_umidtoken,
       sec_ch_ua, sec_ch_ua_mobile, sec_ch_ua_platform, version,
-      user_id, token_expires_at, captured_at, updated_at
+      user_id, token_expires_at, refresh_token, captured_at, updated_at
     ) VALUES (
       ?, ?, ?, ?, ?, ?,
       ?, ?, ?, ?,
-      ?, ?, ?, datetime('now')
+      ?, ?, ?, ?, datetime('now')
     )
   `);
   stmt.run(
@@ -1706,6 +1707,7 @@ function saveAuthSession(accountId, session) {
     session.version || null,
     session.userId || null,
     session.tokenExpiresAt || null,
+    session.refreshToken || null,
     session.capturedAt ?? Date.now()
   );
 }
@@ -1714,7 +1716,7 @@ function getValidAuthSession(accountId, maxAgeMs = 30 * 24 * 60 * 60 * 1e3) {
   const row = database.prepare(
     `SELECT account_id, cookie, user_agent, bx_v, bx_ua, bx_umidtoken,
               sec_ch_ua, sec_ch_ua_mobile, sec_ch_ua_platform, version,
-              user_id, token_expires_at, captured_at
+              user_id, token_expires_at, refresh_token, captured_at
        FROM qwen_auth_sessions WHERE account_id = ?`
   ).get(accountId);
   if (!row) return null;
@@ -1722,7 +1724,7 @@ function getValidAuthSession(accountId, maxAgeMs = 30 * 24 * 60 * 60 * 1e3) {
   if (capturedAt <= 0 || Date.now() - capturedAt > maxAgeMs) {
     return null;
   }
-  if (row.token_expires_at) {
+  if (!row.refresh_token && row.token_expires_at) {
     const tokenExpMs = Number(row.token_expires_at) * 1e3;
     if (tokenExpMs <= Date.now() + 5 * 60 * 1e3) {
       return null;
@@ -1744,6 +1746,7 @@ function getValidAuthSession(accountId, maxAgeMs = 30 * 24 * 60 * 60 * 1e3) {
     version: row.version || void 0,
     userId: row.user_id || void 0,
     tokenExpiresAt: row.token_expires_at ? Number(row.token_expires_at) : void 0,
+    refreshToken: row.refresh_token || void 0,
     capturedAt
   };
 }
@@ -4269,6 +4272,7 @@ __export(playwright_exports, {
   parseCookiesForBrowser: () => parseCookiesForBrowser,
   pruneAllPlaywrightProfiles: () => pruneAllPlaywrightProfiles,
   prunePlaywrightProfileCaches: () => prunePlaywrightProfileCaches,
+  refreshAccountToken: () => refreshAccountToken,
   refreshHeaders: () => refreshHeaders,
   refreshHeadersWithProfileReset: () => refreshHeadersWithProfileReset,
   registerPlaywrightAccountForTests: () => registerPlaywrightAccountForTests,
@@ -5904,6 +5908,7 @@ async function loginToQwen(accountId, email, password) {
             secChUaPlatform: cache3.headers["sec-ch-ua-platform"] || void 0,
             version: cache3.headers["version"] || void 0,
             tokenExpiresAt: exp || void 0,
+            refreshToken: apiResult.refreshToken,
             capturedAt: Date.now()
           });
         }
@@ -5937,6 +5942,13 @@ 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;
+          if (!rTok) {
+            try {
+              rTok = await page.evaluate(() => localStorage.getItem("refresh_token") || "") || void 0;
+            } catch {
+            }
+          }
           saveAuthSession2(accountId, {
             cookie: cookieStr,
             userAgent: cache3.headers["user-agent"] || "",
@@ -5948,6 +5960,7 @@ async function loginToQwen(accountId, email, password) {
             secChUaPlatform: cache3.headers["sec-ch-ua-platform"] || void 0,
             version: cache3.headers["version"] || void 0,
             tokenExpiresAt: exp || void 0,
+            refreshToken: rTok,
             capturedAt: Date.now()
           });
         }
@@ -6126,7 +6139,7 @@ async function loginViaApi(page, email, password) {
         });
         await page.reload({ waitUntil: "domcontentloaded" }).catch(() => {
         });
-        return { success: true };
+        return { success: true, token, refreshToken };
       }
     }
     return {
@@ -6369,6 +6382,137 @@ async function loginViaUi(page, email, password) {
     return { success: false, reason: err?.message || String(err) };
   }
 }
+async function refreshAccountToken(accountId) {
+  const page = accountPages.get(accountId);
+  if (!page || page.isClosed()) {
+    return { success: false, error: "Account page not active" };
+  }
+  const { getValidAuthSession: getValidAuthSession2, saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
+  const session = getValidAuthSession2(accountId);
+  let refreshToken = session?.refreshToken;
+  if (!refreshToken) {
+    try {
+      refreshToken = await page.evaluate(() => localStorage.getItem("refresh_token") || "") || void 0;
+    } catch {
+    }
+  }
+  if (refreshToken) {
+    try {
+      const refreshResult = await page.evaluate(
+        async ({ rTok }) => {
+          try {
+            const response = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
+              method: "GET",
+              credentials: "include",
+              headers: {
+                accept: "application/json, text/plain, */*",
+                source: "web",
+                version: "0.3.11",
+                "x-request-origin": "https://chat.qwen.ai",
+                timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                authorization: `Bearer ${rTok}`
+              }
+            });
+            const json2 = await response.json().catch(() => null);
+            return { ok: response.ok, status: response.status, data: json2 };
+          } catch (e) {
+            return { ok: false, error: e.message };
+          }
+        },
+        { rTok: refreshToken }
+      );
+      const json = refreshResult?.data;
+      if (json && json.success === true && json.data) {
+        const newAccessToken = json.data.access_token || json.data.token;
+        const newRefreshToken = json.data.refresh_token || refreshToken;
+        if (newAccessToken) {
+          await page.context().addCookies([
+            {
+              name: "token",
+              value: newAccessToken,
+              domain: ".qwen.ai",
+              path: "/",
+              expires: Math.floor(Date.now() / 1e3) + 31536e3,
+              httpOnly: false,
+              secure: true,
+              sameSite: "Lax"
+            }
+          ]);
+          await page.evaluate(
+            ({ tok, rTok }) => {
+              try {
+                localStorage.removeItem("qwen_token_logged_out_marker");
+                localStorage.setItem("token", tok);
+                localStorage.setItem("access_token", tok);
+                if (rTok) localStorage.setItem("refresh_token", rTok);
+                document.cookie = `token=${encodeURIComponent(tok)}; path=/; domain=.qwen.ai; max-age=31536000`;
+              } catch {
+              }
+            },
+            { tok: newAccessToken, rTok: newRefreshToken }
+          ).catch(() => {
+          });
+          const liveCookies = await page.context().cookies();
+          const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
+          const cache3 = getHeaderCache(accountId);
+          cache3.headers.cookie = cookieStr;
+          cache3.lastRefresh = Date.now();
+          markAccountHeadersReady(accountId);
+          saveAuthSession2(accountId, {
+            cookie: cookieStr,
+            userAgent: cache3.headers["user-agent"] || session?.userAgent || "",
+            bxV: cache3.headers["bx-v"] || session?.bxV || "2.5.37",
+            bxUa: cache3.headers["bx-ua"] || session?.bxUa || "",
+            bxUmidtoken: cache3.headers["bx-umidtoken"] || session?.bxUmidtoken || "",
+            secChUa: cache3.headers["sec-ch-ua"] || session?.secChUa,
+            secChUaMobile: cache3.headers["sec-ch-ua-mobile"] || session?.secChUaMobile,
+            secChUaPlatform: cache3.headers["sec-ch-ua-platform"] || session?.secChUaPlatform,
+            version: cache3.headers["version"] || session?.version,
+            userId: session?.userId,
+            tokenExpiresAt: parseJwtExpiry(newAccessToken) || void 0,
+            refreshToken: newRefreshToken,
+            capturedAt: Date.now()
+          });
+          return { success: true, token: newAccessToken };
+        }
+      }
+    } catch {
+    }
+  }
+  const { getAccountCredentials: getAccountCredentials2 } = await Promise.resolve().then(() => (init_accounts(), accounts_exports));
+  const creds = getAccountCredentials2(accountId);
+  if (creds && creds.email && creds.password) {
+    const apiResult = await loginViaApi(page, creds.email, creds.password);
+    if (apiResult.success) {
+      const liveCookies = await page.context().cookies();
+      const tokenCookie = liveCookies.find((c) => c.name === "token");
+      if (tokenCookie) {
+        const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
+        const cache3 = getHeaderCache(accountId);
+        cache3.headers.cookie = cookieStr;
+        cache3.lastRefresh = Date.now();
+        markAccountHeadersReady(accountId);
+        saveAuthSession2(accountId, {
+          cookie: cookieStr,
+          userAgent: cache3.headers["user-agent"] || session?.userAgent || "",
+          bxV: cache3.headers["bx-v"] || session?.bxV || "2.5.37",
+          bxUa: cache3.headers["bx-ua"] || session?.bxUa || "",
+          bxUmidtoken: cache3.headers["bx-umidtoken"] || session?.bxUmidtoken || "",
+          secChUa: cache3.headers["sec-ch-ua"] || session?.secChUa,
+          secChUaMobile: cache3.headers["sec-ch-ua-mobile"] || session?.secChUaMobile,
+          secChUaPlatform: cache3.headers["sec-ch-ua-platform"] || session?.secChUaPlatform,
+          version: cache3.headers["version"] || session?.version,
+          userId: session?.userId,
+          tokenExpiresAt: parseJwtExpiry(tokenCookie.value) || void 0,
+          refreshToken: apiResult.refreshToken,
+          capturedAt: Date.now()
+        });
+        return { success: true, token: tokenCookie.value };
+      }
+    }
+  }
+  return { success: false, error: "Could not refresh or re-authenticate token" };
+}
 async function captureQwenHeaders(accountId, pageOverride, timeoutMs = config.timeouts.headers, triggerGraceMs = HEADER_CAPTURE_TRIGGER_GRACE_MS) {
   const page = pageOverride ?? accountPages.get(accountId);
   if (!page || page.isClosed()) {
@@ -6885,16 +7029,9 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
         }
       };
       if (forceReauth) {
-        const alreadyIn = await isPageLoggedIn(page, 2e3).catch(() => false);
-        if (alreadyIn) {
-          const liveCookies = await page.context().cookies();
-          if (liveCookies.some((c) => c.name === "token")) {
-            const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
-            cache3.headers.cookie = cookieStr;
-            cache3.lastRefresh = Date.now();
-            markAccountHeadersReady(accountId);
-            return;
-          }
+        const refreshed = await refreshAccountToken(accountId);
+        if (refreshed.success) {
+          return;
         }
         await executeReauth();
       } else {
@@ -7330,50 +7467,15 @@ async function keepAlivePlaywrightAccount(accountId) {
     const now = Date.now();
     const currentUrl = page.url();
     const cookie = await getCookies(accountId);
-    if (cookie && isTokenExpiringSoon(cookie, 2)) {
-      try {
-        await page.evaluate(async () => {
-          await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
-            method: "GET",
-            credentials: "include"
-          }).catch(() => {
-          });
-          await fetch("/api/v1/auths/", {
-            method: "GET",
-            credentials: "include"
-          }).catch(() => {
-          });
-        }).catch(() => {
-        });
-        const liveCookies = await page.context().cookies();
-        const tokenCookie = liveCookies.find((c) => c.name === "token");
-        if (tokenCookie) {
-          const cookieStr = liveCookies.map((c) => `${c.name}=${c.value}`).join("; ");
-          const cache3 = getHeaderCache(accountId);
-          cache3.headers.cookie = cookieStr;
-          cache3.lastRefresh = Date.now();
-          markAccountHeadersReady(accountId);
-          lastKeepAliveNavigation.set(accountId, now);
-          touchAccountActivity(accountId);
-          return true;
-        }
-      } catch {
-      }
-      const loggedIn = await isPageLoggedIn(page, 2e3).catch(() => false);
-      if (!loggedIn) {
-        console.log(
-          `\u{1F493} [SessionKeeper] Account ${accountId} session expired; renewing session...`
-        );
-        try {
-          await refreshHeadersInternal(accountId, config.timeouts.headers, true);
-          lastKeepAliveNavigation.set(accountId, now);
-          touchAccountActivity(accountId);
-          return true;
-        } catch (err) {
-          console.warn(
-            `[SessionKeeper] Proactive session renewal failed for ${accountId}: ${getErrorMessage(err)}`
-          );
-        }
+    if (cookie && isTokenExpiringSoon(cookie, 5)) {
+      console.log(
+        `\u{1F493} [SessionKeeper] Account ${accountId} access token expiring soon (<5m); silently refreshing...`
+      );
+      const res = await refreshAccountToken(accountId);
+      if (res.success) {
+        lastKeepAliveNavigation.set(accountId, now);
+        touchAccountActivity(accountId);
+        return true;
       }
     }
     const lastNavigation = lastKeepAliveNavigation.get(accountId) ?? 0;
@@ -9257,7 +9359,7 @@ function classifyRetryAction(err, options) {
       accountCooldownReason: "PersonalizationFailed"
     });
   }
-  if (code === "createchatinvalidresponse" || code === "createchatfailed" || code === "unauthorized" || message.includes("401 n\xE3o autorizado") || message.includes("n\xE3o tem permiss\xE3o para acessar") || message.includes("401 unauthorized") || message.includes('"code":"unauthorized"') || message.includes('"code": "unauthorized"')) {
+  if (code === "createchatinvalidresponse" || code === "createchatfailed" || code === "unauthorized" || message.includes("401 n\xE3o autorizado") || message.includes("n\xE3o tem permiss\xE3o para acessar") || message.includes("401 unauthorized") || message.includes('"code":"unauthorized"') || message.includes('"code": "unauthorized"') || message.includes("token has expired")) {
     return makeRetryAction("account_initialization_failed", {
       switchAccount: true,
       forceNewChat: true,
@@ -10734,6 +10836,16 @@ async function createQwenChatSession(headers, model, accountId, chatMode = "thre
       }
     }
     if (json?.data?.code === "Unauthorized" || json?.code === "Unauthorized" || rawLower.includes("unauthorized") || rawLower.includes("permission to access")) {
+      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);
+          }
+        } catch {
+        }
+      }
       throw new QwenUpstreamError(
         `Qwen create chat unauthorized: ${raw.substring(0, 300)}`,
         "Unauthorized",
@@ -11429,16 +11541,28 @@ async function requestQwenTextInBrowser(accountId, method, path21, headers, body
         });
         if (response2.status === 401) {
           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 rTok = localStorage.getItem("refresh_token");
+            if (rTok) {
+              const refreshRes = await fetch("https://auth.qwen.ai/api/v2/auths/refresh", {
+                method: "GET",
+                credentials: "include",
+                headers: {
+                  accept: "application/json, text/plain, */*",
+                  source: "web",
+                  version: "0.3.11",
+                  "x-request-origin": "https://chat.qwen.ai",
+                  timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+                  authorization: `Bearer ${rTok}`
+                },
+                signal: AbortSignal.timeout(5e3)
+              });
               const refreshJson = await refreshRes.json().catch(() => null);
-              if (refreshJson && refreshJson.success === true && refreshJson.data?.token) {
-                const freshTok = refreshJson.data.token;
+              const freshTok = refreshJson?.data?.access_token || refreshJson?.data?.token;
+              const nextRTok = refreshJson?.data?.refresh_token;
+              if (refreshJson?.success === true && freshTok) {
                 localStorage.setItem("token", freshTok);
+                localStorage.setItem("access_token", freshTok);
+                if (nextRTok) localStorage.setItem("refresh_token", nextRTok);
                 document.cookie = `token=${encodeURIComponent(freshTok)}; path=/; domain=.qwen.ai; max-age=31536000`;
                 if (headers2["authorization"] || headers2["Authorization"]) {
                   headers2["authorization"] = `Bearer ${freshTok}`;
@@ -11476,13 +11600,29 @@ async function requestQwenTextInBrowser(accountId, method, path21, headers, body
     }
   );
   const recoverOnTimeout = !options.noMutexRecovery;
-  const response = await withQwenBrowserPage(
+  let response = await withQwenBrowserPage(
     accountId,
     evaluateRequest,
     void 0,
     options.timeoutMs,
     recoverOnTimeout
   );
+  if (response.status === 401 && accountId) {
+    try {
+      const { refreshAccountToken: refreshAccountToken2 } = await Promise.resolve().then(() => (init_playwright(), playwright_exports));
+      const refreshed = await refreshAccountToken2(accountId);
+      if (refreshed.success) {
+        response = await withQwenBrowserPage(
+          accountId,
+          evaluateRequest,
+          void 0,
+          options.timeoutMs,
+          recoverOnTimeout
+        );
+      }
+    } catch {
+    }
+  }
   return new Response(response.raw, {
     status: response.status,
     headers: response.contentType ? { "content-type": response.contentType } : void 0
@@ -12005,7 +12145,11 @@ async function syncQwenRequestPersonalization(instruction, accountId, metadata =
     );
     try {
       currentSettings = null;
-      const { headers: freshHeaders } = await getQwenHeaders(true, accountId, true);
+      const { refreshAccountToken: refreshAccountToken2 } = await Promise.resolve().then(() => (init_playwright(), playwright_exports));
+      if (accountId) {
+        await refreshAccountToken2(accountId);
+      }
+      const { headers: freshHeaders } = await getQwenHeaders(false, accountId);
       requestHeaders = buildCapturedQwenHeaders(freshHeaders, {
         referer: qwenUrl("/settings/personalization")
       });
@@ -25673,7 +25817,7 @@ function getAppVersion() {
     }
   } catch {
   }
-  cachedVersion = "v1.4.7";
+  cachedVersion = "v1.4.8";
   return cachedVersion;
 }
 var cachedVersion;