Reformat

index.html

@@ -27,9 +27,7 @@
       <input type="text" id="game-link" size="50" readonly />
       <button onclick="copyGameLink()">Copy</button>
     </div>
-    <div id="ws-status" style="margin-top: 10px; color: grey">
+    <div id="ws-status" style="margin-top: 10px; color: grey">Disconnected</div>
-      Disconnected
-    </div>
     <script src="scripts/display-ws-connection.js"></script>
     <script src="scripts/send-ws-messages.js"></script>
     <script src="scripts/copy-game-link.js"></script>

public/scripts/display-ws-connection.js

@@ -22,12 +22,10 @@ htmx.trigger(gameContainer, ' and connect');
 // Update the game link input
 const gameLinkInput = document.getElementById('game-link');
 if (!gameLinkInput) {
-  console.error('Missing game-link element.')
+  console.error('Missing game-link element.');
 }
 gameLinkInput.value =
-  window.location.origin +
+  window.location.origin + window.location.pathname + `?gameId=${gameId}`;
-  window.location.pathname +
-  `?gameId=${gameId}`;
 
 // Update the WebSocket status indicator
 const wsStatusDiv = document.getElementById('ws-status');

public/scripts/send-ws-messages.js

@@ -5,9 +5,9 @@ document.addEventListener('htmx:wsConfigSend', function(e) {
 
     // Set the custom JSON data
     e.detail.parameters = {
-            type: "make_move",
+      type: 'make_move',
       row: row,
-            col: col
+      col: col,
     };
   }
 });

src/game/WebSocketHandler.ts

@@ -12,7 +12,7 @@ interface MakeMoveMessage {
   col: number;
 }
 
-type WS = ElysiaWS<{query: {playerId: string, gameId: string}}>;
+type WS = ElysiaWS<{ query: { playerId: string; gameId: string } }>;
 export class WebSocketHandler {
   private connections: Map<string, Array<WS>>;
   private games: Map<string, GameInstance>;
@@ -54,13 +54,12 @@ export class WebSocketHandler {
   private handleMakeMove(ws: WS, message: MakeMoveMessage): void {
     const { row, col } = message;
     const { gameId, playerId } = ws.data.query;
-    console.log(`Handling make_move message in game ${gameId} from player ${playerId}: ${{message}}`);
+    console.log(
+      `Handling make_move message in game ${gameId} from player ${playerId}: ${{ message }}`,
+    );
 
     if (!gameId || !playerId || row === undefined || col === undefined) {
-      this.sendMessage(
+      this.sendMessage(ws, 'Error: missing gameId, playerId, row, or col');
-        ws,
-        'Error: missing gameId, playerId, row, or col',
-      );
       return;
     }
 
@@ -74,10 +73,7 @@ export class WebSocketHandler {
       ([_, id]) => id === playerId,
     )?.[0] as ('black' | 'white') | undefined;
     if (!playerColor) {
-      this.sendMessage(
+      this.sendMessage(ws, 'Error: you are not a player in this game');
-        ws,
-        'Error: you are not a player in this game',
-      );
       return;
     }
 
@@ -106,7 +102,9 @@ export class WebSocketHandler {
 
     const connectionsInGame = this.connections.get(gameId);
     if (!connectionsInGame) {
-      console.error(`Disconnecting WebSocket for player ${playerId} from game ${gameId}, but that game has no connections!`);
+      console.error(
+        `Disconnecting WebSocket for player ${playerId} from game ${gameId}, but that game has no connections!`,
+      );
       return;
     }
     this.connections.set(
@@ -127,7 +125,9 @@ export class WebSocketHandler {
   public broadcastGameState(gameId: string): void {
     const game = this.games.get(gameId);
     if (!game) {
-      console.warn('Attempted to broadcast state of game ${gameId}, which is not loaded.');
+      console.warn(
+        'Attempted to broadcast state of game ${gameId}, which is not loaded.',
+      );
       return;
     }
 
@@ -138,17 +138,17 @@ export class WebSocketHandler {
 
         const updatedBoardHtml = renderGameBoardHtml(game, playerId);
         ws.send(updatedBoardHtml);
-        const updatedPlayerInfoHtml = renderPlayerInfoHtml(
+        const updatedPlayerInfoHtml = renderPlayerInfoHtml(game.id, playerId);
-          game.id,
-          playerId,
-        );
         ws.send(updatedPlayerInfoHtml);
 
         if (game.status === 'finished') {
           if (game.winner === 'draw') {
             this.sendMessageToGame(gameId, 'Game ended in draw.');
           } else if (game.winner) {
-            this.sendMessageToGame(gameId, `${game.winner.toUpperCase()} wins!`);
+            this.sendMessageToGame(
+              gameId,
+              `${game.winner.toUpperCase()} wins!`,
+            );
           }
         } else if (game.status === 'playing') {
           const clientPlayerColor = Object.entries(game.players).find(
@@ -168,27 +168,21 @@ export class WebSocketHandler {
     }
   }
 
-  public sendMessageToGame(
+  public sendMessageToGame(gameId: string, message: string): void {
-    gameId: string,
-    message: string,
-  ): void {
     const connections = this.connections.get(gameId);
     if (connections) {
       connections.forEach((ws) => {
-        ws.send('<div id="messages">' + message + '</div>')
+        ws.send('<div id="messages">' + message + '</div>');
       });
     }
   }
 
-  public sendMessage(
+  public sendMessage(targetWs: WS, message: string): void {
-    targetWs: WS,
+    targetWs.send('<div id="messages">' + message + '</div>');
-    message: string,
-  ): void {
-    targetWs.send('<div id="messages">' + message + '</div>')
   }
 
   public getGame(gameId: string): GameInstance | undefined {
-    return this.games.get(gameId)
+    return this.games.get(gameId);
   }
 
   createGame(gameId?: string): GameInstance {

src/view/board-renderer.ts

@@ -12,9 +12,8 @@ export function renderGameBoardHtml(
   let boardHtml = '<div id="game-board" class="game-board-grid">';
 
   const currentPlayerColor =
-    Object.entries(gameState.players).find(
+    Object.entries(gameState.players).find(([_, id]) => id === playerId)?.[0] ||
-      ([_, id]) => id === playerId,
+    null;
-    )?.[0] || null;
   const isPlayersTurn =
     gameState.status === 'playing' &&
     gameState.currentPlayer === currentPlayerColor;
@@ -30,9 +29,7 @@ export function renderGameBoardHtml(
       }
 
       // HTMX attributes for making a move
-      const wsAttrs = isPlayersTurn && !stone
+      const wsAttrs = isPlayersTurn && !stone ? `ws-send="click"` : '';
-        ? `ws-send="click"` 
-        : '';
 
       boardHtml += `
                 <div