@pedrofariasx/qwenproxy 1.6.2 → 1.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pedrofariasx/qwenproxy",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Local OpenAI-compatible proxy API that routes requests to Qwen (chat.qwen.ai) via Playwright browser automation.",
   "main": "index.js",
   "scripts": {

package/src/core/config.ts

@@ -8,9 +8,10 @@ const envSchema = z.object({
   USER_DATA_DIR: z.string().default('./qwen_profiles'),
   USER_AGENT: z.string().default('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'),
   LOG_CONSOLE: z.string().default('false'),
-  NAVIGATION_TIMEOUT: z.string().default('30000'),
-  PAGE_TIMEOUT: z.string().default('15000'),
-  HTTP_TIMEOUT: z.string().default('10000'),
+  NAVIGATION_TIMEOUT: z.string().default('45000'),
+  PAGE_TIMEOUT: z.string().default('30000'),
+  HTTP_TIMEOUT: z.string().default('30000'),
+  HEADERS_TIMEOUT: z.string().default('60000'),
   CHAT_TIMEOUT: z.string().default('120000'),
   CACHE_TTL: z.string().default('3600'),
   RESPONSE_TTL: z.string().default('1800'),
@@ -59,6 +60,7 @@ export const config = {
     navigation: parseInt(env.NAVIGATION_TIMEOUT),
     page: parseInt(env.PAGE_TIMEOUT),
     http: parseInt(env.HTTP_TIMEOUT),
+    headers: parseInt(env.HEADERS_TIMEOUT),
     chat: parseInt(env.CHAT_TIMEOUT),
   },
   cache: {

package/src/services/playwright.ts

@@ -385,7 +385,7 @@ async function checkValidSession(): Promise<boolean> {
     const cookies = await activePage.context().cookies();
     const hasAuthCookie = cookies.some(c => c.name.toLowerCase().includes('token') || c.name.toLowerCase().includes('session'));
     if (!hasAuthCookie) return false;
-    await activePage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded', timeout: 10000 });
+    await activePage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded', timeout: config.timeouts.navigation });
     const isLogged = !activePage.url().includes('auth') && !activePage.url().includes('login');
     return isLogged;
   } catch {
@@ -450,7 +450,7 @@ async function loginToQwenUI(email: string, password: string): Promise<boolean>
   }
 
   try {
-    await activePage.waitForSelector('input[type="email"], input[placeholder*="Email"]', { timeout: 5000 });
+    await activePage.waitForSelector('input[type="email"], input[placeholder*="Email"]', { timeout: config.timeouts.page });
   } catch {
     if (activePage.url().includes('/auth')) throw new Error('Email input not found');
     console.log('[Playwright] Already logged in');
@@ -462,7 +462,7 @@ async function loginToQwenUI(email: string, password: string): Promise<boolean>
   await activePage.keyboard.press('Enter');
   await sleep(1000);
 
-  await activePage.waitForSelector('input[type="password"]', { timeout: 10000 });
+  await activePage.waitForSelector('input[type="password"]', { timeout: config.timeouts.page });
   console.log('[Playwright] UI: Filling password...');
   await activePage.fill('input[type="password"]', password);
   await activePage.keyboard.press('Enter');
@@ -502,7 +502,7 @@ export async function getGuestHeaders(): Promise<Record<string, string>> {
     await guestContext.addInitScript(getStealthScript());
     guestPage = await guestContext.newPage();
     
-    await guestPage.goto('https://chat.qwen.ai/c/guest', { waitUntil: 'domcontentloaded' });
+    await guestPage.goto('https://chat.qwen.ai/c/guest', { waitUntil: 'domcontentloaded', timeout: config.timeouts.navigation });
     
     try {
       const keepSessionBtn = await guestPage.$('button:has-text("Manter sessão terminada"), button:has-text("Keep session ended"), button:has-text("Manter sessão encerrada")');
@@ -517,7 +517,7 @@ export async function getGuestHeaders(): Promise<Record<string, string>> {
   }
 
   return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => reject(new Error('Timeout getting guest headers')), 30000);
+    const timeout = setTimeout(() => reject(new Error('Timeout getting guest headers')), config.timeouts.headers);
     
     const routeHandler = async (route: any, request: any) => {
       clearTimeout(timeout);
@@ -558,27 +558,25 @@ export async function getGuestHeaders(): Promise<Record<string, string>> {
     guestPage!.route('**/api/v2/chat/completions*', routeHandler).then(async () => {
       const inputSelector = 'textarea:visible, [contenteditable="true"]:visible';
       try {
-        await guestPage!.waitForSelector(inputSelector, { timeout: 10000 });
+        await guestPage!.waitForSelector(inputSelector, { timeout: config.timeouts.page });
         await guestPage!.focus(inputSelector);
         await guestPage!.fill(inputSelector, '');
         await guestPage!.type(inputSelector, 'a', { delay: 50 });
-        await sleep(1500);
+        await sleep(1000);
         
-        // Try pressing Enter first as it is highly reliable
-        await guestPage!.focus(inputSelector);
-        await guestPage!.keyboard.press('Enter');
-
         const selectors = ['.message-input-right-button-send .send-button', '.chat-prompt-send-button', 'button.send-button'];
+        let clicked = false;
         for (const selector of selectors) {
-          try {
-            const btn = await guestPage!.$(selector);
-            if (btn && await btn.isVisible()) {
-              await btn.click({ force: true, delay: 50 }).catch(() => {});
-            }
-          } catch (e) {
-            // ignore click errors
+          const btn = await guestPage!.$(selector);
+          if (btn && await btn.isVisible()) {
+            await btn.click({ force: true, delay: 50 }).catch(() => {});
+            clicked = true;
+            break;
           }
         }
+        if (!clicked) {
+          await guestPage!.keyboard.press('Enter');
+        }
       } catch (e) {
         clearTimeout(timeout);
         reject(e);
@@ -753,7 +751,7 @@ async function _getQwenHeadersInternal(forceNew = false, accountId?: string): Pr
 
   console.log(`[Playwright] Waiting for chat input for ${cacheKey}...`);
   const inputSelector = 'textarea:visible, [contenteditable="true"]:visible';
-  await page.waitForSelector(inputSelector, { timeout: 30000 }).catch(() => {
+  await page.waitForSelector(inputSelector, { timeout: config.timeouts.page }).catch(() => {
     console.error(`[Playwright] Chat input not found for ${cacheKey}. Current URL:`, page.url());
     throw new Error(`Timeout waiting for chat input for ${cacheKey}. Are you logged in?`);
   });
@@ -769,7 +767,7 @@ async function _getQwenHeadersInternal(forceNew = false, accountId?: string): Pr
         console.error('[Playwright] Failed to save error screenshot:', err.message);
       }
       reject(new Error(`Timeout waiting for Qwen headers for ${cacheKey}`));
-    }, 60000);
+    }, config.timeouts.headers);
 
     console.log(`[Playwright] Setting up route interception for ${cacheKey}...`);
     const routeHandler = async (route: any, request: any) => {
@@ -827,45 +825,47 @@ async function _getQwenHeadersInternal(forceNew = false, accountId?: string): Pr
       console.log(`[Playwright] Triggering request for ${cacheKey}...`);
       const inputSelector = 'textarea:visible, [contenteditable="true"]:visible';
 
-      try {
-        await page.focus(inputSelector);
-        await page.fill(inputSelector, '');
-        await page.type(inputSelector, 'a', { delay: 50 });
-        console.log(`[Playwright] Typed char for ${cacheKey}, waiting for UI to update...`);
-        await sleep(1500);
+      await page.focus(inputSelector);
+      await page.fill(inputSelector, '');
+      await page.type(inputSelector, 'a', { delay: 100 });
+      console.log(`[Playwright] Typed char for ${cacheKey}, waiting for UI to update...`);
+      await sleep(2000);
 
-        // Try pressing Enter first on the input field as it is highly reliable
-        console.log(`[Playwright] Pressing Enter for ${cacheKey}...`);
-        await page.focus(inputSelector);
-        await page.keyboard.press('Enter');
+      const selectors = [
+        '.message-input-right-button-send .send-button',
+        '.chat-prompt-send-button',
+        'button.send-button'
+      ];
 
-        // Also attempt to click the send button in case Enter didn't submit
-        const selectors = [
-          '.message-input-right-button-send .send-button',
-          '.chat-prompt-send-button',
-          'button.send-button'
-        ];
+      let clicked = false;
+      for (const selector of selectors) {
+        try {
+          const btn = await page.$(selector);
+          if (btn && await btn.isVisible()) {
+            console.log(`[Playwright] Attempting click on: ${selector}`);
+
+            await page.evaluate((sel) => {
+              const element = document.querySelector(sel) as HTMLElement;
+              if (element) {
+                element.focus();
+                element.click();
+              }
+            }, selector);
 
-        for (const selector of selectors) {
-          try {
-            const btn = await page.$(selector);
-            if (btn && await btn.isVisible()) {
-              console.log(`[Playwright] Also attempting click on: ${selector}`);
-              await page.evaluate((sel) => {
-                const element = document.querySelector(sel) as HTMLElement;
-                if (element) {
-                  element.focus();
-                  element.click();
-                }
-              }, selector);
-              await btn.click({ force: true, delay: 50 }).catch(() => {});
-            }
-          } catch (e) {
-            // ignore click errors
+            await btn.click({ force: true, delay: 50 }).catch(() => {});
+
+            clicked = true;
+            break;
           }
+        } catch (e) {
+          console.error(`[Playwright] Error clicking ${selector} for ${cacheKey}:`, e);
         }
-      } catch (triggerErr: any) {
-        console.error(`[Playwright] Failed to trigger request for ${cacheKey}:`, triggerErr.message);
+      }
+
+      if (!clicked) {
+        console.log(`[Playwright] No send button found/clicked for ${cacheKey}, fallback to Enter...`);
+        await page.focus(inputSelector);
+        await page.keyboard.press('Enter');
       }
     });
   });
@@ -906,13 +906,13 @@ export async function initPlaywrightForAccount(account: QwenAccount, headless =
 
   // Navigate to Qwen home to validate session and populate cookies
   try {
-    await acctPage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded', timeout: 15000 });
+    await acctPage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded', timeout: config.timeouts.navigation });
     const url = acctPage.url();
     if (url.includes('auth') || url.includes('login')) {
       if (account.email && account.password) {
         console.log(`[Playwright] Session expired for ${account.email}, re-logging in...`);
         await loginToQwenWithContext(acctContext, acctPage, account.email, account.password);
-        await acctPage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded', timeout: 15000 });
+        await acctPage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded', timeout: config.timeouts.navigation });
       } else {
         console.warn(`[Playwright] Session expired for account ${account.id} but no credentials available for re-login.`);
       }
@@ -1122,7 +1122,7 @@ export async function browserStreamFetch(
     streamCallbacks.delete(reqId);
     abortControllers.delete(reqId);
     metaResolve({ status: 0, statusText: 'Timeout', contentType: '', headers: {} });
-  }, options.timeoutMs || 130000);
+  }, options.timeoutMs || config.timeouts.chat);
 
   streamCallbacks.set(reqId, {
     onMeta: (meta) => {

package/src/services/qwen.ts

@@ -1,6 +1,7 @@
 import { getQwenHeaders, getBasicHeaders, getGuestHeaders, getPageForAccount, browserFetch, browserStreamFetch, CHROME_CLIENT_HINTS, CHROME_UA } from './playwright.js';
 import { MAX_PAYLOAD_SIZE } from '../core/model-registry.js';
 import { markAccountRateLimited } from '../core/account-manager.js';
+import { config } from '../core/config.js';
 import crypto from 'crypto';
 
 const CACHED_TIMEZONE = new Date().toString().split(' (')[0];
@@ -132,7 +133,7 @@ async function createRealQwenChat(header: Record<string, string>, accountId?: st
           'timezone': CACHED_TIMEZONE,
         },
         body,
-        timeoutMs: 30000,
+        timeoutMs: config.timeouts.http,
       });
 
       if (result.status === 429) {
@@ -176,7 +177,7 @@ async function createRealQwenChat(header: Record<string, string>, accountId?: st
       ...getClientHintsHeaders(),
     },
     body,
-    signal: AbortSignal.timeout(30000),
+    signal: AbortSignal.timeout(config.timeouts.http),
   });
 
   if (!response.ok) {
@@ -200,6 +201,69 @@ async function createRealQwenChat(header: Record<string, string>, accountId?: st
   return chatId;
 }
 
+async function fetchUnusedChats(headers: Record<string, string>, accountId?: string): Promise<string[]> {
+  const page = getPageForAccount(accountId);
+  const url = 'https://chat.qwen.ai/api/v2/chats/?page=1&exclude_project=true';
+  const reqHeaders: Record<string, string> = {
+    'accept': 'application/json, text/plain, */*',
+    'x-request-id': crypto.randomUUID(),
+    'timezone': CACHED_TIMEZONE,
+    'source': 'web',
+  };
+
+  let body = '';
+  if (page && !page.isClosed() && page.url().includes('chat.qwen.ai')) {
+    try {
+      const result = await browserFetch(page, url, {
+        method: 'GET',
+        headers: reqHeaders,
+        timeoutMs: config.timeouts.http,
+      });
+      if (result.status && result.status < 400) {
+        body = result.body;
+      }
+    } catch (err: any) {
+      console.warn('[WarmPool] browserFetch failed for chat list, falling back:', err.message);
+    }
+  }
+
+  if (!body) {
+    const response = await fetch(url, {
+      headers: {
+        'accept': 'application/json, text/plain, */*',
+        'accept-language': 'pt-BR,pt;q=0.9',
+        'cookie': headers['cookie'],
+        'referer': 'https://chat.qwen.ai/',
+        'user-agent': headers['user-agent'],
+        'x-request-id': crypto.randomUUID(),
+        'bx-v': headers['bx-v'],
+        'bx-ua': headers['bx-ua'] || '',
+        'bx-umidtoken': headers['bx-umidtoken'] || '',
+        'timezone': CACHED_TIMEZONE,
+        'source': 'web',
+        ...getClientHintsHeaders(),
+      },
+      signal: AbortSignal.timeout(config.timeouts.http),
+    });
+    if (!response.ok) return [];
+    body = await response.text();
+  }
+
+  try {
+    const json = JSON.parse(body);
+    if (!json.success || !Array.isArray(json.data)) return [];
+    const unused: string[] = [];
+    for (const chat of json.data) {
+      if (chat.title === 'Nova Conversa' && chat.created_at === chat.updated_at) {
+        unused.push(chat.id);
+      }
+    }
+    return unused;
+  } catch {
+    return [];
+  }
+}
+
 async function refillPoolForAccount(accountId: string) {
   let pool = warmPool.get(accountId);
   if (!pool) { pool = []; warmPool.set(accountId, pool); }
@@ -217,7 +281,27 @@ async function refillPoolForAccount(accountId: string) {
   }
 
   const acctId = accountId === 'global' ? undefined : accountId;
-  for (let i = 0; i < need; i++) {
+  const existingIds = new Set(pool.map(e => e.chatId));
+
+  let reused = 0;
+  try {
+    const unusedChats = await fetchUnusedChats(headers, acctId);
+    for (const chatId of unusedChats) {
+      if (reused >= need) break;
+      if (existingIds.has(chatId)) continue;
+      pool.push({ chatId, headers, accountId, timestamp: Date.now() });
+      existingIds.add(chatId);
+      reused++;
+    }
+    if (reused > 0) {
+      console.log(`[WarmPool] Reused ${reused} existing unused chats for ${accountId}`);
+    }
+  } catch (err: any) {
+    console.warn(`[WarmPool] Failed to fetch unused chats for ${accountId}:`, err.message);
+  }
+
+  const stillNeed = Math.max(0, need - reused);
+  for (let i = 0; i < stillNeed; i++) {
     if (i > 0) {
       await sleep(800 + Math.floor(Math.random() * 2200));
     }
@@ -355,7 +439,7 @@ export async function disableNativeTools(accountId?: string): Promise<void> {
             'timezone': CACHED_TIMEZONE,
           },
           body: JSON.stringify(payload),
-          timeoutMs: 30000,
+          timeoutMs: config.timeouts.http,
         });
         if (result.status && result.status < 400) {
           console.log(`[Qwen] Native tools disabled successfully for ${cacheKey}.`);
@@ -370,7 +454,7 @@ export async function disableNativeTools(accountId?: string): Promise<void> {
     }
 
     const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 30000);
+    const timeoutId = setTimeout(() => controller.abort(), config.timeouts.http);
     const response = await fetch('https://chat.qwen.ai/api/v2/users/user/settings/update', {
       method: 'POST',
       headers: {
@@ -422,7 +506,7 @@ export async function fetchQwenModels(accountId?: string): Promise<any[]> {
           'timezone': CACHED_TIMEZONE,
           'source': 'web',
         },
-        timeoutMs: 30000,
+        timeoutMs: config.timeouts.http,
       });
       if (result.status && result.status < 400) {
         return processModelsJson(JSON.parse(result.body));
@@ -526,7 +610,7 @@ export async function createQwenStream(
           method: 'POST',
           headers: { 'accept': 'application/json, text/plain, */*', 'content-type': 'application/json', 'x-request-id': crypto.randomUUID(), 'timezone': CACHED_TIMEZONE },
           body: guestBody,
-          timeoutMs: 30000,
+          timeoutMs: config.timeouts.http,
         });
         if (!result.status || result.status >= 400) throw new Error(`Failed to create guest chat: ${result.status}`);
         const json = JSON.parse(result.body);
@@ -538,7 +622,7 @@ export async function createQwenStream(
           method: 'POST',
           headers: { 'accept': 'application/json, text/plain, */*', 'content-type': 'application/json', cookie: chatHeaders['cookie'], origin: 'https://chat.qwen.ai', referer: 'https://chat.qwen.ai/c/guest', 'user-agent': chatHeaders['user-agent'], 'x-request-id': crypto.randomUUID(), 'bx-v': chatHeaders['bx-v'], 'bx-ua': chatHeaders['bx-ua'], 'bx-umidtoken': chatHeaders['bx-umidtoken'], ...getClientHintsHeaders() },
           body: guestBody,
-          signal: AbortSignal.timeout(30000),
+          signal: AbortSignal.timeout(config.timeouts.http),
         });
         if (!response.ok) throw new Error(`Failed to create guest chat: ${response.status}`);
         const json = await response.json();
@@ -550,7 +634,7 @@ export async function createQwenStream(
         method: 'POST',
         headers: { 'accept': 'application/json, text/plain, */*', 'content-type': 'application/json', cookie: chatHeaders['cookie'], origin: 'https://chat.qwen.ai', referer: 'https://chat.qwen.ai/c/guest', 'user-agent': chatHeaders['user-agent'], 'x-request-id': crypto.randomUUID(), 'bx-v': chatHeaders['bx-v'], 'bx-ua': chatHeaders['bx-ua'], 'bx-umidtoken': chatHeaders['bx-umidtoken'], ...getClientHintsHeaders() },
         body: guestBody,
-        signal: AbortSignal.timeout(30000),
+        signal: AbortSignal.timeout(config.timeouts.http),
       });
       if (!response.ok) throw new Error(`Failed to create guest chat: ${response.status}`);
       const json = await response.json();