Upload 52 files

Dockerfile

@@ -49,17 +49,17 @@ RUN mkdir -p /app/logs /app/tmp && \
     chown -R jimeng:nodejs /app/logs /app/tmp
 
 # 设置环境变量
-ENV SERVER_PORT=7860
+ENV SERVER_PORT=5100
 
 # 切换到非root用户
 USER jimeng
 
 # 暴露端口
-EXPOSE 7860
+EXPOSE 5100
 
 # 健康检查
 HEALTHCHECK --interval=15s --timeout=5s --start-period=20s --retries=3 \
-    CMD wget -q --spider http://localhost:7860/ping
+    CMD wget -q --spider http://localhost:5100/ping
 
 # 启动应用
 CMD ["yarn", "start"]

src/api/consts/dreamina.ts

@@ -4,7 +4,7 @@ export const BASE_URL_DREAMINA_US = "https://dreamina-api.us.capcut.com";
 export const BASE_URL_IMAGEX_US = "https://imagex16-normal-us-ttp.capcutapi.us";
 
 export const BASE_URL_DREAMINA_HK = "https://mweb-api-sg.capcut.com";
-export const BASE_URL_IMAGEX_HK = "https://imagex16-normal-sg-ttp.capcutapi.sg";
+export const BASE_URL_IMAGEX_HK = "https://imagex-normal-sg.capcutapi.com";
 
 
 export const WEB_VERSION = "7.5.0";

src/api/controllers/core.ts

@@ -1,4 +1,3 @@
-import { PassThrough } from "stream";
 import path from "path";
 import _ from "lodash";
 import mime from "mime";
@@ -6,7 +5,6 @@ import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
 
 import APIException from "@/lib/exceptions/APIException.ts";
 import EX from "@/api/consts/exceptions.ts";
-import { createParser } from "eventsource-parser";
 import logger from "@/lib/logger.ts";
 import util from "@/lib/util.ts";
 import { JimengErrorHandler, JimengErrorResponse } from "@/lib/error-handler.ts";
@@ -73,14 +71,72 @@ export async function acquireToken(refreshToken: string): Promise<string> {
   return refreshToken;
 }
 
+/**
+ * 解析 token 中的地区信息
+ *
+ * @param refreshToken 刷新令牌
+ * @returns 地区信息对象
+ */
+export interface RegionInfo {
+  isUS: boolean;
+  isHK: boolean;
+  isJP: boolean;
+  isSG: boolean;
+  isInternational: boolean;
+  isCN: boolean;
+}
+
+export function parseRegionFromToken(refreshToken: string): RegionInfo {
+  const token = refreshToken.toLowerCase();
+  const isUS = token.startsWith('us-');
+  const isHK = token.startsWith('hk-');
+  const isJP = token.startsWith('jp-');
+  const isSG = token.startsWith('sg-');
+  const isInternational = isUS || isHK || isJP || isSG;
+
+  return {
+    isUS,
+    isHK,
+    isJP,
+    isSG,
+    isInternational,
+    isCN: !isInternational
+  };
+}
+
+/**
+ * 根据地区获取 Referer
+ *
+ * @param refreshToken 刷新令牌
+ * @param cnPath 国内站路径
+ * @returns Referer URL
+ */
+export function getRefererByRegion(refreshToken: string, cnPath: string): string {
+  const { isInternational } = parseRegionFromToken(refreshToken);
+  return isInternational
+    ? "https://dreamina.capcut.com/"
+    : `https://jimeng.jianying.com${cnPath}`;
+}
+
+/**
+ * 根据地区获取 AssistantID
+ *
+ * @param regionInfo 地区信息
+ * @returns AssistantID
+ */
+export function getAssistantId(regionInfo: RegionInfo): number {
+  if (regionInfo.isUS) return DEFAULT_ASSISTANT_ID_US;
+  if (regionInfo.isJP) return DEFAULT_ASSISTANT_ID_JP;
+  if (regionInfo.isSG) return DEFAULT_ASSISTANT_ID_SG;
+  if (regionInfo.isHK) return DEFAULT_ASSISTANT_ID_HK;
+  return DEFAULT_ASSISTANT_ID_CN;
+}
+
 /**
  * 生成cookie
  */
 export function generateCookie(refreshToken: string) {
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
+  const { isUS, isHK, isJP, isSG } = parseRegionFromToken(refreshToken);
   const token = (isUS || isHK || isJP || isSG) ? refreshToken.substring(3) : refreshToken;
 
   let storeRegion = 'cn-gd';
@@ -110,12 +166,14 @@ export function generateCookie(refreshToken: string) {
  * @param refreshToken 用于刷新access_token的refresh_token
  */
 export async function getCredit(refreshToken: string) {
+  const referer = getRefererByRegion(refreshToken, "/ai-tool/image/generate");
+
   const {
     credit: { gift_credit, purchase_credit, vip_credit }
   } = await request("POST", "/commerce/v1/benefits/user_credit", refreshToken, {
     data: {},
     headers: {
-      Referer: "https://jimeng.jianying.com/ai-tool/image/generate",
+      Referer: referer,
     },
     noDefaultParams: true
   });
@@ -135,12 +193,14 @@ export async function getCredit(refreshToken: string) {
  */
 export async function receiveCredit(refreshToken: string) {
   logger.info("正在收取今日积分...")
+  const referer = getRefererByRegion(refreshToken, "/ai-tool/home");
+
   const { cur_total_credits, receive_quota  } = await request("POST", "/commerce/v1/benefits/credit_receive", refreshToken, {
     data: {
       time_zone: "Asia/Shanghai"
     },
     headers: {
-      Referer: "https://jimeng.jianying.com/ai-tool/image/generate"
+      Referer: referer
     }
   });
   logger.info(`\n今日${receive_quota}积分收取成功\n剩余积分: ${cur_total_credits}`);
@@ -161,11 +221,9 @@ export async function request(
   refreshToken: string,
   options: AxiosRequestConfig & { noDefaultParams?: boolean } = {}
 ) {
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
-  const token = await acquireToken((isUS || isHK || isJP || isSG) ? refreshToken.substring(3) : refreshToken);
+  const regionInfo = parseRegionFromToken(refreshToken);
+  const { isUS, isHK, isJP, isSG } = regionInfo;
+  const token = await acquireToken(regionInfo.isInternational ? refreshToken.substring(3) : refreshToken);
   const deviceTime = util.unixTimestamp();
   const sign = util.md5(
     `9e2c|${uri.slice(-7)}|${PLATFORM_CODE}|${VERSION_CODE}|${deviceTime}||11ac`

src/api/controllers/images.ts

@@ -1,15 +1,15 @@
 import _ from "lodash";
-import crypto from "crypto";
 
 import APIException from "@/lib/exceptions/APIException.ts";
 import EX from "@/api/consts/exceptions.ts";
 import util from "@/lib/util.ts";
-import { getCredit, receiveCredit, request } from "./core.ts";
+import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, 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_IMAGE_MODEL, DRAFT_VERSION, DRAFT_MIN_VERSION, IMAGE_MODEL_MAP, IMAGE_MODEL_MAP_US, RESOLUTION_OPTIONS } from "@/api/consts/common.ts";
-import { BASE_URL_DREAMINA_US, BASE_URL_DREAMINA_HK, BASE_URL_IMAGEX_US, BASE_URL_IMAGEX_HK, WEB_VERSION as DREAMINA_WEB_VERSION, DA_VERSION as DREAMINA_DA_VERSION, AIGC_FEATURES as DREAMINA_AIGC_FEATURES } from "@/api/consts/dreamina.ts";
-import { createSignature } from "@/lib/aws-signature.ts";
+import { WEB_VERSION as DREAMINA_WEB_VERSION, DA_VERSION as DREAMINA_DA_VERSION, AIGC_FEATURES as DREAMINA_AIGC_FEATURES } from "@/api/consts/dreamina.ts";
+import { uploadImageFromUrl, uploadImageBuffer } from "@/lib/image-uploader.ts";
+import { extractImageUrls } from "@/lib/image-utils.ts";
 
 export const DEFAULT_MODEL = DEFAULT_IMAGE_MODEL;
 
@@ -42,198 +42,6 @@ export function getModel(model: string, isInternational: boolean) {
   return modelMap[model] || modelMap[DEFAULT_MODEL];
 }
 
-function calculateCRC32(buffer: ArrayBuffer): string {
-  const crcTable = [];
-  for (let i = 0; i < 256; i++) {
-    let crc = i;
-    for (let j = 0; j < 8; j++) {
-      crc = (crc & 1) ? (0xEDB88320 ^ (crc >>> 1)) : (crc >>> 1);
-    }
-    crcTable[i] = crc;
-  }
-
-  let crc = 0 ^ (-1);
-  const bytes = new Uint8Array(buffer);
-  for (let i = 0; i < bytes.length; i++) {
-    crc = (crc >>> 8) ^ crcTable[(crc ^ bytes[i]) & 0xFF];
-  }
-  return ((crc ^ (-1)) >>> 0).toString(16).padStart(8, '0');
-}
-
-async function uploadImageFromUrl(imageUrl: string, refreshToken: string, isInternational: boolean): Promise<string> {
-  try {
-    logger.info(`开始上传图片: ${imageUrl} (isInternational: ${isInternational})`);
-
-    const imageResponse = await fetch(imageUrl);
-    if (!imageResponse.ok) {
-      throw new Error(`下载图片失败: ${imageResponse.status}`);
-    }
-    const imageBuffer = await imageResponse.arrayBuffer();
-
-    return await uploadImageFromBuffer(Buffer.from(imageBuffer), refreshToken, isInternational);
-
-  } catch (error) {
-    logger.error(`图片上传失败: ${error.message}`);
-    throw error;
-  }
-}
-
-async function uploadImageFromBuffer(imageBuffer: Buffer, refreshToken: string, isInternational: boolean): Promise<string> {
-  try {
-    logger.info(`开始通过Buffer上传图片... (isInternational: ${isInternational})`);
-
-    const isUS = refreshToken.toLowerCase().startsWith('us-');
-    const isHK = refreshToken.toLowerCase().startsWith('hk-');
-    const isJP = refreshToken.toLowerCase().startsWith('jp-');
-    const isSG = refreshToken.toLowerCase().startsWith('sg-');
-
-    const tokenResult = await request("post", "/mweb/v1/get_upload_token", refreshToken, {
-      data: {
-        scene: 2,
-      },
-      params: isInternational ? {
-        aid: isUS ? DEFAULT_ASSISTANT_ID_US : (isJP ? DEFAULT_ASSISTANT_ID_JP : (isSG ? DEFAULT_ASSISTANT_ID_SG : DEFAULT_ASSISTANT_ID_HK)),
-        web_version: DREAMINA_WEB_VERSION,
-        da_version: DREAMINA_DA_VERSION,
-        aigc_features: DREAMINA_AIGC_FEATURES,
-      } : {
-        aid: DEFAULT_ASSISTANT_ID_CN.toString(),
-      },
-    });
-    const { access_key_id, secret_access_key, session_token } = tokenResult;
-    const service_id = isInternational ? tokenResult.space_name : tokenResult.service_id;
-
-    if (!access_key_id || !secret_access_key || !session_token) {
-      throw new Error("获取上传令牌失败");
-    }
-
-    const actualServiceId = service_id || (isUS ? "wopfjsm1ax" : (isHK || isJP || isSG) ? "wopfjsm1ax" : "tb4s082cfz");
-
-    logger.info(`获取上传令牌成功: service_id=${actualServiceId}`);
-
-    const fileSize = imageBuffer.byteLength;
-    const crc32 = calculateCRC32(imageBuffer);
-
-    logger.info(`图片Buffer: 大小=${fileSize}字节, CRC32=${crc32}`);
-
-    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 applyUrlHost = isUS ? BASE_URL_IMAGEX_US : (isHK || isJP || isSG) ? BASE_URL_IMAGEX_HK : 'https://imagex.bytedanceapi.com';
-    const applyUrl = `${applyUrlHost}/?Action=ApplyImageUpload&Version=2018-08-01&ServiceId=${actualServiceId}&FileSize=${fileSize}&s=${randomStr}${isInternational ? '&device_platform=web' : ''}`;
-
-    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);
-
-    const origin = isUS ? new URL(BASE_URL_DREAMINA_US).origin : (isHK || isJP || isSG) ? new URL(BASE_URL_DREAMINA_HK).origin : 'https://jimeng.jianying.com';
-
-    const applyResponse = await fetch(applyUrl, {
-      method: 'GET',
-      headers: {
-        'accept': '*/*',
-        'authorization': authorization,
-        'origin': origin,
-        'referer': `${origin}/ai-tool/generate`,
-        '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,
-      },
-    });
-
-    if (!applyResponse.ok) {
-      const errorText = await applyResponse.text();
-      throw new Error(`申请上传权限失败: ${applyResponse.status} - ${errorText}`);
-    }
-
-    const applyResult = await applyResponse.json();
-
-    if (applyResult?.ResponseMetadata?.Error) {
-      throw new Error(`申请上传权限失败: ${JSON.stringify(applyResult.ResponseMetadata.Error)}`);
-    }
-
-    const uploadAddress = applyResult?.Result?.UploadAddress;
-    if (!uploadAddress || !uploadAddress.StoreInfos || !uploadAddress.UploadHosts) {
-      throw new Error(`获取上传地址失败: ${JSON.stringify(applyResult)}`);
-    }
-
-    const storeInfo = uploadAddress.StoreInfos[0];
-    const uploadHost = uploadAddress.UploadHosts[0];
-    const auth = storeInfo.Auth;
-    const uploadUrl = `https://${uploadHost}/upload/v1/${storeInfo.StoreUri}`;
-
-    const uploadResponse = await fetch(uploadUrl, {
-      method: 'POST',
-      headers: {
-        'Authorization': auth,
-        'Content-CRC32': crc32,
-        'Content-Disposition': 'attachment; filename="undefined"',
-        'Content-Type': 'application/octet-stream',
-        '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,
-    });
-
-    if (!uploadResponse.ok) {
-      const errorText = await uploadResponse.text();
-      throw new Error(`图片上传失败: ${uploadResponse.status} - ${errorText}`);
-    }
-
-    const commitUrl = `${applyUrlHost}/?Action=CommitImageUpload&Version=2018-08-01&ServiceId=${actualServiceId}`;
-    const commitTimestamp = new Date().toISOString().replace(/[:\-]/g, '').replace(/\.\d{3}Z$/, 'Z');
-    const commitPayload = JSON.stringify({
-      SessionKey: uploadAddress.SessionKey
-    });
-    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);
-
-    const commitResponse = await fetch(commitUrl, {
-      method: 'POST',
-      headers: {
-        'authorization': commitAuthorization,
-        'content-type': 'application/json',
-        '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,
-      },
-      body: commitPayload,
-    });
-
-    if (!commitResponse.ok) {
-      const errorText = await commitResponse.text();
-      throw new Error(`提交上传失败: ${commitResponse.status} - ${errorText}`);
-    }
-
-    const commitResult = await commitResponse.json();
-    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 uploadResult = commitResult.Result.Results[0];
-    if (uploadResult.UriStatus !== 2000) {
-      throw new Error(`图片上传状态异常: UriStatus=${uploadResult.UriStatus}`);
-    }
-    const fullImageUri = uploadResult.Uri;
-    logger.info(`图片Buffer上传完成: ${fullImageUri}`);
-    return fullImageUri;
-  } catch (error) {
-    logger.error(`图片Buffer上传失败: ${error.message}`);
-    throw error;
-  }
-}
-
 export async function generateImageComposition(
   _model: string,
   prompt: string,
@@ -251,11 +59,8 @@ export async function generateImageComposition(
   },
   refreshToken: string
 ) {
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
-  const isInternational = isUS || isHK || isJP || isSG;
+  const regionInfo = parseRegionFromToken(refreshToken);
+  const { isInternational } = regionInfo;
   const model = getModel(_model, isInternational);
   
   let width, height, image_ratio, resolution_type;
@@ -292,10 +97,10 @@ export async function generateImageComposition(
       let imageId: string;
       if (typeof image === 'string') {
         logger.info(`正在处理第 ${i + 1}/${imageCount} 张图片 (URL)...`);
-        imageId = await uploadImageFromUrl(image, refreshToken, isInternational);
+        imageId = await uploadImageFromUrl(image, refreshToken, regionInfo);
       } else {
         logger.info(`正在处理第 ${i + 1}/${imageCount} 张图片 (Buffer)...`);
-        imageId = await uploadImageFromBuffer(image, refreshToken, isInternational);
+        imageId = await uploadImageBuffer(image, refreshToken, regionInfo);
       }
       uploadedImageIds.push(imageId);
       logger.info(`图片 ${i + 1}/${imageCount} 上传成功: ${imageId}`);
@@ -412,7 +217,7 @@ export async function generateImageComposition(
           ],
         }),
         http_common_info: {
-          aid: isInternational ? (isUS ? DEFAULT_ASSISTANT_ID_US : (isJP ? DEFAULT_ASSISTANT_ID_JP : (isSG ? DEFAULT_ASSISTANT_ID_SG : DEFAULT_ASSISTANT_ID_HK))) : DEFAULT_ASSISTANT_ID_CN
+          aid: getAssistantId(regionInfo)
         }
       },
     }
@@ -479,28 +284,7 @@ export async function generateImageComposition(
   }, historyId);
 
   const item_list = finalTaskInfo.item_list || [];
-
-  const resultImageUrls = item_list.map((item: any, index: number) => {
-    let imageUrl: string | null = null;
-
-    if (item?.image?.large_images?.[0]?.image_url) {
-      imageUrl = item.image.large_images[0].image_url;
-      logger.debug(`图片 ${index + 1}: 使用 large_images URL`);
-    } else if (item?.common_attr?.cover_url) {
-      imageUrl = item.common_attr.cover_url;
-      logger.debug(`图片 ${index + 1}: 使用 cover_url`);
-    } else if (item?.image_url) {
-      imageUrl = item.image_url;
-      logger.debug(`图片 ${index + 1}: 使用 image_url`);
-    } else if (item?.url) {
-      imageUrl = item.url;
-      logger.debug(`图片 ${index + 1}: 使用 url`);
-    } else {
-      logger.warn(`图片 ${index + 1}: 无法提取URL，item结构: ${JSON.stringify(item, null, 2)}`);
-    }
-
-    return imageUrl;
-  }).filter((url: string | null) => url !== null) as string[];
+  const resultImageUrls = extractImageUrls(item_list);
 
   logger.info(`图生图结果: 成功生成 ${resultImageUrls.length} 张图片，总耗时 ${pollingResult.elapsedTime} 秒，最终状态: ${pollingResult.status}`);
 
@@ -529,12 +313,8 @@ export async function generateImages(
   },
   refreshToken: string
 ) {
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
-  const isInternational = isUS || isHK || isJP || isSG;
-  const model = getModel(_model, isInternational);
+  const regionInfo = parseRegionFromToken(refreshToken);
+  const model = getModel(_model, regionInfo.isInternational);
   logger.info(`使用模型: ${_model} 映射模型: ${model} 分辨率: ${resolution} 比例: ${ratio} 精细度: ${sampleStrength}`);
 
   return await generateImagesInternal(_model, prompt, { ratio, resolution, sampleStrength, negativePrompt }, refreshToken);
@@ -556,12 +336,8 @@ async function generateImagesInternal(
   },
   refreshToken: string
 ) {
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
-  const isInternational = isUS || isHK || isJP || isSG;
-  const model = getModel(_model, isInternational);
+  const regionInfo = parseRegionFromToken(refreshToken);
+  const model = getModel(_model, regionInfo.isInternational);
   
   let width, height, image_ratio, resolution_type;
 
@@ -672,7 +448,7 @@ async function generateImagesInternal(
           ],
         }),
         http_common_info: {
-          aid: isInternational ? (isUS ? DEFAULT_ASSISTANT_ID_US : (isJP ? DEFAULT_ASSISTANT_ID_JP : (isSG ? DEFAULT_ASSISTANT_ID_SG : DEFAULT_ASSISTANT_ID_HK))) : DEFAULT_ASSISTANT_ID_CN
+          aid: getAssistantId(regionInfo)
         }
       },
     }
@@ -744,27 +520,7 @@ async function generateImagesInternal(
     .map((x: any) => String(x).trim())
     .filter(Boolean);
 
-  const imageUrls = item_list.map((item: any, index: number) => {
-    let imageUrl: string | null = null;
-
-    if (item?.image?.large_images?.[0]?.image_url) {
-      imageUrl = item.image.large_images[0].image_url;
-      logger.debug(`图片 ${index + 1}: 使用 large_images URL`);
-    } else if (item?.common_attr?.cover_url) {
-      imageUrl = item.common_attr.cover_url;
-      logger.debug(`图片 ${index + 1}: 使用 cover_url`);
-    } else if (item?.image_url) {
-      imageUrl = item.image_url;
-      logger.debug(`图片 ${index + 1}: 使用 image_url`);
-    } else if (item?.url) {
-      imageUrl = item.url;
-      logger.debug(`图片 ${index + 1}: 使用 url`);
-    } else {
-      logger.warn(`图片 ${index + 1}: 无法提取URL，item结构: ${JSON.stringify(item, null, 2)}`);
-    }
-
-    return imageUrl;
-  }).filter((url: string | null) => url !== null) as string[];
+  const imageUrls = extractImageUrls(item_list);
 
   logger.info(`图像生成完成: 成功生成 ${imageUrls.length} 张图片，总耗时 ${pollingResult.elapsedTime} 秒，最终状态: ${pollingResult.status}`);
 
@@ -791,12 +547,8 @@ async function generateJimeng40MultiImages(
   },
   refreshToken: string
 ) {
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
-  const isInternational = isUS || isHK || isJP || isSG;
-  const model = getModel(_model, isInternational);
+  const regionInfo = parseRegionFromToken(refreshToken);
+  const model = getModel(_model, regionInfo.isInternational);
   const { width, height, image_ratio, resolution_type } = getResolutionParams(resolution, ratio);
 
   const targetImageCount = prompt.match(/(\d+)张/) ? parseInt(prompt.match(/(\d+)张/)[1]) : 4;
@@ -879,7 +631,7 @@ async function generateJimeng40MultiImages(
           ],
         }),
         http_common_info: {
-          aid: isInternational ? (isUS ? DEFAULT_ASSISTANT_ID_US : (isJP ? DEFAULT_ASSISTANT_ID_JP : (isSG ? DEFAULT_ASSISTANT_ID_SG : DEFAULT_ASSISTANT_ID_HK))) : DEFAULT_ASSISTANT_ID_CN
+          aid: getAssistantId(regionInfo)
         }
       },
     }
@@ -891,18 +643,15 @@ async function generateJimeng40MultiImages(
 
   logger.info(`多图生成任务已提交，submit_id: ${submitId}, history_id: ${historyId}，等待生成 ${targetImageCount} 张图片...`);
 
-  let status = 20, failCode: string | undefined, item_list: any[] = [];
-  let pollCount = 0;
   const maxPollCount = 600;
 
-  while (pollCount < maxPollCount) {
-    await new Promise((resolve) => setTimeout(resolve, 1000));
-    pollCount++;
-
-    if (pollCount % 30 === 0) {
-      logger.info(`多图生成进度: 第 ${pollCount} 次轮询 (history_id: ${historyId})，当前状态: ${status}，已生成: ${item_list.length}/${targetImageCount} 张图片...`);
-    }
+  const poller = new SmartPoller({
+    maxPollCount,
+    expectedItemCount: targetImageCount,
+    type: 'image'
+  });
 
+  const { result: pollingResult, data: finalTaskInfo } = await poller.poll(async () => {
     const result = await request("post", "/mweb/v1/get_history_by_ids", refreshToken, {
       data: {
         history_ids: [historyId],
@@ -928,44 +677,28 @@ async function generateJimeng40MultiImages(
     if (!result[historyId])
       throw new APIException(EX.API_IMAGE_GENERATION_FAILED, "记录不存在");
 
-    status = result[historyId].status;
-    failCode = result[historyId].fail_code;
-    item_list = result[historyId].item_list || [];
-
-    if (item_list.length >= targetImageCount) {
-      logger.info(`多图生成完成: 状态=${status}, 已生成 ${item_list.length} 张图片`);
-      break;
-    }
-
-    if (pollCount % 60 === 0) {
-      logger.info(`详细状态: status=${status}, item_list.length=${item_list.length}, failCode=${failCode || 'none'}`);
-    }
-
-    if (status === 10 && item_list.length < targetImageCount && pollCount % 30 === 0) {
-      logger.info(`状态已完成但图片数量不足: 状态=${status}, 已生成 ${item_list.length}/${targetImageCount} 张图片，继续等待...`);
-    }
-  }
-
-  if (pollCount >= maxPollCount) {
-    logger.warn(`多图生成超时: 轮询了 ${pollCount} 次，当前状态: ${status}，已生成图片数: ${item_list.length}`);
-  }
+    const taskInfo = result[historyId];
+    const currentStatus = taskInfo.status;
+    const currentFailCode = taskInfo.fail_code;
+    const currentItemList = taskInfo.item_list || [];
+    const finishTime = taskInfo.task?.finish_time || 0;
 
-  if (status === 30) {
-    if (failCode === '2038')
-      throw new APIException(EX.API_CONTENT_FILTERED);
-    else if (failCode === '1001' || failCode === 1001)
-      throw new APIException(EX.API_IMAGE_GENERATION_FAILED, `生成失败，错误代码: ${failCode}。可能原因：文本或图片中包含敏感内容`);
-    else
-      throw new APIException(EX.API_IMAGE_GENERATION_FAILED, `生成失败，错误代码: ${failCode}`);
-  }
+    return {
+      status: {
+        status: currentStatus,
+        failCode: currentFailCode,
+        itemCount: currentItemList.length,
+        finishTime,
+        historyId
+      } as PollingStatus,
+      data: taskInfo
+    };
+  }, historyId);
 
-  const imageUrls = item_list.map((item) => {
-    if(!item?.image?.large_images?.[0]?.image_url)
-      return item?.common_attr?.cover_url || null;
-    return item.image.large_images[0].image_url;
-  }).filter(url => url !== null);
+  const item_list = finalTaskInfo.item_list || [];
+  const imageUrls = extractImageUrls(item_list);
 
-  logger.info(`多图生成结果: 成功生成 ${imageUrls.length} 张图片`);
+  logger.info(`多图生成结果: 成功生成 ${imageUrls.length} 张图片，总耗时 ${pollingResult.elapsedTime} 秒，最终状态: ${pollingResult.status}`);
   return imageUrls;
 }
 

src/api/controllers/videos.ts

@@ -1,15 +1,15 @@
 import _ from "lodash";
-import crypto from "crypto";
 import fs from "fs-extra";
 
 import APIException from "@/lib/exceptions/APIException.ts";
 import EX from "@/api/consts/exceptions.ts";
 import util from "@/lib/util.ts";
-import { getCredit, receiveCredit, request } from "./core.ts";
+import { getCredit, receiveCredit, request, parseRegionFromToken, getAssistantId, 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 } from "@/api/consts/common.ts";
-import { BASE_URL_DREAMINA_US, BASE_URL_DREAMINA_HK, BASE_URL_IMAGEX_US, BASE_URL_IMAGEX_HK } from "@/api/consts/dreamina.ts";
+import { uploadImageBuffer } from "@/lib/image-uploader.ts";
+import { extractVideoUrl } from "@/lib/image-utils.ts";
 
 export const DEFAULT_MODEL = DEFAULT_VIDEO_MODEL;
 
@@ -17,322 +17,20 @@ export function getModel(model: string) {
   return VIDEO_MODEL_MAP[model] || VIDEO_MODEL_MAP[DEFAULT_MODEL];
 }
 
-// AWS4-HMAC-SHA256 签名生成函数（从 images.ts 复制）
-function createSignature(
-  method: string,
-  url: string,
-  headers: { [key: string]: string },
-  accessKeyId: string,
-  secretAccessKey: string,
-  sessionToken?: string,
-  payload: string = '',
-  region: string = 'cn-north-1'
-) {
-  const urlObj = new URL(url);
-  const pathname = urlObj.pathname || '/';
-  const search = urlObj.search;
-
-  // 创建规范请求
-  const timestamp = headers['x-amz-date'];
-  const date = timestamp.substr(0, 8);
-  const service = 'imagex';
-  
-  // 规范化查询参数
-  const queryParams: Array<[string, string]> = [];
-  const searchParams = new URLSearchParams(search);
-  searchParams.forEach((value, key) => {
-    queryParams.push([key, value]);
-  });
-  
-  // 按键名排序
-  queryParams.sort(([a], [b]) => {
-    if (a < b) return -1;
-    if (a > b) return 1;
-    return 0;
-  });
-  
-  const canonicalQueryString = queryParams
-    .map(([key, value]) => `${key}=${value}`)
-    .join('&');
-  
-  // 规范化头部
-  const headersToSign: { [key: string]: string } = {
-    'x-amz-date': timestamp
-  };
-  
-  if (sessionToken) {
-    headersToSign['x-amz-security-token'] = sessionToken;
-  }
-  
-  let payloadHash = crypto.createHash('sha256').update('').digest('hex');
-  if (method.toUpperCase() === 'POST' && payload) {
-    payloadHash = crypto.createHash('sha256').update(payload, 'utf8').digest('hex');
-    headersToSign['x-amz-content-sha256'] = payloadHash;
-  }
-  
-  const signedHeaders = Object.keys(headersToSign)
-    .map(key => key.toLowerCase())
-    .sort()
-    .join(';');
-  
-  const canonicalHeaders = Object.keys(headersToSign)
-    .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
-    .map(key => `${key.toLowerCase()}:${headersToSign[key].trim()}\n`)
-    .join('');
-  
-  const canonicalRequest = [
-    method.toUpperCase(),
-    pathname,
-    canonicalQueryString,
-    canonicalHeaders,
-    signedHeaders,
-    payloadHash
-  ].join('\n');
-  
-  // 创建待签名字符串
-  const credentialScope = `${date}/${region}/${service}/aws4_request`;
-  const stringToSign = [
-    'AWS4-HMAC-SHA256',
-    timestamp,
-    credentialScope,
-    crypto.createHash('sha256').update(canonicalRequest, 'utf8').digest('hex')
-  ].join('\n');
-  
-  // 生成签名
-  const kDate = crypto.createHmac('sha256', `AWS4${secretAccessKey}`).update(date).digest();
-  const kRegion = crypto.createHmac('sha256', kDate).update(region).digest();
-  const kService = crypto.createHmac('sha256', kRegion).update(service).digest();
-  const kSigning = crypto.createHmac('sha256', kService).update('aws4_request').digest();
-  const signature = crypto.createHmac('sha256', kSigning).update(stringToSign, 'utf8').digest('hex');
-  
-  return `AWS4-HMAC-SHA256 Credential=${accessKeyId}/${credentialScope}, SignedHeaders=${signedHeaders}, Signature=${signature}`;
-}
-
-// 计算文件的CRC32值（从 images.ts 复制）
-function calculateCRC32(buffer: ArrayBuffer): string {
-  const crcTable = [];
-  for (let i = 0; i < 256; i++) {
-    let crc = i;
-    for (let j = 0; j < 8; j++) {
-      crc = (crc & 1) ? (0xEDB88320 ^ (crc >>> 1)) : (crc >>> 1);
-    }
-    crcTable[i] = crc;
-  }
-  
-  let crc = 0 ^ (-1);
-  const bytes = new Uint8Array(buffer);
-  for (let i = 0; i < bytes.length; i++) {
-    crc = (crc >>> 8) ^ crcTable[(crc ^ bytes[i]) & 0xFF];
+// 处理本地上传的文件
+async function uploadImageFromFile(file: any, refreshToken: string, regionInfo: RegionInfo): Promise<string> {
+  try {
+    logger.info(`开始从本地文件上传视频图片: ${file.originalFilename} (路径: ${file.filepath})`);
+    const imageBuffer = await fs.readFile(file.filepath);
+    return await uploadImageBuffer(imageBuffer, refreshToken, regionInfo);
+  } catch (error: any) {
+    logger.error(`从本地文件上传视频图片失败: ${error.message}`);
+    throw error;
   }
-  return ((crc ^ (-1)) >>> 0).toString(16).padStart(8, '0');
-}
-
-// 核心上传逻辑：上传二进制buffer到ImageX
-async function _uploadImageBuffer(imageBuffer: ArrayBuffer, refreshToken: string): Promise<string> {
-    // 检测区域
-    const isUS = refreshToken.toLowerCase().startsWith('us-');
-    const isHK = refreshToken.toLowerCase().startsWith('hk-');
-    const isJP = refreshToken.toLowerCase().startsWith('jp-');
-    const isSG = refreshToken.toLowerCase().startsWith('sg-');
-    const isInternational = isUS || isHK || isJP || isSG;
-
-    logger.info(`开始上传视频图片... (isInternational: ${isInternational}, isUS: ${isUS}, isHK: ${isHK}, isJP: ${isJP}, isSG: ${isSG})`);
-
-    // 第一步：获取上传令牌
-    const tokenResult = await request("post", "/mweb/v1/get_upload_token", refreshToken, {
-      data: {
-        scene: 2, // AIGC 图片上传场景
-      },
-    });
-
-    const { access_key_id, secret_access_key, session_token, service_id } = tokenResult;
-    if (!access_key_id || !secret_access_key || !session_token) {
-      throw new Error("获取上传令牌失败");
-    }
-
-    const actualServiceId = service_id || (isUS ? "wopfjsm1ax" : (isHK || isJP || isSG) ? "wopfjsm1ax" : "tb4s082cfz");
-    logger.info(`获取上传令牌成功: service_id=${actualServiceId}`);
-    
-    const fileSize = imageBuffer.byteLength;
-    const crc32 = calculateCRC32(imageBuffer);
-    
-    logger.info(`图片Buffer准备完成: 大小=${fileSize}字节, CRC32=${crc32}`);
-
-    // 第二步：申请图片上传权限
-    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 applyUrlHost = isUS ? BASE_URL_IMAGEX_US : (isHK || isJP || isSG) ? BASE_URL_IMAGEX_HK : 'https://imagex.bytedanceapi.com';
-    const applyUrl = `${applyUrlHost}/?Action=ApplyImageUpload&Version=2018-08-01&ServiceId=${actualServiceId}&FileSize=${fileSize}&s=${randomStr}${isInternational ? '&device_platform=web' : ''}`;
-
-    const region = isUS ? 'us-east-1' : (isHK || isJP || isSG) ? 'ap-southeast-1' : 'cn-north-1';
-
-    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, '', region);
-
-    const origin = isUS ? new URL(BASE_URL_DREAMINA_US).origin : (isHK || isJP || isSG) ? new URL(BASE_URL_DREAMINA_HK).origin : 'https://jimeng.jianying.com';
-
-    logger.info(`申请上传权限: ${applyUrl}`);
-    
-    const applyResponse = await fetch(applyUrl, {
-      method: 'GET',
-      headers: {
-        'accept': '*/*',
-        'accept-language': 'zh-CN,zh;q=0.9',
-        'authorization': authorization,
-        'origin': origin,
-        'referer': `${origin}/ai-tool/video/generate`,
-        '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,
-      },
-    });
-    
-    if (!applyResponse.ok) {
-      const errorText = await applyResponse.text();
-      throw new Error(`申请上传权限失败: ${applyResponse.status} - ${errorText}`);
-    }
-    
-    const applyResult = await applyResponse.json();
-    
-    if (applyResult?.ResponseMetadata?.Error) {
-      throw new Error(`申请上传权限失败: ${JSON.stringify(applyResult.ResponseMetadata.Error)}`);
-    }
-    
-    logger.info(`申请上传权限成功`);
-    
-    // 解析上传信息
-    const uploadAddress = applyResult?.Result?.UploadAddress;
-    if (!uploadAddress || !uploadAddress.StoreInfos || !uploadAddress.UploadHosts) {
-      throw new Error(`获取上传地址失败: ${JSON.stringify(applyResult)}`);
-    }
-    
-    const storeInfo = uploadAddress.StoreInfos[0];
-    const uploadHost = uploadAddress.UploadHosts[0];
-    const auth = storeInfo.Auth;
-    
-    const uploadUrl = `https://${uploadHost}/upload/v1/${storeInfo.StoreUri}`;
-    const imageId = storeInfo.StoreUri.split('/').pop();
-    
-    logger.info(`准备上传图片: imageId=${imageId}, uploadUrl=${uploadUrl}`);
-    
-    // 第三步：上传图片文件
-    const uploadResponse = await fetch(uploadUrl, {
-      method: 'POST',
-      headers: {
-        'Accept': '*/*',
-        'Accept-Language': 'zh-CN,zh;q=0.9',
-        'Authorization': auth,
-        'Connection': 'keep-alive',
-        'Content-CRC32': crc32,
-        'Content-Disposition': 'attachment; filename="undefined"',
-        'Content-Type': 'application/octet-stream',
-        'Origin': 'https://jimeng.jianying.com',
-        'Referer': 'https://jimeng.jianying.com/ai-tool/video/generate',
-        '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-Storage-U': '704135154117550',
-      },
-      body: imageBuffer,
-    });
-    
-    if (!uploadResponse.ok) {
-      const errorText = await uploadResponse.text();
-      throw new Error(`图片上传失败: ${uploadResponse.status} - ${errorText}`);
-    }
-    
-    logger.info(`图片文件上传成功`);
-
-    // 第四步：提交上传
-    const commitUrl = `${applyUrlHost}/?Action=CommitImageUpload&Version=2018-08-01&ServiceId=${actualServiceId}`;
-
-    const commitTimestamp = new Date().toISOString().replace(/[:\-]/g, '').replace(/\.\d{3}Z$/, 'Z');
-    const commitPayload = JSON.stringify({
-      SessionKey: uploadAddress.SessionKey,
-      SuccessActionStatus: "200"
-    });
-
-    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, region);
-
-    const commitResponse = await fetch(commitUrl, {
-      method: 'POST',
-      headers: {
-        'accept': '*/*',
-        'accept-language': 'zh-CN,zh;q=0.9',
-        'authorization': commitAuthorization,
-        'content-type': 'application/json',
-        'origin': origin,
-        'referer': `${origin}/ai-tool/video/generate`,
-        '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,
-      },
-      body: commitPayload,
-    });
-    
-    if (!commitResponse.ok) {
-      const errorText = await commitResponse.text();
-      throw new Error(`提交上传失败: ${commitResponse.status} - ${errorText}`);
-    }
-    
-    const commitResult = await commitResponse.json();
-    
-    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 uploadResult = commitResult.Result.Results[0];
-    if (uploadResult.UriStatus !== 2000) {
-      throw new Error(`图片上传状态异常: UriStatus=${uploadResult.UriStatus}`);
-    }
-    
-    const fullImageUri = uploadResult.Uri;
-    
-    // 验证图片信息
-    const pluginResult = commitResult.Result?.PluginResult?.[0];
-    if (pluginResult && pluginResult.ImageUri) {
-      logger.info(`视频图片上传完成: ${pluginResult.ImageUri}`);
-      return pluginResult.ImageUri;
-    }
-    
-    logger.info(`视频图片上传完成: ${fullImageUri}`);
-    return fullImageUri;
 }
 
 // 处理来自URL的图片
-async function uploadImageFromUrl(imageUrl: string, refreshToken: string): Promise<string> {
+async function uploadImageFromUrl(imageUrl: string, refreshToken: string, regionInfo: RegionInfo): Promise<string> {
   try {
     logger.info(`开始从URL下载并上传视频图片: ${imageUrl}`);
     const imageResponse = await fetch(imageUrl);
@@ -340,25 +38,13 @@ async function uploadImageFromUrl(imageUrl: string, refreshToken: string): Promi
       throw new Error(`下载图片失败: ${imageResponse.status}`);
     }
     const imageBuffer = await imageResponse.arrayBuffer();
-    return await _uploadImageBuffer(imageBuffer, refreshToken);
-  } catch (error) {
+    return await uploadImageBuffer(imageBuffer, refreshToken, regionInfo);
+  } catch (error: any) {
     logger.error(`从URL上传视频图片失败: ${error.message}`);
     throw error;
   }
 }
 
-// 处理本地上传的文件
-async function uploadImageFromFile(file: any, refreshToken: string): Promise<string> {
-  try {
-    logger.info(`开始从本地文件上传视频图片: ${file.originalFilename} (路径: ${file.filepath})`);
-    const imageBuffer = await fs.readFile(file.filepath);
-    return await _uploadImageBuffer(imageBuffer, refreshToken);
-  } catch (error) {
-    logger.error(`从本地文件上传视频图片失败: ${error.message}`);
-    throw error;
-  }
-}
-
 
 /**
  * 生成视频
@@ -388,13 +74,10 @@ export async function generateVideo(
   refreshToken: string
 ) {
   // 检测区域
-  const isUS = refreshToken.toLowerCase().startsWith('us-');
-  const isHK = refreshToken.toLowerCase().startsWith('hk-');
-  const isJP = refreshToken.toLowerCase().startsWith('jp-');
-  const isSG = refreshToken.toLowerCase().startsWith('sg-');
-  const isInternational = isUS || isHK || isJP || isSG;
+  const regionInfo = parseRegionFromToken(refreshToken);
+  const { isInternational } = regionInfo;
 
-  logger.info(`视频生成区域检测: isUS=${isUS}, isHK=${isHK}, isJP=${isJP}, isSG=${isSG}, isInternational=${isInternational}`);
+  logger.info(`视频生成区域检测: isInternational=${isInternational}`);
 
   const model = getModel(_model);
 
@@ -422,14 +105,14 @@ export async function generateVideo(
       if (!file) continue;
       try {
         logger.info(`开始上传第 ${i + 1} 张本地图片: ${file.originalFilename}`);
-        const imageUri = await uploadImageFromFile(file, refreshToken);
+        const imageUri = await uploadImageFromFile(file, refreshToken, regionInfo);
         if (imageUri) {
           uploadIDs.push(imageUri);
           logger.info(`第 ${i + 1} 张本地图片上传成功: ${imageUri}`);
         } else {
           logger.error(`第 ${i + 1} 张本地图片上传失败: 未获取到 image_uri`);
         }
-      } catch (error) {
+      } catch (error: any) {
         logger.error(`第 ${i + 1} 张本地图片上传失败: ${error.message}`);
         if (i === 0) {
           throw new APIException(EX.API_REQUEST_FAILED, `首帧图片上传失败: ${error.message}`);
@@ -448,14 +131,14 @@ export async function generateVideo(
       }
       try {
         logger.info(`开始上传第 ${i + 1} 个URL图片: ${filePath}`);
-        const imageUri = await uploadImageFromUrl(filePath, refreshToken);
+        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`);
         }
-      } catch (error) {
+      } catch (error: any) {
         logger.error(`第 ${i + 1} 个URL图片上传失败: ${error.message}`);
         if (i === 0) {
           throw new APIException(EX.API_REQUEST_FAILED, `首帧图片上传失败: ${error.message}`);
@@ -614,9 +297,7 @@ export async function generateVideo(
           }],
         }),
         http_common_info: {
-          aid: isInternational
-            ? (isUS ? DEFAULT_ASSISTANT_ID_US : (isJP ? DEFAULT_ASSISTANT_ID_JP : (isSG ? DEFAULT_ASSISTANT_ID_SG : DEFAULT_ASSISTANT_ID_HK)))
-            : DEFAULT_ASSISTANT_ID_CN
+          aid: getAssistantId(regionInfo)
         },
       },
     }
@@ -719,25 +400,12 @@ export async function generateVideo(
   const item_list = finalHistoryData.item_list || [];
 
   // 提取视频URL
-  let videoUrl = item_list?.[0]?.video?.transcoded_video?.origin?.video_url;
+  let videoUrl = item_list?.[0] ? extractVideoUrl(item_list[0]) : null;
 
-  // 如果通过常规路径无法获取视频URL，尝试其他可能的路径
+  // 如果无法获取视频URL，抛出异常
   if (!videoUrl) {
-    if (item_list?.[0]?.video?.play_url) {
-      videoUrl = item_list[0].video.play_url;
-      logger.info(`从play_url获取到视频URL: ${videoUrl}`);
-    } else if (item_list?.[0]?.video?.download_url) {
-      videoUrl = item_list[0].video.download_url;
-      logger.info(`从download_url获取到视频URL: ${videoUrl}`);
-    } else if (item_list?.[0]?.video?.url) {
-      videoUrl = item_list[0].video.url;
-      logger.info(`从url获取到视频URL: ${videoUrl}`);
-    } else {
-      logger.error(`未能获取视频URL，item_list: ${JSON.stringify(item_list)}`);
-      const error = new APIException(EX.API_IMAGE_GENERATION_FAILED, "未能获取视频URL，请稍后查看");
-      error.historyId = historyId;
-      throw error;
-    }
+    logger.error(`未能获取视频URL，item_list: ${JSON.stringify(item_list)}`);
+    throw new APIException(EX.API_IMAGE_GENERATION_FAILED, "未能获取视频URL，请稍后查看");
   }
 
   logger.info(`视频生成成功，URL: ${videoUrl}，总耗时: ${pollingResult.elapsedTime}秒`);

src/lib/aws-signature.ts

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

src/lib/image-uploader.ts

@@ -0,0 +1,261 @@
+import crypto from "crypto";
+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";
+
+/**
+ * 统一的图片上传模块
+ * 整合了images.ts和videos.ts中重复的上传逻辑
+ */
+
+/**
+ * 上传图片Buffer到ImageX
+ * @param imageBuffer 图片数据
+ * @param refreshToken 刷新令牌
+ * @param regionInfo 区域信息
+ * @returns 图片URI
+ */
+export async function uploadImageBuffer(
+  imageBuffer: ArrayBuffer | Buffer,
+  refreshToken: string,
+  regionInfo: RegionInfo
+): Promise<string> {
+  try {
+    logger.info(`开始上传图片Buffer... (isInternational: ${regionInfo.isInternational})`);
+
+    // 第一步：获取上传令牌
+    const tokenResult = await request("post", "/mweb/v1/get_upload_token", refreshToken, {
+      data: {
+        scene: 2, // AIGC 图片上传场景
+      },
+    });
+
+    const { access_key_id, secret_access_key, session_token } = tokenResult;
+    const service_id = regionInfo.isInternational ? tokenResult.space_name : tokenResult.service_id;
+
+    if (!access_key_id || !secret_access_key || !session_token) {
+      throw new Error("获取上传令牌失败");
+    }
+
+    const actualServiceId = RegionUtils.getServiceId(regionInfo, service_id);
+    logger.info(`获取上传令牌成功: service_id=${actualServiceId}`);
+
+    // 准备文件信息
+    const fileSize = imageBuffer.byteLength;
+    const crc32 = util.calculateCRC32(imageBuffer);
+    logger.info(`图片Buffer: 大小=${fileSize}字节, CRC32=${crc32}`);
+
+    // 第二步：申请图片上传权限
+    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 applyUrlHost = RegionUtils.getImageXUrl(regionInfo);
+    const applyUrl = `${applyUrlHost}/?Action=ApplyImageUpload&Version=2018-08-01&ServiceId=${actualServiceId}&FileSize=${fileSize}&s=${randomStr}${regionInfo.isInternational ? '&device_platform=web' : ''}`;
+
+    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);
+
+    logger.info(`申请上传权限: ${applyUrl}`);
+
+    let applyResponse;
+    try {
+      applyResponse = await fetch(applyUrl, {
+        method: 'GET',
+        headers: {
+          'accept': '*/*',
+          'accept-language': 'zh-CN,zh;q=0.9',
+          'authorization': authorization,
+          'origin': origin,
+          'referer': `${origin}/ai-tool/generate`,
+          '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,
+        },
+      });
+    } 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();
+      throw new Error(`申请上传权限失败: ${applyResponse.status} - ${errorText}`);
+    }
+
+    const applyResult = await applyResponse.json();
+
+    if (applyResult?.ResponseMetadata?.Error) {
+      throw new Error(`申请上传权限失败: ${JSON.stringify(applyResult.ResponseMetadata.Error)}`);
+    }
+
+    logger.info(`申请上传权限成功`);
+
+    // 解析上传信息
+    const uploadAddress = applyResult?.Result?.UploadAddress;
+    if (!uploadAddress || !uploadAddress.StoreInfos || !uploadAddress.UploadHosts) {
+      throw new Error(`获取上传地址失败: ${JSON.stringify(applyResult)}`);
+    }
+
+    const storeInfo = uploadAddress.StoreInfos[0];
+    const uploadHost = uploadAddress.UploadHosts[0];
+    const auth = storeInfo.Auth;
+    const uploadUrl = `https://${uploadHost}/upload/v1/${storeInfo.StoreUri}`;
+
+    logger.info(`准备上传图片: uploadUrl=${uploadUrl}`);
+
+    // 第三步：上传图片文件
+    let uploadResponse;
+    try {
+      uploadResponse = await fetch(uploadUrl, {
+        method: 'POST',
+        headers: {
+          'Accept': '*/*',
+          'Accept-Language': 'zh-CN,zh;q=0.9',
+          'Authorization': auth,
+          'Connection': 'keep-alive',
+          'Content-CRC32': crc32,
+          'Content-Disposition': 'attachment; filename="undefined"',
+          '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',
+        },
+        body: imageBuffer,
+      });
+    } 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();
+      throw new Error(`图片上传失败: ${uploadResponse.status} - ${errorText}`);
+    }
+
+    logger.info(`图片文件上传成功`);
+
+    // 第四步：提交上传
+    const commitUrl = `${applyUrlHost}/?Action=CommitImageUpload&Version=2018-08-01&ServiceId=${actualServiceId}`;
+    const commitTimestamp = new Date().toISOString().replace(/[:\-]/g, '').replace(/\.\d{3}Z$/, 'Z');
+    const commitPayload = JSON.stringify({
+      SessionKey: uploadAddress.SessionKey
+    });
+
+    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);
+
+    let commitResponse;
+    try {
+      commitResponse = await fetch(commitUrl, {
+        method: 'POST',
+        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,
+        },
+        body: commitPayload,
+      });
+    } 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();
+      throw new Error(`提交上传失败: ${commitResponse.status} - ${errorText}`);
+    }
+
+    const commitResult = await commitResponse.json();
+
+    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 uploadResult = commitResult.Result.Results[0];
+    if (uploadResult.UriStatus !== 2000) {
+      throw new Error(`图片上传状态异常: UriStatus=${uploadResult.UriStatus}`);
+    }
+
+    const fullImageUri = uploadResult.Uri;
+    logger.info(`图片上传完成: ${fullImageUri}`);
+
+    return fullImageUri;
+  } catch (error: any) {
+    logger.error(`图片Buffer上传失败: ${error.message}`);
+    throw error;
+  }
+}
+
+/**
+ * 从URL下载并上传图片
+ * @param imageUrl 图片URL
+ * @param refreshToken 刷新令牌
+ * @param regionInfo 区域信息
+ * @returns 图片URI
+ */
+export async function uploadImageFromUrl(
+  imageUrl: string,
+  refreshToken: string,
+  regionInfo: RegionInfo
+): Promise<string> {
+  try {
+    logger.info(`开始从URL下载并上传图片: ${imageUrl}`);
+
+    const imageResponse = await fetch(imageUrl);
+    if (!imageResponse.ok) {
+      throw new Error(`下载图片失败: ${imageResponse.status}`);
+    }
+
+    const imageBuffer = await imageResponse.arrayBuffer();
+    return await uploadImageBuffer(imageBuffer, refreshToken, regionInfo);
+  } catch (error: any) {
+    logger.error(`从URL上传图片失败: ${error.message}`);
+    throw error;
+  }
+}

src/lib/image-utils.ts

@@ -0,0 +1,82 @@
+import logger from "@/lib/logger.ts";
+
+/**
+ * 图片URL提取工具
+ * 统一从不同格式的响应中提取图片URL
+ */
+
+/**
+ * 从API响应项中提取图片URL
+ * @param item API响应中的单个项目
+ * @param index 项目索引（用于日志）
+ * @returns 图片URL或null
+ */
+export function extractImageUrl(item: any, index?: number): string | null {
+  const logPrefix = index !== undefined ? `图片 ${index + 1}` : '图片';
+
+  let imageUrl: string | null = null;
+
+  // 优先尝试 large_images
+  if (item?.image?.large_images?.[0]?.image_url) {
+    imageUrl = item.image.large_images[0].image_url;
+    logger.debug(`${logPrefix}: 使用 large_images URL`);
+  }
+  // 其次尝试 cover_url
+  else if (item?.common_attr?.cover_url) {
+    imageUrl = item.common_attr.cover_url;
+    logger.debug(`${logPrefix}: 使用 cover_url`);
+  }
+  // 再尝试 image_url
+  else if (item?.image_url) {
+    imageUrl = item.image_url;
+    logger.debug(`${logPrefix}: 使用 image_url`);
+  }
+  // 最后尝试 url
+  else if (item?.url) {
+    imageUrl = item.url;
+    logger.debug(`${logPrefix}: 使用 url`);
+  }
+  // 无法提取URL
+  else {
+    logger.warn(`${logPrefix}: 无法提取URL，item结构: ${JSON.stringify(item, null, 2)}`);
+  }
+
+  return imageUrl;
+}
+
+/**
+ * 从项目列表中批量提取图片URLs
+ * @param itemList 项目列表
+ * @returns 图片URL数组
+ */
+export function extractImageUrls(itemList: any[]): string[] {
+  return itemList
+    .map((item, index) => extractImageUrl(item, index))
+    .filter((url): url is string => url !== null);
+}
+
+/**
+ * 从视频响应项中提取视频URL
+ * @param item 视频响应项
+ * @returns 视频URL或null
+ */
+export function extractVideoUrl(item: any): string | null {
+  // 优先尝试 transcoded_video.origin.video_url
+  if (item?.video?.transcoded_video?.origin?.video_url) {
+    return item.video.transcoded_video.origin.video_url;
+  }
+  // 尝试 play_url
+  if (item?.video?.play_url) {
+    return item.video.play_url;
+  }
+  // 尝试 download_url
+  if (item?.video?.download_url) {
+    return item.video.download_url;
+  }
+  // 尝试 url
+  if (item?.video?.url) {
+    return item.video.url;
+  }
+
+  return null;
+}

src/lib/region-utils.ts

@@ -0,0 +1,78 @@
+import { RegionInfo } from "@/api/controllers/core.ts";
+import { BASE_URL_DREAMINA_US, BASE_URL_DREAMINA_HK, BASE_URL_IMAGEX_US, BASE_URL_IMAGEX_HK } from "@/api/consts/dreamina.ts";
+
+/**
+ * 区域配置工具类
+ * 统一管理不同区域的配置信息
+ */
+export class RegionUtils {
+  /**
+   * 获取ServiceId
+   */
+  static getServiceId(regionInfo: RegionInfo, providedServiceId?: string): string {
+    if (providedServiceId) {
+      return providedServiceId;
+    }
+
+    // US/HK/JP/SG 使用相同的 service_id
+    if (regionInfo.isUS || regionInfo.isHK || regionInfo.isJP || regionInfo.isSG) {
+      return "wopfjsm1ax";
+    }
+
+    // CN 使用默认的 service_id
+    return "tb4s082cfz";
+  }
+
+  /**
+   * 获取ImageX URL
+   */
+  static getImageXUrl(regionInfo: RegionInfo): string {
+    if (regionInfo.isUS) {
+      return BASE_URL_IMAGEX_US;
+    }
+
+    if (regionInfo.isHK || regionInfo.isJP || regionInfo.isSG) {
+      return BASE_URL_IMAGEX_HK;
+    }
+
+    return 'https://imagex.bytedanceapi.com';
+  }
+
+  /**
+   * 获取Origin
+   */
+  static getOrigin(regionInfo: RegionInfo): string {
+    if (regionInfo.isUS) {
+      return new URL(BASE_URL_DREAMINA_US).origin;
+    }
+
+    if (regionInfo.isHK || regionInfo.isJP || regionInfo.isSG) {
+      return new URL(BASE_URL_DREAMINA_HK).origin;
+    }
+
+    return 'https://jimeng.jianying.com';
+  }
+
+  /**
+   * 获取AWS区域
+   */
+  static getAWSRegion(regionInfo: RegionInfo): string {
+    if (regionInfo.isUS) {
+      return 'us-east-1';
+    }
+
+    if (regionInfo.isHK || regionInfo.isJP || regionInfo.isSG) {
+      return 'ap-southeast-1';
+    }
+
+    return 'cn-north-1';
+  }
+
+  /**
+   * 获取Referer路径
+   */
+  static getRefererPath(regionInfo: RegionInfo, path: string = '/ai-tool/generate'): string {
+    const origin = this.getOrigin(regionInfo);
+    return `${origin}${path}`;
+  }
+}

src/lib/smart-poller.ts

@@ -122,8 +122,8 @@ export class SmartPoller {
       return { shouldExit: true, reason: '任务失败' };
     }
     
-    // 3. 已获得期望数量的结果
-    if (itemCount >= this.options.expectedItemCount) {
+    // 3. 已获得期望数量的结果（但必须状态已完成）
+    if (itemCount >= this.options.expectedItemCount && (status === 10 || status === 50)) {
       return { shouldExit: true, reason: `已获得完整结果集(${itemCount}/${this.options.expectedItemCount})` };
     }
     

src/lib/util.ts

@@ -302,6 +302,29 @@ const util = {
     });
     return result.data.toString("base64");
   },
+
+  /**
+   * 计算 ArrayBuffer 的 CRC32 值
+   * @param buffer ArrayBuffer 数据
+   * @returns CRC32 十六进制字符串
+   */
+  calculateCRC32(buffer: ArrayBuffer): string {
+    const crcTable = [];
+    for (let i = 0; i < 256; i++) {
+      let crc = i;
+      for (let j = 0; j < 8; j++) {
+        crc = (crc & 1) ? (0xEDB88320 ^ (crc >>> 1)) : (crc >>> 1);
+      }
+      crcTable[i] = crc;
+    }
+
+    let crc = 0 ^ (-1);
+    const bytes = new Uint8Array(buffer);
+    for (let i = 0; i < bytes.length; i++) {
+      crc = (crc >>> 8) ^ crcTable[(crc ^ bytes[i]) & 0xFF];
+    }
+    return ((crc ^ (-1)) >>> 0).toString(16).padStart(8, '0');
+  },
 };
 
 export default util;

test-sg-network.cjs

@@ -0,0 +1,154 @@
+#!/usr/bin/env node
+
+/**
+ * 国际站SG区域网络连接诊断脚本
+ * 用于测试能否访问新加坡ImageX服务
+ */
+
+const dns = require('dns').promises;
+const https = require('https');
+
+const SG_DOMAINS = [
+  'mweb-api-sg.capcut.com',
+  'imagex16-normal-sg-ttp.capcutapi.sg'
+];
+
+console.log('=== 国际站SG区域网络诊断 ===\n');
+
+async function testDNS(domain) {
+  console.log(`[DNS测试] 正在解析: ${domain}`);
+  try {
+    const addresses = await dns.resolve4(domain);
+    console.log(`✓ DNS解析成功: ${domain} -> ${addresses.join(', ')}`);
+    return true;
+  } catch (error) {
+    console.error(`✗ DNS解析失败: ${domain}`);
+    console.error(`  错误: ${error.message}`);
+    return false;
+  }
+}
+
+async function testHTTPS(domain) {
+  console.log(`\n[HTTPS测试] 正在测试连接: https://${domain}`);
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+    const req = https.get(`https://${domain}`, {
+      timeout: 10000,
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+      }
+    }, (res) => {
+      const duration = Date.now() - startTime;
+      console.log(`✓ HTTPS连接成功: ${domain}`);
+      console.log(`  状态码: ${res.statusCode}`);
+      console.log(`  响应时间: ${duration}ms`);
+      res.resume();
+      resolve(true);
+    });
+
+    req.on('error', (error) => {
+      const duration = Date.now() - startTime;
+      console.error(`✗ HTTPS连接失败: ${domain}`);
+      console.error(`  错误类型: ${error.code || error.constructor.name}`);
+      console.error(`  错误信息: ${error.message}`);
+      console.error(`  耗时: ${duration}ms`);
+
+      if (error.code === 'ENOTFOUND') {
+        console.error(`  建议: DNS无法解析该域名，请检查DNS设置或网络连接`);
+      } else if (error.code === 'ETIMEDOUT' || error.code === 'ECONNREFUSED') {
+        console.error(`  建议: 无法连接到服务器，可能需要配置代理或检查防火墙`);
+      } else if (error.code === 'CERT_HAS_EXPIRED' || error.code === 'UNABLE_TO_VERIFY_LEAF_SIGNATURE') {
+        console.error(`  建议: SSL证书问题，可能是系统时间不正确或证书链不完整`);
+      }
+
+      resolve(false);
+    });
+
+    req.on('timeout', () => {
+      req.destroy();
+      console.error(`✗ HTTPS连接超时: ${domain}`);
+      console.error(`  建议: 网络延迟过高或无法访问，请检查网络连接或配置代理`);
+      resolve(false);
+    });
+  });
+}
+
+async function testImageXAPI() {
+  console.log(`\n[API测试] 测试ImageX API端点`);
+  const testUrl = 'https://imagex16-normal-sg-ttp.capcutapi.sg/?Action=GetImageServiceSubscriptions&Version=2018-08-01';
+
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+    https.get(testUrl, {
+      timeout: 10000,
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
+        'Accept': '*/*'
+      }
+    }, (res) => {
+      const duration = Date.now() - startTime;
+      console.log(`✓ ImageX API端点可访问`);
+      console.log(`  状态码: ${res.statusCode}`);
+      console.log(`  响应时间: ${duration}ms`);
+
+      let data = '';
+      res.on('data', chunk => data += chunk);
+      res.on('end', () => {
+        try {
+          const json = JSON.parse(data);
+          console.log(`  响应示例: ${data.substring(0, 200)}...`);
+        } catch (e) {
+          console.log(`  响应: ${data.substring(0, 200)}...`);
+        }
+        resolve(true);
+      });
+    }).on('error', (error) => {
+      console.error(`✗ ImageX API端点访问失败`);
+      console.error(`  错误: ${error.message}`);
+      resolve(false);
+    });
+  });
+}
+
+async function main() {
+  let allSuccess = true;
+
+  // 测试DNS解析
+  console.log('步骤 1: DNS解析测试');
+  console.log('─'.repeat(50));
+  for (const domain of SG_DOMAINS) {
+    const success = await testDNS(domain);
+    if (!success) allSuccess = false;
+  }
+
+  // 测试HTTPS连接
+  console.log('\n步骤 2: HTTPS连接测试');
+  console.log('─'.repeat(50));
+  for (const domain of SG_DOMAINS) {
+    const success = await testHTTPS(domain);
+    if (!success) allSuccess = false;
+  }
+
+  // 测试API端点
+  console.log('\n步骤 3: API端点测试');
+  console.log('─'.repeat(50));
+  const apiSuccess = await testImageXAPI();
+  if (!apiSuccess) allSuccess = false;
+
+  // 总结
+  console.log('\n' + '='.repeat(50));
+  if (allSuccess) {
+    console.log('✓ 所有测试通过！网络连接正常');
+  } else {
+    console.log('✗ 部分测试失败，请检查上述错误信息');
+    console.log('\n常见解决方案:');
+    console.log('1. 检查是否需要配置代理 (HTTP_PROXY/HTTPS_PROXY环境变量)');
+    console.log('2. 检查DNS设置是否正确');
+    console.log('3. 检查防火墙是否阻止了访问');
+    console.log('4. 尝试使用VPN连接');
+    console.log('5. 检查系��时间是否正确 (影响SSL证书验证)');
+  }
+  console.log('='.repeat(50));
+}
+
+main().catch(console.error);