mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-29 00:32:06 +08:00
✨ feat(hook): 增强认证钩子和运行时缓存管理 (#2106)
* ✨ feat(hook): 增强认证钩子和运行时缓存管理 ``` ♻ refactor(hook): 移除未使用的配置项并优化缓存设置 移除 AUTH_HOOKS_CONCURRENCY_LIMIT 配置项,该配置项不再使用 ✨feat(auth_ban): 简化缓存配置并添加实体参数支持 将 BAN_CACHE_TTL 相关配置从动态配置改为常量定义, 移除复杂的 TTL 值转换逻辑,并为 auth_ban 函数添加可选的 entity 参数以支持外部传入实体信息 ♻ refactor(auth_limit): 移除未使用的配置依赖 移除 AUTH_LIMIT_NOTICE_CD 配置项,直接使用常量值 2 作为限制通知冷却时间 📦 依赖更新: update playwright dependency to version 1.57.0 in pyproject.toml and requirements.txt ``` * ✨ feat(auth_checker): 增强插件模块处理和预过滤逻辑,支持用户插件兼容性 * ✨ feat(http_utils): 添加内容缓存机制以优化HTTP响应处理 * ✨ feat(cache): 添加群组插件设置视图缓存类型并更新相关逻辑 * ✨ feat(renderer): 优化渲染引擎,增加内存缓存管理和HTML文档处理逻辑 * ✨ feat(sign_in): 添加好感度排行和好感度总排行命令 * ✨ feat(renderer): 增强浏览器实例管理和模板预处理,支持历史 include 语法兼容 * ✨ feat(renderer): 优化 Playwright 环境检查逻辑,增加结果缓存以提高性能 * ✨ feat(renderer): 增强模板文件渲染策略,优化资产加载路径处理 * 🚨 auto fix by pre-commit hooks * ✨ feat(log): 增加日志内容安全序列化,避免超长 base64 等污染日志 ✨ feat(log_sanitizer): 添加对嵌入超长 base64/data URI 的清理功能 ✨ feat(auth_checker): 添加 Alconna 快捷方式缓存检查,优化路由匹配逻辑 * feat(renderer): 添加渲染结果内存缓存功能以优化性能 feat(help): 实现帮助菜单图像缓存机制 feat(sign_in): 更新HTML卡片生成以支持动画禁用和剪裁 feat(superuser): 在启动时预热超级用户帮助缓存 feat(theme): 优化主题管理器的资源解析缓存 * 🚨 auto fix by pre-commit hooks * feat(renderer): 增加全页面视口最大宽度限制并优化内容尺寸计算 --------- Co-authored-by: ATTomatoo <1126160939@qq.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com>
This commit is contained in:
co-authored by
ATTomatoo
pre-commit-ci[bot]
HibiKier
parent
51f4773e14
commit
ce94f63d9a
@@ -1,4 +1,5 @@
|
||||
import asyncio
|
||||
from collections import OrderedDict
|
||||
from collections.abc import AsyncGenerator, Awaitable, Callable, Sequence
|
||||
from contextlib import asynccontextmanager
|
||||
import os
|
||||
@@ -164,6 +165,72 @@ class AsyncHttpx:
|
||||
else None
|
||||
)
|
||||
|
||||
_CONTENT_CACHE_TTL: ClassVar[float] = 3.0
|
||||
_CONTENT_CACHE_MAX_ITEMS: ClassVar[int] = 256
|
||||
_CONTENT_CACHE_MAX_BYTES: ClassVar[int] = 2 * 1024 * 1024
|
||||
_content_cache: ClassVar[OrderedDict[str, tuple[float, bytes]]] = OrderedDict()
|
||||
_content_inflight: ClassVar[dict[str, asyncio.Task[Response]]] = {}
|
||||
_content_cache_lock: ClassVar[asyncio.Lock] = asyncio.Lock()
|
||||
|
||||
@classmethod
|
||||
def _is_probably_image_url(cls, url: str) -> bool:
|
||||
lower_url = url.lower()
|
||||
if any(
|
||||
ext in lower_url
|
||||
for ext in (
|
||||
".jpg",
|
||||
".jpeg",
|
||||
".png",
|
||||
".webp",
|
||||
".gif",
|
||||
".bmp",
|
||||
".avif",
|
||||
".heic",
|
||||
)
|
||||
):
|
||||
return True
|
||||
return "qpic.cn" in lower_url or "qlogo.cn" in lower_url
|
||||
|
||||
@classmethod
|
||||
def _get_cached_content_nolock(cls, key: str) -> bytes | None:
|
||||
entry = cls._content_cache.get(key)
|
||||
if not entry:
|
||||
return None
|
||||
expire_at, content = entry
|
||||
if expire_at <= time.monotonic():
|
||||
cls._content_cache.pop(key, None)
|
||||
return None
|
||||
cls._content_cache.move_to_end(key)
|
||||
return content
|
||||
|
||||
@classmethod
|
||||
def _cleanup_content_cache_nolock(cls) -> None:
|
||||
now = time.monotonic()
|
||||
while cls._content_cache:
|
||||
expire_at, _ = next(iter(cls._content_cache.values()))
|
||||
if expire_at > now:
|
||||
break
|
||||
cls._content_cache.popitem(last=False)
|
||||
while len(cls._content_cache) > cls._CONTENT_CACHE_MAX_ITEMS:
|
||||
cls._content_cache.popitem(last=False)
|
||||
|
||||
@classmethod
|
||||
async def _try_cache_content(cls, key: str, response: Response) -> None:
|
||||
content = response.content
|
||||
if not content or len(content) > cls._CONTENT_CACHE_MAX_BYTES:
|
||||
return
|
||||
content_type = response.headers.get("content-type", "").lower()
|
||||
is_image = content_type.startswith("image/") or cls._is_probably_image_url(key)
|
||||
if not is_image:
|
||||
return
|
||||
async with cls._content_cache_lock:
|
||||
cls._content_cache[key] = (
|
||||
time.monotonic() + cls._CONTENT_CACHE_TTL,
|
||||
content,
|
||||
)
|
||||
cls._content_cache.move_to_end(key)
|
||||
cls._cleanup_content_cache_nolock()
|
||||
|
||||
@classmethod
|
||||
def _prepare_temporary_client_config(cls, client_kwargs: dict) -> dict:
|
||||
"""
|
||||
@@ -378,7 +445,29 @@ class AsyncHttpx:
|
||||
cls, url: str | list[str], *, client: AsyncClient | None = None, **kwargs
|
||||
) -> bytes:
|
||||
"""获取指定 URL 的二进制内容。"""
|
||||
res = await cls.get(url, client=client, **kwargs)
|
||||
if not isinstance(url, str):
|
||||
res = await cls.get(url, client=client, **kwargs)
|
||||
return res.content
|
||||
|
||||
cache_key = url
|
||||
async with cls._content_cache_lock:
|
||||
cached = cls._get_cached_content_nolock(cache_key)
|
||||
if cached is not None:
|
||||
return cached
|
||||
task = cls._content_inflight.get(cache_key)
|
||||
if task is None:
|
||||
task = asyncio.create_task(cls.get(url, client=client, **kwargs))
|
||||
cls._content_inflight[cache_key] = task
|
||||
|
||||
def _cleanup_inflight(
|
||||
_: asyncio.Task[Response], key: str = cache_key
|
||||
) -> None:
|
||||
cls._content_inflight.pop(key, None)
|
||||
|
||||
task.add_done_callback(_cleanup_inflight)
|
||||
|
||||
res = await task
|
||||
await cls._try_cache_content(cache_key, res)
|
||||
return res.content
|
||||
|
||||
@classmethod
|
||||
|
||||
Reference in New Issue
Block a user