qwenproxy-cli 1.2.7 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qwenproxy-cli",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "High-performance OpenAI & Anthropic compatible API gateway for Qwen with multi-account rotation, interactive TUI, and resilient tool calling.",
   "main": "src/index.ts",
   "bin": {

package/src/core/accounts.ts

@@ -23,12 +23,30 @@ function parseEnvAccounts(): QwenAccount[] {
   const envAccounts = process.env.QWEN_ACCOUNTS;
   if (!envAccounts) return [];
 
-  const separator = envAccounts.includes(";") ? ";" : ",";
+  const clean = (s: string) => s.trim().replace(/^[,;\s"'`]+|[,;\s"'`]+$/g, "").trim();
 
-  return envAccounts
-    .split(separator)
+  const lines = envAccounts.split(/[\r\n;]+/);
+  const rawEntries: string[] = [];
+
+  for (const rawLine of lines) {
+    const line = clean(rawLine);
+    if (!line || line.startsWith("#") || line.startsWith("//")) continue;
+
+    // Check if line contains multiple accounts separated by comma (e.g. "a@b.com:p1, c@d.com:p2")
+    if (line.includes(",") && (line.match(/@/g) || []).length > 1) {
+      for (const seg of line.split(",")) {
+        const trimmed = clean(seg);
+        if (trimmed) rawEntries.push(trimmed);
+      }
+    } else {
+      const trimmed = clean(line);
+      if (trimmed) rawEntries.push(trimmed);
+    }
+  }
+
+  return rawEntries
     .map((entry, index) => {
-      const trimmed = entry.trim();
+      const trimmed = clean(entry);
       const colonIdx = trimmed.indexOf(":");
       if (colonIdx === -1) {
         console.warn(
@@ -36,8 +54,8 @@ function parseEnvAccounts(): QwenAccount[] {
         );
         return null;
       }
-      const email = trimmed.substring(0, colonIdx);
-      const password = trimmed.substring(colonIdx + 1);
+      const email = clean(trimmed.substring(0, colonIdx));
+      const password = clean(trimmed.substring(colonIdx + 1));
       if (!email || !password) {
         console.warn(
           `[Accounts] Invalid QWEN_ACCOUNTS entry at index ${index}: "${trimmed}"`,
@@ -46,8 +64,8 @@ function parseEnvAccounts(): QwenAccount[] {
       }
       return {
         id: generateId(email),
-        email: email.trim(),
-        password: password.trim(),
+        email,
+        password,
       };
     })
     .filter((a): a is QwenAccount => a !== null);
@@ -160,26 +178,27 @@ export function parseBatchAccounts(rawInput: string): {
       let email = "";
       let password = "";
 
+      const clean = (s: string) => s.trim().replace(/^[,;\s"'`]+|[,;\s"'`]+$/g, "").trim();
       if (seg.includes("---")) {
         const parts = seg.split("---");
-        email = parts[0].trim();
-        password = parts.slice(1).join("---").trim();
+        email = clean(parts[0]);
+        password = clean(parts.slice(1).join("---"));
       } else if (seg.includes("\t")) {
         const parts = seg.split("\t");
-        email = parts[0].trim();
-        password = parts.slice(1).join("\t").trim();
+        email = clean(parts[0]);
+        password = clean(parts.slice(1).join("\t"));
       } else if (seg.includes(" | ")) {
         const parts = seg.split(" | ");
-        email = parts[0].trim();
-        password = parts.slice(1).join(" | ").trim();
+        email = clean(parts[0]);
+        password = clean(parts.slice(1).join(" | "));
       } else if (seg.includes(":")) {
         const colonIdx = seg.indexOf(":");
-        email = seg.slice(0, colonIdx).trim();
-        password = seg.slice(colonIdx + 1).trim();
+        email = clean(seg.slice(0, colonIdx));
+        password = clean(seg.slice(colonIdx + 1));
       } else if (seg.includes(",")) {
         const commaIdx = seg.indexOf(",");
-        email = seg.slice(0, commaIdx).trim();
-        password = seg.slice(commaIdx + 1).trim();
+        email = clean(seg.slice(0, commaIdx));
+        password = clean(seg.slice(commaIdx + 1));
       } else {
         invalid.push(seg);
         continue;

package/src/core/server-log-buffer.ts

@@ -80,9 +80,11 @@ export function recordServerLog(level: "INFO" | "WARN" | "ERROR", text: string):
       .replace(/([\u{1F300}-\u{1FAFF}\u{2600}-\u{27BF}\u{2300}-\u{23FF}]\uFE0F?)\s{2,}/gu, "$1 ");
     if (!line) continue;
 
-    // Prevent identical consecutive duplicate logs in the same second
-    const last = logHistory[logHistory.length - 1];
-    if (last && last.time === time && last.level === level && last.message === line) {
+    // Prevent identical duplicate logs within the same second window
+    const isDuplicate = logHistory
+      .slice(-10)
+      .some((entry) => entry.time === time && entry.level === level && entry.message === line);
+    if (isDuplicate) {
       continue;
     }
 

package/src/services/playwright.ts

@@ -352,10 +352,7 @@ export async function isPageLoggedIn(
           const res = await fetch("/api/v1/auths/", { method: "GET" });
           return res.status === 200;
         } catch {
-          const btn = document.querySelector(
-            ".header-right-auth-button, button.header-right-auth-button, a[href*='/auth'], a[href*='/login']",
-          );
-          return !btn || (btn as HTMLElement).offsetWidth === 0;
+          return false;
         }
       })
       .catch(() => false);
@@ -1844,8 +1841,9 @@ async function loginViaApi(
       .digest("hex");
     const signinUrl = qwenUrl("/api/v2/auths/signin");
 
+    const requestId = crypto.randomUUID();
     const result = await page.evaluate(
-      async ({ email, password, signinUrl }) => {
+      async ({ email, password, signinUrl, requestId }) => {
         try {
           const response = await fetch(signinUrl, {
             method: "POST",
@@ -1855,7 +1853,7 @@ async function loginViaApi(
               "content-type": "application/json",
               source: "web",
               timezone: new Date().toString().split(" (")[0],
-              "x-request-id": crypto.randomUUID(),
+              "x-request-id": requestId,
             },
             body: JSON.stringify({ email, password, login_type: "email" }),
           });
@@ -1865,7 +1863,7 @@ async function loginViaApi(
           return { ok: false, error: e.message };
         }
       },
-      { email, password: hashedPassword, signinUrl },
+      { email, password: hashedPassword, signinUrl, requestId },
     );
 
     if (result.data) {

package/src/services/qwen.ts

@@ -1793,8 +1793,9 @@ export async function disableNativeTools(accountId?: string): Promise<void> {
         const result = await withAccountPage(
           accountId,
           async (page) => {
+            const requestId = crypto.randomUUID();
             const response = await page.evaluate(
-              async ({ payload, timeoutMs }: { payload: any; timeoutMs: number }) => {
+              async ({ payload, timeoutMs, requestId }: { payload: any; timeoutMs: number; requestId: string }) => {
                 const controller = new AbortController();
                 const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
                 try {
@@ -1805,7 +1806,7 @@ export async function disableNativeTools(accountId?: string): Promise<void> {
                       headers: {
                         accept: "application/json, text/plain, */*",
                         "content-type": "application/json",
-                        "x-request-id": crypto.randomUUID(),
+                        "x-request-id": requestId,
                         timezone: new Date().toString().split(" (")[0],
                         source: "web",
                       },
@@ -1818,7 +1819,7 @@ export async function disableNativeTools(accountId?: string): Promise<void> {
                   clearTimeout(timeoutId);
                 }
               },
-              { payload, timeoutMs: config.timeouts.http },
+              { payload, timeoutMs: config.timeouts.http, requestId },
             );
             return response;
           },
@@ -2152,25 +2153,29 @@ export async function fetchQwenModels(
       const result = await withAccountPage(
         accountId,
         async (page) => {
-          const response = await page.evaluate(async (timeoutMs: number) => {
-            const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-            try {
-              const resp = await fetch("https://chat.qwen.ai/api/models", {
-                method: "GET",
-                headers: {
-                  accept: "application/json, text/plain, */*",
-                  "x-request-id": crypto.randomUUID(),
-                  timezone: new Date().toString().split(" (")[0],
-                  source: "web",
-                },
-                signal: controller.signal,
-              });
-              return { status: resp.status, body: await resp.text() };
-            } finally {
-              clearTimeout(timeoutId);
-            }
-          }, config.timeouts.http);
+          const requestId = crypto.randomUUID();
+          const response = await page.evaluate(
+            async ({ timeoutMs, requestId }: { timeoutMs: number; requestId: string }) => {
+              const controller = new AbortController();
+              const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+              try {
+                const resp = await fetch("https://chat.qwen.ai/api/models", {
+                  method: "GET",
+                  headers: {
+                    accept: "application/json, text/plain, */*",
+                    "x-request-id": requestId,
+                    timezone: new Date().toString().split(" (")[0],
+                    source: "web",
+                  },
+                  signal: controller.signal,
+                });
+                return { status: resp.status, body: await resp.text() };
+              } finally {
+                clearTimeout(timeoutId);
+              }
+            },
+            { timeoutMs: config.timeouts.http, requestId },
+          );
           return response;
         },
       );