refactor: simplify updater target branching and release artifacts

Author: zouyonghe

.github/workflows/release.yml

@@ -146,16 +146,13 @@ jobs:
           echo "${{ needs.resolve-release-context.outputs.tag }}" > dashboard/dist/assets/version
           cd dashboard
           zip -r "AstrBot-${{ needs.resolve-release-context.outputs.tag }}-dashboard.zip" dist
-          cp "AstrBot-${{ needs.resolve-release-context.outputs.tag }}-dashboard.zip" dist.zip
 
       - name: Upload dashboard artifact
         uses: actions/upload-artifact@v7
         with:
           name: Dashboard-${{ needs.resolve-release-context.outputs.tag }}
           if-no-files-found: error
-          path: |
-            dashboard/AstrBot-${{ needs.resolve-release-context.outputs.tag }}-dashboard.zip
-            dashboard/dist.zip
+          path: dashboard/AstrBot-${{ needs.resolve-release-context.outputs.tag }}-dashboard.zip
 
       - name: Upload dashboard package to Cloudflare R2
         if: ${{ env.R2_ACCOUNT_ID != '' && env.R2_ACCESS_KEY_ID != '' && env.R2_SECRET_ACCESS_KEY != '' && needs.resolve-release-context.outputs.tag != 'nightly' }}

astrbot/core/updator.py

@@ -158,18 +158,11 @@ def _is_expected_nightly_fetch_error(exc: BaseException) -> bool:
             JSONDecodeError,
             FetchReleaseError,
         )
-        current: BaseException | None = exc
-        seen: set[int] = set()
-        while current is not None and id(current) not in seen:
-            seen.add(id(current))
-            if isinstance(current, expected_types):
-                return True
-            current = getattr(current, "__cause__", None) or getattr(
-                current,
-                "__context__",
-                None,
-            )
-        return False
+        if isinstance(exc, expected_types):
+            return True
+
+        cause = getattr(exc, "__cause__", None) or getattr(exc, "__context__", None)
+        return isinstance(cause, expected_types)
 
     async def get_nightly_release(self) -> dict | None:
         nightly_release_url = f"{self.GITHUB_RELEASE_API}/tags/{self.NIGHTLY_TAG}"
@@ -201,6 +194,44 @@ async def get_releases_with_nightly(self, latest: bool = True) -> list:
             releases.insert(0, nightly_release)
         return releases
 
+    async def _resolve_latest_target(self) -> tuple[str, str]:
+        releases = await self.get_releases(latest=True)
+        latest_release = next(
+            (
+                item
+                for item in releases
+                if item.get("tag_name", "").lower() != self.NIGHTLY_TAG
+            ),
+            None,
+        )
+        if latest_release is None:
+            raise Exception("未找到可用的发布版本。")
+
+        latest_version = latest_release["tag_name"]
+        if self.compare_version(VERSION, latest_version) >= 0:
+            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"
+        )
+
+    async def _resolve_tag_target(self, version_str: str) -> tuple[str, str]:
+        releases = await self.get_releases(latest=False)
+        for data in releases:
+            if data["tag_name"] == version_str:
+                return version_str, data["zipball_url"]
+        raise Exception(f"未找到版本号为 {version_str} 的更新文件。")
+
+    def _resolve_commit_target(self, version_str: str) -> tuple[str, str]:
+        if len(version_str) != 40:
+            raise Exception("commit hash 长度不正确，应为 40")
+        return (
+            version_str,
+            f"https://github.com/AstrBotDevs/AstrBot/archive/{version_str}.zip",
+        )
+
     async def _resolve_update_target(
         self,
         latest: bool,
@@ -209,41 +240,15 @@ async def _resolve_update_target(
         version_str = str(version) if version is not None else ""
 
         if latest:
-            releases = await self.get_releases(latest=True)
-            latest_release = next(
-                (
-                    item
-                    for item in releases
-                    if item.get("tag_name", "").lower() != self.NIGHTLY_TAG
-                ),
-                None,
-            )
-            if latest_release is None:
-                raise Exception("未找到可用的发布版本。")
-
-            latest_version = latest_release["tag_name"]
-            if self.compare_version(VERSION, latest_version) >= 0:
-                raise Exception("当前已经是最新版本。")
-            return latest_version, latest_release["zipball_url"]
+            return await self._resolve_latest_target()
 
         if version_str.lower() == self.NIGHTLY_TAG:
-            return self.NIGHTLY_TAG, (
-                f"https://github.com/AstrBotDevs/AstrBot/archive/refs/tags/{self.NIGHTLY_TAG}.zip"
-            )
+            return self._resolve_nightly_target()
 
         if version_str.startswith("v"):
-            releases = await self.get_releases(latest=False)
-            for data in releases:
-                if data["tag_name"] == version_str:
-                    return version_str, data["zipball_url"]
-            raise Exception(f"未找到版本号为 {version_str} 的更新文件。")
+            return await self._resolve_tag_target(version_str)
 
-        if len(version_str) != 40:
-            raise Exception("commit hash 长度不正确，应为 40")
-        return (
-            version_str,
-            f"https://github.com/AstrBotDevs/AstrBot/archive/{version_str}.zip",
-        )
+        return self._resolve_commit_target(version_str)
 
     async def update(self, reboot=False, latest=True, version=None, proxy="") -> None:
         if os.environ.get("ASTRBOT_CLI") or os.environ.get("ASTRBOT_LAUNCHER"):