版本更新 (#1666)

* ✨ 父级插件加载 * ✅ 添加测试：更新与添加插件 (#1594) * ✅ 测试更新与添加插件 * ✅ Sourcery建议 * 👷 添加pytest * 🎨 优化代码 * 🐛 bug修复 * 🐛修复添加插件返回403的问题 (#1595) * 完善测试方法 * vscode测试配置 * 重构插件安装过程 * 🎨 修改readme * Update README.md * 🐛 修改bug与版本锁定 * 🐛 修复超级用户对群组功能开关 * 🐛 修复插件商店检查插件更新问题 (#1597) * 🐛 修复插件商店检查插件更新问题 * 🐛 恶意命令检测问题 * 🐛 增加插件状态检查 (#1598) * ✅ 优化测试用例 * 🐛 更改插件更新与安装逻辑 * 🐛 修复更新群组成员信息 * 🎨 代码优化 * 🚀 更新Dockerfile (#1599) * 🎨 更新requirements * ➕ 添加依赖aiocache * ⚡ 添加github镜像 * ✨ 添加仓库目录多获取渠道 * 🐛 修复测试用例 * ✨ 添加API缓存 * 🎨 采取Sourcery建议 * 🐛 文件下载逻辑修改 * 🎨 优化代码 * 🐛 修复插件开关有时出现错误 * ✨ 重构自检ui * 🐛 自检html修正 * 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606) * 修复签到功能已知问题 * 修复签到功能已知问题 * 修改参数名称 * 修改uid判断 --------- Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🎨 代码结构优化 * 🐛 私聊时修改插件时删除私聊帮助 * 🐛 过滤父插件 * 🐛 修复自检在ARM上的问题 (#1607) * 🐛 修复自检在ARM上的问题 * ✅ 优化测试 * ✨ 支持mysql，psql，sqlite随机函数 * 🔧 VSCode配置修改 * 🔧 VSCode配置修改 * ✨ 添加金币排行 Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 📝 修改README Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🔨 提取GitHub相关操作 (#1609) * 🔨 提取GitHub相关操作 * 🔨 重构API策略 * ✨ 签到/金币排行限制最大数量 (#1616) * ✨ 签到/金币排行限制最大数量 * 🐛 修复超级用户id获取问题 * 🐛 修复路径解压与挂载 (#1619) * 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620) * 🐛 签到文本适应 (#1622) * 🐛 好感度排行提供默认值 (#1624) * 🎈 优先使用github api (#1625) * ✨ 重构帮助，限制普通用户查询管理插件 (#1626) * 🐛 修复群权限与插件等级匹配 (#1627) * ✨ 当管理员尝试ban真寻时将被反杀 (#1628) * ✨ 群组发言时间检测提供开关配置 (#1630) * 🐳 chore: 支持自动修改版本号 (#1629) * 🎈 perf(github_utils): 支持github url下载遍历 (#1632) * 🎈 perf(github_utils): 支持github url下载遍历 * 🐞 fix(http_utils): 修复一些下载问题 * 🦄 refactor(http_utils): 部分重构 * chore(version): Update version to v0.2.2-e6f17c4 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🧪 test(auto_update): 修复测试用例 (#1633) * 🐛 修复商店商品为空时报错 (#1634) * 🐛 修复群权限与插件等级匹配 (#1635) * ✨ message_build支持AtAll (#1639) * 🎈 perf: 使用commit号下载插件 (#1641) * 🎈 perf: 使用commit号下载插件 * chore(version): Update version to v0.2.2-f9c7360 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🐳 chore: 修改运行检查触发路径 (#1642) * 🐳 chore: 修改运行检查触发路径 * 🐳 chore: 添加tests目录 * ✨ 重构qq群事件处理 (#1643) * 🐛 签到名称自适应 (#1644) * 🎨 更新README (#1645) * 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647) * 🐛 修复群组中帮助功能状态显示问题 (#1650) * 🐛 修复群欢迎消息设置 (#1651) * 🐛 修复webui下载后首次启动错误 (#1652) * 🐛 修复webui下载后首次启动错误 * chore(version): Update version to v0.2.2-4a8ef85 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 移除默认图片文件夹：爬 (#1653) * ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654) * ✨ 新增超级用户与管理员帮助模板 (#1655) * ✨ 新增个人信息命令 (#1657) * ✨ 修改个人信息菜单名称 (#1658) * ✨ 新增插件商店api (#1659) * ✨ 新增插件商店api * chore(version): Update version to v0.2.2-7e15f20 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 将cd，block，count限制复原配置文件 (#1662) * 🎨 修改README (#1663) * 🎨 修改版本号 (#1664) * 🎨 修改requirements (#1665) --------- Co-authored-by: AkashiCoin <l1040186796@gmail.com> Co-authored-by: fanyinrumeng <42991257+fanyinrumeng@users.noreply.github.com> Co-authored-by: AkashiCoin <i@loli.vet> Co-authored-by: Elaga <1728903318@qq.com> Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>
2026-09-29 00:32:06 +08:00 · 2024-10-01 00:42:23 +08:00
parent daa40ae8b8
commit 4e33bf3a50
216 changed files with 10281 additions and 2538 deletions
@@ -0,0 +1,232 @@
+from typing import Protocol
+
+from aiocache import cached
+from strenum import StrEnum
+from pydantic import BaseModel
+
+from ..http_utils import AsyncHttpx
+from .consts import CACHED_API_TTL, GIT_API_TREES_FORMAT, JSD_PACKAGE_API_FORMAT
+from .func import (
+    get_fastest_raw_formats,
+    get_fastest_archive_formats,
+    get_fastest_release_source_formats,
+)
+
+
+class RepoInfo(BaseModel):
+    """仓库信息"""
+
+    owner: str
+    repo: str
+    branch: str = "main"
+
+    async def get_raw_download_url(self, path: str) -> str:
+        return (await self.get_raw_download_urls(path))[0]
+
+    async def get_archive_download_url(self) -> str:
+        return (await self.get_archive_download_urls())[0]
+
+    async def get_release_source_download_url_tgz(self, version: str) -> str:
+        return (await self.get_release_source_download_urls_tgz(version))[0]
+
+    async def get_release_source_download_url_zip(self, version: str) -> str:
+        return (await self.get_release_source_download_urls_zip(version))[0]
+
+    async def get_raw_download_urls(self, path: str) -> list[str]:
+        url_formats = await get_fastest_raw_formats()
+        return [
+            url_format.format(**self.dict(), path=path) for url_format in url_formats
+        ]
+
+    async def get_archive_download_urls(self) -> list[str]:
+        url_formats = await get_fastest_archive_formats()
+        return [url_format.format(**self.dict()) for url_format in url_formats]
+
+    async def get_release_source_download_urls_tgz(self, version: str) -> list[str]:
+        url_formats = await get_fastest_release_source_formats()
+        return [
+            url_format.format(**self.dict(), version=version, compress="tar.gz")
+            for url_format in url_formats
+        ]
+
+    async def get_release_source_download_urls_zip(self, version: str) -> list[str]:
+        url_formats = await get_fastest_release_source_formats()
+        return [
+            url_format.format(**self.dict(), version=version, compress="zip")
+            for url_format in url_formats
+        ]
+
+
+class APIStrategy(Protocol):
+    """API策略"""
+
+    body: BaseModel
+
+    async def parse_repo_info(self, repo_info: RepoInfo) -> BaseModel: ...
+
+    def get_files(self, module_path: str, is_dir: bool) -> list[str]: ...
+
+
+class RepoAPI:
+    """基础接口"""
+
+    def __init__(self, strategy: APIStrategy):
+        self.strategy = strategy
+
+    async def parse_repo_info(self, repo_info: RepoInfo):
+        body = await self.strategy.parse_repo_info(repo_info)
+        self.strategy.body = body
+
+    def get_files(self, module_path: str, is_dir: bool) -> list[str]:
+        return self.strategy.get_files(module_path, is_dir)
+
+
+class FileType(StrEnum):
+    """文件类型"""
+
+    FILE = "file"
+    DIR = "directory"
+    PACKAGE = "gh"
+
+
+class FileInfo(BaseModel):
+    """文件信息"""
+
+    type: FileType
+    name: str
+    files: list["FileInfo"] = []
+
+
+class JsdelivrStrategy:
+    """Jsdelivr策略"""
+
+    body: FileInfo
+
+    def get_file_paths(self, module_path: str, is_dir: bool = True) -> list[str]:
+        """获取文件路径"""
+        paths = module_path.split("/")
+        filename = "" if is_dir else paths[-1]
+        paths = paths if is_dir else paths[:-1]
+        cur_file = self.body
+        for path in paths:  # 导航到正确的目录
+            cur_file = next(
+                (
+                    f
+                    for f in cur_file.files
+                    if f.type == FileType.DIR and f.name == path
+                ),
+                None,
+            )
+            if not cur_file:
+                raise ValueError(f"模块路径{module_path}不存在")
+
+        def collect_files(file: FileInfo, current_path: str, filename: str):
+            """收集文件"""
+            if file.type == FileType.FILE and (not filename or file.name == filename):
+                return [f"{current_path}/{file.name}"]
+            elif file.type == FileType.DIR and file.files:
+                return [
+                    path
+                    for f in file.files
+                    for path in collect_files(
+                        f,
+                        (
+                            f"{current_path}/{f.name}"
+                            if f.type == FileType.DIR
+                            else current_path
+                        ),
+                        filename,
+                    )
+                ]
+            return []
+
+        return collect_files(cur_file, "/".join(paths), filename)
+
+    @classmethod
+    @cached(ttl=CACHED_API_TTL)
+    async def parse_repo_info(cls, repo_info: RepoInfo) -> "FileInfo":
+        """解析仓库信息"""
+
+        """获取插件包信息
+
+        参数:
+            repo_info: 仓库信息
+
+        返回:
+            FileInfo: 插件包信息
+        """
+        jsd_package_url: str = JSD_PACKAGE_API_FORMAT.format(
+            owner=repo_info.owner, repo=repo_info.repo, branch=repo_info.branch
+        )
+        res = await AsyncHttpx.get(url=jsd_package_url)
+        if res.status_code != 200:
+            raise ValueError(f"下载错误, code: {res.status_code}")
+        return FileInfo(**res.json())
+
+    def get_files(self, module_path: str, is_dir: bool = True) -> list[str]:
+        """获取文件路径"""
+        return self.get_file_paths(module_path, is_dir)
+
+
+class TreeType(StrEnum):
+    """树类型"""
+
+    FILE = "blob"
+    DIR = "tree"
+
+
+class Tree(BaseModel):
+    """树"""
+
+    path: str
+    mode: str
+    type: TreeType
+    sha: str
+    size: int | None
+    url: str
+
+
+class TreeInfo(BaseModel):
+    """树信息"""
+
+    sha: str
+    url: str
+    tree: list[Tree]
+
+
+class GitHubStrategy:
+    """GitHub策略"""
+
+    body: TreeInfo
+
+    def export_files(self, module_path: str) -> list[str]:
+        """导出文件路径"""
+        tree_info = self.body
+        return [
+            file.path
+            for file in tree_info.tree
+            if file.type == TreeType.FILE and file.path.startswith(module_path)
+        ]
+
+    @classmethod
+    @cached(ttl=CACHED_API_TTL)
+    async def parse_repo_info(cls, repo_info: RepoInfo) -> "TreeInfo":
+        """获取仓库树
+
+        参数:
+            repo_info: 仓库信息
+
+        返回:
+            TreesInfo: 仓库树信息
+        """
+        git_tree_url: str = GIT_API_TREES_FORMAT.format(
+            owner=repo_info.owner, repo=repo_info.repo, branch=repo_info.branch
+        )
+        res = await AsyncHttpx.get(url=git_tree_url)
+        if res.status_code != 200:
+            raise ValueError(f"下载错误, code: {res.status_code}")
+        return TreeInfo(**res.json())
+
+    def get_files(self, module_path: str, is_dir: bool = True) -> list[str]:
+        """获取文件路径"""
+        return self.export_files(module_path)