Optimize captcha browser slot pooling

Author: genz27

config/setting_example.toml

@@ -56,6 +56,10 @@ base_url = ""   # 缓存文件访问的基础URL, 留空则使用服务器地址
 [captcha]
 captcha_method = "browser"  # 打码方式: yescaptcha/browser/personal/remote_browser
 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
+personal_idle_tab_ttl_seconds = 600  # personal 模式标签页空闲回收时间(秒)
 yescaptcha_api_key = ""  # YesCaptcha API密钥
 yescaptcha_base_url = "https://api.yescaptcha.com"
 remote_browser_base_url = ""  # 远程有头打码服务地址

src/api/admin.py

@@ -1528,6 +1528,7 @@ async def update_captcha_config(
     browser_proxy_enabled = request.get("browser_proxy_enabled", False)
     browser_proxy_url = request.get("browser_proxy_url", "")
     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")
     personal_idle_tab_ttl_seconds = request.get("personal_idle_tab_ttl_seconds")
 
@@ -1570,6 +1571,7 @@ async def update_captcha_config(
         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,
+        personal_project_pool_size=personal_project_pool_size,
         personal_max_resident_tabs=personal_max_resident_tabs,
         personal_idle_tab_ttl_seconds=personal_idle_tab_ttl_seconds
     )
@@ -1618,6 +1620,7 @@ async def get_captcha_config(token: str = Depends(verify_admin_token)):
         "browser_proxy_enabled": captcha_config.browser_proxy_enabled,
         "browser_proxy_url": captcha_config.browser_proxy_url or "",
         "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,
         "personal_idle_tab_ttl_seconds": captcha_config.personal_idle_tab_ttl_seconds
     }

src/core/config.py

@@ -391,13 +391,22 @@ def browser_idle_ttl_seconds(self) -> int:
 
     @property
     def personal_max_resident_tabs(self) -> int:
-        """内置浏览器打码最大常驻标签页数量"""
+        """内置浏览器打码的共享标签页上限"""
         value = self._config.get("captcha", {}).get("personal_max_resident_tabs", 5)
         try:
             return max(1, min(50, int(value)))  # 限制在1-50之间
         except Exception:
             return 5
 
+    @property
+    def personal_project_pool_size(self) -> int:
+        """单个 Token 默认维护的项目池数量，仅影响项目轮换。"""
+        value = self._config.get("captcha", {}).get("personal_project_pool_size", 4)
+        try:
+            return max(1, min(50, int(value)))
+        except Exception:
+            return 4
+
     @property
     def personal_idle_tab_ttl_seconds(self) -> int:
         """内置浏览器打码标签页空闲超时(秒)"""
@@ -408,11 +417,17 @@ def personal_idle_tab_ttl_seconds(self) -> int:
             return 600
 
     def set_personal_max_resident_tabs(self, value: int):
-        """设置内置浏览器打码最大常驻标签页数量"""
+        """设置内置浏览器打码的共享标签页上限"""
         if "captcha" not in self._config:
             self._config["captcha"] = {}
         self._config["captcha"]["personal_max_resident_tabs"] = max(1, min(50, int(value)))
 
+    def set_personal_project_pool_size(self, value: int):
+        """设置单个 Token 默认维护的项目池数量，仅影响项目轮换"""
+        if "captcha" not in self._config:
+            self._config["captcha"] = {}
+        self._config["captcha"]["personal_project_pool_size"] = max(1, min(50, int(value)))
+
     def set_personal_idle_tab_ttl_seconds(self, value: int):
         """设置内置浏览器打码标签页空闲超时(秒)"""
         if "captcha" not in self._config:

src/core/models.py

@@ -193,7 +193,8 @@ class CaptchaConfig(BaseModel):
     browser_proxy_enabled: bool = False  # 浏览器打码是否启用代理
     browser_proxy_url: Optional[str] = None  # 浏览器打码代理URL
     browser_count: int = 1  # 浏览器打码实例数量
-    personal_max_resident_tabs: int = 5  # 内置浏览器最大常驻标签页数量
+    personal_project_pool_size: int = 4  # 单个 Token 默认维护的项目池数量（仅影响项目轮换）
+    personal_max_resident_tabs: int = 5  # 内置浏览器共享打码标签页数量上限
     personal_idle_tab_ttl_seconds: int = 600  # 内置浏览器标签页空闲超时(秒)
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None

src/main.py

@@ -44,76 +44,48 @@ async def lifespan(app: FastAPI):
         await db.check_and_migrate_db(config_dict)
         print("✓ Database migration check completed.")
 
-    # Load admin config from database
-    admin_config = await db.get_admin_config()
-    if admin_config:
-        config.set_admin_username_from_db(admin_config.username)
-        config.set_admin_password_from_db(admin_config.password)
-        config.api_key = admin_config.api_key
-
-    # Load cache configuration from database
-    cache_config = await db.get_cache_config()
-    config.set_cache_enabled(cache_config.cache_enabled)
-    config.set_cache_timeout(cache_config.cache_timeout)
-    config.set_cache_base_url(cache_config.cache_base_url or "")
-
-    # Load generation configuration from database
-    generation_config = await db.get_generation_config()
-    config.set_image_timeout(generation_config.image_timeout)
-    config.set_video_timeout(generation_config.video_timeout)
-
-    # Load debug configuration from database
-    debug_config = await db.get_debug_config()
-    config.set_debug_enabled(debug_config.enabled)
-
-    # Load captcha configuration from database
+    # 启动时统一把数据库配置同步到内存，避免 personal/brower 相关运行时配置遗漏。
+    await db.reload_config_to_memory()
     captcha_config = await db.get_captcha_config()
-    
-    config.set_captcha_method(captcha_config.captcha_method)
-    config.set_yescaptcha_api_key(captcha_config.yescaptcha_api_key)
-    config.set_yescaptcha_base_url(captcha_config.yescaptcha_base_url)
-    config.set_capmonster_api_key(captcha_config.capmonster_api_key)
-    config.set_capmonster_base_url(captcha_config.capmonster_base_url)
-    config.set_ezcaptcha_api_key(captcha_config.ezcaptcha_api_key)
-    config.set_ezcaptcha_base_url(captcha_config.ezcaptcha_base_url)
-    config.set_capsolver_api_key(captcha_config.capsolver_api_key)
-    config.set_capsolver_base_url(captcha_config.capsolver_base_url)
-    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)
+
+    # 尽量在浏览器服务启动前就拿到 token 快照，后续并发管理和预热共用。
+    tokens = await token_manager.get_all_tokens()
 
     # Initialize browser captcha service if needed
     browser_service = None
     if captcha_config.captcha_method == "personal":
         from .services.browser_captcha_personal import BrowserCaptchaService
         browser_service = await BrowserCaptchaService.get_instance(db)
         print("✓ Browser captcha service initialized (nodriver mode)")
-        
-        # 启动常驻模式：从第一个可用token获取project_id
-        tokens = await token_manager.get_all_tokens()
-        resident_project_id = None
-        for t in tokens:
-            if t.current_project_id and t.is_active:
-                resident_project_id = t.current_project_id
-                break
-        
-        if resident_project_id:
-            # 直接启动常驻模式（会自动导航到项目页面，cookie已持久化）
-            await browser_service.start_resident_mode(resident_project_id)
-            print(f"✓ Browser captcha resident mode started (project: {resident_project_id[:8]}...)")
+
+        warmup_limit = max(1, int(config.personal_max_resident_tabs or 1))
+        warmup_project_ids = await token_manager.get_personal_warmup_project_ids(
+            tokens=tokens,
+            limit=warmup_limit,
+        )
+
+        warmed_slots = await browser_service.warmup_resident_tabs(
+            warmup_project_ids,
+            limit=warmup_limit,
+        )
+        if warmed_slots:
+            print(
+                f"✓ Browser captcha shared resident tabs warmed "
+                f"({len(warmed_slots)} slot(s), limit={warmup_limit})"
+            )
+        elif tokens:
+            print("⚠ Browser captcha resident warmup skipped: no tab warmed successfully")
         else:
-            # 没有可用的project_id时，打开登录窗口供用户手动操作
+            # 没有任何可用 token 时，打开登录窗口供用户手动操作
             await browser_service.open_login_window()
-            print("⚠ No active token with project_id found, opened login window for manual setup")
+            print("⚠ No active token found, opened login window for manual setup")
     elif captcha_config.captcha_method == "browser":
         from .services.browser_captcha import BrowserCaptchaService
         browser_service = await BrowserCaptchaService.get_instance(db)
         await browser_service.warmup_browser_slots()
         print("? Browser captcha service initialized (headed mode)")
 
     # Initialize concurrency manager
-    tokens = await token_manager.get_all_tokens()
-
     await concurrency_manager.initialize(tokens)
 
     if config.captcha_method == "remote_browser":