qwenproxy-cli 1.5.3 → 1.6.1

package/dist/login.js

@@ -341,7 +341,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;`
@@ -442,7 +461,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(
@@ -457,8 +480,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()
   );
 }
@@ -1077,6 +1102,44 @@ var init_logger = __esm({
   }
 });
 
+// src/core/process-guard.ts
+function isPlaywrightAlreadyClosedMessage(message) {
+  if (!message) return false;
+  return message.includes("Target page, context or browser has been closed") || message.includes("Browser has been closed") || message.includes("Target closed") || message.includes("Target crashed") || message.includes("Page crashed") || message.includes("Assertion error") || message.includes("Cannot find parent object") || message.includes("Connection closed") || message.includes("session closed") || message.includes("Session closed") || message.includes("Network.setCacheDisabled") || message.includes("Protocol error") || message.includes("storageState timed out");
+}
+function isBenignTeardownError(error) {
+  if (!error) return false;
+  const message = error instanceof Error ? error.message : typeof error === "object" && "message" in error ? String(error.message) : String(error);
+  return isPlaywrightAlreadyClosedMessage(message);
+}
+function installProcessTeardownGuards(label = "Process") {
+  if (guardsInstalled) return;
+  guardsInstalled = true;
+  process.on("uncaughtException", (error) => {
+    if (isBenignTeardownError(error)) {
+      const msg = error instanceof Error ? error.message : typeof error === "object" && error !== null && "message" in error ? String(error.message) : String(error);
+      console.warn(`\u26A0\uFE0F  [${label}] Handled benign driver teardown exception: ${msg}`);
+      return;
+    }
+    console.error(`\u274C [${label}] Uncaught Exception:`, error);
+  });
+  process.on("unhandledRejection", (reason) => {
+    if (isBenignTeardownError(reason)) {
+      const msg = reason instanceof Error ? reason.message : typeof reason === "object" && reason !== null && "message" in reason ? String(reason.message) : String(reason);
+      console.warn(`\u26A0\uFE0F  [${label}] Handled benign driver teardown rejection: ${msg}`);
+      return;
+    }
+    console.error(`\u274C [${label}] Unhandled Rejection:`, reason);
+  });
+}
+var guardsInstalled;
+var init_process_guard = __esm({
+  "src/core/process-guard.ts"() {
+    "use strict";
+    guardsInstalled = false;
+  }
+});
+
 // src/core/config.ts
 var config_exports = {};
 __export(config_exports, {
@@ -1226,11 +1289,11 @@ var init_config = __esm({
       // nothing in this window is dead and should fail fast, retryable).
       QWEN_FIRST_CHUNK_TIMEOUT: z.string().default("60000"),
       TOTAL_REQUEST_TIMEOUT: z.string().default("600000"),
-      // Mid-stream silence window for thinking models: 3 min with ZERO upstream
+      // Mid-stream silence window for thinking models: 5 min with ZERO upstream
       // bytes is a dead stream (WAF swallow / dropped connection) — fail fast and
       // let the retry policy rotate accounts. Flowing reasoning chunks RESET this
       // timer, so legitimate slow thinking is never cut; only total silence is.
-      REASONING_MODEL_TIMEOUT: z.string().default("180000"),
+      REASONING_MODEL_TIMEOUT: z.string().default("300000"),
       CACHE_TTL: z.string().default("3600"),
       RESPONSE_TTL: z.string().default("1800"),
       CACHE_COMPRESSION_ENABLED: z.string().default("true"),
@@ -3102,6 +3165,8 @@ var init_clean_cache = __esm({
   "src/clean-cache.ts"() {
     "use strict";
     init_playwright();
+    init_process_guard();
+    installProcessTeardownGuards("CleanCache");
     isDirectRun = process.argv[1] && (process.argv[1].endsWith("clean-cache.ts") || process.argv[1].endsWith("clean-cache.js"));
     if (isDirectRun) {
       main().catch((err) => {
@@ -3326,15 +3391,18 @@ function loadStorageState(accountId) {
     return void 0;
   }
 }
-async function saveStorageState(context, accountId, timeoutMs = 5e3) {
+async function saveStorageState(context, accountId, timeoutMs = 1e4) {
   try {
     const stateFile = getStorageStatePath(accountId);
     const dir = path5.dirname(stateFile);
     if (!fs8.existsSync(dir)) {
       fs8.mkdirSync(dir, { recursive: true });
     }
+    const rawPromise = context.storageState({ path: stateFile }).catch(() => {
+      return void 0;
+    });
     await withTimeout(
-      context.storageState({ path: stateFile }),
+      rawPromise,
       timeoutMs,
       `storageState timed out after ${timeoutMs}ms`
     );
@@ -4061,6 +4129,11 @@ async function getBasicHeaders(accountId) {
   if (!page) {
     throw new Error(`Playwright not initialized for account: ${accountId}`);
   }
+  const inFlightInit = inFlightAccountInits.get(accountId);
+  if (inFlightInit) {
+    await inFlightInit.catch(() => {
+    });
+  }
   const release = await acquireAccountMutex(
     accountId,
     `headers:${accountId.substring(0, 12)}`
@@ -5535,6 +5608,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"],
@@ -5546,6 +5624,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 {
@@ -5577,38 +5656,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;
@@ -5924,7 +6022,13 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
             `[Playwright] Navigation check failed during refresh for ${accountId}:`,
             navErr.message
           );
-          await executeReauth();
+          if (await isPageLoggedIn(page, 3e3)) {
+          } else {
+            const refreshed = await refreshAccountToken(accountId);
+            if (!refreshed.success) {
+              await executeReauth();
+            }
+          }
         }
       }
       if (hasRequiredQwenHeaders(cache.headers)) {
@@ -5938,6 +6042,11 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
             const { saveAuthSession: saveAuthSession2 } = await Promise.resolve().then(() => (init_database(), database_exports));
             const tokenCookie = liveCookies.find((c) => c.name === "token");
             const exp = tokenCookie ? parseJwtExpiry(tokenCookie.value) : void 0;
+            let rTok;
+            try {
+              rTok = (await page.evaluate(() => localStorage.getItem("refresh_token") || "")).trim() || void 0;
+            } catch {
+            }
             saveAuthSession2(accountId, {
               cookie: cookieStr,
               userAgent: cache.headers["user-agent"] || "",
@@ -5949,6 +6058,7 @@ async function refreshHeadersInternal(accountId, timeoutMs = config.timeouts.hea
               secChUaPlatform: cache.headers["sec-ch-ua-platform"] || void 0,
               version: cache.headers["version"] || void 0,
               tokenExpiresAt: exp || void 0,
+              refreshToken: rTok,
               capturedAt: Date.now()
             });
           } catch {
@@ -6335,8 +6445,10 @@ async function keepAlivePlaywrightAccount(accountId) {
     if (!page || page.isClosed()) return false;
     const now = Date.now();
     const currentUrl = page.url();
+    const lastRefreshAttempt = lastProactiveTokenRefresh.get(accountId) ?? 0;
     const cookie = await getCookies(accountId);
-    if (cookie && isTokenExpiringSoon(cookie, 5)) {
+    if (cookie && isTokenExpiringSoon(cookie, 5) && now - lastRefreshAttempt > 6e4) {
+      lastProactiveTokenRefresh.set(accountId, now);
       console.log(
         `\u{1F493} [SessionKeeper] Account ${accountId} access token expiring soon (<5m); silently refreshing...`
       );
@@ -6380,6 +6492,7 @@ function cleanupPlaywrightAccountState(accountId) {
   cookieCaches.delete(accountId);
   lastAccountActivity.delete(accountId);
   lastKeepAliveNavigation.delete(accountId);
+  lastProactiveTokenRefresh.delete(accountId);
   clearFingerprintCache(accountId);
   unmarkAccountHeadersReady(accountId);
 }
@@ -6563,7 +6676,7 @@ async function getTokenDiagnostics(accountId) {
     }
   };
 }
-var requireLocal, contextInitHooks, ACCOUNT_MUTEX_MAX_HOLD_MS, accountMutexes, accountContexts, accountPages, cachedUserAgents, inFlightAccountInits, sharedBrowser, sharedBrowserPromise, headerCaches, HEADER_CACHE_TTL, HEADER_REFRESH_THRESHOLD, 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, cachedUserAgents, inFlightAccountInits, sharedBrowser, sharedBrowserPromise, headerCaches, HEADER_CACHE_TTL, HEADER_REFRESH_THRESHOLD, 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";
@@ -6599,6 +6712,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;
@@ -6627,10 +6741,12 @@ var init_playwright = __esm({
 // src/login.ts
 init_accounts();
 init_logger();
+init_process_guard();
 import crypto4 from "crypto";
 import * as readline from "readline";
 import * as dotenv2 from "dotenv";
 dotenv2.config();
+installProcessTeardownGuards("Login");
 var rl = readline.createInterface({
   input: process.stdin,
   output: process.stdout