Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(media-server): keep queued audio when a stream finishes
Aditya Garud024bb01a92ca
diff --git a/apps/media-server/src/__tests__/lib/media-audio.integration.test.ts b/apps/media-server/src/__tests__/lib/media-audio.integration.test.tsindex 66d5d71ed..44cd86983 100644--- a/apps/media-server/src/__tests__/lib/media-audio.integration.test.ts+++ b/apps/media-server/src/__tests__/lib/media-audio.integration.test.ts@@ -224,6 +224,25 @@ describe("mediaAudio integration tests", () => {});describe("extractAudioStream", () => {+ test("preserves queued audio when the reader pauses before EOF", async () => {+ const expected = await extractAudio(TEST_VIDEO_WITH_AUDIO);+ const { stream, cleanup } = extractAudioStream(TEST_VIDEO_WITH_AUDIO);+ const reader = stream.getReader();+ const chunks: Uint8Array[] = [];+ try {+ while (true) {+ const { done, value } = await reader.read();+ if (done) break;+ chunks.push(value);+ await Bun.sleep(50);+ }+ expect(Buffer.concat(chunks).equals(expected)).toBe(true);+ } finally {+ reader.releaseLock();+ cleanup();+ }+ });+test("drains all encoded bytes when the consumer waits for FFmpeg to exit", async () => {const expected = await extractAudio(TEST_VIDEO_WITH_AUDIO);const registration = spyOn(subprocess, "registerSubprocess");diff --git a/apps/media-server/src/lib/media-audio.ts b/apps/media-server/src/lib/media-audio.tsindex 040ece6da..eeb2096c0 100644--- a/apps/media-server/src/lib/media-audio.ts+++ b/apps/media-server/src/lib/media-audio.ts@@ -401,10 +401,10 @@ export function extractAudioStream(let reader: ReadableStreamDefaultReader<Uint8Array> | null = null;let streamController: ReadableStreamDefaultController<Uint8Array> | undefined;- const cleanup = (error = new Error("Audio extraction cancelled")) => {+ const finish = (error?: Error) => {if (cleaned) return;cleaned = true;- streamController?.error(error);+ if (error) streamController?.error(error);if (timeoutId) clearTimeout(timeoutId);if (reader) {try {@@ -416,9 +416,10 @@ export function extractAudioStream(unregisterMediaOperation(operation);void terminateProcess(proc);};+ const cleanup = () => finish(new Error("Audio extraction cancelled"));timeoutId = setTimeout(() => {- cleanup(new Error(`Operation timed out after ${opts.timeoutMs}ms`));+ finish(new Error(`Operation timed out after ${opts.timeoutMs}ms`));}, opts.timeoutMs);void drainStream(proc.stderr as ReadableStream<Uint8Array>);@@ -426,7 +427,7 @@ export function extractAudioStream(proc.exited.then((exitCode) => {if (cleaned) return;if (exitCode !== 0) {- cleanup(new Error(`FFmpeg exited with code ${exitCode}`));+ finish(new Error(`FFmpeg exited with code ${exitCode}`));return;}if (timeoutId) clearTimeout(timeoutId);@@ -455,13 +456,13 @@ export function extractAudioStream(await proc.exited;if (cleaned) return;controller.close();- cleanup();+ finish();} else {controller.enqueue(value);}} catch (err) {controller.error(err);- cleanup();+ finish();}},cancel() {