mb-rrvideo-server 1.0.5 → 1.0.8

package/DOCKER.md

@@ -16,8 +16,7 @@
 
 **快速参考：**
 ```bash
-# 下载 npm 包
-npm pack mb-rrvideo-server
+
 
 # 构建 Docker 镜像
 docker build -t mb-rrvideo-converter:latest .
@@ -31,8 +30,17 @@ docker-compose up -d
 #第一次安装
 sudo docker compose up -d --build --progress=plain
 
+# 更新docker镜像(里面的npm依赖更新的时候用这个）：
+sudo docker compose build --no-cache
+
+# 清理旧容器
+sudo docker system prune -f
+
 # 容器名称
 docker ps | grep rrvideo-server
+
+# 下载 npm 包
+npm pack mb-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/bin/rrvideo-server

@@ -6,9 +6,10 @@
 
 const path = require('path');
 
-// 设置工作目录为项目根目录
-const projectRoot = path.resolve(__dirname, '..');
-process.chdir(projectRoot);
+// 设置工作目录为项目根目录（如果有必要，或者保持当前目录）
+// const projectRoot = path.resolve(__dirname, '..');
+// process.chdir(projectRoot);
 
 // 启动服务
-require('../src/index.js');
+const { startServer } = require('../src/index.js');
+startServer();

package/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     restart: unless-stopped
     
     ports:
-      - "24203:24203"
+      - "23501:24203"
     
     volumes:
       # 配置文件（必须）

package/package.json

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

package/src/index.js

@@ -11,6 +11,35 @@ const { handleReceiveRequest } = require('./routes/receive');
 const { handleConvertV1, handleConvertV2 } = require('./routes/convert');
 const { handleMerge } = require('./routes/merge');
 
+// 全局错误处理
+process.on('exit', (code) => {
+  console.log(`进程退出，代码: ${code}`);
+  logger.flushAll();
+});
+
+process.on('SIGINT', () => {
+  console.log('收到 SIGINT 信号，正在关闭...');
+  logger.flushAll();
+  process.exit(0);
+});
+
+process.on('SIGTERM', () => {
+  console.log('收到 SIGTERM 信号，正在关闭...');
+  logger.flushAll();
+  process.exit(0);
+});
+
+process.on('uncaughtException', (err) => {
+  console.error(`未捕获的异常: ${err.message}`);
+  console.error(err.stack);
+  logger.flushAll();
+  process.exit(1);
+});
+
+process.on('unhandledRejection', (reason, promise) => {
+  console.error(`未处理的 Promise 拒绝: ${reason}`);
+});
+
 // 创建 HTTP 服务器
 const server = http.createServer((req, res) => {
   try {
@@ -94,8 +123,8 @@ const server = http.createServer((req, res) => {
   }
 });
 
-// 启动服务器
-if (require.main === module) {
+// 封装启动逻辑
+function startServer() {
   const PORT = config.get('server.port', 24203);
   const HOST = config.get('server.host', '0.0.0.0');
   
@@ -104,35 +133,12 @@ if (require.main === module) {
     console.log(`Storage type: ${config.get('storage.type')}`);
     console.log(`Log level: ${config.get('log.level')}`);
   });
-  
-  // 程序异常或提前终止时的处理
-  process.on('exit', (code) => {
-    console.log(`进程退出，代码: ${code}`);
-    logger.flushAll();
-  });
-
-  process.on('SIGINT', () => {
-    console.log('收到 SIGINT 信号，正在关闭...');
-    logger.flushAll();
-    process.exit(0);
-  });
-
-  process.on('SIGTERM', () => {
-    console.log('收到 SIGTERM 信号，正在关闭...');
-    logger.flushAll();
-    process.exit(0);
-  });
-
-  process.on('uncaughtException', (err) => {
-    console.error(`未捕获的异常: ${err.message}`);
-    console.error(err.stack);
-    logger.flushAll();
-    process.exit(1);
-  });
+}
 
-  process.on('unhandledRejection', (reason, promise) => {
-    console.error(`未处理的 Promise 拒绝: ${reason}`);
-  });
+// 如果是直接运行脚本，则启动服务器
+if (require.main === module) {
+  startServer();
 }
 
-module.exports = { server };
+// 导出 server 和启动函数
+module.exports = { server, startServer };

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');