bililive-cli 3.17.0 → 3.18.0

package/lib/{index-cBdgazGf.cjs → index-CYt93UQb.cjs}

@@ -4,7 +4,7 @@ var path$3 = require('node:path');
 var require$$2$1 = require('node:http');
 var require$$0$4 = require('node:url');
 var a$1 = require('node:https');
-var index$1 = require('./index-BZBJd-mI.cjs');
+var index$1 = require('./index-CWUSa9VA.cjs');
 var require$$0$6 = require('tty');
 var require$$1$3 = require('util');
 var require$$0$c = require('assert');
@@ -62549,7 +62549,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-x9JhF4gH.cjs'); });
+    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(function () { return require('./fileFromPath-Df_wQ1he.cjs'); });
     if (!fileFromPathWarned) {
         console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path)}) instead`);
         fileFromPathWarned = true;
@@ -77055,7 +77055,7 @@ class ConfigManager {
             uploadToSameMedia,
             noDanmuVideoPreset,
             videoHandleTime: limitVideoConvertTime ? videoHandleTime : undefined,
-            partTitleTemplate: this.getRoomSetting("partTitleTemplate", roomSetting) || "{{filename}}",
+            partTitleTemplate: this.getRoomSetting("partTitleTemplate", roomSetting) || "",
             afterUploadDeletAction: this.getRoomSetting("afterUploadDeletAction", roomSetting) ?? "none",
             syncId,
             flvRepair,
@@ -78606,10 +78606,21 @@ class WebhookHandler {
         const runtimePart = this.getRuntimePart(part);
         return type === "handled" ? runtimePart.handledCid : runtimePart.rawCid;
     }
+    createUploadFileMeta(live, part, index) {
+        return {
+            index,
+            title: part.title,
+            username: live.username,
+            roomId: live.roomId,
+            startTimestamp: part.startTime ? Math.floor(part.startTime / 1000) : null,
+            platform: live.platform,
+        };
+    }
     toPathArray(items) {
         return items.map((item) => ({
             path: item.path,
             title: item.title,
+            meta: item.meta,
         }));
     }
     createUploadItems(filePaths, type) {
@@ -78698,28 +78709,22 @@ class WebhookHandler {
      * 构建上传文件列表
      * @private
      */
-    buildUploadFileList(live, uploadableParts, type, config) {
+    buildUploadFileList(live, uploadableParts, type) {
         const updateStatusField = type === "handled" ? "uploadStatus" : "rawUploadStatus";
         const filePathField = type === "handled" ? "filePath" : "rawFilePath";
         let cover;
         const filePaths = [];
-        // 计算已上传分段的数量，用于生成正确的索引
         const uploadedCount = live
             .getNonErrorParts(type)
             .filter((part) => part[updateStatusField] === "uploaded").length;
         let currentIndex = uploadedCount + 1;
         // 构建上传文件列表
         for (const part of uploadableParts) {
-            const filename = path$3.parse(part[filePathField]).name;
-            const title = index$1.formatPartTitle({
-                title: part.title,
-                username: live.username,
-                roomId: live.roomId,
-                time: part?.startTime ? new Date(part.startTime).toISOString() : new Date().toISOString(),
-                filename,
-                index: currentIndex,
-            }, config.partTitleTemplate ?? "{{filename}}");
-            filePaths.push({ path: part[filePathField], title, part });
+            filePaths.push({
+                path: part[filePathField],
+                meta: this.createUploadFileMeta(live, part, currentIndex),
+                part,
+            });
             if (!cover)
                 cover = part.cover;
             currentIndex++;
@@ -78772,13 +78777,13 @@ class WebhookHandler {
         }
         return sortParams;
     }
-    getUploadedItemCountForSameMedia(live, config) {
+    getUploadedItemCountForSameMedia(live, type) {
         let uploadedCount = 0;
         for (const part of live.parts) {
-            if (part.uploadStatus === "uploaded") {
+            if (type === "handled" && part.uploadStatus === "uploaded") {
                 uploadedCount++;
             }
-            if (config.uploadNoDanmu && part.rawUploadStatus === "uploaded") {
+            if (type === "raw" && part.rawUploadStatus === "uploaded") {
                 uploadedCount++;
             }
         }
@@ -78787,7 +78792,10 @@ class WebhookHandler {
     buildSameMediaUploadFileList(live, config) {
         let cover;
         const filePaths = [];
-        let currentIndex = this.getUploadedItemCountForSameMedia(live, config) + 1;
+        const currentIndexes = {
+            handled: this.getUploadedItemCountForSameMedia(live, "handled") + 1,
+            raw: this.getUploadedItemCountForSameMedia(live, "raw") + 1,
+        };
         for (const type of SAME_MEDIA_UPLOAD_ORDER) {
             for (const part of live.parts) {
                 const item = this.getSameMediaUploadCandidate(part, type, config);
@@ -78797,27 +78805,16 @@ class WebhookHandler {
                     continue;
                 if (!item.canUpload)
                     continue;
-                const filename = path$3.parse(item.path).name;
-                const baseTitle = index$1.formatPartTitle({
-                    title: part.title,
-                    username: live.username,
-                    roomId: live.roomId,
-                    time: part?.startTime
-                        ? new Date(part.startTime).toISOString()
-                        : new Date().toISOString(),
-                    filename,
-                    index: currentIndex,
-                }, config.partTitleTemplate ?? "{{filename}}");
                 filePaths.push({
                     part,
                     path: item.path,
-                    title: baseTitle,
+                    meta: this.createUploadFileMeta(live, part, currentIndexes[type]),
                     type: item.type,
                 });
                 if (!cover) {
                     cover = part.cover;
                 }
-                currentIndex++;
+                currentIndexes[type]++;
             }
         }
         return { filePaths, cover };
@@ -78860,6 +78857,8 @@ class WebhookHandler {
         if (config.useLiveCover && cover) {
             uploadPreset.cover = cover;
         }
+        uploadPreset.partTitleTemplate =
+            config.partTitleTemplate?.trim() || uploadPreset.partTitleTemplate?.trim() || "";
         // 处理转载来源：当设置为转载类型且转载来源为空时，自动生成直播间链接
         // TODO: 考虑迁移到上传预设配置实现，需要将metadata参数传递到上传函数中
         if (uploadPreset.copyright === 2 &&
@@ -79001,7 +79000,7 @@ class WebhookHandler {
         // 3. 获取配置
         const config = this.configManager.getConfig(live.roomId);
         // 4. 构建上传文件列表
-        const { filePaths, cover } = this.buildUploadFileList(live, uploadableParts, type, config);
+        const { filePaths, cover } = this.buildUploadFileList(live, uploadableParts, type);
         // 5. 验证上传配置
         if (!this.validateUploadConfig(live, filePaths, type, config)) {
             return;
@@ -79091,7 +79090,7 @@ let handler;
 let appConfig;
 let container;
 const fileCache = createFileCache();
-path$3.dirname(require$$0$4.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-cBdgazGf.cjs', document.baseURI).href))));
+path$3.dirname(require$$0$4.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CYt93UQb.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.17.0";
+var version = "3.18.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-BZBJd-mI.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-cBdgazGf.cjs'); }).then(function (n) { return n.index; });
+    const { init } = await Promise.resolve().then(function () { return require('./index-CWUSa9VA.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-CYt93UQb.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-D1unhaX7.cjs → linux-Cj0-4UT4.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-BZBJd-mI.cjs');
+var index = require('./index-CWUSa9VA.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.17.0",
+  "version": "3.18.0",
   "type": "module",
   "description": "biliLive-tools的cli程序",
   "main": "./lib/index.js",
@@ -27,7 +27,7 @@
     "@napi-rs/canvas": "^0.1.60",
     "font-ls": "0.6.6",
     "ntsuspend": "^1.0.2",
-    "better-sqlite3": "12.6.2",
+    "better-sqlite3": "12.11.1",
     "shazamio-core": "^1.3.1",
     "music-segment-detector": "^0.3.1"
   },
@@ -39,9 +39,9 @@
     "commander": "^12.1.0",
     "rimraf": "^6.0.1",
     "tsx": "^4.19.2",
-    "@biliLive-tools/http": "3.17.0",
-    "@biliLive-tools/types": "3.17.0",
-    "@biliLive-tools/shared": "3.17.0"
+    "@biliLive-tools/http": "3.18.0",
+    "@biliLive-tools/types": "3.18.0",
+    "@biliLive-tools/shared": "3.18.0"
   },
   "scripts": {
     "start": "tsx src/index.ts",