[melobot] Tiny modifies for some functions and vars

Author: aicorein

src/melobot/bot/dispatch.py

@@ -58,7 +58,7 @@ def __init__(self) -> None:
     def internal_add(self, *handlers: EventHandler) -> None:
         for h in handlers:
             self.handlers.setdefault(h.flow.priority, set()).add(h)
-            h.flow.on_priority_reset(lambda new_prior, h=h: self.reset(h, new_prior))
+            h.flow.on_priority_reset(lambda new_prior, h=h: self._reset(h, new_prior))
 
     async def add(self, *handlers: EventHandler) -> None:
         async with self.broadcast_ctrl.write():
@@ -76,7 +76,7 @@ async def expire(self, *handlers: EventHandler) -> None:
         async with self.broadcast_ctrl.write():
             await self._remove(*handlers)
 
-    async def reset(self, handler: EventHandler, new_prior: HandleLevel) -> None:
+    async def _reset(self, handler: EventHandler, new_prior: HandleLevel) -> None:
         if handler.flow.priority == new_prior:
             return
 

src/melobot/session/base.py

@@ -264,7 +264,7 @@ async def suspend(timeout: float | None = None) -> bool:
     :param timeout: 挂起后再唤醒的超时时间, 为空则永不超时
     :return: 如果为 `False` 则表明唤醒超时
     """
-    return await SessionCtx().get().__suspend__(timeout)
+    return await _SESSION_CTX.get().__suspend__(timeout)
 
 
 def enter_session(

src/melobot/utils.py

@@ -14,11 +14,10 @@
     ContextManager,
     Coroutine,
     Literal,
-    TypeVar,
     cast,
 )
 
-from typing_extensions import Self
+from typing_extensions import Self, TypeVar
 
 from .exceptions import ValidateError
 from .typ import AsyncCallable, P, T
@@ -349,10 +348,10 @@ def to_coro(
     return to_async(obj)(*args, **kwargs)  # type: ignore[arg-type]
 
 
-CbRetT = TypeVar("CbRetT")
-FirstCbRetT = TypeVar("FirstCbRetT")
-SecondCbRetT = TypeVar("SecondCbRetT")
-OriginRetT = TypeVar("OriginRetT")
+CbRetT = TypeVar("CbRetT", default=Any)
+FirstCbRetT = TypeVar("FirstCbRetT", default=Any)
+SecondCbRetT = TypeVar("SecondCbRetT", default=Any)
+OriginRetT = TypeVar("OriginRetT", default=Any)
 
 
 def if_not(