From fba40e996bc67147f86d10e706aa2e1af755a21e Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Wed, 11 Nov 2026 05:41:15 +0000 Subject: [PATCH] fix(speech): keep an interrupted swap's backup and let delete wait for it Retry renames through Windows file locks, and keep .previous when it is the only old copy left. --- src/main/speech/model-manager.test.ts | 15 ++++++++++++++- src/main/speech/model-manager.ts | 11 ++++++++--- src/main/speech/speech-model-dir-swap.ts | 24 +++++++++++++----------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/main/speech/model-manager.test.ts b/src/main/speech/model-manager.test.ts index 91e0bacc11d..abf21ef06c5 100644 --- a/src/main/speech/model-manager.test.ts +++ b/src/main/speech/model-manager.test.ts @@ -1,4 +1,12 @@ -import { existsSync, mkdirSync, mkdtempSync, rmSync, truncateSync, writeFileSync } from 'node:fs' +import { + existsSync, + mkdirSync, + mkdtempSync, + renameSync, + rmSync, + truncateSync, + writeFileSync +} from 'node:fs' import { tmpdir } from 'node:os' import { join } from 'node:path' import { beforeEach, describe, expect, it, vi } from 'vitest' @@ -132,6 +140,11 @@ describe('ModelManager', () => { await expect(failedSwap.downloadModel(modelId)).rejects.toThrow('ENOENT') expect(existsSync(`${modelDir}.previous`)).toBe(false) expect((await failedSwap.getModelState(modelId)).needsUpdate).toBe(true) + + // An interrupted swap leaves the old files only in .previous. + renameSync(modelDir, `${modelDir}.previous`) + await expect(failedSwap.downloadModel(modelId)).rejects.toThrow('ENOENT') + expect((await failedSwap.getModelState(modelId)).needsUpdate).toBe(true) } finally { rmSync(dir, { recursive: true, force: true }) } diff --git a/src/main/speech/model-manager.ts b/src/main/speech/model-manager.ts index 7bb071c3adc..da3cc2584dc 100644 --- a/src/main/speech/model-manager.ts +++ b/src/main/speech/model-manager.ts @@ -20,6 +20,7 @@ import { previousSpeechModelDir, swapInSpeechModelDir } from './speech-model-dir type DownloadHandle = { abort: () => void + settled: Promise } type ProgressCallback = (modelId: string, progress: number) => void @@ -173,13 +174,15 @@ export class ModelManager extends SpeechModelDownloadTransport { mkdirSync(stagingDir, { recursive: true }) let aborted = false const abortController = new AbortController() + const settled = Promise.withResolvers() const handle: DownloadHandle = { abort: () => { aborted = true // Abort immediately: stalled HTTPS may never deliver another chunk. abortController.abort() - } + }, + settled: settled.promise } this.activeDownloads.set(modelId, handle) @@ -205,14 +208,13 @@ export class ModelManager extends SpeechModelDownloadTransport { if (!aborted) { console.error('[speech] Model download failed:', modelId, err) this.updateState(modelId, 'error', undefined, String(err)) - } - if (!aborted) { // Settings awaits real failures; cancellation stays quiet. throw err } } finally { this.activeDownloads.delete(modelId) removeModelDownloadStaging(stagingDir, legacyArchivePath) + settled.resolve() } } @@ -233,7 +235,10 @@ export class ModelManager extends SpeechModelDownloadTransport { if (!manifest || !isLocalSpeechModel(manifest)) { throw new Error(`Model does not support deletion: ${modelId}`) } + const download = this.activeDownloads.get(modelId) this.cancelDownload(modelId) + // A swap already under way ignores cancel; deleting mid-swap could race its restore. + await download?.settled const modelDir = this.getModelDir(modelId) if (existsSync(modelDir)) { await rm(modelDir, { recursive: true, force: true }) diff --git a/src/main/speech/speech-model-dir-swap.ts b/src/main/speech/speech-model-dir-swap.ts index 7d775eeffb1..215ecbd9ae4 100644 --- a/src/main/speech/speech-model-dir-swap.ts +++ b/src/main/speech/speech-model-dir-swap.ts @@ -1,5 +1,6 @@ import { existsSync } from 'node:fs' -import { rename, rm } from 'node:fs/promises' +import { rm } from 'node:fs/promises' +import { renameFileWithWindowsRetryAsync } from '../../shared/windows-retry-file-operations' export function previousSpeechModelDir(modelDir: string): string { return `${modelDir}.previous` @@ -8,19 +9,20 @@ export function previousSpeechModelDir(modelDir: string): string { /** Moves the old download aside instead of deleting it, so a failed rename (e.g. a Windows file lock) keeps it. */ export async function swapInSpeechModelDir(stagingDir: string, modelDir: string): Promise { const previousDir = previousSpeechModelDir(modelDir) - // Left by an interrupted swap; the staged download is complete, so it is no longer needed. - await rm(previousDir, { recursive: true, force: true }) - const hadPrevious = existsSync(modelDir) - if (hadPrevious) { - await rename(modelDir, previousDir) + // With no modelDir, previousDir is the old copy an interrupted swap left; keep it until the new one is in. + if (existsSync(modelDir)) { + await rm(previousDir, { recursive: true, force: true }) + await renameFileWithWindowsRetryAsync(modelDir, previousDir) } try { - await rename(stagingDir, modelDir) + await renameFileWithWindowsRetryAsync(stagingDir, modelDir) } catch (error) { - if (hadPrevious) { - await rename(previousDir, modelDir).catch((restoreError: unknown) => { - console.error('[speech] Failed to restore the previous model files:', restoreError) - }) + if (existsSync(previousDir)) { + await renameFileWithWindowsRetryAsync(previousDir, modelDir).catch( + (restoreError: unknown) => { + console.error('[speech] Failed to restore the previous model files:', restoreError) + } + ) } throw error }