Add disconnect (not working yet)

Author: ApmeM

TurnBase.KaNoBu.Godot/Presentation/Main.cs

@@ -93,6 +93,7 @@ private void EndGame(string gameId)
             return;
         }
 
+        gameField.Game.Disconnect(gameField);
         gameField.QueueFree();
 
         this.infinityGameField.Visible = true;

TurnBase/Events/MultipleGameLogListener.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace TurnBase
@@ -12,6 +11,11 @@ public void Add(IGameEventListener<TMoveNotificationModel> gameLogListener)
             this.gameLogListeners.Add(gameLogListener);
         }
 
+        public void Remove(IGameEventListener<TMoveNotificationModel> gameLogListener)
+        {
+            this.gameLogListeners.Remove(gameLogListener);
+        }
+
         public void GameStarted()
         {
             this.gameLogListeners.ForEach(a => a.GameStarted());

TurnBase/Games/Game.cs

@@ -5,7 +5,7 @@
 
 namespace TurnBase
 {
-    public class Game<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> : 
+    public class Game<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> :
         IGame<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel>
     {
         private class PlayerData
@@ -47,7 +47,7 @@ public AddPlayerStatus AddPlayer(IPlayer<TInitModel, TInitResponseModel, TMoveMo
             }
 
             this.players.Add(
-                new PlayerFailProtection<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel>(player), 
+                new PlayerFailProtection<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel>(player),
                 new PlayerData { IsInGame = true, PlayerNumber = this.players.Count });
             return AddPlayerStatus.OK;
         }
@@ -94,12 +94,7 @@ async Task SingleAction(IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMov
                     return;
                 }
 
-                //TODO: Handle disconnect player in memorization and game field.
-                var playerData = this.players[p];
-                playerData.IsInGame = false;
-                this.rules.PlayerDisconnected(this.mainField, playerData.PlayerNumber);
-                this.players.Keys.ToList().ForEach(a => a.GamePlayerDisconnected(playerData.PlayerNumber));
-                this.gameLogListeners.GamePlayerDisconnected(playerData.PlayerNumber);
+                this.Disconnect(p);
             }
 
             return Task.WhenAll(
@@ -218,5 +213,20 @@ private async Task<bool> MovePlayer(IPlayer<TInitModel, TInitResponseModel, TMov
             this.gameLogListeners.GameLogCurrentField(this.mainField.copyForPlayer(-1));
             return true;
         }
+
+        public void Disconnect(IGameEventListener<TMoveNotificationModel> listener)
+        {
+            //TODO: Handle disconnect player in memorization and game field.
+            if (listener is IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> player && this.players.ContainsKey(player))
+            {
+                var playerData = this.players[player];
+                playerData.IsInGame = false;
+                this.rules.PlayerDisconnected(this.mainField, playerData.PlayerNumber);
+                this.players.Keys.ToList().ForEach(a => a.GamePlayerDisconnected(playerData.PlayerNumber));
+                this.gameLogListeners.GamePlayerDisconnected(playerData.PlayerNumber);
+            }
+            
+            this.gameLogListeners.Remove(listener);
+        }
     }
 }

TurnBase/Games/IGame.cs

@@ -14,5 +14,7 @@ public interface IGame<TInitModel, TInitResponseModel, TMoveModel, TMoveResponse
         AddPlayerStatus AddPlayer(IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> player);
 
         void AddGameLogListener(IGameEventListener<TMoveNotificationModel> gameLogListener);
+        
+        void Disconnect(IGameEventListener<TMoveNotificationModel> player);
     }
 }

TurnBase/Games/RemoteGame.cs

@@ -24,6 +24,7 @@ public class RemoteGame<TInitModel, TInitResponseModel, TMoveModel, TMoveRespons
         public string GameId { get; private set; }
         private IPlayer<TInitModel, TInitResponseModel, TMoveModel, TMoveResponseModel, TMoveNotificationModel> player;
         private MultipleGameLogListener<TMoveNotificationModel> gameLogListeners = new MultipleGameLogListener<TMoveNotificationModel>();
+        private bool connected;
 
         public RemoteGame(IClient client, string serverUrl, string gameId)
         {
@@ -56,7 +57,9 @@ public async Task Play()
 
             var playerIdQueryString = new Dictionary<string, object> { { "playerId", playerId } };
 
-            while (true)
+            this.connected = true;
+
+            while (this.connected)
             {
                 var result = await this.client.SendAction(serverUrl, "wait-action", playerIdQueryString);
 
@@ -125,5 +128,10 @@ public async Task Play()
                 }
             }
         }
+
+        public void Disconnect(IGameEventListener<TMoveNotificationModel> player)
+        {
+            this.connected = false;
+        }
     }
 }

TurnBase/Games/ReplayGame.cs

@@ -29,8 +29,9 @@ public AddPlayerStatus AddPlayer(IPlayer<TInitModel, TInitResponseModel, TMoveMo
 
         public async Task Play()
         {
-            foreach (var gameEvent in events)
+            for (var i = 0; i < events.Count; i++)
             {
+                var gameEvent = events[i];
                 if (gameEvent is GameStartedCommunicationModel gameStarted)
                 {
                     this.gameLogListeners.GameStarted();
@@ -70,5 +71,10 @@ public async Task Play()
                 }
             }
         }
+
+        public void Disconnect(IGameEventListener<TMoveNotificationModel> player)
+        {
+            this.events.Clear();
+        }
     }
 }