Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(web): lock video row when merging metadata updates

Richie McIlroyb3d6128c1e7c
diff --git a/apps/web/__tests__/unit/video-storage-key.test.ts b/apps/web/__tests__/unit/video-storage-key.test.ts
index 9487d4599..04d809ce4 100644
--- a/apps/web/__tests__/unit/video-storage-key.test.ts
+++ b/apps/web/__tests__/unit/video-storage-key.test.ts
@@ -11,6 +11,8 @@ const mocks = vi.hoisted(() => ({
startVideoProcessingWorkflow: vi.fn(),
selectWhere: vi.fn(),
updateSet: vi.fn(),
+ lockedFor: vi.fn(),
+ transaction: vi.fn(),
}));
vi.mock("@cap/database", () => ({
@@ -62,6 +64,21 @@ beforeEach(() => {
});
mocks.startVideoProcessingWorkflow.mockResolvedValue("started");
mocks.updateSet.mockReturnValue({ where: vi.fn().mockResolvedValue([]) });
+ mocks.lockedFor.mockResolvedValue([]);
+ mocks.transaction.mockImplementation((run: (tx: unknown) => unknown) =>
+ run({
+ select: () => ({
+ from: () => ({
+ where: () => ({
+ for: mocks.lockedFor,
+ }),
+ }),
+ }),
+ update: () => ({
+ set: mocks.updateSet,
+ }),
+ }),
+ );
mocks.db.mockReturnValue({
select: () => ({
from: () => ({
@@ -71,6 +88,7 @@ beforeEach(() => {
update: () => ({
set: mocks.updateSet,
}),
+ transaction: mocks.transaction,
});
});
@@ -221,6 +239,9 @@ describe("video metadata route", () => {
mocks.selectWhere.mockResolvedValue([
{ ...video, metadata: { sourceName: "a.mp4", agentUpload } },
]);
+ mocks.lockedFor.mockResolvedValue([
+ { metadata: { sourceName: "a.mp4", agentUpload } },
+ ]);
const response = await put({
sourceName: "b.mp4",
@@ -233,8 +254,34 @@ describe("video metadata route", () => {
});
});
+ it("keeps an agent upload accepted after the initial read when metadata is written", async () => {
+ const accepted = {
+ state: "accepted",
+ rawFileKey: `${ownerId}/${videoId}/verified-upload-abc.mp4`,
+ };
+ mocks.selectWhere.mockResolvedValue([
+ {
+ ...video,
+ metadata: { sourceName: "a.mp4", agentUpload: { state: "pending" } },
+ },
+ ]);
+ mocks.lockedFor.mockResolvedValue([
+ { metadata: { sourceName: "a.mp4", agentUpload: accepted } },
+ ]);
+
+ const response = await put({ sourceName: "b.mp4" });
+
+ expect(response.status).toBe(200);
+ expect(mocks.transaction).toHaveBeenCalledOnce();
+ expect(mocks.lockedFor).toHaveBeenCalledWith("update");
+ expect(mocks.updateSet).toHaveBeenCalledWith({
+ metadata: { sourceName: "b.mp4", agentUpload: accepted },
+ });
+ });
+
it("does not add an agent upload state from the request", async () => {
mocks.selectWhere.mockResolvedValue([{ ...video, metadata: null }]);
+ mocks.lockedFor.mockResolvedValue([{ metadata: null }]);
const response = await put({
customCreatedAt: "2026-01-01T00:00:00.000Z",
@@ -254,5 +301,6 @@ describe("video metadata route", () => {
expect(response.status).toBe(400);
expect(mocks.updateSet).not.toHaveBeenCalled();
+ expect(mocks.transaction).not.toHaveBeenCalled();
});
});
diff --git a/apps/web/app/api/video/metadata/route.ts b/apps/web/app/api/video/metadata/route.ts
index 1c9506674..eefb9e29f 100644
--- a/apps/web/app/api/video/metadata/route.ts
+++ b/apps/web/app/api/video/metadata/route.ts
@@ -35,16 +35,25 @@ export async function PUT(request: NextRequest) {
}
const { agentUpload: _agentUpload, ...clientMetadata } = metadata;
- const storedAgentUpload = result.metadata?.agentUpload;
-
- await db()
- .update(videos)
- .set({
- metadata: storedAgentUpload
- ? { ...clientMetadata, agentUpload: storedAgentUpload }
- : clientMetadata,
- })
- .where(eq(videos.id, videoId));
+
+ await db().transaction(async (tx) => {
+ const [locked] = await tx
+ .select({ metadata: videos.metadata })
+ .from(videos)
+ .where(eq(videos.id, videoId))
+ .for("update");
+
+ const storedAgentUpload = locked?.metadata?.agentUpload;
+
+ await tx
+ .update(videos)
+ .set({
+ metadata: storedAgentUpload
+ ? { ...clientMetadata, agentUpload: storedAgentUpload }
+ : clientMetadata,
+ })
+ .where(eq(videos.id, videoId));
+ });
return Response.json(true, { status: 200 });
}