🐛 fix run pre/post hook not in context (#1391)

nonebot/internal/matcher.py

@@ -1,8 +1,8 @@
 from types import ModuleType
 from contextvars import ContextVar
 from collections import defaultdict
-from contextlib import AsyncExitStack
 from datetime import datetime, timedelta
+from contextlib import AsyncExitStack, contextmanager
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -661,6 +661,18 @@ class Matcher(metaclass=MatcherMeta):
         if REJECT_CACHE_TARGET in self.state:
             self.state[REJECT_TARGET] = self.state[REJECT_CACHE_TARGET]
 
+    @contextmanager
+    def ensure_context(self, bot: Bot, event: Event):
+        b_t = current_bot.set(bot)
+        e_t = current_event.set(event)
+        m_t = current_matcher.set(self)
+        try:
+            yield
+        finally:
+            current_bot.reset(b_t)
+            current_event.reset(e_t)
+            current_matcher.reset(m_t)
+
     async def simple_run(
         self,
         bot: Bot,
@@ -673,9 +685,8 @@ class Matcher(metaclass=MatcherMeta):
             f"{self} run with incoming args: "
             f"bot={bot}, event={event!r}, state={state!r}"
         )
-        b_t = current_bot.set(bot)
-        e_t = current_event.set(event)
-        m_t = current_matcher.set(self)
+
+        with self.ensure_context(bot, event):
             try:
                 # Refresh preprocess state
                 self.state.update(state)
@@ -699,9 +710,6 @@ class Matcher(metaclass=MatcherMeta):
                 self.block = True
             finally:
                 logger.info(f"{self} running complete")
-            current_bot.reset(b_t)
-            current_event.reset(e_t)
-            current_matcher.reset(m_t)
 
     # 运行handlers
     async def run(

nonebot/message.py

@@ -167,6 +167,8 @@ async def _run_matcher(
         )
         for proc in _run_preprocessors
     ]:
+        # ensure matcher function can be correctly called
+        with matcher.ensure_context(bot, event):
             try:
                 await asyncio.gather(*coros)
             except IgnoredException:
@@ -205,6 +207,8 @@ async def _run_matcher(
         )
         for proc in _run_postprocessors
     ]:
+        # ensure matcher function can be correctly called
+        with matcher.ensure_context(bot, event):
             try:
                 await asyncio.gather(*coros)
             except Exception as e: