@bililive-tools/manager 1.1.0 → 1.2.0

package/lib/FFMPEGRecorder.d.ts

@@ -24,6 +24,7 @@ export declare class FFMPEGRecorder extends EventEmitter {
         inputOptions?: string[];
         isHls?: boolean;
         disableDanma?: boolean;
+        videoFormat?: "auto" | "ts" | "mkv";
     }, onEnd: (...args: unknown[]) => void);
     private createCommand;
     formatLine(line: string): {

package/lib/FFMPEGRecorder.js

@@ -19,7 +19,7 @@ export class FFMPEGRecorder extends EventEmitter {
         this.onEnd = onEnd;
         const hasSegment = !!opts.segment;
         this.disableDanma = opts.disableDanma ?? false;
-        this.streamManager = new StreamManager(opts.getSavePath, hasSegment, this.disableDanma);
+        this.streamManager = new StreamManager(opts.getSavePath, hasSegment, this.disableDanma, opts.videoFormat);
         this.timeoutChecker = utils.createTimeoutChecker(() => this.onEnd("ffmpeg timeout"), 3 * 10e3);
         this.hasSegment = hasSegment;
         this.getSavePath = opts.getSavePath;

package/lib/recorder.d.ts

@@ -15,6 +15,7 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     streamPriorities: string[];
     sourcePriorities: string[];
     formatPriorities?: string[];
+    source?: string;
     segment?: number;
     saveGiftDanma?: boolean;
     saveSCDanma?: boolean;
@@ -38,6 +39,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     api?: "auto" | "web" | "mp";
     /** 标题关键词，如果直播间标题包含这些关键词，则不会自动录制（仅对斗鱼有效），多个关键词用英文逗号分隔 */
     titleKeywords?: string;
+    /** 用于指定录制文件格式，auto时，分段使用ts，不分段使用mp4 */
+    videoFormat?: "auto" | "ts" | "mkv";
     extra?: Partial<E>;
 }
 export type SerializedRecorder<E extends AnyObject> = PickRequired<RecorderCreateOpts<E>, "id">;

package/lib/streamManager.d.ts

@@ -12,18 +12,22 @@ export declare class Segment extends EventEmitter {
     /** 输出文件名名，不包含拓展名 */
     outputVideoFilePath: string;
     disableDanma: boolean;
-    constructor(getSavePath: GetSavePath, disableDanma: boolean);
+    videoExt: "ts" | "mkv" | "mp4";
+    constructor(getSavePath: GetSavePath, disableDanma: boolean, videoExt: "ts" | "mkv" | "mp4");
     handleSegmentEnd(): Promise<void>;
     onSegmentStart(stderrLine: string): Promise<void>;
+    get outputFilePath(): string;
 }
 export declare class StreamManager extends EventEmitter {
     private segment;
     private extraDataController;
     recordSavePath: string;
     recordStartTime?: number;
-    constructor(getSavePath: GetSavePath, hasSegment: boolean, disableDanma: boolean);
+    private videoFormat?;
+    constructor(getSavePath: GetSavePath, hasSegment: boolean, disableDanma: boolean, videoFormat?: "auto" | "ts" | "mkv");
     handleVideoStarted(stderrLine: string): Promise<void>;
     handleVideoCompleted(): Promise<void>;
     getExtraDataController(): import("./record_extra_data_controller.js").RecordExtraDataController | null;
+    get videoExt(): "ts" | "mkv" | "mp4";
     get videoFilePath(): string;
 }

package/lib/streamManager.js

@@ -11,10 +11,12 @@ export class Segment extends EventEmitter {
     /** 输出文件名名，不包含拓展名 */
     outputVideoFilePath;
     disableDanma;
-    constructor(getSavePath, disableDanma) {
+    videoExt;
+    constructor(getSavePath, disableDanma, videoExt) {
         super();
         this.getSavePath = getSavePath;
         this.disableDanma = disableDanma;
+        this.videoExt = videoExt;
     }
     async handleSegmentEnd() {
         if (!this.outputVideoFilePath) {
@@ -26,10 +28,10 @@ export class Segment extends EventEmitter {
         }
         try {
             await Promise.all([
-                fs.rename(this.rawRecordingVideoPath, `${this.outputVideoFilePath}.ts`),
+                fs.rename(this.rawRecordingVideoPath, this.outputFilePath),
                 this.extraDataController?.flush(),
             ]);
-            this.emit("videoFileCompleted", { filename: `${this.outputVideoFilePath}.ts` });
+            this.emit("videoFileCompleted", { filename: this.outputFilePath });
         }
         catch (err) {
             this.emit("DebugLog", {
@@ -56,24 +58,29 @@ export class Segment extends EventEmitter {
         if (match) {
             const filename = match[1];
             this.rawRecordingVideoPath = filename;
-            this.emit("videoFileCreated", { filename: `${this.outputVideoFilePath}.ts` });
+            this.emit("videoFileCreated", { filename: this.outputFilePath });
         }
         else {
             this.emit("DebugLog", { type: "ffmpeg", text: "No match found" });
         }
     }
+    get outputFilePath() {
+        return `${this.outputVideoFilePath}.${this.videoExt}`;
+    }
 }
 export class StreamManager extends EventEmitter {
     segment = null;
     extraDataController = null;
     recordSavePath;
     recordStartTime;
-    constructor(getSavePath, hasSegment, disableDanma) {
+    videoFormat;
+    constructor(getSavePath, hasSegment, disableDanma, videoFormat) {
         super();
         const recordSavePath = getSavePath({ startTime: Date.now() });
         this.recordSavePath = recordSavePath;
+        this.videoFormat = videoFormat;
         if (hasSegment) {
-            this.segment = new Segment(getSavePath, disableDanma);
+            this.segment = new Segment(getSavePath, disableDanma, this.videoExt);
             this.segment.on("DebugLog", (data) => {
                 this.emit("DebugLog", data);
             });
@@ -121,7 +128,20 @@ export class StreamManager extends EventEmitter {
     getExtraDataController() {
         return this.segment?.extraDataController || this.extraDataController;
     }
+    get videoExt() {
+        if (this.videoFormat === "mkv") {
+            return "mkv";
+        }
+        else if (this.videoFormat === "auto") {
+            if (!this.segment) {
+                return "mp4";
+            }
+        }
+        return "ts";
+    }
     get videoFilePath() {
-        return this.segment ? `${this.recordSavePath}-PART%03d.ts` : `${this.recordSavePath}.ts`;
+        return this.segment
+            ? `${this.recordSavePath}-PART%03d.${this.videoExt}`
+            : `${this.recordSavePath}.${this.videoExt}`;
     }
 }

package/package.json

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