Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(media-server): give forwarded cancels time for the owner's webhook

Richie McIlroy78c8a3c1ef61
diff --git a/apps/media-server/src/__tests__/routes/peer-jobs.test.ts b/apps/media-server/src/__tests__/routes/peer-jobs.test.ts
index 4aa4ea77d..c9ef0e01c 100644
--- a/apps/media-server/src/__tests__/routes/peer-jobs.test.ts
+++ b/apps/media-server/src/__tests__/routes/peer-jobs.test.ts
@@ -17,7 +17,7 @@ const peerRequests: {
peerLookup: string | null;
secret: string | null;
}[] = [];
-let respond: (request: Request) => Response = () =>
+let respond: (request: Request) => Response | Promise<Response> = () =>
new Response("not found", { status: 404 });
let peer: ReturnType<typeof Bun.serve>;
let missingPeer: ReturnType<typeof Bun.serve>;
@@ -116,6 +116,23 @@ describe("peer job lookup", () => {
expect(response.status).toBe(404);
});
+ test("waits for an owner that delivers its webhook before confirming a cancel", async () => {
+ respond = async (request) => {
+ if (request.method !== "POST")
+ return new Response("not found", { status: 404 });
+ await Bun.sleep(2_500);
+ return Response.json({ success: true, jobId: "job-slow-cancel" });
+ };
+ const response = await app.fetch(
+ new Request("http://localhost/video/process/job-slow-cancel/cancel", {
+ method: "POST",
+ headers: { "x-media-server-secret": SECRET },
+ }),
+ );
+ expect(response.status).toBe(200);
+ expect((await response.json()).success).toBe(true);
+ }, 10_000);
+
test("cancels a job on the peer that owns it", async () => {
respond = (request) =>
request.method === "POST"
diff --git a/apps/media-server/src/lib/peer-jobs.ts b/apps/media-server/src/lib/peer-jobs.ts
index ae7865ab5..99318e2a1 100644
--- a/apps/media-server/src/lib/peer-jobs.ts
+++ b/apps/media-server/src/lib/peer-jobs.ts
@@ -1,5 +1,7 @@
const PEER_LOOKUP_HEADER = "x-cap-peer-lookup";
-const PEER_TIMEOUT_MS = 2_000;
+const PEER_STATUS_TIMEOUT_MS = 2_000;
+// The owner replies to a cancel only after delivering its webhook (up to three 5 s attempts).
+const PEER_CANCEL_TIMEOUT_MS = 30_000;
// Jobs live in the memory of the instance that runs them. Behind a load
// balancer a status or cancel request can land on another instance, so it asks
@@ -32,7 +34,10 @@ export async function findJobOnPeer(
const peers = mediaServerPeers();
if (!secret || peers.length === 0) return null;
const controller = new AbortController();
- const timeout = setTimeout(() => controller.abort(), PEER_TIMEOUT_MS);
+ const timeout = setTimeout(
+ () => controller.abort(),
+ method === "POST" ? PEER_CANCEL_TIMEOUT_MS : PEER_STATUS_TIMEOUT_MS,
+ );
try {
return await Promise.any(
peers.map(async (peer) => {