Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix: bound and drain Loom preview renders, accept internal HTTP storage

Richie McIlroy51e62ddc73c9
diff --git a/apps/media-server/src/__tests__/loom-importer/preview.test.ts b/apps/media-server/src/__tests__/loom-importer/preview.test.ts
index 005954ee3..336438784 100644
--- a/apps/media-server/src/__tests__/loom-importer/preview.test.ts
+++ b/apps/media-server/src/__tests__/loom-importer/preview.test.ts
@@ -58,17 +58,20 @@ describe("Loom preview GIF", () => {
});
test("renders a GIF from the finished video and uploads it", async () => {
- await renderPreviewGif({
- videoUrl: `http://127.0.0.1:${server.port}/result.mp4`,
- previewGifPresignedUrl: `http://127.0.0.1:${server.port}/upload/preview.gif`,
- duration: 6,
- });
+ await renderPreviewGif(
+ {
+ videoUrl: `http://127.0.0.1:${server.port}/result.mp4`,
+ previewGifPresignedUrl: `http://127.0.0.1:${server.port}/upload/preview.gif`,
+ duration: 6,
+ },
+ AbortSignal.timeout(60_000),
+ );
expect(uploads).toHaveLength(1);
expect(uploads[0]?.type).toBe("image/gif");
expect(uploads[0]?.bytes).toBeGreaterThan(1000);
});
- test("requires the secret and an HTTPS source", async () => {
+ test("requires the secret and an HTTP source", async () => {
const { app } = createLoomImporter(
loadImporterSettings({ LOOM_IMPORTER_WORK_DIR: root }),
);
@@ -82,7 +85,7 @@ describe("Loom preview GIF", () => {
body: JSON.stringify(body),
});
const body = {
- videoUrl: "http://127.0.0.1/result.mp4",
+ videoUrl: "file:///etc/passwd",
previewGifPresignedUrl: "https://storage.example.com/p.gif",
duration: 6,
};
diff --git a/apps/media-server/src/loom-importer/app.ts b/apps/media-server/src/loom-importer/app.ts
index 37a6802e2..eb9896e74 100644
--- a/apps/media-server/src/loom-importer/app.ts
+++ b/apps/media-server/src/loom-importer/app.ts
@@ -59,6 +59,7 @@ export function loadImporterSettings(
}
const JOB_LIFETIME_MS = 4 * 60 * 60 * 1000;
+const PREVIEW_TIMEOUT_MS = 120_000;
const JOB_HEARTBEAT_MS = 60_000;
interface QueuedImport {
@@ -81,6 +82,7 @@ export function createLoomImporter(
const running = new Map<string, AbortController>();
let draining = false;
const previewSemaphore = new Semaphore(config.maxPreviewJobs);
+ const previews = new Set<AbortController>();
const startJob = ({ jobId, request }: QueuedImport) =>
createJob(
@@ -204,8 +206,18 @@ export function createLoomImporter(
);
if (!parsed.success)
return c.json({ error: "Invalid request", code: "INVALID_REQUEST" }, 400);
+ if (previews.size >= config.maxPreviewJobs * 2)
+ return c.json(
+ { error: "Preview queue is full", code: "SERVER_BUSY" },
+ 503,
+ );
+ const controller = new AbortController();
+ const timeout = setTimeout(() => controller.abort(), PREVIEW_TIMEOUT_MS);
+ previews.add(controller);
try {
- await previewSemaphore.run(() => renderPreviewGif(parsed.data));
+ await previewSemaphore.run(() =>
+ renderPreviewGif(parsed.data, controller.signal),
+ );
return c.json({ ok: true });
} catch (error) {
console.warn("[loom-importer] Preview GIF failed", error);
@@ -213,6 +225,9 @@ export function createLoomImporter(
{ error: "Preview GIF failed", code: "PREVIEW_FAILED" },
502,
);
+ } finally {
+ clearTimeout(timeout);
+ previews.delete(controller);
}
});
@@ -246,13 +261,17 @@ export function createLoomImporter(
const drain = async (timeoutMs: number) => {
draining = true;
const deadline = Date.now() + timeoutMs;
- while ((queue.length > 0 || running.size > 0) && Date.now() < deadline)
+ while (
+ (queue.length > 0 || running.size > 0 || previews.size > 0) &&
+ Date.now() < deadline
+ )
await new Promise((resolve) => setTimeout(resolve, 500));
+ for (const controller of previews) controller.abort();
await Promise.all(
queue.splice(0).map((entry) => cancelJob(startJob(entry))),
);
for (const controller of running.values()) controller.abort();
- while (running.size > 0)
+ while (running.size > 0 || previews.size > 0)
await new Promise((resolve) => setTimeout(resolve, 250));
};
diff --git a/apps/media-server/src/loom-importer/preview.ts b/apps/media-server/src/loom-importer/preview.ts
index 8a76db3bf..413dc25d8 100644
--- a/apps/media-server/src/loom-importer/preview.ts
+++ b/apps/media-server/src/loom-importer/preview.ts
@@ -1,21 +1,25 @@
import { z } from "zod";
import { generatePreviewGif, uploadFileToS3 } from "../lib/media-video";
-const PREVIEW_TIMEOUT_MS = 120_000;
-
export const previewRequestSchema = z.object({
videoUrl: z
.string()
.url()
- .refine((value) => value.startsWith("https://"), "videoUrl must use HTTPS"),
+ .refine(
+ (value) => value.startsWith("https://") || value.startsWith("http://"),
+ "videoUrl must be an HTTP URL",
+ ),
previewGifPresignedUrl: z.string().url(),
duration: z.number().positive().max(86_400),
});
export type PreviewRequest = z.infer<typeof previewRequestSchema>;
-export async function renderPreviewGif(request: PreviewRequest) {
- const signal = AbortSignal.timeout(PREVIEW_TIMEOUT_MS);
+export async function renderPreviewGif(
+ request: PreviewRequest,
+ signal: AbortSignal,
+) {
+ signal.throwIfAborted();
const rendered = await generatePreviewGif(
request.videoUrl,
request.duration,