⚡ 添加github镜像

zhenxun/builtin_plugins/plugin_store/config.py

@@ -5,17 +5,11 @@ BASE_PATH = Path() / "zhenxun"
 BASE_PATH.mkdir(parents=True, exist_ok=True)
 
 
-CONFIG_URL = "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins/plugins.json"
-"""插件信息文件"""
-
-CONFIG_INDEX_URL = "https://raw.githubusercontent.com/zhenxun-org/zhenxun_bot_plugins_index/index/plugins.json"
-"""插件索引库信息文件"""
-
-CONFIG_INDEX_CDN_URL = "https://cdn.jsdelivr.net/gh/zhenxun-org/zhenxun_bot_plugins_index@index/plugins.json"
-"""插件索引库信息文件cdn"""
-
 DEFAULT_GITHUB_URL = "https://github.com/zhenxun-org/zhenxun_bot_plugins/tree/main"
-"""默认github仓库地址"""
+"""伴生插件github仓库地址"""
+
+EXTRA_GITHUB_URL = "https://github.com/zhenxun-org/zhenxun_bot_plugins_index/tree/index"
+"""插件库索引github仓库地址"""
 
 GITHUB_REPO_URL_PATTERN = re.compile(
     r"^https://github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)(/tree/(?P<branch>[^/]+))?$"

zhenxun/builtin_plugins/plugin_store/data_source.py

@@ -3,6 +3,7 @@ import subprocess
 from pathlib import Path
 
 import ujson as json
+from aiocache import cached
 
 from zhenxun.services.log import logger
 from zhenxun.utils.http_utils import AsyncHttpx
@@ -19,12 +20,9 @@ from zhenxun.builtin_plugins.plugin_store.models import (
 
 from .config import (
     BASE_PATH,
-    CONFIG_URL,
-    CONFIG_INDEX_URL,
+    EXTRA_GITHUB_URL,
     DEFAULT_GITHUB_URL,
-    CONFIG_INDEX_CDN_URL,
     JSD_PACKAGE_API_FORMAT,
-    GITHUB_REPO_URL_PATTERN,
 )
 
 
@@ -140,6 +138,7 @@ def install_requirement(plugin_path: Path):
 
 class ShopManage:
     @classmethod
+    @cached(60)
     async def __get_data(cls) -> dict[str, StorePluginInfo]:
         """获取插件信息数据
 
@@ -149,12 +148,14 @@ class ShopManage:
         返回:
             dict: 插件信息数据
         """
-        res = await AsyncHttpx.get(CONFIG_URL)
-        res2 = await AsyncHttpx.get(CONFIG_INDEX_URL)
-
-        if res2.status_code != 200:
-            logger.info("访问第三方插件信息文件失败，改为进行cdn访问")
-            res2 = await AsyncHttpx.get(CONFIG_INDEX_CDN_URL)
+        default_github_url = await RepoInfo.parse_github_url(
+            DEFAULT_GITHUB_URL
+        ).get_download_url_with_path("plugins.json")
+        extra_github_url = await RepoInfo.parse_github_url(
+            EXTRA_GITHUB_URL
+        ).get_download_url_with_path("plugins.json")
+        res = await AsyncHttpx.get(default_github_url)
+        res2 = await AsyncHttpx.get(extra_github_url)
 
         # 检查请求结果
         if res.status_code != 200 or res2.status_code != 200:
@@ -274,7 +275,7 @@ class ShopManage:
         return f"插件 {plugin_key} 安装成功! 重启后生效"
 
     @classmethod
-    async def get_repo_package_info(cls, repo_info: RepoInfo) -> JsdPackageInfo:
+    async def get_repo_package_info_of_jsd(cls, repo_info: RepoInfo) -> JsdPackageInfo:
         """获取插件包信息
 
         参数:
@@ -291,19 +292,13 @@ class ShopManage:
             raise ValueError(f"下载错误, code: {res.status_code}")
         return JsdPackageInfo(**res.json())
 
-    @classmethod
-    def expand_github_url(cls, github_url: str) -> RepoInfo:
-        if matched := GITHUB_REPO_URL_PATTERN.match(github_url):
-            return RepoInfo(**matched.groupdict())  # type: ignore
-        raise ValueError("github地址格式错误")
-
     @classmethod
     async def install_plugin_with_repo(
         cls, github_url: str, module_path: str, is_dir: bool, is_external: bool = False
     ):
-        repo_info = cls.expand_github_url(github_url)
+        repo_info = RepoInfo.parse_github_url(github_url)
         logger.debug(f"成功获取仓库信息: {repo_info}", "插件管理")
-        jsd_package_info: JsdPackageInfo = await cls.get_repo_package_info(
+        jsd_package_info: JsdPackageInfo = await cls.get_repo_package_info_of_jsd(
             repo_info=repo_info
         )
         files = full_files_path(jsd_package_info, module_path, is_dir)
@@ -313,7 +308,9 @@ class ShopManage:
             is_dir,
         )
         logger.debug(f"获取插件文件列表: {files}", "插件管理")
-        download_urls = [repo_info.get_download_url_with_path(file) for file in files]
+        download_urls = [
+            await repo_info.get_download_url_with_path(file) for file in files
+        ]
         base_path = BASE_PATH / "plugins" if is_external else BASE_PATH
         download_paths: list[Path | str] = [base_path / file for file in files]
         logger.debug(f"插件下载路径: {download_paths}", "插件管理")
@@ -332,7 +329,7 @@ class ShopManage:
             )
             logger.debug(f"获取插件依赖文件列表: {req_files}", "插件管理")
             req_download_urls = [
-                repo_info.get_download_url_with_path(file) for file in req_files
+                await repo_info.get_download_url_with_path(file) for file in req_files
             ]
             req_paths: list[Path | str] = [plugin_path / file for file in req_files]
             logger.debug(f"插件依赖文件下载路径: {req_paths}", "插件管理")

zhenxun/builtin_plugins/plugin_store/models.py

@@ -1,7 +1,11 @@
+from aiocache import cached
 from strenum import StrEnum
 from pydantic import BaseModel, validator
 
 from zhenxun.utils.enum import PluginType
+from zhenxun.utils.http_utils import AsyncHttpx
+
+from .config import GITHUB_REPO_URL_PATTERN
 
 type2name: dict[str, str] = {
     "NORMAL": "普通插件",
@@ -39,11 +43,39 @@ class RepoInfo(BaseModel):
     branch: str | None
 
     @validator("branch", pre=True, always=True)
-    def set_default_branch(cls, v):
+    def _set_default_branch(cls, v):
         return "main" if v is None else v
 
-    def get_download_url_with_path(self, path: str):
-        return f"https://raw.githubusercontent.com/{self.owner}/{self.repo}/{self.branch}/{path}"
+    async def get_download_url_with_path(self, path: str):
+        url_format = await self.get_fastest_format()
+        return url_format.format(**self.dict(), path=path)
+
+    @classmethod
+    def parse_github_url(cls, github_url: str) -> "RepoInfo":
+        if matched := GITHUB_REPO_URL_PATTERN.match(github_url):
+            return RepoInfo(**matched.groupdict())
+        raise ValueError("github地址格式错误")
+
+    @classmethod
+    @cached()
+    async def get_fastest_format(cls) -> str:
+        """获取最快下载地址格式"""
+        raw_format = "https://raw.githubusercontent.com/{owner}/{repo}/{branch}/{path}"
+        patterns: dict[str, str] = {
+            (
+                "https://raw.githubusercontent.com"
+                "/zhenxun-org/zhenxun_bot_plugins/main"
+                "/plugins.json"
+            ): raw_format,
+            "https://ghproxy.cc/": f"https://ghproxy.cc/{raw_format}",
+            "https://mirror.ghproxy.com/": f"https://mirror.ghproxy.com/{raw_format}",
+            "https://gh-proxy.com/": f"https://gh-proxy.com/{raw_format}",
+            "https://cdn.jsdelivr.net/": "https://cdn.jsdelivr.net/gh/{owner}/{repo}@{branch}/{path}",
+        }
+        sorted_urls = await AsyncHttpx.get_fastest_mirror(list(patterns.keys()))
+        if not sorted_urls:
+            raise Exception("无法获取任意GitHub资源加速地址，请检查网络")
+        return patterns[sorted_urls[0]]
 
 
 class FileType(StrEnum):