From 7a8d65d37de49f5f7840026fefe91b488d5b73c8 Mon Sep 17 00:00:00 2001 From: Misaka Mikoto <117180744+railgun19457@users.noreply.github.com> Date: Sat, 2 Aug 2025 14:03:53 +0800 Subject: [PATCH] feat: add plugins local cache and remote file MD5 validation (#2211) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 修改openai的嵌入模型默认维度为1024 * 为插件市场添加本地缓存 - 优先使用api获取，获取失败时则使用本地缓存 - 每次获取后会更新本地缓存 - 如果获取结果为空，判定为获取失败，使用本地缓存 - 前端页面添加刷新按钮，用于手动刷新本地缓存 * feat: 增强插件市场缓存机制，支持MD5校验以确保数据有效性 --------- Co-authored-by: Soulter <905617992@qq.com> --- astrbot/dashboard/routes/plugin.py | 139 +++++++++++++++++- .../locales/en-US/features/extension.json | 3 +- .../locales/zh-CN/features/extension.json | 3 +- dashboard/src/stores/common.js | 6 +- dashboard/src/views/ExtensionPage.vue | 36 ++++- 5 files changed, 177 insertions(+), 10 deletions(-) diff --git a/astrbot/dashboard/routes/plugin.py b/astrbot/dashboard/routes/plugin.py index 6f37609b2..179b45428 100644 --- a/astrbot/dashboard/routes/plugin.py +++ b/astrbot/dashboard/routes/plugin.py @@ -1,6 +1,8 @@ import traceback import aiohttp import os +import json +from datetime import datetime import ssl import certifi @@ -75,15 +77,33 @@ class PluginRoute(Route): async def get_online_plugins(self): custom = request.args.get("custom_registry") + force_refresh = request.args.get("force_refresh", "false").lower() == "true" + + cache_file = "data/plugins.json" if custom: urls = [custom] else: - urls = ["https://api.soulter.top/astrbot/plugins"] + urls = [ + "https://api.soulter.top/astrbot/plugins", + "https://github.com/AstrBotDevs/AstrBot_Plugins_Collection/raw/refs/heads/main/plugin_cache_original.json", + ] - # 新增：创建 SSL 上下文，使用 certifi 提供的根证书 + # 如果不是强制刷新，先检查缓存是否有效 + cached_data = None + if not force_refresh: + # 先检查MD5是否匹配，如果匹配则使用缓存 + if await self._is_cache_valid(cache_file): + cached_data = self._load_plugin_cache(cache_file) + if cached_data: + logger.debug("缓存MD5匹配，使用缓存的插件市场数据") + return Response().ok(cached_data).__dict__ + + # 尝试获取远程数据 + remote_data = None ssl_context = ssl.create_default_context(cafile=certifi.where()) connector = aiohttp.TCPConnector(ssl=ssl_context) + for url in urls: try: async with aiohttp.ClientSession( @@ -91,14 +111,123 @@ class PluginRoute(Route): ) as session: async with session.get(url) as response: if response.status == 200: - result = await response.json() - return Response().ok(result).__dict__ + remote_data = await response.json() + + # 检查远程数据是否为空 + if not remote_data or ( + isinstance(remote_data, dict) and len(remote_data) == 0 + ): + logger.warning(f"远程插件市场数据为空: {url}") + continue # 继续尝试其他URL或使用缓存 + + logger.info("成功获取远程插件市场数据") + # 获取最新的MD5并保存到缓存 + current_md5 = await self._get_remote_md5() + self._save_plugin_cache( + cache_file, remote_data, current_md5 + ) + return Response().ok(remote_data).__dict__ else: logger.error(f"请求 {url} 失败，状态码：{response.status}") except Exception as e: logger.error(f"请求 {url} 失败，错误：{e}") - return Response().error("获取插件列表失败").__dict__ + # 如果远程获取失败，尝试使用缓存数据 + if not cached_data: + cached_data = self._load_plugin_cache(cache_file) + + if cached_data: + logger.warning("远程插件市场数据获取失败，使用缓存数据") + return Response().ok(cached_data, "使用缓存数据，可能不是最新版本").__dict__ + + return Response().error("获取插件列表失败，且没有可用的缓存数据").__dict__ + + async def _is_cache_valid(self, cache_file: str) -> bool: + """检查缓存是否有效（基于MD5）""" + try: + if not os.path.exists(cache_file): + return False + + # 加载缓存文件 + with open(cache_file, "r", encoding="utf-8") as f: + cache_data = json.load(f) + + cached_md5 = cache_data.get("md5") + if not cached_md5: + logger.debug("缓存文件中没有MD5信息") + return False + + # 获取远程MD5 + remote_md5 = await self._get_remote_md5() + if not remote_md5: + logger.warning("无法获取远程MD5，将使用缓存") + return True # 如果无法获取远程MD5，认为缓存有效 + + is_valid = cached_md5 == remote_md5 + logger.debug( + f"插件数据MD5: 本地={cached_md5}, 远程={remote_md5}, 有效={is_valid}" + ) + return is_valid + + except Exception as e: + logger.warning(f"检查缓存有效性失败: {e}") + return False + + async def _get_remote_md5(self) -> str: + """获取远程插件数据的MD5""" + try: + ssl_context = ssl.create_default_context(cafile=certifi.where()) + connector = aiohttp.TCPConnector(ssl=ssl_context) + + async with aiohttp.ClientSession( + trust_env=True, connector=connector + ) as session: + async with session.get( + "https://api.soulter.top/astrbot/plugins-md5" + ) as response: + if response.status == 200: + data = await response.json() + return data.get("md5", "") + else: + logger.error(f"获取MD5失败，状态码：{response.status}") + return "" + except Exception as e: + logger.error(f"获取远程MD5失败: {e}") + return "" + + def _load_plugin_cache(self, cache_file: str): + """加载本地缓存的插件市场数据""" + try: + if os.path.exists(cache_file): + with open(cache_file, "r", encoding="utf-8") as f: + cache_data = json.load(f) + # 检查缓存是否有效 + if "data" in cache_data and "timestamp" in cache_data: + logger.debug( + f"加载缓存文件: {cache_file}, 缓存时间: {cache_data['timestamp']}" + ) + return cache_data["data"] + except Exception as e: + logger.warning(f"加载插件市场缓存失败: {e}") + return None + + def _save_plugin_cache(self, cache_file: str, data, md5: str = None): + """保存插件市场数据到本地缓存""" + try: + # 确保目录存在 + os.makedirs(os.path.dirname(cache_file), exist_ok=True) + + cache_data = { + "timestamp": datetime.now().isoformat(), + "data": data, + "md5": md5 or "", + } + + with open(cache_file, "w", encoding="utf-8") as f: + json.dump(cache_data, f, ensure_ascii=False, indent=2) + logger.debug(f"插件市场数据已缓存到: {cache_file}, MD5: {md5}") + except Exception as e: + logger.warning(f"保存插件市场缓存失败: {e}") async def get_plugins(self): _plugin_resp = [] diff --git a/dashboard/src/i18n/locales/en-US/features/extension.json b/dashboard/src/i18n/locales/en-US/features/extension.json index a9d0d1b2f..a586da59d 100644 --- a/dashboard/src/i18n/locales/en-US/features/extension.json +++ b/dashboard/src/i18n/locales/en-US/features/extension.json @@ -32,7 +32,8 @@ "cancel": "Cancel", "actions": "Actions", "back": "Back", - "selectFile": "Select File" + "selectFile": "Select File", + "refresh": "Refresh" }, "status": { "enabled": "Enabled", diff --git a/dashboard/src/i18n/locales/zh-CN/features/extension.json b/dashboard/src/i18n/locales/zh-CN/features/extension.json index a8e4559eb..61b30183e 100644 --- a/dashboard/src/i18n/locales/zh-CN/features/extension.json +++ b/dashboard/src/i18n/locales/zh-CN/features/extension.json @@ -32,7 +32,8 @@ "cancel": "取消", "actions": "操作", "back": "返回", - "selectFile": "选择文件" + "selectFile": "选择文件", + "refresh": "刷新" }, "status": { "enabled": "启用", diff --git a/dashboard/src/stores/common.js b/dashboard/src/stores/common.js index d87f969b3..fb951fc0a 100644 --- a/dashboard/src/stores/common.js +++ b/dashboard/src/stores/common.js @@ -159,7 +159,11 @@ export const useCommonStore = defineStore({ if (!force && this.pluginMarketData.length > 0) { return Promise.resolve(this.pluginMarketData); } - return axios.get('/api/plugin/market_list') + + // 如果是强制刷新，添加 force_refresh 参数 + const url = force ? '/api/plugin/market_list?force_refresh=true' : '/api/plugin/market_list'; + + return axios.get(url) .then((res) => { let data = [] for (let key in res.data.data) { diff --git a/dashboard/src/views/ExtensionPage.vue b/dashboard/src/views/ExtensionPage.vue index a3dbc9c37..9d159990b 100644 --- a/dashboard/src/views/ExtensionPage.vue +++ b/dashboard/src/views/ExtensionPage.vue @@ -71,6 +71,7 @@ const uploadTab = ref('file'); const showPluginFullName = ref(false); const marketSearch = ref(""); const filterKeys = ['name', 'desc', 'author']; +const refreshingMarket = ref(false); const plugin_handler_info_headers = computed(() => [ { title: tm('table.headers.eventType'), key: 'event_type_h' }, @@ -560,6 +561,25 @@ const newExtension = async () => { } }; +// 刷新插件市场数据 +const refreshPluginMarket = async () => { + refreshingMarket.value = true; + try { + // 强制刷新插件市场数据 + const data = await commonStore.getPluginCollections(true); + pluginMarketData.value = data; + trimExtensionName(); + checkAlreadyInstalled(); + checkUpdate(); + + toast(tm('messages.refreshSuccess'), "success"); + } catch (err) { + toast(tm('messages.refreshFailed') + " " + err, "error"); + } finally { + refreshingMarket.value = false; + } +}; + // 生命周期 onMounted(async () => { await getExtensions(); @@ -851,8 +871,20 @@ onMounted(async () => {

{{ tm('market.allPlugins') }}

- +
+ + mdi-refresh + {{ tm('buttons.refresh') }} + + +