mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2025-12-15 14:22:55 +08:00
* 添加全局cache * ✨ 构建缓存,hook使用缓存 * ✨ 新增数据库Model方法监控 * ✨ 数据库添加semaphore锁 * 🩹 优化webapi返回数据 * ✨ 添加增量缓存与缓存过期 * 🎨 优化检测代码结构 * ⚡ 优化hook权限检测性能 * 🐛 添加新异常判断跳过权限检测 * ✨ 添加插件limit缓存 * 🎨 代码格式优化 * 🐛 修复代码导入 * 🐛 修复刷新时检查 * 👽 Rename exception for missing database URL in initialization * ♿ Update default database URL to SQLite in configuration * 🔧 Update tortoise-orm and aiocache dependencies restrictions; add optional redis and asyncpg support * 🐛 修复ban检测 * 🐛 修复所有插件关闭时缓存更新 * 🐛 尝试迁移至aiocache * 🐛 完善aiocache缓存 * ⚡ 代码性能优化 * 🐛 移除获取封禁缓存时的日志记录 * 🐛 修复缓存类型声明,优化封禁用户处理逻辑 * 🐛 优化LevelUser权限更新逻辑及数据库迁移 * ✨ cache支持redis连接 * 🚨 auto fix by pre-commit hooks * ⚡ :增强获取群组的安全性和准确性。同时,优化了缓存管理中的相关逻辑,确保缓存操作的一致性。 * ✨ feat(auth_limit): 将插件初始化逻辑的启动装饰器更改为优先级管理器 * 🔧 修复日志记录级别 * 🔧 更新数据库连接字符串 * 🔧 更新数据库连接字符串为内存数据库,并优化权限检查逻辑 * ✨ feat(cache): 增加缓存功能配置项,并新增数据访问层以支持缓存逻辑 * ♻️ 重构cache * ✨ feat(cache): 增强缓存管理,新增缓存字典和缓存列表功能,支持过期时间管理 * 🔧 修复Notebook类中的viewport高度设置,将其从1000调整为10 * ✨ 更新插件管理逻辑,替换缓存服务为CacheRoot并优化缓存失效处理 * ✨ 更新RegisterConfig类中的type字段 * ✨ 修复清理重复记录逻辑,确保检查记录的id属性有效性 * ⚡ 超级无敌大优化,解决延迟与卡死问题 * ✨ 更新封禁功能,增加封禁时长参数和描述,优化插件信息返回结构 * ✨ 更新zhenxun_help.py中的viewport高度,将其从453调整为10,以优化页面显示效果 * ✨ 优化插件分类逻辑,增加插件ID排序,并更新插件信息返回结构 --------- Co-authored-by: BalconyJH <balconyjh@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
243 lines
9.4 KiB
Python
243 lines
9.4 KiB
Python
import asyncio
|
|
import time
|
|
|
|
from nonebot.adapters import Event
|
|
from nonebot_plugin_uninfo import Uninfo
|
|
|
|
from zhenxun.models.group_console import GroupConsole
|
|
from zhenxun.models.plugin_info import PluginInfo
|
|
from zhenxun.services.data_access import DataAccess
|
|
from zhenxun.services.db_context import DB_TIMEOUT_SECONDS
|
|
from zhenxun.services.log import logger
|
|
from zhenxun.utils.common_utils import CommonUtils
|
|
from zhenxun.utils.enum import BlockType
|
|
from zhenxun.utils.utils import get_entity_ids
|
|
|
|
from .config import LOGGER_COMMAND, WARNING_THRESHOLD
|
|
from .exception import IsSuperuserException, SkipPluginException
|
|
from .utils import freq, is_poke, send_message
|
|
|
|
|
|
class GroupCheck:
|
|
def __init__(
|
|
self, plugin: PluginInfo, group_id: str, session: Uninfo, is_poke: bool
|
|
) -> None:
|
|
self.group_id = group_id
|
|
self.session = session
|
|
self.is_poke = is_poke
|
|
self.plugin = plugin
|
|
self.group_dao = DataAccess(GroupConsole)
|
|
self.group_data = None
|
|
|
|
async def check(self):
|
|
start_time = time.time()
|
|
try:
|
|
# 只查询一次数据库,使用 DataAccess 的缓存机制
|
|
try:
|
|
self.group_data = await asyncio.wait_for(
|
|
self.group_dao.safe_get_or_none(
|
|
group_id=self.group_id, channel_id__isnull=True
|
|
),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"查询群组数据超时: {self.group_id}", LOGGER_COMMAND)
|
|
return # 超时时不阻塞,继续执行
|
|
|
|
# 检查超级用户禁用
|
|
if (
|
|
self.group_data
|
|
and CommonUtils.format(self.plugin.module)
|
|
in self.group_data.superuser_block_plugin
|
|
):
|
|
if freq.is_send_limit_message(self.plugin, self.group_id, self.is_poke):
|
|
try:
|
|
await asyncio.wait_for(
|
|
send_message(
|
|
self.session,
|
|
"超级管理员禁用了该群此功能...",
|
|
self.group_id,
|
|
),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"发送消息超时: {self.group_id}", LOGGER_COMMAND)
|
|
raise SkipPluginException(
|
|
f"{self.plugin.name}({self.plugin.module})"
|
|
f" 超级管理员禁用了该群此功能..."
|
|
)
|
|
|
|
# 检查普通禁用
|
|
if (
|
|
self.group_data
|
|
and CommonUtils.format(self.plugin.module)
|
|
in self.group_data.block_plugin
|
|
):
|
|
if freq.is_send_limit_message(self.plugin, self.group_id, self.is_poke):
|
|
try:
|
|
await asyncio.wait_for(
|
|
send_message(
|
|
self.session, "该群未开启此功能...", self.group_id
|
|
),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"发送消息超时: {self.group_id}", LOGGER_COMMAND)
|
|
raise SkipPluginException(
|
|
f"{self.plugin.name}({self.plugin.module}) 未开启此功能..."
|
|
)
|
|
|
|
# 检查全局禁用
|
|
if self.plugin.block_type == BlockType.GROUP:
|
|
if freq.is_send_limit_message(self.plugin, self.group_id, self.is_poke):
|
|
try:
|
|
await asyncio.wait_for(
|
|
send_message(
|
|
self.session, "该功能在群组中已被禁用...", self.group_id
|
|
),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"发送消息超时: {self.group_id}", LOGGER_COMMAND)
|
|
raise SkipPluginException(
|
|
f"{self.plugin.name}({self.plugin.module})该插件在群组中已被禁用..."
|
|
)
|
|
finally:
|
|
# 记录执行时间
|
|
elapsed = time.time() - start_time
|
|
if elapsed > WARNING_THRESHOLD: # 记录耗时超过500ms的检查
|
|
logger.warning(
|
|
f"GroupCheck.check 耗时: {elapsed:.3f}s, 群组: {self.group_id}",
|
|
LOGGER_COMMAND,
|
|
)
|
|
|
|
|
|
class PluginCheck:
|
|
def __init__(self, group_id: str | None, session: Uninfo, is_poke: bool):
|
|
self.session = session
|
|
self.is_poke = is_poke
|
|
self.group_id = group_id
|
|
self.group_dao = DataAccess(GroupConsole)
|
|
self.group_data = None
|
|
|
|
async def check_user(self, plugin: PluginInfo):
|
|
"""全局私聊禁用检测
|
|
|
|
参数:
|
|
plugin: PluginInfo
|
|
|
|
异常:
|
|
IgnoredException: 忽略插件
|
|
"""
|
|
if plugin.block_type == BlockType.PRIVATE:
|
|
if freq.is_send_limit_message(plugin, self.session.user.id, self.is_poke):
|
|
try:
|
|
await asyncio.wait_for(
|
|
send_message(self.session, "该功能在私聊中已被禁用..."),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error("发送消息超时", LOGGER_COMMAND)
|
|
raise SkipPluginException(
|
|
f"{plugin.name}({plugin.module}) 该插件在私聊中已被禁用..."
|
|
)
|
|
|
|
async def check_global(self, plugin: PluginInfo):
|
|
"""全局状态
|
|
|
|
参数:
|
|
plugin: PluginInfo
|
|
|
|
异常:
|
|
IgnoredException: 忽略插件
|
|
"""
|
|
start_time = time.time()
|
|
try:
|
|
if plugin.status or plugin.block_type != BlockType.ALL:
|
|
return
|
|
"""全局状态"""
|
|
if self.group_id:
|
|
# 使用 DataAccess 的缓存机制
|
|
try:
|
|
self.group_data = await asyncio.wait_for(
|
|
self.group_dao.safe_get_or_none(
|
|
group_id=self.group_id, channel_id__isnull=True
|
|
),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"查询群组数据超时: {self.group_id}", LOGGER_COMMAND)
|
|
return # 超时时不阻塞,继续执行
|
|
|
|
if self.group_data and self.group_data.is_super:
|
|
raise IsSuperuserException()
|
|
|
|
sid = self.group_id or self.session.user.id
|
|
if freq.is_send_limit_message(plugin, sid, self.is_poke):
|
|
try:
|
|
await asyncio.wait_for(
|
|
send_message(self.session, "全局未开启此功能...", sid),
|
|
timeout=DB_TIMEOUT_SECONDS,
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"发送消息超时: {sid}", LOGGER_COMMAND)
|
|
raise SkipPluginException(
|
|
f"{plugin.name}({plugin.module}) 全局未开启此功能..."
|
|
)
|
|
finally:
|
|
# 记录执行时间
|
|
elapsed = time.time() - start_time
|
|
if elapsed > WARNING_THRESHOLD: # 记录耗时超过500ms的检查
|
|
logger.warning(
|
|
f"PluginCheck.check_global 耗时: {elapsed:.3f}s", LOGGER_COMMAND
|
|
)
|
|
|
|
|
|
async def auth_plugin(plugin: PluginInfo, session: Uninfo, event: Event):
|
|
"""插件状态
|
|
|
|
参数:
|
|
plugin: PluginInfo
|
|
session: Uninfo
|
|
event: Event
|
|
"""
|
|
start_time = time.time()
|
|
try:
|
|
entity = get_entity_ids(session)
|
|
is_poke_event = is_poke(event)
|
|
user_check = PluginCheck(entity.group_id, session, is_poke_event)
|
|
|
|
if entity.group_id:
|
|
group_check = GroupCheck(plugin, entity.group_id, session, is_poke_event)
|
|
try:
|
|
await asyncio.wait_for(
|
|
group_check.check(), timeout=DB_TIMEOUT_SECONDS * 2
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error(f"群组检查超时: {entity.group_id}", LOGGER_COMMAND)
|
|
# 超时时不阻塞,继续执行
|
|
else:
|
|
try:
|
|
await asyncio.wait_for(
|
|
user_check.check_user(plugin), timeout=DB_TIMEOUT_SECONDS
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error("用户检查超时", LOGGER_COMMAND)
|
|
# 超时时不阻塞,继续执行
|
|
|
|
try:
|
|
await asyncio.wait_for(
|
|
user_check.check_global(plugin), timeout=DB_TIMEOUT_SECONDS
|
|
)
|
|
except asyncio.TimeoutError:
|
|
logger.error("全局检查超时", LOGGER_COMMAND)
|
|
# 超时时不阻塞,继续执行
|
|
finally:
|
|
# 记录总执行时间
|
|
elapsed = time.time() - start_time
|
|
if elapsed > WARNING_THRESHOLD: # 记录耗时超过500ms的检查
|
|
logger.warning(
|
|
f"auth_plugin 总耗时: {elapsed:.3f}s, 模块: {plugin.module}",
|
|
LOGGER_COMMAND,
|
|
)
|