@bililive-tools/manager 1.17.2 → 1.17.3

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

@@ -87,6 +87,10 @@ export interface AppendRecorderTimelineArgs {
     startTime?: number;
     text: string;
 }
+export interface StreamRetryHint {
+    liveId: string;
+    preferAlternativeStream: boolean;
+}
 export interface RecordHandle {
     id: string;
     stream: string;
@@ -172,6 +176,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bililive-tools/manager",
-  "version": "1.17.2",
+  "version": "1.17.3",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",