AstrBot 4.8.0__py3-none-any.whl → 4.9.1__py3-none-any.whl

astrbot/dashboard/routes/plugin.py

@@ -1,14 +1,17 @@
 import asyncio
+import hashlib
 import json
 import os
 import ssl
 import traceback
+from dataclasses import dataclass
 from datetime import datetime
 
 import aiohttp
 import certifi
 from quart import request
 
+from astrbot.api import sp
 from astrbot.core import DEMO_MODE, file_token_service, logger
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.star.filter.command import CommandFilter
@@ -25,6 +28,13 @@ PLUGIN_UPDATE_CONCURRENCY = (
 )
 
 
+@dataclass
+class RegistrySource:
+    urls: list[str]
+    cache_file: str
+    md5_url: str | None  # None means "no remote MD5, always treat cache as stale"
+
+
 class PluginRoute(Route):
     def __init__(
         self,
@@ -45,6 +55,8 @@ class PluginRoute(Route):
             "/plugin/on": ("POST", self.on_plugin),
             "/plugin/reload": ("POST", self.reload_plugins),
             "/plugin/readme": ("GET", self.get_plugin_readme),
+            "/plugin/source/get": ("GET", self.get_custom_source),
+            "/plugin/source/save": ("POST", self.save_custom_source),
         }
         self.core_lifecycle = core_lifecycle
         self.plugin_manager = plugin_manager
@@ -84,22 +96,15 @@ class PluginRoute(Route):
         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",
-                "https://github.com/AstrBotDevs/AstrBot_Plugins_Collection/raw/refs/heads/main/plugin_cache_original.json",
-            ]
+        # 构建注册表源信息
+        source = self._build_registry_source(custom)
 
         # 如果不是强制刷新，先检查缓存是否有效
         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 await self._is_cache_valid(source):
+                cached_data = self._load_plugin_cache(source.cache_file)
                 if cached_data:
                     logger.debug("缓存MD5匹配，使用缓存的插件市场数据")
                     return Response().ok(cached_data).__dict__
@@ -109,7 +114,7 @@ class PluginRoute(Route):
         ssl_context = ssl.create_default_context(cafile=certifi.where())
         connector = aiohttp.TCPConnector(ssl=ssl_context)
 
-        for url in urls:
+        for url in source.urls:
             try:
                 async with (
                     aiohttp.ClientSession(
@@ -119,7 +124,11 @@ class PluginRoute(Route):
                     session.get(url) as response,
                 ):
                     if response.status == 200:
-                        remote_data = await response.json()
+                        try:
+                            remote_data = await response.json()
+                        except aiohttp.ContentTypeError:
+                            remote_text = await response.text()
+                            remote_data = json.loads(remote_text)
 
                         # 检查远程数据是否为空
                         if not remote_data or (
@@ -128,11 +137,13 @@ class PluginRoute(Route):
                             logger.warning(f"远程插件市场数据为空: {url}")
                             continue  # 继续尝试其他URL或使用缓存
 
-                        logger.info("成功获取远程插件市场数据")
+                        logger.info(
+                            f"成功获取远程插件市场数据，包含 {len(remote_data)} 个插件"
+                        )
                         # 获取最新的MD5并保存到缓存
-                        current_md5 = await self._get_remote_md5()
+                        current_md5 = await self._fetch_remote_md5(source.md5_url)
                         self._save_plugin_cache(
-                            cache_file,
+                            source.cache_file,
                             remote_data,
                             current_md5,
                         )
@@ -143,7 +154,7 @@ class PluginRoute(Route):
 
         # 如果远程获取失败，尝试使用缓存数据
         if not cached_data:
-            cached_data = self._load_plugin_cache(cache_file)
+            cached_data = self._load_plugin_cache(source.cache_file)
 
         if cached_data:
             logger.warning("远程插件市场数据获取失败，使用缓存数据")
@@ -151,39 +162,47 @@ class PluginRoute(Route):
 
         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, encoding="utf-8") as f:
-                cache_data = json.load(f)
+    def _build_registry_source(self, custom_url: str | None) -> RegistrySource:
+        """构建注册表源信息"""
+        if custom_url:
+            # 对自定义URL生成一个安全的文件名
+            url_hash = hashlib.md5(custom_url.encode()).hexdigest()[:8]
+            cache_file = f"data/plugins_custom_{url_hash}.json"
 
-            cached_md5 = cache_data.get("md5")
-            if not cached_md5:
-                logger.debug("缓存文件中没有MD5信息")
-                return False
+            # 更安全的后缀处理方式
+            if custom_url.endswith(".json"):
+                md5_url = custom_url[:-5] + "-md5.json"
+            else:
+                md5_url = custom_url + "-md5.json"
 
-            # 获取远程MD5
-            remote_md5 = await self._get_remote_md5()
-            if not remote_md5:
-                logger.warning("无法获取远程MD5，将使用缓存")
-                return True  # 如果无法获取远程MD5，认为缓存有效
+            urls = [custom_url]
+        else:
+            cache_file = "data/plugins.json"
+            md5_url = "https://api.soulter.top/astrbot/plugins-md5"
+            urls = [
+                "https://api.soulter.top/astrbot/plugins",
+                "https://github.com/AstrBotDevs/AstrBot_Plugins_Collection/raw/refs/heads/main/plugin_cache_original.json",
+            ]
+        return RegistrySource(urls=urls, cache_file=cache_file, md5_url=md5_url)
 
-            is_valid = cached_md5 == remote_md5
-            logger.debug(
-                f"插件数据MD5: 本地={cached_md5}, 远程={remote_md5}, 有效={is_valid}",
-            )
-            return is_valid
+    def _load_cached_md5(self, cache_file: str) -> str | None:
+        """从缓存文件中加载MD5"""
+        if not os.path.exists(cache_file):
+            return None
 
+        try:
+            with open(cache_file, encoding="utf-8") as f:
+                cache_data = json.load(f)
+            return cache_data.get("md5")
         except Exception as e:
-            logger.warning(f"检查缓存有效性失败: {e}")
-            return False
+            logger.warning(f"加载缓存MD5失败: {e}")
+            return None
+
+    async def _fetch_remote_md5(self, md5_url: str | None) -> str | None:
+        """获取远程MD5"""
+        if not md5_url:
+            return None
 
-    async def _get_remote_md5(self) -> str:
-        """获取远程插件数据的MD5"""
         try:
             ssl_context = ssl.create_default_context(cafile=certifi.where())
             connector = aiohttp.TCPConnector(ssl=ssl_context)
@@ -193,18 +212,37 @@ class PluginRoute(Route):
                     trust_env=True,
                     connector=connector,
                 ) as session,
-                session.get(
-                    "https://api.soulter.top/astrbot/plugins-md5",
-                ) as response,
+                session.get(md5_url) as response,
             ):
                 if response.status == 200:
                     data = await response.json()
                     return data.get("md5", "")
-                logger.error(f"获取MD5失败，状态码：{response.status}")
-                return ""
         except Exception as e:
-            logger.error(f"获取远程MD5失败: {e}")
-            return ""
+            logger.debug(f"获取远程MD5失败: {e}")
+        return None
+
+    async def _is_cache_valid(self, source: RegistrySource) -> bool:
+        """检查缓存是否有效（基于MD5）"""
+        try:
+            cached_md5 = self._load_cached_md5(source.cache_file)
+            if not cached_md5:
+                logger.debug("缓存文件中没有MD5信息")
+                return False
+
+            remote_md5 = await self._fetch_remote_md5(source.md5_url)
+            if remote_md5 is None:
+                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
 
     def _load_plugin_cache(self, cache_file: str):
         """加载本地缓存的插件市场数据"""
@@ -545,9 +583,13 @@ class PluginRoute(Route):
             logger.warning(f"插件 {plugin_name} 不存在")
             return Response().error(f"插件 {plugin_name} 不存在").__dict__
 
+        if not plugin_obj.root_dir_name:
+            logger.warning(f"插件 {plugin_name} 目录不存在")
+            return Response().error(f"插件 {plugin_name} 目录不存在").__dict__
+
         plugin_dir = os.path.join(
             self.plugin_manager.plugin_store_path,
-            plugin_obj.root_dir_name,
+            plugin_obj.root_dir_name or "",
         )
 
         if not os.path.isdir(plugin_dir):
@@ -572,3 +614,22 @@ class PluginRoute(Route):
         except Exception as e:
             logger.error(f"/api/plugin/readme: {traceback.format_exc()}")
             return Response().error(f"读取README文件失败: {e!s}").__dict__
+
+    async def get_custom_source(self):
+        """获取自定义插件源"""
+        sources = await sp.global_get("custom_plugin_sources", [])
+        return Response().ok(sources).__dict__
+
+    async def save_custom_source(self):
+        """保存自定义插件源"""
+        try:
+            data = await request.get_json()
+            sources = data.get("sources", [])
+            if not isinstance(sources, list):
+                return Response().error("sources fields must be a list").__dict__
+
+            await sp.global_put("custom_plugin_sources", sources)
+            return Response().ok(None, "保存成功").__dict__
+        except Exception as e:
+            logger.error(f"/api/plugin/source/save: {traceback.format_exc()}")
+            return Response().error(str(e)).__dict__

astrbot/dashboard/routes/route.py

@@ -12,6 +12,8 @@ class RouteContext:
 
 
 class Route:
+    routes: list | dict
+
     def __init__(self, context: RouteContext):
         self.app = context.app
         self.config = context.config

astrbot/dashboard/server.py

@@ -2,9 +2,12 @@ import asyncio
 import logging
 import os
 import socket
+from typing import cast
 
 import jwt
 import psutil
+from flask.json.provider import DefaultJSONProvider
+from psutil._common import addr as psutil_addr
 from quart import Quart, g, jsonify, request
 from quart.logging import default_handler
 
@@ -21,7 +24,7 @@ from .routes.route import Response, RouteContext
 from .routes.session_management import SessionManagementRoute
 from .routes.t2i import T2iRoute
 
-APP: Quart = None
+APP: Quart
 
 
 class AstrBotDashboard:
@@ -48,7 +51,7 @@ class AstrBotDashboard:
         self.app.config["MAX_CONTENT_LENGTH"] = (
             128 * 1024 * 1024
         )  # 将 Flask 允许的最大上传文件体大小设置为 128 MB
-        self.app.json.sort_keys = False
+        cast(DefaultJSONProvider, self.app.json).sort_keys = False
         self.app.before_request(self.auth_middleware)
         # token 用于验证请求
         logging.getLogger(self.app.name).removeHandler(default_handler)
@@ -147,7 +150,7 @@ class AstrBotDashboard:
         """获取占用端口的进程详细信息"""
         try:
             for conn in psutil.net_connections(kind="inet"):
-                if conn.laddr.port == port:
+                if cast(psutil_addr, conn.laddr).port == port:
                     try:
                         process = psutil.Process(conn.pid)
                         # 获取详细信息

{astrbot-4.8.0.dist-info → astrbot-4.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.8.0
+Version: 4.9.1
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin
@@ -81,6 +81,7 @@ Description-Content-Type: text/markdown
 <img src="https://img.shields.io/github/v/release/AstrBotDevs/AstrBot?color=76bad9" href="https://github.com/AstrBotDevs/AstrBot/releases/latest">
 <img src="https://img.shields.io/badge/python-3.10+-blue.svg" alt="python">
 <img src="https://deepwiki.com/badge.svg" href="https://deepwiki.com/AstrBotDevs/AstrBot">
+<a href="https://zread.ai/AstrBotDevs/AstrBot" target="_blank"><img src="https://img.shields.io/badge/Ask_Zread-_.svg?style=flat&color=00b0aa&labelColor=000000&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxNiAxNiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTQuOTYxNTYgMS42MDAxSDIuMjQxNTZDMS44ODgxIDEuNjAwMSAxLjYwMTU2IDEuODg2NjQgMS42MDE1NiAyLjI0MDFWNC45NjAxQzEuNjAxNTYgNS4zMTM1NiAxLjg4ODEgNS42MDAxIDIuMjQxNTYgNS42MDAxSDQuOTYxNTZDNS4zMTUwMiA1LjYwMDEgNS42MDE1NiA1LjMxMzU2IDUuNjAxNTYgNC45NjAxVjIuMjQwMUM1LjYwMTU2IDEuODg2NjQgNS4zMTUwMiAxLjYwMDEgNC45NjE1NiAxLjYwMDFaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00Ljk2MTU2IDEwLjM5OTlIMi4yNDE1NkMxLjg4ODEgMTAuMzk5OSAxLjYwMTU2IDEwLjY4NjQgMS42MDE1NiAxMS4wMzk5VjEzLjc1OTlDMS42MDE1NiAxNC4xMTM0IDEuODg4MSAxNC4zOTk5IDIuMjQxNTYgMTQuMzk5OUg0Ljk2MTU2QzUuMzE1MDIgMTQuMzk5OSA1LjYwMTU2IDE0LjExMzQgNS42MDE1NiAxMy43NTk5VjExLjAzOTlDNS42MDE1NiAxMC42ODY0IDUuMzE1MDIgMTAuMzk5OSA0Ljk2MTU2IDEwLjM5OTlaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik0xMy43NTg0IDEuNjAwMUgxMS4wMzg0QzEwLjY4NSAxLjYwMDEgMTAuMzk4NCAxLjg4NjY0IDEwLjM5ODQgMi4yNDAxVjQuOTYwMUMxMC4zOTg0IDUuMzEzNTYgMTAuNjg1IDUuNjAwMSAxMS4wMzg0IDUuNjAwMUgxMy43NTg0QzE0LjExMTkgNS42MDAxIDE0LjM5ODQgNS4zMTM1NiAxNC4zOTg0IDQuOTYwMVYyLjI0MDFDMTQuMzk4NCAxLjg4NjY0IDE0LjExMTkgMS42MDAxIDEzLjc1ODQgMS42MDAxWiIgZmlsbD0iI2ZmZiIvPgo8cGF0aCBkPSJNNCAxMkwxMiA0TDQgMTJaIiBmaWxsPSIjZmZmIi8%2BCjxwYXRoIGQ9Ik00IDEyTDEyIDQiIHN0cm9rZT0iI2ZmZiIgc3Ryb2tlLXdpZHRoPSIxLjUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIvPgo8L3N2Zz4K&logoColor=ffffff" alt="zread"/></a>
 <a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg?color=76bad9"/></a>
 <img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.soulter.top%2Fastrbot%2Fplugin-num&query=%24.result&suffix=%E4%B8%AA&label=%E6%8F%92%E4%BB%B6%E5%B8%82%E5%9C%BA&cacheSeconds=3600">
 <img src="https://gitcode.com/Soulter/AstrBot/star/badge.svg" href="https://gitcode.com/Soulter/AstrBot">
@@ -267,6 +268,7 @@ pre-commit install
 - 3 群：630166526
 - 5 群：822130018
 - 6 群：753075035
+- 7 群：743746109
 - 开发者群：975206796
 
 ### Telegram 群组
@@ -302,4 +304,10 @@ pre-commit install
 
 </details>
 
+<div align="center">
+
 _私は、高性能ですから!_
+
+<img src="https://files.astrbot.app/watashiwa-koseino-desukara.gif" width="100"/>
+</div
+