python-library-ff14-the-hunt 0.0.4__tar.gz → 0.0.7__tar.gz

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/.cursor/skills/ff14_the_hunt-package-changelog/SKILL.md

@@ -7,6 +7,11 @@ description: ff14_the_hunt 包：要求与决议；最新在上。
 
 （规则见 `~/.cursor/skills/agent-project-changelog/SKILL.md`。）
 
+## 2026-06-10
+
+- **决议**：自动轮询：爬取、回调或循环内任意异常均记录后等待 60 秒继续，仅 ``KeyboardInterrupt`` / ``SystemExit`` 可终止服务。发布 ``0.0.6``。
+- **决议**：Bear Tracker / 区域地图 HTTP 经 ``common/urlopen_retry`` 对瞬时 TLS/网络错误指数退避重试。发布 ``0.0.5``。
+
 ## 2026-06-09
 
 - **决议**：``region_map_image_url`` 对区域名做 URL 编码，修复含空格等区域名（如 ``Yak T'el``）拉取狩猎地图时 ``InvalidURL`` 导致 ff14hub 崩溃。发布 ``0.0.4``。

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/.cursor/skills/ff14_the_hunt-package-preload/SKILL.md

@@ -1,25 +1,25 @@
----
-name: ff14-the-hunt-package-preload
-description: ff14_the_hunt 包：会话预加载；改本包源码前 Read。
----
-
-# ff14_the_hunt · 会话预加载
-
-## 初始化加载（Session preload）
-
-在 **`packages/ff14_the_hunt/`** 下改源码、测试或 `pyproject.toml` 时，按序 **Read**：
-
-1. `~/.cursor/skills/project-skill-manifest-policy/SKILL.md`
-2. `~/.cursor/skills/forbidden-doc-comment-vocabulary/SKILL.md`
-3. `~/.cursor/skills/markdown-authoring-zh/SKILL.md`
-4. `~/.cursor/skills/python-project-ai/SKILL.md`
-5. `~/.cursor/skills/python-doc-comments/SKILL.md`
-6. `~/.cursor/skills/agent-codegen-self-review/SKILL.md`
-7. `.cursor/skills/ff14_the_hunt-package-design/SKILL.md`
-8. `.cursor/skills/ff14_the_hunt-package-changelog/SKILL.md`
-
-整库约定见仓库根 `.cursor/skills/python-library-session-manifest/SKILL.md`。
-
-## 用过的 skill（追加记录）
-
-（初始为空。）
+---
+name: ff14-the-hunt-package-preload
+description: ff14_the_hunt 包：会话预加载；改本包源码前 Read。
+---
+
+# ff14_the_hunt · 会话预加载
+
+## 初始化加载（Session preload）
+
+在 **`packages/ff14_the_hunt/`** 下改源码、测试或 `pyproject.toml` 时，按序 **Read**：
+
+1. `~/.cursor/skills/project-skill-manifest-policy/SKILL.md`
+2. `~/.cursor/skills/forbidden-doc-comment-vocabulary/SKILL.md`
+3. `~/.cursor/skills/markdown-authoring-zh/SKILL.md`
+4. `~/.cursor/skills/python-project-ai/SKILL.md`
+5. `~/.cursor/skills/python-doc-comments/SKILL.md`
+6. `~/.cursor/skills/agent-codegen-self-review/SKILL.md`
+7. `.cursor/skills/ff14_the_hunt-package-design/SKILL.md`
+8. `.cursor/skills/ff14_the_hunt-package-changelog/SKILL.md`
+
+整库约定见仓库根 `.cursor/skills/python-library-session-manifest/SKILL.md`。
+
+## 用过的 skill（追加记录）
+
+（初始为空。）

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-library-ff14-the-hunt
-Version: 0.0.4
+Version: 0.0.7
 Requires-Python: >=3.10
 Requires-Dist: pydantic>=2.0
 Provides-Extra: dev

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/README.md

@@ -66,9 +66,9 @@ example.bat
 | --- | --- |
 | `POST /api/syncSession` | 狩猎库、刷点坐标、数据中心/世界列表 |
 | `POST /api/lastDeathTimers` | 计时行；`RankType` 为 `aRank` / `sRank` / `fate` |
-| `POST /api/querySpawnPoints` | 刚刷新记录的各刷点存活状态（需 `LastDeath`） |
+| `POST /api/querySpawnPoints` | 刚刷新记录的非触发点认证状态（需 `LastDeath`） |
 
-刚刷新记录才填充 ``spawn_points``、``spawn_map_layout`` 与 ``region_map``。包内不标点、不裁剪；``region_map`` 为站点 ``HuntRegions`` 原图 base64。刷点含 ``地图X/Y``、``格点X/Y``、``像素X/Y``（按原图尺寸算好）；``地图布局`` 含格点尺度与归一化公式。默认 ``include_spawn_maps=True`` 拉取原图。示例 ``python -m example`` 将 PNG 写入 ``example/output/maps/``，JSON 用 ``区域地图.地图文件`` 引用。
+刚刷新记录才填充 ``spawn_points``、``spawn_map_layout`` 与 ``region_map``。包内不标点、不裁剪；``region_map`` 为站点 ``HuntRegions`` 原图 base64。刷点仅保留未被 Sonar 或玩家认证为非触发的绿色候选点，含 ``地图X/Y``、``格点X/Y``、``像素X/Y``（按原图尺寸算好）；``地图布局`` 含格点尺度与归一化公式。默认 ``include_spawn_maps=True`` 拉取原图。示例 ``python -m example`` 将 PNG 写入 ``example/output/maps/``，JSON 用 ``区域地图.地图文件`` 引用。
 
 `QueryDeathTimers` 为世界名列表（由所选数据中心展开）。
 

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/bear_tracker/client.py

@@ -5,6 +5,8 @@ import urllib.error
 import urllib.request
 from typing import Any
 
+from ff14_the_hunt.common.urlopen_retry import urlopen_read
+
 DEFAULT_BASE_URL = "https://tracker.beartoolkit.com/api"
 
 
@@ -97,11 +99,7 @@ class BearTrackerClient:
             method="POST",
         )
         try:
-            with urllib.request.urlopen(
-                request,
-                timeout=self._timeout_seconds,
-            ) as response:
-                raw = response.read()
+            raw = urlopen_read(request, timeout=self._timeout_seconds)
         except urllib.error.HTTPError as exc:
             detail = exc.read().decode("utf-8", errors="replace")
             raise RuntimeError(

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/bear_tracker/enrich.py

@@ -7,10 +7,9 @@ from ff14_the_hunt.models import HuntMarkRecord, HuntQueryFilter
 
 from ff14_the_hunt.bear_tracker.fate_timer import compute_fate_timer
 from ff14_the_hunt.bear_tracker.resources import BearResources
-from ff14_the_hunt.bear_tracker.spawn_window import (
-    compute_trigger_timer,
-    is_recently_in_window,
-)
+from ff14_the_hunt.bear_tracker.spawn_window import (
+    compute_trigger_timer,
+)
 
 
 def mark_has_display_timer(record: HuntMarkRecord) -> bool:
@@ -88,13 +87,10 @@ def build_hunt_record(
         now=now,
     )
 
-    recently = is_recently_in_window(trigger, grace_seconds=recent_grace_seconds)
-    if last_mark and now is not None:
-        if now - float(last_mark) <= recent_grace_seconds:
-            recently = True
-    elif last_mark:
-        if time.time() - float(last_mark) <= recent_grace_seconds:
-            recently = True
+    recently = False
+    if last_mark:
+        reference_now = time.time() if now is None else now
+        recently = reference_now - float(last_mark) <= recent_grace_seconds
 
     region = meta.get("Region", "")
     return HuntMarkRecord(

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/bear_tracker/spawn_points.py

@@ -40,21 +40,17 @@ def list_map_coordinates(
         grid_y = float(raw[1])
         norm_x = (grid_x - 1.0) / scale
         norm_y = (grid_y - 1.0) / scale
-        state = None
-        if api_states and key in api_states:
-            entry = api_states[key]
-            if isinstance(entry, dict):
-                state_val = entry.get("State")
-                if state_val is not None:
-                    state = bool(state_val)
+        state = None
+        if api_states is not None:
+            state = key not in api_states
         coordinates.append(
             MapCoordinate(
                 point_key=key,
                 x=norm_x,
                 y=norm_y,
-                grid_x=grid_x,
-                grid_y=grid_y,
-                active=state,
-            )
-        )
+                grid_x=grid_x,
+                grid_y=grid_y,
+                active=state,
+            )
+        )
     return coordinates

python_library_ff14_the_hunt-0.0.7/ff14_the_hunt/common/urlopen_retry.py

@@ -0,0 +1,75 @@
+from __future__ import annotations
+
+import ssl
+import time
+import urllib.error
+import urllib.request
+
+_RETRYABLE_HTTP_CODES = frozenset({408, 429, 500, 502, 503, 504})
+_DEFAULT_MAX_ATTEMPTS = 4
+_DEFAULT_INITIAL_BACKOFF_SECONDS = 1.0
+_DEFAULT_MAX_BACKOFF_SECONDS = 8.0
+
+
+def is_retryable_urlopen_error(exc: BaseException) -> bool:
+    """判断 ``urlopen`` 相关异常是否宜短暂等待后重试。"""
+    if isinstance(exc, urllib.error.HTTPError):
+        return exc.code in _RETRYABLE_HTTP_CODES
+    if isinstance(exc, TimeoutError):
+        return True
+    if isinstance(exc, urllib.error.URLError):
+        reason = exc.reason
+        if isinstance(reason, TimeoutError):
+            return True
+        if isinstance(reason, (ssl.SSLError, ConnectionResetError, OSError)):
+            return True
+        return True
+    if isinstance(exc, (ssl.SSLError, ConnectionResetError, OSError)):
+        return True
+    return False
+
+
+def urlopen_read(
+    request: urllib.request.Request,
+    *,
+    timeout: float,
+    max_attempts: int = _DEFAULT_MAX_ATTEMPTS,
+    initial_backoff_seconds: float = _DEFAULT_INITIAL_BACKOFF_SECONDS,
+    max_backoff_seconds: float = _DEFAULT_MAX_BACKOFF_SECONDS,
+) -> bytes:
+    """``urlopen`` 读响应体；瞬时网络或 TLS 失败时指数退避重试。
+
+    Args:
+        request: 待发送请求。
+        timeout: 单次 ``urlopen`` 超时秒数。
+        max_attempts: 最多尝试次数（含首次）。
+        initial_backoff_seconds: 首次重试前等待秒数。
+        max_backoff_seconds: 退避等待上限秒数。
+
+    Returns:
+        响应体原始字节。
+
+    Raises:
+        urllib.error.HTTPError: 不可重试的 HTTP 状态，或重试耗尽后的 HTTP 错误。
+        urllib.error.URLError: 重试耗尽后的网络或 TLS 错误。
+        TimeoutError: 重试耗尽后的超时。
+    """
+    if max_attempts < 1:
+        raise ValueError("max_attempts must be >= 1")
+
+    last_exc: BaseException | None = None
+    backoff = initial_backoff_seconds
+    for attempt in range(max_attempts):
+        try:
+            with urllib.request.urlopen(request, timeout=timeout) as response:
+                return response.read()
+        except BaseException as exc:
+            last_exc = exc
+            if attempt + 1 >= max_attempts or not is_retryable_urlopen_error(exc):
+                raise
+            time.sleep(min(backoff, max_backoff_seconds))
+            backoff = min(backoff * 2.0, max_backoff_seconds)
+
+    if last_exc is not None:
+        raise last_exc
+    raise RuntimeError("urlopen_read ended without response or error")

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/ff14_the_hunt.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import threading
 import time
 from collections.abc import Callable
@@ -21,6 +22,9 @@ from ff14_the_hunt.spawn_map.region_fetch import RegionMapFetcher, site_root_fro
 
 HuntCrawlCallback = Callable[[HuntCrawlPacket], None]
 
+_log = logging.getLogger(__name__)
+_FETCH_FAILURE_RETRY_SECONDS = 60.0
+
 
 class FF14TheHunt:
     """FF14 狩猎追踪门面：当前对接 [Bear Tracker](https://tracker.beartoolkit.com/timer)。"""
@@ -63,7 +67,7 @@ class FF14TheHunt:
             min_wakeup_seconds: 全未开窗时睡到最近开窗的下限（秒），默认 2 分钟。
             poll_interval_seconds: 已废弃；等同 ``fallback_poll_interval_seconds``。
             recent_grace_seconds: 「刚刷新」宽限秒数。
-            include_spawn_states: 已废弃；刚刷新记录的存活点会在补全刷点时自动查询。
+            include_spawn_states: 已废弃；刚刷新记录的候选点会在补全刷点时自动查询。
             include_spawn_maps: 为刚刷新记录拉取站点区域原图 PNG base64。
             include_untimed_marks: 是否保留无计时的占位行（SS 级噬灵王、维护占位等）。
         """
@@ -317,17 +321,33 @@ class FF14TheHunt:
         if stop_event is None:
             return
 
-        marks = self._scheduler.fetch()
-        self._emit_crawl(self._make_crawl_packet(marks))
-
         while not stop_event.is_set():
-            wait_seconds = self._scheduler.seconds_until_next_fetch()
-            if wait_seconds > 0 and wait_or_stop(stop_event, wait_seconds):
-                break
-            if stop_event.is_set():
-                break
+            try:
+                self._poll_once_or_wait(stop_event)
+                if stop_event.is_set():
+                    break
+                wait_seconds = self._scheduler.seconds_until_next_fetch()
+                if wait_seconds > 0 and wait_or_stop(stop_event, wait_seconds):
+                    break
+            except KeyboardInterrupt:
+                raise
+            except Exception as exc:
+                _log.exception("狩猎轮询意外错误，%s 秒后继续：%s", _FETCH_FAILURE_RETRY_SECONDS, exc)
+                wait_or_stop(stop_event, _FETCH_FAILURE_RETRY_SECONDS)
+
+    def _poll_once_or_wait(self, stop_event: threading.Event) -> None:
+        try:
             marks = self._scheduler.fetch()
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except Exception as exc:
+            _log.warning("狩猎爬取失败，%s 秒后重试：%s", _FETCH_FAILURE_RETRY_SECONDS, exc)
+            wait_or_stop(stop_event, _FETCH_FAILURE_RETRY_SECONDS)
+            return
+        try:
             self._emit_crawl(self._make_crawl_packet(marks))
+        except Exception as exc:
+            _log.exception("狩猎爬取回调失败，已跳过本轮展示：%s", exc)
 
     def _make_crawl_packet(self, marks: list[HuntMarkRecord]) -> HuntCrawlPacket:
         crawled_at = self._scheduler.last_crawl_at

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/locale/cn.py

@@ -152,7 +152,7 @@ def mark_to_display_dict(
                 "像素Y": point.pixel_y,
                 "格点X": point.grid_x,
                 "格点Y": point.grid_y,
-                "存活": point.active,
+                "可能触发": point.active,
             }
             for point in mark.spawn_points
         ]

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/models.py

@@ -58,7 +58,7 @@ class MapCoordinate(BaseModel):
         default=None,
         description="区域原图上的 Y 像素；norm_y * 图高",
     )
-    active: bool | None = Field(default=None, description="querySpawnPoints 返回的存活点位状态")
+    active: bool | None = Field(default=None, description="是否仍是可能触发点位")
 
 
 class SpawnMapLayout(BaseModel):
@@ -127,7 +127,7 @@ class HuntMarkRecord(BaseModel):
     fate_timer: TimerDisplay | None = None
     spawn_points: list[MapCoordinate] = Field(
         default_factory=list,
-        description="仅刚刷新记录填充；有存活点时只保留存活点",
+        description="仅刚刷新记录填充；只保留可能触发点位",
     )
     spawn_map_layout: SpawnMapLayout | None = Field(
         default=None,

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/spawn_map/points.py

@@ -3,12 +3,10 @@ from __future__ import annotations
 from ff14_the_hunt.models import MapCoordinate
 
 
-def select_display_spawn_points(points: list[MapCoordinate]) -> list[MapCoordinate]:
-    """刚刷新记录上要展示的刷点；有存活点时只保留存活点。"""
+def select_display_spawn_points(points: list[MapCoordinate]) -> list[MapCoordinate]:
+    """刚刷新记录上只展示仍可能触发的绿色候选点。"""
     active = [point for point in points if point.active is True]
-    if active:
-        return active
-    return list(points)
+    return active
 
 
 def resolve_region_name(region: str | list[str]) -> str:

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/ff14_the_hunt/spawn_map/region_fetch.py

@@ -4,6 +4,8 @@ import urllib.error
 import urllib.parse
 import urllib.request
 
+from ff14_the_hunt.common.urlopen_retry import urlopen_read
+
 
 def site_root_from_api_base(base_url: str) -> str:
     """由 Bear Tracker ``/api`` 根地址推导站点静态资源根。"""
@@ -62,11 +64,7 @@ class RegionMapFetcher:
             method="GET",
         )
         try:
-            with urllib.request.urlopen(
-                request,
-                timeout=self._timeout_seconds,
-            ) as response:
-                data = response.read()
+            data = urlopen_read(request, timeout=self._timeout_seconds)
         except urllib.error.HTTPError as exc:
             detail = exc.read().decode("utf-8", errors="replace")
             raise RuntimeError(

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-library-ff14-the-hunt"
-version = "0.0.4"
+version = "0.0.7"
 requires-python = ">=3.10"
 dependencies = [
     "pydantic>=2.0",

{python_library_ff14_the_hunt-0.0.4 → python_library_ff14_the_hunt-0.0.7}/tests/test_ff14_the_hunt_service.py

@@ -1,6 +1,7 @@
 import threading
 import time
-from unittest.mock import MagicMock
+import urllib.error
+from unittest.mock import MagicMock, patch
 
 from ff14_the_hunt import FF14TheHunt, HuntCrawlPacket, HuntQueryFilter, HuntRankKind
 from ff14_the_hunt.bear_tracker.timer_theme import build_timer_display
@@ -110,6 +111,31 @@ def test_wait_or_stop() -> None:
     assert wait_or_stop(stop_event, 1.0) is True
 
 
+def test_poll_loop_survives_callback_failure() -> None:
+    hunt, _mock_query = _hunt_with_mock_query()
+    hunt.on_crawl(lambda _packet: (_ for _ in ()).throw(RuntimeError("sink")))
+    stop_event = threading.Event()
+    hunt._poll_once_or_wait(stop_event)  # type: ignore[attr-defined]
+
+
+def test_poll_loop_survives_fetch_failure() -> None:
+    hunt, mock_query = _hunt_with_mock_query()
+    seen: list[HuntCrawlPacket] = []
+    hunt.on_crawl(lambda packet: seen.append(packet))
+    mock_query.side_effect = [
+        urllib.error.URLError("transient"),
+        [_sample_mark()],
+    ]
+
+    stop_event = threading.Event()
+    with patch("ff14_the_hunt.ff14_the_hunt.wait_or_stop", return_value=False):
+        hunt._poll_once_or_wait(stop_event)  # type: ignore[attr-defined]
+        hunt._poll_once_or_wait(stop_event)  # type: ignore[attr-defined]
+
+    assert mock_query.call_count == 2
+    assert len(seen) == 1
+
+
 def test_wait_or_stop_wakes_early_on_stop() -> None:
     stop_event = threading.Event()
 

python_library_ff14_the_hunt-0.0.7/tests/test_recent_spawn_detection.py

@@ -0,0 +1,59 @@
+from ff14_the_hunt.bear_tracker.enrich import build_hunt_record
+from ff14_the_hunt.bear_tracker.resources import BearResources
+from ff14_the_hunt.models import HuntQueryFilter
+
+
+_RESOURCES = BearResources(
+    {
+        "DatabaseHunt": {
+            "Sansheya": {
+                "Patch": "DT",
+                "Region": "Shaaloani",
+                "Rank": 3,
+                "RespawnTimer": [46.0, 2.0],
+            },
+        },
+        "SpawnPoint": {},
+        "DataCenters": {},
+    },
+)
+
+
+def _row(**overrides) -> dict:
+    row = {
+        "huntKey": "Sansheya",
+        "huntName": "Sansheya",
+        "worldName": "Test",
+        "isMaint": False,
+        "lastDeathTime": 1_000_000.0,
+    }
+    row.update(overrides)
+    return row
+
+
+def test_open_window_without_last_mark_is_not_recently_spawned() -> None:
+    record = build_hunt_record(
+        timer_row=_row(),
+        resources=_RESOURCES,
+        query=HuntQueryFilter(),
+        now=1_000_000.0 + 46 * 3600 + 60,
+        recent_grace_seconds=900.0,
+    )
+
+    assert record is not None
+    assert record.trigger_timer is not None
+    assert record.recently_spawned is False
+
+
+def test_recent_last_mark_is_recently_spawned() -> None:
+    now = 1_000_000.0 + 46 * 3600 + 60
+    record = build_hunt_record(
+        timer_row=_row(lastMarkTime=now - 30),
+        resources=_RESOURCES,
+        query=HuntQueryFilter(),
+        now=now,
+        recent_grace_seconds=900.0,
+    )
+
+    assert record is not None
+    assert record.recently_spawned is True

python_library_ff14_the_hunt-0.0.7/tests/test_spawn_map_points.py

@@ -0,0 +1,44 @@
+from ff14_the_hunt.models import MapCoordinate
+from ff14_the_hunt.bear_tracker.spawn_points import list_map_coordinates
+from ff14_the_hunt.spawn_map.points import select_display_spawn_points
+
+
+def test_select_display_spawn_points_keeps_only_possible_points() -> None:
+    points = [
+        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=False),
+        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=True),
+    ]
+    selected = select_display_spawn_points(points)
+    assert len(selected) == 1
+    assert selected[0].point_key == "SpawnPoint02"
+
+
+def test_select_display_spawn_points_does_not_fallback_to_excluded_points() -> None:
+    points = [
+        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=None),
+        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=False),
+    ]
+    selected = select_display_spawn_points(points)
+    assert selected == []
+
+
+def test_list_map_coordinates_marks_unreported_points_as_possible() -> None:
+    points = list_map_coordinates(
+        {
+            "Dimensions": [41, 41],
+            "DisplayPoints": 3,
+            "SpawnPoint01": [1, 1],
+            "SpawnPoint02": [2, 2],
+            "SpawnPoint03": [3, 3],
+        },
+        api_states={
+            "SpawnPoint01": {"State": True, "Verified": True},
+            "SpawnPoint02": {"State": False, "Verified": True},
+        },
+    )
+
+    assert [(point.point_key, point.active) for point in points] == [
+        ("SpawnPoint01", False),
+        ("SpawnPoint02", False),
+        ("SpawnPoint03", True),
+    ]

python_library_ff14_the_hunt-0.0.7/tests/test_urlopen_retry.py

@@ -0,0 +1,59 @@
+import ssl
+import urllib.error
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from ff14_the_hunt.common.urlopen_retry import is_retryable_urlopen_error, urlopen_read
+
+
+def test_is_retryable_urlopen_error_for_ssl_eof() -> None:
+    ssl_exc = ssl.SSLEOFError("EOF occurred in violation of protocol")
+    url_error = urllib.error.URLError(ssl_exc)
+    assert is_retryable_urlopen_error(url_error) is True
+
+
+def test_is_retryable_urlopen_error_for_http_404() -> None:
+    http_error = urllib.error.HTTPError(
+        url="https://example.test",
+        code=404,
+        msg="Not Found",
+        hdrs=None,
+        fp=None,
+    )
+    assert is_retryable_urlopen_error(http_error) is False
+
+
+def test_urlopen_read_retries_transient_failure() -> None:
+    request = MagicMock()
+    response = MagicMock()
+    response.read.return_value = b"ok"
+    response.__enter__.return_value = response
+    response.__exit__.return_value = False
+
+    ssl_exc = ssl.SSLEOFError("EOF occurred in violation of protocol")
+    url_error = urllib.error.URLError(ssl_exc)
+
+    with patch("ff14_the_hunt.common.urlopen_retry.time.sleep"):
+        with patch(
+            "ff14_the_hunt.common.urlopen_retry.urllib.request.urlopen",
+            side_effect=[url_error, response],
+        ) as mock_urlopen:
+            raw = urlopen_read(request, timeout=5.0, max_attempts=3)
+
+    assert raw == b"ok"
+    assert mock_urlopen.call_count == 2
+
+
+def test_urlopen_read_raises_after_exhausted_retries() -> None:
+    request = MagicMock()
+    ssl_exc = ssl.SSLEOFError("EOF occurred in violation of protocol")
+    url_error = urllib.error.URLError(ssl_exc)
+
+    with patch("ff14_the_hunt.common.urlopen_retry.time.sleep"):
+        with patch(
+            "ff14_the_hunt.common.urlopen_retry.urllib.request.urlopen",
+            side_effect=url_error,
+        ):
+            with pytest.raises(urllib.error.URLError):
+                urlopen_read(request, timeout=5.0, max_attempts=2)

python_library_ff14_the_hunt-0.0.4/tests/test_spawn_map_points.py

@@ -1,21 +0,0 @@
-from ff14_the_hunt.models import MapCoordinate
-from ff14_the_hunt.spawn_map.points import select_display_spawn_points
-
-
-def test_select_display_spawn_points_prefers_active() -> None:
-    points = [
-        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=False),
-        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=True),
-    ]
-    selected = select_display_spawn_points(points)
-    assert len(selected) == 1
-    assert selected[0].point_key == "SpawnPoint02"
-
-
-def test_select_display_spawn_points_keeps_all_when_no_active() -> None:
-    points = [
-        MapCoordinate(point_key="SpawnPoint01", x=0.1, y=0.2, active=None),
-        MapCoordinate(point_key="SpawnPoint02", x=0.3, y=0.4, active=False),
-    ]
-    selected = select_display_spawn_points(points)
-    assert len(selected) == 2