bililive-cli 3.9.0 → 3.9.1

package/lib/{index-Ba32bNTL.cjs → index-B4DHRkFJ.cjs}

@@ -11802,6 +11802,16 @@ const amfPresets = [
         label: "quality",
     },
 ];
+const videoToolBoxPresets = [
+    {
+        value: "1",
+        label: "realtime",
+    },
+    {
+        value: "0",
+        label: "not realtime",
+    },
+];
 const amfAv1Presets = [
     ...amfPresets,
     {
@@ -11876,6 +11886,17 @@ const videoEncoders = [
         ],
         presets: amfPresets,
     },
+    {
+        value: "h264_videotoolbox",
+        label: "H.264(Apple)",
+        birateControls: [
+            {
+                value: "VBR",
+                label: "平均比特率",
+            },
+        ],
+        presets: videoToolBoxPresets,
+    },
     {
         value: "libx265",
         label: "H.265(x265)",
@@ -11932,9 +11953,20 @@ const videoEncoders = [
         ],
         presets: amfPresets,
     },
+    {
+        value: "hevc_videotoolbox",
+        label: "H.265(Apple)",
+        birateControls: [
+            {
+                value: "VBR",
+                label: "平均比特率",
+            },
+        ],
+        presets: videoToolBoxPresets,
+    },
     {
         value: "libsvtav1",
-        label: "AV1 (libsvtav1)",
+        label: "AV1(libsvtav1)",
         birateControls: [
             {
                 value: "CRF",
@@ -12006,7 +12038,7 @@ const videoEncoders = [
     },
     {
         value: "av1_qsv",
-        label: "AV1 (Intel QSV)",
+        label: "AV1(Intel QSV)",
         birateControls: [
             {
                 value: "ICQ",
@@ -12021,7 +12053,7 @@ const videoEncoders = [
     },
     {
         value: "av1_nvenc",
-        label: "AV1 (NVIDIA NVEnc)",
+        label: "AV1(NVIDIA NVEnc)",
         birateControls: [
             {
                 value: "CQ",
@@ -12036,7 +12068,7 @@ const videoEncoders = [
     },
     {
         value: "av1_amf",
-        label: "AV1 (AMD AMF)",
+        label: "AV1(AMD AMF)",
         birateControls: [
             {
                 value: "VBR",
@@ -12045,6 +12077,17 @@ const videoEncoders = [
         ],
         presets: amfAv1Presets,
     },
+    {
+        value: "av1_videotoolbox",
+        label: "AV1(Apple)",
+        birateControls: [
+            {
+                value: "VBR",
+                label: "平均比特率",
+            },
+        ],
+        presets: videoToolBoxPresets,
+    },
 ];
 const defaultRecordConfig = {
     providerId: "DouYu",
@@ -12175,6 +12218,18 @@ const baseFfmpegPresets = [
             preset: "balanced",
         },
     },
+    {
+        id: "b_videotoolbox_h264",
+        name: "H.264(Apple)",
+        config: {
+            ...commonPresetParams,
+            encoder: "h264_videotoolbox",
+            bitrateControl: "VBR",
+            bitrate: 8000,
+            bit10: false,
+            preset: "1",
+        },
+    },
     {
         id: "b_libx265",
         name: "H.265(x265)",
@@ -12227,9 +12282,21 @@ const baseFfmpegPresets = [
             preset: "balanced",
         },
     },
+    {
+        id: "b_videotoolbox_h265",
+        name: "H.265(Apple)",
+        config: {
+            ...commonPresetParams,
+            encoder: "hevc_videotoolbox",
+            bitrateControl: "VBR",
+            bitrate: 8000,
+            bit10: false,
+            preset: "1",
+        },
+    },
     {
         id: "b_svt_av1",
-        name: "AV1 (libsvtav1)",
+        name: "AV1(libsvtav1)",
         config: {
             ...commonPresetParams,
             encoder: "libsvtav1",
@@ -12243,7 +12310,7 @@ const baseFfmpegPresets = [
     },
     {
         id: "b_qsv_av1",
-        name: "AV1 (Intel QSV)",
+        name: "AV1(Intel QSV)",
         config: {
             ...commonPresetParams,
             encoder: "av1_qsv",
@@ -12256,7 +12323,7 @@ const baseFfmpegPresets = [
     },
     {
         id: "b_nvenc_av1",
-        name: "AV1 (NVIDIA NVEnc)",
+        name: "AV1(NVIDIA NVEnc)",
         config: {
             ...commonPresetParams,
             encoder: "av1_nvenc",
@@ -12270,7 +12337,7 @@ const baseFfmpegPresets = [
     },
     {
         id: "b_amf_av1",
-        name: "AV1 (AMD AMF)",
+        name: "AV1(AMD AMF)",
         config: {
             ...commonPresetParams,
             encoder: "av1_amf",
@@ -12280,6 +12347,18 @@ const baseFfmpegPresets = [
             preset: "balanced",
         },
     },
+    {
+        id: "b_videotoolbox_av1",
+        name: "AV1(Apple)",
+        config: {
+            ...commonPresetParams,
+            encoder: "av1_videotoolbox",
+            bitrateControl: "VBR",
+            bitrate: 8000,
+            bit10: false,
+            preset: "1",
+        },
+    },
 ];
 class FFmpegPreset extends CommonPreset {
     constructor({ globalConfig }) {
@@ -44460,7 +44539,7 @@ async function trash(paths, options) {
 	} else if (process$2.platform === 'win32') {
 		module = await Promise.resolve().then(function () { return require('./windows-CJCw0QtL.cjs'); });
 	} else {
-		module = await Promise.resolve().then(function () { return require('./linux-v9dbfGoh.cjs'); });
+		module = await Promise.resolve().then(function () { return require('./linux-CNe7K9Gx.cjs'); });
 	}
 
 	return module.default(paths);
@@ -53151,11 +53230,15 @@ const getHardwareAcceleration = (encoder) => {
     else if (["libx264", "libx265", "libsvtav1"].includes(encoder)) {
         return "cpu";
     }
+    else if (["h264_videotoolbox", "hevc_videotoolbox", "av1_videotoolbox"].includes(encoder)) {
+        return "videotoolbox";
+    }
     else {
         throw new Error(`未知的编码器: ${encoder}`);
     }
 };
 const genFfmpegParams = (options) => {
+    const hardware = getHardwareAcceleration(options.encoder);
     const result = [];
     if (options.encoder) {
         result.push(`-c:v ${options.encoder}`);
@@ -53187,7 +53270,12 @@ const genFfmpegParams = (options) => {
         if (options.preset) {
             const encoder = videoEncoders.find((item) => item.value === options.encoder);
             if ((encoder?.presets ?? []).findIndex((item) => item.value === options.preset) !== -1) {
-                result.push(`-preset ${options.preset}`);
+                if (hardware === "videotoolbox") {
+                    result.push(`-realtime ${options.preset}`);
+                }
+                else {
+                    result.push(`-preset ${options.preset}`);
+                }
             }
         }
         if (["libsvtav1"].includes(options.encoder)) {

package/lib/{index-DTf_Oo8U.cjs → index-Cba0EEtx.cjs}

@@ -4,7 +4,7 @@ var path$7 = require('node:path');
 var http$3 = require('node:http');
 var require$$0$4 = require('node:url');
 var a = require('node:https');
-var index = require('./index-Ba32bNTL.cjs');
+var index = require('./index-B4DHRkFJ.cjs');
 var require$$0$5 = require('tty');
 var require$$1$2 = require('util');
 var require$$0$c = require('assert');
@@ -80233,7 +80233,9 @@ class WebhookHandler {
             // 处理后的视频文件，可能被上传、非弹幕上传、同步
             if (syncConfig?.targetFiles.includes("danmaku")) {
                 const shouldRemove = config.afterConvertRemoveVideoRaw;
-                this.fileRefManager.addRef(filePath, shouldRemove);
+                if (filePath.includes("后处理") || filePath.includes("弹幕版")) {
+                    this.fileRefManager.addRef(filePath, shouldRemove);
+                }
             }
             if (config.uid) {
                 const shouldRemove = config.afterUploadDeletAction === "delete" ||
@@ -80274,8 +80276,8 @@ class WebhookHandler {
         // 5. 处理弹幕和视频压制
         const processingResult = await this.processMediaFiles(context, options, config, xmlFilePath);
         index.logObj.debug("processingResult", processingResult, options.filePath, context.part.filePath);
+        this.collectTasks(context.part.filePath, "handledVideo", config);
         if (processingResult.conversionSuccessful) {
-            this.collectTasks(context.part.filePath, "handledVideo", config);
             this.fileRefManager.releaseRef(options.filePath);
         }
         if (xmlFilePath && processingResult.danmuConversionSuccessful) {
@@ -81094,7 +81096,7 @@ exports.handler = void 0;
 exports.appConfig = void 0;
 exports.container = void 0;
 const fileCache = createFileCache();
-path$7.dirname(require$$0$4.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-DTf_Oo8U.cjs', document.baseURI).href))));
+path$7.dirname(require$$0$4.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-Cba0EEtx.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.9.0";
+var version = "3.9.1";
 
 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-Ba32bNTL.cjs'); }).then(function (n) { return n.index; });
-    const { serverStart } = await Promise.resolve().then(function () { return require('./index-DTf_Oo8U.cjs'); });
+    const { init } = await Promise.resolve().then(function () { return require('./index-B4DHRkFJ.cjs'); }).then(function (n) { return n.index; });
+    const { serverStart } = await Promise.resolve().then(function () { return require('./index-Cba0EEtx.cjs'); });
     const globalConfig = {
         ffmpegPresetPath: path$1.join(c.configFolder, "ffmpeg_presets.json"),
         videoPresetPath: path$1.join(c.configFolder, "presets.json"),
@@ -3825,7 +3825,7 @@ function generateConfig(configPath) {
             defaultConfig.configFolder = configFolder;
         }
     }
-    else if (process.platform === "linux") {
+    else if (process.platform === "linux" || process.platform === "darwin") {
         defaultConfig.ffmpegPath = "ffmpeg";
         defaultConfig.ffprobePath = "ffprobe";
         defaultConfig.mesioPath = "mesio";

package/lib/{linux-v9dbfGoh.cjs → linux-CNe7K9Gx.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-Ba32bNTL.cjs');
+var index = require('./index-B4DHRkFJ.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.9.0",
+  "version": "3.9.1",
   "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/types": "3.9.0",
-    "@biliLive-tools/shared": "3.9.0",
-    "@biliLive-tools/http": "3.9.0"
+    "@biliLive-tools/http": "3.9.1",
+    "@biliLive-tools/types": "3.9.1",
+    "@biliLive-tools/shared": "3.9.1"
   },
   "scripts": {
     "start": "tsx src/index.ts",