From cbea484f38a9a24b158ab2c91faf3435e0f36b5c Mon Sep 17 00:00:00 2001 From: K2cr2O1 <2221577113@qq.com> Date: Fri, 9 Jan 2026 04:37:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(command=5Fmanager):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=8D=B8=E8=BD=BD=E6=97=B6=E5=85=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=A7=BB=E9=99=A4=E4=B8=8D=E7=B2=BE=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复 CommandManager 中 unload_plugin 方法移除插件元信息时使用 startswith 导致可能误删其他插件的问题，改为精确匹配 同时调整相关测试用例验证精确匹配行为 --- core/managers/__init__.py | 3 +- core/managers/command_manager.py | 2 +- core/managers/permission_manager.py | 13 +++++-- plugins/admin.py | 6 +-- tests/test_plugin_reload_meta.py | 60 +++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 tests/test_plugin_reload_meta.py diff --git a/core/managers/__init__.py b/core/managers/__init__.py index 10780cb..5be6af9 100644 --- a/core/managers/__init__.py +++ b/core/managers/__init__.py @@ -6,7 +6,7 @@ """ from ..config_loader import global_config from .admin_manager import AdminManager -from .command_manager import CommandManager +from .command_manager import matcher as command_manager from .permission_manager import PermissionManager from .plugin_manager import PluginManager from .redis_manager import RedisManager @@ -20,7 +20,6 @@ admin_manager = AdminManager() permission_manager = PermissionManager() # 命令与事件管理器 (别名 matcher) -command_manager = CommandManager(prefixes=tuple(global_config.bot.command)) matcher = command_manager # 插件管理器 diff --git a/core/managers/command_manager.py b/core/managers/command_manager.py index 522d86e..da555e7 100644 --- a/core/managers/command_manager.py +++ b/core/managers/command_manager.py @@ -93,7 +93,7 @@ class CommandManager: self.request_handler.unregister_by_plugin_name(plugin_name) # 移除插件元信息 - plugins_to_remove = [name for name in self.plugins if name.startswith(plugin_name)] + plugins_to_remove = [name for name in self.plugins if name == plugin_name] for name in plugins_to_remove: del self.plugins[name] diff --git a/core/managers/permission_manager.py b/core/managers/permission_manager.py index de808c1..b7904c3 100644 --- a/core/managers/permission_manager.py +++ b/core/managers/permission_manager.py @@ -170,13 +170,20 @@ class PermissionManager(Singleton): user_permission = await self.get_user_permission(user_id) return user_permission >= required_permission - def get_all_user_permissions(self) -> Dict[str, str]: + async def get_all_user_permissions(self) -> Dict[str, str]: """ - 获取所有已配置的用户权限 + 获取所有已配置的用户权限（包括 AdminManager 中的管理员） :return: 一个包含所有用户权限的字典 """ - return self._data["users"].copy() + permissions = self._data["users"].copy() + + # 合并 AdminManager 中的管理员 + admins = await admin_manager.get_all_admins() + for admin_id in admins: + permissions[str(admin_id)] = Permission.ADMIN.value + + return permissions def get_all_users(self) -> Dict[str, str]: """ diff --git a/plugins/admin.py b/plugins/admin.py index f9e9aa4..6dd0c18 100644 --- a/plugins/admin.py +++ b/plugins/admin.py @@ -18,11 +18,11 @@ __plugin_meta__ = { @command_manager.command("admin", permission=Permission.ADMIN) -async def admin_management(event: MessageEvent, args: str): +async def admin_management(event: MessageEvent, args: list[str]): """ 处理所有权限管理相关的命令。 """ - parts = args.split() + parts = args if not parts: await event.reply(f"用法不正确。\n\n{__plugin_meta__['usage']}") return @@ -73,7 +73,7 @@ async def list_permissions(event: MessageEvent): """ 列出所有具有特殊权限（管理员和操作员）的用户。 """ - permissions = permission_manager.get_all_user_permissions() + permissions = await permission_manager.get_all_user_permissions() if not permissions: await event.reply("当前没有配置任何特殊权限的用户。") return diff --git a/tests/test_plugin_reload_meta.py b/tests/test_plugin_reload_meta.py new file mode 100644 index 0000000..92a9e93 --- /dev/null +++ b/tests/test_plugin_reload_meta.py @@ -0,0 +1,60 @@ + +import pytest +from unittest.mock import MagicMock +from core.managers.command_manager import CommandManager + +class TestPluginReloadMeta: + def test_plugin_meta_persistence(self): + """ + 测试插件加载、卸载和重载过程中元信息的持久性 + """ + # 初始化 CommandManager + command_manager = CommandManager(prefixes=("/",)) + + # 模拟插件名称和元信息 + plugin_name = "plugins.test_plugin" + plugin_meta = { + "name": "测试插件", + "description": "这是一个测试插件", + "usage": "/test" + } + + # 1. 模拟加载插件 + command_manager.plugins[plugin_name] = plugin_meta + + # 验证元信息已注册 + assert plugin_name in command_manager.plugins + assert command_manager.plugins[plugin_name] == plugin_meta + + # 2. 模拟卸载插件 + command_manager.unload_plugin(plugin_name) + + # 验证元信息已移除 + assert plugin_name not in command_manager.plugins + + # 3. 模拟重载插件（重新注册元信息） + # 在实际运行中，PluginManager 会在 reload 后重新赋值 + command_manager.plugins[plugin_name] = plugin_meta + + # 验证元信息已恢复 + assert plugin_name in command_manager.plugins + assert command_manager.plugins[plugin_name] == plugin_meta + + def test_unload_plugin_exact_match(self): + """ + 测试 unload_plugin 是否只移除精确匹配的插件元信息 + """ + command_manager = CommandManager(prefixes=("/",)) + + plugin1 = "plugins.test" + plugin2 = "plugins.test_extra" + + command_manager.plugins[plugin1] = {"name": "Test 1"} + command_manager.plugins[plugin2] = {"name": "Test 2"} + + # 卸载 plugin1 + command_manager.unload_plugin(plugin1) + + # 验证 plugin1 被移除，但 plugin2 仍然存在 + assert plugin1 not in command_manager.plugins + assert plugin2 in command_manager.plugins