@bililive-tools/douyin-recorder 1.9.0 → 1.10.0

package/README.md

@@ -38,7 +38,7 @@ interface Options {
   sourcePriorities: []; // 废弃
   formatPriorities?: string[]; // 支持，`flv`和`hls` 参数，默认为['flv','hls']
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
-  segment?: number; // 分段参数，单位分钟
+  segment?: number | string; // 分段参数，单位分钟，如果以"B","KB","MB","GB"结尾，会尝试使用文件大小分段，仅推荐在使用mesio录制引擎时使用
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveCover?: boolean; // 保存封面

package/lib/douyin_api.js

@@ -121,7 +121,7 @@ export function selectRandomAPI(exclude) {
     return availableAPIs[randomIndex];
 }
 /**
- * 通过解析直播html页面来获取房间数据
+ * 通过解析用户html页面来获取房间数据
  * @param secUserId
  * @param opts
  */
@@ -212,7 +212,7 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
     }
 }
 /**
- * 通过解析用户html页面来获取房间数据
+ * 通过解析直播html页面来获取房间数据
  * @param webRoomId
  * @param opts
  */
@@ -390,7 +390,6 @@ export async function getRoomInfo(webRoomId, opts = {}) {
     }
     // console.log(JSON.stringify(data, null, 2));
     const room = data.room;
-    assert(room, `No room data, id ${webRoomId}`);
     if (api === "userHTML") {
         return {
             living: data.living,
@@ -400,12 +399,13 @@ export async function getRoomInfo(webRoomId, opts = {}) {
             streams: [],
             sources: [],
             avatar: data.avatar,
-            cover: room.cover,
-            liveId: room.id_str,
+            cover: room?.cover ?? "",
+            liveId: room?.id_str ?? "",
             uid: data.sec_uid,
             api: data.api,
         };
     }
+    assert(room, `No room data, id ${webRoomId}`);
     if (room?.stream_url == null) {
         return {
             living: false,

package/lib/index.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import mitt from "mitt";
-import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createBaseRecorder, } from "@bililive-tools/manager";
+import { defaultFromJSON, defaultToJSON, genRecorderUUID, genRecordUUID, utils, createDownloader, } from "@bililive-tools/manager";
 import { getInfo, getStream } from "./stream.js";
 import { ensureFolderExist, singleton } from "./utils.js";
 import { resolveShortURL, parseUser } from "./douyin_api.js";
@@ -16,10 +16,10 @@ function createRecorder(opts) {
         ...opts,
         availableStreams: [],
         availableSources: [],
-        qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
         useServerTimestamp: opts.useServerTimestamp ?? true,
         state: "idle",
+        cache: null,
         getChannelURL() {
             return `https://live.douyin.com/${this.channelId}`;
         },
@@ -62,40 +62,15 @@ function createRecorder(opts) {
 const ffmpegOutputOptions = [];
 const ffmpegInputOptions = ["-rw_timeout", "10000000", "-timeout", "10000000"];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
-    // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
+    // 如果已经在录制中,只在需要检查标题关键词时才获取最新信息
     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, {
-                cookie: this.auth,
-                api: this.api,
-                uid: this.uid,
-            });
-            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;
-            }
+        const shouldStop = await utils.checkTitleKeywordsWhileRecording(this, isManualStart, (channelId) => getInfo(channelId, {
+            cookie: this.auth,
+            api: this.api,
+            uid: this.uid,
+        }));
+        if (shouldStop) {
+            return null;
         }
         // 已经在录制中，直接返回
         return this.recordHandle;
@@ -124,30 +99,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return null;
     if (!this.liveInfo.living)
         return null;
-    // 检查标题是否包含关键词，如果包含则不自动录制
-    // 手动开始录制时不检查标题关键词
-    if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
-        if (utils.hasBlockedTitleKeywords(this.liveInfo.title, this.titleKeywords)) {
-            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 qualityRetryLeft = (await this.cache.get("qualityRetryLeft")) ?? this.qualityRetry;
+    const strictQuality = utils.shouldUseStrictQuality(qualityRetryLeft, this.qualityRetry, isManualStart);
     let res;
     try {
-        let strictQuality = false;
-        if (this.qualityRetry > 0) {
-            strictQuality = true;
-        }
-        if (this.qualityMaxRetry < 0) {
-            strictQuality = true;
-        }
-        if (isManualStart) {
-            strictQuality = false;
-        }
         // TODO: 检查mobile接口处理双屏录播流
         res = await getStream({
             channelId: this.channelId,
@@ -166,15 +124,17 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.liveInfo.cover = res.cover;
         this.liveInfo.liveId = res.liveId;
         this.liveInfo.avatar = res.avatar;
-        this.liveInfo.startTime = new Date();
+        // 再检查一次，上一个接口可能不存在标题参数
+        if (utils.checkTitleKeywordsBeforeRecord(this.liveInfo.title, this, isManualStart))
+            return null;
     }
     catch (err) {
-        if (this.qualityRetry > 0)
-            this.qualityRetry -= 1;
+        if (qualityRetryLeft > 0)
+            await this.cache.set("qualityRetryLeft", qualityRetryLeft - 1);
         this.state = "check-error";
         throw err;
     }
-    const { owner, title, startTime } = this.liveInfo;
+    const { owner, title, liveStartTime, recordStartTime } = this.liveInfo;
     this.state = "recording";
     const { currentStream: stream, sources: availableSources, streams: availableStreams } = res;
     this.availableStreams = availableStreams.map((s) => s.desc);
@@ -198,8 +158,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         const reason = args[0] instanceof Error ? args[0].message : String(args[0]);
         this.recordHandle?.stop(reason);
     };
-    const recordStartTime = new Date();
-    const recorder = createBaseRecorder(this.recorderType, {
+    const downloader = createDownloader(this.recorderType, {
         url: stream.url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
@@ -208,10 +167,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             owner,
             title: opts.title ?? title,
             startTime: opts.startTime,
-            liveStartTime: startTime,
+            liveStartTime: liveStartTime,
             recordStartTime,
         }),
-        disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
         debugLevel: this.debugLevel ?? "none",
         onlyAudio: stream.onlyAudio,
@@ -226,7 +184,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         owner,
         title,
         startTime: Date.now(),
-        liveStartTime: startTime,
+        liveStartTime,
         recordStartTime,
     });
     try {
@@ -244,7 +202,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         if (cover && this?.liveInfo) {
             this.liveInfo.cover = cover;
         }
-        const extraDataController = recorder.getExtraDataController();
+        const extraDataController = downloader.getExtraDataController();
         extraDataController?.setMeta({
             room_id: this.channelId,
             platform: provider?.id,
@@ -254,14 +212,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             user_name: owner,
         });
     };
-    recorder.on("videoFileCreated", handleVideoCreated);
-    recorder.on("videoFileCompleted", ({ filename }) => {
+    downloader.on("videoFileCreated", handleVideoCreated);
+    downloader.on("videoFileCompleted", ({ filename }) => {
         this.emit("videoFileCompleted", { filename });
     });
-    recorder.on("DebugLog", (data) => {
+    downloader.on("DebugLog", (data) => {
         this.emit("DebugLog", data);
     });
-    recorder.on("progress", (progress) => {
+    downloader.on("progress", (progress) => {
         if (this.recordHandle) {
             this.recordHandle.progress = progress;
         }
@@ -275,7 +233,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         cookie: this.auth,
     });
     client.on("chat", (msg) => {
-        const extraDataController = recorder.getExtraDataController();
+        const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
             return;
         const comment = {
@@ -296,7 +254,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         extraDataController.addMessage(comment);
     });
     client.on("gift", (msg) => {
-        const extraDataController = recorder.getExtraDataController();
+        const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
             return;
         if (this.saveGiftDanma === false)
@@ -385,17 +343,17 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     if (!this.disableProvideCommentsWhenRecording) {
         client.connect();
     }
-    const ffmpegArgs = recorder.getArguments();
-    recorder.run();
+    const downloaderArgs = downloader.getArguments();
+    downloader.run();
     const cut = singleton(async () => {
         if (!this.recordHandle)
             return;
         if (isCutting)
             return;
         isCutting = true;
-        await recorder.stop();
-        recorder.createCommand();
-        recorder.run();
+        await downloader.stop();
+        downloader.createCommand();
+        downloader.run();
     });
     const stop = singleton(async (reason) => {
         if (!this.recordHandle)
@@ -406,7 +364,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             for (const [_groupId, cached] of giftMessageCache.entries()) {
                 clearTimeout(cached.timer);
                 // 立即添加剩余的礼物消息
-                const extraDataController = recorder.getExtraDataController();
+                const extraDataController = downloader.getExtraDataController();
                 if (extraDataController) {
                     this.emit("Message", cached.gift);
                     extraDataController.addMessage(cached.gift);
@@ -414,12 +372,12 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             }
             giftMessageCache.clear();
             client.close();
-            await recorder.stop();
+            await downloader.stop();
         }
         catch (err) {
             this.emit("DebugLog", {
                 type: "common",
-                text: `stop ffmpeg error: ${String(err)}`,
+                text: `stop record error: ${String(err)}`,
             });
         }
         this.usedStream = undefined;
@@ -428,14 +386,15 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.recordHandle = undefined;
         this.liveInfo = undefined;
         this.state = "idle";
+        this.cache.set("qualityRetryLeft", this.qualityRetry);
     });
     this.recordHandle = {
         id: genRecordUUID(),
         stream: stream.name,
         source: stream.source,
-        recorderType: recorder.type,
+        recorderType: downloader.type,
         url: stream.url,
-        ffmpegArgs,
+        downloaderArgs,
         savePath: savePath,
         stop,
         cut,

package/lib/stream.d.ts

@@ -11,10 +11,11 @@ export declare function getInfo(channelId: string, opts?: {
     roomId: string;
     avatar: string;
     cover: string;
-    startTime: Date;
     liveId: string;
     uid: string;
     api: RealAPIType;
+    liveStartTime: Date;
+    recordStartTime: Date;
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality" | "streamPriorities" | "sourcePriorities"> & {
     rejectCache?: boolean;

package/lib/stream.js

@@ -12,6 +12,7 @@ export async function getInfo(channelId, opts) {
     else {
         info = await getRoomInfo(channelId, opts ?? {});
     }
+    const startTime = new Date();
     return {
         living: info.living,
         owner: info.owner,
@@ -19,10 +20,11 @@ export async function getInfo(channelId, opts) {
         roomId: info.roomId,
         avatar: info.avatar,
         cover: info.cover,
-        startTime: new Date(),
         liveId: info.liveId,
         uid: info.uid,
         api: info.api,
+        liveStartTime: startTime,
+        recordStartTime: startTime,
     };
 }
 export async function getStream(opts) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "sm-crypto": "^0.3.13",
-    "douyin-danma-listener": "0.2.1",
-    "@bililive-tools/manager": "^1.9.0"
+    "@bililive-tools/manager": "^1.10.0",
+    "douyin-danma-listener": "0.2.1"
   },
   "devDependencies": {
     "@types/node": "*"