Merge pull request #4 from CSDotNET0211/dev

bug fixes

Author: CSDotNET0211

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fumen",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"description": "",
 	"type": "module",
 	"scripts": {
@@ -49,4 +49,4 @@
 		"typescript": "~5.6.2",
 		"vite": "^6.2.6"
 	}
-}
+}

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://schema.tauri.app/config/2",
 	"productName": "fumen-rs",
-	"version": "0.2.0",
+	"version": "0.2.2",
 	"identifier": "com.fumen.app",
 	"build": {
 		"beforeDevCommand": "npm run dev",

src/core/nodes/NodeUpdater/localNodeUpdater.ts

@@ -16,6 +16,6 @@ export class LocalNodeUpdater extends NodeUpdater {
 
 	}
 	async delete(node: DatabaseNode): Promise<void> {
-		deleteNodeDatabase(node);
+		await deleteNodeDatabase(node);
 	}
 }

src/core/nodes/db.ts

@@ -154,20 +154,15 @@ export async function loadDatabase(dbData: Uint8Array<ArrayBufferLike>, useSplas
 			}, { once: true });
 		});
 
-		//currentField.set(FieldType.TetrisEdit);
 		currentWindow.set(WindowType.Splash);
 		currentFieldIndex.set(-1);
 
 		await waitForTransition;
 
 		const firstFieldResult = getLatestFieldId()!;
-		//if (firstFieldResult) {
 		currentFieldIndex.set(firstFieldResult);
 		currentWindow.set(originalWindow);
 		WindowFadeDuration.set(300);
-		//}
-
-
 	} else {
 		currentFieldIndex.set(-1);
 		const firstFieldResult = getLatestFieldId();
@@ -218,7 +213,7 @@ export function createNodeDatabase(updateNode: DatabaseNode): number {
 
 
 
-export function deleteNodeDatabase(node: DatabaseNode) {
+export async function deleteNodeDatabase(node: DatabaseNode) {
 	if (!db) {
 		throw new Error("Database is not initialized.");
 	}
@@ -229,12 +224,28 @@ export function deleteNodeDatabase(node: DatabaseNode) {
 
 	node.deleteNode(db);
 
+	if (node.id === get(currentFieldIndex)) {
+		const originalWindow = get(currentWindow);
 
+		const waitForTransition = new Promise<void>((resolve) => {
+			document.addEventListener("onWindowTransitionEnd", async () => {
+				await new Promise(resolve => setTimeout(resolve, 100));
+				resolve();
+			}, { once: true });
+		});
 
-	const firstFieldResult = getLatestFieldId();
-	if (firstFieldResult) {
+		currentWindow.set(WindowType.Splash);
+		currentFieldIndex.set(-1);
+
+		await waitForTransition;
+
+		const firstFieldResult = getLatestFieldId()!;
 		currentFieldIndex.set(firstFieldResult);
+		currentWindow.set(originalWindow);
+		WindowFadeDuration.set(300);
 	}
+
+
 }
 
 export function getNodeDatabase(id: number): DatabaseNode | null {

src/features/windows/canvas/CanvasNode/textCanvasNode.ts

@@ -116,20 +116,20 @@ export class TextCanvasNode extends CanvasNode {
 
 		const oldText = textNode.element.textContent || "";
 
-		function cleanup() {
+		async function cleanup() {
 			if (textNode.element && textNode.element.parentNode) {
 				textNode.element.parentNode.removeChild(textNode.element);
 			}
 			// nodes配列からも削除
-			deleteNodeDatabase(getNodeDatabase(textNode.id)!);
+			await deleteNodeDatabase(getNodeDatabase(textNode.id)!);
 			//TextNode.deleteDB(textNode.id);
 		}
 
-		const confirm = () => {
+		const confirm = async () => {
 			if (!textNode.element) return;
 			const newText = (textNode.element.textContent || "").trim();
 			if (!newText) {
-				cleanup();
+				await cleanup();
 				return;
 			}
 
@@ -145,15 +145,15 @@ export class TextCanvasNode extends CanvasNode {
 			get(nodeUpdater)!.update(new TextDatabaseNode(textNode.id, undefined, undefined, newText, undefined, undefined, undefined));
 			//TextNode.updateDB(textNode.id, textNode.x, textNode.y, textNode.size, textNode.text, textNode.color, textNode.backgroundColor);
 		}
-		const cancel = () => {
+		const cancel = async () => {
 			if (!textNode.element) return;
 			if (oldText.trim()) {
 				textNode.element.textContent = oldText;
 				textNode.element.contentEditable = "false";
 				textNode.element.style.userSelect = "none";
 				textNode.element.className = "canvas-text confirmed";
 			} else {
-				cleanup();
+				await cleanup();
 			}
 		}
 

src/features/windows/splash/splashWindow.svelte

@@ -20,7 +20,7 @@
       data-tauri-drag-region
       style="font-size: 0.9em; color: #aaa; margin-bottom: 0px;"
     >
-      version 0.2.0
+      version 0.2.2
     </p>
     <p
       data-tauri-drag-region

src/services/online.ts

@@ -89,7 +89,6 @@ export async function joinRoomWS(
 		);
 		return;
 	}
-
 	const { roomPlayers, isHost, playerId }: { roomPlayers: { id: string; name: string; color: string }[], isHost: boolean, playerId: string } = await wsSocket?.emitWithAck("join_room", roomName, userName);
 
 	players.set(new Set(roomPlayers));
@@ -102,7 +101,6 @@ export async function joinRoomWS(
 	document.addEventListener("onTetrisBoardMove", onTetrisBoardMove);
 
 	positionSendInterval = setInterval(sendPositionIfChanged, 50);
-
 	if (!isHost) {
 		const dbBin = await getHostDB();
 		await loadDatabase(dbBin, true);
@@ -148,10 +146,7 @@ export async function sendDeleteNodeWS(node: DatabaseNode): Promise<any> {
 
 	const uIntResponse = new Uint8Array(response);
 	const databaseNode = resolveDatabaseNode(BSON.deserialize(uIntResponse));
-	return deleteNodeDatabase(databaseNode);
-
-
-
+	return await deleteNodeDatabase(databaseNode);
 }
 
 export async function getHostDB(): Promise<Uint8Array> {
@@ -333,7 +328,7 @@ function registerEvents(wsSocket: Socket) {
 		const databaseNodeObj = BSON.deserialize(uIntResponse);
 
 		const databaseNode = resolveDatabaseNode(databaseNodeObj);
-		deleteNodeDatabase(databaseNode);
+		await deleteNodeDatabase(databaseNode);
 		if (callback)
 			callback(nodeBson);
 	});