mb-rrvideo-server 1.0.16 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mb-rrvideo-server",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "视频转码服务 - 接收可回溯机请求，执行转码/合并，上传MinIO/本地存储",
   "main": "src/index.js",
   "bin": {

package/src/routes/merge.js

@@ -83,13 +83,18 @@ async function handleMerge(inputData, res, logFileName) {
     logger.debug(`[${actionName}] 视频列表(${videos.length}个): ${JSON.stringify(videos)}`, taskId, 'merge');
     logger.info(`[${actionName}] 输出路径: ${output}`, taskId, 'merge');
     logger.debug(`[${actionName}] 回调数据: ${JSON.stringify(callbackData)}`, taskId, 'merge');
+
+    const mergeDownloadDir = path.join(process.cwd(), '__rrvideos__temp__', 'merge_downloads', String(taskId));
+    ensureDir(mergeDownloadDir);
+    logger.info(`[${actionName}] 合并临时下载目录: ${mergeDownloadDir}`, taskId, 'merge');
     
     // 生成合并命令
     const command = buildMergeCommand(videos, output, {
       format,
       method,
       auto_mode: autoMode,
-      headers
+      headers,
+      download_dir: mergeDownloadDir
     });
     
     logger.info(`[${actionName}] 合并指令:\n${command}`, taskId, 'merge');

package/src/utils/video.js

@@ -183,12 +183,17 @@ function buildMergeCommand(videos, output, options = {}) {
   const method = options.method || 'concat';
   const autoMode = options.auto_mode || 'smart';
   const headers = options.headers || {};
+  const downloadDir = options.download_dir;
   
   let command = `${nodePath} --expose-gc ${rrvideosPath} merge --output ${escapeArg(output)} --format ${escapeArg(format)} --method ${escapeArg(method)} --auto-mode ${escapeArg(autoMode)}`;
   
   videos.forEach((v) => {
     command += ` --videos ${escapeArg(v)}`;
   });
+
+  if (downloadDir) {
+    command += ` --download-dir ${escapeArg(downloadDir)}`;
+  }
   
   Object.keys(headers).forEach((k) => {
     const pair = `${k}:${headers[k]}`;