feat: implement clock expiry scanning and handling for game records (#53)

Reviewed-on: #53

modules/core/src/main/scala/de/nowchess/chess/redis/GameRedisPublisher.scala

@@ -1,13 +1,12 @@
 package de.nowchess.chess.redis
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import de.nowchess.api.dto.{GameStateEventDto, GameWritebackEventDto}
-import de.nowchess.api.game.{CorrespondenceClockState, LiveClockState}
-import de.nowchess.chess.grpc.IoGrpcClientWrapper
-import de.nowchess.api.game.{DrawReason, GameResult, WinReason}
+import de.nowchess.api.dto.{GameStateDto, GameStateEventDto, GameWritebackEventDto}
+import de.nowchess.api.game.{CorrespondenceClockState, DrawReason, GameResult, LiveClockState, TimeControl, WinReason}
 import de.nowchess.api.board.Color
+import de.nowchess.chess.grpc.IoGrpcClientWrapper
 import de.nowchess.chess.observer.{GameEvent, Observer}
-import de.nowchess.chess.registry.GameRegistry
+import de.nowchess.chess.registry.{GameEntry, GameRegistry}
 import de.nowchess.chess.resource.GameDtoMapper
 import io.quarkus.redis.datasource.RedisDataSource
 import org.jboss.logging.Logger
@@ -26,61 +25,69 @@ class GameRedisPublisher(
     onGameOver: String => Unit,
 ) extends Observer:
 
+  def emitInitialWriteback(): Unit =
+    try
+      registry.get(gameId).foreach { entry =>
+        val dto = GameDtoMapper.toGameStateDto(entry, ioClient)
+        writebackEmit(objectMapper.writeValueAsString(buildWriteback(entry, dto)))
+      }
+    catch case ex: Exception => GameRedisPublisher.log.warnf(ex, "Failed to emit initial writeback for game %s", gameId)
+
   def onGameEvent(event: GameEvent): Unit =
     try
       GameRedisPublisher.log.debugf("Publishing game event for game %s", gameId)
       registry.get(gameId).foreach { entry =>
-        val dto  = GameDtoMapper.toGameStateDto(entry, ioClient)
-        val json = objectMapper.writeValueAsString(GameStateEventDto(dto))
-        redis.pubsub(classOf[String]).publish(s2cTopicName, json)
-
-        val clock = entry.engine.currentClockState
-        val wb = GameWritebackEventDto(
-          gameId = gameId,
-          fen = dto.fen,
-          pgn = dto.pgn,
-          moveCount = entry.engine.context.moves.size,
-          whiteId = entry.white.id.value,
-          whiteName = entry.white.displayName,
-          blackId = entry.black.id.value,
-          blackName = entry.black.displayName,
-          mode = entry.mode.toString,
-          resigned = entry.resigned,
-          limitSeconds = entry.engine.timeControl match {
-            case de.nowchess.api.game.TimeControl.Clock(l, _) => Some(l); case _ => None
-          },
-          incrementSeconds = entry.engine.timeControl match {
-            case de.nowchess.api.game.TimeControl.Clock(_, i) => Some(i); case _ => None
-          },
-          daysPerMove = entry.engine.timeControl match {
-            case de.nowchess.api.game.TimeControl.Correspondence(d) => Some(d); case _ => None
-          },
-          whiteRemainingMs = clock.collect { case c: LiveClockState => c.whiteRemainingMs },
-          blackRemainingMs = clock.collect { case c: LiveClockState => c.blackRemainingMs },
-          incrementMs = clock.collect { case c: LiveClockState => c.incrementMs },
-          clockLastTickAt = clock.collect { case c: LiveClockState => c.lastTickAt.toEpochMilli },
-          clockMoveDeadline = clock.collect { case c: CorrespondenceClockState => c.moveDeadline.toEpochMilli },
-          clockActiveColor = clock.map(_.activeColor.label.toLowerCase),
-          pendingDrawOffer = entry.engine.pendingDrawOfferBy.map(_.label.toLowerCase),
-          result = entry.engine.context.result.map {
-            case GameResult.Win(Color.White, _) => "white"
-            case GameResult.Win(Color.Black, _) => "black"
-            case GameResult.Draw(_)             => "draw"
-          },
-          terminationReason = entry.engine.context.result.map {
-            case GameResult.Win(_, WinReason.Checkmate)           => "checkmate"
-            case GameResult.Win(_, WinReason.Resignation)         => "resignation"
-            case GameResult.Win(_, WinReason.TimeControl)         => "timeout"
-            case GameResult.Draw(DrawReason.Stalemate)            => "stalemate"
-            case GameResult.Draw(DrawReason.InsufficientMaterial) => "insufficient_material"
-            case GameResult.Draw(DrawReason.FiftyMoveRule)        => "fifty_move"
-            case GameResult.Draw(DrawReason.ThreefoldRepetition)  => "repetition"
-            case GameResult.Draw(DrawReason.Agreement)            => "agreement"
-          },
-          redoStack = entry.engine.redoStackMoves.map(GameDtoMapper.moveToUci),
-          pendingTakebackRequest = entry.engine.pendingTakebackRequestBy.map(_.label.toLowerCase),
-        )
-        writebackEmit(objectMapper.writeValueAsString(wb))
+        val dto = GameDtoMapper.toGameStateDto(entry, ioClient)
+        redis.pubsub(classOf[String]).publish(s2cTopicName, objectMapper.writeValueAsString(GameStateEventDto(dto)))
+        writebackEmit(objectMapper.writeValueAsString(buildWriteback(entry, dto)))
         if entry.engine.context.result.isDefined then onGameOver(gameId)
       }
     catch case ex: Exception => GameRedisPublisher.log.warnf(ex, "Failed to publish game event for game %s", gameId)
+
+  private def buildWriteback(entry: GameEntry, dto: GameStateDto): GameWritebackEventDto =
+    val clock = entry.engine.currentClockState
+    GameWritebackEventDto(
+      gameId = gameId,
+      fen = dto.fen,
+      pgn = dto.pgn,
+      moveCount = entry.engine.context.moves.size,
+      whiteId = entry.white.id.value,
+      whiteName = entry.white.displayName,
+      blackId = entry.black.id.value,
+      blackName = entry.black.displayName,
+      mode = entry.mode.toString,
+      resigned = entry.resigned,
+      limitSeconds = entry.engine.timeControl match {
+        case TimeControl.Clock(l, _) => Some(l); case _ => None
+      },
+      incrementSeconds = entry.engine.timeControl match {
+        case TimeControl.Clock(_, i) => Some(i); case _ => None
+      },
+      daysPerMove = entry.engine.timeControl match {
+        case TimeControl.Correspondence(d) => Some(d); case _ => None
+      },
+      whiteRemainingMs = clock.collect { case c: LiveClockState => c.whiteRemainingMs },
+      blackRemainingMs = clock.collect { case c: LiveClockState => c.blackRemainingMs },
+      incrementMs = clock.collect { case c: LiveClockState => c.incrementMs },
+      clockLastTickAt = clock.collect { case c: LiveClockState => c.lastTickAt.toEpochMilli },
+      clockMoveDeadline = clock.collect { case c: CorrespondenceClockState => c.moveDeadline.toEpochMilli },
+      clockActiveColor = clock.map(_.activeColor.label.toLowerCase),
+      pendingDrawOffer = entry.engine.pendingDrawOfferBy.map(_.label.toLowerCase),
+      result = entry.engine.context.result.map {
+        case GameResult.Win(Color.White, _) => "white"
+        case GameResult.Win(Color.Black, _) => "black"
+        case GameResult.Draw(_)             => "draw"
+      },
+      terminationReason = entry.engine.context.result.map {
+        case GameResult.Win(_, WinReason.Checkmate)           => "checkmate"
+        case GameResult.Win(_, WinReason.Resignation)         => "resignation"
+        case GameResult.Win(_, WinReason.TimeControl)         => "timeout"
+        case GameResult.Draw(DrawReason.Stalemate)            => "stalemate"
+        case GameResult.Draw(DrawReason.InsufficientMaterial) => "insufficient_material"
+        case GameResult.Draw(DrawReason.FiftyMoveRule)        => "fifty_move"
+        case GameResult.Draw(DrawReason.ThreefoldRepetition)  => "repetition"
+        case GameResult.Draw(DrawReason.Agreement)            => "agreement"
+      },
+      redoStack = entry.engine.redoStackMoves.map(GameDtoMapper.moveToUci),
+      pendingTakebackRequest = entry.engine.pendingTakebackRequestBy.map(_.label.toLowerCase),
+    )

modules/core/src/main/scala/de/nowchess/chess/redis/GameRedisSubscriberManager.scala

@@ -13,6 +13,7 @@ import de.nowchess.chess.service.InstanceHeartbeatService
 import io.quarkus.redis.datasource.ReactiveRedisDataSource
 import io.quarkus.redis.datasource.RedisDataSource
 import io.quarkus.redis.datasource.pubsub.ReactivePubSubCommands
+import jakarta.annotation.PostConstruct
 import jakarta.annotation.PreDestroy
 import jakarta.enterprise.context.ApplicationScoped
 import jakarta.enterprise.inject.Instance
@@ -45,6 +46,30 @@ class GameRedisSubscriberManager:
   private val c2sListeners = new ConcurrentHashMap[String, ReactivePubSubCommands.ReactiveRedisSubscriber]()
   private val s2cObservers = new ConcurrentHashMap[String, Observer]()
 
+  // scalafix:off DisableSyntax.var
+  private var clockExpireSubscriber: Option[ReactivePubSubCommands.ReactiveRedisSubscriber] = None
+  // scalafix:on DisableSyntax.var
+
+  private def clockExpireChannel: String = s"${redisConfig.prefix}:game:clock:expire"
+
+  @PostConstruct
+  def subscribeClockExpiry(): Unit =
+    val handler: Consumer[String] = gameId => handleClockExpiry(gameId)
+    try
+      val subscriber = reactiveRedis
+        .pubsub(classOf[String])
+        .subscribe(clockExpireChannel, handler)
+        .await()
+        .atMost(java.time.Duration.ofSeconds(5))
+      clockExpireSubscriber = Some(subscriber)
+      log.infof("Subscribed to clock expiry channel %s", clockExpireChannel)
+    catch case ex: Exception => log.warnf(ex, "Failed to subscribe to clock expiry channel")
+
+  private def handleClockExpiry(gameId: String): Unit =
+    if !s2cObservers.containsKey(gameId) then
+      log.infof("Clock expired for game %s — loading engine to enforce timeout", gameId)
+      subscribeGame(gameId)
+
   private def c2sTopic(gameId: String): String =
     s"${redisConfig.prefix}:game:$gameId:c2s"
 
@@ -65,6 +90,7 @@ class GameRedisSubscriberManager:
     )
     s2cObservers.put(gameId, obs)
     registry.get(gameId).foreach(_.engine.subscribe(obs))
+    obs.emitInitialWriteback()
     heartbeatServiceOpt.foreach(_.addGameSubscription(gameId))
 
     val handler: Consumer[String] = msg => handleC2sMessage(gameId, msg)
@@ -156,5 +182,6 @@ class GameRedisSubscriberManager:
 
   @PreDestroy
   def cleanup(): Unit =
+    clockExpireSubscriber.foreach(_.unsubscribe(clockExpireChannel).await().indefinitely())
     c2sListeners.forEach((gameId, subscriber) => subscriber.unsubscribe(c2sTopic(gameId)).await().indefinitely())
     s2cObservers.forEach((gameId, obs) => registry.get(gameId).foreach(_.engine.unsubscribe(obs)))