configured proxy so game-server connections needs to be pointed to path game-server/socket.io instead of default path to make sure it overlap with other possible socket connections, updated readme

Author: trsctr

Frontend/nginx.conf

@@ -106,7 +106,8 @@ http {
         }
 
         # Proxy WebSocket and HTTP requests to the game server
-        location /socket.io/ {
+        location /game-server/socket.io/ {
+            rewrite ^/game-server/socket.io/(.*) /socket.io/$1 break;
             proxy_pass http://game-server;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;

Frontend/nginx.conf.dev

@@ -28,8 +28,8 @@ http {
         }
 
         # WebSocket requests
-        location /socket.io/ {
-            proxy_pass http://game-server:8010; 
+        location /game-server/socket.io/ {
+            proxy_pass http://game-server:8010/socket.io; 
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

Frontend/src/js/pong/socket.js

@@ -1,9 +1,8 @@
 import { io } from 'socket.io-client';
 
 // Use the proxy path for local development
-// const socket = io( {path: '/game-server/socket.io'});
-const socket = io();
-console.log("derp")
+const socket = io('/', {path: '/game-server/socket.io',});
+// const socket = io();
 
 socket.on('connect', () => {
     console.log('Connected to server');

Frontend/vite.config.js

@@ -21,8 +21,8 @@ export default defineConfig(({ mode }) => ({
         target: 'http://game-history:8002',  // Proxy to game history service
         changeOrigin: true,
       },
-      '/socket.io': {
-        target: 'http://game-server:8010',  // Proxy to game server
+      '/game-server/socket.io': {
+        target: 'http://game-server:8010/socket.io',  // Proxy to game server
         changeOrigin: true,
         ws: true,  // Enable WebSocket support
       },

Game_server/README.md

@@ -14,7 +14,7 @@ This is the game server for the Mighty Pong Contest. Developed with Python and S
 To start a game session, follow these instructions:
 
 1. **Connect to the Server**
-   - Connect your client to the server using Socket.IO at `http://game-server:8010/socket.io`.
+   - Connect your client to the server using Socket.IO at `http://game-server:8010/game-server/socket.io`.
 
 2. **Prepare Game Initialization Data**
    - Create an object with the following details:
@@ -79,6 +79,11 @@ To start a game session, follow these instructions:
    uvicorn main:app --host 0.0.0.0 --port 8010 --log-level info
    ```
 
+4. **Build and run the app**
+  ```bash
+  make
+  ```
+  
 ### TODO: Remote Play Integration
 
 The backend is working on matchmaking feature which is coming soon, in the meantime remote play needs to be fully integrated, and handling the ending of the game as well.

Game_server/server.py

@@ -122,7 +122,7 @@ async def game_loop(self) -> None:
         while self.game_state.in_progress:
             self.game_state.current_rally = 0
             self.game_state.reset_ball()
-            logging.info("Rally started")
+            logging.info(f"Rally started, game ID: {self.game_state.game_id}, sids: {self.sids}")
             await self.send_game_state_to_client()
             await asyncio.sleep(0.5) # Little break before start of the rally
             self.game_state.paused = False
@@ -298,7 +298,7 @@ async def connect(sid, environ):
 # This function is called when a client disconnects from the server
 # The 'sid' parameter is the session ID of the client
 # Removes sid from sid_to_game and active_games
-# If no players are left in the game, the game instance is removed
+# If no players are left in the game, the game instance is or should be removed
 @sio.event
 async def disconnect(sid):
     logging.info(f'Disconnect: {sid}')
@@ -309,7 +309,8 @@ async def disconnect(sid):
             if sid in game_instance.sids:
                 game_instance.sids.remove(sid)
                 if not game_instance.sids:
-                    del active_games[game_id]  # Optionally handle cleanup if no players are left
+                    logging.info(f"No players left in game {game_id}") 
+                    del active_games[game_id]  # this cleanup actually does not work
 
 # Event handler for messages
 # This function is called when a client sends a message to the server