Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): never start a transcode after the job was cancelled

Richie McIlroyb49908d3aa86
diff --git a/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts b/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts
index 2efaf38a6..23cceb76e 100644
--- a/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts
+++ b/apps/media-server/src/__tests__/lib/nvenc-encoder.test.ts
@@ -646,6 +646,25 @@ describe("nvenc jobs on hosts without an NVENC device", () => {
}
}
+ test("does not start the encoder once the job is cancelled", async () => {
+ const metadata = await probeVideo(`file://${fixture}`);
+ const attempts = getVideoEncoderStatus(enabled).nvenc?.attempts ?? 0;
+ const controller = new AbortController();
+ controller.abort();
+ await expect(
+ withNvencEnv(() =>
+ processVideo(
+ fixture,
+ metadata,
+ { maxWidth: 160, maxHeight: 120 },
+ undefined,
+ controller.signal,
+ ),
+ ),
+ ).rejects.toThrow("Video processing was cancelled");
+ expect(getVideoEncoderStatus(enabled).nvenc?.attempts ?? 0).toBe(attempts);
+ });
+
test("still produces the transcode", async () => {
const metadata = await probeVideo(`file://${fixture}`);
const attempts = getVideoEncoderStatus(enabled).nvenc?.attempts ?? 0;
diff --git a/apps/media-server/src/lib/media-video.ts b/apps/media-server/src/lib/media-video.ts
index f61cd5b2e..256210b4a 100644
--- a/apps/media-server/src/lib/media-video.ts
+++ b/apps/media-server/src/lib/media-video.ts
@@ -1808,6 +1808,7 @@ async function runTranscodeCommand(
onProgress?: ProgressCallback,
abortSignal?: AbortSignal,
): Promise<void> {
+ if (abortSignal?.aborted) throw new Error("Video processing was cancelled");
const proc = registerSubprocess(
spawn({
cmd: ffmpegArgs,