Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions eslint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,6 @@
"count": 1
}
},
"src/lib/litegraph/src/subgraph/subgraphDeduplication.ts": {
"comfy/no-new-error-throw": {
"count": 1
}
},
"src/platform/assets/services/assetService.ts": {
"comfy/no-new-error-throw": {
"count": 21
Expand Down
2 changes: 1 addition & 1 deletion src/composables/useCopy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function selectDocumentText(selectedCharacters: number): void {
function readSerializedClipboardMetadata(dataTransfer: DataTransfer): string {
const match = dataTransfer
.getData('text/html')
.match(/data-metadata="([A-Za-z0-9+/=]+)"/)?.[1]
.match(/data-comfy-metadata="([A-Za-z0-9+/=]+)"/)?.[1]
expect(match).toBeDefined()
if (!match) throw new Error('Expected clipboard metadata to be written')

Expand Down
2 changes: 1 addition & 1 deletion src/composables/useCopy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const CANVAS_CLIPBOARD_KEY = 'litegrapheditor_clipboard'
const CANVAS_CLIPBOARD_ID_KEY = 'litegrapheditor_clipboard_id'

const clipboardHTMLWrapper = [
'<meta charset="utf-8"><div><span data-metadata="',
'<meta charset="utf-8"><div><span data-comfy-metadata="',
'"></span></div><span style="white-space:pre-wrap;">Text</span>'
]
const clipboardByteChunkSize = 0x8000
Expand Down
115 changes: 113 additions & 2 deletions src/composables/usePaste.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import type {
LGraphNode
} from '@/lib/litegraph/src/litegraph'
import { app } from '@/scripts/app'
import { useToastStore } from '@/platform/updates/common/toastStore'
import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils'
import { createNode } from '@/utils/litegraphUtil'
import {
Expand Down Expand Up @@ -615,14 +616,42 @@ describe('usePaste', () => {
})

it('should handle clipboard items with metadata', async () => {
const data = { test: 'data' }
const data = {
nodes: [],
groups: [],
reroutes: [],
links: [],
subgraphs: []
}
const encoded = btoa(JSON.stringify(data))
const html = `<div data-comfy-metadata="${encoded}"></div>`

usePaste()

const dataTransfer = new DataTransfer()
dataTransfer.setData('text/html', html)

const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
document.dispatchEvent(event)

await vi.waitFor(() => {
expect(mockCanvas._deserializeItems).toHaveBeenCalledWith(
data,
expect.any(Object)
)
})
})

it('accepts validated legacy data-metadata clipboard items', async () => {
const data = { nodes: [] }
const encoded = btoa(JSON.stringify(data))
const html = `<div data-metadata="${encoded}"></div>`

usePaste()

const dataTransfer = new DataTransfer()
dataTransfer.setData('text/html', html)
dataTransfer.setData('text/plain', 'some text')

const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
document.dispatchEvent(event)
Expand All @@ -635,6 +664,88 @@ describe('usePaste', () => {
})
})

it.for([
{ name: 'null payload', data: null },
{ name: 'empty object', data: {} },
{ name: 'malformed node', data: { nodes: [{ type: 'KSampler' }] } },
{ name: 'malformed group', data: { groups: [{ id: 1 }] } },
{ name: 'malformed reroute', data: { reroutes: [{ id: 1 }] } },
{ name: 'malformed link', data: { links: [{ id: 1 }] } },
{ name: 'malformed subgraph', data: { subgraphs: [{ id: 'invalid' }] } }
])('falls back for malformed Comfy metadata: $name', async ({ data }) => {
const encoded = btoa(JSON.stringify(data))
const html = `<div data-comfy-metadata="${encoded}"></div>`

usePaste()

const dataTransfer = new DataTransfer()
dataTransfer.setData('text/html', html)
dataTransfer.setData('text/plain', 'some text')

document.dispatchEvent(
new ClipboardEvent('paste', { clipboardData: dataTransfer })
)

await vi.waitFor(() => {
expect(mockCanvas._deserializeItems).not.toHaveBeenCalled()
expect(mockCanvas.pasteFromClipboard).toHaveBeenCalled()
})
})

it('falls back when Comfy metadata is not valid JSON', async () => {
const parseError = vi.spyOn(console, 'error').mockImplementation(() => {})
onTestFinished(() => parseError.mockRestore())
const html = `<div data-comfy-metadata="${btoa('{')}"></div>`

usePaste()

const dataTransfer = new DataTransfer()
dataTransfer.setData('text/html', html)
dataTransfer.setData('text/plain', 'some text')

document.dispatchEvent(
new ClipboardEvent('paste', { clipboardData: dataTransfer })
)

await vi.waitFor(() => {
expect(parseError).toHaveBeenCalledOnce()
expect(mockCanvas._deserializeItems).not.toHaveBeenCalled()
expect(mockCanvas.pasteFromClipboard).toHaveBeenCalled()
})
})

it('should toast a deserialization error without falling back', async () => {
const deserializeError = new Error('Paste failed')
vi.mocked(mockCanvas._deserializeItems).mockImplementation(() => {
throw deserializeError
})
const data = {
nodes: [],
groups: [],
reroutes: [],
links: [],
subgraphs: []
}
const encoded = btoa(JSON.stringify(data))
const html = `<div data-comfy-metadata="${encoded}"></div>`

usePaste()

const dataTransfer = new DataTransfer()
dataTransfer.setData('text/html', html)
dataTransfer.setData('text/plain', 'some text')

const event = new ClipboardEvent('paste', { clipboardData: dataTransfer })
document.dispatchEvent(event)

await vi.waitFor(() => {
expect(useToastStore().add).toHaveBeenCalledWith(
expect.objectContaining({ severity: 'error' })
)
expect(mockCanvas.pasteFromClipboard).not.toHaveBeenCalled()
})
})

it('should skip node metadata paste when a media node is selected', async () => {
const mockNode = createMockLGraphNode({
is_selected: true,
Expand All @@ -648,7 +759,7 @@ describe('usePaste', () => {

const nodeData = { nodes: [{ type: 'KSampler' }] }
const encoded = btoa(JSON.stringify(nodeData))
const html = `<div data-metadata="${encoded}"></div>`
const html = `<div data-comfy-metadata="${encoded}"></div>`

const dataTransfer = new DataTransfer()
dataTransfer.setData('text/html', html)
Expand Down
24 changes: 19 additions & 5 deletions src/composables/usePaste.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useEventListener } from '@vueuse/core'

import { useErrorHandling } from '@/composables/useErrorHandling'
import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
import { zClipboardItems } from '@/platform/workflow/validation/schemas/workflowSchema'
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
import { app } from '@/scripts/app'
import { useWorkspaceStore } from '@/stores/workspaceStore'
Expand Down Expand Up @@ -42,19 +44,31 @@ export function cloneDataTransfer(original: DataTransfer): DataTransfer {

function pasteClipboardItems(data: DataTransfer): boolean {
const rawData = data.getData('text/html')
const match = rawData.match(/data-metadata="([A-Za-z0-9+/=]+)"/)?.[1]
const match = rawData.match(
/data-(?:comfy-)?metadata="([A-Za-z0-9+/=]+)"/
)?.[1]
if (!match) return false

let parsed: unknown
try {
// Decode UTF-8 safe base64
const binaryString = atob(match)
const bytes = Uint8Array.from(binaryString, (c) => c.charCodeAt(0))
const decodedData = new TextDecoder().decode(bytes)
useCanvasStore().getCanvas()._deserializeItems(JSON.parse(decodedData), {})
return true
parsed = JSON.parse(decodedData)
} catch (err) {
console.error(err)
return false
}

const clipboardItems = zClipboardItems.safeParse(parsed)
if (!clipboardItems.success) return false

try {
useCanvasStore().getCanvas()._deserializeItems(clipboardItems.data, {})
} catch (err) {
useErrorHandling().toastErrorHandler(err)
Comment thread
DrJKL marked this conversation as resolved.
Resolved
}
return false
return true
}

function isWorkflow(
Expand Down
10 changes: 7 additions & 3 deletions src/extensions/core/groupNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type {
} from '@/lib/litegraph/src/litegraph'
import { LiteGraph } from '@/lib/litegraph/src/litegraph'
import { outputLinks } from '@/lib/litegraph/src/node/slotLinks'
import { slotTypeKey } from '@/lib/litegraph/src/utils/type'
import type { SerializedNodeId } from '@/types/nodeId'
import { parseNodeId } from '@/types/nodeId'
import type {
Expand Down Expand Up @@ -229,7 +230,9 @@ export class GroupNodeConfig {
if (!linksFrom) return

const firstLink = linksFrom[0]?.at(0)
let type: string | number | null = firstLink?.[5] ?? null
let type: string | number | null = firstLink
? slotTypeKey(firstLink[5])
: null
if (type === 'COMBO') {
// Use the array items
const output = node.outputs?.[0]
Expand Down Expand Up @@ -326,13 +329,14 @@ export class GroupNodeConfig {
}

config.forceInput = true
const rerouteTypeKey = slotTypeKey(rerouteType)
return {
input: {
required: {
[rerouteType]: [rerouteType, config]
[rerouteTypeKey]: [rerouteTypeKey, config]
}
},
output: [rerouteType],
output: [rerouteTypeKey],
output_name: [],
output_is_list: []
}
Expand Down
3 changes: 2 additions & 1 deletion src/extensions/core/rerouteNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
} from '@/lib/litegraph/src/litegraph'
import type { ISlotType } from '@/lib/litegraph/src/interfaces'
import { outputLinks } from '@/lib/litegraph/src/node/slotLinks'
import { slotTypeKey } from '@/lib/litegraph/src/utils/type'

import { app } from '../../scripts/app'
import { getWidgetConfig, mergeIfValid, setWidgetConfig } from './widgetInputs'
Expand Down Expand Up @@ -115,7 +116,7 @@ app.registerExtension({
}
}

const displayType = inputType || outputType || '*'
const displayType = slotTypeKey(inputType || outputType || '*')
const color = LGraphCanvas.link_type_colors[displayType]

let widgetConfig
Expand Down
3 changes: 2 additions & 1 deletion src/extensions/core/widgetInputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import type {
import type { IWidgetLocator } from '@/lib/litegraph/src/interfaces'
import { NodeSlot } from '@/lib/litegraph/src/node/NodeSlot'
import { outputHasLinks, outputLinks } from '@/lib/litegraph/src/node/slotLinks'
import { slotTypeKey } from '@/lib/litegraph/src/utils/type'
import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
import { assetService } from '@/platform/assets/services/assetService'
import { createAssetWidget } from '@/platform/assets/utils/createAssetWidget'
Expand Down Expand Up @@ -196,7 +197,7 @@ export class PrimitiveNode extends LGraphNode {
) {
// Fires before the link is made allowing us to reject it if it isn't valid
// No widget, we can't connect
if (!input.widget && !(input.type in ComfyWidgets)) {
if (!input.widget && !(slotTypeKey(input.type) in ComfyWidgets)) {
return false
}

Expand Down
20 changes: 14 additions & 6 deletions src/lib/litegraph/src/LGraph.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import {
} from './__fixtures__/duplicateLinks'
import { duplicateSubgraphNodeIds } from './__fixtures__/duplicateSubgraphNodeIds'
import { nestedSubgraphProxyWidgets } from './__fixtures__/nestedSubgraphProxyWidgets'
import { nodeIdSpaceExhausted } from './__fixtures__/nodeIdSpaceExhausted'
import { nodeIdsAtFormerLimit } from './__fixtures__/nodeIdsAtFormerLimit'
import { uniqueSubgraphNodeIds } from './__fixtures__/uniqueSubgraphNodeIds'
import { test } from './__fixtures__/testExtensions'

Expand Down Expand Up @@ -2347,11 +2347,19 @@ describe('deduplicateSubgraphNodeIds (via configure)', () => {
})
})

it('throws when node ID space is exhausted', () => {
expect(() => {
const graph = new LGraph()
graph.configure(structuredClone(nodeIdSpaceExhausted))
}).toThrow('Node ID space exhausted')
it('remaps duplicate node IDs above the former fixed limit', () => {
const graph = new LGraph()

graph.configure(structuredClone(nodeIdsAtFormerLimit))

expect(nodeIdSet(graph, SUBGRAPH_B)).toEqual(
new Set([
toNodeId(100_000_001),
toNodeId(100_000_002),
toNodeId(100_000_003)
])
)
expect(graph.state.lastNodeId).toBe(100_000_003)
})

it('is a no-op when subgraph node IDs are already unique', () => {
Expand Down
Loading
Loading