- 文件代理（PUBLIC_URL）：上传与直链文本的 URL 换成 bot 公开地址，请求 到来现场重解析直链再转发字节，绕开 QQ 抓风控直链失败（40093007）与 qs 本地流外网不可达；PROXY_PORT 指定监听端口 - 群消息去重补第二把钥匙：全量模式下 @消息同时命中两事件且 msg_id 不同， 只按 msg_id 拦不住，再加「群+发送人+文本」10 秒短窗（修双发） - 「<平台>下载 <歌名>」改出该平台的选歌菜单（与 /点歌 同款交互、spage 翻页锁定平台），不再直接下第一首 - 猫耳/懒人/蜻蜓节目级条目点编号先出选集菜单（/album）：猫耳选集接口 忽略翻页参数，一次拉 50 集本地切片；懒人/蜻蜓走服务端翻页；空选集 （已下线/需登录）给明确提示 - 指令面板条目按 /sources 现算、按宽度裁剪（修 30013 超限）；装配入口 改用 Bot 门面；qqbotsdk 依赖更名 qqbotsdk-py（撤 GitHub archive 源）
This commit is contained in:
snowy-yang committed
1 parent
324fe86962
commit
c364506925
10 files changed
+1883
-254
No files matched your search
@@ -3,10 +3,14 @@
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from urllib.parse import urlsplit
|
||||
|
||||
# 内嵌键盘上限 5 行 × 每行 5 个；歌曲占行 + 1 行翻页 → 每页最多 20 首
|
||||
_MAX_MENU_PAGE_SIZE = 20
|
||||
|
||||
# PUBLIC_URL 不带端口时文件代理的监听端口（MusicServer 默认在 16688）
|
||||
_DEFAULT_PROXY_PORT = 16689
|
||||
|
||||
_LOG_LEVELS = ("TRACE", "DEBUG", "INFO", "SUCCESS", "WARNING", "ERROR", "CRITICAL")
|
||||
|
||||
|
||||
@@ -28,6 +32,20 @@ def _send_mode() -> str:
|
||||
return raw if raw in ("file", "link") else "link"
|
||||
|
||||
|
||||
def _proxy_port(public_url: str) -> int:
|
||||
"""PROXY_PORT：文件代理的监听端口。
|
||||
|
||||
缺省跟随 PUBLIC_URL 里的显式端口（如 http://1.2.3.4:16689 → 16689），
|
||||
没写端口用默认（https 域名走反向代理时必须显式配置，bot 本身不收 TLS）。"""
|
||||
raw = os.getenv("PROXY_PORT", "").strip()
|
||||
if raw.isdigit():
|
||||
return int(raw)
|
||||
try:
|
||||
return urlsplit(public_url).port or _DEFAULT_PROXY_PORT
|
||||
except ValueError: # URL 端口段写坏了
|
||||
return _DEFAULT_PROXY_PORT
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class BotConfig:
|
||||
music_server_url: str
|
||||
@@ -36,6 +54,9 @@ class BotConfig:
|
||||
menu_page_size: int = 10 # 选歌菜单每页候选数（1~20）
|
||||
withdraw: bool = True # 自动撤回旧菜单/卡片是否开启
|
||||
send_mode: str = "link" # 下载发送方式："file" 先传文件 / "link" 直接发直链
|
||||
file_proxy: bool = False # 文件代理开关（FILE_PROXY=on 且配了 PUBLIC_URL 才开）
|
||||
public_url: str = "" # 文件代理对外基址（PUBLIC_URL，如 http://1.2.3.4:16689）
|
||||
proxy_port: int = _DEFAULT_PROXY_PORT # 文件代理监听端口（缺省跟 PUBLIC_URL）
|
||||
command_panel: bool = True # 启动/重连时自动注册指令面板（输入框 / 菜单）
|
||||
log_level: str = "INFO" # 控制台与文件日志级别
|
||||
log_dir: Path = Path("logs") # 日志目录；写不进去时自动退化为仅控制台
|
||||
@@ -44,6 +65,7 @@ class BotConfig:
|
||||
@classmethod
|
||||
def load(cls) -> "BotConfig":
|
||||
page_size = int(os.getenv("MENU_PAGE_SIZE", "10"))
|
||||
public_url = os.getenv("PUBLIC_URL", "").strip().rstrip("/")
|
||||
return cls(
|
||||
music_server_url=os.getenv("MUSIC_SERVER_URL", "http://127.0.0.1:16688"),
|
||||
music_quality=os.getenv("MUSIC_QUALITY", "128k"),
|
||||
@@ -51,6 +73,9 @@ class BotConfig:
|
||||
menu_page_size=min(max(1, page_size), _MAX_MENU_PAGE_SIZE),
|
||||
withdraw=_flag("WITHDRAW", True),
|
||||
send_mode=_send_mode(),
|
||||
file_proxy=_flag("FILE_PROXY", True) and bool(public_url),
|
||||
public_url=public_url,
|
||||
proxy_port=_proxy_port(public_url),
|
||||
command_panel=_flag("COMMAND_PANEL", True),
|
||||
log_level=_log_level(),
|
||||
log_dir=Path(os.getenv("LOG_DIR", "logs")),
|
||||
|
||||
+4
-4
@@ -7,7 +7,7 @@ from pathlib import Path
|
||||
|
||||
from aiohttp import ClientSession
|
||||
from loguru import logger
|
||||
from qqbotsdk import EventEmitter, run_loop
|
||||
from qqbotsdk import Bot
|
||||
|
||||
from . import reload
|
||||
from .config import BotConfig
|
||||
@@ -48,11 +48,11 @@ async def amain() -> None:
|
||||
config = BotConfig.load()
|
||||
setup_logging(config)
|
||||
logger.info(f"musicbot 启动，日志级别 {config.log_level}")
|
||||
ee = EventEmitter() # 队列由 emitter 自建，run_loop 复用同一实例
|
||||
bot = Bot() # 构造即读 .env 并校验 SDK 配置（APPID/APPSECRET/CONNECTER）
|
||||
# bot 自建连接池：直链探测不受 SDK 的 TIMEOUT 约束
|
||||
async with ClientSession() as http:
|
||||
register(ee, config, http)
|
||||
await run_loop(ee)
|
||||
register(bot, config, http)
|
||||
await bot.start()
|
||||
|
||||
|
||||
def _parse_args(argv: list[str] | None) -> argparse.Namespace:
|
||||
|
||||
+873
-158
File diff suppressed because it is too large.
Load diff
+20
-17
@@ -3,7 +3,11 @@
|
||||
调开放平台 2026-08 新增的 /v2/panels 接口，把点歌指令同步到 QQ：
|
||||
启动与每次重连（READY）各同步一次——没有就创建（target_type=all
|
||||
对全部群生效），内容有变就更新，一致则跳过，幂等可重入。
|
||||
失败只记日志不影响运行（如功能未对机器人开放）。
|
||||
|
||||
条目由调用方给定（music.panel_items 按 MusicServer /sources 现算：
|
||||
基础指令 + 热搜/榜单 + 各平台「<平台>下载」），服务器增删源跟着变。
|
||||
接口上限（每面板 20 条；name/desc 按宽度限 14/30——汉字计 2）由条目
|
||||
生成方裁剪。失败只记日志不影响运行（如功能未对机器人开放）。
|
||||
"""
|
||||
|
||||
from typing import Any
|
||||
@@ -20,14 +24,6 @@ _TARGET_TYPE = "all"
|
||||
# remark 兼作身份标识：重连同步时按它找到自己注册过的面板
|
||||
_REMARK = "音乐bot"
|
||||
|
||||
_PANEL_ITEMS = [
|
||||
{"name": "点歌", "type": "command", "desc": "出选歌菜单，点编号选歌"},
|
||||
{"name": "歌词", "type": "command", "desc": "查看歌词"},
|
||||
{"name": "帮助", "type": "command", "desc": "查看帮助"},
|
||||
]
|
||||
|
||||
_PANEL_BODY = {"items": _PANEL_ITEMS, "remark": _REMARK}
|
||||
|
||||
|
||||
def _signature(items: list[dict]) -> list[tuple]:
|
||||
"""面板条目的比较指纹：只取本模块管理的字段，忽略其余与键序。"""
|
||||
@@ -61,25 +57,32 @@ def _mine(records: list[Any]) -> dict | None:
|
||||
return None
|
||||
|
||||
|
||||
async def sync_command_panel(api: BotApi) -> None:
|
||||
"""把点歌指令面板同步到 QQ（幂等）。任何失败只记日志，绝不抛出。"""
|
||||
async def sync_command_panel(api: BotApi, items: list[dict]) -> None:
|
||||
"""把给定条目同步成 QQ 指令面板（幂等）。任何失败只记日志，绝不抛出。"""
|
||||
try:
|
||||
resp = await api.get("/v2/panels", params={"scope": _SCOPE, "limit": "20"})
|
||||
records = _unwrap(resp, "records").get("records") or []
|
||||
mine = _mine(records)
|
||||
unchanged = mine and _signature(mine["panel"].get("items") or []) == _signature(
|
||||
_PANEL_ITEMS
|
||||
items
|
||||
)
|
||||
if unchanged:
|
||||
logger.info("指令面板已是最新（点歌/歌词/帮助）")
|
||||
logger.info(f"指令面板已是最新（{len(items)} 条指令）")
|
||||
return
|
||||
if mine:
|
||||
await api.put(f"/v2/panels/{mine['panel_id']}", json={"panel": _PANEL_BODY})
|
||||
logger.info("指令面板已更新（点歌/歌词/帮助）")
|
||||
await api.put(
|
||||
f"/v2/panels/{mine['panel_id']}",
|
||||
json={"panel": {"items": items, "remark": _REMARK}},
|
||||
)
|
||||
logger.info(f"指令面板已更新（{len(items)} 条指令）")
|
||||
else:
|
||||
body = {"scope": _SCOPE, "panel": _PANEL_BODY, "target_type": _TARGET_TYPE}
|
||||
body = {
|
||||
"scope": _SCOPE,
|
||||
"panel": {"items": items, "remark": _REMARK},
|
||||
"target_type": _TARGET_TYPE,
|
||||
}
|
||||
await api.post("/v2/panels", json=body)
|
||||
logger.info("指令面板已创建（点歌/歌词/帮助，对全部群生效）")
|
||||
logger.info(f"指令面板已创建（{len(items)} 条指令，对全部群生效）")
|
||||
except _API_FAILS as e:
|
||||
# 失败不影响运行；指令可改为在开放平台后台手工配置
|
||||
logger.warning(f"指令面板同步失败: {e!r}")
|
||||
@@ -0,0 +1,143 @@
|
||||
"""文件代理：bot 自建 HTTP 服务，把播放直链换成自己的公开 URL。
|
||||
|
||||
QQ 服务器侧上传富媒体（语音 file_type=3 / 群文件 4）要现场抓取 URL 入库，
|
||||
两类直链它抓不到：tx 等源的 CDN 风控直链（QQ 侧报 40093007，bot 自己的
|
||||
出口反而常能抓），以及 qs 登录态直链（MusicServer 本地解密流代理，只有
|
||||
bot 所在网络可达）。开启后 send_song 发出的 URL（上传与直链文本同源）一律
|
||||
换成 <PUBLIC_URL>/file/<key>/<文件名>：
|
||||
|
||||
- key 在发送时登记（歌曲 + 搜索词），随机不可猜、短时有效、总量封顶；
|
||||
- 请求到来时经 resolve 现场重解析直链——直链本身有时效，登记时探测过的
|
||||
那条不能复用；解析自带候选源回退（tx 风控会自动落到 kw 等源）——再从
|
||||
上游流式转发字节；
|
||||
- bot 主机需能被 QQ 服务器 / 群友访问（公网 IP 或端口映射），否则上传
|
||||
失败、回退直链文本；服务起不来（端口被占）时 claim 不换链，退回发
|
||||
原直链，主流程不受影响。"""
|
||||
|
||||
import secrets
|
||||
import time
|
||||
from collections import OrderedDict
|
||||
from collections.abc import Awaitable, Callable
|
||||
from typing import Any
|
||||
from urllib.parse import quote
|
||||
|
||||
from aiohttp import ClientError, ClientSession, ClientTimeout, web
|
||||
from loguru import logger
|
||||
|
||||
# 现场解析一条当前可抓取的直链（music._fetchable_play，含候选源回退），
|
||||
# 失败返回 None。歌曲对象对本模块透明（避免与 music 循环导入），透传即可。
|
||||
Resolver = Callable[[Any, str], Awaitable[tuple[Any, str] | None]]
|
||||
|
||||
_TTL = 2 * 60 * 60.0 # 秒：直链文本可能被群友过一阵才点，登记保留久一点
|
||||
_MAX_ENTRIES = 256 # 条；超出按插入序淘汰最旧，封住内存
|
||||
_CHUNK = 64 * 1024 # 流式转发的块大小
|
||||
# 转发超时：连接要快、单次读不能卡死，但不设总时长（整首歌可以下挺久）
|
||||
_STREAM_TIMEOUT = ClientTimeout(total=None, connect=10, sock_read=60)
|
||||
|
||||
|
||||
class FileProxy:
|
||||
"""发送时登记换链、请求时解析直链并转发字节的小型文件代理。"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
public_base: str,
|
||||
http: ClientSession,
|
||||
resolve: Resolver,
|
||||
port: int,
|
||||
) -> None:
|
||||
self._base = public_base.rstrip("/")
|
||||
self._http = http
|
||||
self._resolve = resolve
|
||||
self._port = port
|
||||
self.port = port # 实际监听端口（port=0 时在 start 后更新为分配值）
|
||||
# key -> (过期时刻, 歌曲, 搜索词, 文件名)；OrderedDict 按插入序淘汰
|
||||
self._entries: OrderedDict[str, tuple[float, Any, str, str]] = OrderedDict()
|
||||
self._runner: web.AppRunner | None = None
|
||||
|
||||
@property
|
||||
def ready(self) -> bool:
|
||||
"""HTTP 服务是否已在跑；没起来时调用方应放弃换链、退回原直链。"""
|
||||
return self._runner is not None
|
||||
|
||||
def claim(self, song: Any, keyword: str, filename: str) -> str:
|
||||
"""登记一首歌并返回它的公开代理 URL（尾段带文件名，供展示与扩展名）。"""
|
||||
now = time.monotonic()
|
||||
while self._entries:
|
||||
key, (expire_at, *_) = next(iter(self._entries.items()))
|
||||
if expire_at > now:
|
||||
break
|
||||
del self._entries[key]
|
||||
key = secrets.token_urlsafe(8)
|
||||
self._entries[key] = (now + _TTL, song, keyword, filename)
|
||||
while len(self._entries) > _MAX_ENTRIES:
|
||||
self._entries.popitem(last=False)
|
||||
return f"{self._base}/file/{key}/{quote(filename)}"
|
||||
|
||||
async def start(self) -> None:
|
||||
"""起 HTTP 服务；幂等（重连 READY 会再调），端口被占等失败仅记日志。"""
|
||||
if self._runner is not None:
|
||||
return
|
||||
app = web.Application()
|
||||
app.router.add_get("/file/{key}/{name}", self._serve)
|
||||
runner = web.AppRunner(app, access_log=None) # 交付另有日志，不刷访问日志
|
||||
try:
|
||||
await runner.setup()
|
||||
site = web.TCPSite(runner, "0.0.0.0", self._port)
|
||||
await site.start()
|
||||
except OSError as e:
|
||||
logger.warning(f"文件代理监听 0.0.0.0:{self._port} 失败: {e}")
|
||||
await runner.cleanup()
|
||||
return
|
||||
if self._port == 0:
|
||||
# sockets 未列入 aiohttp 类型存根，只能从私有属性取实际端口
|
||||
server = site._server
|
||||
assert server is not None
|
||||
self.port = server.sockets[0].getsockname()[1] # type: ignore[attr-defined]
|
||||
self._runner = runner
|
||||
logger.info(f"文件代理已监听 0.0.0.0:{self.port}，对外地址 {self._base}")
|
||||
|
||||
async def stop(self) -> None:
|
||||
if self._runner is not None:
|
||||
await self._runner.cleanup()
|
||||
self._runner = None
|
||||
|
||||
async def _serve(self, request: web.Request) -> web.StreamResponse:
|
||||
key = request.match_info["key"]
|
||||
entry = self._entries.get(key)
|
||||
if entry is None or entry[0] < time.monotonic():
|
||||
return web.Response(status=404, text="链接已过期或不存在")
|
||||
_, song, keyword, filename = entry
|
||||
try:
|
||||
found = await self._resolve(song, keyword)
|
||||
except Exception as e: # 解析在 handler 边界，别让 500 栈漏给请求方
|
||||
logger.warning(f"文件代理解析直链异常: {e!r}")
|
||||
found = None
|
||||
if found is None:
|
||||
return web.Response(status=502, text="取流失败，请重新点歌")
|
||||
url = found[1]
|
||||
resp: web.StreamResponse | None = None
|
||||
try:
|
||||
async with self._http.get(url, timeout=_STREAM_TIMEOUT) as upstream:
|
||||
if upstream.status != 200:
|
||||
raise ClientError(f"上游 HTTP {upstream.status}")
|
||||
resp = web.StreamResponse(headers={
|
||||
# 上游的 Content-Type 透传（音源都是 audio/*），缺省按 mp3
|
||||
"Content-Type": upstream.headers.get("Content-Type", "audio/mpeg"),
|
||||
"Content-Disposition": (
|
||||
f"attachment; filename*=UTF-8''{quote(filename)}"
|
||||
),
|
||||
})
|
||||
if upstream.content_length is not None:
|
||||
resp.content_length = upstream.content_length
|
||||
await resp.prepare(request)
|
||||
async for chunk in upstream.content.iter_chunked(_CHUNK):
|
||||
await resp.write(chunk)
|
||||
await resp.write_eof()
|
||||
logger.info(f"文件代理已交付：{filename}")
|
||||
return resp
|
||||
except (ClientError, TimeoutError, OSError) as e:
|
||||
logger.warning(f"文件代理转发失败（{url[:80]}）: {e!r}")
|
||||
# 字节已发出一半时状态码改不了，就地断流让客户端感知；没开始才给 502
|
||||
if resp is not None and resp.prepared:
|
||||
return resp
|
||||
return web.Response(status=502, text="上游取流失败")
|
||||
Reference in new issue
Block a user