@bililive-tools/manager 1.10.0 → 1.11.0

package/lib/downloader/BililiveDownloader.d.ts

@@ -12,7 +12,8 @@ declare class BililiveRecorderCommand extends EventEmitter {
     inputOptions(...options: string[]): BililiveRecorderCommand;
     _getArguments(): string[];
     run(): void;
-    kill(signal?: NodeJS.Signals): void;
+    kill(): void;
+    cut(): void;
 }
 export declare const createBililiveBuilder: () => BililiveRecorderCommand;
 export declare class BililiveDownloader extends EventEmitter implements IDownloader {
@@ -28,6 +29,7 @@ export declare class BililiveDownloader extends EventEmitter implements IDownloa
     }) => string;
     readonly segment: Segment;
     readonly inputOptions: string[];
+    readonly disableDanma: boolean;
     readonly url: string;
     readonly debugLevel: "none" | "basic" | "verbose";
     readonly headers: {
@@ -46,5 +48,6 @@ export declare class BililiveDownloader extends EventEmitter implements IDownloa
     stop(): Promise<void>;
     getExtraDataController(): import("../xml_stream_controller.js").XmlStreamController | null;
     get videoFilePath(): string;
+    cut(): void;
 }
 export {};

package/lib/downloader/BililiveDownloader.js

@@ -1,5 +1,6 @@
 import EventEmitter from "node:events";
 import { spawn } from "node:child_process";
+import { DEFAULT_USER_AGENT } from "./index.js";
 import { StreamManager, getBililivePath } from "../index.js";
 import { byte2MB } from "../utils.js";
 // Bililive command builder class similar to ffmpeg
@@ -64,7 +65,6 @@ class BililiveRecorderCommand extends EventEmitter {
         this.process.on("error", (error) => {
             this.emit("error", error);
         });
-        [];
         this.process.on("close", (code) => {
             if (code === 0) {
                 this.emit("end");
@@ -74,9 +74,15 @@ class BililiveRecorderCommand extends EventEmitter {
             }
         });
     }
-    kill(signal = "SIGTERM") {
+    kill() {
         if (this.process) {
-            this.process.kill(signal);
+            this.process.stdin?.write("q\n");
+            // this.process.kill("SIGTERM");
+        }
+    }
+    cut() {
+        if (this.process) {
+            this.process.stdin?.write("s\n");
         }
     }
 }
@@ -94,6 +100,7 @@ export class BililiveDownloader extends EventEmitter {
     getSavePath;
     segment;
     inputOptions = [];
+    disableDanma = false;
     url;
     debugLevel = "none";
     headers;
@@ -104,16 +111,20 @@ export class BililiveDownloader extends EventEmitter {
         // 存在自动分段，永远为true
         const hasSegment = true;
         this.hasSegment = hasSegment;
+        this.disableDanma = opts.disableDanma ?? false;
         this.debugLevel = opts.debugLevel ?? "none";
         let videoFormat = "flv";
-        this.streamManager = new StreamManager(opts.getSavePath, hasSegment, "bililive", videoFormat, {
+        this.streamManager = new StreamManager(opts.getSavePath, hasSegment, this.disableDanma, "bililive", videoFormat, {
             onUpdateLiveInfo: this.onUpdateLiveInfo,
         });
         this.getSavePath = opts.getSavePath;
         this.inputOptions = [];
         this.url = opts.url;
         this.segment = opts.segment;
-        this.headers = opts.headers;
+        this.headers = {
+            "User-Agent": DEFAULT_USER_AGENT,
+            ...(opts.headers || {}),
+        };
         this.command = this.createCommand();
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
@@ -126,11 +137,7 @@ export class BililiveDownloader extends EventEmitter {
         });
     }
     createCommand() {
-        const inputOptions = [
-            ...this.inputOptions,
-            "-h",
-            "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36",
-        ];
+        const inputOptions = [...this.inputOptions, "--disable-log-file", "true"];
         if (this.debugLevel === "verbose") {
             inputOptions.push("-l", "Debug");
         }
@@ -187,7 +194,7 @@ export class BililiveDownloader extends EventEmitter {
     async stop() {
         try {
             // 直接发送SIGINT信号，会导致数据丢失
-            this.command.kill("SIGINT");
+            this.command.kill();
             await this.streamManager.handleVideoCompleted();
         }
         catch (err) {
@@ -200,4 +207,7 @@ export class BililiveDownloader extends EventEmitter {
     get videoFilePath() {
         return this.streamManager.videoFilePath;
     }
+    cut() {
+        this.command.cut();
+    }
 }

package/lib/downloader/FFmpegDownloader.d.ts

@@ -18,6 +18,7 @@ export declare class FFmpegDownloader extends EventEmitter implements IDownloade
     ffmpegOutputOptions: string[];
     readonly inputOptions: string[];
     readonly isHls: boolean;
+    readonly disableDanma: boolean;
     readonly url: string;
     formatName: FormatName;
     videoFormat: VideoFormat;
@@ -39,4 +40,5 @@ export declare class FFmpegDownloader extends EventEmitter implements IDownloade
     stop(): Promise<void>;
     getExtraDataController(): import("../xml_stream_controller.js").XmlStreamController | null;
     get videoFilePath(): string;
+    cut(): void;
 }

package/lib/downloader/FFmpegDownloader.js

@@ -1,6 +1,7 @@
 import EventEmitter from "node:events";
 import { createFFMPEGBuilder, StreamManager, utils } from "../index.js";
 import { createInvalidStreamChecker, assert } from "../utils.js";
+import { DEFAULT_USER_AGENT } from "./index.js";
 export class FFmpegDownloader extends EventEmitter {
     onEnd;
     onUpdateLiveInfo;
@@ -14,6 +15,7 @@ export class FFmpegDownloader extends EventEmitter {
     ffmpegOutputOptions = [];
     inputOptions = [];
     isHls;
+    disableDanma = false;
     url;
     formatName;
     videoFormat;
@@ -50,7 +52,8 @@ export class FFmpegDownloader extends EventEmitter {
             }
         }
         this.videoFormat = videoFormat;
-        this.streamManager = new StreamManager(opts.getSavePath, this.hasSegment, "ffmpeg", this.videoFormat, {
+        this.disableDanma = opts.disableDanma ?? false;
+        this.streamManager = new StreamManager(opts.getSavePath, this.hasSegment, this.disableDanma, "ffmpeg", this.videoFormat, {
             onUpdateLiveInfo: this.onUpdateLiveInfo,
         });
         this.timeoutChecker = utils.createTimeoutChecker(() => this.onEnd("ffmpeg timeout"), 3 * 10e3, false);
@@ -78,7 +81,7 @@ export class FFmpegDownloader extends EventEmitter {
         const inputOptions = [
             ...this.inputOptions,
             "-user_agent",
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36",
+            this.headers?.["User-Agent"] ?? DEFAULT_USER_AGENT,
         ];
         if (this.isHls) {
             inputOptions.push(...["-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_delay_max", "3"]);
@@ -89,8 +92,8 @@ export class FFmpegDownloader extends EventEmitter {
         if (this.headers) {
             const headers = [];
             Object.entries(this.headers).forEach(([key, value]) => {
-                if (!value)
-                    return;
+                if (!value || key === "User-Agent")
+                    return; // User-Agent单独处理
                 headers.push(`${key}:${value}`);
             });
             if (headers.length) {
@@ -186,4 +189,7 @@ export class FFmpegDownloader extends EventEmitter {
     get videoFilePath() {
         return this.streamManager.videoFilePath;
     }
+    cut() {
+        throw new Error("FFmpeg downloader does not support cut operation.");
+    }
 }

package/lib/downloader/IDownloader.d.ts

@@ -14,6 +14,7 @@ export interface BaseRecorderOptions {
     }) => string;
     segment: Segment;
     inputOptions?: string[];
+    disableDanma?: boolean;
     formatName: FormatName;
     debugLevel?: "none" | "basic" | "verbose";
     headers?: {
@@ -29,6 +30,7 @@ export interface IDownloader extends EventEmitter {
     readonly hasSegment: boolean;
     readonly segment: Segment;
     readonly inputOptions: string[];
+    readonly disableDanma: boolean;
     readonly url: string;
     readonly headers: {
         [key: string]: string | undefined;
@@ -39,6 +41,7 @@ export interface IDownloader extends EventEmitter {
     }) => string;
     run(): void;
     stop(): Promise<void>;
+    cut(): void;
     getArguments(): string[];
     getExtraDataController(): XmlStreamController | null;
     createCommand(): any;

package/lib/downloader/index.d.ts

@@ -19,6 +19,7 @@ export type RecorderOptions<T extends DownloaderType> = T extends "ffmpeg" ? FFM
  */
 export type RecorderInstance<T extends DownloaderType> = T extends "ffmpeg" ? FFmpegDownloader : T extends "mesio" ? mesioDownloader : BililiveDownloader;
 type RecorderOpts = FFMPEGRecorderOptions | MesioRecorderOptions | BililiveRecorderOptions;
+export declare const DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36";
 /**
  * 创建录制器的工厂函数
  */

package/lib/downloader/index.js

@@ -5,6 +5,7 @@ import { parseSizeToBytes } from "../utils.js";
 export { FFmpegDownloader } from "./FFmpegDownloader.js";
 export { mesioDownloader } from "./mesioDownloader.js";
 export { BililiveDownloader } from "./BililiveDownloader.js";
+export const DEFAULT_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36";
 /**
  * 创建录制器的工厂函数
  */

package/lib/downloader/mesioDownloader.d.ts

@@ -12,7 +12,7 @@ declare class MesioCommand extends EventEmitter {
     inputOptions(...options: string[]): MesioCommand;
     _getArguments(): string[];
     run(): void;
-    kill(signal?: NodeJS.Signals): void;
+    kill(): void;
 }
 export declare const createMesioBuilder: () => MesioCommand;
 export declare class mesioDownloader extends EventEmitter implements IDownloader {
@@ -28,6 +28,7 @@ export declare class mesioDownloader extends EventEmitter implements IDownloader
     }) => string;
     readonly segment: Segment;
     readonly inputOptions: string[];
+    readonly disableDanma: boolean;
     readonly url: string;
     readonly debugLevel: "none" | "basic" | "verbose";
     readonly headers: {
@@ -43,5 +44,6 @@ export declare class mesioDownloader extends EventEmitter implements IDownloader
     stop(): Promise<void>;
     getExtraDataController(): import("../xml_stream_controller.js").XmlStreamController | null;
     get videoFilePath(): string;
+    cut(): void;
 }
 export {};

package/lib/downloader/mesioDownloader.js

@@ -1,8 +1,8 @@
 import path from "node:path";
 import EventEmitter from "node:events";
 import { spawn } from "node:child_process";
+import { DEFAULT_USER_AGENT } from "./index.js";
 import { StreamManager, getMesioPath } from "../index.js";
-// Mesio command builder class similar to ffmpeg
 class MesioCommand extends EventEmitter {
     _input = "";
     _output = "";
@@ -74,9 +74,10 @@ class MesioCommand extends EventEmitter {
             }
         });
     }
-    kill(signal = "SIGTERM") {
+    kill() {
         if (this.process) {
-            this.process.kill(signal);
+            this.process.stdin?.write("q");
+            this.process.stdin?.end();
         }
     }
 }
@@ -94,6 +95,7 @@ export class mesioDownloader extends EventEmitter {
     getSavePath;
     segment;
     inputOptions = [];
+    disableDanma = false;
     url;
     debugLevel = "none";
     headers;
@@ -104,6 +106,7 @@ export class mesioDownloader extends EventEmitter {
         // 存在自动分段，永远为true
         const hasSegment = true;
         this.hasSegment = hasSegment;
+        this.disableDanma = opts.disableDanma ?? false;
         this.debugLevel = opts.debugLevel ?? "none";
         let videoFormat = "flv";
         if (opts.url.includes(".m3u8")) {
@@ -118,14 +121,17 @@ export class mesioDownloader extends EventEmitter {
         else if (opts.formatName === "flv") {
             videoFormat = "flv";
         }
-        this.streamManager = new StreamManager(opts.getSavePath, hasSegment, "mesio", videoFormat, {
+        this.streamManager = new StreamManager(opts.getSavePath, hasSegment, this.disableDanma, "mesio", videoFormat, {
             onUpdateLiveInfo: this.onUpdateLiveInfo,
         });
         this.getSavePath = opts.getSavePath;
         this.inputOptions = [];
         this.url = opts.url;
         this.segment = opts.segment;
-        this.headers = opts.headers;
+        this.headers = {
+            "User-Agent": DEFAULT_USER_AGENT,
+            ...(opts.headers || {}),
+        };
         this.command = this.createCommand();
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
@@ -138,13 +144,7 @@ export class mesioDownloader extends EventEmitter {
         });
     }
     createCommand() {
-        const inputOptions = [
-            ...this.inputOptions,
-            "--fix",
-            "-H",
-            "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36",
-            "--no-proxy",
-        ];
+        const inputOptions = [...this.inputOptions, "--fix", "--no-proxy"];
         if (this.debugLevel === "verbose") {
             inputOptions.push("-v");
         }
@@ -183,8 +183,8 @@ export class mesioDownloader extends EventEmitter {
     }
     async stop() {
         try {
-            // 直接发送SIGINT信号，会导致数据丢失
-            this.command.kill("SIGINT");
+            this.command.kill();
+            await new Promise((resolve) => setTimeout(resolve, 2000));
             await this.streamManager.handleVideoCompleted();
         }
         catch (err) {
@@ -197,4 +197,7 @@ export class mesioDownloader extends EventEmitter {
     get videoFilePath() {
         return this.streamManager.videoFilePath;
     }
+    cut() {
+        throw new Error("Mesio downloader does not support cut operation.");
+    }
 }

package/lib/downloader/streamManager.d.ts

@@ -15,8 +15,9 @@ export declare class Segment extends EventEmitter {
     rawRecordingVideoPath: string;
     /** 输出文件名名，不包含拓展名 */
     outputVideoFilePath: string;
+    disableDanma: boolean;
     videoExt: TrueVideoFormat;
-    constructor(getSavePath: GetSavePath, videoExt: TrueVideoFormat);
+    constructor(getSavePath: GetSavePath, disableDanma: boolean, videoExt: TrueVideoFormat);
     handleSegmentEnd(): Promise<void>;
     onSegmentStart(stderrLine: string, callBack?: {
         onUpdateLiveInfo: () => Promise<{
@@ -35,7 +36,7 @@ export declare class StreamManager extends EventEmitter {
     recorderType: RecorderType;
     private videoFormat;
     private callBack?;
-    constructor(getSavePath: GetSavePath, hasSegment: boolean, recorderType: RecorderType, videoFormat: TrueVideoFormat, callBack?: {
+    constructor(getSavePath: GetSavePath, hasSegment: boolean, disableDanma: boolean, recorderType: RecorderType, videoFormat: TrueVideoFormat, callBack?: {
         onUpdateLiveInfo: () => Promise<{
             title?: string;
             cover?: string;

package/lib/downloader/streamManager.js

@@ -1,7 +1,7 @@
 import EventEmitter from "node:events";
 import fs from "fs/promises";
 import { createRecordExtraDataController } from "../xml_stream_controller.js";
-import { replaceExtName, ensureFolderExist, isFfmpegStartSegment, isMesioStartSegment, isBililiveStartSegment, isFfmpegStart, retry, cleanTerminalText, } from "../utils.js";
+import { ensureFolderExist, isFfmpegStartSegment, isMesioStartSegment, isBililiveStartSegment, isFfmpegStart, retry, cleanTerminalText, } from "../utils.js";
 export class Segment extends EventEmitter {
     extraDataController = null;
     init = true;
@@ -10,10 +10,12 @@ export class Segment extends EventEmitter {
     rawRecordingVideoPath;
     /** 输出文件名名，不包含拓展名 */
     outputVideoFilePath;
+    disableDanma;
     videoExt;
-    constructor(getSavePath, videoExt) {
+    constructor(getSavePath, disableDanma, videoExt) {
         super();
         this.getSavePath = getSavePath;
+        this.disableDanma = disableDanma;
         this.videoExt = videoExt;
     }
     async handleSegmentEnd() {
@@ -67,7 +69,9 @@ export class Segment extends EventEmitter {
             title: liveInfo?.title,
         });
         ensureFolderExist(this.outputVideoFilePath);
-        this.extraDataController = createRecordExtraDataController(`${this.outputVideoFilePath}.xml`);
+        if (!this.disableDanma) {
+            this.extraDataController = createRecordExtraDataController(`${this.outputVideoFilePath}.xml`);
+        }
         // 支持两种格式的正则表达式
         // 1. FFmpeg格式: Opening 'filename' for writing
         // 2. Mesio格式: Opening FLV segment path=filename Processing
@@ -106,7 +110,7 @@ export class StreamManager extends EventEmitter {
     recorderType;
     videoFormat;
     callBack;
-    constructor(getSavePath, hasSegment, recorderType, videoFormat, callBack) {
+    constructor(getSavePath, hasSegment, disableDanma, recorderType, videoFormat, callBack) {
         super();
         const recordSavePath = getSavePath({ startTime: Date.now() });
         this.recordSavePath = recordSavePath;
@@ -115,7 +119,7 @@ export class StreamManager extends EventEmitter {
         this.hasSegment = hasSegment;
         this.callBack = callBack;
         if (hasSegment) {
-            this.segment = new Segment(getSavePath, this.videoExt);
+            this.segment = new Segment(getSavePath, disableDanma, this.videoExt);
             this.segment.on("DebugLog", (data) => {
                 this.emit("DebugLog", data);
             });
@@ -127,8 +131,10 @@ export class StreamManager extends EventEmitter {
             });
         }
         else {
-            const extraDataSavePath = replaceExtName(recordSavePath, ".xml");
-            this.extraDataController = createRecordExtraDataController(extraDataSavePath);
+            const extraDataSavePath = `${recordSavePath}.xml`;
+            if (!disableDanma) {
+                this.extraDataController = createRecordExtraDataController(extraDataSavePath);
+            }
         }
     }
     async handleVideoStarted(stderrLine) {

package/lib/manager.d.ts

@@ -77,6 +77,7 @@ export interface RecorderManager<ME extends UnknownObject, P extends RecorderPro
     recorders: Recorder<E>[];
     addRecorder: (this: RecorderManager<ME, P, PE, E>, opts: RecorderCreateOpts<E>) => Recorder<E>;
     removeRecorder: (this: RecorderManager<ME, P, PE, E>, recorder: Recorder<E>) => void;
+    getRecorder: (this: RecorderManager<ME, P, PE, E>, id: string) => Recorder<E> | null;
     startRecord: (this: RecorderManager<ME, P, PE, E>, id: string) => Promise<Recorder<E> | undefined>;
     stopRecord: (this: RecorderManager<ME, P, PE, E>, id: string) => Promise<Recorder<E> | undefined>;
     cutRecord: (this: RecorderManager<ME, P, PE, E>, id: string) => Promise<Recorder<E> | undefined>;

package/lib/manager.js

@@ -194,6 +194,10 @@ export function createRecorderManager(opts) {
             delete tempBanObj[recorder.channelId];
             this.emit("RecorderRemoved", recorder.toJSON());
         },
+        getRecorder(id) {
+            const recorder = this.recorders.find((item) => item.id === id);
+            return recorder ?? null;
+        },
         async startRecord(id) {
             const recorder = this.recorders.find((item) => item.id === id);
             if (recorder == null)

package/lib/recorder.d.ts

@@ -40,8 +40,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     formatName?: FormatName;
     /** 流编码 */
     codecName?: CodecName;
-    /** 选择使用的api，虎牙支持: auto,web,mp，抖音支持：web,webHTML,mobile,userHTML */
-    api?: "auto" | "web" | "mp" | "webHTML" | "mobile" | "userHTML";
+    /** 选择使用的api，虎牙支持: auto,web,mp,wup，抖音支持：web,webHTML,mobile,userHTML */
+    api?: "auto" | "web" | "mp" | "wup" | "webHTML" | "mobile" | "userHTML" | "balance" | "random" | string;
     /** 标题关键词，如果直播间标题包含这些关键词，则不会自动录制（仅对斗鱼有效），多个关键词用英文逗号分隔 */
     titleKeywords?: string;
     /** 用于指定录制文件格式，auto时，分段使用ts，不分段使用mp4 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",