Update main.py

main.py

@@ -10,6 +10,7 @@ from apscheduler.schedulers.asyncio import AsyncIOScheduler
 # 全局变量
 browser = None
 page = None
+context = None
 config = None
 scheduler = AsyncIOScheduler()
 
@@ -19,12 +20,54 @@ def load_config():
         return json.load(f)
 
 def load_cookies():
-    """加载cookies"""
+    """加载并转换cookies格式"""
     try:
         with open("cookies.json", "r", encoding="utf-8") as f:
-            return json.load(f)
+            raw_cookies = json.load(f)
     except FileNotFoundError:
         return []
+    
+    if not raw_cookies:
+        return []
+    
+    converted_cookies = []
+    for cookie in raw_cookies:
+        # 构建Playwright兼容的cookie格式
+        new_cookie = {
+            "name": cookie.get("name"),
+            "value": cookie.get("value"),
+            "domain": cookie.get("domain"),
+            "path": cookie.get("path", "/"),
+        }
+        
+        # 处理过期时间：expirationDate -> expires (秒转为秒，Playwright接受Unix时间戳)
+        if "expirationDate" in cookie:
+            new_cookie["expires"] = cookie["expirationDate"]
+        elif "expires" in cookie:
+            new_cookie["expires"] = cookie["expires"]
+        
+        # 处理sameSite：转换为Playwright格式
+        same_site = cookie.get("sameSite", "").lower()
+        if same_site in ["strict", "lax", "none"]:
+            new_cookie["sameSite"] = same_site.capitalize()
+            if same_site == "none":
+                new_cookie["sameSite"] = "None"
+        elif same_site == "unspecified" or same_site == "no_restriction":
+            new_cookie["sameSite"] = "None"
+        else:
+            new_cookie["sameSite"] = "Lax"  # 默认值
+        
+        # 处理secure和httpOnly
+        new_cookie["secure"] = cookie.get("secure", False)
+        new_cookie["httpOnly"] = cookie.get("httpOnly", False)
+        
+        # sameSite=None时必须secure=True
+        if new_cookie["sameSite"] == "None":
+            new_cookie["secure"] = True
+        
+        converted_cookies.append(new_cookie)
+    
+    return converted_cookies
 
 async def activate_task():
     """定时激活任务"""
@@ -38,7 +81,7 @@ async def activate_task():
 
 async def init_browser():
     """初始化浏览器"""
-    global browser, page, config
+    global browser, page, context, config
     
     config = load_config()
     cookies = load_cookies()
@@ -46,20 +89,47 @@ async def init_browser():
     playwright = await async_playwright().start()
     browser = await playwright.chromium.launch(headless=True)
     context = await browser.new_context(
-        viewport={"width": 1920, "height": 1080}
+        viewport={"width": 1920, "height": 1080},
+        user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
     )
     
-    # 导入cookies
+    # 按域名分组导入cookies
     if cookies:
-        await context.add_cookies(cookies)
-        print(f"[Browser] Loaded {len(cookies)} cookies")
+        # 过滤有效的cookies
+        valid_cookies = []
+        for cookie in cookies:
+            try:
+                # 确保必要字段存在
+                if cookie.get("name") and cookie.get("value") and cookie.get("domain"):
+                    valid_cookies.append(cookie)
+            except Exception as e:
+                print(f"[Cookie] Skip invalid cookie: {e}")
+        
+        if valid_cookies:
+            try:
+                await context.add_cookies(valid_cookies)
+                print(f"[Browser] Loaded {len(valid_cookies)} cookies")
+            except Exception as e:
+                print(f"[Browser] Error loading cookies: {e}")
+                # 尝试逐个添加
+                success_count = 0
+                for cookie in valid_cookies:
+                    try:
+                        await context.add_cookies([cookie])
+                        success_count += 1
+                    except Exception as ce:
+                        print(f"[Cookie] Failed to add cookie '{cookie.get('name')}' for {cookie.get('domain')}: {ce}")
+                print(f"[Browser] Loaded {success_count}/{len(valid_cookies)} cookies individually")
     
     page = await context.new_page()
     
     # 打开目标页面
     target_link = config.get("targetLink", "https://www.example.com")
-    await page.goto(target_link, wait_until="networkidle")
-    print(f"[Browser] Opened: {target_link}")
+    try:
+        await page.goto(target_link, wait_until="networkidle", timeout=60000)
+        print(f"[Browser] Opened: {target_link}")
+    except Exception as e:
+        print(f"[Browser] Warning: Page load issue - {e}")
 
 async def close_browser():
     """关闭浏览器"""
@@ -121,8 +191,37 @@ async def refresh_page():
     if not page:
         return {"status": "error", "message": "Browser not initialized"}
     
-    await page.reload(wait_until="networkidle")
-    return {"status": "success", "message": "Page refreshed"}
+    try:
+        await page.reload(wait_until="networkidle", timeout=60000)
+        return {"status": "success", "message": "Page refreshed"}
+    except Exception as e:
+        return {"status": "warning", "message": f"Refresh completed with issue: {e}"}
+
+@app.get("/navigate")
+async def navigate_to(url: str):
+    """导航到指定URL"""
+    global page
+    if not page:
+        return {"status": "error", "message": "Browser not initialized"}
+    
+    try:
+        await page.goto(url, wait_until="networkidle", timeout=60000)
+        return {"status": "success", "message": f"Navigated to {url}"}
+    except Exception as e:
+        return {"status": "warning", "message": f"Navigation completed with issue: {e}"}
+
+@app.get("/cookies")
+async def get_cookies():
+    """获取当前cookies"""
+    global context
+    if not context:
+        return {"status": "error", "message": "Browser not initialized"}
+    
+    try:
+        cookies = await context.cookies()
+        return {"status": "success", "count": len(cookies), "cookies": cookies}
+    except Exception as e:
+        return {"status": "error", "message": str(e)}
 
 @app.get("/health")
 async def health_check():