@bililive-tools/douyin-recorder 1.8.0 → 1.9.0

package/lib/douyin_api.d.ts

@@ -6,6 +6,11 @@ import type { APIType, RealAPIType } from "./types.js";
  */
 export declare function resolveShortURL(shortURL: string): Promise<string>;
 export declare const getCookie: () => Promise<string>;
+/**
+ * 随机选择一个可用的 API 接口
+ * @returns 随机选择的 API 类型
+ */
+export declare function selectRandomAPI(exclude?: RealAPIType[]): RealAPIType;
 export declare function getRoomInfo(webRoomId: string, opts?: {
     auth?: string;
     doubleScreen?: boolean;

package/lib/douyin_api.js

@@ -107,8 +107,16 @@ function generateNonce() {
  * 随机选择一个可用的 API 接口
  * @returns 随机选择的 API 类型
  */
-function selectRandomAPI() {
+export function selectRandomAPI(exclude) {
     const availableAPIs = ["web", "webHTML", "mobile", "userHTML"];
+    if (exclude && exclude.length > 0) {
+        for (const api of exclude) {
+            const index = availableAPIs.indexOf(api);
+            if (index !== -1) {
+                availableAPIs.splice(index, 1);
+            }
+        }
+    }
     const randomIndex = Math.floor(Math.random() * availableAPIs.length);
     return availableAPIs[randomIndex];
 }
@@ -151,7 +159,7 @@ async function getRoomInfoByUserWeb(secUserId, opts = {}) {
             nickname: "",
             sec_uid: "",
             avatar: "",
-            api: "webHTML",
+            api: "userHTML",
             room: null,
         };
     }
@@ -244,7 +252,7 @@ async function getRoomInfoByHtml(webRoomId, opts = {}) {
             nickname: roomInfo?.anchor?.nickname ?? "",
             sec_uid: roomInfo?.anchor?.sec_uid ?? "",
             avatar: roomInfo?.anchor?.avatar_thumb?.url_list?.[0] ?? "",
-            api: "userHTML",
+            api: "webHTML",
             room: {
                 title: roomInfo?.room?.title ?? "",
                 cover: roomInfo?.room?.cover?.url_list?.[0] ?? "",

package/lib/index.js

@@ -59,14 +59,7 @@ function createRecorder(opts) {
     });
     return recorderWithSupportUpdatedEvent;
 }
-const ffmpegOutputOptions = [
-    "-c",
-    "copy",
-    "-movflags",
-    "faststart+frag_keyframe+empty_moov",
-    "-min_frag_duration",
-    "10000000",
-];
+const ffmpegOutputOptions = [];
 const ffmpegInputOptions = ["-rw_timeout", "10000000", "-timeout", "10000000"];
 const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isManualStart, }) {
     // 如果已经在录制中，只在需要检查标题关键词时才获取最新信息
@@ -181,7 +174,7 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         this.state = "check-error";
         throw err;
     }
-    const { owner, title } = this.liveInfo;
+    const { owner, title, startTime } = this.liveInfo;
     this.state = "recording";
     const { currentStream: stream, sources: availableSources, streams: availableStreams } = res;
     this.availableStreams = availableStreams.map((s) => s.desc);
@@ -205,12 +198,19 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         const reason = args[0] instanceof Error ? args[0].message : String(args[0]);
         this.recordHandle?.stop(reason);
     };
+    const recordStartTime = new Date();
     const recorder = createBaseRecorder(this.recorderType, {
         url: stream.url,
         outputOptions: ffmpegOutputOptions,
         inputOptions: ffmpegInputOptions,
         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",
@@ -225,6 +225,9 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
     const savePath = getSavePath({
         owner,
         title,
+        startTime: Date.now(),
+        liveStartTime: startTime,
+        recordStartTime,
     });
     try {
         ensureFolderExist(savePath);
@@ -264,6 +267,10 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
         }
         this.emit("progress", progress);
     });
+    // 礼物消息缓存管理
+    const giftMessageCache = new Map();
+    // 礼物延迟处理时间(毫秒),可根据实际情况调整
+    const GIFT_DELAY = 5000;
     const client = new DouYinDanmaClient(this?.liveInfo?.liveId, {
         cookie: this.auth,
     });
@@ -294,9 +301,6 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return;
         if (this.saveGiftDanma === false)
             return;
-        // repeatEnd 表示礼物连击完毕，只记录这个礼物
-        if (!msg.repeatEnd)
-            return;
         const serverTimestamp = Number(msg.common.createTime) > 9999999999
             ? Number(msg.common.createTime)
             : Number(msg.common.createTime) * 1000;
@@ -316,8 +320,25 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
                 // },
             },
         };
-        this.emit("Message", gift);
-        extraDataController.addMessage(gift);
+        // 单独使用groupId并不可靠
+        const groupId = `${msg.groupId}_${msg.user.id}_${msg.giftId}`;
+        // 如果已存在相同 groupId 的礼物,清除旧的定时器
+        const existing = giftMessageCache.get(groupId);
+        if (existing) {
+            clearTimeout(existing.timer);
+        }
+        // 创建新的定时器
+        const timer = setTimeout(() => {
+            const cachedGift = giftMessageCache.get(groupId);
+            if (cachedGift) {
+                // 延迟时间到,添加最终的礼物消息
+                this.emit("Message", cachedGift.gift);
+                extraDataController.addMessage(cachedGift.gift);
+                giftMessageCache.delete(groupId);
+            }
+        }, GIFT_DELAY);
+        // 更新缓存
+        giftMessageCache.set(groupId, { gift, timer });
     });
     client.on("reconnect", (attempts) => {
         this.emit("DebugLog", {
@@ -381,6 +402,17 @@ const checkLiveStatusAndRecord = async function ({ getSavePath, banLiveId, isMan
             return;
         this.state = "stopping-record";
         try {
+            // 清理所有礼物缓存定时器
+            for (const [_groupId, cached] of giftMessageCache.entries()) {
+                clearTimeout(cached.timer);
+                // 立即添加剩余的礼物消息
+                const extraDataController = recorder.getExtraDataController();
+                if (extraDataController) {
+                    this.emit("Message", cached.gift);
+                    extraDataController.addMessage(cached.gift);
+                }
+            }
+            giftMessageCache.clear();
             client.close();
             await recorder.stop();
         }
@@ -401,6 +433,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/lib/stream.js

@@ -1,4 +1,4 @@
-import { getRoomInfo } from "./douyin_api.js";
+import { getRoomInfo, selectRandomAPI } from "./douyin_api.js";
 import { globalLoadBalancer } from "./loadBalancer/loadBalancer.js";
 export async function getInfo(channelId, opts) {
     let info;
@@ -31,6 +31,9 @@ export async function getStream(opts) {
         // userHTML 接口只能用于状态检测
         api = "web";
     }
+    else if (api === "random") {
+        api = selectRandomAPI(["userHTML"]);
+    }
     const info = await getRoomInfo(opts.channelId, {
         doubleScreen: opts.doubleScreen ?? true,
         auth: opts.cookie,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/douyin-recorder",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "@bililive-tools douyin recorder implemention",
   "main": "./lib/index.js",
   "type": "module",
@@ -38,8 +38,8 @@
     "lodash-es": "^4.17.21",
     "mitt": "^3.0.1",
     "sm-crypto": "^0.3.13",
-    "@bililive-tools/manager": "^1.8.0",
-    "douyin-danma-listener": "0.2.1"
+    "douyin-danma-listener": "0.2.1",
+    "@bililive-tools/manager": "^1.9.0"
   },
   "devDependencies": {
     "@types/node": "*"