fix: address review feedback from #1333 and #1335 (#1343)

Co-authored-by: Matt Van Horn <455140+mvanhorn@users.noreply.github.com>
This commit is contained in:
Matt Van Horn
2026-06-12 16:18:18 -07:00
committed by GitHub
co-authored by Matt Van Horn
parent 1ea0ed55e3
commit 28e2ab9d5b
6 changed files with 78 additions and 39 deletions
@@ -208,4 +208,22 @@ describe("prepareAnimatedGifInputs", () => {
);
expect(result.preparedGifs[0]?.sourceSrc).toBe(sourceUrl);
});
it("propagates actionable transcode failure messages", async () => {
const projectDir = makeProject();
const sourcePath = join(projectDir, "broken.gif");
writeFileSync(sourcePath, gif([...frame(10), ...frame(10)], 0));
await expect(
prepareAnimatedGifInputs(`<img src="broken.gif" />`, {
projectDir,
downloadDir: projectDir,
transcode: async (request) => {
throw new Error(
`ffmpeg failed for ${request.inputPath}: Invalid data found when processing input`,
);
},
}),
).rejects.toThrow(`ffmpeg failed for ${sourcePath}: Invalid data found`);
});
});
@@ -28,7 +28,7 @@
* `success: false`.
*/
import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from "node:fs";
import { copyFileSync, existsSync, mkdirSync, readdirSync, rmSync, statSync } from "node:fs";
import { dirname, join } from "node:path";
import {
encodeFramesChunkedConcat,
@@ -148,44 +148,49 @@ async function encodeGifFromDir(
fps: input.fps,
loop: input.loop,
};
const paletteResult = await runFfmpeg(buildGifPalettegenArgs(argsInput), {
signal: input.signal,
timeout: input.timeout,
});
if (!paletteResult.success) {
try {
const paletteResult = await runFfmpeg(buildGifPalettegenArgs(argsInput), {
signal: input.signal,
timeout: input.timeout,
});
if (!paletteResult.success) {
return {
success: false,
outputPath,
durationMs: Date.now() - startTime,
framesEncoded: 0,
fileSize: 0,
error: formatFfmpegError(paletteResult.exitCode, paletteResult.stderr),
};
}
const gifResult = await runFfmpeg(buildGifPaletteuseArgs(argsInput), {
signal: input.signal,
timeout: input.timeout,
});
if (!gifResult.success) {
return {
success: false,
outputPath,
durationMs: Date.now() - startTime,
framesEncoded: 0,
fileSize: 0,
error: formatFfmpegError(gifResult.exitCode, gifResult.stderr),
};
}
const fileSize = existsSync(outputPath) ? statSync(outputPath).size : 0;
return {
success: false,
success: true,
outputPath,
durationMs: Date.now() - startTime,
framesEncoded: 0,
fileSize: 0,
error: formatFfmpegError(paletteResult.exitCode, paletteResult.stderr),
framesEncoded: frameCount,
fileSize,
};
} finally {
// The GIF palette is a temp file; remove it after success or any encode failure.
rmSync(input.palettePath, { force: true });
}
const gifResult = await runFfmpeg(buildGifPaletteuseArgs(argsInput), {
signal: input.signal,
timeout: input.timeout,
});
if (!gifResult.success) {
return {
success: false,
outputPath,
durationMs: Date.now() - startTime,
framesEncoded: 0,
fileSize: 0,
error: formatFfmpegError(gifResult.exitCode, gifResult.stderr),
};
}
const fileSize = existsSync(outputPath) ? statSync(outputPath).size : 0;
return {
success: true,
outputPath,
durationMs: Date.now() - startTime,
framesEncoded: frameCount,
fileSize,
};
}
export async function runEncodeStage(input: EncodeStageInput): Promise<EncodeStageResult> {