Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): copy verification chunk fragments without stacking stream listeners

Richie McIlroy0c2ca9f11953
diff --git a/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts b/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts
index 618cfa779..2a31b372e 100644
--- a/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts
+++ b/apps/media-server/src/__tests__/lib/recording-verification.integration.test.ts
@@ -2445,7 +2445,12 @@ function objectResponse(
}
describe("chunked packet-proven verification", () => {
- async function segmentedRecording(name: string, gop: number) {
+ async function segmentedRecording(
+ name: string,
+ gop: number,
+ frames = 120,
+ segmentSeconds = 0.5,
+ ) {
const fragments = await mkdtemp(join(directory, `${name}-`));
await run([
"ffmpeg",
@@ -2456,7 +2461,7 @@ describe("chunked packet-proven verification", () => {
"-i",
"testsrc2=size=320x180:rate=30",
"-frames:v",
- "120",
+ String(frames),
"-c:v",
"libx264",
"-preset",
@@ -2472,7 +2477,7 @@ describe("chunked packet-proven verification", () => {
"-f",
"dash",
"-seg_duration",
- "0.5",
+ String(segmentSeconds),
"-use_template",
"1",
"-use_timeline",
@@ -2620,6 +2625,22 @@ describe("chunked packet-proven verification", () => {
expect(chunked.video.frameCount).toBe(120);
});
+ test("copies many fragments into one run without piling up stream listeners", async () => {
+ const recording = await segmentedRecording("chunk-many", 6, 240, 0.2);
+ expect(recording.segments.length).toBeGreaterThanOrEqual(30);
+ const warnings: string[] = [];
+ const onWarning = (warning: Error) => warnings.push(warning.name);
+ process.on("warning", onWarning);
+ try {
+ const { single, chunked, fallbacks } = await both(recording);
+ expect(fallbacks).toHaveLength(0);
+ expect(chunked).toEqual(single);
+ } finally {
+ process.off("warning", onWarning);
+ }
+ expect(warnings).not.toContain("MaxListenersExceededWarning");
+ });
+
test("still rejects a corrupt recording through the full decode", async () => {
const recording = await segmentedRecording("chunk-corrupt", 15);
const target = recording.segments[3];
diff --git a/apps/media-server/src/lib/recording-verification.ts b/apps/media-server/src/lib/recording-verification.ts
index dcd7c5346..ef2a42c3b 100644
--- a/apps/media-server/src/lib/recording-verification.ts
+++ b/apps/media-server/src/lib/recording-verification.ts
@@ -1,11 +1,10 @@
import { spawn } from "node:child_process";
import { createHash, type Hash } from "node:crypto";
-import { createReadStream, createWriteStream } from "node:fs";
-import { lstat, rm } from "node:fs/promises";
+import { createReadStream } from "node:fs";
+import { lstat, open, rm } from "node:fs/promises";
import { availableParallelism } from "node:os";
import { dirname, isAbsolute, join } from "node:path";
import { Readable } from "node:stream";
-import { pipeline } from "node:stream/promises";
import { setTimeout as sleep } from "node:timers/promises";
import { decodeThreadsFromEnv, PROCESS_TIMEOUT_MS } from "./media-common";
import {
@@ -723,19 +722,16 @@ async function concatFiles(
target: string,
signal?: AbortSignal,
): Promise<void> {
- const output = createWriteStream(target);
+ const output = await open(target, "w");
try {
for (const path of paths) {
signal?.throwIfAborted();
- await pipeline(createReadStream(path), output, {
- end: false,
- ...(signal ? { signal } : {}),
- });
+ for await (const chunk of createReadStream(path, { signal })) {
+ await output.write(chunk);
+ }
}
} finally {
- await new Promise<void>((resolve, reject) =>
- output.end((error?: Error | null) => (error ? reject(error) : resolve())),
- );
+ await output.close();
}
}