ci: bump version to v4.15.0

Reviewed-on: #109

CHANGELOG.md

@@ -249,3 +249,8 @@
 ### Features
 
 * FRO-31 Small backend changes ([#108](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/108)) ([b17aae5](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b17aae5795b35ce3805db87c9bf741a5a96cd5ac))
+##  (2025-12-14)
+
+### Features
+
+* Update routing and websocket configuration for game state management ([#109](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/109)) ([35f6085](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/35f608513dd80eece46d49b40ecf31c8e915d307))

knockoutwhistweb/app/controllers/WebsocketController.scala

@@ -21,7 +21,7 @@ class WebsocketController @Inject()(
                                    )(implicit system: ActorSystem, mat: Materializer) extends AbstractController(cc) {
 
   def socket(): WebSocket = WebSocket.accept[String, String] { request =>
-    val session = request.cookies.get("sessionId")
+    val session = request.cookies.get("accessToken")
     if (session.isEmpty) throw new Exception("No session cookie found")
     val userOpt = sessionManger.getUserBySession(session.get.value)
     if (userOpt.isEmpty) throw new Exception("Invalid session")

knockoutwhistweb/app/dto/subDTO/HandDTO.scala

@@ -2,13 +2,13 @@ package dto.subDTO
 
 import de.knockoutwhist.cards.Hand
 
-case class HandDTO(card: List[CardDTO])
+case class HandDTO(cards: List[CardDTO])
 
 object HandDTO {
   
   def apply(hand: Hand): HandDTO = {
     HandDTO(
-      card = hand.cards.zipWithIndex.map { case (card, idx) => CardDTO(card, idx) }
+      cards = hand.cards.zipWithIndex.map { case (card, idx) => CardDTO(card, idx) }
     )
   }
   

knockoutwhistweb/app/dto/subDTO/TrickDTO.scala

@@ -8,7 +8,7 @@ object TrickDTO {
 
   def apply(trick: Trick): TrickDTO = {
     TrickDTO(
-      cards = trick.cards.map { case (card, player) => player.id.toString -> CardDTO(card) },
+      cards = trick.cards.map { case (card, player) => player.name -> CardDTO(card) },
       firstCard = trick.firstCard.map(card => CardDTO(card)),
       winner = trick.winner.map(player => PlayerDTO(player))
     )

knockoutwhistweb/app/model/sessions/UserSession.scala

@@ -46,13 +46,13 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
       case "StartGame" =>
         gameLobby.startGame(user)
       case "PlayCard" =>
-        val maybeCardIndex: Option[String] = (data \ "cardindex").asOpt[String]
+        val maybeCardIndex: Option[Int] = (data \ "cardindex").asOpt[Int]
         maybeCardIndex match {
           case Some(index) =>
             val session = gameLobby.getUserSession(user.id)
-            gameLobby.playCard(session, index.toInt)
+            gameLobby.playCard(session, index)
           case None =>
-            println("Card Index not found or is not a number.")
+            println("Card Index not found or is not a number." + data)
         }
       case "PickTrumpsuit" =>
         val maybeSuitIndex: Option[Int] = (data \ "suitIndex").asOpt[Int]
@@ -74,6 +74,10 @@ class UserSession(val user: User, val host: Boolean, val gameLobby: GameLobby) e
         }
       case "ReturnToLobby" =>
         gameLobby.returnToLobby(this)
+      case "LeaveGame" =>
+        gameLobby.leaveGame(user.id, false)
+      case _ =>
+        println("Unknown event type: " + eventType + " with data: " + data)
     }
   }
 

knockoutwhistweb/public/javascripts/websocket.js

@@ -1,11 +1,9 @@
-// javascript
-let ws = null; // will be created by connectWebSocket()
-const pending = new Map(); // id -> { resolve, reject, timer }
-const handlers = new Map(); // eventType -> handler(data) -> (value|Promise)
+let ws = null;
+const pending = new Map();
+const handlers = new Map(); 
 
 let timer = null;
 
-// helper to attach message/error/close handlers to a socket
 function setupSocketHandlers(socket) {
     socket.onmessage = (event) => {
         console.debug("SERVER MESSAGE:", event.data);
@@ -48,7 +46,6 @@ function setupSocketHandlers(socket) {
             };
 
             if (!handler) {
-                // no handler: respond with an error object in data so server can fail it
                 console.warn("No handler for event:", eventType);
                 sendResponse({error: "No handler for event: " + eventType});
                 return;
@@ -91,7 +88,6 @@ function setupSocketHandlers(socket) {
     };
 }
 
-// connect/disconnect helpers
 function connectWebSocket(url = null) {
     if (!url) {
         const loc = window.location;
@@ -100,7 +96,6 @@ function connectWebSocket(url = null) {
     }
     if (ws && ws.readyState === WebSocket.OPEN) return Promise.resolve();
     if (ws && ws.readyState === WebSocket.CONNECTING) {
-        // already connecting - return a promise that resolves on open
         return new Promise((resolve, reject) => {
             const prevOnOpen = ws.onopen;
             const prevOnError = ws.onerror;
@@ -121,7 +116,6 @@ function connectWebSocket(url = null) {
     return new Promise((resolve, reject) => {
         ws.onopen = () => {
             console.log("WebSocket connection established!");
-            // start heartbeat
             timer = setInterval(() => {
                 if (ws && ws.readyState === WebSocket.OPEN) {
                     sendEventAndWait("ping", {}).then(

versions.env

@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=14
+MINOR=15
 PATCH=0