bililive-cli 3.13.1 → 3.14.0

package/lib/{index-CgpPN0zA.cjs → index-DnN22ZAd.cjs}

@@ -11575,7 +11575,7 @@ const APP_DEFAULT_CONFIG = {
             },
         ],
         songRecognizeAsr: {
-            modelId: "",
+            modelId: "bcut",
         },
         songRecognizeLlm: {
             modelId: "",
@@ -12136,6 +12136,7 @@ const defaultRecordConfig = {
     sendToWebhook: false,
     noGlobalFollowFields: [],
     saveCover: false,
+    convert2Mp4: false,
     extra: {},
     qualityRetry: 0,
     formatName: "auto",
@@ -54494,7 +54495,7 @@ async function trash(paths, options) {
 	} else if (process$2.platform === 'win32') {
 		module = await Promise.resolve().then(function () { return require('./windows-OmnJ7a39.cjs'); });
 	} else {
-		module = await Promise.resolve().then(function () { return require('./linux-B6245EX2.cjs'); });
+		module = await Promise.resolve().then(function () { return require('./linux-CH6NYi8a.cjs'); });
 	}
 
 	return module.default(paths);
@@ -61384,9 +61385,6 @@ const genFfmpegParams = (options) => {
     if (options.audioCodec) {
         result.push(`-c:a ${options.audioCodec}`);
     }
-    else {
-        result.push(`-c:a copy`);
-    }
     if (options.extraOptions) {
         options.extraOptions.split(" ").forEach((option) => {
             result.push(option);
@@ -181078,26 +181076,31 @@ const checkMergeVideos = async (inputFiles) => {
     const videoMetas = await Promise.all(inputFiles.map((file) => readVideoMeta(file)));
     const errors = [];
     const warnings = [];
+    const videoStream0 = videoMetas[0].streams.find((stream) => stream.codec_type === "video");
+    const audioStream0 = videoMetas[0].streams.find((stream) => stream.codec_type === "audio");
     for (const meta of videoMetas) {
         if (meta.format.format_name !== videoMetas[0].format.format_name) {
             errors.push("输入视频容器不一致");
         }
         const videoStream = meta.streams.find((stream) => stream.codec_type === "video");
-        const videoStream0 = videoMetas[0].streams.find((stream) => stream.codec_type === "video");
         const audioStream = meta.streams.find((stream) => stream.codec_type === "audio");
-        const audioStream0 = videoMetas[0].streams.find((stream) => stream.codec_type === "audio");
         if (videoStream?.codec_name !== videoStream0?.codec_name) {
             errors.push("输入视频编码器不一致");
         }
         if (audioStream?.codec_name !== audioStream0?.codec_name) {
             errors.push("输入视频音频编码器不一致");
         }
-        // 分辨率不一致警告
         if (videoStream?.width !== videoStream0?.width) {
-            warnings.push("输入视频分辨率宽不一致");
+            errors.push("输入视频分辨率宽不一致");
         }
         if (videoStream?.height !== videoStream0?.height) {
-            warnings.push("输入视频分辨率高不一致");
+            errors.push("输入视频分辨率高不一致");
+        }
+        if (audioStream?.sample_rate !== audioStream0?.sample_rate) {
+            errors.push("输入视频音频采样率不一致");
+        }
+        if (videoStream?.r_frame_rate !== videoStream0?.r_frame_rate) {
+            warnings.push("输入视频帧率不一致");
         }
     }
     return {
@@ -186333,6 +186336,9 @@ function createRecordExtraDataController(savePath) {
             // 清理内存
             data.pendingMessages = [];
             interactedUsers.clear();
+            danmaNum = 0;
+            scNum = 0;
+            guardNum = 0;
         }
     };
     return {
@@ -186476,11 +186482,13 @@ class Segment extends EventEmitter$j {
     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 {
@@ -186521,11 +186529,13 @@ class Segment extends EventEmitter$j {
         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) {
@@ -186606,7 +186616,9 @@ class StreamManager extends EventEmitter$j {
         }
         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);
             });
@@ -187225,7 +187237,7 @@ class mesioDownloader extends EventEmitter$j {
         });
     }
     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");
         }
@@ -187801,6 +187813,7 @@ function defaultToJSON(provider, recorder) {
             "segment",
             "saveSCDanma",
             "saveCover",
+            "convert2Mp4",
             "saveGiftDanma",
             "disableProvideCommentsWhenRecording",
             "liveInfo",
@@ -196084,14 +196097,14 @@ const getMatchingFiles = async (config, folderPath, startTime) => {
         .filter((result) => {
         // 排除directory，开始时间大于startTime，ctime大于当前时间五分钟，startTimeMs从旧到新排序
         const filename = require$$0$7.basename(result.path);
-        const startTimeMs = extractStartTimeFromFilename(filename, config.startTimeAutoMatch, result.value.birthtimeMs);
+        const startTimeMs = extractStartTimeFromFilename(filename, config.startTimeAutoMatch, result.value.birthtimeMs || result.value.ctimeMs);
         return (result.value.isFile() &&
             startTimeMs > startTime &&
             Date.now() - result.value.ctimeMs > 1 * 60 * 1000);
     })
         .map((result) => {
         const filename = require$$0$7.basename(result.path);
-        const startTimeMs = extractStartTimeFromFilename(filename, config.startTimeAutoMatch, result.value.birthtimeMs);
+        const startTimeMs = extractStartTimeFromFilename(filename, config.startTimeAutoMatch, result.value.birthtimeMs || result.value.ctimeMs);
         return {
             path: result.path,
             startTimeMs,
@@ -213077,34 +213090,47 @@ const checkLiveStatusAndRecord$2 = async function ({ getSavePath, isManualStart,
         uid: Number(this.uid),
         useServerTimestamp: this.useServerTimestamp,
     });
-    if (!this.disableProvideCommentsWhenRecording) {
-        danmaClient.on("Message", (msg) => {
-            const extraDataController = downloader.getExtraDataController();
-            if (!extraDataController)
-                return;
-            if (msg.type === "super_chat" && this.saveSCDanma === false)
-                return;
-            if ((msg.type === "give_gift" || msg.type === "guard") && this.saveGiftDanma === false)
-                return;
-            this.emit("Message", msg);
-            extraDataController.addMessage(msg);
-        });
-        danmaClient.on("onRoomInfoChange", (msg) => {
-            if (utils$2.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
-                const title = msg?.body?.title ?? "";
-                const hasTitleKeyword = utils$2.hasBlockedTitleKeywords(title, this.titleKeywords);
-                if (hasTitleKeyword) {
-                    this.state = "title-blocked";
-                    this.emit("DebugLog", {
-                        type: "common",
-                        text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
-                    });
-                    // 停止录制
-                    this.recordHandle && this.recordHandle.stop("直播间标题包含关键词");
-                }
+    // 开启了禁止提供弹幕功能，并且也没有设置标题关键词，才完全禁止连接弹幕服务器，否则都连接弹幕服务器，前者不处理弹幕消息，后者根据标题关键词来判断是否停止录制
+    const enableDanmaListen = !this.disableProvideCommentsWhenRecording ||
+        utils$2.shouldCheckTitleKeywords(isManualStart, this.titleKeywords);
+    danmaClient.on("Message", (msg) => {
+        if (this.disableProvideCommentsWhenRecording)
+            return;
+        const extraDataController = downloader.getExtraDataController();
+        if (!extraDataController)
+            return;
+        if (msg.type === "super_chat" && this.saveSCDanma === false)
+            return;
+        if ((msg.type === "give_gift" || msg.type === "guard") && this.saveGiftDanma === false)
+            return;
+        this.emit("Message", msg);
+        extraDataController.addMessage(msg);
+    });
+    danmaClient.on("onRoomInfoChange", (msg) => {
+        if (utils$2.shouldCheckTitleKeywords(isManualStart, this.titleKeywords)) {
+            const title = msg?.body?.title ?? "";
+            const hasTitleKeyword = utils$2.hasBlockedTitleKeywords(title, this.titleKeywords);
+            if (hasTitleKeyword) {
+                this.state = "title-blocked";
+                this.emit("DebugLog", {
+                    type: "common",
+                    text: `检测到标题包含关键词，停止录制：直播间标题 "${title}" 包含关键词 "${this.titleKeywords}"`,
+                });
+                // 停止录制
+                this.recordHandle && this.recordHandle.stop("直播间标题包含关键词");
             }
-        });
-        danmaClient.start();
+        }
+    });
+    if (enableDanmaListen) {
+        try {
+            danmaClient.start();
+        }
+        catch (err) {
+            this.emit("DebugLog", {
+                type: "error",
+                text: `弹幕连接失败，错误信息: ${String(err)}`,
+            });
+        }
     }
     const downloaderArgs = downloader.getArguments();
     downloader.run();
@@ -290881,6 +290907,7 @@ class RecorderConfig {
             saveGiftDanma: getValue("saveGiftDanma") ?? false,
             saveSCDanma: getValue("saveSCDanma") ?? true,
             saveCover: getValue("saveCover") ?? false,
+            convert2Mp4: getValue("convert2Mp4") ?? false,
             segment: getValue("segment") ?? 90,
             uid: uid,
             qualityRetry: getValue("qualityRetry") ?? 0,
@@ -290978,6 +291005,30 @@ async function sendEndLiveNotification(appConfig, recorder, config) {
     // 更新最后通知时间
     endLiveNotificationCache.set(cacheKey, now);
 }
+async function convert2Mp4(videoFile) {
+    const output = replaceExtName$1(videoFile, ".mp4");
+    if (await fs$k.pathExists(output))
+        return output;
+    const name = path$y.basename(output);
+    return new Promise((resolve, reject) => {
+        transcode(videoFile, name, {
+            encoder: "copy",
+            audioCodec: "copy",
+        }, {
+            saveType: 1,
+            savePath: ".",
+            override: false,
+            removeOrigin: false,
+        }).then((task) => {
+            task.on("task-end", () => {
+                resolve(output);
+            });
+            task.on("task-error", () => {
+                reject();
+            });
+        });
+    });
+}
 async function createRecorderManager(appConfig) {
     /**
      * 更新录制器
@@ -291193,8 +291244,14 @@ async function createRecorderManager(appConfig) {
         const config = appConfig.getAll();
         try {
             const xmlFile = replaceExtName$1(filename, ".xml");
-            const videoMeta = await readVideoMeta(filename);
-            const duration = videoMeta?.format?.duration ?? 0;
+            let duration = 0;
+            try {
+                const videoMeta = await readVideoMeta(filename);
+                duration = videoMeta?.format?.duration ?? 0;
+            }
+            catch (error) {
+                logObj.error("读取视频元信息失败", { filename, error });
+            }
             // 提取文件名（不含后缀）
             const videoFilename = path$y.basename(filename, path$y.extname(filename));
             // 计算文件快速哈希值
@@ -291233,6 +291290,16 @@ async function createRecorderManager(appConfig) {
                     interact_num: uniqMember,
                 });
             }
+            if (data?.convert2Mp4) {
+                try {
+                    await convert2Mp4(filename);
+                    await fs$k.unlink(filename);
+                    logObj.info("转换 mp4 成功，已删除原文件", { filename });
+                }
+                catch (error) {
+                    logObj.error("convert2Mp4 error", error);
+                }
+            }
         }
         catch (error) {
             logObj.error("Update live error", { recorder, filename, error });

package/lib/index.cjs

@@ -3715,7 +3715,7 @@ const {
   Help,
 } = commander;
 
-var version = "3.13.1";
+var version = "3.14.0";
 
 process.on("uncaughtException", function (error) {
     console.error(`${new Date().toISOString()} uncaughtException`, error);
@@ -3741,8 +3741,8 @@ program
         throw new Error(`${c.configFolder}参数不存在，请先重新运行 config gen 命令`);
     }
     // 下面两行顺序不能换（
-    const { init } = await Promise.resolve().then(function () { return require('./index-CgpPN0zA.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DG03bxlI.cjs'); });
+    const { init } = await Promise.resolve().then(function () { return require('./index-DnN22ZAd.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-BxJPCbAG.cjs'); });
     const globalConfig = {
         ffmpegPresetPath: path$1.join(c.configFolder, "ffmpeg_presets.json"),
         videoPresetPath: path$1.join(c.configFolder, "presets.json"),

package/lib/{linux-B6245EX2.cjs → linux-CH6NYi8a.cjs}

@@ -4,7 +4,7 @@ var os$3 = require('node:os');
 var path$5 = require('node:path');
 var fs$3 = require('node:fs');
 var crypto = require('node:crypto');
-var index = require('./index-CgpPN0zA.cjs');
+var index = require('./index-DnN22ZAd.cjs');
 var require$$0$1 = require('fs');
 var require$$0 = require('path');
 var require$$0$2 = require('child_process');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bililive-cli",
-  "version": "3.13.1",
+  "version": "3.14.0",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
@@ -39,9 +39,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/http": "3.13.1",
-    "@biliLive-tools/types": "3.13.1",
-    "@biliLive-tools/shared": "3.13.1"
+    "@biliLive-tools/shared": "3.14.0",
+    "@biliLive-tools/http": "3.14.0",
+    "@biliLive-tools/types": "3.14.0"
   },
   "scripts": {
     "start": "tsx src/index.ts",