@bililive-tools/manager 1.14.1 → 1.16.0

package/lib/downloader/BililiveDownloader.js

@@ -194,6 +194,11 @@ export class BililiveDownloader extends EventEmitter {
         if (timeMatch) {
             time = timeMatch[1];
         }
+        const spaceMath = line.match(/下载进度:\s*([\d.]+\s*MB)\s*/);
+        if (spaceMath) {
+            const space = spaceMath[1];
+            time = time ? `${time} ${space}` : space;
+        }
         return {
             time,
         };

package/lib/downloader/FFmpegDownloader.js

@@ -154,7 +154,7 @@ export class FFmpegDownloader extends EventEmitter {
         let time = null;
         const timeMatch = line.match(/time=([0-9:.]+)/);
         if (timeMatch) {
-            time = timeMatch[1];
+            time = timeMatch[1].split(".")[0];
         }
         return {
             time,

package/lib/downloader/IDownloader.d.ts

@@ -11,6 +11,7 @@ export interface BaseRecorderOptions {
     getSavePath: (data: {
         startTime: number;
         title?: string;
+        extraMs?: boolean;
     }) => string;
     segment: Segment;
     inputOptions?: string[];
@@ -38,6 +39,7 @@ export interface IDownloader extends EventEmitter {
     readonly getSavePath: (data: {
         startTime: number;
         title?: string;
+        extraMs?: boolean;
     }) => string;
     run(): void;
     stop(): Promise<void>;

package/lib/downloader/streamManager.d.ts

@@ -5,6 +5,7 @@ import type { TrueVideoFormat } from "../index.js";
 export type GetSavePath = (data: {
     startTime: number;
     title?: string;
+    extraMs?: boolean;
 }) => string;
 type RecorderType = Exclude<RecorderCreateOpts["recorderType"], undefined | "auto">;
 export declare class Segment extends EventEmitter {

package/lib/downloader/streamManager.js

@@ -1,5 +1,6 @@
 import EventEmitter from "node:events";
 import fs from "fs/promises";
+import fsSync from "fs";
 import { createRecordExtraDataController } from "../xml_stream_controller.js";
 import { ensureFolderExist, isFfmpegStartSegment, isMesioStartSegment, isBililiveStartSegment, isFfmpegStart, retry, cleanTerminalText, } from "../utils.js";
 export class Segment extends EventEmitter {
@@ -64,10 +65,19 @@ export class Segment extends EventEmitter {
                 });
             }
         }
-        this.outputVideoFilePath = this.getSavePath({
+        let recordSavePath = this.getSavePath({
             startTime: startTime,
-            title: liveInfo?.title,
+            title: liveInfo?.title ? liveInfo.title : undefined,
         });
+        // 文件重复判断
+        if (fsSync.existsSync(recordSavePath + "." + this.videoExt)) {
+            recordSavePath = this.getSavePath({
+                startTime: startTime,
+                title: liveInfo?.title,
+                extraMs: true,
+            });
+        }
+        this.outputVideoFilePath = recordSavePath;
         ensureFolderExist(this.outputVideoFilePath);
         if (!this.disableDanma) {
             this.extraDataController = createRecordExtraDataController(`${this.outputVideoFilePath}.xml`);
@@ -112,12 +122,19 @@ export class StreamManager extends EventEmitter {
     callBack;
     constructor(getSavePath, hasSegment, disableDanma, recorderType, videoFormat, callBack) {
         super();
-        const recordSavePath = getSavePath({ startTime: Date.now() });
-        this.recordSavePath = recordSavePath;
+        const startTime = Date.now();
+        let recordSavePath = getSavePath({ startTime });
         this.videoFormat = videoFormat;
         this.recorderType = recorderType;
         this.hasSegment = hasSegment;
         this.callBack = callBack;
+        console.log("Initial recordSavePath:", recordSavePath);
+        // 文件重复判断
+        if (fsSync.existsSync(recordSavePath + "." + videoFormat)) {
+            console.log("File already exists, generating new save path with extraMs");
+            recordSavePath = getSavePath({ startTime, extraMs: true });
+        }
+        this.recordSavePath = recordSavePath;
         if (hasSegment) {
             this.segment = new Segment(getSavePath, disableDanma, this.videoExt);
             this.segment.on("DebugLog", (data) => {
@@ -131,6 +148,7 @@ export class StreamManager extends EventEmitter {
             });
         }
         else {
+            ensureFolderExist(recordSavePath);
             const extraDataSavePath = `${recordSavePath}.xml`;
             if (!disableDanma) {
                 this.extraDataController = createRecordExtraDataController(extraDataSavePath);

package/lib/manager.d.ts

@@ -125,6 +125,7 @@ export declare function genSavePathFromRule<ME extends AnyObject, P extends Reco
     startTime: number;
     liveStartTime: Date;
     recordStartTime: Date;
+    extraMs?: boolean;
 }): string;
 export type GetProviderExtra<P> = P extends RecorderProvider<infer E> ? E : never;
 export { StreamManager };

package/lib/manager.js

@@ -381,6 +381,9 @@ export function genSavePathFromRule(manager, recorder, extData) {
         channelId,
     };
     let savePathRule = manager.savePathRule;
+    if (extData?.extraMs) {
+        savePathRule += "_{ms}";
+    }
     try {
         savePathRule = ejs.render(savePathRule, params);
     }

package/lib/recorder.d.ts

@@ -93,6 +93,7 @@ export type GetSavePath = (data: {
     startTime: number;
     liveStartTime: Date;
     recordStartTime: Date;
+    extraMs?: boolean;
 }) => string;
 export interface Recorder<E extends AnyObject = UnknownObject> extends Emitter<{
     RecordStart: RecordHandle;

package/package.json

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