Open source Loom alternative. Beautiful, shareable screen recordings.
Rust appcapcossloommacnextjsnextjs15open-sourceossreactrecordrustscreen-capturescreen-recorderscreenshotsolidjstauritauri-apptypescriptvite
fix: lock Loom concierge completion, recover failed automatic imports, and surface unmapped rows
Richie McIlroy5efae8d17807
diff --git a/apps/web/__tests__/integration/loom-concierge-database.test.ts b/apps/web/__tests__/integration/loom-concierge-database.test.tsindex ae8f4fe55..f296f046c 100644--- a/apps/web/__tests__/integration/loom-concierge-database.test.ts+++ b/apps/web/__tests__/integration/loom-concierge-database.test.ts@@ -10,8 +10,14 @@ import {videos,videoUploads,} from "@cap/database/schema";-import { Organisation, User, Video } from "@cap/web-domain";+import {+ Organisation,+ type Storage as StorageDomain,+ User,+ Video,+} from "@cap/web-domain";import { eq } from "drizzle-orm";+import { createConnection } from "mysql2/promise";import {afterAll,beforeAll,@@ -65,6 +71,8 @@ vi.mock("@cap/database/auth/session", () => ({const OPERATOR_EMAIL = "[email protected]";const realFetch = globalThis.fetch;+type StorageUploadTarget = StorageDomain.UploadTarget;+function id() {return randomUUID().replaceAll("-", "").slice(0, 15);}@@ -175,6 +183,31 @@ async function setUploadPhase(.where(eq(videoUploads.videoId, Video.VideoId.make(videoId)));}+async function uploadToTarget(target: StorageUploadTarget) {+ const body = new Uint8Array(4096).fill(7);+ if (target.type === "put") {+ const response = await realFetch(target.url, {+ method: "PUT",+ headers: target.headers,+ body,+ });+ expect(response.ok).toBe(true);+ } else if (target.type === "s3Post") {+ const form = new FormData();+ for (const [key, value] of Object.entries(target.fields)) {+ form.append(key, value);+ }+ form.append("file", new Blob([body], { type: "video/mp4" }));+ const response = await realFetch(target.url, {+ method: "POST",+ body: form,+ });+ expect(response.ok).toBe(true);+ } else {+ throw new Error(`Unexpected upload target ${target.type}`);+ }+}+function stubLoomFetch() {vi.stubGlobal("fetch",@@ -764,29 +797,7 @@ describe.skipIf(!databaseUrl)("Loom concierge migration database", () => {}),).rejects.toThrow("already in the Cap import inventory");- const target = retry.uploadTarget;- const body = new Uint8Array(4096).fill(7);- if (target.type === "put") {- const response = await realFetch(target.url, {- method: "PUT",- headers: target.headers,- body,- });- expect(response.ok).toBe(true);- } else if (target.type === "s3Post") {- const form = new FormData();- for (const [key, value] of Object.entries(target.fields)) {- form.append(key, value);- }- form.append("file", new Blob([body], { type: "video/mp4" }));- const response = await realFetch(target.url, {- method: "POST",- body: form,- });- expect(response.ok).toBe(true);- } else {- throw new Error(`Unexpected upload target ${target.type}`);- }+ await uploadToTarget(retry.uploadTarget);fixture.start.mockClear();const finished = await loom.finishConciergeLoomFileUpload({@@ -813,6 +824,105 @@ describe.skipIf(!databaseUrl)("Loom concierge migration database", () => {).rejects.toThrow("already in the Cap import inventory");});+ it("recovers a failed automatic import with a restricted MP4", async () => {+ const { ownerId, organizationId } = await makeOrganization();+ const requestId = await requestMigration(organizationId, ownerId);+ const ownerEmail = `${id()}@example.com`;+ const loomUrl = `https://www.loom.com/share/${loomId()}`;++ signInAs(operatorId);+ const imported = await loom.importFromLoomCsvForConcierge({+ requestId,+ rows: [{ rowNumber: 2, loomUrl, userEmail: ownerEmail, spaceName: "" }],+ });+ const videoId = imported.results[0]?.videoId;+ if (!videoId) throw new Error("Missing automatic import");+ await setUploadPhase(videoId, "error");+ const [failed] = await db()+ .select({ rawFileKey: videoUploads.rawFileKey })+ .from(videoUploads)+ .where(eq(videoUploads.videoId, videoId));+ expect(failed?.rawFileKey).toBeNull();++ const prepared = await loom.createConciergeLoomFileUpload({+ requestId,+ loomUrl,+ userEmail: ownerEmail,+ spaceName: "",+ videoTitle: "Recovered",+ });+ expect(prepared.videoId).toBe(videoId);+ const [video] = await db()+ .select({ ownerId: videos.ownerId })+ .from(videos)+ .where(eq(videos.id, videoId));+ const [recovering] = await db()+ .select({ rawFileKey: videoUploads.rawFileKey })+ .from(videoUploads)+ .where(eq(videoUploads.videoId, videoId));+ expect(recovering?.rawFileKey).toBe(+ `${video?.ownerId}/${videoId}/raw-upload.mp4`,+ );+ expect((await getRequest(requestId)).queuedVideoCount).toBe(1);++ await uploadToTarget(prepared.uploadTarget);+ fixture.start.mockClear();+ const finished = await loom.finishConciergeLoomFileUpload({+ requestId,+ videoId,+ });+ expect(finished.status).toBe("started");+ expect(fixture.start).toHaveBeenCalledTimes(1);+ });++ it("waits for an in-flight import transaction before completing", async () => {+ const { ownerId, organizationId } = await makeOrganization();+ const requestId = await requestMigration(organizationId, ownerId);+ if (!databaseUrl) throw new Error("Missing test database");+ const connection = await createConnection(databaseUrl);+ const videoId = id();+ try {+ await connection.beginTransaction();+ await connection.query(+ "SELECT id FROM loom_migration_requests WHERE id = ? FOR UPDATE",+ [requestId],+ );+ await connection.query(+ "INSERT INTO videos (id, ownerId, orgId, name, source, createdAt, updatedAt) VALUES (?, ?, ?, 'In flight', ?, NOW(), NOW())",+ [videoId, ownerId, organizationId, JSON.stringify({ type: "webMP4" })],+ );+ await connection.query(+ "INSERT INTO video_uploads (video_id, phase, mode) VALUES (?, 'uploading', 'singlepart')",+ [videoId],+ );+ await connection.query(+ "INSERT INTO loom_migration_imports (videoId, requestId, createdAt) VALUES (?, ?, NOW())",+ [videoId, requestId],+ );++ signInAs(operatorId);+ const completion = actions.updateLoomMigrationStatus({+ requestId,+ nextStatus: "completed",+ message: "",+ verified: true,+ expectedVideoCount: 0,+ importedVideoCount: 0,+ });+ const settled = completion.then(+ () => "completed",+ (error: Error) => error.message,+ );+ await new Promise((resolve) => setTimeout(resolve, 300));+ await connection.commit();++ expect(await settled).toContain("still processing");+ expect((await getRequest(requestId)).status).toBe("pending");+ } finally {+ await connection.end();+ }+ });+it("refuses to map another request's video", async () => {const first = await makeOrganization();const firstRequest = await requestMigration(diff --git a/apps/web/actions/loom-concierge.tsx b/apps/web/actions/loom-concierge.tsxindex 66f5e4c11..b332c0c2e 100644--- a/apps/web/actions/loom-concierge.tsx+++ b/apps/web/actions/loom-concierge.tsx@@ -16,7 +16,7 @@ import {} from "@cap/database/schema";import { serverEnv } from "@cap/env";import type { Organisation } from "@cap/web-domain";-import { and, eq, inArray, isNotNull, lte, or } from "drizzle-orm";+import { and, eq, inArray, isNotNull } from "drizzle-orm";import { revalidatePath } from "next/cache";import {getCustomerMigrationRequests,@@ -272,72 +272,83 @@ async function saveMigrationStatus({) {return;}- if (nextStatus === "completed") {- const [unfinishedImport] = await db()- .select({ videoId: videoUploads.videoId })- .from(loomMigrationImports)- .innerJoin(- videoUploads,- eq(videoUploads.videoId, loomMigrationImports.videoId),- )- .where(- and(- eq(loomMigrationImports.requestId, requestId),- inArray(videoUploads.phase, [- "uploading",- "processing",- "generating_thumbnail",- "error",- ]),- ),- )- .limit(1);- if (unfinishedImport) {- throw new LoomMigrationError(- "Loom imports are still processing or have errors. Resolve them before completion.",- );- }- }const [organization] = await db().select({ name: organizations.name }).from(organizations).where(eq(organizations.id, request.organizationId)).limit(1);- const result = await db()- .update(loomMigrationRequests)- .set({- status: nextStatus,- capMessage: normalizedMessage || null,- expectedVideoCount,- importedVideoCount,- activeImportCount: nextStatus === "completed" ? 0 : undefined,- activeImportLeaseToken: nextStatus === "completed" ? null : undefined,- activeImportLeaseUntil: nextStatus === "completed" ? null : undefined,- activeOrganizationId:- nextStatus === "completed" ? null : request.organizationId,- completedAt: nextStatus === "completed" ? new Date() : null,- lastOperatorUserId: operator.id,- lastOperatorAt: new Date(),- updatedAt: new Date(),- })- .where(- and(- eq(loomMigrationRequests.id, requestId),- eq(loomMigrationRequests.status, request.status),- isNotNull(loomMigrationRequests.activeOrganizationId),- nextStatus === "completed"- ? or(- eq(loomMigrationRequests.activeImportCount, 0),- lte(loomMigrationRequests.activeImportLeaseUntil, new Date()),- )- : undefined,- ),- );- if (affectedRows(result) === 0) {- throw new LoomMigrationError(- "The migration request changed or imports are starting. Refresh and try again.",- );- }+ await db().transaction(async (tx) => {+ const now = new Date();+ const [current] = await tx+ .select({+ status: loomMigrationRequests.status,+ activeOrganizationId: loomMigrationRequests.activeOrganizationId,+ activeImportCount: loomMigrationRequests.activeImportCount,+ activeImportLeaseUntil: loomMigrationRequests.activeImportLeaseUntil,+ })+ .from(loomMigrationRequests)+ .where(eq(loomMigrationRequests.id, requestId))+ .limit(1)+ .for("update");+ const importStarting =+ !!current &&+ current.activeImportCount > 0 &&+ (!current.activeImportLeaseUntil || current.activeImportLeaseUntil > now);+ if (+ !current?.activeOrganizationId ||+ current.status !== request.status ||+ (nextStatus === "completed" && importStarting)+ ) {+ throw new LoomMigrationError(+ "The migration request changed or imports are starting. Refresh and try again.",+ );+ }+ if (nextStatus === "completed") {+ const [unfinishedImport] = await tx+ .select({ videoId: videoUploads.videoId })+ .from(loomMigrationImports)+ .innerJoin(+ videoUploads,+ eq(videoUploads.videoId, loomMigrationImports.videoId),+ )+ .where(+ and(+ eq(loomMigrationImports.requestId, requestId),+ inArray(videoUploads.phase, [+ "uploading",+ "processing",+ "generating_thumbnail",+ "error",+ ]),+ ),+ )+ .limit(1)+ .for("share");+ if (unfinishedImport) {+ throw new LoomMigrationError(+ "Loom imports are still processing or have errors. Resolve them before completion.",+ );+ }+ }+ await tx+ .update(loomMigrationRequests)+ .set({+ status: nextStatus,+ capMessage: normalizedMessage || null,+ expectedVideoCount,+ importedVideoCount,+ activeImportCount: nextStatus === "completed" ? 0 : undefined,+ activeImportLeaseToken: nextStatus === "completed" ? null : undefined,+ activeImportLeaseUntil: nextStatus === "completed" ? null : undefined,+ activeOrganizationId:+ nextStatus === "completed" ? null : request.organizationId,+ completedAt: nextStatus === "completed" ? now : null,+ lastOperatorUserId: operator.id,+ lastOperatorAt: now,+ updatedAt: now,+ })+ .where(eq(loomMigrationRequests.id, requestId));+ });const customerVisibleChange =nextStatus !== request.status ||diff --git a/apps/web/actions/loom.ts b/apps/web/actions/loom.tsindex 9d3acc866..2f8ce51d1 100644--- a/apps/web/actions/loom.ts+++ b/apps/web/actions/loom.ts@@ -1204,11 +1204,16 @@ async function prepareConciergeLoomFileUpload({).limit(1);if (existing) {+ const existingRawFileKey =+ existing.rawFileKey ??+ (existing.phase === "error" && existing.ownerId+ ? `${existing.ownerId}/${existing.id}/raw-upload.mp4`+ : null);if (!existing.ownerId ||!existing.ownerEmail ||normalizeImportEmail(existing.ownerEmail) !== normalizedEmail ||- !existing.rawFileKey ||+ !existingRawFileKey ||(existing.phase !== "error" &&(existing.phase !== "uploading" ||existing.processingMessage !== "Uploading Loom video..."))@@ -1219,7 +1224,7 @@ async function prepareConciergeLoomFileUpload({}const retryUpload = await Storage.createUploadTargetForUser(existing.ownerId,- existing.rawFileKey,+ existingRawFileKey,{contentType: "video/mp4",videoTitle: normalizedTitle,@@ -1249,7 +1254,7 @@ async function prepareConciergeLoomFileUpload({"This Loom import belongs to another migration request.",);}- if (!mapped) {+ if (!mapped || !existing.rawFileKey) {await db().transaction(async (tx) => {const [reservation] = await tx.select({@@ -1271,6 +1276,19 @@ async function prepareConciergeLoomFileUpload({"The concierge import expired. Retry this video.",);}+ if (!existing.rawFileKey) {+ await tx+ .update(videoUploads)+ .set({ rawFileKey: existingRawFileKey, updatedAt: new Date() })+ .where(+ and(+ eq(videoUploads.videoId, Video.VideoId.make(existing.id)),+ eq(videoUploads.phase, "error"),+ isNull(videoUploads.rawFileKey),+ ),+ );+ }+ if (mapped) return;await tx.insert(loomMigrationImports).values({videoId: Video.VideoId.make(existing.id),requestId,diff --git a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsxindex b27cc2d64..f9d860b04 100644--- a/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx+++ b/apps/web/app/(org)/dashboard/admin/loom-migrations/LoomMigrationQueue.tsx@@ -109,7 +109,9 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {}),);started += result.importedCount;- failures.push(...result.results.filter((row) => !row.success));+ failures.push(+ ...result.results.filter((row) => !row.success || row.error),+ );setProcessedRows(index + batch.length);setStartedRows(started);setFailedRows([...failures]);@@ -275,15 +277,19 @@ function QueueItem({ request }: { request: OperatorLoomMigrationView }) {</Button>{processedRows > 0 && (<p className="mt-2 text-xs text-gray-10">- {startedRows} jobs started; {failedRows.length} rows failed to- start.+ {startedRows} jobs started;{" "}+ {failedRows.filter((row) => !row.success).length} rows failed to+ start; {failedRows.filter((row) => row.success).length} started rows+ need space mapping.</p>)}{failedRows.length > 0 && (- <ul className="mt-3 max-h-48 list-inside list-disc overflow-y-auto text-xs text-red-11">+ <ul className="mt-3 max-h-48 list-inside list-disc overflow-y-auto text-xs text-red-400">{failedRows.map((row) => (<li key={row.rowNumber}>- Row {row.rowNumber}: {row.error || "Could not start import."}+ Row {row.rowNumber}+ {row.success && row.spaceName ? ` (${row.spaceName})` : ""}:{" "}+ {row.error || "Could not start import."}</li>))}</ul>@@ -520,7 +526,7 @@ export function LoomMigrationQueue() {</p>)}{queueQuery.isError && (- <div className="rounded-lg border border-red-7 bg-red-3 p-4 text-sm text-red-11">+ <div className="rounded-lg border border-red-400/30 bg-red-400/10 p-4 text-sm text-red-400">Could not load the queue. {queueQuery.error.message}<buttonclassName="ml-2 underline"diff --git a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsxindex 57883acca..6c3cd6742 100644--- a/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx+++ b/apps/web/app/(org)/dashboard/migrations/loom/LoomMigrationPage.tsx@@ -191,7 +191,7 @@ export function LoomMigrationPage() {</div>)}{migrationQuery.isError && (- <div className="rounded-lg border border-red-7 bg-red-3 p-4 text-sm text-red-11">+ <div className="rounded-lg border border-red-400/30 bg-red-400/10 p-4 text-sm text-red-400">Could not load your migration. {migrationQuery.error.message}<buttonclassName="ml-2 underline"