mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-10-18 02:30:08 +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
+78
-101
@@ -1,4 +1,4 @@
|
||||
from typing import Any, ClassVar, cast, overload
|
||||
from typing import TYPE_CHECKING, Any, ClassVar, cast, overload
|
||||
from typing_extensions import Self
|
||||
|
||||
from tortoise import fields
|
||||
@@ -7,10 +7,14 @@ from tortoise.backends.base.client import BaseDBAsyncClient
|
||||
from zhenxun.models.plugin_info import PluginInfo
|
||||
from zhenxun.models.task_info import TaskInfo
|
||||
from zhenxun.services.cache import CacheRoot
|
||||
from zhenxun.services.cache.runtime_cache import GroupMemoryCache
|
||||
from zhenxun.services.data_access import DataAccess
|
||||
from zhenxun.services.db_context import Model
|
||||
from zhenxun.utils.enum import CacheType, DbLockType, PluginType
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from zhenxun.services.cache.runtime_cache import GroupSnapshot
|
||||
|
||||
|
||||
def add_disable_marker(name: str) -> str:
|
||||
"""添加模块禁用标记符
|
||||
@@ -155,6 +159,7 @@ class GroupConsole(Model):
|
||||
|
||||
# 更新缓存
|
||||
await cls._update_cache(group)
|
||||
await GroupMemoryCache.upsert_from_model(group)
|
||||
|
||||
return group
|
||||
|
||||
@@ -210,6 +215,7 @@ class GroupConsole(Model):
|
||||
# 更新缓存
|
||||
if is_create:
|
||||
await cls._update_cache(group)
|
||||
await GroupMemoryCache.upsert_from_model(group)
|
||||
|
||||
return group, is_create
|
||||
|
||||
@@ -235,26 +241,37 @@ class GroupConsole(Model):
|
||||
|
||||
# 更新缓存
|
||||
await cls._update_cache(group)
|
||||
await GroupMemoryCache.upsert_from_model(group)
|
||||
|
||||
return group, is_create
|
||||
|
||||
async def save(self, *args, **kwargs):
|
||||
await super().save(*args, **kwargs)
|
||||
await GroupMemoryCache.upsert_from_model(self)
|
||||
|
||||
async def delete(self, *args, **kwargs):
|
||||
group_id = self.group_id
|
||||
channel_id = self.channel_id
|
||||
await super().delete(*args, **kwargs)
|
||||
await GroupMemoryCache.remove(group_id, channel_id)
|
||||
|
||||
@classmethod
|
||||
async def get_group(
|
||||
cls,
|
||||
group_id: str,
|
||||
channel_id: str | None = None,
|
||||
clean_duplicates: bool = True,
|
||||
) -> "GroupSnapshot | None":
|
||||
return GroupMemoryCache.get_if_ready(group_id, channel_id)
|
||||
|
||||
@classmethod
|
||||
async def get_group_db(
|
||||
cls,
|
||||
group_id: str,
|
||||
channel_id: str | None = None,
|
||||
clean_duplicates: bool = True,
|
||||
) -> Self | None:
|
||||
"""获取群组
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
channel_id: 频道id
|
||||
clean_duplicates: 是否删除重复的记录，仅保留最新的
|
||||
|
||||
返回:
|
||||
Self: GroupConsole
|
||||
"""
|
||||
"""获取群组（数据库）"""
|
||||
dao = DataAccess(cls)
|
||||
if channel_id:
|
||||
return await dao.safe_get_or_none(
|
||||
@@ -270,49 +287,32 @@ class GroupConsole(Model):
|
||||
|
||||
@classmethod
|
||||
async def is_super_group(cls, group_id: str) -> bool:
|
||||
"""是否超级用户指定群
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
|
||||
返回:
|
||||
bool: 是否超级用户指定群
|
||||
"""
|
||||
return group.is_super if (group := await cls.get_group(group_id)) else False
|
||||
group = GroupMemoryCache.get_if_ready(group_id, None)
|
||||
return bool(group and group.is_super)
|
||||
|
||||
@classmethod
|
||||
async def is_superuser_block_plugin(cls, group_id: str, module: str) -> bool:
|
||||
"""查看群组是否超级用户禁用功能
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
module: 模块名称
|
||||
|
||||
返回:
|
||||
bool: 是否禁用被动
|
||||
"""
|
||||
return await cls.exists(
|
||||
group_id=group_id,
|
||||
superuser_block_plugin__contains=add_disable_marker(module),
|
||||
group = GroupMemoryCache.get_if_ready(group_id, None)
|
||||
if not group:
|
||||
return False
|
||||
return bool(
|
||||
group.superuser_block_plugin_set
|
||||
and module in group.superuser_block_plugin_set
|
||||
)
|
||||
|
||||
@classmethod
|
||||
async def is_block_plugin(cls, group_id: str, module: str) -> bool:
|
||||
"""查看群组是否禁用插件
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
plugin: 插件名称
|
||||
|
||||
返回:
|
||||
bool: 是否禁用插件
|
||||
"""
|
||||
module = add_disable_marker(module)
|
||||
return await cls.exists(
|
||||
group_id=group_id, block_plugin__contains=module
|
||||
) or await cls.exists(
|
||||
group_id=group_id, superuser_block_plugin__contains=module
|
||||
)
|
||||
group = GroupMemoryCache.get_if_ready(group_id, None)
|
||||
if not group:
|
||||
return False
|
||||
if group.block_plugin_set and module in group.block_plugin_set:
|
||||
return True
|
||||
if (
|
||||
group.superuser_block_plugin_set
|
||||
and module in group.superuser_block_plugin_set
|
||||
):
|
||||
return True
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
async def set_block_plugin(
|
||||
@@ -396,70 +396,47 @@ class GroupConsole(Model):
|
||||
async def is_normal_block_plugin(
|
||||
cls, group_id: str, module: str, channel_id: str | None = None
|
||||
) -> bool:
|
||||
"""查看群组是否禁用功能
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
module: 模块名称
|
||||
channel_id: 频道id
|
||||
|
||||
返回:
|
||||
bool: 是否禁用被动
|
||||
"""
|
||||
return await cls.exists(
|
||||
group_id=group_id,
|
||||
channel_id=channel_id,
|
||||
block_plugin__contains=f"<{module},",
|
||||
)
|
||||
group = GroupMemoryCache.get_if_ready(group_id, channel_id)
|
||||
if not group:
|
||||
return False
|
||||
return bool(group.block_plugin_set and module in group.block_plugin_set)
|
||||
|
||||
@classmethod
|
||||
async def is_superuser_block_task(cls, group_id: str, task: str) -> bool:
|
||||
"""查看群组是否超级用户禁用被动
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
task: 模块名称
|
||||
|
||||
返回:
|
||||
bool: 是否禁用被动
|
||||
"""
|
||||
return await cls.exists(
|
||||
group_id=group_id,
|
||||
superuser_block_task__contains=add_disable_marker(task),
|
||||
group = GroupMemoryCache.get_if_ready(group_id, None)
|
||||
if not group:
|
||||
return False
|
||||
return bool(
|
||||
group.superuser_block_task_set and task in group.superuser_block_task_set
|
||||
)
|
||||
|
||||
@classmethod
|
||||
async def is_block_task(
|
||||
cls, group_id: str, task: str, channel_id: str | None = None
|
||||
) -> bool:
|
||||
"""查看群组是否禁用被动
|
||||
|
||||
参数:
|
||||
group_id: 群组id
|
||||
task: 任务模块
|
||||
channel_id: 频道id
|
||||
|
||||
返回:
|
||||
bool: 是否禁用被动
|
||||
"""
|
||||
task = add_disable_marker(task)
|
||||
if not channel_id:
|
||||
return await cls.exists(
|
||||
group_id=group_id,
|
||||
channel_id__isnull=True,
|
||||
block_task__contains=task,
|
||||
) or await cls.exists(
|
||||
group_id=group_id,
|
||||
channel_id__isnull=True,
|
||||
superuser_block_task__contains=task,
|
||||
)
|
||||
return await cls.exists(
|
||||
group_id=group_id, channel_id=channel_id, block_task__contains=task
|
||||
) or await cls.exists(
|
||||
group_id=group_id,
|
||||
channel_id__isnull=True,
|
||||
superuser_block_task__contains=task,
|
||||
)
|
||||
group = GroupMemoryCache.get_if_ready(group_id, None)
|
||||
if not group:
|
||||
return False
|
||||
if group.block_task_set and task in group.block_task_set:
|
||||
return True
|
||||
if (
|
||||
group.superuser_block_task_set
|
||||
and task in group.superuser_block_task_set
|
||||
):
|
||||
return True
|
||||
return False
|
||||
group = GroupMemoryCache.get_if_ready(group_id, channel_id)
|
||||
if group and group.block_task_set and task in group.block_task_set:
|
||||
return True
|
||||
super_group = GroupMemoryCache.get_if_ready(group_id, None)
|
||||
if (
|
||||
super_group
|
||||
and super_group.superuser_block_task_set
|
||||
and task in super_group.superuser_block_task_set
|
||||
):
|
||||
return True
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
async def set_block_task(
|
||||
|
||||
Reference in New Issue
Block a user