更新

backend/app/services/qr_login_service.py

@@ -4,22 +4,30 @@ QR码自动登录服务
 """
 import asyncio
 import base64
-from pathlib import Path
-from playwright.async_api import async_playwright, Page
-from loguru import logger
 import json
-import os
+from pathlib import Path
+from typing import Optional, Dict, Any, List
+from playwright.async_api import async_playwright, Page, BrowserContext, Browser, Playwright as PW
+from loguru import logger
 
 
 class QRLoginService:
     """QR码登录服务"""
     
-    def __init__(self, platform: str, cookies_dir: Path):
+    # 登录监控超时 (秒)
+    LOGIN_TIMEOUT = 120
+    
+    def __init__(self, platform: str, cookies_dir: Path) -> None:
         self.platform = platform
         self.cookies_dir = cookies_dir
-        self.qr_code_image = None
-        self.login_success = False
-        self.cookies_data = None
+        self.qr_code_image: Optional[str] = None
+        self.login_success: bool = False
+        self.cookies_data: Optional[Dict[str, Any]] = None
+        
+        # Playwright 资源 (手动管理生命周期)
+        self.playwright: Optional[PW] = None
+        self.browser: Optional[Browser] = None
+        self.context: Optional[BrowserContext] = None
         
         # 每个平台使用多个选择器 (使用逗号分隔，Playwright会同时等待它们)
         self.platform_configs = {
@@ -56,7 +64,7 @@ class QRLoginService:
             }
         }
     
-    async def start_login(self):
+    async def start_login(self) -> Dict[str, Any]:
         """
         启动登录流程
         
@@ -129,7 +137,7 @@ class QRLoginService:
             await self._cleanup()
             return {"success": False, "message": f"启动失败: {str(e)}"}
     
-    async def _extract_qr_code(self, page: Page, selectors: list) -> str:
+    async def _extract_qr_code(self, page: Page, selectors: List[str]) -> Optional[str]:
         """
         提取二维码图片 (借鉴 SuperIPAgent 的方式)
         """
@@ -195,7 +203,7 @@ class QRLoginService:
                                 break
                         if qr_element:
                             break
-                    except:
+                    except Exception:
                         continue
             except Exception as e:
                 logger.warning(f"[{self.platform}] 策略3(Text) 失败: {e}")
@@ -225,7 +233,7 @@ class QRLoginService:
             key_cookies = {"bilibili": "SESSDATA", "douyin": "sessionid", "xiaohongshu": "web_session"}
             target_cookie = key_cookies.get(self.platform, "")
             
-            for i in range(120):
+            for i in range(self.LOGIN_TIMEOUT):
                 await asyncio.sleep(1)
                 
                 try:
@@ -260,19 +268,28 @@ class QRLoginService:
         finally:
             await self._cleanup()
 
-    async def _cleanup(self):
+    async def _cleanup(self) -> None:
         """清理资源"""
-        if hasattr(self, 'context') and self.context:
-            try: await self.context.close()
-            except: pass
-        if hasattr(self, 'browser') and self.browser:
-            try: await self.browser.close()
-            except: pass
-        if hasattr(self, 'playwright') and self.playwright:
-            try: await self.playwright.stop()
-            except: pass
+        if self.context:
+            try:
+                await self.context.close()
+            except Exception:
+                pass
+            self.context = None
+        if self.browser:
+            try:
+                await self.browser.close()
+            except Exception:
+                pass
+            self.browser = None
+        if self.playwright:
+            try:
+                await self.playwright.stop()
+            except Exception:
+                pass
+            self.playwright = None
             
-    async def _save_cookies(self, cookies: list):
+    async def _save_cookies(self, cookies: List[Dict[str, Any]]) -> None:
         """保存Cookie到文件"""
         try:
             cookie_file = self.cookies_dir / f"{self.platform}_cookies.json"
@@ -301,7 +318,7 @@ class QRLoginService:
         except Exception as e:
             logger.error(f"[{self.platform}] 保存Cookie失败: {e}")
     
-    def get_login_status(self):
+    def get_login_status(self) -> Dict[str, Any]:
         """获取登录状态"""
         return {
             "success": self.login_success,