qwenproxy-cli 1.4.3 → 1.4.7

package/dist/login.js

@@ -3864,8 +3864,29 @@ function getStealthScript(profile) {
         const _toBlob = HTMLCanvasElement.prototype.toBlob;
         const _getImageData = CanvasRenderingContext2D.prototype.getImageData;
 
+        function isCaptchaCanvas(canvas) {
+          try {
+            if (!canvas) return false;
+            const id = (canvas.id || "").toLowerCase();
+            const cls = (canvas.className || "").toLowerCase();
+            return (
+              id.includes("baxia") ||
+              id.includes("nc_") ||
+              id.includes("captcha") ||
+              id.includes("punish") ||
+              cls.includes("baxia") ||
+              cls.includes("nc_") ||
+              cls.includes("captcha") ||
+              Boolean(canvas.closest?.("#baxia-dialog, #baxia-punish, [class*='baxia'], [class*='nc_'], .auth-layout"))
+            );
+          } catch(e) {
+            return false;
+          }
+        }
+
         function addNoise(canvas) {
           try {
+            if (isCaptchaCanvas(canvas)) return;
             const ctx = canvas.getContext('2d');
             if (!ctx) return;
             const style = ctx.fillStyle;
@@ -3889,6 +3910,9 @@ function getStealthScript(profile) {
 
         CanvasRenderingContext2D.prototype.getImageData = function(x, y, w, h) {
           const imageData = _getImageData.apply(this, arguments);
+          if (isCaptchaCanvas(this.canvas)) {
+            return imageData;
+          }
           const data = imageData.data;
           const maxPixels = Math.min(data.length / 4, 2500);
           for (let i = 0; i < maxPixels * 4; i += 4) {
@@ -4844,37 +4868,52 @@ async function loginToQwen(accountId, email, password) {
 async function loginViaApi(page, email, password) {
   try {
     const hashedPassword = crypto3.createHash("sha256").update(password).digest("hex");
-    const signinUrl = qwenUrl("/api/v2/auths/signin");
-    let signinSuccess = false;
-    let data = null;
-    if (page.request && typeof page.request.post === "function") {
-      try {
-        const response = await page.request.post(signinUrl, {
-          data: {
-            email,
-            password: hashedPassword,
-            login_type: "email"
-          },
-          headers: {
-            "content-type": "application/json",
-            accept: "application/json, text/plain, */*",
-            referer: qwenUrl("/auth"),
-            origin: qwenOrigin(),
-            source: "web"
-          },
-          timeout: 1e4
-        });
-        data = await response.json().catch(() => null);
-        signinSuccess = Boolean(data && (data.success === true || data.token));
-      } catch {
-      }
+    if (!page.url().includes("/auth")) {
+      await page.goto(qwenUrl("/auth"), {
+        waitUntil: "domcontentloaded",
+        timeout: config.timeouts.navigation
+      }).catch(() => {
+      });
+      await sleep2(1e3);
     }
-    if (!signinSuccess && !data) {
-      const requestId = crypto3.randomUUID();
-      const evalRes = await page.evaluate(
-        async ({ email: email2, password: password2, signinUrl: signinUrl2, requestId: requestId2 }) => {
+    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 }) => {
+        try {
+          const response = await fetch(signinUrl2, {
+            method: "POST",
+            signal: AbortSignal.timeout(15e3),
+            credentials: "include",
+            headers: {
+              accept: "application/json, text/plain, */*",
+              "content-type": "application/json",
+              source: "web",
+              version: "0.3.11",
+              "x-request-origin": "https://chat.qwen.ai",
+              timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
+              "x-request-id": requestId2
+            },
+            body: JSON.stringify({ email: email2, password: password2 })
+          });
+          const json = await response.json().catch(() => null);
+          return { ok: response.ok, status: response.status, data: json };
+        } catch (e) {
+          return { ok: false, error: e.message };
+        }
+      },
+      { email, password: hashedPassword, signinUrl, requestId }
+    ).catch(() => null);
+    let data = evalRes?.data;
+    let signinSuccess = Boolean(
+      data && (data.success === true || data.token || data.data?.access_token || data.data?.token)
+    );
+    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 }) => {
           try {
-            const response = await fetch(signinUrl2, {
+            const response = await fetch(fallbackUrl2, {
               method: "POST",
               signal: AbortSignal.timeout(1e4),
               credentials: "include",
@@ -4882,10 +4921,11 @@ async function loginViaApi(page, email, password) {
                 accept: "application/json, text/plain, */*",
                 "content-type": "application/json",
                 source: "web",
+                version: "0.3.11",
                 timezone: (/* @__PURE__ */ new Date()).toString().split(" (")[0],
                 "x-request-id": requestId2
               },
-              body: JSON.stringify({ email: email2, password: password2, login_type: "email" })
+              body: JSON.stringify({ email: email2, password: password2 })
             });
             const json = await response.json().catch(() => null);
             return { ok: response.ok, status: response.status, data: json };
@@ -4893,11 +4933,13 @@ async function loginViaApi(page, email, password) {
             return { ok: false, error: e.message };
           }
         },
-        { email, password: hashedPassword, signinUrl, requestId }
+        { email, password: hashedPassword, fallbackUrl, requestId }
       ).catch(() => null);
-      if (evalRes?.data) {
-        data = evalRes.data;
-        signinSuccess = Boolean(data && (data.success === true || data.token));
+      if (fallbackRes?.data) {
+        data = fallbackRes.data;
+        signinSuccess = Boolean(
+          data && (data.success === true || data.token || data.data?.access_token || data.data?.token)
+        );
       }
     }
     if (data?.success === false) {
@@ -4911,7 +4953,8 @@ async function loginViaApi(page, email, password) {
       };
     }
     if (signinSuccess) {
-      const token = data?.data?.token || data?.token;
+      const token = data?.data?.access_token || data?.data?.token || data?.access_token || data?.token;
+      const refreshToken = data?.data?.refresh_token || data?.refresh_token;
       if (token) {
         try {
           await page.context().addCookies([
@@ -4935,14 +4978,19 @@ async function loginViaApi(page, email, password) {
       }).catch(() => {
       });
       if (token) {
-        await page.evaluate((tok) => {
-          try {
-            localStorage.removeItem("qwen_token_logged_out_marker");
-            localStorage.setItem("token", tok);
-            document.cookie = `token=${encodeURIComponent(tok)}; path=/; domain=.qwen.ai; max-age=31536000`;
-          } catch {
-          }
-        }, token).catch(() => {
+        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: token, rTok: refreshToken }
+        ).catch(() => {
         });
         await page.reload({ waitUntil: "domcontentloaded" }).catch(() => {
         });
@@ -4970,11 +5018,23 @@ async function loginViaApi(page, email, password) {
 }
 async function loginViaUi(page, email, password) {
   try {
-    await page.goto(qwenUrl("/auth"), {
-      waitUntil: "domcontentloaded",
-      timeout: config.timeouts.navigation
-    });
-    await sleep2(1500);
+    if (!page.url().includes("/auth") && await isPageLoggedIn(page, 2e3).catch(() => false)) {
+      return { success: true };
+    }
+    try {
+      await page.goto(qwenUrl("/auth"), {
+        waitUntil: "domcontentloaded",
+        timeout: Math.min(config.timeouts.navigation, 15e3)
+      });
+      await sleep2(1e3);
+    } catch (gotoErr) {
+      if (!page.url().includes("/auth") && await isPageLoggedIn(page, 3e3).catch(() => false)) {
+        return { success: true };
+      }
+    }
+    if (!page.url().includes("/auth") && await isPageLoggedIn(page, 3e3).catch(() => false)) {
+      return { success: true };
+    }
     const emailSelector = [
       'input[type="email"]',
       'input[name="email"]',
@@ -4984,7 +5044,7 @@ async function loginViaUi(page, email, password) {
     ].join(", ");
     try {
       await page.waitForSelector(emailSelector, {
-        timeout: Math.min(config.timeouts.page, 8e3)
+        timeout: Math.min(config.timeouts.page, 5e3)
       });
     } catch {
       if (!page.url().includes("/auth") && await isPageLoggedIn(page, 3e3)) {
@@ -4997,30 +5057,55 @@ async function loginViaUi(page, email, password) {
       return { success: false, reason: "Campo de e-mail n\xE3o encontrado (poss\xEDvel captcha)" };
     }
     await clearVisibleChallenge(page);
-    const findPasswordModeButton = () => {
-      return page.locator('button, [role="button"], a, div').filter({
-        hasText: /(?:log\s*in\s*with\s*(?:a\s*)?password|fazer\s*login\s*com\s*senha|entrar\s*com\s*(?:uma\s*)?senha|iniciar\s*sesi[oó]n\s*con\s*contrase[nñ]a|密码登录)/i
-      }).first();
+    const isPasswordInputPresent = async () => {
+      return await page.locator('input[type="password"], input[name="password"]').count().catch(() => 0) > 0;
     };
-    try {
-      const pwdModeBtn = findPasswordModeButton();
-      if (await pwdModeBtn.isVisible({ timeout: 2e3 }).catch(() => false)) {
-        await pwdModeBtn.click({ timeout: 2e3 }).catch(() => {
+    const revealPasswordMode = async () => {
+      if (page.url().includes("/forget")) {
+        await page.goto(qwenUrl("/auth"), { waitUntil: "domcontentloaded", timeout: 1e4 }).catch(() => {
         });
-        await sleep2(500);
+        await sleep2(1e3);
       }
-    } catch {
-    }
-    await page.fill(emailSelector, email);
-    await sleep2(300);
-    try {
-      const pwdModeBtn = findPasswordModeButton();
-      if (await pwdModeBtn.isVisible({ timeout: 1500 }).catch(() => false)) {
-        await pwdModeBtn.click({ timeout: 2e3 }).catch(() => {
+      if (await isPasswordInputPresent()) return;
+      const btn = page.locator("button").filter({
+        hasText: /(?:log\s*in\s*with\s*(?:a\s*)?password|fazer\s*login\s*com\s*senha|entrar\s*com\s*(?:uma\s*)?senha|iniciar\s*sesi[oó]n\s*con\s*contrase[nñ]a|密码登录)/i
+      }).filter({
+        hasNotText: /(?:esqueci|forgot|olvid|reset|recover)/i
+      }).first();
+      if (await btn.isVisible({ timeout: 1500 }).catch(() => false)) {
+        await btn.click({ timeout: 2e3 }).catch(() => {
         });
         await sleep2(500);
       }
+      if (await isPasswordInputPresent()) return;
+      await page.evaluate(() => {
+        try {
+          const buttons = Array.from(document.querySelectorAll("button, [role='button'], a"));
+          for (const b of buttons) {
+            const txt = (b.innerText || "").trim().toLowerCase();
+            if (/(?:log\s*in\s*with\s*(?:a\s*)?password|fazer\s*login\s*com\s*senha|entrar\s*com\s*(?:uma\s*)?senha|iniciar\s*sesi[oó]n\s*con\s*contrase[nñ]a|密码登录)/i.test(txt) && !txt.includes("esqueci") && !txt.includes("forgot") && !txt.includes("olvid") && !txt.includes("reset")) {
+              b.click();
+              return true;
+            }
+          }
+        } catch {
+        }
+        return false;
+      }).catch(() => false);
+      await sleep2(500);
+    };
+    await revealPasswordMode();
+    try {
+      await page.fill(emailSelector, email, { timeout: 8e3 });
+      await sleep2(300);
     } catch {
+      if (!page.url().includes("/auth") && await isPageLoggedIn(page, 3e3)) {
+        return { success: true };
+      }
+      throw new Error(`Campo de e-mail n\xE3o encontrado na tela de autentica\xE7\xE3o`);
+    }
+    if (!await isPasswordInputPresent()) {
+      await revealPasswordMode();
     }
     const passwordSelector = 'input[type="password"], input[name="password"]';
     try {
@@ -5039,17 +5124,50 @@ async function loginViaUi(page, email, password) {
         reason: "Campo de senha n\xE3o encontrado na tela de autentica\xE7\xE3o"
       };
     }
-    await page.fill(passwordSelector, password);
-    await sleep2(500);
+    try {
+      await page.fill(passwordSelector, password, { timeout: 8e3 });
+      await sleep2(500);
+    } catch {
+      if (!page.url().includes("/auth") && await isPageLoggedIn(page, 3e3)) {
+        return { success: true };
+      }
+      throw new Error(`Campo de senha n\xE3o encontrado na tela de autentica\xE7\xE3o`);
+    }
+    await page.evaluate(() => {
+      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 }));
+        }
+      } catch {
+      }
+    }).catch(() => {
+    });
     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();
     try {
       await page.waitForSelector('button[type="submit"]:not([disabled])', {
-        timeout: 5e3
+        timeout: 4e3
       });
       await submitButton.click();
     } catch {
-      await page.keyboard.press("Enter");
+      const isDisabled = await submitButton.isDisabled().catch(() => true);
+      if (!isDisabled) {
+        await submitButton.click({ force: true }).catch(() => {
+        });
+      } else {
+        if (!page.url().includes("/auth") && await isPageLoggedIn(page, 2e3)) {
+          return { success: true };
+        }
+      }
     }
     const postSubmitDeadline = Date.now() + 15e3;
     while (Date.now() < postSubmitDeadline) {
@@ -5635,6 +5753,17 @@ 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("; ");
+            cache.headers.cookie = cookieStr;
+            cache.lastRefresh = Date.now();
+            markAccountHeadersReady(accountId);
+            return;
+          }
+        }
         await executeReauth();
       } else {
         try {
@@ -6069,19 +6198,50 @@ async function keepAlivePlaywrightAccount(accountId) {
     const now = Date.now();
     const currentUrl = page.url();
     const cookie = await getCookies(accountId);
-    if (cookie && isTokenExpiringSoon(cookie, 45)) {
-      console.log(
-        `\u{1F493} [SessionKeeper] Account ${accountId} token expires within 45m; proactively renewing session...`
-      );
+    if (cookie && isTokenExpiringSoon(cookie, 2)) {
       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)}`
+        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 cache = getHeaderCache(accountId);
+          cache.headers.cookie = cookieStr;
+          cache.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)}`
+          );
+        }
       }
     }
     const lastNavigation = lastKeepAliveNavigation.get(accountId) ?? 0;