feat(event): improve event consumer logic for handling of events

app/command.py

@@ -1,8 +1,4 @@
-import copy
-import importlib
-import threading
 import traceback
-from threading import Thread
 from typing import Any, Union, Dict
 
 from app.chain import ChainBase
@@ -12,11 +8,9 @@ from app.chain.subscribe import SubscribeChain
 from app.chain.system import SystemChain
 from app.chain.transfer import TransferChain
 from app.core.config import settings
-from app.core.event import Event as ManagerEvent
-from app.core.event import eventmanager, EventManager
+from app.core.event import Event as ManagerEvent, eventmanager
 from app.core.plugin import PluginManager
 from app.helper.message import MessageHelper
-from app.helper.thread import ThreadHelper
 from app.log import logger
 from app.scheduler import Scheduler
 from app.schemas import Notification
@@ -41,12 +35,7 @@ class Command(metaclass=Singleton):
     # 内建命令
     _commands = {}
 
-    # 退出事件
-    _event = threading.Event()
-
     def __init__(self):
-        # 事件管理器
-        self.eventmanager = EventManager()
         # 插件管理器
         self.pluginmanager = PluginManager()
         # 处理链
@@ -55,8 +44,6 @@ class Command(metaclass=Singleton):
         self.scheduler = Scheduler()
         # 消息管理器
         self.messagehelper = MessageHelper()
-        # 线程管理器
-        self.threader = ThreadHelper()
         # 内置命令
         self._commands = {
             "/cookiecloud": {
@@ -172,72 +159,9 @@ class Command(metaclass=Singleton):
         # 广播注册命令菜单
         if not settings.DEV:
             self.chain.register_commands(commands=self.get_commands())
-        # 消息处理线程
-        self._thread = Thread(target=self.__run)
-        # 启动事件处理线程
-        self._thread.start()
         # 重启msg
         SystemChain().restart_finish()
 
-    def __run(self):
-        """
-        事件处理线程
-        """
-        while not self._event.is_set():
-            event, handlers = self.eventmanager.get_event()
-            if event:
-                logger.info(f"处理事件：{event.event_type} - {handlers}")
-                if not handlers and event.event_callback:
-                    event.event_callback()
-                for handler in handlers:
-                    names = handler.__qualname__.split(".")
-                    [class_name, method_name] = names
-                    try:
-                        if class_name in self.pluginmanager.get_plugin_ids():
-                            # 插件事件
-                            result = self.threader.submit(
-                                self.pluginmanager.run_plugin_method,
-                                class_name, method_name, copy.deepcopy(event)
-                            )
-                            if event.event_callback:
-                                event.event_callback(result)
-                        else:
-                            # 检查全局变量中是否存在
-                            if class_name not in globals():
-                                # 导入模块，除了插件和Command本身，只有chain能响应事件
-                                try:
-                                    module = importlib.import_module(
-                                        f"app.chain.{class_name[:-5].lower()}"
-                                    )
-                                    class_obj = getattr(module, class_name)()
-                                except Exception as e:
-                                    logger.error(f"事件处理出错：{str(e)} - {traceback.format_exc()}")
-                                    continue
-                            else:
-                                # 通过类名创建类实例
-                                class_obj = globals()[class_name]()
-                            # 检查类是否存在并调用方法
-                            if hasattr(class_obj, method_name):
-                                self.threader.submit(
-                                    getattr(class_obj, method_name),
-                                    copy.deepcopy(event)
-                                )
-                    except Exception as e:
-                        logger.error(f"事件处理出错：{str(e)} - {traceback.format_exc()}")
-                        self.messagehelper.put(title=f"{event.event_type} 事件处理出错",
-                                               message=f"{class_name}.{method_name}：{str(e)}",
-                                               role="system")
-                        self.eventmanager.send_event(
-                            EventType.SystemError,
-                            {
-                                "type": "event",
-                                "event_type": event.event_type,
-                                "event_handle": f"{class_name}.{method_name}",
-                                "error": str(e),
-                                "traceback": traceback.format_exc()
-                            }
-                        )
-
     def __run_command(self, command: Dict[str, any], data_str: str = "",
                       channel: MessageChannel = None, source: str = None, userid: Union[str, int] = None):
         """
@@ -292,18 +216,6 @@ class Command(metaclass=Singleton):
                 # 没有参数
                 command['func']()
 
-    def stop(self):
-        """
-        停止事件处理线程
-        """
-        logger.info("正在停止事件处理...")
-        self._event.set()
-        try:
-            self._thread.join()
-            logger.info("事件处理停止完成")
-        except Exception as e:
-            logger.error(f"停止事件处理线程出错：{str(e)} - {traceback.format_exc()}")
-
     def get_commands(self):
         """
         获取命令列表
@@ -361,7 +273,7 @@ class Command(metaclass=Singleton):
         """
         发送插件命令
         """
-        EventManager().send_event(etype, data)
+        eventmanager.send_event(etype, data)
 
     @eventmanager.register(EventType.CommandExcute)
     def command_event(self, event: ManagerEvent) -> None: