@bililive-tools/bilibili-recorder 1.10.0 → 1.12.0

package/lib/index.js

@@ -2,7 +2,7 @@ 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, hasKeyword } from "./utils.js";
+import { ensureFolderExist } from "./utils.js";
 import DanmaClient from "./danma.js";
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
@@ -104,18 +104,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     if (!this.liveInfo.living)
         return null;
     // 检查标题是否包含关键词，如果包含则不自动录制
-    // 手动开始录制时不检查标题关键词
-    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}"`,
-            });
-            return null;
-        }
-    }
+    if (utils.checkTitleKeywordsBeforeRecord(this.liveInfo.title, this, isManualStart))
+        return null;
     const liveInfo = await getInfo(this.channelId);
     const { owner, title, roomId, liveStartTime, recordStartTime } = liveInfo;
     this.liveInfo = liveInfo;
@@ -147,7 +137,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     this.usedSource = stream.source;
     let url = stream.url;
     let intervalId = null;
-    if (this.useM3U8Proxy && streamOptions.protocol_name === "http_hls") {
+    if (this.useM3U8Proxy && streamOptions.format_name === "ts") {
         url = `${this.m3u8ProxyUrl}?id=${this.id}&format=hls`;
         this.emit("DebugLog", {
             type: "common",
@@ -170,13 +160,8 @@ 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;
@@ -200,6 +185,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
             recordStartTime,
         }),
         formatName: streamOptions.format_name,
+        disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat,
         debugLevel: this.debugLevel ?? "none",
         headers: {
@@ -274,7 +260,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
         danmaClient.on("onRoomInfoChange", (msg) => {
             if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
                 const title = msg?.body?.title ?? "";
-                const hasTitleKeyword = hasKeyword(title, this.titleKeywords);
+                const hasTitleKeyword = utils.hasBlockedTitleKeywords(title, this.titleKeywords);
                 if (hasTitleKeyword) {
                     this.state = "title-blocked";
                     this.emit("DebugLog", {
@@ -293,12 +279,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, isManualStart, b
     const cut = utils.singleton(async () => {
         if (!this.recordHandle)
             return;
-        if (isCutting)
-            return;
-        isCutting = true;
-        await downloader.stop();
-        downloader.createCommand();
-        downloader.run();
+        downloader.cut();
     });
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)

package/lib/stream.js

@@ -83,13 +83,13 @@ async function getLiveInfo(roomIdOrShortId, opts) {
         },
         {
             protocol_name: "http_hls",
-            format_name: "ts",
+            format_name: "fmp4",
             codec_name: "avc",
             sort: 8,
         },
         {
             protocol_name: "http_hls",
-            format_name: "fmp4",
+            format_name: "ts",
             codec_name: "avc",
             sort: 7,
         },
@@ -101,13 +101,13 @@ async function getLiveInfo(roomIdOrShortId, opts) {
         },
         {
             protocol_name: "http_hls",
-            format_name: "ts",
+            format_name: "fmp4",
             codec_name: "hevc",
             sort: 5,
         },
         {
             protocol_name: "http_hls",
-            format_name: "fmp4",
+            format_name: "ts",
             codec_name: "hevc",
             sort: 4,
         },
@@ -164,7 +164,7 @@ async function getLiveInfo(roomIdOrShortId, opts) {
             ?.format.find(({ format_name }) => format_name === condition.format_name)
             ?.codec.filter(({ codec_name }) => codec_name === condition.codec_name);
         if (streamList && streamList.length > 1) {
-            // 由于录播姬直推hevc时，指定qn，服务端仍会返回其他画质的流，这里需要指定找一下流
+            // 由于直播姬直推hevc时，指定qn，服务端仍会返回其他画质的流，这里需要指定找一下流
             streamInfo = streamList.find((item) => item.current_qn === opts.qn);
         }
         if (!streamInfo) {

package/lib/utils.d.ts

@@ -21,4 +21,3 @@ 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 | undefined): boolean;

package/lib/utils.js

@@ -81,11 +81,3 @@ 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.10.0",
+  "version": "1.12.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.10.0"
+    "@bililive-tools/manager": "^1.12.0"
   },
   "scripts": {
     "build": "tsc",