fix: stop button working properly

src/lib/server/abortedGenerations.ts

@@ -7,11 +7,13 @@ import { onExit } from "./exitHandler";
 export class AbortedGenerations {
 	private static instance: AbortedGenerations;
 
-	private abortedGenerations: Map<string, Date> = new Map();
+	private abortedGenerations: Record<string, Date> = {};
 
 	private constructor() {
-		const interval = setInterval(this.updateList, 1000);
+		const interval = setInterval(() => this.updateList(), 1000);
 		onExit(() => clearInterval(interval));
+
+		this.updateList();
 	}
 
 	public static getInstance(): AbortedGenerations {
@@ -22,16 +24,16 @@ export class AbortedGenerations {
 		return AbortedGenerations.instance;
 	}
 
-	public getList(): Map<string, Date> {
-		return this.abortedGenerations;
+	public getAbortTime(conversationId: string): Date | undefined {
+		return this.abortedGenerations[conversationId];
 	}
 
 	private async updateList() {
 		try {
 			const aborts = await collections.abortedGenerations.find({}).sort({ createdAt: 1 }).toArray();
 
-			this.abortedGenerations = new Map(
-				aborts.map(({ conversationId, createdAt }) => [conversationId.toString(), createdAt])
+			this.abortedGenerations = Object.fromEntries(
+				aborts.map((abort) => [abort.conversationId.toString(), abort.createdAt])
 			);
 		} catch (err) {
 			logger.error(err);

src/lib/server/textGeneration/generate.ts

@@ -193,8 +193,12 @@ Do not use prefixes such as Response: or Answer: when answering to the user.`,
 		}
 
 		// abort check
-		const date = AbortedGenerations.getInstance().getList().get(conv._id.toString());
-		if (date && date > promptedAt) break;
+		const date = AbortedGenerations.getInstance().getAbortTime(conv._id.toString());
+
+		if (date && date > promptedAt) {
+			logger.info(`Aborting generation for conversation ${conv._id}`);
+			break;
+		}
 
 		// no output check
 		if (!output) break;

src/routes/conversation/[id]/+page.svelte

@@ -520,7 +520,21 @@
 	on:showAlternateMsg={onShowAlternateMsg}
 	on:vote={(event) => voteMessage(event.detail.score, event.detail.id)}
 	on:share={() => shareConversation(page.params.id, data.title)}
-	on:stop={() => (($isAborted = true), (loading = false))}
+	on:stop={async () => {
+		await fetch(`${base}/conversation/${page.params.id}/stop-generating`, {
+			method: "POST",
+		}).then((r) => {
+			if (r.ok) {
+				setTimeout(() => {
+					$isAborted = true;
+					loading = false;
+				}, 3000);
+			} else {
+				$isAborted = true;
+				loading = false;
+			}
+		});
+	}}
 	models={data.models}
 	currentModel={findCurrentModel([...data.models, ...data.oldModels], data.model)}
 	assistant={data.assistant}