@pedrofariasx/qwenproxy 1.2.2 → 1.3.0

package/package.json

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

package/src/api/models.ts

@@ -4,6 +4,7 @@ import { getBasicHeaders } from '../services/playwright.js'
 import { loadAccounts } from '../core/accounts.js'
 import { getAccountCooldownInfo } from '../core/account-manager.js'
 import { cache } from '../cache/memory-cache.js'
+import { syncModelContextWindows } from '../core/model-registry.js'
 
 const app = new Hono()
 
@@ -80,7 +81,7 @@ app.get('/v1/models', async (c) => {
       ],
     }
 
-    // Cache the formatted models list for 5 minutes (300 seconds)
+    syncModelContextWindows(formatted.data)
     await cache.set(cacheKey, formatted, 300)
     
     return c.json(formatted)
@@ -163,6 +164,7 @@ app.get('/v1/models/:model', async (c) => {
         ],
       }
 
+      syncModelContextWindows(formatted.data)
       await cache.set(cacheKey, formatted, 300)
       models = formatted.data
     }

package/src/api/server.ts

@@ -70,10 +70,10 @@ app.notFound((c) => c.json({ error: 'Not found' }, 404))
 export async function startServer(): Promise<void> {
   await cache.connect()
 
-  const { loadAccounts } = await import('../core/accounts.ts')
+  const { loadAccounts } = await import('../core/accounts.js')
   const accounts = loadAccounts()
 
-  const { initPlaywright, initPlaywrightForAccount, getQwenHeaders } = await import('../services/playwright.ts')
+  const { initPlaywright, initPlaywrightForAccount, getQwenHeaders } = await import('../services/playwright.js')
   
   await initPlaywright(config.browser.headless)
   
@@ -87,7 +87,7 @@ export async function startServer(): Promise<void> {
       )
     )
     console.log('[Server] Pre-fetching headers for all accounts in background...')
-    const { warmAllPools } = await import('../services/qwen.ts')
+    const { warmAllPools } = await import('../services/qwen.js')
     warmAllPools(accounts.map(a => a.id)).catch(() => {})
   }
 
@@ -111,7 +111,7 @@ export async function startServer(): Promise<void> {
     await cache.close()
     const { closePlaywright } = await import('../services/playwright.js')
     await closePlaywright()
-    const { closeDatabase } = await import('../core/database.ts')
+    const { closeDatabase } = await import('../core/database.js')
     closeDatabase()
     server?.close()
     process.exit(0)

package/src/cache/memory-cache.ts

@@ -21,6 +21,7 @@ export class MemoryCache {
   private cleanupInterval: NodeJS.Timeout | null
   private maxEntries: number
   private totalBytes: number
+  private scanRegexCache: Map<string, RegExp>
 
   constructor(options?: { prefix?: string; defaultTTL?: number; maxEntries?: number }) {
     this.prefix = options?.prefix || 'qwenproxy:'
@@ -29,12 +30,14 @@ export class MemoryCache {
     this.store = new Map()
     this.totalBytes = 0
     this.cleanupInterval = null
+    this.scanRegexCache = new Map()
 
     this.startCleanup()
   }
 
   private entryByteSize(key: string, value: any): number {
-    return Buffer.byteLength(key) + Buffer.byteLength(JSON.stringify(value))
+    const valueStr = typeof value === 'string' ? value : JSON.stringify(value)
+    return Buffer.byteLength(key) + Buffer.byteLength(valueStr || '')
   }
 
   private evictLRU(): void {
@@ -63,11 +66,9 @@ export class MemoryCache {
   }
 
   async set<T>(key: CacheKey, value: T, ttl?: number): Promise<void> {
-    const serialized = JSON.stringify(value)
-    const valueBytes = Buffer.byteLength(serialized)
     const effectiveTTL = ttl || this.defaultTTL
     const fullKey = this.prefix + key
-    const entrySize = Buffer.byteLength(fullKey) + valueBytes
+    const entrySize = this.entryByteSize(fullKey, value)
     
     if (this.store.has(fullKey)) {
       const oldEntry = this.store.get(fullKey)
@@ -85,7 +86,7 @@ export class MemoryCache {
     this.totalBytes += entrySize
     
     metrics.increment('cache.set')
-    metrics.histogram('cache.value.size', valueBytes)
+    metrics.histogram('cache.value.size', entrySize)
   }
 
   async get<T>(key: CacheKey): Promise<T | null> {

package/src/core/account-manager.ts

@@ -1,4 +1,4 @@
-import { QwenAccount, loadAccounts } from './accounts.ts'
+import { QwenAccount, loadAccounts } from './accounts.js'
 import { config } from './config.js'
 
 let currentIndex = 0

package/src/core/accounts.ts

@@ -1,5 +1,5 @@
 import crypto from 'crypto'
-import { getDatabase } from './database.ts'
+import { getDatabase } from './database.js'
 import { config } from './config.js'
 
 export interface QwenAccount {

package/src/core/model-registry.ts

@@ -1,16 +1,58 @@
 const modelContextWindows: Record<string, number> = {
-  'qwen-max': 32768,
-  'qwen-max-latest': 32768,
-  'qwen-plus': 131072,
-  'qwen-plus-latest': 131072,
-  'qwen-turbo': 131072,
-  'qwen-turbo-latest': 131072,
-  'qwen-long': 1000000,
-  'qwen-coder': 131072,
-  'qwen-coder-plus': 131072,
+  'qwen3.7-plus': 1000000,
+  'qwen3.7-max': 1000000,
+  'qwen3.6-plus': 1000000,
+  'qwen3.6-plus-preview': 1000000,
+  'qwen3.6-max-preview': 262144,
+  'qwen3.6-27b': 262144,
+  'qwen3.6-35b-a3b': 262144,
+  'qwen3.5-plus': 1000000,
+  'qwen3.5-flash': 1000000,
+  'qwen3.5-omni-plus': 262144,
+  'qwen3.5-omni-flash': 262144,
+  'qwen3.5-max-2026-03-08': 262144,
+  'qwen3.5-397b-a17b': 262144,
+  'qwen3.5-122b-a10b': 262144,
+  'qwen3.5-27b': 262144,
+  'qwen3.5-35b-a3b': 262144,
+  'qwen3-max-2026-01-23': 262144,
+  'qwen3-coder-plus': 1048576,
+  'qwen3-vl-plus': 262144,
+  'qwen3-omni-flash-2025-12-01': 65536,
+  'qwen-plus-2025-07-28': 131072,
+  'qwen-latest-series-invite-beta-v24': 262144,
+  'qwen-latest-series-invite-beta-v16': 1000000,
+}
+
+const modelTokenDivisors: Record<string, number> = {
+  'qwen3.7-max': 2.2,
+  'qwen3.6-max-preview': 2.2,
+  'qwen3.5-max-2026-03-08': 2.2,
+  'qwen3-max-2026-01-23': 2.2,
+  'qwen-latest-series-invite-beta-v24': 2.2,
+  'qwen3.7-plus': 2.0,
+  'qwen3.6-plus': 2.0,
+  'qwen3.6-plus-preview': 2.0,
+  'qwen3.5-plus': 2.0,
+  'qwen-plus-2025-07-28': 2.0,
+  'qwen-latest-series-invite-beta-v16': 2.0,
+  'qwen3.5-flash': 1.8,
+  'qwen3.5-omni-plus': 1.8,
+  'qwen3.5-omni-flash': 1.7,
+  'qwen3-omni-flash-2025-12-01': 1.7,
+  'qwen3.5-397b-a17b': 1.9,
+  'qwen3.5-122b-a10b': 1.9,
+  'qwen3.6-35b-a3b': 1.9,
+  'qwen3.5-35b-a3b': 1.9,
+  'qwen3.6-27b': 1.9,
+  'qwen3.5-27b': 1.9,
+  'qwen3-coder-plus': 2.3,
+  'qwen3-vl-plus': 2.1,
 }
 
 const defaultContextWindow = 131072
+const defaultTokenDivisor = 2.0
+export const MAX_PAYLOAD_SIZE = 10 * 1024 * 1024
 
 export function setModelContextWindow(modelId: string, contextWindow: number): void {
   modelContextWindows[modelId] = contextWindow
@@ -21,6 +63,11 @@ export function getModelContextWindow(modelId: string): number {
   return modelContextWindows[baseId] ?? defaultContextWindow
 }
 
+export function getModelTokenDivisor(modelId: string): number {
+  const baseId = modelId.replace('-no-thinking', '')
+  return modelTokenDivisors[baseId] ?? defaultTokenDivisor
+}
+
 export function syncModelContextWindows(models: Array<{ id: string; context_window?: number }>): void {
   for (const m of models) {
     if (m.context_window) {

package/src/login.ts

@@ -1,5 +1,5 @@
-import { addAccount, removeAccount, listAccounts, getAccountCredentials, QwenAccount } from './core/accounts.ts'
-import { initPlaywrightForAccount, closePlaywrightForAccount, BrowserType, launchManualLoginAccount, extractAccountInfoFromContext } from './services/playwright.ts'
+import { addAccount, removeAccount, listAccounts, getAccountCredentials, QwenAccount } from './core/accounts.js'
+import { initPlaywrightForAccount, closePlaywrightForAccount, BrowserType, launchManualLoginAccount, extractAccountInfoFromContext } from './services/playwright.js'
 import * as readline from 'readline'
 import * as dotenv from 'dotenv'
 

package/src/routes/chat.ts

@@ -11,18 +11,17 @@
 import { Context } from 'hono';
 import { stream as honoStream } from 'hono/streaming';
 import crypto from 'crypto';
-import { createQwenStream, updateSessionParent } from '../services/qwen.ts';
-import { OpenAIRequest, ChoiceDelta, Message } from '../utils/types.ts';
-import { registry } from '../tools/registry.ts';
-import type { FunctionToolDefinition } from '../tools/types.ts';
-import { robustParseJSON } from '../utils/json.ts';
-import { StreamingToolParser } from '../tools/parser.ts';
-import { QwenStreamParser, ParsedChunkResult } from '../utils/qwen-stream-parser.ts';
-import { RetryableQwenStreamError } from '../services/qwen.ts';
+import { createQwenStream, updateSessionParent, RetryableQwenStreamError } from '../services/qwen.js';
+import { OpenAIRequest, ChoiceDelta, Message } from '../utils/types.js';
+import { registry } from '../tools/registry.js';
+import type { FunctionToolDefinition } from '../tools/types.js';
+import { robustParseJSON } from '../utils/json.js';
+import { StreamingToolParser } from '../tools/parser.js';
+import { QwenStreamParser, ParsedChunkResult } from '../utils/qwen-stream-parser.js';
 import { getModelContextWindow } from '../core/model-registry.js'
-import { truncateMessages, estimateTokenCount } from '../utils/context-truncation.ts';
-import { getNextAccount, getNextAvailableAccount, markAccountRateLimited, getAccountCooldownInfo } from '../core/account-manager.ts';
-import { registerStream, removeStream, getStream } from '../core/stream-registry.ts';
+import { truncateMessages, estimateTokenCount } from '../utils/context-truncation.js';
+import { getNextAccount, getNextAvailableAccount, markAccountRateLimited, getAccountCooldownInfo } from '../core/account-manager.js';
+import { registerStream, removeStream, getStream } from '../core/stream-registry.js';
 import { metrics } from '../core/metrics.js'
 
 export interface DeltaResult {
@@ -53,14 +52,6 @@ export function getIncrementalDelta(oldStr: string, newStr: string, prevLength:
     const actualSuffix = newStr.slice(prevLength - checkLen, prevLength);
     
     if (expectedSuffix === actualSuffix) {
-      if (delta.length <= 4 && oldStr.length > 2000) {
-        return { 
-          delta: newStr, 
-          matchedContent: oldStr + newStr,
-          contentLength: newStr.length,
-          contentSuffix: newStr.slice(-64)
-        };
-      }
       return { 
         delta, 
         matchedContent: newStr,
@@ -73,14 +64,6 @@ export function getIncrementalDelta(oldStr: string, newStr: string, prevLength:
   // Fallback: startsWith check for edge cases
   if (newStr.startsWith(oldStr)) {
     const delta = newStr.slice(oldStr.length);
-    if (delta.length <= 4 && oldStr.length > 2000) {
-      return { 
-        delta: newStr, 
-        matchedContent: oldStr + newStr,
-        contentLength: newStr.length,
-        contentSuffix: newStr.slice(-64)
-      };
-    }
     return { 
       delta, 
       matchedContent: newStr,
@@ -264,12 +247,12 @@ export async function chatCompletions(c: Context) {
 
     const modelId = body.model.replace('-no-thinking', '');
     const modelContextWindow = getModelContextWindow(modelId)
-    const estimatedTokens = estimateTokenCount(systemPrompt + prompt);
+    const estimatedTokens = estimateTokenCount(systemPrompt + prompt, modelId);
     const hasTools = Array.isArray(bodyAny.tools) && bodyAny.tools.length > 0;
     
     let finalPrompt: string;
     if (estimatedTokens > modelContextWindow - 1000) {
-      const truncated = truncateMessages(messages, modelContextWindow, systemPrompt);
+      const truncated = truncateMessages(messages, modelContextWindow, systemPrompt, modelId);
       const truncatedBody = truncated.map(m => `${m.role === 'user' ? 'User' : m.role === 'assistant' ? 'Assistant' : m.role}: ${m.content}`).join('\n\n');
       finalPrompt = systemPrompt ? `${systemPrompt}\n\n${truncatedBody}` : truncatedBody;
     } else {
@@ -289,7 +272,7 @@ export async function chatCompletions(c: Context) {
 
     // Account selection with fallback on rate-limit/failure
     let account = getNextAccount();
-    let triedAccountIds = new Set<string>();
+    const triedAccountIds = new Set<string>();
     let lastError: any = null;
 
     let stream: ReadableStream | undefined;
@@ -395,7 +378,6 @@ export async function chatCompletions(c: Context) {
 
       const toolCallsOut: any[] = [];
       let buffer = '';
-      const hasTools = Array.isArray(bodyAny.tools) && bodyAny.tools.length > 0;
 
       const qwenParser = new QwenStreamParser(uiSessionId, {
         tools: hasTools ? bodyAny.tools : [],
@@ -524,25 +506,13 @@ export async function chatCompletions(c: Context) {
         const createdTimestamp = Math.floor(Date.now() / 1000);
 
         const fastWriteContent = (content: string) => {
-          const chunk = JSON.stringify({
-            id: completionId,
-            object: 'chat.completion.chunk',
-            created: createdTimestamp,
-            model: body.model,
-            choices: [makeChoice({ content })]
-          });
-          streamWriter.write(`data: ${chunk}\n\n`);
+          const escaped = content.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n').replace(/\r/g, '\\r').replace(/\t/g, '\\t');
+          streamWriter.write(`data: {"id":"${completionId}","object":"chat.completion.chunk","created":${createdTimestamp},"model":"${body.model}","choices":[{"index":0,"delta":{"content":"${escaped}"},"logprobs":null,"finish_reason":null}]}\n\n`);
         };
 
         const fastWriteReasoning = (content: string) => {
-          const chunk = JSON.stringify({
-            id: completionId,
-            object: 'chat.completion.chunk',
-            created: createdTimestamp,
-            model: body.model,
-            choices: [makeChoice({ reasoning_content: content })]
-          });
-          streamWriter.write(`data: ${chunk}\n\n`);
+          const escaped = content.replace(/\\/g, '\\\\').replace(/"/g, '\\"').replace(/\n/g, '\\n').replace(/\r/g, '\\r').replace(/\t/g, '\\t');
+          streamWriter.write(`data: {"id":"${completionId}","object":"chat.completion.chunk","created":${createdTimestamp},"model":"${body.model}","choices":[{"index":0,"delta":{"reasoning_content":"${escaped}"},"logprobs":null,"finish_reason":null}]}\n\n`);
         };
 
         writeEvent({
@@ -563,7 +533,6 @@ export async function chatCompletions(c: Context) {
         let targetResponseId: string | null = null;
         let targetResponseIdSet = false;
         let currentThoughtIndex = 0;
-        const hasTools = Array.isArray(bodyAny.tools) && bodyAny.tools.length > 0;
         const toolParser = hasTools ? new StreamingToolParser(bodyAny.tools) : null;
 
         let buffer = '';
@@ -687,7 +656,9 @@ export async function chatCompletions(c: Context) {
                 }
               }
             } catch (e) {
-              // parse error, ignore partial chunk
+              if (dataStr.length > 10) {
+                console.warn(`[Chat] SSE parse error for chunk (${dataStr.length} chars):`, (e as Error).message);
+              }
             }
           }
 

package/src/routes/upload.ts

@@ -5,7 +5,7 @@
  */
 
 import { Context } from "hono";
-import { getQwenHeaders } from "../services/playwright.ts";
+import { getQwenHeaders } from "../services/playwright.js";
 import crypto from "crypto";
 
 interface STSResponse {

package/src/services/playwright.ts

@@ -11,11 +11,27 @@
 import { chromium, firefox, webkit, BrowserContext, Page } from 'playwright';
 import path from 'path';
 import crypto from 'crypto';
-import { QwenAccount } from '../core/accounts.ts';
-import { config } from '../core/config.ts';
+import { QwenAccount } from '../core/accounts.js';
+import { config } from '../core/config.js';
 
 export type BrowserType = 'chromium' | 'firefox' | 'webkit' | 'chrome' | 'edge';
 
+interface BrowserEngineConfig {
+  engine: typeof chromium | typeof firefox | typeof webkit;
+  channel?: string;
+}
+
+function resolveBrowserEngine(browserType: BrowserType): BrowserEngineConfig {
+  switch (browserType) {
+    case 'firefox': return { engine: firefox };
+    case 'webkit': return { engine: webkit };
+    case 'chrome': return { engine: chromium, channel: 'chrome' };
+    case 'edge': return { engine: chromium, channel: 'msedge' };
+    case 'chromium':
+    default: return { engine: chromium };
+  }
+}
+
 let context: BrowserContext | null = null;
 export let activePage: Page | null = null;
 const accountContexts = new Map<string, BrowserContext>();
@@ -120,9 +136,14 @@ export async function getBasicHeaders(accountId?: string): Promise<{ cookie: str
   if (!page) throw new Error('Playwright not initialized');
   
   const cookie = await getCookies(accountId);
-  const userAgent = await page.evaluate(() => navigator.userAgent);
-  
   const cacheKey = accountId || 'global';
+  
+  let userAgent = cachedUserAgents.get(cacheKey);
+  if (!userAgent) {
+    userAgent = await page.evaluate(() => navigator.userAgent);
+    cachedUserAgents.set(cacheKey, userAgent);
+  }
+  
   const cache = getAccountHeaderCache(cacheKey);
   const bxV = cache.currentHeaders['bx-v'] || '2.5.36';
   const bxUa = cache.currentHeaders['bx-ua'];
@@ -138,34 +159,11 @@ export async function initPlaywright(headless = true, browserType: BrowserType =
   }
 
   const profilePath = path.resolve('qwen_profiles', '_default');
-  
-  let browserEngine;
-  let channel: string | undefined;
-
-  switch (browserType) {
-    case 'firefox':
-      browserEngine = firefox;
-      break;
-    case 'webkit':
-      browserEngine = webkit;
-      break;
-    case 'chrome':
-      browserEngine = chromium;
-      channel = 'chrome';
-      break;
-    case 'edge':
-      browserEngine = chromium;
-      channel = 'msedge';
-      break;
-    case 'chromium':
-    default:
-      browserEngine = chromium;
-      break;
-  }
+  const { engine, channel } = resolveBrowserEngine(browserType);
 
   console.log(`[Playwright] Launching ${browserType}...`);
 
-  context = await browserEngine.launchPersistentContext(profilePath, {
+  context = await engine.launchPersistentContext(profilePath, {
     headless,
     channel,
     userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',
@@ -249,45 +247,8 @@ export async function closePlaywright() {
 
 export async function loginToQwen(email: string, password: string): Promise<boolean> {
   if (!activePage) throw new Error('Playwright not initialized');
-
   console.log(`[Playwright] Attempting API login for ${email}...`);
-  
-  await activePage.goto('https://chat.qwen.ai/auth', { waitUntil: 'domcontentloaded' });
-
-  const hashedPassword = crypto.createHash('sha256').update(password).digest('hex');
-
-  const result = await activePage.evaluate(async ({ email, password }) => {
-    try {
-      const response = await fetch("https://chat.qwen.ai/api/v2/auths/signin", {
-        method: "POST",
-        headers: {
-          "accept": "application/json, text/plain, */*",
-          "content-type": "application/json",
-          "source": "web",
-          "timezone": new Date().toString().split(' (')[0],
-          "x-request-id": crypto.randomUUID()
-        },
-        body: JSON.stringify({ email, password, login_type: "email" })
-      });
-      const data = await response.json();
-      return { ok: response.ok, data };
-    } catch (e: any) {
-      return { ok: false, error: e.message };
-    }
-  }, { email, password: hashedPassword });
-
-  if (result.ok) {
-    console.log('[Playwright] API login request successful.');
-    await activePage.goto('https://chat.qwen.ai/', { waitUntil: 'domcontentloaded' });
-    const isLogged = !(activePage.url().includes('auth') || activePage.url().includes('login'));
-    if (isLogged) {
-       console.log('[Playwright] Login confirmed.');
-       return true;
-    }
-  }
-
-  console.error('[Playwright] Login failed:', result.data || result.error);
-  return false;
+  return loginToQwenWithContext(activePage.context(), activePage, email, password);
 }
 
 async function loginToQwenUI(email: string, password: string): Promise<boolean> {
@@ -341,7 +302,9 @@ export async function getQwenHeaders(forceNew = false, accountId?: string): Prom
     if (age < HEADERS_TTL) {
       if (age > HEADERS_TTL * REFRESH_THRESHOLD && !cache.refreshInProgress) {
         cache.refreshInProgress = true;
-        getQwenHeaders(true, accountId).finally(() => {
+        getQwenHeaders(true, accountId).catch((err) => {
+          console.warn(`[Playwright] Background header refresh failed for ${cacheKey}:`, (err as Error).message);
+        }).finally(() => {
           cache.refreshInProgress = false;
         });
       }
@@ -374,7 +337,11 @@ async function tryLightweightCookieRefresh(accountId?: string): Promise<{ header
   try {
     const cookies = await page.context().cookies();
     const cookieStr = cookies.map(c => `${c.name}=${c.value}`).join('; ');
-    const userAgent = await page.evaluate(() => navigator.userAgent);
+    let userAgent = cachedUserAgents.get(cacheKey);
+    if (!userAgent) {
+      userAgent = await page.evaluate(() => navigator.userAgent);
+      cachedUserAgents.set(cacheKey, userAgent);
+    }
 
     const now = Date.now();
     cookieCaches.set(cacheKey, { cookie: cookieStr, timestamp: now });
@@ -473,7 +440,7 @@ async function _getQwenHeadersInternal(forceNew = false, accountId?: string): Pr
         console.warn('[Playwright] Detected login page but QWEN_EMAIL/PASSWORD not provided in .env');
       }
     } else {
-      const { getAccountCredentials } = await import('../core/accounts.ts');
+      const { getAccountCredentials } = await import('../core/accounts.js');
       const creds = getAccountCredentials(accountId);
       if (creds && creds.email && creds.password) {
         console.log(`[Playwright] Detected login page for account ${creds.email}. Attempting login...`);
@@ -548,7 +515,7 @@ async function _getQwenHeadersInternal(forceNew = false, accountId?: string): Pr
       cache.lastHeadersTime = Date.now();
       cache.refreshInProgress = false;
 
-      import('./qwen.ts').then(m => m.disableNativeTools(accountId).catch(() => {}));
+      import('./qwen.js').then(m => m.disableNativeTools(accountId).catch(() => {}));
 
       await route.abort('aborted');
 
@@ -609,34 +576,11 @@ async function _getQwenHeadersInternal(forceNew = false, accountId?: string): Pr
 
 export async function initPlaywrightForAccount(account: QwenAccount, headless = true, browserType: BrowserType = 'chromium') {
   const profilePath = path.resolve('qwen_profiles', account.id);
-  
-  let browserEngine;
-  let channel: string | undefined;
-
-  switch (browserType) {
-    case 'firefox':
-      browserEngine = firefox;
-      break;
-    case 'webkit':
-      browserEngine = webkit;
-      break;
-    case 'chrome':
-      browserEngine = chromium;
-      channel = 'chrome';
-      break;
-    case 'edge':
-      browserEngine = chromium;
-      channel = 'msedge';
-      break;
-    case 'chromium':
-    default:
-      browserEngine = chromium;
-      break;
-  }
+  const { engine, channel } = resolveBrowserEngine(browserType);
 
   console.log(`[Playwright] Launching ${browserType} for account ${account.email}...`);
 
-  const acctContext = await browserEngine.launchPersistentContext(profilePath, {
+  const acctContext = await engine.launchPersistentContext(profilePath, {
     headless,
     channel,
     userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',
@@ -666,32 +610,9 @@ export async function initPlaywrightForAccount(account: QwenAccount, headless =
 
 export async function launchManualLoginAccount(accountId: string, browserType: BrowserType = 'chromium'): Promise<{ context: BrowserContext, page: Page }> {
   const profilePath = path.resolve('qwen_profiles', accountId);
-  
-  let browserEngine;
-  let channel: string | undefined;
-
-  switch (browserType) {
-    case 'firefox':
-      browserEngine = firefox;
-      break;
-    case 'webkit':
-      browserEngine = webkit;
-      break;
-    case 'chrome':
-      browserEngine = chromium;
-      channel = 'chrome';
-      break;
-    case 'edge':
-      browserEngine = chromium;
-      channel = 'msedge';
-      break;
-    case 'chromium':
-    default:
-      browserEngine = chromium;
-      break;
-  }
+  const { engine, channel } = resolveBrowserEngine(browserType);
 
-  const acctContext = await browserEngine.launchPersistentContext(profilePath, {
+  const acctContext = await engine.launchPersistentContext(profilePath, {
     headless: false,
     channel,
     userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36',