mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-28 16:20:56 +08:00
* bugfix:修复内存泄露和信号量饥饿问题 * 修复图片渲染按高度截断问题 * 优化图片渲染速度 * 权限检查去掉无效引用代码 * 添加uv支持 * 🚨 auto fix by pre-commit hooks * bugfix:修改gitignore换行 * bugfix:修复测试没有新生成uv.lock * 修复导入错误 * bugfix:移除重复调用 * 🚨 auto fix by pre-commit hooks * 清理残余poetry引用 * 更新uv安装方式 * 修复阿里云获取问题 * 增加资源下载提示 * 🚨 auto fix by pre-commit hooks * 修改资源下载为流式 * 🚨 auto fix by pre-commit hooks * 提高启动速度 * 移除bot.py支持 * 🚨 auto fix by pre-commit hooks * 优化win脚本逻辑 * 🚨 auto fix by pre-commit hooks * 清理残余无效逻辑 * 代码改进 * 🚨 auto fix by pre-commit hooks * 增加数据库迁移存在性检查 * 🚨 auto fix by pre-commit hooks * chore(test): 添加pytest超时控制和优雅关闭机制 - 在GitHub Actions工作流中添加作业级和步骤级超时限制,防止测试无限期挂起 - 添加pytest-timeout依赖并配置全局超时为120秒 - 在send_queue服务添加关闭钩子,确保worker任务正确取消 - 在priority_manager添加on_shutdown钩子,支持优先级生命周期的关闭阶段 * chore(lint): 禁用超长行的lint警告 * Modify restart logic for Windows platform * 🚨 auto fix by pre-commit hooks * bugfix:修复sys导入问题 * 清理无效结构 * bugfix:修复路径问题 * bugfix:修复shell语法传递给git导致资源获取失败问题 * 优化关闭显示 * bugfix:修复路径问题 * bugfix:增加路径安全 * bugfix:修复orm绕过问题 * 放宽numpy版本限制 * 修改重启方案 * bugfix:修复循环导入 * 优化逻辑 * Enhance disconnect function with error handling Added error handling for disconnect function and imported ConfigurationError. * Implement emergency restart mechanism Added emergency restart mechanism using atexit to ensure process restart even on severe exceptions during shutdown. * 🚨 auto fix by pre-commit hooks * 重启行为归一化 * 修复测试检测问题 * bugfix:修复测试侧类型报错问题 * 引入launcher机制 * 移除重启测试 * 收紧缓存调用路径 * 类型注解收敛 * 优化浏览器回收行为 * 优化浏览器渲染 * bugfix:解决重复关闭浏览器问题 --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: ManyManyTomato <93612024+ATTomatoo@users.noreply.github.com> Co-authored-by: AkashiCoin <l1040186796@gmail.com>
89 lines
2.3 KiB
Python
89 lines
2.3 KiB
Python
import asyncio
|
|
import time
|
|
from typing import Any
|
|
|
|
import nonebot
|
|
from nonebot.adapters import Bot
|
|
|
|
from zhenxun.services.log import logger
|
|
|
|
_SEND_APIS = {"send_msg", "send_like"}
|
|
_QUEUE: asyncio.Queue[tuple[Bot, str, dict[str, Any], asyncio.Future]] = asyncio.Queue()
|
|
_WORKERS = 3
|
|
_MIN_INTERVAL = 0.05
|
|
_SEND_LOCK = asyncio.Lock()
|
|
_LAST_SEND_TS = 0.0
|
|
_API_SEMAPHORE = asyncio.Semaphore(3)
|
|
_ORIG_CALL_API = Bot.call_api
|
|
_PATCHED = False
|
|
_WORKER_TASKS: list[asyncio.Task] = []
|
|
|
|
|
|
async def _rate_limit():
|
|
global _LAST_SEND_TS
|
|
async with _SEND_LOCK:
|
|
now = time.monotonic()
|
|
wait = _MIN_INTERVAL - (now - _LAST_SEND_TS)
|
|
if wait > 0:
|
|
await asyncio.sleep(wait)
|
|
_LAST_SEND_TS = time.monotonic()
|
|
|
|
|
|
async def _worker(worker_id: int):
|
|
while True:
|
|
bot, api, data, future = await _QUEUE.get()
|
|
try:
|
|
await _rate_limit()
|
|
async with _API_SEMAPHORE:
|
|
result = await _ORIG_CALL_API(bot, api, **data)
|
|
if not future.done():
|
|
future.set_result(result)
|
|
except Exception as exc:
|
|
if not future.done():
|
|
future.set_exception(exc)
|
|
logger.warning(
|
|
f"send queue failed: {api}",
|
|
"SendQueue",
|
|
target=getattr(bot, "self_id", None),
|
|
e=exc,
|
|
)
|
|
finally:
|
|
_QUEUE.task_done()
|
|
|
|
|
|
async def _queued_call_api(self: Bot, api: str, **data: Any):
|
|
if api not in _SEND_APIS:
|
|
return await _ORIG_CALL_API(self, api, **data)
|
|
loop = asyncio.get_running_loop()
|
|
future: asyncio.Future = loop.create_future()
|
|
await _QUEUE.put((self, api, data, future))
|
|
return await future
|
|
|
|
|
|
def patch_send_queue() -> None:
|
|
global _PATCHED
|
|
if _PATCHED:
|
|
return
|
|
Bot.call_api = _queued_call_api # type: ignore[assignment]
|
|
_PATCHED = True
|
|
|
|
|
|
driver = nonebot.get_driver()
|
|
|
|
|
|
@driver.on_startup
|
|
async def _start_send_queue():
|
|
patch_send_queue()
|
|
for idx in range(_WORKERS):
|
|
_WORKER_TASKS.append(asyncio.create_task(_worker(idx)))
|
|
|
|
|
|
@driver.on_shutdown
|
|
async def _stop_send_queue():
|
|
tasks = _WORKER_TASKS.copy()
|
|
_WORKER_TASKS.clear()
|
|
for task in tasks:
|
|
task.cancel()
|
|
if tasks:
|
|
await asyncio.gather(*tasks, return_exceptions=True)
|