fix: prelogin capped at 3 rounds + revert aggressive check_login_state

deepseek_browser.py

@@ -94,15 +94,6 @@ class DeepSeekBrowser:
 
     async def _check_login_state(self):
         current_url = self.page.url
-        try:
-            await self.page.wait_for_selector("textarea", timeout=10000)
-            self._logged_in = True
-            self._ready = True
-            if self._logged_in:
-                await self._check_mute()
-            return
-        except Exception:
-            pass
         if "/sign_in" in current_url:
             await self._auto_login()
         else:

main.py

@@ -382,7 +382,7 @@ async def import_accounts(request: Request, admin_key: str = Header(...)):
 
     # 异步触发新导入账号的并行预登录
     if new_accounts:
-        asyncio.create_task(_prelogin_loop(sem_size=8, retry_delay=180))
+        asyncio.create_task(_prelogin_loop(sem_size=8, max_rounds=3))
 
     return {"success": True, "imported": imported, "total": len(manager.accounts)}
 
@@ -747,25 +747,27 @@ async def startup():
     asyncio.create_task(_prelogin_all())
 
 
-async def _prelogin_loop(sem_size=8, retry_delay=180):
-    """通用预登录循环：并行登录一批账号，失败的在 delay 秒后重试，直到全部成功或错误过多。
+async def _prelogin_loop(sem_size=8, max_rounds=3):
+    """通用预登录：并行登录，每轮失败的等更久后重试，最多 max_rounds 轮。
 
     参数:
-        sem_size: 最大同时登录数（默认 8）
-        retry_delay: 失败后重试等待秒数（默认 180 = 3 分钟）
+        sem_size:  最大同时登录数（默认 8）
+        max_rounds: 最多重试轮数（默认 3），每轮间隔 3min → 10min → 30min
     """
     total = len(manager.accounts)
-    while True:
+    delays = [180, 600, 1800]  # 3min, 10min, 30min
+
+    for round_idx in range(max_rounds):
         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")
+            logger.info("[prelogin] All accounts ready")
             return
 
-        logger.info("[prelogin] %d/%d accounts pending, starting batch (concurrency=%d)...",
-                    len(pending), total, sem_size)
+        logger.info("[prelogin round %d/%d] %d/%d accounts pending (concurrency=%d)...",
+                    round_idx + 1, max_rounds, len(pending), total, sem_size)
         sem = asyncio.Semaphore(sem_size)
 
         async def _login_one(email, account):
@@ -788,17 +790,23 @@ async def _prelogin_loop(sem_size=8, retry_delay=180):
             if not a.logged_in and a.error_count < 5
         )
         if still_pending == 0:
-            logger.info("[prelogin] All done")
+            logger.info("[prelogin] All done after round %d", round_idx + 1)
             return
 
-        logger.info("[prelogin] %d accounts still pending, retrying in %ds...",
-                    still_pending, retry_delay)
-        await asyncio.sleep(retry_delay)
+        if round_idx < max_rounds - 1:
+            delay = delays[min(round_idx, len(delays) - 1)]
+            logger.info("[prelogin] %d accounts still pending, waiting %ds before round %d...",
+                        still_pending, delay, round_idx + 2)
+            await asyncio.sleep(delay)
+
+    remaining = sum(1 for a in manager.accounts.values() if not a.logged_in)
+    logger.info("[prelogin] Giving up after %d rounds. %d/%d accounts online, %d failed",
+                max_rounds, total - remaining, total, remaining)
 
 
 async def _prelogin_all():
-    """启动时后台预登录：同时 8 个，失败 3 分钟后重试，无限循环直到全部在线。"""
-    await _prelogin_loop(sem_size=8, retry_delay=180)
+    """启动时预登录：同时 8 个，最多 3 轮，失败不再无限重试。"""
+    await _prelogin_loop(sem_size=8, max_rounds=3)
 
 
 def main():