diff --git a/nonebot/exception.py b/nonebot/exception.py
index 4d862e41..5e27acc4 100644
--- a/nonebot/exception.py
+++ b/nonebot/exception.py
@@ -9,12 +9,6 @@
from nonebot.typing import List, Type, Optional
-class _ExceptionContainer(Exception):
-
- def __init__(self, exceptions: List[Type[Exception]]) -> None:
- self.exceptions = exceptions
-
-
class IgnoredException(Exception):
"""
:说明:
diff --git a/nonebot/message.py b/nonebot/message.py
index 49cff307..9b3aab47 100644
--- a/nonebot/message.py
+++ b/nonebot/message.py
@@ -9,10 +9,9 @@ from datetime import datetime
from nonebot.log import logger
from nonebot.rule import TrieRule
from nonebot.utils import escape_tag
-from nonebot.matcher import matchers
-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.matcher import matchers, Matcher
+from nonebot.typing import Set, Type, Union, Iterable, NoReturn, Bot, Event
+from nonebot.exception import IgnoredException, ExpiredException, StopPropagation
from nonebot.typing import EventPreProcessor, RunPreProcessor, EventPostProcessor, RunPostProcessor
_event_preprocessors: Set[EventPreProcessor] = set()
@@ -41,20 +40,46 @@ def run_postprocessor(func: RunPostProcessor) -> RunPostProcessor:
return func
+async def _check_matcher(priority: int, bot: Bot, event: Event,
+ state: dict) -> Iterable[Type[Matcher]]:
+ current_matchers = matchers[priority].copy()
+
+ async def _check(Matcher: Type[Matcher], bot: Bot, event: Event,
+ state: dict) -> Optional[Type[Matcher]]:
+ try:
+ if await Matcher.check_perm(
+ bot, event) and await Matcher.check_rule(bot, event, state):
+ return Matcher
+ except Exception as e:
+ logger.opt(colors=True, exception=e).error(
+ f"Rule check failed for {Matcher}."
+ )
+ return None
+
+ async def _check_expire(Matcher: Type[Matcher]) -> Optional[Type[Matcher]]:
+ if Matcher.temp or (Matcher.expire_time and
+ datetime.now() > Matcher.expire_time):
+ return Matcher
+ return None
+
+ checking_tasks = [
+ _check(Matcher, bot, event, state) for Matcher in current_matchers
+ ]
+ checking_expire_tasks = [
+ _check_expire(Matcher) for Matcher in current_matchers
+ ]
+ results = await asyncio.gather(*checking_tasks, return_exceptions=True)
+ expired = await asyncio.gather(*checking_expire_tasks)
+ for expired_matcher in filter(lambda x: issubclass(Matcher), expired):
+ try:
+ matchers[priority].remove(expired_matcher)
+ except Exception:
+ pass
+ return filter(lambda x: issubclass(Matcher), results)
+
+
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:
- raise _ExceptionContainer([ExpiredException])
-
- try:
- if not await Matcher.check_perm(
- bot, event) or not await Matcher.check_rule(bot, event, state):
- return
- except Exception as e:
- logger.opt(colors=True, exception=e).error(
- f"Rule check failed for {Matcher}.")
- return
-
logger.info(f"Event will be handled by {Matcher}")
matcher = Matcher()
@@ -74,7 +99,7 @@ async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event,
"Running cancelled!")
return
- exceptions = []
+ exception = None
try:
logger.debug(f"Running matcher {matcher}")
@@ -83,15 +108,10 @@ 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)
-
- if Matcher.temp:
- exceptions.append(ExpiredException)
- if Matcher.block:
- exceptions.append(StopPropagation)
+ exception = e
coros = list(
- map(lambda x: x(matcher, exceptions, bot, event, state),
+ map(lambda x: x(matcher, exception, bot, event, state),
_run_postprocessors))
if coros:
try:
@@ -101,8 +121,8 @@ async def _run_matcher(Matcher: Type[Matcher], bot: Bot, event: Event,
"Error when running RunPostProcessors"
)
- if exceptions:
- raise _ExceptionContainer(exceptions)
+ if matcher.block:
+ raise StopPropagation
async def handle_event(bot: Bot, event: Event):
@@ -153,29 +173,23 @@ async def handle_event(bot: Bot, event: Event):
if break_flag:
break
- pending_tasks = [
- _run_matcher(matcher, bot, event, state.copy())
- for matcher in matchers[priority]
- ]
-
if show_log:
logger.debug(f"Checking for matchers in priority {priority}...")
+
+ run_matchers = _check_matcher(priority, bot, event, state)
+
+ pending_tasks = [
+ _run_matcher(matcher, bot, event, state.copy())
+ for matcher in run_matchers
+ ]
+
results = await asyncio.gather(*pending_tasks, return_exceptions=True)
- i = 0
- for index, result in enumerate(results):
- if isinstance(result, _ExceptionContainer):
- e_list = result.exceptions
- if StopPropagation in e_list:
- if not break_flag:
- break_flag = True
- logger.debug("Stop event propagation")
- if ExpiredException in e_list:
- logger.debug(
- f"Matcher {matchers[priority][index - i]} will be removed."
- )
- del matchers[priority][index - i]
- i += 1
+ for result in results:
+ if result is StopPropagation:
+ if not break_flag:
+ break_flag = True
+ logger.debug("Stop event propagation")
coros = list(map(lambda x: x(bot, event, state), _event_postprocessors))
if coros:
diff --git a/nonebot/typing.py b/nonebot/typing.py
index da7923bd..09109b37 100644
--- a/nonebot/typing.py
+++ b/nonebot/typing.py
@@ -119,14 +119,14 @@ RunPreProcessor = Callable[["Matcher", Bot, Event, dict],
事件响应器运行前预处理函数 RunPreProcessor 类型
"""
-RunPostProcessor = Callable[["Matcher", List[Any], Bot, Event, dict],
+RunPostProcessor = Callable[["Matcher", Optional[Exception], Bot, Event, dict],
Union[Awaitable[None], Awaitable[NoReturn]]]
"""
-:类型: ``Callable[[Matcher, List[Any], Bot, Event, dict], Union[Awaitable[None], Awaitable[NoReturn]]]``
+:类型: ``Callable[[Matcher, Optional[Exception], Bot, Event, dict], Union[Awaitable[None], Awaitable[NoReturn]]]``
:说明:
- 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数包含运行时产生的错误以及 ``ExpiredException``, ``StopPropagation`` (如果存在)
+ 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数为运行时产生的错误（如果存在）
"""
Matcher = TypeVar("Matcher", bound="MatcherClass")