Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix: keep deferred Loom claims when a conversion start is uncertain
Richie McIlroy3e8cd63ae011
diff --git a/apps/web/__tests__/unit/loom-importer-redrive.test.ts b/apps/web/__tests__/unit/loom-importer-redrive.test.tsindex ab9a5375a..cb3ab80fd 100644--- a/apps/web/__tests__/unit/loom-importer-redrive.test.ts+++ b/apps/web/__tests__/unit/loom-importer-redrive.test.ts@@ -281,8 +281,8 @@ describe("deferred Loom processing", () => {).toBeNull();});- it("releases its claim when the conversion cannot start", async () => {- mocks.startProcessing.mockRejectedValue(new Error("queue down"));+ it("keeps its claim when the conversion start is uncertain", async () => {+ mocks.startProcessing.mockRejectedValue(new Error("queue timed out"));await expect(startDeferredLoomProcessing({@@ -293,9 +293,9 @@ describe("deferred Loom processing", () => {},now,),- ).rejects.toThrow("queue down");- expect(mocks.deletes).toBe(1);- expect(mocks.updates).toHaveLength(2);+ ).rejects.toThrow("queue timed out");+ expect(mocks.deletes).toBe(0);+ expect(mocks.updates).toHaveLength(1);});it("starts processing the original once", async () => {diff --git a/apps/web/lib/loom-deferred-processing.ts b/apps/web/lib/loom-deferred-processing.tsindex 63437dbef..7a1ed19b7 100644--- a/apps/web/lib/loom-deferred-processing.ts+++ b/apps/web/lib/loom-deferred-processing.ts@@ -66,45 +66,22 @@ export async function startDeferredLoomProcessing();if (getAffectedRows(claim) !== 1) return "already-started" as const;- try {- await db()- .insert(videoUploads)- .values({- videoId,- mode: "singlepart",- phase: "uploading",- rawFileKey,- processingMessage: "Optimizing imported video...",- })- .onDuplicateKeyUpdate({ set: { rawFileKey, phase: "uploading" } });- return await startVideoProcessingWorkflow({+ await db()+ .insert(videoUploads)+ .values({videoId,- userId: ownerId,+ mode: "singlepart",+ phase: "uploading",rawFileKey,- bucketId,processingMessage: "Optimizing imported video...",- startFailureMessage: "Imported video could not be optimized",- });- } catch (error) {- await db()- .delete(videoUploads)- .where(- and(- eq(videoUploads.videoId, videoId),- eq(videoUploads.rawFileKey, rawFileKey),- ),- );- await db()- .update(videos)- .set({- metadata: sql`JSON_SET(${videos.metadata}, '$.loomDeferredProcessing.status', 'pending')`,- })- .where(- and(- eq(videos.id, videoId),- sql`JSON_UNQUOTE(JSON_EXTRACT(${videos.metadata}, '$.loomDeferredProcessing.startedAt')) = ${startedAt}`,- ),- );- throw error;- }+ })+ .onDuplicateKeyUpdate({ set: { rawFileKey, phase: "uploading" } });+ return startVideoProcessingWorkflow({+ videoId,+ userId: ownerId,+ rawFileKey,+ bucketId,+ processingMessage: "Optimizing imported video...",+ startFailureMessage: "Imported video could not be optimized",+ });}