@bililive-tools/manager 1.8.0 → 1.9.0

package/README.md

@@ -94,19 +94,22 @@ setBililivePath("BililiveRecorder.Cli.exe");
 
 默认值为 `{platform}/{owner}/{year}-{month}-{date} {hour}-{min}-{sec} {title}`
 
-| 值          | 标签   |
-| ----------- | ------ |
-| {platform}  | 平台   |
-| {channelId} | 房间号 |
-| {remarks}   | 备注   |
-| {owner}     | 主播名 |
-| {title}     | 标题   |
-| {year}      | 年     |
-| {month}     | 月     |
-| {date}      | 日     |
-| {hour}      | 时     |
-| {min}       | 分     |
-| {sec}       | 秒     |
+| 值                | 标签                                       |
+| ----------------- | ------------------------------------------ |
+| {platform}        | 平台                                       |
+| {channelId}       | 房间号                                     |
+| {remarks}         | 备注                                       |
+| {owner}           | 主播名                                     |
+| {title}           | 标题                                       |
+| {year}            | 年                                         |
+| {month}           | 月                                         |
+| {date}            | 日                                         |
+| {hour}            | 时                                         |
+| {min}             | 分                                         |
+| {sec}             | 秒                                         |
+| {startTime}       | 分段开始时间，Date对象                     |
+| {recordStartTime} | 录制开始时间，Date对象                     |
+| {liveStartTime}   | 直播开始时间，Date对象，抖音同录制开始时间 |
 
 ## 事件
 

package/lib/common.d.ts

@@ -1,11 +1,10 @@
 import { AnyObject, UnknownObject } from "./utils.js";
 export type ChannelId = string;
 export declare const Qualities: readonly ["lowest", "low", "medium", "high", "highest"];
-export declare const BiliQualities: readonly [30000, 20000, 10000, 400, 250, 150, 80];
 export declare const DouyuQualities: readonly [0, 2, 3, 4, 8];
 export declare const HuYaQualities: readonly [0, 20000, 14100, 14000, 10000, 8000, 4200, 4000, 2000, 500, -1];
 export declare const DouYinQualities: readonly ["origin", "uhd", "hd", "sd", "ld", "ao", "real_origin"];
-export type Quality = (typeof Qualities)[number] | (typeof BiliQualities)[number] | (typeof DouyuQualities)[number] | (typeof HuYaQualities)[number] | (typeof DouYinQualities)[number];
+export type Quality = string | number;
 export interface MessageSender<E extends AnyObject = UnknownObject> {
     uid?: string;
     name: string;

package/lib/common.js

@@ -1,5 +1,4 @@
 export const Qualities = ["lowest", "low", "medium", "high", "highest"];
-export const BiliQualities = [30000, 20000, 10000, 400, 250, 150, 80];
 export const DouyuQualities = [0, 2, 3, 4, 8];
 // 14100: 2K HDR；14000：2K；4200：HDR(10M)；0：原画；8000：蓝光8M；4000：蓝光4M；2000：超清；500：流畅
 export const HuYaQualities = [

package/lib/index.d.ts

@@ -24,3 +24,4 @@ export declare function getMesioPath(): string;
 export declare function setBililivePath(newPath: string): void;
 export declare function getBililivePath(): string;
 export declare function getDataFolderPath<E extends AnyObject>(provider: RecorderProvider<E>): string;
+export type VideoFormat = "auto" | "ts" | "mkv" | "flv" | "mp4" | "m4s";

package/lib/manager.d.ts

@@ -103,7 +103,9 @@ export declare function createRecorderManager<ME extends AnyObject = UnknownObje
 export declare function genSavePathFromRule<ME extends AnyObject, P extends RecorderProvider<AnyObject>, PE extends AnyObject, E extends AnyObject>(manager: RecorderManager<ME, P, PE, E>, recorder: Recorder<E>, extData: {
     owner: string;
     title: string;
-    startTime?: number;
+    startTime: number;
+    liveStartTime: Date;
+    recordStartTime: Date;
 }): string;
 export type GetProviderExtra<P> = P extends RecorderProvider<infer E> ? E : never;
 export { StreamManager, Cache };

package/lib/manager.js

@@ -312,12 +312,12 @@ export function genSavePathFromRule(manager, recorder, extData) {
     // TODO: 这里随便写的，后面再优化
     const provider = manager.providers.find((p) => p.id === recorder.toJSON().providerId);
     const now = extData?.startTime ? new Date(extData.startTime) : new Date();
-    const owner = (extData?.owner ?? "").replaceAll("%", "_");
-    const title = (extData?.title ?? "").replaceAll("%", "_");
+    const owner = removeSystemReservedChars((extData?.owner ?? "").replaceAll("%", "_"));
+    const title = removeSystemReservedChars((extData?.title ?? "").replaceAll("%", "_"));
+    const remarks = removeSystemReservedChars((recorder.remarks ?? "").replaceAll("%", "_"));
+    const channelId = removeSystemReservedChars(String(recorder.channelId));
     const params = {
         platform: provider?.name ?? "unknown",
-        channelId: recorder.channelId,
-        remarks: recorder.remarks ?? "",
         year: formatDate(now, "yyyy"),
         month: formatDate(now, "MM"),
         date: formatDate(now, "dd"),
@@ -325,20 +325,19 @@ export function genSavePathFromRule(manager, recorder, extData) {
         min: formatDate(now, "mm"),
         sec: formatDate(now, "ss"),
         ...extData,
+        startTime: now,
         owner: owner,
         title: title,
+        remarks: remarks,
+        channelId,
     };
-    if (manager.autoRemoveSystemReservedChars) {
-        for (const key in params) {
-            params[key] = removeSystemReservedChars(String(params[key])).trim();
-        }
-    }
     let savePathRule = manager.savePathRule;
     try {
         savePathRule = ejs.render(savePathRule, params);
+        console.log("解析后保存路径模板：", savePathRule, params);
     }
     catch (error) {
-        console.error("模板解析错误", error);
+        console.error("模板解析错误", error, savePathRule, params);
     }
     return formatTemplate(savePathRule, params);
 }

package/lib/recorder/BililiveRecorder.js

@@ -43,7 +43,6 @@ class BililiveRecorderCommand extends EventEmitter {
     run() {
         const args = this._getArguments();
         const bililiveExecutable = getBililivePath();
-        console.log("Starting BililiveRecorder with args:", bililiveExecutable, args);
         this.process = spawn(bililiveExecutable, args, {
             stdio: ["pipe", "pipe", "pipe"],
         });
@@ -116,8 +115,8 @@ export class BililiveRecorder extends EventEmitter {
         this.segment = opts.segment;
         this.headers = opts.headers;
         this.command = this.createCommand();
-        this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename }) => {
-            this.emit("videoFileCreated", { filename, cover, rawFilename });
+        this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
+            this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
         this.streamManager.on("videoFileCompleted", ({ filename }) => {
             this.emit("videoFileCompleted", { filename });

package/lib/recorder/FFMPEGRecorder.d.ts

@@ -1,6 +1,7 @@
 import EventEmitter from "node:events";
 import { IRecorder, FFMPEGRecorderOptions } from "./IRecorder.js";
-import type { FormatName } from "./index.js";
+import { FormatName } from "./index.js";
+import type { VideoFormat } from "../index.js";
 export declare class FFMPEGRecorder extends EventEmitter implements IRecorder {
     private onEnd;
     private onUpdateLiveInfo;
@@ -20,7 +21,7 @@ export declare class FFMPEGRecorder extends EventEmitter implements IRecorder {
     readonly disableDanma: boolean;
     readonly url: string;
     formatName: FormatName;
-    videoFormat: "ts" | "mkv" | "mp4";
+    videoFormat: VideoFormat;
     readonly debugLevel: "none" | "basic" | "verbose";
     readonly headers: {
         [key: string]: string | undefined;
@@ -30,6 +31,7 @@ export declare class FFMPEGRecorder extends EventEmitter implements IRecorder {
         cover?: string;
     }>);
     createCommand(): import("@renmu/fluent-ffmpeg").FfmpegCommand;
+    buildOutputOptions(): string[];
     formatLine(line: string): {
         time: string | null;
     } | null;

package/lib/recorder/FFMPEGRecorder.js

@@ -37,7 +37,7 @@ export class FFMPEGRecorder extends EventEmitter {
         let videoFormat = opts.videoFormat ?? "auto";
         if (videoFormat === "auto") {
             if (!this.hasSegment) {
-                videoFormat = "mp4";
+                videoFormat = "m4s";
                 if (this.formatName === "ts") {
                     videoFormat = "ts";
                 }
@@ -59,8 +59,8 @@ export class FFMPEGRecorder extends EventEmitter {
         this.segment = opts.segment;
         this.headers = opts.headers;
         this.command = this.createCommand();
-        this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename }) => {
-            this.emit("videoFileCreated", { filename, cover, rawFilename });
+        this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
+            this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
         this.streamManager.on("videoFileCompleted", ({ filename }) => {
             this.emit("videoFileCompleted", { filename });
@@ -95,10 +95,11 @@ export class FFMPEGRecorder extends EventEmitter {
                 inputOptions.push("-headers", headers.join("\\r\\n"));
             }
         }
+        const outputOptions = this.buildOutputOptions();
         const command = createFFMPEGBuilder()
             .input(this.url)
             .inputOptions(inputOptions)
-            .outputOptions(this.ffmpegOutputOptions)
+            .outputOptions(outputOptions)
             .output(this.streamManager.videoFilePath)
             .on("error", this.onEnd)
             .on("end", () => this.onEnd("finished"))
@@ -116,10 +117,24 @@ export class FFMPEGRecorder extends EventEmitter {
             }
         })
             .on("stderr", this.timeoutChecker?.update);
+        return command;
+    }
+    buildOutputOptions() {
+        const options = [];
+        options.push(...this.ffmpegOutputOptions);
+        options.push("-c", "copy", "-movflags", "+frag_keyframe+empty_moov+separate_moof", "-fflags", "+genpts+igndts", "-min_frag_duration", "10000000");
         if (this.hasSegment) {
-            command.outputOptions("-f", "segment", "-segment_time", String(this.segment * 60), "-reset_timestamps", "1");
+            options.push("-f", "segment", "-segment_time", String(this.segment * 60), "-reset_timestamps", "1");
+            if (this.videoFormat === "m4s") {
+                options.push("-segment_format", "mp4");
+            }
         }
-        return command;
+        else {
+            if (this.videoFormat === "m4s") {
+                options.push("-f", "mp4");
+            }
+        }
+        return options;
     }
     formatLine(line) {
         if (!line.includes("time=")) {

package/lib/recorder/IRecorder.d.ts

@@ -1,5 +1,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";
 /**
  * 录制器构造函数选项的基础接口
  */
@@ -17,7 +19,7 @@ export interface BaseRecorderOptions {
     headers?: {
         [key: string]: string | undefined;
     };
-    videoFormat?: "auto" | "ts" | "mkv" | "mp4";
+    videoFormat?: VideoFormat;
 }
 /**
  * 录制器接口定义
@@ -39,12 +41,13 @@ export interface IRecorder extends EventEmitter {
     run(): void;
     stop(): Promise<void>;
     getArguments(): string[];
-    getExtraDataController(): any;
+    getExtraDataController(): XmlStreamController | null;
     createCommand(): any;
     on(event: "videoFileCreated", listener: (data: {
         filename: string;
         cover?: string;
         rawFilename?: string;
+        title?: string;
     }) => void): this;
     on(event: "videoFileCompleted", listener: (data: {
         filename: string;
@@ -59,6 +62,7 @@ export interface IRecorder extends EventEmitter {
         filename: string;
         cover?: string;
         rawFilename?: string;
+        title?: string;
     }): boolean;
     emit(event: "videoFileCompleted", data: {
         filename: string;

package/lib/recorder/mesioRecorder.js

@@ -128,8 +128,8 @@ export class MesioRecorder extends EventEmitter {
         this.segment = opts.segment;
         this.headers = opts.headers;
         this.command = this.createCommand();
-        this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename }) => {
-            this.emit("videoFileCreated", { filename, cover, rawFilename });
+        this.streamManager.on("videoFileCreated", ({ filename, cover, rawFilename, title }) => {
+            this.emit("videoFileCreated", { filename, cover, rawFilename, title });
         });
         this.streamManager.on("videoFileCompleted", ({ filename }) => {
             this.emit("videoFileCompleted", { filename });
@@ -144,6 +144,7 @@ export class MesioRecorder extends EventEmitter {
             "--fix",
             "-H",
             "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36",
+            "--no-proxy",
         ];
         if (this.debugLevel === "verbose") {
             inputOptions.push("-v");

package/lib/recorder/streamManager.d.ts

@@ -1,12 +1,12 @@
 import EventEmitter from "node:events";
 import { createRecordExtraDataController } from "../xml_stream_controller.js";
 import type { RecorderCreateOpts } from "../recorder.js";
+import type { VideoFormat } from "../index.js";
 export type GetSavePath = (data: {
     startTime: number;
     title?: string;
 }) => string;
 type RecorderType = Exclude<RecorderCreateOpts["recorderType"], undefined | "auto">;
-type VideoFormat = "auto" | "ts" | "mkv" | "flv" | "mp4" | "m4s";
 export declare class Segment extends EventEmitter {
     extraDataController: ReturnType<typeof createRecordExtraDataController> | null;
     init: boolean;

package/lib/recorder.d.ts

@@ -3,6 +3,7 @@ import { ChannelId, Message, Quality } from "./common.js";
 import { RecorderProvider } from "./manager.js";
 import { AnyObject, PickRequired, UnknownObject } from "./utils.js";
 import { Cache } from "./cache.js";
+import type { RecorderType } from "./recorder/index.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> {
@@ -44,7 +45,7 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     /** 标题关键词，如果直播间标题包含这些关键词，则不会自动录制（仅对斗鱼有效），多个关键词用英文逗号分隔 */
     titleKeywords?: string;
     /** 用于指定录制文件格式，auto时，分段使用ts，不分段使用mp4 */
-    videoFormat?: "auto" | "ts" | "mkv";
+    videoFormat?: "auto" | "ts" | "mkv" | "flv";
     /** 录制类型 */
     recorderType?: "auto" | "ffmpeg" | "mesio" | "bililive";
     /** 流格式优先级 */
@@ -71,6 +72,7 @@ export interface RecordHandle {
     id: string;
     stream: string;
     source: string;
+    recorderType?: RecorderType;
     url: string;
     ffmpegArgs?: string[];
     progress?: Progress;
@@ -85,7 +87,9 @@ export interface DebugLog {
 export type GetSavePath = (data: {
     owner: string;
     title: string;
-    startTime?: number;
+    startTime: number;
+    liveStartTime: Date;
+    recordStartTime: Date;
 }) => string;
 export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
     RecordStart: RecordHandle;
@@ -121,7 +125,7 @@ export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
         living: boolean;
         owner: string;
         title: string;
-        startTime?: Date;
+        startTime: Date;
         avatar: string;
         cover: string;
         liveId?: string;

package/lib/utils.d.ts

@@ -34,7 +34,7 @@ export declare function assertStringType(data: unknown, msg?: string): asserts d
 export declare function assertNumberType(data: unknown, msg?: string): asserts data is number;
 export declare function assertObjectType(data: unknown, msg?: string): asserts data is object;
 export declare function formatDate(date: Date, format: string): string;
-export declare function removeSystemReservedChars(filename: string): string;
+export declare function removeSystemReservedChars(str: string): string;
 export declare function isFfmpegStartSegment(line: string): boolean;
 export declare function isMesioStartSegment(line: string): boolean;
 export declare function isBililiveStartSegment(line: string): boolean;

package/lib/utils.js

@@ -120,8 +120,8 @@ export function formatDate(date, format) {
     };
     return format.replace(/yyyy|MM|dd|HH|mm|ss/g, (matched) => map[matched]);
 }
-export function removeSystemReservedChars(filename) {
-    return filenamify(filename, { replacement: "_" });
+export function removeSystemReservedChars(str) {
+    return filenamify(str, { replacement: "_" });
 }
 export function isFfmpegStartSegment(line) {
     return line.includes("Opening ") && line.includes("for writing");

package/lib/xml_stream_controller.d.ts

@@ -17,7 +17,7 @@ export interface XmlStreamController {
     /** 设计上来说，外部程序不应该能直接修改 data 上的东西 */
     readonly data: XmlStreamData;
     addMessage: (message: Message) => void;
-    setMeta: (meta: Partial<XmlStreamData["meta"]>) => void;
+    setMeta: (meta: Partial<XmlStreamData["meta"]>) => Promise<void>;
     flush: () => Promise<void>;
 }
 export declare function createRecordExtraDataController(savePath: string): XmlStreamController;

package/lib/xml_stream_controller.js

@@ -70,13 +70,16 @@ export function createRecordExtraDataController(savePath) {
         initializeFile().catch(console.error);
         scheduleWrite();
     };
-    const setMeta = (meta) => {
+    const setMeta = async (meta) => {
         if (hasCompleted)
             return;
         data.meta = {
             ...data.meta,
             ...meta,
         };
+        // 确保文件已初始化，然后立即更新文件中的metadata
+        await initializeFile().catch(console.error);
+        await updateMetadataInFile(savePath, data.meta).catch(console.error);
     };
     const flush = async () => {
         if (hasCompleted)
@@ -89,7 +92,7 @@ export function createRecordExtraDataController(savePath) {
             await writeToFile();
         }
         // 完成XML文件（添加结束标签等）
-        await finalizeXmlFile(savePath, data.meta);
+        await finalizeXmlFile(savePath);
         // 清理内存
         data.pendingMessages = [];
     };
@@ -206,9 +209,9 @@ async function appendToXmlFile(filePath, content) {
     }
 }
 /**
- * 完成XML文件写入
+ * 更新XML文件中的metadata
  */
-async function finalizeXmlFile(filePath, metadata) {
+async function updateMetadataInFile(filePath, metadata) {
     try {
         const builder = new XMLBuilder({
             ignoreAttributes: false,
@@ -228,8 +231,25 @@ async function finalizeXmlFile(filePath, metadata) {
         });
         // 读取文件内容
         const content = await fs.promises.readFile(filePath, "utf-8");
-        // 替换占位符为实际的metadata，并添加结束标签
-        const finalContent = content.replace("<!--METADATA_PLACEHOLDER-->", metadataXml) + "</i>";
+        // 替换占位符为实际的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);
     }

package/package.json

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