Fix #71

valkyrienyanko · valkyrienyanko · commit bc16a9c3e6f6 · 2022-05-06T22:35:10.000-05:00
diff --git a/Scripts/Netcode/Client/ENetClient.cs b/Scripts/Netcode/Client/ENetClient.cs
@@ -8,7 +8,7 @@
 
 namespace GodotModules.Netcode.Client
 {
-    public class ENetClient : IDisposable
+    public class ENetClient
     {
         public static readonly Dictionary<ServerPacketOpcode, APacketServer> HandlePacket = ReflectionUtils.LoadInstances<ServerPacketOpcode, APacketServer>("SPacket");
 
@@ -73,8 +73,6 @@ public async void Start(string ip, ushort port)
         /// </summary>
         public void Stop() => ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToDisconnect));
 
-        public void CancelTask() => ENetCmds.Enqueue(new ENetCmd(ENetOpcode.CancelTask));
-
         public void Log(object obj) => Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);
 
         /// <summary>
@@ -135,9 +133,6 @@ private async Task ENetThreadWorker(string ip, ushort port)
                         case ENetOpcode.ClientWantsToDisconnect:
                             peer.Disconnect(0);
                             break;
-                        case ENetOpcode.CancelTask:
-                            CancelTokenSource.Cancel();
-                            break;
                     }
                 }
 
@@ -211,11 +206,6 @@ private async Task ENetThreadWorker(string ip, ushort port)
         }
 
         private bool ConcurrentQueuesWorking() => ENetCmds.Count != 0 || Outgoing.Count != 0;
-
-        public void Dispose()
-        {
-            CancelTokenSource.Dispose();
-        }
     }
 
     public struct PacketHandleData 
diff --git a/Scripts/Netcode/Client/GameClient.cs b/Scripts/Netcode/Client/GameClient.cs
@@ -6,7 +6,7 @@ public class GameClient : ENetClient
     {
         public static bool ConnectingToLobby { get; set; }
         public static bool Disconnected { get; set; }
-        
+
         public Dictionary<uint, string> Players { get; set; }
 
         public GameClient()
@@ -38,7 +38,10 @@ private void HandlePeerLeave(DisconnectOpcode opcode)
             Connected = 0;
             NetworkManager.GodotCmds.Enqueue(new GodotCmd(GodotOpcode.Disconnect, opcode));
             if (CancelTokenSource != null)
+            {
                 CancelTokenSource.Cancel();
+                CancelTokenSource.Dispose();
+            }
         }
     }
 }
diff --git a/Scripts/Netcode/Common/_Opcodes.cs b/Scripts/Netcode/Common/_Opcodes.cs
@@ -115,8 +115,6 @@ public enum ENetOpcode
         StopServer,
         RestartServer,
         ClientWantsToExitApp,
-        ClientWantsToDisconnect,
-        CancelTask,
-        Dispose
+        ClientWantsToDisconnect
     }
 }
diff --git a/Scripts/Netcode/Server/ENetServer.cs b/Scripts/Netcode/Server/ENetServer.cs
@@ -7,7 +7,7 @@
 
 namespace GodotModules.Netcode.Server
 {
-    public abstract class ENetServer : IDisposable
+    public abstract class ENetServer
     {
         public bool HasSomeoneConnected { get => Interlocked.Read(ref SomeoneConnected) == 1; }
         public bool IsRunning { get => Interlocked.Read(ref Running) == 1; }
@@ -261,8 +261,5 @@ private void Send(ServerPacket gamePacket, Peer peer)
         }
 
         private bool ConcurrentQueuesWorking() => ENetCmds.Count != 0 || Outgoing.Count != 0;
-
-        public virtual void Dispose()
-        { }
     }
 }
diff --git a/Scripts/Netcode/Server/GameServer.cs b/Scripts/Netcode/Server/GameServer.cs
@@ -100,14 +100,6 @@ protected override void ServerCmds()
                         CTS.Cancel();
                         KickAll(DisconnectOpcode.Stopping);
                         break;
-
-                    case ENetOpcode.Dispose:
-                        CTS.Dispose();
-                        EmitClientTransforms.Stop();
-                        EmitClientTransforms.Dispose();
-                        ServerSimulation.Stop();
-                        ServerSimulation.Dispose();
-                        break;
                 }
             }
         }
@@ -128,6 +120,11 @@ protected override void Timeout(Event netEvent)
 
         protected override void Stopped()
         {
+            CTS.Dispose();
+            EmitClientTransforms.Stop();
+            EmitClientTransforms.Dispose();
+            ServerSimulation.Stop();
+            ServerSimulation.Dispose();
         }
 
         private void HandlePlayerLeave(uint id)
@@ -189,11 +186,5 @@ public void SendToOtherPlayers(uint id, ServerPacketOpcode opcode, APacket data
             else
                 Send(opcode, data, flags, otherPlayers);
         }
-
-        public override void Dispose()
-        {
-            base.Dispose();
-            ENetCmds.Enqueue(new ENetCmd(ENetOpcode.Dispose));
-        }
     }
 }
diff --git a/Scripts/Scenes/Game Servers/SceneGameServers.cs b/Scripts/Scenes/Game Servers/SceneGameServers.cs
@@ -75,7 +75,7 @@ public override void _Input(InputEvent @event)
                 WebClient.Client.CancelPendingRequests();
 
                 if (NetworkManager.GameClient != null)
-                    NetworkManager.GameClient.CancelTask();
+                    NetworkManager.GameClient.Stop();
 
                 await SceneManager.ChangeScene("Menu");
             });
diff --git a/Scripts/Scenes/Main/GameManager.cs b/Scripts/Scenes/Main/GameManager.cs
@@ -48,7 +48,6 @@ private static async Task ExitCleanup()
                     if (NetworkManager.GameServer.IsRunning)
                     {
                         NetworkManager.GameServer.ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToExitApp));
-                        NetworkManager.GameServer.Dispose();
                         NetworkManager.GameServer.Stop();
 
                         while (NetworkManager.GameServer.IsRunning) 
@@ -61,7 +60,6 @@ private static async Task ExitCleanup()
                 if (NetworkManager.GameClient != null)
                     if (NetworkManager.GameClient.IsRunning)
                     {
-                        NetworkManager.GameClient.Dispose();
                         NetworkManager.GameClient.Stop();
 
                         while (NetworkManager.GameClient.IsRunning) 
diff --git a/Scripts/Scenes/Main/NetworkManager.cs b/Scripts/Scenes/Main/NetworkManager.cs
@@ -108,16 +108,12 @@ public override async void _Process(float delta)
 
         public static void StartClient(string ip, ushort port)
         {
-            if (GameClient != null)
-                GameClient.Dispose();
             GameClient = new GameClient();
             GameClient.Start(ip, port);
         }
 
         public static async void StartServer(ushort port, int maxClients)
         {
-            if (GameServer != null)
-                GameServer.Dispose();
             GameServer = new GameServer();
             await GameServer.Start(port, maxClients);
         }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace GodotModules.Netcode.Client`
`10`	`10`	`{`
`11`		`- public class ENetClient : IDisposable`
	`11`	`+ public class ENetClient`
`12`	`12`	`{`
`13`	`13`	`public static readonly Dictionary<ServerPacketOpcode, APacketServer> HandlePacket = ReflectionUtils.LoadInstances<ServerPacketOpcode, APacketServer>("SPacket");`
`14`	`14`
`@@ -73,8 +73,6 @@ public async void Start(string ip, ushort port)`
`73`	`73`	`/// </summary>`
`74`	`74`	`public void Stop() => ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToDisconnect));`
`75`	`75`
`76`		`- public void CancelTask() => ENetCmds.Enqueue(new ENetCmd(ENetOpcode.CancelTask));`
`77`		`-`
`78`	`76`	`public void Log(object obj) => Logger.Log($"[Client]: {obj}", ConsoleColor.Yellow);`
`79`	`77`
`80`	`78`	`/// <summary>`
`@@ -135,9 +133,6 @@ private async Task ENetThreadWorker(string ip, ushort port)`
`135`	`133`	`case ENetOpcode.ClientWantsToDisconnect:`
`136`	`134`	`peer.Disconnect(0);`
`137`	`135`	`break;`
`138`		`- case ENetOpcode.CancelTask:`
`139`		`- CancelTokenSource.Cancel();`
`140`		`- break;`
`141`	`136`	`}`
`142`	`137`	`}`
`143`	`138`
`@@ -211,11 +206,6 @@ private async Task ENetThreadWorker(string ip, ushort port)`
`211`	`206`	`}`
`212`	`207`
`213`	`208`	`private bool ConcurrentQueuesWorking() => ENetCmds.Count != 0 \|\| Outgoing.Count != 0;`
`214`		`-`
`215`		`- public void Dispose()`
`216`		`- {`
`217`		`- CancelTokenSource.Dispose();`
`218`		`- }`
`219`	`209`	`}`
`220`	`210`
`221`	`211`	`public struct PacketHandleData`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ public class GameClient : ENetClient`
`6`	`6`	`{`
`7`	`7`	`public static bool ConnectingToLobby { get; set; }`
`8`	`8`	`public static bool Disconnected { get; set; }`
`9`		`-`
	`9`	`+`
`10`	`10`	`public Dictionary<uint, string> Players { get; set; }`
`11`	`11`
`12`	`12`	`public GameClient()`
`@@ -38,7 +38,10 @@ private void HandlePeerLeave(DisconnectOpcode opcode)`
`38`	`38`	`Connected = 0;`
`39`	`39`	`NetworkManager.GodotCmds.Enqueue(new GodotCmd(GodotOpcode.Disconnect, opcode));`
`40`	`40`	`if (CancelTokenSource != null)`
	`41`	`+ {`
`41`	`42`	`CancelTokenSource.Cancel();`
	`43`	`+ CancelTokenSource.Dispose();`
	`44`	`+ }`
`42`	`45`	`}`
`43`	`46`	`}`
`44`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,6 @@ public enum ENetOpcode`
`115`	`115`	`StopServer,`
`116`	`116`	`RestartServer,`
`117`	`117`	`ClientWantsToExitApp,`
`118`		`- ClientWantsToDisconnect,`
`119`		`- CancelTask,`
`120`		`- Dispose`
	`118`	`+ ClientWantsToDisconnect`
`121`	`119`	`}`
`122`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace GodotModules.Netcode.Server`
`9`	`9`	`{`
`10`		`- public abstract class ENetServer : IDisposable`
	`10`	`+ public abstract class ENetServer`
`11`	`11`	`{`
`12`	`12`	`public bool HasSomeoneConnected { get => Interlocked.Read(ref SomeoneConnected) == 1; }`
`13`	`13`	`public bool IsRunning { get => Interlocked.Read(ref Running) == 1; }`
`@@ -261,8 +261,5 @@ private void Send(ServerPacket gamePacket, Peer peer)`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`private bool ConcurrentQueuesWorking() => ENetCmds.Count != 0 \|\| Outgoing.Count != 0;`
`264`		`-`
`265`		`- public virtual void Dispose()`
`266`		`- { }`
`267`	`264`	`}`
`268`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,6 @@ protected override void ServerCmds()`
`100`	`100`	`CTS.Cancel();`
`101`	`101`	`KickAll(DisconnectOpcode.Stopping);`
`102`	`102`	`break;`
`103`		`-`
`104`		`- case ENetOpcode.Dispose:`
`105`		`- CTS.Dispose();`
`106`		`- EmitClientTransforms.Stop();`
`107`		`- EmitClientTransforms.Dispose();`
`108`		`- ServerSimulation.Stop();`
`109`		`- ServerSimulation.Dispose();`
`110`		`- break;`
`111`	`103`	`}`
`112`	`104`	`}`
`113`	`105`	`}`
`@@ -128,6 +120,11 @@ protected override void Timeout(Event netEvent)`
`128`	`120`
`129`	`121`	`protected override void Stopped()`
`130`	`122`	`{`
	`123`	`+ CTS.Dispose();`
	`124`	`+ EmitClientTransforms.Stop();`
	`125`	`+ EmitClientTransforms.Dispose();`
	`126`	`+ ServerSimulation.Stop();`
	`127`	`+ ServerSimulation.Dispose();`
`131`	`128`	`}`
`132`	`129`
`133`	`130`	`private void HandlePlayerLeave(uint id)`
`@@ -189,11 +186,5 @@ public void SendToOtherPlayers(uint id, ServerPacketOpcode opcode, APacket data`
`189`	`186`	`else`
`190`	`187`	`Send(opcode, data, flags, otherPlayers);`
`191`	`188`	`}`
`192`		`-`
`193`		`- public override void Dispose()`
`194`		`- {`
`195`		`- base.Dispose();`
`196`		`- ENetCmds.Enqueue(new ENetCmd(ENetOpcode.Dispose));`
`197`		`- }`
`198`	`189`	`}`
`199`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ private static async Task ExitCleanup()`
`48`	`48`	`if (NetworkManager.GameServer.IsRunning)`
`49`	`49`	`{`
`50`	`50`	`NetworkManager.GameServer.ENetCmds.Enqueue(new ENetCmd(ENetOpcode.ClientWantsToExitApp));`
`51`		`- NetworkManager.GameServer.Dispose();`
`52`	`51`	`NetworkManager.GameServer.Stop();`
`53`	`52`
`54`	`53`	`while (NetworkManager.GameServer.IsRunning)`
`@@ -61,7 +60,6 @@ private static async Task ExitCleanup()`
`61`	`60`	`if (NetworkManager.GameClient != null)`
`62`	`61`	`if (NetworkManager.GameClient.IsRunning)`
`63`	`62`	`{`
`64`		`- NetworkManager.GameClient.Dispose();`
`65`	`63`	`NetworkManager.GameClient.Stop();`
`66`	`64`
`67`	`65`	`while (NetworkManager.GameClient.IsRunning)`
Original file line number	Diff line number	Diff line change
`@@ -108,16 +108,12 @@ public override async void _Process(float delta)`
`108`	`108`
`109`	`109`	`public static void StartClient(string ip, ushort port)`
`110`	`110`	`{`
`111`		`- if (GameClient != null)`
`112`		`- GameClient.Dispose();`
`113`	`111`	`GameClient = new GameClient();`
`114`	`112`	`GameClient.Start(ip, port);`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`public static async void StartServer(ushort port, int maxClients)`
`118`	`116`	`{`
`119`		`- if (GameServer != null)`
`120`		`- GameServer.Dispose();`
`121`	`117`	`GameServer = new GameServer();`
`122`	`118`	`await GameServer.Start(port, maxClients);`
`123`	`119`	`}`