From 9df04610eff7fa55f9b48a7d4075599bed8ccc72 Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <600878@stud.hvl.no>
Date: Fri, 19 May 2023 23:24:46 +0200
Subject: [PATCH] Added disconnect method on return, removed promise from close

---
 .../ClientApp/src/classes/WebSocketService.ts               | 4 ++--
 .../ClientApp/src/components/gameComponent.tsx              | 1 +
 pac-man-board-game/ClientApp/src/game/game.ts               | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pac-man-board-game/ClientApp/src/classes/WebSocketService.ts b/pac-man-board-game/ClientApp/src/classes/WebSocketService.ts
index 22f118a..5bf5bdc 100644
--- a/pac-man-board-game/ClientApp/src/classes/WebSocketService.ts
+++ b/pac-man-board-game/ClientApp/src/classes/WebSocketService.ts
@@ -64,8 +64,8 @@ export default class WebSocketService {
     });
   }
 
-  public async close(): Promise<void> {
-    return new Promise(() => this.ws?.close());
+  public close(): void {
+    this.ws?.close();
   }
 
   public isOpen(): boolean {
diff --git a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
index 02751f3..cd7b297 100644
--- a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
+++ b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
@@ -31,6 +31,7 @@ export const GameComponent: Component = () => {
 
     game.connectToServer();
     startGameLoop();
+    return () => game.disconnect();
   }, []);
 
   return (
diff --git a/pac-man-board-game/ClientApp/src/game/game.ts b/pac-man-board-game/ClientApp/src/game/game.ts
index ee9fc7b..95528fd 100644
--- a/pac-man-board-game/ClientApp/src/game/game.ts
+++ b/pac-man-board-game/ClientApp/src/game/game.ts
@@ -3,7 +3,7 @@ import {Action} from "../classes/actions";
 
 export default class Game {
 
-  private _wsService: WebSocketService;
+  private readonly _wsService: WebSocketService;
 
   constructor() {
     this._wsService = new WebSocketService("wss://localhost:3000/api/game");
@@ -38,6 +38,10 @@ export default class Game {
   public isConnected(): boolean {
     return this._wsService.isOpen();
   }
+  
+  public disconnect(): void {
+    this._wsService.close();
+  }
 
   private createPlayers(): void {
     throw new Error("Not implemented");