@bililive-tools/manager 1.16.1 → 1.17.0

package/lib/downloader/BililiveDownloader.d.ts

@@ -34,6 +34,7 @@ export declare class BililiveDownloader extends EventEmitter implements IDownloa
     readonly disableDanma: boolean;
     readonly url: string;
     readonly debugLevel: "none" | "basic" | "verbose";
+    readonly proxy?: string;
     readonly headers: {
         [key: string]: string | undefined;
     } | undefined;

package/lib/downloader/BililiveDownloader.js

@@ -109,6 +109,7 @@ export class BililiveDownloader extends EventEmitter {
     disableDanma = false;
     url;
     debugLevel = "none";
+    proxy;
     headers;
     constructor(opts, onEnd, onUpdateLiveInfo) {
         super();
@@ -119,6 +120,7 @@ export class BililiveDownloader extends EventEmitter {
         this.hasSegment = hasSegment;
         this.disableDanma = opts.disableDanma ?? false;
         this.debugLevel = opts.debugLevel ?? "none";
+        this.proxy = opts.proxy;
         let videoFormat = "flv";
         this.streamManager = new StreamManager(opts.getSavePath, hasSegment, this.disableDanma, "bililive", videoFormat, {
             onUpdateLiveInfo: this.onUpdateLiveInfo,
@@ -153,6 +155,9 @@ export class BililiveDownloader extends EventEmitter {
         if (this.debugLevel === "verbose") {
             inputOptions.push("-l", "Debug");
         }
+        if (this.proxy) {
+            inputOptions.push(...["--proxy", this.proxy]);
+        }
         if (this.headers) {
             Object.entries(this.headers).forEach(([key, value]) => {
                 if (!value)

package/lib/downloader/FFmpegDownloader.d.ts

@@ -23,6 +23,7 @@ export declare class FFmpegDownloader extends EventEmitter implements IDownloade
     formatName: FormatName;
     videoFormat: VideoFormat;
     readonly debugLevel: "none" | "basic" | "verbose";
+    readonly proxy?: string;
     readonly headers: {
         [key: string]: string | undefined;
     } | undefined;

package/lib/downloader/FFmpegDownloader.js

@@ -20,6 +20,7 @@ export class FFmpegDownloader extends EventEmitter {
     formatName;
     videoFormat;
     debugLevel = "none";
+    proxy;
     headers;
     constructor(opts, onEnd, onUpdateLiveInfo) {
         super();
@@ -63,6 +64,7 @@ export class FFmpegDownloader extends EventEmitter {
         this.url = opts.url;
         this.segment = opts.segment;
         this.headers = opts.headers;
+        this.proxy = opts.proxy;
         this.command = this.createCommand();
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
@@ -86,6 +88,9 @@ export class FFmpegDownloader extends EventEmitter {
         if (this.isHls) {
             inputOptions.push(...["-reconnect", "1", "-reconnect_streamed", "1", "-reconnect_delay_max", "3"]);
         }
+        if (this.proxy) {
+            inputOptions.push(...["-http_proxy", this.proxy]);
+        }
         if (this.debugLevel === "verbose") {
             inputOptions.push("-loglevel", "debug");
         }

package/lib/downloader/IDownloader.d.ts

@@ -23,6 +23,7 @@ export interface BaseRecorderOptions {
         [key: string]: string | undefined;
     };
     videoFormat?: VideoFormat;
+    proxy?: string;
 }
 /**
  * 录制器接口定义
@@ -37,6 +38,7 @@ export interface IDownloader extends EventEmitter {
     readonly headers: {
         [key: string]: string | undefined;
     } | undefined;
+    readonly proxy?: string;
     readonly getSavePath: (data: {
         startTime: number;
         title?: string;

package/lib/downloader/mesioDownloader.d.ts

@@ -31,6 +31,7 @@ export declare class mesioDownloader extends EventEmitter implements IDownloader
     readonly disableDanma: boolean;
     readonly url: string;
     readonly debugLevel: "none" | "basic" | "verbose";
+    readonly proxy?: string;
     readonly headers: {
         [key: string]: string | undefined;
     } | undefined;

package/lib/downloader/mesioDownloader.js

@@ -99,6 +99,7 @@ export class mesioDownloader extends EventEmitter {
     disableDanma = false;
     url;
     debugLevel = "none";
+    proxy;
     headers;
     constructor(opts, onEnd, onUpdateLiveInfo) {
         super();
@@ -109,6 +110,7 @@ export class mesioDownloader extends EventEmitter {
         this.hasSegment = hasSegment;
         this.disableDanma = opts.disableDanma ?? false;
         this.debugLevel = opts.debugLevel ?? "none";
+        this.proxy = opts.proxy;
         let videoFormat = "flv";
         if (opts.url.includes(".m3u8")) {
             videoFormat = "ts";
@@ -145,7 +147,29 @@ export class mesioDownloader extends EventEmitter {
         });
     }
     createCommand() {
-        const inputOptions = [...this.inputOptions, "--fix", "--no-proxy"];
+        const inputOptions = [...this.inputOptions, "--fix", "--disable-log-file"];
+        if (this.proxy) {
+            try {
+                const { protocol, username, password, origin, search, pathname } = new URL(this.proxy);
+                if (protocol.startsWith("https")) {
+                    inputOptions.push("--proxy-type", "https");
+                }
+                else if (protocol.startsWith("socks5")) {
+                    inputOptions.push("--proxy-type", "socks5");
+                }
+                if (username && password) {
+                    inputOptions.push("--proxy-user", `${username}`);
+                    inputOptions.push("--proxy-pass", `${password}`);
+                }
+                inputOptions.push("--proxy", origin + pathname + search);
+            }
+            catch (err) {
+                this.emit("DebugLog", { type: "error", text: `Invalid proxy URL: ${this.proxy}` });
+            }
+        }
+        else {
+            inputOptions.push("--no-proxy");
+        }
         if (this.debugLevel === "verbose") {
             inputOptions.push("-v");
         }

package/lib/downloader/streamManager.d.ts

@@ -23,7 +23,12 @@ export declare class Segment extends EventEmitter {
     outputVideoFilePath: string;
     disableDanma: boolean;
     videoExt: TrueVideoFormat;
-    constructor(getSavePath: GetSavePath, disableDanma: boolean, videoExt: TrueVideoFormat);
+    options?: {
+        firstStartTime: number;
+    };
+    constructor(getSavePath: GetSavePath, disableDanma: boolean, videoExt: TrueVideoFormat, options?: {
+        firstStartTime: number;
+    });
     private getVideoFileCompletedPayload;
     handleSegmentEnd(): Promise<void>;
     onSegmentStart(stderrLine: string, callBack?: {

package/lib/downloader/streamManager.js

@@ -13,11 +13,13 @@ export class Segment extends EventEmitter {
     outputVideoFilePath;
     disableDanma;
     videoExt;
-    constructor(getSavePath, disableDanma, videoExt) {
+    options;
+    constructor(getSavePath, disableDanma, videoExt, options) {
         super();
         this.getSavePath = getSavePath;
         this.disableDanma = disableDanma;
         this.videoExt = videoExt;
+        this.options = options;
     }
     getVideoFileCompletedPayload() {
         return {
@@ -58,11 +60,13 @@ export class Segment extends EventEmitter {
         if (!this.init) {
             await this.handleSegmentEnd();
         }
+        // 首次创建使用上次的时间戳，后续创建使用当前时间戳
+        const startTime = this.init ? (this.options?.firstStartTime ?? Date.now()) : Date.now();
         this.init = false;
-        const startTime = Date.now();
         let liveInfo = { title: "", cover: "" };
         if (callBack?.onUpdateLiveInfo) {
             try {
+                // TODO:这里存在bug，当调用onUpdateLiveInfo并在等待时，handleSegmentEnd被调用，那么会造成竞态导致数据错误，后续需要优化，需要保存segment状态
                 liveInfo = await callBack.onUpdateLiveInfo();
             }
             catch (err) {
@@ -143,7 +147,9 @@ export class StreamManager extends EventEmitter {
         }
         this.recordSavePath = recordSavePath;
         if (hasSegment) {
-            this.segment = new Segment(getSavePath, disableDanma, this.videoExt);
+            this.segment = new Segment(getSavePath, disableDanma, this.videoExt, {
+                firstStartTime: startTime,
+            });
             this.segment.on("DebugLog", (data) => {
                 this.emit("DebugLog", data);
             });

package/lib/index.js

@@ -32,6 +32,7 @@ export function defaultToJSON(provider, recorder) {
             "segment",
             "saveSCDanma",
             "saveCover",
+            "convert2Mp4",
             "saveGiftDanma",
             "disableProvideCommentsWhenRecording",
             "liveInfo",

package/lib/manager.js

@@ -7,6 +7,45 @@ import { RecorderCacheImpl, MemoryCacheStore } from "./cache.js";
 import { getBiliStatusInfoByRoomIds } from "./api.js";
 import { formatDate, removeSystemReservedChars, formatTemplate, replaceExtName, downloadImage, isBetweenTimeRange, sleep, } from "./utils.js";
 import { StreamManager } from "./downloader/streamManager.js";
+const RECORDER_TIMELINE_LIMIT = 40;
+function normalizeTimelineText(text) {
+    return text.trim();
+}
+function appendRecorderTimeline(recorder, args) {
+    const text = normalizeTimelineText(args.text);
+    if (!text) {
+        return recorder.timeline ?? [];
+    }
+    const startTime = args.startTime ?? Date.now();
+    const timeline = recorder.timeline ?? [];
+    const lastItem = timeline[timeline.length - 1];
+    if (lastItem && lastItem.text === text) {
+        lastItem.endTime = Math.max(lastItem.endTime ?? lastItem.startTime, startTime);
+        recorder.timeline = [...timeline];
+        return recorder.timeline;
+    }
+    const nextTimeline = [...timeline, { startTime, text }].slice(-RECORDER_TIMELINE_LIMIT);
+    recorder.timeline = nextTimeline;
+    return nextTimeline;
+}
+function ensureRecorderTimeline(recorder) {
+    recorder.timeline = Array.isArray(recorder.timeline) ? recorder.timeline : [];
+    recorder.appendTimeline = (args) => appendRecorderTimeline(recorder, args);
+}
+function getStateTimelineText(state, msg) {
+    const text = normalizeTimelineText(msg ?? "");
+    if (text) {
+        return text;
+    }
+    const stateTextMap = {
+        idle: "空闲中",
+        recording: "录制中",
+        "stopping-record": "停止录制中",
+        "check-error": "检查失败",
+        "title-blocked": "标题命中过滤规则",
+    };
+    return stateTextMap[state];
+}
 const configurableProps = [
     "savePathRule",
     "autoRemoveSystemReservedChars",
@@ -25,7 +64,7 @@ export function createRecorderManager(opts) {
     const recorders = [];
     // 存储每个 provider 的 timer，key 为 providerId
     const checkLoopTimers = new Map();
-    const multiThreadCheck = async (manager, providerId) => {
+    const multiThreadCheck = async (manager, providerId, providerConfig) => {
         const handleBatchQuery = async (obj) => {
             for (const recorder of recorders
                 .filter((r) => !r.disableAutoCheck)
@@ -48,7 +87,6 @@ export function createRecorderManager(opts) {
             .filter((r) => !r.disableAutoCheck)
             .filter((r) => isBetweenTimeRange(r.handleTime))
             .filter((r) => r.providerId === providerId);
-        const providerConfig = manager.getProviderCheckConfig(providerId);
         const threads = [];
         // Bilibili 批量查询特殊处理
         if (providerId === "Bilibili" && manager.biliBatchQuery) {
@@ -87,13 +125,15 @@ export function createRecorderManager(opts) {
             while (needCheckRecorders.length > 0) {
                 try {
                     await checkOnce();
-                    if (providerConfig.waitTime > 0) {
-                        await sleep(providerConfig.waitTime);
-                    }
                 }
                 catch (err) {
                     manager.emit("error", { source: "checkOnceInThread", err });
                 }
+                finally {
+                    if (providerConfig.waitTime > 0) {
+                        await sleep(providerConfig.waitTime);
+                    }
+                }
             }
         }));
         await Promise.all(threads);
@@ -124,21 +164,42 @@ export function createRecorderManager(opts) {
             });
             // 为录制器注入独立的缓存命名空间
             recorder.cache = this.cache.createNamespace(recorder.id);
+            ensureRecorderTimeline(recorder);
             this.recorders.push(recorder);
-            recorder.on("RecordStart", (recordHandle) => this.emit("RecordStart", { recorder: recorder.toJSON(), recordHandle }));
+            recorder.on("RecordStart", (recordHandle) => {
+                recorder.appendTimeline?.({
+                    startTime: recorder.liveInfo?.recordStartTime?.getTime() ?? Date.now(),
+                    text: `开始录制：${recordHandle.stream}/${recordHandle.source}/${recordHandle.recorderType}/${recordHandle.url}`,
+                });
+                this.emit("RecordStart", { recorder: recorder.toJSON(), recordHandle });
+            });
             recorder.on("RecordSegment", (recordHandle) => this.emit("RecordSegment", { recorder: recorder.toJSON(), recordHandle }));
             recorder.on("videoFileCreated", ({ filename, cover, rawFilename }) => {
                 if (recorder.saveCover && recorder?.liveInfo?.cover) {
                     const coverPath = replaceExtName(filename, ".jpg");
                     downloadImage(cover ?? recorder?.liveInfo?.cover, coverPath);
                 }
+                recorder.appendTimeline?.({
+                    startTime: Date.now(),
+                    text: `视频文件创建：${filename}`,
+                });
                 this.emit("videoFileCreated", { recorder: recorder.toJSON(), filename, rawFilename });
             });
-            recorder.on("videoFileCompleted", ({ filename, stats }) => this.emit("videoFileCompleted", { recorder: recorder.toJSON(), filename, stats }));
+            recorder.on("videoFileCompleted", ({ filename, stats }) => {
+                recorder.appendTimeline?.({
+                    startTime: Date.now(),
+                    text: `视频文件创建完成：${filename}`,
+                });
+                this.emit("videoFileCompleted", { recorder: recorder.toJSON(), filename, stats });
+            });
             recorder.on("Message", (message) => this.emit("Message", { recorder: recorder.toJSON(), message }));
             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 }) => {
+                recorder.appendTimeline?.({
+                    startTime: Date.now(),
+                    text: reason ? `停止录制：${reason}` : "停止录制",
+                });
                 this.emit("RecordStop", { recorder: recorder.toJSON(), recordHandle, reason });
                 const maxRetryCount = 10;
                 // 默认策略下，如果录制被中断，那么会在下一个检查周期时重新检查直播状态并重新开始录制，这种策略的问题就是一部分时间会被漏掉。
@@ -167,6 +228,10 @@ export function createRecorderManager(opts) {
                         type: "common",
                         text: `录制${recorder.channelId}中断，立即触发重试（${retryCountObj[key]}/${maxRetryCount}）`,
                     });
+                    recorder.appendTimeline?.({
+                        startTime: Date.now(),
+                        text: `录制中断，立即触发重试（${retryCountObj[key]}/${maxRetryCount}）`,
+                    });
                     // 触发一次检查，等待一秒使状态清理完毕
                     setTimeout(() => {
                         recorder.checkLiveStatusAndRecord({
@@ -189,6 +254,15 @@ export function createRecorderManager(opts) {
                 liveStartObj[key] = true;
                 this.emit("RecoderLiveStart", { recorder: recorder });
             });
+            recorder.on("stateChange", ({ state, msg }) => {
+                recorder.state = state;
+                if (state !== "idle") {
+                    recorder.appendTimeline?.({
+                        startTime: Date.now(),
+                        text: `状态变更：${getStateTimelineText(state, msg)}`,
+                    });
+                }
+            });
             this.emit("RecorderAdded", recorder.toJSON());
             // startCheckLoop 会为所有注册的 provider 启动检查循环，无需在此处额外处理
             return recorder;
@@ -260,11 +334,11 @@ export function createRecorderManager(opts) {
             // TODO: emit updated event
             // 为每个 provider 创建独立的检查循环
             const startProviderCheckLoop = (providerId) => {
-                const providerConfig = this.getProviderCheckConfig(providerId);
                 const checkLoop = async () => {
+                    const providerConfig = this.getProviderCheckConfig(providerId);
                     try {
                         // 只检查当前 provider 的 recorders
-                        await multiThreadCheck(this, providerId);
+                        await multiThreadCheck(this, providerId, providerConfig);
                     }
                     catch (err) {
                         this.emit("error", { source: "multiThreadCheck", err });

package/lib/recorder.d.ts

@@ -25,6 +25,8 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     saveSCDanma?: boolean;
     /** 保存封面 */
     saveCover?: boolean;
+    /** 转封装为 mp4 */
+    convert2Mp4?: boolean;
     /** 身份验证 */
     auth?: string;
     /** cookie所有者uid,B站弹幕录制 */
@@ -44,7 +46,7 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     /** 流编码 */
     codecName?: CodecName;
     /** 选择使用的api，虎牙支持: auto,web,mp,wup，抖音支持：web,webHTML,mobile,userHTML */
-    api?: "auto" | "web" | "mp" | "wup" | "webHTML" | "mobile" | "userHTML" | "balance" | "random" | string;
+    api?: "auto" | "web" | "mp" | "wup" | "webHTML" | "mobile" | "userHTML" | "balance" | "random" | "newAPI" | "oldAPI" | string;
     /** 标题关键词，如果直播间标题包含这些关键词，则不会自动录制，支持两种格式：
      * 1. 逗号分隔的关键词：'回放,录播,重播'
      * 2. 正则表达式：'/pattern/flags'（如：'/回放|录播/i'）
@@ -63,15 +65,26 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     /** 控制弹幕是否使用服务端时间戳 */
     useServerTimestamp?: boolean;
     extra?: Partial<E>;
+    /** 代理 如http://127.0.0.1:7890 */
+    proxy?: string;
     /** 调试等级 */
     debugLevel?: "none" | "basic" | "verbose";
 }
-export type SerializedRecorder<E extends AnyObject> = PickRequired<RecorderCreateOpts<E>, "id"> & Pick<Recorder<E>, "id" | "channelId" | "remarks" | "disableAutoCheck" | "quality" | "streamPriorities" | "sourcePriorities" | "extra" | "segment" | "saveSCDanma" | "saveCover" | "saveGiftDanma" | "disableProvideCommentsWhenRecording" | "liveInfo" | "uid" | "titleKeywords">;
+export type SerializedRecorder<E extends AnyObject> = PickRequired<RecorderCreateOpts<E>, "id"> & Pick<Recorder<E>, "id" | "channelId" | "remarks" | "disableAutoCheck" | "quality" | "streamPriorities" | "sourcePriorities" | "extra" | "segment" | "saveSCDanma" | "saveCover" | "convert2Mp4" | "saveGiftDanma" | "disableProvideCommentsWhenRecording" | "liveInfo" | "uid" | "titleKeywords">;
 /** 录制状态，idle: 空闲中，recording: 录制中，stopping-record: 停止录制中，check-error: 检查错误，title-blocked: 标题黑名单 */
 export type RecorderState = "idle" | "recording" | "stopping-record" | "check-error" | "title-blocked";
 export type Progress = {
     time: string | null;
 };
+export interface RecorderTimelineItem {
+    startTime: number;
+    text: string;
+    endTime?: number;
+}
+export interface AppendRecorderTimelineArgs {
+    startTime?: number;
+    text: string;
+}
 export interface RecordHandle {
     id: string;
     stream: string;
@@ -104,6 +117,10 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
         cover?: string;
         rawFilename?: string;
     };
+    stateChange: {
+        state: RecorderState;
+        msg?: string;
+    };
     videoFileCompleted: {
         filename: string;
         stats?: XmlStreamStats;
@@ -138,6 +155,8 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
         area?: string;
     };
     tempStopIntervalCheck?: boolean;
+    timeline?: RecorderTimelineItem[];
+    appendTimeline: (args: AppendRecorderTimelineArgs) => RecorderTimelineItem[];
     /** 缓存实例（命名空间） */
     cache: NamespacedCache;
     getChannelURL: (this: Recorder<E>) => string;

package/lib/utils.js

@@ -460,10 +460,13 @@ export async function checkTitleKeywordsWhileRecording(recorder, isManualStart,
     const { title } = liveInfo;
     // 检查标题是否包含关键词
     if (hasBlockedTitleKeywords(title, recorder.titleKeywords)) {
-        recorder.state = "title-blocked";
+        recorder.emit("stateChange", {
+            state: "title-blocked",
+            msg: `停止录制，直播间标题 "${title}" 包含关键词 "${recorder.titleKeywords}"`,
+        });
         recorder.emit("DebugLog", {
             type: "common",
-            text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${recorder.titleKeywords}"`,
+            text: `停止录制，直播间标题 "${title}" 包含关键词 "${recorder.titleKeywords}"`,
         });
         // 停止录制
         await recorder?.recordHandle?.stop("直播间标题包含关键词");
@@ -485,10 +488,9 @@ export function checkTitleKeywordsBeforeRecord(title, recorder, isManualStart) {
         return false;
     }
     if (hasBlockedTitleKeywords(title, recorder.titleKeywords)) {
-        recorder.state = "title-blocked";
-        recorder.emit("DebugLog", {
-            type: "common",
-            text: `跳过录制：直播间标题 "${title}" 包含关键词 "${recorder.titleKeywords}"`,
+        recorder.emit("stateChange", {
+            state: "title-blocked",
+            msg: `跳过录制，直播间标题 "${title}" 包含关键词 "${recorder.titleKeywords}"`,
         });
         return true;
     }

package/lib/xml_stream_controller.js

@@ -102,6 +102,9 @@ export function createRecordExtraDataController(savePath) {
             // 清理内存
             data.pendingMessages = [];
             interactedUsers.clear();
+            danmaNum = 0;
+            scNum = 0;
+            guardNum = 0;
         }
     };
     return {

package/package.json

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