add jimeng-video-3.0-fast for Asia international sites

Author: iptag

README.CN.md

@@ -448,7 +448,7 @@ A: 可以。现在支持直接上传本地文件。请参考上方的“本地
 - `jimeng-video-sora2` - Sora2模型，仅亚洲国际站 (HK/JP/SG) 支持
 - `jimeng-video-3.0-pro` - 专业版，国内站和亚洲国际站 (HK/JP/SG) 支持
 - `jimeng-video-3.0` - 标准版，国内/国际站均支持
-- `jimeng-video-3.0-fast` - 极速版（仅国内站支持）
+- `jimeng-video-3.0-fast` - 极速版，国内站和亚洲国际站 (HK/JP/SG) 支持
 - `jimeng-video-2.0-pro` - 专业版v2，国内站和亚洲国际站 (HK/JP/SG) 支持
 - `jimeng-video-2.0` - 标准版v2，国内站和亚洲国际站 (HK/JP/SG) 支持
 

README.md

@@ -427,7 +427,7 @@ Generate a video from a text prompt (Text-to-Video) or from start/end frame imag
 - `jimeng-video-sora2` - Sora2 model, Asia international sites only (HK/JP/SG)
 - `jimeng-video-3.0-pro` - Professional Edition, China and Asia international sites (HK/JP/SG)
 - `jimeng-video-3.0` - Standard Edition, works on all sites
-- `jimeng-video-3.0-fast` - Fast Edition (China site only)
+- `jimeng-video-3.0-fast` - Fast Edition, China and Asia international sites (HK/JP/SG)
 - `jimeng-video-2.0-pro` - Professional Edition v2, China and Asia international sites (HK/JP/SG)
 - `jimeng-video-2.0` - Standard Edition v2, China and Asia international sites (HK/JP/SG)
 

package-lock.json

@@ -85,6 +85,7 @@ export const VIDEO_MODEL_MAP_ASIA = {
   "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",
+  "jimeng-video-3.0-fast": "dreamina_ic_generate_video_model_vgfm_3.0_fast",
   "jimeng-video-2.0": "dreamina_ic_generate_video_model_vgfm_lite",
   "jimeng-video-2.0-pro": "dreamina_ic_generate_video_model_vgfm1.0"
 };

src/api/consts/common.ts

@@ -9,6 +9,7 @@ import logger from "@/lib/logger.ts";
 import util from "@/lib/util.ts";
 import { JimengErrorHandler, JimengErrorResponse } from "@/lib/error-handler.ts";
 import { BASE_URL_DREAMINA_US, BASE_URL_DREAMINA_HK } from "@/api/consts/dreamina.ts";
+
 import {
   BASE_URL_CN,
   BASE_URL_US_COMMERCE,

src/api/controllers/core.ts

@@ -1,7 +1,9 @@
 import _ from "lodash";
 import fs from "fs-extra";
+import axios from "axios";
 
 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";
@@ -64,11 +66,13 @@ async function uploadImageFromFile(file: any, refreshToken: string, regionInfo:
 async function uploadImageFromUrl(imageUrl: string, refreshToken: string, regionInfo: RegionInfo): Promise<string> {
   try {
     logger.info(`开始从URL下载并上传视频图片: ${imageUrl}`);
-    const imageResponse = await fetch(imageUrl);
-    if (!imageResponse.ok) {
+    const imageResponse = await axios.get(imageUrl, {
+      responseType: 'arraybuffer',
+    });
+    if (imageResponse.status < 200 || imageResponse.status >= 300) {
       throw new Error(`下载图片失败: ${imageResponse.status}`);
     }
-    const imageBuffer = await imageResponse.arrayBuffer();
+    const imageBuffer = imageResponse.data;
     return await uploadImageBuffer(imageBuffer, refreshToken, regionInfo);
   } catch (error: any) {
     logger.error(`从URL上传视频图片失败: ${error.message}`);

src/api/controllers/videos.ts

@@ -1,4 +1,5 @@
 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";
@@ -69,8 +70,9 @@ export async function uploadImageBuffer(
 
     let applyResponse;
     try {
-      applyResponse = await fetch(applyUrl, {
+      applyResponse = await axios({
         method: 'GET',
+        url: applyUrl,
         headers: {
           'accept': '*/*',
           'accept-language': 'zh-CN,zh;q=0.9',
@@ -87,19 +89,20 @@ export async function uploadImageBuffer(
           'x-amz-date': timestamp,
           'x-amz-security-token': session_token,
         },
+        validateStatus: () => true,
       });
     } catch (fetchError: any) {
       logger.error(`Fetch请求失败，目标URL: ${applyUrl}`);
       logger.error(`错误详情: ${fetchError.message}`);
       throw new Error(`网络请求失败 (${applyUrlHost}): ${fetchError.message}. 请检查: 1) 网络连接是否正常 2) 是否需要配置代理 3) DNS是否能解析该域名`);
     }
 
-    if (!applyResponse.ok) {
-      const errorText = await applyResponse.text();
+    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 = await applyResponse.json();
+    const applyResult = applyResponse.data;
 
     if (applyResult?.ResponseMetadata?.Error) {
       throw new Error(`申请上传权限失败: ${JSON.stringify(applyResult.ResponseMetadata.Error)}`);
@@ -123,8 +126,9 @@ export async function uploadImageBuffer(
     // 第三步：上传图片文件
     let uploadResponse;
     try {
-      uploadResponse = await fetch(uploadUrl, {
+      uploadResponse = await axios({
         method: 'POST',
+        url: uploadUrl,
         headers: {
           'Accept': '*/*',
           'Accept-Language': 'zh-CN,zh;q=0.9',
@@ -140,16 +144,17 @@ export async function uploadImageBuffer(
           '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',
         },
-        body: imageBuffer,
+        data: imageBuffer,
+        validateStatus: () => true,
       });
     } catch (fetchError: any) {
       logger.error(`图片文件上传fetch请求失败，目标URL: ${uploadUrl}`);
       logger.error(`错误详情: ${fetchError.message}`);
       throw new Error(`图片上传网络请求失败 (${uploadHost}): ${fetchError.message}. 请检查网络连接`);
     }
 
-    if (!uploadResponse.ok) {
-      const errorText = await uploadResponse.text();
+    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}`);
     }
 
@@ -174,8 +179,9 @@ export async function uploadImageBuffer(
 
     let commitResponse;
     try {
-      commitResponse = await fetch(commitUrl, {
+      commitResponse = await axios({
         method: 'POST',
+        url: commitUrl,
         headers: {
           'accept': '*/*',
           'accept-language': 'zh-CN,zh;q=0.9',
@@ -194,20 +200,21 @@ export async function uploadImageBuffer(
           'x-amz-security-token': session_token,
           'x-amz-content-sha256': payloadHash,
         },
-        body: commitPayload,
+        data: commitPayload,
+        validateStatus: () => true,
       });
     } catch (fetchError: any) {
       logger.error(`提交上传fetch请求失败，目标URL: ${commitUrl}`);
       logger.error(`错误详情: ${fetchError.message}`);
       throw new Error(`提交上传网络请求失败 (${applyUrlHost}): ${fetchError.message}. 请检查网络连接`);
     }
 
-    if (!commitResponse.ok) {
-      const errorText = await commitResponse.text();
+    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 = await commitResponse.json();
+    const commitResult = commitResponse.data;
 
     if (commitResult?.ResponseMetadata?.Error) {
       throw new Error(`提交上传失败: ${JSON.stringify(commitResult.ResponseMetadata.Error)}`);
@@ -247,12 +254,14 @@ export async function uploadImageFromUrl(
   try {
     logger.info(`开始从URL下载并上传图片: ${imageUrl}`);
 
-    const imageResponse = await fetch(imageUrl);
-    if (!imageResponse.ok) {
+    const imageResponse = await axios.get(imageUrl, {
+      responseType: 'arraybuffer',
+    });
+    if (imageResponse.status < 200 || imageResponse.status >= 300) {
       throw new Error(`下载图片失败: ${imageResponse.status}`);
     }
 
-    const imageBuffer = await imageResponse.arrayBuffer();
+    const imageBuffer = imageResponse.data;
     return await uploadImageBuffer(imageBuffer, refreshToken, regionInfo);
   } catch (error: any) {
     logger.error(`从URL上传图片失败: ${error.message}`);