fix commands

app/command.py

@@ -1,24 +1,36 @@
+import traceback
+from threading import Thread, Event
 from typing import Any
 
+from app.chain import ChainBase
 from app.chain.cookiecloud import CookieCloudChain
 from app.chain.douban_sync import DoubanSyncChain
 from app.chain.subscribe import SubscribeChain
 from app.core import eventmanager, PluginManager, EventManager
-from app.core.event_manager import Event
+from app.core.event_manager import Event as ManagerEvent
 from app.log import logger
 from app.utils.singleton import Singleton
 from app.utils.types import EventType
 
 
+class CommandChian(ChainBase):
+    """
+    插件处理链
+    """
+
+    def process(self, *args, **kwargs):
+        pass
+
+
 class Command(metaclass=Singleton):
     """
-    全局命令管理
+    全局命令管理，消费事件
     """
     # 内建命令
     _commands = {
         "/cookiecloud": {
             "func": CookieCloudChain().process,
-            "description": "同步CookieCloud的Cookie",
+            "description": "同步站点Cookie",
             "data": {}
         },
         "/doubansync": {
@@ -35,9 +47,16 @@ class Command(metaclass=Singleton):
         }
     }
 
+    # 退出事件
+    _event = Event()
+
     def __init__(self):
-        # 注册插件命令
-        plugin_commands = PluginManager().get_plugin_commands()
+        # 事件管理器
+        self.eventmanager = EventManager()
+        # 插件管理器
+        self.pluginmanager = PluginManager()
+        # 汇总插件命令
+        plugin_commands = self.pluginmanager.get_plugin_commands()
         for command in plugin_commands:
             self.register(
                 cmd=command.get('cmd'),
@@ -48,6 +67,45 @@ class Command(metaclass=Singleton):
                     'data': command.get('data')
                 }
             )
+        # 处理链
+        self.chain = CommandChian()
+        # 广播注册命令
+        self.chain.run_module("register_commands", commands=self.get_commands())
+        # 消息处理线程
+        self._thread = Thread(target=self.__run)
+        # 启动事件处理线程
+        self._thread.start()
+
+    def __run(self):
+        """
+        事件处理线程
+        """
+        while not self._event.is_set():
+            event, handlers = self.eventmanager.get_event()
+            if event:
+                logger.info(f"处理事件：{event.event_type} - {handlers}")
+                for handler in handlers:
+                    try:
+                        names = handler.__qualname__.split(".")
+                        if names[0] == "Command":
+                            self.command_event(event)
+                        else:
+                            self.pluginmanager.run_plugin_method(names[0], names[1], event)
+                    except Exception as e:
+                        logger.error(f"事件处理出错：{str(e)} - {traceback.format_exc()}")
+
+    def stop(self):
+        """
+        停止事件处理线程
+        """
+        self._event.set()
+        self._thread.join()
+
+    def get_commands(self):
+        """
+        获取命令列表
+        """
+        return self._commands
 
     def register(self, cmd: str, func: Any, data: dict = None, desc: str = None) -> None:
         """
@@ -83,7 +141,7 @@ class Command(metaclass=Singleton):
         EventManager().send_event(etype, data)
 
     @eventmanager.register(EventType.CommandExcute)
-    def command_event(self, event: Event) -> None:
+    def command_event(self, event: ManagerEvent) -> None:
         """
         注册命令执行事件
         event_data: {