mb-rrvideo-server 1.0.14 → 1.0.17

package/docker-compose.yml

@@ -2,8 +2,8 @@ version: '3.8'
 
 services:
   rrvideo-server:
-    build: .
     image: mb-rrvideo-converter:latest
+    build: .
     container_name: rrvideo-server
     restart: unless-stopped
     

package/ecosystem.docker.config.js

@@ -11,7 +11,8 @@ module.exports = {
     max_memory_restart: '2G',
     env: {
       NODE_ENV: 'production',
-      CONFIG_PATH: '/app/config/config.json'
+      CONFIG_PATH: '/app/config/config.json',
+      HOSTNAME: process.env.HOSTNAME // 显式传递 Docker Hostname
     },
     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.14",
+  "version": "1.0.17",
   "description": "视频转码服务 - 接收可回溯机请求，执行转码/合并，上传MinIO/本地存储",
   "main": "src/index.js",
   "bin": {

package/src/logger.js

@@ -58,6 +58,14 @@ class Logger {
     const dateStr = this.getCurrentDate();
     const logDir = path.join(this.baseDir, logType, dateStr);
     this.ensureDir(logDir);
+
+    // 在多实例/集群环境下，避免 system.log 冲突
+    // 优先使用 HOSTNAME (Docker环境)，其次使用 PID (普通Node环境)
+    if (fileName === 'system') {
+      const instanceId = process.env.HOSTNAME || process.pid;
+      return path.join(logDir, `${fileName}_${instanceId}.log`);
+    }
+
     return path.join(logDir, `${fileName}.log`);
   }
 

package/src/routes/convert.js

@@ -5,118 +5,15 @@
 
 const fs = require('fs');
 const path = require('path');
-const crypto = require('crypto');
-const http = require('http');
-const https = require('https');
-const url = require('url');
 const config = require('../config');
 const logger = require('../logger');
 const taskManager = require('../task');
 const storageManager = require('../storage');
 const { sendCallback } = require('../utils/callback');
+const { downloadAndMergeManifestEventFiles, normalizeManifestEventFiles } = require('../utils/event-files');
+const { pullTaskManifest } = require('../utils/pull-task-data');
 const { runRrvideosCommand, buildConvertCommand, setPermissions, cleanupTempConfigFile } = require('../utils/video');
 
-/**
- * 从pull_data_url拉取任务数据（带签名验证）
- * @param {string} pullDataUrl - 拉取数据的URL
- * @param {string} recordId - 记录ID
- * @param {string} logFileName - 日志文件名
- * @param {Array} tasks - 任务列表（V2使用，可选）
- * @returns {Promise<Object>} - 返回拉取到的数据
- */
-async function pullTaskData(pullDataUrl, recordId, logFileName, tasks = null) {
-  return new Promise((resolve, reject) => {
-    try {
-      // 构造签名参数
-      const source = 'converter_internal';
-      const timestamp = Math.floor(Date.now() / 1000);
-      const secret = crypto.createHash('md5').update(source + '@BBX').digest('hex');
-      
-      // 签名数组（用于计算签名）
-      const signArray = {
-        record_id: recordId,
-        source: source,
-        timestamp: timestamp,
-        secret: secret
-      };
-      
-      // 排序并生成签名字符串
-      const sortedKeys = Object.keys(signArray).sort();
-      const signParts = sortedKeys.map(key => `${key}=${signArray[key]}`);
-      const signStr = signParts.join('&');
-      const sign = crypto.createHash('md5').update(signStr).digest('hex');
-      
-      logger.debug(`[pullTaskData] 签名计算: sign_str=${signStr}, sign=${sign}`, logFileName, 'convert');
-      
-      // ✅ 判断是V1还是V2：V2会传入tasks参数，V1不会
-      const isV2 = tasks && Array.isArray(tasks) && tasks.length > 0;
-      
-      // ✅ 构造请求参数（V1使用record_id，V2使用record_no）
-      const postData = {
-        [isV2 ? 'record_no' : 'record_id']: recordId,
-        source: source,
-        timestamp: timestamp,
-        sign: sign
-      };
-      
-      // V2需要传递tasks
-      if (isV2) {
-        postData.tasks = JSON.stringify(tasks);
-      }
-      
-      const postDataStr = Object.keys(postData).map(key => 
-        `${encodeURIComponent(key)}=${encodeURIComponent(postData[key])}`
-      ).join('&');
-      
-      logger.debug(`[pullTaskData] 请求参数 (${isV2 ? 'V2' : 'V1'}): ${postDataStr}`, logFileName, 'convert');
-      
-      const pullUrl = new URL(pullDataUrl);
-      const httpModule = pullUrl.protocol === 'https:' ? https : http;
-      
-      const options = {
-        hostname: pullUrl.hostname,
-        port: pullUrl.port || (pullUrl.protocol === 'https:' ? 443 : 80),
-        path: pullUrl.pathname + (pullUrl.search || ''),
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'Content-Length': Buffer.byteLength(postDataStr)
-        },
-        rejectUnauthorized: false
-      };
-      
-      const req = httpModule.request(options, (resp) => {
-        let body = '';
-        resp.on('data', (chunk) => (body += chunk));
-        resp.on('end', () => {
-          try {
-            const data = JSON.parse(body);
-            logger.debug(`[pullTaskData] 响应数据: ${body}`, logFileName, 'convert');
-            
-            if (data.result_code !== 0) {
-              reject(new Error(data.message || '拉取数据失败'));
-            } else {
-              resolve(data);
-            }
-          } catch (parseError) {
-            reject(new Error(`解析响应失败: ${parseError.message}`));
-          }
-        });
-      });
-      
-      req.on('error', (err) => {
-        reject(new Error(`请求失败: ${err.message}`));
-      });
-      
-      req.write(postDataStr);
-      req.end();
-      
-    } catch (error) {
-      reject(error);
-    }
-  });
-}
-
 /**
  * 生成任务ID
  */
@@ -183,18 +80,21 @@ async function handleConvertV1(inputData, res, logFileName) {
       logger.info(`[${actionName}] 开始拉取任务详细数据，URL: ${pullDataUrl}`, logFileName, 'convert');
       
       try {
-        const pullData = await pullTaskData(pullDataUrl, recordId, logFileName);
+        const pullData = await pullTaskManifest(pullDataUrl, recordId, logFileName);
+        logger.info(`[${actionName}] manifest 接口返回: ${JSON.stringify(pullData)}`, logFileName, 'convert');
         
-        if (!pullData.data || !pullData.data.events_data) {
+        const eventFiles = pullData.data ? normalizeManifestEventFiles(pullData.data) : [];
+        if (!eventFiles.length) {
           logger.error(`[${actionName}] 拉取数据格式错误，完整数据: ${JSON.stringify(pullData)}`, logFileName, 'convert');
           throw new Error('拉取的数据格式不正确');
         }
-        
-        const eventsData = pullData.data.events_data;
-        const eventsJson = JSON.stringify(eventsData);
-        
-        logger.info(`[${actionName}] 数据拉取完成，事件数: ${eventsData.length}`, logFileName, 'convert');
-        logger.debug(`[${actionName}] 事件数据大小: ${eventsJson.length}字节`, logFileName, 'convert');
+
+        const eventsSize = eventFiles.reduce((sum, item) => sum + Number(item.size || 0), 0);
+        logger.info(
+          `[${actionName}] manifest 拉取完成，事件分片数=${eventFiles.length}, events_size=${eventsSize}`,
+          logFileName,
+          'convert'
+        );
         
         // ✅ 创建临时目录和文件
         const basePath = config.get('storage.local.temp_dir') || config.get('storage.local.base_path') || './';
@@ -204,10 +104,17 @@ async function handleConvertV1(inputData, res, logFileName) {
         
         const tempFile = 'record.data';
         const tempFilePath = path.join(tempDir, tempFile);
-        
-        // 写入临时文件
-        fs.writeFileSync(tempFilePath, eventsJson, 'utf8');
-        logger.debug(`[${actionName}] 写入临时文件: ${tempFilePath}`, logFileName, 'convert');
+
+        await downloadAndMergeManifestEventFiles(pullData.data, {
+          targetPath: tempFilePath,
+          tempDir,
+          logger,
+          logFileName,
+          logType: 'convert',
+          retries: 2,
+          retryDelayMs: 1000
+        });
+        logger.debug(`[${actionName}] 事件JSON分片已下载并拼接到临时文件: ${tempFilePath}`, logFileName, 'convert');
         
         // ✅ 构造输出路径
         const now = new Date();
@@ -488,13 +395,14 @@ async function handleConvertV2(inputData, res, logFileName) {
         return;
       }
       
-      logger.info(`[${actionName}] 开始拉取任务详细数据，URL: ${pullDataUrl}`, logFileName, 'convert');
+        logger.info(`[${actionName}] 开始拉取任务详细数据，URL: ${pullDataUrl}`, logFileName, 'convert');
       
       try {
-        const pullData = await pullTaskData(pullDataUrl, recordId, logFileName, tasks.map(t => ({
+        const pullData = await pullTaskManifest(pullDataUrl, recordId, logFileName, tasks.map(t => ({
           record_page_id: t.record_page_id,
           record_page_no: t.record_page_no
         })));
+        logger.info(`[${actionName}] manifest 接口返回: ${JSON.stringify(pullData)}`, logFileName, 'convert');
         
         if (!pullData.data || !pullData.data.tasks) {
           logger.error(`[${actionName}] 拉取数据格式错误，完整数据: ${JSON.stringify(pullData)}`, logFileName, 'convert');
@@ -521,15 +429,18 @@ async function handleConvertV2(inputData, res, logFileName) {
             pt.record_page_no == recordPageNo
           );
           
-          if (!pulledTask || !pulledTask.events_data || pulledTask.events_data.length === 0) {
-            logger.warning(`[${actionName}] 第${i}个任务(page_id=${recordPageId})的事件数据为空，跳过`, logFileName, 'convert');
+          const eventFiles = pulledTask ? normalizeManifestEventFiles(pulledTask) : [];
+          if (!eventFiles.length) {
+            logger.warn(`[${actionName}] 第${i}个任务(page_id=${recordPageId})缺少事件文件清单，跳过`, logFileName, 'convert');
             continue;  // 跳过，不添加到validTasksTemp
           }
-          
-          const eventsData = pulledTask.events_data;
-          const eventsJson = JSON.stringify(eventsData);
-          
-          logger.debug(`[${actionName}] 第${i}个任务的事件数据大小: ${eventsJson.length}字节`, logFileName, 'convert');
+
+          const eventsSize = eventFiles.reduce((sum, item) => sum + Number(item.size || 0), 0);
+          logger.info(
+            `[${actionName}] 第${i}个任务 manifest: page_id=${recordPageId}, 分片数=${eventFiles.length}, events_size=${eventsSize}`,
+            logFileName,
+            'convert'
+          );
           
           // ✅ 创建临时目录和文件（照着PHP的逻辑）
           const basePath = config.get('storage.local.temp_dir') || config.get('storage.local.base_path') || './';
@@ -539,10 +450,17 @@ async function handleConvertV2(inputData, res, logFileName) {
           
           const tempFile = `record_${recordPageId}.data`;
           const tempFilePath = path.join(tempDir, tempFile);
-          
-          // 写入临时文件
-          fs.writeFileSync(tempFilePath, eventsJson, 'utf8');
-          logger.debug(`[${actionName}] 写入临时文件: ${tempFilePath}`, logFileName, 'convert');
+
+          await downloadAndMergeManifestEventFiles(pulledTask, {
+            targetPath: tempFilePath,
+            tempDir,
+            logger,
+            logFileName,
+            logType: 'convert',
+            retries: 2,
+            retryDelayMs: 1000
+          });
+          logger.debug(`[${actionName}] 第${i}个任务事件JSON分片已下载并拼接: ${tempFilePath}`, logFileName, 'convert');
           
           // ✅ 构造输出路径（照着PHP的逻辑）
           const now = new Date();

package/src/routes/merge.js

@@ -83,13 +83,18 @@ async function handleMerge(inputData, res, logFileName) {
     logger.debug(`[${actionName}] 视频列表(${videos.length}个): ${JSON.stringify(videos)}`, taskId, 'merge');
     logger.info(`[${actionName}] 输出路径: ${output}`, taskId, 'merge');
     logger.debug(`[${actionName}] 回调数据: ${JSON.stringify(callbackData)}`, taskId, 'merge');
+
+    const mergeDownloadDir = path.join(process.cwd(), '__rrvideos__temp__', 'merge_downloads', String(taskId));
+    ensureDir(mergeDownloadDir);
+    logger.info(`[${actionName}] 合并临时下载目录: ${mergeDownloadDir}`, taskId, 'merge');
     
     // 生成合并命令
     const command = buildMergeCommand(videos, output, {
       format,
       method,
       auto_mode: autoMode,
-      headers
+      headers,
+      download_dir: mergeDownloadDir
     });
     
     logger.info(`[${actionName}] 合并指令:\n${command}`, taskId, 'merge');

package/src/utils/download.js

@@ -0,0 +1,192 @@
+const fs = require('fs');
+const path = require('path');
+const http = require('http');
+const https = require('https');
+
+function ensureDir(dirPath) {
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true });
+  }
+}
+
+function formatBytes(bytes) {
+  if (!bytes || bytes < 0) {
+    return '0 B';
+  }
+
+  const units = ['B', 'KB', 'MB', 'GB'];
+  let size = bytes;
+  let unitIndex = 0;
+
+  while (size >= 1024 && unitIndex < units.length - 1) {
+    size /= 1024;
+    unitIndex++;
+  }
+
+  return `${size.toFixed(unitIndex === 0 ? 0 : 2)} ${units[unitIndex]}`;
+}
+
+function unlinkQuietly(filePath) {
+  try {
+    if (filePath && fs.existsSync(filePath)) {
+      fs.unlinkSync(filePath);
+    }
+  } catch (error) {
+    // Ignore cleanup failures.
+  }
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+function downloadUrlToFile(downloadUrl, targetPath, options = {}) {
+  const logger = options.logger;
+  const logFileName = options.logFileName || 'download';
+  const logType = options.logType || 'convert';
+  const maxRedirects = typeof options.maxRedirects === 'number' ? options.maxRedirects : 5;
+
+  return new Promise((resolve, reject) => {
+    const startedAt = Date.now();
+    ensureDir(path.dirname(targetPath));
+
+    const requestOnce = (requestUrl, redirectCount) => {
+      let request;
+      let fileStream;
+      let bytesWritten = 0;
+      let contentLength = 0;
+
+      try {
+        const parsed = new URL(requestUrl);
+        const client = parsed.protocol === 'https:' ? https : http;
+
+        logger && logger.info(`[downloadUrlToFile] 开始下载事件文件: ${requestUrl}`, logFileName, logType);
+
+        request = client.get({
+          hostname: parsed.hostname,
+          port: parsed.port || (parsed.protocol === 'https:' ? 443 : 80),
+          path: parsed.pathname + (parsed.search || ''),
+          headers: options.headers || {},
+          rejectUnauthorized: false
+        }, (response) => {
+          if (response.statusCode >= 300 && response.statusCode < 400 && response.headers.location) {
+            if (redirectCount >= maxRedirects) {
+              response.resume();
+              reject(new Error(`下载重定向次数过多: ${requestUrl}`));
+              return;
+            }
+
+            const nextUrl = new URL(response.headers.location, requestUrl).toString();
+            logger && logger.info(`[downloadUrlToFile] 跟随重定向: ${nextUrl}`, logFileName, logType);
+            response.resume();
+            requestOnce(nextUrl, redirectCount + 1);
+            return;
+          }
+
+          if (response.statusCode !== 200) {
+            response.resume();
+            reject(new Error(`下载失败，HTTP状态码: ${response.statusCode}`));
+            return;
+          }
+
+          contentLength = Number(response.headers['content-length'] || 0);
+          fileStream = fs.createWriteStream(targetPath);
+
+          response.on('data', (chunk) => {
+            bytesWritten += chunk.length;
+          });
+
+          response.on('error', (error) => {
+            if (fileStream) {
+              fileStream.destroy();
+            }
+            unlinkQuietly(targetPath);
+            reject(error);
+          });
+
+          fileStream.on('error', (error) => {
+            response.destroy(error);
+            unlinkQuietly(targetPath);
+            reject(error);
+          });
+
+          fileStream.on('finish', () => {
+            const durationMs = Date.now() - startedAt;
+            logger && logger.info(
+              `[downloadUrlToFile] 下载完成: ${targetPath}, 大小=${formatBytes(bytesWritten)}${contentLength ? `/${formatBytes(contentLength)}` : ''}, 耗时=${durationMs}ms`,
+              logFileName,
+              logType
+            );
+            resolve({
+              bytesWritten,
+              contentLength,
+              durationMs,
+              targetPath
+            });
+          });
+
+          response.pipe(fileStream);
+        });
+
+        request.on('error', (error) => {
+          unlinkQuietly(targetPath);
+          reject(error);
+        });
+      } catch (error) {
+        unlinkQuietly(targetPath);
+        reject(error);
+      }
+    };
+
+    requestOnce(downloadUrl, 0);
+  });
+}
+
+async function downloadUrlToFileWithRetry(downloadUrl, targetPath, options = {}) {
+  const retries = typeof options.retries === 'number' ? options.retries : 2;
+  const retryDelayMs = typeof options.retryDelayMs === 'number' ? options.retryDelayMs : 1000;
+  const logger = options.logger;
+  const logFileName = options.logFileName || 'download';
+  const logType = options.logType || 'convert';
+
+  let lastError = null;
+
+  for (let attempt = 0; attempt <= retries; attempt += 1) {
+    try {
+      if (attempt > 0) {
+        logger && logger.info(
+          `[downloadUrlToFileWithRetry] 第${attempt + 1}次下载重试: ${downloadUrl}`,
+          logFileName,
+          logType
+        );
+      }
+
+      return await downloadUrlToFile(downloadUrl, targetPath, options);
+    } catch (error) {
+      lastError = error;
+      unlinkQuietly(targetPath);
+
+      if (attempt >= retries) {
+        break;
+      }
+
+      logger && logger.warn && logger.warn(
+        `[downloadUrlToFileWithRetry] 下载失败，${retryDelayMs}ms后重试: ${error.message}`,
+        logFileName,
+        logType
+      );
+
+      await sleep(retryDelayMs);
+    }
+  }
+
+  throw lastError;
+}
+
+module.exports = {
+  downloadUrlToFile,
+  downloadUrlToFileWithRetry,
+  formatBytes
+};

package/src/utils/event-files.js

@@ -0,0 +1,157 @@
+const fs = require('fs');
+const path = require('path');
+const { downloadUrlToFileWithRetry } = require('./download');
+
+function ensureDir(dirPath) {
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true });
+  }
+}
+
+function normalizeManifestEventFiles(payload) {
+  if (!payload || typeof payload !== 'object') {
+    return [];
+  }
+
+  if (Array.isArray(payload.events_files) && payload.events_files.length) {
+    return payload.events_files.map((item) => ({
+      url: item.url || item.events_url || '',
+      size: Number(item.size || item.events_size || 0)
+    })).filter((item) => item.url);
+  }
+
+  if (Array.isArray(payload.events_urls) && payload.events_urls.length) {
+    return payload.events_urls.map((item) => {
+      if (item && typeof item === 'object') {
+        return {
+          url: item.url || item.events_url || '',
+          size: Number(item.size || item.events_size || 0)
+        };
+      }
+
+      return {
+        url: item,
+        size: 0
+      };
+    }).filter((item) => item.url);
+  }
+
+  if (payload.events_url) {
+    return [{
+      url: payload.events_url,
+      size: Number(payload.events_size || 0)
+    }];
+  }
+
+  return [];
+}
+
+function extractEventArrayContent(rawContent) {
+  const trimmed = String(rawContent || '').trim();
+  if (!trimmed) {
+    return '';
+  }
+
+  if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+    return trimmed.slice(1, -1).trim();
+  }
+
+  const parsed = JSON.parse(trimmed);
+  const events = Array.isArray(parsed) ? parsed : (parsed && Array.isArray(parsed.events) ? parsed.events : null);
+  if (!events) {
+    throw new Error('事件文件不是数组结构');
+  }
+
+  return JSON.stringify(events).slice(1, -1).trim();
+}
+
+async function mergeEventJsonFilesToFile(sourcePaths, targetPath) {
+  ensureDir(path.dirname(targetPath));
+
+  const chunks = [];
+  for (const sourcePath of sourcePaths) {
+    const content = fs.readFileSync(sourcePath, 'utf8');
+    const innerContent = extractEventArrayContent(content);
+    if (innerContent) {
+      chunks.push(innerContent);
+    }
+  }
+
+  const mergedContent = `[${chunks.join(',')}]`;
+  fs.writeFileSync(targetPath, mergedContent, 'utf8');
+
+  return {
+    targetPath,
+    fileCount: sourcePaths.length
+  };
+}
+
+async function downloadAndMergeManifestEventFiles(payload, options = {}) {
+  const eventFiles = normalizeManifestEventFiles(payload);
+  if (!eventFiles.length) {
+    throw new Error('manifest 中缺少事件文件地址');
+  }
+
+  const logger = options.logger;
+  const logFileName = options.logFileName || 'event-files';
+  const logType = options.logType || 'convert';
+  const tempDir = options.tempDir;
+  const targetPath = options.targetPath;
+
+  if (!tempDir || !targetPath) {
+    throw new Error('tempDir 和 targetPath 不能为空');
+  }
+
+  ensureDir(tempDir);
+
+  const downloadedPaths = [];
+  try {
+    for (let index = 0; index < eventFiles.length; index += 1) {
+      const file = eventFiles[index];
+      const partPath = path.join(tempDir, `part_${index + 1}.json`);
+      logger && logger.info(
+        `[downloadAndMergeManifestEventFiles] 下载事件分片 ${index + 1}/${eventFiles.length}: ${file.url}`,
+        logFileName,
+        logType
+      );
+
+      await downloadUrlToFileWithRetry(file.url, partPath, {
+        logger,
+        logFileName,
+        logType,
+        retries: typeof options.retries === 'number' ? options.retries : 2,
+        retryDelayMs: typeof options.retryDelayMs === 'number' ? options.retryDelayMs : 1000
+      });
+      downloadedPaths.push(partPath);
+    }
+
+    await mergeEventJsonFilesToFile(downloadedPaths, targetPath);
+    logger && logger.info(
+      `[downloadAndMergeManifestEventFiles] 事件分片拼接完成: ${targetPath}, 分片数=${eventFiles.length}`,
+      logFileName,
+      logType
+    );
+
+    return {
+      targetPath,
+      fileCount: eventFiles.length,
+      totalSize: eventFiles.reduce((sum, item) => sum + Number(item.size || 0), 0)
+    };
+  } finally {
+    for (const downloadedPath of downloadedPaths) {
+      try {
+        if (fs.existsSync(downloadedPath)) {
+          fs.unlinkSync(downloadedPath);
+        }
+      } catch (error) {
+        // Ignore cleanup failures.
+      }
+    }
+  }
+}
+
+module.exports = {
+  normalizeManifestEventFiles,
+  mergeEventJsonFilesToFile,
+  downloadAndMergeManifestEventFiles
+};

package/src/utils/pull-task-data.js

@@ -0,0 +1,117 @@
+const crypto = require('crypto');
+const http = require('http');
+const https = require('https');
+const logger = require('../logger');
+
+function buildSignedPayload(recordId, tasks = null) {
+  const source = 'converter_internal';
+  const timestamp = Math.floor(Date.now() / 1000);
+  const secret = crypto.createHash('md5').update(source + '@BBX').digest('hex');
+  const signArray = {
+    record_id: recordId,
+    source,
+    timestamp,
+    secret
+  };
+  const sortedKeys = Object.keys(signArray).sort();
+  const signStr = sortedKeys.map((key) => `${key}=${signArray[key]}`).join('&');
+  const sign = crypto.createHash('md5').update(signStr).digest('hex');
+
+  const isV2 = Array.isArray(tasks) && tasks.length > 0;
+  const payload = {
+    [isV2 ? 'record_no' : 'record_id']: recordId,
+    source,
+    timestamp,
+    sign,
+    data_mode: 'url'
+  };
+
+  if (isV2) {
+    const pageIds = tasks
+      .map((task) => task.record_page_id || task.recordPageId || '')
+      .filter((value) => value !== '' && value !== null && value !== undefined)
+      .join(',');
+
+    if (pageIds) {
+      payload.page_ids = pageIds;
+    }
+  }
+
+  return {
+    payload,
+    signStr,
+    sign,
+    isV2
+  };
+}
+
+function pullTaskManifest(pullDataUrl, recordId, logFileName, tasks = null) {
+  return new Promise((resolve, reject) => {
+    try {
+      const { payload, signStr, sign, isV2 } = buildSignedPayload(recordId, tasks);
+      const postDataStr = Object.keys(payload).map((key) =>
+        `${encodeURIComponent(key)}=${encodeURIComponent(payload[key])}`
+      ).join('&');
+
+      logger.debug(`[pullTaskManifest] 签名计算: sign_str=${signStr}, sign=${sign}`, logFileName, 'convert');
+      logger.debug(`[pullTaskManifest] 请求参数 (${isV2 ? 'V2' : 'V1'}): ${postDataStr}`, logFileName, 'convert');
+
+      const pullUrl = new URL(pullDataUrl);
+      const httpModule = pullUrl.protocol === 'https:' ? https : http;
+      const options = {
+        hostname: pullUrl.hostname,
+        port: pullUrl.port || (pullUrl.protocol === 'https:' ? 443 : 80),
+        path: pullUrl.pathname + (pullUrl.search || ''),
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'Content-Length': Buffer.byteLength(postDataStr)
+        },
+        rejectUnauthorized: false
+      };
+
+      const req = httpModule.request(options, (resp) => {
+        let body = '';
+
+        resp.on('data', (chunk) => {
+          body += chunk;
+        });
+
+        resp.on('end', () => {
+          if (resp.statusCode !== 200) {
+            reject(new Error(`拉取 manifest 失败，HTTP状态码: ${resp.statusCode}`));
+            return;
+          }
+
+          try {
+            const data = JSON.parse(body);
+            logger.debug(`[pullTaskManifest] 响应数据: ${body}`, logFileName, 'convert');
+
+            if (data.result_code !== 0) {
+              reject(new Error(data.message || '拉取 manifest 失败'));
+              return;
+            }
+
+            resolve(data);
+          } catch (parseError) {
+            reject(new Error(`解析 manifest 响应失败: ${parseError.message}`));
+          }
+        });
+      });
+
+      req.on('error', (err) => {
+        reject(new Error(`请求 manifest 失败: ${err.message}`));
+      });
+
+      req.write(postDataStr);
+      req.end();
+    } catch (error) {
+      reject(error);
+    }
+  });
+}
+
+module.exports = {
+  buildSignedPayload,
+  pullTaskManifest
+};

package/src/utils/video.js

@@ -183,12 +183,17 @@ function buildMergeCommand(videos, output, options = {}) {
   const method = options.method || 'concat';
   const autoMode = options.auto_mode || 'smart';
   const headers = options.headers || {};
+  const downloadDir = options.download_dir;
   
   let command = `${nodePath} --expose-gc ${rrvideosPath} merge --output ${escapeArg(output)} --format ${escapeArg(format)} --method ${escapeArg(method)} --auto-mode ${escapeArg(autoMode)}`;
   
   videos.forEach((v) => {
     command += ` --videos ${escapeArg(v)}`;
   });
+
+  if (downloadDir) {
+    command += ` --download-dir ${escapeArg(downloadDir)}`;
+  }
   
   Object.keys(headers).forEach((k) => {
     const pair = `${k}:${headers[k]}`;