@bililive-tools/bilibili-recorder 1.15.0 → 1.16.1

package/lib/index.js

@@ -2,7 +2,6 @@ import path from "node:path";
 import mitt from "mitt";
 import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createDownloader, } from "@bililive-tools/manager";
 import { getInfo, getStream, getLiveStatus, getStrictStream } from "./stream.js";
-import { ensureFolderExist } from "./utils.js";
 import DanmaClient from "./danma.js";
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
@@ -185,6 +184,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             startTime: opts.startTime,
             liveStartTime: liveStartTime,
             recordStartTime,
+            extraMs: opts.extraMs,
         }),
         formatName: streamOptions.format_name,
         disableDanma: this.disableProvideCommentsWhenRecording,
@@ -197,20 +197,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         const info = await getInfo(this.channelId);
         return info;
     });
-    const savePath = getSavePath({
-        owner,
-        title,
-        startTime: Date.now(),
-        liveStartTime: liveStartTime,
-        recordStartTime,
-    });
-    try {
-        ensureFolderExist(savePath);
-    }
-    catch (err) {
-        this.state = "idle";
-        throw err;
-    }
     const handleVideoCreated = async ({ filename, title, cover, rawFilename }) => {
         this.emit("videoFileCreated", { filename, cover, rawFilename });
         if (title && this?.liveInfo) {
@@ -230,8 +216,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         });
     };
     downloader.on("videoFileCreated", handleVideoCreated);
-    downloader.on("videoFileCompleted", ({ filename }) => {
-        this.emit("videoFileCompleted", { filename });
+    downloader.on("videoFileCompleted", (data) => {
+        this.emit("videoFileCompleted", data);
     });
     downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
@@ -247,34 +233,47 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         uid: Number(this.uid),
         useServerTimestamp: this.useServerTimestamp,
     });
-    if (!this.disableProvideCommentsWhenRecording) {
-        danmaClient.on("Message", (msg) => {
-            const extraDataController = downloader.getExtraDataController();
-            if (!extraDataController)
-                return;
-            if (msg.type === "super_chat" && this.saveSCDanma === false)
-                return;
-            if ((msg.type === "give_gift" || msg.type === "guard") && this.saveGiftDanma === false)
-                return;
-            this.emit("Message", msg);
-            extraDataController.addMessage(msg);
-        });
-        danmaClient.on("onRoomInfoChange", (msg) => {
-            if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
-                const title = msg?.body?.title ?? "";
-                const hasTitleKeyword = utils.hasBlockedTitleKeywords(title, this.titleKeywords);
-                if (hasTitleKeyword) {
-                    this.state = "title-blocked";
-                    this.emit("DebugLog", {
-                        type: "common",
-                        text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
-                    });
-                    // 停止录制
-                    this.recordHandle && this.recordHandle.stop("直播间标题包含关键词");
-                }
+    // 开启了禁止提供弹幕功能，并且也没有设置标题关键词，才完全禁止连接弹幕服务器，否则都连接弹幕服务器，前者不处理弹幕消息，后者根据标题关键词来判断是否停止录制
+    const enableDanmaListen = !this.disableProvideCommentsWhenRecording ||
+        utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords);
+    danmaClient.on("Message", (msg) => {
+        if (this.disableProvideCommentsWhenRecording)
+            return;
+        const extraDataController = downloader.getExtraDataController();
+        if (!extraDataController)
+            return;
+        if (msg.type === "super_chat" && this.saveSCDanma === false)
+            return;
+        if ((msg.type === "give_gift" || msg.type === "guard") && this.saveGiftDanma === false)
+            return;
+        this.emit("Message", msg);
+        extraDataController.addMessage(msg);
+    });
+    danmaClient.on("onRoomInfoChange", (msg) => {
+        if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
+            const title = msg?.body?.title ?? "";
+            const hasTitleKeyword = utils.hasBlockedTitleKeywords(title, this.titleKeywords);
+            if (hasTitleKeyword) {
+                this.state = "title-blocked";
+                this.emit("DebugLog", {
+                    type: "common",
+                    text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
+                });
+                // 停止录制
+                this.recordHandle && this.recordHandle.stop("直播间标题包含关键词");
             }
-        });
-        danmaClient.start();
+        }
+    });
+    if (enableDanmaListen) {
+        try {
+            danmaClient.start();
+        }
+        catch (err) {
+            this.emit("DebugLog", {
+                type: "error",
+                text: `弹幕连接失败，错误信息: ${String(err)}`,
+            });
+        }
     }
     const downloaderArgs = downloader.getArguments();
     downloader.run();
@@ -313,7 +312,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         recorderType: downloader.type,
         url: stream.url,
         downloaderArgs,
-        savePath: savePath,
+        savePath: downloader.videoFilePath,
         stop,
         cut,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.15.0",
+  "version": "1.16.1",
   "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.15.0",
-    "@bililive-tools/manager": "^1.14.1"
+    "@bililive-tools/manager": "^1.16.2"
   },
   "scripts": {
     "build": "tsc",