disconnect opcode thread safety

Author: valkyrienyanko

Scripts/Netcode/Client/ENetClient.cs

@@ -16,7 +16,6 @@ public class ENetClient : IDisposable
         public int PingMs { get; set;}
         public bool WasPingReceived { get; set; }
         public ConcurrentQueue<ENetCmd> ENetCmds { get; set; }
-        public DisconnectOpcode DisconnectOpcode { get; set; }
         public bool IsConnected { get => Interlocked.Read(ref Connected) == 1; }
         public bool IsRunning { get => Interlocked.Read(ref Running) == 1; }
         public bool IsENetThreadRunning { get => Interlocked.Read(ref ENetThreadRunning) == 1; }
@@ -33,7 +32,6 @@ public ENetClient()
         {
             Outgoing = new();
             ENetCmds = new();
-            DisconnectOpcode = DisconnectOpcode.Disconnected;
         }
 
         public async Task Send(ClientPacketOpcode opcode, APacket data = null, PacketFlags flags = PacketFlags.Reliable)

Scripts/Netcode/Client/GameClient.cs

@@ -36,8 +36,7 @@ private void HandlePeerLeave(DisconnectOpcode opcode)
             ConnectingToLobby = false;
             Disconnected = true;
             Connected = 0;
-            DisconnectOpcode = (DisconnectOpcode)opcode;
-            NetworkManager.GodotCmds.Enqueue(new GodotCmd(GodotOpcode.ChangeScene, "GameServers"));
+            NetworkManager.GodotCmds.Enqueue(new GodotCmd(GodotOpcode.Disconnect, opcode));
             CancelTokenSource.Cancel();
         }
     }

Scripts/Netcode/Common/_Opcodes.cs

@@ -87,7 +87,8 @@ public enum GodotOpcode
         LogMessage,
         LogError,
         ChangeScene,
-        PopupMessage
+        PopupMessage,
+        Disconnect
     }
 
     public class ENetCmd

Scripts/Scenes/Game Servers/SceneGameServers.cs

@@ -33,7 +33,7 @@ public override async void _Ready()
                 GameClient.Disconnected = false;
                 var message = "Disconnected";
 
-                switch (NetworkManager.GameClient.DisconnectOpcode) // THREAD SAFETY VIOLATION
+                switch (NetworkManager.DisconnectOpcode)
                 {
                     case DisconnectOpcode.Timeout:
                         message = "Timed out from server";

Scripts/Scenes/Main/NetworkManager.cs

@@ -18,6 +18,7 @@ public class NetworkManager : Node
         public static NetworkManager Instance { get; set; }
         private static CancellationTokenSource ClientConnectingTokenSource { get; set; }
 
+        public static DisconnectOpcode DisconnectOpcode { get; set; }
         public static uint PeerId { get; set; } // this clients peer id (grabbed from server at some point)
         public static bool IsHost { get; set; }
 
@@ -97,6 +98,11 @@ public override async void _Process(float delta)
                     case GodotOpcode.ChangeScene:
                         await SceneManager.ChangeScene($"{cmd.Data}");
                         break;
+
+                    case GodotOpcode.Disconnect:
+                        DisconnectOpcode = (DisconnectOpcode)cmd.Data;
+                        await SceneManager.ChangeScene("GameServers");
+                        break;
                 }
             }
         }