qwenproxy-cli 1.5.2 → 1.6.0

package/dist/clean-cache.js

@@ -296,7 +296,26 @@ function runMigrations(db2) {
       instruction_hash TEXT NOT NULL,
       updated_at TEXT NOT NULL DEFAULT (datetime('now'))
     );
+
+    CREATE TABLE IF NOT EXISTS account_daily_usage (
+      account_id TEXT NOT NULL,
+      date_utc TEXT NOT NULL,
+      prompt_tokens INTEGER NOT NULL DEFAULT 0,
+      completion_tokens INTEGER NOT NULL DEFAULT 0,
+      weighted_tokens REAL NOT NULL DEFAULT 0,
+      total_tokens INTEGER NOT NULL DEFAULT 0,
+      turns_count INTEGER NOT NULL DEFAULT 0,
+      updated_at TEXT NOT NULL DEFAULT (datetime('now')),
+      PRIMARY KEY (account_id, date_utc)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_daily_usage_date ON account_daily_usage(date_utc);
   `);
+  try {
+    db2.exec(`ALTER TABLE account_daily_usage ADD COLUMN weighted_tokens REAL DEFAULT 0;`);
+  } catch (err) {
+    if (!isDuplicateColumnError(err)) throw err;
+  }
   try {
     db2.exec(
       `ALTER TABLE accounts ADD COLUMN cooldown_until INTEGER DEFAULT 0;`
@@ -397,7 +416,11 @@ function saveAuthSession(accountId, session) {
     ) VALUES (
       ?, ?, ?, ?, ?, ?,
       ?, ?, ?, ?,
-      ?, ?, ?, ?, datetime('now')
+      COALESCE(?, (SELECT user_id FROM qwen_auth_sessions WHERE account_id = ?)),
+      ?,
+      COALESCE(?, (SELECT refresh_token FROM qwen_auth_sessions WHERE account_id = ?)),
+      ?,
+      datetime('now')
     )
   `);
   stmt.run(
@@ -412,8 +435,10 @@ function saveAuthSession(accountId, session) {
     session.secChUaPlatform || null,
     session.version || null,
     session.userId || null,
+    accountId,
     session.tokenExpiresAt || null,
     session.refreshToken || null,
+    accountId,
     session.capturedAt ?? Date.now()
   );
 }
@@ -4306,6 +4331,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 cache = getHeaderCache(accountId);
+          cache.headers.cookie = cookieStr;
+          cache.lastRefresh = Date.now();
+          markAccountHeadersReady(accountId);
+          saveAuthSession2(accountId, {
+            cookie: cookieStr,
+            userAgent: cache.headers["user-agent"] || session?.userAgent || "",
+            bxV: cache.headers["bx-v"] || session?.bxV || "2.5.37",
+            bxUa: cache.headers["bx-ua"] || session?.bxUa || "",
+            bxUmidtoken: cache.headers["bx-umidtoken"] || session?.bxUmidtoken || "",
+            secChUa: cache.headers["sec-ch-ua"] || session?.secChUa,
+            secChUaMobile: cache.headers["sec-ch-ua-mobile"] || session?.secChUaMobile,
+            secChUaPlatform: cache.headers["sec-ch-ua-platform"] || session?.secChUaPlatform,
+            version: cache.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 cache = getHeaderCache(accountId);
+        cache.headers.cookie = cookieStr;
+        cache.lastRefresh = Date.now();
+        markAccountHeadersReady(accountId);
+        saveAuthSession2(accountId, {
+          cookie: cookieStr,
+          userAgent: cache.headers["user-agent"] || session?.userAgent || "",
+          bxV: cache.headers["bx-v"] || session?.bxV || "2.5.37",
+          bxUa: cache.headers["bx-ua"] || session?.bxUa || "",
+          bxUmidtoken: cache.headers["bx-umidtoken"] || session?.bxUmidtoken || "",
+          secChUa: cache.headers["sec-ch-ua"] || session?.secChUa,
+          secChUaMobile: cache.headers["sec-ch-ua-mobile"] || session?.secChUaMobile,
+          secChUaPlatform: cache.headers["sec-ch-ua-platform"] || session?.secChUaPlatform,
+          version: cache.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()) {
@@ -4459,6 +4615,11 @@ async function captureQwenHeaders(accountId, pageOverride, timeoutMs = config.ti
           const { saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
           const { parseJwtExpiry: parseJwtExpiry2 } = await Promise.resolve().then(() => (init_jwt(), jwt_exports));
           const tokenExpiry = parseJwtExpiry2(capturedHeaders.cookie);
+          let rTok;
+          try {
+            rTok = (await page.evaluate(() => localStorage.getItem("refresh_token") || "")).trim() || void 0;
+          } catch {
+          }
           saveAuthSession2(accountId, {
             cookie: capturedHeaders.cookie,
             userAgent: capturedHeaders["user-agent"],
@@ -4470,6 +4631,7 @@ async function captureQwenHeaders(accountId, pageOverride, timeoutMs = config.ti
             secChUaPlatform: capturedHeaders["sec-ch-ua-platform"],
             version: capturedHeaders["version"],
             tokenExpiresAt: tokenExpiry || void 0,
+            refreshToken: rTok,
             capturedAt: Date.now()
           });
         } catch {
@@ -4501,38 +4663,57 @@ async function captureQwenHeaders(accountId, pageOverride, timeoutMs = config.ti
         const isAuthUrl = currentUrl.includes("/auth") || currentUrl.includes("/login");
         const isSuspectedGuest = isAuthUrl || attempt >= 2 && !await isPageLoggedIn(page, 5e3);
         if (isSuspectedGuest) {
-          const { getAccountCredentials: getAccountCredentials2 } = await Promise.resolve().then(() => (init_accounts(), accounts_exports));
-          const creds = getAccountCredentials2(accountId);
-          if (creds && creds.email && creds.password) {
-            console.warn(
-              `\u26A0\uFE0F  [Playwright] Session expired or guest state detected during header capture for ${accountId}; re-authenticating...`
+          const silentRefresh = await refreshAccountToken(accountId);
+          if (silentRefresh.success) {
+            console.log(
+              `\u26A1 [Playwright] Token refreshed silently during header capture for ${accountId}`
             );
-            armOverallDeadline();
-            const ok = await loginToQwen(accountId, creds.email, creds.password);
-            if (ok) {
+            if (isAuthUrl) {
               await page.goto(qwenUrl("/"), {
                 waitUntil: "domcontentloaded",
                 timeout: Math.min(config.timeouts.navigation, timeoutMs)
               });
-              await sleep2(2e3);
+              await sleep2(1500);
+            }
+            if (await isPageLoggedIn(page, 5e3)) {
+              armOverallDeadline();
             }
-            if (!ok || !await isPageLoggedIn(page, 6e3)) {
+          }
+          const stillSuspected = !silentRefresh.success || !await isPageLoggedIn(page, 2e3);
+          if (stillSuspected) {
+            const { getAccountCredentials: getAccountCredentials2 } = await Promise.resolve().then(() => (init_accounts(), accounts_exports));
+            const creds = getAccountCredentials2(accountId);
+            if (creds && creds.email && creds.password) {
+              console.warn(
+                `\u26A0\uFE0F  [Playwright] Session expired or guest state detected during header capture for ${accountId}; re-authenticating...`
+              );
+              armOverallDeadline();
+              const ok = await loginToQwen(accountId, creds.email, creds.password);
+              if (ok) {
+                await page.goto(qwenUrl("/"), {
+                  waitUntil: "domcontentloaded",
+                  timeout: Math.min(config.timeouts.navigation, timeoutMs)
+                });
+                await sleep2(2e3);
+              }
+              if (!ok || !await isPageLoggedIn(page, 6e3)) {
+                settle(
+                  new Error(
+                    `Header capture failed for ${accountId}: re-login after session expiry did not succeed`
+                  )
+                );
+                return;
+              }
+              armOverallDeadline();
+              if (settled || page.isClosed()) return;
+            } else {
               settle(
                 new Error(
-                  `Header capture failed for ${accountId}: re-login after session expiry did not succeed`
+                  `Header capture failed for ${accountId}: session expired and no credentials available for re-login (run 'qpx login')`
                 )
               );
               return;
             }
-            armOverallDeadline();
-            if (settled || page.isClosed()) return;
-          } else {
-            settle(
-              new Error(
-                `Header capture failed for ${accountId}: session expired and no credentials available for re-login (run 'qpx login')`
-              )
-            );
-            return;
           }
         }
         if (settled || page.isClosed()) return;
@@ -5022,6 +5203,7 @@ function cleanupPlaywrightAccountState(accountId) {
   cookieCaches.delete(accountId);
   lastAccountActivity.delete(accountId);
   lastKeepAliveNavigation.delete(accountId);
+  lastProactiveTokenRefresh.delete(accountId);
   clearFingerprintCache(accountId);
   unmarkAccountHeadersReady(accountId);
 }
@@ -5096,7 +5278,7 @@ async function closePlaywrightForAccount(accountId) {
     release();
   }
 }
-var requireLocal, contextInitHooks, ACCOUNT_MUTEX_MAX_HOLD_MS, accountMutexes, accountContexts, accountPages, inFlightAccountInits, headerCaches, HEADER_CACHE_TTL, COOKIE_CACHE_TTL, cookieCaches, lastAccountActivity, lastKeepAliveNavigation, 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 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"() {
     "use strict";
@@ -5128,6 +5310,7 @@ var init_playwright = __esm({
     cookieCaches = /* @__PURE__ */ new Map();
     lastAccountActivity = /* @__PURE__ */ new Map();
     lastKeepAliveNavigation = /* @__PURE__ */ new Map();
+    lastProactiveTokenRefresh = /* @__PURE__ */ new Map();
     profileResetQueue = /* @__PURE__ */ new Map();
     profileResetChain = Promise.resolve();
     closingAllPlaywright = false;