refactor: prelogin retry loop — 8 concurrent, 3min retry, infinite until all online

main.py

@@ -381,24 +381,8 @@ async def import_accounts(request: Request, admin_key: str = Header(...)):
         _save_settings(saved)
 
     # 异步触发新导入账号的并行预登录
-    async def prelogin_new_accounts():
-        sem = asyncio.Semaphore(10)  # 最多同时 10 个登录，避免浏览器启动过载
-        async def _login_one(account):
-            async with sem:
-                try:
-                    logger.info("Pre-logging in newly imported account %s...", account.email)
-                    await manager.get_or_create_browser_with_retry(
-                        account, headless=config.browser.headless
-                    )
-                    logger.info("Pre-login OK: %s", account.email)
-                except Exception as e:
-                    logger.error("Pre-login FAILED for %s: %s", account.email, e)
-        tasks = [_login_one(a) for a in new_accounts]
-        if tasks:
-            await asyncio.gather(*tasks, return_exceptions=True)
-
     if new_accounts:
-        asyncio.create_task(prelogin_new_accounts())
+        asyncio.create_task(_prelogin_loop(sem_size=8, retry_delay=180))
 
     return {"success": True, "imported": imported, "total": len(manager.accounts)}
 
@@ -724,29 +708,58 @@ async def startup():
     asyncio.create_task(_prelogin_all())
 
 
-async def _prelogin_all():
-    """并行预登录全部账号，信号量控制并发避免打崩服务器。"""
-    sem = asyncio.Semaphore(10)  # 最多同时 10 个登录，避免浏览器启动过载
+async def _prelogin_loop(sem_size=8, retry_delay=180):
+    """通用预登录循环：并行登录一批账号，失败的在 delay 秒后重试，直到全部成功或错误过多。
+
+    参数:
+        sem_size: 最大同时登录数（默认 8）
+        retry_delay: 失败后重试等待秒数（默认 180 = 3 分钟）
+    """
     total = len(manager.accounts)
-    done = 0
+    while True:
+        pending = [
+            (email, acc) for email, acc in manager.accounts.items()
+            if not acc.logged_in and acc.error_count < 5
+        ]
+        if not pending:
+            logger.info("[prelogin] All accounts ready or max retries exhausted")
+            return
+
+        logger.info("[prelogin] %d/%d accounts pending, starting batch (concurrency=%d)...",
+                    len(pending), total, sem_size)
+        sem = asyncio.Semaphore(sem_size)
+
+        async def _login_one(email, account):
+            async with sem:
+                try:
+                    logger.info("[prelogin] %s ...", email)
+                    await manager.get_or_create_browser_with_retry(
+                        account, headless=config.browser.headless
+                    )
+                    logger.info("[prelogin OK] %s (muted=%s)", email, account.is_muted)
+                except Exception as e:
+                    logger.error("[prelogin FAIL] %s: %s", email, e)
 
-    async def _login_one(email: str, account):
-        nonlocal done
-        async with sem:
-            try:
-                logger.info("[prelogin %d/%d] %s ...", done + 1, total, email)
-                await manager.get_or_create_browser_with_retry(
-                    account, headless=config.browser.headless
-                )
-                logger.info("[prelogin OK %d/%d] %s (muted=%s)", done + 1, total, email, account.is_muted)
-            except Exception as e:
-                logger.error("[prelogin FAIL %d/%d] %s: %s", done + 1, total, email, e)
-        done += 1
-
-    tasks = [_login_one(email, acc) for email, acc in manager.accounts.items()]
-    if tasks:
-        await asyncio.gather(*tasks, return_exceptions=True)
-    logger.info("Pre-login complete: %d/%d accounts ready", sum(1 for a in manager.accounts.values() if a.logged_in), total)
+        tasks = [_login_one(email, acc) for email, acc in pending]
+        if tasks:
+            await asyncio.gather(*tasks, return_exceptions=True)
+
+        still_pending = sum(
+            1 for a in manager.accounts.values()
+            if not a.logged_in and a.error_count < 5
+        )
+        if still_pending == 0:
+            logger.info("[prelogin] All done")
+            return
+
+        logger.info("[prelogin] %d accounts still pending, retrying in %ds...",
+                    still_pending, retry_delay)
+        await asyncio.sleep(retry_delay)
+
+
+async def _prelogin_all():
+    """启动时后台预登录：同时 8 个，失败 3 分钟后重试，无限循环直到全部在线。"""
+    await _prelogin_loop(sem_size=8, retry_delay=180)
 
 
 def main():