@bililive-tools/manager 1.3.0 → 1.4.0

package/README.md

@@ -28,7 +28,7 @@ import { provider } from "@bililive-tools/bilibili-recorder";
 
 const manager = createRecorderManager({
   providers: [provider],
-  savePathRule: "D:\\录制\\{platforme}}/{owner}/{year}-{month}-{date} {hour}-{min}-{sec} {title}", // 保存路径，占位符见文档
+  savePathRule: "D:\\录制\\{platforme}}/{owner}/{year}-{month}-{date} {hour}-{min}-{sec} {title}", // 保存路径，占位符见文档，支持 [ejs](https://ejs.co/) 模板引擎
   autoCheckInterval: 1000 * 60, // 自动检查间隔，单位秒
   autoRemoveSystemReservedChars: true, // 移除系统非法字符串
   biliBatchQuery: false, // B站检查使用批量接口

package/lib/FFMPEGRecorder.js

@@ -52,7 +52,7 @@ export class FFMPEGRecorder extends EventEmitter {
     }
     createCommand() {
         this.timeoutChecker?.start();
-        const invalidCount = this.isHls ? 35 : 15;
+        const invalidCount = this.isHls ? 35 : 18;
         const isInvalidStream = createInvalidStreamChecker(invalidCount);
         const inputOptions = [
             ...this.inputOptions,
@@ -117,13 +117,18 @@ export class FFMPEGRecorder extends EventEmitter {
     async stop() {
         this.timeoutChecker.stop();
         try {
-            this.command.kill("SIGINT");
-            // @ts-ignore
-            // this.command.ffmpegProc?.stdin?.write("q");
+            // ts文件使用write("q")需要十来秒进行处理，直接中断，其他格式使用sigint会导致缺少数据
+            if (this.streamManager.videoFilePath.endsWith(".ts")) {
+                this.command.kill("SIGINT");
+            }
+            else {
+                // @ts-ignore
+                this.command.ffmpegProc?.stdin?.write("q");
+            }
             await this.streamManager.handleVideoCompleted();
         }
         catch (err) {
-            this.emit("DebugLog", { type: "common", text: String(err) });
+            this.emit("DebugLog", { type: "error", text: String(err) });
         }
     }
     getExtraDataController() {

package/lib/manager.js

@@ -1,5 +1,6 @@
 import path from "node:path";
 import mitt from "mitt";
+import ejs from "ejs";
 import { omit, range } from "lodash-es";
 import { parseArgsStringToArgv } from "string-argv";
 import { getBiliStatusInfoByRoomIds } from "./api.js";
@@ -271,9 +272,16 @@ export function genSavePathFromRule(manager, recorder, extData) {
     };
     if (manager.autoRemoveSystemReservedChars) {
         for (const key in params) {
-            params[key] = removeSystemReservedChars(String(params[key]));
+            params[key] = removeSystemReservedChars(String(params[key])).trim();
         }
     }
-    return formatTemplate(manager.savePathRule, params);
+    let savePathRule = manager.savePathRule;
+    try {
+        savePathRule = ejs.render(savePathRule, params);
+    }
+    catch (error) {
+        console.error("模板解析错误", error);
+    }
+    return formatTemplate(savePathRule, params);
 }
 export { StreamManager };

package/lib/record_extra_data_controller.js

@@ -14,6 +14,7 @@ export function createRecordExtraDataController(savePath) {
         },
         messages: [],
     };
+    let hasCompleted = false;
     const scheduleSave = asyncThrottle(() => save(), 30e3, {
         immediateRunWhenEndOfDefer: true,
     });
@@ -22,10 +23,14 @@ export function createRecordExtraDataController(savePath) {
     };
     // TODO: 将所有数据存放在内存中可能存在问题
     const addMessage = (comment) => {
+        if (hasCompleted)
+            return;
         data.messages.push(comment);
         scheduleSave();
     };
     const setMeta = (meta) => {
+        if (hasCompleted)
+            return;
         data.meta = {
             ...data.meta,
             ...meta,
@@ -33,13 +38,16 @@ export function createRecordExtraDataController(savePath) {
         scheduleSave();
     };
     const flush = async () => {
-        scheduleSave.flush();
+        if (hasCompleted)
+            return;
+        hasCompleted = true;
         scheduleSave.cancel();
         const xmlContent = convert2Xml(data);
         const parsedPath = path.parse(savePath);
         const xmlPath = path.join(parsedPath.dir, parsedPath.name + ".xml");
         await fs.promises.writeFile(xmlPath, xmlContent);
         await fs.promises.rm(savePath);
+        data.messages = [];
     };
     return {
         data,
@@ -76,6 +84,7 @@ export function convert2Xml(data) {
             "@@weight": String(0),
             "@@user": String(ele.sender?.name),
             "@@uid": String(ele?.sender?.uid),
+            "@@timestamp": String(ele.timestamp),
         };
         data["@@p"] = [
             data["@@progress"],
@@ -88,7 +97,7 @@ export function convert2Xml(data) {
             data["@@uid"],
             data["@@weight"],
         ].join(",");
-        return pick(data, ["@@p", "#text", "@@user", "@@uid"]);
+        return pick(data, ["@@p", "#text", "@@user", "@@uid", "@@timestamp"]);
     });
     const gifts = data.messages
         .filter((item) => item.type === "give_gift")
@@ -101,6 +110,7 @@ export function convert2Xml(data) {
             "@@price": String(ele.price * 1000),
             "@@user": String(ele.sender?.name),
             "@@uid": String(ele?.sender?.uid),
+            "@@timestamp": String(ele.timestamp),
             // "@@raw": JSON.stringify(ele),
         };
         return data;
@@ -115,6 +125,7 @@ export function convert2Xml(data) {
             "#text": String(ele.text),
             "@@user": String(ele.sender?.name),
             "@@uid": String(ele?.sender?.uid),
+            "@@timestamp": String(ele.timestamp),
             // "@@raw": JSON.stringify(ele),
         };
         return data;
@@ -131,6 +142,7 @@ export function convert2Xml(data) {
             "@@level": String(ele.level),
             "@@user": String(ele.sender?.name),
             "@@uid": String(ele?.sender?.uid),
+            "@@timestamp": String(ele.timestamp),
             // "@@raw": JSON.stringify(ele),
         };
         return data;

package/lib/recorder.d.ts

@@ -27,6 +27,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     uid?: number;
     /** 画质匹配重试次数 */
     qualityRetry?: number;
+    /** 抖音是否使用双屏直播流，开启后如果是双屏直播，那么就使用拼接的流，默认为true */
+    doubleScreen?: boolean;
     /** B站是否使用m3u8代理 */
     useM3U8Proxy?: boolean;
     /**B站m3u8代理url */
@@ -43,6 +45,10 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     videoFormat?: "auto" | "ts" | "mkv";
     /** 流格式优先级 */
     formatriorities?: Array<"flv" | "hls">;
+    /** 只录制音频 */
+    onlyAudio?: boolean;
+    /** 控制弹幕是否使用服务端时间戳 */
+    useServerTimestamp?: boolean;
     extra?: Partial<E>;
 }
 export type SerializedRecorder<E extends AnyObject> = PickRequired<RecorderCreateOpts<E>, "id">;
@@ -62,7 +68,7 @@ export interface RecordHandle {
     cut: (this: RecordHandle) => Promise<void>;
 }
 export interface DebugLog {
-    type: string | "common" | "ffmpeg";
+    type: string | "common" | "ffmpeg" | "error";
     text: string;
 }
 export type GetSavePath = (data: {

package/lib/streamManager.js

@@ -21,21 +21,21 @@ export class Segment extends EventEmitter {
     async handleSegmentEnd() {
         if (!this.outputVideoFilePath) {
             this.emit("DebugLog", {
-                type: "common",
+                type: "error",
                 text: "Should call onSegmentStart first",
             });
             return;
         }
         try {
             await Promise.all([
-                retry(() => fs.rename(this.rawRecordingVideoPath, this.outputFilePath)),
+                retry(() => fs.rename(this.rawRecordingVideoPath, this.outputFilePath), 10, 2000),
                 this.extraDataController?.flush(),
             ]);
             this.emit("videoFileCompleted", { filename: this.outputFilePath });
         }
         catch (err) {
             this.emit("DebugLog", {
-                type: "common",
+                type: "error",
                 text: "videoFileCompleted error " + String(err),
             });
         }
@@ -53,7 +53,7 @@ export class Segment extends EventEmitter {
             }
             catch (err) {
                 this.emit("DebugLog", {
-                    type: "common",
+                    type: "error",
                     text: "onUpdateLiveInfo error " + String(err),
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",
@@ -39,7 +39,8 @@
     "string-argv": "^0.3.2",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "fs-extra": "^11.2.0"
+    "fs-extra": "^11.2.0",
+    "ejs": "^3.1.10"
   },
   "scripts": {
     "build": "pnpm run test && tsc",