mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-12 23:40:03 +08:00
🎉🍾♻️refactor(core): 重构核心鉴权与缓存机制，引入异步发送队列以提升性能 🚀 (#2088)
* 添加测试插件 * ✨ feat(auth): 添加缓存机制以优化用户和插件数据查询性能 * 🗑️ chore(help): 删除笨蛋检测插件代码 * ✨ feat(bot): 添加对扩展插件的加载支持 * ✨ feat(auth): 优化权限检查和缓存机制，增加用户和插件数据的并行查询 * ✨ feat(cache): 引入运行时缓存机制，优化用户和插件的ban记录管理 * ✨ feat(auth): 更新is_ban函数文档，添加参数和返回值说明 * ``` feat(auth): 使用内存缓存优化权限验证性能 - 移除数据库查询超时控制，改用 LevelUserMemoryCache、BotMemoryCache 和 PluginLimitMemoryCache 进行缓存查询 - 优化 auth_admin、auth_bot、auth_limit 权限验证逻辑，提升响应速度 - 添加 background 参数支持异步发送权限不足提示消息 - 移除 asyncio 依赖，简化代码结构 fix(auth): 修复限制通知频率控制问题 - 实现限制通知冷却机制，避免重复发送相同限制消息 - 添加 AUTH_LIMIT_NOTICE_CD 配置项，默认值为 2 秒 - 使用 FreqLimiter 控制限制通知发送频率 refactor(models): 增强模型数据变更时的缓存同步 - 在 BotConsole、GroupConsole、LevelUser、PluginLimit 模型的 create、update_or_create、save、delete 方法中自动更新对应缓存 - 确保数据库和内存缓存数据一致性 docs(ban_console): 修正文档注释并优化日志信息 - 修正 BanConsole 类中方法的文档字符串，使用标准参数和返回值格式 - 优化调试日志信息，使描述更加清晰准确 ``` * ✨ feat(auth): 更新Limit类以支持PluginLimitSnapshot，优化限制信息处理 * ✨ feat(bot_manage): 优化Bot控制台初始化逻辑，处理IntegrityError异常 * ✨ feat(mmm1): 新增消息推送功能，支持私聊和群聊事件处理 * ✨ feat(group_member_update): 优化群组成员更新逻辑，增加活动跟踪和消息记录功能 * ✨ feat(mmm1): 删除冗余的消息推送功能代码 * ✨ feat(auth): 优化权限检查逻辑，增加模块阻止功能和缓存处理 * ✨ feat(auth): 优化权限检查逻辑，增加快速ban检测和前置检查功能 * ✨ feat(chat_history): 增强消息处理规则，添加时间间隔限制以防止重复消息 ✨ feat(data_source): 引入异步获取群成员信息的功能，优化用户信息更新逻辑 * ✨ feat(send_queue): 添加异步发送队列以优化API调用和速率限制 * ✨ feat(auth): 添加缓存就绪检查以优化权限处理逻辑 * ✨ feat(plugins): 移除不必要的插件加载以简化插件管理 * ✨ feat(group_console): 优化群组获取逻辑，添加缓存检查以提升性能 ✨ 只接收缓存完成之后时间的消息 * ✨ feat(auth): 添加异步任务管理和超载检测，优化权限处理逻辑 ✨ feat(chat_history): 修改规则函数为异步，提升消息处理效率 ✨ feat(group_handle): 增加安全获取群组信息的异步方法，添加超时处理 ✨ feat(record_request): 引入安全获取群组信息的异步方法，优化群邀请处理 ✨ feat(ban_memory_cache): 增强禁言内存缓存，添加负缓存机制 ✨ feat(message_load): 新增消息负载检测功能，优化任务调度 ✨ feat(scheduler): 在调度器中集成消息压力检测，优化任务执行 ✨ feat(send_queue): 引入异步任务管理，优化发送队列处理 * ✨ feat(auth): 添加对 LevelUserSnapshot 和 BotSnapshot 的支持，优化权限检查逻辑 ✨ 格式化 * ✨ feat(db_context): 增强 get_or_create 方法，处理并发创建冲突并回退查询已存在记录 * ✨ feat(bot_manage): 增强 init_bot_console 方法，处理并发创建冲突并回退查询已存在的 bot 数据 * 🚨 auto fix by pre-commit hooks * ✨ feat(runtime_cache): 优化消息处理逻辑，支持 bytes 和 bytearray 类型的联合判断 * ✨ style(runtime_cache): 格式化代码，优化多行表达式的可读性 * 🚨 auto fix by pre-commit hooks * ✨ refactor: 优化类型注解，改进群组成员更新逻辑和平台处理 ✨ 格式化 * 🚨 auto fix by pre-commit hooks * ✨ refactor: 优化代码格式，增强可读性并修复类型注解 * 🚨 auto fix by pre-commit hooks * ✨ refactor: 更新文档注释，增强is_ban函数的可读性 * ✨ refactor: 优化代码结构，移除冗余函数，增强可读性并改进任务调度逻辑 * ✨ refactor: 调整定时任务时间，优化渲染服务的初始化逻辑，增强代码可读性 --------- Co-authored-by: ATTomatoo <1126160939@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
ManyManyTomato
co-authored by
ATTomatoo
pre-commit-ci[bot]
ATTomatoo
pre-commit-ci[bot]
parent
c9f0a8b9d9
commit
837330e30a
@@ -1,3 +1,4 @@
|
||||
import asyncio
|
||||
from datetime import datetime
|
||||
import os
|
||||
from pathlib import Path
|
||||
@@ -33,6 +34,57 @@ WELCOME_PATH = DATA_PATH / "welcome_message"
|
||||
|
||||
DEFAULT_IMAGE_PATH = IMAGE_PATH / "qxz"
|
||||
|
||||
_API_SEMAPHORE = asyncio.Semaphore(4)
|
||||
_API_TIMEOUT = 5.0
|
||||
_REFRESH_TASKS: set[asyncio.Task] = set()
|
||||
|
||||
|
||||
def _normalize_platform(platform: str | set[str] | None) -> str | None:
|
||||
if isinstance(platform, set):
|
||||
return next(iter(platform), None)
|
||||
return platform
|
||||
|
||||
|
||||
async def _safe_get_group_member_info(bot: Bot, group_id: str, user_id: str) -> dict:
|
||||
async with _API_SEMAPHORE:
|
||||
try:
|
||||
return await asyncio.wait_for(
|
||||
bot.get_group_member_info(
|
||||
group_id=int(group_id), user_id=int(user_id), no_cache=True
|
||||
),
|
||||
timeout=_API_TIMEOUT,
|
||||
)
|
||||
except (asyncio.TimeoutError, ActionFailed, Exception) as e:
|
||||
logger.warning("获取用户信息失败", e=e)
|
||||
return {"user_id": user_id, "group_id": group_id, "nickname": ""}
|
||||
|
||||
|
||||
async def _safe_get_group_info(bot: Bot, group_id: str) -> dict | None:
|
||||
async with _API_SEMAPHORE:
|
||||
try:
|
||||
return await asyncio.wait_for(
|
||||
bot.get_group_info(group_id=group_id),
|
||||
timeout=_API_TIMEOUT,
|
||||
)
|
||||
except (asyncio.TimeoutError, ActionFailed, Exception) as e:
|
||||
logger.warning("获取群信息失败", e=e)
|
||||
return None
|
||||
|
||||
|
||||
async def _refresh_member_info_async(
|
||||
bot: Bot, group_id: str, user_id: str, platform: str | None
|
||||
) -> None:
|
||||
user_info = await _safe_get_group_member_info(bot, group_id, user_id)
|
||||
await GroupInfoUser.update_or_create(
|
||||
user_id=str(user_info["user_id"]),
|
||||
group_id=str(user_info["group_id"]),
|
||||
defaults={
|
||||
"user_name": user_info.get("nickname") or "",
|
||||
"nickname": user_info.get("card") or user_info.get("nickname") or "",
|
||||
"platform": platform,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
class GroupManager:
|
||||
_flmt = FreqLimiter(limit_cd)
|
||||
@@ -56,7 +108,14 @@ class GroupManager:
|
||||
if plugin_list := await PluginInfo.filter(default_status=False).all():
|
||||
for plugin in plugin_list:
|
||||
block_plugin += f"<{plugin.module},"
|
||||
group_info = await bot.get_group_info(group_id=group_id)
|
||||
group_info = await _safe_get_group_info(bot, group_id)
|
||||
if not group_info:
|
||||
logger.warning(
|
||||
"获取群信息失败，跳过群信息写入",
|
||||
"入群检测",
|
||||
group_id=group_id,
|
||||
)
|
||||
return
|
||||
await GroupConsole.update_or_create(
|
||||
group_id=group_info["group_id"],
|
||||
defaults={
|
||||
@@ -259,22 +318,27 @@ class GroupManager:
|
||||
else:
|
||||
group_id = session.group.id
|
||||
join_time = datetime.now()
|
||||
try:
|
||||
user_info = await bot.get_group_member_info(
|
||||
group_id=int(group_id), user_id=int(user_id), no_cache=True
|
||||
)
|
||||
except ActionFailed as e:
|
||||
logger.warning("获取用户信息识别...", e=e)
|
||||
user_info = {"user_id": user_id, "group_id": group_id, "nickname": ""}
|
||||
user_name = getattr(session.user, "name", None) or getattr(
|
||||
session.user, "nick", None
|
||||
)
|
||||
platform = PlatformUtils.get_platform(session)
|
||||
await GroupInfoUser.update_or_create(
|
||||
user_id=str(user_info["user_id"]),
|
||||
group_id=str(user_info["group_id"]),
|
||||
user_id=str(user_id),
|
||||
group_id=str(group_id),
|
||||
defaults={
|
||||
"user_name": user_info["nickname"],
|
||||
"user_name": user_name or "",
|
||||
"user_join_time": join_time,
|
||||
"platform": platform,
|
||||
},
|
||||
)
|
||||
logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
|
||||
task = asyncio.create_task(
|
||||
_refresh_member_info_async(
|
||||
bot, str(group_id), str(user_id), _normalize_platform(platform)
|
||||
)
|
||||
)
|
||||
_REFRESH_TASKS.add(task)
|
||||
task.add_done_callback(_REFRESH_TASKS.discard)
|
||||
logger.info(f"用户{user_id} 所属{group_id} 更新成功")
|
||||
if not await CommonUtils.task_is_block(
|
||||
session, "group_welcome"
|
||||
) and cls._flmt.check(group_id):
|
||||
@@ -295,7 +359,7 @@ class GroupManager:
|
||||
operator_name = user.user_name
|
||||
else:
|
||||
operator_name = "None"
|
||||
group = await GroupConsole.get_group(group_id)
|
||||
group = await GroupConsole.get_group_db(group_id)
|
||||
group_name = group.group_name if group else ""
|
||||
if group:
|
||||
await group.delete()
|
||||
@@ -342,10 +406,15 @@ class GroupManager:
|
||||
)
|
||||
if sub_type == "kick":
|
||||
if operator_id != "0":
|
||||
operator = await bot.get_group_member_info(
|
||||
user_id=int(operator_id), group_id=int(group_id)
|
||||
operator_user = await GroupInfoUser.get_or_none(
|
||||
user_id=operator_id, group_id=group_id
|
||||
)
|
||||
operator_name = operator["card"] or operator["nickname"]
|
||||
if operator_user:
|
||||
operator_name = (
|
||||
operator_user.nickname or operator_user.user_name or operator_id
|
||||
)
|
||||
else:
|
||||
operator_name = operator_id
|
||||
else:
|
||||
operator_name = ""
|
||||
return f"{user_name} 被 {operator_name} 送走了."
|
||||
|
||||
Reference in New Issue
Block a user