Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): stop cancelled video jobs reporting success

Aditya Garud6c74aa79a70f
diff --git a/apps/media-server/src/__tests__/lib/media-video.integration.test.ts b/apps/media-server/src/__tests__/lib/media-video.integration.test.ts
index dd9844d10..91cd8ba13 100644
--- a/apps/media-server/src/__tests__/lib/media-video.integration.test.ts
+++ b/apps/media-server/src/__tests__/lib/media-video.integration.test.ts
@@ -34,6 +34,7 @@ import {
uploadFileToStorage,
uploadToS3,
} from "../../lib/media-video";
+import { ensureTempDir, getTempDir } from "../../lib/temp-files";
const FIXTURES_DIR = join(import.meta.dir, "..", "fixtures");
const TEST_VIDEO_WITH_AUDIO = join(FIXTURES_DIR, "test-with-audio.mp4");
@@ -511,6 +512,81 @@ describe("generatePreviewGif integration tests", () => {
});
describe("processVideo integration tests", () => {
+ test.each([false, true])(
+ "rejects cancelled video processing with remuxOnly=%s",
+ async (remuxOnly) => {
+ const metadata = await probeVideo(`file://${TEST_VIDEO_WITH_AUDIO}`);
+ const controller = new AbortController();
+ const reason = new Error("Recording worker lease expired");
+ controller.abort(reason);
+ const outcome = await processVideo(
+ TEST_VIDEO_WITH_AUDIO,
+ metadata,
+ { remuxOnly },
+ undefined,
+ controller.signal,
+ ).then(
+ (output) => {
+ tempFiles.push(output.path);
+ return output;
+ },
+ (error: unknown) => error,
+ );
+ expect(outcome).toBe(reason);
+ },
+ );
+
+ test("rejects cancellation during video processing setup", async () => {
+ const metadata = await probeVideo(`file://${TEST_VIDEO_WITH_AUDIO}`);
+ const controller = new AbortController();
+ const reason = new Error("Recording worker lease expired");
+ const processing = processVideo(
+ TEST_VIDEO_WITH_AUDIO,
+ metadata,
+ {},
+ undefined,
+ controller.signal,
+ );
+ queueMicrotask(() => controller.abort(reason));
+ const outcome = await processing.then(
+ (output) => {
+ tempFiles.push(output.path);
+ return output;
+ },
+ (error: unknown) => error,
+ );
+ expect(outcome).toBe(reason);
+ });
+
+ test("rejects cancellation at final video progress and removes the output", async () => {
+ const metadata = await probeVideo(`file://${TEST_VIDEO_WITH_AUDIO}`);
+ const controller = new AbortController();
+ const reason = new Error("Recording worker lease expired");
+ await ensureTempDir();
+ const existingFiles = new Set(readdirSync(getTempDir()));
+ const outcome = await processVideo(
+ TEST_VIDEO_WITH_AUDIO,
+ metadata,
+ { remuxOnly: true },
+ (progress) => {
+ if (progress < 100) return;
+ controller.abort(reason);
+ },
+ controller.signal,
+ ).then(
+ (output) => {
+ tempFiles.push(output.path);
+ return output;
+ },
+ (error: unknown) => error,
+ );
+ expect(controller.signal.aborted).toBe(true);
+ expect(outcome).toBe(reason);
+ expect(
+ readdirSync(getTempDir()).filter((name) => !existingFiles.has(name)),
+ ).toEqual([]);
+ });
+
test.each(["libvpx", "libvpx-vp9"])(
"preserves the playable ending of sparse %s screen recordings",
async (codec) => {
diff --git a/apps/media-server/src/lib/media-video.ts b/apps/media-server/src/lib/media-video.ts
index da16eceb2..03297f062 100644
--- a/apps/media-server/src/lib/media-video.ts
+++ b/apps/media-server/src/lib/media-video.ts
@@ -1597,6 +1597,7 @@ export async function processVideo(
abortSignal?: AbortSignal,
resilientFlags?: ResilientInputFlags,
): Promise<TempFileHandle> {
+ abortSignal?.throwIfAborted();
const definedOptions = Object.fromEntries(
Object.entries(options).filter(([, value]) => value !== undefined),
) as VideoProcessingOptions;
@@ -1608,6 +1609,7 @@ export async function processVideo(
!remuxOnly && metadata.videoCodec === "h264"
? await probeH264Level(inputPath, abortSignal)
: null;
+ abortSignal?.throwIfAborted();
const targetH264Level = pickMobileSafeH264Level(metadata, opts);
const normalizeH264Level =
opts.normalizeH264Level &&
@@ -1647,9 +1649,11 @@ export async function processVideo(
onProgress,
abortSignal,
);
+ abortSignal?.throwIfAborted();
return outputTempFile;
} catch (err) {
await outputTempFile.cleanup();
+ abortSignal?.throwIfAborted();
throw err;
}
}
@@ -1697,6 +1701,7 @@ export async function processVideo(
abortSignal,
);
recordNvencAttempt("process");
+ abortSignal?.throwIfAborted();
return outputTempFile;
} catch (error) {
const reason = nvencFallbackReason(
@@ -1722,9 +1727,11 @@ export async function processVideo(
onProgress,
abortSignal,
);
+ abortSignal?.throwIfAborted();
return outputTempFile;
} catch (err) {
await outputTempFile.cleanup();
+ abortSignal?.throwIfAborted();
throw err;
}
}