fix(api): 处理 PR 审查评论

- 添加 _client None 检查，防止 close() 后调用
- from_dict 增加列表元素类型校验
- 嵌套对象字段增加类型校验
- Cookie 选择改用 Playwright URL 作用域
- 测试文件添加 sys.path 注入
- pyproject.toml 添加 respx 到 test 依赖
- points_text 添加 None 检查

Author: Disaster-Terminator

pyproject.toml

@@ -48,6 +48,8 @@ test = [
     "pytest-xdist>=3.5.0",
     "hypothesis>=6.125.0",
     "faker>=35.0.0",
+    "httpx>=0.28.0",
+    "respx>=0.21.0",
 ]
 viz = [
     "streamlit>=1.41.0",

src/account/points_detector.py

@@ -125,7 +125,7 @@ async def get_current_points(self, page: Page, skip_navigation: bool = False) ->
                         points_text = await element.text_content()
                         logger.debug(f"找到积分文本: {points_text}")
 
-                        if points_text.strip():
+                        if points_text and points_text.strip():
                             points = self._parse_points(points_text.strip())
 
                             if points is not None and points >= 100:

src/api/dashboard_client.py

@@ -96,23 +96,14 @@ async def _get_cookies_header(self) -> str:
         """
         从 Page context 获取 cookies 字符串
 
-        只发送与 API 域名相关的 Cookie，避免跨域泄露。
+        使用 Playwright 的 URL 作用域 cookie 选择，让 Playwright 按浏览器规则
+        返回对该 URL 生效的 cookies（包括父域 cookies）。
 
         Returns:
             cookies 字符串
         """
-        from urllib.parse import urlparse
-
-        all_cookies = await self._page.context.cookies()
-        api_domain = urlparse(self._api_url).netloc
-
-        allowed_domains = {
-            api_domain,
-            f".{api_domain}",
-        }
-
-        filtered_cookies = [c for c in all_cookies if c["domain"] in allowed_domains]
-        return "; ".join(f"{c['name']}={c['value']}" for c in filtered_cookies)
+        cookies = await self._page.context.cookies([self._api_url])
+        return "; ".join(f"{c['name']}={c['value']}" for c in cookies)
 
     async def _call_api(self) -> DashboardData:
         """
@@ -133,6 +124,8 @@ async def _call_api(self) -> DashboardData:
 
         for attempt in range(self._max_retries + 1):
             try:
+                if self._client is None or self._client.is_closed:
+                    raise DashboardError("HTTP client has been closed")
                 response = await self._client.get(self._api_url, headers=headers)
                 response.raise_for_status()
                 data = response.json()

src/api/models.py

@@ -64,8 +64,10 @@ def from_dict(cls, data: dict[str, Any]) -> "SearchCounters":
         if not isinstance(mobile_raw, list):
             mobile_raw = []
 
-        pc_search = [SearchCounter.from_dict(item) for item in pc_raw]
-        mobile_search = [SearchCounter.from_dict(item) for item in mobile_raw]
+        pc_search = [SearchCounter.from_dict(item) for item in pc_raw if isinstance(item, dict)]
+        mobile_search = [
+            SearchCounter.from_dict(item) for item in mobile_raw if isinstance(item, dict)
+        ]
         return cls(pc_search=pc_search, mobile_search=mobile_search)
 
 
@@ -171,8 +173,16 @@ class UserStatus:
     def from_dict(cls, data: dict[str, Any]) -> "UserStatus":
         """从字典创建实例"""
         data = _transform_dict(data)
-        level_info = LevelInfo.from_dict(data.get("level_info", {}))
-        counters = SearchCounters.from_dict(data.get("counters", {}))
+        level_info_raw = data.get("level_info")
+        level_info = (
+            LevelInfo.from_dict(level_info_raw) if isinstance(level_info_raw, dict) else LevelInfo()
+        )
+        counters_raw = data.get("counters")
+        counters = (
+            SearchCounters.from_dict(counters_raw)
+            if isinstance(counters_raw, dict)
+            else SearchCounters()
+        )
         return cls(
             available_points=data.get("available_points", 0),
             level_info=level_info,
@@ -219,22 +229,29 @@ def from_dict(cls, data: dict[str, Any]) -> "DashboardData":
         more_promotions_data = data.get("more_promotions") or []
         if not isinstance(more_promotions_data, list):
             more_promotions_data = []
-        more_promotions = [Promotion.from_dict(item) for item in more_promotions_data]
+        more_promotions = [
+            Promotion.from_dict(item) for item in more_promotions_data if isinstance(item, dict)
+        ]
 
         punch_cards_data = data.get("punch_cards") or []
         if not isinstance(punch_cards_data, list):
             punch_cards_data = []
-        punch_cards = [PunchCard.from_dict(item) for item in punch_cards_data]
+        punch_cards = [
+            PunchCard.from_dict(item) for item in punch_cards_data if isinstance(item, dict)
+        ]
 
         streak_promotion = None
-        if data.get("streak_promotion"):
-            streak_promotion = StreakPromotion.from_dict(data["streak_promotion"])
+        streak_promotion_raw = data.get("streak_promotion")
+        if isinstance(streak_promotion_raw, dict):
+            streak_promotion = StreakPromotion.from_dict(streak_promotion_raw)
 
         streak_bonus_data = data.get("streak_bonus_promotions") or []
         if not isinstance(streak_bonus_data, list):
             streak_bonus_data = []
         streak_bonus_promotions = [
-            StreakBonusPromotion.from_dict(item) for item in streak_bonus_data
+            StreakBonusPromotion.from_dict(item)
+            for item in streak_bonus_data
+            if isinstance(item, dict)
         ]
 
         return cls(

tests/unit/test_dashboard_client.py

@@ -1,11 +1,15 @@
 """Dashboard Client 单元测试"""
 
+import sys
+from pathlib import Path
 from unittest.mock import AsyncMock, Mock
 
 import httpx
 import pytest
 import respx
 
+sys.path.insert(0, str(Path(__file__).parent.parent.parent / "src"))
+
 from api.dashboard_client import DashboardClient, DashboardError
 from api.models import DashboardData, SearchCounters
 
@@ -15,12 +19,14 @@ def mock_page():
     """Mock Playwright Page 对象"""
     page = Mock()
     page.context = Mock()
-    page.context.cookies = AsyncMock(
-        return_value=[
+
+    async def mock_cookies(urls=None):
+        return [
             {"name": "cookie1", "value": "value1", "domain": "rewards.bing.com"},
             {"name": "cookie2", "value": "value2", "domain": ".rewards.bing.com"},
         ]
-    )
+
+    page.context.cookies = mock_cookies
     page.content = AsyncMock(
         return_value="""
         <html>
@@ -58,9 +64,11 @@ def mock_page_no_dashboard():
     """没有 dashboard 变量的 Mock Page"""
     page = Mock()
     page.context = Mock()
-    page.context.cookies = AsyncMock(
-        return_value=[{"name": "cookie1", "value": "value1", "domain": "rewards.bing.com"}]
-    )
+
+    async def mock_cookies(urls=None):
+        return [{"name": "cookie1", "value": "value1", "domain": "rewards.bing.com"}]
+
+    page.context.cookies = mock_cookies
     page.content = AsyncMock(return_value="<html><body>no dashboard</body></html>")
     return page
 
@@ -525,22 +533,20 @@ async def test_search_counters_handles_scalar_values():
 
 
 async def test_cookie_filtering_by_domain(mock_page):
-    """测试 Cookie 按域名严格过滤"""
-    mock_page.context.cookies = AsyncMock(
-        return_value=[
+    """测试 Cookie 使用 Playwright URL 作用域选择"""
+
+    async def mock_cookies(urls=None):
+        return [
             {"name": "bing_cookie", "value": "bing_value", "domain": "bing.com"},
             {"name": "rewards_cookie", "value": "rewards_value", "domain": "rewards.bing.com"},
             {"name": "rewards_sub_cookie", "value": "sub_value", "domain": ".rewards.bing.com"},
-            {"name": "login_cookie", "value": "login_value", "domain": "login.live.com"},
-            {"name": "microsoft_cookie", "value": "ms_value", "domain": "microsoft.com"},
         ]
-    )
+
+    mock_page.context.cookies = mock_cookies
 
     client = DashboardClient(mock_page)
     cookies = await client._get_cookies_header()
 
-    assert "bing_cookie=bing_value" not in cookies
+    assert "bing_cookie=bing_value" in cookies
     assert "rewards_cookie=rewards_value" in cookies
     assert "rewards_sub_cookie=sub_value" in cookies
-    assert "login_cookie=login_value" not in cookies
-    assert "microsoft_cookie=ms_value" not in cookies