@bililive-tools/douyu-recorder 1.2.0 → 1.4.0

package/README.md

@@ -47,6 +47,7 @@ interface Options {
   saveSCDanma?: boolean; // 保存高能弹幕
   saveCover?: boolean; // 保存封面
   videoFormat?: "auto"; // 视频格式： "auto", "ts", "mkv" ，auto模式下, 分段使用 "ts"，不分段使用 "mp4"
+  onlyAudio?: boolean; // 只录制音频，默认为否
 }
 ```
 

package/lib/dy_api.d.ts

@@ -6,6 +6,7 @@ export declare function getLiveInfo(opts: {
     cdn?: string;
     rate?: number;
     rejectSignFnCache?: boolean;
+    onlyAudio?: boolean;
 }): Promise<{
     living: false;
 } | {

package/lib/dy_api.js

@@ -21,6 +21,8 @@ export async function getLiveInfo(opts) {
         cdn: opts.cdn ?? "",
         // 相当于清晰度类型的 id，给 -1 会由后端决定，0为原画
         rate: String(opts.rate ?? 0),
+        // 是否只录制音频
+        fa: opts.onlyAudio ? "1" : "0",
     }));
     if (res.status !== 200) {
         if (res.status === 403 && res.data === "鉴权失败" && !opts.rejectSignFnCache) {

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

@@ -15,7 +15,12 @@ export function createDYClient(channelId, opts = {}) {
     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,7 +106,7 @@ 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;
     if (liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
@@ -137,7 +137,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return null;
         }
     }
-    this.emit("LiveStart", { liveId });
     let res;
     // TODO: 先不做什么错误处理，就简单包一下预期上会有错误的地方
     try {
@@ -156,6 +155,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             quality: this.quality,
             source: this.source,
             strictQuality,
+            onlyAudio: this.onlyAudio,
         });
     }
     catch (err) {
@@ -170,6 +170,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;
@@ -181,14 +185,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,
         videoFormat: this.videoFormat ?? "auto",
-    }, onEnd);
+    }, onEnd, async () => {
+        const info = await getInfo(this.channelId);
+        return info;
+    });
     const savePath = getSavePath({
         owner,
         title,
@@ -200,14 +208,20 @@ 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,
             platform: provider?.id,
             liveStartTimestamp: liveInfo.startTime?.getTime(),
-            recordStopTimestamp: Date.now(),
+            // recordStopTimestamp: Date.now(),
             title: title,
             user_name: owner,
         });
@@ -236,7 +250,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: {
@@ -370,6 +384,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;
@@ -400,6 +424,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

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

package/lib/stream.js

@@ -48,6 +48,7 @@ export async function getStream(opts) {
         channelId: opts.channelId,
         rate: qn,
         cdn: opts.source === "auto" ? undefined : opts.source,
+        onlyAudio: opts.onlyAudio,
     });
     if (!liveInfo.living)
         throw new Error("It must be called getStream when living");
@@ -68,6 +69,7 @@ export async function getStream(opts) {
             liveInfo = await getLiveInfo({
                 channelId: opts.channelId,
                 rate: liveInfo.streams[0].rate,
+                onlyAudio: opts.onlyAudio,
             });
             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.2.0",
+  "version": "1.4.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.2.0"
+    "@bililive-tools/manager": "^1.3.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"