diff --git a/src/stores/nodeOutputStore.ts b/src/stores/nodeOutputStore.ts index 2e74aa633b8..a4c4ecb9c47 100644 --- a/src/stores/nodeOutputStore.ts +++ b/src/stores/nodeOutputStore.ts @@ -16,7 +16,6 @@ import type { } 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' @@ -203,14 +202,10 @@ export const useNodeOutputStore = defineStore('nodeOutput', () => { return { ...result, url: result.url ?? resultItemUrl(result) + rand, - previewUrl: - result.previewUrl ?? - (isHdrImageFilename(result.filename) - ? resultItemPreviewUrl(result) - : (result.url ?? - resultItemPreviewUrl(result) + - getPreviewParam(node, outputs) + - rand)) + previewUrl: resultItemPreviewUrl(result, { + previewFormat: getPreviewParam(node, outputs), + rand + }) } }) } diff --git a/src/utils/resultItemUrl.test.ts b/src/utils/resultItemUrl.test.ts index b2aefc4976e..403018ed1d5 100644 --- a/src/utils/resultItemUrl.test.ts +++ b/src/utils/resultItemUrl.test.ts @@ -24,7 +24,30 @@ describe('resultItemPreviewUrl', () => { '/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) + expect( + resultItemPreviewUrl(item, { + previewFormat: '&preview=webp;75', + rand: '&rand=ignored' + }) + ).toBe(item.previewUrl) + }) + + it('applies preview format and output revision to generated URLs', () => { + const url = new URL( + resultItemPreviewUrl(resultItem({ filename: 'out.png' }), { + previewFormat: '&preview=webp;75', + rand: '&rand=revision-2' + }), + window.location.origin + ) + + expect(Object.fromEntries(url.searchParams)).toMatchObject({ + filename: 'out.png', + type: 'output', + subfolder: '', + preview: 'webp;75', + rand: 'revision-2' + }) }) it.for([ @@ -51,8 +74,11 @@ describe('resultItemPreviewUrl', () => { ) it('resolves no preview for an HDR output without a stored preview', () => { - expect(resultItemPreviewUrl(resultItem({ filename: 'render.exr' }))).toBe( - '' - ) + expect( + resultItemPreviewUrl(resultItem({ filename: 'render.exr' }), { + previewFormat: '&preview=webp;75', + rand: '&rand=ignored' + }) + ).toBe('') }) }) diff --git a/src/utils/resultItemUrl.ts b/src/utils/resultItemUrl.ts index 0eba9429eb8..e08c046d547 100644 --- a/src/utils/resultItemUrl.ts +++ b/src/utils/resultItemUrl.ts @@ -20,9 +20,15 @@ export function resultItemUrl(item: AugmentedResultItem): string { return api.apiURL('/view?' + resultItemUrlParams(item)) } +interface ResultItemPreviewUrlOptions { + fullRes?: boolean + previewFormat?: string + rand?: string +} + export function resultItemPreviewUrl( item: AugmentedResultItem, - options: { fullRes?: boolean } = {} + options: ResultItemPreviewUrlOptions = {} ): string { if (isHdrImageFilename(item.filename)) return ( @@ -31,10 +37,11 @@ export function resultItemPreviewUrl( ) if (options.fullRes) return resultItemUrl(item) if (item.previewUrl !== undefined) return item.previewUrl - if (!isImageResult(item)) return resultItemUrl(item) + if (item.url !== undefined) return item.url const params = resultItemUrlParams(item) - appendCloudResParam(params, item.filename) - return api.apiURL('/view?' + params) + if (isImageResult(item)) appendCloudResParam(params, item.filename) + const url = item.filename ? api.apiURL('/view?' + params) : '' + return url + (options.previewFormat ?? '') + (options.rand ?? '') } export function resultItemVhsAdvancedPreviewUrl(