bililive-cli 3.22.2 → 4.0.0

package/lib/{index-yHivC5bo.cjs → index-DonNRzzv.cjs}

@@ -1,10 +1,8 @@
 'use strict';
 
-var path$3 = require('node:path');
 var http$4 = require('node:http');
-var urlLib = require('node:url');
 var https = require('node:https');
-var index$1 = require('./index-Bqpkb00O.cjs');
+var index$1 = require('./index-CWkwaDmT.cjs');
 var require$$0$5 = require('tty');
 var require$$1$4 = require('util');
 var require$$0$b = require('assert');
@@ -20,7 +18,9 @@ var require$$1$2 = require('http');
 var require$$4$1 = require('net');
 var require$$5$1 = require('querystring');
 var require$$17 = require('async_hooks');
+var urlLib = require('node:url');
 var require$$1$5 = require('string_decoder');
+var path$3 = require('node:path');
 var os$1 = require('node:os');
 var require$$1$6 = require('os');
 var require$$1$1 = require('node:child_process');
@@ -38,7 +38,6 @@ var require$$0$d = require('node:stream');
 var web = require('node:stream/web');
 var shazamioCore = require('shazamio-core');
 
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 /**
  * 百度网盘上传类
  * 使用 BaiduPCS-Go 工具进行文件上传
@@ -48296,17 +48295,18 @@ router$h.post("/import", upload$1.single("file"), async (ctx) => {
                 // 如果filename是 appConfig.json，那么替换掉ffmpegPath、ffprobePath、danmuFactoryPath配置
                 if (filename === "appConfig.json") {
                     const data = await index$1.fs.readJSON(path$3.join(userDataPath, `${filename}.backup`));
-                    const appConfig = await index$1.fs.readJSON(configPath);
-                    appConfig.ffmpegPath = data.ffmpegPath;
-                    appConfig.ffprobePath = data.ffprobePath;
-                    appConfig.danmuFactoryPath = data.danmuFactoryPath;
-                    appConfig.mesioPath = data.mesioPath;
-                    appConfig.bililiveRecorderPath = data.bililiveRecorderPath;
-                    appConfig.audiowaveformPath = data.audiowaveformPath;
-                    appConfig.webhook.recoderFolder = data.webhook.recoderFolder;
-                    appConfig.recorder.savePath = data.recorder.savePath;
-                    appConfig.losslessCutPath = data.losslessCutPath;
-                    await index$1.fs.writeJSON(filePath, appConfig);
+                    const importedConfig = await index$1.fs.readJSON(configPath);
+                    importedConfig.ffmpegPath = data.ffmpegPath;
+                    importedConfig.ffprobePath = data.ffprobePath;
+                    importedConfig.danmuFactoryPath = data.danmuFactoryPath;
+                    importedConfig.mesioPath = data.mesioPath;
+                    importedConfig.bililiveRecorderPath = data.bililiveRecorderPath;
+                    importedConfig.audiowaveformPath = data.audiowaveformPath;
+                    importedConfig.webhook.recoderFolder = data.webhook.recoderFolder;
+                    importedConfig.recorder.savePath = data.recorder.savePath;
+                    importedConfig.losslessCutPath = data.losslessCutPath;
+                    await index$1.fs.writeJSON(filePath, importedConfig);
+                    appConfig.getAll();
                 }
             }
             else if (filename === "app.db") {
@@ -62606,7 +62606,7 @@ class MultipartBody {
 let fileFromPathWarned = false;
 async function fileFromPath(path, ...args) {
     // this import fails in environments that don't handle export maps correctly, like old versions of Jest
-    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(function () { return require('./fileFromPath-BycXkXgu.cjs'); });
+    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(function () { return require('./fileFromPath-Cl9Q2SkN.cjs'); });
     if (!fileFromPathWarned) {
         console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path)}) instead`);
         fileFromPathWarned = true;
@@ -73737,6 +73737,28 @@ const getRecordDuration = (record) => {
     return 0;
 };
 const toSessionKey = (record) => record.live_id || UNKNOWN_LIVE_ID;
+const parseDanmaTimeline = (value) => {
+    if (!value)
+        return undefined;
+    try {
+        const parsed = JSON.parse(value);
+        const interval = parsed.danmaTimeline?.interval;
+        const data = parsed.danmaTimeline?.data;
+        if (typeof interval !== "number" ||
+            !Number.isFinite(interval) ||
+            interval <= 0 ||
+            !Array.isArray(data)) {
+            return undefined;
+        }
+        return {
+            interval,
+            data: data.map((item) => typeof item === "number" && Number.isFinite(item) && item >= 0 ? Math.round(item) : 0),
+        };
+    }
+    catch {
+        return undefined;
+    }
+};
 const toSessionCard = (records) => {
     const sortedRecords = [...records].sort((left, right) => right.record_start_time - left.record_start_time);
     const latestRecord = sortedRecords[0] || null;
@@ -73771,6 +73793,7 @@ const toSessionCard = (records) => {
             video_duration: item.video_duration,
             danma_num: item.danma_num,
             interact_num: item.interact_num,
+            danmaTimeline: parseDanmaTimeline(item.danma_stats_json),
             quick_hash: item.quick_hash,
         })),
     };
@@ -74046,7 +74069,7 @@ router$b.get("/ws/danma-test", async (ctx) => {
     };
 });
 router$b.post("/add", async (ctx) => {
-    const args = index$1.pick((ctx.request.body ?? {}), "providerId", "channelId", "remarks", "disableAutoCheck", "quality", "streamPriorities", "sourcePriorities", "extra", "noGlobalFollowFields", "line", "disableProvideCommentsWhenRecording", "saveGiftDanma", "saveSCDanma", "segment", "sendToWebhook", "uid", "saveCover", "convert2Mp4", "qualityRetry", "formatName", "useM3U8Proxy", "customHost", "codecName", "titleKeywords", "segmentOnTitleChange", "liveStartNotification", "chargeLiveNotification", "liveEndNotification", "weight", "source", "videoFormat", "recorderType", "cookie", "doubleScreen", "onlyAudio", "useServerTimestamp", "handleTime", "debugLevel", "api");
+    const args = index$1.pick((ctx.request.body ?? {}), "providerId", "channelId", "remarks", "disableAutoCheck", "quality", "streamPriorities", "sourcePriorities", "extra", "noGlobalFollowFields", "line", "disableProvideCommentsWhenRecording", "saveGiftDanma", "saveSCDanma", "saveDanmaStats2DB", "segment", "sendToWebhook", "uid", "saveCover", "convert2Mp4", "qualityRetry", "formatName", "useM3U8Proxy", "customHost", "codecName", "titleKeywords", "segmentOnTitleChange", "liveStartNotification", "chargeLiveNotification", "liveEndNotification", "weight", "source", "videoFormat", "recorderType", "cookie", "doubleScreen", "onlyAudio", "useServerTimestamp", "handleTime", "debugLevel", "api");
     const data = await recorderService.addRecorder(args);
     ctx.body = { payload: data };
 });
@@ -74075,7 +74098,7 @@ router$b.post("/:id/stream", async (ctx) => {
 });
 router$b.put("/:id", (ctx) => {
     const { id } = ctx.params;
-    const patch = index$1.pick(ctx.request.body, "remarks", "disableAutoCheck", "quality", "streamPriorities", "sourcePriorities", "noGlobalFollowFields", "line", "disableProvideCommentsWhenRecording", "saveGiftDanma", "saveSCDanma", "saveCover", "segment", "sendToWebhook", "uid", "qualityRetry", "formatName", "useM3U8Proxy", "customHost", "codecName", "titleKeywords", "segmentOnTitleChange", "liveStartNotification", "chargeLiveNotification", "liveEndNotification", "weight", "source", "videoFormat", "recorderType", "cookie", "doubleScreen", "onlyAudio", "useServerTimestamp", "handleTime", "debugLevel", "convert2Mp4", "api");
+    const patch = index$1.pick(ctx.request.body, "remarks", "disableAutoCheck", "quality", "streamPriorities", "sourcePriorities", "noGlobalFollowFields", "line", "disableProvideCommentsWhenRecording", "saveGiftDanma", "saveSCDanma", "saveDanmaStats2DB", "saveCover", "segment", "sendToWebhook", "uid", "qualityRetry", "formatName", "useM3U8Proxy", "customHost", "codecName", "titleKeywords", "segmentOnTitleChange", "liveStartNotification", "chargeLiveNotification", "liveEndNotification", "weight", "source", "videoFormat", "recorderType", "cookie", "doubleScreen", "onlyAudio", "useServerTimestamp", "handleTime", "debugLevel", "convert2Mp4", "api");
     ctx.body = { payload: recorderService.updateRecorder({ id, ...patch }) };
 });
 /**
@@ -74495,6 +74518,20 @@ router$a.post("/formatTitle", async (ctx) => {
     const title = index$1.formatTitle(data.options, template);
     ctx.body = title;
 });
+router$a.post("/formatSeasonTitle", async (ctx) => {
+    const { template, mediaTitleTemplate } = ctx.request.body;
+    const options = {
+        title: "标题",
+        username: "主播名",
+        time: new Date().toISOString(),
+        roomId: 123456,
+        filename: "文件名",
+    };
+    ctx.body = index$1.formatSeasonTitle({
+        ...options,
+        mediaTitle: index$1.formatTitle(options, mediaTitleTemplate || options.title),
+    }, template);
+});
 router$a.post("/formatPartTitle", async (ctx) => {
     const data = ctx.request.body;
     const template = (data.template || "");
@@ -77251,6 +77288,7 @@ class ConfigManager {
         const appConfigAll = this.getAppConfigAll();
         const roomSetting = appConfigAll.webhook?.rooms?.[roomId];
         const danmu = this.getRoomSetting("danmu", roomSetting) ?? false;
+        const burnWithoutDanmu = this.getRoomSetting("burnWithoutDanmu", roomSetting) ?? false;
         const mergePart = this.getRoomSetting("autoPartMerge", roomSetting) ?? false;
         const minSize = this.getRoomSetting("minSize", roomSetting) ?? 10;
         const uploadPresetId = this.getRoomSetting("uploadPresetId", roomSetting) || "default";
@@ -77312,6 +77350,7 @@ class ConfigManager {
         const open = this.canRoomOpen(roomSetting, appConfigAll?.webhook?.blacklist, roomId);
         return {
             danmu,
+            burnWithoutDanmu,
             mergePart,
             minSize,
             uploadPresetId,
@@ -78428,7 +78467,8 @@ class WebhookHandler {
     async processDanmuVideo(context, options, config, xmlFilePath) {
         try {
             // 验证弹幕文件
-            if (!(await index$1.fs.pathExists(xmlFilePath)) || (await index$1.isEmptyDanmu(xmlFilePath))) {
+            const hasDanmu = (await index$1.fs.pathExists(xmlFilePath)) && !(await index$1.isEmptyDanmu(xmlFilePath));
+            if (!hasDanmu && !config.burnWithoutDanmu) {
                 context.part.recordStatus = "handled";
                 context.part.uploadStatus = "pending";
                 index$1.logObj.warn(`弹幕文件不存在或为空，跳过弹幕压制: ${xmlFilePath}`);
@@ -78453,6 +78493,7 @@ class WebhookHandler {
                 danmaOptions: danmuConfig.config,
                 ffmpegOptions: ffmpegPreset.config,
                 hasHotProgress: config.hotProgress,
+                ignoreDanmu: !hasDanmu,
                 hotProgressOptions: {
                     interval: config.hotProgressSample || 30,
                     color: config.hotProgressColor || "#f9f5f3",
@@ -78465,7 +78506,7 @@ class WebhookHandler {
             });
             context.part.filePath = output;
             context.part.recordStatus = "handled";
-            return { conversionSuccessful: true, danmuConversionSuccessful: true };
+            return { conversionSuccessful: true, danmuConversionSuccessful: hasDanmu };
         }
         catch (error) {
             index$1.logObj.error(error);
@@ -79373,7 +79414,6 @@ let handler;
 let appConfig;
 let container;
 const fileCache = createFileCache();
-path$3.dirname(urlLib.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-yHivC5bo.cjs', document.baseURI).href))));
 const authMiddleware = (passKey) => {
     return async (ctx, next) => {
         const authHeader = ctx.headers["authorization"] || ctx.request.query.auth;

package/lib/index.cjs

@@ -3715,7 +3715,7 @@ const {
   Help,
 } = commander;
 
-var version = "3.22.2";
+var version = "4.0.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-Bqpkb00O.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-yHivC5bo.cjs'); }).then(function (n) { return n.index; });
+    const { init } = await Promise.resolve().then(function () { return require('./index-CWkwaDmT.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DonNRzzv.cjs'); }).then(function (n) { return n.index; });
     const globalConfig = {
         ffmpegPresetPath: path$1.join(c.configFolder, "ffmpeg_presets.json"),
         videoPresetPath: path$1.join(c.configFolder, "presets.json"),

package/lib/{linux-Cy2IwLL8.cjs → linux-dGf0gycY.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-Bqpkb00O.cjs');
+var index = require('./index-CWkwaDmT.cjs');
 var require$$0$1 = require('fs');
 var require$$0 = require('path');
 var require$$0$2 = require('child_process');

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "bililive-cli",
-  "version": "3.22.2",
+  "version": "4.0.0",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
   "author": "renmu123",
   "license": "GPL-3.0",
   "homepage": "https://github.com/renmu123/biliLive-tools",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/renmu123/biliLive-tools",
+    "directory": "packages/CLI"
+  },
   "pkg": {
     "assets": "./lib/node_modules/**"
   },
@@ -25,8 +30,8 @@
   ],
   "dependencies": {
     "@napi-rs/canvas": "^1.0.9",
-    "font-ls": "0.6.6",
-    "better-sqlite3": "12.11.1",
+    "font-ls": "0.6.7",
+    "better-sqlite3": "13.0.3",
     "shazamio-core": "^1.3.1",
     "music-segment-detector": "^0.3.1"
   },
@@ -41,9 +46,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/shared": "3.22.2",
-    "@biliLive-tools/http": "3.22.2",
-    "@biliLive-tools/types": "3.22.2"
+    "@biliLive-tools/shared": "4.0.0",
+    "@biliLive-tools/types": "4.0.0",
+    "@biliLive-tools/http": "4.0.0"
   },
   "scripts": {
     "start": "tsx src/index.ts",