@bililive-tools/douyu-recorder 1.8.0 → 1.9.0

package/lib/dy_api.js

@@ -46,7 +46,6 @@ 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;

package/lib/index.js

@@ -55,14 +55,7 @@ function createRecorder(opts) {
     });
     return recorderWithSupportUpdatedEvent;
 }
-const ffmpegOutputOptions = [
-    "-c",
-    "copy",
-    "-movflags",
-    "faststart+frag_keyframe+empty_moov",
-    "-min_frag_duration",
-    "10000000",
-];
+const ffmpegOutputOptions = [];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
     // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
     if (this.recordHandle != null) {
@@ -108,7 +101,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "check-error";
         throw error;
     }
-    const { living, owner, title } = this.liveInfo;
+    const { living, owner, title, startTime } = this.liveInfo;
     if (this.liveInfo.liveId === banLiveId) {
         this.tempStopIntervalCheck = true;
     }
@@ -181,12 +174,19 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     };
     let isEnded = false;
     let isCutting = false;
+    const recordStartTime = new Date();
     const recorder = createBaseRecorder(this.recorderType, {
         url: stream.url,
         // @ts-ignore
         outputOptions: ffmpegOutputOptions,
         segment: this.segment ?? 0,
-        getSavePath: (opts) => getSavePath({ owner, title: opts.title ?? title, startTime: opts.startTime }),
+        getSavePath: (opts) => getSavePath({
+            owner,
+            title: opts.title ?? title,
+            startTime: opts.startTime,
+            liveStartTime: startTime,
+            recordStartTime,
+        }),
         disableDanma: this.disableProvideCommentsWhenRecording,
         videoFormat: this.videoFormat ?? "auto",
         debugLevel: this.debugLevel ?? "none",
@@ -198,6 +198,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const savePath = getSavePath({
         owner,
         title,
+        startTime: Date.now(),
+        liveStartTime: startTime,
+        recordStartTime,
     });
     try {
         ensureFolderExist(savePath);
@@ -246,7 +249,8 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return;
         switch (msg.type) {
             case "chatmsg": {
-                const timestamp = this.useServerTimestamp ? Number(msg.cst) : Date.now();
+                // 某些情况下cst不存在，可能是其他平台发送的弹幕？
+                const timestamp = this.useServerTimestamp && msg.cst ? Number(msg.cst) : Date.now();
                 const comment = {
                     type: "comment",
                     timestamp: timestamp,
@@ -418,6 +422,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         id: genRecordUUID(),
         stream: stream.name,
         source: stream.source,
+        recorderType: recorder.type,
         url: stream.url,
         ffmpegArgs,
         savePath: savePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyu-recorder",
-  "version": "1.8.0",
+  "version": "1.9.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.8.0"
+    "@bililive-tools/manager": "^1.9.0"
   },
   "devDependencies": {
     "@types/ws": "^8.5.13"