mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-24 06:35:10 +00:00
## Summary Harden the `ChangeTracker` lifecycle to eliminate the class of bugs where an inactive workflow's tracker silently captures the wrong graph state. Renames `checkState()` to `captureCanvasState()` with a self-defending assertion, introduces `deactivate()` and `prepareForSave()` lifecycle methods, and closes a latent undo-history corruption bug discovered during code review. ## Background ComfyUI supports multiple workflows open as tabs, but only one canvas (`app.rootGraph`) exists at a time. When the user switches tabs, the old workflow's graph is unloaded and the new one is loaded into this shared canvas. The old `checkState()` method serialized `app.rootGraph` into `activeState` to track changes for undo/redo. It had no awareness of *which* workflow it belonged to -- if called on an inactive tab's tracker, it would capture the active tab's graph data and silently overwrite the inactive workflow's state. This caused permanent data loss (fixed in PR #10745 with caller-side `isActive` guards). The caller-side guards were fragile: every new call site had to remember to add the guard, and forgetting would reintroduce the same silent data corruption. Additionally, `beforeLoadNewGraph` only called `store()` (viewport/outputs) without `checkState()`, meaning canvas state could be stale if a tab switch happened without a preceding mouseup event. ### Before (fragile) ``` saveWorkflow(workflow): if (isActive(workflow)) <-- caller must remember this guard workflow.changeTracker.checkState() <-- name implies "read", actually writes ... beforeLoadNewGraph(): activeWorkflow.changeTracker.store() <-- only saves viewport, NOT graph state ``` ### After (self-defending) ``` saveWorkflow(workflow): workflow.changeTracker.prepareForSave() <-- handles active/inactive internally ... beforeLoadNewGraph(): activeWorkflow.changeTracker.deactivate() <-- captures graph + viewport together ``` ## Changes - Rename `checkState` to `captureCanvasState` with active-tracker assertion - Add `deactivate()` and `prepareForSave()` lifecycle methods - Fix undo-history corruption: `captureCanvasState()` guarded by `_restoringState` - Fix viewport regression during undo: `deactivate()` skips `captureCanvasState()` during undo/redo but always calls `store()` to preserve viewport (regression from PR #10247) - Log inactive tracker warnings unconditionally at warn level (not DEV-only) - Deprecated `checkState()` wrapper for extension compatibility - Rename `checkState` to `captureCanvasState` in `useWidgetSelectActions` composable - Add `appModeStore.ts` to manual call sites documentation - Add `checkState()` deprecation note to architecture docs - Add 16 unit tests covering all guard conditions, lifecycle methods, and undo behavior - Add E2E test: "Undo preserves viewport offset" ## New ChangeTracker Public API | Method | Caller | Purpose | |--------|--------|---------| | `captureCanvasState()` | Event handlers, UI interactions | Snapshots canvas into activeState, pushes undo. Asserts active tracker. | | `deactivate()` | `beforeLoadNewGraph` only | `captureCanvasState()` (skipped during undo/redo) + `store()`. Freezes state for tab switch. | | `prepareForSave()` | Save paths only | Active: `captureCanvasState()`. Inactive: no-op. | | `checkState()` | **Deprecated** -- extensions only | Wrapper that delegates to `captureCanvasState()` with deprecation warning. | | `store()` | Internal to `deactivate()` | Saves viewport, outputs, subgraph navigation. | | `restore()` | `afterLoadNewGraph` | Restores viewport, outputs, subgraph navigation. | | `reset()` | `afterLoadNewGraph`, save | Resets initial state (marks as "clean"). | ## Test plan - [x] Unit tests: 16 tests covering all guard conditions, state capture, undo queue behavior - [x] E2E test: "Undo preserves viewport offset" verifies no viewport drift on undo - [x] E2E test: "Prevents captureCanvasState from corrupting workflow state during tab switch" - [x] Existing E2E: "Closing an inactive tab with save preserves its own content" - [ ] Manual: rapidly switch tabs during undo/redo, verify no viewport drift - [ ] Manual: verify extensions calling `checkState()` see deprecation warning in console
131 lines
4.0 KiB
TypeScript
131 lines
4.0 KiB
TypeScript
import type { Response } from '@playwright/test'
|
|
import { expect, mergeTests } from '@playwright/test'
|
|
|
|
import { comfyPageFixture } from '@e2e/fixtures/ComfyPage'
|
|
import { webSocketFixture } from '@e2e/fixtures/ws'
|
|
import type { WorkspaceStore } from '@e2e/types/globals'
|
|
|
|
const test = mergeTests(comfyPageFixture, webSocketFixture)
|
|
|
|
test.describe('Actionbar', { tag: '@ui' }, () => {
|
|
/**
|
|
* This test ensures that the autoqueue change mode can only queue one change at a time
|
|
*/
|
|
test('Does not auto-queue multiple changes at a time', async ({
|
|
comfyPage,
|
|
getWebSocket
|
|
}) => {
|
|
const ws = await getWebSocket()
|
|
|
|
// Enable change auto-queue mode
|
|
const queueOpts = await comfyPage.actionbar.queueButton.toggleOptions()
|
|
await expect.poll(() => queueOpts.getMode()).toBe('disabled')
|
|
await queueOpts.setMode('change')
|
|
await comfyPage.nextFrame()
|
|
await expect.poll(() => queueOpts.getMode()).toBe('change')
|
|
await comfyPage.actionbar.queueButton.toggleOptions()
|
|
|
|
// Intercept the prompt queue endpoint
|
|
let promptNumber = 0
|
|
await comfyPage.page.route('**/api/prompt', async (route, req) => {
|
|
await new Promise((r) => setTimeout(r, 100))
|
|
await route.fulfill({
|
|
status: 200,
|
|
body: JSON.stringify({
|
|
prompt_id: promptNumber,
|
|
number: ++promptNumber,
|
|
node_errors: {},
|
|
// Include the request data to validate which prompt was queued so we can validate the width
|
|
__request: req.postDataJSON()
|
|
})
|
|
})
|
|
})
|
|
|
|
// Start watching for a message to prompt
|
|
const requestPromise = comfyPage.page.waitForResponse('**/api/prompt')
|
|
|
|
// Find and set the width on the latent node
|
|
const triggerChange = async (value: number) => {
|
|
return await comfyPage.page.evaluate((value) => {
|
|
const node = window.app!.graph!._nodes.find(
|
|
(n) => n.type === 'EmptyLatentImage'
|
|
)
|
|
node!.widgets![0].value = value
|
|
|
|
;(
|
|
window.app!.extensionManager as WorkspaceStore
|
|
).workflow.activeWorkflow?.changeTracker.captureCanvasState()
|
|
}, value)
|
|
}
|
|
|
|
// Trigger a status websocket message
|
|
const triggerStatus = (queueSize: number) => {
|
|
ws.send(
|
|
JSON.stringify({
|
|
type: 'status',
|
|
data: {
|
|
status: {
|
|
exec_info: {
|
|
queue_remaining: queueSize
|
|
}
|
|
}
|
|
}
|
|
})
|
|
)
|
|
}
|
|
|
|
// Extract the width from the queue response
|
|
const getQueuedWidth = async (resp: Promise<Response>) => {
|
|
const obj = await (await resp).json()
|
|
return obj['__request']['prompt']['5']['inputs']['width']
|
|
}
|
|
|
|
// Trigger a bunch of changes
|
|
const START = 32
|
|
const END = 64
|
|
for (let i = START; i <= END; i += 8) {
|
|
await triggerChange(i)
|
|
}
|
|
|
|
// Ensure the queued width is the first value
|
|
expect(
|
|
await getQueuedWidth(requestPromise),
|
|
'the first queued prompt should be the first change width'
|
|
).toBe(START)
|
|
|
|
// Ensure that no other changes are queued
|
|
await expect(
|
|
comfyPage.page.waitForResponse('**/api/prompt', { timeout: 250 })
|
|
).rejects.toThrow()
|
|
expect(
|
|
promptNumber,
|
|
'only 1 prompt should have been queued even though there were multiple changes'
|
|
).toBe(1)
|
|
|
|
// Trigger a status update so auto-queue re-runs
|
|
triggerStatus(1)
|
|
triggerStatus(0)
|
|
|
|
// Ensure the queued width is the last queued value
|
|
expect(
|
|
await getQueuedWidth(comfyPage.page.waitForResponse('**/api/prompt')),
|
|
'last queued prompt width should be the last change'
|
|
).toBe(END)
|
|
expect(promptNumber, 'queued prompt count should be 2').toBe(2)
|
|
})
|
|
|
|
test('Can dock actionbar into top menu', async ({ comfyPage }) => {
|
|
await comfyPage.page.dragAndDrop(
|
|
'.actionbar .drag-handle',
|
|
'.actionbar-container',
|
|
{
|
|
targetPosition: { x: 50, y: 20 },
|
|
force: true
|
|
}
|
|
)
|
|
await expect(comfyPage.actionbar.root.locator('.actionbar')).toHaveClass(
|
|
/static/
|
|
)
|
|
})
|
|
})
|