ErisPulse 2.6.0.dev0__tar.gz → 2.6.0.dev1__tar.gz

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.6.0.dev0
+Version: 2.6.0.dev1
 Summary: Event-driven modular async bot framework — write once, deploy to any platform | 事件驱动的模块化异步机器人框架，一次编写，多平台部署
 Project-URL: Homepage, https://github.com/ErisPulse/ErisPulse
 Project-URL: Documentation, https://www.erisdev.com#docs
@@ -69,7 +69,7 @@ Description-Content-Type: text/markdown
 
 <img src=".github/assets/mascot-hero.png" align="right" width="300" alt="ErisPulse" style="margin-left: 24px; margin-bottom: 16px; border-radius: 12px;" />
 
-[**English**](README.md) | 简体中文 | [繁體中文](README.zh-TW.md) | [日本語](README.ja.md) | [Русский](README.ru.md)
+**English** | [简体中文](README.zh-CN.md) | [繁體中文](README.zh-TW.md) | [日本語](README.ja.md) | [Русский](README.ru.md)
 
 # ErisPulse
 
@@ -715,4 +715,4 @@ The early exploration and growth of ErisPulse would not have been possible witho
 
 We also thank all developers and project authors who have contributed to ErisPulse, OneBot ecosystem, and the open-source community.
 
-</div>
+</div>

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/README.md

@@ -1,6 +1,6 @@
 <img src=".github/assets/mascot-hero.png" align="right" width="300" alt="ErisPulse" style="margin-left: 24px; margin-bottom: 16px; border-radius: 12px;" />
 
-[**English**](README.md) | 简体中文 | [繁體中文](README.zh-TW.md) | [日本語](README.ja.md) | [Русский](README.ru.md)
+**English** | [简体中文](README.zh-CN.md) | [繁體中文](README.zh-TW.md) | [日本語](README.ja.md) | [Русский](README.ru.md)
 
 # ErisPulse
 
@@ -646,4 +646,4 @@ The early exploration and growth of ErisPulse would not have been possible witho
 
 We also thank all developers and project authors who have contributed to ErisPulse, OneBot ecosystem, and the open-source community.
 
-</div>
+</div>

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ErisPulse"
-version = "2.6.0-dev.0"
+version = "2.6.0-dev.1"
 description = "Event-driven modular async bot framework — write once, deploy to any platform | 事件驱动的模块化异步机器人框架，一次编写，多平台部署"
 readme = "README.md"
 requires-python = ">=3.10"

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/Bases/adapter.py

@@ -464,7 +464,10 @@ class SendDSL:
         if target_type == DETAIL_TYPE_PRIVATE:
             target_type = "user"
 
-        return self.__class__(self._adapter, target_type, target_id, self._account_id, self._rules)
+        instance = self.__class__(self._adapter, target_type, target_id, self._account_id)
+        if self._rules:
+            instance._rules = _copy_rules(self._rules)
+        return instance
 
     def Using(self, account_id: str | int) -> "SendDSL":
         """
@@ -477,9 +480,12 @@ class SendDSL:
         >>> adapter.Send.Using("bot1").To("123").Text("Hello")
         >>> adapter.Send.To("123").Using("bot1").Text("Hello")  # 支持乱序
         """
-        return self.__class__(
-            self._adapter, self._target_type, self._target_id, account_id, self._rules
+        instance = self.__class__(
+            self._adapter, self._target_type, self._target_id, account_id
         )
+        if self._rules:
+            instance._rules = _copy_rules(self._rules)
+        return instance
 
     def Account(self, account_id: str | int) -> "SendDSL":
         """
@@ -492,9 +498,12 @@ class SendDSL:
         >>> adapter.Send.Account("bot1").To("123").Text("Hello")
         >>> adapter.Send.To("123").Account("bot1").Text("Hello")  # 支持乱序
         """
-        return self.__class__(
-            self._adapter, self._target_type, self._target_id, account_id, self._rules
+        instance = self.__class__(
+            self._adapter, self._target_type, self._target_id, account_id
         )
+        if self._rules:
+            instance._rules = _copy_rules(self._rules)
+        return instance
 
     # ==================== 发送规则装饰器 ====================
 

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/Event/command.py

@@ -330,17 +330,14 @@ class CommandHandler:
 
             return result
         except asyncio.TimeoutError:
-            # 清理超时的等待
-            if wait_key in self._waiting_replies:
-                del self._waiting_replies[wait_key]
             logger.trace(f"wait_reply 超时: key={wait_key}, timeout={timeout}s")
             return None
         except Exception as e:
-            # 清理异常情况
-            if wait_key in self._waiting_replies:
-                del self._waiting_replies[wait_key]
             logger.error(f"等待回复时发生错误: {e}")
             return None
+        finally:
+            # 无论成功、超时、异常还是 CancelledError，都确保清理等待条目
+            self._waiting_replies.pop(wait_key, None)
 
     async def _handle_message(self, event: dict[str, Any]):
         """

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/adapter.py

@@ -23,6 +23,9 @@ from .constants import (
     CONFIG_KEY_ADAPTER_STATUS,
     CONFIG_KEY_ADAPTER_STATUS_OF,
     DEFAULT_ADAPTER_ENABLED,
+    DEFAULT_HANDLER_DRAIN_TIMEOUT_SECS,
+    DEFAULT_HANDLER_MAX_CONCURRENCY,
+    DEFAULT_OFFLINE_BOT_EXPIRY_SECS,
     HANDLER_SLOW_THRESHOLD_SECS,
 )
 from .i18n import i18n
@@ -91,6 +94,13 @@ class AdapterManager(ManagerBase):
         # 后台任务追踪 - {platform: asyncio.Task}
         self._adapter_tasks: dict[str, asyncio.Task] = {}
 
+        # 在途事件处理器 Task 集合（用于 shutdown 时等待/取消）
+        self._pending_handler_tasks: set[asyncio.Task] = set()
+
+        # 事件处理器并发控制信号量（运行时从配置加载，默认值由常量提供）
+        self._handler_semaphore: asyncio.Semaphore | None = None
+        self._handler_max_concurrency: int = 0  # 0 = 尚未初始化
+
         # Bot状态存储 - {platform: {bot_id: {"status": str, "last_active": float, "info": dict}}}
         self._bots: dict[str, dict[str, dict]] = {}
 
@@ -505,6 +515,8 @@ class AdapterManager(ManagerBase):
             # 仅在关闭全部适配器时清理事件处理器，避免部分关闭影响其他适配器
             all_platforms = set(self._adapters.keys())
             if set(platforms) >= all_platforms:
+                # 等待或取消所有在途的事件处理器 Task
+                await self._drain_pending_handler_tasks()
                 self._onebot_handlers.clear()
                 self._raw_handlers.clear()
                 self._onebot_middlewares.clear()
@@ -550,6 +562,39 @@ class AdapterManager(ManagerBase):
         # 回收该平台运行期间注册的路由/事件/命令（幂等）
         self._cleanup_adapter_resources(platform)
 
+    async def _drain_pending_handler_tasks(
+        self, timeout: float = DEFAULT_HANDLER_DRAIN_TIMEOUT_SECS
+    ) -> None:
+        """
+        {!--< internal-use >!--}
+        等待或取消所有在途的事件处理器 Task
+
+        :param timeout: 等待 Task 退出的最长时间（秒）
+        """
+        pending = list(self._pending_handler_tasks)
+        if not pending:
+            return
+        # 取消所有未完成的 Task
+        for task in pending:
+            if not task.done():
+                task.cancel()
+        # 等待它们退出（带超时）
+        try:
+            await asyncio.wait_for(
+                asyncio.gather(*pending, return_exceptions=True),
+                timeout=timeout,
+            )
+        except asyncio.TimeoutError:
+            logger.trace(
+                i18n.t(
+                    "core.adapter.handler_drain_timeout",
+                    count=len(pending),
+                    timeout=timeout,
+                )
+            )
+        finally:
+            self._pending_handler_tasks.clear()
+
     def _cleanup_adapter_resources(self, platform: str) -> None:
         """
         {!--< internal-use >!--}
@@ -605,6 +650,20 @@ class AdapterManager(ManagerBase):
                 i18n.t("core.adapter.handlers_clean_failed", platform=platform, error=e)
             )
 
+        # 清理该适配器注册的生命周期钩子
+        try:
+            lifecycle_removed = lifecycle.unregister_by_owner(platform)
+            if lifecycle_removed > 0:
+                logger.trace(
+                    i18n.t(
+                        "core.adapter.lifecycle_hooks_cleaned",
+                        platform=platform,
+                        count=lifecycle_removed,
+                    )
+                )
+        except Exception:
+            pass
+
     async def restart(self, platform: str) -> bool:
         """
         重启指定平台适配器（shutdown + 资源兜底清理 + start）
@@ -716,6 +775,13 @@ class AdapterManager(ManagerBase):
                 task.cancel()
         self._adapter_tasks.clear()
 
+        # 清除在途事件处理器 Task 引用（不等待，在 shutdown 中已处理）
+        self._pending_handler_tasks.clear()
+
+        # 重置并发信号量
+        self._handler_semaphore = None
+        self._handler_max_concurrency = 0
+
         # 清除Bot状态
         self._bots.clear()
 
@@ -1126,6 +1192,33 @@ class AdapterManager(ManagerBase):
             },
         )
 
+    def _get_handler_semaphore(self) -> asyncio.Semaphore:
+        """
+        {!--< internal-use >!--}
+        获取事件处理器并发控制信号量
+
+        懒初始化，首次调用时从框架配置读取 handler_max_concurrency。
+        配置变更后可通过设置 _handler_max_concurrency = 0 来强制重建。
+
+        :return: asyncio.Semaphore 并发控制信号量
+        """
+        if self._handler_semaphore is None or self._handler_max_concurrency == 0:
+            max_concurrency = DEFAULT_HANDLER_MAX_CONCURRENCY
+            try:
+                from ..runtime import get_framework_config
+
+                framework_config = get_framework_config()
+                max_concurrency = framework_config.get(
+                    "handler_max_concurrency", max_concurrency
+                )
+            except Exception:
+                pass
+            if max_concurrency <= 0:
+                max_concurrency = DEFAULT_HANDLER_MAX_CONCURRENCY
+            self._handler_max_concurrency = max_concurrency
+            self._handler_semaphore = asyncio.Semaphore(max_concurrency)
+        return self._handler_semaphore
+
     def _dispatch_handler_task(
         self,
         func: Callable,
@@ -1133,7 +1226,7 @@ class AdapterManager(ManagerBase):
         *,
         event_type: str = "unknown",
         platform: str = "unknown",
-    ) -> asyncio.Task:
+    ) -> asyncio.Task | None:
         """
         {!--< internal-use >!--}
         将事件处理器包装为独立 asyncio.Task 并调度执行
@@ -1147,20 +1240,21 @@ class AdapterManager(ManagerBase):
         :param platform: 平台名称（用于日志）
         :return: asyncio.Task
         """
-        import time as _time
-
         _func_name = getattr(func, "__qualname__", getattr(func, "__name__", str(func)))
 
-        # 在 Task 顶层准备 wait_reply 累计器（list 对象，可跨 ContextVar 共享）。
+        # 在 Task 顶层准备 wait_reply 累加器（list 对象，可跨 ContextVar 共享）。
         # 注意：ContextVar 的 set()/reset() 必须在同一个 Task Context 内完成，
         # 所以下面把 .set() 移入 _safe_run，避免跨 Task token 错误。
         _task_waits: list[dict] = []
+        _sem = self._get_handler_semaphore()
 
         async def _safe_run():
             _wait_token = handler_waits.set(_task_waits)
-            t0 = _time.monotonic()
+            t0 = time.monotonic()
             try:
-                await func(data)
+                # 并发背压控制：限制同时在途的 handler Task 数量
+                async with _sem:
+                    await func(data)
             except asyncio.CancelledError:
                 pass
             except Exception as e:
@@ -1174,7 +1268,7 @@ class AdapterManager(ManagerBase):
                     )
                 )
             finally:
-                elapsed = _time.monotonic() - t0
+                elapsed = time.monotonic() - t0
                 handler_waits.reset(_wait_token)
 
                 _wait_total = sum(w.get("duration", 0.0) for w in _task_waits)
@@ -1217,9 +1311,16 @@ class AdapterManager(ManagerBase):
                         )
 
         try:
-            return asyncio.create_task(_safe_run())
+            task = asyncio.create_task(_safe_run())
+            # 追踪 Task 以便 shutdown 时取消/等待
+            self._pending_handler_tasks.add(task)
+            task.add_done_callback(self._pending_handler_tasks.discard)
+            return task
         except RuntimeError:
-            return asyncio.ensure_future(_safe_run())
+            task = asyncio.ensure_future(_safe_run())
+            self._pending_handler_tasks.add(task)
+            task.add_done_callback(self._pending_handler_tasks.discard)
+            return task
 
     # ==================== Bot状态管理 ====================
 
@@ -1365,6 +1466,43 @@ class AdapterManager(ManagerBase):
             if bot_meta:
                 self._bots[platform][bot_id].setdefault("info", {}).update(bot_meta)
 
+    def _evict_offline_bots(self, expiry_secs: int | None = None) -> int:
+        """
+        {!--< internal-use >!--}
+        清除过期的离线 Bot 记录
+
+        遍历 _bots，将状态为 offline 且 last_active 距今超过 expiry_secs 的条目移除。
+
+        :param expiry_secs: 过期时间（秒），None 时从框架配置读取
+        :return: int 被清除的 Bot 记录数
+        """
+        if expiry_secs is None:
+            expiry_secs = DEFAULT_OFFLINE_BOT_EXPIRY_SECS
+            try:
+                from ..runtime import get_framework_config
+
+                framework_config = get_framework_config()
+                expiry_secs = framework_config.get("offline_bot_expiry", expiry_secs)
+            except Exception:
+                pass
+        if expiry_secs <= 0:
+            return 0
+
+        now = time.time()
+        evicted = 0
+        for platform in list(self._bots.keys()):
+            for bot_id in list(self._bots[platform].keys()):
+                bot_info = self._bots[platform][bot_id]
+                if (
+                    bot_info.get("status") == "offline"
+                    and (now - bot_info.get("last_active", 0)) > expiry_secs
+                ):
+                    del self._bots[platform][bot_id]
+                    evicted += 1
+            if not self._bots[platform]:
+                del self._bots[platform]
+        return evicted
+
     def get_bot_info(self, platform: str, bot_id: str) -> dict | None:
         """
         获取Bot详细信息

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/adapter.pyi

@@ -22,7 +22,7 @@ from ..runtime.context import current_owner, handler_waits
 from .Bases.adapter import BaseAdapter
 from .Bases.manager import ManagerBase
 from .config import config
-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
+from .constants import ADAPTER_RETRY_BACKOFF_INTERVALS, ADAPTER_RETRY_FIXED_DELAY_SECS, CONFIG_KEY_ADAPTER_STATUS, CONFIG_KEY_ADAPTER_STATUS_OF, DEFAULT_ADAPTER_ENABLED, DEFAULT_HANDLER_DRAIN_TIMEOUT_SECS, DEFAULT_HANDLER_MAX_CONCURRENCY, DEFAULT_OFFLINE_BOT_EXPIRY_SECS, HANDLER_SLOW_THRESHOLD_SECS
 from .i18n import i18n
 from .lifecycle import lifecycle
 from .logger import logger

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/constants.py

@@ -585,3 +585,37 @@ DEFAULT_WS_CLIENT_CONNECT_TIMEOUT_SECS: Final[float] = 10.0
 # 才会按数组索引处理。超过此值的索引会被安全跳过，避免分配超大列表导致 OOM。
 # 修改影响: 运行时行为。storage.set() 写入超大列表索引时的安全阈值。
 STORAGE_MAX_LIST_INDEX: Final[int] = 10000
+
+# ==============================================================================
+# 性能优化与主动 GC
+#
+# 控制事件处理器并发上限、后台资源回收节奏和内存释放策略。
+# 使用位置: Core/adapter.py -> emit(), shutdown()
+#            Core/lifecycle.py -> register()
+#            sdk.py -> _do_uninit()
+# ==============================================================================
+
+# 事件处理器最大并发 Task 数。
+# 运行时行为。每个事件匹配的处理器在独立 Task 中执行，此值限制同时运行的 Task 数量。
+# 修改影响: 设大提高并发吞吐但增加内存占用，设小限制资源消耗但可能降低事件处理速度。
+DEFAULT_HANDLER_MAX_CONCURRENCY: Final[int] = 64
+
+# 路由限流存储的自动清理间隔（秒）。
+# 运行时行为。后台定期扫描 _rate_limit_store，清除过期的 IP 记录。
+# 修改影响: 设大减少 CPU 开销但内存占用更久，设小更积极回收内存。
+DEFAULT_RATE_LIMIT_CLEANUP_INTERVAL_SECS: Final[int] = 300
+
+# 离线 Bot 信息的自动过期时间（秒）。
+# 运行时行为。Bot 标记为 offline 后，经过此时间会被自动清除。
+# 修改影响: 设大保留更多历史 Bot 信息，设小更快回收内存。0 表示不过期。
+DEFAULT_OFFLINE_BOT_EXPIRY_SECS: Final[int] = 3600
+
+# 主动 GC（垃圾回收）间隔（秒）。
+# 运行时行为。SDK 初始化后启动定期 GC 后台任务，按此间隔触发 Python GC 和内部资源回收。
+# 修改影响: 设大减少 CPU 中断但内存峰值更高，设小更频繁回收但增加开销。0 表示禁用。
+DEFAULT_PROACTIVE_GC_INTERVAL_SECS: Final[int] = 300
+
+# shutdown 时等待在途事件处理器完成的最长时间（秒）。
+# 运行时行为。适配器关闭时取消所有 pending handler tasks 后等待它们退出的耐心时间。
+# 修改影响: 设大确保处理器完整结束，设小加速关闭流程。
+DEFAULT_HANDLER_DRAIN_TIMEOUT_SECS: Final[float] = 5.0

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/constants.pyi

@@ -208,3 +208,13 @@ DEFAULT_WS_CLIENT_HEARTBEAT_SECS: Final[float | None]
 DEFAULT_WS_CLIENT_CONNECT_TIMEOUT_SECS: Final[float]
 
 STORAGE_MAX_LIST_INDEX: Final[int]
+
+DEFAULT_HANDLER_MAX_CONCURRENCY: Final[int]
+
+DEFAULT_RATE_LIMIT_CLEANUP_INTERVAL_SECS: Final[int]
+
+DEFAULT_OFFLINE_BOT_EXPIRY_SECS: Final[int]
+
+DEFAULT_PROACTIVE_GC_INTERVAL_SECS: Final[int]
+
+DEFAULT_HANDLER_DRAIN_TIMEOUT_SECS: Final[float]

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/i18n/locales/en.py

@@ -45,6 +45,8 @@ TRANSLATIONS = {
     "core.sdk.uninit.timeout_msg": "SDK uninitialization timed out",
     "core.sdk.uninit.failed_msg": "SDK uninitialization failed",
     "core.sdk.uninit.critical_error": "SDK uninitialization critical error: {error}",
+    "core.sdk.uninit.client_close_failed": "Failed to close HTTP client connection pool: {error}",
+    "core.sdk.gc.collected": "[GC] Python collected {collected} object(s), evicted {evicted} offline bot(s)",
     # ==================== SDK Environment Preparation ====================
     "core.sdk.prepare.start": "Starting initialization",
     "core.sdk.prepare.starting": "Preparing initialization environment...",
@@ -133,6 +135,8 @@ TRANSLATIONS = {
     "core.adapter.bot_online": "Bot {platform}/{bot_id} online",
     "core.adapter.handler_error": "Event handler execution error [{handler}] type={type} platform={platform}: {error}",
     "core.adapter.handler_slow": "Event handler execution slow [{handler}] elapsed {elapsed}s > {threshold}s type={type} platform={platform}{tag}",
+    "core.adapter.handler_drain_timeout": "{count} pending event handler(s) did not exit within {timeout}s, force cancelled",
+    "core.adapter.lifecycle_hooks_cleaned": "Adapter {platform} cleaned {count} lifecycle hook(s)",
     "core.adapter.auto_discover_bot": "Auto-discovered Bot: {platform}/{bot_id}",
     "core.adapter.bot_status_change": "Bot status change: {platform}/{bot_id} {old} -> {new}",
     "core.adapter.method_not_exist": "Method {method} does not exist",
@@ -161,6 +165,7 @@ TRANSLATIONS = {
     "core.module.on_unload_failed": "Module {name} on_unload method execution failed: {error}",
     "core.module.unload_routes_cleaned": "Cleaned routes for module {name}: HTTP={http}, WebSocket={ws}",
     "core.module.unload_handlers_cleaned": "Cleaned {count} event handlers/commands for module {name}",
+    "core.module.lifecycle_hooks_cleaned": "Module {name} cleaned {count} lifecycle hook(s)",
     "core.module.unload_success": "Module {name} unloaded successfully",
     "core.module.unload_failed": "Failed to unload module {name}: {error}",
     "core.module.registered_status": "Module {name} registered and {status}",

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/i18n/locales/ja.py

@@ -45,6 +45,8 @@ TRANSLATIONS = {
     "core.sdk.uninit.timeout_msg": "SDK の非初期化がタイムアウトしました",
     "core.sdk.uninit.failed_msg": "SDK の非初期化に失敗しました",
     "core.sdk.uninit.critical_error": "SDK 非初期化の重大なエラー: {error}",
+    "core.sdk.uninit.client_close_failed": "HTTP クライアント接続プールのクローズに失敗しました: {error}",
+    "core.sdk.gc.collected": "[GC] Python が {collected} 個のオブジェクトを回収し、{evicted} 個のオフライン Bot を削除しました",
     # ==================== SDK 環境準備 ====================
     "core.sdk.prepare.start": "初期化を開始します",
     "core.sdk.prepare.starting": "初期化環境を準備しています...",
@@ -133,6 +135,8 @@ TRANSLATIONS = {
     "core.adapter.bot_online": "Bot {platform}/{bot_id} がオンラインになりました",
     "core.adapter.handler_error": "イベントハンドラーの実行エラー [{handler}] type={type} platform={platform}: {error}",
     "core.adapter.handler_slow": "イベントハンドラーの実行が遅いです [{handler}] 経過時間 {elapsed}s > {threshold}s type={type} platform={platform}{tag}",
+    "core.adapter.handler_drain_timeout": "{count} 個の保留中イベントハンドラーが {timeout}s 内に終了しなかったため、強制キャンセルされました",
+    "core.adapter.lifecycle_hooks_cleaned": "アダプター {platform} が {count} 個のライフサイクルフックをクリーンアップしました",
     "core.adapter.auto_discover_bot": "Bot を自動検出しました: {platform}/{bot_id}",
     "core.adapter.bot_status_change": "Bot の状態変化: {platform}/{bot_id} {old} -> {new}",
     "core.adapter.method_not_exist": "メソッド {method} は存在しません",
@@ -161,6 +165,7 @@ TRANSLATIONS = {
     "core.module.on_unload_failed": "モジュール {name} の on_unload メソッドの実行に失敗しました: {error}",
     "core.module.unload_routes_cleaned": "モジュール {name} のルートをクリーンアップしました: HTTP={http}, WebSocket={ws}",
     "core.module.unload_handlers_cleaned": "モジュール {name} の {count} 個のイベントハンドラー/コマンドをクリーンアップしました",
+    "core.module.lifecycle_hooks_cleaned": "モジュール {name} が {count} 個のライフサイクルフックをクリーンアップしました",
     "core.module.unload_success": "モジュール {name} のアンロードに成功しました",
     "core.module.unload_failed": "モジュール {name} のアンロードに失敗しました: {error}",
     "core.module.registered_status": "モジュール {name} は登録され、{status}",

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/i18n/locales/ru.py

@@ -45,6 +45,8 @@ TRANSLATIONS = {
     "core.sdk.uninit.timeout_msg": "Деинициализация SDK превысила время ожидания",
     "core.sdk.uninit.failed_msg": "Ошибка деинициализации SDK",
     "core.sdk.uninit.critical_error": "Критическая ошибка деинициализации SDK: {error}",
+    "core.sdk.uninit.client_close_failed": "Не удалось закрыть пул соединений HTTP-клиента: {error}",
+    "core.sdk.gc.collected": "[GC] Python собрал {collected} объект(ов), удалено {evicted} автономных бот(ов)",
     # ==================== Подготовка окружения SDK ====================
     "core.sdk.prepare.start": "Начало инициализации",
     "core.sdk.prepare.starting": "Подготовка окружения инициализации...",
@@ -133,6 +135,8 @@ TRANSLATIONS = {
     "core.adapter.bot_online": "Bot {platform}/{bot_id} в сети",
     "core.adapter.handler_error": "Ошибка выполнения обработчика событий [{handler}] type={type} platform={platform}: {error}",
     "core.adapter.handler_slow": "Медленное выполнение обработчика событий [{handler}] время {elapsed}s > {threshold}s type={type} platform={platform}{tag}",
+    "core.adapter.handler_drain_timeout": "{count} ожидающих обработчиков событий не завершились за {timeout}s, принудительно отменены",
+    "core.adapter.lifecycle_hooks_cleaned": "Адаптер {platform} очистил {count} перехватчиков жизненного цикла",
     "core.adapter.auto_discover_bot": "Автообнаружение Bot: {platform}/{bot_id}",
     "core.adapter.bot_status_change": "Изменение состояния Bot: {platform}/{bot_id} {old} -> {new}",
     "core.adapter.method_not_exist": "Метод {method} не существует",
@@ -161,6 +165,7 @@ TRANSLATIONS = {
     "core.module.on_unload_failed": "Ошибка выполнения метода on_unload модуля {name}: {error}",
     "core.module.unload_routes_cleaned": "Очищены маршруты для модуля {name}: HTTP={http}, WebSocket={ws}",
     "core.module.unload_handlers_cleaned": "Очищено {count} обработчиков событий/команд для модуля {name}",
+    "core.module.lifecycle_hooks_cleaned": "Модуль {name} очистил {count} перехватчиков жизненного цикла",
     "core.module.unload_success": "Модуль {name} успешно выгружен",
     "core.module.unload_failed": "Ошибка выгрузки модуля {name}: {error}",
     "core.module.registered_status": "Модуль {name} зарегистрирован и {status}",

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/i18n/locales/zh_cn.py

@@ -45,6 +45,8 @@ TRANSLATIONS = {
     "core.sdk.uninit.timeout_msg": "SDK反初始化超时",
     "core.sdk.uninit.failed_msg": "SDK反初始化失败",
     "core.sdk.uninit.critical_error": "SDK反初始化严重错误: {error}",
+    "core.sdk.uninit.client_close_failed": "关闭 HTTP 客户端连接池失败: {error}",
+    "core.sdk.gc.collected": "[GC] Python 回收了 {collected} 个对象，清理了 {evicted} 个离线 Bot",
     # ==================== SDK 环境准备 ====================
     "core.sdk.prepare.start": "开始初始化",
     "core.sdk.prepare.starting": "准备初始化环境...",
@@ -133,6 +135,8 @@ TRANSLATIONS = {
     "core.adapter.bot_online": "Bot {platform}/{bot_id} 上线",
     "core.adapter.handler_error": "事件处理器执行错误 [{handler}] type={type} platform={platform}: {error}",
     "core.adapter.handler_slow": "事件处理器执行缓慢 [{handler}] 耗时 {elapsed}s > {threshold}s type={type} platform={platform}{tag}",
+    "core.adapter.handler_drain_timeout": "{count} 个在途事件处理器未在 {timeout}s 内退出，已强制取消",
+    "core.adapter.lifecycle_hooks_cleaned": "适配器 {platform} 清理了 {count} 个生命周期钩子",
     "core.adapter.auto_discover_bot": "自动发现Bot: {platform}/{bot_id}",
     "core.adapter.bot_status_change": "Bot状态变更: {platform}/{bot_id} {old} -> {new}",
     "core.adapter.method_not_exist": "方法 {method} 不存在",
@@ -161,6 +165,7 @@ TRANSLATIONS = {
     "core.module.on_unload_failed": "模块 {name} on_unload 方法执行失败: {error}",
     "core.module.unload_routes_cleaned": "已清理模块 {name} 的路由: HTTP={http}, WebSocket={ws}",
     "core.module.unload_handlers_cleaned": "已清理模块 {name} 的 {count} 个事件处理器/命令",
+    "core.module.lifecycle_hooks_cleaned": "模块 {name} 清理了 {count} 个生命周期钩子",
     "core.module.unload_success": "模块 {name} 卸载成功",
     "core.module.unload_failed": "卸载模块 {name} 失败: {error}",
     "core.module.registered_status": "模块 {name} 已注册并{status}",

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/i18n/locales/zh_tw.py

@@ -45,6 +45,8 @@ TRANSLATIONS = {
     "core.sdk.uninit.timeout_msg": "SDK反初始化逾時",
     "core.sdk.uninit.failed_msg": "SDK反初始化失敗",
     "core.sdk.uninit.critical_error": "SDK反初始化嚴重錯誤: {error}",
+    "core.sdk.uninit.client_close_failed": "關閉 HTTP 客戶端連線池失敗: {error}",
+    "core.sdk.gc.collected": "[GC] Python 回收了 {collected} 個物件，清理了 {evicted} 個離線 Bot",
     # ==================== SDK 環境準備 ====================
     "core.sdk.prepare.start": "開始初始化",
     "core.sdk.prepare.starting": "準備初始化環境...",
@@ -133,6 +135,8 @@ TRANSLATIONS = {
     "core.adapter.bot_online": "Bot {platform}/{bot_id} 上線",
     "core.adapter.handler_error": "事件處理器執行錯誤 [{handler}] type={type} platform={platform}: {error}",
     "core.adapter.handler_slow": "事件處理器執行緩慢 [{handler}] 耗時 {elapsed}s > {threshold}s type={type} platform={platform}{tag}",
+    "core.adapter.handler_drain_timeout": "{count} 個在途事件處理器未在 {timeout}s 內退出，已強制取消",
+    "core.adapter.lifecycle_hooks_cleaned": "介面卡 {platform} 清理了 {count} 個生命週期鉤子",
     "core.adapter.auto_discover_bot": "自動發現Bot: {platform}/{bot_id}",
     "core.adapter.bot_status_change": "Bot狀態變更: {platform}/{bot_id} {old} -> {new}",
     "core.adapter.method_not_exist": "方法 {method} 不存在",
@@ -161,6 +165,7 @@ TRANSLATIONS = {
     "core.module.on_unload_failed": "模組 {name} on_unload 方法執行失敗: {error}",
     "core.module.unload_routes_cleaned": "已清理模組 {name} 的路由: HTTP={http}, WebSocket={ws}",
     "core.module.unload_handlers_cleaned": "已清理模組 {name} 的 {count} 個事件處理器/命令",
+    "core.module.lifecycle_hooks_cleaned": "模組 {name} 清理了 {count} 個生命週期鉤子",
     "core.module.unload_success": "模組 {name} 卸載成功",
     "core.module.unload_failed": "卸載模組 {name} 失敗: {error}",
     "core.module.registered_status": "模組 {name} 已註冊並{status}",

{erispulse-2.6.0.dev0 → erispulse-2.6.0.dev1}/src/ErisPulse/Core/lifecycle.py

@@ -19,6 +19,7 @@ from typing import Any
 
 from .constants import DEFAULT_EVENT_SOURCE, HANDLER_SLOW_THRESHOLD_SECS
 from .i18n import i18n
+from ..runtime.context import current_owner
 
 
 class _NullLogger:
@@ -108,7 +109,8 @@ class LifecycleManager:
     }
 
     def __init__(self):
-        self._hooks: dict[str, list[tuple[int, Callable]]] = {}
+        # _hooks 存储 (priority, handler, owner) 三元组
+        self._hooks: dict[str, list[tuple[int, Callable, str | None]]] = {}
         self._timers: dict[str, float] = {}
 
     # ==================== 注册 API ====================
@@ -136,7 +138,8 @@ class LifecycleManager:
             raise ValueError(i18n.t("core.lifecycle.event_name_required"))
 
         def decorator(func: Callable) -> Callable:
-            self._hooks.setdefault(event, []).append((priority, func))
+            owner = current_owner.get()
+            self._hooks.setdefault(event, []).append((priority, func, owner))
             self._hooks[event].sort(key=lambda x: x[0], reverse=True)
             return func
 
@@ -155,7 +158,8 @@ class LifecycleManager:
         """
         if not isinstance(event, str) or not event:
             raise ValueError(i18n.t("core.lifecycle.event_name_required"))
-        self._hooks.setdefault(event, []).append((priority, handler))
+        owner = current_owner.get()
+        self._hooks.setdefault(event, []).append((priority, handler, owner))
         self._hooks[event].sort(key=lambda x: x[0], reverse=True)
 
     def unregister(self, event: str, handler: Callable = None):
@@ -173,7 +177,30 @@ class LifecycleManager:
             self._hooks.pop(event, None)
         else:
             handlers = self._hooks.get(event, [])
-            self._hooks[event] = [(p, h) for p, h in handlers if h != handler]
+            self._hooks[event] = [(p, h, o) for p, h, o in handlers if h != handler]
+
+    def unregister_by_owner(self, owner: str) -> int:
+        """
+        取消指定 owner 注册的所有事件处理器
+
+        用于模块/适配器卸载时自动清理其注册的钩子，避免闭包引用导致内存泄漏。
+
+        :param owner: 模块或适配器名称
+        :return: int 被移除的处理器数量
+
+        :example:
+        >>> lifecycle.unregister_by_owner("MyModule")
+        """
+        removed = 0
+        for event in list(self._hooks.keys()):
+            original_len = len(self._hooks[event])
+            self._hooks[event] = [
+                (p, h, o) for p, h, o in self._hooks[event] if o != owner
+            ]
+            removed += original_len - len(self._hooks[event])
+            if not self._hooks[event]:
+                del self._hooks[event]
+        return removed
 
     # ==================== 触发 API ====================
 
@@ -346,7 +373,7 @@ class LifecycleManager:
         """
         import time as _time
 
-        for priority, handler in self._hooks[hook_name]:
+        for priority, handler, _owner in self._hooks[hook_name]:
             try:
                 _t = _time.monotonic()
                 _hname = getattr(
@@ -381,7 +408,7 @@ class LifecycleManager:
         :param data: Any 事件数据
         :return: Any 处理后的数据
         """
-        for _, handler in self._hooks[hook_name]:
+        for _, handler, _owner in self._hooks[hook_name]:
             try:
                 if inspect.iscoroutinefunction(handler):
                     try: