mirror of
https://github.com/ZHANGTIANYAO1/teamspeak-music-bot.git
synced 2026-10-02 21:12:49 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
88e6b5a691 |
No files matched your search
@@ -136,14 +136,35 @@ ports:
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
### 方式四:Linux 一键安装
|
### 方式四:Linux 安装脚本
|
||||||
|
|
||||||
|
Linux 下有两个脚本,按需二选一:
|
||||||
|
|
||||||
|
| | `scripts/install.sh`(一键安装 + 系统服务) | `scripts/setup.sh`(只安装构建) |
|
||||||
|
|---|---|---|
|
||||||
|
| 适合 | 想开箱即用、开机自启的服务器 | 想自己决定怎么常驻(screen / tmux / pm2 / 自写服务)的用户,或 macOS |
|
||||||
|
| Node.js | 没有或版本过低时**自动安装 Node 22 LTS**(apt / yum / pacman) | **不会安装**,需先自行装好 Node 22.12+ |
|
||||||
|
| 系统依赖 | 自动安装构建工具(和 FFmpeg,作为内置 FFmpeg 的后备) | 不安装,只提示 |
|
||||||
|
| 安装位置 | 构建后复制到 `/opt/tsmusicbot`(重装时保留 `data/`) | 就在当前项目目录 |
|
||||||
|
| 系统服务 | 自动配置 systemd 服务 `tsmusicbot` 并开机自启 | **不配置服务**,完成后自己 `npm start` |
|
||||||
|
| 需要 root | 是(`sudo`) | 否 |
|
||||||
|
|
||||||
|
两者共用同一套安装逻辑:`install.sh` 会调用 `setup.sh` 完成依赖安装、国内网络镜像切换、原生模块校验和构建,然后再复制文件、配置服务。
|
||||||
|
|
||||||
|
**一键安装 + systemd 服务:**
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
chmod +x scripts/install.sh
|
chmod +x scripts/install.sh
|
||||||
sudo ./scripts/install.sh
|
sudo ./scripts/install.sh
|
||||||
|
# 之后:systemctl status|restart|stop tsmusicbot,日志:journalctl -u tsmusicbot -f
|
||||||
```
|
```
|
||||||
|
|
||||||
自动安装 Node.js 和依赖,配置 systemd 服务,支持开机自启。
|
**只安装构建(不装 Node、不配服务):**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bash scripts/setup.sh
|
||||||
|
npm start
|
||||||
|
```
|
||||||
|
|
||||||
## 更新升级
|
## 更新升级
|
||||||
|
|
||||||
@@ -364,7 +385,6 @@ sudo systemctl start tsmusicbot
|
|||||||
| `!mode <seq\|loop\|random\|rloop>` | 切换播放模式 |
|
| `!mode <seq\|loop\|random\|rloop>` | 切换播放模式 |
|
||||||
| `!playlist <歌单名或ID>` | 加载歌单(支持名称模糊搜索和 ID;Jellyfin 歌单 GUID 也可直接粘贴) |
|
| `!playlist <歌单名或ID>` | 加载歌单(支持名称模糊搜索和 ID;Jellyfin 歌单 GUID 也可直接粘贴) |
|
||||||
| `!playlist -q <歌单名>` | 从 QQ 音乐搜索并加载歌单 |
|
| `!playlist -q <歌单名>` | 从 QQ 音乐搜索并加载歌单 |
|
||||||
| `!playlist <歌单链接>` | 直接粘贴网易云 / QQ 音乐 / YouTube 歌单链接加载,平台由链接自动识别,无需加 `-q` 等标志;也可直接粘贴 App 的分享文案或短链(`163cn.tv`、`c6.y.qq.com`) |
|
|
||||||
| `!album <专辑名或ID>` | 加载专辑(支持名称搜索 / 数字 ID / Jellyfin GUID) |
|
| `!album <专辑名或ID>` | 加载专辑(支持名称搜索 / 数字 ID / Jellyfin GUID) |
|
||||||
| `!artist <歌手名>` | 按歌手循环播放(支持 `-j`/`-n`/`-q`/`-k`/`-b`/`-y`) |
|
| `!artist <歌手名>` | 按歌手循环播放(支持 `-j`/`-n`/`-q`/`-k`/`-b`/`-y`) |
|
||||||
| `!fm` | 私人 FM(默认网易云,自动续播) |
|
| `!fm` | 私人 FM(默认网易云,自动续播) |
|
||||||
@@ -496,6 +516,7 @@ teamspeak-music-bot/
|
|||||||
├── scripts/ # 部署脚本
|
├── scripts/ # 部署脚本
|
||||||
│ ├── setup.bat # Windows 首次安装
|
│ ├── setup.bat # Windows 首次安装
|
||||||
│ ├── start.bat # Windows 启动脚本
|
│ ├── start.bat # Windows 启动脚本
|
||||||
|
│ ├── setup.sh # Linux/macOS 首次安装(只安装构建)
|
||||||
│ ├── install.sh # Linux 一键安装 + systemd 服务
|
│ ├── install.sh # Linux 一键安装 + systemd 服务
|
||||||
│ └── docker/ # Docker 部署文件
|
│ └── docker/ # Docker 部署文件
|
||||||
│ ├── Dockerfile
|
│ ├── Dockerfile
|
||||||
|
|||||||
+65
-23
@@ -1,6 +1,16 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
#
|
||||||
|
# TSMusicBot Installer (Linux, systemd)
|
||||||
|
# - Installs system packages and Node.js 22 LTS
|
||||||
|
# - Runs scripts/setup.sh to install dependencies, verify native binaries and build
|
||||||
|
# - Copies the build to /opt/tsmusicbot and registers a systemd service (auto-start on boot)
|
||||||
|
#
|
||||||
|
# Only want to build and run it yourself (no Node install, no service)?
|
||||||
|
# Use scripts/setup.sh instead — see README「Linux 安装脚本」.
|
||||||
|
#
|
||||||
|
|
||||||
echo "╔══════════════════════════════════════╗"
|
echo "╔══════════════════════════════════════╗"
|
||||||
echo "║ TSMusicBot Installer ║"
|
echo "║ TSMusicBot Installer ║"
|
||||||
echo "╚══════════════════════════════════════╝"
|
echo "╚══════════════════════════════════════╝"
|
||||||
@@ -11,6 +21,9 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|||||||
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
PROJECT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||||
INSTALL_DIR="/opt/tsmusicbot"
|
INSTALL_DIR="/opt/tsmusicbot"
|
||||||
SERVICE_NAME="tsmusicbot"
|
SERVICE_NAME="tsmusicbot"
|
||||||
|
# Node LTS line to install when a supported Node is missing. Keep in sync with
|
||||||
|
# package.json "engines" and the floor check in setup.sh (#152).
|
||||||
|
NODE_LTS_MAJOR=22
|
||||||
|
|
||||||
# Verify we're in a valid project directory
|
# Verify we're in a valid project directory
|
||||||
if [ ! -f "$PROJECT_DIR/package.json" ]; then
|
if [ ! -f "$PROJECT_DIR/package.json" ]; then
|
||||||
@@ -28,42 +41,66 @@ else
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[1/6] Installing system dependencies..."
|
# Supported: 22.12+ or 24+ (odd majors are excluded by better-sqlite3 and vitest).
|
||||||
|
node_supported() {
|
||||||
|
command -v node &> /dev/null &&
|
||||||
|
node -e 'const v=process.versions.node.split(".").map(Number); process.exit((v[0]===22&&v[1]>=12)||v[0]>=24?0:1)'
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "[1/5] Installing system dependencies..."
|
||||||
case $OS in
|
case $OS in
|
||||||
ubuntu|debian)
|
ubuntu|debian)
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -y -qq curl build-essential python3
|
sudo apt-get install -y -qq curl ca-certificates build-essential python3 ffmpeg
|
||||||
;;
|
;;
|
||||||
centos|rhel|fedora)
|
centos|rhel|fedora|rocky|almalinux)
|
||||||
sudo yum install -y curl gcc gcc-c++ make python3
|
sudo yum install -y curl gcc gcc-c++ make python3
|
||||||
;;
|
;;
|
||||||
arch|manjaro)
|
arch|manjaro)
|
||||||
sudo pacman -S --noconfirm curl base-devel python
|
sudo pacman -S --noconfirm --needed curl base-devel python ffmpeg
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unsupported OS: $OS. Please install Node.js 20, build tools, and FFmpeg manually."
|
echo "Unsupported OS: $OS. Please install Node.js ${NODE_LTS_MAJOR}.12+ and build tools manually."
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo "[2/6] Installing Node.js 20 LTS..."
|
echo "[2/5] Installing Node.js ${NODE_LTS_MAJOR} LTS..."
|
||||||
if ! command -v node &> /dev/null || [[ $(node -v | cut -d. -f1 | tr -d 'v') -lt 20 ]]; then
|
if node_supported; then
|
||||||
curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
|
echo "Node.js $(node -v) already installed"
|
||||||
sudo apt-get install -y -qq nodejs 2>/dev/null || sudo yum install -y nodejs 2>/dev/null
|
else
|
||||||
fi
|
case $OS in
|
||||||
echo "Node.js $(node -v) installed"
|
ubuntu|debian)
|
||||||
|
curl -fsSL "https://deb.nodesource.com/setup_${NODE_LTS_MAJOR}.x" | sudo -E bash -
|
||||||
echo "[3/6] Installing dependencies..."
|
sudo apt-get install -y -qq nodejs
|
||||||
cd "$PROJECT_DIR"
|
;;
|
||||||
npm install
|
centos|rhel|fedora|rocky|almalinux)
|
||||||
if [ -d "$PROJECT_DIR/web/package.json" ] || [ -f "$PROJECT_DIR/web/package.json" ]; then
|
curl -fsSL "https://rpm.nodesource.com/setup_${NODE_LTS_MAJOR}.x" | sudo bash -
|
||||||
(cd "$PROJECT_DIR/web" && npm install)
|
sudo yum install -y nodejs
|
||||||
|
;;
|
||||||
|
arch|manjaro)
|
||||||
|
sudo pacman -S --noconfirm --needed nodejs npm
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if ! node_supported; then
|
||||||
|
echo "Error: Node.js 22.12+ (or 24+) is required, found: $(node -v 2>/dev/null || echo none)."
|
||||||
|
echo "Install it from https://nodejs.org/ (or https://nodejs.cn/) and re-run this script."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Node.js $(node -v) installed"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "[4/6] Building project..."
|
echo "[3/5] Installing dependencies and building (scripts/setup.sh)..."
|
||||||
npm run build
|
bash "$SCRIPT_DIR/setup.sh"
|
||||||
|
|
||||||
echo "[5/6] Copying to $INSTALL_DIR..."
|
echo "[4/5] Copying to $INSTALL_DIR..."
|
||||||
|
# Stop a running copy before replacing its files (re-install / upgrade).
|
||||||
|
if systemctl is-active --quiet "$SERVICE_NAME" 2>/dev/null; then
|
||||||
|
sudo systemctl stop "$SERVICE_NAME"
|
||||||
|
fi
|
||||||
sudo mkdir -p "$INSTALL_DIR"
|
sudo mkdir -p "$INSTALL_DIR"
|
||||||
|
# Replace build output wholesale so files removed upstream don't linger.
|
||||||
|
# data/ (config, database, cookies) is never touched.
|
||||||
|
sudo rm -rf "$INSTALL_DIR/dist" "$INSTALL_DIR/node_modules" "$INSTALL_DIR/web/dist"
|
||||||
sudo cp -r "$PROJECT_DIR/dist" "$INSTALL_DIR/"
|
sudo cp -r "$PROJECT_DIR/dist" "$INSTALL_DIR/"
|
||||||
sudo cp -r "$PROJECT_DIR/node_modules" "$INSTALL_DIR/"
|
sudo cp -r "$PROJECT_DIR/node_modules" "$INSTALL_DIR/"
|
||||||
sudo cp "$PROJECT_DIR/package.json" "$INSTALL_DIR/"
|
sudo cp "$PROJECT_DIR/package.json" "$INSTALL_DIR/"
|
||||||
@@ -72,13 +109,18 @@ if [ -d "$PROJECT_DIR/web/dist" ]; then
|
|||||||
sudo mkdir -p "$INSTALL_DIR/web"
|
sudo mkdir -p "$INSTALL_DIR/web"
|
||||||
sudo cp -r "$PROJECT_DIR/web/dist" "$INSTALL_DIR/web/"
|
sudo cp -r "$PROJECT_DIR/web/dist" "$INSTALL_DIR/web/"
|
||||||
fi
|
fi
|
||||||
|
# yt-dlp is looked up in bin/ next to dist/ before falling back to PATH
|
||||||
|
if [ -d "$PROJECT_DIR/bin" ]; then
|
||||||
|
sudo cp -r "$PROJECT_DIR/bin" "$INSTALL_DIR/"
|
||||||
|
fi
|
||||||
# Copy scripts for future use
|
# Copy scripts for future use
|
||||||
sudo mkdir -p "$INSTALL_DIR/scripts"
|
sudo mkdir -p "$INSTALL_DIR/scripts"
|
||||||
sudo cp -r "$PROJECT_DIR/scripts/"* "$INSTALL_DIR/scripts/" 2>/dev/null || true
|
sudo cp -r "$PROJECT_DIR/scripts/"* "$INSTALL_DIR/scripts/" 2>/dev/null || true
|
||||||
# Create data directory
|
# Create data directory
|
||||||
sudo mkdir -p "$INSTALL_DIR/data"
|
sudo mkdir -p "$INSTALL_DIR/data"
|
||||||
|
|
||||||
echo "[6/6] Creating systemd service..."
|
echo "[5/5] Creating systemd service..."
|
||||||
|
NODE_BIN="$(command -v node)"
|
||||||
sudo tee /etc/systemd/system/${SERVICE_NAME}.service > /dev/null <<EOL
|
sudo tee /etc/systemd/system/${SERVICE_NAME}.service > /dev/null <<EOL
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=TSMusicBot - TeamSpeak Music Bot
|
Description=TSMusicBot - TeamSpeak Music Bot
|
||||||
@@ -88,7 +130,7 @@ After=network.target
|
|||||||
Type=simple
|
Type=simple
|
||||||
User=root
|
User=root
|
||||||
WorkingDirectory=${INSTALL_DIR}
|
WorkingDirectory=${INSTALL_DIR}
|
||||||
ExecStart=/usr/bin/node ${INSTALL_DIR}/dist/index.js
|
ExecStart=${NODE_BIN} ${INSTALL_DIR}/dist/index.js
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
Environment=NODE_ENV=production
|
Environment=NODE_ENV=production
|
||||||
@@ -99,7 +141,7 @@ EOL
|
|||||||
|
|
||||||
sudo systemctl daemon-reload
|
sudo systemctl daemon-reload
|
||||||
sudo systemctl enable ${SERVICE_NAME}
|
sudo systemctl enable ${SERVICE_NAME}
|
||||||
sudo systemctl start ${SERVICE_NAME}
|
sudo systemctl restart ${SERVICE_NAME}
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "╔══════════════════════════════════════╗"
|
echo "╔══════════════════════════════════════╗"
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ echo ""
|
|||||||
|
|
||||||
# ---- Check Node.js ----
|
# ---- Check Node.js ----
|
||||||
if ! command -v node &>/dev/null; then
|
if ! command -v node &>/dev/null; then
|
||||||
echo "[ERROR] Node.js not found. Please install Node.js 20+ from https://nodejs.org"
|
echo "[ERROR] Node.js not found. Please install Node.js 22.12+ LTS from https://nodejs.org"
|
||||||
echo " or https://nodejs.cn/ (China mirror)."
|
echo " or https://nodejs.cn/ (China mirror)."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1590,70 +1590,3 @@ describe("BotInstance Bilibili multi-P resolution", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
describe("cmdPlaylist with a playlist link (#160)", () => {
|
|
||||||
const cmdPlaylist = (BotInstance.prototype as any).cmdPlaylist as (
|
|
||||||
this: unknown, cmd: { name: string; args: string; rawArgs: string[]; flags: Set<string> },
|
|
||||||
) => Promise<string>;
|
|
||||||
|
|
||||||
function makeCtx() {
|
|
||||||
const song = { id: "s1", name: "Song", artist: "A", album: "B", duration: 1, coverUrl: "" };
|
|
||||||
const makeProvider = (platform: string) => ({
|
|
||||||
platform,
|
|
||||||
search: vi.fn().mockResolvedValue({ songs: [], playlists: [] }),
|
|
||||||
getPlaylistSongs: vi.fn().mockResolvedValue([song]),
|
|
||||||
});
|
|
||||||
const providers: Record<string, any> = {
|
|
||||||
netease: makeProvider("netease"),
|
|
||||||
qq: makeProvider("qq"),
|
|
||||||
youtube: makeProvider("youtube"),
|
|
||||||
};
|
|
||||||
const queued: any[] = [];
|
|
||||||
return {
|
|
||||||
providers,
|
|
||||||
queued,
|
|
||||||
getProvider: vi.fn(() => providers.netease),
|
|
||||||
getProviderFor: vi.fn((p: string) => providers[p]),
|
|
||||||
assertProviderEnabled: vi.fn(),
|
|
||||||
extractId: (BotInstance.prototype as any).extractId,
|
|
||||||
looksLikeCollectionId: (BotInstance.prototype as any).looksLikeCollectionId,
|
|
||||||
player: { stop: vi.fn() },
|
|
||||||
queue: { clear: vi.fn(), add: (s: any) => queued.push(s), play: () => queued[0] },
|
|
||||||
disableFmMode: vi.fn(),
|
|
||||||
withRequester: (s: any) => s,
|
|
||||||
resolveAndPlay: vi.fn(async () => true),
|
|
||||||
sweepLocalAudio: vi.fn(),
|
|
||||||
emit: vi.fn(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
const cmd = (args: string, flags: string[] = []) =>
|
|
||||||
({ name: "playlist", args, rawArgs: args.split(" "), flags: new Set(flags) });
|
|
||||||
|
|
||||||
it("routes a QQ playlist link to QQ even without -q (default is NetEase)", async () => {
|
|
||||||
const ctx = makeCtx();
|
|
||||||
const reply = await cmdPlaylist.call(ctx, cmd("[URL]https://y.qq.com/n/ryqq/playlist/8052190267[/URL]"));
|
|
||||||
expect(ctx.providers.qq.getPlaylistSongs).toHaveBeenCalledWith("8052190267");
|
|
||||||
expect(ctx.providers.netease.getPlaylistSongs).not.toHaveBeenCalled();
|
|
||||||
expect(ctx.queued[0].platform).toBe("qq");
|
|
||||||
expect(reply).toMatch(/^Loaded 1 songs/);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("loads a YouTube playlist link by its list id instead of name-searching the URL", async () => {
|
|
||||||
const ctx = makeCtx();
|
|
||||||
await cmdPlaylist.call(ctx, cmd("https://www.youtube.com/playlist?list=PLabc123"));
|
|
||||||
expect(ctx.providers.youtube.getPlaylistSongs).toHaveBeenCalledWith("PLabc123");
|
|
||||||
expect(ctx.providers.netease.search).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("checks the link's platform is enabled", async () => {
|
|
||||||
const ctx = makeCtx();
|
|
||||||
ctx.assertProviderEnabled.mockImplementation(() => { throw new Error("音源未启用:qq"); });
|
|
||||||
await expect(cmdPlaylist.call(ctx, cmd("https://y.qq.com/n/ryqq/playlist/1"))).rejects.toThrow("音源未启用");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("keeps the old behavior for a bare id", async () => {
|
|
||||||
const ctx = makeCtx();
|
|
||||||
await cmdPlaylist.call(ctx, cmd("2829883282"));
|
|
||||||
expect(ctx.providers.netease.getPlaylistSongs).toHaveBeenCalledWith("2829883282");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
+4
-25
@@ -13,13 +13,7 @@ import {
|
|||||||
canRunCommand,
|
canRunCommand,
|
||||||
type ParsedCommand,
|
type ParsedCommand,
|
||||||
} from "./commands.js";
|
} from "./commands.js";
|
||||||
import {
|
import { parseSongRef, parseSelectionIndex } from "./song-ref.js";
|
||||||
parseSongRef,
|
|
||||||
parseSelectionIndex,
|
|
||||||
parsePlaylistRef,
|
|
||||||
findShareShortLink,
|
|
||||||
resolveShareLink,
|
|
||||||
} from "./song-ref.js";
|
|
||||||
import { splitTextIntoChunks } from "./text-chunk.js";
|
import { splitTextIntoChunks } from "./text-chunk.js";
|
||||||
import type { Logger } from "../logger.js";
|
import type { Logger } from "../logger.js";
|
||||||
import { SHARED_QUEUE_OWNER, type BotDatabase, type ProfileConfig, type StoredSong } from "../data/database.js";
|
import { SHARED_QUEUE_OWNER, type BotDatabase, type ProfileConfig, type StoredSong } from "../data/database.js";
|
||||||
@@ -1519,21 +1513,8 @@ export class BotInstance extends EventEmitter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async cmdPlaylist(cmd: ParsedCommand, requesterName?: string): Promise<string> {
|
private async cmdPlaylist(cmd: ParsedCommand, requesterName?: string): Promise<string> {
|
||||||
if (!cmd.args) return "Usage: !playlist <playlist name, ID or link>";
|
if (!cmd.args) return "Usage: !playlist <playlist name or ID>";
|
||||||
|
const provider = this.getProvider(cmd.flags);
|
||||||
// A playlist link (#160) names its own platform, so it wins over flags.
|
|
||||||
// App share short links are followed one hop to the real URL first.
|
|
||||||
let ref = parsePlaylistRef(cmd.args);
|
|
||||||
if (!ref) {
|
|
||||||
const shortLink = findShareShortLink(cmd.args);
|
|
||||||
if (shortLink) {
|
|
||||||
const target = await resolveShareLink(shortLink);
|
|
||||||
ref = target ? parsePlaylistRef(target) : null;
|
|
||||||
if (!ref) return "Could not open that share link — paste the full playlist link or its ID instead";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (ref) this.assertProviderEnabled(ref.platform);
|
|
||||||
const provider = ref ? this.getProviderFor(ref.platform) : this.getProvider(cmd.flags);
|
|
||||||
|
|
||||||
// Determine if input is a direct ID (numeric / Jellyfin GUID) or a name search
|
// Determine if input is a direct ID (numeric / Jellyfin GUID) or a name search
|
||||||
const id = this.extractId(cmd.args);
|
const id = this.extractId(cmd.args);
|
||||||
@@ -1541,9 +1522,7 @@ export class BotInstance extends EventEmitter {
|
|||||||
|
|
||||||
let playlistId: string;
|
let playlistId: string;
|
||||||
|
|
||||||
if (ref) {
|
if (isDirectId || id !== cmd.args) {
|
||||||
playlistId = ref.id;
|
|
||||||
} else if (isDirectId || id !== cmd.args) {
|
|
||||||
// Input is a direct ID or URL containing an ID — use existing logic
|
// Input is a direct ID or URL containing an ID — use existing logic
|
||||||
playlistId = id;
|
playlistId = id;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { describe, it, expect } from "vitest";
|
import { describe, it, expect } from "vitest";
|
||||||
import { parseSongRef, parseSelectionIndex, parsePlaylistRef, findShareShortLink, resolveShareLink } from "./song-ref.js";
|
import { parseSongRef, parseSelectionIndex } from "./song-ref.js";
|
||||||
|
|
||||||
describe("parseSongRef (#90 exact-song selection)", () => {
|
describe("parseSongRef (#90 exact-song selection)", () => {
|
||||||
it("returns null for a plain search term", () => {
|
it("returns null for a plain search term", () => {
|
||||||
@@ -120,65 +120,3 @@ describe("parseSelectionIndex (#90 pick from last search)", () => {
|
|||||||
expect(parseSelectionIndex("")).toBeNull();
|
expect(parseSelectionIndex("")).toBeNull();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("parsePlaylistRef (#160 play a playlist from its link)", () => {
|
|
||||||
it("returns null for a playlist name or a bare id (caller keeps its old logic)", () => {
|
|
||||||
expect(parsePlaylistRef("华语经典")).toBeNull();
|
|
||||||
expect(parsePlaylistRef("2829883282")).toBeNull();
|
|
||||||
expect(parsePlaylistRef("")).toBeNull();
|
|
||||||
});
|
|
||||||
|
|
||||||
it("parses NetEase playlist URLs (web, hash route, mobile share)", () => {
|
|
||||||
expect(parsePlaylistRef("https://music.163.com/playlist?id=2829883282")).toEqual({ id: "2829883282", platform: "netease" });
|
|
||||||
expect(parsePlaylistRef("https://music.163.com/#/playlist?id=2829883282")).toEqual({ id: "2829883282", platform: "netease" });
|
|
||||||
expect(parsePlaylistRef("https://y.music.163.com/m/playlist?id=2829883282&userid=77&creatorId=77")).toEqual({ id: "2829883282", platform: "netease" });
|
|
||||||
expect(parsePlaylistRef("https://music.163.com/playlist/2829883282")).toEqual({ id: "2829883282", platform: "netease" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("does not mistake a NetEase userid= for the playlist id", () => {
|
|
||||||
expect(parsePlaylistRef("https://music.163.com/playlist?userid=77&id=123")).toEqual({ id: "123", platform: "netease" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("parses QQ Music playlist URLs", () => {
|
|
||||||
expect(parsePlaylistRef("https://y.qq.com/n/ryqq/playlist/8052190267")).toEqual({ id: "8052190267", platform: "qq" });
|
|
||||||
expect(parsePlaylistRef("https://i.y.qq.com/n2/m/share/details/taoge.html?platform=11&appshare=android_qq&hosteuin=abc&id=8052190267&appversion=13")).toEqual({ id: "8052190267", platform: "qq" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("parses YouTube playlist URLs by their list= id", () => {
|
|
||||||
expect(parsePlaylistRef("https://www.youtube.com/playlist?list=PLx0sYbCqOb8TBPRdmBHs5Iftvv9TPboYG")).toEqual({ id: "PLx0sYbCqOb8TBPRdmBHs5Iftvv9TPboYG", platform: "youtube" });
|
|
||||||
expect(parsePlaylistRef("https://youtu.be/abc?list=PLabc-_1")).toEqual({ id: "PLabc-_1", platform: "youtube" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("unwraps the [URL] BBCode the TeamSpeak client adds to pasted links", () => {
|
|
||||||
expect(parsePlaylistRef("[URL]https://y.qq.com/n/ryqq/playlist/8052190267[/URL]")).toEqual({ id: "8052190267", platform: "qq" });
|
|
||||||
});
|
|
||||||
|
|
||||||
it("finds the link inside an app's share text", () => {
|
|
||||||
expect(parsePlaylistRef("分享某人创建的歌单「深夜」: https://y.music.163.com/m/playlist?id=123&userid=77 (来自@网易云音乐)")).toEqual({ id: "123", platform: "netease" });
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("findShareShortLink (#160)", () => {
|
|
||||||
it("finds NetEase and QQ app short links, even inside share text or BBCode", () => {
|
|
||||||
expect(findShareShortLink("歌单「深夜」: https://163cn.tv/Abc123 (来自@网易云音乐)")).toBe("https://163cn.tv/Abc123");
|
|
||||||
expect(findShareShortLink("[URL]https://c6.y.qq.com/base/fcgi-bin/u?__=AbCd12[/URL]")).toBe("https://c6.y.qq.com/base/fcgi-bin/u?__=AbCd12");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("ignores every other host, so we never fetch arbitrary user-supplied URLs", () => {
|
|
||||||
expect(findShareShortLink("https://evil.example/163cn.tv/Abc")).toBeNull();
|
|
||||||
expect(findShareShortLink("http://127.0.0.1:8080/x")).toBeNull();
|
|
||||||
expect(findShareShortLink("华语经典")).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("resolveShareLink (#160)", () => {
|
|
||||||
it("returns the redirect target", async () => {
|
|
||||||
const get = async () => ({ status: 302, location: "https://music.163.com/playlist?id=123" });
|
|
||||||
expect(await resolveShareLink("https://163cn.tv/Abc", get)).toBe("https://music.163.com/playlist?id=123");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("returns null when there is no redirect or the request fails", async () => {
|
|
||||||
expect(await resolveShareLink("https://163cn.tv/Abc", async () => ({ status: 200, location: undefined }))).toBeNull();
|
|
||||||
expect(await resolveShareLink("https://163cn.tv/Abc", async () => { throw new Error("boom"); })).toBeNull();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
import axios from "axios";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Parsing helpers for picking an EXACT song in a !play / !add / !playnext query,
|
* Parsing helpers for picking an EXACT song in a !play / !add / !playnext query,
|
||||||
* so same-name songs can be disambiguated instead of always getting the single
|
* so same-name songs can be disambiguated instead of always getting the single
|
||||||
@@ -100,82 +98,3 @@ export function parseSelectionIndex(raw: string): number | null {
|
|||||||
const n = parseInt(m[1], 10);
|
const n = parseInt(m[1], 10);
|
||||||
return Number.isFinite(n) && n > 0 ? n : null;
|
return Number.isFinite(n) && n > 0 ? n : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PlaylistRef {
|
|
||||||
id: string;
|
|
||||||
platform: "netease" | "qq" | "youtube";
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Drop the [URL]…[/URL] BBCode the TeamSpeak client wraps around pasted links. */
|
|
||||||
function stripUrlBBCode(text: string): string {
|
|
||||||
return text.replace(/\[\/?url(?:=[^\]]*)?\]/gi, " ");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Detect a playlist URL (#160) — a web link, or the full link inside an app's
|
|
||||||
* share text. The platform comes from the URL, so a QQ link works without
|
|
||||||
* `-q`. Returns `null` for anything else (a playlist name or bare id), which
|
|
||||||
* the caller handles as before.
|
|
||||||
*/
|
|
||||||
export function parsePlaylistRef(raw: string): PlaylistRef | null {
|
|
||||||
const q = stripUrlBBCode(raw ?? "").trim();
|
|
||||||
if (!q) return null;
|
|
||||||
|
|
||||||
if (/music\.163\.com/i.test(q)) {
|
|
||||||
const m = /[?&#/]id=(\d+)/.exec(q) ?? /\/playlist\/(\d+)/.exec(q);
|
|
||||||
if (m) return { id: m[1], platform: "netease" };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (/y\.qq\.com/i.test(q)) {
|
|
||||||
const m = /\/playlist\/(\d+)/.exec(q) ?? /[?&](?:id|disstid)=(\d+)/.exec(q);
|
|
||||||
if (m) return { id: m[1], platform: "qq" };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (/youtube\.com|youtu\.be/i.test(q)) {
|
|
||||||
const m = /[?&]list=([\w-]+)/.exec(q);
|
|
||||||
if (m) return { id: m[1], platform: "youtube" };
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find a NetEase (163cn.tv) or QQ Music (c6.y.qq.com/base/fcgi-bin/u) share
|
|
||||||
* short link — what the phone apps copy. Only these hosts are recognized so
|
|
||||||
* the bot never fetches an arbitrary user-supplied URL.
|
|
||||||
*/
|
|
||||||
export function findShareShortLink(raw: string): string | null {
|
|
||||||
const q = stripUrlBBCode(raw ?? "");
|
|
||||||
const m =
|
|
||||||
/https?:\/\/163cn\.(?:tv|link)\/[0-9A-Za-z]+/i.exec(q) ??
|
|
||||||
/https?:\/\/c\d*\.y\.qq\.com\/base\/fcgi-bin\/u\?__=[0-9A-Za-z]+/i.exec(q);
|
|
||||||
return m ? m[0] : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
type RedirectGet = (url: string) => Promise<{ status: number; location: string | undefined }>;
|
|
||||||
|
|
||||||
const redirectGet: RedirectGet = async (url) => {
|
|
||||||
const res = await axios.get(url, {
|
|
||||||
maxRedirects: 0,
|
|
||||||
timeout: 5000,
|
|
||||||
validateStatus: () => true,
|
|
||||||
responseType: "stream",
|
|
||||||
});
|
|
||||||
res.data?.destroy?.();
|
|
||||||
const location = res.headers.location;
|
|
||||||
return { status: res.status, location: typeof location === "string" ? location : undefined };
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Follow a share short link one hop. Returns the target URL, or null. */
|
|
||||||
export async function resolveShareLink(
|
|
||||||
url: string,
|
|
||||||
get: RedirectGet = redirectGet,
|
|
||||||
): Promise<string | null> {
|
|
||||||
try {
|
|
||||||
const { status, location } = await get(url);
|
|
||||||
if (status < 300 || status >= 400 || !location) return null;
|
|
||||||
return new URL(location, url).toString();
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user