@bililive-tools/bilibili-recorder 1.7.0 → 1.8.0

package/README.md

@@ -53,7 +53,8 @@ interface Options {
   m3u8ProxyUrl?: string; // 代理链接，文档待补充
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   onlyAudio?: boolean; // 只录制音频，默认为否
-  recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
+  recorderType?: "auto" | "ffmpeg" | "mesio" | "bililive"; // 底层录制器，使用mesio和bililive时videoFormat参数无效
+  debugLevel?: `verbose` | "basic"; // verbose参数时，录制器会输出更加详细的log
 }
 ```
 

package/lib/index.js

@@ -72,14 +72,10 @@ const ffmpegOutputOptions = [
     "10000000",
 ];
 const ffmpegInputOptions = [
-    "-reconnect",
-    "1",
-    "-reconnect_streamed",
-    "1",
-    "-reconnect_delay_max",
-    "10",
     "-rw_timeout",
-    "15000000",
+    "10000000",
+    "-timeout",
+    "10000000",
     "-headers",
     "Referer:https://live.bilibili.com/",
 ];
@@ -96,6 +92,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             cover: "",
             liveId: liveId,
         };
+        this.state = "idle";
     }
     catch (error) {
         this.state = "check-error";
@@ -113,12 +110,10 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         return null;
     // 检查标题是否包含关键词，如果包含则不自动录制
     // 手动开始录制时不检查标题关键词
-    if (!isManualStart &&
-        this.titleKeywords &&
-        typeof this.titleKeywords === "string" &&
-        this.titleKeywords.trim()) {
+    if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
         const hasTitleKeyword = hasKeyword(this.liveInfo.title, this.titleKeywords);
         if (hasTitleKeyword) {
+            this.state = "title-blocked";
             this.emit("DebugLog", {
                 type: "common",
                 text: `跳过录制：直播间标题 "${this.liveInfo.title}" 包含关键词 "${this.titleKeywords}"`,
@@ -130,7 +125,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     const { owner, title, roomId } = liveInfo;
     this.liveInfo = liveInfo;
     let res;
-    // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
         let strictQuality = false;
         if (this.qualityRetry > 0) {
@@ -206,17 +200,19 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         const reason = args[0] instanceof Error ? args[0].message : String(args[0]);
         this.recordHandle?.stop(reason);
     };
-    let recorderType = this.recorderType === "mesio" ? "mesio" : "ffmpeg";
-    const recorder = createBaseRecorder(recorderType, {
+    const recorder = createBaseRecorder(this.recorderType, {
         url: url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
-        mesioOptions: ["-H", "Referer:https://live.bilibili.com/"],
         segment: this.segment ?? 0,
         getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
         formatName: streamOptions.format_name,
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat,
+        debugLevel: this.debugLevel ?? "none",
+        headers: {
+            Referer: "https://live.bilibili.com/",
+        },
     }, onEnd, async () => {
         const info = await getInfo(this.channelId);
         return info;
@@ -232,8 +228,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         this.state = "idle";
         throw err;
     }
-    const handleVideoCreated = async ({ filename, title, cover }) => {
-        this.emit("videoFileCreated", { filename, cover });
+    const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
+        this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
             this.liveInfo.title = title;
         }
@@ -281,13 +277,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             extraDataController.addMessage(msg);
         });
         danmaClient.on("onRoomInfoChange", (msg) => {
-            if (!isManualStart &&
-                this.titleKeywords &&
-                typeof this.titleKeywords === "string" &&
-                this.titleKeywords.trim()) {
+            if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
                 const title = msg?.body?.title ?? "";
                 const hasTitleKeyword = hasKeyword(title, this.titleKeywords);
                 if (hasTitleKeyword) {
+                    this.state = "title-blocked";
                     this.emit("DebugLog", {
                         type: "common",
                         text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
@@ -338,6 +332,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         id: genRecordUUID(),
         stream: stream.name,
         source: stream.source,
+        recorderType: recorder.type,
         url: stream.url,
         ffmpegArgs,
         savePath: savePath,

package/lib/utils.d.ts

@@ -21,4 +21,4 @@ export declare function assertStringType(data: unknown, msg?: string): asserts d
 export declare function assertNumberType(data: unknown, msg?: string): asserts data is number;
 export declare function assertObjectType(data: unknown, msg?: string): asserts data is object;
 export declare function createInvalidStreamChecker(count?: number): (ffmpegLogLine: string) => boolean;
-export declare function hasKeyword(title: string, titleKeywords: string): boolean;
+export declare function hasKeyword(title: string, titleKeywords: string | undefined): boolean;

package/lib/utils.js

@@ -82,7 +82,7 @@ export function createInvalidStreamChecker(count = 10) {
     };
 }
 export function hasKeyword(title, titleKeywords) {
-    const keywords = titleKeywords
+    const keywords = (titleKeywords ?? "")
         .split(",")
         .map((k) => k.trim())
         .filter((k) => k);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -39,7 +39,7 @@
     "tiny-bilibili-ws": "^1.0.2",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "@bililive-tools/manager": "^1.6.1"
+    "@bililive-tools/manager": "^1.8.0"
   },
   "scripts": {
     "build": "tsc",