flow2api

Runtime error

App Files Files Community

genz27 Warp commited on Jan 26

Commit

99bedf8

1 Parent(s): aec69d2

更新：1.本地打码方式修改为有头并增加并行（可设置启动浏览器数量）2.修复flow视频和图片请求体报错400 3.新增图片和视频画质提升包括4K,2K以及1080p等 4.调整管理员端配置UI布局

Browse files

Files changed (9) hide show

src/api/admin.py +14 -2
src/core/config.py +11 -0
src/core/database.py +10 -6
src/core/models.py +1 -0
src/services/browser_captcha.py +489 -271
src/services/file_cache.py +35 -0
src/services/flow_client.py +576 -187
src/services/generation_handler.py +425 -27
static/manage.html +83 -78

src/api/admin.py CHANGED Viewed

@@ -885,6 +885,7 @@ async def update_captcha_config(
     capsolver_base_url = request.get("capsolver_base_url")
     browser_proxy_enabled = request.get("browser_proxy_enabled", False)
     browser_proxy_url = request.get("browser_proxy_url", "")
     # 验证浏览器代理URL格式
     if browser_proxy_enabled and browser_proxy_url:
@@ -903,9 +904,19 @@ async def update_captcha_config(
         capsolver_api_key=capsolver_api_key,
         capsolver_base_url=capsolver_base_url,
         browser_proxy_enabled=browser_proxy_enabled,
-        browser_proxy_url=browser_proxy_url if browser_proxy_enabled else None
     )
     # 🔥 Hot reload: sync database config to memory
     await db.reload_config_to_memory()
@@ -927,7 +938,8 @@ async def get_captcha_config(token: str = Depends(verify_admin_token)):
         "capsolver_api_key": captcha_config.capsolver_api_key,
         "capsolver_base_url": captcha_config.capsolver_base_url,
         "browser_proxy_enabled": captcha_config.browser_proxy_enabled,
-        "browser_proxy_url": captcha_config.browser_proxy_url or ""
     }

     capsolver_base_url = request.get("capsolver_base_url")
     browser_proxy_enabled = request.get("browser_proxy_enabled", False)
     browser_proxy_url = request.get("browser_proxy_url", "")
+    browser_count = request.get("browser_count", 1)
     # 验证浏览器代理URL格式
     if browser_proxy_enabled and browser_proxy_url:
         capsolver_api_key=capsolver_api_key,
         capsolver_base_url=capsolver_base_url,
         browser_proxy_enabled=browser_proxy_enabled,
+        browser_proxy_url=browser_proxy_url if browser_proxy_enabled else None,
+        browser_count=max(1, int(browser_count)) if browser_count else 1
     )
+    # 如果使用 browser 打码，热重载浏览器数量配置
+    if captcha_method == "browser":
+        try:
+            from ..services.browser_captcha import BrowserCaptchaService
+            service = await BrowserCaptchaService.get_instance(db)
+            await service.reload_browser_count()
+        except Exception:
+            pass
     # 🔥 Hot reload: sync database config to memory
     await db.reload_config_to_memory()
         "capsolver_api_key": captcha_config.capsolver_api_key,
         "capsolver_base_url": captcha_config.capsolver_base_url,
         "browser_proxy_enabled": captcha_config.browser_proxy_enabled,
+        "browser_proxy_url": captcha_config.browser_proxy_url or "",
+        "browser_count": captcha_config.browser_count
     }

src/core/config.py CHANGED Viewed

@@ -145,6 +145,17 @@ class Config:
             self._config["generation"] = {}
         self._config["generation"]["video_timeout"] = timeout
     # Cache configuration
     @property
     def cache_enabled(self) -> bool:

             self._config["generation"] = {}
         self._config["generation"]["video_timeout"] = timeout
+    @property
+    def upsample_timeout(self) -> int:
+        """Get upsample (4K/2K) timeout in seconds"""
+        return self._config.get("generation", {}).get("upsample_timeout", 300)
+    def set_upsample_timeout(self, timeout: int):
+        """Set upsample (4K/2K) timeout in seconds"""
+        if "generation" not in self._config:
+            self._config["generation"] = {}
+        self._config["generation"]["upsample_timeout"] = timeout
     # Cache configuration
     @property
     def cache_enabled(self) -> bool:

src/core/database.py CHANGED Viewed

@@ -289,6 +289,7 @@ class Database:
                     ("ezcaptcha_base_url", "TEXT DEFAULT 'https://api.ez-captcha.com'"),
                     ("capsolver_api_key", "TEXT DEFAULT ''"),
                     ("capsolver_base_url", "TEXT DEFAULT 'https://api.capsolver.com'"),
                 ]
                 for col_name, col_type in captcha_columns_to_add:
@@ -1224,7 +1225,8 @@ class Database:
         capsolver_api_key: str = None,
         capsolver_base_url: str = None,
         browser_proxy_enabled: bool = None,
-        browser_proxy_url: str = None
     ):
         """Update captcha configuration"""
         async with aiosqlite.connect(self.db_path) as db:
@@ -1245,6 +1247,7 @@ class Database:
                 new_cs_url = capsolver_base_url if capsolver_base_url is not None else current.get("capsolver_base_url", "https://api.capsolver.com")
                 new_proxy_enabled = browser_proxy_enabled if browser_proxy_enabled is not None else current.get("browser_proxy_enabled", False)
                 new_proxy_url = browser_proxy_url if browser_proxy_url is not None else current.get("browser_proxy_url")
                 await db.execute("""
                     UPDATE captcha_config
@@ -1252,10 +1255,10 @@ class Database:
                         capmonster_api_key = ?, capmonster_base_url = ?,
                         ezcaptcha_api_key = ?, ezcaptcha_base_url = ?,
                         capsolver_api_key = ?, capsolver_base_url = ?,
-                        browser_proxy_enabled = ?, browser_proxy_url = ?, updated_at = CURRENT_TIMESTAMP
                     WHERE id = 1
                 """, (new_method, new_yes_key, new_yes_url, new_cap_key, new_cap_url,
-                      new_ez_key, new_ez_url, new_cs_key, new_cs_url, new_proxy_enabled, new_proxy_url))
             else:
                 new_method = captcha_method if captcha_method is not None else "yescaptcha"
                 new_yes_key = yescaptcha_api_key if yescaptcha_api_key is not None else ""
@@ -1268,14 +1271,15 @@ class Database:
                 new_cs_url = capsolver_base_url if capsolver_base_url is not None else "https://api.capsolver.com"
                 new_proxy_enabled = browser_proxy_enabled if browser_proxy_enabled is not None else False
                 new_proxy_url = browser_proxy_url
                 await db.execute("""
                     INSERT INTO captcha_config (id, captcha_method, yescaptcha_api_key, yescaptcha_base_url,
                         capmonster_api_key, capmonster_base_url, ezcaptcha_api_key, ezcaptcha_base_url,
-                        capsolver_api_key, capsolver_base_url, browser_proxy_enabled, browser_proxy_url)
-                    VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """, (new_method, new_yes_key, new_yes_url, new_cap_key, new_cap_url,
-                      new_ez_key, new_ez_url, new_cs_key, new_cs_url, new_proxy_enabled, new_proxy_url))
             await db.commit()

                     ("ezcaptcha_base_url", "TEXT DEFAULT 'https://api.ez-captcha.com'"),
                     ("capsolver_api_key", "TEXT DEFAULT ''"),
                     ("capsolver_base_url", "TEXT DEFAULT 'https://api.capsolver.com'"),
+                    ("browser_count", "INTEGER DEFAULT 1"),
                 ]
                 for col_name, col_type in captcha_columns_to_add:
         capsolver_api_key: str = None,
         capsolver_base_url: str = None,
         browser_proxy_enabled: bool = None,
+        browser_proxy_url: str = None,
+        browser_count: int = None
     ):
         """Update captcha configuration"""
         async with aiosqlite.connect(self.db_path) as db:
                 new_cs_url = capsolver_base_url if capsolver_base_url is not None else current.get("capsolver_base_url", "https://api.capsolver.com")
                 new_proxy_enabled = browser_proxy_enabled if browser_proxy_enabled is not None else current.get("browser_proxy_enabled", False)
                 new_proxy_url = browser_proxy_url if browser_proxy_url is not None else current.get("browser_proxy_url")
+                new_browser_count = browser_count if browser_count is not None else current.get("browser_count", 1)
                 await db.execute("""
                     UPDATE captcha_config
                         capmonster_api_key = ?, capmonster_base_url = ?,
                         ezcaptcha_api_key = ?, ezcaptcha_base_url = ?,
                         capsolver_api_key = ?, capsolver_base_url = ?,
+                        browser_proxy_enabled = ?, browser_proxy_url = ?, browser_count = ?, updated_at = CURRENT_TIMESTAMP
                     WHERE id = 1
                 """, (new_method, new_yes_key, new_yes_url, new_cap_key, new_cap_url,
+                      new_ez_key, new_ez_url, new_cs_key, new_cs_url, new_proxy_enabled, new_proxy_url, new_browser_count))
             else:
                 new_method = captcha_method if captcha_method is not None else "yescaptcha"
                 new_yes_key = yescaptcha_api_key if yescaptcha_api_key is not None else ""
                 new_cs_url = capsolver_base_url if capsolver_base_url is not None else "https://api.capsolver.com"
                 new_proxy_enabled = browser_proxy_enabled if browser_proxy_enabled is not None else False
                 new_proxy_url = browser_proxy_url
+                new_browser_count = browser_count if browser_count is not None else 1
                 await db.execute("""
                     INSERT INTO captcha_config (id, captcha_method, yescaptcha_api_key, yescaptcha_base_url,
                         capmonster_api_key, capmonster_base_url, ezcaptcha_api_key, ezcaptcha_base_url,
+                        capsolver_api_key, capsolver_base_url, browser_proxy_enabled, browser_proxy_url, browser_count)
+                    VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """, (new_method, new_yes_key, new_yes_url, new_cap_key, new_cap_url,
+                      new_ez_key, new_ez_url, new_cs_key, new_cs_url, new_proxy_enabled, new_proxy_url, new_browser_count))
             await db.commit()

src/core/models.py CHANGED Viewed

@@ -160,6 +160,7 @@ class CaptchaConfig(BaseModel):
     page_action: str = "FLOW_GENERATION"
     browser_proxy_enabled: bool = False  # 浏览器打码是否启用代理
     browser_proxy_url: Optional[str] = None  # 浏览器打码代理URL
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None

     page_action: str = "FLOW_GENERATION"
     browser_proxy_enabled: bool = False  # 浏览器打码是否启用代理
     browser_proxy_url: Optional[str] = None  # 浏览器打码代理URL
+    browser_count: int = 1  # 浏览器打码实例数量
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None

src/services/browser_captcha.py CHANGED Viewed

@@ -1,317 +1,535 @@
 """
-浏览器自动化获取 reCAPTCHA token
-使用 Playwright 访问页面并执行 reCAPTCHA 验证
 """
 import asyncio
 import time
 import re
 from typing import Optional, Dict
-from playwright.async_api import async_playwright, Browser, BrowserContext
-from ..core.logger import debug_logger
-def parse_proxy_url(proxy_url: str) -> Optional[Dict[str, str]]:
-    """解析代理URL，分离协议、主机、端口、认证信息
-    Args:
-        proxy_url: 代理URL，格式：protocol://[username:password@]host:port
-    Returns:
-        代理配置字典，包含server、username、password（如果有认证）
-    """
-    proxy_pattern = r'^(socks5|http|https)://(?:([^:]+):([^@]+)@)?([^:]+):(\d+)$'
-    match = re.match(proxy_pattern, proxy_url)
     if match:
         protocol, username, password, host, port = match.groups()
         proxy_config = {'server': f'{protocol}://{host}:{port}'}
         if username and password:
             proxy_config['username'] = username
             proxy_config['password'] = password
         return proxy_config
     return None
 def validate_browser_proxy_url(proxy_url: str) -> tuple[bool, str]:
-    """验证浏览器代理URL格式（仅支持HTTP和无认证SOCKS5）
-    Args:
-        proxy_url: 代理URL
-    Returns:
-        (是否有效, 错误信息)
-    """
-    if not proxy_url or not proxy_url.strip():
-        return True, ""  # 空URL视为有效（不使用代理）
-    proxy_url = proxy_url.strip()
     parsed = parse_proxy_url(proxy_url)
-    if not parsed:
-        return False, "代理URL格式错误，正确格式：http://host:port 或 socks5://host:port"
-    # 检查是否有认证信息
-    has_auth = 'username' in parsed
-    # 获取协议
-    protocol = parsed['server'].split('://')[0]
-    # SOCKS5不支持认证
-    if protocol == 'socks5' and has_auth:
-        return False, "浏览器不支持带认证的SOCKS5代理，请使用HTTP代理或移除SOCKS5认证"
-    # HTTP/HTTPS支持认证
-    if protocol in ['http', 'https']:
-        return True, ""
-    # SOCKS5无认证支持
-    if protocol == 'socks5' and not has_auth:
-        return True, ""
-    return False, f"不支持的代理协议：{protocol}"
-class BrowserCaptchaService:
-    """浏览器自动化获取 reCAPTCHA token（单例模式）"""
-    _instance: Optional['BrowserCaptchaService'] = None
-    _lock = asyncio.Lock()
-    def __init__(self, db=None):
-        """初始化服务（始终使用无头模式）"""
-        self.headless = True  # 始终无头
-        self.playwright = None
-        self.browser: Optional[Browser] = None
-        self._initialized = False
-        self.website_key = "6LdsFiUsAAAAAIjVDZcuLhaHiDn5nnHVXVRQGeMV"
         self.db = db
-    @classmethod
-    async def get_instance(cls, db=None) -> 'BrowserCaptchaService':
-        """获取单例实例"""
-        if cls._instance is None:
-            async with cls._lock:
-                if cls._instance is None:
-                    cls._instance = cls(db)
-                    await cls._instance.initialize()
-        return cls._instance
-    async def initialize(self):
-        """初始化浏览器（启动一次）"""
-        if self._initialized:
-            return
         try:
-            # 获取浏览器专用代理配置
-            proxy_url = None
             if self.db:
                 captcha_config = await self.db.get_captcha_config()
-                if captcha_config.browser_proxy_enabled and captcha_config.browser_proxy_url:
-                    proxy_url = captcha_config.browser_proxy_url
-            debug_logger.log_info(f"[BrowserCaptcha] 正在启动浏览器... (proxy={proxy_url or 'None'})")
-            self.playwright = await async_playwright().start()
-            # 配置浏览器启动参数
-            launch_options = {
-                'headless': self.headless,
-                'args': [
                     '--disable-blink-features=AutomationControlled',
-                    '--disable-dev-shm-usage',
                     '--no-sandbox',
-                    '--disable-setuid-sandbox'
                 ]
-            }
-            # 如果有代理，解析并添加代理配置
-            if proxy_url:
-                proxy_config = parse_proxy_url(proxy_url)
-                if proxy_config:
-                    launch_options['proxy'] = proxy_config
-                    auth_info = "auth=yes" if 'username' in proxy_config else "auth=no"
-                    debug_logger.log_info(f"[BrowserCaptcha] 代理配置: {proxy_config['server']} ({auth_info})")
-                else:
-                    debug_logger.log_warning(f"[BrowserCaptcha] 代理URL格式错误: {proxy_url}")
-            self.browser = await self.playwright.chromium.launch(**launch_options)
-            self._initialized = True
-            debug_logger.log_info(f"[BrowserCaptcha] ✅ 浏览器已启动 (headless={self.headless}, proxy={proxy_url or 'None'})")
         except Exception as e:
-            debug_logger.log_error(f"[BrowserCaptcha] ❌ 浏览器启动失败: {str(e)}")
             raise
-    async def get_token(self, project_id: str) -> Optional[str]:
-        """获取 reCAPTCHA token
-        Args:
-            project_id: Flow项目ID
-        Returns:
-            reCAPTCHA token字符串，如果获取失败返回None
-        """
-        if not self._initialized:
-            await self.initialize()
-        start_time = time.time()
-        context = None
         try:
-            # 创建新的上下文
-            context = await self.browser.new_context(
-                viewport={'width': 1920, 'height': 1080},
-                user_agent='Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-                locale='en-US',
-                timezone_id='America/New_York'
-            )
             page = await context.new_page()
-            website_url = f"https://labs.google/fx/tools/flow/project/{project_id}"
-            debug_logger.log_info(f"[BrowserCaptcha] 访问页面: {website_url}")
-            # 访问页面
             try:
-                await page.goto(website_url, wait_until="domcontentloaded", timeout=30000)
             except Exception as e:
-                debug_logger.log_warning(f"[BrowserCaptcha] 页面加载超时或失败: {str(e)}")
-            # 检查并注入 reCAPTCHA v3 脚本
-            debug_logger.log_info("[BrowserCaptcha] 检查并加载 reCAPTCHA v3 脚本...")
-            script_loaded = await page.evaluate("""
-                () => {
-                    if (window.grecaptcha && typeof window.grecaptcha.execute === 'function') {
-                        return true;
-                    }
-                    return false;
-                }
-            """)
-            if not script_loaded:
-                # 注入脚本
-                debug_logger.log_info("[BrowserCaptcha] 注入 reCAPTCHA v3 脚本...")
-                await page.evaluate(f"""
-                    () => {{
-                        return new Promise((resolve) => {{
-                            const script = document.createElement('script');
-                            script.src = 'https://www.google.com/recaptcha/api.js?render={self.website_key}';
-                            script.async = true;
-                            script.defer = true;
-                            script.onload = () => resolve(true);
-                            script.onerror = () => resolve(false);
-                            document.head.appendChild(script);
                         }});
                     }}
-                """)
-            # 等待reCAPTCHA加载和初始化
-            debug_logger.log_info("[BrowserCaptcha] 等待reCAPTCHA初始化...")
-            for i in range(20):
-                grecaptcha_ready = await page.evaluate("""
-                    () => {
-                        return window.grecaptcha &&
-                               typeof window.grecaptcha.execute === 'function';
-                    }
-                """)
-                if grecaptcha_ready:
-                    debug_logger.log_info(f"[BrowserCaptcha] reCAPTCHA 已准备好（等待了 {i*0.5} 秒）")
-                    break
-                await asyncio.sleep(0.5)
-            else:
-                debug_logger.log_warning("[BrowserCaptcha] reCAPTCHA 初始化超时，继续尝试执行...")
-            # 额外等待确保完全初始化
-            await page.wait_for_timeout(1000)
-            # 执行reCAPTCHA并获取token
-            debug_logger.log_info("[BrowserCaptcha] 执行reCAPTCHA验证...")
-            token = await page.evaluate("""
-                async (websiteKey) => {
-                    try {
-                        if (!window.grecaptcha) {
-                            console.error('[BrowserCaptcha] window.grecaptcha 不存在');
-                            return null;
-                        }
-                        if (typeof window.grecaptcha.execute !== 'function') {
-                            console.error('[BrowserCaptcha] window.grecaptcha.execute 不是函数');
-                            return null;
-                        }
-                        // 确保grecaptcha已准备好
-                        await new Promise((resolve, reject) => {
-                            const timeout = setTimeout(() => {
-                                reject(new Error('reCAPTCHA加载超时'));
-                            }, 15000);
-                            if (window.grecaptcha && window.grecaptcha.ready) {
-                                window.grecaptcha.ready(() => {
-                                    clearTimeout(timeout);
-                                    resolve();
-                                });
-                            } else {
-                                clearTimeout(timeout);
-                                resolve();
-                            }
-                        });
-                        // 执行reCAPTCHA v3
-                        const token = await window.grecaptcha.execute(websiteKey, {
-                            action: 'FLOW_GENERATION'
-                        });
-                        return token;
-                    } catch (error) {
-                        console.error('[BrowserCaptcha] reCAPTCHA执行错误:', error);
-                        return null;
-                    }
-                }
-            """, self.website_key)
-            duration_ms = (time.time() - start_time) * 1000
-            if token:
-                debug_logger.log_info(f"[BrowserCaptcha] ✅ Token获取成功（耗时 {duration_ms:.0f}ms）")
-                return token
-            else:
-                debug_logger.log_error("[BrowserCaptcha] Token获取失败（返回null）")
-                return None
         except Exception as e:
-            debug_logger.log_error(f"[BrowserCaptcha] 获取token异常: {str(e)}")
             return None
         finally:
-            # 关闭上下文
-            if context:
-                try:
-                    await context.close()
-                except:
-                    pass
-    async def close(self):
-        """关闭浏览器"""
-        try:
-            if self.browser:
                 try:
-                    await self.browser.close()
                 except Exception as e:
-                    # 忽略连接关闭错误（正常关闭场景）
-                    if "Connection closed" not in str(e):
-                        debug_logger.log_warning(f"[BrowserCaptcha] 关闭浏览器时出现异常: {str(e)}")
                 finally:
-                    self.browser = None
-            if self.playwright:
-                try:
-                    await self.playwright.stop()
-                except Exception:
-                    pass  # 静默处理 playwright 停止异常
-                finally:
-                    self.playwright = None
-            self._initialized = False
-            debug_logger.log_info("[BrowserCaptcha] 浏览器已关闭")
-        except Exception as e:
-            debug_logger.log_error(f"[BrowserCaptcha] 关闭浏览器异常: {str(e)}")

 """
+基于 RT 的本地 reCAPTCHA 打码服务 (终极闭环版 - 无 fake_useragent 纯净版)
+支持：自动刷新 Session Token、外部触发指纹切换、死磕重试
 """
 import asyncio
 import time
+import os
 import re
+import random
+from pathlib import Path
 from typing import Optional, Dict
+from datetime import datetime
+from urllib.parse import urlparse, unquote
+from playwright.async_api import async_playwright, Route, BrowserContext
+from ..core.logger import debug_logger
+# 配置
+LABS_URL = "https://labs.google/fx/tools/flow"
+# ==========================================
+# 代理解析工具函数
+# ==========================================
+def parse_proxy_url(proxy_url: str) -> Optional[Dict[str, str]]:
+    """解析代理URL"""
+    if not proxy_url: return None
+    if not re.match(r'^(http|https|socks5)://', proxy_url): proxy_url = f"http://{proxy_url}"
+    match = re.match(r'^(socks5|http|https)://(?:([^:]+):([^@]+)@)?([^:]+):(\d+)$', proxy_url)
     if match:
         protocol, username, password, host, port = match.groups()
         proxy_config = {'server': f'{protocol}://{host}:{port}'}
         if username and password:
             proxy_config['username'] = username
             proxy_config['password'] = password
         return proxy_config
     return None
 def validate_browser_proxy_url(proxy_url: str) -> tuple[bool, str]:
+    if not proxy_url: return True, None
     parsed = parse_proxy_url(proxy_url)
+    if not parsed: return False, "代理格式错误"
+    return True, None
+class TokenBrowser:
+    """简化版浏览器：每次获取 token 时启动新浏览器，用完即关
+    每次都是新的随机 UA，避免长时间运行导致的各种问题
+    """
+    # UA 池
+    UA_LIST = [
+        # Windows Chrome (120-132)
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+        # Windows Chrome 完整版本号
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.6834.83 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.6778.139 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.117 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.6668.100 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.6613.138 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.6533.120 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.127 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.6422.141 Safari/537.36",
+        "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+        # Windows Edge (120-132)
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36 Edg/129.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36 Edg/126.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36 Edg/125.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36 Edg/123.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.6834.83 Safari/537.36 Edg/132.0.2957.115",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.6778.139 Safari/537.36 Edg/131.0.2903.99",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.117 Safari/537.36 Edg/130.0.2849.80",
+        # macOS Chrome (120-132)
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_3_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_2_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_6_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_5_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+        # macOS Safari
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.4.1 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_3_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.3.1 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_2_1) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 13_6_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.1 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Safari/605.1.15",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.6 Safari/605.1.15",
+        # macOS Edge
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Edg/130.0.0.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36 Edg/129.0.0.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0",
+        # Linux Chrome
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36",
+        # Linux Firefox
+        "Mozilla/5.0 (X11; Linux x86_64; rv:134.0) Gecko/20100101 Firefox/134.0",
+        "Mozilla/5.0 (X11; Linux x86_64; rv:133.0) Gecko/20100101 Firefox/133.0",
+        "Mozilla/5.0 (X11; Linux x86_64; rv:132.0) Gecko/20100101 Firefox/132.0",
+        "Mozilla/5.0 (X11; Linux x86_64; rv:131.0) Gecko/20100101 Firefox/131.0",
+        "Mozilla/5.0 (X11; Linux x86_64; rv:130.0) Gecko/20100101 Firefox/130.0",
+        "Mozilla/5.0 (X11; Linux x86_64; rv:129.0) Gecko/20100101 Firefox/129.0",
+        "Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0",
+        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:134.0) Gecko/20100101 Firefox/134.0",
+        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:133.0) Gecko/20100101 Firefox/133.0",
+        "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:132.0) Gecko/20100101 Firefox/132.0",
+        "Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:134.0) Gecko/20100101 Firefox/134.0",
+        # Windows Firefox
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:134.0) Gecko/20100101 Firefox/134.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:133.0) Gecko/20100101 Firefox/133.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:130.0) Gecko/20100101 Firefox/130.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:129.0) Gecko/20100101 Firefox/129.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0",
+        # macOS Firefox
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14.4; rv:134.0) Gecko/20100101 Firefox/134.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14.3; rv:133.0) Gecko/20100101 Firefox/133.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 14.2; rv:132.0) Gecko/20100101 Firefox/132.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:134.0) Gecko/20100101 Firefox/134.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:133.0) Gecko/20100101 Firefox/133.0",
+        # Opera
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 OPR/116.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 OPR/115.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36 OPR/114.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 OPR/113.0.0.0",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 OPR/112.0.0.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 OPR/116.0.0.0",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 OPR/115.0.0.0",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 OPR/116.0.0.0",
+        # Brave
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Brave/131",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Brave/130",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Brave/131",
+        "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Brave/131",
+        # Vivaldi
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Vivaldi/6.9.3447.54",
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36 Vivaldi/6.8.3381.55",
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36 Vivaldi/6.9.3447.54",
+    ]
+    # 分辨率池
+    RESOLUTIONS = [
+        (1920, 1080), (2560, 1440), (3840, 2160), (1366, 768), (1536, 864),
+        (1600, 900), (1280, 720), (1360, 768), (1920, 1200),
+        (1440, 900), (1680, 1050), (1280, 800), (2560, 1600),
+        (2880, 1800), (3024, 1890), (3456, 2160),
+        (1280, 1024), (1024, 768), (1400, 1050),
+        (1920, 1280), (2736, 1824), (2880, 1920), (3000, 2000),
+        (2256, 1504), (2496, 1664), (3240, 2160),
+        (3200, 1800), (2304, 1440), (1800, 1200),
+    ]
+    def __init__(self, token_id: int, user_data_dir: str, db=None):
+        self.token_id = token_id
+        self.user_data_dir = user_data_dir
         self.db = db
+        self._semaphore = asyncio.Semaphore(1)  # 同时只能有一个任务
+        self._solve_count = 0
+        self._error_count = 0
+    async def _create_browser(self) -> tuple:
+        """创建新浏览器实例（新 UA），返回 (playwright, browser, context)"""
+        import random
+        random_ua = random.choice(self.UA_LIST)
+        base_w, base_h = random.choice(self.RESOLUTIONS)
+        width, height = base_w, base_h - random.randint(0, 80)
+        viewport = {"width": width, "height": height}
+        playwright = await async_playwright().start()
+        Path(self.user_data_dir).mkdir(parents=True, exist_ok=True)
+        # 代理配置
+        proxy_option = None
         try:
             if self.db:
                 captcha_config = await self.db.get_captcha_config()
+                raw_url = captcha_config.browser_proxy_enabled and captcha_config.browser_proxy_url
+                if raw_url:
+                    proxy_option = parse_proxy_url(raw_url.strip())
+                    if proxy_option:
+                        debug_logger.log_info(f"[BrowserCaptcha] Token-{self.token_id} 使用代理: {proxy_option['server']}")
+        except: pass
+        try:
+            browser = await playwright.chromium.launch(
+                headless=False,
+                proxy=proxy_option,
+                args=[
                     '--disable-blink-features=AutomationControlled',
                     '--no-sandbox',
+                    '--disable-dev-shm-usage',
+                    '--disable-setuid-sandbox',
+                    '--no-first-run',
+                    '--no-zygote',
+                    f'--window-size={width},{height}',
+                    '--disable-infobars',
+                    '--hide-scrollbars',
                 ]
+            )
+            context = await browser.new_context(
+                user_agent=random_ua,
+                viewport=viewport,
+            )
+            return playwright, browser, context
         except Exception as e:
+            debug_logger.log_error(f"[BrowserCaptcha] Token-{self.token_id} 启动浏览器失败: {type(e).__name__}: {str(e)[:200]}")
+            # 确保清理已创建的对象
+            try:
+                if playwright:
+                    await playwright.stop()
+            except: pass
             raise
+    async def _close_browser(self, playwright, browser, context):
+        """关闭浏览器实例"""
+        try:
+            if context:
+                await context.close()
+        except: pass
+        try:
+            if browser:
+                await browser.close()
+        except: pass
+        try:
+            if playwright:
+                await playwright.stop()
+        except: pass
+    async def _execute_captcha(self, context, project_id: str, website_key: str, action: str) -> Optional[str]:
+        """在给定 context 中执行打码逻辑"""
+        page = None
         try:
             page = await context.new_page()
+            await page.add_init_script("Object.defineProperty(navigator, 'webdriver', {get: () => undefined});")
+            page_url = f"https://labs.google/fx/tools/flow/project/{project_id}"
+            async def handle_route(route):
+                if route.request.url.rstrip('/') == page_url.rstrip('/'):
+                    html = f"""<html><head><script src="https://www.google.com/recaptcha/enterprise.js?render={website_key}"></script></head><body></body></html>"""
+                    await route.fulfill(status=200, content_type="text/html", body=html)
+                elif any(d in route.request.url for d in ["google.com", "gstatic.com", "recaptcha.net"]):
+                    await route.continue_()
+                else:
+                    await route.abort()
+            await page.route("**/*", handle_route)
             try:
+                await page.goto(page_url, wait_until="load", timeout=30000)
             except Exception as e:
+                debug_logger.log_warning(f"[BrowserCaptcha] Token-{self.token_id} page.goto 失败: {type(e).__name__}: {str(e)[:200]}")
+                return None
+            try:
+                await page.wait_for_function("typeof grecaptcha !== 'undefined'", timeout=15000)
+            except Exception as e:
+                debug_logger.log_warning(f"[BrowserCaptcha] Token-{self.token_id} grecaptcha 未就绪: {type(e).__name__}: {str(e)[:200]}")
+                return None
+            token = await asyncio.wait_for(
+                page.evaluate(f"""
+                    (actionName) => {{
+                        return new Promise((resolve, reject) => {{
+                            const timeout = setTimeout(() => reject(new Error('timeout')), 25000);
+                            grecaptcha.enterprise.execute('{website_key}', {{action: actionName}})
+                                .then(t => {{ resolve(t); }})
+                                .catch(e => {{ reject(e); }});
                         }});
                     }}
+                """, action),
+                timeout=30
+            )
+            return token
         except Exception as e:
+            msg = f"{type(e).__name__}: {str(e)}"
+            debug_logger.log_warning(f"[BrowserCaptcha] Token-{self.token_id} 打码失败: {msg[:200]}")
             return None
         finally:
+            if page:
+                try: await page.close()
+                except: pass
+    async def get_token(self, project_id: str, website_key: str, action: str = "IMAGE_GENERATION") -> Optional[str]:
+        """获取 Token：启动新浏览器 -> 打码 -> 关闭浏览器"""
+        async with self._semaphore:
+            MAX_RETRIES = 3
+            for attempt in range(MAX_RETRIES):
+                playwright = None
+                browser = None
+                context = None
                 try:
+                    start_ts = time.time()
+                    # 每次都启动新浏览器（新 UA）
+                    playwright, browser, context = await self._create_browser()
+                    # 执行打码
+                    token = await self._execute_captcha(context, project_id, website_key, action)
+                    if token:
+                        self._solve_count += 1
+                        debug_logger.log_info(f"[BrowserCaptcha] Token-{self.token_id} 获取成功 ({(time.time()-start_ts)*1000:.0f}ms)")
+                        return token
+                    self._error_count += 1
+                    debug_logger.log_warning(f"[BrowserCaptcha] Token-{self.token_id} 尝试 {attempt+1}/{MAX_RETRIES} 失败")
                 except Exception as e:
+                    self._error_count += 1
+                    debug_logger.log_error(f"[BrowserCaptcha] Token-{self.token_id} 浏览器错误: {type(e).__name__}: {str(e)[:200]}")
                 finally:
+                    # 无论成功失败都关闭浏览器
+                    await self._close_browser(playwright, browser, context)
+                # 重试前等待
+                if attempt < MAX_RETRIES - 1:
+                    await asyncio.sleep(1)
+            return None
+class BrowserCaptchaService:
+    """多浏览器轮询打码服务（单例模式）
+    支持配置浏览器数量，每个浏览器只开 1 个标签页，请求轮询分配
+    """
+    _instance: Optional['BrowserCaptchaService'] = None
+    _lock = asyncio.Lock()
+    def __init__(self, db=None):
+        self.db = db
+        self.website_key = "6LdsFiUsAAAAAIjVDZcuLhaHiDn5nnHVXVRQGeMV"
+        self.base_user_data_dir = os.path.join(os.getcwd(), "browser_data_rt")
+        self._browsers: Dict[int, TokenBrowser] = {}
+        self._browsers_lock = asyncio.Lock()
+        # 浏览器数量配置
+        self._browser_count = 1  # 默认 1 个，会从数���库加载
+        self._round_robin_index = 0  # 轮询索引
+        # 统计指标
+        self._stats = {
+            "req_total": 0,
+            "gen_ok": 0,
+            "gen_fail": 0,
+            "api_403": 0
+        }
+        # 并发限制将在 _load_browser_count 中根据配置设置
+        self._token_semaphore = None
+    @classmethod
+    async def get_instance(cls, db=None) -> 'BrowserCaptchaService':
+        if cls._instance is None:
+            async with cls._lock:
+                if cls._instance is None:
+                    cls._instance = cls(db)
+                    # 从数据库加载 browser_count 配置
+                    await cls._instance._load_browser_count()
+        return cls._instance
+    async def _load_browser_count(self):
+        """从数据库加载浏览器数量配置"""
+        if self.db:
+            try:
+                captcha_config = await self.db.get_captcha_config()
+                self._browser_count = max(1, captcha_config.browser_count)
+                debug_logger.log_info(f"[BrowserCaptcha] 浏览器数量配置: {self._browser_count}")
+            except Exception as e:
+                debug_logger.log_warning(f"[BrowserCaptcha] 加载 browser_count 配置失败: {e}，使用默认值 1")
+                self._browser_count = 1
+        # 并发限制 = 浏览器数量，不再硬编码限制
+        self._token_semaphore = asyncio.Semaphore(self._browser_count)
+        debug_logger.log_info(f"[BrowserCaptcha] 并发上限: {self._browser_count}")
+    async def reload_browser_count(self):
+        """重新加载浏览器数量配置（用于配置更新后热重载）"""
+        old_count = self._browser_count
+        await self._load_browser_count()
+        # 如果数量减少，移除多余的浏览器实例
+        if self._browser_count < old_count:
+            async with self._browsers_lock:
+                for browser_id in list(self._browsers.keys()):
+                    if browser_id >= self._browser_count:
+                        self._browsers.pop(browser_id)
+                        debug_logger.log_info(f"[BrowserCaptcha] 移除多余浏览器实例 {browser_id}")
+    def _log_stats(self):
+        total = self._stats["req_total"]
+        gen_fail = self._stats["gen_fail"]
+        api_403 = self._stats["api_403"]
+        gen_ok = self._stats["gen_ok"]
+        valid_success = gen_ok - api_403
+        if valid_success < 0: valid_success = 0
+        rate = (valid_success / total * 100) if total > 0 else 0.0
+    async def _get_or_create_browser(self, browser_id: int) -> TokenBrowser:
+        """获取或创建指定 ID 的浏览器实例"""
+        async with self._browsers_lock:
+            if browser_id not in self._browsers:
+                user_data_dir = os.path.join(self.base_user_data_dir, f"browser_{browser_id}")
+                browser = TokenBrowser(browser_id, user_data_dir, db=self.db)
+                self._browsers[browser_id] = browser
+                debug_logger.log_info(f"[BrowserCaptcha] 创建浏览器实例 {browser_id}")
+            return self._browsers[browser_id]
+    def _get_next_browser_id(self) -> int:
+        """轮询获取下一个浏览器 ID"""
+        browser_id = self._round_robin_index % self._browser_count
+        self._round_robin_index += 1
+        return browser_id
+    async def get_token(self, project_id: str, action: str = "IMAGE_GENERATION", token_id: int = None) -> tuple[Optional[str], int]:
+        """获取 reCAPTCHA Token（轮询分配到不同浏览器）
+        Args:
+            project_id: 项目 ID
+            action: reCAPTCHA action
+            token_id: 忽略，使用轮询分配
+        Returns:
+            (token, browser_id) 元组，调用方失败时用 browser_id 调用 report_error
+        """
+        self._stats["req_total"] += 1
+        # 全局并发限制（如果已配置）
+        if self._token_semaphore:
+            async with self._token_semaphore:
+                # 轮询选择浏览器
+                browser_id = self._get_next_browser_id()
+                browser = await self._get_or_create_browser(browser_id)
+                token = await browser.get_token(project_id, self.website_key, action)
+            if token:
+                self._stats["gen_ok"] += 1
+            else:
+                self._stats["gen_fail"] += 1
+            self._log_stats()
+            return token, browser_id
+        # 无并发限制时直接执行
+        browser_id = self._get_next_browser_id()
+        browser = await self._get_or_create_browser(browser_id)
+        token = await browser.get_token(project_id, self.website_key, action)
+        if token:
+            self._stats["gen_ok"] += 1
+        else:
+            self._stats["gen_fail"] += 1
+        self._log_stats()
+        return token, browser_id
+    async def report_error(self, browser_id: int = None):
+        """上层举报：Token 无效（统计用）
+        Args:
+            browser_id: 浏览器 ID（当前架构下每次都是新浏览器，此参数仅用于日志）
+        """
+        async with self._browsers_lock:
+            self._stats["api_403"] += 1
+            if browser_id is not None:
+                debug_logger.log_info(f"[BrowserCaptcha] 浏览器 {browser_id} 的 token 验证失败")
+    async def remove_browser(self, browser_id: int):
+        async with self._browsers_lock:
+            if browser_id in self._browsers:
+                self._browsers.pop(browser_id)
+    async def close(self):
+        async with self._browsers_lock:
+            self._browsers.clear()
+    async def open_login_browser(self): return {"success": False, "error": "Not implemented"}
+    async def create_browser_for_token(self, t, s=None): pass
+    def get_stats(self):
+        base_stats = {
+            "total_solve_count": self._stats["gen_ok"],
+            "total_error_count": self._stats["gen_fail"],
+            "risk_403_count": self._stats["api_403"],
+            "browser_count": len(self._browsers),
+            "configured_browser_count": self._browser_count,
+            "browsers": []
+        }
+        return base_stats

src/services/file_cache.py CHANGED Viewed

@@ -264,6 +264,41 @@ class FileCache:
             )
             raise Exception(f"Failed to cache file: {str(e)}")
     def get_cache_path(self, filename: str) -> Path:
         """Get full path to cached file"""
         return self.cache_dir / filename

             )
             raise Exception(f"Failed to cache file: {str(e)}")
+    async def cache_base64_image(self, base64_data: str, resolution: str = "") -> str:
+        """
+        Cache base64 encoded image data to local file
+        Args:
+            base64_data: Base64 encoded image data (without data:image/... prefix)
+            resolution: Resolution info for filename (e.g., "4K", "2K")
+        Returns:
+            Local cache filename
+        """
+        import base64
+        import uuid
+        # Generate unique filename
+        unique_id = hashlib.md5(f"{uuid.uuid4()}{time.time()}".encode()).hexdigest()
+        suffix = f"_{resolution}" if resolution else ""
+        filename = f"{unique_id}{suffix}.jpg"
+        file_path = self.cache_dir / filename
+        try:
+            # Decode base64 and save to file
+            image_data = base64.b64decode(base64_data)
+            with open(file_path, 'wb') as f:
+                f.write(image_data)
+            debug_logger.log_info(f"Base64 image cached: {filename} ({len(image_data)} bytes)")
+            return filename
+        except Exception as e:
+            debug_logger.log_error(
+                error_message=f"Failed to cache base64 image: {str(e)}",
+                status_code=0,
+                response_text=""
+            )
+            raise Exception(f"Failed to cache base64 image: {str(e)}")
     def get_cache_path(self, filename: str) -> Path:
         """Get full path to cached file"""
         return self.cache_dir / filename

src/services/flow_client.py CHANGED Viewed

@@ -1,4 +1,5 @@
 """Flow API Client for VideoFX (Veo)"""
 import time
 import uuid
 import random
@@ -21,6 +22,21 @@ class FlowClient:
         # 缓存每个账号的 User-Agent
         self._user_agent_cache = {}
     def _generate_user_agent(self, account_id: str = None) -> str:
         """基于账号ID生成固定的 User-Agent
@@ -102,7 +118,8 @@ class FlowClient:
         use_st: bool = False,
         st_token: Optional[str] = None,
         use_at: bool = False,
-        at_token: Optional[str] = None
     ) -> Dict[str, Any]:
         """统一HTTP请求处理
@@ -115,8 +132,10 @@ class FlowClient:
             st_token: Session Token
             use_at: 是否使用AT认证 (Bearer方式)
             at_token: Access Token
         """
         proxy_url = await self.proxy_manager.get_proxy_url()
         if headers is None:
             headers = {}
@@ -142,6 +161,10 @@ class FlowClient:
             "User-Agent": self._generate_user_agent(account_id)
         })
         # Log request
         if config.debug_enabled:
             debug_logger.log_request(
@@ -161,7 +184,7 @@ class FlowClient:
                         url,
                         headers=headers,
                         proxy=proxy_url,
-                        timeout=self.timeout,
                         impersonate="chrome110"
                     )
                 else:  # POST
@@ -170,7 +193,7 @@ class FlowClient:
                         headers=headers,
                         json=json_data,
                         proxy=proxy_url,
-                        timeout=self.timeout,
                         impersonate="chrome110"
                     )
@@ -185,19 +208,45 @@ class FlowClient:
                         duration_ms=duration_ms
                     )
-                response.raise_for_status()
                 return response.json()
         except Exception as e:
             duration_ms = (time.time() - start_time) * 1000
             error_msg = str(e)
-            if config.debug_enabled:
-                debug_logger.log_error(
-                    error_message=error_msg,
-                    status_code=getattr(e, 'status_code', None),
-                    response_text=getattr(e, 'response_text', None)
-                )
             raise Exception(f"Flow API request failed: {error_msg}")
@@ -304,6 +353,60 @@ class FlowClient:
     # ========== 图片上传 (使用AT) ==========
     async def upload_image(
         self,
         at: str,
@@ -326,6 +429,9 @@ class FlowClient:
         if aspect_ratio.startswith("VIDEO_"):
             aspect_ratio = aspect_ratio.replace("VIDEO_", "IMAGE_")
         # 编码为base64 (去掉前缀)
         image_base64 = base64.b64encode(image_bytes).decode('utf-8')
@@ -333,7 +439,7 @@ class FlowClient:
         json_data = {
             "imageInput": {
                 "rawImageBytes": image_base64,
-                "mimeType": "image/jpeg",
                 "isUserUploaded": True,
                 "aspectRatio": aspect_ratio
             },
@@ -390,42 +496,115 @@ class FlowClient:
         """
         url = f"{self.api_base_url}/projects/{project_id}/flowMedia:batchGenerateImages"
-        # 获取 reCAPTCHA token
-        recaptcha_token = await self._get_recaptcha_token(project_id) or ""
-        session_id = self._generate_session_id()
-        # 构建请求
-        request_data = {
-            "clientContext": {
-                "recaptchaToken": recaptcha_token,
-                "projectId": project_id,
                 "sessionId": session_id,
                 "tool": "PINHOLE"
-            },
-            "seed": random.randint(1, 99999),
-            "imageModelName": model_name,
-            "imageAspectRatio": aspect_ratio,
-            "prompt": prompt,
-            "imageInputs": image_inputs or []
-        }
         json_data = {
             "clientContext": {
-                "recaptchaToken": recaptcha_token,
-                "sessionId": session_id
-            },
-            "requests": [request_data]
         }
         result = await self._make_request(
             method="POST",
             url=url,
             json_data=json_data,
             use_at=True,
-            at_token=at
         )
-        return result
     # ========== 视频生成 (使用AT) - 异步返回 ==========
@@ -460,41 +639,64 @@ class FlowClient:
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoText"
-        # 获取 reCAPTCHA token
-        recaptcha_token = await self._get_recaptcha_token(project_id) or ""
-        session_id = self._generate_session_id()
-        scene_id = str(uuid.uuid4())
-        json_data = {
-            "clientContext": {
-                "recaptchaToken": recaptcha_token,
-                "sessionId": session_id,
-                "projectId": project_id,
-                "tool": "PINHOLE",
-                "userPaygateTier": user_paygate_tier
-            },
-            "requests": [{
-                "aspectRatio": aspect_ratio,
-                "seed": random.randint(1, 99999),
-                "textInput": {
-                    "prompt": prompt
                 },
-                "videoModelKey": model_key,
-                "metadata": {
-                    "sceneId": scene_id
-                }
-            }]
-        }
-        result = await self._make_request(
-            method="POST",
-            url=url,
-            json_data=json_data,
-            use_at=True,
-            at_token=at
-        )
-        return result
     async def generate_video_reference_images(
         self,
@@ -522,42 +724,65 @@ class FlowClient:
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoReferenceImages"
-        # 获取 reCAPTCHA token
-        recaptcha_token = await self._get_recaptcha_token(project_id) or ""
-        session_id = self._generate_session_id()
-        scene_id = str(uuid.uuid4())
-        json_data = {
-            "clientContext": {
-                "recaptchaToken": recaptcha_token,
-                "sessionId": session_id,
-                "projectId": project_id,
-                "tool": "PINHOLE",
-                "userPaygateTier": user_paygate_tier
-            },
-            "requests": [{
-                "aspectRatio": aspect_ratio,
-                "seed": random.randint(1, 99999),
-                "textInput": {
-                    "prompt": prompt
                 },
-                "videoModelKey": model_key,
-                "referenceImages": reference_images,
-                "metadata": {
-                    "sceneId": scene_id
-                }
-            }]
-        }
-        result = await self._make_request(
-            method="POST",
-            url=url,
-            json_data=json_data,
-            use_at=True,
-            at_token=at
-        )
-        return result
     async def generate_video_start_end(
         self,
@@ -587,47 +812,70 @@ class FlowClient:
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoStartAndEndImage"
-        # 获取 reCAPTCHA token
-        recaptcha_token = await self._get_recaptcha_token(project_id) or ""
-        session_id = self._generate_session_id()
-        scene_id = str(uuid.uuid4())
-        json_data = {
-            "clientContext": {
-                "recaptchaToken": recaptcha_token,
-                "sessionId": session_id,
-                "projectId": project_id,
-                "tool": "PINHOLE",
-                "userPaygateTier": user_paygate_tier
-            },
-            "requests": [{
-                "aspectRatio": aspect_ratio,
-                "seed": random.randint(1, 99999),
-                "textInput": {
-                    "prompt": prompt
-                },
-                "videoModelKey": model_key,
-                "startImage": {
-                    "mediaId": start_media_id
-                },
-                "endImage": {
-                    "mediaId": end_media_id
                 },
-                "metadata": {
-                    "sceneId": scene_id
-                }
-            }]
-        }
-        result = await self._make_request(
-            method="POST",
-            url=url,
-            json_data=json_data,
-            use_at=True,
-            at_token=at
-        )
-        return result
     async def generate_video_start_image(
         self,
@@ -655,45 +903,149 @@ class FlowClient:
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoStartImage"
-        # 获取 reCAPTCHA token
-        recaptcha_token = await self._get_recaptcha_token(project_id) or ""
-        session_id = self._generate_session_id()
-        scene_id = str(uuid.uuid4())
-        json_data = {
-            "clientContext": {
-                "recaptchaToken": recaptcha_token,
-                "sessionId": session_id,
-                "projectId": project_id,
-                "tool": "PINHOLE",
-                "userPaygateTier": user_paygate_tier
-            },
-            "requests": [{
-                "aspectRatio": aspect_ratio,
-                "seed": random.randint(1, 99999),
-                "textInput": {
-                    "prompt": prompt
-                },
-                "videoModelKey": model_key,
-                "startImage": {
-                    "mediaId": start_media_id
                 },
-                # 注意: 没有endImage字段,只用首帧
-                "metadata": {
-                    "sceneId": scene_id
-                }
-            }]
-        }
-        result = await self._make_request(
-            method="POST",
-            url=url,
-            json_data=json_data,
-            use_at=True,
-            at_token=at
-        )
-        return result
     # ========== 任务轮询 (使用AT) ==========
@@ -757,6 +1109,31 @@ class FlowClient:
     # ========== 辅助方法 ==========
     def _generate_session_id(self) -> str:
         """生成sessionId: ;timestamp"""
         return f";{int(time.time() * 1000)}"
@@ -765,8 +1142,19 @@ class FlowClient:
         """生成sceneId: UUID"""
         return str(uuid.uuid4())
-    async def _get_recaptcha_token(self, project_id: str) -> Optional[str]:
-        """获取reCAPTCHA token - 支持多种打码方式"""
         captcha_method = config.captcha_method
         # 恒定浏览器打码
@@ -774,25 +1162,26 @@ class FlowClient:
             try:
                 from .browser_captcha_personal import BrowserCaptchaService
                 service = await BrowserCaptchaService.get_instance(self.db)
-                return await service.get_token(project_id)
             except Exception as e:
                 debug_logger.log_error(f"[reCAPTCHA Browser] error: {str(e)}")
-                return None
-        # 无头浏览器打码
         elif captcha_method == "browser":
             try:
                 from .browser_captcha import BrowserCaptchaService
                 service = await BrowserCaptchaService.get_instance(self.db)
-                return await service.get_token(project_id)
             except Exception as e:
                 debug_logger.log_error(f"[reCAPTCHA Browser] error: {str(e)}")
-                return None
         # API打码服务
         elif captcha_method in ["yescaptcha", "capmonster", "ezcaptcha", "capsolver"]:
-            return await self._get_api_captcha_token(captcha_method, project_id)
         else:
-            debug_logger.log_error(f"[reCAPTCHA] Unknown captcha method: {captcha_method}")
-            return None
     async def _get_api_captcha_token(self, method: str, project_id: str) -> Optional[str]:
         """通用API打码服务"""
@@ -804,11 +1193,11 @@ class FlowClient:
         elif method == "capmonster":
             client_key = config.capmonster_api_key
             base_url = config.capmonster_base_url
-            task_type = "RecaptchaV3EnterpriseTask"
         elif method == "ezcaptcha":
             client_key = config.ezcaptcha_api_key
             base_url = config.ezcaptcha_base_url
-            task_type = "ReCaptchaV3EnterpriseTaskProxyless"
         elif method == "capsolver":
             client_key = config.capsolver_api_key
             base_url = config.capsolver_base_url

 """Flow API Client for VideoFX (Veo)"""
+import asyncio
 import time
 import uuid
 import random
         # 缓存每个账号的 User-Agent
         self._user_agent_cache = {}
+        # Default "real browser" headers (Android Chrome style) to reduce upstream 4xx/5xx instability.
+        # These will be applied as defaults (won't override caller-provided headers).
+        self._default_client_headers = {
+            "sec-ch-ua-mobile": "?1",
+            "sec-ch-ua-platform": "\"Android\"",
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "cross-site",
+            "x-browser-channel": "stable",
+            "x-browser-copyright": "Copyright 2026 Google LLC. All Rights reserved.",
+            "x-browser-validation": "UujAs0GAwdnCJ9nvrswZ+O+oco0=",
+            "x-browser-year": "2026",
+            "x-client-data": "CJS2yQEIpLbJAQipncoBCNj9ygEIlKHLAQiFoM0BGP6lzwE="
+        }
     def _generate_user_agent(self, account_id: str = None) -> str:
         """基于账号ID生成固定的 User-Agent
         use_st: bool = False,
         st_token: Optional[str] = None,
         use_at: bool = False,
+        at_token: Optional[str] = None,
+        timeout: Optional[int] = None
     ) -> Dict[str, Any]:
         """统一HTTP请求处理
             st_token: Session Token
             use_at: 是否使用AT认证 (Bearer方式)
             at_token: Access Token
+            timeout: 自定义超时时间(秒)，不传则使用默认值
         """
         proxy_url = await self.proxy_manager.get_proxy_url()
+        request_timeout = timeout or self.timeout
         if headers is None:
             headers = {}
             "User-Agent": self._generate_user_agent(account_id)
         })
+        # Add default Chromium/Android client headers (do not override explicitly provided values).
+        for key, value in self._default_client_headers.items():
+            headers.setdefault(key, value)
         # Log request
         if config.debug_enabled:
             debug_logger.log_request(
                         url,
                         headers=headers,
                         proxy=proxy_url,
+                        timeout=request_timeout,
                         impersonate="chrome110"
                     )
                 else:  # POST
                         headers=headers,
                         json=json_data,
                         proxy=proxy_url,
+                        timeout=request_timeout,
                         impersonate="chrome110"
                     )
                         duration_ms=duration_ms
                     )
+                # 检查HTTP错误
+                if response.status_code >= 400:
+                    # 解析错误响应
+                    error_reason = f"HTTP Error {response.status_code}"
+                    try:
+                        error_body = response.json()
+                        # 提取 Google API 错误格式中的 reason
+                        if "error" in error_body:
+                            error_info = error_body["error"]
+                            error_message = error_info.get("message", "")
+                            # 从 details 中提取 reason
+                            details = error_info.get("details", [])
+                            for detail in details:
+                                if detail.get("reason"):
+                                    error_reason = detail.get("reason")
+                                    break
+                            if error_message:
+                                error_reason = f"{error_reason}: {error_message}"
+                    except:
+                        error_reason = f"HTTP Error {response.status_code}: {response.text[:200]}"
+                    # 失败时输出请求体和错误内容到控制台
+                    debug_logger.log_error(f"[API FAILED] URL: {url}")
+                    debug_logger.log_error(f"[API FAILED] Request Body: {json_data}")
+                    debug_logger.log_error(f"[API FAILED] Response: {response.text}")
+                    raise Exception(error_reason)
                 return response.json()
         except Exception as e:
             duration_ms = (time.time() - start_time) * 1000
             error_msg = str(e)
+            # 如果不是我们自己抛出的异常，记录日志
+            if "HTTP Error" not in error_msg and not any(x in error_msg for x in ["PUBLIC_ERROR", "INVALID_ARGUMENT"]):
+                debug_logger.log_error(f"[API FAILED] URL: {url}")
+                debug_logger.log_error(f"[API FAILED] Request Body: {json_data}")
+                debug_logger.log_error(f"[API FAILED] Exception: {error_msg}")
             raise Exception(f"Flow API request failed: {error_msg}")
     # ========== 图片上传 (使用AT) ==========
+    def _detect_image_mime_type(self, image_bytes: bytes) -> str:
+        """通过文件头 magic bytes 检测图片 MIME 类型
+        Args:
+            image_bytes: 图片字节数据
+        Returns:
+            MIME 类型字符串，默认 image/jpeg
+        """
+        if len(image_bytes) < 12:
+            return "image/jpeg"
+        # WebP: RIFF....WEBP
+        if image_bytes[:4] == b'RIFF' and image_bytes[8:12] == b'WEBP':
+            return "image/webp"
+        # PNG: 89 50 4E 47
+        if image_bytes[:4] == b'\x89PNG':
+            return "image/png"
+        # JPEG: FF D8 FF
+        if image_bytes[:3] == b'\xff\xd8\xff':
+            return "image/jpeg"
+        # GIF: GIF87a 或 GIF89a
+        if image_bytes[:6] in (b'GIF87a', b'GIF89a'):
+            return "image/gif"
+        # BMP: BM
+        if image_bytes[:2] == b'BM':
+            return "image/bmp"
+        # JPEG 2000: 00 00 00 0C 6A 50
+        if image_bytes[:6] == b'\x00\x00\x00\x0cjP':
+            return "image/jp2"
+        return "image/jpeg"
+    def _convert_to_jpeg(self, image_bytes: bytes) -> bytes:
+        """将图片转换为 JPEG 格式
+        Args:
+            image_bytes: 原始图片字节数据
+        Returns:
+            JPEG 格式的图片字节数据
+        """
+        from io import BytesIO
+        from PIL import Image
+        img = Image.open(BytesIO(image_bytes))
+        # 如果有透明通道，转换为 RGB
+        if img.mode in ('RGBA', 'LA', 'P'):
+            img = img.convert('RGB')
+        output = BytesIO()
+        img.save(output, format='JPEG', quality=95)
+        return output.getvalue()
     async def upload_image(
         self,
         at: str,
         if aspect_ratio.startswith("VIDEO_"):
             aspect_ratio = aspect_ratio.replace("VIDEO_", "IMAGE_")
+        # 自动检测图片 MIME 类型
+        mime_type = self._detect_image_mime_type(image_bytes)
         # 编码为base64 (去掉前缀)
         image_base64 = base64.b64encode(image_bytes).decode('utf-8')
         json_data = {
             "imageInput": {
                 "rawImageBytes": image_base64,
+                "mimeType": mime_type,
                 "isUserUploaded": True,
                 "aspectRatio": aspect_ratio
             },
         """
         url = f"{self.api_base_url}/projects/{project_id}/flowMedia:batchGenerateImages"
+        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
+        max_retries = 3
+        last_error = None
+        for retry_attempt in range(max_retries):
+            # 每次重试都重新获取 reCAPTCHA token
+            recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="IMAGE_GENERATION")
+            recaptcha_token = recaptcha_token or ""
+            session_id = self._generate_session_id()
+            # 构建请求 - clientContext 只在外层，requests 内不重复
+            client_context = {
+                "recaptchaContext": {
+                    "token": recaptcha_token,
+                    "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                },
                 "sessionId": session_id,
+                "projectId": project_id,
                 "tool": "PINHOLE"
+            }
+            request_data = {
+                "seed": random.randint(1, 99999),
+                "imageModelName": model_name,
+                "imageAspectRatio": aspect_ratio,
+                "prompt": prompt,
+                "imageInputs": image_inputs or []
+            }
+            json_data = {
+                "clientContext": client_context,
+                "requests": [request_data]
+            }
+            try:
+                result = await self._make_request(
+                    method="POST",
+                    url=url,
+                    json_data=json_data,
+                    use_at=True,
+                    at_token=at
+                )
+                return result
+            except Exception as e:
+                error_str = str(e)
+                last_error = e
+                retry_reason = self._get_retry_reason(error_str)
+                if retry_reason and retry_attempt < max_retries - 1:
+                    debug_logger.log_warning(f"[IMAGE] 生成遇到{retry_reason}，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...")
+                    await self._notify_browser_captcha_error(browser_id)
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    raise e
+        # 所有重试都失败
+        raise last_error
+    async def upsample_image(
+        self,
+        at: str,
+        project_id: str,
+        media_id: str,
+        target_resolution: str = "UPSAMPLE_IMAGE_RESOLUTION_4K"
+    ) -> str:
+        """放大图片到 2K/4K
+        Args:
+            at: Access Token
+            project_id: 项目ID
+            media_id: 图片的 mediaId (从 batchGenerateImages 返回的 media[0]["name"])
+            target_resolution: UPSAMPLE_IMAGE_RESOLUTION_2K 或 UPSAMPLE_IMAGE_RESOLUTION_4K
+        Returns:
+            base64 编码的图片数据
+        """
+        url = f"{self.api_base_url}/flow/upsampleImage"
+        # 获取 reCAPTCHA token - 使用 VIDEO_GENERATION action
+        recaptcha_token, _ = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
+        recaptcha_token = recaptcha_token or ""
+        session_id = self._generate_session_id()
         json_data = {
+            "mediaId": media_id,
+            "targetResolution": target_resolution,
             "clientContext": {
+                "recaptchaContext": {
+                    "token": recaptcha_token,
+                    "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                },
+                "sessionId": session_id,
+                "projectId": project_id,
+                "tool": "PINHOLE"
+            }
         }
+        # 4K/2K 放大使用专用超时，因为返回的 base64 数据量很大
         result = await self._make_request(
             method="POST",
             url=url,
             json_data=json_data,
             use_at=True,
+            at_token=at,
+            timeout=config.upsample_timeout
         )
+        # 返回 base64 编码的图片
+        return result.get("encodedImage", "")
     # ========== 视频生成 (使用AT) - 异步返回 ==========
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoText"
+        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
+        max_retries = 3
+        last_error = None
+        for retry_attempt in range(max_retries):
+            # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
+            recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
+            recaptcha_token = recaptcha_token or ""
+            session_id = self._generate_session_id()
+            scene_id = str(uuid.uuid4())
+            json_data = {
+                "clientContext": {
+                    "recaptchaContext": {
+                        "token": recaptcha_token,
+                        "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                    },
+                    "sessionId": session_id,
+                    "projectId": project_id,
+                    "tool": "PINHOLE",
+                    "userPaygateTier": user_paygate_tier
                 },
+                "requests": [{
+                    "aspectRatio": aspect_ratio,
+                    "seed": random.randint(1, 99999),
+                    "textInput": {
+                        "prompt": prompt
+                    },
+                    "videoModelKey": model_key,
+                    "metadata": {
+                        "sceneId": scene_id
+                    }
+                }]
+            }
+            try:
+                result = await self._make_request(
+                    method="POST",
+                    url=url,
+                    json_data=json_data,
+                    use_at=True,
+                    at_token=at
+                )
+                return result
+            except Exception as e:
+                error_str = str(e)
+                last_error = e
+                retry_reason = self._get_retry_reason(error_str)
+                if retry_reason and retry_attempt < max_retries - 1:
+                    debug_logger.log_warning(f"[VIDEO T2V] 生成遇到{retry_reason}，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...")
+                    await self._notify_browser_captcha_error(browser_id)
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    raise e
+        # 所有重试都失败
+        raise last_error
     async def generate_video_reference_images(
         self,
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoReferenceImages"
+        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
+        max_retries = 3
+        last_error = None
+        for retry_attempt in range(max_retries):
+            # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
+            recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
+            recaptcha_token = recaptcha_token or ""
+            session_id = self._generate_session_id()
+            scene_id = str(uuid.uuid4())
+            json_data = {
+                "clientContext": {
+                    "recaptchaContext": {
+                        "token": recaptcha_token,
+                        "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                    },
+                    "sessionId": session_id,
+                    "projectId": project_id,
+                    "tool": "PINHOLE",
+                    "userPaygateTier": user_paygate_tier
                 },
+                "requests": [{
+                    "aspectRatio": aspect_ratio,
+                    "seed": random.randint(1, 99999),
+                    "textInput": {
+                        "prompt": prompt
+                    },
+                    "videoModelKey": model_key,
+                    "referenceImages": reference_images,
+                    "metadata": {
+                        "sceneId": scene_id
+                    }
+                }]
+            }
+            try:
+                result = await self._make_request(
+                    method="POST",
+                    url=url,
+                    json_data=json_data,
+                    use_at=True,
+                    at_token=at
+                )
+                return result
+            except Exception as e:
+                error_str = str(e)
+                last_error = e
+                retry_reason = self._get_retry_reason(error_str)
+                if retry_reason and retry_attempt < max_retries - 1:
+                    debug_logger.log_warning(f"[VIDEO R2V] 生成遇到{retry_reason}，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...")
+                    await self._notify_browser_captcha_error(browser_id)
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    raise e
+        # 所有重试都失败
+        raise last_error
     async def generate_video_start_end(
         self,
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoStartAndEndImage"
+        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
+        max_retries = 3
+        last_error = None
+        for retry_attempt in range(max_retries):
+            # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
+            recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
+            recaptcha_token = recaptcha_token or ""
+            session_id = self._generate_session_id()
+            scene_id = str(uuid.uuid4())
+            json_data = {
+                "clientContext": {
+                    "recaptchaContext": {
+                        "token": recaptcha_token,
+                        "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                    },
+                    "sessionId": session_id,
+                    "projectId": project_id,
+                    "tool": "PINHOLE",
+                    "userPaygateTier": user_paygate_tier
                 },
+                "requests": [{
+                    "aspectRatio": aspect_ratio,
+                    "seed": random.randint(1, 99999),
+                    "textInput": {
+                        "prompt": prompt
+                    },
+                    "videoModelKey": model_key,
+                    "startImage": {
+                        "mediaId": start_media_id
+                    },
+                    "endImage": {
+                        "mediaId": end_media_id
+                    },
+                    "metadata": {
+                        "sceneId": scene_id
+                    }
+                }]
+            }
+            try:
+                result = await self._make_request(
+                    method="POST",
+                    url=url,
+                    json_data=json_data,
+                    use_at=True,
+                    at_token=at
+                )
+                return result
+            except Exception as e:
+                error_str = str(e)
+                last_error = e
+                retry_reason = self._get_retry_reason(error_str)
+                if retry_reason and retry_attempt < max_retries - 1:
+                    debug_logger.log_warning(f"[VIDEO I2V] 首尾帧生成遇到{retry_reason}，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...")
+                    await self._notify_browser_captcha_error(browser_id)
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    raise e
+        # 所有重试都失败
+        raise last_error
     async def generate_video_start_image(
         self,
         """
         url = f"{self.api_base_url}/video:batchAsyncGenerateVideoStartImage"
+        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
+        max_retries = 3
+        last_error = None
+        for retry_attempt in range(max_retries):
+            # 每次重试都重新获取 reCAPTCHA token - 视频使用 VIDEO_GENERATION action
+            recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
+            recaptcha_token = recaptcha_token or ""
+            session_id = self._generate_session_id()
+            scene_id = str(uuid.uuid4())
+            json_data = {
+                "clientContext": {
+                    "recaptchaContext": {
+                        "token": recaptcha_token,
+                        "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                    },
+                    "sessionId": session_id,
+                    "projectId": project_id,
+                    "tool": "PINHOLE",
+                    "userPaygateTier": user_paygate_tier
                 },
+                "requests": [{
+                    "aspectRatio": aspect_ratio,
+                    "seed": random.randint(1, 99999),
+                    "textInput": {
+                        "prompt": prompt
+                    },
+                    "videoModelKey": model_key,
+                    "startImage": {
+                        "mediaId": start_media_id
+                    },
+                    # 注意: 没有endImage字段,只用首帧
+                    "metadata": {
+                        "sceneId": scene_id
+                    }
+                }]
+            }
+            try:
+                result = await self._make_request(
+                    method="POST",
+                    url=url,
+                    json_data=json_data,
+                    use_at=True,
+                    at_token=at
+                )
+                return result
+            except Exception as e:
+                error_str = str(e)
+                last_error = e
+                retry_reason = self._get_retry_reason(error_str)
+                if retry_reason and retry_attempt < max_retries - 1:
+                    debug_logger.log_warning(f"[VIDEO I2V] 首帧生成遇到{retry_reason}，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...")
+                    await self._notify_browser_captcha_error(browser_id)
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    raise e
+        # 所有重试都失败
+        raise last_error
+    # ========== 视频放大 (Video Upsampler) ==========
+    async def upsample_video(
+        self,
+        at: str,
+        project_id: str,
+        video_media_id: str,
+        aspect_ratio: str,
+        resolution: str,
+        model_key: str
+    ) -> dict:
+        """视频放大到 4K/1080P，返回 task_id
+        Args:
+            at: Access Token
+            project_id: 项目ID
+            video_media_id: 视频的 mediaId
+            aspect_ratio: 视频宽高比 VIDEO_ASPECT_RATIO_PORTRAIT/LANDSCAPE
+            resolution: VIDEO_RESOLUTION_4K 或 VIDEO_RESOLUTION_1080P
+            model_key: veo_3_1_upsampler_4k 或 veo_3_1_upsampler_1080p
+        Returns:
+            同 generate_video_text
+        """
+        url = f"{self.api_base_url}/video:batchAsyncUpsampleVideo"
+        # 403/reCAPTCHA 重试逻辑 - 最多重试3次
+        max_retries = 3
+        last_error = None
+        for retry_attempt in range(max_retries):
+            recaptcha_token, browser_id = await self._get_recaptcha_token(project_id, action="VIDEO_GENERATION")
+            recaptcha_token = recaptcha_token or ""
+            session_id = self._generate_session_id()
+            scene_id = str(uuid.uuid4())
+            json_data = {
+                "requests": [{
+                    "aspectRatio": aspect_ratio,
+                    "resolution": resolution,
+                    "seed": random.randint(1, 99999),
+                    "videoInput": {
+                        "mediaId": video_media_id
+                    },
+                    "videoModelKey": model_key,
+                    "metadata": {
+                        "sceneId": scene_id
+                    }
+                }],
+                "clientContext": {
+                    "recaptchaContext": {
+                        "token": recaptcha_token,
+                        "applicationType": "RECAPTCHA_APPLICATION_TYPE_WEB"
+                    },
+                    "sessionId": session_id
+                }
+            }
+            try:
+                result = await self._make_request(
+                    method="POST",
+                    url=url,
+                    json_data=json_data,
+                    use_at=True,
+                    at_token=at
+                )
+                return result
+            except Exception as e:
+                error_str = str(e)
+                last_error = e
+                retry_reason = self._get_retry_reason(error_str)
+                if retry_reason and retry_attempt < max_retries - 1:
+                    debug_logger.log_warning(f"[VIDEO UPSAMPLE] 放大遇到{retry_reason}，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...")
+                    await self._notify_browser_captcha_error(browser_id)
+                    await asyncio.sleep(1)
+                    continue
+                else:
+                    raise e
+        raise last_error
     # ========== 任务轮询 (使用AT) ==========
     # ========== 辅助方法 ==========
+    def _get_retry_reason(self, error_str: str) -> Optional[str]:
+        """判断是否需要重试，返回日志提示内容"""
+        error_lower = error_str.lower()
+        if "403" in error_lower:
+            return "403错误"
+        if "recaptcha evaluation failed" in error_lower:
+            return "reCAPTCHA 验证失败"
+        if "recaptcha" in error_lower:
+            return "reCAPTCHA 错误"
+        return None
+    async def _notify_browser_captcha_error(self, browser_id: int = None):
+        """通知有头浏览器打码切换指纹（仅当使用 browser 打码方式时）
+        Args:
+            browser_id: 要标记为 bad 的浏览器 ID
+        """
+        if config.captcha_method == "browser":
+            try:
+                from .browser_captcha import BrowserCaptchaService
+                service = await BrowserCaptchaService.get_instance(self.db)
+                await service.report_error(browser_id)
+            except Exception:
+                pass
     def _generate_session_id(self) -> str:
         """生成sessionId: ;timestamp"""
         return f";{int(time.time() * 1000)}"
         """生成sceneId: UUID"""
         return str(uuid.uuid4())
+    async def _get_recaptcha_token(self, project_id: str, action: str = "IMAGE_GENERATION") -> tuple[Optional[str], Optional[int]]:
+        """获取reCAPTCHA token - 支持多种打码方式
+        Args:
+            project_id: 项目ID
+            action: reCAPTCHA action类型
+                - IMAGE_GENERATION: 图片生成 (默认)
+                - VIDEO_GENERATION: 视频生成和2K/4K图片放大
+        Returns:
+            (token, browser_id) 元组，browser_id 用于失败时调用 report_error
+            对于非 browser 打码方式，browser_id 为 None
+        """
         captcha_method = config.captcha_method
         # 恒定浏览器打码
             try:
                 from .browser_captcha_personal import BrowserCaptchaService
                 service = await BrowserCaptchaService.get_instance(self.db)
+                return await service.get_token(project_id, action), None
             except Exception as e:
                 debug_logger.log_error(f"[reCAPTCHA Browser] error: {str(e)}")
+                return None, None
+        # 有头浏览器打码
         elif captcha_method == "browser":
             try:
                 from .browser_captcha import BrowserCaptchaService
                 service = await BrowserCaptchaService.get_instance(self.db)
+                return await service.get_token(project_id, action)
             except Exception as e:
                 debug_logger.log_error(f"[reCAPTCHA Browser] error: {str(e)}")
+                return None, None
         # API打码服务
         elif captcha_method in ["yescaptcha", "capmonster", "ezcaptcha", "capsolver"]:
+            token = await self._get_api_captcha_token(captcha_method, project_id)
+            return token, None
         else:
+            debug_logger.log_info(f"[reCAPTCHA] 未知的打码方式: {captcha_method}")
+            return None, None
     async def _get_api_captcha_token(self, method: str, project_id: str) -> Optional[str]:
         """通用API打码服务"""
         elif method == "capmonster":
             client_key = config.capmonster_api_key
             base_url = config.capmonster_base_url
+            task_type = "RecaptchaV3TaskProxyless"
         elif method == "ezcaptcha":
             client_key = config.ezcaptcha_api_key
             base_url = config.ezcaptcha_base_url
+            task_type = "ReCaptchaV3TaskProxyless"
         elif method == "capsolver":
             client_key = config.capsolver_api_key
             base_url = config.capsolver_base_url

src/services/generation_handler.py CHANGED Viewed

@@ -35,6 +35,85 @@ MODEL_CONFIG = {
         "model_name": "GEM_PIX_2",
         "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT"
     },
     # 图片生成 - IMAGEN_3_5 (Imagen 4.0)
     "imagen-4.0-generate-preview-landscape": {
@@ -102,25 +181,39 @@ MODEL_CONFIG = {
         "supports_images": False
     },
-    # veo_3_1_t2v_fast_portrait_ultra (竖屏)
-    "veo_3_1_t2v_fast_portrait_ultra": {
         "type": "video",
         "video_type": "t2v",
         "model_key": "veo_3_1_t2v_fast_portrait_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": False
     },
-    # veo_3_1_t2v_fast_portrait_ultra_relaxed (竖屏)
-    "veo_3_1_t2v_fast_portrait_ultra_relaxed": {
         "type": "video",
         "video_type": "t2v",
         "model_key": "veo_3_1_t2v_fast_portrait_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": False
     },
-    # veo_3_1_t2v_portrait (竖屏)
     "veo_3_1_t2v_portrait": {
         "type": "video",
         "video_type": "t2v",
@@ -128,6 +221,13 @@ MODEL_CONFIG = {
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": False
     },
     # ========== 首尾帧模型 (I2V - Image to Video) ==========
     # 支持1-2张图片：1张作为首帧，2张作为首尾帧
@@ -192,11 +292,11 @@ MODEL_CONFIG = {
         "max_images": 2
     },
-    # veo_3_1_i2v_s_fast_ultra (需要新增横竖屏)
     "veo_3_1_i2v_s_fast_ultra_portrait": {
         "type": "video",
         "video_type": "i2v",
-        "model_key": "veo_3_1_i2v_s_fast_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 1,
@@ -205,7 +305,7 @@ MODEL_CONFIG = {
     "veo_3_1_i2v_s_fast_ultra_landscape": {
         "type": "video",
         "video_type": "i2v",
-        "model_key": "veo_3_1_i2v_s_fast_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 1,
@@ -255,64 +355,223 @@ MODEL_CONFIG = {
     # ========== 多图生成 (R2V - Reference Images to Video) ==========
     # 支持多张图片,不限制数量
-    # veo_3_0_r2v_fast (需要新增横竖屏)
-    "veo_3_0_r2v_fast_portrait": {
         "type": "video",
         "video_type": "r2v",
-        "model_key": "veo_3_0_r2v_fast_portrait_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
-    "veo_3_0_r2v_fast_landscape": {
         "type": "video",
         "video_type": "r2v",
-        "model_key": "veo_3_0_r2v_fast_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
-    # veo_3_0_r2v_fast_ultra (需要新增横竖屏)
-    "veo_3_0_r2v_fast_ultra_portrait": {
         "type": "video",
         "video_type": "r2v",
-        "model_key": "veo_3_0_r2v_fast_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
-    "veo_3_0_r2v_fast_ultra_landscape": {
         "type": "video",
         "video_type": "r2v",
-        "model_key": "veo_3_0_r2v_fast_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
-    # veo_3_0_r2v_fast_ultra_relaxed (需要新增横竖屏)
-    "veo_3_0_r2v_fast_ultra_relaxed_portrait": {
         "type": "video",
         "video_type": "r2v",
-        "model_key": "veo_3_0_r2v_fast_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
-    "veo_3_0_r2v_fast_ultra_relaxed_landscape": {
         "type": "video",
         "video_type": "r2v",
-        "model_key": "veo_3_0_r2v_fast_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     }
 }
@@ -572,13 +831,101 @@ class GenerationHandler:
                 image_inputs=image_inputs
             )
-            # 提取URL
             media = result.get("media", [])
             if not media:
                 yield self._create_error_response("生成结果为空")
                 return
             image_url = media[0]["image"]["generatedImage"]["fifeUrl"]
             # 缓存图片 (如果启用)
             local_url = image_url
@@ -835,7 +1182,10 @@ class GenerationHandler:
             if stream:
                 yield self._create_stream_chunk(f"视频生成中...\n")
-            async for chunk in self._poll_video_result(token, operations, stream):
                 yield chunk
         finally:
@@ -846,13 +1196,23 @@ class GenerationHandler:
     async def _poll_video_result(
         self,
         token,
         operations: List[Dict],
-        stream: bool
     ) -> AsyncGenerator:
-        """轮询视频生成结果"""
         max_attempts = config.max_poll_attempts
         poll_interval = config.poll_interval
         for attempt in range(max_attempts):
             await asyncio.sleep(poll_interval)
@@ -879,11 +1239,49 @@ class GenerationHandler:
                     metadata = operation["operation"].get("metadata", {})
                     video_info = metadata.get("video", {})
                     video_url = video_info.get("fifeUrl")
                     if not video_url:
                         yield self._create_error_response("视频URL为空")
                         return
                     # 缓存视频 (如果启用)
                     local_url = video_url
                     if config.cache_enabled:

         "model_name": "GEM_PIX_2",
         "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT"
     },
+    "gemini-3.0-pro-image-square": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_SQUARE"
+    },
+    "gemini-3.0-pro-image-four-three": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_LANDSCAPE_FOUR_THREE"
+    },
+    "gemini-3.0-pro-image-three-four": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT_THREE_FOUR"
+    },
+    # 图片生成 - GEM_PIX_2 (Gemini 3.0 Pro) 2K 放大版
+    "gemini-3.0-pro-image-landscape-2k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_LANDSCAPE",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_2K"
+    },
+    "gemini-3.0-pro-image-portrait-2k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_2K"
+    },
+    "gemini-3.0-pro-image-square-2k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_SQUARE",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_2K"
+    },
+    "gemini-3.0-pro-image-four-three-2k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_LANDSCAPE_FOUR_THREE",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_2K"
+    },
+    "gemini-3.0-pro-image-three-four-2k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT_THREE_FOUR",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_2K"
+    },
+    # 图片生成 - GEM_PIX_2 (Gemini 3.0 Pro) 4K 放大版
+    "gemini-3.0-pro-image-landscape-4k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_LANDSCAPE",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_4K"
+    },
+    "gemini-3.0-pro-image-portrait-4k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_4K"
+    },
+    "gemini-3.0-pro-image-square-4k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_SQUARE",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_4K"
+    },
+    "gemini-3.0-pro-image-four-three-4k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_LANDSCAPE_FOUR_THREE",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_4K"
+    },
+    "gemini-3.0-pro-image-three-four-4k": {
+        "type": "image",
+        "model_name": "GEM_PIX_2",
+        "aspect_ratio": "IMAGE_ASPECT_RATIO_PORTRAIT_THREE_FOUR",
+        "upsample": "UPSAMPLE_IMAGE_RESOLUTION_4K"
+    },
     # 图片生成 - IMAGEN_3_5 (Imagen 4.0)
     "imagen-4.0-generate-preview-landscape": {
         "supports_images": False
     },
+    # veo_3_1_t2v_fast_ultra (横竖屏)
+    "veo_3_1_t2v_fast_ultra_portrait": {
         "type": "video",
         "video_type": "t2v",
         "model_key": "veo_3_1_t2v_fast_portrait_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": False
     },
+    "veo_3_1_t2v_fast_ultra_landscape": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False
+    },
+    # veo_3_1_t2v_fast_ultra_relaxed (横竖屏)
+    "veo_3_1_t2v_fast_ultra_relaxed_portrait": {
         "type": "video",
         "video_type": "t2v",
         "model_key": "veo_3_1_t2v_fast_portrait_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": False
     },
+    "veo_3_1_t2v_fast_ultra_relaxed_landscape": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_ultra_relaxed",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False
+    },
+    # veo_3_1_t2v (横竖屏)
     "veo_3_1_t2v_portrait": {
         "type": "video",
         "video_type": "t2v",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": False
     },
+    "veo_3_1_t2v_landscape": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False
+    },
     # ========== 首尾帧模型 (I2V - Image to Video) ==========
     # 支持1-2张图片：1张作为首帧，2张作为首尾帧
         "max_images": 2
     },
+    # veo_3_1_i2v_s_fast_ultra (横竖屏)
     "veo_3_1_i2v_s_fast_ultra_portrait": {
         "type": "video",
         "video_type": "i2v",
+        "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 1,
     "veo_3_1_i2v_s_fast_ultra_landscape": {
         "type": "video",
         "video_type": "i2v",
+        "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 1,
     # ========== 多图生成 (R2V - Reference Images to Video) ==========
     # 支持多张图片,不限制数量
+    # veo_3_1_r2v_fast (横竖屏)
+    "veo_3_1_r2v_fast_portrait": {
         "type": "video",
         "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_portrait_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
+    "veo_3_1_r2v_fast_landscape": {
         "type": "video",
         "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_landscape_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
+    # veo_3_1_r2v_fast_ultra (横竖屏)
+    "veo_3_1_r2v_fast_ultra_portrait": {
         "type": "video",
         "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_portrait_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
+    "veo_3_1_r2v_fast_ultra_landscape": {
         "type": "video",
         "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_landscape_ultra",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
+    # veo_3_1_r2v_fast_ultra_relaxed (横竖屏)
+    "veo_3_1_r2v_fast_ultra_relaxed_portrait": {
         "type": "video",
         "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_portrait_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
     },
+    "veo_3_1_r2v_fast_ultra_relaxed_landscape": {
         "type": "video",
         "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_landscape_ultra_relaxed",
         "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
         "supports_images": True,
         "min_images": 0,
         "max_images": None  # 不限制
+    },
+    # ========== 视频放大 (Video Upsampler) ==========
+    # 仅 3.1 支持，需要先生成视频后再放大，可能需要 30 分钟
+    # T2V 4K 放大版
+    "veo_3_1_t2v_fast_portrait_4k": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_portrait",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    "veo_3_1_t2v_fast_landscape_4k": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    "veo_3_1_t2v_fast_ultra_portrait_4k": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_portrait_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    "veo_3_1_t2v_fast_ultra_landscape_4k": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    # T2V 1080P 放大版
+    "veo_3_1_t2v_fast_portrait_1080p": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_portrait",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    "veo_3_1_t2v_fast_landscape_1080p": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    "veo_3_1_t2v_fast_ultra_portrait_1080p": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_portrait_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    "veo_3_1_t2v_fast_ultra_landscape_1080p": {
+        "type": "video",
+        "video_type": "t2v",
+        "model_key": "veo_3_1_t2v_fast_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": False,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    # I2V 4K 放大版
+    "veo_3_1_i2v_s_fast_ultra_portrait_4k": {
+        "type": "video",
+        "video_type": "i2v",
+        "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": True,
+        "min_images": 1,
+        "max_images": 2,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    "veo_3_1_i2v_s_fast_ultra_landscape_4k": {
+        "type": "video",
+        "video_type": "i2v",
+        "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": True,
+        "min_images": 1,
+        "max_images": 2,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    # I2V 1080P 放大版
+    "veo_3_1_i2v_s_fast_ultra_portrait_1080p": {
+        "type": "video",
+        "video_type": "i2v",
+        "model_key": "veo_3_1_i2v_s_fast_portrait_ultra_fl",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": True,
+        "min_images": 1,
+        "max_images": 2,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    "veo_3_1_i2v_s_fast_ultra_landscape_1080p": {
+        "type": "video",
+        "video_type": "i2v",
+        "model_key": "veo_3_1_i2v_s_fast_ultra_fl",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": True,
+        "min_images": 1,
+        "max_images": 2,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    # R2V 4K 放大版
+    "veo_3_1_r2v_fast_ultra_portrait_4k": {
+        "type": "video",
+        "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_portrait_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": True,
+        "min_images": 0,
+        "max_images": None,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    "veo_3_1_r2v_fast_ultra_landscape_4k": {
+        "type": "video",
+        "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_landscape_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": True,
+        "min_images": 0,
+        "max_images": None,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+    },
+    # R2V 1080P 放大版
+    "veo_3_1_r2v_fast_ultra_portrait_1080p": {
+        "type": "video",
+        "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_portrait_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_PORTRAIT",
+        "supports_images": True,
+        "min_images": 0,
+        "max_images": None,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
+    },
+    "veo_3_1_r2v_fast_ultra_landscape_1080p": {
+        "type": "video",
+        "video_type": "r2v",
+        "model_key": "veo_3_1_r2v_fast_landscape_ultra",
+        "aspect_ratio": "VIDEO_ASPECT_RATIO_LANDSCAPE",
+        "supports_images": True,
+        "min_images": 0,
+        "max_images": None,
+        "upsample": {"resolution": "VIDEO_RESOLUTION_1080P", "model_key": "veo_3_1_upsampler_1080p"}
     }
 }
                 image_inputs=image_inputs
             )
+            # 提取URL和mediaId
             media = result.get("media", [])
             if not media:
                 yield self._create_error_response("生成结果为空")
                 return
             image_url = media[0]["image"]["generatedImage"]["fifeUrl"]
+            media_id = media[0].get("name")  # 用于 upsample
+            # 检查是否需要 upsample
+            upsample_resolution = model_config.get("upsample")
+            if upsample_resolution and media_id:
+                resolution_name = "4K" if "4K" in upsample_resolution else "2K"
+                if stream:
+                    yield self._create_stream_chunk(f"正在放大图片到 {resolution_name}...\n")
+                # 4K/2K 图片重试逻辑 - 最多重试3次
+                max_retries = 3
+                for retry_attempt in range(max_retries):
+                    try:
+                        # 调用 upsample API
+                        encoded_image = await self.flow_client.upsample_image(
+                            at=token.at,
+                            project_id=project_id,
+                            media_id=media_id,
+                            target_resolution=upsample_resolution
+                        )
+                        if encoded_image:
+                            debug_logger.log_info(f"[UPSAMPLE] 图片已放大到 {resolution_name}")
+                            if stream:
+                                yield self._create_stream_chunk(f"✅ 图片已放大到 {resolution_name}\n")
+                            # 缓存放大后的图片 (如果启用)
+                            # 日志统一记录原图URL (放大后的base64数据太大，不适合存储)
+                            self._last_generated_url = image_url
+                            if config.cache_enabled:
+                                try:
+                                    if stream:
+                                        yield self._create_stream_chunk(f"缓存 {resolution_name} 图片中...\n")
+                                    cached_filename = await self.file_cache.cache_base64_image(encoded_image, resolution_name)
+                                    local_url = f"{self._get_base_url()}/tmp/{cached_filename}"
+                                    if stream:
+                                        yield self._create_stream_chunk(f"✅ {resolution_name} 图片缓存成功\n")
+                                        yield self._create_stream_chunk(
+                                            f"![Generated Image]({local_url})",
+                                            finish_reason="stop"
+                                        )
+                                    else:
+                                        yield self._create_completion_response(
+                                            local_url,
+                                            media_type="image"
+                                        )
+                                    return
+                                except Exception as e:
+                                    debug_logger.log_error(f"Failed to cache {resolution_name} image: {str(e)}")
+                                    if stream:
+                                        yield self._create_stream_chunk(f"⚠️ 缓存失败: {str(e)}，返回 base64...\n")
+                            # 缓存未启用或缓存失败，返回 base64 格式
+                            base64_url = f"data:image/jpeg;base64,{encoded_image}"
+                            if stream:
+                                yield self._create_stream_chunk(
+                                    f"![Generated Image]({base64_url})",
+                                    finish_reason="stop"
+                                )
+                            else:
+                                yield self._create_completion_response(
+                                    base64_url,
+                                    media_type="image"
+                                )
+                            return
+                        else:
+                            debug_logger.log_warning("[UPSAMPLE] 返回结果为空")
+                            if stream:
+                                yield self._create_stream_chunk(f"⚠️ 放大失败，返回原图...\n")
+                            break  # 空结果不重试
+                    except Exception as e:
+                        error_str = str(e)
+                        debug_logger.log_error(f"[UPSAMPLE] 放大失败 (尝试 {retry_attempt + 1}/{max_retries}): {error_str}")
+                        # 检查是否是403错误，需要重试
+                        if "403" in error_str and retry_attempt < max_retries - 1:
+                            if stream:
+                                yield self._create_stream_chunk(f"⚠️ 放大遇到403错误，正在重新获取验证码重试 ({retry_attempt + 2}/{max_retries})...\n")
+                            # 等待一小段时间后重试
+                            await asyncio.sleep(1)
+                            continue
+                        else:
+                            if stream:
+                                yield self._create_stream_chunk(f"⚠️ 放大失败: {error_str}，返回原图...\n")
+                            break
             # 缓存图片 (如果启用)
             local_url = image_url
             if stream:
                 yield self._create_stream_chunk(f"视频生成中...\n")
+            # 检查是否需要放大
+            upsample_config = model_config.get("upsample")
+            async for chunk in self._poll_video_result(token, project_id, operations, stream, upsample_config):
                 yield chunk
         finally:
     async def _poll_video_result(
         self,
         token,
+        project_id: str,
         operations: List[Dict],
+        stream: bool,
+        upsample_config: Optional[Dict] = None
     ) -> AsyncGenerator:
+        """轮询视频生成结果
+        Args:
+            upsample_config: 放大配置 {"resolution": "VIDEO_RESOLUTION_4K", "model_key": "veo_3_1_upsampler_4k"}
+        """
         max_attempts = config.max_poll_attempts
         poll_interval = config.poll_interval
+        # 如果需要放大，轮询次数加倍（放大可能需要 30 分钟）
+        if upsample_config:
+            max_attempts = max_attempts * 3  # 放大需要更长时间
         for attempt in range(max_attempts):
             await asyncio.sleep(poll_interval)
                     metadata = operation["operation"].get("metadata", {})
                     video_info = metadata.get("video", {})
                     video_url = video_info.get("fifeUrl")
+                    video_media_id = video_info.get("mediaGenerationId")
+                    aspect_ratio = video_info.get("aspectRatio", "VIDEO_ASPECT_RATIO_LANDSCAPE")
                     if not video_url:
                         yield self._create_error_response("视频URL为空")
                         return
+                    # ========== 视频放大处理 ==========
+                    if upsample_config and video_media_id:
+                        if stream:
+                            resolution_name = "4K" if "4K" in upsample_config["resolution"] else "1080P"
+                            yield self._create_stream_chunk(f"\n视频生成完成，开始 {resolution_name} 放大处理...（可能需要 30 分钟）\n")
+                        try:
+                            # 提交放大任务
+                            upsample_result = await self.flow_client.upsample_video(
+                                at=token.at,
+                                project_id=project_id,
+                                video_media_id=video_media_id,
+                                aspect_ratio=aspect_ratio,
+                                resolution=upsample_config["resolution"],
+                                model_key=upsample_config["model_key"]
+                            )
+                            upsample_operations = upsample_result.get("operations", [])
+                            if upsample_operations:
+                                if stream:
+                                    yield self._create_stream_chunk("放大任务已提交，继续轮询...\n")
+                                # 递归轮询放大结果（不再放大）
+                                async for chunk in self._poll_video_result(
+                                    token, project_id, upsample_operations, stream, None
+                                ):
+                                    yield chunk
+                                return
+                            else:
+                                if stream:
+                                    yield self._create_stream_chunk("⚠️ 放大任务创建失败，返回原始视频\n")
+                        except Exception as e:
+                            debug_logger.log_error(f"Video upsample failed: {str(e)}")
+                            if stream:
+                                yield self._create_stream_chunk(f"⚠️ 放大失败: {str(e)}，返回原始视频\n")
                     # 缓存视频 (如果启用)
                     local_url = video_url
                     if config.cache_enabled:

static/manage.html CHANGED Viewed

@@ -156,9 +156,9 @@
         <div id="panelSettings" class="hidden">
             <div class="grid gap-6 lg:grid-cols-2">
                 <!-- 安全配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">安全配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="text-sm font-medium mb-2 block">管理员用户名</label>
                             <input id="cfgAdminUsername" type="text" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm">
@@ -172,14 +172,14 @@
                             <label class="text-sm font-medium mb-2 block">新密码</label>
                             <input id="cfgNewPassword" type="password" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="输入新密码">
                         </div>
-                        <button onclick="updateAdminPassword()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">修改密码</button>
                     </div>
                 </div>
                 <!-- API 密钥配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">API 密钥配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="text-sm font-medium mb-2 block">当前 API Key</label>
                             <input id="cfgCurrentAPIKey" type="text" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" readonly disabled>
@@ -190,14 +190,14 @@
                             <input id="cfgNewAPIKey" type="text" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="输入新的 API Key">
                             <p class="text-xs text-muted-foreground mt-1">用于客户端调用 API 的密钥</p>
                         </div>
-                        <button onclick="updateAPIKey()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">更新 API Key</button>
                     </div>
                 </div>
                 <!-- 代理配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">代理配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="inline-flex items-center gap-2 cursor-pointer">
                                 <input type="checkbox" id="cfgProxyEnabled" class="h-4 w-4 rounded border-input">
@@ -209,27 +209,45 @@
                             <input id="cfgProxyUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="http://127.0.0.1:7890 或 socks5://127.0.0.1:1080">
                             <p class="text-xs text-muted-foreground mt-1">支持 HTTP 和 SOCKS5 代理</p>
                         </div>
-                        <button onclick="saveProxyConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">保存配置</button>
                     </div>
                 </div>
                 <!-- 错误处理配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">错误处理配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="text-sm font-medium mb-2 block">错误封禁阈值</label>
                             <input id="cfgErrorBan" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="3">
                             <p class="text-xs text-muted-foreground mt-1">Token 连续错误达到此次数后自动禁用</p>
                         </div>
-                        <button onclick="saveAdminConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">保存配置</button>
                     </div>
                 </div>
                 <!-- 缓存配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">缓存配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="inline-flex items-center gap-2 cursor-pointer">
                                 <input type="checkbox" id="cfgCacheEnabled" class="h-4 w-4 rounded border-input" onchange="toggleCacheOptions()">
@@ -256,15 +274,51 @@
                                 </p>
                             </div>
                         </div>
-                        <button onclick="saveCacheConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">保存配置</button>
                     </div>
                 </div>
                 <!-- 验证码配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">验证码配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="text-sm font-medium mb-2 block">打码方式</label>
                             <select id="cfgCaptchaMethod" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" onchange="toggleCaptchaOptions()">
@@ -272,7 +326,7 @@
                                 <option value="capmonster">CapMonster打码</option>
                                 <option value="ezcaptcha">EzCaptcha打码</option>
                                 <option value="capsolver">CapSolver打码</option>
-                                <option value="browser">无头浏览器打码</option>
                                 <option value="personal">内置浏览器打码</option>
                             </select>
                             <p class="text-xs text-muted-foreground mt-1">选择验证码获取方式</p>
@@ -347,7 +401,7 @@
                                     <input type="checkbox" id="cfgBrowserProxyEnabled" class="h-4 w-4 rounded border-input" onchange="toggleBrowserProxyInput()">
                                     <span class="text-sm font-medium">启用代理</span>
                                 </label>
-                                <p class="text-xs text-muted-foreground mt-2">为无头浏览器配置独立代理</p>
                             </div>
                             <div id="browserProxyUrlInput" class="hidden">
@@ -358,71 +412,21 @@
                                     示例：<code class="bg-muted px-1 py-0.5 rounded">http://user:pass@proxy.com:8080</code> 或 <code class="bg-muted px-1 py-0.5 rounded">socks5://proxy.com:1080</code>
                                 </p>
                             </div>
-                        </div>
-                        <button onclick="saveCaptchaConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">保存配置</button>
-                    </div>
-                </div>
-                <!-- 插件连接配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
-                    <h3 class="text-lg font-semibold mb-4">插件连接配置</h3>
-                    <div class="space-y-4">
-                        <div>
-                            <label class="text-sm font-semibold mb-2 block">连接接口</label>
-                            <div class="flex gap-2">
-                                <input id="cfgPluginConnectionUrl" type="text" readonly class="flex h-9 flex-1 rounded-md border border-input bg-muted px-3 py-2 text-sm" placeholder="加载中...">
-                                <button onclick="copyConnectionUrl()" class="inline-flex items-center justify-center rounded-md bg-secondary text-secondary-foreground hover:bg-secondary/80 h-9 px-4">复制</button>
-                            </div>
-                            <p class="text-xs text-muted-foreground mt-1">Chrome扩展插件需要配置此接口地址</p>
-                        </div>
-                        <div>
-                            <label class="text-sm font-semibold mb-2 block">连接Token</label>
-                            <div class="flex gap-2">
-                                <input id="cfgPluginConnectionToken" type="text" class="flex h-9 flex-1 rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="留空自动生成">
-                                <button onclick="generateRandomToken()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4">随机</button>
-                                <button onclick="copyConnectionToken()" class="inline-flex items-center justify-center rounded-md bg-secondary text-secondary-foreground hover:bg-secondary/80 h-9 px-4">复制</button>
                             </div>
-                            <p class="text-xs text-muted-foreground mt-1">用于验证Chrome扩展插件的身份，留空将自动生成随机token</p>
-                        </div>
-                        <div>
-                            <label class="inline-flex items-center gap-2 cursor-pointer">
-                                <input type="checkbox" id="cfgAutoEnableOnUpdate" class="h-4 w-4 rounded border-input">
-                                <span class="text-sm font-medium">更新token时自动启用</span>
-                            </label>
-                            <p class="text-xs text-muted-foreground mt-2">当插件更新token时，如果该token被禁用，则自动启用它</p>
-                        </div>
-                        <div class="rounded-md bg-blue-50 dark:bg-blue-900/20 p-3 border border-blue-200 dark:border-blue-800">
-                            <p class="text-xs text-blue-800 dark:text-blue-200">
-                                ℹ️ <strong>使用说明：</strong>安装Chrome扩展后，将连接接口和Token配置到插件中，插件会自动提取Google Labs的cookie并更新到系统
-                            </p>
-                        </div>
-                        <button onclick="savePluginConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">保存配置</button>
-                    </div>
-                </div>
-                <!-- 生成超时配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
-                    <h3 class="text-lg font-semibold mb-4">生成超时配置</h3>
-                    <div class="space-y-4">
-                        <div>
-                            <label class="text-sm font-medium mb-2 block">图片生成超时时间（秒）</label>
-                            <input id="cfgImageTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="300" min="60" max="3600">
-                            <p class="text-xs text-muted-foreground mt-1">图片生成超时时间，范围：60-3600 秒（1分钟-1小时），超时后自动释放Token锁</p>
-                        </div>
-                        <div>
-                            <label class="text-sm font-medium mb-2 block">视频生成超时时间（秒）</label>
-                            <input id="cfgVideoTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="1500" min="60" max="7200">
-                            <p class="text-xs text-muted-foreground mt-1">视频生成超时时间，范围：60-7200 秒（1分钟-2小时），超时后返回上游API超时错误</p>
                         </div>
-                        <button onclick="saveGenerationTimeout()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full">保存配置</button>
                     </div>
                 </div>
                 <!-- 调试配置 -->
-                <div class="rounded-lg border border-border bg-background p-6">
                     <h3 class="text-lg font-semibold mb-4">调试配置</h3>
-                    <div class="space-y-4">
                         <div>
                             <label class="inline-flex items-center gap-2 cursor-pointer">
                                 <input type="checkbox" id="cfgDebugEnabled" class="h-4 w-4 rounded border-input" onchange="toggleDebugMode()">
@@ -436,6 +440,7 @@
                             </p>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
@@ -746,8 +751,8 @@
         saveGenerationTimeout=async()=>{const imageTimeout=parseInt($('cfgImageTimeout').value)||300,videoTimeout=parseInt($('cfgVideoTimeout').value)||1500;console.log('保存生成超时配置:',{imageTimeout,videoTimeout});if(imageTimeout<60||imageTimeout>3600)return showToast('图片超时时间必须在 60-3600 秒之间','error');if(videoTimeout<60||videoTimeout>7200)return showToast('视频超时时间必须在 60-7200 秒之间','error');try{const r=await apiRequest('/api/generation/timeout',{method:'POST',body:JSON.stringify({image_timeout:imageTimeout,video_timeout:videoTimeout})});if(!r){console.error('保存请求失败');return}const d=await r.json();console.log('保存结果:',d);if(d.success){showToast('生成超时配置保存成功','success');await new Promise(r=>setTimeout(r,200));await loadGenerationTimeout()}else{console.error('保存失败:',d);showToast('保存失败','error')}}catch(e){console.error('保存失败:',e);showToast('保存失败: '+e.message,'error')}},
         toggleCaptchaOptions=()=>{const method=$('cfgCaptchaMethod').value;$('yescaptchaOptions').style.display=method==='yescaptcha'?'block':'none';$('capmonsterOptions').classList.toggle('hidden',method!=='capmonster');$('ezcaptchaOptions').classList.toggle('hidden',method!=='ezcaptcha');$('capsolverOptions').classList.toggle('hidden',method!=='capsolver');$('browserCaptchaOptions').classList.toggle('hidden',method!=='browser')},
         toggleBrowserProxyInput=()=>{const enabled=$('cfgBrowserProxyEnabled').checked;$('browserProxyUrlInput').classList.toggle('hidden',!enabled)},
-        loadCaptchaConfig=async()=>{try{console.log('开始加载验证码配置...');const r=await apiRequest('/api/captcha/config');if(!r){console.error('API请求失败');return}const d=await r.json();console.log('验证码配置数据:',d);$('cfgCaptchaMethod').value=d.captcha_method||'yescaptcha';$('cfgYescaptchaApiKey').value=d.yescaptcha_api_key||'';$('cfgYescaptchaBaseUrl').value=d.yescaptcha_base_url||'https://api.yescaptcha.com';$('cfgCapmonsterApiKey').value=d.capmonster_api_key||'';$('cfgCapmonsterBaseUrl').value=d.capmonster_base_url||'https://api.capmonster.cloud';$('cfgEzcaptchaApiKey').value=d.ezcaptcha_api_key||'';$('cfgEzcaptchaBaseUrl').value=d.ezcaptcha_base_url||'https://api.ez-captcha.com';$('cfgCapsolverApiKey').value=d.capsolver_api_key||'';$('cfgCapsolverBaseUrl').value=d.capsolver_base_url||'https://api.capsolver.com';$('cfgBrowserProxyEnabled').checked=d.browser_proxy_enabled||false;$('cfgBrowserProxyUrl').value=d.browser_proxy_url||'';toggleCaptchaOptions();toggleBrowserProxyInput();console.log('验证码配置加载成功')}catch(e){console.error('加载验证码配置失败:',e);showToast('加载验证码配置失败: '+e.message,'error')}},
-        saveCaptchaConfig=async()=>{const method=$('cfgCaptchaMethod').value,yesApiKey=$('cfgYescaptchaApiKey').value.trim(),yesBaseUrl=$('cfgYescaptchaBaseUrl').value.trim(),capApiKey=$('cfgCapmonsterApiKey').value.trim(),capBaseUrl=$('cfgCapmonsterBaseUrl').value.trim(),ezApiKey=$('cfgEzcaptchaApiKey').value.trim(),ezBaseUrl=$('cfgEzcaptchaBaseUrl').value.trim(),solverApiKey=$('cfgCapsolverApiKey').value.trim(),solverBaseUrl=$('cfgCapsolverBaseUrl').value.trim(),browserProxyEnabled=$('cfgBrowserProxyEnabled').checked,browserProxyUrl=$('cfgBrowserProxyUrl').value.trim();console.log('保存验证码配置:',{method,yesApiKey,yesBaseUrl,capApiKey,capBaseUrl,ezApiKey,ezBaseUrl,solverApiKey,solverBaseUrl,browserProxyEnabled,browserProxyUrl});try{const r=await apiRequest('/api/captcha/config',{method:'POST',body:JSON.stringify({captcha_method:method,yescaptcha_api_key:yesApiKey,yescaptcha_base_url:yesBaseUrl,capmonster_api_key:capApiKey,capmonster_base_url:capBaseUrl,ezcaptcha_api_key:ezApiKey,ezcaptcha_base_url:ezBaseUrl,capsolver_api_key:solverApiKey,capsolver_base_url:solverBaseUrl,browser_proxy_enabled:browserProxyEnabled,browser_proxy_url:browserProxyUrl})});if(!r){console.error('保存请求失败');return}const d=await r.json();console.log('保存结果:',d);if(d.success){showToast('验证码配置保存成功','success');await new Promise(r=>setTimeout(r,200));await loadCaptchaConfig()}else{console.error('保存失败:',d);showToast(d.message||'保存失败','error')}}catch(e){console.error('保存失败:',e);showToast('保存失败: '+e.message,'error')}},
         loadPluginConfig=async()=>{try{const r=await apiRequest('/api/plugin/config');if(!r)return;const d=await r.json();if(d.success&&d.config){$('cfgPluginConnectionUrl').value=d.config.connection_url||'';$('cfgPluginConnectionToken').value=d.config.connection_token||'';$('cfgAutoEnableOnUpdate').checked=d.config.auto_enable_on_update||false}}catch(e){console.error('加载插件配置失败:',e);showToast('加载插件配置失败: '+e.message,'error')}},
         savePluginConfig=async()=>{const token=$('cfgPluginConnectionToken').value.trim();const autoEnable=$('cfgAutoEnableOnUpdate').checked;try{const r=await apiRequest('/api/plugin/config',{method:'POST',body:JSON.stringify({connection_token:token,auto_enable_on_update:autoEnable})});if(!r)return;const d=await r.json();if(d.success){showToast('插件配置保存成功','success');await loadPluginConfig()}else{showToast(d.message||'保存失败','error')}}catch(e){showToast('保存失败: '+e.message,'error')}},
         copyConnectionUrl=()=>{const url=$('cfgPluginConnectionUrl').value;if(!url){showToast('连接接口为空','error');return}navigator.clipboard.writeText(url).then(()=>showToast('连接接口已复制','success')).catch(()=>showToast('复制失败','error'))},

         <div id="panelSettings" class="hidden">
             <div class="grid gap-6 lg:grid-cols-2">
                 <!-- 安全配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">安全配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="text-sm font-medium mb-2 block">管理员用户名</label>
                             <input id="cfgAdminUsername" type="text" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm">
                             <label class="text-sm font-medium mb-2 block">新密码</label>
                             <input id="cfgNewPassword" type="password" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="输入新密码">
                         </div>
                     </div>
+                    <button onclick="updateAdminPassword()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">修改密码</button>
                 </div>
                 <!-- API 密钥配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">API 密钥配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="text-sm font-medium mb-2 block">当前 API Key</label>
                             <input id="cfgCurrentAPIKey" type="text" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" readonly disabled>
                             <input id="cfgNewAPIKey" type="text" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="输入新的 API Key">
                             <p class="text-xs text-muted-foreground mt-1">用于客户端调用 API 的密钥</p>
                         </div>
                     </div>
+                    <button onclick="updateAPIKey()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">更新 API Key</button>
                 </div>
                 <!-- 代理配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">代理配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="inline-flex items-center gap-2 cursor-pointer">
                                 <input type="checkbox" id="cfgProxyEnabled" class="h-4 w-4 rounded border-input">
                             <input id="cfgProxyUrl" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="http://127.0.0.1:7890 或 socks5://127.0.0.1:1080">
                             <p class="text-xs text-muted-foreground mt-1">支持 HTTP 和 SOCKS5 代理</p>
                         </div>
                     </div>
+                    <button onclick="saveProxyConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">保存配置</button>
+                </div>
+                <!-- 生成超时配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
+                    <h3 class="text-lg font-semibold mb-4">生成超时配置</h3>
+                    <div class="space-y-4 flex-1">
+                        <div>
+                            <label class="text-sm font-medium mb-2 block">图片生成超时时间（秒）</label>
+                            <input id="cfgImageTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="300" min="60" max="3600">
+                            <p class="text-xs text-muted-foreground mt-1">图片生成超时时间，范围：60-3600 秒（1分钟-1小时），超时后自动释放Token锁</p>
+                        </div>
+                        <div>
+                            <label class="text-sm font-medium mb-2 block">视频生成超时时间（秒）</label>
+                            <input id="cfgVideoTimeout" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="1500" min="60" max="7200">
+                            <p class="text-xs text-muted-foreground mt-1">视频生成超时时间，范围：60-7200 秒（1分钟-2小时），超时后返回上游API超时错误</p>
+                        </div>
+                    </div>
+                    <button onclick="saveGenerationTimeout()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">保存配置</button>
                 </div>
                 <!-- 错误处理配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">错误处理配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="text-sm font-medium mb-2 block">错误封禁阈值</label>
                             <input id="cfgErrorBan" type="number" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="3">
                             <p class="text-xs text-muted-foreground mt-1">Token 连续错误达到此次数后自动禁用</p>
                         </div>
                     </div>
+                    <button onclick="saveAdminConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">保存配置</button>
                 </div>
                 <!-- 缓存配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">缓存配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="inline-flex items-center gap-2 cursor-pointer">
                                 <input type="checkbox" id="cfgCacheEnabled" class="h-4 w-4 rounded border-input" onchange="toggleCacheOptions()">
                                 </p>
                             </div>
                         </div>
+                    </div>
+                    <button onclick="saveCacheConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">保存配置</button>
+                </div>
+                <!-- 插件连接配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
+                    <h3 class="text-lg font-semibold mb-4">插件连接配置</h3>
+                    <div class="space-y-4 flex-1">
+                        <div>
+                            <label class="text-sm font-semibold mb-2 block">连接接口</label>
+                            <div class="flex gap-2">
+                                <input id="cfgPluginConnectionUrl" type="text" readonly class="flex h-9 flex-1 rounded-md border border-input bg-muted px-3 py-2 text-sm" placeholder="加载中...">
+                                <button onclick="copyConnectionUrl()" class="inline-flex items-center justify-center rounded-md bg-secondary text-secondary-foreground hover:bg-secondary/80 h-9 px-4">复制</button>
+                            </div>
+                            <p class="text-xs text-muted-foreground mt-1">Chrome扩展插件需要配置此接口地址</p>
+                        </div>
+                        <div>
+                            <label class="text-sm font-semibold mb-2 block">连接Token</label>
+                            <div class="flex gap-2">
+                                <input id="cfgPluginConnectionToken" type="text" class="flex h-9 flex-1 rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="留空自动生成">
+                                <button onclick="generateRandomToken()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4">随机</button>
+                                <button onclick="copyConnectionToken()" class="inline-flex items-center justify-center rounded-md bg-secondary text-secondary-foreground hover:bg-secondary/80 h-9 px-4">复制</button>
+                            </div>
+                            <p class="text-xs text-muted-foreground mt-1">用于验证Chrome扩展插件的身份，留空将自动生成随机token</p>
+                        </div>
+                        <div>
+                            <label class="inline-flex items-center gap-2 cursor-pointer">
+                                <input type="checkbox" id="cfgAutoEnableOnUpdate" class="h-4 w-4 rounded border-input">
+                                <span class="text-sm font-medium">更新token时自动启用</span>
+                            </label>
+                            <p class="text-xs text-muted-foreground mt-2">当插件更新token时，如果该token被禁用，则自动启用它</p>
+                        </div>
+                        <div class="rounded-md bg-blue-50 dark:bg-blue-900/20 p-3 border border-blue-200 dark:border-blue-800">
+                            <p class="text-xs text-blue-800 dark:text-blue-200">
+                                ℹ️ <strong>使用说明：</strong>安装Chrome扩展后，将连接接口和Token配置到插件中，插件会自动提取Google Labs的cookie并更新到系统
+                            </p>
+                        </div>
                     </div>
+                    <button onclick="savePluginConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">保存配置</button>
                 </div>
                 <!-- 验证码配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">验证码配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="text-sm font-medium mb-2 block">打码方式</label>
                             <select id="cfgCaptchaMethod" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" onchange="toggleCaptchaOptions()">
                                 <option value="capmonster">CapMonster打码</option>
                                 <option value="ezcaptcha">EzCaptcha打码</option>
                                 <option value="capsolver">CapSolver打码</option>
+                                <option value="browser">有头浏览器打码</option>
                                 <option value="personal">内置浏览器打码</option>
                             </select>
                             <p class="text-xs text-muted-foreground mt-1">选择验证码获取方式</p>
                                     <input type="checkbox" id="cfgBrowserProxyEnabled" class="h-4 w-4 rounded border-input" onchange="toggleBrowserProxyInput()">
                                     <span class="text-sm font-medium">启用代理</span>
                                 </label>
+                                <p class="text-xs text-muted-foreground mt-2">为有头浏览器配置独立代理</p>
                             </div>
                             <div id="browserProxyUrlInput" class="hidden">
                                     示例：<code class="bg-muted px-1 py-0.5 rounded">http://user:pass@proxy.com:8080</code> 或 <code class="bg-muted px-1 py-0.5 rounded">socks5://proxy.com:1080</code>
                                 </p>
                             </div>
+                            <div>
+                                <label class="text-sm font-medium mb-2 block">浏览器数量</label>
+                                <input id="cfgBrowserCount" type="number" min="1" max="20" class="flex h-9 w-full rounded-md border border-input bg-background px-3 py-2 text-sm" placeholder="1" value="1">
+                                <p class="text-xs text-muted-foreground mt-1">同时启动的浏览器实例数量，每个浏览器只开1个标签页，请求轮询分配</p>
                             </div>
                         </div>
                     </div>
+                    <button onclick="saveCaptchaConfig()" class="inline-flex items-center justify-center rounded-md bg-primary text-primary-foreground hover:bg-primary/90 h-9 px-4 w-full mt-4">保存配置</button>
                 </div>
                 <!-- 调试配置 -->
+                <div class="rounded-lg border border-border bg-background p-6 flex flex-col">
                     <h3 class="text-lg font-semibold mb-4">调试配置</h3>
+                    <div class="space-y-4 flex-1">
                         <div>
                             <label class="inline-flex items-center gap-2 cursor-pointer">
                                 <input type="checkbox" id="cfgDebugEnabled" class="h-4 w-4 rounded border-input" onchange="toggleDebugMode()">
                             </p>
                         </div>
                     </div>
+                    <div class="text-xs text-muted-foreground text-center mt-4 h-9 flex items-center justify-center">✅ 开关状态自动保存</div>
                 </div>
             </div>
         </div>
         saveGenerationTimeout=async()=>{const imageTimeout=parseInt($('cfgImageTimeout').value)||300,videoTimeout=parseInt($('cfgVideoTimeout').value)||1500;console.log('保存生成超时配置:',{imageTimeout,videoTimeout});if(imageTimeout<60||imageTimeout>3600)return showToast('图片超时时间必须在 60-3600 秒之间','error');if(videoTimeout<60||videoTimeout>7200)return showToast('视频超时时间必须在 60-7200 秒之间','error');try{const r=await apiRequest('/api/generation/timeout',{method:'POST',body:JSON.stringify({image_timeout:imageTimeout,video_timeout:videoTimeout})});if(!r){console.error('保存请求失败');return}const d=await r.json();console.log('保存结果:',d);if(d.success){showToast('生成超时配置保存成功','success');await new Promise(r=>setTimeout(r,200));await loadGenerationTimeout()}else{console.error('保存失败:',d);showToast('保存失败','error')}}catch(e){console.error('保存失败:',e);showToast('保存失败: '+e.message,'error')}},
         toggleCaptchaOptions=()=>{const method=$('cfgCaptchaMethod').value;$('yescaptchaOptions').style.display=method==='yescaptcha'?'block':'none';$('capmonsterOptions').classList.toggle('hidden',method!=='capmonster');$('ezcaptchaOptions').classList.toggle('hidden',method!=='ezcaptcha');$('capsolverOptions').classList.toggle('hidden',method!=='capsolver');$('browserCaptchaOptions').classList.toggle('hidden',method!=='browser')},
         toggleBrowserProxyInput=()=>{const enabled=$('cfgBrowserProxyEnabled').checked;$('browserProxyUrlInput').classList.toggle('hidden',!enabled)},
+        loadCaptchaConfig=async()=>{try{console.log('开始加载验证码配置...');const r=await apiRequest('/api/captcha/config');if(!r){console.error('API请求失败');return}const d=await r.json();console.log('验证码配置数据:',d);$('cfgCaptchaMethod').value=d.captcha_method||'yescaptcha';$('cfgYescaptchaApiKey').value=d.yescaptcha_api_key||'';$('cfgYescaptchaBaseUrl').value=d.yescaptcha_base_url||'https://api.yescaptcha.com';$('cfgCapmonsterApiKey').value=d.capmonster_api_key||'';$('cfgCapmonsterBaseUrl').value=d.capmonster_base_url||'https://api.capmonster.cloud';$('cfgEzcaptchaApiKey').value=d.ezcaptcha_api_key||'';$('cfgEzcaptchaBaseUrl').value=d.ezcaptcha_base_url||'https://api.ez-captcha.com';$('cfgCapsolverApiKey').value=d.capsolver_api_key||'';$('cfgCapsolverBaseUrl').value=d.capsolver_base_url||'https://api.capsolver.com';$('cfgBrowserProxyEnabled').checked=d.browser_proxy_enabled||false;$('cfgBrowserProxyUrl').value=d.browser_proxy_url||'';$('cfgBrowserCount').value=d.browser_count||1;toggleCaptchaOptions();toggleBrowserProxyInput();console.log('验证码配置加载成功')}catch(e){console.error('加载验证码配置失败:',e);showToast('加载验证码配置失败: '+e.message,'error')}},
+        saveCaptchaConfig=async()=>{const method=$('cfgCaptchaMethod').value,yesApiKey=$('cfgYescaptchaApiKey').value.trim(),yesBaseUrl=$('cfgYescaptchaBaseUrl').value.trim(),capApiKey=$('cfgCapmonsterApiKey').value.trim(),capBaseUrl=$('cfgCapmonsterBaseUrl').value.trim(),ezApiKey=$('cfgEzcaptchaApiKey').value.trim(),ezBaseUrl=$('cfgEzcaptchaBaseUrl').value.trim(),solverApiKey=$('cfgCapsolverApiKey').value.trim(),solverBaseUrl=$('cfgCapsolverBaseUrl').value.trim(),browserProxyEnabled=$('cfgBrowserProxyEnabled').checked,browserProxyUrl=$('cfgBrowserProxyUrl').value.trim(),browserCount=parseInt($('cfgBrowserCount').value)||1;console.log('保存验证码配置:',{method,yesApiKey,yesBaseUrl,capApiKey,capBaseUrl,ezApiKey,ezBaseUrl,solverApiKey,solverBaseUrl,browserProxyEnabled,browserProxyUrl,browserCount});try{const r=await apiRequest('/api/captcha/config',{method:'POST',body:JSON.stringify({captcha_method:method,yescaptcha_api_key:yesApiKey,yescaptcha_base_url:yesBaseUrl,capmonster_api_key:capApiKey,capmonster_base_url:capBaseUrl,ezcaptcha_api_key:ezApiKey,ezcaptcha_base_url:ezBaseUrl,capsolver_api_key:solverApiKey,capsolver_base_url:solverBaseUrl,browser_proxy_enabled:browserProxyEnabled,browser_proxy_url:browserProxyUrl,browser_count:browserCount})});if(!r){console.error('保存请求失败');return}const d=await r.json();console.log('保存结果:',d);if(d.success){showToast('验证码配置保存成功','success');await new Promise(r=>setTimeout(r,200));await loadCaptchaConfig()}else{console.error('保存失败:',d);showToast(d.message||'保存失败','error')}}catch(e){console.error('保存失败:',e);showToast('保存失败: '+e.message,'error')}},
         loadPluginConfig=async()=>{try{const r=await apiRequest('/api/plugin/config');if(!r)return;const d=await r.json();if(d.success&&d.config){$('cfgPluginConnectionUrl').value=d.config.connection_url||'';$('cfgPluginConnectionToken').value=d.config.connection_token||'';$('cfgAutoEnableOnUpdate').checked=d.config.auto_enable_on_update||false}}catch(e){console.error('加载插件配置失败:',e);showToast('加载插件配置失败: '+e.message,'error')}},
         savePluginConfig=async()=>{const token=$('cfgPluginConnectionToken').value.trim();const autoEnable=$('cfgAutoEnableOnUpdate').checked;try{const r=await apiRequest('/api/plugin/config',{method:'POST',body:JSON.stringify({connection_token:token,auto_enable_on_update:autoEnable})});if(!r)return;const d=await r.json();if(d.success){showToast('插件配置保存成功','success');await loadPluginConfig()}else{showToast(d.message||'保存失败','error')}}catch(e){showToast('保存失败: '+e.message,'error')}},
         copyConnectionUrl=()=>{const url=$('cfgPluginConnectionUrl').value;if(!url){showToast('连接接口为空','error');return}navigator.clipboard.writeText(url).then(()=>showToast('连接接口已复制','success')).catch(()=>showToast('复制失败','error'))},