ErisPulse 2.4.6.dev2__tar.gz → 2.4.6.dev3__tar.gz

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.4.6.dev2
+Version: 2.4.6.dev3
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: ErisDev <erisdev@88.com>
 Maintainer-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.4.6-dev.2"
+version = "2.4.6-dev.3"
 description = "ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。"
 readme = "README.md"
 requires-python = ">=3.10"

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/Event/base.py

@@ -12,11 +12,12 @@ ErisPulse 事件处理基础模块
 from .. import adapter, logger
 from ...runtime import get_event_config
 from ...runtime.context import current_owner
-from ..constants import DEFAULT_HANDLER_PRIORITY, UNKNOWN_PLATFORM, EVENT_TYPE_MESSAGE
+from ..constants import DEFAULT_HANDLER_PRIORITY, UNKNOWN_PLATFORM, EVENT_TYPE_MESSAGE, HANDLER_SLOW_THRESHOLD_SECS
 from typing import Any
 from collections.abc import Callable
 import asyncio
 import inspect
+import time as _time
 from itertools import groupby
 from .wrapper import Event
 from ..lifecycle import lifecycle
@@ -34,11 +35,16 @@ async def _invoke_handler(handler_info: dict, event: Event) -> None:
     :param event: 事件对象
     """
     handler = handler_info["func"]
+    _hname = getattr(handler, "__qualname__", getattr(handler, "__name__", str(handler)))
     try:
+        _t = _time.monotonic()
         if inspect.iscoroutinefunction(handler):
             await handler(event)
         else:
             handler(event)
+        _elapsed = _time.monotonic() - _t
+        if _elapsed > HANDLER_SLOW_THRESHOLD_SECS:
+            logger.warning(f"[EventHandler] Slow handler {_hname} took {_elapsed:.4f}s")
     except Exception as e:
         logger.error(f"事件处理器执行错误: {e}")
 

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/Event/base.pyi

@@ -18,11 +18,12 @@ ErisPulse 事件处理基础模块
 from .. import adapter, logger
 from ...runtime import get_event_config
 from ...runtime.context import current_owner
-from ..constants import DEFAULT_HANDLER_PRIORITY, UNKNOWN_PLATFORM, EVENT_TYPE_MESSAGE
+from ..constants import DEFAULT_HANDLER_PRIORITY, UNKNOWN_PLATFORM, EVENT_TYPE_MESSAGE, HANDLER_SLOW_THRESHOLD_SECS
 from typing import Any
 from collections.abc import Callable
 import asyncio
 import inspect
+import time as _time
 from itertools import groupby
 from .wrapper import Event
 from ..lifecycle import lifecycle

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/Event/command.py

@@ -286,6 +286,7 @@ class CommandHandler:
             # 清理超时的等待
             if wait_key in self._waiting_replies:
                 del self._waiting_replies[wait_key]
+            logger.debug(f"wait_reply 超时: key={wait_key}, timeout={timeout}s")
             return None
         except Exception as e:
             # 清理异常情况

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/adapter.py

@@ -23,6 +23,7 @@ from .constants import (
     CONFIG_KEY_ADAPTER_STATUS,
     CONFIG_KEY_ADAPTER_STATUS_OF,
     DEFAULT_ADAPTER_ENABLED,
+    HANDLER_SLOW_THRESHOLD_SECS,
 )
 
 
@@ -685,6 +686,9 @@ class AdapterManager(ManagerBase):
         """
         提交OneBot12协议事件到指定平台
 
+        每个事件处理器（handler）都在独立的 asyncio.Task 中执行，
+        单个处理器阻塞不会影响框架的事件分发和其他处理器运行。
+
         :param data: 符合OneBot12标准的事件数据
 
         :example:
@@ -766,7 +770,7 @@ class AdapterManager(ManagerBase):
                         },
                     )
 
-        # 先执行OneBot12中间件
+        # 先执行OneBot12中间件（中间件可以修改数据，必须顺序执行）
         processed_data = data
         for middleware in self._onebot_middlewares:
             result = await middleware(processed_data)
@@ -777,7 +781,7 @@ class AdapterManager(ManagerBase):
                     f"中间件 {middleware.__qualname__} 返回 None，已忽略并保留原数据"
                 )
 
-        # 分发到OneBot12事件处理器
+        # 分发到OneBot12事件处理器（每个 handler 在独立 Task 中执行，不阻塞框架）
         handlers_to_call = []
 
         # 处理特定事件类型的处理器
@@ -787,12 +791,14 @@ class AdapterManager(ManagerBase):
         # 处理通配符处理器
         handlers_to_call.extend(self._onebot_handlers.get("*", []))
 
-        # 调用符合条件的标准事件处理器
+        # 将符合条件的处理器分发到独立 Task
         for handler_wrapper in handlers_to_call:
             handler_platform = handler_wrapper.get("platform")
-            # 如果处理器没有指定平台，或者指定的平台与当前事件平台匹配
             if handler_platform is None or handler_platform == platform:
-                await handler_wrapper["func"](processed_data)
+                self._dispatch_handler_task(
+                    handler_wrapper["func"], processed_data,
+                    event_type=event_type, platform=platform,
+                )
 
         # 只有当存在原生事件数据时才分发原生事件
         if raw_event_type and (platform_raw := data.get(f"{platform}_raw")) is not None:
@@ -805,12 +811,14 @@ class AdapterManager(ManagerBase):
             # 处理原生事件的通配符处理器
             raw_handlers_to_call.extend(self._raw_handlers.get("*", []))
 
-            # 调用符合条件的原生事件处理器
+            # 将符合条件的原生事件处理器分发到独立 Task
             for handler_wrapper in raw_handlers_to_call:
                 handler_platform = handler_wrapper.get("platform")
-                # 如果处理器没有指定平台，或者指定的平台与当前事件平台匹配
                 if handler_platform is None or handler_platform == platform:
-                    await handler_wrapper["func"](platform_raw)
+                    self._dispatch_handler_task(
+                        handler_wrapper["func"], platform_raw,
+                        event_type=raw_event_type, platform=platform,
+                    )
 
         # 钩子: 事件分发完成
         await lifecycle.emit("adapter.event.dispatched", {
@@ -820,6 +828,56 @@ class AdapterManager(ManagerBase):
             "onebot_handlers_count": len(handlers_to_call),
         })
 
+    def _dispatch_handler_task(
+        self,
+        func: Callable,
+        data: Any,
+        *,
+        event_type: str = "unknown",
+        platform: str = "unknown",
+    ) -> asyncio.Task:
+        """
+        {!--< internal-use >!--}
+        将事件处理器包装为独立 asyncio.Task 并调度执行
+
+        处理器在独立 Task 中运行，不会阻塞 adapter.emit() 的后续流程。
+        自动捕获处理器异常并记录日志，同时监控处理器执行耗时。
+
+        :param func: 事件处理器函数
+        :param data: 事件数据
+        :param event_type: 事件类型（用于日志）
+        :param platform: 平台名称（用于日志）
+        :return: asyncio.Task
+        """
+        import time as _time
+
+        _func_name = getattr(func, "__qualname__", getattr(func, "__name__", str(func)))
+
+        async def _safe_run():
+            t0 = _time.monotonic()
+            try:
+                await func(data)
+            except asyncio.CancelledError:
+                pass
+            except Exception as e:
+                logger.error(
+                    f"事件处理器执行错误 [{_func_name}] "
+                    f"type={event_type} platform={platform}: {e}"
+                )
+            finally:
+                elapsed = _time.monotonic() - t0
+                if elapsed > HANDLER_SLOW_THRESHOLD_SECS:
+                    logger.warning(
+                        f"事件处理器执行缓慢 [{_func_name}] "
+                        f"耗时 {elapsed:.2f}s > {HANDLER_SLOW_THRESHOLD_SECS}s "
+                        f"type={event_type} platform={platform}"
+                    )
+
+        try:
+            return asyncio.create_task(_safe_run())
+        except RuntimeError:
+            return asyncio.ensure_future(_safe_run())
+
     # ==================== Bot状态管理 ====================
 
     def _auto_register_bot(self, platform: str, self_info: dict) -> bool:

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/adapter.pyi

@@ -23,7 +23,7 @@ from .Bases.adapter import BaseAdapter
 from .config import config
 from .lifecycle import lifecycle
 from .Bases.manager import ManagerBase
-from .constants import ADAPTER_RETRY_BACKOFF_INTERVALS, ADAPTER_RETRY_FIXED_DELAY_SECS, CONFIG_KEY_ADAPTER_STATUS, CONFIG_KEY_ADAPTER_STATUS_OF, DEFAULT_ADAPTER_ENABLED
+from .constants import ADAPTER_RETRY_BACKOFF_INTERVALS, ADAPTER_RETRY_FIXED_DELAY_SECS, CONFIG_KEY_ADAPTER_STATUS, CONFIG_KEY_ADAPTER_STATUS_OF, DEFAULT_ADAPTER_ENABLED, HANDLER_SLOW_THRESHOLD_SECS
 
 class AdapterManager(ManagerBase):
     """
@@ -218,6 +218,9 @@ class AdapterManager(ManagerBase):
         """
         提交OneBot12协议事件到指定平台
         
+        每个事件处理器（handler）都在独立的 asyncio.Task 中执行，
+        单个处理器阻塞不会影响框架的事件分发和其他处理器运行。
+        
         :param data: 符合OneBot12标准的事件数据
         
         :example:

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/constants.py

@@ -308,6 +308,11 @@ DEFAULT_WAIT_TIMEOUT_SECS = 60.0
 # 修改影响: 验证器拒绝回复后的重试次数。
 DEFAULT_MAX_RETRIES = 3
 
+# 事件处理器执行耗时警告阈值（秒）。
+# 使用位置: Core/adapter.py -> emit() 中的 handler 执行监控。
+# 修改影响: 当单个处理器执行超过此时间时记录 WARNING 日志。
+HANDLER_SLOW_THRESHOLD_SECS = 1.0
+
 # 平台标识的回退值。
 # 当事件数据缺少 platform 字段时使用。
 # 修改影响: 日志和事件处理中的平台标识显示。

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/lifecycle.py

@@ -13,7 +13,7 @@ ErisPulse 生命周期管理模块
 
 import asyncio
 import inspect
-from .constants import DEFAULT_EVENT_SOURCE
+from .constants import DEFAULT_EVENT_SOURCE, HANDLER_SLOW_THRESHOLD_SECS
 import time
 from typing import Any
 from collections.abc import Callable
@@ -307,12 +307,18 @@ class LifecycleManager:
         :param data: Any 事件数据
         :return: Any 处理后的数据
         """
-        for _, handler in self._hooks[hook_name]:
+        import time as _time
+        for priority, handler in self._hooks[hook_name]:
             try:
+                _t = _time.monotonic()
+                _hname = getattr(handler, "__qualname__", getattr(handler, "__name__", str(handler)))
                 if inspect.iscoroutinefunction(handler):
                     result = await handler(data)
                 else:
                     result = handler(data)
+                _elapsed = _time.monotonic() - _t
+                if _elapsed > HANDLER_SLOW_THRESHOLD_SECS:
+                    _get_logger().warning(f"[Lifecycle] Slow handler {_hname} for event '{event}' took {_elapsed:.4f}s")
                 if result is not None:
                     data = result
             except Exception as e:

{erispulse-2.4.6.dev2 → erispulse-2.4.6.dev3}/src/ErisPulse/Core/lifecycle.pyi

@@ -19,7 +19,7 @@ ErisPulse 生命周期管理模块
 
 import asyncio
 import inspect
-from .constants import DEFAULT_EVENT_SOURCE
+from .constants import DEFAULT_EVENT_SOURCE, HANDLER_SLOW_THRESHOLD_SECS
 import time
 from typing import Any
 from collections.abc import Callable