diff --git a/nonebot/message.py b/nonebot/message.py
index d9e61c63..81a089c5 100644
--- a/nonebot/message.py
+++ b/nonebot/message.py
@@ -5,19 +5,37 @@ from nonebot.log import logger
from nonebot.rule import TrieRule
from nonebot.utils import escape_tag
from nonebot.matcher import matchers
-from nonebot.typing import Set, Type, Union, NoReturn
-from nonebot.typing import Bot, Event, Matcher, PreProcessor
from nonebot.exception import IgnoredException, ExpiredException
from nonebot.exception import StopPropagation, _ExceptionContainer
+from nonebot.typing import Set, Type, Union, NoReturn, Bot, Event, Matcher
+from nonebot.typing import EventPreProcessor, RunPreProcessor, EventPostProcessor, RunPostProcessor
-_event_preprocessors: Set[PreProcessor] = set()
+_event_preprocessors: Set[EventPreProcessor] = set()
+_event_postprocessors: Set[EventPostProcessor] = set()
+_run_preprocessors: Set[RunPreProcessor] = set()
+_run_postprocessors: Set[RunPostProcessor] = set()
-def event_preprocessor(func: PreProcessor) -> PreProcessor:
+def event_preprocessor(func: EventPreProcessor) -> EventPreProcessor:
_event_preprocessors.add(func)
return func
+def event_postprocessor(func: EventPostProcessor) -> EventPostProcessor:
+ _event_postprocessors.add(func)
+ return func
+
+
+def run_preprocessor(func: RunPreProcessor) -> RunPreProcessor:
+ _run_preprocessors.add(func)
+ return func
+
+
+def run_postprocessor(func: RunPostProcessor) -> RunPostProcessor:
+ _run_postprocessors.add(func)
+ return func
+
+
async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event,
state: dict) -> Union[None, NoReturn]:
if Matcher.expire_time and datetime.now() > Matcher.expire_time:
@@ -35,7 +53,24 @@ async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event,
logger.info(f"Event will be handled by {Matcher}")
matcher = Matcher()
- # TODO: BeforeMatcherRun
+
+ coros = list(
+ map(lambda x: x(matcher, bot, event, state), _run_preprocessors))
+ if coros:
+ try:
+ await asyncio.gather(*coros)
+ except IgnoredException:
+ logger.opt(colors=True).info(
+ f"Matcher {matcher} running is cancelled")
+ return
+ except Exception as e:
+ logger.opt(colors=True, exception=e).error(
+ "Error when running RunPreProcessors. "
+ "Running cancelled!")
+ return
+
+ exceptions = []
+
try:
logger.debug(f"Running matcher {matcher}")
await matcher.run(bot, event, state)
@@ -43,12 +78,24 @@ async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event,
logger.opt(colors=True, exception=e).error(
f"Running matcher {matcher} failed."
)
+ exceptions.append(e)
- exceptions = []
if Matcher.temp:
exceptions.append(ExpiredException)
if Matcher.block:
exceptions.append(StopPropagation)
+
+ coros = list(
+ map(lambda x: x(matcher, exceptions, bot, event, state),
+ _run_postprocessors))
+ if coros:
+ try:
+ await asyncio.gather(*coros)
+ except Exception as e:
+ logger.opt(colors=True, exception=e).error(
+ "Error when running RunPostProcessors"
+ )
+
if exceptions:
raise _ExceptionContainer(exceptions)
@@ -77,10 +124,8 @@ async def handle_event(bot: Bot, event: Event):
if show_log:
logger.opt(colors=True).info(log_msg)
- coros = []
state = {}
- for preprocessor in _event_preprocessors:
- coros.append(preprocessor(bot, event, state))
+ coros = list(map(lambda x: x(bot, event, state), _event_preprocessors))
if coros:
try:
logger.debug("Running PreProcessors...")
@@ -89,6 +134,11 @@ async def handle_event(bot: Bot, event: Event):
logger.opt(
colors=True).info(f"Event {event.name} is ignored")
return
+ except Exception as e:
+ logger.opt(colors=True, exception=e).error(
+ "Error when running EventPreProcessors. "
+ "Event ignored!")
+ return
# Trie Match
_, _ = TrieRule.get_value(bot, event, state)
@@ -121,3 +171,13 @@ async def handle_event(bot: Bot, event: Event):
)
del matchers[priority][index - i]
i += 1
+
+ coros = list(map(lambda x: x(bot, event, state), _event_postprocessors))
+ if coros:
+ try:
+ logger.debug("Running PostProcessors...")
+ await asyncio.gather(*coros)
+ except Exception as e:
+ logger.opt(colors=True, exception=e).error(
+ "Error when running EventPostProcessors"
+ )
diff --git a/nonebot/typing.py b/nonebot/typing.py
index ec9a666b..da7923bd 100644
--- a/nonebot/typing.py
+++ b/nonebot/typing.py
@@ -92,14 +92,41 @@ MessageSegment = TypeVar("MessageSegment", bound="BaseMessageSegment")
所有 MessageSegment 的基类。
"""
-PreProcessor = Callable[[Bot, Event, dict], Union[Awaitable[None],
- Awaitable[NoReturn]]]
+EventPreProcessor = Callable[[Bot, Event, dict], Union[Awaitable[None],
+ Awaitable[NoReturn]]]
"""
:类型: ``Callable[[Bot, Event, dict], Union[Awaitable[None], Awaitable[NoReturn]]]``
:说明:
- 消息预处理函数 PreProcessor 类型
+ 事件预处理函数 EventPreProcessor 类型
+"""
+EventPostProcessor = Callable[[Bot, Event, dict], Union[Awaitable[None],
+ Awaitable[NoReturn]]]
+"""
+:类型: ``Callable[[Bot, Event, dict], Union[Awaitable[None], Awaitable[NoReturn]]]``
+
+:说明:
+
+ 事件预处理函数 EventPostProcessor 类型
+"""
+RunPreProcessor = Callable[["Matcher", Bot, Event, dict],
+ Union[Awaitable[None], Awaitable[NoReturn]]]
+"""
+:类型: ``Callable[[Matcher, Bot, Event, dict], Union[Awaitable[None], Awaitable[NoReturn]]]``
+
+:说明:
+
+ 事件响应器运行前预处理函数 RunPreProcessor 类型
+"""
+RunPostProcessor = Callable[["Matcher", List[Any], Bot, Event, dict],
+ Union[Awaitable[None], Awaitable[NoReturn]]]
+"""
+:类型: ``Callable[[Matcher, List[Any], Bot, Event, dict], Union[Awaitable[None], Awaitable[NoReturn]]]``
+
+:说明:
+
+ 事件响应器运行前预处理函数 RunPostProcessor 类型,第二个参数包含运行时产生的错误以及 ``ExpiredException``, ``StopPropagation`` (如果存在)
"""
Matcher = TypeVar("Matcher", bound="MatcherClass")