@bililive-tools/manager 1.16.1 → 1.16.2

package/lib/downloader/mesioDownloader.js

@@ -145,7 +145,7 @@ export class mesioDownloader extends EventEmitter {
         });
     }
     createCommand() {
-        const inputOptions = [...this.inputOptions, "--fix", "--no-proxy"];
+        const inputOptions = [...this.inputOptions, "--fix", "--no-proxy", "--disable-log-file"];
         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/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站弹幕录制 */
@@ -66,7 +68,7 @@ export interface RecorderCreateOpts<E extends AnyObject = UnknownObject> {
     /** 调试等级 */
     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 = {

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.16.2",
   "description": "Batch scheduling recorders",
   "main": "./lib/index.js",
   "type": "module",