mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-06 04:10:02 +08:00
性能优化 (#2126)
* 性能优化 * 代码改进 * 优化浏览器代际切换逻辑 * 统一缓存与生命周期 * 添加aiomysql依赖 * 优化插件路径处理逻辑，简化条件判断；在虚拟环境包管理器中添加编码和错误处理参数以增强稳定性 * 🚨 auto fix by pre-commit hooks * 优化Windows下的关闭逻辑 * 代码优化 * bugfix:修复配置重载问题 * bugfix:修复插件加载启动竞态问题 * 收敛事件入口和权限上下文 * 优化 Windows launcher 关闭重启兜底 --------- Co-authored-by: HibiKier <775757368@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Copaan
co-authored by
HibiKier
pre-commit-ci[bot]
HibiKier
pre-commit-ci[bot]
parent
24c316cd2c
commit
5d92ccd3b0
@@ -1,4 +1,3 @@
|
||||
import contextlib
|
||||
import time
|
||||
|
||||
from nonebot import get_driver
|
||||
@@ -12,14 +11,20 @@ from nonebot_plugin_uninfo import Uninfo
|
||||
|
||||
from zhenxun.services.cache.runtime_cache import is_cache_ready
|
||||
from zhenxun.services.log import logger
|
||||
from zhenxun.services.message_load import is_overloaded
|
||||
from zhenxun.services.message_load import is_overloaded, mark_activity
|
||||
from zhenxun.services.runtime_bootstrap import register_runtime_bootstrap
|
||||
from zhenxun.utils.utils import get_entity_ids
|
||||
|
||||
from .auth.config import LOGGER_COMMAND
|
||||
from .auth.context import (
|
||||
get_event_context,
|
||||
get_or_create_event_context,
|
||||
resolve_actor_user_id,
|
||||
resolve_event_channel_id,
|
||||
resolve_event_group_id,
|
||||
set_route_modules,
|
||||
)
|
||||
from .auth_checker import (
|
||||
LimitManager,
|
||||
_get_event_cache,
|
||||
_get_route_context,
|
||||
auth,
|
||||
route_precheck,
|
||||
@@ -41,17 +46,6 @@ async def _mark_bot_connected(bot: Bot):
|
||||
_BOT_CONNECT_TS = time.time()
|
||||
|
||||
|
||||
def _extract_plain_text(message: UniMsg | None, event: Event) -> str:
|
||||
if message is not None:
|
||||
with contextlib.suppress(Exception):
|
||||
return message.extract_plain_text()
|
||||
with contextlib.suppress(Exception):
|
||||
plain = event.get_plaintext()
|
||||
if plain:
|
||||
return plain.strip()
|
||||
return ""
|
||||
|
||||
|
||||
@driver.on_startup
|
||||
async def _start_auth_runtime_tasks():
|
||||
await start_auth_runtime_tasks()
|
||||
@@ -72,37 +66,9 @@ def _skip_auth_for_plugin(matcher: Matcher) -> bool:
|
||||
return "chat_history" in module_name
|
||||
|
||||
|
||||
def _resolve_actor_user_id(event: Event, fallback_user_id: str) -> str:
|
||||
"""优先使用事件发起者ID，避免 notice 场景 session.user 指向 bot 自身。"""
|
||||
event_user_id = getattr(event, "user_id", None)
|
||||
if event_user_id is None:
|
||||
return fallback_user_id
|
||||
event_user_id = str(event_user_id)
|
||||
return event_user_id or fallback_user_id
|
||||
|
||||
|
||||
def _resolve_event_group_id(event: Event, fallback_group_id: str | None) -> str | None:
|
||||
"""notice 场景 session.group 可能缺失，回退到事件上的 group_id。"""
|
||||
event_group_id = getattr(event, "group_id", None)
|
||||
if event_group_id is None:
|
||||
return fallback_group_id
|
||||
resolved = str(event_group_id)
|
||||
return resolved or fallback_group_id
|
||||
|
||||
|
||||
def _resolve_event_channel_id(
|
||||
event: Event, fallback_channel_id: str | None
|
||||
) -> str | None:
|
||||
"""频道场景回退到事件上的 channel_id。"""
|
||||
event_channel_id = getattr(event, "channel_id", None)
|
||||
if event_channel_id is None:
|
||||
return fallback_channel_id
|
||||
resolved = str(event_channel_id)
|
||||
return resolved or fallback_channel_id
|
||||
|
||||
|
||||
@event_preprocessor
|
||||
async def _drop_message_before_cache_ready(event: Event):
|
||||
mark_activity()
|
||||
if event.get_type() != "message":
|
||||
return
|
||||
if not is_cache_ready():
|
||||
@@ -130,46 +96,22 @@ async def _auth_preprocessor(
|
||||
return
|
||||
|
||||
start_time = time.time()
|
||||
entity = state.get("_zx_entity")
|
||||
if entity is None:
|
||||
entity = get_entity_ids(session)
|
||||
entity.user_id = _resolve_actor_user_id(event, entity.user_id)
|
||||
entity.group_id = _resolve_event_group_id(event, entity.group_id)
|
||||
entity.channel_id = _resolve_event_channel_id(event, entity.channel_id)
|
||||
state["_zx_entity"] = entity
|
||||
|
||||
event_cache = state.get("_zx_event_cache")
|
||||
if event_cache is None:
|
||||
event_cache = _get_event_cache(event, session, entity)
|
||||
state["_zx_event_cache"] = event_cache
|
||||
|
||||
text = state.get("_zx_plain_text")
|
||||
if text is None:
|
||||
text = _extract_plain_text(message, event)
|
||||
state["_zx_plain_text"] = text
|
||||
if event_cache is not None:
|
||||
event_cache["plain_text"] = text
|
||||
|
||||
route_modules = state.get("_zx_route_modules")
|
||||
if route_modules is None:
|
||||
route_modules = await _get_route_context(text, event_cache)
|
||||
state["_zx_route_modules"] = route_modules
|
||||
|
||||
is_superuser = state.get("_zx_is_superuser")
|
||||
if is_superuser is None:
|
||||
is_superuser = entity.user_id in bot.config.superusers
|
||||
state["_zx_is_superuser"] = is_superuser
|
||||
|
||||
if await route_precheck(
|
||||
matcher,
|
||||
event_context = get_or_create_event_context(
|
||||
bot,
|
||||
event,
|
||||
session,
|
||||
message,
|
||||
entity=entity,
|
||||
event_cache=event_cache,
|
||||
text=text,
|
||||
route_modules=route_modules,
|
||||
):
|
||||
state,
|
||||
message=message,
|
||||
)
|
||||
|
||||
if not event_context.route_modules_loaded:
|
||||
route_modules = await _get_route_context(
|
||||
event_context.plain_text,
|
||||
event_context.event_cache,
|
||||
)
|
||||
set_route_modules(state, event_context, route_modules)
|
||||
|
||||
if await route_precheck(matcher, event_context):
|
||||
return
|
||||
|
||||
try:
|
||||
@@ -178,13 +120,9 @@ async def _auth_preprocessor(
|
||||
event,
|
||||
bot,
|
||||
session,
|
||||
message,
|
||||
context=event_context,
|
||||
skip_ban=False,
|
||||
entity=entity,
|
||||
event_cache=event_cache,
|
||||
text=text,
|
||||
route_modules=route_modules,
|
||||
is_superuser=is_superuser,
|
||||
state=state,
|
||||
)
|
||||
except IgnoredException:
|
||||
raise
|
||||
@@ -203,16 +141,27 @@ async def _auth_preprocessor(
|
||||
|
||||
|
||||
@run_postprocessor
|
||||
async def _unblock_after_matcher(matcher: Matcher, session: Uninfo, event: Event):
|
||||
user_id = _resolve_actor_user_id(event, session.user.id)
|
||||
group_id = _resolve_event_group_id(event, None)
|
||||
channel_id = _resolve_event_channel_id(event, None)
|
||||
if session.group:
|
||||
if session.group.parent:
|
||||
group_id = session.group.parent.id
|
||||
channel_id = session.group.id
|
||||
else:
|
||||
group_id = session.group.id
|
||||
async def _unblock_after_matcher(
|
||||
matcher: Matcher,
|
||||
session: Uninfo,
|
||||
event: Event,
|
||||
state: T_State,
|
||||
):
|
||||
context = get_event_context(state)
|
||||
if context is not None:
|
||||
user_id = context.user_id
|
||||
group_id = context.group_id
|
||||
channel_id = context.channel_id
|
||||
else:
|
||||
user_id = resolve_actor_user_id(event, session.user.id)
|
||||
group_id = resolve_event_group_id(event, None)
|
||||
channel_id = resolve_event_channel_id(event, None)
|
||||
if session.group:
|
||||
if session.group.parent:
|
||||
group_id = session.group.parent.id
|
||||
channel_id = session.group.id
|
||||
else:
|
||||
group_id = session.group.id
|
||||
if user_id and matcher.plugin:
|
||||
module = matcher.plugin.name
|
||||
LimitManager.unblock(module, user_id, group_id, channel_id)
|
||||
|
||||
Reference in New Issue
Block a user