@bililive-tools/douyu-recorder 1.7.0 → 1.8.0

package/README.md

@@ -49,7 +49,8 @@ interface Options {
   saveCover?: boolean; // 保存封面
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
   onlyAudio?: boolean; // 只录制音频，默认为否
-  recorderType?: "auto" | "ffmpeg" | "mesio"; // 底层录制器，使用mesio时videoFormat参数无效
+  recorderType?: "auto" | "ffmpeg" | "mesio" | "bililive"; // 底层录制器，使用mesio和bililive时videoFormat参数无效
+  debugLevel?: `verbose` | "basic"; // verbose参数时，录制器会输出更加详细的log
 }
 ```
 

package/lib/dy_api.d.ts

@@ -16,6 +16,7 @@ export declare function getLiveInfo(opts: {
     isSupportRateSwitch: boolean;
     isOriginalStream: boolean;
     currentStream: {
+        onlyAudio: boolean;
         source: string;
         name: string;
         rate: number;

package/lib/dy_api.js

@@ -46,11 +46,16 @@ export async function getLiveInfo(opts) {
             delete signCaches[opts.channelId];
         throw new Error("Unexpected error code, " + json.error);
     }
+    console.log(JSON.stringify(json, null, 2));
     const streamUrl = `${json.data.rtmp_url}/${json.data.rtmp_live}`;
     let cdn = json.data.rtmp_cdn;
+    let onlyAudio = false;
     try {
         const url = new URL(streamUrl);
         cdn = url.searchParams.get("fcdn") ?? "";
+        if (url.searchParams.get("only-audio") == "1") {
+            onlyAudio = true;
+        }
     }
     catch (error) {
         console.warn("解析 rtmp_url 失败", error);
@@ -62,6 +67,7 @@ export async function getLiveInfo(opts) {
         isSupportRateSwitch: json.data.rateSwitch === 1,
         isOriginalStream: json.data.rateSwitch !== 1,
         currentStream: {
+            onlyAudio,
             source: cdn,
             name: json.data.rateSwitch !== 1
                 ? "原画"

package/lib/dy_client/index.js

@@ -12,7 +12,11 @@ export function createDYClient(channelId, opts = {}) {
     let maxRetry = 10;
     let coder = new BufferCoder();
     let heartbeatTimer = null;
-    const send = (message) => ws?.send(coder.encode(STT.serialize(message)));
+    const send = (message) => {
+        if (ws && ws.readyState === WebSocket.OPEN) {
+            ws?.send(coder.encode(STT.serialize(message)));
+        }
+    };
     const sendLogin = () => send({ type: "loginreq", roomid: channelId });
     const sendJoinGroup = () => send({ type: "joingroup", rid: channelId, gid: -9999 });
     const sendHeartbeat = () => {

package/lib/index.js

@@ -67,10 +67,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
     if (this.recordHandle != null) {
         // 只有当设置了标题关键词时，并且不是手动启动的录制，才获取最新的直播间信息
-        if (!isManualStart &&
-            this.titleKeywords &&
-            typeof this.titleKeywords === "string" &&
-            this.titleKeywords.trim()) {
+        if (utils.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
             const now = Date.now();
             // 每5分钟检查一次标题变化
             const titleCheckInterval = 5 * 60 * 1000; // 5分钟
@@ -86,12 +83,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             const liveInfo = await getInfo(this.channelId);
             const { title } = liveInfo;
             // 检查标题是否包含关键词
-            const keywords = this.titleKeywords
-                .split(",")
-                .map((k) => k.trim())
-                .filter((k) => k);
-            const hasTitleKeyword = keywords.some((keyword) => title.toLowerCase().includes(keyword.toLowerCase()));
-            if (hasTitleKeyword) {
+            if (utils.hasBlockedTitleKeywords(title, this.titleKeywords)) {
+                this.state = "title-blocked";
                 this.emit("DebugLog", {
                     type: "common",
                     text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
@@ -109,6 +102,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     try {
         const liveInfo = await getInfo(this.channelId);
         this.liveInfo = liveInfo;
+        this.state = "idle";
     }
     catch (error) {
         this.state = "check-error";
@@ -127,16 +121,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         return null;
     // 检查标题是否包含关键词，如果包含则不自动录制
     // 手动开始录制时不检查标题关键词
-    if (!isManualStart &&
-        this.titleKeywords &&
-        typeof this.titleKeywords === "string" &&
-        this.titleKeywords.trim()) {
-        const keywords = this.titleKeywords
-            .split(",")
-            .map((k) => k.trim())
-            .filter((k) => k);
-        const hasTitleKeyword = keywords.some((keyword) => title.toLowerCase().includes(keyword.toLowerCase()));
-        if (hasTitleKeyword) {
+    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}"`,
@@ -144,7 +131,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return null;
         }
     }
-    let recorderType = this.recorderType === "mesio" ? "mesio" : "ffmpeg";
     let res;
     try {
         let strictQuality = false;
@@ -163,7 +149,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             source: this.source,
             strictQuality,
             onlyAudio: this.onlyAudio,
-            avoidEdgeCDN: recorderType === "mesio",
+            avoidEdgeCDN: true,
         });
     }
     catch (err) {
@@ -195,7 +181,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     };
     let isEnded = false;
     let isCutting = false;
-    const recorder = createBaseRecorder(recorderType, {
+    const recorder = createBaseRecorder(this.recorderType, {
         url: stream.url,
         // @ts-ignore
         outputOptions: ffmpegOutputOptions,
@@ -203,6 +189,8 @@ 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",
+        onlyAudio: stream.onlyAudio,
     }, onEnd, async () => {
         const info = await getInfo(this.channelId);
         return info;
@@ -218,8 +206,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;
         }
@@ -458,11 +446,18 @@ export const provider = {
             roomId = matched[1].trim();
         }
         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();
+            // 解析出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();
+                }
             }
         }
         if (!roomId)

package/lib/stream.d.ts

@@ -21,6 +21,7 @@ export declare function getStream(opts: Pick<Recorder, "channelId" | "quality">
     isSupportRateSwitch: boolean;
     isOriginalStream: boolean;
     currentStream: {
+        onlyAudio: boolean;
         source: string;
         name: string;
         rate: number;

package/lib/stream.js

@@ -57,7 +57,20 @@ export async function getStream(opts) {
     });
     if (!liveInfo.living)
         throw new Error("It must be called getStream when living");
-    // console.log(JSON.stringify(liveInfo, null, 2));
+    //如果是scdn，那么找到第一个非scdn的源，重新请求一次
+    if (liveInfo.currentStream.source === "scdn") {
+        const nonScdnSource = liveInfo.sources.find((source) => source.cdn !== "scdnctshh");
+        if (nonScdnSource) {
+            liveInfo = await getLiveInfo({
+                channelId: opts.channelId,
+                rate: qn,
+                cdn: nonScdnSource?.cdn,
+                onlyAudio: opts.onlyAudio,
+            });
+        }
+    }
+    if (!liveInfo.living)
+        throw new Error("It must be called getStream when living");
     if (liveInfo.currentStream.rate !== qn && opts.strictQuality) {
         throw new Error("Can not get expect quality because of strictQuality");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "bililive-tools douyu recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -41,7 +41,7 @@
     "lodash-es": "^4.17.21",
     "axios": "^1.7.8",
     "douyu-api": "^0.1.0",
-    "@bililive-tools/manager": "^1.6.1"
+    "@bililive-tools/manager": "^1.8.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"