mb-rrvideo-server 1.0.10 → 1.0.13

package/DOCKER.md

@@ -285,7 +285,9 @@ sudo docker compose up -d
 sudo docker exec rrvideo-server npm update -g mb-rrvideo-server
 sudo docker restart rrvideo-server
 
-不需要pm2重启
+#不需要pm2重启，docker重启的时候会更新掉
+
+
 **输出示例：**
 ```
 NAME              IMAGE                      STATUS         PORTS
@@ -929,8 +931,7 @@ mb-rrvideo 使用 Playwright 来渲染 rrweb 录屏数据，需要一个真实
 **方法 1：使用镜像压缩**
 ```bash
 # 导出时压缩
-docker save mb-rrvideo-converter:latest | gzip > mb-rrvideo-converter.tar.gz
-
+ docker save mb-rrvideo-converter:latest | gzip > /home/mb-rrvideo-converter.tar.gz
 # 压缩后约 600MB
 ls -lh mb-rrvideo-converter.tar.gz
 

package/Dockerfile

@@ -1,5 +1,5 @@
 # ============================================
-# mb-rrvideo-server Docker 镜像
+# mb-rrvideo-server Docker 镜像 (精简版)
 # 视频转码服务（纯 Node.js）
 # 包含：Node.js 22 + mb-rrvideo + mb-rrvideo-server
 # ============================================
@@ -7,7 +7,6 @@
 FROM node:22-slim
 
 # 设置代理参数（可从构建参数传入，也可在此处直接定义默认值）
-# 如果不想每次构建都传参，可以在这里写死默认值
 ARG HTTP_PROXY="http://172.168.1.117:10809"
 ARG HTTPS_PROXY="http://172.168.1.117:10809"
 
@@ -17,19 +16,12 @@ ENV TZ=Asia/Shanghai \
     PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 \
     PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright 
 
-    # PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright
-
 # ============================================
-# 第一步：配置国内镜像源（加速构建）
+# 合并安装系统依赖（减少镜像层）
 # ============================================
-# 使用阿里云 Debian 镜像源
 RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debian.sources && \
-    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 \
+    sed -i 's/security.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debian.sources && \
+    apt-get update && apt-get install -y --no-install-recommends \
     # 基础工具
     curl \
     wget \
@@ -57,34 +49,28 @@ RUN apt-get update && apt-get install -y \
     # 字体支持
     fonts-liberation \
     fonts-noto-cjk \
+    # 清理缓存
+    && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # ============================================
-# 第三步：配置 npm 国内镜像源（加速安装）
+# 安装 npm 包与浏览器（合并层以减少体积）
 # ============================================
-RUN npm config set registry https://registry.npmmirror.com
-
-# ============================================
-# 第五步：全局安装 Node.js 包
-# 使用 --verbose 查看详细日志
-# 并显式添加 --ignore-scripts 参数以跳过所有 postinstall 脚本
-# ============================================
-RUN npm install -g --verbose --ignore-scripts \
+RUN npm config set registry https://registry.npmmirror.com && \
+    npm install -g --verbose --ignore-scripts \
     pm2 \
     mb-rrvideo \
     mb-rrvideo-server \
-    && npm cache clean --force
-
-# ============================================
-# 第六步：安装 Playwright 浏览器（Chromium）
-# 使用构建参数中的代理（只在此步骤生效）
-# ============================================
-RUN export HTTP_PROXY=$HTTP_PROXY && \
+    && npm cache clean --force && \
+    # 立即安装浏览器并清理
+    export HTTP_PROXY=$HTTP_PROXY && \
     export HTTPS_PROXY=$HTTPS_PROXY && \
-    npx playwright install chromium
+    npx playwright install chromium && \
+    # 删除 playwright 下载的 zip 包缓存（瘦身关键）
+    rm -rf /root/.cache/ms-playwright/*/chromium-*.zip
 
 # ============================================
-# 第七步：创建应用目录
+# 创建应用目录与配置
 # ============================================
 RUN mkdir -p /app/config \
     && mkdir -p /app/logs \
@@ -94,23 +80,11 @@ RUN mkdir -p /app/config \
 
 WORKDIR /app
 
-# ============================================
-# 第八步：复制 PM2 配置文件
-# ============================================
 COPY ecosystem.docker.config.js /app/ecosystem.config.js
 
-# ============================================
-# 第九步：暴露端口
-# ============================================
 EXPOSE 24203
 
-# ============================================
-# 第十步：健康检查
-# ============================================
 HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
     CMD curl -f http://localhost:24203/health || exit 1
 
-# ============================================
-# 第十一步：启动服务
-# ============================================
 CMD ["pm2-runtime", "start", "ecosystem.config.js"]

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.10",
+  "version": "1.0.13",
   "description": "视频转码服务 - 接收可回溯机请求，执行转码/合并，上传MinIO/本地存储",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -138,9 +138,13 @@ function startServer() {
   }
 
   server.listen(PORT, HOST, () => {
-    console.log(`rrvideo-server v${version} listening on ${HOST}:${PORT}`);
-    console.log(`Storage type: ${config.get('storage.type')}`);
-    console.log(`Log level: ${config.get('log.level')}`);
+    const startMsg = `rrvideo-server v${version} listening on ${HOST}:${PORT}\n` +
+                     `Storage type: ${config.get('storage.type')}\n` +
+                     `Log level: ${config.get('log.level')}`;
+    
+    console.log(startMsg);
+    // 记录到系统日志文件，确保日志目录被创建
+    logger.info(startMsg, 'system', 'system');
   });
 }
 

package/src/logger.js

@@ -14,7 +14,22 @@ class Logger {
     this.buffers = new Map(); // fileKey -> { logs: [], timer: null }
     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');
+    
+    // 优先使用配置的日志目录，或者环境变量 LOG_DIR
+    // 适配 Docker 环境：如果 /app/logs 存在，则优先使用（防止全局安装时路径跑偏）
+    if (process.env.LOG_DIR) {
+      this.baseDir = process.env.LOG_DIR;
+    } else if (config.get('log.dir')) {
+      this.baseDir = config.get('log.dir');
+    } else {
+      // 自动检测 Docker 环境
+      const dockerLogDir = '/app/logs';
+      if (fs.existsSync(dockerLogDir)) {
+        this.baseDir = dockerLogDir;
+      } else {
+        this.baseDir = path.join(__dirname, '../logs');
+      }
+    }
   }
 
   ensureDir(dirPath) {

package/src/routes/convert.js

@@ -167,6 +167,7 @@ function deriveRecordId(taskItem, rootParams) {
  */
 async function handleConvertV1(inputData, res, logFileName) {
   const actionName = 'handleConvertV1';
+  let createdTempDir = null; // 记录创建的临时目录
   
   try {
     let input = inputData.input;
@@ -198,6 +199,7 @@ async function handleConvertV1(inputData, res, logFileName) {
         const basePath = config.get('storage.local.temp_dir') || config.get('storage.local.base_path') || './';
         const tempDir = path.join(basePath, `__temp_convert_${recordId}`);
         ensureDir(tempDir);
+        createdTempDir = tempDir; // 记录临时目录路径
         
         const tempFile = 'record.data';
         const tempFilePath = path.join(tempDir, tempFile);
@@ -322,6 +324,16 @@ async function handleConvertV1(inputData, res, logFileName) {
         if (tempConfigFile) {
           cleanupTempConfigFile(tempConfigFile);
         }
+
+        // 清理临时目录
+        if (createdTempDir) {
+          try {
+            fs.rmSync(createdTempDir, { recursive: true, force: true });
+            logger.info(`[${actionName}] 临时目录已删除: ${createdTempDir}`, logFileName, 'convert');
+          } catch (e) {
+            logger.error(`[${actionName}] 删除临时目录失败: ${e.message}`, logFileName, 'convert');
+          }
+        }
         
         if (exitCode !== 0) {
           // 转码失败
@@ -432,6 +444,7 @@ async function handleConvertV1(inputData, res, logFileName) {
  */
 async function handleConvertV2(inputData, res, logFileName) {
   const actionName = 'handleConvertV2';
+  const createdTempDirs = []; // 记录创建的临时目录列表
   
   try {
     const recordId = inputData.record_id || inputData.record_no || 'unknown';
@@ -508,6 +521,7 @@ async function handleConvertV2(inputData, res, logFileName) {
           const basePath = config.get('storage.local.temp_dir') || config.get('storage.local.base_path') || './';
           const tempDir = path.join(basePath, `__temp_convert_${recordId}_${recordPageId}`);
           ensureDir(tempDir);
+          createdTempDirs.push(tempDir); // 记录临时目录路径
           
           const tempFile = `record_${recordPageId}.data`;
           const tempFilePath = path.join(tempDir, tempFile);
@@ -664,6 +678,16 @@ async function handleConvertV2(inputData, res, logFileName) {
         if (tempConfigFile) {
           cleanupTempConfigFile(tempConfigFile);
         }
+
+        // 清理所有临时目录
+        for (const dir of createdTempDirs) {
+          try {
+            fs.rmSync(dir, { recursive: true, force: true });
+            logger.info(`[${actionName}] 临时目录已删除: ${dir}`, logFileName, 'convert');
+          } catch (e) {
+            logger.error(`[${actionName}] 删除临时目录失败: ${e.message}`, logFileName, 'convert');
+          }
+        }
         
         if (exitCode !== 0) {
           // 转码失败

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