@bililive-tools/bilibili-recorder 1.1.0 → 1.3.0

package/README.md

@@ -50,6 +50,7 @@ interface Options {
   codecName?: CodecName; // 见 CodecName 参数
   useM3U8Proxy?: boolean; // 是否使用m3u8代理，由于hls及fmp4存在一个小时超时时间，需自行实现代理避免
   m3u8ProxyUrl?: string; // 代理链接，文档待补充
+  videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
 }
 ```
 

package/lib/bilibili_api.d.ts

@@ -1,4 +1,4 @@
-type LiveStatus = 0 | 1 | 2;
+export type LiveStatus = 0 | 1 | 2;
 export declare function getRoomInit(roomIdOrShortId: number): Promise<{
     room_id: number;
     short_id: number;
@@ -110,4 +110,3 @@ export interface SourceProfile {
     extra: string;
     stream_ttl: number;
 }
-export {};

package/lib/danma.js

@@ -5,7 +5,7 @@ class DanmaClient extends EventEmitter {
     roomId;
     auth;
     uid;
-    retryCount = 5;
+    retryCount = 10;
     constructor(roomId, auth, uid) {
         super();
         this.roomId = roomId;
@@ -21,7 +21,7 @@ class DanmaClient extends EventEmitter {
                     return;
                 const comment = {
                     type: "comment",
-                    timestamp: msg.timestamp,
+                    timestamp: msg.body.timestamp,
                     text: content,
                     color: msg.body.content_color,
                     mode: msg.body.type,
@@ -41,7 +41,7 @@ class DanmaClient extends EventEmitter {
                 const content = msg.body.content.replaceAll(/[\r\n]/g, "");
                 const comment = {
                     type: "super_chat",
-                    timestamp: msg.timestamp,
+                    timestamp: msg.raw.send_time,
                     text: content,
                     price: msg.body.price,
                     sender: {
@@ -79,7 +79,7 @@ class DanmaClient extends EventEmitter {
             onGift: (msg) => {
                 const gift = {
                     type: "give_gift",
-                    timestamp: msg.timestamp,
+                    timestamp: msg.raw.send_time,
                     name: msg.body.gift_name,
                     count: msg.body.amount,
                     price: msg.body.coin_type === "silver" ? 0 : msg.body.price / 1000,
@@ -98,6 +98,9 @@ class DanmaClient extends EventEmitter {
                 };
                 this.emit("Message", gift);
             },
+            onRoomInfoChange: (msg) => {
+                this.emit("RoomInfoChange", msg);
+            },
         };
         this.client = startListen(this.roomId, handler, {
             ws: {
@@ -112,7 +115,7 @@ class DanmaClient extends EventEmitter {
             if (this.retryCount > 0) {
                 setTimeout(() => {
                     this.client && this.client.reconnect();
-                }, 2000 * (5 - this.retryCount));
+                }, 2000);
             }
             this.emit("error", err);
         });

package/lib/index.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import mitt from "mitt";
 import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, FFMPEGRecorder, } from "@bililive-tools/manager";
 import { getInfo, getStream, getLiveStatus, getStrictStream } from "./stream.js";
-import { ensureFolderExist } from "./utils.js";
+import { ensureFolderExist, hasKeyword } from "./utils.js";
 import DanmaClient from "./danma.js";
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
@@ -67,7 +67,7 @@ const ffmpegOutputOptions = [
     "-movflags",
     "faststart+frag_keyframe+empty_moov",
     "-min_frag_duration",
-    "60000000",
+    "10000000",
 ];
 const ffmpegInputOptions = [
     "-reconnect",
@@ -93,7 +93,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         cover: "",
         liveId: liveId,
     };
-    this.emit("LiveStart", { liveId });
     if (liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -104,6 +103,21 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         return null;
     if (!living)
         return null;
+    // 检查标题是否包含关键词，如果包含则不自动录制
+    // 手动开始录制时不检查标题关键词
+    if (!isManualStart &&
+        this.titleKeywords &&
+        typeof this.titleKeywords === "string" &&
+        this.titleKeywords.trim()) {
+        const hasTitleKeyword = hasKeyword(_title, this.titleKeywords);
+        if (hasTitleKeyword) {
+            this.emit("DebugLog", {
+                type: "common",
+                text: `跳过录制：直播间标题 "${_title}" 包含关键词 "${this.titleKeywords}"`,
+            });
+            return null;
+        }
+    }
     const liveInfo = await getInfo(this.channelId);
     const { owner, title, roomId } = liveInfo;
     this.liveInfo = liveInfo;
@@ -165,8 +179,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             });
         }, 50 * 60 * 1000);
     }
+    let isCutting = false;
     let isEnded = false;
     const onEnd = (...args) => {
+        if (isCutting) {
+            isCutting = false;
+            return;
+        }
         if (isEnded)
             return;
         isEnded = true;
@@ -182,10 +201,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
         segment: this.segment ?? 0,
-        getSavePath: (opts) => getSavePath({ owner, title, startTime: opts.startTime }),
+        getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
         isHls: streamOptions.protocol_name === "http_hls",
         disableDanma: this.disableProvideCommentsWhenRecording,
-    }, onEnd);
+        videoFormat: this.videoFormat,
+    }, onEnd, async () => {
+        const info = await getInfo(this.channelId);
+        return info;
+    });
     const savePath = getSavePath({
         owner,
         title,
@@ -197,8 +220,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         this.state = "idle";
         throw err;
     }
-    const handleVideoCreated = async ({ filename }) => {
-        this.emit("videoFileCreated", { filename });
+    const handleVideoCreated = async ({ filename, title, cover }) => {
+        this.emit("videoFileCreated", { filename, cover });
+        if (title && this?.liveInfo) {
+            this.liveInfo.title = title;
+        }
+        if (cover && this?.liveInfo) {
+            this.liveInfo.cover = cover;
+        }
         const extraDataController = recorder.getExtraDataController();
         extraDataController?.setMeta({
             room_id: String(roomId),
@@ -224,7 +253,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     });
     let danmaClient = new DanmaClient(roomId, this.auth, this.uid);
     if (!this.disableProvideCommentsWhenRecording) {
-        danmaClient = danmaClient.on("Message", (msg) => {
+        danmaClient.on("Message", (msg) => {
             const extraDataController = recorder.getExtraDataController();
             if (!extraDataController)
                 return;
@@ -235,10 +264,37 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             this.emit("Message", msg);
             extraDataController.addMessage(msg);
         });
+        danmaClient.on("onRoomInfoChange", (msg) => {
+            if (!isManualStart &&
+                this.titleKeywords &&
+                typeof this.titleKeywords === "string" &&
+                this.titleKeywords.trim()) {
+                const title = msg?.body?.title ?? "";
+                const hasTitleKeyword = hasKeyword(title, this.titleKeywords);
+                if (hasTitleKeyword) {
+                    this.emit("DebugLog", {
+                        type: "common",
+                        text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
+                    });
+                    // 停止录制
+                    this.recordHandle && this.recordHandle.stop("直播间标题包含关键词");
+                }
+            }
+        });
         danmaClient.start();
     }
     const ffmpegArgs = recorder.getArguments();
     recorder.run();
+    const cut = utils.singleton(async () => {
+        if (!this.recordHandle)
+            return;
+        if (isCutting)
+            return;
+        isCutting = true;
+        await recorder.stop();
+        recorder.createCommand();
+        recorder.run();
+    });
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
             return;
@@ -270,6 +326,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         ffmpegArgs,
         savePath: savePath,
         stop,
+        cut,
     };
     this.emit("RecordStart", this.recordHandle);
     return this.recordHandle;

package/lib/stream.js

@@ -155,10 +155,17 @@ async function getLiveInfo(roomIdOrShortId, opts) {
     let streamInfo;
     let streamOptions;
     for (const condition of conditons) {
-        streamInfo = res.playurl_info.playurl.stream
+        const streamList = res.playurl_info.playurl.stream
             .find(({ protocol_name }) => protocol_name === condition.protocol_name)
             ?.format.find(({ format_name }) => format_name === condition.format_name)
-            ?.codec.find(({ codec_name }) => codec_name === condition.codec_name);
+            ?.codec.filter(({ codec_name }) => codec_name === condition.codec_name);
+        if (streamList && streamList.length > 1) {
+            // 由于录播姬直推hevc时，指定qn，服务端仍会返回其他画质的流，这里需要指定找一下流
+            streamInfo = streamList.find((item) => item.current_qn === opts.qn);
+        }
+        if (!streamInfo) {
+            streamInfo = streamList?.[0];
+        }
         if (streamInfo) {
             streamOptions = {
                 ...condition,
@@ -167,7 +174,11 @@ async function getLiveInfo(roomIdOrShortId, opts) {
             break;
         }
     }
-    console.log("streamOptions", streamOptions, res.playurl_info.playurl.stream);
+    // console.log(
+    //   "streamOptions",
+    //   streamOptions,
+    //   JSON.stringify(res.playurl_info.playurl.stream, null, 2),
+    // );
     assert(streamInfo, "没有找到支持的流");
     const streams = streamInfo.accept_qn.map((qn) => {
         const qnDesc = res.playurl_info.playurl.g_qn_desc.find((item) => item.qn === qn);

package/lib/utils.d.ts

@@ -21,3 +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;

package/lib/utils.js

@@ -81,3 +81,11 @@ export function createInvalidStreamChecker(count = 10) {
         return false;
     };
 }
+export function hasKeyword(title, titleKeywords) {
+    const keywords = titleKeywords
+        .split(",")
+        .map((k) => k.trim())
+        .filter((k) => k);
+    const hasTitleKeyword = keywords.some((keyword) => title.toLowerCase().includes(keyword.toLowerCase()));
+    return hasTitleKeyword;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "bililive-tools bilibili recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -36,10 +36,10 @@
   "dependencies": {
     "blive-message-listener": "^0.5.0",
     "mitt": "^3.0.1",
-    "tiny-bilibili-ws": "^1.0.1",
+    "tiny-bilibili-ws": "^1.0.2",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "@bililive-tools/manager": "^1.1.0"
+    "@bililive-tools/manager": "^1.3.0"
   },
   "scripts": {
     "build": "tsc",