tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(canvas): 节点复制 - 修复生图副本生成后消失 (#676)

Browse Source 
Co-authored-by: tanzui <305375675@.com>
This commit is contained in:
tanzui
2026-10-05 15:26:51 +08:00
committed by GitHub
parent 4b1ce20d2d
commit 1dfc8ce7ac
5 changed files with 85 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/test/canvas-node-copy.test.ts
View File

@@ -43,6 +43,7 @@ describe("canvas generation copy metadata", () => {
videoStartFrameNodeId: "reference-start",
videoEndFrameNodeId: "reference-end",
generationResultPlacement: "new-version",
generationEffectKeys: ["attach-node:source-task:source:0"],
},
};
@@ -53,6 +54,8 @@ describe("canvas generation copy metadata", () => {
expect(metadata.videoEndFrameNodeId).toBe("reference-end");
expect(metadata.copiedFromNodeId).toBe("source");
expect(metadata.generationResultPlacement).toBe("replace-node");
expect(metadata.generationEffectKeys).toBeUndefined();
expect(source.metadata?.generationEffectKeys).toEqual(["attach-node:source-task:source:0"]);
});
test("复制到副本的入边继续解析为同一张参考图", () => {

12
web/test/generation-storage-consistency.test.ts
View File

@@ -1,6 +1,6 @@
import { expect, test } from "bun:test";
type Scenario = "image-cleanup" | "scope-cleanup-switch" | "scope-cleanup-late-canvas-reference" | "video-commit-race" | "audio-commit-race" | "canvas-batch-commit-race" | "canvas-multi-output";
type Scenario = "image-cleanup" | "scope-cleanup-switch" | "scope-cleanup-late-canvas-reference" | "video-commit-race" | "audio-commit-race" | "canvas-batch-commit-race" | "canvas-multi-output" | "canvas-copy-generation";
test("一次任务四图经真实消费链路堆叠并保存，刷新和重放保留四个独立资源", async () => {
type Node = import("../src/types/canvas").CanvasNodeData;
@@ -21,6 +21,16 @@ test("一次任务四图经真实消费链路堆叠并保存，刷新和重放
});
type ScenarioResponse<T> = { ok: true; result: T } | { ok: false; error: string };
test("已生成图片的副本在普通保存和新生成结果持久化后仍保留，原节点不受影响", async () => {
type Node = import("../src/types/canvas").CanvasNodeData;
const result = await runScenario<{ beforeGeneration: Node[]; restored: Node[] }>("canvas-copy-generation");
expect(result.beforeGeneration.map((node) => node.id)).toEqual(["source", "copy"]);
expect(result.beforeGeneration.find((node) => node.id === "copy")?.metadata?.generationEffectKeys).toBeUndefined();
expect(result.restored.map((node) => node.id)).toEqual(["source", "copy"]);
expect(result.restored.find((node) => node.id === "source")?.metadata).toMatchObject({ content: "original-image", generationEffectKeys: ["attach-node:old-task:source:0"] });
expect(result.restored.find((node) => node.id === "copy")?.metadata).toMatchObject({ content: "new-image", status: "success", generationEffectKeys: ["attach-node:new-task:copy:0"] });
});
test("并发生成结果经真实持久化消费链路及重新读取后保留成功、失败和用户编辑", async () => {
type Node = import("../src/types/canvas").CanvasNodeData;
const result = await runScenario<{ edited: boolean; live: Node[]; restored: Node[] }>("canvas-batch-commit-race");

61
web/test/helpers/generation-storage-consistency.worker.ts
View File

@@ -4,7 +4,7 @@ import { getActiveUserScope, setActiveUserScope } from "../../src/lib/user-scope
type InstanceHook = (storeName: string, key: string, value: unknown) => Promise<void> | void;
type Scenario = "image-cleanup" | "scope-cleanup-switch" | "scope-cleanup-late-canvas-reference" | "video-commit-race" | "audio-commit-race" | "canvas-batch-commit-race" | "canvas-multi-output";
type Scenario = "image-cleanup" | "scope-cleanup-switch" | "scope-cleanup-late-canvas-reference" | "video-commit-race" | "audio-commit-race" | "canvas-batch-commit-race" | "canvas-multi-output" | "canvas-copy-generation";
function installStorageHarness() {
const originalCreateInstance = localforage.createInstance.bind(localforage);
@@ -522,6 +522,57 @@ async function runCanvasBatchCommitRace(multiOutput = false) {
}
}
/** 使用真实画布存储和生成持久化入口验证复制流程，不调用供应商或生成付费媒体。 */
async function runCanvasCopyGeneration() {
const harness = installStorageHarness();
const previousScope = getActiveUserScope();
try {
setActiveUserScope("canvas-copy-generation");
const { useCanvasStore, flushCanvasStorePersistence, CANVAS_STORE_KEY } = await import("../../src/stores/canvas/use-canvas-store");
const { persistCanvasGenerationEffect } = await import("../../src/services/canvas-generation-consumer");
const { isolateCopiedNodeMetadata } = await import("../../src/lib/canvas/canvas-node-copy");
const { localForageStorageForScope } = await import("../../src/lib/localforage-storage");
const { parseCanvasStorageDocument } = await import("../../src/lib/canvas/canvas-storage-revision");
const { CanvasNodeType } = await import("../../src/types/canvas");
const projectId = useCanvasStore.getState().createProject("copy generation");
const readNodes = async () => {
const stored = parseCanvasStorageDocument(await localForageStorageForScope(getActiveUserScope()).getItem(CANVAS_STORE_KEY));
return stored.state.projects.find((project) => project.id === projectId)!.nodes;
};
const initial: import("../../src/types/canvas").CanvasNodeData = {
id: "source", type: CanvasNodeType.Image, title: "source", position: { x: 0, y: 0 }, width: 320, height: 240,
metadata: { content: "original-image", prompt: "test prompt", status: "success" },
};
useCanvasStore.getState().updateProject(projectId, { nodes: [initial] });
await flushCanvasStorePersistence();
const sourceEffect = "attach-node:old-task:source:0";
await persistCanvasGenerationEffect({
projectId, effectKey: sourceEffect, previousNodes: [initial],
nodes: [{ ...initial, metadata: { ...initial.metadata, generationEffectKeys: [sourceEffect] } }],
});
const source = (await readNodes())[0]!;
const copy = { ...source, id: "copy", title: "source_copy1", position: { x: 400, y: 0 }, metadata: isolateCopiedNodeMetadata(source, new Map([["source", "copy"]])) };
useCanvasStore.getState().updateProject(projectId, { nodes: [source, copy] });
await flushCanvasStorePersistence();
const beforeGeneration = await readNodes();
if (!beforeGeneration.some((node) => node.id === "copy")) throw new Error("复制节点在普通保存后丢失");
const pendingNodes = [source, { ...copy, metadata: { ...copy.metadata, status: "loading" as const, taskId: "new-task" } }];
useCanvasStore.getState().updateProject(projectId, { nodes: pendingNodes });
await flushCanvasStorePersistence();
const copyEffect = "attach-node:new-task:copy:0";
await persistCanvasGenerationEffect({
projectId, effectKey: copyEffect, previousNodes: pendingNodes,
nodes: pendingNodes.map((node) => node.id === "copy" ? { ...node, metadata: { ...node.metadata, content: "new-image", status: "success", generationEffectKeys: [copyEffect] } } : node),
});
await flushCanvasStorePersistence();
return { beforeGeneration, restored: await readNodes() };
} finally {
setActiveUserScope(previousScope);
harness.restore();
}
}
self.onmessage = async (event: MessageEvent<Scenario>) => {
try {
const result =
@@ -533,9 +584,11 @@ self.onmessage = async (event: MessageEvent<Scenario>) => {
? await runScopeCleanupAfterLateCanvasReference()
: event.data === "canvas-multi-output"
? await runCanvasBatchCommitRace(true)
: event.data === "canvas-batch-commit-race"
? await runCanvasBatchCommitRace()
: await runMediaCommitRace(event.data === "audio-commit-race" ? "audio" : "video");
: event.data === "canvas-copy-generation"
? await runCanvasCopyGeneration()
: event.data === "canvas-batch-commit-race"
? await runCanvasBatchCommitRace()
: await runMediaCommitRace(event.data === "audio-commit-race" ? "audio" : "video");
self.postMessage({ ok: true, result });
} catch (error) {
self.postMessage({ ok: false, error: error instanceof Error ? `${error.name}: ${error.message}` : String(error) });