mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-01 05:49:54 +00:00
## Summary Continues the TypeScript strict typing improvements by removing `any` types from core scripts and dialog components. ### Changes **api.ts (6 instances)** - Define `V1RawPrompt` and `CloudRawPrompt` tuple types for queue prompt formats - Export `QueueIndex`, `PromptInputs`, `ExtraData`, `OutputsToExecute` from apiSchema - Type `#postItem` body, `storeUserData` data, and `getCustomNodesI18n` return **groupNodeManage.ts (all @ts-expect-error removed)** - Add `GroupNodeConfigEntry` interface to LGraph.ts - Extend `GroupNodeWorkflowData` with `title`, `widgets_values`, and typed `config` - Type all class properties with definite assignment assertions - Type all method parameters and event handlers - Fix save button callback with proper generic types for node ordering **changeTracker.ts (4 instances)** - Type `nodeOutputs` as `Record<string, ExecutedWsMessage['output']>` - Type prompt callback with `CanvasPointerEvent` and proper value types **asyncDialog.ts and dialog.ts** - Make `ComfyAsyncDialog` generic with `DialogAction<T>` type - Type `ComfyDialog` constructor and show method parameters - Update `ManageGroupDialog.show` signature to match base class ## Test plan - [x] `pnpm typecheck` passes - [x] `pnpm lint` passes - [x] Sourcegraph checks for external usage --- Related: Continues from #8083 ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-8092-Road-to-No-Explicit-Any-Part-7-Scripts-and-Dialog-Cleanup-2ea6d73d365081fbb890e73646a6ad16) by [Unito](https://www.unito.io)
448 lines
13 KiB
TypeScript
448 lines
13 KiB
TypeScript
import _ from 'es-toolkit/compat'
|
|
import * as jsondiffpatch from 'jsondiffpatch'
|
|
import log from 'loglevel'
|
|
|
|
import type { CanvasPointerEvent } from '@/lib/litegraph/src/litegraph'
|
|
import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph'
|
|
import {
|
|
ComfyWorkflow,
|
|
useWorkflowStore
|
|
} from '@/platform/workflow/management/stores/workflowStore'
|
|
import type { ComfyWorkflowJSON } from '@/platform/workflow/validation/schemas/workflowSchema'
|
|
import type { ExecutedWsMessage } from '@/schemas/apiSchema'
|
|
import { useExecutionStore } from '@/stores/executionStore'
|
|
import { useNodeOutputStore } from '@/stores/imagePreviewStore'
|
|
import { useSubgraphNavigationStore } from '@/stores/subgraphNavigationStore'
|
|
|
|
import { api } from './api'
|
|
import type { ComfyApp } from './app'
|
|
import { app } from './app'
|
|
|
|
function clone<T>(obj: T): T {
|
|
return JSON.parse(JSON.stringify(obj))
|
|
}
|
|
|
|
const logger = log.getLogger('ChangeTracker')
|
|
// Change to debug for more verbose logging
|
|
logger.setLevel('info')
|
|
|
|
export class ChangeTracker {
|
|
static MAX_HISTORY = 50
|
|
/**
|
|
* The active state of the workflow.
|
|
*/
|
|
activeState: ComfyWorkflowJSON
|
|
undoQueue: ComfyWorkflowJSON[] = []
|
|
redoQueue: ComfyWorkflowJSON[] = []
|
|
changeCount: number = 0
|
|
/**
|
|
* Whether the redo/undo restoring is in progress.
|
|
*/
|
|
_restoringState: boolean = false
|
|
|
|
ds?: { scale: number; offset: [number, number] }
|
|
nodeOutputs?: Record<string, ExecutedWsMessage['output']>
|
|
|
|
private subgraphState?: {
|
|
navigation: string[]
|
|
}
|
|
|
|
constructor(
|
|
/**
|
|
* The workflow that this change tracker is tracking
|
|
*/
|
|
public workflow: ComfyWorkflow,
|
|
/**
|
|
* The initial state of the workflow
|
|
*/
|
|
public initialState: ComfyWorkflowJSON
|
|
) {
|
|
this.activeState = initialState
|
|
}
|
|
|
|
/**
|
|
* Save the current state as the initial state.
|
|
*/
|
|
reset(state?: ComfyWorkflowJSON) {
|
|
// Do not reset the state if we are restoring.
|
|
if (this._restoringState) return
|
|
|
|
logger.debug('Reset State')
|
|
if (state) this.activeState = clone(state)
|
|
this.initialState = clone(this.activeState)
|
|
}
|
|
|
|
store() {
|
|
this.ds = {
|
|
scale: app.canvas.ds.scale,
|
|
offset: [app.canvas.ds.offset[0], app.canvas.ds.offset[1]]
|
|
}
|
|
const navigation = useSubgraphNavigationStore().exportState()
|
|
// Always store the navigation state, even if empty (root level)
|
|
this.subgraphState = { navigation }
|
|
}
|
|
|
|
restore() {
|
|
if (this.ds) {
|
|
app.canvas.ds.scale = this.ds.scale
|
|
app.canvas.ds.offset = this.ds.offset
|
|
}
|
|
if (this.nodeOutputs) {
|
|
useNodeOutputStore().restoreOutputs(this.nodeOutputs)
|
|
}
|
|
if (this.subgraphState) {
|
|
const { navigation } = this.subgraphState
|
|
useSubgraphNavigationStore().restoreState(navigation)
|
|
|
|
const activeId = navigation.at(-1)
|
|
if (activeId) {
|
|
// Navigate to the saved subgraph
|
|
const subgraph = app.rootGraph.subgraphs.get(activeId)
|
|
if (subgraph) {
|
|
app.canvas.setGraph(subgraph)
|
|
}
|
|
} else {
|
|
// Empty navigation array means root level
|
|
app.canvas.setGraph(app.rootGraph)
|
|
}
|
|
}
|
|
}
|
|
|
|
updateModified() {
|
|
api.dispatchCustomEvent('graphChanged', this.activeState)
|
|
|
|
// Get the workflow from the store as ChangeTracker is raw object, i.e.
|
|
// `this.workflow` is not reactive.
|
|
const workflow = useWorkflowStore().getWorkflowByPath(this.workflow.path)
|
|
if (workflow) {
|
|
workflow.isModified = !ChangeTracker.graphEqual(
|
|
this.initialState,
|
|
this.activeState
|
|
)
|
|
if (logger.getLevel() <= logger.levels.DEBUG && workflow.isModified) {
|
|
const diff = ChangeTracker.graphDiff(
|
|
this.initialState,
|
|
this.activeState
|
|
)
|
|
logger.debug('Graph diff:', diff)
|
|
}
|
|
}
|
|
}
|
|
|
|
checkState() {
|
|
if (!app.graph || this.changeCount) return
|
|
const currentState = clone(app.rootGraph.serialize()) as ComfyWorkflowJSON
|
|
if (!this.activeState) {
|
|
this.activeState = currentState
|
|
return
|
|
}
|
|
if (!ChangeTracker.graphEqual(this.activeState, currentState)) {
|
|
this.undoQueue.push(this.activeState)
|
|
if (this.undoQueue.length > ChangeTracker.MAX_HISTORY) {
|
|
this.undoQueue.shift()
|
|
}
|
|
logger.debug('Diff detected. Undo queue length:', this.undoQueue.length)
|
|
|
|
this.activeState = currentState
|
|
this.redoQueue.length = 0
|
|
this.updateModified()
|
|
}
|
|
}
|
|
|
|
async updateState(source: ComfyWorkflowJSON[], target: ComfyWorkflowJSON[]) {
|
|
const prevState = source.pop()
|
|
if (prevState) {
|
|
target.push(this.activeState)
|
|
this._restoringState = true
|
|
try {
|
|
await app.loadGraphData(prevState, false, false, this.workflow, {
|
|
showMissingModelsDialog: false,
|
|
showMissingNodesDialog: false,
|
|
checkForRerouteMigration: false
|
|
})
|
|
this.activeState = prevState
|
|
this.updateModified()
|
|
} finally {
|
|
this._restoringState = false
|
|
}
|
|
}
|
|
}
|
|
|
|
async undo() {
|
|
await this.updateState(this.undoQueue, this.redoQueue)
|
|
logger.debug(
|
|
'Undo. Undo queue length:',
|
|
this.undoQueue.length,
|
|
'Redo queue length:',
|
|
this.redoQueue.length
|
|
)
|
|
}
|
|
|
|
async redo() {
|
|
await this.updateState(this.redoQueue, this.undoQueue)
|
|
logger.debug(
|
|
'Redo. Undo queue length:',
|
|
this.undoQueue.length,
|
|
'Redo queue length:',
|
|
this.redoQueue.length
|
|
)
|
|
}
|
|
|
|
async undoRedo(e: KeyboardEvent) {
|
|
if ((e.ctrlKey || e.metaKey) && !e.altKey) {
|
|
const key = e.key.toUpperCase()
|
|
// Redo: Ctrl + Y, or Ctrl + Shift + Z
|
|
if ((key === 'Y' && !e.shiftKey) || (key == 'Z' && e.shiftKey)) {
|
|
await this.redo()
|
|
return true
|
|
} else if (key === 'Z' && !e.shiftKey) {
|
|
await this.undo()
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
|
|
beforeChange() {
|
|
this.changeCount++
|
|
}
|
|
|
|
afterChange() {
|
|
if (!--this.changeCount) {
|
|
this.checkState()
|
|
}
|
|
}
|
|
|
|
static init() {
|
|
const getCurrentChangeTracker = () =>
|
|
useWorkflowStore().activeWorkflow?.changeTracker
|
|
const checkState = () => getCurrentChangeTracker()?.checkState()
|
|
|
|
let keyIgnored = false
|
|
window.addEventListener(
|
|
'keydown',
|
|
(e: KeyboardEvent) => {
|
|
// Do not trigger on repeat events (Holding down a key)
|
|
// This can happen when user is holding down "Space" to pan the canvas.
|
|
if (e.repeat) return
|
|
|
|
// If the mask editor is opened, we don't want to trigger on key events
|
|
const comfyApp = app.constructor as typeof ComfyApp
|
|
if (comfyApp.maskeditor_is_opended?.()) return
|
|
|
|
const activeEl = document.activeElement
|
|
requestAnimationFrame(async () => {
|
|
let bindInputEl: Element | null = null
|
|
// If we are auto queue in change mode then we do want to trigger on inputs
|
|
if (!app.ui.autoQueueEnabled || app.ui.autoQueueMode === 'instant') {
|
|
if (
|
|
activeEl?.tagName === 'INPUT' ||
|
|
(activeEl && 'type' in activeEl && activeEl.type === 'textarea')
|
|
) {
|
|
// Ignore events on inputs, they have their native history
|
|
return
|
|
}
|
|
bindInputEl = activeEl
|
|
}
|
|
|
|
keyIgnored =
|
|
e.key === 'Control' ||
|
|
e.key === 'Shift' ||
|
|
e.key === 'Alt' ||
|
|
e.key === 'Meta'
|
|
if (keyIgnored) return
|
|
|
|
const changeTracker = getCurrentChangeTracker()
|
|
if (!changeTracker) return
|
|
|
|
// Check if this is a ctrl+z ctrl+y
|
|
if (await changeTracker.undoRedo(e)) return
|
|
|
|
// If our active element is some type of input then handle changes after they're done
|
|
if (ChangeTracker.bindInput(bindInputEl)) return
|
|
logger.debug('checkState on keydown')
|
|
changeTracker.checkState()
|
|
})
|
|
},
|
|
true
|
|
)
|
|
|
|
window.addEventListener('keyup', () => {
|
|
if (keyIgnored) {
|
|
keyIgnored = false
|
|
logger.debug('checkState on keyup')
|
|
checkState()
|
|
}
|
|
})
|
|
|
|
// Handle clicking DOM elements (e.g. widgets)
|
|
window.addEventListener('mouseup', () => {
|
|
logger.debug('checkState on mouseup')
|
|
checkState()
|
|
})
|
|
|
|
// Handle prompt queue event for dynamic widget changes
|
|
api.addEventListener('promptQueued', () => {
|
|
logger.debug('checkState on promptQueued')
|
|
checkState()
|
|
})
|
|
|
|
api.addEventListener('graphCleared', () => {
|
|
logger.debug('checkState on graphCleared')
|
|
checkState()
|
|
})
|
|
|
|
// Handle litegraph clicks
|
|
const processMouseUp = LGraphCanvas.prototype.processMouseUp
|
|
LGraphCanvas.prototype.processMouseUp = function (e) {
|
|
const v = processMouseUp.apply(this, [e])
|
|
logger.debug('checkState on processMouseUp')
|
|
checkState()
|
|
return v
|
|
}
|
|
|
|
// Handle litegraph dialog popup for number/string widgets
|
|
const prompt = LGraphCanvas.prototype.prompt
|
|
LGraphCanvas.prototype.prompt = function (
|
|
title: string,
|
|
value: string | number,
|
|
callback: (v: string) => void,
|
|
event: CanvasPointerEvent
|
|
) {
|
|
const extendedCallback = (v: string) => {
|
|
callback(v)
|
|
checkState()
|
|
}
|
|
logger.debug('checkState on prompt')
|
|
return prompt.apply(this, [title, value, extendedCallback, event])
|
|
}
|
|
|
|
// Handle litegraph context menu for COMBO widgets
|
|
const close = LiteGraph.ContextMenu.prototype.close
|
|
LiteGraph.ContextMenu.prototype.close = function (e: MouseEvent) {
|
|
const v = close.apply(this, [e])
|
|
logger.debug('checkState on contextMenuClose')
|
|
checkState()
|
|
return v
|
|
}
|
|
|
|
// Handle multiple commands as a single transaction
|
|
document.addEventListener('litegraph:canvas', (e: Event) => {
|
|
const detail = (e as CustomEvent).detail
|
|
if (detail.subType === 'before-change') {
|
|
getCurrentChangeTracker()?.beforeChange()
|
|
} else if (detail.subType === 'after-change') {
|
|
getCurrentChangeTracker()?.afterChange()
|
|
}
|
|
})
|
|
|
|
// Store node outputs
|
|
api.addEventListener('executed', (e: CustomEvent<ExecutedWsMessage>) => {
|
|
const detail = e.detail
|
|
const workflow =
|
|
useExecutionStore().queuedPrompts[detail.prompt_id]?.workflow
|
|
const changeTracker = workflow?.changeTracker
|
|
if (!changeTracker) return
|
|
changeTracker.nodeOutputs ??= {}
|
|
const nodeOutputs = changeTracker.nodeOutputs
|
|
const output = nodeOutputs[detail.node]
|
|
if (detail.merge && output) {
|
|
for (const k in detail.output ?? {}) {
|
|
const v = output[k]
|
|
if (v instanceof Array) {
|
|
output[k] = v.concat(detail.output[k])
|
|
} else {
|
|
output[k] = detail.output[k]
|
|
}
|
|
}
|
|
} else {
|
|
nodeOutputs[detail.node] = detail.output
|
|
}
|
|
})
|
|
}
|
|
|
|
static bindInput(activeEl: Element | null): boolean {
|
|
if (
|
|
!activeEl ||
|
|
activeEl.tagName === 'CANVAS' ||
|
|
activeEl.tagName === 'BODY'
|
|
) {
|
|
return false
|
|
}
|
|
|
|
for (const evt of ['change', 'input', 'blur']) {
|
|
const htmlElement = activeEl as HTMLElement
|
|
if (`on${evt}` in htmlElement) {
|
|
const listener = () => {
|
|
useWorkflowStore().activeWorkflow?.changeTracker?.checkState?.()
|
|
htmlElement.removeEventListener(evt, listener)
|
|
}
|
|
htmlElement.addEventListener(evt, listener)
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
static graphEqual(a: ComfyWorkflowJSON, b: ComfyWorkflowJSON) {
|
|
if (a === b) return true
|
|
|
|
if (typeof a == 'object' && a && typeof b == 'object' && b) {
|
|
// Compare nodes ignoring order
|
|
if (
|
|
!_.isEqualWith(a.nodes, b.nodes, (arrA, arrB) => {
|
|
if (Array.isArray(arrA) && Array.isArray(arrB)) {
|
|
return _.isEqual(new Set(arrA), new Set(arrB))
|
|
}
|
|
})
|
|
) {
|
|
return false
|
|
}
|
|
|
|
// Compare extra properties ignoring ds
|
|
if (
|
|
!_.isEqual(_.omit(a.extra ?? {}, ['ds']), _.omit(b.extra ?? {}, ['ds']))
|
|
)
|
|
return false
|
|
|
|
// Compare other properties normally
|
|
for (const key of [
|
|
'links',
|
|
'floatingLinks',
|
|
'reroutes',
|
|
'groups',
|
|
'definitions',
|
|
'subgraphs'
|
|
]) {
|
|
if (!_.isEqual(a[key], b[key])) {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
private static graphDiff(a: ComfyWorkflowJSON, b: ComfyWorkflowJSON) {
|
|
function sortGraphNodes(graph: ComfyWorkflowJSON) {
|
|
return {
|
|
links: graph.links,
|
|
floatingLinks: graph.floatingLinks,
|
|
reroutes: graph.reroutes,
|
|
groups: graph.groups,
|
|
extra: graph.extra,
|
|
definitions: graph.definitions,
|
|
subgraphs: graph.subgraphs,
|
|
nodes: graph.nodes.sort((a, b) => {
|
|
if (typeof a.id === 'number' && typeof b.id === 'number') {
|
|
return a.id - b.id
|
|
}
|
|
return 0
|
|
})
|
|
}
|
|
}
|
|
return jsondiffpatch.diff(sortGraphNodes(a), sortGraphNodes(b))
|
|
}
|
|
}
|