Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix(web): retry media jobs cancelled by a media server shutdown
Richie McIlroyd282077cf1ae
diff --git a/apps/web/__tests__/unit/media-server-progress.test.ts b/apps/web/__tests__/unit/media-server-progress.test.tsindex f4e817178..ff6a9a157 100644--- a/apps/web/__tests__/unit/media-server-progress.test.ts+++ b/apps/web/__tests__/unit/media-server-progress.test.ts@@ -256,15 +256,19 @@ function databaseFixture(initial: DesktopRecordingJob | null = fixture().job) {function request(body: unknown = fixture().payload,secret: string | null = "media-secret",+ search = "",) {const headers = new Headers({ "Content-Type": "application/json" });if (secret !== null) headers.set("x-media-server-secret", secret);return POST(- new NextRequest("https://cap.so/api/webhooks/media-server/progress", {- method: "POST",- headers,- body: JSON.stringify(body),- }),+ new NextRequest(+ `https://cap.so/api/webhooks/media-server/progress${search}`,+ {+ method: "POST",+ headers,+ body: JSON.stringify(body),+ },+ ),);}@@ -748,4 +752,61 @@ describe("media-server recording progress webhook", () => {expect(database.mutations).toEqual([]);expect(mocks.transcribe).not.toHaveBeenCalled();});++ it.each([+ ["a retryable error", "error", "Worker failed", "?retryable=true"],+ [+ "a media server shutdown",+ "cancelled",+ "Server shutting down",+ "?retryable=true",+ ],+ ])(+ "keeps a workflow upload processing for retry after %s",+ async (_, phase, message, search) => {+ const database = databaseFixture(null);+ const response = await request(+ { jobId: "web-job", videoId, phase, progress: 37, message },+ "media-secret",+ search,+ );+ expect(response.status).toBe(200);+ expect(database.mutations).toEqual([+ {+ operation: "update",+ table: mocks.tables.uploads,+ values: expect.objectContaining({+ phase: "processing",+ processingProgress: 37,+ processingError: message,+ processingMessage: "Retrying video processing...",+ }),+ },+ ]);+ },+ );++ it.each([+ ["a deliberate cancel", "Cancelled by user", "?retryable=true"],+ ["a shutdown cancel without retry support", "Server shutting down", ""],+ ])("marks a workflow upload failed after %s", async (_, message, search) => {+ const database = databaseFixture(null);+ const response = await request(+ { jobId: "web-job", videoId, phase: "cancelled", progress: 37, message },+ "media-secret",+ search,+ );+ expect(response.status).toBe(200);+ expect(database.mutations).toEqual([+ {+ operation: "update",+ table: mocks.tables.uploads,+ values: expect.objectContaining({+ phase: "error",+ processingError: message,+ processingMessage: message,+ }),+ },+ ]);+ });});diff --git a/apps/web/app/api/webhooks/media-server/progress/route.ts b/apps/web/app/api/webhooks/media-server/progress/route.tsindex 9e4a7bf82..35233e295 100644--- a/apps/web/app/api/webhooks/media-server/progress/route.ts+++ b/apps/web/app/api/webhooks/media-server/progress/route.ts@@ -58,6 +58,8 @@ interface ProgressWebhookPayload {};}+const MEDIA_SERVER_SHUTDOWN_MESSAGE = "Server shutting down";+function getValidDuration(duration: number) {return Number.isFinite(duration) && duration > 0 ? duration : undefined;}@@ -146,7 +148,9 @@ export async function POST(request: NextRequest) {}const isRetryableWorkflowError =request.nextUrl.searchParams.get("retryable") === "true" &&- payload.phase === "error";+ (payload.phase === "error" ||+ (payload.phase === "cancelled" &&+ payload.message === MEDIA_SERVER_SHUTDOWN_MESSAGE));console.log("[media-server-webhook] Received progress update for video %s: %s (%d%%)",