@bililive-tools/manager 1.17.2 → 1.18.0

package/lib/manager.js

@@ -8,6 +8,14 @@ import { getBiliStatusInfoByRoomIds } from "./api.js";
 import { formatDate, removeSystemReservedChars, formatTemplate, replaceExtName, downloadImage, isBetweenTimeRange, sleep, replaceFourByteUnicode, } from "./utils.js";
 import { StreamManager } from "./downloader/streamManager.js";
 const RECORDER_TIMELINE_LIMIT = 40;
+const SHORT_RECORDING_THRESHOLD = 12 * 1000;
+const SHORT_RECORDING_RETRY_COUNT = 2;
+const SHORT_RECORDING_REASON_BLACKLIST = new Set([
+    "manual stop",
+    "remove recorder",
+    "直播间标题包含关键词",
+    "标题变更分段",
+]);
 function normalizeTimelineText(text) {
     return text.trim();
 }
@@ -63,6 +71,18 @@ function isConfigurableProp(prop) {
 }
 export function createRecorderManager(opts) {
     const recorders = [];
+    // 短录制检测仅用于当前进程，不需要持久化。
+    const recordAttempts = new Map();
+    const shortRecordingStates = new Map();
+    const getStreamRetryHint = (recorder) => {
+        const state = shortRecordingStates.get(recorder.id);
+        if (!state?.preferAlternativeStream)
+            return undefined;
+        return {
+            liveId: state.liveId,
+            preferAlternativeStream: true,
+        };
+    };
     // 存储每个 provider 的 timer，key 为 providerId
     const checkLoopTimers = new Map();
     const multiThreadCheck = async (manager, providerId, providerConfig) => {
@@ -78,6 +98,7 @@ export function createRecorderManager(opts) {
                             return genSavePathFromRule(manager, recorder, data);
                         },
                         banLiveId: tempBanObj[recorder.channelId],
+                        streamRetryHint: getStreamRetryHint(recorder),
                     });
                 }
             }
@@ -120,6 +141,7 @@ export function createRecorderManager(opts) {
                     return genSavePathFromRule(manager, recorder, data);
                 },
                 banLiveId,
+                streamRetryHint: getStreamRetryHint(recorder),
             });
         };
         threads.push(...range(0, providerConfig.maxThreadCount).map(async () => {
@@ -170,6 +192,21 @@ export function createRecorderManager(opts) {
             ensureRecorderTimeline(recorder);
             this.recorders.push(recorder);
             recorder.on("RecordStart", (recordHandle) => {
+                const liveId = recorder.liveInfo?.liveId;
+                recordAttempts.set(recordHandle.id, {
+                    recorderId: recorder.id,
+                    liveId,
+                    startedAt: Date.now(),
+                });
+                const shortRecordingState = shortRecordingStates.get(recorder.id);
+                if (shortRecordingState) {
+                    if (shortRecordingState.liveId === liveId) {
+                        shortRecordingState.preferAlternativeStream = false;
+                    }
+                    else {
+                        shortRecordingStates.delete(recorder.id);
+                    }
+                }
                 recorder.appendTimeline?.({
                     startTime: recorder.liveInfo?.recordStartTime?.getTime() ?? Date.now(),
                     text: `开始录制：${recordHandle.stream}/${recordHandle.source}/${recordHandle.recorderType}/${recordHandle.url}`,
@@ -199,10 +236,36 @@ export function createRecorderManager(opts) {
             recorder.on("Updated", (keys) => this.emit("RecorderUpdated", { recorder: recorder.toJSON(), keys }));
             recorder.on("DebugLog", (log) => this.emit("RecorderDebugLog", { recorder: recorder, ...log }));
             recorder.on("RecordStop", ({ recordHandle, reason }) => {
+                const stoppedAt = Date.now();
                 recorder.appendTimeline?.({
-                    startTime: Date.now(),
+                    startTime: stoppedAt,
                     text: reason ? `停止录制：${reason}` : "停止录制",
                 });
+                const attempt = recordAttempts.get(recordHandle.id);
+                recordAttempts.delete(recordHandle.id);
+                if (attempt?.recorderId === recorder.id && attempt.liveId) {
+                    const isReasonBlacklisted = reason != null && SHORT_RECORDING_REASON_BLACKLIST.has(reason);
+                    const duration = stoppedAt - attempt.startedAt;
+                    const previousState = shortRecordingStates.get(recorder.id);
+                    if (isReasonBlacklisted || duration >= SHORT_RECORDING_THRESHOLD) {
+                        shortRecordingStates.delete(recorder.id);
+                    }
+                    else {
+                        const count = previousState?.liveId === attempt.liveId ? previousState.count + 1 : 1;
+                        const preferAlternativeStream = count >= SHORT_RECORDING_RETRY_COUNT;
+                        shortRecordingStates.set(recorder.id, {
+                            liveId: attempt.liveId,
+                            count,
+                            preferAlternativeStream,
+                        });
+                        if (preferAlternativeStream && !previousState?.preferAlternativeStream) {
+                            recorder.appendTimeline?.({
+                                startTime: stoppedAt,
+                                text: `连续 ${SHORT_RECORDING_RETRY_COUNT} 次录制在 ${SHORT_RECORDING_THRESHOLD / 1000} 秒内结束，下次可能尝试切换流格式（仅抖音）`,
+                            });
+                        }
+                    }
+                }
                 this.emit("RecordStop", { recorder: recorder.toJSON(), recordHandle, reason });
                 const maxRetryCount = 10;
                 // 默认策略下，如果录制被中断，那么会在下一个检查周期时重新检查直播状态并重新开始录制，这种策略的问题就是一部分时间会被漏掉。
@@ -241,6 +304,7 @@ export function createRecorderManager(opts) {
                             getSavePath(data) {
                                 return genSavePathFromRule(manager, recorder, data);
                             },
+                            streamRetryHint: getStreamRetryHint(recorder),
                         });
                     }, 1000);
                 }
@@ -296,6 +360,11 @@ export function createRecorderManager(opts) {
                 if (k.startsWith(keyPrefix))
                     delete chargeLiveObj[k];
             });
+            shortRecordingStates.delete(recorder.id);
+            for (const [recordHandleId, attempt] of recordAttempts) {
+                if (attempt.recorderId === recorder.id)
+                    recordAttempts.delete(recordHandleId);
+            }
             this.emit("RecorderRemoved", recorder.toJSON());
         },
         getRecorder(id) {
@@ -317,6 +386,7 @@ export function createRecorderManager(opts) {
                     return genSavePathFromRule(manager, recorder, data);
                 },
                 isManualStart: true,
+                streamRetryHint: getStreamRetryHint(recorder),
             });
             delete tempBanObj[recorder.channelId];
             recorder.tempStopIntervalCheck = false;

package/lib/recorder.d.ts

@@ -29,6 +29,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     convert2Mp4?: boolean;
     /** 身份验证 */
     auth?: string;
+    /** 抖音 Cookie 使用范围，默认为全部 */
+    cookieMode?: "all" | "stream" | "danma";
     /** cookie所有者uid,B站弹幕录制 */
     uid?: number | string;
     /** 画质匹配重试次数 */
@@ -87,6 +89,10 @@ export interface AppendRecorderTimelineArgs {
     startTime?: number;
     text: string;
 }
+export interface StreamRetryHint {
+    liveId: string;
+    preferAlternativeStream: boolean;
+}
 export interface RecordHandle {
     id: string;
     stream: string;
@@ -172,6 +178,8 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
         getSavePath: GetSavePath;
         banLiveId?: string;
         isManualStart?: boolean;
+        /** 上一次使用的流疑似不可用，录制器可在同一场直播中优先尝试备用流 */
+        streamRetryHint?: StreamRetryHint;
     }) => Promise<RecordHandle | null>;
     recordHandle?: RecordHandle;
     toJSON: (this: Recorder<E>) => SerializedRecorder<E>;

package/lib/xml_stream_controller.d.ts

@@ -1,9 +1,16 @@
 import { Message } from "./common.js";
+export interface DanmaStatsPayload {
+    danmaTimeline: {
+        interval: number;
+        data: number[];
+    };
+}
 export interface XmlStreamStats {
     danmaNum: number;
     uniqMember: number;
     scNum: number;
     guardNum: number;
+    danmaStats: DanmaStatsPayload;
 }
 export interface XmlStreamData {
     header: string;

package/lib/xml_stream_controller.js

@@ -7,6 +7,7 @@ import { XMLBuilder } from "fast-xml-parser";
 import { pick } from "lodash-es";
 const METADATA_PLACEHOLDER = "<!--METADATA_PLACEHOLDER-->";
 const XML_FILE_HEADER = `<?xml version="1.0" encoding="utf-8"?>\n<?xml-stylesheet type="text/xsl" href="#s"?>\n<i>\n${METADATA_PLACEHOLDER}\n<RecorderXmlStyle><z:stylesheet version="1.0" id="s" xml:id="s" xmlns:z="http://www.w3.org/1999/XSL/Transform"><z:output method="html"/><z:template match="/"><html><meta name="viewport" content="width=device-width"/><title>弹幕文件 <z:value-of select="/i/metadata/user_name/text()"/></title><style>body{margin:0}h1,h2,p,table{margin-left:5px}table{border-spacing:0}td,th{border:1px solid grey;padding:1px 5px}th{position:sticky;top:0;background:#4098de}tr:hover{background:#d9f4ff}div{overflow:auto;max-height:80vh;max-width:100vw;width:fit-content}</style><h1>弹幕XML文件</h1><p>本文件不支持在 IE 浏览器里预览，请使用 Chrome Firefox Edge 等浏览器。</p><p>文件用法参考文档 <a href="https://rec.danmuji.org/user/danmaku/">https://rec.danmuji.org/user/danmaku/</a></p><table><tr><td>房间号</td><td><z:value-of select="/i/metadata/room_id/text()"/></td></tr><tr><td>主播名</td><td><z:value-of select="/i/metadata/user_name/text()"/></td></tr><tr><td><a href="#d">弹幕</a></td><td>共<z:value-of select="count(/i/d)"/>条记录</td></tr><tr><td><a href="#guard">上船</a></td><td>共<z:value-of select="count(/i/guard)"/>条记录</td></tr><tr><td><a href="#sc">SC</a></td><td>共<z:value-of select="count(/i/sc)"/>条记录</td></tr><tr><td><a href="#gift">礼物</a></td><td>共<z:value-of select="count(/i/gift)"/>条记录</td></tr></table><h2 id="d">弹幕</h2><div id="dm"><table><tr><th>用户名</th><th>出现时间</th><th>用户ID</th><th>弹幕</th><th>参数</th></tr><z:for-each select="/i/d"><tr><td><z:value-of select="@user"/></td><td></td><td></td><td><z:value-of select="."/></td><td><z:value-of select="@p"/></td></tr></z:for-each></table></div><script>Array.from(document.querySelectorAll('#dm tr')).slice(1).map(t=>t.querySelectorAll('td')).forEach(t=>{let p=t[4].textContent.split(','),a=p[0];t[1].textContent=\`\u0024{(Math.floor(a/60/60)+'').padStart(2,0)}:\u0024{(Math.floor(a/60%60)+'').padStart(2,0)}:\u0024{(a%60).toFixed(3).padStart(6,0)}\`;t[2].innerHTML=\`&lt;a target=_blank rel="nofollow noreferrer" "&gt;\u0024{p[6]}&lt;/a&gt;\`})</script><h2 id="guard">舰长购买</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>舰长等级</th><th>购买数量</th><th>出现时间</th></tr><z:for-each select="/i/guard"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="@level"/></td><td><z:value-of select="@count"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="sc">SuperChat 醒目留言</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>内容</th><th>显示时长</th><th>价格</th><th>出现时间</th></tr><z:for-each select="/i/sc"><tr><td><z:value-of select="@user"/></td><td><a rel="nofollow noreferrer"><z:attribute name="href"><z:text></z:text><z:value-of select="@uid" /></z:attribute><z:value-of select="@uid"/></a></td><td><z:value-of select="."/></td><td><z:value-of select="@time"/></td><td><z:value-of select="@price"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div><h2 id="gift">礼物</h2><div><table><tr><th>用户名</th><th>用户ID</th><th>礼物名</th><th>礼物数量</th><th>出现时间</th></tr><z:for-each select="/i/gift"><tr><td><z:value-of select="@user"/></td><td><span rel="nofollow noreferrer"><z:attribute name="href"></z:attribute><z:value-of select="@uid"/></span></td><td><z:value-of select="@giftname"/></td><td><z:value-of select="@giftcount"/></td><td><z:value-of select="@ts"/></td></tr></z:for-each></table></div></html></z:template></z:stylesheet></RecorderXmlStyle>\n`;
+const DANMA_STATS_INTERVAL = 10;
 export function createRecordExtraDataController(savePath) {
     const data = {
         header: XML_FILE_HEADER,
@@ -20,13 +21,42 @@ export function createRecordExtraDataController(savePath) {
     let danmaNum = 0;
     let scNum = 0;
     let guardNum = 0;
+    let maxDanmaBucketStart = -1;
     const interactedUsers = new Set();
+    const danmaBucketCountMap = new Map();
+    const getDanmaStats = () => {
+        if (maxDanmaBucketStart < 0) {
+            return {
+                danmaTimeline: {
+                    interval: DANMA_STATS_INTERVAL,
+                    data: [],
+                },
+            };
+        }
+        const stats = [];
+        for (let start = 0; start <= maxDanmaBucketStart; start += DANMA_STATS_INTERVAL) {
+            stats.push(danmaBucketCountMap.get(start) ?? 0);
+        }
+        return {
+            danmaTimeline: {
+                interval: DANMA_STATS_INTERVAL,
+                data: stats,
+            },
+        };
+    };
     const getStats = () => ({
         danmaNum,
         uniqMember: interactedUsers.size,
         scNum,
         guardNum,
+        danmaStats: getDanmaStats(),
     });
+    const trackDanmaBucket = (message) => {
+        const progressInSeconds = Math.max((message.timestamp - data.meta.recordStartTimestamp) / 1000, 0);
+        const bucketStart = Math.floor(progressInSeconds / DANMA_STATS_INTERVAL) * DANMA_STATS_INTERVAL;
+        danmaBucketCountMap.set(bucketStart, (danmaBucketCountMap.get(bucketStart) ?? 0) + 1);
+        maxDanmaBucketStart = Math.max(maxDanmaBucketStart, bucketStart);
+    };
     const trackInteractedUser = (message) => {
         const userName = message.sender?.name?.trim();
         if (!userName)
@@ -68,6 +98,7 @@ export function createRecordExtraDataController(savePath) {
             return;
         if (message.type === "comment") {
             danmaNum += 1;
+            trackDanmaBucket(message);
         }
         else if (message.type === "super_chat") {
             scNum += 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.17.2",
+  "version": "1.18.0",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",
@@ -28,7 +28,11 @@
     "scheduling",
     "recorders"
   ],
-  "repository": "https://github.com/renmu123/biliLive-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/renmu123/biliLive-tools",
+    "directory": "packages/liveManager"
+  },
   "author": "renmu123",
   "license": "LGPL",
   "dependencies": {