mb-rrvideo-server 1.0.3 → 1.0.5

package/DOCKER.md

@@ -28,6 +28,9 @@ docker images mb-rrvideo-converter
 # 运行容器
 docker-compose up -d
 
+#第一次安装
+sudo docker compose up -d --build --progress=plain
+
 # 容器名称
 docker ps | grep rrvideo-server
 ```
@@ -98,7 +101,7 @@ docker --version
 
 ```bash
 # 下载 Docker Compose
-sudo curl -L "https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+sudo curl -L "https://gh-proxy.org/https://github.com/docker/compose/releases/download/v2.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 
 # 添加执行权限
 sudo chmod +x /usr/local/bin/docker-compose
@@ -117,9 +120,10 @@ sudo mkdir -p /etc/docker
 sudo tee /etc/docker/daemon.json <<-'EOF'
 {
   "registry-mirrors": [
-    "https://docker.mirrors.ustc.edu.cn",
-    "https://hub-mirror.c.163.com",
-    "https://mirror.ccs.tencentyun.com"
+    "https://docker.m.daocloud.io",
+    "https://dockerproxy.com",
+    "https://mirror.baidubce.com",
+    "https://docker.nju.edu.cn"
   ]
 }
 EOF
@@ -262,6 +266,13 @@ docker-compose up -d
 docker-compose ps
 ```
 
+更新后重装：
+# 强制不使用缓存构建，确保拉到最新的 npm 包
+sudo docker compose build --no-cache
+
+# 重启服务
+sudo docker compose up -d
+
 **输出示例：**
 ```
 NAME              IMAGE                      STATUS         PORTS

package/Dockerfile

@@ -6,11 +6,18 @@
 
 FROM node:22-slim
 
+# 设置代理参数（可从构建参数传入，也可在此处直接定义默认值）
+# 如果不想每次构建都传参，可以在这里写死默认值
+ARG HTTP_PROXY="http://172.168.1.117:10809"
+ARG HTTPS_PROXY="http://172.168.1.117:10809"
+
 # 设置环境变量
 ENV TZ=Asia/Shanghai \
     NODE_ENV=production \
-    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 \
-    PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 \
+    PLAYWRIGHT_BROWSERS_PATH=/root/.cache/ms-playwright 
+
+    # PLAYWRIGHT_DOWNLOAD_HOST=https://npmmirror.com/mirrors/playwright
 
 # ============================================
 # 第一步：配置国内镜像源（加速构建）
@@ -56,42 +63,26 @@ RUN apt-get update && apt-get install -y \
 RUN npm config set registry https://registry.npmmirror.com
 
 # ============================================
-# 第四步：全局安装 PM2
-# ============================================
-RUN npm install -g pm2 && npm cache clean --force
-
+# 第五步：全局安装 Node.js 包
+# 使用 --verbose 查看详细日志
+# 并显式添加 --ignore-scripts 参数以跳过所有 postinstall 脚本
 # ============================================
-# 第五步：安装本地依赖包 (mb-rrvideo)
-# 方案：直接使用源码在容器内编译安装
-# 前置条件：构建前由 server-run.sh 脚本将 ../mb-rrvideo 复制到 ./_deps/mb-rrvideo
-# ============================================
-COPY _deps/mb-rrvideo /tmp/mb-rrvideo
-RUN cd /tmp/mb-rrvideo && \
-    # 安装依赖（包含 devDependencies 以便执行 build）
-    npm install && \
-    # 编译 TypeScript
-    npm run build && \
-    # 全局安装
-    npm install -g . && \
-    # 清理源码和缓存
-    cd / && rm -rf /tmp/mb-rrvideo && npm cache clean --force
+RUN npm install -g --verbose --ignore-scripts \
+    pm2 \
+    mb-rrvideo \
+    mb-rrvideo-server \
+    && npm cache clean --force
 
 # ============================================
-# 第六步：复制项目源码并安装
+# 第六步：安装 Playwright 浏览器（Chromium）
+# 使用构建参数中的代理（只在此步骤生效）
 # ============================================
-WORKDIR /app
-COPY . /app
-
-# 安装当前项目依赖并链接命令
-RUN npm install -g . && npm cache clean --force
+RUN export HTTP_PROXY=$HTTP_PROXY && \
+    export HTTPS_PROXY=$HTTPS_PROXY && \
+    npx playwright install chromium
 
 # ============================================
-# 第七步：安装 Playwright 浏览器（Chromium）
-# ============================================
-RUN npx playwright install chromium
-
-# ============================================
-# 第八步：创建应用目录
+# 第七步：创建应用目录
 # ============================================
 RUN mkdir -p /app/config \
     && mkdir -p /app/logs \
@@ -99,23 +90,25 @@ RUN mkdir -p /app/config \
     && mkdir -p /app/Video \
     && mkdir -p /app/tasks
 
+WORKDIR /app
+
 # ============================================
-# 第九步：复制 PM2 配置文件
+# 第八步：复制 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/config.example.json

@@ -7,23 +7,29 @@
   
   // 存储配置
   "storage": {
-    "type": "local",            // 存储类型: "local" 或 "minio"
+    "type": "aliyun",            // 存储类型: "local" 或 "minio"
     
     // 本地存储配置
     "local": {
       "video_dir": "./Video",   // 视频存储目录
       "temp_dir": "./temp"      // 临时文件目录
     },
+    "aliyun":{
+      "accessKeyId": "",
+      "accessKeySecret": "",
+      "endpoint": "",
+      "bucket": ""
+    },
     
     // MinIO 对象存储配置
     "minio": {
-      "endpoint": "172.168.1.2",
+      "endpoint": "",
       "port": 9000,
       "useSSL": false,
       "accessKey": "your-access-key",
       "secretKey": "your-secret-key",
-      "bucket": "record-prod",
-      "public_host": "https://oss-bbx.17maibaoxian.com:10008"
+      "bucket": "",
+      "publicHost": ""
     }
   },
   

package/ecosystem.docker.config.js

@@ -10,7 +10,8 @@ module.exports = {
     watch: false,
     max_memory_restart: '2G',
     env: {
-      NODE_ENV: 'production'
+      NODE_ENV: 'production',
+      CONFIG_PATH: '/app/config/config.json'
     },
     error_file: '/app/logs/pm2-error.log',
     out_file: '/app/logs/pm2-out.log',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mb-rrvideo-server",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "视频转码服务 - 接收可回溯机请求，执行转码/合并，上传MinIO/本地存储",
   "main": "src/index.js",
   "bin": {
@@ -35,6 +35,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "ali-oss": "^6.23.0",
     "minio": "^7.1.3"
   },
   "devDependencies": {

package/src/config.js

@@ -4,7 +4,22 @@ const path = require('path');
 class ConfigManager {
   constructor() {
     this.config = null;
-    this.configPath = path.join(__dirname, '../config.json');
+    // 优先使用环境变量 CONFIG_PATH，如果没设置，再按顺序查找
+    // 1. 当前工作目录下的 config.json (本地开发路径)
+    // 2. 源码所在目录的上级目录 (兜底)
+    
+    if (process.env.CONFIG_PATH) {
+      this.configPath = process.env.CONFIG_PATH;
+    } else {
+      const fs = require('fs');
+      const candidates = [
+        path.join(process.cwd(), 'config.json'),
+        path.join(__dirname, '../config.json')
+      ];
+      
+      this.configPath = candidates.find(p => fs.existsSync(p)) || candidates[1];
+    }
+    
     this.examplePath = path.join(__dirname, '../config.example.json');
   }
 
@@ -123,8 +138,8 @@ class ConfigManager {
     }
 
     const storageType = this.config.storage.type;
-    if (storageType !== 'local' && storageType !== 'minio') {
-      throw new Error('storage.type 必须是 local 或 minio');
+    if (storageType !== 'local' && storageType !== 'minio' && storageType !== 'aliyun') {
+      throw new Error('storage.type 必须是 local, minio 或 aliyun');
     }
 
     // 如果使用 MinIO，验证 MinIO 配置
@@ -135,6 +150,14 @@ class ConfigManager {
       }
     }
 
+    // 如果使用 Aliyun OSS，验证 Aliyun OSS 配置
+    if (storageType === 'aliyun') {
+      const aliyun = this.config.storage.aliyun;
+      if (!aliyun || !aliyun.accessKeyId || !aliyun.accessKeySecret || !aliyun.endpoint || !aliyun.bucket) {
+        throw new Error('阿里云 OSS 配置不完整');
+      }
+    }
+
     console.log('[Config] 配置验证通过');
     console.log('[Config] 存储类型:', storageType);
   }

package/src/storage.js

@@ -1,12 +1,14 @@
 const fs = require('fs');
 const path = require('path');
 const Minio = require('minio');
+const OSS = require('ali-oss');
 const config = require('./config');
 
 class StorageManager {
   constructor() {
     this.storageType = null;
     this.minioClient = null;
+    this.ossClient = null;
     this.init();
   }
 
@@ -24,6 +26,17 @@ class StorageManager {
         secretKey: minioConfig.secretKey
       });
       console.log('[Storage] MinIO 客户端已初始化');
+    } else if (this.storageType === 'aliyun') {
+      const aliyunConfig = storageConfig.aliyun;
+      this.ossClient = new OSS({
+        // region: aliyunConfig.region || 'oss-cn-hangzhou', // 默认为杭州，或者从endpoint解析
+        accessKeyId: aliyunConfig.accessKeyId,
+        accessKeySecret: aliyunConfig.accessKeySecret,
+        bucket: aliyunConfig.bucket,
+        endpoint: aliyunConfig.endpoint,
+        secure: true // 默认使用 HTTPS
+      });
+      console.log('[Storage] 阿里云 OSS 客户端已初始化');
     } else {
       console.log('[Storage] 使用本地存储');
     }
@@ -64,6 +77,8 @@ class StorageManager {
 
       if (this.storageType === 'minio') {
         return await this.uploadToMinio(localPath, remotePath);
+      } else if (this.storageType === 'aliyun') {
+        return await this.uploadToOss(localPath, remotePath);
       } else {
         return await this.saveToLocal(localPath, remotePath);
       }
@@ -95,7 +110,7 @@ class StorageManager {
       await this.minioClient.fPutObject(bucket, remotePath, localPath, metaData);
       
       // 生成公网访问 URL
-      const publicHost = minioConfig.public_host;
+      const publicHost = minioConfig.publicHost;
       const videoUrl = `${publicHost}/${bucket}/${remotePath}`;
       
       console.log('[Storage] MinIO 上传成功:', videoUrl);
@@ -106,6 +121,50 @@ class StorageManager {
     }
   }
 
+  /**
+   * 上传到 阿里云 OSS
+   */
+  async uploadToOss(localPath, remotePath) {
+    try {
+      // 检查文件是否存在
+      if (!fs.existsSync(localPath)) {
+        throw new Error(`本地文件不存在: ${localPath}`);
+      }
+
+      // 上传选项
+      const headers = {
+        // 指定Object的存储类型。
+        'x-oss-storage-class': 'Standard',
+        // 指定Object的访问权限。
+        'x-oss-object-acl': 'public-read', // 通常视频需要公共读权限以便播放
+        // 指定PutObject操作时是否覆盖同名目标Object。此处设置为true，表示禁止覆盖同名Object。
+        'x-oss-forbid-overwrite': 'false', // 允许覆盖
+        'Content-Type': 'video/mp4'
+      };
+
+      const result = await this.ossClient.put(remotePath, path.normalize(localPath), { headers });
+      
+      // 生成访问 URL
+      // 优先使用 result.url，如果配置了自定义域名(publicHost)则使用自定义域名
+      const aliyunConfig = config.get('storage.aliyun');
+      let videoUrl = result.url;
+      
+      if (aliyunConfig.publicHost) {
+        // 确保 publicHost 不带末尾斜杠
+        const host = aliyunConfig.publicHost.replace(/\/$/, '');
+        // 确保 remotePath 不带开头斜杠
+        const key = remotePath.replace(/^\//, '');
+        videoUrl = `${host}/${key}`;
+      }
+      
+      console.log('[Storage] 阿里云 OSS 上传成功:', videoUrl);
+      return videoUrl;
+    } catch (error) {
+      console.error('[Storage] 阿里云 OSS 上传失败:', error.message);
+      throw error;
+    }
+  }
+
   /**
    * 保存到本地
    */