diff --git a/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts b/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts index 68b61391916..ce564ff44d2 100644 --- a/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts +++ b/browser_tests/tests/dialogs/modelImportProgressDialog.spec.ts @@ -261,10 +261,10 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => { test('a dismissed unconfirmed cancellation stays hidden from late progress', async ({ comfyPage }) => { + test.setTimeout(30_000) const { page } = comfyPage const taskId = '1396cc07-bab2-4f12-9b54-741f83f9224e' const assetName = 'unconfirmed-cancel-model.safetensors' - await page.clock.install() await page.route(`**/tasks/${taskId}`, async (route) => { if (route.request().method() === 'DELETE') { await route.fulfill({ status: 204 }) @@ -295,7 +295,16 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => { const toast = page.getByRole('status').filter({ hasText: assetName }) await expect(toast).toBeVisible() await toast.getByRole('button', { name: 'Expand' }).click() + const cancellation = page.waitForResponse( + (candidate) => + candidate.url().endsWith(`/tasks/${taskId}`) && + candidate.request().method() === 'DELETE' + ) await toast.getByRole('button', { name: 'Cancel Download' }).click() + await cancellation + await expect( + toast.getByText('Cancelled', { exact: true }).first() + ).toBeVisible() const advanceReconciliation = async () => { const response = page.waitForResponse( @@ -303,9 +312,7 @@ test.describe('Model import progress toast', { tag: ['@screenshot'] }, () => { candidate.url().endsWith(`/tasks/${taskId}`) && candidate.request().method() === 'GET' ) - await page.clock.runFor(10_001) await (await response).finished() - await page.clock.runFor(1) } await advanceReconciliation() await expect( diff --git a/src/platform/assets/composables/useUploadModelWizard.test.ts b/src/platform/assets/composables/useUploadModelWizard.test.ts index 40bff22c7a9..4a0df069210 100644 --- a/src/platform/assets/composables/useUploadModelWizard.test.ts +++ b/src/platform/assets/composables/useUploadModelWizard.test.ts @@ -19,7 +19,8 @@ vi.mock(import('@/platform/assets/services/assetService'), () => ({ assetService: { getAssetMetadata: vi.fn(), uploadAssetAsync: vi.fn(), - uploadAssetFromBase64: vi.fn() + uploadAssetFromBase64: vi.fn(), + deleteAsset: vi.fn() } })) @@ -108,7 +109,8 @@ describe('useUploadModelWizard', () => { let finishPreview!: () => void vi.mocked(assetService.uploadAssetFromBase64).mockReturnValue( new Promise((resolve) => { - finishPreview = () => resolve(fromPartial({ id: 'preview-id' })) + finishPreview = () => + resolve(fromPartial({ id: 'preview-id', created_new: true })) }) ) @@ -126,10 +128,75 @@ describe('useUploadModelWizard', () => { await expect(upload).resolves.toBeNull() expect(assetService.uploadAssetAsync).not.toHaveBeenCalled() + expect(assetService.deleteAsset).toHaveBeenCalledWith('preview-id') expect(wizard.currentStep.value).toBe(1) expect(wizard.isUploading.value).toBe(false) }) + it('does not delete a deduplicated preview after reset', async () => { + const { assetService } = + await import('@/platform/assets/services/assetService') + let finishPreview!: () => void + vi.mocked(assetService.uploadAssetFromBase64).mockReturnValue( + new Promise((resolve) => { + finishPreview = () => + resolve(fromPartial({ id: 'shared-preview', created_new: false })) + }) + ) + const wizard = setupUploadModelWizard(modelTypes) + wizard.wizardData.value.url = 'https://civitai.com/models/shared-preview' + wizard.wizardData.value.previewImage = 'data:image/png;base64,cHJldmlldw==' + wizard.selectedModelType.value = 'checkpoints' + + const upload = wizard.uploadModel() + await vi.waitFor(() => { + expect(assetService.uploadAssetFromBase64).toHaveBeenCalledOnce() + }) + wizard.resetWizard() + finishPreview() + + await expect(upload).resolves.toBeNull() + expect(assetService.deleteAsset).not.toHaveBeenCalled() + }) + + it('does not reopen a reset wizard after a synchronous refresh finishes', async () => { + const { assetService } = + await import('@/platform/assets/services/assetService') + vi.mocked(assetService.uploadAssetAsync).mockResolvedValue({ + type: 'sync', + asset: fromPartial({ + id: 'asset-1', + name: 'model.safetensors', + tags: ['models', 'checkpoints'] + }) + }) + let finishRefresh!: () => void + const refreshPending = new Promise((resolve) => { + finishRefresh = resolve + }) + vi.spyOn(useModelToNodeStore(), 'getAllNodeProviders').mockReturnValue([ + fromPartial({ nodeDef: { name: 'CheckpointLoaderSimple' } }) + ]) + vi.spyOn(useAssetsStore(), 'updateModelsForNodeType').mockReturnValue( + refreshPending + ) + + const wizard = setupUploadModelWizard(modelTypes) + wizard.wizardData.value.url = 'https://civitai.com/models/sync' + wizard.selectedModelType.value = 'checkpoints' + const upload = wizard.uploadModel() + await vi.waitFor(() => { + expect(useAssetsStore().updateModelsForNodeType).toHaveBeenCalledOnce() + }) + + wizard.resetWizard() + finishRefresh() + + await expect(upload).resolves.toBeNull() + expect(wizard.currentStep.value).toBe(1) + expect(wizard.uploadStatus.value).toBeUndefined() + }) + it('tracks a backend task that resolves after the wizard is reset', async () => { const { assetService } = await import('@/platform/assets/services/assetService') @@ -168,6 +235,44 @@ describe('useUploadModelWizard', () => { expect(wizard.currentStep.value).toBe(1) }) + it('refreshes model caches when a synchronous import finishes after reset', async () => { + const { assetService } = + await import('@/platform/assets/services/assetService') + let finishUpload!: (value: AsyncUploadResponse) => void + vi.mocked(assetService.uploadAssetAsync).mockReturnValue( + new Promise((resolve) => { + finishUpload = resolve + }) + ) + vi.spyOn(useModelToNodeStore(), 'getAllNodeProviders').mockReturnValue([ + fromPartial({ nodeDef: { name: 'CheckpointLoaderSimple' } }) + ]) + const refresh = vi + .spyOn(useAssetsStore(), 'updateModelsForNodeType') + .mockResolvedValue(undefined) + + const wizard = setupUploadModelWizard(modelTypes) + wizard.wizardData.value.url = 'https://civitai.com/models/stale-sync' + wizard.selectedModelType.value = 'checkpoints' + const upload = wizard.uploadModel() + await vi.waitFor(() => { + expect(assetService.uploadAssetAsync).toHaveBeenCalledOnce() + }) + wizard.resetWizard() + finishUpload({ + type: 'sync', + asset: fromPartial({ + id: 'asset-after-reset', + name: 'model.safetensors', + tags: ['models', 'checkpoints'] + }) + }) + + await expect(upload).resolves.toBeNull() + expect(refresh).toHaveBeenCalledWith('CheckpointLoaderSimple') + expect(wizard.currentStep.value).toBe(1) + }) + it('does not let a stale failure overwrite a replacement upload', async () => { const { assetService } = await import('@/platform/assets/services/assetService') diff --git a/src/platform/assets/composables/useUploadModelWizard.ts b/src/platform/assets/composables/useUploadModelWizard.ts index 2de235520a0..832bd0b8131 100644 --- a/src/platform/assets/composables/useUploadModelWizard.ts +++ b/src/platform/assets/composables/useUploadModelWizard.ts @@ -233,7 +233,7 @@ export function useUploadModelWizard( async function uploadPreviewImage( filename: string - ): Promise { + ): Promise<{ id: string; createdNew: boolean } | undefined> { if (!wizardData.value.previewImage) return undefined try { @@ -251,19 +251,20 @@ export function useUploadModelWizard( name: `${baseFilename}_preview.${extension}`, tags: ['preview'] }) - return previewAsset.id + return { + id: previewAsset.id, + createdNew: previewAsset.created_new + } } catch (error) { console.error('Failed to upload preview image:', error) return undefined } } - async function refreshModelCaches() { - if (!resolvedModelType.value) return + async function refreshModelCaches(modelType = resolvedModelType.value) { + if (!modelType) return - const providers = modelToNodeStore.getAllNodeProviders( - resolvedModelType.value - ) + const providers = modelToNodeStore.getAllNodeProviders(modelType) const results = await Promise.allSettled( providers.map((provider) => assetsStore.updateModelsForNodeType(provider.nodeDef.name) @@ -418,8 +419,17 @@ export function useUploadModelWizard( wizardData.value.metadata?.name || 'model' - const previewId = await uploadPreviewImage(filename) - if (isStaleUpload(generation)) return null + const preview = await uploadPreviewImage(filename) + if (isStaleUpload(generation)) { + if (preview?.createdNew) { + try { + await assetService.deleteAsset(preview.id) + } catch (error) { + console.error('Failed to clean up stale preview image:', error) + } + } + return null + } const userMetadata = { source: source.type, @@ -431,7 +441,7 @@ export function useUploadModelWizard( source_url: wizardData.value.url, tags, user_metadata: userMetadata, - preview_id: previewId + preview_id: preview?.id }) if (result.type === 'async' && result.task.status !== 'completed') { @@ -444,7 +454,12 @@ export function useUploadModelWizard( } } - if (isStaleUpload(generation)) return null + if (isStaleUpload(generation)) { + if (result.type === 'sync' || result.task.status === 'completed') { + await refreshModelCaches(modelType) + } + return null + } if (result.type === 'async' && result.task.status !== 'completed') { uploadSuccess = watchAsyncUpload( @@ -465,6 +480,7 @@ export function useUploadModelWizard( uploadStatus.value = 'success' await refreshModelCaches() + if (isStaleUpload(generation)) return null uploadSuccess = { filename: result.type === 'sync' ? getAssetFilename(result.asset) : filename, diff --git a/src/stores/assetDownloadStore.test.ts b/src/stores/assetDownloadStore.test.ts index 7b9282d3e63..bd77e73369c 100644 --- a/src/stores/assetDownloadStore.test.ts +++ b/src/stores/assetDownloadStore.test.ts @@ -178,11 +178,15 @@ describe('useAssetDownloadStore', () => { taskId: 'task-123', modelType: 'checkpoints' }) + const completionTimestamp = store.lastCompletedDownload?.timestamp + await vi.advanceTimersByTimeAsync(1) + dispatch(createDownloadMessage({ status: 'completed', progress: 1 })) + expect(store.lastCompletedDownload?.timestamp).toBe(completionTimestamp) - // A terminal frame consumes the tombstone, so a deliberately reused - // task id is no longer muted for the remainder of the session. + // Late progress after a terminal frame is still part of the dismissed + // task and must not reopen the toast. dispatch(createDownloadMessage({ status: 'running', progress: 0.25 })) - expect(store.activeDownloads).toHaveLength(1) + expect(store.downloadList).toHaveLength(0) }) it('does not resurrect a dismissed unconfirmed cancellation on late events', async () => { @@ -638,7 +642,7 @@ describe('useAssetDownloadStore', () => { expect(store.lastCompletedDownload?.modelType).toBe('checkpoints') }) - it('stops polling after an authoritative failure during cancellation', async () => { + it('recovers from an authoritative failure during cancellation', async () => { const store = useAssetDownloadStore() store.trackDownload('task-123', 'checkpoints', 'model.safetensors') vi.mocked(taskService.cancelTask).mockResolvedValue({ @@ -669,10 +673,10 @@ describe('useAssetDownloadStore', () => { await vi.advanceTimersByTimeAsync(60_000) - expect(taskService.getTask).toHaveBeenCalledTimes(1) + expect(taskService.getTask).toHaveBeenCalledTimes(2) expect(store.finishedDownloads[0]).toMatchObject({ - status: 'failed', - error: 'Cancellation failed' + status: 'completed', + error: undefined }) }) @@ -771,7 +775,82 @@ describe('useAssetDownloadStore', () => { expect(taskService.getTask).toHaveBeenCalledTimes(2) }) - it('stops polling after reconciliation confirms a failed task', async () => { + it('restarts reconciliation when cancelling a task-unavailable row', async () => { + const store = useAssetDownloadStore() + vi.mocked(taskService.getTask) + .mockResolvedValueOnce({ + ok: false, + error: new TaskNotFoundError('task-123') + }) + .mockResolvedValueOnce({ + ok: false, + error: new TaskNotFoundError('task-123') + }) + .mockResolvedValue({ + ok: true, + value: createTaskResponse({ status: 'running', result: undefined }) + }) + vi.mocked(taskService.cancelTask).mockResolvedValue({ + ok: true, + value: 'cancelling' + }) + dispatch(createDownloadMessage({ status: 'running' })) + await vi.advanceTimersByTimeAsync(20_000) + expect(store.finishedDownloads[0].status).toBe('failed') + + await store.cancelDownload('task-123') + await vi.advanceTimersByTimeAsync(10_000) + + expect(taskService.getTask).toHaveBeenCalledTimes(3) + expect(store.downloadList[0].status).toBe('cancellation_pending') + }) + + it('recovers a task-unavailable row from new active progress', async () => { + const store = useAssetDownloadStore() + vi.mocked(taskService.getTask).mockResolvedValue({ + ok: false, + error: new TaskNotFoundError('task-123') + }) + dispatch(createDownloadMessage({ status: 'running' })) + await vi.advanceTimersByTimeAsync(20_000) + expect(store.finishedDownloads[0].status).toBe('failed') + + dispatch(createDownloadMessage({ status: 'running', progress: 75 })) + + expect(store.activeDownloads[0]).toMatchObject({ + status: 'running', + progress: 75 + }) + }) + + it('keeps reconciling a failed task so a backend retry can recover', async () => { + const store = useAssetDownloadStore() + vi.mocked(taskService.getTask) + .mockResolvedValueOnce({ + ok: true, + value: createTaskResponse({ + status: 'failed', + result: undefined, + error_message: 'Retrying download' + }) + }) + .mockResolvedValueOnce({ + ok: true, + value: createTaskResponse({ status: 'running', result: undefined }) + }) + .mockResolvedValueOnce({ + ok: true, + value: createTaskResponse({ status: 'completed' }) + }) + dispatch(createDownloadMessage({ status: 'failed' })) + + await vi.advanceTimersByTimeAsync(30_000) + + expect(taskService.getTask).toHaveBeenCalledTimes(3) + expect(store.finishedDownloads[0].status).toBe('completed') + }) + + it('bounds polling for a permanently failed task', async () => { const store = useAssetDownloadStore() vi.mocked(taskService.getTask).mockResolvedValue({ ok: true, @@ -783,14 +862,16 @@ describe('useAssetDownloadStore', () => { }) dispatch(createDownloadMessage({ status: 'failed' })) - await vi.advanceTimersByTimeAsync(10_000) - expect(store.finishedDownloads[0].status).toBe('failed') - + await vi.advanceTimersByTimeAsync(300_000) + expect(taskService.getTask).toHaveBeenCalledTimes(30) await vi.advanceTimersByTimeAsync(60_000) - expect(taskService.getTask).toHaveBeenCalledTimes(1) + expect(taskService.getTask).toHaveBeenCalledTimes(30) + + dispatch(createDownloadMessage({ status: 'running', progress: 75 })) + expect(store.activeDownloads).toHaveLength(1) }) - it('keeps a terminally reconciled failure terminal after late progress', async () => { + it('accepts retry progress after an authoritative failed snapshot', async () => { const store = useAssetDownloadStore() vi.mocked(taskService.getTask).mockResolvedValue({ ok: true, @@ -805,15 +886,37 @@ describe('useAssetDownloadStore', () => { dispatch(createDownloadMessage({ status: 'running', progress: 75 })) - expect(store.finishedDownloads[0]).toMatchObject({ - status: 'failed', - error: 'Download failed' + expect(store.activeDownloads[0]).toMatchObject({ + status: 'running', + progress: 75 }) - expect(store.activeDownloads).toHaveLength(0) + }) - store.clearFinishedDownloads() - dispatch(createDownloadMessage({ status: 'running', progress: 80 })) - expect(store.downloadList).toHaveLength(0) + it('requires consecutive task lookup 404s before settling', async () => { + const store = useAssetDownloadStore() + vi.mocked(taskService.getTask) + .mockResolvedValueOnce({ + ok: false, + error: new TaskNotFoundError('task-123') + }) + .mockResolvedValueOnce({ + ok: false, + error: new Error('gateway unavailable') + }) + .mockResolvedValueOnce({ + ok: false, + error: new TaskNotFoundError('task-123') + }) + .mockResolvedValueOnce({ + ok: true, + value: createTaskResponse({ status: 'running', result: undefined }) + }) + dispatch(createDownloadMessage({ status: 'running' })) + + await vi.advanceTimersByTimeAsync(40_000) + + expect(store.activeDownloads).toHaveLength(1) + expect(store.finishedDownloads).toHaveLength(0) }) it('settles a pending cancellation the backend never confirms', async () => { @@ -998,6 +1101,16 @@ describe('useAssetDownloadStore', () => { expect(store.hasDownloads).toBe(false) }) + it('does not restore a dismissed confirmed cancellation from late progress', () => { + const store = useAssetDownloadStore() + dispatch(createDownloadMessage({ status: 'cancelled' })) + + store.clearFinishedDownloads() + dispatch(createDownloadMessage({ status: 'running', progress: 80 })) + + expect(store.downloadList).toHaveLength(0) + }) + it('polls and marks failed downloads', async () => { const store = useAssetDownloadStore() diff --git a/src/stores/assetDownloadStore.ts b/src/stores/assetDownloadStore.ts index d2e6deb9a6f..1cb03d9069c 100644 --- a/src/stores/assetDownloadStore.ts +++ b/src/stores/assetDownloadStore.ts @@ -1,6 +1,6 @@ import { useIntervalFn } from '@vueuse/core' import { defineStore } from 'pinia' -import { computed, ref, watch } from 'vue' +import { computed, reactive, ref, watch } from 'vue' import type { DownloadFileResult, @@ -93,6 +93,10 @@ interface CompletedDownload { modelType: string timestamp: number } +interface DismissedDownload { + modelType?: string + completionNotified: boolean +} const STALE_THRESHOLD_MS = 10_000 const POLL_INTERVAL_MS = 10_000 /** @@ -102,6 +106,9 @@ const POLL_INTERVAL_MS = 10_000 * reports a terminal status from pinning the toast open until a page reload. */ const MAX_CANCELLATION_RECONCILE_ATTEMPTS = 6 +const MAX_TASK_NOT_FOUND_ATTEMPTS = 2 +const MAX_FAILED_RECONCILE_ATTEMPTS = 30 +const MAX_DISMISSED_DOWNLOADS = 256 function generateDownloadTrackingPlaceholder( taskId: TaskId, @@ -150,8 +157,8 @@ function finalizeCancellation(download: AssetDownload) { /** * Record a reconciliation attempt that left a pending cancellation unresolved, * exposing an unconfirmed but dismissible state once the attempts are - * exhausted. It remains recheckable so a late authoritative outcome can - * replace it. + * exhausted. A later WebSocket completion can still replace it, but polling + * stops once the bounded reconciliation window is exhausted. */ function noteAuthoritativePendingCancellation(download: AssetDownload) { if (download.status !== 'cancellation_pending') return @@ -246,9 +253,11 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { const downloads = ref>(new Map()) const cancellingTaskIds = ref(new Set()) const reconcilingTasks = new Map>() - const dismissedPendingDownloads = new Map() + const dismissedPendingDownloads = new Map() const taskNotFoundAttempts = new Map() - const terminalReconciledFailures = new Set() + const unavailableTaskIds = reactive(new Set()) + const failedReconcileAttempts = reactive(new Map()) + const settledFailureTaskIds = reactive(new Set()) const lastCompletedDownload = ref(null) const downloadList = computed(() => Array.from(downloads.value.values())) @@ -277,7 +286,8 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { downloadList.value.filter( (download) => isDownloadRecheckable(download.status) && - !terminalReconciledFailures.has(download.taskId) + !unavailableTaskIds.has(download.taskId) && + !settledFailureTaskIds.has(download.taskId) ) ) const hasRecheckableDownloads = computed( @@ -301,26 +311,43 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { dismissedPendingDownloads.delete(taskId) taskNotFoundAttempts.delete(taskId) - terminalReconciledFailures.delete(taskId) + unavailableTaskIds.delete(taskId) + failedReconcileAttempts.delete(taskId) + settledFailureTaskIds.delete(taskId) downloads.value.set( taskId, generateDownloadTrackingPlaceholder(taskId, modelType, assetName) ) } + function rememberDismissedDownload(download: AssetDownload) { + dismissedPendingDownloads.delete(download.taskId) + dismissedPendingDownloads.set(download.taskId, { + modelType: download.modelType, + completionNotified: download.status === 'completed' + }) + while (dismissedPendingDownloads.size > MAX_DISMISSED_DOWNLOADS) { + const oldestTaskId = dismissedPendingDownloads.keys().next().value + if (oldestTaskId === undefined) break + dismissedPendingDownloads.delete(oldestTaskId) + } + } + function consumeDismissedDownload(data: AssetDownloadWsMessage): boolean { if (!dismissedPendingDownloads.has(data.task_id)) return false - const modelType = dismissedPendingDownloads.get(data.task_id) - if (data.status === 'completed' && modelType) { + const dismissed = dismissedPendingDownloads.get(data.task_id) + if ( + data.status === 'completed' && + dismissed?.modelType && + !dismissed.completionNotified + ) { lastCompletedDownload.value = { taskId: data.task_id, - modelType, + modelType: dismissed.modelType, timestamp: Date.now() } - } - if (data.status === 'completed' || data.status === 'cancelled') { - dismissedPendingDownloads.delete(data.task_id) + dismissed.completionNotified = true } return true } @@ -328,11 +355,6 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { function handleAssetDownload(e: CustomEvent) { const data = e.detail if (consumeDismissedDownload(data)) return - if ( - terminalReconciledFailures.has(data.task_id) && - activeStatuses.has(data.status) - ) - return const existing = downloads.value.get(data.task_id) // WebSocket payloads are not runtime-validated at the event boundary. @@ -344,6 +366,13 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { if (shouldIgnoreDownloadUpdate(existing?.status, data.status)) return + if (activeStatuses.has(data.status)) { + taskNotFoundAttempts.delete(data.task_id) + unavailableTaskIds.delete(data.task_id) + failedReconcileAttempts.delete(data.task_id) + settledFailureTaskIds.delete(data.task_id) + } + const download: AssetDownload = { taskId: data.task_id, assetId: data.asset_id, @@ -369,10 +398,7 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { } function handleTaskNotFound(download: AssetDownload) { - if ( - download.status === 'cancellation_pending' || - download.status === 'cancellation_unconfirmed' - ) { + if (download.status === 'cancellation_pending') { taskNotFoundAttempts.delete(download.taskId) finalizeCancellation(download) return @@ -380,12 +406,12 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { const attempts = (taskNotFoundAttempts.get(download.taskId) ?? 0) + 1 taskNotFoundAttempts.set(download.taskId, attempts) - if (attempts < 2) { + if (attempts < MAX_TASK_NOT_FOUND_ATTEMPTS) { download.lastUpdate = Date.now() return } taskNotFoundAttempts.delete(download.taskId) - terminalReconciledFailures.add(download.taskId) + unavailableTaskIds.add(download.taskId) download.status = 'failed' download.error = t('progressToast.taskUnavailable') download.lastUpdate = Date.now() @@ -401,11 +427,14 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { // transient and must not consume the authoritative reconciliation bound. if (result.error instanceof TaskNotFoundError) { handleTaskNotFound(download) + } else { + taskNotFoundAttempts.delete(download.taskId) } return } taskNotFoundAttempts.delete(download.taskId) + unavailableTaskIds.delete(download.taskId) const task = result.value if ( download.status === 'cancellation_pending' && @@ -422,7 +451,14 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { return } if (task.status === 'failed') { - terminalReconciledFailures.add(download.taskId) + const attempts = (failedReconcileAttempts.get(download.taskId) ?? 0) + 1 + failedReconcileAttempts.set(download.taskId, attempts) + if (attempts >= MAX_FAILED_RECONCILE_ATTEMPTS) { + settledFailureTaskIds.add(download.taskId) + } + } else { + failedReconcileAttempts.delete(download.taskId) + settledFailureTaskIds.delete(download.taskId) } handleAssetDownload( new CustomEvent('asset_download', { @@ -487,10 +523,11 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { function clearFinishedDownloads() { for (const download of finishedDownloads.value) { - if (download.status === 'cancellation_unconfirmed') { - dismissedPendingDownloads.set(download.taskId, download.modelType) - } + rememberDismissedDownload(download) taskNotFoundAttempts.delete(download.taskId) + unavailableTaskIds.delete(download.taskId) + failedReconcileAttempts.delete(download.taskId) + settledFailureTaskIds.delete(download.taskId) downloads.value.delete(download.taskId) } } @@ -501,13 +538,11 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { isDownloadFinished(download.status) || download.status === 'cancellation_pending' ) { - if ( - download.status === 'cancellation_pending' || - download.status === 'cancellation_unconfirmed' - ) { - dismissedPendingDownloads.set(download.taskId, download.modelType) - } + rememberDismissedDownload(download) taskNotFoundAttempts.delete(download.taskId) + unavailableTaskIds.delete(download.taskId) + failedReconcileAttempts.delete(download.taskId) + settledFailureTaskIds.delete(download.taskId) downloads.value.delete(download.taskId) } } @@ -528,6 +563,9 @@ export const useAssetDownloadStore = defineStore('assetDownload', () => { if (isSettledDownload(current)) { return { ok: true, value: result.value === 'cancelling' } } + unavailableTaskIds.delete(taskId) + failedReconcileAttempts.delete(taskId) + settledFailureTaskIds.delete(taskId) // A DELETE 404 can mean the cancellation route is unavailable, not that // the task is gone. Re-read the task before deciding how to settle it. diff --git a/src/stores/assetExportStore.test.ts b/src/stores/assetExportStore.test.ts index 18a48fea990..cb9f9aeb5fc 100644 --- a/src/stores/assetExportStore.test.ts +++ b/src/stores/assetExportStore.test.ts @@ -201,7 +201,7 @@ describe('useAssetExportStore polling', () => { expect(store.finishedExports[0]).toMatchObject({ status: 'failed', - error: 'progressToast.failed' + error: 'progressToast.taskUnavailable' }) }) @@ -346,6 +346,13 @@ describe('assetExportStore triggerDownload', () => { name: 'a backslash-prefixed authority URL', url: '\\\\storage.example.com/exports/e.zip?signature=abc' }, + { + name: 'a mixed backslash authority URL', + url: '\\/storage.example.com/exports/e.zip?signature=abc' + }, + { name: 'a malformed HTTP URL', url: 'http://' }, + { name: 'a malformed IPv6 URL', url: 'https://[' }, + { name: 'a slash-backslash authority URL', url: '/\\evil.com/x' }, { name: 'an empty URL', url: '' }, { name: 'a whitespace-only URL', url: ' ' } ])('rejects $name', async ({ url }) => { diff --git a/src/stores/assetExportStore.ts b/src/stores/assetExportStore.ts index 5b0d6974332..48f05e4cab5 100644 --- a/src/stores/assetExportStore.ts +++ b/src/stores/assetExportStore.ts @@ -101,14 +101,20 @@ function resolveExportDownloadUrl( if ( !trimmedUrl || trimmedUrl.startsWith('//') || - trimmedUrl.startsWith('\\\\') + trimmedUrl.startsWith('\\') || + trimmedUrl.startsWith('/\\') ) { return { ok: false, error: t('exportToast.unsupportedDownloadUrl') } } const resolvedUrl = trimmedUrl.startsWith('/') ? api.apiURL(trimmedUrl) : trimmedUrl - const parsedUrl = new URL(resolvedUrl, document.baseURI) + let parsedUrl: URL + try { + parsedUrl = new URL(resolvedUrl, document.baseURI) + } catch { + return { ok: false, error: t('exportToast.unsupportedDownloadUrl') } + } if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') { return { ok: false, error: t('exportToast.unsupportedDownloadUrl') } } @@ -251,7 +257,7 @@ export const useAssetExportStore = defineStore('assetExport', () => { bytes_processed: exp.bytesProcessed, progress: exp.progress, status: 'failed', - error: t('progressToast.failed') + error: t('progressToast.taskUnavailable') }) }