ci: bump version to v4.21.0

Added localhost:3000 to CORS for PWA to work

Co-authored-by: LQ63 <lkhermann@web.de>
Reviewed-on: #110
Reviewed-by: Janis <janis-e@gmx.de>
Co-authored-by: lq64 <lq@blackhole.local>
Co-committed-by: lq64 <lq@blackhole.local>

CHANGELOG.md

@@ -244,3 +244,51 @@
 ### Features
 
 * **api:** FRO-14 Create Game ([#107](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/107)) ([bd7a055](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/bd7a055a0944a1c5219f21bb080bf658229f49e9))
+##  (2025-12-11)
+
+### 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))
+##  (2025-12-18)
+
+### Features
+
+* **ui:** FRO-36 PWA ([#110](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/issues/110)) ([e4384ee](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e4384ee8945ac462fe1f3580215117e0a438f71a))
+##  (2026-01-06)
+
+### Features
+
+* Enhance win effects and animations in OfflineView component ([088dda8](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/088dda8d528edb9f3fd420e7e69eb44144d39eff))
+##  (2026-01-07)
+
+### Features
+
+* Add GatewayModule for enhanced module configuration ([1d05bd4](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/1d05bd43b482564636345322a2cecf58f7d229d0))
+* Enhance Dockerfile with secret management for GitHub credentials ([5f9ef2b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/5f9ef2beb0a6e7d5e8caf436f545bbd78a6b242e))
+* Simplify Dockerfile by removing multi-stage build and adjusting file copy paths ([e17f59e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/e17f59e614a0060b70514c2337ac6fd84688546e))
+* Update build.sbt and Dockerfile for improved GitHub credentials handling ([8126b46](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/8126b46a0a1649d2b20b31975603f7610fafd18b))
+* Update build.sbt and Dockerfile for improved GitHub credentials handling ([25dd926](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/25dd9264b57ffafc5b01587ff5dda2e2188b5fbd))
+* Update Dockerfile for multi-platform support and add nginx configuration ([ccf993b](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/ccf993bff25b4551a70c1f0263695f828df15a02))
+* Update Dockerfile for multi-platform support and add nginx configuration ([3e06734](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/3e067346ffe3bdc62dc936ea8e79ae9293d86351))
+* Update Dockerfile for multi-platform support and add nginx configuration ([b2527ed](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/b2527ed041568d20f880515b406fe0b0e10c12c1))
+##  (2026-01-07)
+##  (2026-01-07)
+
+### Features
+
+* Update configuration files for CORS settings and add production environment ([3b7a1e3](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/3b7a1e3c646d870134d8d06b4962498b0e282cbd))
+##  (2026-01-07)
+
+### Features
+
+* Add caching headers for env.js in Nginx configuration ([dbad818](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/dbad818fdaeb237a05f583e5402773a4339e7aa1))
+##  (2026-01-07)
+
+### Features
+
+* Add logging to Gateway for pod synchronization and startup events ([6ef7401](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/6ef74014430673e725245bf37e44c5b90b81abb3))

Dockerfile

@@ -1,26 +1,4 @@
-# === Stage 1: Build the Play application ===
-FROM sbtscala/scala-sbt:eclipse-temurin-alpine-22_36_1.10.3_3.5.1 AS builder
-
-WORKDIR /app
-
-# Install Node.js and Less CSS preprocessor
-USER root
-RUN apk add --no-cache nodejs npm && \
-    npm install -g less
-
-# Cache dependencies first
-COPY project ./project
-COPY build.sbt ./
-RUN sbt -Dscoverage.skip=true update
-
-# Copy the rest of the code
-COPY . .
-
-# Build the app and stage it
-RUN sbt -Dscoverage.skip=true clean stage
-
-# === Stage 2: Runtime image ===
-FROM eclipse-temurin:21-jre-alpine
+FROM --platform=$TARGETPLATFORM eclipse-temurin:22-jre-alpine
 
 # Install Argon2 CLI and libraries
 RUN apk add --no-cache bash argon2 argon2-libs
@@ -28,7 +6,7 @@ RUN apk add --no-cache bash argon2 argon2-libs
 WORKDIR /opt/playapp
 
 # Copy staged Play build
-COPY --from=builder /app/knockoutwhistweb/target/universal/stage /opt/playapp
+COPY ./knockoutwhistweb/target/universal/stage /opt/playapp
 
 # Expose the default Play port
 EXPOSE 9000

bruno/KnockOutWhist/Login/Request Status.bru

@@ -0,0 +1,15 @@
+meta {
+  name: Request Status
+  type: http
+  seq: 1
+}
+
+get {
+  url: {{host}}/status
+  body: none
+  auth: inherit
+}
+
+settings {
+  encodeUrl: true
+}

bruno/KnockOutWhist/Login/folder.bru

@@ -0,0 +1,8 @@
+meta {
+  name: Login
+  seq: 3
+}
+
+auth {
+  mode: inherit
+}

bruno/KnockOutWhist/environments/Prod.bru

@@ -0,0 +1,3 @@
+vars {
+  host: https://knockout.janis-eccarius.de/api
+}

build.sbt

@@ -1,5 +1,12 @@
 ThisBuild / scalaVersion := "3.5.1"
 
+credentials += Credentials(
+  "GitHub Package Registry",
+  "maven.pkg.github.com",
+  sys.env.getOrElse("GITHUB_USER", sys.error("GITHUB_USER not set")),
+  sys.env.getOrElse("GITHUB_TOKEN", sys.error("GITHUB_TOKEN not set"))
+)
+
 lazy val commonSettings = Seq(
   libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.19",
   libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.19" % "test",
@@ -35,12 +42,16 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb"))
   .enablePlugins(PlayScala)
   .dependsOn(knockoutwhist % "compile->compile;test->test")
   .settings(
+
+    resolvers += "GitHub Packages" at "https://maven.pkg.github.com/16Janis12/KnockOutWhist-Web",
+
     commonSettings,
     libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.2" % Test,
     libraryDependencies += "de.mkammerer" % "argon2-jvm" % "2.12",
     libraryDependencies += "com.auth0" % "java-jwt" % "4.5.0",
     libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3",
     libraryDependencies += "tools.jackson.module" %% "jackson-module-scala" % "3.0.2",
+    libraryDependencies += "de.janis" % "knockoutwhist-data" % "1.0-SNAPSHOT",
     JsEngineKeys.engineType := JsEngineKeys.EngineType.Node
   )
 

knockoutwhistweb/app/controllers/StatusController.scala

@@ -34,7 +34,7 @@ class StatusController @Inject()(
             Json.obj(
               "status" -> "authenticated",
               "username" -> user.name,
-              "inGame" -> "false"
+              "inGame" -> false
             )
           )
         } else {
@@ -43,7 +43,7 @@ class StatusController @Inject()(
             Json.obj(
               "status" -> "authenticated",
               "username" -> user.name,
-              "inGame" -> "true",
+              "inGame" -> true,
               "gameId" -> game.id
             )
           )
@@ -80,7 +80,7 @@ class StatusController @Inject()(
   }}
 
   private def getUserFromSession(request: RequestHeader): Option[User] = {
-    val session = request.cookies.get("sessionId")
+    val session = request.cookies.get("accessToken")
     if (session.isDefined)
       return sessionManager.getUserBySession(session.get.value)
     None

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/logic/Gateway.scala

@@ -0,0 +1,51 @@
+package logic
+
+import de.knockoutwhist.data.Pod
+import de.knockoutwhist.data.redis.RedisManager
+import org.apache.pekko.actor.ActorSystem
+import org.redisson.config.Config
+import play.api.Logger
+import play.api.inject.ApplicationLifecycle
+
+import java.util.UUID
+import javax.inject.*
+import scala.concurrent.ExecutionContext
+import scala.jdk.CollectionConverters.*
+
+@Singleton
+class Gateway @Inject()(
+                         lifecycle: ApplicationLifecycle,
+                         actorSystem: ActorSystem
+                       )(implicit ec: ExecutionContext)  {
+
+  private val logger = Logger(getClass.getName)
+  
+  val redis: RedisManager = {
+    val config: Config = Config()
+    config.useSingleServer.setAddress("valkey://" + sys.env.getOrElse("VALKEY_HOST", "localhost") + ":" + sys.env.getOrElse("VALKEY_PORT", "6379"))
+    RedisManager(config)
+  }
+
+  redis.continuousSyncPod(() => {
+    logger.info("Syncing pod with Redis")
+    createPod()
+  })
+  
+  logger.info("Gateway started")
+
+  def syncPod(): Unit = {
+    redis.syncPod(createPod())
+  }
+
+  private def createPod(): Pod = {
+    Pod(
+      UUID.randomUUID().toString,
+      PodManager.podName,
+      PodManager.podIp,
+      9000,
+      PodManager.getAllGameIds().asJava,
+      PodManager.allBoundUsers().asJava
+    )
+  }
+
+}

knockoutwhistweb/app/logic/PodManager.scala

@@ -21,6 +21,8 @@ object PodManager {
   private val userSession: mutable.Map[User, String] = mutable.Map()
   private val injector: Injector = Guice.createInjector(KnockOutWebConfigurationModule())
 
+  private[logic] var redis: Option[Gateway] = None
+
   def createGame(
                   host: User,
                   name: String,
@@ -35,7 +37,8 @@ object PodManager {
       host = host
     )
     sessions += (gameLobby.id -> gameLobby)
-    userSession += (host -> gameLobby.id)
+    registerUserToGame(host, gameLobby.id)
+    redis.foreach(gateway => gateway.syncPod())
     gameLobby
   }
 
@@ -46,6 +49,7 @@ object PodManager {
   def registerUserToGame(user: User, gameId: String): Boolean = {
     if (sessions.contains(gameId)) {
       userSession += (user -> gameId)
+      redis.foreach(gateway => gateway.syncPod())
       true
     } else {
       false
@@ -54,6 +58,7 @@ object PodManager {
 
   def unregisterUserFromGame(user: User): Unit = {
     userSession.remove(user)
+    redis.foreach(gateway => gateway.redis.invalidateUser(user.id.toString))
   }
 
   def identifyGameOfUser(user: User): Option[GameLobby] = {
@@ -65,9 +70,12 @@ object PodManager {
 
   private[logic] def removeGame(gameId: String): Unit = {
     sessions.remove(gameId)
+    redis.foreach(gateway => gateway.redis.invalidateGame(gameId))
     // Also remove all user sessions associated with this game
     userSession.filterInPlace((_, v) => v != gameId)
   }
 
+  private[logic] def getAllGameIds(): List[String] = sessions.keys.toList
+  private[logic] def allBoundUsers(): List[String] = userSession.keys.map(_.id.toString).toList
 
 }

knockoutwhistweb/app/logic/game/GameLobby.scala

@@ -106,6 +106,9 @@ class GameLobby private(
     }
     if (sessionOpt.get.host) {
       logic.invoke(SessionClosed())
+      for (session <- users.values) {
+        PodManager.unregisterUserFromGame(session.user)
+      }
       users.clear()
       PodManager.removeGame(id)
       return

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/app/modules/GatewayModule.scala

@@ -0,0 +1,10 @@
+package modules
+
+import com.google.inject.AbstractModule
+import logic.Gateway
+
+class GatewayModule extends AbstractModule {
+  override def configure(): Unit = {
+    bind(classOf[Gateway]).asEagerSingleton()
+  }
+}

knockoutwhistweb/app/util/WebsocketEventMapper.scala

@@ -57,7 +57,8 @@ object WebsocketEventMapper {
     Json.obj(
       "id" -> ("request-" + java.util.UUID.randomUUID().toString),
       "event" -> obj.id,
-      "state" -> stateToJson(session),
+      "state" -> session.gameLobby.getLogic.getCurrentState.toString,
+      "stateData" -> stateToJson(session),
       "data" -> data
     )
   }

knockoutwhistweb/conf/prod.conf

@@ -0,0 +1,14 @@
+include "application.conf"
+
+play.http.secret.key="zg8^v0R*:7-m.>^8T2B1q)sE3MV_9=M{K9zx8,<3}"
+
+play.http.context="/api"
+
+play.modules.enabled += "modules.GatewayModule"
+
+play.filters.cors {
+  allowedOrigins = ["https://knockout.janis-eccarius.de"]
+  allowedCredentials = true
+  allowedHttpMethods = ["GET", "POST", "PUT", "DELETE", "OPTIONS"]
+  allowedHttpHeaders = ["Accept", "Content-Type", "Origin", "X-Requested-With"]
+}

knockoutwhistweb/conf/staging.conf

@@ -0,0 +1,12 @@
+include "application.conf"
+
+play.http.context="/api"
+
+play.modules.enabled += "modules.GatewayModule"
+
+play.filters.cors {
+  allowedOrigins = ["https://st.knockout.janis-eccarius.de"]
+  allowedCredentials = true
+  allowedHttpMethods = ["GET", "POST", "PUT", "DELETE", "OPTIONS"]
+  allowedHttpHeaders = ["Accept", "Content-Type", "Origin", "X-Requested-With"]
+}

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=13
+MINOR=21
 PATCH=0