✨ feat(command): 添加命令监听与外接回调功能
- 新增 `#四个中文字+空格` 消息匹配规则,可配置前缀和长度 - 匹配成功后 POST 到 COMMAND_CALLBACK_URL,携带命令名、内容、用户信息 - 使用 EventMixin.events() 订阅消息流,on_close 自动取消监听 - 新增配置项:COMMAND_PREFIX、COMMAND_LENGTH、COMMAND_CALLBACK_URL - 更新 .env.example 和 README 文档
This commit is contained in:
46
plugin.py
46
plugin.py
@@ -7,7 +7,8 @@ import os
|
||||
from aiohttp import web
|
||||
from ncatbot.plugin import NcatBotPlugin
|
||||
|
||||
from .config import HOST, PORT, UPLOAD_DIR, WEBHOOK_API_KEY
|
||||
from .config import COMMAND_CALLBACK_URL, COMMAND_LENGTH, COMMAND_PREFIX, HOST, PORT, UPLOAD_DIR, WEBHOOK_API_KEY
|
||||
from .handlers.command import parse_command, send_command_callback
|
||||
from .handlers.health import health_handler
|
||||
from .handlers.message import webhook_handler
|
||||
from .handlers.upload import cleanup_expired_files, upload_handler
|
||||
@@ -26,14 +27,25 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
super().__init__(*args, **kwargs)
|
||||
self._webhook_runner: web.AppRunner | None = None
|
||||
self._cleanup_task: asyncio.Task | None = None
|
||||
self._listener_task: asyncio.Task | None = None
|
||||
|
||||
async def on_load(self):
|
||||
self.logger.info("Webhook 插件已加载")
|
||||
self.logger.info("WEBHOOK_API_KEY: %s", "已配置" if os.environ.get("WEBHOOK_API_KEY") else "自动生成")
|
||||
self.logger.info("命令监听: 前缀=%s 长度=%d 回调=%s", COMMAND_PREFIX, COMMAND_LENGTH,
|
||||
COMMAND_CALLBACK_URL or "未配置")
|
||||
asyncio.create_task(self._start_webhook())
|
||||
self._cleanup_task = asyncio.create_task(self._cleanup_loop())
|
||||
self._listener_task = asyncio.create_task(self._message_listener())
|
||||
|
||||
async def on_close(self):
|
||||
if self._listener_task is not None:
|
||||
self._listener_task.cancel()
|
||||
try:
|
||||
await self._listener_task
|
||||
except asyncio.CancelledError:
|
||||
pass
|
||||
self._listener_task = None
|
||||
if self._cleanup_task is not None:
|
||||
self._cleanup_task.cancel()
|
||||
try:
|
||||
@@ -53,6 +65,38 @@ class WebHookPlugin(NcatBotPlugin):
|
||||
except Exception as exc:
|
||||
self.logger.error("清理过期文件失败: %s", exc)
|
||||
|
||||
async def _message_listener(self) -> None:
|
||||
"""监听 QQ 消息,匹配命令模式后转发到外部回调。"""
|
||||
try:
|
||||
async with self.events("message") as stream:
|
||||
async for event in stream:
|
||||
try:
|
||||
raw_message = event.data.raw_message
|
||||
if not raw_message:
|
||||
continue
|
||||
parsed = parse_command(raw_message)
|
||||
if not parsed:
|
||||
continue
|
||||
# 构建回调数据
|
||||
data = {
|
||||
"command": parsed["command"],
|
||||
"content": parsed["content"],
|
||||
"raw_message": parsed["raw_message"],
|
||||
"user_id": event.data.user_id,
|
||||
"message_id": event.data.message_id,
|
||||
}
|
||||
if hasattr(event.data, "group_id"):
|
||||
data["group_id"] = event.data.group_id
|
||||
self.logger.info(
|
||||
"命令监听匹配: command=%s user=%s group=%s",
|
||||
parsed["command"], data["user_id"], data.get("group_id", "-"),
|
||||
)
|
||||
asyncio.create_task(send_command_callback(data, self.logger))
|
||||
except Exception as exc:
|
||||
self.logger.error("消息处理异常: %s", exc)
|
||||
except asyncio.CancelledError:
|
||||
return
|
||||
|
||||
def _create_app(self) -> web.Application:
|
||||
app = web.Application(middlewares=[request_id_middleware, auth_middleware])
|
||||
app["qq_api"] = self.api
|
||||
|
||||
Reference in New Issue
Block a user