From c87ef56d32fedb0fa0ef20a28b74898fb2abc4c8 Mon Sep 17 00:00:00 2001 From: DrJKL Date: Wed, 11 Nov 2026 14:13:23 -0800 Subject: [PATCH 01/21] perf: show downscaled previews for large images in Vue nodes - Downscale preview images to at most 1024px in a Web Worker pool and show the blob copy; the original stays on data-full-src for copy, clipspace, mask editor and open/save - Keep one cache-buster per outputs object so the same output is not downloaded twice and the HTTP cache applies - Skip the legacy full-size canvas preview load in Vue nodes mode - Load preview images with decoding=async and loading=lazy - Add a @perf test comparing a grid of 4096px and 256px previews --- browser_tests/fixtures/utils/largePng.ts | 43 +++++ .../performance/largeImagePreview.spec.ts | 150 ++++++++++++++++++ .../composables/useMaskEditorLoader.test.ts | 7 +- .../composables/useMaskEditorLoader.ts | 3 +- .../vueNodes/components/ImagePreview.test.ts | 29 ++++ .../vueNodes/components/ImagePreview.vue | 45 +++++- .../vueNodes/utils/downscaleImage.worker.ts | 40 +++++ .../vueNodes/utils/downscaleImageMessages.ts | 18 +++ .../vueNodes/utils/downscaledImage.ts | 107 +++++++++++++ .../composables/useImageUploadWidget.ts | 8 +- src/scripts/clipspace.ts | 3 +- src/services/litegraphService.ts | 4 +- src/stores/nodeOutputStore.test.ts | 23 +++ src/stores/nodeOutputStore.ts | 16 +- src/utils/hdrFormatUtil.test.ts | 19 ++- src/utils/hdrFormatUtil.ts | 10 +- 16 files changed, 504 insertions(+), 21 deletions(-) create mode 100644 browser_tests/fixtures/utils/largePng.ts create mode 100644 browser_tests/tests/performance/largeImagePreview.spec.ts create mode 100644 src/renderer/extensions/vueNodes/utils/downscaleImage.worker.ts create mode 100644 src/renderer/extensions/vueNodes/utils/downscaleImageMessages.ts create mode 100644 src/renderer/extensions/vueNodes/utils/downscaledImage.ts diff --git a/browser_tests/fixtures/utils/largePng.ts b/browser_tests/fixtures/utils/largePng.ts new file mode 100644 index 00000000000..7f775792bef --- /dev/null +++ b/browser_tests/fixtures/utils/largePng.ts @@ -0,0 +1,43 @@ +import { crc32, deflateSync } from 'node:zlib' + +function chunk(type: string, data: Buffer): Buffer { + const length = Buffer.alloc(4) + length.writeUInt32BE(data.length) + const typeAndData = Buffer.concat([Buffer.from(type, 'ascii'), data]) + const crc = Buffer.alloc(4) + crc.writeUInt32BE(crc32(typeAndData)) + return Buffer.concat([length, typeAndData, crc]) +} + +/** Encodes a noisy RGB gradient PNG whose size and entropy resemble a real upscaled output. */ +export function createLargePng( + width: number, + height: number, + seed = 1 +): Buffer { + const stride = width * 3 + 1 + const raw = Buffer.alloc(stride * height) + let state = seed + for (let y = 0; y < height; y++) { + raw[y * stride] = 0 + for (let x = 0; x < width; x++) { + state = (state * 1103515245 + 12345) >>> 0 + const noise = (state >>> 24) & 0x1f + const offset = y * stride + 1 + x * 3 + raw[offset] = ((x * 255) / width + noise) & 0xff + raw[offset + 1] = ((y * 255) / height + noise) & 0xff + raw[offset + 2] = (seed * 37 + noise * 3) & 0xff + } + } + const header = Buffer.alloc(13) + header.writeUInt32BE(width, 0) + header.writeUInt32BE(height, 4) + header[8] = 8 + header[9] = 2 + return Buffer.concat([ + Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]), + chunk('IHDR', header), + chunk('IDAT', deflateSync(raw, { level: 1 })), + chunk('IEND', Buffer.alloc(0)) + ]) +} diff --git a/browser_tests/tests/performance/largeImagePreview.spec.ts b/browser_tests/tests/performance/largeImagePreview.spec.ts new file mode 100644 index 00000000000..f47f07fceda --- /dev/null +++ b/browser_tests/tests/performance/largeImagePreview.spec.ts @@ -0,0 +1,150 @@ +import type { ComfyPage } from '@e2e/fixtures/ComfyPage' +import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage' +import { createLargePng } from '@e2e/fixtures/utils/largePng' +import { + logMeasurement, + recordMeasurement +} from '@e2e/fixtures/utils/perfReporter' +import type { ComfyWorkflowJSON } from '@comfyorg/graph-model/workflowSchema' + +const COLUMNS = 4 +const ROWS = 3 +const NODE_COUNT = COLUMNS * ROWS +const NODE_SIZE: [number, number] = [315, 314] +const SPACING = 340 + +function imageNames(size: number): string[] { + return Array.from({ length: NODE_COUNT }, (_, i) => `perf_${size}_${i}.png`) +} + +async function uploadImages(comfyPage: ComfyPage, size: number) { + for (const [i, name] of imageNames(size).entries()) { + const response = await comfyPage.page.request.post( + `${comfyPage.url}/api/upload/image`, + { + multipart: { + image: { + name, + mimeType: 'image/png', + buffer: createLargePng(size, size, i + 1) + }, + overwrite: 'true', + type: 'input' + } + } + ) + test.expect(response.ok()).toBe(true) + } +} + +function gridWorkflow(size: number): ComfyWorkflowJSON { + return { + last_node_id: NODE_COUNT, + last_link_id: 0, + nodes: imageNames(size).map((name, i) => ({ + id: i + 1, + type: 'LoadImage', + pos: [(i % COLUMNS) * SPACING, Math.floor(i / COLUMNS) * SPACING], + size: NODE_SIZE, + flags: {}, + order: i, + mode: 0, + inputs: [], + outputs: [ + { name: 'IMAGE', type: 'IMAGE', links: null }, + { name: 'MASK', type: 'MASK', links: null } + ], + properties: { 'Node name for S&R': 'LoadImage' }, + widgets_values: [name, 'image'] + })), + links: [], + groups: [], + config: {}, + extra: { ds: { offset: [40, 40], scale: 0.5 } }, + version: 0.4 + } +} + +async function waitForAllImagesDecoded(comfyPage: ComfyPage) { + await test + .expect(comfyPage.page.getByTestId('main-image')) + .toHaveCount(NODE_COUNT, { timeout: 30_000 }) + await comfyPage.page.waitForFunction( + async (count) => { + const imgs = [ + ...document.querySelectorAll( + '[data-testid="main-image"]' + ) + ] + if (imgs.length !== count) return false + if (!imgs.every((img) => img.complete && img.naturalWidth > 0)) + return false + await Promise.all(imgs.map((img) => img.decode())) + return true + }, + NODE_COUNT, + { timeout: 30_000, polling: 100 } + ) +} + +const LOGGED_FIELDS = [ + 'durationMs', + 'frameDurationMs', + 'p95FrameDurationMs', + 'totalBlockingTimeMs', + 'taskDurationMs', + 'heapUsedBytes' +] as const + +for (const size of [4096, 256]) { + test.describe( + `Image previews ${size}px`, + { tag: ['@vue-nodes', '@perf'] }, + () => { + test.setTimeout(120_000) + + test.beforeEach(async ({ comfyPage }) => { + await uploadImages(comfyPage, size) + }) + + test('load, pan and zoom a 4x3 grid', async ({ comfyPage }) => { + const { page } = comfyPage + const label = (phase: string) => `image-preview-${size}-${phase}` + + await comfyPage.perf.startMeasuring() + await comfyPage.workflow.loadGraphData(gridWorkflow(size)) + await waitForAllImagesDecoded(comfyPage) + const load = await comfyPage.perf.stopMeasuring(label('load')) + recordMeasurement(load) + logMeasurement(label('load'), load, [...LOGGED_FIELDS]) + + const box = await comfyPage.canvas.boundingBox() + test.expect(box).not.toBeNull() + const cx = box!.x + box!.width / 2 + const cy = box!.y + box!.height / 2 + + await comfyPage.perf.startMeasuring() + await page.mouse.move(cx, cy) + await page.mouse.down({ button: 'middle' }) + for (let i = 0; i < 60; i++) { + await page.mouse.move(cx + Math.sin(i / 6) * 300, cy + (i % 20) * 8) + await comfyPage.nextFrame() + } + await page.mouse.up({ button: 'middle' }) + const pan = await comfyPage.perf.stopMeasuring(label('pan')) + recordMeasurement(pan) + logMeasurement(label('pan'), pan, [...LOGGED_FIELDS]) + + await comfyPage.perf.startMeasuring() + await page.mouse.move(cx, cy) + for (let i = 0; i < 30; i++) { + await page.mouse.wheel(0, i < 15 ? -120 : 120) + await comfyPage.nextFrame() + } + const zoom = await comfyPage.perf.stopMeasuring(label('zoom')) + recordMeasurement(zoom) + logMeasurement(label('zoom'), zoom, [...LOGGED_FIELDS]) + }) + } + ) +} diff --git a/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.test.ts b/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.test.ts index 4db87f37437..356a14ec7b6 100644 --- a/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.test.ts +++ b/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.test.ts @@ -62,7 +62,12 @@ function createLoadImageNode( return fromAny({ id: nodeId, type: 'LoadImage', - imgs: [{ src: 'http://localhost:8188/api/view?filename=whatever.png' }], + imgs: [ + { + src: 'http://localhost:8188/api/view?filename=whatever.png', + dataset: {} + } + ], images, graph: { rootGraph: { id: GRAPH_ID } } }) diff --git a/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.ts b/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.ts index c24bf878669..f6c4482ac1a 100644 --- a/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.ts +++ b/src/renderer/extensions/maskEditor/composables/useMaskEditorLoader.ts @@ -10,6 +10,7 @@ import { useNodeOutputStore } from '@/stores/nodeOutputStore' import { isCloud } from '@/platform/distribution/types' import { api } from '@/scripts/api' import { useApp } from '@/scripts/appInstance' +import { fullResolutionSrc } from '@/utils/hdrFormatUtil' import { extractWidgetStringValue, parseImageWidgetValue @@ -259,7 +260,7 @@ export function useMaskEditorLoader() { if (node.imgs?.length) { const index = node.imageIndex ?? 0 - const imgSrc = node.imgs[index].src + const imgSrc = fullResolutionSrc(node.imgs[index]) if (imgSrc && !imgSrc.startsWith('data:')) { return imgSrc diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts index 5372fbf6663..8ea9038ace0 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts @@ -30,6 +30,17 @@ vi.mock(import('@comfyorg/telemetry')) vi.mock(import('@/utils/litegraphUtil'), { spy: true }) +const displayImages = vi.hoisted(() => ({ supported: false })) + +vi.mock(import('@/renderer/extensions/vueNodes/utils/downscaledImage'), () => ({ + canDownscaleImages: () => displayImages.supported, + getDisplayImage: async (source: string) => ({ + source, + url: 'blob:display-copy', + originalSize: { width: 4096, height: 4096 } + }) +})) + const i18n = createI18n({ legacy: false, locale: 'en', @@ -90,6 +101,24 @@ describe('ImagePreview', () => { await nextTick() } + it('shows a downscaled copy while keeping the full-resolution source', async () => { + displayImages.supported = true + try { + renderImagePreview({ + imageUrls: ['/api/view?filename=large.png&type=output'] + }) + + const image = await screen.findByTestId('main-image') + expect(image).toHaveAttribute('src', 'blob:display-copy') + expect(image).toHaveAttribute( + 'data-full-src', + '/api/view?filename=large.png&type=output' + ) + } finally { + displayImages.supported = false + } + }) + it('does not render when no imageUrls provided', () => { const { container } = renderImagePreview({ imageUrls: [] }) diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.vue b/src/renderer/extensions/vueNodes/components/ImagePreview.vue index a7cf536e124..cccdcf0f333 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.vue +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.vue @@ -34,6 +34,8 @@ :src="url" :alt="`${$t('g.galleryThumbnail')} ${index + 1}`" draggable="false" + decoding="async" + loading="lazy" class="size-full object-contain" @load="updateAspectRatio($event, index)" @error="failedHdrPreviews[index] = true" @@ -113,13 +115,16 @@ diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts index 153d3291dc7..72bcc874964 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts @@ -21,6 +21,7 @@ import { createI18n } from 'vue-i18n' import { LGraphEventMode, TitleMode } from '@comfyorg/graph-model/globalEnums' import type { LGraphNode as LiteGraphNode } from '@/lib/litegraph/src/litegraph' +import type { ResultItem } from '@comfyorg/api-client/executionTypes' import type { NodeState } from '@comfyorg/graph-model/nodeState' import { resizeNodeLayout } from '@/renderer/core/layout/operations/graphLayoutAttachment' import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue' @@ -192,13 +193,22 @@ function renderLGraphNode(props: ComponentProps) { NodeContent: { props: ['media'], template: - '
{{ media?.urls?.join(",") }}
' + '
{{ media?.items?.map((item) => item.filename).join(",") }}
' }, SlotConnectionDot: true } } }) } +function seedNodeOutputs(images: ResultItem[]) { + const outputs = useNodeOutputStore() + outputs.nodeOutputs['test-node-123'] = { images } + vi.mocked(outputs.getNodeOutputs).mockImplementation( + () => outputs.nodeOutputs['test-node-123'] + ) + return outputs +} + const mockNodeData: NodeState = { id: toNodeId('test-node-123'), graphId: 'test-graph', @@ -365,12 +375,7 @@ describe('LGraphNode', () => { suppression: { byExtension: false, byConnection: false } } ) - useNodeOutputStore().nodeOutputs['test-node-123'] = { - images: [{ filename: 'output.png', type: 'output' }] - } - vi.mocked(useNodeOutputStore().getNodeImageUrls).mockReturnValue([ - '/output.png' - ]) + seedNodeOutputs([{ filename: 'output.png', type: 'output' }]) const { container } = renderLGraphNode({ nodeData: { ...mockNodeData, graphId: 'graph-test' } @@ -395,11 +400,9 @@ describe('LGraphNode', () => { widgetId('graph-test', mockNodeData.id, 'prompt'), { name: 'prompt', type: 'customtext', value: '', options: {} } ) - const outputs = useNodeOutputStore() - outputs.nodeOutputs['test-node-123'] = { - images: [{ filename: 'output.png', type: 'output' }] - } - vi.mocked(outputs.getNodeImageUrls).mockReturnValue(['/output.png']) + const outputs = seedNodeOutputs([ + { filename: 'output.png', type: 'output' } + ]) const { container } = renderLGraphNode({ nodeData: { ...mockNodeData, graphId: 'graph-test' } }) @@ -472,11 +475,7 @@ describe('LGraphNode', () => { isInputConnected: vi.fn(() => true), isSubgraphNode: () => false } - const nodeOutputStore = useNodeOutputStore() - nodeOutputStore.nodeOutputs['test-node-123'] = { - images: [{ filename: 'input.png', type: 'input' }] - } - vi.mocked(nodeOutputStore.getNodeImageUrls).mockReturnValue(['/input.png']) + seedNodeOutputs([{ filename: 'input.png', type: 'input' }]) renderLGraphNode({ nodeData: { @@ -498,11 +497,7 @@ describe('LGraphNode', () => { isInputConnected: vi.fn(() => true), isSubgraphNode: () => false } - const nodeOutputStore = useNodeOutputStore() - nodeOutputStore.nodeOutputs['test-node-123'] = { - images: [{ filename: 'output.png', type: 'output' }] - } - vi.mocked(nodeOutputStore.getNodeImageUrls).mockReturnValue(['/output.png']) + seedNodeOutputs([{ filename: 'output.png', type: 'output' }]) renderLGraphNode({ nodeData: { @@ -544,9 +539,7 @@ describe('LGraphNode', () => { nodeData: { ...mockNodeData, id: nodeId, graphId: 'graph-test' } }) - expect(screen.getByTestId('node-content')).toHaveTextContent( - 'filename=output.png' - ) + expect(screen.getByTestId('node-content')).toHaveTextContent('output.png') } ) diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.vue b/src/renderer/extensions/vueNodes/components/LGraphNode.vue index f0f7ea269be..9b33101ec51 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.vue +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.vue @@ -174,12 +174,16 @@ " > - + > + + + { if (promotedPreviews.value.length > 0) return true - return !!nodeMedia.value && nodeMedia.value.urls.length > 0 + return !!nodeMedia.value && nodeMedia.value.items.length > 0 }) // Computed classes and conditions for better reusability @@ -688,26 +692,18 @@ const hasVideoPreviewWidget = computed(() => ) const nodeMedia = computed(() => { - const locatorId = nodeLocatorId.value - const newOutputs = locatorId ? nodeOutputs.nodeOutputs[locatorId] : undefined const node = lgraphNode.value - - if ( - !node || - !newOutputs?.images?.length || - node.hideOutputImages || - hideExecutedOutput.value - ) + if (!node || node.hideOutputImages || hideExecutedOutput.value) return undefined - if (node instanceof SubgraphNode) return undefined - if (shouldHideLinkedCoreMediaInputPreview(node, newOutputs)) return undefined - const urls = nodeOutputs.getNodeImageUrls(node) - if (!urls?.length) return undefined + const outputs = nodeOutputs.getNodeOutputs(node) + if (!outputs) return undefined + + if (shouldHideLinkedCoreMediaInputPreview(node, outputs)) return undefined const type = - isVideoOutput(newOutputs) || + isVideoOutput(outputs) || node.previewMediaType === 'video' || (!node.previewMediaType && hasVideoInput.value) ? 'video' @@ -715,7 +711,10 @@ const nodeMedia = computed(() => { if (type === 'video' && hasVideoPreviewWidget.value) return undefined - return { type, urls } as const + const items = nodeOutputs.getNodeOutputItems(node, outputs) + if (!items.length) return undefined + + return { type, items } as const }) // Drag and drop support diff --git a/src/renderer/extensions/vueNodes/components/NodeContent.vue b/src/renderer/extensions/vueNodes/components/NodeContent.vue index bbfbc056115..60d309aa0e2 100644 --- a/src/renderer/extensions/vueNodes/components/NodeContent.vue +++ b/src/renderer/extensions/vueNodes/components/NodeContent.vue @@ -10,18 +10,18 @@ () -const hasMedia = computed(() => props.media && props.media.urls.length > 0) +const hasMedia = computed(() => props.media && props.media.items.length > 0) const nodeId = computed(() => props.nodeData?.id) diff --git a/src/stores/nodeOutputStore.test.ts b/src/stores/nodeOutputStore.test.ts index bca5746d9de..5d5885dfe12 100644 --- a/src/stores/nodeOutputStore.test.ts +++ b/src/stores/nodeOutputStore.test.ts @@ -14,6 +14,7 @@ import { import { toNodeId } from '@comfyorg/graph-model/nodeId' import * as graphTraversalUtil from '@/utils/graphTraversalUtil' import * as litegraphUtil from '@/utils/litegraphUtil' +import { resultItemPreviewUrl } from '@/utils/resultItemUrl' vi.mock(import('@/utils/litegraphUtil'), () => ({ isAnimatedOutput: vi.fn(), @@ -1030,12 +1031,37 @@ describe('nodeOutputStore image url cache busting', () => { store.setNodeOutputs(node, 'same-name.png') const first = store.getNodeImageUrls(node) + const firstItems = store.getNodeOutputItems(node) const again = store.getNodeImageUrls(node) + const againItems = store.getNodeOutputItems(node) store.setNodeOutputs(node, 'same-name.png') const afterReload = store.getNodeImageUrls(node) + const afterItems = store.getNodeOutputItems(node) expect(again).toEqual(first) expect(afterReload).not.toEqual(first) + expect(againItems).toEqual(firstItems) + expect( + firstItems.map((item) => + new URL( + resultItemPreviewUrl(item), + window.location.origin + ).searchParams.get('rand') + ) + ).toEqual(['0']) + expect( + afterItems.map((item) => + new URL( + resultItemPreviewUrl(item), + window.location.origin + ).searchParams.get('rand') + ) + ).toEqual(['1']) + expect( + afterItems.map((item) => resultItemPreviewUrl(item, { fullRes: true })) + ).not.toEqual( + firstItems.map((item) => resultItemPreviewUrl(item, { fullRes: true })) + ) }) }) diff --git a/src/stores/nodeOutputStore.ts b/src/stores/nodeOutputStore.ts index b5a10dd6f61..20ac7ce38b3 100644 --- a/src/stores/nodeOutputStore.ts +++ b/src/stores/nodeOutputStore.ts @@ -15,6 +15,9 @@ import type { ResultItem } from '@comfyorg/api-client/executionTypes' import type { ResultItemType } from '@comfyorg/api-client/resultItemTypeSchema' +import { parseNodeOutput } from '@/stores/resultItemParsing' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' +import { resultItemPreviewUrl, resultItemUrl } from '@/utils/resultItemUrl' import { api } from '@/scripts/api' import { useApp } from '@/scripts/appInstance' import { clone } from '@/scripts/utils' @@ -169,6 +172,33 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { return rand } + function getNodeOutputItems( + node: LGraphNode, + outputs = getNodeOutputs(node) + ) { + if (!outputs) return [] + const rand = randParamFor(outputs) + return parseNodeOutput(node.id, outputs).map((item) => { + const { filepath, rootFolder } = parseAnnotatedPath( + item.filename, + item.type + ) + const result = { + ...item, + filename: + node.comfyClass === 'LoadImageOutput' ? item.filename : filepath, + type: rootFolder + } + return { + ...result, + url: resultItemUrl(result) + rand, + previewUrl: isHdrImageFilename(result.filename) + ? resultItemPreviewUrl(result) + : resultItemPreviewUrl(result) + getPreviewParam(node, outputs) + rand + } + }) + } + function buildImageUrls( node: LGraphNode, outputs: ExecutedWsMessage['output'] | undefined @@ -615,6 +645,7 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { return { getNodeOutputs, + getNodeOutputItems, getNodeImageUrls, getNodeImageUrlsByExecutionId, getNodeOutputByExecutionId, diff --git a/src/utils/createAnnotatedPath.ts b/src/utils/createAnnotatedPath.ts index 8e742cec357..73b919b6d21 100644 --- a/src/utils/createAnnotatedPath.ts +++ b/src/utils/createAnnotatedPath.ts @@ -23,6 +23,10 @@ type AnnotatedPathOptions = { subfolder?: string } +export function parseAnnotatedPath( + filepath: string, + fallbackRoot?: Fallback +): { filepath: string; rootFolder: ResultItemType | Fallback } export function parseAnnotatedPath( filepath: string, fallbackRoot: string = IMPLICIT_ASSET_ROOT diff --git a/src/utils/resultItem.ts b/src/utils/resultItem.ts index 00ae83a5188..d131b4c00e2 100644 --- a/src/utils/resultItem.ts +++ b/src/utils/resultItem.ts @@ -1,6 +1,7 @@ import type { ResultItem } from '@comfyorg/api-client/executionTypes' import type { SerializedNodeId } from '@comfyorg/graph-model/nodeId' import { getMediaTypeFromFilename } from '@/utils/formatUtil' +import { isHdrImageFilename } from '@/utils/hdrFormatUtil' export interface AugmentedResultItem extends ResultItem { filename: string @@ -42,6 +43,9 @@ export function isVideoResult(item: AugmentedResultItem): boolean { (isVideoByType && !isImageBySuffix(item) && !isAudioBySuffix(item)) ) } +export function isHdrResult(item: AugmentedResultItem): boolean { + return isHdrImageFilename(item.filename) +} export function isImageResult(item: AugmentedResultItem): boolean { if (hasResolvedMediaType(item)) return item.mediaType === 'images' diff --git a/src/utils/resultItemUrl.test.ts b/src/utils/resultItemUrl.test.ts index 3ca0b651dbe..b2aefc4976e 100644 --- a/src/utils/resultItemUrl.test.ts +++ b/src/utils/resultItemUrl.test.ts @@ -17,6 +17,16 @@ function resultItem( } describe('resultItemPreviewUrl', () => { + it('keeps the original URL and its revision when requesting full resolution', () => { + const item = resultItem({ + url: '/api/view?filename=out.png&type=output&rand=second', + previewUrl: + '/api/view?filename=out.png&type=output&preview=webp;75&rand=second' + }) + expect(resultItemPreviewUrl(item, { fullRes: true })).toBe(item.url) + expect(resultItemPreviewUrl(item)).toBe(item.previewUrl) + }) + it.for([ { filename: 'render.exr', @@ -28,7 +38,6 @@ describe('resultItemPreviewUrl', () => { preview_id: 'p1', pathname: '/api/assets/p1/content' }, - { filename: 'render.exr', preview_id: undefined, pathname: '/api/view' }, { filename: 'render.png', preview_id: 'p1', pathname: '/api/view' } ])( 'resolves $filename with preview_id $preview_id to $pathname', @@ -40,4 +49,10 @@ describe('resultItemPreviewUrl', () => { expect(url.pathname).toBe(pathname) } ) + + it('resolves no preview for an HDR output without a stored preview', () => { + expect(resultItemPreviewUrl(resultItem({ filename: 'render.exr' }))).toBe( + '' + ) + }) }) diff --git a/src/utils/resultItemUrl.ts b/src/utils/resultItemUrl.ts index 4985ac9592b..0eba9429eb8 100644 --- a/src/utils/resultItemUrl.ts +++ b/src/utils/resultItemUrl.ts @@ -1,6 +1,6 @@ +import { hdrPreviewAssetUrl, isHdrImageFilename } from '@/utils/hdrFormatUtil' import { appendCloudResParam } from '@/platform/distribution/cloudPreviewUtil' import { api } from '@/scripts/api' -import { hdrPreviewAssetUrl, isHdrImageFilename } from '@/utils/hdrFormatUtil' import type { AugmentedResultItem } from '@/utils/resultItem' import { isImageResult } from '@/utils/resultItem' @@ -20,10 +20,17 @@ export function resultItemUrl(item: AugmentedResultItem): string { return api.apiURL('/view?' + resultItemUrlParams(item)) } -export function resultItemPreviewUrl(item: AugmentedResultItem): string { +export function resultItemPreviewUrl( + item: AugmentedResultItem, + options: { fullRes?: boolean } = {} +): string { + if (isHdrImageFilename(item.filename)) + return ( + item.previewUrl ?? + (item.preview_id ? hdrPreviewAssetUrl(item.preview_id) : '') + ) + if (options.fullRes) return resultItemUrl(item) if (item.previewUrl !== undefined) return item.previewUrl - if (item.preview_id && isHdrImageFilename(item.filename)) - return hdrPreviewAssetUrl(item.preview_id) if (!isImageResult(item)) return resultItemUrl(item) const params = resultItemUrlParams(item) appendCloudResParam(params, item.filename) From 67f43bb76c5c004f557c91ac049e6b67260667c0 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Thu, 12 Nov 2026 18:56:34 +0000 Subject: [PATCH 18/21] fix: keep widget-specific images out of generic previews --- .../vueNodes/components/LGraphNode.vue | 2 +- src/services/litegraphService.test.ts | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.vue b/src/renderer/extensions/vueNodes/components/LGraphNode.vue index 9b33101ec51..6034e546ad3 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.vue +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.vue @@ -698,7 +698,7 @@ const nodeMedia = computed(() => { if (node instanceof SubgraphNode) return undefined const outputs = nodeOutputs.getNodeOutputs(node) - if (!outputs) return undefined + if (!outputs?.images?.length) return undefined if (shouldHideLinkedCoreMediaInputPreview(node, outputs)) return undefined diff --git a/src/services/litegraphService.test.ts b/src/services/litegraphService.test.ts index b0cbce88383..d79507f4571 100644 --- a/src/services/litegraphService.test.ts +++ b/src/services/litegraphService.test.ts @@ -246,6 +246,40 @@ describe('useLitegraphService().registerNodeDef custom widget metadata', () => { }) }) +describe('canvas image context menu', () => { + it.for([ + { state: 'selected', imageIndex: 0, overIndex: null }, + { state: 'hovered', imageIndex: null, overIndex: 0 } + ])( + 'offers image actions for the $state image at index zero', + async (state) => { + const nodeName = 'TestFirstImageMenu' + await useLitegraphService().registerNodeDef( + nodeName, + createNodeDefV1({ name: nodeName }) + ) + const node = LiteGraph.createNode(nodeName) + assert.exists(node) + const image = document.createElement('img') + image.src = 'http://localhost/view?filename=first.png' + node.imgs = [image] + node.imageIndex = state.imageIndex + node.overIndex = state.overIndex + const options: (IContextMenuValue | null)[] = [] + + node.getExtraMenuOptions?.(app.canvas, options) + + expect(options).toEqual( + expect.arrayContaining([ + expect.objectContaining({ content: 'Open Image' }), + expect.objectContaining({ content: 'Copy Image' }), + expect.objectContaining({ content: 'Save Image' }) + ]) + ) + } + ) +}) + describe('canvas Copy Image action', () => { it('preserves original bounds when clipboard requires PNG conversion', async () => { const nodeName = 'TestOriginalImageCopy' From cea251871ccbfe3c8c2b17212ca2c21b3d27f0e4 Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Thu, 12 Nov 2026 19:21:54 +0000 Subject: [PATCH 19/21] fix: preserve preview media types and fallback behavior --- .../node/usePromotedPreviews.test.ts | 26 +++++++++++++++++++ src/composables/node/usePromotedPreviews.ts | 13 +++++++--- .../components/ImagePreview.stories.ts | 4 ++- .../vueNodes/components/ImagePreview.test.ts | 6 ++++- .../vueNodes/components/ImagePreview.vue | 12 ++++++++- .../vueNodes/components/LGraphNode.test.ts | 16 ++++++++++++ .../vueNodes/components/LGraphNode.vue | 4 ++- src/stores/nodeOutputStore.test.ts | 18 +++++++++++++ src/stores/nodeOutputStore.ts | 12 ++++++--- 9 files changed, 100 insertions(+), 11 deletions(-) diff --git a/src/composables/node/usePromotedPreviews.test.ts b/src/composables/node/usePromotedPreviews.test.ts index 0221f310191..3cd16b6e8fc 100644 --- a/src/composables/node/usePromotedPreviews.test.ts +++ b/src/composables/node/usePromotedPreviews.test.ts @@ -155,6 +155,32 @@ describe(usePromotedPreviews, () => { expect(promotedPreviews.value[0].type).toBe('video') }) + it.for([ + { bucket: 'video', filename: 'output.webm', expected: 'video' }, + { bucket: 'audio', filename: 'output.flac', expected: 'audio' } + ])( + 'infers promoted $expected output without a node media hint', + ({ bucket, filename, expected }) => { + const setup = createSetup() + addInteriorNode(setup) + exposePreview(setup, '10') + useNodeOutputStore().nodeOutputs[ + createNodeLocatorId(setup.subgraph.id, toNodeId(10)) + ] = { + [bucket]: [{ filename }] + } + + const { promotedPreviews } = usePromotedPreviews(() => setup.subgraphNode) + + expect(promotedPreviews.value).toEqual([ + expect.objectContaining({ + type: expected, + items: outputItems(filename) + }) + ]) + } + ) + it('defaults preview type to image when previewMediaType is unset', () => { const { setup, items } = arrangePromotedPreview() diff --git a/src/composables/node/usePromotedPreviews.ts b/src/composables/node/usePromotedPreviews.ts index b08142a8551..7d4f1406eed 100644 --- a/src/composables/node/usePromotedPreviews.ts +++ b/src/composables/node/usePromotedPreviews.ts @@ -11,6 +11,7 @@ import { usePreviewExposureStore } from '@/stores/previewExposureStore' import type { AugmentedResultItem } from '@/utils/resultItem' +import { isAudioResult, isVideoResult } from '@/utils/resultItem' import type { NodeId } from '@comfyorg/graph-model/nodeId' import { appendNodeExecutionId, @@ -30,9 +31,15 @@ type PromotedPreview = PromotedContent & { sourceWidgetName: string } -function getPreviewMediaType(node: LGraphNode): PromotedOutput['type'] { +function getPreviewMediaType( + node: LGraphNode, + items: AugmentedResultItem[] +): PromotedOutput['type'] { const media = node.previewMediaType - return media === 'video' || media === 'audio' ? media : 'image' + if (media === 'image' || media === 'video' || media === 'audio') return media + if (items.some(isVideoResult)) return 'video' + if (items.some(isAudioResult)) return 'audio' + return 'image' } export function usePromotedPreviews( @@ -50,7 +57,7 @@ export function usePromotedPreviews( if (url) return { type: 'preview', url } if (!outputs) return undefined const items = nodeOutputStore.getNodeOutputItems(node, outputs) - if (items.length) return { type: getPreviewMediaType(node), items } + if (items.length) return { type: getPreviewMediaType(node, items), items } return undefined } diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.stories.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.stories.ts index 31d1be21d76..e7420f2d5bb 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.stories.ts +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.stories.ts @@ -5,13 +5,15 @@ import type { AugmentedResultItem } from '@/utils/resultItem' import ImagePreview from './ImagePreview.vue' function sampleItem(seed: string, previewUrl?: string): AugmentedResultItem { + const url = previewUrl ?? `https://picsum.photos/seed/${seed}/800/600` return { filename: `${seed}.png`, subfolder: '', type: 'output', mediaType: 'images', nodeId: '1', - previewUrl: previewUrl ?? `https://picsum.photos/seed/${seed}/800/600` + url, + previewUrl: url } } diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts index 5069e89a122..db3fc8496b4 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.test.ts @@ -324,11 +324,15 @@ describe('ImagePreview', () => { ).not.toBeInTheDocument() }) - it('offers the HDR viewer instead of an for exr outputs', () => { + it('offers the HDR viewer without a persistent loader for exr outputs', async () => { renderImagePreview({ items: [outputItem('out.exr')] }) + await vi.advanceTimersByTimeAsync(300) expect(screen.getByTestId('hdr-open-button')).toBeInTheDocument() expect(screen.queryByTestId('main-image')).not.toBeInTheDocument() + expect( + screen.queryByRole('status', { name: 'Loading' }) + ).not.toBeInTheDocument() }) it('shows the server preview of an exr output and still offers the HDR viewer', async () => { diff --git a/src/renderer/extensions/vueNodes/components/ImagePreview.vue b/src/renderer/extensions/vueNodes/components/ImagePreview.vue index 53c87de3e3c..1ca7d022e9f 100644 --- a/src/renderer/extensions/vueNodes/components/ImagePreview.vue +++ b/src/renderer/extensions/vueNodes/components/ImagePreview.vue @@ -87,7 +87,17 @@

-
+
{ expect(screen.queryByTestId('node-content')).not.toBeInTheDocument() }) + it('limits a generic image preview to the images output bucket', () => { + const outputs = seedNodeOutputs([ + { filename: 'output.png', type: 'output' } + ]) + outputs.nodeOutputs['test-node-123'] = { + images: [{ filename: 'output.png', type: 'output' }], + video: [{ filename: 'output.webm', type: 'output' }] + } + + renderLGraphNode({ nodeData: mockNodeData }) + + expect(screen.getByTestId('node-content')).toHaveTextContent( + /^output\.png$/ + ) + }) + it('keeps an executed output preview when the LoadImage selector is linked', () => { mockData.mockLgraphNode = { constructor: { diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.vue b/src/renderer/extensions/vueNodes/components/LGraphNode.vue index 6034e546ad3..0efeee8966c 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.vue +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.vue @@ -711,7 +711,9 @@ const nodeMedia = computed(() => { if (type === 'video' && hasVideoPreviewWidget.value) return undefined - const items = nodeOutputs.getNodeOutputItems(node, outputs) + const items = nodeOutputs + .getNodeOutputItems(node, outputs) + .filter((item) => type === 'video' || item.mediaType === 'images') if (!items.length) return undefined return { type, items } as const diff --git a/src/stores/nodeOutputStore.test.ts b/src/stores/nodeOutputStore.test.ts index 5d5885dfe12..a3266edafd0 100644 --- a/src/stores/nodeOutputStore.test.ts +++ b/src/stores/nodeOutputStore.test.ts @@ -1025,6 +1025,24 @@ describe('nodeOutputStore image url cache busting', () => { vi.mocked(app.getRandParam).mockImplementation(() => `&rand=${calls++}`) }) + it.for(['blob:original-image', 'https://example.com/original.png'])( + 'preserves explicit original and preview URLs for %s', + (url) => { + const store = useNodeOutputStore() + const node = createMockNode({ id: 7 }) + const image = { + filename: 'original.png', + url, + previewUrl: 'blob:preview-image' + } + store.nodeOutputs['7'] = { images: [image] } + + expect(store.getNodeOutputItems(node)).toEqual([ + expect.objectContaining({ url, previewUrl: 'blob:preview-image' }) + ]) + } + ) + it('reuses one url for the same outputs and a fresh one for new outputs', () => { const store = useNodeOutputStore() const node = createMockNode({ id: 7 }) diff --git a/src/stores/nodeOutputStore.ts b/src/stores/nodeOutputStore.ts index 20ac7ce38b3..78f41d16d92 100644 --- a/src/stores/nodeOutputStore.ts +++ b/src/stores/nodeOutputStore.ts @@ -191,10 +191,14 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { } return { ...result, - url: resultItemUrl(result) + rand, - previewUrl: isHdrImageFilename(result.filename) - ? resultItemPreviewUrl(result) - : resultItemPreviewUrl(result) + getPreviewParam(node, outputs) + rand + url: result.url ?? resultItemUrl(result) + rand, + previewUrl: + result.previewUrl ?? + (isHdrImageFilename(result.filename) + ? resultItemPreviewUrl(result) + : resultItemPreviewUrl(result) + + getPreviewParam(node, outputs) + + rand) } }) } From 9336f60b20566c8610010c27d3c8be9193bd19ec Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Thu, 12 Nov 2026 22:53:13 +0000 Subject: [PATCH 20/21] fix: preserve explicit media URLs without separate previews --- src/stores/nodeOutputStore.test.ts | 20 ++++++++++++++++++++ src/stores/nodeOutputStore.ts | 7 ++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/stores/nodeOutputStore.test.ts b/src/stores/nodeOutputStore.test.ts index a3266edafd0..aa57fd044ad 100644 --- a/src/stores/nodeOutputStore.test.ts +++ b/src/stores/nodeOutputStore.test.ts @@ -1043,6 +1043,26 @@ describe('nodeOutputStore image url cache busting', () => { } ) + it.for([ + { bucket: 'video', filename: 'movie.webm', url: 'blob:movie' }, + { + bucket: 'audio', + filename: 'sound.flac', + url: 'https://example.com/sound.flac' + } + ])( + 'uses an explicit $bucket URL without a separate preview', + ({ bucket, filename, url }) => { + const store = useNodeOutputStore() + const node = createMockNode({ id: 7 }) + store.nodeOutputs['7'] = { [bucket]: [{ filename, url }] } + + expect(store.getNodeOutputItems(node)).toEqual([ + expect.objectContaining({ url, previewUrl: url }) + ]) + } + ) + it('reuses one url for the same outputs and a fresh one for new outputs', () => { const store = useNodeOutputStore() const node = createMockNode({ id: 7 }) diff --git a/src/stores/nodeOutputStore.ts b/src/stores/nodeOutputStore.ts index 78f41d16d92..1dd664599cf 100644 --- a/src/stores/nodeOutputStore.ts +++ b/src/stores/nodeOutputStore.ts @@ -196,9 +196,10 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { result.previewUrl ?? (isHdrImageFilename(result.filename) ? resultItemPreviewUrl(result) - : resultItemPreviewUrl(result) + - getPreviewParam(node, outputs) + - rand) + : (result.url ?? + resultItemPreviewUrl(result) + + getPreviewParam(node, outputs) + + rand)) } }) } From 80c2e767ba688571a2cd767ade0c807517b5ea2d Mon Sep 17 00:00:00 2001 From: Alexander Brown Date: Thu, 12 Nov 2026 23:17:22 +0000 Subject: [PATCH 21/21] fix: exclude non-video outputs from node video previews Amp-Thread-ID: https://ampcode.com/threads/T-510f7596-171b-458f-86c5-cfc0341dacfe --- .../vueNodes/components/LGraphNode.test.ts | 15 +++++++++++++++ .../extensions/vueNodes/components/LGraphNode.vue | 5 ++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts index d3b0269a960..793780918d9 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.test.ts @@ -503,6 +503,21 @@ describe('LGraphNode', () => { ) }) + it('keeps legacy video files without adding text outputs to the preview', () => { + const outputs = seedNodeOutputs([]) + outputs.nodeOutputs['test-node-123'] = { + text: ['Video saved'], + images: [{ filename: 'output.mp4', type: 'output' }], + animated: [true] + } + + renderLGraphNode({ nodeData: mockNodeData }) + + expect(screen.getByTestId('node-content')).toHaveTextContent( + /^output\.mp4$/ + ) + }) + it('keeps an executed output preview when the LoadImage selector is linked', () => { mockData.mockLgraphNode = { constructor: { diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.vue b/src/renderer/extensions/vueNodes/components/LGraphNode.vue index b1c4ec2dbaa..e3cf6b9d3fd 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.vue +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.vue @@ -310,6 +310,7 @@ import { } from '@/renderer/extensions/vueNodes/utils/nodeStyleUtils' import { app } from '@/scripts/app' import { useNodeOutputStore } from '@/stores/nodeOutputStore' +import { isVideoResult } from '@/utils/resultItem' import { stripGraphPrefix, useWidgetValueStore @@ -725,7 +726,9 @@ const nodeMedia = computed(() => { const items = nodeOutputs .getNodeOutputItems(node, outputs) - .filter((item) => type === 'video' || item.mediaType === 'images') + .filter((item) => + type === 'video' ? isVideoResult(item) : item.mediaType === 'images' + ) if (!items.length) return undefined return { type, items } as const