fix(captcha): 修复内置打码并发分发与清理配置

Author: genz27

config/setting_example.toml

@@ -59,6 +59,7 @@ browser_recaptcha_settle_seconds = 3.0  # reload/clr 就绪后的额外稳态等
 browser_count = 1  # browser 模式的有头浏览器实例数量
 personal_project_pool_size = 4  # personal 模式下单个 Token 默认维护的项目池数量（仅影响项目轮换，不决定打码标签页数量）
 personal_max_resident_tabs = 5  # personal 模式共享打码标签页上限，所有 Token/project 共用这组 tab
+browser_personal_fresh_restart_every_n_solves = 10  # personal 模式成功获取多少个码后清理并重启浏览器，0 表示禁用
 personal_idle_tab_ttl_seconds = 600  # personal 模式标签页空闲回收时间(秒)
 yescaptcha_api_key = ""  # YesCaptcha API密钥
 yescaptcha_base_url = "https://api.yescaptcha.com"

src/api/admin.py

@@ -1596,6 +1596,10 @@ async def update_captcha_config(
     browser_count = request.get("browser_count", 1)
     personal_project_pool_size = request.get("personal_project_pool_size")
     personal_max_resident_tabs = request.get("personal_max_resident_tabs")
+    browser_personal_fresh_restart_every_n_solves = request.get(
+        "browser_personal_fresh_restart_every_n_solves",
+        10,
+    )
     personal_idle_tab_ttl_seconds = request.get("personal_idle_tab_ttl_seconds")
 
     # 验证浏览器代理URL格式
@@ -1614,6 +1618,17 @@ async def update_captcha_config(
         remote_browser_timeout = max(5, int(remote_browser_timeout or 60))
     except Exception:
         return {"success": False, "message": "远程打码超时时间必须是整数秒"}
+    try:
+        browser_count = max(1, min(20, int(browser_count or 1)))
+    except Exception:
+        return {"success": False, "message": "浏览器实例数量必须是整数"}
+    try:
+        browser_personal_fresh_restart_every_n_solves = max(
+            0,
+            int(browser_personal_fresh_restart_every_n_solves if browser_personal_fresh_restart_every_n_solves is not None else 10),
+        )
+    except Exception:
+        return {"success": False, "message": "重置码数必须是整数，0 表示禁用"}
 
     if captcha_method == "remote_browser":
         if not (remote_browser_base_url or "").strip():
@@ -1637,9 +1652,10 @@ async def update_captcha_config(
         remote_browser_timeout=remote_browser_timeout,
         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_count=browser_count,
         personal_project_pool_size=personal_project_pool_size,
         personal_max_resident_tabs=personal_max_resident_tabs,
+        browser_personal_fresh_restart_every_n_solves=browser_personal_fresh_restart_every_n_solves,
         personal_idle_tab_ttl_seconds=personal_idle_tab_ttl_seconds
     )
 
@@ -1690,6 +1706,7 @@ async def get_captcha_config(token: str = Depends(verify_admin_token)):
         "browser_count": captcha_config.browser_count,
         "personal_project_pool_size": captcha_config.personal_project_pool_size,
         "personal_max_resident_tabs": captcha_config.personal_max_resident_tabs,
+        "browser_personal_fresh_restart_every_n_solves": captcha_config.browser_personal_fresh_restart_every_n_solves,
         "personal_idle_tab_ttl_seconds": captcha_config.personal_idle_tab_ttl_seconds
     }
 

src/core/config.py

@@ -405,6 +405,21 @@ def set_browser_launch_background(self, enabled: bool):
             self._config["captcha"] = {}
         self._config["captcha"]["browser_launch_background"] = bool(enabled)
 
+    @property
+    def browser_count(self) -> int:
+        """浏览器打码实例数量，browser/personal 模式共用。"""
+        value = self._config.get("captcha", {}).get("browser_count", 1)
+        try:
+            return max(1, min(20, int(value)))
+        except Exception:
+            return 1
+
+    def set_browser_count(self, value: int):
+        """设置浏览器打码实例数量。"""
+        if "captcha" not in self._config:
+            self._config["captcha"] = {}
+        self._config["captcha"]["browser_count"] = max(1, min(20, int(value)))
+
     @property
     def browser_recaptcha_settle_seconds(self) -> float:
         """有头打码在 reload/clr 就绪后的额外等待秒数。"""
@@ -467,6 +482,21 @@ def set_personal_idle_tab_ttl_seconds(self, value: int):
             self._config["captcha"] = {}
         self._config["captcha"]["personal_idle_tab_ttl_seconds"] = max(60, int(value))
 
+    @property
+    def browser_personal_fresh_restart_every_n_solves(self) -> int:
+        """内置浏览器成功打码多少次后使用全新 profile 重启，0 表示禁用。"""
+        value = self._config.get("captcha", {}).get("browser_personal_fresh_restart_every_n_solves", 10)
+        try:
+            return max(0, int(value))
+        except Exception:
+            return 10
+
+    def set_browser_personal_fresh_restart_every_n_solves(self, value: int):
+        """设置内置浏览器 fresh profile 轮换阈值。"""
+        if "captcha" not in self._config:
+            self._config["captcha"] = {}
+        self._config["captcha"]["browser_personal_fresh_restart_every_n_solves"] = max(0, int(value))
+
     @property
     def yescaptcha_api_key(self) -> str:
         """Get YesCaptcha API key"""

src/core/database.py

@@ -231,6 +231,7 @@ async def _ensure_config_rows(self, db, config_dict: dict = None):
             browser_count = 1
             personal_project_pool_size = 4
             personal_max_resident_tabs = 5
+            browser_personal_fresh_restart_every_n_solves = 10
             personal_idle_tab_ttl_seconds = 600
 
             if config_dict:
@@ -245,6 +246,7 @@ async def _ensure_config_rows(self, db, config_dict: dict = None):
                 browser_count = captcha_config.get("browser_count", 1)
                 personal_project_pool_size = captcha_config.get("personal_project_pool_size", 4)
                 personal_max_resident_tabs = captcha_config.get("personal_max_resident_tabs", 5)
+                browser_personal_fresh_restart_every_n_solves = captcha_config.get("browser_personal_fresh_restart_every_n_solves", 10)
                 personal_idle_tab_ttl_seconds = captcha_config.get("personal_idle_tab_ttl_seconds", 600)
             try:
                 remote_browser_timeout = max(5, int(remote_browser_timeout))
@@ -262,6 +264,10 @@ async def _ensure_config_rows(self, db, config_dict: dict = None):
                 personal_max_resident_tabs = max(1, min(50, int(personal_max_resident_tabs)))
             except Exception:
                 personal_max_resident_tabs = 5
+            try:
+                browser_personal_fresh_restart_every_n_solves = max(0, int(browser_personal_fresh_restart_every_n_solves))
+            except Exception:
+                browser_personal_fresh_restart_every_n_solves = 10
             try:
                 personal_idle_tab_ttl_seconds = max(60, int(personal_idle_tab_ttl_seconds))
             except Exception:
@@ -273,9 +279,10 @@ async def _ensure_config_rows(self, db, config_dict: dict = None):
                     yescaptcha_task_type,
                     remote_browser_base_url, remote_browser_api_key, remote_browser_timeout,
                     browser_count, personal_project_pool_size,
-                    personal_max_resident_tabs, personal_idle_tab_ttl_seconds
+                    personal_max_resident_tabs, browser_personal_fresh_restart_every_n_solves,
+                    personal_idle_tab_ttl_seconds
                 )
-                VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
             """, (
                 captcha_method,
                 yescaptcha_api_key,
@@ -287,6 +294,7 @@ async def _ensure_config_rows(self, db, config_dict: dict = None):
                 browser_count,
                 personal_project_pool_size,
                 personal_max_resident_tabs,
+                browser_personal_fresh_restart_every_n_solves,
                 personal_idle_tab_ttl_seconds,
             ))
 
@@ -381,6 +389,11 @@ async def check_and_migrate_db(self, config_dict: dict = None):
                         page_action TEXT DEFAULT 'IMAGE_GENERATION',
                         browser_proxy_enabled BOOLEAN DEFAULT 0,
                         browser_proxy_url TEXT,
+                        browser_count INTEGER DEFAULT 1,
+                        personal_project_pool_size INTEGER DEFAULT 4,
+                        personal_max_resident_tabs INTEGER DEFAULT 5,
+                        browser_personal_fresh_restart_every_n_solves INTEGER DEFAULT 10,
+                        personal_idle_tab_ttl_seconds INTEGER DEFAULT 600,
                         created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                         updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                     )
@@ -528,6 +541,7 @@ async def check_and_migrate_db(self, config_dict: dict = None):
                 captcha_columns_to_add = [
                     ("personal_project_pool_size", "INTEGER DEFAULT 4"),
                     ("personal_max_resident_tabs", "INTEGER DEFAULT 5"),
+                    ("browser_personal_fresh_restart_every_n_solves", "INTEGER DEFAULT 10"),
                     ("personal_idle_tab_ttl_seconds", "INTEGER DEFAULT 600"),
                 ]
 
@@ -747,6 +761,7 @@ async def init_db(self):
                     browser_count INTEGER DEFAULT 1,
                     personal_project_pool_size INTEGER DEFAULT 4,
                     personal_max_resident_tabs INTEGER DEFAULT 5,
+                    browser_personal_fresh_restart_every_n_solves INTEGER DEFAULT 10,
                     personal_idle_tab_ttl_seconds INTEGER DEFAULT 600,
                     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
@@ -1642,8 +1657,12 @@ async def reload_config_to_memory(self):
             config.set_remote_browser_base_url(captcha_config.remote_browser_base_url)
             config.set_remote_browser_api_key(captcha_config.remote_browser_api_key)
             config.set_remote_browser_timeout(captcha_config.remote_browser_timeout)
+            config.set_browser_count(captcha_config.browser_count)
             config.set_personal_project_pool_size(captcha_config.personal_project_pool_size)
             config.set_personal_max_resident_tabs(captcha_config.personal_max_resident_tabs)
+            config.set_browser_personal_fresh_restart_every_n_solves(
+                captcha_config.browser_personal_fresh_restart_every_n_solves
+            )
             config.set_personal_idle_tab_ttl_seconds(captcha_config.personal_idle_tab_ttl_seconds)
 
     # Cache config operations
@@ -1780,6 +1799,7 @@ async def update_captcha_config(
         browser_count: int = None,
         personal_project_pool_size: int = None,
         personal_max_resident_tabs: int = None,
+        browser_personal_fresh_restart_every_n_solves: int = None,
         personal_idle_tab_ttl_seconds: int = None
     ):
         """Update captcha configuration"""
@@ -1810,10 +1830,17 @@ async def update_captcha_config(
                 new_browser_count = browser_count if browser_count is not None else current.get("browser_count", 1)
                 new_personal_project_pool_size = personal_project_pool_size if personal_project_pool_size is not None else current.get("personal_project_pool_size", 4)
                 new_personal_max_tabs = personal_max_resident_tabs if personal_max_resident_tabs is not None else current.get("personal_max_resident_tabs", 5)
+                new_personal_fresh_restart_every = (
+                    browser_personal_fresh_restart_every_n_solves
+                    if browser_personal_fresh_restart_every_n_solves is not None
+                    else current.get("browser_personal_fresh_restart_every_n_solves", 10)
+                )
                 new_personal_idle_ttl = personal_idle_tab_ttl_seconds if personal_idle_tab_ttl_seconds is not None else current.get("personal_idle_tab_ttl_seconds", 600)
                 new_remote_timeout = max(5, int(new_remote_timeout)) if new_remote_timeout is not None else 60
+                new_browser_count = max(1, min(20, int(new_browser_count)))
                 new_personal_project_pool_size = max(1, min(50, int(new_personal_project_pool_size)))
                 new_personal_max_tabs = max(1, min(50, int(new_personal_max_tabs)))  # 限制1-50
+                new_personal_fresh_restart_every = max(0, int(new_personal_fresh_restart_every))
                 new_personal_idle_ttl = max(60, int(new_personal_idle_ttl))  # 最少60秒
 
                 await db.execute("""
@@ -1826,15 +1853,17 @@ async def update_captcha_config(
                         remote_browser_base_url = ?, remote_browser_api_key = ?, remote_browser_timeout = ?,
                         browser_proxy_enabled = ?, browser_proxy_url = ?, browser_count = ?,
                         personal_project_pool_size = ?,
-                        personal_max_resident_tabs = ?, personal_idle_tab_ttl_seconds = ?,
+                        personal_max_resident_tabs = ?,
+                        browser_personal_fresh_restart_every_n_solves = ?,
+                        personal_idle_tab_ttl_seconds = ?,
                         updated_at = CURRENT_TIMESTAMP
                     WHERE id = 1
                 """, (new_method, new_yes_key, new_yes_url, new_yes_task_type,
                       new_cap_key, new_cap_url,
                       new_ez_key, new_ez_url, new_cs_key, new_cs_url,
                       (new_remote_base_url or "").strip(), (new_remote_api_key or "").strip(), new_remote_timeout,
                       new_proxy_enabled, new_proxy_url, new_browser_count, new_personal_project_pool_size,
-                      new_personal_max_tabs, new_personal_idle_ttl))
+                      new_personal_max_tabs, new_personal_fresh_restart_every, new_personal_idle_ttl))
             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 ""
@@ -1854,10 +1883,17 @@ async def update_captcha_config(
                 new_browser_count = browser_count if browser_count is not None else 1
                 new_personal_project_pool_size = personal_project_pool_size if personal_project_pool_size is not None else 4
                 new_personal_max_tabs = personal_max_resident_tabs if personal_max_resident_tabs is not None else 5
+                new_personal_fresh_restart_every = (
+                    browser_personal_fresh_restart_every_n_solves
+                    if browser_personal_fresh_restart_every_n_solves is not None
+                    else 10
+                )
                 new_personal_idle_ttl = personal_idle_tab_ttl_seconds if personal_idle_tab_ttl_seconds is not None else 600
                 new_remote_timeout = max(5, int(new_remote_timeout))
+                new_browser_count = max(1, min(20, int(new_browser_count)))
                 new_personal_project_pool_size = max(1, min(50, int(new_personal_project_pool_size)))
                 new_personal_max_tabs = max(1, min(50, int(new_personal_max_tabs)))
+                new_personal_fresh_restart_every = max(0, int(new_personal_fresh_restart_every))
                 new_personal_idle_ttl = max(60, int(new_personal_idle_ttl))
 
                 await db.execute("""
@@ -1868,14 +1904,15 @@ async def update_captcha_config(
                         remote_browser_base_url, remote_browser_api_key, remote_browser_timeout,
                         browser_proxy_enabled, browser_proxy_url, browser_count,
                         personal_project_pool_size,
-                        personal_max_resident_tabs, personal_idle_tab_ttl_seconds)
-                    VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                        personal_max_resident_tabs, browser_personal_fresh_restart_every_n_solves,
+                        personal_idle_tab_ttl_seconds)
+                    VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """, (new_method, new_yes_key, new_yes_url, new_yes_task_type,
                       new_cap_key, new_cap_url,
                       new_ez_key, new_ez_url, new_cs_key, new_cs_url,
                       (new_remote_base_url or "").strip(), (new_remote_api_key or "").strip(), new_remote_timeout,
                       new_proxy_enabled, new_proxy_url, new_browser_count, new_personal_project_pool_size,
-                      new_personal_max_tabs, new_personal_idle_ttl))
+                      new_personal_max_tabs, new_personal_fresh_restart_every, new_personal_idle_ttl))
 
             await db.commit()
 

src/core/models.py

@@ -198,6 +198,7 @@ class CaptchaConfig(BaseModel):
     browser_count: int = 1  # 浏览器打码实例数量
     personal_project_pool_size: int = 4  # 单个 Token 默认维护的项目池数量（仅影响项目轮换）
     personal_max_resident_tabs: int = 5  # 内置浏览器共享打码标签页数量上限
+    browser_personal_fresh_restart_every_n_solves: int = 10  # 成功打码多少次后清理并重启浏览器，0表示禁用
     personal_idle_tab_ttl_seconds: int = 600  # 内置浏览器标签页空闲超时(秒)
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None