refactor: simplify updater target resolution and nightly handling

Author: zouyonghe

.github/workflows/release.yml

@@ -30,10 +30,10 @@ jobs:
       nightly_tag: ${{ steps.nightly-tag.outputs.nightly_tag }}
       repo_slug: ${{ steps.repo-slug.outputs.repo_slug }}
     steps:
-      - name: Checkout repository for constants
+      - name: Checkout repository
         uses: actions/checkout@v6
         with:
-          fetch-depth: 1
+          fetch-depth: 0
 
       - name: Resolve nightly tag
         id: nightly-tag
@@ -88,11 +88,23 @@ jobs:
 
           echo "ref=$ref" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout repository at release ref
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          ref: ${{ steps.checkout-ref.outputs.ref }}
+      - name: Switch repository to release ref
+        shell: bash
+        run: |
+          target_ref="${{ steps.checkout-ref.outputs.ref }}"
+          if [ -z "$target_ref" ]; then
+            echo "Resolved checkout ref is empty." >&2
+            exit 1
+          fi
+
+          if ! git checkout --force "$target_ref" >/tmp/git_checkout_ref.log 2>&1; then
+            if ! git fetch --force origin "$target_ref" >/tmp/git_fetch_ref.log 2>&1; then
+              echo "Failed to fetch checkout ref: $target_ref" >&2
+              cat /tmp/git_fetch_ref.log >&2 || true
+              exit 1
+            fi
+            git checkout --force FETCH_HEAD
+          fi
 
       - name: Resolve tag
         id: tag

astrbot/core/release_constants.py

@@ -1,4 +1,10 @@
+import re
+
 NIGHTLY_TAG = "nightly"
 GITHUB_REPO_SLUG = "AstrBotDevs/AstrBot"
 GITHUB_RELEASE_API = f"https://api.github.com/repos/{GITHUB_REPO_SLUG}/releases"
 GITHUB_ARCHIVE_BASE = f"https://github.com/{GITHUB_REPO_SLUG}/archive"
+PRERELEASE_TAG_REGEX = re.compile(
+    rf"[\-_.]?(alpha|beta|rc|dev|{re.escape(NIGHTLY_TAG)}|pre|preview)[\-_.]?\d*$",
+    re.IGNORECASE,
+)

astrbot/core/updator.py

@@ -10,12 +10,13 @@
     GITHUB_ARCHIVE_BASE,
     GITHUB_RELEASE_API,
     NIGHTLY_TAG,
+    PRERELEASE_TAG_REGEX,
 )
 from astrbot.core.utils.astrbot_path import get_astrbot_path
 from astrbot.core.utils.io import download_file
 
 from .zip_updator import (
-    PRERELEASE_TAG_REGEX,
+    FetchReleaseError,
     ReleaseInfo,
     RepoZipUpdator,
 )
@@ -169,7 +170,7 @@ async def get_releases_with_nightly(self) -> list[dict]:
         nightly_release_url = f"{self.GITHUB_RELEASE_API}/tags/{self.NIGHTLY_TAG}"
         try:
             nightly_releases = await self.fetch_release_info(nightly_release_url)
-        except Exception as e:
+        except (FetchReleaseError, TimeoutError, OSError) as e:
             logger.warning(
                 "获取 nightly 发布信息失败，跳过 nightly。"
                 f"url={nightly_release_url}, error_type={type(e).__name__}, detail={e}",
@@ -184,7 +185,29 @@ async def get_releases_with_nightly(self) -> list[dict]:
             releases.insert(0, nightly_release)
         return releases
 
-    def _parse_update_target(
+    async def _resolve_nightly_target(self) -> tuple[str, str]:
+        nightly_release_url = f"{self.GITHUB_RELEASE_API}/tags/{self.NIGHTLY_TAG}"
+        fallback = (
+            self.NIGHTLY_TAG,
+            f"{self.GITHUB_ARCHIVE_BASE}/refs/tags/{self.NIGHTLY_TAG}.zip",
+        )
+        try:
+            nightly_releases = await self.fetch_release_info(nightly_release_url)
+        except (FetchReleaseError, TimeoutError, OSError) as e:
+            logger.warning(
+                "获取 nightly 发布信息失败，使用归档地址。"
+                f"url={nightly_release_url}, error_type={type(e).__name__}, detail={e}",
+            )
+            return fallback
+
+        if not nightly_releases:
+            return fallback
+
+        nightly_release = nightly_releases[0]
+        zip_url = nightly_release.get("zipball_url", fallback[1])
+        return self.NIGHTLY_TAG, zip_url
+
+    async def _resolve_update_target(
         self,
         latest: bool,
         version: str | None,
@@ -198,31 +221,6 @@ def _parse_update_target(
             )
 
         if latest:
-            return "latest", ""
-
-        if not version_str:
-            raise AstrBotUpdateError("invalid_target", "未指定有效的更新目标。")
-
-        if version_str.lower() == self.NIGHTLY_TAG:
-            return "nightly", self.NIGHTLY_TAG
-
-        if version_str.startswith("v"):
-            return "tag", version_str
-
-        if len(version_str) != 40:
-            raise AstrBotUpdateError(
-                "invalid_target", "commit hash 长度不正确，应为 40"
-            )
-        return "commit", version_str
-
-    async def _resolve_update_target(
-        self,
-        latest: bool,
-        version: str | None,
-    ) -> tuple[str, str]:
-        kind, value = self._parse_update_target(latest, version)
-
-        if kind == "latest":
             releases = await self.get_releases()
             latest_release = next(
                 (
@@ -240,38 +238,34 @@ async def _resolve_update_target(
                 raise AstrBotUpdateError("up_to_date", "当前已经是最新版本。")
             return latest_version, latest_release["zipball_url"]
 
-        if kind == "nightly":
-            releases = await self.get_releases_with_nightly()
-            nightly_release = next(
-                (
-                    item
-                    for item in releases
-                    if item.get("tag_name", "").lower() == self.NIGHTLY_TAG
-                ),
-                None,
-            )
-            if nightly_release is not None:
-                return self.NIGHTLY_TAG, nightly_release["zipball_url"]
-            return self.NIGHTLY_TAG, (
-                f"{self.GITHUB_ARCHIVE_BASE}/refs/tags/{self.NIGHTLY_TAG}.zip"
-            )
+        if not version_str:
+            raise AstrBotUpdateError("invalid_target", "未指定有效的更新目标。")
+
+        if version_str.lower() == self.NIGHTLY_TAG:
+            return await self._resolve_nightly_target()
 
-        if kind == "tag":
+        if version_str.startswith("v"):
             releases = await self.get_releases()
             for data in releases:
-                if data.get("tag_name") == value:
-                    return value, data["zipball_url"]
+                if data.get("tag_name") == version_str:
+                    return version_str, data["zipball_url"]
             raise AstrBotUpdateError(
                 "file_not_found",
-                f"未找到版本号为 {value} 的更新文件。",
+                f"未找到版本号为 {version_str} 的更新文件。",
             )
 
-        return value, f"{self.GITHUB_ARCHIVE_BASE}/{value}.zip"
+        if len(version_str) != 40:
+            raise AstrBotUpdateError(
+                "invalid_target",
+                "commit hash 长度不正确，应为 40",
+            )
+        return version_str, f"{self.GITHUB_ARCHIVE_BASE}/{version_str}.zip"
 
     async def update(self, reboot=False, latest=True, version=None, proxy="") -> None:
         if os.environ.get("ASTRBOT_CLI") or os.environ.get("ASTRBOT_LAUNCHER"):
-            raise Exception(
-                "Error: You are running AstrBot via CLI, please use `pip` or `uv tool upgrade` to update AstrBot."
+            raise AstrBotUpdateError(
+                "invalid_environment",
+                "Error: You are running AstrBot via CLI, please use `pip` or `uv tool upgrade` to update AstrBot.",
             )  # 避免版本管理混乱
 
         try:

astrbot/core/zip_updator.py

@@ -10,14 +10,10 @@
 import certifi
 
 from astrbot.core import logger
-from astrbot.core.release_constants import NIGHTLY_TAG
+from astrbot.core.release_constants import PRERELEASE_TAG_REGEX
 from astrbot.core.utils.io import download_file, on_error
 from astrbot.core.utils.version_comparator import VersionComparator
 
-PRERELEASE_TAG_REGEX = re.compile(
-    rf"[\-_.]?(alpha|beta|rc|dev|{re.escape(NIGHTLY_TAG)}|pre|preview)[\-_.]?\d*$",
-    re.IGNORECASE,
-)
 # Keep this rule aligned with dashboard/src/layouts/full/vertical-header/VerticalHeader.vue.
 
 

tests/unit/test_prerelease_rule_sync.py

@@ -1,7 +1,7 @@
 import re
 from pathlib import Path
 
-from astrbot.core.zip_updator import PRERELEASE_TAG_REGEX
+from astrbot.core.release_constants import PRERELEASE_TAG_REGEX
 
 
 def test_prerelease_rule_is_synced_with_dashboard():

tests/unit/test_updator.py

@@ -142,10 +142,12 @@ async def test_resolve_update_target_nightly_uses_archive_fallback(monkeypatch):
     updator = AstrBotUpdator()
     updator.GITHUB_ARCHIVE_BASE = "https://github.com/example-org/example-repo/archive"
 
-    async def mock_get_releases_with_nightly():
-        return []
+    async def mock_fetch_release_info(url: str):
+        if url == f"{updator.GITHUB_RELEASE_API}/tags/{updator.NIGHTLY_TAG}":
+            raise FetchReleaseError("请求失败")
+        raise AssertionError(f"unexpected URL: {url}")
 
-    monkeypatch.setattr(updator, "get_releases_with_nightly", mock_get_releases_with_nightly)
+    monkeypatch.setattr(updator, "fetch_release_info", mock_fetch_release_info)
 
     target_version, file_url = await updator._resolve_update_target(
         latest=False,
@@ -341,7 +343,7 @@ async def mock_fetch_release_info(url: str):
 
 
 @pytest.mark.asyncio
-async def test_get_releases_with_nightly_falls_back_on_unexpected_nightly_error(
+async def test_get_releases_with_nightly_raises_for_unexpected_nightly_error(
     monkeypatch,
 ):
     updator = AstrBotUpdator()
@@ -362,9 +364,8 @@ async def mock_fetch_release_info(url: str):
 
     monkeypatch.setattr(updator, "fetch_release_info", mock_fetch_release_info)
 
-    releases = await updator.get_releases_with_nightly()
-    assert len(releases) == 1
-    assert releases[0]["tag_name"] == "v9.9.9"
+    with pytest.raises(KeyError):
+        await updator.get_releases_with_nightly()
 
 
 @pytest.mark.asyncio