@bililive-tools/manager 1.16.0 → 1.16.1

package/lib/downloader/BililiveDownloader.js

@@ -140,8 +140,8 @@ export class BililiveDownloader extends EventEmitter {
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
-        this.streamManager.on("videoFileCompleted", ({ filename }) => {
-            this.emit("videoFileCompleted", { filename });
+        this.streamManager.on("videoFileCompleted", (data) => {
+            this.emit("videoFileCompleted", data);
         });
         this.streamManager.on("DebugLog", (data) => {
             this.emit("DebugLog", data);

package/lib/downloader/FFmpegDownloader.js

@@ -67,8 +67,8 @@ export class FFmpegDownloader extends EventEmitter {
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
-        this.streamManager.on("videoFileCompleted", ({ filename }) => {
-            this.emit("videoFileCompleted", { filename });
+        this.streamManager.on("videoFileCompleted", (data) => {
+            this.emit("videoFileCompleted", data);
         });
         this.streamManager.on("DebugLog", (data) => {
             this.emit("DebugLog", data);

package/lib/downloader/IDownloader.d.ts

@@ -2,6 +2,7 @@ import { EventEmitter } from "node:events";
 import type { VideoFormat } from "../index.js";
 import type { FormatName } from "./index.js";
 import type { XmlStreamController } from "../xml_stream_controller.js";
+import type { VideoFileCompletedPayload } from "./streamManager.js";
 export type Segment = number | string | undefined;
 /**
  * 录制器构造函数选项的基础接口
@@ -54,9 +55,7 @@ export interface IDownloader extends EventEmitter {
         rawFilename?: string;
         title?: string;
     }) => void): this;
-    on(event: "videoFileCompleted", listener: (data: {
-        filename: string;
-    }) => void): this;
+    on(event: "videoFileCompleted", listener: (data: VideoFileCompletedPayload) => void): this;
     on(event: "DebugLog", listener: (data: {
         type: string;
         text: string;
@@ -69,9 +68,7 @@ export interface IDownloader extends EventEmitter {
         rawFilename?: string;
         title?: string;
     }): boolean;
-    emit(event: "videoFileCompleted", data: {
-        filename: string;
-    }): boolean;
+    emit(event: "videoFileCompleted", data: VideoFileCompletedPayload): boolean;
     emit(event: "DebugLog", data: {
         type: string;
         text: string;

package/lib/downloader/mesioDownloader.js

@@ -137,8 +137,8 @@ export class mesioDownloader extends EventEmitter {
         this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
             this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
-        this.streamManager.on("videoFileCompleted", ({ filename }) => {
-            this.emit("videoFileCompleted", { filename });
+        this.streamManager.on("videoFileCompleted", (data) => {
+            this.emit("videoFileCompleted", data);
         });
         this.streamManager.on("DebugLog", (data) => {
             this.emit("DebugLog", data);

package/lib/downloader/streamManager.d.ts

@@ -2,12 +2,17 @@ import EventEmitter from "node:events";
 import { createRecordExtraDataController } from "../xml_stream_controller.js";
 import type { RecorderCreateOpts } from "../recorder.js";
 import type { TrueVideoFormat } from "../index.js";
+import type { XmlStreamStats } from "../xml_stream_controller.js";
 export type GetSavePath = (data: {
     startTime: number;
     title?: string;
     extraMs?: boolean;
 }) => string;
 type RecorderType = Exclude<RecorderCreateOpts["recorderType"], undefined | "auto">;
+export interface VideoFileCompletedPayload {
+    filename: string;
+    stats?: XmlStreamStats;
+}
 export declare class Segment extends EventEmitter {
     extraDataController: ReturnType<typeof createRecordExtraDataController> | null;
     init: boolean;
@@ -19,6 +24,7 @@ export declare class Segment extends EventEmitter {
     disableDanma: boolean;
     videoExt: TrueVideoFormat;
     constructor(getSavePath: GetSavePath, disableDanma: boolean, videoExt: TrueVideoFormat);
+    private getVideoFileCompletedPayload;
     handleSegmentEnd(): Promise<void>;
     onSegmentStart(stderrLine: string, callBack?: {
         onUpdateLiveInfo: () => Promise<{

package/lib/downloader/streamManager.js

@@ -19,6 +19,12 @@ export class Segment extends EventEmitter {
         this.disableDanma = disableDanma;
         this.videoExt = videoExt;
     }
+    getVideoFileCompletedPayload() {
+        return {
+            filename: this.outputFilePath,
+            stats: this.extraDataController?.getStats(),
+        };
+    }
     async handleSegmentEnd() {
         if (!this.outputVideoFilePath) {
             this.emit("DebugLog", {
@@ -27,6 +33,7 @@ export class Segment extends EventEmitter {
             });
             return;
         }
+        const data = this.getVideoFileCompletedPayload();
         try {
             this.emit("DebugLog", {
                 type: "info",
@@ -36,7 +43,7 @@ export class Segment extends EventEmitter {
                 retry(() => fs.rename(this.rawRecordingVideoPath, this.outputFilePath), 20, 1000),
                 this.extraDataController?.flush(),
             ]);
-            this.emit("videoFileCompleted", { filename: this.outputFilePath });
+            this.emit("videoFileCompleted", data);
         }
         catch (err) {
             this.emit("DebugLog", {
@@ -44,7 +51,7 @@ export class Segment extends EventEmitter {
                 text: "videoFileCompleted error " + String(err),
             });
             // 虽然重命名失败了，但是也当作完成处理，避免卡住录制流程
-            this.emit("videoFileCompleted", { filename: this.outputFilePath });
+            this.emit("videoFileCompleted", data);
         }
     }
     async onSegmentStart(stderrLine, callBack) {
@@ -194,8 +201,13 @@ export class StreamManager extends EventEmitter {
             }
             else {
                 if (this.recordStartTime) {
-                    await this.getExtraDataController()?.flush();
-                    this.emit("videoFileCompleted", { filename: this.videoFilePath });
+                    const stats = this.extraDataController?.getStats();
+                    const extraDataController = this.getExtraDataController();
+                    await extraDataController?.flush();
+                    this.emit("videoFileCompleted", {
+                        filename: this.videoFilePath,
+                        stats: stats,
+                    });
                 }
             }
         }

package/lib/index.d.ts

@@ -7,7 +7,6 @@ export * from "./common.js";
 export * from "./recorder.js";
 export * from "./manager.js";
 export * from "./cache.js";
-export * from "./record_extra_data_controller.js";
 export * from "./downloader/FFmpegDownloader.js";
 export { createDownloader } from "./downloader/index.js";
 export { checkTitleKeywordsWhileRecording, checkTitleKeywordsBeforeRecord } from "./utils.js";

package/lib/index.js

@@ -6,7 +6,6 @@ export * from "./common.js";
 export * from "./recorder.js";
 export * from "./manager.js";
 export * from "./cache.js";
-export * from "./record_extra_data_controller.js";
 export * from "./downloader/FFmpegDownloader.js";
 export { createDownloader } from "./downloader/index.js";
 export { checkTitleKeywordsWhileRecording, checkTitleKeywordsBeforeRecord } from "./utils.js";

package/lib/manager.d.ts

@@ -2,6 +2,7 @@ import { Emitter } from "mitt";
 import { ChannelId, Message } from "./common.js";
 import { RecorderCache } from "./cache.js";
 import { RecorderCreateOpts, Recorder, SerializedRecorder, RecordHandle, DebugLog, Progress } from "./recorder.js";
+import type { XmlStreamStats } from "./xml_stream_controller.js";
 import { AnyObject, UnknownObject } from "./utils.js";
 import { StreamManager } from "./downloader/streamManager.js";
 export interface ProviderCheckConfig {
@@ -52,6 +53,7 @@ export interface RecorderManager<ME extends UnknownObject, P extends RecorderPro
     videoFileCompleted: {
         recorder: SerializedRecorder<E>;
         filename: string;
+        stats?: XmlStreamStats;
     };
     RecorderProgress: {
         recorder: SerializedRecorder<E>;

package/lib/manager.js

@@ -134,7 +134,7 @@ export function createRecorderManager(opts) {
                 }
                 this.emit("videoFileCreated", { recorder: recorder.toJSON(), filename, rawFilename });
             });
-            recorder.on("videoFileCompleted", ({ filename }) => this.emit("videoFileCompleted", { recorder: recorder.toJSON(), filename }));
+            recorder.on("videoFileCompleted", ({ filename, stats }) => 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 }));
@@ -279,18 +279,9 @@ export function createRecorderManager(opts) {
                             }
                         }
                         else {
-                            // 检查该 provider 是否还有 recorder
-                            const hasRecorders = this.recorders.some((r) => r.providerId === providerId);
-                            if (hasRecorders) {
-                                // 继续循环
-                                const timer = setTimeout(checkLoop, providerConfig.autoCheckInterval);
-                                checkLoopTimers.set(providerId, timer);
-                            }
-                            else {
-                                // 没有 recorder 了，停止该 provider 的检查循环
-                                // TODO: 也许不需要删除定时器
-                                checkLoopTimers.delete(providerId);
-                            }
+                            // 即使当前 provider 暂时没有 recorder，也保留轮询，避免后续新增 recorder 时漏掉自动检查。
+                            const timer = setTimeout(checkLoop, providerConfig.autoCheckInterval);
+                            checkLoopTimers.set(providerId, timer);
                         }
                     }
                 };

package/lib/recorder.d.ts

@@ -4,6 +4,7 @@ import { RecorderProvider } from "./manager.js";
 import { AnyObject, PickRequired, UnknownObject } from "./utils.js";
 import type { NamespacedCache } from "./cache.js";
 import type { DownloaderType } from "./downloader/index.js";
+import type { XmlStreamStats } from "./xml_stream_controller.js";
 type FormatName = "auto" | "flv" | "hls" | "fmp4" | "flv_only" | "hls_only" | "fmp4_only";
 type CodecName = "auto" | "avc" | "hevc" | "avc_only" | "hevc_only";
 export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
@@ -105,6 +106,7 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
     };
     videoFileCompleted: {
         filename: string;
+        stats?: XmlStreamStats;
     };
     progress: Progress;
     RecordStop: {

package/lib/xml_stream_controller.d.ts

@@ -1,5 +1,12 @@
 import { Message } from "./common.js";
+export interface XmlStreamStats {
+    danmaNum: number;
+    uniqMember: number;
+    scNum: number;
+    guardNum: number;
+}
 export interface XmlStreamData {
+    header: string;
     meta: {
         title?: string;
         recordStartTimestamp: number;
@@ -19,5 +26,6 @@ export interface XmlStreamController {
     addMessage: (message: Message) => void;
     setMeta: (meta: Partial<XmlStreamData["meta"]>) => Promise<void>;
     flush: () => Promise<void>;
+    getStats: () => XmlStreamStats;
 }
 export declare function createRecordExtraDataController(savePath: string): XmlStreamController;

package/lib/xml_stream_controller.js

@@ -1,74 +1,82 @@
 /**
  * XML流式写入控制器，用于实时写入弹幕、礼物等信息到XML文件
- * 相比原有的json方案，这个实现每隔5秒就会写入数据，减少内存占用和数据丢失风险
+ * 相比原有的json方案，这个实现每隔10秒就会写入数据，减少内存占用和数据丢失风险
  */
 import fs from "node:fs";
 import { XMLBuilder } from "fast-xml-parser";
 import { pick } from "lodash-es";
-import { asyncThrottle } from "./utils.js";
+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`;
 export function createRecordExtraDataController(savePath) {
     const data = {
+        header: XML_FILE_HEADER,
         meta: {
             recordStartTimestamp: Date.now(),
         },
         pendingMessages: [],
     };
     let hasCompleted = false;
-    let isWriting = false;
-    let isInitialized = false;
-    // 初始化文件
-    const initializeFile = async () => {
-        if (isInitialized)
-            return;
-        isInitialized = true;
-        try {
-            // 创建XML文件头，使用占位符预留metadata位置
-            const 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>`;
-            await fs.promises.writeFile(savePath, header);
-        }
-        catch (error) {
-            console.error("初始化XML文件失败:", error);
-            isInitialized = false;
-            throw error;
-        }
-    };
-    // 每10秒写入一次数据
-    const scheduleWrite = asyncThrottle(() => writeToFile(), 10e3, {
-        immediateRunWhenEndOfDefer: true,
+    let hasPersistedHeader = false;
+    let danmaNum = 0;
+    let scNum = 0;
+    let guardNum = 0;
+    const interactedUsers = new Set();
+    const getStats = () => ({
+        danmaNum,
+        uniqMember: interactedUsers.size,
+        scNum,
+        guardNum,
     });
-    const writeToFile = async () => {
-        if (isWriting || hasCompleted || data.pendingMessages.length === 0) {
+    const trackInteractedUser = (message) => {
+        const userName = message.sender?.name?.trim();
+        if (!userName)
             return;
+        interactedUsers.add(userName);
+    };
+    const initializeFile = async (content) => {
+        // 这里有个假设，那就是第一次保存必然存在metatdata信息
+        const initialContent = data.header.replace(METADATA_PLACEHOLDER, generateMetadataXml(data.meta));
+        await fs.promises.writeFile(savePath, initialContent + content);
+        hasPersistedHeader = true;
+    };
+    const writeToFile = async (force = false) => {
+        if (!force && data.pendingMessages.length === 0) {
+            return Promise.resolve();
         }
-        // 确保文件已初始化
-        await initializeFile();
-        isWriting = true;
+        const messagesToWrite = [...data.pendingMessages];
+        data.pendingMessages = [];
         try {
-            // 获取待写入的消息
-            const messagesToWrite = [...data.pendingMessages];
-            data.pendingMessages = [];
-            // 生成XML内容
             const xmlContent = generateXmlContent(data.meta, messagesToWrite);
-            // 追加写入文件
-            await appendToXmlFile(savePath, xmlContent);
+            if (!hasPersistedHeader) {
+                await initializeFile(xmlContent);
+            }
+            else if (xmlContent) {
+                await appendToXmlFile(savePath, xmlContent);
+            }
         }
         catch (error) {
             console.error("写入XML文件失败:", error);
-            // 如果写入失败，将消息重新加入队列
-            data.pendingMessages = [...data.pendingMessages];
-        }
-        finally {
-            isWriting = false;
+            data.pendingMessages = [...messagesToWrite, ...data.pendingMessages];
         }
     };
+    // 每10秒写入一次数据
+    const writeTimer = setInterval(() => {
+        writeToFile();
+    }, 10e3);
     const addMessage = (message) => {
         if (hasCompleted)
             return;
-        // if (!isInitialized) return;
+        if (message.type === "comment") {
+            danmaNum += 1;
+        }
+        else if (message.type === "super_chat") {
+            scNum += 1;
+        }
+        else if (message.type === "guard") {
+            guardNum += 1;
+        }
+        trackInteractedUser(message);
         data.pendingMessages.push(message);
-        // 确保文件已初始化
-        initializeFile().catch(console.error);
-        scheduleWrite();
     };
     const setMeta = async (meta) => {
         if (hasCompleted)
@@ -77,30 +85,31 @@ export function createRecordExtraDataController(savePath) {
             ...data.meta,
             ...meta,
         };
-        // 确保文件已初始化，然后立即更新文件中的metadata
-        await initializeFile().catch(console.error);
-        await updateMetadataInFile(savePath, data.meta).catch(console.error);
     };
     const flush = async () => {
         if (hasCompleted)
             return;
         hasCompleted = true;
-        scheduleWrite.cancel();
-        await initializeFile().catch(console.error);
-        // 写入剩余的数据
-        if (data.pendingMessages.length > 0) {
-            await writeToFile();
+        writeTimer && clearInterval(writeTimer);
+        try {
+            await writeToFile(true);
+            await appendToXmlFile(savePath, "</i>");
+        }
+        catch (error) {
+            console.error("完成XML文件写入失败:", error);
+        }
+        finally {
+            // 清理内存
+            data.pendingMessages = [];
+            interactedUsers.clear();
         }
-        // 完成XML文件（添加结束标签等）
-        await finalizeXmlFile(savePath);
-        // 清理内存
-        data.pendingMessages = [];
     };
     return {
         data,
         addMessage,
         setMeta,
         flush,
+        getStats,
     };
 }
 /**
@@ -116,7 +125,7 @@ function generateXmlContent(metadata, messages) {
         .filter((item) => item.type === "comment")
         .map((ele) => {
         const progress = Math.max((ele.timestamp - metadata.recordStartTimestamp) / 1000, 0);
-        const data = {
+        const attrs = {
             "@@p": "",
             "@@progress": progress,
             "@@mode": String(ele.mode ?? 1),
@@ -131,18 +140,18 @@ function generateXmlContent(metadata, messages) {
             "@@uid": String(ele?.sender?.uid),
             "@@timestamp": String(ele.timestamp),
         };
-        data["@@p"] = [
-            data["@@progress"],
-            data["@@mode"],
-            data["@@fontsize"],
-            data["@@color"],
-            data["@@ctime"],
-            data["@@pool"],
-            data["@@midHash"],
-            data["@@uid"],
-            data["@@weight"],
+        attrs["@@p"] = [
+            attrs["@@progress"],
+            attrs["@@mode"],
+            attrs["@@fontsize"],
+            attrs["@@color"],
+            attrs["@@ctime"],
+            attrs["@@pool"],
+            attrs["@@midHash"],
+            attrs["@@uid"],
+            attrs["@@weight"],
         ].join(",");
-        return pick(data, ["@@p", "#text", "@@user", "@@uid", "@@timestamp"]);
+        return pick(attrs, ["@@p", "#text", "@@user", "@@uid", "@@timestamp"]);
     });
     const gifts = messages
         .filter((item) => item.type === "give_gift")
@@ -208,53 +217,20 @@ async function appendToXmlFile(filePath, content) {
         throw error;
     }
 }
-/**
- * 更新XML文件中的metadata
- */
-async function updateMetadataInFile(filePath, metadata) {
-    try {
-        const builder = new XMLBuilder({
-            ignoreAttributes: false,
-            attributeNamePrefix: "@@",
-            format: true,
-        });
-        // 生成metadata XML
-        const metadataXml = builder.build({
-            metadata: {
-                platform: metadata.platform,
-                video_start_time: metadata.recordStartTimestamp,
-                live_start_time: metadata.liveStartTimestamp,
-                room_title: metadata.title,
-                user_name: metadata.user_name,
-                room_id: metadata.room_id,
-            },
-        });
-        // 读取文件内容
-        const content = await fs.promises.readFile(filePath, "utf-8");
-        // 替换占位符为实际的metadata
-        const updatedContent = content.replace("<!--METADATA_PLACEHOLDER-->", metadataXml);
-        // 写回文件
-        await fs.promises.writeFile(filePath, updatedContent);
-    }
-    catch (error) {
-        console.error(`更新XML文件metadata失败: ${filePath}`, error);
-        throw error;
-    }
-}
-/**
- * 完成XML文件写入
- */
-async function finalizeXmlFile(filePath) {
-    try {
-        // 读取文件内容
-        const content = await fs.promises.readFile(filePath, "utf-8");
-        // 添加结束标签
-        const finalContent = content + "</i>";
-        // 写回文件
-        await fs.promises.writeFile(filePath, finalContent);
-    }
-    catch (error) {
-        console.error(`完成XML文件写入失败: ${filePath}`, error);
-        throw error;
-    }
+function generateMetadataXml(metadata) {
+    const builder = new XMLBuilder({
+        ignoreAttributes: false,
+        attributeNamePrefix: "@@",
+        format: true,
+    });
+    return builder.build({
+        metadata: {
+            platform: metadata.platform,
+            video_start_time: metadata.recordStartTimestamp,
+            live_start_time: metadata.liveStartTimestamp,
+            room_title: metadata.title,
+            user_name: metadata.user_name,
+            room_id: metadata.room_id,
+        },
+    });
 }

package/package.json

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

package/lib/record_extra_data_controller.d.ts

@@ -1,28 +0,0 @@
-import { Message } from "./common.js";
-export interface RecordExtraData {
-    meta: {
-        title?: string;
-        recordStartTimestamp: number;
-        recordStopTimestamp?: number;
-        liveStartTimestamp?: number;
-        downloaderArgs?: string[];
-        platform?: string;
-        user_name?: string;
-        room_id?: string;
-    };
-    /** 这个数组预期上是一个根据 timestamp 排序的有序数组，方便做一些时间段查询 */
-    messages: Message[];
-}
-export interface RecordExtraDataController {
-    /** 设计上来说，外部程序不应该能直接修改 data 上的东西 */
-    readonly data: RecordExtraData;
-    addMessage: (message: Message) => void;
-    setMeta: (meta: Partial<RecordExtraData["meta"]>) => void;
-    flush: () => Promise<void>;
-}
-export declare function createRecordExtraDataController(savePath: string): RecordExtraDataController;
-/**
- * 转换弹幕为b站格式xml
- * @link: https://socialsisteryi.github.io/bilibili-API-collect/docs/danmaku/danmaku_xml.html#%E5%B1%9E%E6%80%A7-p
- */
-export declare function convert2Xml(data: RecordExtraData): string;

package/lib/record_extra_data_controller.js

@@ -1,168 +0,0 @@
-/**
- * 用一个视频之外的独立文件来存储元信息和弹幕、礼物等信息。
- * 暂时使用 json 作为存储方案试试效果，猜测可能会有实时写入差、占用空间大的问题。
- */
-import path from "node:path";
-import fs from "node:fs";
-import { XMLBuilder } from "fast-xml-parser";
-import { pick } from "lodash-es";
-import { asyncThrottle } from "./utils.js";
-export function createRecordExtraDataController(savePath) {
-    const data = {
-        meta: {
-            recordStartTimestamp: Date.now(),
-        },
-        messages: [],
-    };
-    let hasCompleted = false;
-    const scheduleSave = asyncThrottle(() => save(), 30e3, {
-        immediateRunWhenEndOfDefer: true,
-    });
-    const save = () => {
-        return fs.promises.writeFile(savePath, JSON.stringify(data));
-    };
-    // TODO: 将所有数据存放在内存中可能存在问题
-    const addMessage = (comment) => {
-        if (hasCompleted)
-            return;
-        data.messages.push(comment);
-        scheduleSave();
-    };
-    const setMeta = (meta) => {
-        if (hasCompleted)
-            return;
-        data.meta = {
-            ...data.meta,
-            ...meta,
-        };
-        scheduleSave();
-    };
-    const flush = async () => {
-        if (hasCompleted)
-            return;
-        hasCompleted = true;
-        scheduleSave.cancel();
-        const xmlContent = convert2Xml(data);
-        const parsedPath = path.parse(savePath);
-        const xmlPath = path.join(parsedPath.dir, parsedPath.name + ".xml");
-        await fs.promises.writeFile(xmlPath, xmlContent);
-        await fs.promises.rm(savePath);
-        data.messages = [];
-    };
-    return {
-        data,
-        addMessage,
-        setMeta,
-        flush,
-    };
-}
-/**
- * 转换弹幕为b站格式xml
- * @link: https://socialsisteryi.github.io/bilibili-API-collect/docs/danmaku/danmaku_xml.html#%E5%B1%9E%E6%80%A7-p
- */
-export function convert2Xml(data) {
-    const metadata = data.meta;
-    const builder = new XMLBuilder({
-        ignoreAttributes: false,
-        attributeNamePrefix: "@@",
-        format: true,
-    });
-    const comments = data.messages
-        .filter((item) => item.type === "comment")
-        .map((ele) => {
-        const progress = Math.max((ele.timestamp - metadata.recordStartTimestamp) / 1000, 0);
-        const data = {
-            "@@p": "",
-            "@@progress": progress,
-            "@@mode": String(ele.mode ?? 1),
-            "@@fontsize": String(25),
-            "@@color": String(parseInt((ele.color || "#ffffff").replace("#", ""), 16)),
-            "@@midHash": String(ele?.sender?.uid),
-            "#text": String(ele?.text || ""),
-            "@@ctime": String(ele.timestamp),
-            "@@pool": String(0),
-            "@@weight": String(0),
-            "@@user": String(ele.sender?.name),
-            "@@uid": String(ele?.sender?.uid),
-            "@@timestamp": String(ele.timestamp),
-        };
-        data["@@p"] = [
-            data["@@progress"],
-            data["@@mode"],
-            data["@@fontsize"],
-            data["@@color"],
-            data["@@ctime"],
-            data["@@pool"],
-            data["@@midHash"],
-            data["@@uid"],
-            data["@@weight"],
-        ].join(",");
-        return pick(data, ["@@p", "#text", "@@user", "@@uid", "@@timestamp"]);
-    });
-    const gifts = data.messages
-        .filter((item) => item.type === "give_gift")
-        .map((ele) => {
-        const progress = Math.max((ele.timestamp - metadata.recordStartTimestamp) / 1000, 0);
-        const data = {
-            "@@ts": progress,
-            "@@giftname": String(ele.name),
-            "@@giftcount": String(ele.count),
-            "@@price": String(ele.price * 1000),
-            "@@user": String(ele.sender?.name),
-            "@@uid": String(ele?.sender?.uid),
-            "@@timestamp": String(ele.timestamp),
-            // "@@raw": JSON.stringify(ele),
-        };
-        return data;
-    });
-    const superChats = data.messages
-        .filter((item) => item.type === "super_chat")
-        .map((ele) => {
-        const progress = Math.max((ele.timestamp - metadata.recordStartTimestamp) / 1000, 0);
-        const data = {
-            "@@ts": progress,
-            "@@price": String(ele.price * 1000),
-            "#text": String(ele.text),
-            "@@user": String(ele.sender?.name),
-            "@@uid": String(ele?.sender?.uid),
-            "@@timestamp": String(ele.timestamp),
-            // "@@raw": JSON.stringify(ele),
-        };
-        return data;
-    });
-    const guardGift = data.messages
-        .filter((item) => item.type === "guard")
-        .map((ele) => {
-        const progress = Math.max((ele.timestamp - metadata.recordStartTimestamp) / 1000, 0);
-        const data = {
-            "@@ts": progress,
-            "@@price": String(ele.price * 1000),
-            "@@giftname": String(ele.name),
-            "@@giftcount": String(ele.count),
-            "@@level": String(ele.level),
-            "@@user": String(ele.sender?.name),
-            "@@uid": String(ele?.sender?.uid),
-            "@@timestamp": String(ele.timestamp),
-            // "@@raw": JSON.stringify(ele),
-        };
-        return data;
-    });
-    const xmlContent = builder.build({
-        i: {
-            metadata: {
-                platform: metadata.platform,
-                video_start_time: metadata.recordStartTimestamp,
-                live_start_time: metadata.liveStartTimestamp,
-                room_title: metadata.title,
-                user_name: metadata.user_name,
-                room_id: metadata.room_id,
-            },
-            d: comments,
-            gift: gifts,
-            sc: superChats,
-            guard: guardGift,
-        },
-    });
-    return `<?xml version="1.0" encoding="utf-8"?>
-${xmlContent}`;
-}