Final touches

api/app/Http/Controllers/GameController.php

@@ -55,6 +55,10 @@ class GameController extends Controller
 
         $validated = $request->validate([
             "type" => "required|in:3,9",
+            "player2_user_id" => "nullable|integer|exists:users,id",
+            "match_id" => "nullable|integer|exists:matches,id",
+            "status" => "nullable|in:Pending,Playing",
+            "began_at" => "nullable|date"
         ]);
 
         $user = Auth::user();
@@ -70,21 +74,30 @@ class GameController extends Controller
              return response()->json(["message" => "You already have an active game."], 400);
         }
 
+        $player2Id = $request->input('player2_user_id', self::GHOST_ID);
+
+        $initialStatus = $request->input('status', 'Pending');
+        
+        if ($player2Id !== self::GHOST_ID && !$request->has('status')) {
+            $initialStatus = 'Playing';
+        }
+
         $game = Game::create([
             "type" => $validated["type"],
-            "status" => "Pending",
+            "status" => $initialStatus,
             "player1_user_id" => $user->id,
-            "player2_user_id" => self::GHOST_ID,
-            "winner_user_id" => self::GHOST_ID,
-            "loser_user_id" => self::GHOST_ID,
-            "began_at" => now(),
+            "player2_user_id" => $player2Id, 
+            "winner_user_id" => null,
+            "loser_user_id" => null,
+            "match_id" => $request->input('match_id', null),
+            "began_at" => $request->input('began_at', now()),
             "player1_points" => 0,
             "player2_points" => 0,
             "custom" => null,
         ]);
 
         return response()->json([
-            "message" => "Multiplayer game room created",
+            "message" => "Game created",
             "game" => $game,
         ], 201);
     }

websockets/events/connection.js

@@ -1,6 +1,4 @@
 import { addUser, removeUser } from "../state/connection.js";
-import { addUser, removeUser } from "../state/connection.js";
-
 
 const HEARTBEAT_INTERVAL = 30000; // 30 seconds
 const HEARTBEAT_TIMEOUT = 10000; // 10 seconds

websockets/state/game.js

@@ -2,11 +2,11 @@ import BiscaGame from "../classes/BiscaGame.js";
 
 const activeGames = new Map();
 
-const createGame = (id, type, player1, player2) => {
+export const createGame = (id, type, player1, player2) => {
   const existingGame = activeGames.get(id);
   if (existingGame) {
     console.log(
-            `[Game State] Game ${id} already exists, returning existing instance`,
+      `[Game State] Game ${id} already exists, returning existing instance`
     );
     return existingGame;
   }
@@ -20,11 +20,11 @@ const createGame = (id, type, player1, player2) => {
   return game;
 };
 
-const getGame = (id) => {
+export const getGame = (id) => {
   return activeGames.get(id);
 };
 
-const removeGame = (id) => {
+export const removeGame = (id) => {
   const game = activeGames.get(id);
   if (game) {
     game.stopTimer();
@@ -32,10 +32,3 @@ const removeGame = (id) => {
     console.log(`[Game State] Game removed: ${id}`);
   }
 };
-
-module.exports = {
-    createGame,
-    getGame,
-    removeGame,
-};
-