@bililive-tools/huya-recorder 1.7.0 → 1.8.0

package/README.md

@@ -37,6 +37,7 @@ interface Options {
   quality: number; // 见画质参数
   qualityRetry?: number; // 画质匹配重试次数, -1为强制匹配画质，0为自动配置，正整数为最大匹配次数
   streamPriorities: []; // 废弃
+  titleKeywords?: string; // 禁止录制的标题关键字，英文逗号分开多个
   sourcePriorities: []; // 按提供的源优先级去给CDN列表排序，并过滤掉不在优先级配置中的源，在未匹配到的情况下会优先使用TX的CDN，具体参数见 CDN 参数
   formatPriorities?: string[]; // 支持，`flv`和`hls` 参数，默认为['flv','hls']
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
@@ -47,6 +48,7 @@ interface Options {
   api?: "auto" | "mp" | "web"; // 默认为auto，在星秀区使用mp接口，其他使用web接口，你也可以强制指定
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
+  debugLevel?: `verbose` | "basic"; // verbose参数时，录制器会输出更加详细的log
 }
 ```
 

package/lib/index.js

@@ -64,22 +64,47 @@ const ffmpegOutputOptions = [
     "-min_frag_duration",
     "10000000",
 ];
-const ffmpegInputOptions = [
-    "-reconnect",
-    "1",
-    "-reconnect_streamed",
-    "1",
-    "-reconnect_delay_max",
-    "10",
-    "-rw_timeout",
-    "15000000",
-];
+const ffmpegInputOptions = ["-rw_timeout", "10000000", "-timeout", "10000000"];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
-    if (this.recordHandle != null)
+    // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
+    if (this.recordHandle != null) {
+        // 只有当设置了标题关键词时，并且不是手动启动的录制，才获取最新的直播间信息
+        if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
+            const now = Date.now();
+            // 每5分钟检查一次标题变化
+            const titleCheckInterval = 5 * 60 * 1000; // 5分钟
+            // 获取上次检查时间
+            const lastCheckTime = typeof this.extra.lastTitleCheckTime === "number" ? this.extra.lastTitleCheckTime : 0;
+            // 如果距离上次检查时间不足指定间隔，则跳过检查
+            if (now - lastCheckTime < titleCheckInterval) {
+                return this.recordHandle;
+            }
+            // 更新检查时间
+            this.extra.lastTitleCheckTime = now;
+            // 获取直播间信息
+            const liveInfo = await getInfo(this.channelId);
+            const { title } = liveInfo;
+            // 检查标题是否包含关键词
+            if (utils.hasBlockedTitleKeywords(title, this.titleKeywords)) {
+                this.state = "title-blocked";
+                this.emit("DebugLog", {
+                    type: "common",
+                    text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
+                });
+                // 停止录制
+                await this.recordHandle.stop("直播间标题包含关键词");
+                // 返回 null，停止录制
+                return null;
+            }
+        }
+        // 已经在录制中，直接返回
         return this.recordHandle;
+    }
+    // 获取直播间信息
     try {
         const liveInfo = await getInfo(this.channelId);
         this.liveInfo = liveInfo;
+        this.state = "idle";
     }
     catch (error) {
         this.state = "check-error";
@@ -96,6 +121,18 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return null;
     if (!living)
         return null;
+    // 检查标题是否包含关键词，如果包含则不自动录制
+    // 手动开始录制时不检查标题关键词
+    if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
+        if (utils.hasBlockedTitleKeywords(title, this.titleKeywords)) {
+            this.state = "title-blocked";
+            this.emit("DebugLog", {
+                type: "common",
+                text: `跳过录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
+            });
+            return null;
+        }
+    }
     let res;
     // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
@@ -148,8 +185,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         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: stream.url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
@@ -157,6 +193,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
+        debugLevel: this.debugLevel ?? "none",
     }, onEnd, async () => {
         const info = await getInfo(this.channelId);
         return info;
@@ -172,8 +209,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         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;
         }
@@ -254,7 +291,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         client.on("retry", (e) => {
             this.emit("DebugLog", {
                 type: "common",
-                text: `huya danmu retry: ${e.count}/${e.max}`,
+                text: `${this?.liveInfo?.owner}:${this.channelId} huya danmu retry: ${e.count}/${e.max}`,
             });
         });
         client.start();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/huya-recorder",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "bililive-tools huya recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -37,8 +37,8 @@
     "mitt": "^3.0.1",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "huya-danma-listener": "0.1.2",
-    "@bililive-tools/manager": "^1.6.1"
+    "@bililive-tools/manager": "^1.8.0",
+    "huya-danma-listener": "0.1.3"
   },
   "devDependencies": {},
   "scripts": {