feat(ci): Polling

Co-authored-by: LQ63 <lkhermann@web.de> Reviewed-on: #53
2025-11-13 11:07:08 +01:00
parent 5d245d0011
commit 370de175db
12 changed files with 271 additions and 127 deletions
--- a/knockoutwhistweb/app/assets/stylesheets/main.less
+++ b/knockoutwhistweb/app/assets/stylesheets/main.less
@@ -22,6 +22,7 @@
  0% { transform: translateX(-100vw); }
  100% { transform: translateX(0); }
 }
+
 .game-field-background {
    background-image: @background-image;
    max-width: 1400px;
@@ -33,10 +34,6 @@
    width: 100%;
    height: 100vh;
 }
-.lobby-background {
-    background-color: @background-color;
-
-}

 .navbar-header{
    text-align:center;
@@ -192,11 +189,6 @@ body {
    font-size: 20px;

 }
-#trumpsuit {
-    display: flex;
-    flex-direction: row;
-    margin-left: 4%;
-}
 #nextPlayers {
    display: flex;
    flex-direction: column;
--- a/knockoutwhistweb/app/controllers/IngameController.scala
+++ b/knockoutwhistweb/app/controllers/IngameController.scala
@@ -1,23 +1,25 @@
 package controllers

 import auth.{AuthAction, AuthenticatedRequest}
+import de.knockoutwhist.cards.Hand
 import de.knockoutwhist.control.GameState.{InGame, Lobby, SelectTrump, TieBreak}
 import exceptions.{CantPlayCardException, GameFullException, NotEnoughPlayersException, NotHostException, NotInThisGameException}
 import logic.PodManager
+import logic.game.PollingEvents.CardPlayed
+import logic.game.PollingEvents.GameStarted
+import logic.game.{GameLobby, PollingEvents}
 import model.sessions.{PlayerSession, UserSession}
+import model.users.User
 import play.api.*
-import play.api.libs.json.Json
+import play.api.libs.json.{JsArray, JsValue, Json}
 import play.api.mvc.*
+import util.WebUIUtils

 import java.util.UUID
 import javax.inject.*
+import scala.concurrent.Future
 import scala.util.Try
-
-
-/**
- * This controller creates an `Action` to handle HTTP requests to the
- * application's home page.
- */
+import scala.concurrent.ExecutionContext
@Singleton
 class IngameController @Inject()(
                                  val controllerComponents: ControllerComponents,
@@ -39,14 +41,12 @@ class IngameController @Inject()(
          case SelectTrump =>
            Ok(views.html.ingame.selecttrump(
              g.getPlayerByUser(request.user),
-              g.logic,
-              gameId
+              g.logic
            ))
          case TieBreak =>
            Ok(views.html.ingame.tie(
              g.getPlayerByUser(request.user),
-              g.logic,
-              gameId
+              g.logic
            ))
          case _ =>
            InternalServerError(s"Invalid game state for in-game view. GameId: $gameId" + s" State: ${g.logic.getCurrentState}")
@@ -67,70 +67,30 @@ class IngameController @Inject()(
      }
    }
    if (result.isSuccess) {
-      Ok(Json.obj(
-        "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameId).url
-      ))
+      Redirect(routes.IngameController.game(gameId))
    } else {
      val throwable = result.failed.get
      throwable match {
        case _: NotInThisGameException =>
-          BadRequest(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          BadRequest(throwable.getMessage)
        case _: NotHostException =>
-          Forbidden(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          Forbidden(throwable.getMessage)
        case _: NotEnoughPlayersException =>
-          BadRequest(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          BadRequest(throwable.getMessage)
        case _ =>
-          InternalServerError(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> throwable.getMessage
-          ))
+          InternalServerError(throwable.getMessage)
      }
    }
  }
-  def kickPlayer(gameId: String, playerToKick: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+  def kickPlayer(gameId: String, playerToKick: UUID): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
    val game = podManager.getGame(gameId)
-    val playerToKickUUID = UUID.fromString(playerToKick)
-    val result = Try {
-      game.get.leaveGame(playerToKickUUID)
-    }
-    if(result.isSuccess) {
-      Ok(Json.obj(
-        "status" -> "success",
-        "redirectUrl" -> routes.IngameController.game(gameId).url
-      ))
-    } else {
-      InternalServerError(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Something went wrong."
-      ))
-    }
+    game.get.leaveGame(playerToKick)
+    Redirect(routes.IngameController.game(gameId))
  }
  def leaveGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
    val game = podManager.getGame(gameId)
-    val result = Try {
-      game.get.leaveGame(request.user.id)
-    }
-    if (result.isSuccess) {
-      Ok(Json.obj(
-        "status" -> "success",
-        "redirectUrl" -> routes.MainMenuController.mainMenu().url
-      ))
-    } else {
-      InternalServerError(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Something went wrong."
-      ))
-    }
+    game.get.leaveGame(request.user.id)
+    Redirect(routes.MainMenuController.mainMenu())
  }
  def joinGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
    val game = podManager.getGame(gameId)
@@ -162,10 +122,7 @@ class IngameController @Inject()(
    val game = podManager.getGame(gameId)
    game match {
      case Some(g) =>
-        val jsonBody = request.body.asJson
-        val cardIdOpt: Option[String] = jsonBody.flatMap { jsValue =>
-          (jsValue \ "cardID").asOpt[String]
-        }
+        val cardIdOpt = request.body.asFormUrlEncoded.flatMap(_.get("cardId").flatMap(_.headOption))
        cardIdOpt match {
          case Some(cardId) =>
            var optSession: Option[UserSession] = None
@@ -177,51 +134,27 @@ class IngameController @Inject()(
            }
            optSession.foreach(_.lock.unlock())
            if (result.isSuccess) {
-              Ok(Json.obj(
-                "status" -> "success",
-                "redirectUrl" -> routes.IngameController.game(gameId).url
-              ))
+              NoContent
            } else {
              val throwable = result.failed.get
              throwable match {
                case _: CantPlayCardException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: NotInThisGameException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: IllegalArgumentException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _: IllegalStateException =>
-                  BadRequest(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  BadRequest(throwable.getMessage)
                case _ =>
-                  InternalServerError(Json.obj(
-                    "status" -> "failure",
-                    "errorMessage" -> throwable.getMessage
-                  ))
+                  InternalServerError(throwable.getMessage)
              }
            }
          case None =>
-            BadRequest(Json.obj(
-              "status" -> "failure",
-              "errorMessage" -> "cardId Parameter is missing"
-            ))
+            BadRequest("cardId parameter is missing")
        }
      case None =>
-        NotFound(Json.obj(
-          "status" -> "failure",
-          "errorMessage" -> "Game not found"
-        ))
+        NotFound("Game not found")
    }
  }
  }
--- a/knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala
+++ b/knockoutwhistweb/app/controllers/JavaScriptRoutingController.scala
@@ -19,7 +19,8 @@ class JavaScriptRoutingController  @Inject()(
          routes.javascript.IngameController.startGame,
          routes.javascript.IngameController.kickPlayer,
          routes.javascript.IngameController.leaveGame,
-          routes.javascript.IngameController.playCard
+          routes.javascript.IngameController.playCard,
+          routes.javascript.IngameController.polling
      )
    ).as("text/javascript")
  }
--- a/knockoutwhistweb/app/logic/game/GameLobby.scala
+++ b/knockoutwhistweb/app/logic/game/GameLobby.scala
@@ -2,21 +2,23 @@ package logic.game

 import de.knockoutwhist.cards.{Hand, Suit}
 import de.knockoutwhist.control.GameLogic
-import de.knockoutwhist.control.GameState.{Lobby, MainMenu}
+import de.knockoutwhist.control.GameState.{InGame, Lobby, MainMenu}
 import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.{MatchUtil, PlayerUtil}
-import de.knockoutwhist.events.global.{GameStateChangeEvent, SessionClosed}
+import de.knockoutwhist.events.global.{CardPlayedEvent, GameStateChangeEvent, SessionClosed}
 import de.knockoutwhist.events.player.PlayerEvent
 import de.knockoutwhist.player.Playertype.HUMAN
 import de.knockoutwhist.player.{AbstractPlayer, PlayerFactory}
 import de.knockoutwhist.rounds.{Match, Round, Trick}
 import de.knockoutwhist.utils.events.{EventListener, SimpleEvent}
 import exceptions.*
+import logic.game.PollingEvents.{CardPlayed, GameStarted}
 import model.sessions.{InteractionType, UserSession}
 import model.users.User

 import java.util.UUID
 import scala.collection.mutable
 import scala.collection.mutable.ListBuffer
+import scala.concurrent.{Promise => ScalaPromise}

 class GameLobby private(
                 val logic: GameLogic,
@@ -29,7 +31,19 @@ class GameLobby private(
  logic.createSession()

  private val users: mutable.Map[UUID, UserSession] = mutable.Map()
-  
+  private var pollingState: mutable.Queue[PollingEvents] = mutable.Queue()
+  private val waitingPromises: mutable.Map[UUID, ScalaPromise[PollingEvents]] = mutable.Map()
+
+  def registerWaiter(playerId: UUID): ScalaPromise[PollingEvents] = {
+    val promise = ScalaPromise[PollingEvents]()
+    waitingPromises.put(playerId, promise)
+    promise
+  }
+
+  def removeWaiter(playerId: UUID): Unit = {
+    waitingPromises.remove(playerId)
+  }
+
  def addUser(user: User): UserSession = {
    if (users.size >= maxPlayers) throw new GameFullException("The game is full!")
    if (users.contains(user.id)) throw new IllegalArgumentException("User is already in the game!")
@@ -44,12 +58,29 @@ class GameLobby private(

  override def listen(event: SimpleEvent): Unit = {
    event match {
+      case event: CardPlayedEvent =>
+        val newEvent = PollingEvents.CardPlayed
+        if (waitingPromises.nonEmpty) {
+          waitingPromises.values.foreach(_.success(newEvent))
+          waitingPromises.clear()
+        } else {
+          pollingState.enqueue(newEvent)
+        }
      case event: PlayerEvent =>
        users.get(event.playerId).foreach(session => session.updatePlayer(event))
      case event: GameStateChangeEvent =>
        if (event.oldState == MainMenu && event.newState == Lobby) {
          return
        }
+        if (event.oldState == Lobby && event.newState == InGame) {
+          val newEvent = PollingEvents.GameStarted
+          if (waitingPromises.nonEmpty) {
+            waitingPromises.values.foreach(_.success(newEvent))
+            waitingPromises.clear()
+          } else {
+            pollingState.enqueue(newEvent)
+          }
+        }
        users.values.foreach(session => session.updatePlayer(event))
      case event: SessionClosed =>
        users.values.foreach(session => session.updatePlayer(event))
@@ -186,7 +217,9 @@ class GameLobby private(
  def getLogic: GameLogic = {
    logic
  }
-
+  def getPollingState: mutable.Queue[PollingEvents] = {
+    pollingState
+  }
  private def getPlayerBySession(userSession: UserSession): AbstractPlayer = {
    val playerOption = getMatch.totalplayers.find(_.id == userSession.id)
    if (playerOption.isEmpty) {
--- a/knockoutwhistweb/app/logic/game/PollingEvents.scala
+++ b/knockoutwhistweb/app/logic/game/PollingEvents.scala
@@ -0,0 +1,6 @@
+package logic.game
+
+enum PollingEvents {
+  case CardPlayed
+  case GameStarted
+}
--- a/knockoutwhistweb/app/views/ingame/ingame.scala.html
+++ b/knockoutwhistweb/app/views/ingame/ingame.scala.html
@@ -10,18 +10,18 @@
            <div class="row ms-4 me-4">
                <div class="col-4 mt-5 text-start">
                    <h4 class="fw-semibold mb-1">Current Player</h4>
-                    <p class="fs-5 text-primary">@gamelobby.getLogic.getCurrentPlayer.get.name</p>
+                    <p class="fs-5 text-primary" id="current-player-name">@gamelobby.getLogic.getCurrentPlayer.get.name</p>
                    @if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) {
                    <h4 class="fw-semibold mb-1">Next Player</h4>
                    @for(nextplayer <- gamelobby.getLogic.getPlayerQueue.get.duplicate()) {
-                    <p class="fs-5 text-primary">@nextplayer</p>
+                    <p class="fs-5 text-primary" id="next-player-name">@nextplayer</p>
                    }
                    }
                </div>

                <div class="col-4 text-center">

-                    <div class="score-table mt-5">
+                    <div class="score-table mt-5" id="score-table-body">
                        <h4 class="fw-bold mb-3 text-black">Tricks Won</h4>

                        <div class="d-flex justify-content-between score-header pb-1">
@@ -41,7 +41,7 @@
                        }

                    </div>
-                    <div class="d-flex justify-content-center g-3 mb-5">
+                    <div class="d-flex justify-content-center g-3 mb-5" id="trick-cards-container">
                        @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) {
                        <div class="col-auto">
                            <div class="card text-center shadow-sm border-0 bg-transparent" style="width: 7rem; backdrop-filter: blur(4px);">
@@ -58,10 +58,10 @@
                </div>
                <div class="col-4 mt-5 text-end">
                    <h4 class="fw-semibold mb-1">Trumpsuit</h4>
-                    <p class="fs-5 text-primary">@gamelobby.getLogic.getCurrentRound.get.trumpSuit</p>
+                    <p class="fs-5 text-primary" id="trumpsuit">@gamelobby.getLogic.getCurrentRound.get.trumpSuit</p>

                    <h5 class="fw-semibold mt-4 mb-1">First Card</h5>
-                    <div class="d-inline-block border rounded shadow-sm p-1 bg-light">
+                    <div class="d-inline-block border rounded shadow-sm p-1 bg-light" id="first-card-container">
                        @if(gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) {
                        @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get) width="80px"/>
                        } else {
@@ -85,4 +85,9 @@
        </div>
    </main>
 </div>
+<script>
+        document.addEventListener('DOMContentLoaded', () => {
+            pollForUpdates('@gamelobby.id');
+        });
+</script>
 }
--- a/knockoutwhistweb/app/views/lobby/lobby.scala.html
+++ b/knockoutwhistweb/app/views/lobby/lobby.scala.html
@@ -1,7 +1,7 @@
@(user: Option[model.users.User], gamelobby: logic.game.GameLobby)

@main("Lobby") {
-<main class="lobby-background vh-100">
+<main class="lobby-background vh-100" id="lobbybackground">
    <div class="container d-flex flex-column" style="height: calc(100vh - 1rem);">
        <div class="row">
            <div class="col">
@@ -66,4 +66,9 @@
        </div>
    </div>
 </main>
+<script>
+        document.addEventListener('DOMContentLoaded', () => {
+            pollForUpdates('@gamelobby.id');
+        });
+</script>
 }
--- a/knockoutwhistweb/app/views/main.scala.html
+++ b/knockoutwhistweb/app/views/main.scala.html
@@ -22,7 +22,6 @@
            @* And here's where we render the `Html` object containing
             * the page content. *@
            @content
-
        <script src="@routes.JavaScriptRoutingController.javascriptRoutes()" type="text/javascript"></script>
        <script src="@routes.Assets.versioned("javascripts/main.js")" type="text/javascript"></script>
        <script src="https://cdn.jsdelivr.net/npm/bootstrap@@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
--- a/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
+++ b/knockoutwhistweb/app/views/mainmenu/creategame.scala.html
@@ -3,7 +3,7 @@
@main("Create Game") {
@navbar(user)
 <main class="lobby-background flex-grow-1">
-    <div class="25 mx-auto">
+    <div class="w-25 mx-auto">
        <div class="mt-3">
            <label for="lobbyname" class="form-label">Lobby-Name</label>
            <input type="text" class="form-control" id="lobbyname" name="lobbyname" placeholder="Lobby 1" required>