@bililive-tools/bilibili-recorder 1.18.1 → 1.19.2

package/README.md

@@ -56,6 +56,7 @@ interface Options {
   recorderType?: "auto" | "ffmpeg" | "mesio" | "bililive"; // 底层录制器，使用mesio和bililive时videoFormat参数无效
   debugLevel?: `verbose` | "basic"; // verbose参数时，录制器会输出更加详细的log
   customHost?: string; // 自定义host来替换直播流的host
+  segmentOnTitleChange?: boolean; // 标题变更时分段，默认为false；bililive引擎无损切段，其他引擎中断录制
 }
 ```
 
@@ -81,15 +82,15 @@ B站录制高画质需要登录，在无法匹配到画质时，会优先使用
 
 能否录制flv下的hevc和你的ffmpeg版本有关
 
-| 解释        | 值        |
-| ----------- | --------- |
-| 等于flv     | auto      |
-| 优先使用flv | flv       |
-| 优先使用hls | hls       |
-| 只使用fmp4  | fmp4      |
-| 只使用flv   | flv_only  |
-| 只使用hls   | hls_only  |
-| 只使用fmp4  | fmp4_only |
+| 解释         | 值        |
+| ------------ | --------- |
+| 等于flv      | auto      |
+| 优先使用flv  | flv       |
+| 优先使用hls  | hls       |
+| 优先使用fmp4 | fmp4      |
+| 只使用flv    | flv_only  |
+| 只使用hls    | hls_only  |
+| 只使用fmp4   | fmp4_only |
 
 ### CodecName
 
@@ -100,8 +101,10 @@ B站录制高画质需要登录，在无法匹配到画质时，会优先使用
 | 等于avc      | auto      |
 | 优先使用avc  | avc       |
 | 优先使用hevc | hevc      |
+| 优先使用av1  | av1       |
 | 只使用avc    | avc_only  |
 | 只使用hevc   | hevc_only |
+| 只使用av1    | av1_only  |
 
 ## 直播间ID解析
 

package/lib/bilibili_api.js

@@ -60,8 +60,8 @@ export async function getRoomPlayInfo(roomIdOrShortId, opts = {}) {
             qn: opts.qn,
             // 0 http_stream, 1 http_hls
             protocol: "0,1",
-            // 0 avc, 1 hevc
-            codec: "0,1",
+            // 0 avc, 1 hevc，2 av1
+            codec: "0,1,2",
             // 0 flv, 1 ts, 2 fmp4
             format: "0,1,2",
             only_audio: opts.onlyAudio ? "1" : "0",

package/lib/index.js

@@ -40,12 +40,16 @@ function createRecorder(opts) {
                 ...info,
             };
         },
-        async getStream() {
+        async getStream(opts = {}) {
             const res = await getStream({
                 channelId: this.channelId,
                 quality: this.quality,
-                formatName: this.formatName,
+                formatName: opts.formatName || this.formatName,
                 codecName: this.codecName,
+                cookie: this.auth,
+                strictQuality: false,
+                onlyAudio: this.onlyAudio,
+                customHost: this.customHost,
             });
             return res.currentStream;
         },
@@ -261,9 +265,11 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         uid: Number(this.uid),
         useServerTimestamp: this.useServerTimestamp,
     });
-    // 开启了禁止提供弹幕功能，并且也没有设置标题关键词，才完全禁止连接弹幕服务器，否则都连接弹幕服务器，前者不处理弹幕消息，后者根据标题关键词来判断是否停止录制
+    // 禁用弹幕且不需要监听标题时，才完全禁止连接弹幕服务器
     const enableDanmaListen = !this.disableProvideCommentsWhenRecording ||
-        utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords);
+        utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords) ||
+        this.segmentOnTitleChange;
+    let currentTitle = title;
     danmaClient.on("Message", (msg) => {
         if (this.disableProvideCommentsWhenRecording)
             return;
@@ -277,9 +283,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         this.emit("Message", msg);
         extraDataController.addMessage(msg);
     });
-    danmaClient.on("onRoomInfoChange", (msg) => {
+    danmaClient.on("RoomInfoChange", (msg) => {
+        const title = msg?.body?.title?.trim() ?? "";
         if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
-            const title = msg?.body?.title ?? "";
             const hasTitleKeyword = utils.hasBlockedTitleKeywords(title, this.titleKeywords);
             if (hasTitleKeyword) {
                 this.emit("stateChange", {
@@ -292,8 +298,35 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
                 });
                 // 停止录制
                 this.recordHandle && this.recordHandle.stop("直播间标题包含关键词");
+                return;
             }
         }
+        if (!this.segmentOnTitleChange || !title || title === currentTitle)
+            return;
+        const previousTitle = currentTitle;
+        currentTitle = title;
+        if (this.liveInfo) {
+            this.liveInfo.title = title;
+        }
+        if (downloader.type !== "bililive") {
+            this.emit("DebugLog", {
+                type: "common",
+                text: `检测到标题由 "${previousTitle}" 变更为 "${title}"，中断录制以进行分段`,
+            });
+            this.appendTimeline({
+                text: `检测到标题由 "${previousTitle}" 变更为 "${title}"，中断录制以进行分段`,
+            });
+            this.recordHandle && this.recordHandle.stop("标题变更分段");
+            return;
+        }
+        this.emit("DebugLog", {
+            type: "common",
+            text: `检测到标题由 "${previousTitle}" 变更为 "${title}"，开始分段`,
+        });
+        this.appendTimeline({
+            text: `检测到标题由 "${previousTitle}" 变更为 "${title}"，开始分段`,
+        });
+        downloader.cut();
     });
     danmaClient.on("open", () => {
         this.appendTimeline({

package/lib/stream.d.ts

@@ -49,11 +49,11 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality">
     onlyAudio?: boolean;
     customHost?: string;
 }): Promise<{
-    currentStream: {
-        name: string;
-        source: string;
-        url: string;
-    };
+    codec_name: string | "avc" | "hevc";
+    accept_qn: number[];
+    base_url: string;
+    current_qn: number;
+    url_info: Omit<SourceProfile, "name">[];
     streams: StreamProfile[];
     sources: SourceProfile[];
     name: string;
@@ -63,9 +63,9 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality">
         codec_name: string;
         qn: number;
     };
-    codec_name: string | "avc" | "hevc";
-    accept_qn: number[];
-    base_url: string;
-    current_qn: number;
-    url_info: Omit<SourceProfile, "name">[];
+    currentStream: {
+        name: string;
+        source: string;
+        url: string;
+    };
 }>;

package/lib/stream.js

@@ -177,6 +177,24 @@ async function getLiveInfo(roomIdOrShortId, opts) {
             codec_name: "hevc",
             sort: 4,
         },
+        {
+            protocol_name: "http_stream",
+            format_name: "flv",
+            codec_name: "av1",
+            sort: 3,
+        },
+        {
+            protocol_name: "http_hls",
+            format_name: "fmp4",
+            codec_name: "av1",
+            sort: 2,
+        },
+        {
+            protocol_name: "http_hls",
+            format_name: "ts",
+            codec_name: "av1",
+            sort: 1,
+        },
     ];
     // 处理formatName
     if (opts.formatName === "flv_only") {
@@ -221,7 +239,17 @@ async function getLiveInfo(roomIdOrShortId, opts) {
         });
         conditons = conditons.sort((a, b) => b.sort - a.sort);
     }
-    // console.log("conditons", opts.codecName, conditons);
+    else if (opts.codecName === "av1") {
+        conditons.forEach((item) => {
+            if (item.codec_name === "av1") {
+                item.sort += 100;
+            }
+        });
+        conditons = conditons.sort((a, b) => b.sort - a.sort);
+    }
+    else if (opts.codecName === "av1_only") {
+        conditons = conditons.filter((item) => item.codec_name === "av1");
+    }
     let streamInfo;
     let streamOptions;
     // console.log("conditons", JSON.stringify(res.playurl_info.playurl.stream, null, 2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/bilibili-recorder",
-  "version": "1.18.1",
+  "version": "1.19.2",
   "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.17.0"
+    "@bililive-tools/manager": "^1.17.2"
   },
   "scripts": {
     "build": "tsc",