mb-rrvideo-server 1.0.6 → 1.0.9

package/DOCKER.md

@@ -30,9 +30,12 @@ docker-compose up -d
 #第一次安装
 sudo docker compose up -d --build --progress=plain
 
-# 更新docker镜像：
+# 更新docker镜像(里面的npm依赖更新的时候用这个）：
 sudo docker compose build --no-cache
 
+# 清理旧容器
+sudo docker system prune -f
+
 # 容器名称
 docker ps | grep rrvideo-server
 

package/Dockerfile

@@ -27,13 +27,15 @@ RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debia
     sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debian.sources
 
 # ============================================
-# 第二步：安装系统依赖
+# 第三步：安装系统依赖
 # ============================================
 RUN apt-get update && apt-get install -y \
     # 基础工具
     curl \
     wget \
     ca-certificates \
+    # 安装 ffmpeg 和 ffprobe (合并视频必须)
+    ffmpeg \
     # Playwright Chromium 依赖
     libnss3 \
     libnspr4 \

package/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     restart: unless-stopped
     
     ports:
-      - "24203:24203"
+      - "23501:24203"
     
     volumes:
       # 配置文件（必须）
@@ -30,10 +30,10 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '4'
+          # cpus: '12'
           memory: 4G
         reservations:
-          cpus: '2'
+          cpus: '4'
           memory: 2G
     
     healthcheck:

package/package.json

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

package/src/logger.js

@@ -1,11 +1,19 @@
 const fs = require('fs');
 const path = require('path');
+const config = require('./config');
+
+const LOG_LEVELS = {
+  'DEBUG': 0,
+  'INFO': 1,
+  'WARN': 2,
+  'ERROR': 3
+};
 
 class Logger {
   constructor() {
     this.buffers = new Map(); // fileKey -> { logs: [], timer: null }
-    this.flushInterval = 2000; // 2秒
-    this.bufferMaxSize = 500; // 500条
+    this.flushInterval = config.get('log.flush_interval', 2000); // 默认2秒
+    this.bufferMaxSize = config.get('log.buffer_max_size', 500); // 默认500条
     this.baseDir = path.join(__dirname, '../logs');
   }
 
@@ -70,6 +78,15 @@ class Logger {
 
   log(logType, fileName, message, level = 'INFO') {
     try {
+      // 检查日志级别
+      const currentLevelStr = config.get('log.level', 'INFO').toUpperCase();
+      const currentLevel = LOG_LEVELS[currentLevelStr] !== undefined ? LOG_LEVELS[currentLevelStr] : LOG_LEVELS['INFO'];
+      const msgLevel = LOG_LEVELS[level.toUpperCase()] !== undefined ? LOG_LEVELS[level.toUpperCase()] : LOG_LEVELS['INFO'];
+
+      if (msgLevel < currentLevel) {
+        return;
+      }
+
       const timestamp = this.getCurrentTime();
       const lines = String(message).split('\n');
       const fileKey = `${logType}::${fileName}`;

package/src/routes/receive.js

@@ -35,7 +35,30 @@ async function handleReceiveRequest(req, res) {
         logFileName = `${recordId}_${actionName}_${Date.now()}`;
         
         logger.info(`[${actionName}] 收到统一请求，类型: ${type}, record_id: ${recordId}, request_id: ${requestId}`, logFileName, 'receive');
-        logger.debug(`[${actionName}] 收到请求数据: ${JSON.stringify(inputData)}`, logFileName, 'receive');
+        // 创建输入的副本进行日志记录，截断过长的字段
+        const logData = { ...inputData };
+        
+        const truncate = (obj) => {
+          try {
+            const str = JSON.stringify(obj);
+            return str.length > 200 ? str.substring(0, 200) + '...' : obj;
+          } catch (e) {
+            return String(obj).substring(0, 200) + '...';
+          }
+        };
+
+        if (logData.events) {
+          logData.events = truncate(logData.events);
+        }
+        if (logData.tasks) {
+          logData.tasks = logData.tasks.map(t => {
+            const taskLog = { ...t };
+            if (taskLog.events) taskLog.events = truncate(taskLog.events);
+            return taskLog;
+          });
+        }
+        
+        logger.debug(`[${actionName}] 收到请求数据: ${JSON.stringify(logData)}`, logFileName, 'receive');
         
         if (!recordId) {
           logger.info(`[${actionName}] record_id不能为空`, logFileName, 'receive');