Add timeout player

Author: ApmeM

TurnBase.KaNoBu.Godot/Presentation/UI.cs

@@ -150,7 +150,11 @@ public IPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBu
                 return new PlayerLoose<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>();
             case 1:
                 // Human
-                return field;
+                return new TimeoutPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(
+                    field, 
+                    async (delay) => await this.ToSignal(this.GetTree().CreateTimer(delay / 1000f), "timeout"),
+                    1000,
+                    60000);
             case 2:
                 // Computer Easy
                 var playerEasy = new KaNoBuPlayerEasy();
@@ -162,7 +166,12 @@ public IPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBu
             case 3:
                 // Remote
                 this.server.StartServer();
-                return new ServerPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(server, gameId);
+                var player = new ServerPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(server, gameId);
+                return new TimeoutPlayer<KaNoBuInitModel, KaNoBuInitResponseModel, KaNoBuMoveModel, KaNoBuMoveResponseModel, KaNoBuMoveNotificationModel>(
+                    player, 
+                    async (delay) => await this.ToSignal(this.GetTree().CreateTimer(delay / 1000f), "timeout"),
+                    1000,
+                    60000);
             case 4:
                 // Computer Medium
                 var playerMedium = new KaNoBuPlayerMedium();

TurnBase/Events/PassThroughListener.cs

@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+
+namespace TurnBase
+{
+    public class PassThroughListener<TMoveNotificationModel> : IGameEventListener<TMoveNotificationModel>
+    {
+        private readonly IGameEventListener<TMoveNotificationModel> listener;
+
+        public PassThroughListener(IGameEventListener<TMoveNotificationModel> listener)
+        {
+            this.listener = listener;
+        }
+
+        public void GameStarted()
+        {
+            this.listener.GameStarted();
+        }
+
+        public void GamePlayerDisconnected(int playerNumber)
+        {
+            this.listener.GamePlayerDisconnected(playerNumber);
+        }
+
+        public void GamePlayerInit(int playerNumber, string playerName)
+        {
+            this.listener.GamePlayerInit(playerNumber, playerName);
+        }
+
+        public void PlayersInitialized()
+        {
+            this.listener.PlayersInitialized();
+        }
+
+        public void GameLogCurrentField(IField field)
+        {
+            this.listener.GameLogCurrentField(field);
+        }
+
+        public void GamePlayerTurn(int playerNumber, TMoveNotificationModel notification)
+        {
+            this.listener.GamePlayerTurn(playerNumber, notification);
+        }
+
+        public void GameTurnFinished()
+        {
+            this.listener.GameTurnFinished();
+        }
+
+        public void GameFinished(List<int> winners)
+        {
+            this.listener.GameFinished(winners);
+        }
+    }
+}

TurnBase/Players/DelayedPlayer.cs

@@ -4,7 +4,8 @@
 
 namespace TurnBase.KaNoBu
 {
-    public class DelayedPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> : 
+    public class DelayedPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> :
+        PassThroughListener<TMoveNotificationModel>,
         IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel>
     {
         private IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> player;
@@ -13,10 +14,10 @@ public class DelayedPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResp
         private readonly int turnDelay;
 
         public DelayedPlayer(
-            IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> originalPlayer, 
+            IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> originalPlayer,
             Func<int, Task> delayAction,
-            int initDelay, 
-            int turnDelay)
+            int initDelay,
+            int turnDelay) : base(originalPlayer)
         {
             this.player = originalPlayer;
             this.delayAction = delayAction;
@@ -35,45 +36,5 @@ public async Task<MakeTurnResponseModel<TMoveResponseModel>> MakeTurn(MakeTurnMo
             await delayAction(this.turnDelay);
             return await this.player.MakeTurn(model);
         }
-
-        public void GameStarted()
-        {
-            this.player.GameStarted();
-        }
-
-        public void GamePlayerInit(int playerNumber, string playerName)
-        {
-            this.player.GamePlayerInit(playerNumber, playerName);
-        }
-
-        public void PlayersInitialized()
-        {
-            this.player.PlayersInitialized();
-        }
-        
-        public void GameLogCurrentField(IField field)
-        {
-            this.player.GameLogCurrentField(field);
-        }
-        
-        public void GamePlayerTurn(int playerNumber, TMoveNotificationModel notification)
-        {
-            this.player.GamePlayerTurn(playerNumber, notification);
-        }
-
-        public void GameTurnFinished()
-        {
-            this.player.GameTurnFinished();
-        }
-
-        public void GamePlayerDisconnected(int playerNumber)
-        {
-            this.player.GamePlayerDisconnected(playerNumber);
-        }
-
-        public void GameFinished(List<int> winners)
-        {
-            this.player.GameFinished(winners);
-        }
     }
 }

TurnBase/Players/TimeoutPlayer.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace TurnBase.KaNoBu
+{
+    public class TimeoutPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> :
+        PassThroughListener<TMoveNotificationModel>,
+        IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel>
+    {
+        private IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> player;
+        private readonly Func<int, Task> delayAction;
+        private readonly int initDelay;
+        private readonly int turnDelay;
+
+        public TimeoutPlayer(
+            IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> originalPlayer,
+            Func<int, Task> delayAction,
+            int initDelay,
+            int turnDelay) : base(originalPlayer)
+        {
+            this.player = originalPlayer;
+            this.delayAction = delayAction;
+            this.initDelay = initDelay;
+            this.turnDelay = turnDelay;
+        }
+
+        public async Task<InitResponseModel<TInitResponseModel>> Init(InitModel<TInitModel> model)
+        {
+            var task1 = delayAction(this.initDelay);
+            var task2 = this.player.Init(model);
+            var task = await Task.WhenAny(task1, task2);
+            if (task == task2)
+            {
+                return await task2;
+            }
+
+            return new InitResponseModel<TInitResponseModel>();
+        }
+
+        public async Task<MakeTurnResponseModel<TMoveResponseModel>> MakeTurn(MakeTurnModel<TMoveModel> model)
+        {
+            var task1 = delayAction(this.turnDelay);
+            var task2 = this.player.MakeTurn(model);
+            var task = await Task.WhenAny(task1, task2);
+            if (task == task2)
+            {
+                return await task2;
+            }
+            
+            return new MakeTurnResponseModel<TMoveResponseModel>();
+        }
+    }
+}