@bililive-tools/douyu-recorder 1.9.0 → 1.11.0

package/README.md

@@ -40,7 +40,7 @@ interface Options {
   streamPriorities: []; // 废弃
   sourcePriorities: []; // 废弃
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
-  segment?: number; // 分段参数，单位分钟
+  segment?: number | string; // 分段参数，单位分钟，如果以"B","KB","MB","GB"结尾，会尝试使用文件大小分段，仅推荐在使用mesio录制引擎时使用
   titleKeywords?: string; // 禁止录制的标题关键字，英文逗号分开多个
   disableProvideCommentsWhenRecording?: boolean; // 禁用弹幕录制
   saveGiftDanma?: boolean; // 保存礼物弹幕

package/lib/index.js

@@ -1,11 +1,11 @@
 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 { live } from "douyu-api";
 import { getInfo, getStream } from "./stream.js";
 import { getRoomInfo } from "./dy_api.js";
 import { ensureFolderExist } from "./utils.js";
 import { createDYClient } from "./dy_client/index.js";
 import { giftMap, colorTab } from "./danma.js";
-import { requester } from "./requester.js";
 function createRecorder(opts) {
     // 内部实现时，应该只有 proxy 包裹的那一层会使用这个 recorder 标识符，不应该有直接通过
     // 此标志来操作这个对象的地方，不然会跳过 proxy 的拦截。
@@ -15,9 +15,9 @@ function createRecorder(opts) {
         // @ts-ignore
         ...mitt(),
         ...opts,
+        cache: null,
         availableStreams: [],
         availableSources: [],
-        qualityMaxRetry: opts.qualityRetry ?? 0,
         qualityRetry: opts.qualityRetry ?? 0,
         useServerTimestamp: opts.useServerTimestamp ?? true,
         state: "idle",
@@ -59,34 +59,9 @@ const ffmpegOutputOptions = [];
 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);
-            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, getInfo);
+        if (shouldStop) {
+            return null;
         }
         // 已经在录制中，直接返回
         return this.recordHandle;
@@ -101,7 +76,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "check-error";
         throw error;
     }
-    const { living, owner, title, startTime } = this.liveInfo;
+    const { living, owner, title, liveStartTime, recordStartTime } = this.liveInfo;
     if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -112,30 +87,13 @@ 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;
-        }
-    }
+    // 检查标题是否包含关键词
+    if (utils.checkTitleKeywordsBeforeRecord(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;
-        }
         res = await getStream({
             channelId: this.channelId,
             quality: this.quality,
@@ -146,8 +104,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         });
     }
     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;
     }
@@ -158,10 +116,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     this.usedStream = stream.name;
     this.usedSource = stream.source;
     const onEnd = (...args) => {
-        if (isCutting) {
-            isCutting = false;
-            return;
-        }
         if (isEnded)
             return;
         isEnded = true;
@@ -173,9 +127,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.recordHandle?.stop(reason);
     };
     let isEnded = false;
-    let isCutting = false;
-    const recordStartTime = new Date();
-    const recorder = createBaseRecorder(this.recorderType, {
+    const downloader = createDownloader(this.recorderType, {
         url: stream.url,
         // @ts-ignore
         outputOptions: ffmpegOutputOptions,
@@ -184,7 +136,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             owner,
             title: opts.title ?? title,
             startTime: opts.startTime,
-            liveStartTime: startTime,
+            liveStartTime,
             recordStartTime,
         }),
         disableDanma: this.disableProvideCommentsWhenRecording,
@@ -199,7 +151,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         owner,
         title,
         startTime: Date.now(),
-        liveStartTime: startTime,
+        liveStartTime,
         recordStartTime,
     });
     try {
@@ -217,24 +169,24 @@ 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,
-            liveStartTimestamp: this?.liveInfo?.startTime?.getTime(),
+            liveStartTimestamp: this?.liveInfo?.liveStartTime?.getTime(),
             // recordStopTimestamp: Date.now(),
             title: title,
             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;
         }
@@ -244,7 +196,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         notAutoStart: true,
     });
     client.on("message", (msg) => {
-        const extraDataController = recorder.getExtraDataController();
+        const extraDataController = downloader.getExtraDataController();
         if (!extraDataController)
             return;
         switch (msg.type) {
@@ -383,18 +335,13 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     if (!this.disableProvideCommentsWhenRecording) {
         client.start();
     }
-    const ffmpegArgs = recorder.getArguments();
-    recorder.run();
+    const downloaderArgs = downloader.getArguments();
+    downloader.run();
     // TODO: 需要一个机制防止空录制，比如检查文件的大小变化、ffmpeg 的输出、直播状态等
     const cut = utils.singleton(async () => {
         if (!this.recordHandle)
             return;
-        if (isCutting)
-            return;
-        isCutting = true;
-        await recorder.stop();
-        recorder.createCommand();
-        recorder.run();
+        downloader.cut();
     });
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
@@ -402,12 +349,12 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "stopping-record";
         try {
             client.stop();
-            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;
@@ -416,15 +363,15 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.recordHandle = undefined;
         this.liveInfo = undefined;
         this.state = "idle";
-        this.qualityRetry = this.qualityMaxRetry;
+        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,
@@ -442,29 +389,7 @@ export const provider = {
     async resolveChannelInfoFromURL(channelURL) {
         if (!this.matchURL(channelURL))
             return null;
-        channelURL = channelURL.trim();
-        const res = await requester.get(channelURL);
-        const html = res.data;
-        const matched = html.match(/\$ROOM\.room_id.?=(.*?);/);
-        let roomId = undefined;
-        if (matched) {
-            roomId = matched[1].trim();
-        }
-        else {
-            // 解析出query中的rid参数
-            const rid = new URL(channelURL).searchParams.get("rid");
-            if (rid) {
-                roomId = rid;
-            }
-            else {
-                // 解析<link rel="canonical" href="xxxxxxx"/>中的href
-                const canonicalLink = html.match(/<link rel="canonical" href="(.*?)"/);
-                if (canonicalLink) {
-                    const url = canonicalLink[1];
-                    roomId = url.split("/").pop();
-                }
-            }
-        }
+        const roomId = await live.parseRoomId(channelURL);
         if (!roomId)
             return null;
         const roomInfo = await getRoomInfo(Number(roomId));

package/lib/stream.d.ts

@@ -3,10 +3,11 @@ export declare function getInfo(channelId: string): Promise<{
     living: boolean;
     owner: string;
     title: string;
-    startTime: Date;
+    liveStartTime: Date;
     avatar: string;
     cover: string;
     liveId: string;
+    recordStartTime: Date;
 }>;
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality"> & {
     rejectCache?: boolean;

package/lib/stream.js

@@ -26,14 +26,16 @@ export async function getInfo(channelId) {
         }
     }
     const startTime = new Date(data.room.show_time * 1000);
+    const recordStartTime = new Date();
     return {
         living,
         owner: data.room.nickname,
         title: data.room.room_name,
         avatar: data.room.avatar.big,
         cover: data.room.room_pic,
-        startTime: startTime,
+        liveStartTime: startTime,
         liveId: utils.md5(`${channelId}-${startTime?.getTime() ?? Date.now()}`),
+        recordStartTime: recordStartTime,
         // gifts: data.gift.map((g) => ({
         //   id: g.id,
         //   name: g.name,
@@ -46,7 +48,6 @@ export async function getStream(opts) {
     const qn = (DouyuQualities.includes(opts.quality) ? opts.quality : 0);
     let cdn = opts.source === "auto" ? undefined : opts.source;
     if (opts.source === "auto" && opts.avoidEdgeCDN) {
-        // TODO: 如果不存在 cdn=hw-h5 的源，那么还是可能默认到边缘节点，就先这样吧
         cdn = "hw-h5";
     }
     let liveInfo = await getLiveInfo({
@@ -93,9 +94,5 @@ export async function getStream(opts) {
                 throw new Error("It must be called getStream when living");
         }
     }
-    // 流未准备好，防止刚开播时的无效录制。
-    // 该判断可能导致开播前 30 秒左右无法录制到，因为 streamStatus 在后端似乎有缓存，所以暂时不使用。
-    // TODO: 需要在 ffmpeg 那里加处理，防止无效录制
-    // if (!json.data.streamStatus) return
     return liveInfo;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "bililive-tools douyu recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -40,8 +40,8 @@
     "ws": "^8.18.0",
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
-    "douyu-api": "^0.1.0",
-    "@bililive-tools/manager": "^1.9.0"
+    "douyu-api": "^0.2.0",
+    "@bililive-tools/manager": "^1.10.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"