refactor: derive archive urls and enrich fetch errors

Author: zouyonghe

astrbot/core/updator.py

@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 import time
 from json import JSONDecodeError
@@ -220,10 +221,19 @@ async def _resolve_latest_target(self) -> tuple[str, str]:
             raise Exception("当前已经是最新版本。")
         return latest_version, latest_release["zipball_url"]
 
-    def _resolve_nightly_target(self) -> tuple[str, str]:
-        return self.NIGHTLY_TAG, (
-            f"https://github.com/AstrBotDevs/AstrBot/archive/refs/tags/{self.NIGHTLY_TAG}.zip"
+    def _resolve_github_archive_base(self) -> str:
+        match = re.search(
+            r"/repos/([^/]+)/([^/]+)/releases/?$",
+            self.GITHUB_RELEASE_API,
         )
+        if match is None:
+            raise Exception("GITHUB_RELEASE_API 格式不正确，无法解析仓库信息。")
+        owner, repo = match.groups()
+        return f"https://github.com/{owner}/{repo}/archive"
+
+    def _resolve_nightly_target(self) -> tuple[str, str]:
+        archive_base = self._resolve_github_archive_base()
+        return self.NIGHTLY_TAG, (f"{archive_base}/refs/tags/{self.NIGHTLY_TAG}.zip")
 
     async def _resolve_tag_target(self, version_str: str) -> tuple[str, str]:
         releases = await self.get_releases()
@@ -235,9 +245,10 @@ async def _resolve_tag_target(self, version_str: str) -> tuple[str, str]:
     def _resolve_commit_target(self, version_str: str) -> tuple[str, str]:
         if len(version_str) != 40:
             raise Exception("commit hash 长度不正确，应为 40")
+        archive_base = self._resolve_github_archive_base()
         return (
             version_str,
-            f"https://github.com/AstrBotDevs/AstrBot/archive/{version_str}.zip",
+            f"{archive_base}/{version_str}.zip",
         )
 
     async def _resolve_update_target(

astrbot/core/zip_updator.py

@@ -43,6 +43,32 @@ def __str__(self) -> str:
 class FetchReleaseError(Exception):
     """Expected errors while fetching release metadata from remote services."""
 
+    def __init__(
+        self,
+        message: str,
+        *,
+        url: str | None = None,
+        status_code: int | None = None,
+        detail: str | None = None,
+    ) -> None:
+        super().__init__(message)
+        self.message = message
+        self.url = url
+        self.status_code = status_code
+        self.detail = detail
+
+    def __str__(self) -> str:
+        context_parts = []
+        if self.url:
+            context_parts.append(f"url={self.url}")
+        if self.status_code is not None:
+            context_parts.append(f"status_code={self.status_code}")
+        if self.detail:
+            context_parts.append(f"detail={self.detail}")
+        if not context_parts:
+            return self.message
+        return f"{self.message} ({', '.join(context_parts)})"
+
 
 class RepoZipUpdator:
     def __init__(self, repo_mirror: str = "") -> None:
@@ -59,7 +85,11 @@ def _normalize_release_payload(result: object, url: str) -> list:
             logger.error(
                 f"版本信息格式异常，期望列表或字典，实际为: {type(result).__name__}, url: {url}",
             )
-            raise FetchReleaseError("版本信息格式异常")
+            raise FetchReleaseError(
+                "版本信息格式异常",
+                url=url,
+                detail=f"top_level_type={type(result).__name__}",
+            )
 
         if not releases:
             return []
@@ -107,7 +137,11 @@ def _normalize_release_payload(result: object, url: str) -> list:
             )
 
         if not normalized:
-            raise FetchReleaseError("版本信息全部无效")
+            raise FetchReleaseError(
+                "版本信息全部无效",
+                url=url,
+                detail=f"invalid_entries={invalid_entry_count}, total_entries={len(releases)}",
+            )
 
         return normalized
 
@@ -135,13 +169,25 @@ async def fetch_release_info(self, url: str) -> list:
                     logger.error(
                         f"请求 {url} 失败，状态码: {response.status}, 内容: {text}",
                     )
-                    raise FetchReleaseError(f"请求失败，状态码: {response.status}")
+                    raise FetchReleaseError(
+                        "请求失败",
+                        url=url,
+                        status_code=response.status,
+                        detail=text[:500],
+                    )
                 result = await response.json()
         except FetchReleaseError:
             raise
         except (TimeoutError, aiohttp.ClientError, JSONDecodeError) as e:
-            logger.error(f"解析版本信息时发生异常: {e}")
-            raise FetchReleaseError("解析版本信息失败") from e
+            logger.error(
+                "解析版本信息时发生异常。"
+                f"url={url}, error_type={type(e).__name__}, detail={e}",
+            )
+            raise FetchReleaseError(
+                "解析版本信息失败",
+                url=url,
+                detail=f"{type(e).__name__}: {e}",
+            ) from e
 
         return self._normalize_release_payload(result, url)
 

tests/unit/test_updator.py

@@ -79,6 +79,21 @@ def test_normalize_release_payload_raises_when_all_entries_invalid():
         )
 
 
+def test_normalize_release_payload_error_contains_context():
+    updator = RepoZipUpdator()
+    malformed_payload = ["invalid-release-item"]
+
+    with pytest.raises(FetchReleaseError) as exc_info:
+        updator._normalize_release_payload(
+            malformed_payload,
+            "https://example.invalid/releases",
+        )
+
+    error = exc_info.value
+    assert error.url == "https://example.invalid/releases"
+    assert error.detail is not None
+
+
 @pytest.mark.asyncio
 async def test_update_supports_nightly_tag(monkeypatch, tmp_path):
     updator = AstrBotUpdator()
@@ -110,6 +125,35 @@ def mock_unzip_file(zip_path: str, target_dir: str):
     assert captured["target_dir"] == str(tmp_path)
 
 
+def test_resolve_nightly_target_uses_repo_from_release_api():
+    updator = AstrBotUpdator()
+    updator.GITHUB_RELEASE_API = (
+        "https://api.github.com/repos/example-org/example-repo/releases"
+    )
+
+    target_version, file_url = updator._resolve_nightly_target()
+    assert target_version == "nightly"
+    assert (
+        file_url
+        == "https://github.com/example-org/example-repo/archive/refs/tags/nightly.zip"
+    )
+
+
+def test_resolve_commit_target_uses_repo_from_release_api():
+    updator = AstrBotUpdator()
+    updator.GITHUB_RELEASE_API = (
+        "https://api.github.com/repos/example-org/example-repo/releases"
+    )
+    version_str = "1234567890123456789012345678901234567890"
+
+    target_version, file_url = updator._resolve_commit_target(version_str)
+    assert target_version == version_str
+    assert (
+        file_url
+        == "https://github.com/example-org/example-repo/archive/1234567890123456789012345678901234567890.zip"
+    )
+
+
 @pytest.mark.asyncio
 async def test_get_releases_includes_nightly_tag(monkeypatch):
     updator = AstrBotUpdator()