diff --git a/README.md b/README.md index adc7768..60954c2 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,70 @@ sudo ./scripts/install.sh 自动安装 Node.js 和依赖，配置 systemd 服务，支持开机自启。 +## 更新升级 + +### Windows 用户 + +``` +1. 双击 scripts\stop.bat 停止运行中的机器人（或手动关闭窗口） +2. 在项目目录打开命令行，执行 git pull +3. 双击 scripts\setup.bat 重新安装依赖并构建 +4. 双击 scripts\start.bat 启动 +``` + +### 手动安装用户（所有系统） + +```bash +# 停止当前运行的机器人（Ctrl+C 或 kill 进程） + +# 拉取最新代码 +git pull + +# 重新安装依赖（如有新增依赖） +npm install +cd web && npm install && cd .. + +# 重新构建 +npm run build + +# 启动 +npm start +``` + +### Docker 用户 + +```bash +cd scripts/docker + +# 拉取最新代码 +git pull + +# 重新构建并启动（数据自动保留） +docker-compose up -d --build +``` + +> 数据（数据库、Cookie、日志）保存在 Docker 命名卷 `tsmusicbot-data` 中，更新不会丢失。 + +### Linux systemd 用户 + +```bash +# 停止服务 +sudo systemctl stop tsmusicbot + +# 拉取最新代码 +git pull + +# 重新安装依赖并构建 +npm install +cd web && npm install && cd .. +npm run build + +# 重新启动服务 +sudo systemctl start tsmusicbot +``` + +> **提示：** 更新不会影响你的 `config.json` 配置文件、数据库和登录 Cookie，所有数据会自动保留。 + ## 使用说明 ### 首次配置 diff --git a/package.json b/package.json index 05c7fdc..694d5fc 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "build": "tsc && npm run build:web", "build:web": "cd web && npm run build", "start": "node dist/index.js", + "play": "node dist/index.js", "test": "vitest run", "test:watch": "vitest" }, diff --git a/src/audio/player.ts b/src/audio/player.ts index 03be44f..f0bcb53 100644 --- a/src/audio/player.ts +++ b/src/audio/player.ts @@ -37,15 +37,23 @@ function ffmpegWorks(bin: string): boolean { /** Resolved once at module load — prefer bundled ffmpeg-static, fall back to system. */ const resolvedFfmpeg: string = (() => { - if (ffmpegPath && isExecutable(ffmpegPath) && ffmpegWorks(ffmpegPath)) { - return ffmpegPath; + // On Windows, ffmpeg-static may return a path with backslashes; on Linux/macOS + // it may return a Windows .exe path if node_modules was copied cross-platform. + const isWinPath = ffmpegPath ? /\\/.test(ffmpegPath) || ffmpegPath.endsWith(".exe") : false; + const onWindows = process.platform === "win32"; + + // Only try bundled binary if platform matches + if (ffmpegPath && (onWindows === isWinPath)) { + if (isExecutable(ffmpegPath) && ffmpegWorks(ffmpegPath)) { + return ffmpegPath; + } } // Fall back to system ffmpeg if (ffmpegWorks("ffmpeg")) { return "ffmpeg"; } - // Last resort: return whatever we have, will fail at runtime with clear error - return ffmpegPath ?? "ffmpeg"; + // Last resort: always use "ffmpeg" so spawn error is clear, never use a cross-platform path + return "ffmpeg"; })(); /** Resolve ffmpeg binary: prefer bundled ffmpeg-static, fall back to system PATH. */ @@ -79,6 +87,9 @@ export class AudioPlayer extends EventEmitter { private static readonly BUFFER_HIGH_WATER = 960 * 1024; // ~5s of PCM at 48kHz stereo private static readonly BUFFER_LOW_WATER = 480 * 1024; // ~2.5s private ffmpegPaused = false; + private spawnFailed = false; // true if ffmpeg spawn errored (prevent trackEnd cascade) + private consecutiveFailures = 0; + private static readonly MAX_CONSECUTIVE_FAILURES = 3; constructor(logger: Logger) { super(); @@ -94,6 +105,18 @@ export class AudioPlayer extends EventEmitter { this.seekOffset = seekSeconds; this.framesPlayed = 0; this.ffmpegPaused = false; + this.spawnFailed = false; + + // Prevent rapid-fire spawn attempts when ffmpeg is broken + if (this.consecutiveFailures >= AudioPlayer.MAX_CONSECUTIVE_FAILURES) { + this.logger.error( + { failures: this.consecutiveFailures, ffmpeg: getFfmpegCommand() }, + "Too many consecutive ffmpeg failures — ffmpeg binary may be missing or broken. Stopping playback." + ); + this.state = "idle"; + this.emit("error", new Error("ffmpeg unavailable after repeated failures")); + return; + } this.logger.info({ url: url.slice(0, 80), seek: seekSeconds }, "Starting playback"); @@ -160,6 +183,8 @@ export class AudioPlayer extends EventEmitter { this.ffmpeg.on("error", (err) => { this.logger.error({ err }, "FFmpeg error"); if (this.sessionId === playSessionId) { + this.spawnFailed = true; + this.consecutiveFailures++; this.emit("error", err); } }); @@ -210,7 +235,13 @@ export class AudioPlayer extends EventEmitter { this.frameLoopRunning = false; if (this.state !== "idle") { this.state = "idle"; - this.emit("trackEnd"); + // Don't emit trackEnd if ffmpeg spawn failed — prevents infinite retry cascade + if (this.spawnFailed) { + this.logger.warn("Suppressing trackEnd due to ffmpeg spawn failure"); + } else { + this.consecutiveFailures = 0; // Reset on successful track completion + this.emit("trackEnd"); + } } return; } @@ -303,12 +334,18 @@ export class AudioPlayer extends EventEmitter { } this.pcmBuffer = Buffer.alloc(0); this.ffmpegPaused = false; + this.spawnFailed = false; this.state = "idle"; this.currentUrl = ""; this.seekOffset = 0; this.framesPlayed = 0; } + /** Reset the consecutive failure counter (e.g. after user action) */ + resetFailures(): void { + this.consecutiveFailures = 0; + } + setVolume(vol: number): void { this.volume = Math.max(0, Math.min(100, vol)); } diff --git a/src/bot/instance.ts b/src/bot/instance.ts index 920c3e4..e1ce0e5 100644 --- a/src/bot/instance.ts +++ b/src/bot/instance.ts @@ -268,6 +268,8 @@ export class BotInstance extends EventEmitter { this.queue.add({ ...song, platform: provider.platform }); this.queue.play(); + // Reset failure counter on user-initiated play + this.player.resetFailures(); const ok = await this.resolveAndPlay(this.queue.current()!); if (!ok) return `Cannot play: ${song.name}`; return `Now playing: ${song.name} - ${song.artist}`; @@ -561,4 +563,8 @@ export class BotInstance extends EventEmitter { isConnected(): boolean { return this.connected; } + + getIdentityExport(): string | undefined { + return this.tsClient.getIdentityExport(); + } } diff --git a/src/bot/manager.ts b/src/bot/manager.ts index 02f43c3..aa36cc0 100644 --- a/src/bot/manager.ts +++ b/src/bot/manager.ts @@ -143,12 +143,25 @@ export class BotManager { const bot = this.bots.get(id); if (!bot) throw new Error(`Bot ${id} not found`); await bot.connect(); + + // Mark as autoStart so it reconnects on Docker restart, and persist identity + const saved = this.database.getBotInstances().find((i) => i.id === id); + if (saved) { + this.database.saveBotInstance({ ...saved, autoStart: true }); + this.persistBotIdentity(saved, bot); + } } stopBot(id: string): void { const bot = this.bots.get(id); if (!bot) throw new Error(`Bot ${id} not found`); bot.disconnect(); + + // Mark as not autoStart so it stays stopped on Docker restart + const saved = this.database.getBotInstances().find((i) => i.id === id); + if (saved) { + this.database.saveBotInstance({ ...saved, autoStart: false }); + } } async loadSavedBots(): Promise { @@ -163,6 +176,7 @@ export class BotManager { port: saved.serverPort, queryPort: proto === "ts6" ? 10080 : 10011, nickname: saved.nickname, + identity: saved.identity || undefined, defaultChannel: saved.defaultChannel || undefined, channelPassword: saved.channelPassword || undefined, serverProtocol: proto === "ts3" || proto === "ts6" ? proto : undefined, @@ -178,18 +192,30 @@ export class BotManager { this.bots.set(saved.id, bot); - // Auto-connect in background (non-blocking, won't affect other bots) - bot.connect().then(() => { + // Only auto-connect bots that have autoStart enabled + if (saved.autoStart) { + bot.connect().then(() => { + // Persist identity after successful connection for future restarts + this.persistBotIdentity(saved, bot); + this.logger.info( + { botId: saved.id, name: saved.name }, + "Auto-connected saved bot" + ); + }).catch((err) => { + this.logger.error( + { err, botId: saved.id, name: saved.name }, + "Failed to auto-connect bot (start manually from Settings)" + ); + }); + + // Stagger connections to avoid overwhelming the TS server + await new Promise((resolve) => setTimeout(resolve, 1000)); + } else { this.logger.info( { botId: saved.id, name: saved.name }, - "Auto-connected saved bot" + "Loaded bot (autoStart disabled, not connecting)" ); - }).catch((err) => { - this.logger.error( - { err, botId: saved.id, name: saved.name }, - "Failed to auto-connect bot (start manually from Settings)" - ); - }); + } } this.logger.info( @@ -198,6 +224,13 @@ export class BotManager { ); } + private persistBotIdentity(saved: import("../data/database.js").BotInstance, bot: BotInstance): void { + const identity = bot.getIdentityExport(); + if (identity && identity !== saved.identity) { + this.database.saveBotInstance({ ...saved, identity }); + } + } + shutdown(): void { for (const bot of this.bots.values()) { bot.disconnect(); diff --git a/src/data/database.ts b/src/data/database.ts index 5a3ad84..ca66970 100644 --- a/src/data/database.ts +++ b/src/data/database.ts @@ -28,6 +28,7 @@ export interface BotInstance { serverProtocol: string; /** API key for TS6 HTTP Query */ ts6ApiKey: string; + identity?: string; } export interface BotDatabase { @@ -40,6 +41,20 @@ export interface BotDatabase { close(): void; } +function migrateSchema(db: Database.Database): void { + const columns = db.prepare("PRAGMA table_info(bot_instances)").all() as Array<{ name: string }>; + const names = columns.map((c) => c.name); + if (!names.includes("identity")) { + db.exec("ALTER TABLE bot_instances ADD COLUMN identity TEXT"); + } + if (!names.includes("serverProtocol")) { + db.exec("ALTER TABLE bot_instances ADD COLUMN serverProtocol TEXT NOT NULL DEFAULT ''"); + } + if (!names.includes("ts6ApiKey")) { + db.exec("ALTER TABLE bot_instances ADD COLUMN ts6ApiKey TEXT NOT NULL DEFAULT ''"); + } +} + function initTables(db: Database.Database): void { db.exec(` CREATE TABLE IF NOT EXISTS play_history ( @@ -64,7 +79,8 @@ function initTables(db: Database.Database): void { channelPassword TEXT NOT NULL, autoStart INTEGER NOT NULL DEFAULT 0, serverProtocol TEXT NOT NULL DEFAULT '', - ts6ApiKey TEXT NOT NULL DEFAULT '' + ts6ApiKey TEXT NOT NULL DEFAULT '', + identity TEXT ); `); } @@ -73,6 +89,7 @@ export function createDatabase(dbPath: string): BotDatabase { const db = new Database(dbPath); db.pragma("journal_mode = WAL"); initTables(db); + migrateSchema(db); const insertHistory = db.prepare(` INSERT INTO play_history (botId, songId, songName, artist, album, platform, coverUrl) @@ -84,8 +101,8 @@ export function createDatabase(dbPath: string): BotDatabase { `); const upsertInstance = db.prepare(` - INSERT INTO bot_instances (id, name, serverAddress, serverPort, nickname, defaultChannel, channelPassword, autoStart, serverProtocol, ts6ApiKey) - VALUES (@id, @name, @serverAddress, @serverPort, @nickname, @defaultChannel, @channelPassword, @autoStart, @serverProtocol, @ts6ApiKey) + INSERT INTO bot_instances (id, name, serverAddress, serverPort, nickname, defaultChannel, channelPassword, autoStart, serverProtocol, ts6ApiKey, identity) + VALUES (@id, @name, @serverAddress, @serverPort, @nickname, @defaultChannel, @channelPassword, @autoStart, @serverProtocol, @ts6ApiKey, @identity) ON CONFLICT(id) DO UPDATE SET name = excluded.name, serverAddress = excluded.serverAddress, @@ -95,7 +112,8 @@ export function createDatabase(dbPath: string): BotDatabase { channelPassword = excluded.channelPassword, autoStart = excluded.autoStart, serverProtocol = excluded.serverProtocol, - ts6ApiKey = excluded.ts6ApiKey + ts6ApiKey = excluded.ts6ApiKey, + identity = excluded.identity `); const selectInstances = db.prepare(`SELECT * FROM bot_instances`); @@ -117,14 +135,21 @@ export function createDatabase(dbPath: string): BotDatabase { upsertInstance.run({ ...instance, autoStart: instance.autoStart ? 1 : 0, + identity: instance.identity ?? null, }); }, getBotInstances() { const rows = selectInstances.all() as Array< - Omit & { autoStart: number } + Omit & { autoStart: number; identity: string | null } >; - return rows.map((r) => ({ ...r, autoStart: r.autoStart === 1 })); + return rows.map((r) => ({ + ...r, + autoStart: r.autoStart === 1, + serverProtocol: r.serverProtocol ?? "", + ts6ApiKey: r.ts6ApiKey ?? "", + identity: r.identity ?? undefined, + })); }, deleteBotInstance(id) { diff --git a/src/ts-protocol/client.ts b/src/ts-protocol/client.ts index 0ac1303..b333e79 100644 --- a/src/ts-protocol/client.ts +++ b/src/ts-protocol/client.ts @@ -77,6 +77,18 @@ export class TS3Client extends EventEmitter { } async connect(): Promise { + // Clean up any existing connection before creating a new one + if (this.client) { + this.logger.info("Cleaning up previous connection before reconnecting"); + try { + await this.client.disconnect(); + } catch { + // Ignore errors during cleanup + } + this.client = null; + this.clientId = 0; + } + const addr = `${this.options.host}:${this.options.port}`; // Detect or use forced protocol diff --git a/src/web/api/player.ts b/src/web/api/player.ts index 305c133..bd82b61 100644 --- a/src/web/api/player.ts +++ b/src/web/api/player.ts @@ -154,6 +154,7 @@ export function createPlayerRouter( } const queue = bot.getQueueManager(); bot.getPlayer().stop(); // Stop current playback first + bot.getPlayer().resetFailures(); // Reset on user-initiated play const song = queue.playAt(index); if (!song) { res.status(400).json({ error: "Invalid queue index" }); @@ -200,6 +201,7 @@ export function createPlayerRouter( // Stop current playback bot.getPlayer().stop(); + bot.getPlayer().resetFailures(); const songs = await provider.getPlaylistSongs(playlistId); if (songs.length === 0) { @@ -256,6 +258,7 @@ export function createPlayerRouter( queue.add({ ...song, platform: provider.platform }); queue.play(); + bot.getPlayer().resetFailures(); const ok = await bot.resolveAndPlay(queue.current()!); if (!ok) { res.json({ message: `Cannot play: ${song.name}` });