feat: job cancellation for vertd

src/lib/converters/ffmpeg.svelte.ts

@@ -190,16 +190,16 @@ export class FFmpegConverter extends Converter {
 	public async cancel(input: VertFile): Promise<void> {
 		const ffmpeg = this.activeConversions.get(input.id);
 		if (!ffmpeg) {
-			log(
+			error(
 				["converters", this.name],
-				`No active conversion found for file ${input.name}`,
+				`no active conversion found for file ${input.name}`,
 			);
 			return;
 		}
 
 		log(
 			["converters", this.name],
-			`Cancelling conversion for file ${input.name}`,
+			`cancelling conversion for file ${input.name}`,
 		);
 
 		ffmpeg.terminate();

src/lib/converters/magick.svelte.ts

@@ -231,16 +231,16 @@ export class MagickConverter extends Converter {
 	public async cancel(input: VertFile): Promise<void> {
 		const worker = this.activeConversions.get(input.id);
 		if (!worker) {
-			log(
+			error(
 				["converters", this.name],
-				`No active conversion found for file ${input.name}`,
+				`no active conversion found for file ${input.name}`,
 			);
 			return;
 		}
 
 		log(
 			["converters", this.name],
-			`Cancelling conversion for file ${input.name}`,
+			`cancelling conversion for file ${input.name}`,
 		);
 
 		worker.terminate();

src/lib/converters/pandoc.svelte.ts

@@ -3,7 +3,7 @@ import { Converter, FormatInfo } from "./converter.svelte";
 import { browser } from "$app/environment";
 import PandocWorker from "$lib/workers/pandoc?worker&url";
 import { addToast } from "$lib/store/ToastProvider";
-import { log } from "$lib/logger";
+import { error, log } from "$lib/logger";
 
 export class PandocConverter extends Converter {
 	public name = "pandoc";
@@ -105,16 +105,16 @@ export class PandocConverter extends Converter {
 	public async cancel(input: VertFile): Promise<void> {
 		const worker = this.activeConversions.get(input.id);
 		if (!worker) {
-			log(
+			error(
 				["converters", this.name],
-				`No active conversion found for file ${input.name}`,
+				`no active conversion found for file ${input.name}`,
 			);
 			return;
 		}
 
 		log(
 			["converters", this.name],
-			`Cancelling conversion for file ${input.name}`,
+			`cancelling conversion for file ${input.name}`,
 		);
 
 		worker.terminate();

src/lib/converters/vertd.svelte.ts

@@ -1,4 +1,4 @@
-import { log } from "$lib/logger";
+import { error, log } from "$lib/logger";
 import { Settings } from "$lib/sections/settings/index.svelte";
 import { VertFile } from "$lib/types";
 import { Converter, FormatInfo } from "./converter.svelte";
@@ -90,6 +90,21 @@ interface CompletedMessage {
 	};
 }
 
+interface CancelJobMessage {
+	type: "cancelJob";
+	data: {
+		jobId: string;
+		token: string;
+	};
+}
+
+interface JobCancelledMessage {
+	type: "jobCancelled";
+	data: {
+		jobId: string;
+	};
+}
+
 interface FpsProgress {
 	type: "fps";
 	data: number;
@@ -106,6 +121,8 @@ type VertdMessage =
 	| StartJobMessage
 	| ErrorMessage
 	| ProgressMessage
+	| CancelJobMessage
+	| JobCancelledMessage
 	| CompletedMessage;
 
 const progressEstimates = {
@@ -202,6 +219,15 @@ export class VertdConverter extends Converter {
 	public ready = $state(false);
 	public reportsProgress = true;
 
+	private activeConversions = new Map<
+		string,
+		{
+			ws: WebSocket;
+			jobId: string;
+			token: string;
+		}
+	>();
+
 	public supportedFormats = [
 		new FormatInfo("mkv", true, true),
 		new FormatInfo("mp4", true, true),
@@ -253,6 +279,13 @@ export class VertdConverter extends Converter {
 			const ws = new WebSocket(
 				`${protocol}//${apiUrl.replace("http://", "").replace("https://", "")}/api/ws`,
 			);
+
+			this.activeConversions.set(input.id, {
+				ws,
+				jobId: uploadRes.id,
+				token: uploadRes.auth,
+			});
+
 			ws.onopen = () => {
 				const speed = Settings.instance.settings.vertdSpeed;
 				const keepMetadata = Settings.instance.settings.metadata;
@@ -289,6 +322,7 @@ export class VertdConverter extends Converter {
 					case "jobFinished": {
 						this.log("job finished");
 						ws.close();
+						this.activeConversions.delete(input.id);
 						const url = `${apiUrl}/api/download/${msg.data.jobId}/${uploadRes.auth}`;
 						this.log(`downloading from ${url}`);
 						// const res = await fetch(url).then((res) => res.blob());
@@ -297,8 +331,17 @@ export class VertdConverter extends Converter {
 						break;
 					}
 
+					case "jobCancelled": {
+						this.log("job cancelled");
+						ws.close();
+						this.activeConversions.delete(input.id);
+						reject("Conversion cancelled");
+						break;
+					}
+
 					case "error": {
 						this.log(`error: ${msg.data.message}`);
+						this.activeConversions.delete(input.id);
 						reject(msg.data.message);
 					}
 				}
@@ -306,6 +349,39 @@ export class VertdConverter extends Converter {
 		});
 	}
 
+	public async cancel(input: VertFile): Promise<void> {
+		const activeConversion = this.activeConversions.get(input.id);
+		if (!activeConversion) {
+			error(
+				["converters", this.name],
+				`no active conversion found for file ${input.name}`,
+			);
+			return;
+		}
+
+		log(
+			["converters", this.name],
+			`cancelling conversion for file ${input.name}`,
+		);
+
+		const { ws, jobId, token } = activeConversion;
+
+		if (ws.readyState === WebSocket.OPEN) {
+			const cancelMsg: CancelJobMessage = {
+				type: "cancelJob",
+				data: {
+					jobId,
+					token,
+				},
+			};
+			ws.send(JSON.stringify(cancelMsg));
+			this.log("sent cancelJob message");
+		}
+
+		ws.close();
+		this.activeConversions.delete(input.id);
+	}
+
 	public async valid(): Promise<boolean> {
 		if (!Settings.instance.settings.vertdURL) {
 			return false;