bililive-cli 3.20.0 → 3.22.0

package/lib/{index-DTguSku6.cjs → index-Db-mrTi0.cjs}

@@ -4,7 +4,7 @@ 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-RwUbYTSt.cjs');
+var index$1 = require('./index-ByKMHGR7.cjs');
 var require$$0$5 = require('tty');
 var require$$1$4 = require('util');
 var require$$0$b = require('assert');
@@ -26,8 +26,8 @@ var require$$1$6 = require('os');
 var require$$1$1 = require('node:child_process');
 var crypto$3 = require('node:crypto');
 var fs$6 = require('node:fs');
+require('node:module');
 var EventEmitter$4 = require('node:events');
-require('ntsuspend');
 require('node:readline');
 require('@napi-rs/canvas');
 require('better-sqlite3');
@@ -30041,8 +30041,11 @@ router$h.post("/webhook/bililiverecorder", async (ctx) => {
             return;
         }
         const roomId = event.EventData.RoomId;
-        // 如果是docker，那么将recoderFolder参数修改为 /app/video路径
-        const recoderFolder = isDocker ? "/app/video" : config.webhook.recoderFolder;
+        let recoderFolder = config.webhook.recoderFolder;
+        if (isDocker && !config.webhook.recoderFolder) {
+            // 如果是docker，且不存在recoderFolder参数，那么修改默认值
+            recoderFolder = "/app/video";
+        }
         const filePath = path$3.join(recoderFolder, event.EventData.RelativePath);
         index$1.logObj.info("录播姬文件路径：", filePath, recoderFolder);
         handler.handle({
@@ -56214,7 +56217,7 @@ router$c.get("/video/:id", async (ctx) => {
 router$c.post("/video", async (ctx) => {
     const preset = container.resolve("videoPreset");
     const data = ctx.request.body;
-    data.config = index$1.omit(data.config, ["dtime"]);
+    data.config = index$1.omit(data.config, ["dtime", "staffs"]);
     const [status, msg] = index$1.validateBiliupConfig(data.config);
     if (!status) {
         throw new Error(msg || "配置验证失败");
@@ -56228,7 +56231,7 @@ router$c.del("/video/:id", async (ctx) => {
 router$c.put("/video/:id", async (ctx) => {
     const preset = container.resolve("videoPreset");
     const data = ctx.request.body;
-    data.config = index$1.omit(data.config, ["dtime"]);
+    data.config = index$1.omit(data.config, ["dtime", "staffs"]);
     const [status, msg] = index$1.validateBiliupConfig(data.config);
     if (!status) {
         throw new Error(msg || "配置验证失败");
@@ -62603,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-Cqq5W5LP.cjs'); });
+    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(function () { return require('./fileFromPath-1V4Za2hv.cjs'); });
     if (!fileFromPathWarned) {
         console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path)}) instead`);
         fileFromPathWarned = true;
@@ -68770,7 +68773,7 @@ class QwenLLM {
         this.client = new OpenAI({
             apiKey: config.apiKey,
             baseURL: config.baseURL || "https://dashscope.aliyuncs.com/compatible-mode/v1",
-            timeout: config.timeout || 60000,
+            timeout: config.timeout || 300000,
         });
         this.model = config.model || "qwen-plus";
     }
@@ -73203,7 +73206,13 @@ async function recognize(file, lyricOptimize) {
     // console.log("Shazam 识别结果：", JSON.stringify(result, null, 2));
     if (!result)
         return null;
-    const info = await shazamQueryInfo(result.trackId);
+    let info = null;
+    try {
+        info = await shazamQueryInfo(result.trackId);
+    }
+    catch (error) {
+        console.error("Shazam 查询信息失败：", error);
+    }
     const appleMusicId = result.appleMusicId || info?.appleMusicId;
     const title = info?.title || result.title;
     const subtitle = info?.subtitle || "";
@@ -73379,6 +73388,7 @@ async function optimizeLyrics(asrData, lyrics, offset) {
         temperature: 0.5,
         enableSearch: false,
         responseFormat: enableStructuredOutput ? { type: "json_object" } : undefined,
+        enableThinking: false,
     });
     index$1.logObj.info("优化结果:", response);
     if (!response.content) {
@@ -73471,6 +73481,7 @@ async function recognizeSongNameWithLLM(asrText, vendorId, options) {
             enableSearch: options.enableSearch,
             responseFormat: options.enableStructuredOutput ? { type: "json_object" } : undefined,
             temperature: 0.6,
+            enableThinking: false,
             searchOptions: {
                 forcedSearch: options.enableSearch,
                 search_strategy: "max",
@@ -74035,7 +74046,7 @@ router$a.get("/ws/danma-test", async (ctx) => {
     };
 });
 router$a.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", "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", "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 };
 });
@@ -74064,7 +74075,7 @@ router$a.post("/:id/stream", async (ctx) => {
 });
 router$a.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", "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", "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 }) };
 });
 /**
@@ -74350,6 +74361,11 @@ router$9.get("/seasons", async (ctx) => {
     const data = await index$1.biliApi.getSeasonList(uid);
     ctx.body = data;
 });
+router$9.get("/reserveList", async (ctx) => {
+    const { uid } = ctx.request.query;
+    const data = await index$1.biliApi.getReserveList(uid);
+    ctx.body = data;
+});
 router$9.get("/season/:aid", async (ctx) => {
     const { uid } = ctx.request.query;
     const { aid } = ctx.params;
@@ -74381,6 +74397,11 @@ router$9.post("/upload", async (ctx) => {
         ctx.status = 400;
         return;
     }
+    if (data.config.staffs && data.config.staffs.length > 0) {
+        if (appConfig?.get("biliUpload")?.useBCutAPI) {
+            throw new Error("联合投稿暂不支持必剪接口");
+        }
+    }
     if (data.vid) {
         const task = await index$1.biliApi.editMedia(data.vid, data.videos, data.config, data.uid, {
             afterUploadDeletAction: data.options?.removeOriginAfterUploadCheck
@@ -74499,6 +74520,18 @@ router$9.post("/formatDesc", async (ctx) => {
     }, template);
     ctx.body = desc;
 });
+// 搜索联合投稿UP主
+router$9.get("/searchStaff", async (ctx) => {
+    const { kw, uid } = ctx.request.query;
+    const data = await index$1.biliApi.searchStaffUser(Number(uid), kw);
+    ctx.body = data;
+});
+// 获取联合投稿剩余次数
+router$9.get("/staffRemaining", async (ctx) => {
+    const { uid } = ctx.request.query;
+    const data = await index$1.biliApi.getStaffRemaining(Number(uid));
+    ctx.body = data;
+});
 
 async function flvRepair(input, output, opts) {
     // 如果不是flv，直接报错
@@ -76808,6 +76841,7 @@ async function subtitleRecognize(file, modelId, options) {
         fillGap,
         disableCache,
         song: options?.song,
+        modelId,
     });
     try {
         // 生成缓存路径
@@ -76917,8 +76951,11 @@ router$1.post("/subtitle", async (ctx) => {
         };
         return;
     }
-    const config = index$1.appConfig.get("ai") || {};
-    const asrModelId = config.subtitleRecognize.modelId;
+    let asrModelId = data.modelId;
+    if (!asrModelId) {
+        const config = index$1.appConfig.get("ai") || {};
+        asrModelId = config.subtitleRecognize.modelId;
+    }
     if (!asrModelId) {
         throw new Error("请先在配置中设置字幕识别ASR模型");
     }
@@ -79238,7 +79275,7 @@ 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-DTguSku6.cjs', document.baseURI).href))));
+path$3.dirname(urlLib.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Db-mrTi0.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.20.0";
+var version = "3.22.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-RwUbYTSt.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DTguSku6.cjs'); }).then(function (n) { return n.index; });
+    const { init } = await Promise.resolve().then(function () { return require('./index-ByKMHGR7.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-Db-mrTi0.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-B_JvwbpW.cjs → linux-C-4qLKcq.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-RwUbYTSt.cjs');
+var index = require('./index-ByKMHGR7.cjs');
 var require$$0$1 = require('fs');
 var require$$0 = require('path');
 var require$$0$2 = require('child_process');
@@ -30,7 +30,7 @@ require('crypto');
 require('http2');
 require('tty');
 require('zlib');
-require('ntsuspend');
+require('node:module');
 require('node:readline');
 require('node:https');
 require('node:url');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bililive-cli",
-  "version": "3.20.0",
+  "version": "3.22.0",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
@@ -24,13 +24,15 @@
     "lib"
   ],
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.60",
+    "@napi-rs/canvas": "^1.0.9",
     "font-ls": "0.6.6",
-    "ntsuspend": "^1.0.2",
     "better-sqlite3": "12.11.1",
     "shazamio-core": "^1.3.1",
     "music-segment-detector": "^0.3.1"
   },
+  "optionalDependencies": {
+    "ntsuspend": "^1.0.2"
+  },
   "devDependencies": {
     "@types/cli-progress": "^3.11.6",
     "@yao-pkg/pkg": "^6.1.1",
@@ -39,9 +41,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/http": "3.20.0",
-    "@biliLive-tools/types": "3.20.0",
-    "@biliLive-tools/shared": "3.20.0"
+    "@biliLive-tools/shared": "3.22.0",
+    "@biliLive-tools/types": "3.22.0",
+    "@biliLive-tools/http": "3.22.0"
   },
   "scripts": {
     "start": "tsx src/index.ts",