@bililive-tools/douyu-recorder 1.1.0 → 1.3.0

package/README.md

@@ -36,6 +36,7 @@ interface Options {
   channelId: string; // 直播间ID，具体解析见文档，也可自行解析
   quality: number; // 见画质参数
   qualityRetry?: number; // 画质匹配重试次数, -1为强制匹配画质，0为自动配置，正整数为最大匹配次数
+  source?: string; // 指定 cdn，见文档，不传为自动
   streamPriorities: []; // 废弃
   sourcePriorities: []; // 废弃
   disableAutoCheck?: boolean; // 为 true 时 manager 将跳过自动检查
@@ -45,6 +46,7 @@ interface Options {
   saveGiftDanma?: boolean; // 保存礼物弹幕
   saveSCDanma?: boolean; // 保存高能弹幕
   saveCover?: boolean; // 保存封面
+  videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
 }
 ```
 
@@ -71,6 +73,20 @@ const url = "https://www.douyu.com/2140934";
 const { id } = await provider.resolveChannelInfoFromURL(url);
 ```
 
+## cdn
+
+如果有更多线路或者错误，请发issue
+
+| 线路   | 值        |
+| ------ | --------- |
+| 自动   | auto      |
+| 线路1  | scdnctshh |
+| 线路4  | tctc-h5   |
+| 线路5  | tct-h5    |
+| 线路6  | ali-h5    |
+| 线路7  | hw-h5     |
+| 线路13 | hs-h5     |
+
 # 协议
 
 与原项目保存一致为 LGPL

package/lib/dy_client/index.d.ts

@@ -17,6 +17,7 @@ interface Message$Chat {
     dc: string;
     bdlv: string;
     ic: string;
+    cst: string;
 }
 interface Message$Gift {
     type: "dgb";

package/lib/dy_client/index.js

@@ -9,13 +9,18 @@ import { BufferCoder } from "./buffer_coder.js";
 import { STT } from "./stt.js";
 export function createDYClient(channelId, opts = {}) {
     let ws = null;
-    let maxRetry = 5;
+    let maxRetry = 10;
     let coder = new BufferCoder();
     let heartbeatTimer = null;
     const send = (message) => 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 = () => send({ type: "mrkl" });
+    const sendHeartbeat = () => {
+        if (ws?.readyState !== WebSocket.OPEN) {
+            return;
+        }
+        send({ type: "mrkl" });
+    };
     const sendLogout = () => send({ type: "logout" });
     const onOpen = () => {
         sendLogin();

package/lib/index.js

@@ -60,7 +60,7 @@ const ffmpegOutputOptions = [
     "-movflags",
     "faststart+frag_keyframe+empty_moov",
     "-min_frag_duration",
-    "60000000",
+    "10000000",
 ];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
     // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
@@ -106,9 +106,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     }
     // 获取直播间信息
     const liveInfo = await getInfo(this.channelId);
-    const { living, owner, title, liveId } = liveInfo;
+    const { living, owner, title } = liveInfo;
     this.liveInfo = liveInfo;
-    this.emit("LiveStart", { liveId });
     if (liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -154,6 +153,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         res = await getStream({
             channelId: this.channelId,
             quality: this.quality,
+            source: this.source,
             strictQuality,
         });
     }
@@ -169,6 +169,10 @@ 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;
@@ -180,13 +184,18 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.recordHandle?.stop(reason);
     };
     let isEnded = false;
+    let isCutting = false;
     const recorder = new FFMPEGRecorder({
         url: stream.url,
         outputOptions: ffmpegOutputOptions,
         segment: this.segment ?? 0,
-        getSavePath: (opts) => getSavePath({ owner, title, startTime: opts.startTime }),
+        getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
         disableDanma: this.disableProvideCommentsWhenRecording,
-    }, onEnd);
+        videoFormat: this.videoFormat ?? "auto",
+    }, onEnd, async () => {
+        const info = await getInfo(this.channelId);
+        return info;
+    });
     const savePath = getSavePath({
         owner,
         title,
@@ -198,8 +207,14 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "idle";
         throw err;
     }
-    const handleVideoCreated = async ({ filename }) => {
-        this.emit("videoFileCreated", { filename });
+    const handleVideoCreated = async ({ filename, title, cover }) => {
+        this.emit("videoFileCreated", { filename, cover });
+        if (title && this?.liveInfo) {
+            this.liveInfo.title = title;
+        }
+        if (cover && this?.liveInfo) {
+            this.liveInfo.cover = cover;
+        }
         const extraDataController = recorder.getExtraDataController();
         extraDataController?.setMeta({
             room_id: this.channelId,
@@ -234,7 +249,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             case "chatmsg": {
                 const comment = {
                     type: "comment",
-                    timestamp: Date.now(),
+                    timestamp: Number(msg.cst),
                     text: msg.txt,
                     color: colorTab[msg.col] ?? "#ffffff",
                     sender: {
@@ -368,6 +383,16 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const ffmpegArgs = recorder.getArguments();
     recorder.run();
     // TODO: 需要一个机制防止空录制，比如检查文件的大小变化、ffmpeg 的输出、直播状态等
+    const cut = utils.singleton(async () => {
+        if (!this.recordHandle)
+            return;
+        if (isCutting)
+            return;
+        isCutting = true;
+        await recorder.stop();
+        recorder.createCommand();
+        recorder.run();
+    });
     const stop = utils.singleton(async (reason) => {
         if (!this.recordHandle)
             return;
@@ -398,6 +423,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         ffmpegArgs,
         savePath: savePath,
         stop,
+        cut,
     };
     this.emit("RecordStart", this.recordHandle);
     return this.recordHandle;

package/lib/stream.d.ts

@@ -11,6 +11,7 @@ export declare function getInfo(channelId: string): Promise<{
 export declare function getStream(opts: Pick<Recorder, "channelId" | "quality"> & {
     rejectCache?: boolean;
     strictQuality?: boolean;
+    source?: string;
 }): Promise<{
     living: true;
     sources: import("./dy_api.js").SourceProfile[];

package/lib/stream.js

@@ -47,6 +47,7 @@ export async function getStream(opts) {
     let liveInfo = await getLiveInfo({
         channelId: opts.channelId,
         rate: qn,
+        cdn: opts.source === "auto" ? undefined : opts.source,
     });
     if (!liveInfo.living)
         throw new Error("It must be called getStream when living");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.1.0",
+  "version": "1.3.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.1.0"
+    "@bililive-tools/manager": "^1.3.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"