From 8391478a5a738fdbd9a8a9effce8bbf5e6bf2620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel?= Date: Sat, 5 Sep 2026 13:17:09 +0000 Subject: [PATCH] fix(audio): preserve retryable group submix failures --- .../engine/src/services/audioMixer.test.ts | 74 ++++++++++++++++++- packages/engine/src/services/audioMixer.ts | 2 +- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/packages/engine/src/services/audioMixer.test.ts b/packages/engine/src/services/audioMixer.test.ts index 0b8db5d14c..cc04191f93 100644 --- a/packages/engine/src/services/audioMixer.test.ts +++ b/packages/engine/src/services/audioMixer.test.ts @@ -1,6 +1,6 @@ // fallow-ignore-file code-duplication import { afterEach, describe, expect, it, vi } from "vitest"; -import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs"; +import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs"; import { join } from "node:path"; import { tmpdir } from "node:os"; @@ -930,6 +930,78 @@ describe("processCompositionAudio", () => { expect( runFfmpegMock.mock.calls.filter(([args]) => String(args.at(-1)).includes("group-voiceover")), ).toHaveLength(1); + expect(existsSync(workDir)).toBe(false); + }); + + it("preserves a managed deadline from a group sub-mix without degradation retries", async () => { + const baseDir = mkdtempSync(join(tmpdir(), "hf-audio-base-")); + const workDir = mkdtempSync(join(tmpdir(), "hf-audio-work-")); + tempDirs.push(baseDir, workDir); + writeFileSync(join(baseDir, "sfx-a.wav"), "stub"); + writeFileSync(join(baseDir, "sfx-b.wav"), "stub"); + + runFfmpegMock.mockImplementation(async (args: string[]) => { + if (String(args.at(-1)).includes("group-sfx")) { + return { + success: false, + durationMs: 300_000, + stderr: "managed deadline reached", + exitCode: null, + terminationReason: "deadline" as const, + }; + } + return { success: true, durationMs: 1, stderr: "", exitCode: 0 }; + }); + + const result = await processCompositionAudio( + [ + { + id: "sfx-a", + src: "sfx-a.wav", + start: 0, + end: 2, + mediaStart: 0, + layer: 0, + volume: 1, + volumeKeyframes: [ + { time: 0, volume: 1 }, + { time: 2, volume: 0.5 }, + ], + groupId: "sfx", + type: "audio", + }, + { + id: "sfx-b", + src: "sfx-b.wav", + start: 0, + end: 2, + mediaStart: 0, + layer: 1, + volume: 1, + groupId: "sfx", + type: "audio", + }, + ], + baseDir, + workDir, + join(baseDir, "out.m4a"), + 2, + ); + + expect(result.success).toBe(false); + expect(result.failures).toEqual([ + expect.objectContaining({ + stage: "mix", + reason: "ffmpeg_timeout", + owner: "system", + retryable: true, + elementId: "sfx", + }), + ]); + expect( + runFfmpegMock.mock.calls.filter(([args]) => String(args.at(-1)).includes("group-sfx")), + ).toHaveLength(1); + expect(existsSync(workDir)).toBe(false); }); it("bounds per-cause details and the aggregate error across many authored IDs", async () => { diff --git a/packages/engine/src/services/audioMixer.ts b/packages/engine/src/services/audioMixer.ts index c2d9f6f79b..a0d5801142 100644 --- a/packages/engine/src/services/audioMixer.ts +++ b/packages/engine/src/services/audioMixer.ts @@ -1040,7 +1040,7 @@ async function mixGroupMembers( let useNormalize = true; let result = await runOnce(useNormalize); const canRetrySubmix = () => - !result.success && result.failureReason !== "external_interruption" && !signal?.aborted; + !result.success && !signal?.aborted && !ffmpegFailure("mix", result).retryable; if (canRetrySubmix() && groupNormalizeOptionUnsupported(result.stderr)) { useNormalize = false; result = await runOnce(useNormalize);