feat: 为无头模式设置独立代理

src/api/admin.py

@@ -839,14 +839,26 @@ async def update_captcha_config(
     token: str = Depends(verify_admin_token)
 ):
     """Update captcha configuration"""
+    from ..services.browser_captcha import validate_browser_proxy_url
+
     captcha_method = request.get("captcha_method")
     yescaptcha_api_key = request.get("yescaptcha_api_key")
     yescaptcha_base_url = request.get("yescaptcha_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:
+        is_valid, error_msg = validate_browser_proxy_url(browser_proxy_url)
+        if not is_valid:
+            return {"success": False, "message": error_msg}
 
     await db.update_captcha_config(
         captcha_method=captcha_method,
         yescaptcha_api_key=yescaptcha_api_key,
-        yescaptcha_base_url=yescaptcha_base_url
+        yescaptcha_base_url=yescaptcha_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
@@ -862,5 +874,7 @@ async def get_captcha_config(token: str = Depends(verify_admin_token)):
     return {
         "captcha_method": captcha_config.captcha_method,
         "yescaptcha_api_key": captcha_config.yescaptcha_api_key,
-        "yescaptcha_base_url": captcha_config.yescaptcha_base_url
+        "yescaptcha_base_url": captcha_config.yescaptcha_base_url,
+        "browser_proxy_enabled": captcha_config.browser_proxy_enabled,
+        "browser_proxy_url": captcha_config.browser_proxy_url or ""
     }

src/core/database.py

@@ -209,6 +209,8 @@ class Database:
                         yescaptcha_base_url TEXT DEFAULT 'https://api.yescaptcha.com',
                         website_key TEXT DEFAULT '6LdsFiUsAAAAAIjVDZcuLhaHiDn5nnHVXVRQGeMV',
                         page_action TEXT DEFAULT 'FLOW_GENERATION',
+                        browser_proxy_enabled BOOLEAN DEFAULT 0,
+                        browser_proxy_url TEXT,
                         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                         updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                     )
@@ -249,6 +251,21 @@ class Database:
                     except Exception as e:
                         print(f"  ✗ Failed to add column 'error_ban_threshold': {e}")
 
+            # Check and add missing columns to captcha_config table
+            if await self._table_exists(db, "captcha_config"):
+                captcha_columns_to_add = [
+                    ("browser_proxy_enabled", "BOOLEAN DEFAULT 0"),
+                    ("browser_proxy_url", "TEXT"),
+                ]
+
+                for col_name, col_type in captcha_columns_to_add:
+                    if not await self._column_exists(db, "captcha_config", col_name):
+                        try:
+                            await db.execute(f"ALTER TABLE captcha_config ADD COLUMN {col_name} {col_type}")
+                            print(f"  ✓ Added column '{col_name}' to captcha_config table")
+                        except Exception as e:
+                            print(f"  ✗ Failed to add column '{col_name}': {e}")
+
             # Check and add missing columns to token_stats table
             if await self._table_exists(db, "token_stats"):
                 stats_columns_to_add = [
@@ -439,6 +456,8 @@ class Database:
                     yescaptcha_base_url TEXT DEFAULT 'https://api.yescaptcha.com',
                     website_key TEXT DEFAULT '6LdsFiUsAAAAAIjVDZcuLhaHiDn5nnHVXVRQGeMV',
                     page_action TEXT DEFAULT 'FLOW_GENERATION',
+                    browser_proxy_enabled BOOLEAN DEFAULT 0,
+                    browser_proxy_url TEXT,
                     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                 )
@@ -1118,7 +1137,9 @@ class Database:
         self,
         captcha_method: str = None,
         yescaptcha_api_key: str = None,
-        yescaptcha_base_url: str = None
+        yescaptcha_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:
@@ -1131,20 +1152,25 @@ class Database:
                 new_method = captcha_method if captcha_method is not None else current.get("captcha_method", "yescaptcha")
                 new_api_key = yescaptcha_api_key if yescaptcha_api_key is not None else current.get("yescaptcha_api_key", "")
                 new_base_url = yescaptcha_base_url if yescaptcha_base_url is not None else current.get("yescaptcha_base_url", "https://api.yescaptcha.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
-                    SET captcha_method = ?, yescaptcha_api_key = ?, yescaptcha_base_url = ?, updated_at = CURRENT_TIMESTAMP
+                    SET captcha_method = ?, yescaptcha_api_key = ?, yescaptcha_base_url = ?,
+                        browser_proxy_enabled = ?, browser_proxy_url = ?, updated_at = CURRENT_TIMESTAMP
                     WHERE id = 1
-                """, (new_method, new_api_key, new_base_url))
+                """, (new_method, new_api_key, new_base_url, new_proxy_enabled, new_proxy_url))
             else:
                 new_method = captcha_method if captcha_method is not None else "yescaptcha"
                 new_api_key = yescaptcha_api_key if yescaptcha_api_key is not None else ""
                 new_base_url = yescaptcha_base_url if yescaptcha_base_url is not None else "https://api.yescaptcha.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)
-                    VALUES (1, ?, ?, ?)
-                """, (new_method, new_api_key, new_base_url))
+                    INSERT INTO captcha_config (id, captcha_method, yescaptcha_api_key, yescaptcha_base_url, browser_proxy_enabled, browser_proxy_url)
+                    VALUES (1, ?, ?, ?, ?, ?)
+                """, (new_method, new_api_key, new_base_url, new_proxy_enabled, new_proxy_url))
 
             await db.commit()

src/core/models.py

@@ -152,6 +152,8 @@ class CaptchaConfig(BaseModel):
     yescaptcha_base_url: str = "https://api.yescaptcha.com"
     website_key: str = "6LdsFiUsAAAAAIjVDZcuLhaHiDn5nnHVXVRQGeMV"
     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
 

src/main.py

@@ -76,7 +76,7 @@ async def lifespan(app: FastAPI):
     browser_service = None
     if captcha_config.captcha_method == "browser":
         from .services.browser_captcha import BrowserCaptchaService
-        browser_service = await BrowserCaptchaService.get_instance(proxy_manager)
+        browser_service = await BrowserCaptchaService.get_instance(db)
         print("✓ Browser captcha service initialized (headless mode)")
 
     # Initialize concurrency manager

src/services/browser_captcha.py

@@ -35,28 +35,67 @@ def parse_proxy_url(proxy_url: str) -> Optional[Dict[str, str]]:
     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, proxy_manager=None):
+    def __init__(self, db=None):
         """初始化服务（始终使用无头模式）"""
         self.headless = True  # 始终无头
         self.playwright = None
         self.browser: Optional[Browser] = None
         self._initialized = False
         self.website_key = "6LdsFiUsAAAAAIjVDZcuLhaHiDn5nnHVXVRQGeMV"
-        self.proxy_manager = proxy_manager
+        self.db = db
 
     @classmethod
-    async def get_instance(cls, proxy_manager=None) -> 'BrowserCaptchaService':
+    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(proxy_manager)
+                    cls._instance = cls(db)
                     await cls._instance.initialize()
         return cls._instance
 
@@ -66,10 +105,12 @@ class BrowserCaptchaService:
             return
 
         try:
-            # 获取代理配置
+            # 获取浏览器专用代理配置
             proxy_url = None
-            if self.proxy_manager:
-                proxy_url = await self.proxy_manager.get_proxy_url()
+            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()