mb-rrvideo-server 1.0.11 → 1.0.14

package/docker-compose.yml

@@ -12,7 +12,7 @@ services:
     
     volumes:
       # 配置文件（必须）
-      - ./config.json:/app/config/config.json:ro
+      - ./config.json:/app/config/config.json
       # 日志目录
       - ./logs:/app/logs
       # 临时文件目录

package/package.json

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

package/src/routes/convert.js

@@ -186,6 +186,7 @@ async function handleConvertV1(inputData, res, logFileName) {
         const pullData = await pullTaskData(pullDataUrl, recordId, logFileName);
         
         if (!pullData.data || !pullData.data.events_data) {
+          logger.error(`[${actionName}] 拉取数据格式错误，完整数据: ${JSON.stringify(pullData)}`, logFileName, 'convert');
           throw new Error('拉取的数据格式不正确');
         }
         
@@ -289,11 +290,23 @@ async function handleConvertV1(inputData, res, logFileName) {
       if (type === 'stdout') {
         recentStdout.push(text);
         if (recentStdout.length > MAX_BUFFER_LINES) recentStdout.shift();
-        logger.debug(`[rrvideos-stdout] ${text}`, logFileName, 'convert');
+        
+        // 关键过程信息保留为 INFO，进度条等其他信息为 DEBUG
+        if (text.includes('Progress:')) {
+           // 进度条忽略
+        } else {
+           logger.info(`[rrvideos-stdout] ${text}`, logFileName, 'convert');
+        }
       } else if (type === 'stderr') {
         recentStderr.push(text);
         if (recentStderr.length > MAX_BUFFER_LINES) recentStderr.shift();
-        logger.debug(`[rrvideos-stderr] ${text}`, logFileName, 'convert');
+        
+        // stderr 通常包含重要错误信息或ffmpeg日志，提升为 INFO
+        if (text.includes('frame=') && text.includes('fps=')) {
+           // ffmpeg 进度条忽略
+        } else {
+           logger.info(`[rrvideos-stderr] ${text}`, logFileName, 'convert');
+        }
       }
     }, childEnv);
     
@@ -484,6 +497,7 @@ async function handleConvertV2(inputData, res, logFileName) {
         })));
         
         if (!pullData.data || !pullData.data.tasks) {
+          logger.error(`[${actionName}] 拉取数据格式错误，完整数据: ${JSON.stringify(pullData)}`, logFileName, 'convert');
           throw new Error('拉取的数据格式不正确');
         }
         
@@ -643,11 +657,23 @@ async function handleConvertV2(inputData, res, logFileName) {
       if (type === 'stdout') {
         recentStdout.push(text);
         if (recentStdout.length > MAX_BUFFER_LINES) recentStdout.shift();
-        logger.debug(`[rrvideos-stdout] ${text}`, logFileName, 'convert');
+        
+        // 关键过程信息保留为 INFO，进度条等其他信息为 DEBUG
+        if (text.includes('Progress:')) {
+           // 进度条忽略
+        } else {
+           logger.info(`[rrvideos-stdout] ${text}`, logFileName, 'convert');
+        }
       } else if (type === 'stderr') {
         recentStderr.push(text);
         if (recentStderr.length > MAX_BUFFER_LINES) recentStderr.shift();
-        logger.debug(`[rrvideos-stderr] ${text}`, logFileName, 'convert');
+        
+        // stderr 通常包含重要错误信息或ffmpeg日志，提升为 INFO
+        if (text.includes('frame=') && text.includes('fps=')) {
+           // ffmpeg 进度条忽略
+        } else {
+           logger.info(`[rrvideos-stderr] ${text}`, logFileName, 'convert');
+        }
       }
     }, childEnv);
     

package/src/routes/merge.js

@@ -43,9 +43,18 @@ async function handleMerge(inputData, res, logFileName) {
     }
     
     const taskId = mergeId;
-    const videos = Array.isArray(inputData.videos) ? inputData.videos : [];
+    const videos = (Array.isArray(inputData.videos) ? inputData.videos : [])
+      .filter(v => v && typeof v === 'string' && v.trim())
+      .map(v => v.trim());
     // 兼容 output 和 output_name 两种参数名
-    const output = inputData.output || inputData.output_name || '';
+    let output = (inputData.output || inputData.output_name || '').trim();
+    
+    // 如果 output 只是文件名（不是绝对路径），则拼接到配置的视频目录
+    if (output && !path.isAbsolute(output)) {
+      const videoDir = config.get('storage.local.video_dir') || path.join(__dirname, '../../Video');
+      output = path.join(videoDir, output);
+    }
+
     const format = inputData.format || 'mp4';
     const method = inputData.method || 'concat';
     const autoMode = inputData.auto_mode || 'smart';