Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix: restart Loom imports stalled while uploading

Richie McIlroycd663fbe4d4e
diff --git a/apps/web/__tests__/unit/loom-importer-redrive.test.ts b/apps/web/__tests__/unit/loom-importer-redrive.test.ts
index ba6bb8143..ab9a5375a 100644
--- a/apps/web/__tests__/unit/loom-importer-redrive.test.ts
+++ b/apps/web/__tests__/unit/loom-importer-redrive.test.ts
@@ -1,3 +1,5 @@
+import type { HttpApi } from "@effect/platform";
+import type { Layer as EffectLayer } from "effect";
import { NextRequest } from "next/server";
import { beforeEach, describe, expect, it, vi } from "vitest";
@@ -70,11 +72,13 @@ vi.mock("@/lib/loom-import-start", () => ({
}
},
}));
+type ApiLayer = EffectLayer.Layer<HttpApi.Api>;
+
vi.mock("@/lib/server", async () => {
const { HttpApiBuilder, HttpServer } = await import("@effect/platform");
const { Layer } = await import("effect");
return {
- apiToHandler: (api: Layer.Layer<never>) => {
+ apiToHandler: (api: ApiLayer) => {
const { handler } = HttpApiBuilder.toWebHandler(
Layer.mergeAll(api, HttpServer.layerContext),
);
@@ -158,6 +162,15 @@ describe("redriveLoomImport", () => {
expect(mocks.updates).toEqual([]);
});
+ it("restarts imports stuck uploading for over a week", async () => {
+ mocks.rows = [
+ failedImport({ phase: "uploading", uploadUpdatedAt: hoursAgo(24 * 8) }),
+ ];
+ await expect(redriveLoomImport("video", now)).resolves.toMatchObject({
+ status: "restarted",
+ });
+ });
+
it("restarts imports stuck processing for over a week", async () => {
mocks.rows = [
failedImport({
diff --git a/apps/web/lib/loom-import-redrive.ts b/apps/web/lib/loom-import-redrive.ts
index b436e2d22..5aa7125fc 100644
--- a/apps/web/lib/loom-import-redrive.ts
+++ b/apps/web/lib/loom-import-redrive.ts
@@ -55,9 +55,10 @@ export async function redriveLoomImport(
reason: "not an unfinished Loom import",
};
const age = now.getTime() - row.uploadUpdatedAt.getTime();
- const staleProcessing =
- row.phase === "processing" && age > STALE_PROCESSING_AGE_MS;
- if (row.phase !== "error" && !staleProcessing)
+ const stalled =
+ (row.phase === "processing" || row.phase === "uploading") &&
+ age > STALE_PROCESSING_AGE_MS;
+ if (row.phase !== "error" && !stalled)
return { videoId, status: "skipped", reason: `phase ${row.phase}` };
const runState = await getLoomImportRunState(row.metadata?.loomImportRun);
if (runState === "pending" || runState === "active")