修复画布已出图取回和任务状态提示
This commit is contained in:
parent
e3f17cbb5d
commit
fc97232b6f
@ -42,7 +42,7 @@ export async function GET(
|
||||
);
|
||||
}
|
||||
const failure = task.status === "failed" ? getRequestFailureDetails(task.error) : undefined;
|
||||
return NextResponse.json({ success: true, task: { ...task, failure, error: failure ? formatRequestFailure(failure, task.id) : task.error } });
|
||||
return NextResponse.json({ success: true, task: { ...task, failure, error: failure ? formatRequestFailure(failure, task.requestId) : task.error } });
|
||||
}
|
||||
|
||||
export async function POST(
|
||||
|
||||
@ -1663,6 +1663,10 @@ export function ImageNode({
|
||||
}, [publicModelAliasConfig.worldModels]);
|
||||
const [isHovered, setIsHovered] = useState(false);
|
||||
const [isProcessing, setIsProcessing] = useState(false);
|
||||
const [toolbarFailure, setToolbarFailure] = useState<{
|
||||
imageUrl: string;
|
||||
message: string;
|
||||
} | null>(null);
|
||||
const [isCreatingDetachedResultNode, setIsCreatingDetachedResultNode] =
|
||||
useState(false);
|
||||
const [imageAdjustPanelOpen, setImageAdjustPanelOpen] = useState(false);
|
||||
@ -4679,6 +4683,7 @@ export function ImageNode({
|
||||
}
|
||||
|
||||
setIsCreatingDetachedResultNode(false);
|
||||
setToolbarFailure(null);
|
||||
setIsProcessing(true);
|
||||
const actionName = "框选抠图";
|
||||
|
||||
@ -4696,8 +4701,10 @@ export function ImageNode({
|
||||
await runCanvasRemoteOperation(() => executeCanvasToolbarCapability(command));
|
||||
toast.success(`${actionName}完成`);
|
||||
} catch (error) {
|
||||
console.error("框选抠图失败:", error);
|
||||
toast.error(error instanceof Error ? error.message : `${actionName}失败`);
|
||||
setToolbarFailure({
|
||||
imageUrl: data.src,
|
||||
message: error instanceof Error ? error.message : `${actionName}失败`,
|
||||
});
|
||||
} finally {
|
||||
setIsCreatingDetachedResultNode(false);
|
||||
setIsProcessing(false);
|
||||
@ -6651,6 +6658,7 @@ export function ImageNode({
|
||||
}
|
||||
|
||||
setIsCreatingDetachedResultNode(false);
|
||||
setToolbarFailure(null);
|
||||
setIsProcessing(true);
|
||||
try {
|
||||
const command = createCanvasCapabilityClientCommand({
|
||||
@ -6662,9 +6670,10 @@ export function ImageNode({
|
||||
await runCanvasRemoteOperation(() => executeCanvasToolbarCapability(command));
|
||||
toast.success(`${capability.title}完成`);
|
||||
} catch (error) {
|
||||
const message =
|
||||
error instanceof Error ? error.message : `${capability.title}失败`;
|
||||
toast.error(message);
|
||||
setToolbarFailure({
|
||||
imageUrl: data.src,
|
||||
message: error instanceof Error ? error.message : `${capability.title}失败`,
|
||||
});
|
||||
} finally {
|
||||
setIsCreatingDetachedResultNode(false);
|
||||
setIsProcessing(false);
|
||||
@ -9426,6 +9435,29 @@ export function ImageNode({
|
||||
/>
|
||||
)}
|
||||
|
||||
{!isProcessing && toolbarFailure && toolbarFailure.imageUrl === data.src && (
|
||||
<div
|
||||
className="absolute inset-x-2 bottom-2 z-20 flex max-h-[70%] items-start gap-2 overflow-auto rounded-lg border border-red-200 bg-white px-3 py-2 text-xs text-red-800 shadow-sm dark:border-red-900 dark:bg-zinc-900 dark:text-red-200"
|
||||
data-canvas-no-drag="true"
|
||||
onPointerDown={(event) => event.stopPropagation()}
|
||||
>
|
||||
<p className="min-w-0 flex-1 select-text whitespace-pre-wrap break-words" role="alert">
|
||||
{toolbarFailure.message}
|
||||
</p>
|
||||
<button
|
||||
aria-label="关闭任务提示"
|
||||
className="shrink-0 rounded p-1 hover:bg-red-100 dark:hover:bg-red-950"
|
||||
onClick={(event) => {
|
||||
event.stopPropagation();
|
||||
setToolbarFailure(null);
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
<X className="h-3 w-3" />
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* 工具栏使用 Portal 渲染到 body,避免被裁剪 */}
|
||||
|
||||
{/* 悬浮时的更多操作按钮 (右上角) */}
|
||||
|
||||
@ -1,6 +1,36 @@
|
||||
// Polling is bounded by elapsed time, including network waits. Terminal provider failures
|
||||
// must escape immediately instead of being converted into a perpetual pending response.
|
||||
export const AOS_ENHANCE_RESULT_TIMEOUT_MS = 30_000;
|
||||
|
||||
export class EnhanceTerminalError extends Error {}
|
||||
|
||||
export async function readCompletedEnhanceImage(
|
||||
data: { image?: unknown; image_base64?: unknown },
|
||||
fetcher: typeof fetch = fetch,
|
||||
): Promise<{ buffer: Buffer; mimeType: string }> {
|
||||
try {
|
||||
const image = data.image_base64 || data.image;
|
||||
if (typeof image !== "string" || !image) throw new Error("处理结果缺少图片");
|
||||
let buffer: Buffer;
|
||||
if (/^https?:\/\//i.test(image)) {
|
||||
const response = await fetcher(image, {
|
||||
cache: "no-store",
|
||||
signal: AbortSignal.timeout(60_000),
|
||||
});
|
||||
if (!response.ok) throw new Error(`HTTP ${response.status}`);
|
||||
buffer = Buffer.from(await response.arrayBuffer());
|
||||
} else {
|
||||
buffer = Buffer.from(image, "base64");
|
||||
}
|
||||
const { default: sharp } = await import("sharp");
|
||||
const { format } = await sharp(buffer).metadata();
|
||||
if (!format || !["jpeg", "png", "webp", "tiff"].includes(format)) {
|
||||
throw new Error("处理结果的图片格式不可用");
|
||||
}
|
||||
return { buffer, mimeType: `image/${format}` };
|
||||
} catch (error) {
|
||||
throw new Error("图片变清晰已完成,但结果图片未取回。", { cause: error });
|
||||
}
|
||||
}
|
||||
|
||||
export async function pollTaskResult(
|
||||
apiUrl: string,
|
||||
apiKey: string,
|
||||
@ -17,17 +47,23 @@ export async function pollTaskResult(
|
||||
{
|
||||
method: "GET",
|
||||
headers: { "X-API-KEY": apiKey },
|
||||
signal: AbortSignal.timeout(Math.max(1, Math.min(10000, deadline - Date.now()))),
|
||||
signal: AbortSignal.timeout(
|
||||
Math.max(1, Math.min(AOS_ENHANCE_RESULT_TIMEOUT_MS, deadline - Date.now())),
|
||||
),
|
||||
},
|
||||
);
|
||||
if (!response.ok) throw Error(`轮询请求失败: ${response.status}`);
|
||||
const result = await response.json();
|
||||
if (!result.data) throw Error("高清查询未返回任务状态");
|
||||
if (result.data.state < 0)
|
||||
throw new EnhanceTerminalError(
|
||||
`AOS任务失败: ${String(result.data.err_message || result.data.err_info || result.data.state_detail || result.data.state)}`,
|
||||
);
|
||||
if (result.data.progress >= 100) return result;
|
||||
if (result?.data) {
|
||||
const state = Number(result.data.state);
|
||||
if (state < 0) {
|
||||
throw new EnhanceTerminalError(
|
||||
`AOS任务失败: ${String(result.data.err_message || result.data.err_info || result.data.state_detail || result.data.state)}`,
|
||||
);
|
||||
}
|
||||
if (response.ok && (state === 1 || (!(state > 1) && result.data.progress >= 100))) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
if (error instanceof EnhanceTerminalError) throw error;
|
||||
}
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
import { pollTaskResult, EnhanceTerminalError } from "@/lib/canvas/enhance-task-poll";
|
||||
import {
|
||||
AOS_ENHANCE_RESULT_TIMEOUT_MS,
|
||||
EnhanceTerminalError,
|
||||
pollTaskResult,
|
||||
readCompletedEnhanceImage,
|
||||
} from "@/lib/canvas/enhance-task-poll";
|
||||
import "server-only";
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import {
|
||||
@ -107,13 +112,14 @@ async function createThumbnail(buffer: Buffer, mimeType: string): Promise<Buffer
|
||||
const sharp = await import("sharp");
|
||||
|
||||
// 创建缩略图(宽度 500px,高度按比例,质量 80%)
|
||||
const thumbnailBuffer = await sharp.default(buffer)
|
||||
const resized = sharp.default(buffer)
|
||||
.resize(500, null, {
|
||||
fit: "inside",
|
||||
withoutEnlargement: true,
|
||||
})
|
||||
.jpeg({ quality: 80 }) // JPEG格式
|
||||
.toBuffer();
|
||||
});
|
||||
const thumbnailBuffer = await (
|
||||
mimeType === "image/jpeg" ? resized.jpeg({ quality: 80 }) : resized
|
||||
).toBuffer();
|
||||
|
||||
console.log(`[Enhance] Thumbnail created, size: ${thumbnailBuffer.length} bytes (original: ${buffer.length} bytes)`);
|
||||
return thumbnailBuffer;
|
||||
@ -125,12 +131,11 @@ async function createThumbnail(buffer: Buffer, mimeType: string): Promise<Buffer
|
||||
}
|
||||
|
||||
/**
|
||||
* 将 base64 图片上传到 S3,返回缩略图和原图的 URL
|
||||
* 上传图片,返回缩略图和原图的 URL。
|
||||
*/
|
||||
async function uploadBase64ToS3(base64Data: string, mimeType: string = "image/jpeg"): Promise<{ thumbnail: string; original: string }> {
|
||||
async function uploadEnhanceImage(image: string | Buffer, mimeType: string = "image/jpeg"): Promise<{ thumbnail: string; original: string }> {
|
||||
try {
|
||||
// 解析 base64 数据
|
||||
const buffer = Buffer.from(base64Data, "base64");
|
||||
const buffer = typeof image === "string" ? Buffer.from(image, "base64") : image;
|
||||
|
||||
// 生成文件名
|
||||
const ext = mimeType.split("/")[1] || "jpg";
|
||||
@ -403,7 +408,7 @@ async function processWithVip98kEnhance(params: {
|
||||
}
|
||||
const outputBuffer = Buffer.from(await response.arrayBuffer());
|
||||
const outputBase64 = outputBuffer.toString("base64");
|
||||
const uploaded = await uploadBase64ToS3(outputBase64, "image/png");
|
||||
const uploaded = await uploadEnhanceImage(outputBase64, "image/png");
|
||||
const [savedImage] = await db
|
||||
.insert(generatedImage)
|
||||
.values({
|
||||
@ -488,6 +493,16 @@ function buildEnhanceTaskPendingResponse(taskId: string) {
|
||||
);
|
||||
}
|
||||
|
||||
function buildEnhanceTaskFailureResponse(error: EnhanceTerminalError) {
|
||||
const message =
|
||||
getAosFriendlyErrorMessage(error.message) ||
|
||||
"图片变清晰失败,处理服务已确认任务失败。";
|
||||
return NextResponse.json(
|
||||
{ success: false, status: "failed", terminal: true, error: message, detail: message },
|
||||
{ status: 422 },
|
||||
);
|
||||
}
|
||||
|
||||
async function finalizeEnhanceTaskResult(params: {
|
||||
userId: string;
|
||||
taskResult: any;
|
||||
@ -501,28 +516,8 @@ async function finalizeEnhanceTaskResult(params: {
|
||||
throw new Error(params.taskResult?.message || "未知错误");
|
||||
}
|
||||
|
||||
let enhancedImageBase64: string | null = null;
|
||||
if (typeof params.taskResult.data.image_base64 === "string" && params.taskResult.data.image_base64) {
|
||||
enhancedImageBase64 = params.taskResult.data.image_base64;
|
||||
} else if (typeof params.taskResult.data.image === "string" && params.taskResult.data.image) {
|
||||
const imageData = params.taskResult.data.image;
|
||||
if (/^https?:\/\//i.test(imageData)) {
|
||||
const imageResponse = await fetch(imageData);
|
||||
if (!imageResponse.ok) {
|
||||
throw new Error(`无法下载处理后的图片: ${imageResponse.status}`);
|
||||
}
|
||||
const downloadedBuffer = await imageResponse.arrayBuffer();
|
||||
enhancedImageBase64 = Buffer.from(downloadedBuffer).toString("base64");
|
||||
} else {
|
||||
enhancedImageBase64 = imageData;
|
||||
}
|
||||
}
|
||||
|
||||
if (!enhancedImageBase64) {
|
||||
throw new Error("轮询结果未包含图片数据");
|
||||
}
|
||||
|
||||
const uploadResult = await uploadBase64ToS3(enhancedImageBase64, "image/jpeg");
|
||||
const completedImage = await readCompletedEnhanceImage(params.taskResult.data);
|
||||
const uploadResult = await uploadEnhanceImage(completedImage.buffer, completedImage.mimeType);
|
||||
const finalPrompt = params.prompt?.trim() || "图片变清晰处理";
|
||||
|
||||
let saved = false;
|
||||
@ -612,7 +607,7 @@ async function finalizeEnhanceTaskResult(params: {
|
||||
|
||||
return {
|
||||
success: true,
|
||||
image_base64: enhancedImageBase64,
|
||||
image_base64: completedImage.buffer.toString("base64"),
|
||||
thumbnail_url: uploadResult.thumbnail,
|
||||
original_url: uploadResult.original,
|
||||
processing_time: processingTime,
|
||||
@ -710,15 +705,18 @@ export async function executeEnhanceGET(request: Request, trustedUserId: string)
|
||||
config.apiKey,
|
||||
taskId,
|
||||
ENHANCE_TASK_POLL_INTERVAL_MS,
|
||||
ENHANCE_SYNC_WAIT_TIMEOUT_MS
|
||||
AOS_ENHANCE_RESULT_TIMEOUT_MS
|
||||
);
|
||||
} catch (pollError) {
|
||||
if (isEnhanceTaskStillProcessing(pollError)) {
|
||||
return buildEnhanceTaskPendingResponse(taskId);
|
||||
}
|
||||
if (pollError instanceof EnhanceTerminalError) {
|
||||
return buildEnhanceTaskFailureResponse(pollError);
|
||||
}
|
||||
const detail = pollError instanceof Error ? pollError.message : "轮询失败";
|
||||
return NextResponse.json(
|
||||
{ error: "变清晰处理失败", detail, terminal: pollError instanceof EnhanceTerminalError },
|
||||
{ error: "变清晰处理失败", detail },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
@ -917,7 +915,7 @@ export async function executeEnhancePOST(request: Request, trustedUserId: string
|
||||
try {
|
||||
// 步骤1: 先将Base64图片上传到S3获取公开可访问的URL
|
||||
console.log(`[Enhance-RealESRGAN] 📤 步骤1: 上传原图到S3获取URL...`);
|
||||
const tempUploadResult = await uploadBase64ToS3(imageBase64, "image/jpeg");
|
||||
const tempUploadResult = await uploadEnhanceImage(imageBase64, "image/jpeg");
|
||||
const sourceImageUrl = tempUploadResult.original;
|
||||
console.log(`[Enhance-RealESRGAN] ✅ 原图已上传,URL: ${sourceImageUrl}`);
|
||||
|
||||
@ -937,7 +935,7 @@ export async function executeEnhancePOST(request: Request, trustedUserId: string
|
||||
let originalUrl: string;
|
||||
|
||||
try {
|
||||
const uploadResult = await uploadBase64ToS3(result.imageBase64, "image/png");
|
||||
const uploadResult = await uploadEnhanceImage(result.imageBase64, "image/png");
|
||||
thumbnailUrl = uploadResult.thumbnail;
|
||||
originalUrl = uploadResult.original;
|
||||
console.log(`[Enhance-RealESRGAN] ✅ 处理后图片已上传: ${originalUrl}`);
|
||||
@ -1110,7 +1108,7 @@ export async function executeEnhancePOST(request: Request, trustedUserId: string
|
||||
if (scaleFactorValue) {
|
||||
formData.append("scale_factor", String(scaleFactorValue));
|
||||
}
|
||||
formData.append("return_type", "2"); // 返回base64
|
||||
formData.append("return_type", "1"); // 状态查询返回图片链接。
|
||||
|
||||
const headers: Record<string, string> = {
|
||||
"X-API-KEY": config.apiKey!,
|
||||
@ -1305,22 +1303,10 @@ export async function executeEnhancePOST(request: Request, trustedUserId: string
|
||||
if (isEnhanceTaskStillProcessing(pollError)) {
|
||||
return buildEnhanceTaskPendingResponse(taskId);
|
||||
}
|
||||
const detail = pollError instanceof Error ? pollError.message : "轮询失败";
|
||||
try {
|
||||
const fallbackPayload = await executeFalEsrganFallback({
|
||||
userId,
|
||||
imageBase64,
|
||||
prompt,
|
||||
chatId,
|
||||
messageId,
|
||||
sourceImageUrl,
|
||||
requestedScaleFactor,
|
||||
reason: detail,
|
||||
});
|
||||
return NextResponse.json(fallbackPayload);
|
||||
} catch (falError) {
|
||||
console.error("[Enhance-FAL-ESRGAN] 专用高清备用链路失败:", falError);
|
||||
if (pollError instanceof EnhanceTerminalError) {
|
||||
return buildEnhanceTaskFailureResponse(pollError);
|
||||
}
|
||||
const detail = pollError instanceof Error ? pollError.message : "轮询失败";
|
||||
const friendlyMessage = getAosFriendlyErrorMessage(detail);
|
||||
return NextResponse.json(
|
||||
{ error: "变清晰处理失败", detail: friendlyMessage || detail },
|
||||
|
||||
@ -11,6 +11,7 @@ async function requestCapabilityResult(command: CanvasCapabilityClientCommand) {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(command),
|
||||
signal: AbortSignal.timeout(12_000),
|
||||
});
|
||||
payload = await response.json().catch(() => null);
|
||||
if (payload?.success === false || (!response.ok && ![502, 503, 504, 524].includes(response.status))) {
|
||||
@ -21,6 +22,7 @@ async function requestCapabilityResult(command: CanvasCapabilityClientCommand) {
|
||||
if ((error as { confirmedRejection?: boolean })?.confirmedRejection) throw error;
|
||||
}
|
||||
const deadline = Date.now() + 20 * 60 * 1000;
|
||||
let consecutiveMissingStatuses = 0;
|
||||
while (Date.now() < deadline) {
|
||||
const task = payload?.task;
|
||||
if (task?.status === "succeeded") return payload;
|
||||
@ -32,6 +34,8 @@ async function requestCapabilityResult(command: CanvasCapabilityClientCommand) {
|
||||
} catch {
|
||||
payload = null;
|
||||
}
|
||||
consecutiveMissingStatuses = payload?.task?.status ? 0 : consecutiveMissingStatuses + 1;
|
||||
if (consecutiveMissingStatuses >= 4) break;
|
||||
}
|
||||
throw new Error(formatRequestFailure(getRequestFailureDetails({ providerOutcomeUnknown: true }), command.requestId));
|
||||
}
|
||||
@ -46,7 +50,11 @@ export async function executeCanvasToolbarCapability(
|
||||
const base = JSON.stringify({ canvasData: before.getCanvasState() });
|
||||
await requestCapabilityResult(command);
|
||||
|
||||
const projectResponse = await fetch(`/api/canvas/${projectId}`);
|
||||
const projectResponse = await fetch(`/api/canvas/${projectId}`, {
|
||||
signal: AbortSignal.timeout(12_000),
|
||||
}).catch(() => {
|
||||
throw new Error("结果已生成,但画布同步失败,请刷新查看结果。");
|
||||
});
|
||||
const result = await projectResponse.json();
|
||||
if (!projectResponse.ok || !result.success || !result.data?.canvasData) {
|
||||
throw new Error(result.error || "结果已生成,但画布同步失败");
|
||||
|
||||
@ -3,6 +3,7 @@ import { getFriendlyRateLimitMessage, getUserFacingRequestErrorMessage } from "@
|
||||
type LongTaskResponse = {
|
||||
success?: boolean;
|
||||
processing?: boolean;
|
||||
terminal?: boolean;
|
||||
status?: string;
|
||||
taskId?: string;
|
||||
pollAfterMs?: number;
|
||||
@ -19,6 +20,10 @@ function isProcessingPayload(payload: LongTaskResponse | null | undefined) {
|
||||
return status === "queued" || status === "running" || status === "pending";
|
||||
}
|
||||
|
||||
function isFailedPayload(payload: LongTaskResponse | null) {
|
||||
return payload?.terminal === true || String(payload?.status || "").toLowerCase() === "failed";
|
||||
}
|
||||
|
||||
function buildTaskError(payload: LongTaskResponse | null | undefined, fallback: string) {
|
||||
const message = getUserFacingRequestErrorMessage(
|
||||
payload,
|
||||
@ -32,7 +37,7 @@ function buildTaskError(payload: LongTaskResponse | null | undefined, fallback:
|
||||
|
||||
function buildTaskInterruptedError(taskId: string) {
|
||||
const error = new Error(
|
||||
"任务已提交,网络连接暂时中断,请稍后重试查看结果,避免重复提交。"
|
||||
`任务已提交,结果尚未确认。请联系管理员核对原任务(${taskId}),避免重复提交。`
|
||||
) as Error & { taskId?: string };
|
||||
error.taskId = taskId;
|
||||
return error;
|
||||
@ -95,7 +100,7 @@ export async function requestLongTaskResult(params: {
|
||||
});
|
||||
|
||||
const result = await safeParseJson(response);
|
||||
if (!response.ok) {
|
||||
if (!response.ok || isFailedPayload(result)) {
|
||||
throw buildTaskError(result, "请求失败");
|
||||
}
|
||||
|
||||
@ -146,6 +151,10 @@ export async function requestLongTaskResult(params: {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (isFailedPayload(statusPayload)) {
|
||||
throw buildTaskError(statusPayload, "任务已失败");
|
||||
}
|
||||
|
||||
if (!statusResponse.ok) {
|
||||
if (
|
||||
shouldRetryLongTaskPoll(statusResponse.status, statusPayload) &&
|
||||
@ -173,5 +182,5 @@ export async function requestLongTaskResult(params: {
|
||||
pollAfterMs = Math.max(800, Number(statusPayload?.pollAfterMs || pollAfterMs));
|
||||
}
|
||||
|
||||
throw new Error("任务处理超时,请稍后再试");
|
||||
throw buildTaskInterruptedError(taskId);
|
||||
}
|
||||
|
||||
@ -331,6 +331,9 @@ export function getRequestFailureDetails(
|
||||
if (/no_eligible_route|service_unavailable|service_rejected|channel.*unavailable|暂无可用服务|未配置.*模型|没有可用.*(?:模型|通道)|通道.*(?:不可用|未通过)|鉴权/i.test(text)) {
|
||||
return detail("PROVIDER_UNAVAILABLE", "当前模型服务或通道暂不可用。", "请切换其他可用模型;若多个模型都失败,请联系管理员检查服务配置。");
|
||||
}
|
||||
if (/图片变清晰已完成,但结果图片未取回/.test(text)) {
|
||||
return detail("ENHANCE_RESULT_UNAVAILABLE", "图片变清晰已完成,但结果图片未取回。", "请联系管理员核对原任务,避免重复提交。", "unknown");
|
||||
}
|
||||
if (/neither a task ID nor output URLs|已完成.*未取回|completed without.*output/i.test(text)) {
|
||||
return detail("RESULT_UNCONFIRMED", "模型服务没有返回可读取的任务结果,生成状态尚未确认。", "请保留当前任务并联系管理员核对,避免重复生成。", "unknown");
|
||||
}
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
import { expect, test } from "@playwright/test";
|
||||
import { createCanvasSaveQueue } from "@/lib/client/canvas-save-queue";
|
||||
import { executeCanvasToolbarCapability } from "@/lib/client/canvas-toolbar-capability";
|
||||
import { requestLongTaskResult } from "@/lib/client/long-task";
|
||||
import { createCanvasCapabilityClientCommand } from "@/lib/canvas/capabilities/client-command";
|
||||
import { useCanvasStore } from "@/store/canvas";
|
||||
import { canvasService } from "@/services/canvas";
|
||||
@ -87,6 +88,62 @@ test("a lost submission response polls the original task and never resubmits", a
|
||||
expect(useCanvasStore.getState().nodes.map(n => n.id)).toEqual(["source", "result"]);
|
||||
});
|
||||
|
||||
test("a terminal enhance result ends polling even if the response also says it is processing", async () => {
|
||||
const methods: string[] = [];
|
||||
globalThis.fetch = (async (url, init) => {
|
||||
methods.push(init?.method || "GET");
|
||||
if (init?.method === "POST") {
|
||||
return Response.json({ success: true, status: "running", taskId: "upstream-1" }, { status: 202 });
|
||||
}
|
||||
expect(String(url)).toContain("taskId=upstream-1");
|
||||
return Response.json({
|
||||
success: false,
|
||||
status: "failed",
|
||||
processing: true,
|
||||
error: "图片变清晰失败,处理服务已确认任务失败。",
|
||||
terminal: true,
|
||||
}, { status: 500 });
|
||||
}) as typeof fetch;
|
||||
await expect(requestLongTaskResult({ endpoint: "/api/enhance", payload: {} }))
|
||||
.rejects.toThrow("已确认任务失败");
|
||||
expect(methods).toEqual(["POST", "GET"]);
|
||||
});
|
||||
|
||||
test("missing capability status stops waiting with the original request number", async () => {
|
||||
const submitted = command();
|
||||
const methods: string[] = [];
|
||||
const originalSetTimeout = globalThis.setTimeout;
|
||||
globalThis.setTimeout = ((fn: () => void) => originalSetTimeout(fn, 0)) as typeof setTimeout;
|
||||
globalThis.fetch = (async (url, init) => {
|
||||
methods.push(init?.method || "GET");
|
||||
if (init?.method === "POST") return new Response(null, { status: 504 });
|
||||
expect(String(url)).toContain(encodeURIComponent(submitted.requestId));
|
||||
return new Response(null, { status: 404 });
|
||||
}) as typeof fetch;
|
||||
try {
|
||||
await expect(executeCanvasToolbarCapability(submitted)).rejects.toThrow(
|
||||
formatRequestFailure(getRequestFailureDetails({ providerOutcomeUnknown: true }), submitted.requestId),
|
||||
);
|
||||
} finally {
|
||||
globalThis.setTimeout = originalSetTimeout;
|
||||
}
|
||||
expect(methods).toEqual(["POST", "GET", "GET", "GET", "GET"]);
|
||||
});
|
||||
|
||||
test("an interrupted enhance result preserves the upstream task number", async () => {
|
||||
globalThis.fetch = (async (_url, init) => {
|
||||
if (init?.method === "POST") {
|
||||
return Response.json({ success: true, status: "running", taskId: "upstream-2" }, { status: 202 });
|
||||
}
|
||||
throw new TypeError("fetch failed");
|
||||
}) as typeof fetch;
|
||||
await expect(requestLongTaskResult({ endpoint: "/api/enhance", payload: {}, maxPollFailures: 1 }))
|
||||
.rejects.toMatchObject({
|
||||
taskId: "upstream-2",
|
||||
message: expect.stringContaining("结果尚未确认"),
|
||||
});
|
||||
});
|
||||
|
||||
test("a recovered matting rejection shows its dimensions and advice without changing the canvas or resubmitting", async () => {
|
||||
const submitted = createCanvasCapabilityClientCommand({ projectId: "project-a", capabilityId: "image.remove_background", nodeIds: ["source"], source: "toolbar" });
|
||||
const failure = getRequestFailureDetails("抠图参考图分辨率超限(5056×3392 像素),当前 AOS 上游要求宽、高均不超过 4096 像素。");
|
||||
|
||||
@ -468,7 +468,7 @@ import {
|
||||
} from "@/lib/video-canvas/task-recovery";
|
||||
import { CanvasTaskLeaseLostError } from "@/lib/video-canvas/image-operation";
|
||||
import { normalizeVideoAnalysisRows } from "@/lib/video-canvas/video-story";
|
||||
import { pollTaskResult, EnhanceTerminalError } from "@/lib/canvas/enhance-task-poll";
|
||||
import { pollTaskResult, EnhanceTerminalError, readCompletedEnhanceImage } from "@/lib/canvas/enhance-task-poll";
|
||||
const recoveryTime = Date.parse("2026-09-17T04:00:00Z");
|
||||
const checkpoint = {
|
||||
operation: "enhance" as const,
|
||||
@ -592,6 +592,11 @@ test("actual AOS polling propagates negative state immediately and bounds elapse
|
||||
}),
|
||||
).rejects.toBeInstanceOf(EnhanceTerminalError);
|
||||
expect(calls).toBe(1);
|
||||
await expect(
|
||||
pollTaskResult("https://example.com", "qa", "id", 1, 1000, async () =>
|
||||
Response.json({ data: { state: -1, err_message: "bad image" } }, { status: 422 }),
|
||||
),
|
||||
).rejects.toThrow("bad image");
|
||||
const started = Date.now();
|
||||
await expect(
|
||||
pollTaskResult("https://example.com", "qa", "id", 1, 25, async () =>
|
||||
@ -600,6 +605,40 @@ test("actual AOS polling propagates negative state immediately and bounds elapse
|
||||
).rejects.toThrow("轮询超时");
|
||||
expect(Date.now() - started).toBeLessThan(500);
|
||||
});
|
||||
|
||||
test("AOS polling allows time to read a completed legacy inline result", async () => {
|
||||
const timeout = AbortSignal.timeout;
|
||||
const readBudgets: number[] = [];
|
||||
AbortSignal.timeout = (ms) => {
|
||||
readBudgets.push(ms);
|
||||
return timeout(ms);
|
||||
};
|
||||
try {
|
||||
const result = await pollTaskResult("https://example.com", "qa", "original-task", 1, 30_000, async () =>
|
||||
Response.json({ status: 200, data: { state: 1, image: "aW1hZ2U=", progress: 100 } }),
|
||||
);
|
||||
expect(result.data.image).toBe("aW1hZ2U=");
|
||||
expect(readBudgets[0]).toBeGreaterThan(25_000);
|
||||
} finally {
|
||||
AbortSignal.timeout = timeout;
|
||||
}
|
||||
});
|
||||
|
||||
test("completed AOS images retain their PNG format through both result transports", async () => {
|
||||
const { default: sharp } = await import("sharp");
|
||||
const png = await sharp({
|
||||
create: { width: 2, height: 2, channels: 4, background: "#20304f80" },
|
||||
}).png().toBuffer();
|
||||
const inline = await readCompletedEnhanceImage({ image: png.toString("base64") });
|
||||
const linked = await readCompletedEnhanceImage({ image: "https://example.com/result.png" },
|
||||
async () => new Response(new Uint8Array(png)));
|
||||
expect(inline).toEqual({ buffer: png, mimeType: "image/png" });
|
||||
expect(linked).toEqual(inline);
|
||||
await expect(
|
||||
readCompletedEnhanceImage({ image: "https://example.com/result.png" },
|
||||
async () => new Response("unavailable", { status: 200 })),
|
||||
).rejects.toThrow("已完成,但结果图片未取回");
|
||||
});
|
||||
test("video analysis preserves zero timestamps and all shots without invented camera or audio facts", () => {
|
||||
const rows = normalizeVideoAnalysisRows(
|
||||
Array.from({ length: 12 }, (_, i) => ({ sceneDescription: `镜头${i}`, startTime: 0 })),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user