Upload 50 files

Dockerfile

@@ -1,73 +1,73 @@
-# 构建阶段
-FROM node:18-alpine AS builder
-
-# 设置工作目录
-WORKDIR /app
-
-# 安装构建依赖（包括Python和make，某些npm包需要）
-RUN apk add --no-cache python3 make g++
-
-# 复制package文件以优化Docker层缓存
-COPY package.json package-lock.json ./
-
-# 安装所有依赖（包括devDependencies）
-RUN npm ci --registry https://registry.npmmirror.com/
-
-# 复制源代码
-COPY . .
-
-# 接收版本号参数并更新 package.json
-ARG VERSION
-RUN if [ -n "$VERSION" ]; then \
-    echo "Updating package.json version to $VERSION"; \
-    sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" package.json; \
-    cat package.json | grep version; \
-    fi
-
-# 构建应用
-RUN npm run build
-
-# 生产阶段
-FROM node:18-alpine AS production
-
-# 安装健康检查工具
-RUN apk add --no-cache wget
-
-# 创建非root用户
-RUN addgroup -g 1001 -S nodejs && \
-    adduser -S jimeng -u 1001
-
-# 设置工作目录
-WORKDIR /app
-
-# 复制 package.json（使用构建阶段已更新版本）与 package-lock.json
-COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /app/package-lock.json ./package-lock.json
-
-# 只安装生产依赖
-RUN npm ci --omit=dev --registry https://registry.npmmirror.com/ && \
-    npm cache clean --force
-
-# 从构建阶段复制构建产物
-COPY --from=builder --chown=jimeng:nodejs /app/dist ./dist
-COPY --from=builder --chown=jimeng:nodejs /app/configs ./configs
-
-# 创建应用需要的目录并设置权限
-RUN mkdir -p /app/logs /app/tmp && \
-    chown -R jimeng:nodejs /app/logs /app/tmp
-
-# 设置环境变量
-ENV SERVER_PORT=7860
-
-# 切换到非root用户
-USER jimeng
-
-# 暴露端口
-EXPOSE 7860
-
-# 健康检查
-HEALTHCHECK --interval=15s --timeout=5s --start-period=20s --retries=3 \
-    CMD wget -q --spider http://localhost:7860/ping
-
-# 启动应用
-CMD ["npm", "start"]
+# 构建阶段
+FROM node:18-alpine AS builder
+
+# 设置工作目录
+WORKDIR /app
+
+# 安装构建依赖（包括Python和make，某些npm包需要）
+RUN apk add --no-cache python3 make g++
+
+# 复制package文件以优化Docker层缓存
+COPY package.json package-lock.json ./
+
+# 安装所有依赖（包括devDependencies）
+RUN npm ci --registry https://registry.npmmirror.com/
+
+# 复制源代码
+COPY . .
+
+# 接收版本号参数并更新 package.json
+ARG VERSION
+RUN if [ -n "$VERSION" ]; then \
+    echo "Updating package.json version to $VERSION"; \
+    sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" package.json; \
+    cat package.json | grep version; \
+    fi
+
+# 构建应用
+RUN npm run build
+
+# 生产阶段
+FROM node:18-alpine AS production
+
+# 安装健康检查工具
+RUN apk add --no-cache wget
+
+# 创建非root用户
+RUN addgroup -g 1001 -S nodejs && \
+    adduser -S jimeng -u 1001
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制 package.json（使用构建阶段已更新版本）与 package-lock.json
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/package-lock.json ./package-lock.json
+
+# 只安装生产依赖
+RUN npm ci --omit=dev --registry https://registry.npmmirror.com/ && \
+    npm cache clean --force
+
+# 从构建阶段复制构建产物
+COPY --from=builder --chown=jimeng:nodejs /app/dist ./dist
+COPY --from=builder --chown=jimeng:nodejs /app/configs ./configs
+
+# 创建应用需要的目录并设置权限
+RUN mkdir -p /app/logs /app/tmp && \
+    chown -R jimeng:nodejs /app/logs /app/tmp
+
+# 设置环境变量
+ENV SERVER_PORT=5100
+
+# 切换到非root用户
+USER jimeng
+
+# 暴露端口
+EXPOSE 5100
+
+# 健康检查
+HEALTHCHECK --interval=15s --timeout=5s --start-period=20s --retries=3 \
+    CMD wget -q --spider http://localhost:5100/ping
+
+# 启动应用
+CMD ["npm", "start"]

jimeng-api/Skill.md

@@ -107,7 +107,7 @@ python scripts/generate_image.py text \
 - `prompt` (required): Text description of the desired image
 - `--session-id`: Jimeng session ID (required)
 - `--model`: Model to use (default: `jimeng-4.0`)
-  - Options: `jimeng-4.5`, `jimeng-4.1`, `jimeng-4.0`, `jimeng-3.1`, `jimeng-3.0`, `jimeng-2.1`, `jimeng-xl-pro`, `nanobanana` (international only)
+  - Options: `jimeng-5.0`, `jimeng-4.6`, `jimeng-4.5`, `jimeng-4.1`, `jimeng-4.0`, `jimeng-3.1`, `jimeng-3.0`, `nanobanana` (international only)
 - `--ratio`: Aspect ratio (default: `1:1`)
   - Options: `1:1`, `4:3`, `3:4`, `16:9`, `9:16`, `3:2`, `2:3`, `21:9`
 - `--resolution`: Resolution level (default: `2k`)
@@ -268,7 +268,7 @@ Script executes:
 
 **"Model not supported"**
 - `nanobanana` only works with international sites (us-/hk-/jp-/sg- prefix)
-- `jimeng-3.1` and `jimeng-2.1` only work with domestic sites
+- `jimeng-3.1` only works with domestic sites
 
 **"nanobanana resolution mismatch"**
 - **US site (us- prefix)**: nanobanana model only supports 1024×1024 @ 2k resolution; all `ratio` and `resolution` parameters are ignored

jimeng-api/scripts/generate_image.py

@@ -352,7 +352,7 @@ def main():
             "--model",
             type=str,
             default="jimeng-4.5",
-            choices=["jimeng-4.5", "jimeng-4.1", "jimeng-4.0", "jimeng-3.1", "jimeng-3.0", "jimeng-2.1", "jimeng-xl-pro", "nanobanana"],
+            choices=["jimeng-5.0", "jimeng-4.6", "jimeng-4.5", "jimeng-4.1", "jimeng-4.0", "jimeng-3.1", "jimeng-3.0", "nanobanana"],
             help="Model to use (default: jimeng-4.5)"
         )
         subparser.add_argument(

src/api/builders/payload-builder.ts

@@ -112,10 +112,8 @@ export function resolveResolution(
 
 /**
  * benefitCount 规则
- * - CN: 全部不加
- * - US: 仅 jimeng-4.0 / jimeng-3.0 加
- * - HK/JP/SG: nanobanana 不加，其余(含 nanobananapro)加
- * - 多图模式: 所有站点都不加
+ * - 生图模式统一返回 4
+ * - 多图模式: 不加
  */
 export function getBenefitCount(
   userModel: string,
@@ -124,20 +122,7 @@ export function getBenefitCount(
 ): number | undefined {
   if (isMultiImage) return undefined;
 
-  const regionKey = getRegionKey(regionInfo);
-
-  if (regionKey === "CN") return undefined;
-
-  if (regionKey === "US") {
-    return ["jimeng-4.5", "jimeng-4.0", "jimeng-3.0"].includes(userModel) ? 4 : undefined;
-  }
-
-  if (regionKey === "HK" || regionKey === "JP" || regionKey === "SG") {
-    if (userModel === "nanobanana") return undefined;
-    return 4;
-  }
-
-  return undefined;
+  return 4;
 }
 
 export type GenerateMode = "text2img" | "img2img";
@@ -175,8 +160,8 @@ export function buildCoreParam(options: BuildCoreParamOptions) {
     mode = "text2img",
   } = options;
 
-  // ⚠️ intelligent_ratio 仅对 jimeng-4.0/jimeng-4.1/jimeng-4.5 模型有效
-  const effectiveIntelligentRatio = ['jimeng-4.0', 'jimeng-4.1', 'jimeng-4.5'].includes(userModel) ? intelligentRatio : false;
+  // ⚠️ intelligent_ratio 仅对 jimeng-4.0/jimeng-4.1/jimeng-4.5/jimeng-4.6/jimeng-5.0 模型有效
+  const effectiveIntelligentRatio = ['jimeng-4.0', 'jimeng-4.1', 'jimeng-4.5', 'jimeng-4.6', 'jimeng-5.0'].includes(userModel) ? intelligentRatio : false;
 
   // 图生图时，prompt 前缀规则: 每张图片对应 2 个 #
   // 1张图 → ##, 2张图 → ####, 3张图 → ######
@@ -233,6 +218,7 @@ interface Ability {
 
 export interface BuildMetricsExtraOptions {
   userModel: string;
+  model: string;       // 映射后的内部模型名 (如 high_aes_general_v50)
   regionInfo: RegionInfo;
   submitId: string;
   scene: SceneType;
@@ -246,6 +232,7 @@ export interface BuildMetricsExtraOptions {
  */
 export function buildMetricsExtra({
   userModel,
+  model,
   regionInfo,
   submitId,
   scene,
@@ -258,13 +245,13 @@ export function buildMetricsExtra({
   const sceneOption: any = {
     type: "image",
     scene,
-    modelReqKey: userModel,
+    modelReqKey: model,
     resolutionType,
     abilityList,
     reportParams: {
       enterSource: "generate",
       vipSource: "generate",
-      extraVipFunctionKey: `${userModel}-${resolutionType}`,
+      extraVipFunctionKey: `${model}-${resolutionType}`,
       useVipFunctionDetailsReporterHoc: true,
     },
   };

src/api/consts/common.ts

@@ -37,19 +37,21 @@ export const DEFAULT_VIDEO_MODEL = "jimeng-video-3.5-pro";
 // 草稿版本
 export const DRAFT_VERSION = "3.3.8";
 export const DRAFT_MIN_VERSION = "3.0.2";
+export const DRAFT_VERSION_OMNI = "3.3.9";
+
+// omni_reference 模式专用 benefit_type
+export const OMNI_BENEFIT_TYPE = "dreamina_video_seedance_20_video_add";
+export const OMNI_BENEFIT_TYPE_FAST = "dreamina_seedance_20_fast_with_video";
 
 // 图像模型映射
 export const IMAGE_MODEL_MAP = {
+  "jimeng-5.0": "high_aes_general_v50",
+  "jimeng-4.6": "high_aes_general_v42",
   "jimeng-4.5": "high_aes_general_v40l",
   "jimeng-4.1": "high_aes_general_v41",
   "jimeng-4.0": "high_aes_general_v40",
   "jimeng-3.1": "high_aes_general_v30l_art_fangzhou:general_v3.0_18b",
   "jimeng-3.0": "high_aes_general_v30l:general_v3.0_18b",
-  "jimeng-2.1": "high_aes_general_v21_L:general_v2.1_L",
-  "jimeng-2.0-pro": "high_aes_general_v20_L:general_v2.0_L",
-  "jimeng-2.0": "high_aes_general_v20:general_v2.0",
-  "jimeng-1.4": "high_aes_general_v14:general_v1.4",
-  "jimeng-xl-pro": "text2img_xl_sft"
 };
 
 export const IMAGE_MODEL_MAP_US = {
@@ -61,10 +63,22 @@ export const IMAGE_MODEL_MAP_US = {
   "nanobananapro": "dreamina_image_lib_1",
 };
 
+// 图像模型映射 - 亚洲国际站 (HK/JP/SG)
+export const IMAGE_MODEL_MAP_ASIA = {
+  "jimeng-5.0": "high_aes_general_v50",
+  "jimeng-4.6": "high_aes_general_v42",
+  "jimeng-4.5": "high_aes_general_v40l",
+  "jimeng-4.1": "high_aes_general_v41",
+  "jimeng-4.0": "high_aes_general_v40",
+  "jimeng-3.0": "high_aes_general_v30l:general_v3.0_18b",
+  "nanobanana": "external_model_gemini_flash_image_v25",
+  "nanobananapro": "dreamina_image_lib_1",
+};
+
 // 视频模型映射 - 国内站 (CN)
 export const VIDEO_MODEL_MAP = {
-  "jimeng-video-4.0-pro": "dreamina_seedance_40_pro",
-  "jimeng-video-4.0": "dreamina_seedance_40",
+  "jimeng-video-seedance-2.0": "dreamina_seedance_40_pro",
+  "jimeng-video-seedance-2.0-fast": "dreamina_seedance_40",
   "jimeng-video-3.5-pro": "dreamina_ic_generate_video_model_vgfm_3.5_pro",
   "jimeng-video-3.0-pro": "dreamina_ic_generate_video_model_vgfm_3.0_pro",
   "jimeng-video-3.0": "dreamina_ic_generate_video_model_vgfm_3.0",

src/api/controllers/core.ts

@@ -38,7 +38,7 @@ const MODEL_NAME = "jimeng";
 const DEVICE_ID = Math.random() * 999999999999999999 + 7000000000000000000;
 // WebID
 const WEB_ID = Math.random() * 999999999999999999 + 7000000000000000000;
-// 用户ID
+// 用户ID（32位hex，无横线）
 const USER_ID = util.uuid(false);
 // 伪装headers
 const FAKE_HEADERS = {
@@ -165,24 +165,15 @@ export function generateCookie(refreshToken: string) {
     ? tokenWithRegion.substring(3)
     : tokenWithRegion;
 
-  let storeRegion = 'cn-gd';
-  if (isUS) storeRegion = 'us';
-  else if (isHK) storeRegion = 'hk';
-  else if (isJP) storeRegion = 'hk'; // JP uses HK store region
-  else if (isSG) storeRegion = 'hk'; // SG uses HK store region
-
   return [
     `_tea_web_id=${WEB_ID}`,
     `is_staff_user=false`,
-    `store-region=${storeRegion}`,
-    `store-region-src=uid`,
     `sid_guard=${token}%7C${util.unixTimestamp()}%7C5184000%7CMon%2C+03-Feb-2025+08%3A17%3A09+GMT`,
     `uid_tt=${USER_ID}`,
     `uid_tt_ss=${USER_ID}`,
     `sid_tt=${token}`,
     `sessionid=${token}`,
     `sessionid_ss=${token}`,
-    `sid_tt=${token}`
   ].join("; ");
 }
 
@@ -312,11 +303,15 @@ export async function request(
     ...FAKE_HEADERS,
     Origin: origin,
     Referer: origin,
+    "App-Sdk-Version": "48.0.0",
     Appid: aid,
     Cookie: generateCookie(tokenWithRegion),
     "Device-Time": deviceTime,
+    Lan: isUS ? "en" : isJP ? "ja" : (isHK || isSG) ? "en" : "zh-Hans",
+    Loc: isUS ? "us" : isJP ? "jp" : isHK ? "hk" : isSG ? "sg" : "cn",
     Sign: sign,
     "Sign-Ver": "1",
+    Tdid: "",
     ...(options.headers || {}),
   };
 
@@ -396,7 +391,8 @@ export async function request(
         error.message.includes('timeout') ||
         error.message.includes('network') ||
         error.message.includes('ECONNRESET') ||
-        error.message.includes('socket hang up');
+        error.message.includes('socket hang up') ||
+        error.message.includes('Proxy connection');
 
       if (isRetryableError && retries < maxRetries) {
         retries++;
@@ -424,6 +420,64 @@ export async function request(
   }
  }
 
+/**
+ * 检测上传图片内容合规性（仅国内站）
+ * 调用 algo_proxy 接口进行图片安全检测，不通过则抛出异常
+ *
+ * @param imageUri 已上传图片的 URI
+ * @param refreshToken 刷新令牌
+ * @param regionInfo 区域信息
+ */
+export async function checkImageContent(
+  imageUri: string,
+  refreshToken: string,
+  regionInfo: RegionInfo
+): Promise<void> {
+  // 仅国内站需要内容检测
+  if (regionInfo.isInternational) return;
+
+  const babiParam = JSON.stringify({
+    scenario: "image_video_generation",
+    feature_key: "aigc_to_image",
+    feature_entrance: "to-generate",
+    feature_entrance_detail: "to-generate-algo_proxy",
+  });
+
+  logger.info(`开始图片内容安全检测: ${imageUri}`);
+
+  try {
+    await request("post", "/mweb/v1/algo_proxy", refreshToken, {
+      params: {
+        babi_param: babiParam,
+      },
+      data: {
+        scene: "image_face_ip",
+        options: { ip_check: true },
+        req_key: "benchmark_test_user_upload_image_input",
+        file_list: [{ file_uri: imageUri }],
+        req_params: {},
+      },
+    });
+    logger.info(`图片内容安全检测通过: ${imageUri}`);
+  } catch (error: any) {
+    // 区分内容违规(ret=2003等) vs 网络/服务异常
+    const isContentViolation = error.message && (
+      error.message.includes('2003') ||
+      error.message.includes('risk not pass') ||
+      error.message.includes('detected risk')
+    );
+    if (isContentViolation) {
+      logger.error(`图片内容安全检测未通过: ${imageUri}, ${error.message}`);
+      throw new APIException(
+        EX.API_REQUEST_FAILED,
+        `图片内容检测未通过，该图片可能包含违规内容`
+      );
+    }
+    // 网络/服务异常不阻塞，仅记录警告
+    logger.warn(`图片内容安全检测服务异常(不阻塞): ${imageUri}, ${error.message}`);
+  }
+}
+
  /**
   * 预检查文件URL有效性
   *

src/api/controllers/images.ts

@@ -3,10 +3,10 @@ import _ from "lodash";
 import APIException from "@/lib/exceptions/APIException.ts";
 import EX from "@/api/consts/exceptions.ts";
 import util from "@/lib/util.ts";
-import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, RegionInfo } from "./core.ts";
+import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, checkImageContent, RegionInfo } from "./core.ts";
 import logger from "@/lib/logger.ts";
 import { SmartPoller, PollingStatus } from "@/lib/smart-poller.ts";
-import { DEFAULT_IMAGE_MODEL, DEFAULT_IMAGE_MODEL_US, IMAGE_MODEL_MAP, IMAGE_MODEL_MAP_US } from "@/api/consts/common.ts";
+import { DEFAULT_IMAGE_MODEL, DEFAULT_IMAGE_MODEL_US, IMAGE_MODEL_MAP, IMAGE_MODEL_MAP_US, IMAGE_MODEL_MAP_ASIA } from "@/api/consts/common.ts";
 import { uploadImageFromUrl, uploadImageBuffer } from "@/lib/image-uploader.ts";
 import { extractImageUrls } from "@/lib/image-utils.ts";
 import {
@@ -31,14 +31,22 @@ export interface ModelResult {
 
 /**
  * 获取模型映射
- * - 国际站不支持的模型会抛出错误
+ * - 根据站点选择不同的模型映射 (CN / US / ASIA)
+ * - 不支持的模型会抛出错误
  * - 但如果传入的是国内站默认模型，国际站会自动回退到国际站默认模型
  */
-export function getModel(model: string, isInternational: boolean): ModelResult {
-  const modelMap = isInternational ? IMAGE_MODEL_MAP_US : IMAGE_MODEL_MAP;
-  const defaultModel = isInternational ? DEFAULT_MODEL_US : DEFAULT_MODEL;
+export function getModel(model: string, regionInfo: RegionInfo): ModelResult {
+  let modelMap: Record<string, string>;
+  if (regionInfo.isUS) {
+    modelMap = IMAGE_MODEL_MAP_US;
+  } else if (regionInfo.isHK || regionInfo.isJP || regionInfo.isSG) {
+    modelMap = IMAGE_MODEL_MAP_ASIA;
+  } else {
+    modelMap = IMAGE_MODEL_MAP;
+  }
+  const defaultModel = regionInfo.isInternational ? DEFAULT_MODEL_US : DEFAULT_MODEL;
 
-  if (isInternational && !modelMap[model]) {
+  if (regionInfo.isInternational && !modelMap[model]) {
     // 如果传入的是国内站默认模型，回退到国际站默认模型
     if (model === DEFAULT_MODEL) {
       logger.info(`国际站不支持默认模型 "${model}"，回退到 "${defaultModel}"`);
@@ -91,7 +99,7 @@ export async function generateImageComposition(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const { model, userModel } = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo);
 
   // 使用 payload-builder 处理分辨率
   const resolutionResult = resolveResolution(userModel, regionInfo, resolution, ratio);
@@ -123,12 +131,13 @@ export async function generateImageComposition(
       let imageId: string;
       if (typeof image === 'string') {
         logger.info(`正在处理第 ${i + 1}/${imageCount} 张图片 (URL)...`);
-        imageId = await uploadImageFromUrl(image, refreshToken, regionInfo);
+        imageId = (await uploadImageFromUrl(image, refreshToken, regionInfo)).uri;
       } else {
         logger.info(`正在处理第 ${i + 1}/${imageCount} 张图片 (Buffer)...`);
-        imageId = await uploadImageBuffer(image, refreshToken, regionInfo);
+        imageId = (await uploadImageBuffer(image, refreshToken, regionInfo)).uri;
       }
       uploadedImageIds.push(imageId);
+      await checkImageContent(imageId, refreshToken, regionInfo);
       logger.info(`图片 ${i + 1}/${imageCount} 上传成功: ${imageId}`);
     } catch (error) {
       logger.error(`图片 ${i + 1}/${imageCount} 上传失败: ${error.message}`);
@@ -166,6 +175,7 @@ export async function generateImageComposition(
   // 使用 payload-builder 构建 metrics_extra
   const metricsExtra = buildMetricsExtra({
     userModel,
+    model,
     regionInfo,
     submitId,
     scene: "ImageBasicGenerate",
@@ -201,11 +211,15 @@ export async function generateImageComposition(
     metricsExtra,
   });
 
+  const imageReferer = regionInfo.isCN
+    ? "https://jimeng.jianying.com/ai-tool/generate?type=image"
+    : "https://dreamina.capcut.com/ai-tool/generate?type=image";
+
   const { aigc_data } = await request(
     "post",
     "/mweb/v1/aigc_draft/generate",
     refreshToken,
-    { data: requestData }
+    { data: requestData, headers: { Referer: imageReferer } }
   );
 
   const historyId = aigc_data?.history_record_id;
@@ -217,9 +231,10 @@ export async function generateImageComposition(
   // 轮询结果
   const poller = new SmartPoller({
     maxPollCount: 900,
+    pollInterval: 10000, // 10秒轮询间隔
     expectedItemCount: 1,
     type: 'image',
-    timeoutSeconds: 900 // 15 分钟超时
+    timeoutSeconds: 1800 // 30 分钟超时
   });
 
   const { result: pollingResult, data: finalTaskInfo } = await poller.poll(async () => {
@@ -297,7 +312,7 @@ export async function generateImages(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const { model, userModel } = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo);
   logger.info(`使用模型: ${userModel} 映射模型: ${model} 分辨率: ${resolution} 比例: ${ratio} 精细度: ${sampleStrength} 智能比例: ${intelligentRatio}`);
 
   return await generateImagesInternal(userModel, prompt, { ratio, resolution, sampleStrength, negativePrompt, intelligentRatio }, refreshToken);
@@ -325,7 +340,7 @@ async function generateImagesInternal(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const { model, userModel } = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo);
 
   // 使用 payload-builder 处理分辨率
   const resolutionResult = resolveResolution(userModel, regionInfo, resolution, ratio);
@@ -378,6 +393,7 @@ async function generateImagesInternal(
   // 使用 payload-builder 构建 metrics_extra
   const metricsExtra = buildMetricsExtra({
     userModel,
+    model,
     regionInfo,
     submitId,
     scene: "ImageBasicGenerate",
@@ -401,11 +417,15 @@ async function generateImagesInternal(
     metricsExtra,
   });
 
+  const imageReferer = regionInfo.isCN
+    ? "https://jimeng.jianying.com/ai-tool/generate?type=image"
+    : "https://dreamina.capcut.com/ai-tool/generate?type=image";
+
   const { aigc_data } = await request(
     "post",
     "/mweb/v1/aigc_draft/generate",
     refreshToken,
-    { data: requestData }
+    { data: requestData, headers: { Referer: imageReferer } }
   );
 
   const historyId = aigc_data?.history_record_id;
@@ -415,9 +435,10 @@ async function generateImagesInternal(
   // 轮询结果
   const poller = new SmartPoller({
     maxPollCount: 900,
+    pollInterval: 10000, // 10秒轮询间隔
     expectedItemCount: 4,
     type: 'image',
-    timeoutSeconds: 900 // 15 分钟超时
+    timeoutSeconds: 1800 // 30 分钟超时
   });
 
   const { result: pollingResult, data: finalTaskInfo } = await poller.poll(async () => {
@@ -498,7 +519,7 @@ async function generateJimeng4xMultiImages(
   refreshToken: string
 ) {
   const regionInfo = parseRegionFromToken(refreshToken);
-  const { model, userModel } = getModel(_model, regionInfo.isInternational);
+  const { model, userModel } = getModel(_model, regionInfo);
 
   // 使用 payload-builder 处理分辨率
   const resolutionResult = resolveResolution(userModel, regionInfo, resolution, ratio);
@@ -526,6 +547,7 @@ async function generateJimeng4xMultiImages(
   // 使用 payload-builder 构建 metrics_extra (多图模式)
   const metricsExtra = buildMetricsExtra({
     userModel,
+    model,
     regionInfo,
     submitId,
     scene: "ImageMultiGenerate",
@@ -550,11 +572,15 @@ async function generateJimeng4xMultiImages(
     metricsExtra,
   });
 
+  const imageReferer = regionInfo.isCN
+    ? "https://jimeng.jianying.com/ai-tool/generate?type=image"
+    : "https://dreamina.capcut.com/ai-tool/generate?type=image";
+
   const { aigc_data } = await request(
     "post",
     "/mweb/v1/aigc_draft/generate",
     refreshToken,
-    { data: requestData }
+    { data: requestData, headers: { Referer: imageReferer } }
   );
 
   const historyId = aigc_data?.history_record_id;
@@ -566,9 +592,10 @@ async function generateJimeng4xMultiImages(
   // 轮询结果
   const poller = new SmartPoller({
     maxPollCount: 600,
+    pollInterval: 10000, // 10秒轮询间隔
     expectedItemCount: targetImageCount,
     type: 'image',
-    timeoutSeconds: 900 // 15 分钟超时
+    timeoutSeconds: 1800 // 30 分钟超时
   });
 
   const { result: pollingResult, data: finalTaskInfo } = await poller.poll(async () => {

src/api/controllers/videos.ts

@@ -6,12 +6,14 @@ import APIException from "@/lib/exceptions/APIException.ts";
 
 import EX from "@/api/consts/exceptions.ts";
 import util from "@/lib/util.ts";
-import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, RegionInfo } from "./core.ts";
+import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, checkImageContent, RegionInfo } from "./core.ts";
 import logger from "@/lib/logger.ts";
 import { SmartPoller, PollingStatus } from "@/lib/smart-poller.ts";
-import { DEFAULT_ASSISTANT_ID_CN, DEFAULT_ASSISTANT_ID_US, DEFAULT_ASSISTANT_ID_HK, DEFAULT_ASSISTANT_ID_JP, DEFAULT_ASSISTANT_ID_SG, DEFAULT_VIDEO_MODEL, DRAFT_VERSION, VIDEO_MODEL_MAP, VIDEO_MODEL_MAP_US, VIDEO_MODEL_MAP_ASIA } from "@/api/consts/common.ts";
-import { uploadImageBuffer } from "@/lib/image-uploader.ts";
-import { extractVideoUrl } from "@/lib/image-utils.ts";
+import { DEFAULT_ASSISTANT_ID_CN, DEFAULT_ASSISTANT_ID_US, DEFAULT_ASSISTANT_ID_HK, DEFAULT_ASSISTANT_ID_JP, DEFAULT_ASSISTANT_ID_SG, DEFAULT_VIDEO_MODEL, DRAFT_VERSION, DRAFT_VERSION_OMNI, OMNI_BENEFIT_TYPE, OMNI_BENEFIT_TYPE_FAST, VIDEO_MODEL_MAP, VIDEO_MODEL_MAP_US, VIDEO_MODEL_MAP_ASIA } from "@/api/consts/common.ts";
+import { uploadImageBuffer, ImageUploadResult } from "@/lib/image-uploader.ts";
+import { uploadVideoBuffer, VideoUploadResult } from "@/lib/video-uploader.ts";
+import { extractVideoUrl, fetchHighQualityVideoUrl } from "@/lib/image-utils.ts";
+import { uploadVideoFromUrl } from "@/lib/video-uploader.ts";
 
 export const DEFAULT_MODEL = DEFAULT_VIDEO_MODEL;
 
@@ -45,7 +47,7 @@ function getVideoBenefitType(model: string): string {
     return "dreamina_video_seedance_20_pro";
   }
   if (model.includes("40")) {
-    return "dreamina_video_seedance_20";
+    return "dreamina_video_seedance_20_fast";
   }
   if (model.includes("3.5_pro")) {
     return "dreamina_video_seedance_15_pro";
@@ -57,7 +59,7 @@ function getVideoBenefitType(model: string): string {
 }
 
 // 处理本地上传的文件
-async function uploadImageFromFile(file: any, refreshToken: string, regionInfo: RegionInfo): Promise<string> {
+async function uploadImageFromFile(file: any, refreshToken: string, regionInfo: RegionInfo): Promise<ImageUploadResult> {
   try {
     logger.info(`开始从本地文件上传视频图片: ${file.originalFilename} (路径: ${file.filepath})`);
     const imageBuffer = await fs.readFile(file.filepath);
@@ -69,11 +71,12 @@ async function uploadImageFromFile(file: any, refreshToken: string, regionInfo:
 }
 
 // 处理来自URL的图片
-async function uploadImageFromUrl(imageUrl: string, refreshToken: string, regionInfo: RegionInfo): Promise<string> {
+async function uploadImageFromUrl(imageUrl: string, refreshToken: string, regionInfo: RegionInfo): Promise<ImageUploadResult> {
   try {
     logger.info(`开始从URL下载并上传视频图片: ${imageUrl}`);
     const imageResponse = await axios.get(imageUrl, {
       responseType: 'arraybuffer',
+      proxy: false,
     });
     if (imageResponse.status < 200 || imageResponse.status >= 300) {
       throw new Error(`下载图片失败: ${imageResponse.status}`);
@@ -86,6 +89,60 @@ async function uploadImageFromUrl(imageUrl: string, refreshToken: string, region
   }
 }
 
+/**
+ * 解析 omni_reference 模式的 prompt，将 @引用 拆解为 meta_list
+ * 输入: "@image_file_1作为首帧，@image_file_2作为尾帧，运动动作模仿@video_file"
+ * 输出: 交替的 text + material_ref 段
+ */
+function parseOmniPrompt(prompt: string, materialRegistry: Map<string, any>): any[] {
+  // 收集所有可识别的引用名（字段名 + 原始文件名），转义正则特殊字符
+  const refNames = [...materialRegistry.keys()]
+    .sort((a, b) => b.length - a.length) // 长名优先匹配
+    .map(n => n.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+
+  if (refNames.length === 0) {
+    return [{ meta_type: "text", text: prompt }];
+  }
+
+  const pattern = new RegExp(`@(${refNames.join('|')})`, 'g');
+  const meta_list: any[] = [];
+  let lastIndex = 0;
+  let match: RegExpExecArray | null;
+
+  while ((match = pattern.exec(prompt)) !== null) {
+    // 文本段
+    if (match.index > lastIndex) {
+      const textSegment = prompt.slice(lastIndex, match.index);
+      if (textSegment) {
+        meta_list.push({ meta_type: "text", text: textSegment });
+      }
+    }
+    // 引用段
+    const refName = match[1];
+    const entry = materialRegistry.get(refName);
+    if (entry) {
+      meta_list.push({
+        meta_type: entry.type,
+        text: "",
+        material_ref: { material_idx: entry.idx },
+      });
+    }
+    lastIndex = pattern.lastIndex;
+  }
+
+  // 尾部文本
+  if (lastIndex < prompt.length) {
+    meta_list.push({ meta_type: "text", text: prompt.slice(lastIndex) });
+  }
+
+  // 如果没有任何 @ 引用，把整个 prompt 作为文本段
+  if (meta_list.length === 0) {
+    meta_list.push({ meta_type: "text", text: prompt });
+  }
+
+  return meta_list;
+}
+
 
 /**
  * 生成视频
@@ -105,12 +162,16 @@ export async function generateVideo(
     duration = 5,
     filePaths = [],
     files = {},
+    httpRequest,
+    functionMode = "first_last_frames",
   }: {
     ratio?: string;
     resolution?: string;
     duration?: number;
     filePaths?: string[];
     files?: any;
+    httpRequest?: any;
+    functionMode?: string;
   },
   refreshToken: string
 ) {
@@ -124,6 +185,8 @@ export async function generateVideo(
   const isVeo3 = model.includes("veo3");
   const isSora2 = model.includes("sora2");
   const is35Pro = model.includes("3.5_pro");
+  const is40Pro = model.includes("40_pro");
+  const is40 = model.includes("40") && !model.includes("40_pro");
   // 只有 video-3.0 和 video-3.0-fast 支持 resolution 参数（3.0-pro 和 3.5-pro 不支持）
   const supportsResolution = (model.includes("vgfm_3.0") || model.includes("vgfm_3.0_fast")) && !model.includes("_pro");
 
@@ -131,6 +194,7 @@ export async function generateVideo(
   // veo3 模型固定 8 秒
   // sora2 模型支持 4秒、8秒、12秒，默认4秒
   // 3.5-pro 模型支持 5秒、10秒、12秒，默认5秒
+  // 4.0-pro (seedance 2.0) 和 4.0 (seedance 2.0-fast) 模型支持 4~15秒，默认5秒
   // 其他模型支持 5秒、10秒，默认5秒
   let durationMs: number;
   let actualDuration: number;
@@ -148,6 +212,10 @@ export async function generateVideo(
       durationMs = 4000;
       actualDuration = 4;
     }
+  } else if (is40Pro || is40) {
+    // seedance 2.0 和 2.0-fast: 支持 4~15 秒，clamp 到有效范围，默认 5 秒
+    actualDuration = Math.max(4, Math.min(15, duration));
+    durationMs = actualDuration * 1000;
   } else if (is35Pro) {
     if (duration === 12) {
       durationMs = 12000;
@@ -179,230 +247,611 @@ export async function generateVideo(
     }
   }
 
-  // 处理首帧和尾帧图片
-  let first_frame_image = undefined;
-  let end_frame_image = undefined;
-  let uploadIDs: string[] = [];
-
-  // 优先处理本地上传的文件
-  const uploadedFiles = _.values(files); // 将files对象转为数组
-  if (uploadedFiles && uploadedFiles.length > 0) {
-    logger.info(`检测到 ${uploadedFiles.length} 个本地上传文件，优先处理`);
-    for (let i = 0; i < uploadedFiles.length; i++) {
-      const file = uploadedFiles[i];
-      if (!file) continue;
+  const isOmniMode = functionMode === "omni_reference";
+
+  // omni_reference 仅支持 seedance 2.0 (40_pro) 和 2.0-fast (40) 模型
+  if (isOmniMode && !is40Pro && !is40) {
+    throw new APIException(EX.API_REQUEST_FAILED,
+      `omni_reference 模式仅支持 jimeng-video-seedance-2.0 和 jimeng-video-seedance-2.0-fast 模型`);
+  }
+
+  let requestData: any;
+
+  if (isOmniMode) {
+    // ========== omni_reference 分支 ==========
+    logger.info(`进入 omni_reference 全能模式`);
+
+    // 素材注册表: fieldName → { idx, type, uploadResult }
+    interface MaterialEntry {
+      idx: number;
+      type: "image" | "video";
+      fieldName: string;
+      originalFilename: string;
+      imageUri?: string;
+      imageWidth?: number;
+      imageHeight?: number;
+      imageFormat?: string;
+      videoResult?: VideoUploadResult;
+    }
+    const materialRegistry: Map<string, MaterialEntry> = new Map();
+    let materialIdx = 0;
+
+    // canonical key 集合，防止 originalFilename 覆盖
+    const canonicalKeys = new Set<string>();
+    canonicalKeys.add('image_file');
+    canonicalKeys.add('video_file');
+    for (let i = 1; i <= 9; i++) canonicalKeys.add(`image_file_${i}`);
+    for (let i = 1; i <= 3; i++) canonicalKeys.add(`video_file_${i}`);
+
+    // 安全注册别名：originalFilename 不与 canonical key 冲突时才注册
+    function registerAlias(filename: string, entry: MaterialEntry) {
+      if (!canonicalKeys.has(filename) && !materialRegistry.has(filename)) {
+        materialRegistry.set(filename, entry);
+      }
+    }
+
+    // 收集所有需要处理的图片和视频字段
+    const imageFields: string[] = [];
+    const videoFields: string[] = [];
+
+    // 检测上传的文件
+    if (files) {
+      for (const fieldName of Object.keys(files)) {
+        if (fieldName === 'image_file' || fieldName.startsWith('image_file_')) imageFields.push(fieldName);
+        else if (fieldName === 'video_file' || fieldName.startsWith('video_file_')) videoFields.push(fieldName);
+      }
+    }
+
+    // 检测URL字段
+    for (let i = 1; i <= 9; i++) {
+      const fieldName = `image_file_${i}`;
+      if (typeof httpRequest?.body?.[fieldName] === 'string' && httpRequest.body[fieldName].startsWith('http')) {
+        if (!imageFields.includes(fieldName)) imageFields.push(fieldName);
+      }
+    }
+    for (let i = 1; i <= 3; i++) {
+      const fieldName = `video_file_${i}`;
+      if (typeof httpRequest?.body?.[fieldName] === 'string' && httpRequest.body[fieldName].startsWith('http')) {
+        if (!videoFields.includes(fieldName)) videoFields.push(fieldName);
+      }
+    }
+    // 检测不带数字后缀的裸名 URL 字段
+    if (typeof httpRequest?.body?.image_file === 'string' && httpRequest.body.image_file.startsWith('http')) {
+      if (!imageFields.includes('image_file')) imageFields.push('image_file');
+    }
+    if (typeof httpRequest?.body?.video_file === 'string' && httpRequest.body.video_file.startsWith('http')) {
+      if (!videoFields.includes('video_file')) videoFields.push('video_file');
+    }
+
+    // 检查是否有素材
+    const hasFilePaths = filePaths && filePaths.length > 0;
+    if (imageFields.length === 0 && videoFields.length === 0 && !hasFilePaths) {
+      throw new APIException(EX.API_REQUEST_FAILED,
+        `omni_reference 模式需要至少上传一个素材文件 (image_file_*, video_file_*) 或提供素材URL`);
+    }
+
+    let totalVideoDuration = 0; // 累计视频时长
+
+    // 串行上传图片素材
+    for (const fieldName of imageFields) {
+      const imageFile = files?.[fieldName];
+      const imageUrlField = httpRequest?.body?.[fieldName];
+
       try {
-        logger.info(`开始上传第 ${i + 1} 张本地图片: ${file.originalFilename}`);
-        const imageUri = await uploadImageFromFile(file, refreshToken, regionInfo);
-        if (imageUri) {
-          uploadIDs.push(imageUri);
-          logger.info(`第 ${i + 1} 张本地图片上传成功: ${imageUri}`);
-        } else {
-          logger.error(`第 ${i + 1} 张本地图片上传失败: 未获取到 image_uri`);
+        logger.info(`[omni] 上传 ${fieldName}`);
+        let imgResult: ImageUploadResult;
+
+        if (imageFile) {
+          // 本地文件上传
+          const buf = await fs.readFile(imageFile.filepath);
+          imgResult = await uploadImageBuffer(buf, refreshToken, regionInfo);
+          await checkImageContent(imgResult.uri, refreshToken, regionInfo);
+          const entry: MaterialEntry = {
+            idx: materialIdx++,
+            type: "image",
+            fieldName,
+            originalFilename: imageFile.originalFilename,
+            imageUri: imgResult.uri,
+            imageWidth: imgResult.width,
+            imageHeight: imgResult.height,
+            imageFormat: imgResult.format,
+          };
+          materialRegistry.set(fieldName, entry);
+          registerAlias(imageFile.originalFilename, entry);
+          logger.info(`[omni] ${fieldName} 上传成功: ${imgResult.uri} (${imgResult.width}x${imgResult.height})`);
+        } else if (imageUrlField && typeof imageUrlField === 'string' && imageUrlField.startsWith('http')) {
+          // URL上传
+          imgResult = await uploadImageFromUrl(imageUrlField, refreshToken, regionInfo);
+          await checkImageContent(imgResult.uri, refreshToken, regionInfo);
+          const entry: MaterialEntry = {
+            idx: materialIdx++,
+            type: "image",
+            fieldName,
+            originalFilename: imageUrlField,
+            imageUri: imgResult.uri,
+            imageWidth: imgResult.width,
+            imageHeight: imgResult.height,
+            imageFormat: imgResult.format,
+          };
+          materialRegistry.set(fieldName, entry);
+          logger.info(`[omni] ${fieldName} URL上传成功: ${imgResult.uri} (${imgResult.width}x${imgResult.height})`);
         }
       } catch (error: any) {
-        logger.error(`第 ${i + 1} 张本地图片上传失败: ${error.message}`);
-        if (i === 0) {
-          throw new APIException(EX.API_REQUEST_FAILED, `首帧图片上传失败: ${error.message}`);
-        }
+        throw new APIException(EX.API_REQUEST_FAILED, `${fieldName} 处理失败: ${error.message}`);
       }
     }
-  }
-  // 如果没有本地文件，再处理URL
-  else if (filePaths && filePaths.length > 0) {
-    logger.info(`未检测到本地上传文件，处理 ${filePaths.length} 个图片URL`);
-    for (let i = 0; i < filePaths.length; i++) {
-      const filePath = filePaths[i];
-      if (!filePath) {
-        logger.warn(`第 ${i + 1} 个图片URL为空，跳过`);
-        continue;
+
+    // 通过 filePaths 数组补充未被占用的图片槽位
+    if (filePaths && filePaths.length > 0) {
+      let slotIndex = 1;
+      for (const url of filePaths) {
+        // 找到第一个未被占用的槽位
+        while (slotIndex <= 9 && materialRegistry.has(`image_file_${slotIndex}`)) {
+          slotIndex++;
+        }
+        if (slotIndex > 9) break; // 已达到最大数量
+
+        const fieldName = `image_file_${slotIndex}`;
+        try {
+          logger.info(`[omni] 从URL上传 ${fieldName}: ${url}`);
+          const imgResult = await uploadImageFromUrl(url, refreshToken, regionInfo);
+          await checkImageContent(imgResult.uri, refreshToken, regionInfo);
+          const entry: MaterialEntry = {
+            idx: materialIdx++,
+            type: "image",
+            fieldName,
+            originalFilename: url,
+            imageUri: imgResult.uri,
+            imageWidth: imgResult.width,
+            imageHeight: imgResult.height,
+            imageFormat: imgResult.format,
+          };
+          materialRegistry.set(fieldName, entry);
+          logger.info(`[omni] ${fieldName} URL上传成功: ${imgResult.uri} (${imgResult.width}x${imgResult.height})`);
+        } catch (error: any) {
+          throw new APIException(EX.API_REQUEST_FAILED, `${fieldName} URL图片处理失败: ${error.message}`);
+        }
+        slotIndex++;
       }
+    }
+
+    // 串行上传视频素材
+    for (const fieldName of videoFields) {
+      const videoFile = files?.[fieldName];
+      const videoUrlField = httpRequest?.body?.[fieldName];
+
       try {
-        logger.info(`开始上传第 ${i + 1} 个URL图片: ${filePath}`);
-        const imageUri = await uploadImageFromUrl(filePath, refreshToken, regionInfo);
-        if (imageUri) {
-          uploadIDs.push(imageUri);
-          logger.info(`第 ${i + 1} 个URL图片上传成功: ${imageUri}`);
-        } else {
-          logger.error(`第 ${i + 1} 个URL图片上传失败: 未获取到 image_uri`);
+        logger.info(`[omni] 上传 ${fieldName}`);
+        let vResult: VideoUploadResult;
+
+        if (videoFile) {
+          // 本地文件上传
+          const buf = await fs.readFile(videoFile.filepath);
+          vResult = await uploadVideoBuffer(buf, refreshToken, regionInfo);
+          totalVideoDuration += vResult.videoMeta.duration;
+          const entry: MaterialEntry = {
+            idx: materialIdx++,
+            type: "video",
+            fieldName,
+            originalFilename: videoFile.originalFilename,
+            videoResult: vResult
+          };
+          materialRegistry.set(fieldName, entry);
+          registerAlias(videoFile.originalFilename, entry);
+          logger.info(`[omni] ${fieldName} 上传成功: vid=${vResult.vid}, ${vResult.videoMeta.width}x${vResult.videoMeta.height}, ${vResult.videoMeta.duration}s`);
+        } else if (videoUrlField && typeof videoUrlField === 'string' && videoUrlField.startsWith('http')) {
+          // URL上传
+          vResult = await uploadVideoFromUrl(videoUrlField, refreshToken, regionInfo);
+          totalVideoDuration += vResult.videoMeta.duration;
+          const entry: MaterialEntry = {
+            idx: materialIdx++,
+            type: "video",
+            fieldName,
+            originalFilename: videoUrlField,
+            videoResult: vResult
+          };
+          materialRegistry.set(fieldName, entry);
+          logger.info(`[omni] ${fieldName} URL上传成功: vid=${vResult.vid}, ${vResult.videoMeta.width}x${vResult.videoMeta.height}, ${vResult.videoMeta.duration}s`);
         }
       } catch (error: any) {
-        logger.error(`第 ${i + 1} 个URL图片上传失败: ${error.message}`);
-        if (i === 0) {
-          throw new APIException(EX.API_REQUEST_FAILED, `首帧图片上传失败: ${error.message}`);
-        }
+        throw new APIException(EX.API_REQUEST_FAILED, `${fieldName} 处理失败: ${error.message}`);
       }
     }
-  } else {
-    logger.info(`未提供图片文件或URL，将进行纯文本视频生成`);
-  }
 
-  // 如果有图片上传（无论来源），构建对象
-  if (uploadIDs.length > 0) {
-    logger.info(`图片上传完成，共成功 ${uploadIDs.length} 张`);
-    // 构建首帧图片对象
-    if (uploadIDs[0]) {
-      first_frame_image = {
-        format: "",
-        height: 0,
-        id: util.uuid(),
-        image_uri: uploadIDs[0],
-        name: "",
-        platform_type: 1,
-        source_from: "upload",
-        type: "image",
-        uri: uploadIDs[0],
-        width: 0,
-      };
-      logger.info(`设置首帧图片: ${uploadIDs[0]}`);
+    // 验证视频总时长
+    const MAX_TOTAL_VIDEO_DURATION = 15;
+    if (!Number.isFinite(totalVideoDuration)) {
+      throw new APIException(EX.API_REQUEST_FAILED,
+        `视频时长数据异常，请检查视频文件`);
+    }
+    if (totalVideoDuration > MAX_TOTAL_VIDEO_DURATION) {
+      throw new APIException(EX.API_REQUEST_FAILED,
+        `视频总时长 ${totalVideoDuration.toFixed(2)}s 超过限制 (最大 ${MAX_TOTAL_VIDEO_DURATION}s)`);
     }
 
-    // 构建尾帧图片对象
-    if (uploadIDs[1]) {
-      end_frame_image = {
-        format: "",
-        height: 0,
-        id: util.uuid(),
-        image_uri: uploadIDs[1],
-        name: "",
-        platform_type: 1,
-        source_from: "upload",
-        type: "image",
-        uri: uploadIDs[1],
-        width: 0,
-      };
-      logger.info(`设置尾帧图片: ${uploadIDs[1]}`);
+    logger.info(`[omni] 视频总时长: ${totalVideoDuration.toFixed(2)}s`);
+
+    // 构建 material_list（按注册顺序）
+    const orderedEntries = [...new Map([...materialRegistry].filter(([k, v]) => k === v.fieldName)).values()]
+      .sort((a, b) => a.idx - b.idx);
+
+    const material_list: any[] = [];
+    const materialTypes: number[] = [];
+
+    for (const entry of orderedEntries) {
+      if (entry.type === "image") {
+        material_list.push({
+          type: "",
+          id: util.uuid(),
+          material_type: "image",
+          image_info: {
+            type: "image",
+            id: util.uuid(),
+            source_from: "upload",
+            platform_type: 1,
+            name: "",
+            image_uri: entry.imageUri,
+            width: entry.imageWidth || 0,
+            height: entry.imageHeight || 0,
+            format: entry.imageFormat || "",
+            uri: entry.imageUri,
+          },
+        });
+        materialTypes.push(1);
+      } else {
+        const vm = entry.videoResult!;
+        material_list.push({
+          type: "",
+          id: util.uuid(),
+          material_type: "video",
+          video_info: {
+            type: "video",
+            id: util.uuid(),
+            source_from: "upload",
+            name: "",
+            vid: vm.vid,
+            fps: 0,
+            width: vm.videoMeta.width,
+            height: vm.videoMeta.height,
+            duration: Math.round(vm.videoMeta.duration * 1000),
+          },
+        });
+        materialTypes.push(2);
+      }
     }
-  }
 
+    // 解析 prompt → meta_list
+    const meta_list = parseOmniPrompt(prompt, materialRegistry);
+
+    logger.info(`[omni] material_list: ${material_list.length} 项, meta_list: ${meta_list.length} 项, materialTypes: [${materialTypes}]`);
+
+    // 构建 omni payload
+    const componentId = util.uuid();
+    const submitId = util.uuid();
+
+    const sceneOption = {
+      type: "video",
+      scene: "BasicVideoGenerateButton",
+      modelReqKey: model,
+      videoDuration: actualDuration,
+      materialTypes,
+      reportParams: {
+        enterSource: "generate",
+        vipSource: "generate",
+        extraVipFunctionKey: model,
+        useVipFunctionDetailsReporterHoc: true,
+      },
+    };
 
-  const componentId = util.uuid();
-  const originSubmitId = util.uuid();
-
-  // 根据官方API的实际行为，所有模式都使用 "first_last_frames"
-  // 通过 first_frame_image 和 end_frame_image 是否为 undefined 来区分模式
-  const functionMode = "first_last_frames";
-
-  const sceneOption = {
-    type: "video",
-    scene: "BasicVideoGenerateButton",
-    ...(supportsResolution ? { resolution: resolution } : {}),
-    modelReqKey: model,
-    videoDuration: actualDuration,
-    reportParams: {
-      enterSource: "generate",
-      vipSource: "generate",
-      extraVipFunctionKey: supportsResolution ? `${model}-${resolution}` : model,
-      useVipFunctionDetailsReporterHoc: true,
-    },
-  };
-
-  const metricsExtra = JSON.stringify({
-    promptSource: "custom",
-    isDefaultSeed: 1,
-    originSubmitId: originSubmitId,
-    isRegenerate: false,
-    enterFrom: "click",
-    functionMode: functionMode,
-    sceneOptions: JSON.stringify([sceneOption]),
-  });
+    const metricsExtra = JSON.stringify({
+      position: "page_bottom_box",
+      isDefaultSeed: 1,
+      originSubmitId: submitId,
+      isRegenerate: false,
+      enterFrom: "click",
+      functionMode: "omni_reference",
+      sceneOptions: JSON.stringify([sceneOption]),
+    });
 
-  // 当有图片输入时，ratio参数会被图片的实际比例覆盖
-  const hasImageInput = uploadIDs.length > 0;
-  if (hasImageInput && ratio !== "1:1") {
-    logger.warn(`图生视频模式下，ratio参数将被忽略（由输入图片的实际比例决定），但resolution参数仍然有效`);
-  }
+    // 根据模型选择 benefit_type
+    const omniBenefitType = is40 ? OMNI_BENEFIT_TYPE_FAST : OMNI_BENEFIT_TYPE;
 
-  logger.info(`视频生成模式: ${uploadIDs.length}张图片 (首帧: ${!!first_frame_image}, 尾帧: ${!!end_frame_image}), resolution: ${resolution}`);
-  
-  // 构建请求参数
-  const { aigc_data } = await request(
-    "post",
-    "/mweb/v1/aigc_draft/generate",
-    refreshToken,
-    {
+    requestData = {
+      params: {
+        aigc_features: "app_lip_sync",
+        web_version: "7.5.0",
+        da_version: DRAFT_VERSION_OMNI,
+      },
+      data: {
+        extend: {
+          root_model: model,
+          m_video_commerce_info: {
+            benefit_type: omniBenefitType,
+            resource_id: "generate_video",
+            resource_id_type: "str",
+            resource_sub_type: "aigc",
+          },
+          m_video_commerce_info_list: [{
+            benefit_type: omniBenefitType,
+            resource_id: "generate_video",
+            resource_id_type: "str",
+            resource_sub_type: "aigc",
+          }],
+        },
+        submit_id: submitId,
+        metrics_extra: metricsExtra,
+        draft_content: JSON.stringify({
+          type: "draft",
+          id: util.uuid(),
+          min_version: DRAFT_VERSION_OMNI,
+          min_features: ["AIGC_Video_UnifiedEdit"],
+          is_from_tsn: true,
+          version: DRAFT_VERSION_OMNI,
+          main_component_id: componentId,
+          component_list: [{
+            type: "video_base_component",
+            id: componentId,
+            min_version: "1.0.0",
+            aigc_mode: "workbench",
+            metadata: {
+              type: "",
+              id: util.uuid(),
+              created_platform: 3,
+              created_platform_version: "",
+              created_time_in_ms: Date.now().toString(),
+              created_did: "",
+            },
+            generate_type: "gen_video",
+            abilities: {
+              type: "",
+              id: util.uuid(),
+              gen_video: {
+                id: util.uuid(),
+                type: "",
+                text_to_video_params: {
+                  type: "",
+                  id: util.uuid(),
+                  video_gen_inputs: [{
+                    type: "",
+                    id: util.uuid(),
+                    min_version: DRAFT_VERSION_OMNI,
+                    prompt: "",
+                    video_mode: 2,
+                    fps: 24,
+                    duration_ms: durationMs,
+                    unified_edit_input: {
+                      type: "",
+                      id: util.uuid(),
+                      material_list,
+                      meta_list,
+                    },
+                    idip_meta_list: [],
+                  }],
+                  video_aspect_ratio: ratio,
+                  seed: Math.floor(Math.random() * 4294967296),
+                  model_req_key: model,
+                  priority: 0,
+                },
+                video_task_extra: metricsExtra,
+              },
+            },
+            process_type: 1,
+          }],
+        }),
+        http_common_info: {
+          aid: getAssistantId(regionInfo),
+        },
+      },
+    };
+  } else {
+    // ========== first_last_frames 分支（原有逻辑） ==========
+    let first_frame_image = undefined;
+    let end_frame_image = undefined;
+    let uploadIDs: string[] = [];
+
+    // 优先处理本地上传的文件
+    const uploadedFiles = _.values(files);
+    if (uploadedFiles && uploadedFiles.length > 0) {
+      logger.info(`检测到 ${uploadedFiles.length} 个本地上传文件，优先处理`);
+      for (let i = 0; i < uploadedFiles.length; i++) {
+        const file = uploadedFiles[i];
+        if (!file) continue;
+        try {
+          logger.info(`开始上传第 ${i + 1} 张本地图片: ${file.originalFilename}`);
+          const imgResult = await uploadImageFromFile(file, refreshToken, regionInfo);
+          if (imgResult) {
+            await checkImageContent(imgResult.uri, refreshToken, regionInfo);
+            uploadIDs.push(imgResult.uri);
+            logger.info(`第 ${i + 1} 张本地图片上传成功: ${imgResult.uri}`);
+          } else {
+            logger.error(`第 ${i + 1} 张本地图片上传失败: 未获取到 image_uri`);
+          }
+        } catch (error: any) {
+          logger.error(`第 ${i + 1} 张本地图片上传失败: ${error.message}`);
+          if (i === 0) {
+            throw new APIException(EX.API_REQUEST_FAILED, `首帧图片上传失败: ${error.message}`);
+          }
+        }
+      }
+    } else if (filePaths && filePaths.length > 0) {
+      logger.info(`未检测到本地上传文件，处理 ${filePaths.length} 个图片URL`);
+      for (let i = 0; i < filePaths.length; i++) {
+        const filePath = filePaths[i];
+        if (!filePath) {
+          logger.warn(`第 ${i + 1} 个图片URL为空，跳过`);
+          continue;
+        }
+        try {
+          logger.info(`开始上传第 ${i + 1} 个URL图片: ${filePath}`);
+          const imgResult = await uploadImageFromUrl(filePath, refreshToken, regionInfo);
+          if (imgResult) {
+            await checkImageContent(imgResult.uri, refreshToken, regionInfo);
+            uploadIDs.push(imgResult.uri);
+            logger.info(`第 ${i + 1} 个URL图片上传成功: ${imgResult.uri}`);
+          } else {
+            logger.error(`第 ${i + 1} 个URL图片上传失败: 未获取到 image_uri`);
+          }
+        } catch (error: any) {
+          logger.error(`第 ${i + 1} 个URL图片上传失败: ${error.message}`);
+          if (i === 0) {
+            throw new APIException(EX.API_REQUEST_FAILED, `首帧图片上传失败: ${error.message}`);
+          }
+        }
+      }
+    } else {
+      logger.info(`未提供图片文件或URL，将进行纯文本视频生成`);
+    }
+
+    if (uploadIDs.length > 0) {
+      logger.info(`图片上传完成，共成功 ${uploadIDs.length} 张`);
+      if (uploadIDs[0]) {
+        first_frame_image = {
+          format: "", height: 0, id: util.uuid(), image_uri: uploadIDs[0],
+          name: "", platform_type: 1, source_from: "upload", type: "image", uri: uploadIDs[0], width: 0,
+        };
+        logger.info(`设置首帧图片: ${uploadIDs[0]}`);
+      }
+      if (uploadIDs[1]) {
+        end_frame_image = {
+          format: "", height: 0, id: util.uuid(), image_uri: uploadIDs[1],
+          name: "", platform_type: 1, source_from: "upload", type: "image", uri: uploadIDs[1], width: 0,
+        };
+        logger.info(`设置尾帧图片: ${uploadIDs[1]}`);
+      }
+    }
+
+    const componentId = util.uuid();
+    const originSubmitId = util.uuid();
+    const flFunctionMode = "first_last_frames";
+
+    const sceneOption = {
+      type: "video",
+      scene: "BasicVideoGenerateButton",
+      ...(supportsResolution ? { resolution } : {}),
+      modelReqKey: model,
+      videoDuration: actualDuration,
+      reportParams: {
+        enterSource: "generate",
+        vipSource: "generate",
+        extraVipFunctionKey: supportsResolution ? `${model}-${resolution}` : model,
+        useVipFunctionDetailsReporterHoc: true,
+      },
+    };
+
+    const metricsExtra = JSON.stringify({
+      promptSource: "custom",
+      isDefaultSeed: 1,
+      originSubmitId,
+      isRegenerate: false,
+      enterFrom: "click",
+      functionMode: flFunctionMode,
+      sceneOptions: JSON.stringify([sceneOption]),
+    });
+
+    const hasImageInput = uploadIDs.length > 0;
+    if (hasImageInput && ratio !== "1:1") {
+      logger.warn(`图生视频模式下，ratio参数将被忽略（由输入图片的实际比例决定），但resolution参数仍然有效`);
+    }
+
+    logger.info(`视频生成模式: ${uploadIDs.length}张图片 (首帧: ${!!first_frame_image}, 尾帧: ${!!end_frame_image}), resolution: ${resolution}`);
+
+    requestData = {
       params: {
         aigc_features: "app_lip_sync",
         web_version: "7.5.0",
         da_version: DRAFT_VERSION,
       },
       data: {
-        "extend": {
-          "root_model": model,
-          "m_video_commerce_info": {
+        extend: {
+          root_model: model,
+          m_video_commerce_info: {
             benefit_type: getVideoBenefitType(model),
             resource_id: "generate_video",
             resource_id_type: "str",
-            resource_sub_type: "aigc"
+            resource_sub_type: "aigc",
           },
-          "m_video_commerce_info_list": [{
+          m_video_commerce_info_list: [{
             benefit_type: getVideoBenefitType(model),
             resource_id: "generate_video",
             resource_id_type: "str",
-            resource_sub_type: "aigc"
-          }]
+            resource_sub_type: "aigc",
+          }],
         },
-        "submit_id": util.uuid(),
-        "metrics_extra": metricsExtra,
-        "draft_content": JSON.stringify({
-          "type": "draft",
-          "id": util.uuid(),
-          "min_version": "3.0.5",
-          "min_features": [],
-          "is_from_tsn": true,
-          "version": DRAFT_VERSION,
-          "main_component_id": componentId,
-          "component_list": [{
-            "type": "video_base_component",
-            "id": componentId,
-            "min_version": "1.0.0",
-            "aigc_mode": "workbench",
-            "metadata": {
-              "type": "",
-              "id": util.uuid(),
-              "created_platform": 3,
-              "created_platform_version": "",
-              "created_time_in_ms": Date.now().toString(),
-              "created_did": ""
+        submit_id: util.uuid(),
+        metrics_extra: metricsExtra,
+        draft_content: JSON.stringify({
+          type: "draft",
+          id: util.uuid(),
+          min_version: "3.0.5",
+          min_features: [],
+          is_from_tsn: true,
+          version: DRAFT_VERSION,
+          main_component_id: componentId,
+          component_list: [{
+            type: "video_base_component",
+            id: componentId,
+            min_version: "1.0.0",
+            aigc_mode: "workbench",
+            metadata: {
+              type: "",
+              id: util.uuid(),
+              created_platform: 3,
+              created_platform_version: "",
+              created_time_in_ms: Date.now().toString(),
+              created_did: "",
             },
-            "generate_type": "gen_video",
-            "abilities": {
-              "type": "",
-              "id": util.uuid(),
-              "gen_video": {
-                "id": util.uuid(),
-                "type": "",
-                "text_to_video_params": {
-                  "type": "",
-                  "id": util.uuid(),
-                  "video_gen_inputs": [{
-                    "type": "",
-                    "id": util.uuid(),
-                    "min_version": "3.0.5",
-                    "prompt": prompt,
-                    "video_mode": 2,
-                    "fps": 24,
-                    "duration_ms": durationMs,
-                    ...(supportsResolution ? { "resolution": resolution } : {}),
-                    "first_frame_image": first_frame_image,
-                    "end_frame_image": end_frame_image,
-                    "idip_meta_list": []
+            generate_type: "gen_video",
+            abilities: {
+              type: "",
+              id: util.uuid(),
+              gen_video: {
+                id: util.uuid(),
+                type: "",
+                text_to_video_params: {
+                  type: "",
+                  id: util.uuid(),
+                  video_gen_inputs: [{
+                    type: "",
+                    id: util.uuid(),
+                    min_version: "3.0.5",
+                    prompt,
+                    video_mode: 2,
+                    fps: 24,
+                    duration_ms: durationMs,
+                    ...(supportsResolution ? { resolution } : {}),
+                    first_frame_image,
+                    end_frame_image,
+                    idip_meta_list: [],
                   }],
-                  "video_aspect_ratio": ratio,
-                  "seed": Math.floor(Math.random() * 100000000) + 2500000000,
-                  "model_req_key": model,
-                  "priority": 0
+                  video_aspect_ratio: ratio,
+                  seed: Math.floor(Math.random() * 4294967296),
+                  model_req_key: model,
+                  priority: 0,
                 },
-                "video_task_extra": metricsExtra,
-              }
+                video_task_extra: metricsExtra,
+              },
             },
-            "process_type": 1
+            process_type: 1,
           }],
         }),
         http_common_info: {
-          aid: getAssistantId(regionInfo)
+          aid: getAssistantId(regionInfo),
         },
       },
+    };
+  }
+
+  // 发送请求
+  const videoReferer = regionInfo.isCN
+    ? "https://jimeng.jianying.com/ai-tool/generate?type=video"
+    : "https://dreamina.capcut.com/ai-tool/generate?type=video";
+  const { aigc_data } = await request(
+    "post",
+    "/mweb/v1/aigc_draft/generate",
+    refreshToken,
+    {
+      ...requestData,
+      headers: { Referer: videoReferer },
     }
   );
 
@@ -421,10 +870,10 @@ export async function generateVideo(
 
   const poller = new SmartPoller({
     maxPollCount,
-    pollInterval: 2000, // 2秒基础间隔
+    pollInterval: 20000, // 20秒基础间隔
     expectedItemCount: 1,
     type: 'video',
-    timeoutSeconds: 1200 // 20分钟超时
+    timeoutSeconds: 3600 // 60分钟超时
   });
 
   const { result: pollingResult, data: finalHistoryData } = await poller.poll(async () => {
@@ -437,33 +886,6 @@ export async function generateVideo(
       },
     });
 
-    // 尝试直接从响应中提取视频URL
-    const responseStr = JSON.stringify(result);
-    const videoUrlMatch = responseStr.match(/https:\/\/v[0-9]+-artist\.vlabvod\.com\/[^"\s]+/);
-    if (videoUrlMatch && videoUrlMatch[0]) {
-      logger.info(`从API响应中直接提取到视频URL: ${videoUrlMatch[0]}`);
-      // 构造成功状态并返回
-      return {
-        status: {
-          status: 10,
-          itemCount: 1,
-          historyId
-        } as PollingStatus,
-        data: {
-          status: 10,
-          item_list: [{
-            video: {
-              transcoded_video: {
-                origin: {
-                  video_url: videoUrlMatch[0]
-                }
-              }
-            }
-          }]
-        }
-      };
-    }
-
     // 检查响应中是否有该 history_id 的数据
     // 由于 API 存在最终一致性，早期轮询可能暂时获取不到记录，返回处理中状态继续轮询
     if (!result[historyId]) {
@@ -510,15 +932,35 @@ export async function generateVideo(
 
   const item_list = finalHistoryData.item_list || [];
 
-  // 提取视频URL
-  let videoUrl = item_list?.[0] ? extractVideoUrl(item_list[0]) : null;
+  // 尝试通过 get_local_item_list 获取高质量视频下载URL
+  const itemId = item_list?.[0]?.item_id
+    || item_list?.[0]?.id
+    || item_list?.[0]?.local_item_id
+    || item_list?.[0]?.common_attr?.id;
+
+  if (itemId) {
+    try {
+      const hqVideoUrl = await fetchHighQualityVideoUrl(String(itemId), refreshToken);
+      if (hqVideoUrl) {
+        logger.info(`视频生成成功（高质量），URL: ${hqVideoUrl}，总耗时: ${pollingResult.elapsedTime}秒`);
+        return hqVideoUrl;
+      }
+    } catch (error) {
+      logger.warn(`获取高质量视频URL失败，将使用预览URL作为回退: ${error.message}`);
+    }
+  } else {
+    logger.warn(`未能从item_list中提取item_id，将使用预览URL。item_list[0]键: ${item_list?.[0] ? Object.keys(item_list[0]).join(', ') : '无'}`);
+  }
+
+  // 回退：提取预览视频URL
+  let fallbackVideoUrl = item_list?.[0] ? extractVideoUrl(item_list[0]) : null;
 
   // 如果无法获取视频URL，抛出异常
-  if (!videoUrl) {
+  if (!fallbackVideoUrl) {
     logger.error(`未能获取视频URL，item_list: ${JSON.stringify(item_list)}`);
     throw new APIException(EX.API_IMAGE_GENERATION_FAILED, "未能获取视频URL，请稍后查看");
   }
 
-  logger.info(`视频生成成功，URL: ${videoUrl}，总耗时: ${pollingResult.elapsedTime}秒`);
-  return videoUrl;
+  logger.info(`视频生成成功，URL: ${fallbackVideoUrl}，总耗时: ${pollingResult.elapsedTime}秒`);
+  return fallbackVideoUrl;
 }

src/api/routes/videos.ts

@@ -21,28 +21,119 @@ export default {
                 .validate('body.prompt', _.isString)
                 .validate('body.ratio', v => _.isUndefined(v) || _.isString(v))
                 .validate('body.resolution', v => _.isUndefined(v) || _.isString(v))
-                .validate('body.duration', v => {
-                    if (_.isUndefined(v)) return true;
-                    // 支持的时长: 4/8/12 (sora2)、5/10 (其他模型)、15 (4.0模型)
-                    const validDurations = [4, 5, 8, 10, 12, 15];
-                    // 对于 multipart/form-data，允许字符串类型的数字
-                    if (isMultiPart && typeof v === 'string') {
-                        const num = parseInt(v);
-                        return validDurations.includes(num);
-                    }
-                    // 对于 JSON，要求数字类型
-                    return _.isFinite(v) && validDurations.includes(v);
-                })
-                // 限制图片URL数量最多2个
-                .validate('body.file_paths', v => _.isUndefined(v) || (_.isArray(v) && v.length <= 2))
-                .validate('body.filePaths', v => _.isUndefined(v) || (_.isArray(v) && v.length <= 2))
+                .validate('body.functionMode', v => _.isUndefined(v) || (_.isString(v) && ['first_last_frames', 'omni_reference'].includes(v)))
                 .validate('body.response_format', v => _.isUndefined(v) || _.isString(v))
                 .validate('headers.authorization', _.isString);
 
-            // 限制上传文件数量最多2个
-            const uploadedFiles = request.files ? _.values(request.files) : [];
-            if (uploadedFiles.length > 2) {
-                throw new Error('最多只能上传2个图片文件');
+            const functionMode = request.body.functionMode || 'first_last_frames';
+            const isOmniMode = functionMode === 'omni_reference';
+
+            // 验证 duration（根据模型）
+            if (!_.isUndefined(request.body.duration)) {
+                const modelName = request.body.model || DEFAULT_MODEL;
+                let durationValue: number;
+                if (isMultiPart && typeof request.body.duration === 'string') {
+                    durationValue = parseInt(request.body.duration, 10);
+                    // 严格检查 parseInt 结果
+                    if (!Number.isInteger(durationValue) || request.body.duration.trim() !== String(durationValue)) {
+                        throw new Error(`duration 必须是整数，当前值: ${request.body.duration}`);
+                    }
+                } else if (_.isFinite(request.body.duration)) {
+                    durationValue = request.body.duration as number;
+                    if (!Number.isInteger(durationValue)) {
+                        throw new Error(`duration 必须是整数，当前值: ${durationValue}`);
+                    }
+                } else {
+                    throw new Error(`duration 参数格式错误`);
+                }
+
+                // 根据模型验证 duration 有效值
+                let validDurations: number[] = [];
+                let errorMessage = '';
+
+                if (modelName.includes('veo3.1') || modelName.includes('veo3')) {
+                    validDurations = [8];
+                    errorMessage = 'veo3 模型仅支持 8 秒时长';
+                } else if (modelName.includes('sora2')) {
+                    validDurations = [4, 8, 12];
+                    errorMessage = 'sora2 模型仅支持 4、8、12 秒时长';
+                } else if (modelName.includes('3.5-pro') || modelName.includes('3.5_pro')) {
+                    validDurations = [5, 10, 12];
+                    errorMessage = '3.5-pro 模型仅支持 5、10、12 秒时长';
+                } else if (modelName.includes('seedance-2.0') || modelName.includes('40_pro') || modelName.includes('40-pro') || modelName.includes('seedance-2.0-fast')) {
+                    // seedance 2.0 和 2.0-fast 支持 4~15 秒任意整数
+                    if (durationValue < 4 || durationValue > 15) {
+                        throw new Error(`seedance 2.0/2.0-fast 模型支持 4~15 秒时长，当前值: ${durationValue}`);
+                    }
+                } else {
+                    // 其他模型支持 5 或 10 秒
+                    validDurations = [5, 10];
+                    errorMessage = '该模型仅支持 5、10 秒时长';
+                }
+
+                // 检查是否在有效值列表中
+                if (validDurations.length > 0 && !validDurations.includes(durationValue)) {
+                    throw new Error(`${errorMessage}，当前值: ${durationValue}`);
+                }
+            }
+
+            // 验证 file_paths 和 filePaths
+            request
+                .validate('body.file_paths', v => _.isUndefined(v) || (_.isArray(v) && v.length <= 2))
+                .validate('body.filePaths', v => _.isUndefined(v) || (_.isArray(v) && v.length <= 2));
+
+            if (isOmniMode) {
+                // 全能模式验证逻辑
+                const uploadedFiles = request.files || {};
+
+                // 统计各类型文件数量
+                let imageCount = 0;
+                let videoCount = 0;
+
+                // 统计上传的文件
+                for (const fieldName of Object.keys(uploadedFiles)) {
+                    if (fieldName.startsWith('image_file_')) imageCount++;
+                    else if (fieldName.startsWith('video_file_')) videoCount++;
+                }
+
+                // 统计URL字段
+                for (let i = 1; i <= 9; i++) {
+                    const fieldName = `image_file_${i}`;
+                    if (typeof request.body[fieldName] === 'string' && request.body[fieldName].startsWith('http')) {
+                        imageCount++;
+                    }
+                }
+                for (let i = 1; i <= 3; i++) {
+                    const fieldName = `video_file_${i}`;
+                    if (typeof request.body[fieldName] === 'string' && request.body[fieldName].startsWith('http')) {
+                        videoCount++;
+                    }
+                }
+
+                // 验证数量限制
+                if (imageCount > 9) {
+                    throw new Error('全能模式最多上传9张图片');
+                }
+                if (videoCount > 3) {
+                    throw new Error('全能模式最多上传3个视频');
+                }
+
+                const totalCount = imageCount + videoCount;
+                if (totalCount > 12) {
+                    throw new Error('全能模式图片+视频总数不超过12个');
+                }
+                if (totalCount === 0) {
+                    const hasFilePaths = (request.body.filePaths?.length > 0) || (request.body.file_paths?.length > 0);
+                    if (!hasFilePaths) {
+                        throw new Error('全能模式至少需要上传1个素材文件(图片或视频)');
+                    }
+                }
+            } else {
+                // 普通模式验证逻辑（保持原有逻辑）
+                const uploadedFiles = request.files ? _.values(request.files) : [];
+                if (uploadedFiles.length > 2) {
+                    throw new Error('最多只能上传2个图片文件');
+                }
             }
 
             // refresh_token切分
@@ -70,7 +161,7 @@ export default {
             const finalFilePaths = filePaths.length > 0 ? filePaths : file_paths;
 
             // 生成视频
-            const videoUrl = await generateVideo(
+            const generatedVideoUrl = await generateVideo(
                 model,
                 prompt,
                 {
@@ -79,6 +170,8 @@ export default {
                     duration: finalDuration,
                     filePaths: finalFilePaths,
                     files: request.files, // 传递上传的文件
+                    httpRequest: request, // 传递完整的 request 对象以访问动态字段
+                    functionMode,
                 },
                 token
             );
@@ -86,7 +179,7 @@ export default {
             // 根据response_format返回不同格式的结果
             if (response_format === "b64_json") {
                 // 获取视频内容并转换为BASE64
-                const videoBase64 = await util.fetchFileBASE64(videoUrl);
+                const videoBase64 = await util.fetchFileBASE64(generatedVideoUrl);
                 return {
                     created: util.unixTimestamp(),
                     data: [{
@@ -99,7 +192,7 @@ export default {
                 return {
                     created: util.unixTimestamp(),
                     data: [{
-                        url: videoUrl,
+                        url: generatedVideoUrl,
                         revised_prompt: prompt
                     }]
                 };

src/lib/aws-signature.ts

@@ -12,7 +12,8 @@ export function createSignature(
   secretAccessKey: string,
   sessionToken?: string,
   payload: string = '',
-  region: string = 'cn-north-1'
+  region: string = 'cn-north-1',
+  service: string = 'imagex'
 ) {
   const urlObj = new URL(url);
   const pathname = urlObj.pathname || '/';
@@ -21,7 +22,6 @@ export function createSignature(
   // 创建规范请求
   const timestamp = headers['x-amz-date'];
   const date = timestamp.substr(0, 8);
-  const service = 'imagex';
   
   // 规范化查询参数
   const queryParams: Array<[string, string]> = [];

src/lib/image-uploader.ts

@@ -11,18 +11,28 @@ import util from "@/lib/util.ts";
  * 整合了images.ts和videos.ts中重复的上传逻辑
  */
 
+/**
+ * 图片上传结果
+ */
+export interface ImageUploadResult {
+  uri: string;
+  width: number;
+  height: number;
+  format: string;
+}
+
 /**
  * 上传图片Buffer到ImageX
  * @param imageBuffer 图片数据
  * @param refreshToken 刷新令牌
  * @param regionInfo 区域信息
- * @returns 图片URI
+ * @returns 图片上传结果（URI + 元信息）
  */
 export async function uploadImageBuffer(
   imageBuffer: ArrayBuffer | Buffer,
   refreshToken: string,
   regionInfo: RegionInfo
-): Promise<string> {
+): Promise<ImageUploadResult> {
   try {
     logger.info(`开始上传图片Buffer... (isInternational: ${regionInfo.isInternational})`);
 
@@ -230,9 +240,16 @@ export async function uploadImageBuffer(
     }
 
     const fullImageUri = uploadResult.Uri;
-    logger.info(`图片上传完成: ${fullImageUri}`);
 
-    return fullImageUri;
+    // 从 PluginResult 提取图片元信息
+    const pluginResult = commitResult.Result?.PluginResult?.[0];
+    const width = pluginResult?.ImageWidth || 0;
+    const height = pluginResult?.ImageHeight || 0;
+    const format = pluginResult?.ImageFormat || "";
+
+    logger.info(`图片上传完成: ${fullImageUri} (${width}x${height}, ${format})`);
+
+    return { uri: fullImageUri, width, height, format };
   } catch (error: any) {
     logger.error(`图片Buffer上传失败: ${error.message}`);
     throw error;
@@ -244,13 +261,13 @@ export async function uploadImageBuffer(
  * @param imageUrl 图片URL
  * @param refreshToken 刷新令牌
  * @param regionInfo 区域信息
- * @returns 图片URI
+ * @returns 图片上传结果（URI + 元信息）
  */
 export async function uploadImageFromUrl(
   imageUrl: string,
   refreshToken: string,
   regionInfo: RegionInfo
-): Promise<string> {
+): Promise<ImageUploadResult> {
   try {
     logger.info(`开始从URL下载并上传图片: ${imageUrl}`);
 

src/lib/image-utils.ts

@@ -1,3 +1,4 @@
+import { request } from "@/api/controllers/core.ts";
 import logger from "@/lib/logger.ts";
 
 /**
@@ -64,3 +65,74 @@ export function extractVideoUrl(item: any): string | null {
 
   return null;
 }
+
+/**
+ * 通过 get_local_item_list API 获取高质量视频下载URL
+ * 浏览器下载视频时使用此API获取高码率版本（~6297 vs 预览版 ~1152）
+ *
+ * @param itemId 视频项目ID
+ * @param refreshToken 刷新令牌
+ * @returns 高质量视频URL，失败时返回 null
+ */
+export async function fetchHighQualityVideoUrl(itemId: string, refreshToken: string): Promise<string | null> {
+  try {
+    logger.info(`尝试获取高质量视频下载URL，item_id: ${itemId}`);
+
+    const result = await request("post", "/mweb/v1/get_local_item_list", refreshToken, {
+      data: {
+        item_id_list: [itemId],
+        pack_item_opt: {
+          scene: 1,
+          need_data_integrity: true,
+        },
+        is_for_video_download: true,
+      },
+    });
+
+    const responseStr = JSON.stringify(result);
+    logger.info(`get_local_item_list 响应大小: ${responseStr.length} 字符`);
+
+    // 策略1: 从结构化字段中提取视频URL
+    const itemList = result.item_list || result.local_item_list || [];
+    if (itemList.length > 0) {
+      const item = itemList[0];
+      const videoUrl =
+        item?.video?.transcoded_video?.origin?.video_url ||
+        item?.video?.download_url ||
+        item?.video?.play_url ||
+        item?.video?.url;
+
+      if (videoUrl) {
+        logger.info(`从get_local_item_list结构化字段获取到高清视频URL: ${videoUrl}`);
+        return videoUrl;
+      }
+    }
+
+    // 策略2: 正则匹配 dreamnia.jimeng.com 高质量URL
+    const hqUrlMatch = responseStr.match(/https:\/\/v[0-9]+-dreamnia\.jimeng\.com\/[^"\s\\]+/);
+    if (hqUrlMatch && hqUrlMatch[0]) {
+      logger.info(`正则提取到高质量视频URL (dreamnia): ${hqUrlMatch[0]}`);
+      return hqUrlMatch[0];
+    }
+
+    // 策略3: 匹配任何 jimeng.com 域名的视频URL
+    const jimengUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.jimeng\.com\/[^"\s\\]+/);
+    if (jimengUrlMatch && jimengUrlMatch[0]) {
+      logger.info(`正则提取到jimeng视频URL: ${jimengUrlMatch[0]}`);
+      return jimengUrlMatch[0];
+    }
+
+    // 策略4: 匹配任何视频URL（兜底）
+    const anyVideoUrlMatch = responseStr.match(/https:\/\/v[0-9]+-[^"\\]*\.(vlabvod|jimeng)\.com\/[^"\s\\]+/);
+    if (anyVideoUrlMatch && anyVideoUrlMatch[0]) {
+      logger.info(`从get_local_item_list提取到视频URL: ${anyVideoUrlMatch[0]}`);
+      return anyVideoUrlMatch[0];
+    }
+
+    logger.warn(`未能从get_local_item_list响应中提取到视频URL`);
+    return null;
+  } catch (error) {
+    logger.warn(`获取高质量视频下载URL失败: ${error.message}`);
+    return null;
+  }
+}

src/lib/smart-poller.ts

@@ -227,7 +227,8 @@ export class SmartPoller {
           error.message?.includes('timeout') ||
           error.message?.includes('network') ||
           error.message?.includes('ECONNRESET') ||
-          error.message?.includes('socket hang up');
+          error.message?.includes('socket hang up') ||
+          error.message?.includes('Proxy connection');
 
         // 网络错误时进行轮询级别的重试，而不是直接中断整个流程
         if (isRetryableError && this.pollCount < this.options.maxPollCount) {

src/lib/util.ts

@@ -7,7 +7,7 @@ import "colors";
 import mime from "mime";
 import axios from "axios";
 import fs from "fs-extra";
-import { v1 as uuid } from "uuid";
+import { v4 as uuid } from "uuid";
 import { format as dateFormat } from "date-fns";
 import CRC32 from "crc-32";
 import randomstring from "randomstring";

src/lib/video-uploader.ts

@@ -0,0 +1,326 @@
+import crypto from "crypto";
+import axios from "axios";
+import { RegionInfo, request } from "@/api/controllers/core.ts";
+import { RegionUtils } from "@/lib/region-utils.ts";
+import { createSignature } from "@/lib/aws-signature.ts";
+import logger from "@/lib/logger.ts";
+import util from "@/lib/util.ts";
+
+/**
+ * 视频上传模块
+ * 通过 VOD (vod.bytedanceapi.com) 上传视频文件，获取 Vid
+ */
+
+export interface VideoUploadResult {
+  vid: string;
+  uri: string;
+  videoMeta: {
+    width: number;
+    height: number;
+    duration: number;
+    bitrate: number;
+    format: string;
+    codec: string;
+    size: number;
+    md5: string;
+  };
+}
+
+/**
+ * 上传视频Buffer到VOD
+ * @param videoBuffer 视频二进制数据
+ * @param refreshToken 刷新令牌
+ * @param regionInfo 区域信息
+ * @returns 上传结果，包含 vid 和视频元信息
+ */
+export async function uploadVideoBuffer(
+  videoBuffer: ArrayBuffer | Buffer,
+  refreshToken: string,
+  regionInfo: RegionInfo
+): Promise<VideoUploadResult> {
+  try {
+    const fileSize = videoBuffer.byteLength;
+    logger.info(`开始上传视频Buffer... (size=${fileSize}, isInternational=${regionInfo.isInternational})`);
+
+    // 第一步：获取上传令牌
+    const tokenResult = await request("post", "/mweb/v1/get_upload_token", refreshToken, {
+      data: {
+        scene: 1, // VOD 视频上传场景
+      },
+    });
+
+    const { access_key_id, secret_access_key, session_token, space_name } = tokenResult;
+
+    if (!access_key_id || !secret_access_key || !session_token) {
+      throw new Error("获取视频上传令牌失败");
+    }
+
+    const spaceName = space_name || "dreamina";
+    logger.info(`获取视频上传令牌成功: spaceName=${spaceName}`);
+
+    // 第二步：申请视频上传权限 (ApplyUploadInner)
+    const now = new Date();
+    const timestamp = now.toISOString().replace(/[:\-]/g, '').replace(/\.\d{3}Z$/, 'Z');
+    const randomStr = Math.random().toString(36).substring(2, 12);
+
+    const vodHost = "https://vod.bytedanceapi.com";
+    const applyUrl = `${vodHost}/?Action=ApplyUploadInner&Version=2020-11-19&SpaceName=${spaceName}&FileType=video&IsInner=1&FileSize=${fileSize}&s=${randomStr}`;
+
+    const awsRegion = RegionUtils.getAWSRegion(regionInfo);
+    const origin = RegionUtils.getOrigin(regionInfo);
+
+    const requestHeaders = {
+      'x-amz-date': timestamp,
+      'x-amz-security-token': session_token,
+    };
+
+    const authorization = createSignature(
+      'GET', applyUrl, requestHeaders,
+      access_key_id, secret_access_key, session_token,
+      '', awsRegion, 'vod'
+    );
+
+    logger.info(`申请视频上传权限: ${applyUrl}`);
+
+    let applyResponse;
+    try {
+      applyResponse = await axios({
+        method: 'GET',
+        url: applyUrl,
+        headers: {
+          'accept': '*/*',
+          'accept-language': 'zh-CN,zh;q=0.9',
+          'authorization': authorization,
+          'origin': origin,
+          'referer': RegionUtils.getRefererPath(regionInfo),
+          'sec-ch-ua': '"Not A(Brand";v="8", "Chromium";v="132", "Google Chrome";v="132"',
+          'sec-ch-ua-mobile': '?0',
+          'sec-ch-ua-platform': '"Windows"',
+          'sec-fetch-dest': 'empty',
+          'sec-fetch-mode': 'cors',
+          'sec-fetch-site': 'cross-site',
+          'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36',
+          'x-amz-date': timestamp,
+          'x-amz-security-token': session_token,
+        },
+        validateStatus: () => true,
+      });
+    } catch (fetchError: any) {
+      logger.error(`ApplyUploadInner请求失败: ${fetchError.message}`);
+      throw new Error(`视频上传申请网络请求失败 (${vodHost}): ${fetchError.message}`);
+    }
+
+    if (applyResponse.status < 200 || applyResponse.status >= 300) {
+      const errorText = typeof applyResponse.data === 'string' ? applyResponse.data : JSON.stringify(applyResponse.data);
+      throw new Error(`申请视频上传权限失败: ${applyResponse.status} - ${errorText}`);
+    }
+
+    const applyResult = applyResponse.data;
+
+    if (applyResult?.ResponseMetadata?.Error) {
+      throw new Error(`申请视频上传权限失败: ${JSON.stringify(applyResult.ResponseMetadata.Error)}`);
+    }
+
+    // 解析上传节点（优先使用 Edge 节点）
+    const uploadNodes = applyResult?.Result?.InnerUploadAddress?.UploadNodes;
+    if (!uploadNodes || uploadNodes.length === 0) {
+      throw new Error(`获取视频上传节点失败: ${JSON.stringify(applyResult)}`);
+    }
+
+    const uploadNode = uploadNodes[0];
+    const storeInfo = uploadNode.StoreInfos?.[0];
+    if (!storeInfo) {
+      throw new Error(`获取视频上传存储信息失败: ${JSON.stringify(uploadNode)}`);
+    }
+
+    const uploadHost = uploadNode.UploadHost;
+    const storeUri = storeInfo.StoreUri;
+    const auth = storeInfo.Auth;
+    const sessionKey = uploadNode.SessionKey;
+    const vid = uploadNode.Vid;
+
+    logger.info(`获取视频上传节点成功: host=${uploadHost}, vid=${vid}, type=${uploadNode.Type}`);
+
+    // 第三步：上传视频二进制数据
+    const uploadUrl = `https://${uploadHost}/upload/v1/${storeUri}`;
+    const crc32 = util.calculateCRC32(videoBuffer);
+    logger.info(`开始上传视频文件: ${uploadUrl}, CRC32=${crc32}`);
+
+    let uploadResponse;
+    try {
+      uploadResponse = await axios({
+        method: 'POST',
+        url: uploadUrl,
+        headers: {
+          'Accept': '*/*',
+          'Accept-Language': 'zh-CN,zh;q=0.9',
+          'Authorization': auth,
+          'Connection': 'keep-alive',
+          'Content-CRC32': crc32,
+          'Content-Type': 'application/octet-stream',
+          'Origin': origin,
+          'Referer': RegionUtils.getRefererPath(regionInfo),
+          'Sec-Fetch-Dest': 'empty',
+          'Sec-Fetch-Mode': 'cors',
+          'Sec-Fetch-Site': 'cross-site',
+          'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36',
+        },
+        data: videoBuffer,
+        maxContentLength: Infinity,
+        maxBodyLength: Infinity,
+        validateStatus: () => true,
+      });
+    } catch (fetchError: any) {
+      logger.error(`视频文件上传请求失败: ${fetchError.message}`);
+      throw new Error(`视频文件上传网络请求失败 (${uploadHost}): ${fetchError.message}`);
+    }
+
+    if (uploadResponse.status < 200 || uploadResponse.status >= 300) {
+      const errorText = typeof uploadResponse.data === 'string' ? uploadResponse.data : JSON.stringify(uploadResponse.data);
+      throw new Error(`视频文件上传失败: ${uploadResponse.status} - ${errorText}`);
+    }
+
+    const uploadData = uploadResponse.data;
+    if (uploadData?.code !== 2000) {
+      throw new Error(`视频文件上传失败: code=${uploadData?.code}, message=${uploadData?.message}`);
+    }
+
+    logger.info(`视频文件上传成功: crc32=${uploadData.data?.crc32}`);
+
+    // 第四步：提交上传确认 (CommitUploadInner)
+    const commitUrl = `${vodHost}/?Action=CommitUploadInner&Version=2020-11-19&SpaceName=${spaceName}`;
+    const commitTimestamp = new Date().toISOString().replace(/[:\-]/g, '').replace(/\.\d{3}Z$/, 'Z');
+    const commitPayload = JSON.stringify({
+      SessionKey: sessionKey,
+      Functions: [],
+    });
+
+    const payloadHash = crypto.createHash('sha256').update(commitPayload, 'utf8').digest('hex');
+
+    const commitRequestHeaders = {
+      'x-amz-date': commitTimestamp,
+      'x-amz-security-token': session_token,
+      'x-amz-content-sha256': payloadHash,
+    };
+
+    const commitAuthorization = createSignature(
+      'POST', commitUrl, commitRequestHeaders,
+      access_key_id, secret_access_key, session_token,
+      commitPayload, awsRegion, 'vod'
+    );
+
+    logger.info(`提交视频上传确认: ${commitUrl}`);
+
+    let commitResponse;
+    try {
+      commitResponse = await axios({
+        method: 'POST',
+        url: commitUrl,
+        headers: {
+          'accept': '*/*',
+          'accept-language': 'zh-CN,zh;q=0.9',
+          'authorization': commitAuthorization,
+          'content-type': 'application/json',
+          'origin': origin,
+          'referer': RegionUtils.getRefererPath(regionInfo),
+          'sec-ch-ua': '"Not A(Brand";v="8", "Chromium";v="132", "Google Chrome";v="132"',
+          'sec-ch-ua-mobile': '?0',
+          'sec-ch-ua-platform': '"Windows"',
+          'sec-fetch-dest': 'empty',
+          'sec-fetch-mode': 'cors',
+          'sec-fetch-site': 'cross-site',
+          'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36',
+          'x-amz-date': commitTimestamp,
+          'x-amz-security-token': session_token,
+          'x-amz-content-sha256': payloadHash,
+        },
+        data: commitPayload,
+        validateStatus: () => true,
+      });
+    } catch (fetchError: any) {
+      logger.error(`CommitUploadInner请求失败: ${fetchError.message}`);
+      throw new Error(`提交视频上传网络请求失败 (${vodHost}): ${fetchError.message}`);
+    }
+
+    if (commitResponse.status < 200 || commitResponse.status >= 300) {
+      const errorText = typeof commitResponse.data === 'string' ? commitResponse.data : JSON.stringify(commitResponse.data);
+      throw new Error(`提交视频上传失败: ${commitResponse.status} - ${errorText}`);
+    }
+
+    const commitResult = commitResponse.data;
+
+    if (commitResult?.ResponseMetadata?.Error) {
+      throw new Error(`提交视频上传失败: ${JSON.stringify(commitResult.ResponseMetadata.Error)}`);
+    }
+
+    if (!commitResult?.Result?.Results || commitResult.Result.Results.length === 0) {
+      throw new Error(`提交视频上传响应缺少结果: ${JSON.stringify(commitResult)}`);
+    }
+
+    const result = commitResult.Result.Results[0];
+    const videoMeta = result.VideoMeta;
+
+    if (!result.Vid) {
+      throw new Error(`提交视频上传响应缺少 Vid: ${JSON.stringify(result)}`);
+    }
+
+    // 校验视频时长，即梦限制不超过15秒
+    const MAX_VIDEO_DURATION = 15;
+    if (videoMeta?.Duration && videoMeta.Duration > MAX_VIDEO_DURATION) {
+      throw new Error(`视频时长 ${videoMeta.Duration.toFixed(2)}s 超过限制 (最大 ${MAX_VIDEO_DURATION}s)`);
+    }
+
+    logger.info(`视频上传完成: vid=${result.Vid}, ${videoMeta?.Width}x${videoMeta?.Height}, ${videoMeta?.Duration}s, ${videoMeta?.Format}/${videoMeta?.Codec}`);
+
+    return {
+      vid: result.Vid,
+      uri: videoMeta?.Uri || '',
+      videoMeta: {
+        width: videoMeta?.Width || 0,
+        height: videoMeta?.Height || 0,
+        duration: videoMeta?.Duration || 0,
+        bitrate: videoMeta?.Bitrate || 0,
+        format: videoMeta?.Format || '',
+        codec: videoMeta?.Codec || '',
+        size: videoMeta?.Size || 0,
+        md5: videoMeta?.Md5 || '',
+      },
+    };
+  } catch (error: any) {
+    logger.error(`视频Buffer上传失败: ${error.message}`);
+    throw error;
+  }
+}
+
+/**
+ * 从URL下载并上传视频
+ * @param videoUrl 视频URL
+ * @param refreshToken 刷新令牌
+ * @param regionInfo 区域信息
+ * @returns 上传结果
+ */
+export async function uploadVideoFromUrl(
+  videoUrl: string,
+  refreshToken: string,
+  regionInfo: RegionInfo
+): Promise<VideoUploadResult> {
+  try {
+    logger.info(`开始从URL下载并上传视频: ${videoUrl}`);
+
+    const videoResponse = await axios.get(videoUrl, {
+      responseType: 'arraybuffer',
+      maxContentLength: Infinity,
+      maxBodyLength: Infinity,
+    });
+    if (videoResponse.status < 200 || videoResponse.status >= 300) {
+      throw new Error(`下载视频失败: ${videoResponse.status}`);
+    }
+
+    const videoBuffer = videoResponse.data;
+    logger.info(`视频下载完成: ${videoBuffer.byteLength} 字节`);
+    return await uploadVideoBuffer(videoBuffer, refreshToken, regionInfo);
+  } catch (error: any) {
+    logger.error(`从URL上传视频失败: ${error.message}`);
+    throw error;
+  }
+}