Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

perf: send Loom importer progress webhooks at most every 15 seconds

Richie McIlroy5685459364c3
diff --git a/apps/media-server/src/__tests__/loom-importer/app.test.ts b/apps/media-server/src/__tests__/loom-importer/app.test.ts
index 93dec5a6f..01b958e6e 100644
--- a/apps/media-server/src/__tests__/loom-importer/app.test.ts
+++ b/apps/media-server/src/__tests__/loom-importer/app.test.ts
@@ -95,6 +95,20 @@ describe("Loom importer API", () => {
videoId: "second",
phase: "queued",
});
+ const listing = (await (
+ await app.request("/loom-importer/video/status", {
+ headers: { "x-media-server-secret": "importer-secret" },
+ })
+ ).json()) as {
+ jobs: Array<{ jobId: string; videoId: string; phase: string }>;
+ };
+ expect(listing.jobs).toContainEqual(
+ expect.objectContaining({
+ jobId: second.jobId,
+ videoId: "second",
+ phase: "queued",
+ }),
+ );
const full = await post(app, body("third"));
expect(full.status).toBe(503);
expect(await full.json()).toMatchObject({ code: "SERVER_BUSY" });
diff --git a/apps/media-server/src/loom-importer/app.ts b/apps/media-server/src/loom-importer/app.ts
index eb9896e74..2a85c79e8 100644
--- a/apps/media-server/src/loom-importer/app.ts
+++ b/apps/media-server/src/loom-importer/app.ts
@@ -151,7 +151,16 @@ export function createLoomImporter(
phase: job.phase,
progress: job.progress,
ageSeconds: Math.round((Date.now() - job.createdAt) / 1000),
- })),
+ }))
+ .concat(
+ queue.map((entry) => ({
+ jobId: entry.jobId,
+ videoId: entry.request.videoId,
+ phase: "queued" as Job["phase"],
+ progress: 0,
+ ageSeconds: 0,
+ })),
+ ),
});
});
diff --git a/apps/media-server/src/loom-importer/job.ts b/apps/media-server/src/loom-importer/job.ts
index ad6a1fedc..8b335c91b 100644
--- a/apps/media-server/src/loom-importer/job.ts
+++ b/apps/media-server/src/loom-importer/job.ts
@@ -140,6 +140,9 @@ async function deliverTerminalWebhook(job: Job, attempts: number) {
);
}
+const PROGRESS_WEBHOOK_INTERVAL_MS = 15_000;
+const lastProgressWebhook = new Map<string, { at: number; phase: string }>();
+
function progressUpdate(
jobId: string,
phase: Job["phase"],
@@ -147,7 +150,21 @@ function progressUpdate(
message: string,
) {
const job = updateJob(jobId, { phase, progress, message });
- if (job) void sendWebhook(job);
+ if (!job) return;
+ const now = Date.now();
+ const last = lastProgressWebhook.get(jobId);
+ if (
+ last &&
+ last.phase === phase &&
+ now - last.at < PROGRESS_WEBHOOK_INTERVAL_MS
+ )
+ return;
+ lastProgressWebhook.set(jobId, { at: now, phase });
+ void sendWebhook(job);
+}
+
+function forgetProgressWebhooks(jobId: string) {
+ lastProgressWebhook.delete(jobId);
}
interface PreparedSource {
@@ -429,6 +446,7 @@ export async function runLoomImport(
if (failed)
await deliverTerminalWebhook(failed, settings.terminalWebhookAttempts);
} finally {
+ forgetProgressWebhooks(job.jobId);
if (workDir)
await rm(workDir, { recursive: true, force: true }).catch(() => {});
}