mb-rrvideo-server 1.0.4 → 1.0.6

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,14 @@ docker-compose up -d
 #第一次安装
 sudo docker compose up -d --build --progress=plain
 
+# 更新docker镜像：
+sudo docker compose build --no-cache
+
 # 容器名称
 docker ps | grep rrvideo-server
+
+# 下载 npm 包
+npm pack mb-rrvideo-server
 ```
 
 ## 目录
@@ -266,6 +271,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,6 +6,11 @@
 
 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 \
@@ -70,10 +75,10 @@ RUN npm install -g --verbose --ignore-scripts \
 
 # ============================================
 # 第六步：安装 Playwright 浏览器（Chromium）
-# 使用 HTTPS_PROXY 环境变量（注意是 HTTPS_PROXY，且要在一行内执行）
+# 使用构建参数中的代理（只在此步骤生效）
 # ============================================
-RUN export HTTPS_PROXY=http://172.168.1.118:1087 && \
-    export HTTP_PROXY=http://172.168.1.118:1087 && \
+RUN export HTTP_PROXY=$HTTP_PROXY && \
+    export HTTPS_PROXY=$HTTPS_PROXY && \
     npx playwright install chromium
 
 # ============================================

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/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.4",
+  "version": "1.0.6",
   "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

@@ -138,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 配置
@@ -150,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/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/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;
+    }
+  }
+
   /**
    * 保存到本地
    */