Merge branch 'develop' into na/matches-home-page

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/97
Reviewed-by: Afonso Clerigo Mendes de Sousa <[email protected]>
Reviewed-by: Edd <[email protected]>

api/app/Http/Controllers/GameController.php

@@ -17,6 +17,7 @@ class GameController extends Controller
         $user = Auth::user();
         $query = Game::query()->with(["winner", "player1", "player2"]);
 
+        // Se não for Admin, mostra apenas os jogos do utilizador
         if ($user->type !== 'A') {
             $query->where(function ($q) use ($user) {
                 $q->where('player1_user_id', $user->id)
@@ -49,12 +50,69 @@ class GameController extends Controller
         return response()->json($query->paginate(15));
     }
 
+    // --- MÉTODOS ADICIONADOS ---
+
+    // Host a new multiplayer Game
+    public function host(Request $request)
+    {
+        $request->validate([
+            'type' => 'required|in:3,9'
+        ]);
+
+        $user = $request->user();
+
+        // Check for active game
+        $activeGame = Game::where(function ($q) use ($user) {
+             $q->where("player1_user_id", $user->id)
+               ->orWhere("player2_user_id", $user->id);
+        })
+        ->whereIn("status", ["Pending", "Playing"])
+        ->exists();
+
+        if ($activeGame) {
+             return response()->json(["message" => "You already have an active game."], 400);
+        }
+
+        $game = Game::create([
+            'type' => $request->type,
+            'status' => 'Pending',
+            'player1_user_id' => $user->id,
+            'player2_user_id' => self::GHOST_ID, // Ghost ID = 1 (Waiting for player)
+            'began_at' => now(),
+            'player1_points' => 0,
+            'player2_points' => 0,
+        ]);
+
+        return response()->json($game, 201);
+    }
+
+    // List open games (Available to join)
+    public function open(Request $request)
+    {
+        $type = $request->query('type', '9');
+        $GHOST_ID = 1;
+
+        $games = Game::where('status', 'Pending')
+            ->where('player2_user_id', $GHOST_ID) // Games waiting for P2
+            ->where('type', $type)
+            ->with('player1')
+            ->orderBy('began_at', 'asc')
+            ->paginate(10);
+
+        return response()->json($games);
+    }
+    // ---------------------------
+
     public function store(Request $request)
     {
         $this->authorize('create', Game::class);
 
         $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,51 +128,65 @@ 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 specific player 2 is provided, auto-start game
+        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, 
+            "player2_user_id" => $player2Id, 
-            "winner_user_id" => self::GHOST_ID,
+            "winner_user_id" => null,
-            "loser_user_id" => self::GHOST_ID,
+            "loser_user_id" => null,
-            "began_at" => now(),
+            "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);
     }
 
-    public function join(Game $game)
+    public function join(Request $request, Game $game)
     {
-        $this->authorize('join', $game);
+        // Prevent joining if already full or started
-        
+        if ($game->status !== 'Pending' || $game->player2_user_id !== self::GHOST_ID) {
-        $user = Auth::user();
+            return response()->json(['message' => 'Game is not available'], 400);
-
-        if ($game->player1_user_id == $user->id) {
-            return response()->json([
-                "message" => "You are the host. Waiting for opponent...",
-                "game" => $game
-            ], 200);
         }
 
-        if ($game->player2_user_id !== self::GHOST_ID) {
+        // Prevent joining your own game
-            return response()->json(["message" => "Game is full"], 400);
+        if ($game->player1_user_id === $request->user()->id) {
+            return response()->json(['message' => 'Cannot join your own game'], 400);
+        }
+        
+        // Check if joining user has another active game
+        $activeGame = Game::where(function ($q) use ($request) {
+             $q->where("player1_user_id", $request->user()->id)
+               ->orWhere("player2_user_id", $request->user()->id);
+        })
+        ->whereIn("status", ["Pending", "Playing"])
+        ->exists();
+
+        if ($activeGame) {
+             return response()->json(["message" => "You already have an active game."], 400);
         }
 
         $game->update([
-            "status" => "Playing",
+            'player2_user_id' => $request->user()->id,
-            "player2_user_id" => $user->id,
+            'status' => 'Playing',
         ]);
 
-        return response()->json([
+        return response()->json($game);
-            "message" => "Joined successfully!",
-            "game" => $game,
-        ], 200);
     }
 
     public function show(Game $game)

api/app/Http/Controllers/MatchController.php

@@ -3,12 +3,10 @@
 namespace App\Http\Controllers;
 
 use App\Models\MatchGame;
-use App\Models\Game;
 use App\Models\CoinTransaction;
 use App\Models\CoinTransactionType;
 use Illuminate\Http\Request;
 use App\Http\Requests\StoreMatchRequest;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 class MatchController extends Controller
@@ -196,4 +194,77 @@ class MatchController extends Controller
             return response()->json($match);
         });
     }
+
+    public function host(Request $request)
+    {
+        $request->validate([
+            'type' => 'required|in:3,9',
+            'stake' => 'required|integer|min:0'
+        ]);
+
+        $user = $request->user();
+        $stake = $request->stake;
+
+        if ($user->coins_balance < $stake) {
+            return response()->json(['message' => 'Insufficient coin balance'], 400);
+        }
+
+        $activeMatch = MatchGame::where(function ($q) use ($user) {
+            $q->where('player1_user_id', $user->id)
+              ->orWhere('player2_user_id', $user->id);
+        })->whereIn('status', ['Pending', 'Playing'])->exists();
+
+        if ($activeMatch) {
+            return response()->json(['message' => 'You already have an active match.'], 400);
+        }
+
+        return DB::transaction(function () use ($request, $user, $stake) {
+            $GHOST_ID = 1;
+
+            $user->decrement('coins_balance', $stake);
+
+            $stakeType = CoinTransactionType::firstOrCreate(
+                ['name' => 'Match stake'],
+                ['type' => 'D'] // Debit
+            );
+
+            $match = MatchGame::create([
+                'type' => $request->type,
+                'status' => 'Pending',
+                'player1_user_id' => $user->id,
+                'player2_user_id' => $GHOST_ID, 
+                'winner_user_id' => null,
+                'loser_user_id' => null,
+                'stake' => $stake,
+                'began_at' => now(),
+                'player1_marks' => 0, 'player2_marks' => 0,
+                'player1_points' => 0, 'player2_points' => 0,
+            ]);
+
+            CoinTransaction::create([
+                'user_id' => $user->id,
+                'match_id' => $match->id,
+                'coin_transaction_type_id' => $stakeType->id,
+                'transaction_datetime' => now(),
+                'coins' => -$stake,
+            ]);
+
+            return response()->json($match, 201);
+        });
+    }
+
+    public function open(Request $request)
+    {
+        $type = $request->query('type', '9');
+        $GHOST_ID = 1;
+
+        $matches = MatchGame::where('status', 'Pending')
+            ->where('player2_user_id', $GHOST_ID) 
+            ->where('type', $type)
+            ->with('player1')
+            ->orderBy('began_at', 'asc')
+            ->paginate(10);
+
+        return response()->json($matches);
+    }
 }

api/app/Http/Controllers/UserController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Game;
 use App\Models\User;
+use App\Models\MatchGame;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
@@ -178,22 +179,15 @@ class UserController extends Controller
     }
 
     /**
-     * GET /api/users/{user}/matches
+     * GET /api/users/{user}/games
-     * Histórico de Jogos Multiplayer do Utilizador
+     * Histórico de Partidas Individuais (Cartas)
      */
-    public function getMatches(Request $request, User $user)
+    public function getGames(Request $request, User $user)
     {
         $this->authorize('view', $user);
 
-        $outcomeSql = "CASE 
+        // Define a query base para GAMES
-            WHEN is_draw = 1 THEN 'DRAW'
+        $query = \App\Models\Game::query()
-            WHEN winner_user_id = {$user->id} THEN 'WIN'
-            ELSE 'LOSS'
-        END";
-
-        $query = Game::query()
-        ->select('*')
-        ->selectRaw("($outcomeSql) as outcome_text")
             ->where(function ($q) use ($user) {
                 $q->where('player1_user_id', $user->id)
                   ->orWhere('player2_user_id', $user->id);
@@ -208,42 +202,64 @@ class UserController extends Controller
             $query->where('status', $request->status);
         }
 
-        if ($request->filled('outcome')) {
+        $sortDirection = $request->get('sort_direction', 'desc');
-        switch ($request->outcome) {
+        $query->orderBy('began_at', $sortDirection);
-            case 'win':
-                $query->where('winner_user_id', $user->id)
-                      ->where('is_draw', 0);
-                break;
-            case 'loss':
-            case 'forfeit': // Forfeit treated as loss for now
-                $query->where('loser_user_id', $user->id)
-                      ->where('is_draw', 0);
-                break;
-            case 'draw':
-                $query->where('is_draw', 1);
-                break;
-        }
-    }
 
-        if ($request->has('date_from')) {
-            $query->whereDate('began_at', '>=', $request->date_from);
-        }
         
-        if ($request->has('date_to')) {
+        $games = $query->paginate(10);
-            $query->whereDate('ended_at', '<=', $request->date_to);
-        }
 
-        $order = $request->get('sort_by', 'began_at');
+        $games->getCollection()->transform(function ($game) use ($user) {
-        $direction = $request->get('sort_direction', 'desc');
+            if ($game->winner_user_id == $user->id) {
-
+                $game->outcome = 'win';
-        if ($order === 'outcome') {
+            } elseif ($game->is_draw) {
-            $query->orderBy('outcome_text', $direction);
+                $game->outcome = 'draw';
             } else {
-            $query->orderBy($order, $direction);
+                $game->outcome = 'loss';
+            }
+            return $game;
+        });
+
+        return response()->json($games);
     }
 
-        $matches = $query->orderBy($order, $direction)
+    /**
-                              ->paginate(10);
+     * GET /api/users/{user}/matches
+     * Histórico de Matches (Apostas / Marcas)
+     */
+    public function getMatches(Request $request, User $user)
+    {
+        $this->authorize('view', $user);
+
+        $query = MatchGame::query() 
+            ->where(function ($q) use ($user) {
+                $q->where('player1_user_id', $user->id)
+                  ->orWhere('player2_user_id', $user->id);
+            })
+            ->with(['winner', 'player1', 'player2']);
+
+        if ($request->has('type')) {
+            $query->where('type', $request->type);
+        }
+        
+        if ($request->has('status')) {
+            $query->where('status', $request->status);
+        }
+
+        $sortDirection = $request->get('sort_direction', 'desc');
+        $query->orderBy('began_at', $sortDirection);
+
+        $matches = $query->paginate(10);
+
+        $matches->getCollection()->transform(function ($match) use ($user) {
+            if ($match->winner_user_id == $user->id) {
+                $match->outcome = 'win';
+            } elseif ($match->winner_user_id && $match->winner_user_id != $user->id) {
+                $match->outcome = 'loss';
+            } else {
+                $match->outcome = 'interrupted'; // Matches geralmente não empatam (alguém chega a 4 marcas)
+            }
+            return $match;
+        });
 
         return response()->json($matches);
     }

api/app/Models/Game.php

@@ -29,11 +29,22 @@ class Game extends Model
         'match_id'
     ];
 
+    protected $casts = [
+        'began_at' => 'datetime',
+        'ended_at' => 'datetime',
+        'is_draw' => 'boolean',
+    ];
+
     public function winner()
     {
         return $this->belongsTo(User::class, "winner_user_id");
     }
 
+    public function loser()
+    {
+        return $this->belongsTo(User::class, "loser_user_id");
+    }
+
     public function player1()
     {
         return $this->belongsTo(User::class, 'player1_user_id');

api/app/Policies/GamePolicy.php

@@ -86,7 +86,6 @@ class GamePolicy
 
         return true;
     }
-
     /**
      * Determine whether the user can update the model.
      */
@@ -96,17 +95,16 @@ class GamePolicy
             return false;
         }
 
-        if (
+        if (!in_array($game->status, ['Playing', 'Pending'])) {
-            $game->status !== "Playing" ||
+            return false;
-            ($game->player1_user_id !== $user->id &&
+        }
-                $game->player2_user_id !== $user->id)
+
-        ) {
+        if ($game->player1_user_id !== $user->id && $game->player2_user_id !== $user->id) {
             return false;
         }
 
         return true;
     }
-
     /**
      * Determine whether the user can delete the model.
      */

api/routes/api.php

@@ -40,31 +40,28 @@ Route::prefix('v1')->group(function () {
         // User Resources
         Route::prefix('/users')->group(function () {
             Route::get('/{user}', [UserController::class, 'show']);
-            Route::get('/{user}/matches', [
-                UserController::class,
-                'getMatches',
-            ]);
             Route::get('/{user}/transactions', [UserController::class, 'getTransactions']);
+            Route::get('/{user}/games', [UserController::class, 'getGames']);
+            Route::get('/{user}/matches', [UserController::class, 'getMatches']);
         });
 
-        // Game Resources
         Route::prefix('games')->group(function () {
-            Route::apiResource('/', GameController::class)->parameters([
+            Route::post('host', [GameController::class, 'host']);
-                '' => 'game',
+            Route::get('open', [GameController::class, 'open']);
-            ]);
+            Route::get('/', [GameController::class, 'index']);
-            Route::post('/{game}/join', [GameController::class, 'join']);
+            Route::get('/{game}', [GameController::class, 'show']);
+            Route::post('/', [GameController::class, 'store']);
+            Route::put('/{game}', [GameController::class, 'update']);
+            Route::delete('/{game}', [GameController::class, 'destroy']);
             Route::post('/{game}/resign', [GameController::class, 'resign']);
+            Route::post('/{game}/join', [GameController::class, 'join']);
         });
 
-        // Match Resources
         Route::prefix('matches')->group(function () {
-            Route::apiResource('/', MatchController::class)->parameters([
+            Route::apiResource('/', MatchController::class)->parameters(['' => 'match']);
-                '' => 'match',
+            Route::post('/{match}/join', [MatchController::class, 'join']);
-            ]);
+            Route::post('host', [MatchController::class, 'host']); // <--- NOVA
-            Route::post('/{match}/join', [
+            Route::get('open', [MatchController::class, 'open']);
-                MatchController::class,
-                'join',
-            ]);
         });
 
         // Admin Routes
@@ -73,6 +70,8 @@ Route::prefix('v1')->group(function () {
             ->group(function () {
                 Route::get('/statistics', [StatisticsController::class, 'getAdminStats']);
                 Route::get('/transactions', [TransactionController::class, 'index']);
+                Route::get('/games', [GameController::class, 'index']); 
+                Route::get('/matches', [MatchController::class, 'index']);
                 Route::prefix('users')->group(function () {
                     Route::get('/', [UserController::class, 'index']);
                     Route::post('/', [UserController::class, 'store']);

frontend/src/App.vue

@@ -42,7 +42,8 @@ const logout = () => {
 
 onMounted(async () => {
   await authStore.restoreSession()
-  socketStore.handleConnection()
+  // REMOVED - The WebSocket for multiplayer is handled separately in the WebSocketStore
+  // socketStore.handleConnection()
 })
 </script>
 

frontend/src/components/game/GameBoard.vue

@@ -7,6 +7,8 @@
         :player-score="playerScore"
         :opponent-score="opponentScore"
         :current-turn="currentTurn"
+        :player-name="playerName"
+        :opponent-name="opponentName"
         :round-number="1"
       />
     </div>
@@ -62,16 +64,20 @@ const props = defineProps({
   // REMOVIDO: playableCardIndices (já não precisamos dele)
   playerScore: { type: Number, default: 0 },
   opponentScore: { type: Number, default: 0 },
+  playerName: { type: String, default: 'You' },
+  opponentName: { type: String, default: 'Bot' },
   currentTurn: {
     type: String,
     default: 'player',
     validator: (value) => ['player', 'opponent'].includes(value),
   },
+  isMyTurn: { type: Boolean, default: false },
 })
 
 const emit = defineEmits(['play-card'])
 
 const handleCardClick = (payload) => {
+  if (!props.isMyTurn) return
   emit('play-card', payload.card)
 }
 </script>

frontend/src/components/game/PlayerHand.vue

@@ -51,6 +51,10 @@ const props = defineProps({
     default: 3,
     validator: (value) => [3, 9].includes(value),
   },
+  isDisabled: {
+    type: Boolean,
+    default: false,
+  },
 })
 
 const emit = defineEmits(['card-clicked'])

frontend/src/components/game/ScoreDisplay.vue

@@ -33,7 +33,8 @@
           turnChanged && 'animate-pulse',
         ]"
       >
-        {{ currentTurn === 'player' ? 'Your Turn' : "Bot's Turn" }}
+        <!-- You can replace the above line with the following if you want to show names instead -->
+        {{ currentTurn === 'player' ? playerName + "'s Turn" : opponentName + "'s Turn" }}
       </div>
       <span v-if="roundNumber" class="text-gray-500 text-[10px] font-medium">
         Round {{ roundNumber }}

frontend/src/pages/game/MultiplayerGamePage.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="relative min-h-screen overflow-hidden bg-green-900">
+    <div v-if="shouldShowBoard && !gameOver" class="absolute top-4 right-4 z-50">
+      <button
+        @click="handleSurrender"
+        class="bg-red-600 hover:bg-red-700 text-white font-bold py-2 px-4 rounded-lg shadow-lg border-2 border-red-800 transition-all transform hover:scale-105 flex items-center gap-2"
+      >
+        <span>🏳️</span> Surrender
+      </button>
+    </div>
+
+    <div v-if="!wsStore.connected && hasConnectedOnce" class="absolute top-4 left-4 z-50 flex items-center gap-2 bg-gray-800 px-4 py-2 rounded-lg border border-gray-700 shadow-xl">
+      <div class="w-3 h-3 rounded-full bg-red-500 animate-pulse"></div>
+      <span class="text-white text-sm">Reconnecting...</span>
+    </div>
+
+    <div v-if="shouldShowBoard && !gameOver && isMyTurn" class="absolute top-4 left-1/2 -translate-x-1/2 z-50">
+      <div class="bg-gray-800 px-6 py-3 rounded-lg border-2 shadow-xl transition-colors duration-300"
+           :class="timeLeft <= 5 ? 'border-red-500 bg-red-900/20' : 'border-gray-700'">
+        <div class="flex items-center gap-3">
+          <svg class="w-6 h-6" :class="timeLeft <= 5 ? 'text-red-500 animate-bounce' : 'text-white'" viewBox="0 0 24 24" fill="none" stroke="currentColor">
+            <circle cx="12" cy="12" r="10" stroke-width="2"/>
+            <polyline points="12 6 12 12 16 14" stroke-width="2"/>
+          </svg>
+          <span :class="['text-3xl font-mono font-bold', timeLeft <= 5 ? 'text-red-500' : 'text-white']">
+            {{ timeLeft }}
+          </span>
+        </div>
+      </div>
+    </div>
+
+    <div v-if="shouldShowBoard">
+      <GameBoard
+        :trump-card="trumpCard"
+        :cards-remaining="deckCount + (trumpCard ? 1 : 0)"
+
+        :player-hand="visibleHand"
+        :opponent-hand="opponentHand"
+
+        :player-score="playerScore"
+        :opponent-score="opponentScore"
+
+        :player-name="myDisplayName"
+        :opponent-name="opponentDisplayName"
+        :current-turn="currentTurnLabel"
+
+        :current-trick="displayedTrick"
+        :is-my-turn="isMyTurn"
+        @play-card="handlePlayCard"
+      />
+    </div>
+
+    <div v-else-if="!gameOver" class="flex h-screen items-center justify-center bg-green-900 text-white">
+      <div class="text-center p-8 bg-green-800/50 rounded-2xl border border-green-700 shadow-2xl backdrop-blur-sm">
+        <div class="relative mx-auto mb-6 h-16 w-16">
+            <div class="absolute inset-0 rounded-full border-4 border-green-600"></div>
+            <div class="absolute inset-0 rounded-full border-4 border-t-white border-r-transparent border-b-transparent border-l-transparent animate-spin"></div>
+        </div>
+
+        <h2 class="text-2xl font-bold mb-2">
+            Waiting for Opponent...
+        </h2>
+
+        <p class="text-green-100 mb-8 max-w-sm">
+           Share the game code or wait for a player to join your lobby.
+        </p>
+
+        <button
+          @click="handleCloseModal"
+          class="px-6 py-3 bg-red-600 hover:bg-red-700 text-white rounded-lg font-semibold transition-all shadow-lg hover:shadow-red-500/20"
+        >
+          Cancel & Return Home
+        </button>
+      </div>
+    </div>
+
+    <GameOver
+      :is-visible="gameOver"
+      :winner="winnerResult"
+      :player-score="playerScore"
+      :opponent-score="opponentScore"
+      :player-name="myDisplayName"
+      :opponent-name="opponentDisplayName"
+      :stats="{ playerTricks: 0, opponentTricks: 0 }"
+      :is-logging-out="false"
+      @play-again="handleCloseModal"
+      @close="handleCloseModal"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, onUnmounted, watch, inject } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { useSocketStore } from '@/stores/socket'
+import { useAuthStore } from '@/stores/auth'
+import { toast } from 'vue-sonner'
+import axios from 'axios'
+import GameBoard from '@/components/game/GameBoard.vue'
+import GameOver from '@/components/game/GameOver.vue'
+
+const route = useRoute()
+const router = useRouter()
+const wsStore = useSocketStore()
+const authStore = useAuthStore()
+const API_BASE_URL = inject('apiBaseURL')
+
+const gameId = ref(route.params.id)
+const visibleHand = ref([])
+const gameOver = ref(false)
+const isDealing = ref(false)
+const hasInitialDealHappened = ref(false)
+const winnerResult = ref('draw')
+const timeLeft = ref(20)
+const timerInterval = ref(null)
+const hasConnectedOnce = ref(false)
+
+const gameMetadata = ref({
+    p1_id: null,
+    p1_name: 'Player 1',
+    p2_id: null,
+    p2_name: 'Opponent'
+})
+
+const displayedTrick = ref({ playerCard: null, opponentCard: null })
+const trickClearTimer = ref(null)
+
+// --- COMPUTED ---
+
+const myUserId = computed(() => authStore.currentUser?.id)
+
+const shouldShowBoard = computed(() => {
+    const s = wsStore.gameState;
+    if (s && s.player2 && s.player2.id > 1) {
+        return true;
+    }
+    return false;
+})
+
+const amIHost = computed(() => {
+    if (gameMetadata.value.p1_id) {
+        return String(gameMetadata.value.p1_id) === String(myUserId.value)
+    }
+    const p1Id = wsStore.gameState?.player1_user_id || wsStore.gameState?.player1?.id
+    return String(p1Id) === String(myUserId.value)
+})
+
+const myDisplayName = computed(() => amIHost.value ? gameMetadata.value.p1_name : gameMetadata.value.p2_name)
+const opponentDisplayName = computed(() => amIHost.value ? gameMetadata.value.p2_name : gameMetadata.value.p1_name)
+
+const mappedTrick = computed(() => {
+    const table = wsStore.gameState?.table
+    if (!table) return { playerCard: null, opponentCard: null }
+    if (amIHost.value) {
+        return { playerCard: table.playerCard, opponentCard: table.opponentCard }
+    } else {
+        return { playerCard: table.opponentCard, opponentCard: table.playerCard }
+    }
+})
+
+const currentTurnLabel = computed(() => {
+    const turnId = wsStore.gameState?.currentTurn
+    if (!turnId) return 'player'
+    return String(turnId) === String(myUserId.value) ? 'player' : 'opponent'
+})
+
+const trumpCard = computed(() => wsStore.gameState?.trumpCard || null)
+const deckCount = computed(() => wsStore.gameState?.deckCount || 0)
+const playerScore = computed(() => wsStore.gameState?.points || 0)
+const opponentScore = computed(() => wsStore.gameState?.opponent?.points || 0)
+const serverHand = computed(() => wsStore.gameState?.hand || [])
+const isMyTurn = computed(() => String(wsStore.gameState?.currentTurn) === String(myUserId.value))
+const opponentHand = computed(() => {
+  const count = wsStore.gameState?.opponent?.cardCount || 0
+  return Array.from({ length: count }, (_, i) => ({ id: `opp-${i}`, suit: 'back', rank: 0 }))
+})
+
+// --- WATCHERS ---
+
+watch(() => wsStore.connected, (isConnected) => {
+    if (isConnected) {
+        hasConnectedOnce.value = true
+        wsStore.joinGame(gameId.value)
+    }
+}, { immediate: true })
+
+watch(() => wsStore.gameState, async (newState, oldState) => {
+    const oldP2 = oldState?.player2?.id;
+    const newP2 = newState?.player2?.id;
+    if (newP2 && newP2 > 1 && newP2 !== oldP2) {
+        await fetchGameMetadata();
+    }
+}, { deep: true })
+
+watch(mappedTrick, (newVal) => {
+    if (newVal.playerCard || newVal.opponentCard) {
+        if (trickClearTimer.value) clearTimeout(trickClearTimer.value)
+        displayedTrick.value = { ...newVal }
+    } else {
+        const currentlyShowing = displayedTrick.value.playerCard || displayedTrick.value.opponentCard
+        if (currentlyShowing) {
+             trickClearTimer.value = setTimeout(() => {
+                 displayedTrick.value = { playerCard: null, opponentCard: null }
+             }, 1500)
+        } else {
+            displayedTrick.value = { playerCard: null, opponentCard: null }
+        }
+    }
+}, { deep: true })
+
+// --- FIX: TIMER GHOSTING ---
+const startTimer = () => {
+  if (timerInterval.value) clearInterval(timerInterval.value)
+
+  if (!shouldShowBoard.value && wsStore.gameState?.status !== 'playing') {
+      timeLeft.value = 20;
+      return;
+  }
+
+  // FORCE RESET to avoid showing old time for 1 frame
+  timeLeft.value = 20;
+
+  const startAt = wsStore.gameState?.turnStartedAt ? new Date(wsStore.gameState.turnStartedAt).getTime() : Date.now()
+
+  // Define update function
+  const update = () => {
+    const now = Date.now()
+    const elapsed = Math.floor((now - startAt) / 1000)
+    timeLeft.value = Math.max(0, 20 - elapsed)
+    if (timeLeft.value <= 0) clearInterval(timerInterval.value)
+  }
+
+  // EXECUTE IMMEDIATELY
+  update();
+
+  // Then set interval
+  timerInterval.value = setInterval(update, 1000)
+}
+
+watch(() => wsStore.gameState?.currentTurn, (newTurn) => {
+    if (newTurn) startTimer()
+}, { immediate: true })
+
+const animateDeal = async (cards) => {
+    if (isDealing.value) return
+    isDealing.value = true
+    visibleHand.value = []
+    for (const card of cards) {
+        visibleHand.value.push(card)
+        await new Promise(r => setTimeout(r, 150))
+    }
+    isDealing.value = false
+}
+
+watch(serverHand, (newHand) => {
+    if (visibleHand.value.length === 0 && newHand.length > 0 && !hasInitialDealHappened.value) {
+        animateDeal(newHand)
+        hasInitialDealHappened.value = true
+    } else if (!isDealing.value) {
+        visibleHand.value = [...newHand]
+    }
+}, { deep: true })
+
+// --- METHODS ---
+
+const fetchGameMetadata = async () => {
+    try {
+        const response = await axios.get(`${API_BASE_URL}/games/${gameId.value}`)
+        const game = response.data.data || response.data
+        gameMetadata.value = {
+            p1_id: game.player1_user_id,
+            p1_name: game.player1?.nickname || 'Host',
+            p2_id: game.player2_user_id,
+            p2_name: game.player2?.nickname || 'Opponent'
+        }
+    } catch (e) {
+        console.error("Failed to load metadata", e)
+    }
+}
+
+const handlePlayCard = (card) => {
+  if (!isMyTurn.value || gameOver.value) return
+  visibleHand.value = visibleHand.value.filter(c => c.id !== card.id)
+  wsStore.playCard(gameId.value, card.id)
+}
+
+// --- FIX: SURRENDER LOGIC ---
+const handleSurrender = () => {
+    if(confirm('Are you sure you want to surrender? You will lose.')) {
+        // Send event to server. Do NOT disconnect locally yet.
+        // Wait for the server to send "Game Over" event back.
+        wsStore.surrender(gameId.value)
+    }
+}
+
+const handleCloseModal = () => {
+    wsStore.disconnect()
+    router.push({ name: 'home' })
+}
+
+// --- LIFECYCLE ---
+
+onMounted(async () => {
+  await fetchGameMetadata()
+  wsStore.connect()
+
+  wsStore.onTrickEnd((result) => {
+    const winnerName = result.winnerId == authStore.currentUser?.id ? "You" : "Opponent"
+    toast.success(`${winnerName} won the trick!`, { position: 'top-center', duration: 1500 })
+  })
+
+  wsStore.onGameOver((result) => {
+    gameOver.value = true
+    if (result.isDraw) winnerResult.value = 'draw'
+    else winnerResult.value = result.winnerId == authStore.currentUser?.id ? 'player' : 'opponent'
+  })
+})
+
+onUnmounted(() => {
+  if (timerInterval.value) clearInterval(timerInterval.value)
+  wsStore.disconnect()
+})
+</script>

frontend/src/pages/home/HomePage.vue

@@ -12,6 +12,7 @@ import {
 import { useAPIStore } from '@/stores/api'
 import { useRouter } from 'vue-router'
 import { useAuthStore } from '@/stores/auth'
+import axios from 'axios'
 
 const API_BASE_URL = inject('apiBaseURL')
 const apiStore = useAPIStore()
@@ -22,6 +23,11 @@ const gObserverTarget = ref(null);
 const gObserver = ref(null);
 const gLoading = ref(false);
 const gPage = ref(1);
+const openMatches = ref([])
+const mObserverTarget = ref(null);
+const mObserver = ref(null);
+const mLoading = ref(false);
+const mPage = ref(1);
 const showHostModal = ref(false)
 const showJoinModal = ref(false)
 const selectedGame = ref(null)
@@ -37,6 +43,21 @@ const lbObserverTarget = ref(null)
 const lbObserver = ref(null)
 const lbMorePages = ref(true)
 const publicStats = ref(null)
+const isLoggedIn = useAuthStore().isLoggedIn
+
+const setupMatchesObserver = () => {
+    if (mObserver.value) mObserver.value.disconnect();
+
+    mObserver.value = new IntersectionObserver((entries) => {
+        if (entries[0].isIntersecting && !mLoading.value && openMatches.value.length > 0) {
+            getPendingMatches();
+        }
+    }, { threshold: 0.1 });
+
+    if (mObserverTarget.value) {
+        mObserver.value.observe(mObserverTarget.value);
+    }
+}
 
 const setupGamesObserver = () => {
     if (gObserver.value) gObserver.value.disconnect();
@@ -56,12 +77,14 @@ const getPendingGames = async (mode = selectedMode.value) => {
     if (gLoading.value) return;
     gLoading.value = true;
 
-    apiStore.gameQueryParameters.page = gPage.value++;
-    apiStore.gameQueryParameters.filters.sort_direction = "asc"
-    apiStore.gameQueryParameters.filters.type = mode
-    apiStore.gameQueryParameters.filters.status = 'Pending'
     try {
-        const response = await apiStore.getGames();
+        const response = await axios.get(`${API_BASE_URL}/games/open`, {
+            params: {
+                type: mode,
+                page: gPage.value
+            }
+        });
+
         const newGames = response.data.data;
         openGames.value = [...openGames.value, ...newGames];
     } finally {
@@ -69,6 +92,25 @@ const getPendingGames = async (mode = selectedMode.value) => {
     }
 }
 
+const getPendingMatches = async (mode = selectedMode.value) => {
+    if (mLoading.value) return;
+    mLoading.value = true;
+
+    try {
+        const response = await axios.get(`${API_BASE_URL}/matches/open`, {
+            params: {
+                type: mode,
+                page: mPage.value
+            }
+        });
+
+        const newMatches = response.data.data;
+        openMatches.value = [...openMatches.value, ...newMatches];
+    } finally {
+        mLoading.value = false;
+    }
+}
+
 const fetchPublicStats = async () => {
     try {
         const response = await apiStore.getPublicStats()
@@ -139,43 +181,85 @@ const setupLeaderboardObserver = () => {
 
 const clickMode = async (mode) => {
     if (selectedMode.value === mode) return;
-    openGames.value = [];
     selectedMode.value = mode;
+    openGames.value = [];
     gPage.value = 1;
-    await getPendingGames();
+    openMatches.value = [];
+    mPage.value = 1;
+    await Promise.all([getPendingGames(), getPendingMatches()]);
     setupGamesObserver();
+    setupMatchesObserver();
 }
 
 const startSingle = () => {
     router.push({ name: 'bisca' + selectedMode.value });
 }
 
-const JoinGameModal = (game) => {
-    selectedGame.value = game
-    isReady.value = false
-    showJoinModal.value = true
-}
-
-const hostGameModal = () => {
-    showHostModal.value = true
-}
-
 const toggleReady = () => {
     isReady.value = !isReady.value
 }
 
 onMounted(async () => {
     await fetchPublicStats();
-    await getPendingGames();
+    if (isLoggedIn) {
+        await Promise.all([getPendingGames(), getPendingMatches()]);
         await nextTick();
         setupGamesObserver();
+        setupMatchesObserver();
+    }
 })
+
+const hostGame = async () => {
+    showHostModal.value = true
+
+    try {
+        const response = await axios.post(`${API_BASE_URL}/games/host`, {
+            type: selectedMode.value
+        })
+
+        const gameId = response.data.id
+
+        console.log('Game hosted:', gameId)
+
+        router.push({
+            name: 'multiplayer-game',
+            params: { id: gameId },
+            query: { type: selectedMode.value }
+        })
+    } catch (error) {
+        console.error('Failed to host game:', error)
+        console.error('Error details:', error.response?.data)
+        showHostModal.value = false
+        alert('Failed to host game: ' + (error.response?.data?.message || error.message))
+    }
+}
+
+const joinGame = async (game) => {
+    selectedGame.value = game
+
+    try {
+        await axios.post(`${API_BASE_URL}/games/${game.id}/join`)
+
+        console.log('Joined game:', game.id)
+
+        router.push({
+            name: 'multiplayer-game',
+            params: { id: game.id },
+            query: { type: selectedMode.value }
+        })
+    } catch (error) {
+        console.error('Failed to join game:', error)
+        console.error('Error details:', error.response?.data)
+        alert('Failed to join game: ' + (error.response?.data?.message || error.message))
+    }
+}
+
 </script>
 
 <template>
     <div class="min-h-screen bg-cover bg-center transition-all duration-700">
 
-        <div class="flex flex-col justify-center items-center gap-5 pt-10 px-4">
+        <div class="flex flex-col justify-center items-center gap-5 pt-10 pb-10 px-4">
 
             <Card v-if="publicStats" class="w-full max-w-2xl border-[#a855f7] bg-[#f8f0ff] shadow-sm">
                 <CardContent class="p-4">
@@ -241,50 +325,95 @@ onMounted(async () => {
                         </div>
                     </CardContent>
                 </Card>
-                <Card class="w-full max-w-2xl">
+                <Card class="w-full max-w-2xl flex flex-col">
                     <CardHeader>
-                        <CardTitle class="text-3xl font-bold text-center">
+                        <CardTitle class="text-3xl font-bold text-center">Multi Player</CardTitle>
-                            MultiPlayer
+                        <CardDescription class="text-center">Go one on one with another player!</CardDescription>
-                        </CardTitle>
-                        <CardDescription class="text-center">
-                            Go one on one with another player!
-                        </CardDescription>
                     </CardHeader>
-                    <CardContent class="space-y-6">
+
-                        <label class="text-sm font-medium">Open games (oldest first)</label>
+                    <CardContent class="flex-1 flex flex-col space-y-6">
+                        <div class="flex flex-col flex-1">
+                            <div class="flex justify-between items-end mb-2">
+                                <label class="text-sm font-bold uppercase tracking-wider text-muted-foreground">Open
+                                    Matches</label>
+                                <Button v-if="isLoggedIn" @click="showHostModal()" size="sm" variant="outline"
+                                    class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
+                                    Host
+                                </Button>
+                            </div>
+
                             <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
-                            <div v-if="openGames.length === 0" class="p-6 text-center text-sm text-muted-foreground">
+                                <div v-if="openGames.length === 0"
+                                    class="p-6 text-center text-sm text-muted-foreground">
+                                    No open macthes yet. Try hosting one!
+                                </div>
+                                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
+                                    <div v-for="(match, index) in openMatches" :key="match.id"
+                                        class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
+                                        <div class="flex items-center gap-3">
+                                            <div
+                                                class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-red-100 text-red-700">
+                                                {{ index + 1 }}
+                                            </div>
+                                            <div>
+                                                <div class="font-medium text-sm">Match ID: {{ match.id }}</div>
+                                                <div class="text-[10px] text-muted-foreground">{{ new
+                                                    Date(game.began_at).toLocaleDateString() }} • {{ new
+                                                        Date(game.began_at).toLocaleTimeString([], {
+                                                            hour: '2-digit',
+                                                    minute: '2-digit' }) }}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div ref="mObserverTarget" class="h-10 flex items-center justify-center">
+                                        <span v-if="mLoading" class="text-xs text-purple-500 animate-pulse">Loading
+                                            matches...</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="flex flex-col flex-1">
+                            <div class="flex justify-between items-end mb-2">
+                                <label class="text-sm font-medium uppercase tracking-wider text-muted-foreground">Open
+                                    Games</label>
+                                <Button v-if="isLoggedIn" @click="hostGame()" size="sm" variant="outline"
+                                    class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
+                                    Host
+                                </Button>
+                            </div>
+
+                            <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
+                                <div v-if="openGames.length === 0"
+                                    class="p-6 text-center text-sm text-muted-foreground">
                                     No open games yet. Try hosting one!
                                 </div>
                                 <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
-
+                                    <div v-for="(game, index) in openGames" :key="game.id" @click="joinGame(game)"
-                                <div v-for="(game, index) in openGames" :key="game.id" @click="JoinGameModal(game)"
+                                        class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
-                                    class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500">
-
                                         <div class="flex items-center gap-3">
                                             <div
                                                 class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
                                                 {{ index + 1 }}
                                             </div>
                                             <div>
-                                            <div class="font-medium text-sm">Started: {{ game.began_at }}</div>
+                                                <div class="font-medium text-sm">Host: {{ game.player1?.nickname ||
-                                            <div class="text-xs text-muted-foreground">host: {{
+                                                    'Anonymous' }}</div>
-                                                game.player1?.nickname || 'Anonymous' }}</div>
+                                                <div class="text-[10px] text-muted-foreground">{{ new
+                                                    Date(game.began_at).toLocaleDateString() }} • {{ new
+                                                        Date(game.began_at).toLocaleTimeString([], {
+                                                            hour: '2-digit',
+                                                    minute: '2-digit' }) }}</div>
                                             </div>
                                         </div>
                                     </div>
-
                                     <div ref="gObserverTarget" class="h-10 flex items-center justify-center">
                                         <span v-if="gLoading" class="text-xs text-purple-500 animate-pulse">Loading
-                                        more...</span>
+                                            games...</span>
                                     </div>
                                 </div>
                             </div>
-                        <div class="flex justify-center">
-                            <Button @click="hostGameModal()" size="lg" variant="secondary"
-                                class="hover:bg-purple-500 hover:text-slate-200">
-                                Host Game
-                            </Button>
                         </div>
                     </CardContent>
                 </Card>

frontend/src/router/index.js

@@ -9,6 +9,7 @@ import TestDealing from '@/pages/TestDealing.vue'
 import TestAllAnimations from '@/pages/TestAllAnimations.vue'
 import TestGameBoard from '@/pages/TestGameBoard.vue'
 import SinglePlayerGamePage from '@/pages/game/SinglePlayerGamePage.vue'
+import MultiplayerGamePage from '@/pages/game/MultiplayerGamePage.vue'
 import RegisterPage from '@/pages/register/RegisterPage.vue'
 import CoinsPurchasePage from '@/pages/purchase/CoinPurchasePage.vue'
 import { useAuthStore } from '@/stores/auth'
@@ -47,6 +48,12 @@ const router = createRouter({
       props: { gameType: 9 },
       meta: { requiresAuth: true },
     },
+    {
+      path: '/game/multiplayer/:id',
+      name: 'multiplayer-game',
+      component: MultiplayerGamePage,
+      meta: { requiresAuth: true }
+    },
     {
       path: '/user',
       component: UserPage,

frontend/src/stores/api.js

@@ -76,6 +76,23 @@ export const useAPIStore = defineStore('api', () => {
     return axios.get(`${API_BASE_URL}/games?${queryParams}`)
   }
 
+  // --- ADICIONADO: Função que faltava ---
+  const getCurrentUserGames = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.outcome && { outcome: params.outcome }),
+      ...(params.status && { status: params.status }),
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+      sort_by: params.sort_by || 'began_at',
+      sort_direction: params.sort_direction || 'desc',
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/games?${queryParams}`)
+  }
+  // --------------------------------------
+
   const getCurrentUserMatches = (params = {}) => {
     const queryParams = new URLSearchParams({
       page: params.page || 1,
@@ -157,19 +174,34 @@ export const useAPIStore = defineStore('api', () => {
       ...(params.sort_direction == 'asc' && { sort_direction: 'asc' }),
       ...(params.type && { type: params.type }),
     }).toString()
+    
     return axios.get(`${API_BASE_URL}/games?${queryParams}`)
   }
 
+  const getAdminMatches = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.outcome && { outcome: params.outcome }),
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+      sort_by: params.sort_by || 'began_at',
+      sort_direction: params.sort_direction || 'desc',
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/matches?${queryParams}`)
+  }
+
   const postAdmin = async (credentials) => {
     return axios.post(`${API_BASE_URL}/admin/users`, credentials)
   }
 
-
   return {
     postLogin,
     postLogout,
     getAuthUser,
     getGames,
+    getCurrentUserGames,
     getCurrentUserMatches,
     getCurrentUserTransactions,
     getCurrentUserStats,
@@ -182,6 +214,7 @@ export const useAPIStore = defineStore('api', () => {
     deleteUser,
     getAdminTransactions,
     getAdminGames,
+    getAdminMatches,
     postAdmin,
     gameQueryParameters,
   }

frontend/src/stores/socket.js

@@ -1,24 +1,130 @@
 import { defineStore } from 'pinia'
-import { inject } from 'vue'
+import { ref } from 'vue'
+import { io } from 'socket.io-client'
+import { useAuthStore } from './auth'
 
-export const useSocketStore = defineStore('socket', () => {
+export const useSocketStore = defineStore('websocket', () => {
-  const socket = inject('socket')
+  const authStore = useAuthStore()
 
-  const handleConnection = () => {
+  const socket = ref(null)
-    try {
+  const connected = ref(false)
-      socket.on('connect', () => {
+  const gameState = ref(null)
-        console.log(`[Socket] Connected -- ${socket.id}`)
+  const lastError = ref(null)
+  const currentGameId = ref(null)
+
+  const WS_URL = 'http://localhost:3000'
+
+  const connect = () => {
+    if (socket.value?.connected) return
+
+    const token = authStore.getToken()
+    if (!token) {
+      console.error('No token available for WebSocket connection')
+      return
+    }
+
+    socket.value = io(WS_URL, {
+      auth: { token: `Bearer ${token}` },
+      reconnection: true,
+      reconnectionAttempts: 5,
+      reconnectionDelay: 1000
     })
-      socket.on('disconnect', () => {
+
-        console.log(`[Socket] Disconnected -- ${socket.id}`)
+    socket.value.on('connect', () => {
+      if (currentGameId.value) {
+        console.log("Reconnected to socket. Rejoining game...");
+        socket.emit("join-game", { gameId: currentGameId.value });
+      }
+
+      connected.value = true
+      console.log('[WebSocket] Connected:', socket.value.id)
     })
-    } catch (error) {
+
-      console.error('[Socket] Connection error:', error)
+    socket.value.on('disconnect', (reason) => {
+      connected.value = false
+      console.log('[WebSocket] Disconnected:', reason)
+    })
+
+    socket.value.on('connect_error', (error) => {
+      console.error('[WebSocket] Connection error:', error.message)
+      lastError.value = error.message
+    })
+
+    socket.value.on('heartbeat', () => {
+      socket.value.emit('heartbeat_ack')
+    })
+
+    socket.value.on('game-state', (state) => {
+      gameState.value = state
+    })
+
+    socket.value.on('game-error', (data) => {
+      lastError.value = data.message
+      console.error('[Game] Error:', data.message)
+    })
+
+    socket.value.on('error', (data) => {
+      lastError.value = data.message
+      console.error('[Socket] Error:', data.message)
+    })
+  }
+
+  const disconnect = () => {
+    if (socket.value) {
+      socket.value.disconnect()
+      socket.value = null
+      connected.value = false
+      gameState.value = null
+      lastError.value = null
+      currentGameId.value = null
+    }
+  }
+
+  const joinGame = (gameId) => {
+    currentGameId.value = gameId
+    if (!socket.value?.connected) return
+    console.log('[Game] Joining game:', gameId)
+    socket.value.emit('join-game', { gameId })
+  }
+
+  const playCard = (gameId, cardId) => {
+    if (!socket.value?.connected) return
+    socket.value.emit('play-card', { gameId, cardId })
+  }
+
+  // --- NEW: Surrender Action ---
+  const surrender = (gameId) => {
+    if (!socket.value?.connected) return
+    console.log('[Game] Surrendering:', gameId)
+    socket.value.emit('surrender', { gameId })
+  }
+
+  const onTrickEnd = (callback) => {
+    if (socket.value) {
+      socket.value.off('trick-end')
+      socket.value.on('trick-end', callback)
+    }
+  }
+
+  const onGameOver = (callback) => {
+    if (socket.value) {
+      socket.value.off('game-over')
+      socket.value.on('game-over', callback)
     }
   }
 
   return {
-    handleConnection,
+    socket,
+    connected,
+    gameState,
+    lastError,
+    currentGameId,
+    connect,
+    disconnect,
+    joinGame,
+    playCard,
+    surrender, // Exported
+    onTrickEnd,
+    onGameOver
   }
-
 })

websockets/classes/BiscaGame.js

@@ -1,7 +1,9 @@
 class BiscaGame {
-  constructor(id, type, player1, player2) {
+  constructor(id, type, player1, player2, dbId = null, onGameEnd = null) {
     this.id = id;
+    this.dbId = dbId;
     this.type = type;
+    this.onGameEnd = onGameEnd;
 
     this.deck = [];
     this.trumpCard = null;
@@ -17,7 +19,7 @@ class BiscaGame {
     };
 
     this.currentTurn = null;
-    this.status = 'pending';
+    this.status = "pending";
     this.startTime = null;
 
     this.players = {
@@ -50,7 +52,7 @@ class BiscaGame {
     this.currentTurn = playerIds.find((id) => id != 1) || playerIds[0];
 
     this.startTime = Date.now();
-    this.status = 'playing';
+    this.status = "playing";
   }
 
   startTurnTimer(callback) {
@@ -75,7 +77,7 @@ class BiscaGame {
 
   handleTimeout() {
     console.log(
-      `[Game ${this.id}] Timeout! Auto-playing for ${this.currentTurn}`,
+      `[Game ${this.id}] Timeout! Auto-playing for ${this.currentTurn}`
     );
 
     const lowestCard = this.getLowestCard(this.currentTurn);
@@ -94,7 +96,7 @@ class BiscaGame {
   }
 
   createDeck() {
-    const suits = ['c', 'e', 'o', 'p'];
+    const suits = ["c", "e", "o", "p"];
     const ranks = [1, 2, 3, 4, 5, 6, 7, 11, 12, 13];
     let deck = [];
 
@@ -130,7 +132,7 @@ class BiscaGame {
   }
 
   playCard(userId, cardId) {
-    if (this.currentTurn != userId) return { error: 'Not your turn!' };
+    if (this.currentTurn != userId) return { error: "Not your turn!" };
 
     const player = this.players[userId];
     const cardIndex = player.hand.findIndex((c) => c.id === cardId);
@@ -144,7 +146,7 @@ class BiscaGame {
       const suitToFollow = this.table.playerCard.suit;
       const hasSuit = player.hand.some((c) => c.suit === suitToFollow);
       if (hasSuit && card.suit !== suitToFollow) {
-        return { error: 'You must follow the suit!' };
+        return { error: "You must follow the suit!" };
       }
     }
 
@@ -156,7 +158,7 @@ class BiscaGame {
       this.table.playerCard = card;
       this.table.firstPlayerId = userId;
       this.currentTurn = this.getOpponentId(userId);
-      return { action: 'next_turn' };
+      return { action: "next_turn" };
     } else {
       this.table.opponentCard = card;
       return this.resolveTrick();
@@ -196,7 +198,7 @@ class BiscaGame {
     this.table = { playerCard: null, opponentCard: null, firstPlayerId: null };
 
     if (this.players[winnerId].hand.length === 0) {
-      this.status = 'finished';
+      this.status = "finished";
       this.stopTimer();
 
       const pIds = Object.keys(this.players);
@@ -220,7 +222,7 @@ class BiscaGame {
         : p1Obj.id;
 
       return {
-        action: 'game_ended',
+        action: "game_ended",
         trickResult,
         winnerId: finalWinner,
         loserId: finalLoser,
@@ -231,15 +233,20 @@ class BiscaGame {
         player2_points: p2Obj.points,
         totalTime: totalTime,
       };
+      if (this.onGameEnd) {
+        this.onGameEnd(result);
+      }
+      return result;
     }
 
-    return { action: 'trick_resolved', trickResult };
+    return { action: "trick_resolved", trickResult };
   }
 
   getStateForPlayer(userId) {
     const oppId = this.getOpponentId(userId);
     return {
       id: this.id,
+      dbId: this.dbId,
       trumpCard: this.trumpCard,
       trumpSuit: this.trumpSuit,
       deckCount: this.deck.length + (this.trumpCard ? 1 : 0),

websockets/classes/BiscaMatch.js

@@ -0,0 +1,275 @@
+import BiscaGame from "../classes/BiscaGame.js";
+import axios from "axios";
+
+const API_URL = "http://localhost:8000/api/v1";
+
+class BiscaMatch {
+  constructor(apiData, emitStateCallback, token) {
+    this.id = apiData.id;
+    this.emitStateCallback = emitStateCallback;
+    this.token = token;
+    this.stake = apiData.stake;
+    this.type = apiData.type;
+    this.status = apiData.status;
+
+    this.player1Id = apiData.player1_user_id;
+    this.player2Id = apiData.player2_user_id;
+
+    this.marks = {
+      [this.player1Id]: apiData.player1_marks || 0,
+      [this.player2Id]: apiData.player2_marks || 0,
+    };
+
+    this.points = {
+      [this.player1Id]: apiData.player1_points || 0,
+      [this.player2Id]: apiData.player2_points || 0,
+    };
+
+    this.currentGame = null;
+    this.GHOST_ID = 1;
+
+    if (this.status === "Playing" && this.player2Id !== this.GHOST_ID) {
+      this.startNewGame();
+    }
+  }
+
+  async joinPlayer(userId) {
+    if (this.player2Id !== this.GHOST_ID) return false;
+    if (userId === this.player1Id) return false;
+
+    this.player2Id = userId;
+    this.marks[userId] = 0;
+    this.points[userId] = 0;
+    this.status = "Playing";
+
+    await this.startNewGame();
+    return true;
+  }
+
+  getAuthHeaders() {
+    return {
+      headers: { Authorization: this.token },
+    };
+  }
+
+  async startNewGame() {
+    console.log(`[Match ${this.id}] A iniciar nova mão (Game DB)...`);
+
+    let newGameDbId = null;
+
+    try {
+      let payloadP1 = this.player1Id;
+      let payloadP2 = this.player2Id;
+
+      if (this.player2Id !== this.GHOST_ID) {
+        console.log(
+          "🔄 Multiplayer detetado: Trocando ordem para satisfazer a API..."
+        );
+        payloadP1 = this.player2Id;
+        payloadP2 = this.player1Id;
+      }
+
+      const payload = {
+        type: this.type,
+        player1_user_id: payloadP1,
+        player2_user_id: payloadP2,
+        match_id: this.id,
+        status: "Playing",
+        began_at: new Date().toISOString(),
+      };
+
+      console.log("📤 [Payload Adaptado]:", JSON.stringify(payload, null, 2));
+
+      const res = await axios.post(
+        `${API_URL}/games`,
+        payload,
+        this.getAuthHeaders()
+      );
+
+      const gameData = res.data.game || res.data.data || res.data;
+      newGameDbId = gameData.id;
+
+      console.log(`[Match ${this.id}] Game DB criado: #${newGameDbId}`);
+
+      const apiP1 = gameData.player1_user_id;
+      const apiP2 = gameData.player2_user_id;
+
+      const p1 = { id: apiP1, name: `User ${apiP1}` };
+      const p2 = { id: apiP2, name: `User ${apiP2}` };
+
+      this.currentGame = new BiscaGame(
+        this.id,
+        this.type,
+        p1,
+        p2,
+        newGameDbId,
+        (result) => {
+          this.handleGameEnd(result);
+        }
+      );
+
+      this.currentGame.init();
+
+      if (this.emitStateCallback) {
+        this.emitStateCallback("match:new-round", this.getState());
+      }
+    } catch (e) {
+      if (e.response) {
+        console.error(
+          `❌ Erro API (${e.response.status}):`,
+          JSON.stringify(e.response.data)
+        );
+      } else {
+        console.error(`❌ Erro Código: ${e.message}`);
+      }
+    }
+  }
+
+  async handleGameEnd(result) {
+    console.log(
+      `[Match ${this.id}] Mão terminada. Vencedor: ${result.winnerId}`
+    );
+
+    this.points[result.player1_id] += result.player1_points;
+    this.points[result.player2_id] += result.player2_points;
+
+    if (this.currentGame && this.currentGame.dbId) {
+      try {
+        const payload = {
+          status: "Ended",
+          winner_user_id: result.winnerId,
+          loser_user_id: result.loserId,
+          is_draw: result.isDraw,
+          player1_points: result.player1_points,
+          player2_points: result.player2_points,
+          ended_at: new Date().toISOString(),
+        };
+
+        console.log(
+          `📤 A enviar update para Game #${this.currentGame.dbId}...`
+        );
+
+        // --- CORREÇÃO IMPORTANTE: Forçar o header aqui ---
+        const config = {
+          headers: {
+            Authorization: this.token,
+            "Content-Type": "application/json",
+            Accept: "application/json",
+          },
+        };
+
+        await axios.put(
+          `${API_URL}/games/${this.currentGame.dbId}`,
+          payload,
+          config
+        );
+
+        console.log(
+          `✅ Game #${this.currentGame.dbId} atualizado com sucesso.`
+        );
+      } catch (e) {
+        // --- LOG DETALHADO PARA VER O MOTIVO DO 403 ---
+        if (e.response) {
+          console.error(`❌ ERRO CRÍTICO API (${e.response.status}):`);
+          // Isto vai imprimir o JSON exato que o Laravel devolve
+          console.error(JSON.stringify(e.response.data, null, 2));
+        } else {
+          console.error("Erro Axios:", e.message);
+        }
+      }
+    } else {
+      console.warn("⚠️ Ignorado: Não há ID de jogo na DB para atualizar.");
+    }
+
+    // ... (resto da lógica de atribuir marcas e finishMatch mantém-se igual)
+    let marksToAdd = 0;
+    let roundWinnerId = result.winnerId;
+
+    if (roundWinnerId) {
+      const winningScore =
+        roundWinnerId == result.player1_id
+          ? result.player1_points
+          : result.player2_points;
+      if (winningScore === 120) marksToAdd = 4;
+      else if (winningScore > 90) marksToAdd = 2;
+      else if (winningScore >= 60) marksToAdd = 1;
+      this.marks[roundWinnerId] += marksToAdd;
+    }
+
+    if (this.marks[this.player1Id] >= 4 || this.marks[this.player2Id] >= 4) {
+      await this.finishMatch();
+      if (this.emitStateCallback) {
+        this.emitStateCallback("match:ended", this.getState());
+      }
+    } else {
+      console.log(`[Match ${this.id}] Ninguém ganhou 4 marcas. A baralhar...`);
+      await this.startNewGame();
+    }
+  }
+
+  async finishMatch() {
+    this.status = "Ended";
+
+    const winnerId =
+      this.marks[this.player1Id] >= 4 ? this.player1Id : this.player2Id;
+    const loserId =
+      winnerId == this.player1Id ? this.player2Id : this.player1Id;
+
+    try {
+      await axios.put(
+        `${API_URL}/matches/${this.id}`,
+        {
+          status: "Ended",
+          winner_user_id: winnerId,
+          loser_user_id: loserId,
+          player1_marks: this.marks[this.player1Id],
+          player2_marks: this.marks[this.player2Id],
+          player1_points: this.points[this.player1Id],
+          player2_points: this.points[this.player2Id],
+        },
+        this.getAuthHeaders()
+      );
+      console.log(`[Match ${this.id}] Encerrado com sucesso na API.`);
+    } catch (e) {
+      console.error(`Erro ao fechar Match API: ${e.message}`);
+    }
+  }
+
+  playCard(userId, cardId) {
+    if (!this.currentGame || this.status !== "Playing") return;
+    return this.currentGame.playCard(userId, cardId);
+  }
+
+  getState() {
+    let gameState = null;
+
+    if (this.currentGame) {
+      const p1Id = this.player1Id;
+      const p2Id = this.player2Id;
+
+      if (this.currentGame.players && this.currentGame.players[p1Id]) {
+        gameState = this.currentGame.getStateForPlayer(p1Id);
+      } else if (this.currentGame.players && this.currentGame.players[p2Id]) {
+        gameState = this.currentGame.getStateForPlayer(p2Id);
+      } else if (this.currentGame.players) {
+        const availableIds = Object.keys(this.currentGame.players);
+        if (availableIds.length > 0) {
+          console.warn(
+            `⚠️ [Match ${this.id}] IDs desalinhados! A usar vista do user ${availableIds[0]}`
+          );
+          gameState = this.currentGame.getStateForPlayer(availableIds[0]);
+        }
+      }
+    }
+
+    return {
+      matchId: this.id,
+      status: this.status,
+      marks: this.marks,
+      points: this.points,
+      game: gameState,
+    };
+  }
+}
+
+export default BiscaMatch;

websockets/events/connection.js

@@ -1,4 +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
@@ -8,36 +8,36 @@ export const handleConnectionEvents = (io, socket) => {
   let heartbeatTimeout;
   const startHeartbeat = () => {
     heartbeatInterval = setInterval(() => {
-      socket.emit('heartbeat');
+      socket.emit("heartbeat");
 
       heartbeatTimeout = setTimeout(() => {
         console.log(
-          `[Heartbeat] No response from ${socket.id}, disconnecting...`,
+          `[Heartbeat] No response from ${socket.id}, disconnecting...`
         );
         socket.disconnect(true);
       }, HEARTBEAT_TIMEOUT);
     }, HEARTBEAT_INTERVAL);
   };
 
-  socket.on('heartbeat_ack', () => {
+  socket.on("heartbeat_ack", () => {
     clearTimeout(heartbeatTimeout);
     console.log(`[Heartbeat] Received pong from ${socket.id}`);
   });
 
-  socket.on('join', (user) => {
+  socket.on("join", (user) => {
     addUser(socket, user);
     console.log(`[Connection] User ${user.name} has joined the server`);
   });
 
-  socket.on('leave', () => {
+  socket.on("leave", () => {
     const user = removeUser(socket.id);
     if (user) {
       console.log(`[Connection] User ${user.name} has left the server`);
     }
   });
 
-  socket.on('disconnect', () => {
+  socket.on("disconnect", () => {
-    console.log('Connection Lost:', socket.id);
+    console.log("Connection Lost:", socket.id);
     removeUser(socket.id);
   });
 };

websockets/events/game.js

@@ -4,6 +4,71 @@ import { getUser } from "../state/connection.js";
 
 const API_URL = "http://localhost:8000/api/v1";
 
+// --- HELPER: Card Strength for Auto-Play ---
+const getStrength = (rank) => {
+    const strengthMap = { 1: 10, 7: 9, 13: 8, 11: 7, 12: 6, 6: 5, 5: 4, 4: 3, 3: 2, 2: 1 };
+    return strengthMap[rank] || 0;
+};
+
+// --- HELPER: Draw Card Logic ---
+const drawCard = (game, playerId) => {
+    const player = game.players[playerId];
+    if (!player) return;
+
+    if (game.deck && game.deck.length > 0) {
+        const card = game.deck.pop();
+        player.hand.push(card);
+    } else if (game.trumpCard) {
+        player.hand.push(game.trumpCard);
+        game.trumpCard = null;
+    }
+};
+
+// --- HELPER: Sanitize Data ---
+const sanitizeState = (state, game) => {
+    if (!state) return null;
+    const p1 = game.player1 || state.player1 || {};
+    const p2 = game.player2 || state.player2 || {};
+
+    return {
+        id: state.id,
+        status: state.status || game.status,
+        player1: { id: p1.id, name: p1.name },
+        player2: { id: p2.id, name: p2.name },
+        players: state.players, 
+        hand: state.hand,
+        points: state.points,
+        opponent: {
+            id: state.opponent?.id,
+            name: state.opponent?.name,
+            points: state.opponent?.points,
+            cardCount: state.opponent?.cardCount
+        },
+        table: state.table,
+        trumpCard: state.trumpCard,
+        deckCount: game.deck ? game.deck.length : (state.deckCount || 0),
+        currentTurn: state.currentTurn,
+        turnStartedAt: state.turnStartedAt
+    };
+};
+
+const broadcastState = (io, gameId, game) => {
+    const roomName = `game_${gameId}`;
+    const socketsInRoom = io.sockets.adapter.rooms.get(roomName);
+    
+    if (socketsInRoom) {
+      for (const socketId of socketsInRoom) {
+        const s = io.sockets.sockets.get(socketId);
+        const u = getUser(socketId);
+        if (u && game.players[u.id]) {
+          const rawState = game.getStateForPlayer(u.id);
+          const cleanState = sanitizeState(rawState, game);
+          s.emit("game-state", cleanState);
+        }
+      }
+    }
+}
+
 async function saveGameResult(gameId, result, token) {
   try {
     const payload = {
@@ -13,90 +78,105 @@ async function saveGameResult(gameId, result, token) {
       player1_points: result.player1_points,
       player2_points: result.player2_points,
     };
-
     if (!result.isDraw && result.winnerId) {
       payload.winner_user_id = result.winnerId;
       payload.loser_user_id = result.loserId;
     }
-
     await axios.put(`${API_URL}/games/${gameId}`, payload, {
       headers: { Authorization: token },
     });
-    console.log(`[DB] Game ${gameId} saved.`);
   } catch (error) {
     console.error(`[DB Error] Game ${gameId}:`, error.message);
   }
 }
 
+// --- SHARED END GAME LOGIC ---
+const performGameEnd = (io, game, gameId, winnerId, loserId, reason) => {
+    const result = {
+        action: "game_ended",
+        winnerId: parseInt(winnerId),
+        loserId: parseInt(loserId),
+        isDraw: false,
+        player1_points: game.players[Object.keys(game.players)[0]]?.points || 0,
+        player2_points: game.players[Object.keys(game.players)[1]]?.points || 0,
+        reason: reason
+    };
+
+    game.status = "ended";
+    if (game.timer) clearInterval(game.timer);
+
+    io.to(`game_${gameId}`).emit("game-over", {
+        winnerId: result.winnerId,
+        isDraw: result.isDraw,
+        p1Points: result.player1_points,
+        p2Points: result.player2_points,
+        message: reason === "surrender" ? "Opponent Surrendered!" : "Game Over"
+    });
+
+    const anyId = Object.keys(game.players)[0];
+    const token = game.players[anyId]?.token;
+    if (token) saveGameResult(gameId, result, token);
+}
+
+const handleTimeout = (io, gameId, userId) => {
+  const game = getGame(gameId);
+  if (!game || game.status === 'ended') return;
+
+  console.log(`[Timeout] User ${userId} auto-playing lowest card.`);
+  
+  const player = game.players[userId];
+  if (!player || !player.hand || player.hand.length === 0) return;
+
+  const trumpSuit = game.trumpCard?.suit || '';
+  
+  const sortedHand = [...player.hand].sort((a, b) => {
+      const strengthA = getStrength(a.rank) + (a.suit === trumpSuit ? 100 : 0);
+      const strengthB = getStrength(b.rank) + (b.suit === trumpSuit ? 100 : 0);
+      return strengthA - strengthB;
+  });
+
+  const cardToPlay = sortedHand[0];
+  if (cardToPlay) {
+      handleGameMove(io, gameId, userId, cardToPlay.id);
+  }
+};
+
 const handleGameMove = (io, gameId, userId, cardId) => {
   const game = getGame(gameId);
   if (!game) return;
 
   const result = game.playCard(userId, cardId);
-
-  if (result.error) {
-    console.log(`[Game Error] ${result.error}`);
-    return;
-  }
-
   const roomName = `game_${gameId}`;
-  const socketsInRoom = io.sockets.adapter.rooms.get(roomName);
   
-  if (socketsInRoom) {
+  broadcastState(io, gameId, game);
-    for (const socketId of socketsInRoom) {
-      const s = io.sockets.sockets.get(socketId);
-      const u = getUser(socketId);
-      if (u && game.players[u.id]) {
-        s.emit("game-state", game.getStateForPlayer(u.id));
-      }
-    }
-  }
 
   if (result.action === "trick_resolved") {
     io.to(roomName).emit("trick-end", result.trickResult);
+    
+    setTimeout(() => {
+        if (game.status !== "ended") {
+            const canDraw = (game.deck && game.deck.length > 0) || game.trumpCard !== null;
+
+            if (canDraw) {
+                const winnerId = result.trickResult.winnerId;
+                const loserId = Object.keys(game.players).find(id => String(id) !== String(winnerId));
+
+                if (winnerId) drawCard(game, winnerId);
+                if (loserId) drawCard(game, loserId);
+            }
+            broadcastState(io, gameId, game);
+        }
+    }, 1500); 
   }
 
   if (result.action === "game_ended") {
-    io.to(roomName).emit("game-over", {
+      performGameEnd(io, game, gameId, result.winnerId, result.loserId, "points");
-      winnerId: result.winnerId,
-      isDraw: result.isDraw,
-      p1Points: result.player1_points,
-      p2Points: result.player2_points,
-    });
-
-    let tokenToUse = null;
-    const playerIds = Object.keys(game.players);
-
-    for (const pid of playerIds) {
-      if (game.players[pid] && game.players[pid].token) {
-        tokenToUse = game.players[pid].token;
-        break;
-      }
-    }
-
-    if (tokenToUse) {
-      saveGameResult(gameId, result, tokenToUse);
-      console.log(`[DB] Jogo salvo usando o token de um dos jogadores.`);
-    } else {
-      console.error(
-        `[DB Error] CRÍTICO: Nenhum jogador tem token. O jogo ${gameId} não foi salvo.`
-      );
-    }
   }
 
   if (result.action === "next_turn" || result.action === "trick_resolved") {
-    game.startTurnTimer((timeoutUserId, timeoutCardId) => {
+    game.startTurnTimer((timeoutUserId) => {
-      handleGameMove(io, gameId, timeoutUserId, timeoutCardId);
+      handleTimeout(io, gameId, timeoutUserId);
     });
-
-    if (socketsInRoom) {
-      for (const socketId of socketsInRoom) {
-        const s = io.sockets.sockets.get(socketId);
-        const u = getUser(socketId);
-        if (u && game.players[u.id])
-          s.emit("game-state", game.getStateForPlayer(u.id));
-      }
-    }
   }
 };
 
@@ -109,181 +189,92 @@ export default (io, socket) => {
     }
 
     let game = getGame(gameId);
+    let gameData = null;
 
-    if (!game) {
     try {
         const token = socket.handshake.auth.token;
         const response = await axios.get(`${API_URL}/games/${gameId}`, {
           headers: { Authorization: token },
         });
+        gameData = response.data.data || response.data;
+    } catch (e) { console.error("DB Sync Failed"); }
 
-        const gameData = response.data.data || response.data;
+    if (!game && gameData) {
-
+        const p1Name = gameData.player1?.nickname || "Player 1";
-        console.log(
+        const p2Name = gameData.player2?.nickname || "Player 2";
-          `[Join Debug] API Data recebida para Jogo ${gameId}:`,
-          gameData ? "OK" : "NULL"
-        );
-
-        if (
-          gameData.player2_user_id == 1 &&
-          user.id != gameData.player1_user_id
-        ) {
-          try {
-            console.log(
-              `[API Sync] A oficializar User ${user.id} como Player 2 na BD...`
-            );
-            await axios.post(
-              `${API_URL}/games/${gameId}/join`,
-              {},
-              {
-                headers: { Authorization: token },
-              }
-            );
-            console.log(`[API Sync] Sucesso! O jogo passou a 'Playing' na BD.`);
-
-            gameData.player2_user_id = user.id;
-            gameData.player2 = { name: user.name };
-            gameData.status = "Playing";
-          } catch (joinError) {
-            console.error(
-              `[API Sync Error] Falha ao fazer join na BD:`,
-              joinError.message
-            );
-          }
-        }
-
-        if (gameData.status === "Ended") {
-          socket.emit("error", { message: "Game already finished." });
-          return;
-        }
-
-        if (
-          gameData.player1_user_id != user.id &&
-          gameData.player2_user_id != user.id &&
-          gameData.player2_user_id !== 1
-        ) {
-          socket.emit("error", { message: "You are not in this game." });
-          return;
-        }
-
-        const p1Name = gameData.player1?.name || "Player 1";
-        const p2Name = gameData.player2?.name || "Player 2";
         const type = gameData.type == "9" ? 9 : 3;
-
         game = createGame(
           gameId,
           type,
           { id: gameData.player1_user_id, name: p1Name },
           { id: gameData.player2_user_id, name: p2Name }
         );
-        console.log(
+        game.status = gameData.status === 'Playing' ? 'playing' : 'pending';
-          `[Join Debug] Jogo criado?`,
-          game ? "SIM" : "NÃO (Undefined)"
-        );
-      } catch (error) {
-        if (error.response) {
-          console.error(`[Join Error] Status: ${error.response.status}`);
-          console.error(`[Join Error] Data:`, error.response.data);
-        } else {
-          console.error(`[Join Error] Message:`, error.message);
     }
 
-        socket.emit("error", { message: "Failed to join game." });
+    if (!game) {
+        socket.emit("error", { message: "Game not found." });
         return;
     }
+
+    const myId = user.id;
+    const ghostKey = Object.keys(game.players).find(key => key == 1);
+    const amIDbPlayer2 = gameData && gameData.player2_user_id == myId;
+
+    if (!game.players[myId] && (ghostKey || amIDbPlayer2)) {
+        let ghostHand = []; 
+        let ghostPoints = 0; 
+        let ghostTricks = 0;
+        if (ghostKey && game.players[ghostKey]) {
+            ghostHand = game.players[ghostKey].hand || [];
+            ghostPoints = game.players[ghostKey].points || 0;
+            ghostTricks = game.players[ghostKey].tricks || 0;
+            delete game.players[ghostKey];
         }
 
-    const GHOST_ID = 1;
+        game.players[myId] = {
-
+            id: myId,
-    if (game && game.players) {
+            name: user.nickname,
-      if (game.players[user.id]) {
+            hand: ghostHand,
-        game.players[user.id].token = socket.handshake.auth.token;
+            points: ghostPoints,
-      }
+            tricks: ghostTricks,
-
-      if (!game.players[user.id] && game.players[GHOST_ID]) {
-        console.log(`[Ghost Swap] User ${user.name} substituiu o Fantasma.`);
-
-        delete game.players[GHOST_ID];
-        game.players[user.id] = {
-          id: user.id,
-          name: user.name,
-          hand: [],
-          points: 0,
-          tricks: 0,
             token: socket.handshake.auth.token,
         };
-
+        game.player2 = { id: myId, name: user.nickname };
-        const token = socket.handshake.auth.token;
+        game.status = 'playing';
-
+        if(!game.timer) {
-        axios
+            game.startTurnTimer((timeoutUserId) => handleTimeout(io, gameId, timeoutUserId));
-          .post(
-            `${API_URL}/games/${gameId}/join`,
-            {},
-            {
-              headers: { Authorization: token },
-            }
-          )
-          .then(() =>
-            console.log(`[API Sync] Sucesso! BD atualizada para 'Playing'.`)
-          )
-          .catch((err) => console.error(`[API Sync Error]`, err.message));
         }
     }
 
     socket.join(`game_${gameId}`);
     
-    if (game && game.players[user.id]) {
+    if (game.players[myId]) {
-      socket.emit("game-state", game.getStateForPlayer(user.id));
+        game.players[myId].token = socket.handshake.auth.token;
-      console.log(`--> Estado enviado para User ${user.id}`);
+        
-      game.players[user.id].token = socket.handshake.auth.token;
+        const rawState = game.getStateForPlayer(myId);
-      if (!game.timer && game.status === "playing") {
+        const cleanState = sanitizeState(rawState, game);
-        game.startTurnTimer((uId, cId) => handleGameMove(io, gameId, uId, cId));
+        
-      }
+        socket.emit("game-state", cleanState);
-      socket.emit("game-state", game.getStateForPlayer(user.id));
+        broadcastState(io, gameId, game);
-    } else {
-      socket.emit("error", { message: "Error joining game state." });
     }
   });
 
   socket.on("play-card", ({ gameId, cardId }) => {
+    const user = getUser(socket.id);
+    if (user) handleGameMove(io, gameId, user.id, cardId);
+  });
+
+  // --- NEW: SURRENDER HANDLER ---
+  socket.on("surrender", ({ gameId }) => {
       const user = getUser(socket.id);
       const game = getGame(gameId);
       
-    if (!game || !user) return;
+      if (!game || !user || !game.players[user.id]) return;
 
-    const result = game.playCard(user.id, cardId);
+      console.log(`[Game] User ${user.nickname} surrendered.`);
       
-    if (result.error) {
+      const winnerId = Object.keys(game.players).find(id => String(id) !== String(user.id));
-      socket.emit("game-error", { message: result.error });
+      performGameEnd(io, game, gameId, winnerId, user.id, "surrender");
-      return;
-    }
-
-    handleGameMove(io, gameId, user.id, cardId);
-
-    const roomName = `game_${gameId}`;
-    const socketsInRoom = io.sockets.adapter.rooms.get(roomName);
-    if (socketsInRoom) {
-      for (const socketId of socketsInRoom) {
-        const s = io.sockets.sockets.get(socketId);
-        const u = getUser(socketId);
-        if (u && game.players[u.id]) {
-          s.emit("game-state", game.getStateForPlayer(u.id));
-        }
-      }
-    }
-
-    if (result.action === "trick_resolved") {
-      io.to(roomName).emit("trick-end", result.trickResult);
-    }
-
-    if (result.action === "game_ended") {
-      io.to(roomName).emit("game-over", {
-        winnerId: result.winnerId,
-        isDraw: result.isDraw,
-        p1Points: result.player1_points,
-        p2Points: result.player2_points,
-      });
-      saveGameResult(gameId, result, socket.handshake.auth.token);
-    }
   });
 };

websockets/events/match.js

@@ -0,0 +1,138 @@
+import { getMatch, addMatch } from "../state/match.js";
+import BiscaMatch from "../classes/BiscaMatch.js";
+import axios from "axios";
+
+const API_URL = "http://localhost:8000/api/v1";
+
+export default (io, socket) => {
+  const createMatchEmitter = (matchId) => (eventName, payload) => {
+    io.to(`match_${matchId}`).emit(eventName, payload);
+  };
+
+  socket.on("match:enter", async (data) => {
+    const { matchId } = data;
+
+    if (!socket.user || !socket.user.id) {
+      return socket.emit("error", { message: "User not authenticated" });
+    }
+
+    const userId = socket.user.id;
+    const room = `match_${matchId}`;
+
+    let match = getMatch(matchId);
+
+    if (!match) {
+      try {
+        console.log(`A pedir match ${matchId} à API...`);
+        const res = await axios.get(`${API_URL}/matches/${matchId}`, {
+          headers: { Authorization: socket.token },
+        });
+
+        const matchData = res.data.data || res.data;
+
+        match = new BiscaMatch(
+          matchData,
+          createMatchEmitter(matchId),
+          socket.token
+        );
+        addMatch(match);
+        console.log(`Match ${matchId} carregado em memória.`);
+      } catch (e) {
+        console.error("Erro ao carregar Match da API:", e.message);
+        socket.emit("error", "Match not found or API error");
+        return;
+      }
+    } else {
+      match.token = socket.token;
+    }
+
+    if (match) {
+      match.token = socket.token;
+    }
+
+    match.emitStateCallback = createMatchEmitter(matchId);
+
+    if (userId !== match.player1Id && match.player2Id === 1) {
+      console.log(`User ${userId} a substituir o Ghost no Match ${matchId}`);
+      await match.joinPlayer(userId);
+    }
+
+    socket.join(room);
+    console.log(`Socket ${socket.id} entrou na sala ${room}`);
+
+    if (match.status === "Playing") {
+      socket.emit("match:update", match.getState());
+    } else {
+      socket.emit("match:waiting", { msg: "Waiting for opponent..." });
+    }
+  });
+
+  socket.on("game:play-card", (data) => {
+    const { matchId, cardId } = data;
+    const match = getMatch(matchId);
+
+    if (!match || match.status !== "Playing") {
+      console.log(
+        "Tentativa de jogar sem match ativo ou match não encontrado."
+      );
+      return;
+    }
+
+    const result = match.playCard(socket.user.id, cardId);
+
+    if (result && result.error) {
+      console.log(
+        `❌ [Erro Jogo] User ${socket.user.id} tentou jogar carta ${cardId} mas: ${result.error}`
+      );
+
+      socket.emit("error", { message: result.error });
+      return;
+    }
+
+    if (match.currentGame) {
+      io.to(`match_${matchId}`).emit(
+        "game:update",
+        match.currentGame.getStateForPlayer(socket.user.id)
+      );
+    }
+  });
+  socket.on("debug:end-game", async (data) => {
+    const { matchId } = data;
+    const match = getMatch(matchId);
+    if (match) {
+      console.log(`[DEBUG] User ${socket.user.id} a forçar fim de jogo.`);
+      // Simula que o user que clicou ganhou 120 pontos
+      const winnerId = socket.user.id;
+      const loserId =
+        winnerId == match.player1Id ? match.player2Id : match.player1Id;
+
+      // Objeto de resultado falso para fechar o jogo
+      const fakeResult = {
+        winnerId: winnerId,
+        loserId: loserId,
+        isDraw: false,
+        player1_points: winnerId == match.player1Id ? 120 : 0,
+        player2_points: winnerId == match.player2Id ? 120 : 0,
+        player1_id: match.player1Id,
+        player2_id: match.player2Id,
+      };
+
+      await match.handleGameEnd(fakeResult);
+    }
+  });
+
+  // DEBUG: Forçar fim do Match Completo
+  socket.on("debug:end-match", async (data) => {
+    const { matchId } = data;
+    const match = getMatch(matchId);
+    if (match) {
+      console.log(`[DEBUG] User ${socket.user.id} a forçar fim de MATCH.`);
+      // Dá 4 marcas a quem clicou
+      match.marks[socket.user.id] = 4;
+      await match.finishMatch();
+
+      // Emite o estado final
+      io.to(`match_${matchId}`).emit("match:ended", match.getState());
+    }
+  });
+};

websockets/server.js

@@ -3,6 +3,7 @@ import axios from "axios";
 import { handleConnectionEvents } from "./events/connection.js";
 import { addUser, removeUser } from "./state/connection.js";
 import gameEvents from "./events/game.js";
+import matchEvents from "./events/match.js";
 
 export const server = {
   io: null,
@@ -43,6 +44,7 @@ export const serverStart = (port) => {
       }
 
       socket.user = user;
+      socket.token = token;
       socket.handshake.auth.token = token; 
 
       addUser(socket.id, user); 
@@ -65,6 +67,8 @@ export const serverStart = (port) => {
   server.io.on("connection", (socket) => {
     gameEvents(server.io, socket);
 
+    matchEvents(server.io, socket);
+
     handleConnectionEvents(server.io, socket);
 
     socket.on("disconnect", () => {

websockets/state/game.js

@@ -1,8 +1,15 @@
-import BiscaGame from '../classes/BiscaGame.js';
+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`
+    );
+    return existingGame;
+  }
   const game = new BiscaGame(id, type, player1, player2);
 
   game.init();
@@ -13,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();
@@ -25,5 +32,3 @@ const removeGame = (id) => {
     console.log(`[Game State] Game removed: ${id}`);
   }
 };
-
-export { createGame, getGame, removeGame };

websockets/state/match.js

@@ -0,0 +1,16 @@
+const matches = new Map();
+
+export const addMatch = (match) => {
+  matches.set(parseInt(match.id), match);
+  return match;
+};
+
+export const getMatch = (id) => {
+  return matches.get(parseInt(id));
+};
+
+export const removeMatch = (id) => {
+  matches.delete(parseInt(id));
+};
+
+export { matches };