new backend

frontend/src/lib/App.svelte

@@ -6,7 +6,7 @@
 	import PromptModal from '$lib/PromptModal.svelte';
 	import type { Room } from '@liveblocks/client';
 	import { COLORS, EMOJIS } from '$lib/constants';
-	import { PUBLIC_WS_TXT2IMG, PUBLIC_WS_INPAINTING } from '$env/static/public';
+	import { PUBLIC_WS_INPAINTING } from '$env/static/public';
 	import { onMount } from 'svelte';
 	import {
 		isLoading,
@@ -44,11 +44,16 @@
 		const sessionHash = crypto.randomUUID();
 
 		const payload = {
-			fn_index: 2,
-			data: [_prompt],
+			fn_index: 0,
+			data: [
+				null,
+				//{ mask: null, image: null },
+				_prompt,
+				true
+			],
 			session_hash: sessionHash
 		};
-		const websocket = new WebSocket(PUBLIC_WS_ENDPOINT);
+		const websocket = new WebSocket(PUBLIC_WS_INPAINTING);
 		// websocket.onopen = async function (event) {
 		// 	websocket.send(JSON.stringify({ hash: sessionHash }));
 		// };
@@ -81,15 +86,18 @@
 						break;
 					case 'process_completed':
 						try {
-							const imgsBase64 = data.output.data[0] as string[];
-							const imgBlobs = await Promise.all(imgsBase64.map((base64) => base64ToBlob(base64)));
-							const imgURLs = await Promise.all(imgBlobs.map((blob) => uploadImage(blob, _prompt)));
+							const imgBase64 = data.output.data[0] as string;
+							const isNSWF = data.output.data[1] as boolean;
+
+							const imgBlob = await base64ToBlob(imgBase64);
+							const imgURL = await uploadImage(imgBlob, _prompt);
+
 							$imagesList.push({
 								prompt: _prompt,
-								images: imgURLs,
+								imgURL: imgURL,
 								position: $clickedPosition
 							});
-							console.log(imgURLs);
+							console.log(imgURL);
 							$loadingState = data.success ? 'Complete' : 'Error';
 						} catch (e) {
 							$loadingState = e.message;

frontend/src/lib/Canvas.svelte

@@ -39,18 +39,19 @@
 				[-width * 0.1, -height * 0.1],
 				[width * 1.1, height * 1.1]
 			])
+			.tapDistance(10)
 			.on('zoom', zoomed);
 
 		select(canvasEl.parentElement)
 			.call(zoomHandler as any)
-			// .call(zoomHandler.scaleTo as any, 1 / scale)
-			.on('pointermove', handlePointerMove)
-			.on('pointerleave', handlePointerLeave)
-			.on('dblclick.zoom', null)
-			.on('dblclick', () => {
+			.on('dblclick.zoom', () => {
 				$isPrompting = true;
 				$clickedPosition = $myPresence.cursor;
-			});
+				return null;
+			})
+			// .call(zoomHandler.scaleTo as any, 1 / scale)
+			.on('pointermove', handlePointerMove)
+			.on('pointerleave', handlePointerLeave);
 
 		canvasCtx = canvasEl.getContext('2d') as CanvasRenderingContext2D;
 		canvasCtx.strokeStyle = 'blue';
@@ -59,14 +60,14 @@
 	});
 
 	function renderImages(imagesList) {
-		imagesList.forEach(({ images, position }) => {
+		imagesList.forEach(({ imgURL, position }) => {
 			// console.log(item);
 			const img = new Image();
 			img.onload = () => {
 				console.log(img);
 				canvasCtx.drawImage(img, position.x, position.y, img.width, img.height);
 			};
-			img.src = images[0];
+			img.src = imgURL;
 		});
 	}