Add support for aborting multipart uploads

Author: richiemcilroy

apps/web/app/(org)/dashboard/caps/components/WebRecorderDialog/instant-mp4-uploader.ts

@@ -85,6 +85,13 @@ const completeMultipartUpload = async (
 	});
 };
 
+const abortMultipartUpload = async (videoId: VideoId, uploadId: string) => {
+	await postJson<{ success: boolean }>("/api/upload/multipart/abort", {
+		videoId,
+		uploadId,
+	});
+};
+
 interface FinalizeOptions extends MultipartCompletePayload {
 	finalBlob: Blob;
 	thumbnailUrl?: string;
@@ -367,13 +374,18 @@ export class InstantMp4Uploader {
 
 	async cancel() {
 		if (this.finished) return;
+		this.finished = true;
 		this.bufferedChunks = [];
 		this.bufferedBytes = 0;
 		this.clearChunkStates();
-		try {
-			await this.uploadPromise;
-		} catch {
+		const pendingUpload = this.uploadPromise.catch(() => {
 			// Swallow errors during cancellation cleanup.
+		});
+		try {
+			await abortMultipartUpload(this.videoId, this.uploadId);
+		} catch (error) {
+			console.error("Failed to abort multipart upload", error);
 		}
+		await pendingUpload;
 	}
 }

apps/web/app/api/upload/[...route]/multipart.ts

@@ -482,3 +482,77 @@ app.post(
 		}).pipe(Effect.provide(makeCurrentUserLayer(user)), runPromise);
 	},
 );
+
+app.post(
+	"/abort",
+	zValidator(
+		"json",
+		z
+			.object({
+				uploadId: z.string(),
+			})
+			.and(
+				z.union([
+					z.object({ videoId: z.string() }),
+					// deprecated
+					z.object({ fileKey: z.string() }),
+				]),
+			),
+	),
+	(c) => {
+		const { uploadId, ...body } = c.req.valid("json");
+		const user = c.get("user");
+
+		const fileKey = parseVideoIdOrFileKey(user.id, {
+			...body,
+			subpath: "result.mp4",
+		});
+
+		const videoIdFromFileKey = fileKey.split("/")[1];
+		const videoIdRaw = "videoId" in body ? body.videoId : videoIdFromFileKey;
+		if (!videoIdRaw) return c.text("Video id not found", 400);
+		const videoId = Video.VideoId.make(videoIdRaw);
+
+		return Effect.gen(function* () {
+			const repo = yield* VideosRepo;
+			const policy = yield* VideosPolicy;
+			const db = yield* Database;
+
+			const maybeVideo = yield* repo
+				.getById(videoId)
+				.pipe(Policy.withPolicy(policy.isOwner(videoId)));
+			if (Option.isNone(maybeVideo)) {
+				c.status(404);
+				return c.text(`Video '${encodeURIComponent(videoId)}' not found`);
+			}
+			const [video] = maybeVideo.value;
+
+			const [bucket] = yield* S3Buckets.getBucketAccess(video.bucketId);
+
+			console.log(`Aborting multipart upload ${uploadId} for key: ${fileKey}`);
+			yield* bucket.multipart.abort(fileKey, uploadId);
+
+			yield* db.use((db) =>
+				db.delete(Db.videoUploads).where(eq(Db.videoUploads.videoId, videoId)),
+			);
+
+			return c.json({ success: true, fileKey, uploadId });
+		}).pipe(
+			Effect.catchAll((error) => {
+				console.error("Failed to abort multipart upload:", error);
+
+				return Effect.succeed(
+					c.json(
+						{
+							error: "Failed to abort multipart upload",
+							details: error instanceof Error ? error.message : String(error),
+						},
+						500,
+					),
+				);
+			}),
+			Effect.provide(makeCurrentUserLayer(user)),
+			runPromise,
+		);
+	},
+);

packages/web-backend/src/S3Buckets/S3BucketAccess.ts

@@ -107,7 +107,7 @@ export const createS3BucketAccess = Effect.gen(function* () {
 				provider.getInternal.pipe(
 					Effect.flatMap((client) =>
 						Effect.gen(function* () {
-							let _body;
+							let _body: S3.PutObjectCommandInput["Body"];
 
 							if (typeof body === "string" || body instanceof Uint8Array) {
 								_body = body;
@@ -284,6 +284,28 @@ export const createS3BucketAccess = Effect.gen(function* () {
 						),
 					),
 				),
+			abort: (
+				key: string,
+				uploadId: string,
+				args?: Omit<
+					S3.AbortMultipartUploadCommandInput,
+					"Key" | "Bucket" | "UploadId"
+				>,
+			) =>
+				wrapS3Promise(
+					provider.getInternal.pipe(
+						Effect.map((client) =>
+							client.send(
+								new S3.AbortMultipartUploadCommand({
+									Bucket: provider.bucket,
+									Key: key,
+									UploadId: uploadId,
+									...args,
+								}),
+							),
+						),
+					),
+				),
 		},
 	};
 });