Remove all statics from WebClient

valkyrienyanko · valkyrienyanko · commit 7ea0a751992c · 2022-05-10T13:19:16.000-05:00
diff --git a/Scripts/Msc/UIPopupCreateLobby.cs b/Scripts/Msc/UIPopupCreateLobby.cs
@@ -104,7 +104,7 @@ private async void _on_Create_pressed()
             NetworkManager.StartServer(port, ValidatedMaxPlayerCount);
 
             var dummyClient = new ENetClient();
-            dummyClient.Start(WebClient.ExternalIp, port);
+            dummyClient.Start(NetworkManager.WebClient.ExternalIp, port);
             int attempts = 100;
             while (!dummyClient.IsConnected) 
             {
@@ -124,7 +124,7 @@ private async void _on_Create_pressed()
             NetworkManager.StartClient(localIp, port);
 
             SceneGameServersScript.AddServer(info);
-            if (WebClient.ConnectionAlive)
+            if (NetworkManager.WebClient.ConnectionAlive)
                 SceneGameServersScript.PostServer(info);
 
             await SceneGameServersScript.ClientConnect(async () => {
diff --git a/Scripts/Msc/UIPopupReportBug.cs b/Scripts/Msc/UIPopupReportBug.cs
@@ -22,7 +22,7 @@ private async void _on_Send_pressed()
             if (string.IsNullOrWhiteSpace(Description.Text))
                 return;
 
-            await WebClient.PostError(Error.Text, Description.Text);
+            await NetworkManager.WebClient.PostError(Error.Text, Description.Text);
         }
     }
 }
diff --git a/Scripts/Netcode/Common/Utils/WebClient.cs b/Scripts/Netcode/Common/Utils/WebClient.cs
@@ -8,15 +8,15 @@ namespace GodotModules.Netcode
 {
     public class WebClient : IDisposable
     {
-        public static HttpClient Client { get; set; }
-        public static bool ConnectionAlive { get; set; }
-        public static Task<WebServerResponse<LobbyListing[]>> TaskGetServers => WebClient.Get<LobbyListing[]>("servers/get");
-        public static string ExternalIp { get; set; }
-        private static int FailedPingAttempts { get; set; }
-        public static string WEB_SERVER_IP = "localhost:4000";
+        public HttpClient Client { get; set; }
+        public bool ConnectionAlive { get; set; }
+        public Task<WebServerResponse<LobbyListing[]>> TaskGetServers => Get<LobbyListing[]>("servers/get");
+        public string ExternalIp { get; set; }
+        private int FailedPingAttempts { get; set; }
+        public string WEB_SERVER_IP = "localhost:4000";
         private const int WEB_PING_INTERVAL = 10000;
-        private static bool LogExceptions = false;
-        public static Timer TimerPingMasterServer { get; set; }
+        private bool LogExceptions = false;
+        public Timer TimerPingMasterServer { get; set; }
 
         public WebClient()
         {
@@ -46,21 +46,21 @@ public WebClient()
             }
         }
 
-        public async static Task<WebServerResponse<string>> PostError(string errorText, string errorDescription)
+        public async Task<WebServerResponse<string>> PostError(string errorText, string errorDescription)
             => await PostAsync("errors/post", new Dictionary<string, string> {
                     { "error", errorText },
                     { "description", errorDescription }
                 });
 
-        public async static Task<WebServerResponse<string>> RemoveLobbyAsync() => await PostAsync("server/remove", DataExternalIp);
+        public async Task<WebServerResponse<string>> RemoveLobbyAsync() => await PostAsync("server/remove", DataExternalIp);
 
-        public async static Task<WebServerResponse<string>> RemoveLobbyPlayerAsync() => await PostAsync("servers/players/remove", DataExternalIp);
+        public async Task<WebServerResponse<string>> RemoveLobbyPlayerAsync() => await PostAsync("servers/players/remove", DataExternalIp);
 
-        public async static Task<WebServerResponse<string>> AddLobbyPlayerAsync() => await PostAsync("servers/players/add", DataExternalIp);
+        public async Task<WebServerResponse<string>> AddLobbyPlayerAsync() => await PostAsync("servers/players/add", DataExternalIp);
 
-        private static Dictionary<string, string> DataExternalIp => new() { { "Ip", ExternalIp } };
+        private Dictionary<string, string> DataExternalIp => new() { { "Ip", ExternalIp } };
 
-        public async static Task<WebServerResponse<string>> AddLobbyAsync(LobbyListing info)
+        public async Task<WebServerResponse<string>> AddLobbyAsync(LobbyListing info)
         {
             var values = new Dictionary<string, string>
             {
@@ -75,7 +75,7 @@ public async static Task<WebServerResponse<string>> AddLobbyAsync(LobbyListing i
             return await PostAsync("servers/add", values);
         }
 
-        private async static Task<WebServerResponse<string>> PostAsync(string path, Dictionary<string, string> values = null)
+        private async Task<WebServerResponse<string>> PostAsync(string path, Dictionary<string, string> values = null)
         {
             if (!ConnectionAlive)
                 return new() { Status = WebServerStatus.OFFLINE };
@@ -106,7 +106,7 @@ private async static Task<WebServerResponse<string>> PostAsync(string path, Dict
             }
         }
 
-        public static async Task UpdateIsAlive()
+        public async Task UpdateIsAlive()
         {
             try
             {
@@ -120,7 +120,7 @@ public static async Task UpdateIsAlive()
             }
         }
 
-        public static async Task<WebServerResponse<T>> Get<T>(string path)
+        public async Task<WebServerResponse<T>> Get<T>(string path)
         {
             if (!ConnectionAlive)
                 return new() { Status = WebServerStatus.OFFLINE };
@@ -153,7 +153,7 @@ public static async Task<WebServerResponse<T>> Get<T>(string path)
 
         public async void OnTimerPingMasterServerEvent(System.Object source, ElapsedEventArgs args)
         {
-            var res = await WebClient.PostAsync("servers/ping", new Dictionary<string, string> { { "Name", NetworkManager.CurrentLobby.Name } });
+            var res = await PostAsync("servers/ping", new Dictionary<string, string> { { "Name", NetworkManager.CurrentLobby.Name } });
             if (res.Status == WebServerStatus.ERROR)
             {
                 FailedPingAttempts++;
diff --git a/Scripts/Scenes/Game Servers/SceneGameServers.cs b/Scripts/Scenes/Game Servers/SceneGameServers.cs
@@ -62,17 +62,17 @@ public override async void _Ready()
                 GameManager.SpawnPopupMessage(message);
             }
 
-            await WebClient.UpdateIsAlive();
+            await NetworkManager.WebClient.UpdateIsAlive();
 
-            if (WebClient.ConnectionAlive)
+            if (NetworkManager.WebClient.ConnectionAlive)
                 await ListServers();
         }
 
         public override void _Input(InputEvent @event)
         {
             SceneManager.EscapePressed(async () =>
             {
-                WebClient.Client.CancelPendingRequests();
+                NetworkManager.WebClient.Client.CancelPendingRequests();
 
                 if (NetworkManager.GameClient != null)
                     NetworkManager.GameClient.Stop();
@@ -122,7 +122,7 @@ public async Task ListServers()
             GettingServers = true;
             UIGameServersNavBtns.BtnRefresh.Disabled = true;
 
-            var res = await WebClient.TaskGetServers;
+            var res = await NetworkManager.WebClient.TaskGetServers;
 
             if (!SceneManager.InGameServers())
                 return;
@@ -197,7 +197,7 @@ public async Task ListServers()
 
         public async void PostServer(LobbyListing info)
         {
-            await WebClient.AddLobbyAsync(info);
+            await NetworkManager.WebClient.AddLobbyAsync(info);
         }
 
         private void _on_Control_resized()
diff --git a/Scripts/Scenes/Game Servers/UIGameServersNavBtns.cs b/Scripts/Scenes/Game Servers/UIGameServersNavBtns.cs
@@ -43,7 +43,7 @@ private async void _on_Refresh_pressed()
 
             SceneGameServersScript.ClearServers();
 
-            if (WebClient.ConnectionAlive)
+            if (NetworkManager.WebClient.ConnectionAlive)
                 await SceneGameServersScript.ListServers();
         }
 
diff --git a/Scripts/Scenes/Lobby/SceneLobby.cs b/Scripts/Scenes/Lobby/SceneLobby.cs
@@ -60,15 +60,15 @@ public override async void _Input(InputEvent @event)
 
                 if (NetworkManager.IsHost)
                 {
-                    WebClient.Client.CancelPendingRequests();
-                    WebClient.TimerPingMasterServer.Stop();
+                    NetworkManager.WebClient.Client.CancelPendingRequests();
+                    NetworkManager.WebClient.TimerPingMasterServer.Stop();
 
                     if (NetworkManager.GameServer != null)
                         NetworkManager.GameServer.Stop();
 
                     NetworkManager.IsHost = false;
 
-                    await WebClient.RemoveLobbyAsync();
+                    await NetworkManager.WebClient.RemoveLobbyAsync();
                 }
             }
         }
@@ -82,12 +82,12 @@ private async void TimerCountdownCallback()
 
                 if (NetworkManager.IsHost)
                 {
-                    WebClient.TimerPingMasterServer.Stop();
+                    NetworkManager.WebClient.TimerPingMasterServer.Stop();
 
                     // tell everyone game has started
                     await NetworkManager.GameClient.Send(ClientPacketOpcode.Lobby, new CPacketLobby(LobbyOpcode.LobbyGameStart));
 
-                    await WebClient.RemoveLobbyAsync();
+                    await NetworkManager.WebClient.RemoveLobbyAsync();
                 }
             }
         }
@@ -107,7 +107,7 @@ public async void AddPlayer(uint id, string name)
             player.SetId(id);
 
             if (NetworkManager.IsHost)
-                await WebClient.AddLobbyPlayerAsync();
+                await NetworkManager.WebClient.AddLobbyPlayerAsync();
         }
 
         public async void RemovePlayer(uint id)
@@ -120,7 +120,7 @@ public async void RemovePlayer(uint id)
             UIPlayers.Remove(id);
 
             if (NetworkManager.IsHost)
-                await WebClient.RemoveLobbyPlayerAsync();
+                await NetworkManager.WebClient.RemoveLobbyPlayerAsync();
         }
 
         public void SetReady(uint id, bool ready)
diff --git a/Scripts/Scenes/Menu/UIOptions.cs b/Scripts/Scenes/Menu/UIOptions.cs
@@ -49,7 +49,7 @@ private void SetupUI()
             SliderSFX.Value = Options.VolumeSFX;
             VSync.Pressed = Options.VSync;
             InputUsername.Text = Options.OnlineUsername;
-            InputWebServer.Text = WebClient.WEB_SERVER_IP;
+            InputWebServer.Text = NetworkManager.WebClient.WEB_SERVER_IP;
         }
 
         private void SetupFullscreenOptions()
@@ -107,7 +107,7 @@ private void _on_OnlineUsername_text_changed(string text)
 
         private void _on_WebServerIp_text_changed(string text)
         {
-            WebClient.WEB_SERVER_IP = text;
+            NetworkManager.WebClient.WEB_SERVER_IP = text;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ private async void _on_Send_pressed()`
`22`	`22`	`if (string.IsNullOrWhiteSpace(Description.Text))`
`23`	`23`	`return;`
`24`	`24`
`25`		`- await WebClient.PostError(Error.Text, Description.Text);`
	`25`	`+ await NetworkManager.WebClient.PostError(Error.Text, Description.Text);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,15 @@ namespace GodotModules.Netcode`
`8`	`8`	`{`
`9`	`9`	`public class WebClient : IDisposable`
`10`	`10`	`{`
`11`		`- public static HttpClient Client { get; set; }`
`12`		`- public static bool ConnectionAlive { get; set; }`
`13`		`- public static Task<WebServerResponse<LobbyListing[]>> TaskGetServers => WebClient.Get<LobbyListing[]>("servers/get");`
`14`		`- public static string ExternalIp { get; set; }`
`15`		`- private static int FailedPingAttempts { get; set; }`
`16`		`- public static string WEB_SERVER_IP = "localhost:4000";`
	`11`	`+ public HttpClient Client { get; set; }`
	`12`	`+ public bool ConnectionAlive { get; set; }`
	`13`	`+ public Task<WebServerResponse<LobbyListing[]>> TaskGetServers => Get<LobbyListing[]>("servers/get");`
	`14`	`+ public string ExternalIp { get; set; }`
	`15`	`+ private int FailedPingAttempts { get; set; }`
	`16`	`+ public string WEB_SERVER_IP = "localhost:4000";`
`17`	`17`	`private const int WEB_PING_INTERVAL = 10000;`
`18`		`- private static bool LogExceptions = false;`
`19`		`- public static Timer TimerPingMasterServer { get; set; }`
	`18`	`+ private bool LogExceptions = false;`
	`19`	`+ public Timer TimerPingMasterServer { get; set; }`
`20`	`20`
`21`	`21`	`public WebClient()`
`22`	`22`	`{`
`@@ -46,21 +46,21 @@ public WebClient()`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- public async static Task<WebServerResponse<string>> PostError(string errorText, string errorDescription)`
	`49`	`+ public async Task<WebServerResponse<string>> PostError(string errorText, string errorDescription)`
`50`	`50`	`=> await PostAsync("errors/post", new Dictionary<string, string> {`
`51`	`51`	`{ "error", errorText },`
`52`	`52`	`{ "description", errorDescription }`
`53`	`53`	`});`
`54`	`54`
`55`		`- public async static Task<WebServerResponse<string>> RemoveLobbyAsync() => await PostAsync("server/remove", DataExternalIp);`
	`55`	`+ public async Task<WebServerResponse<string>> RemoveLobbyAsync() => await PostAsync("server/remove", DataExternalIp);`
`56`	`56`
`57`		`- public async static Task<WebServerResponse<string>> RemoveLobbyPlayerAsync() => await PostAsync("servers/players/remove", DataExternalIp);`
	`57`	`+ public async Task<WebServerResponse<string>> RemoveLobbyPlayerAsync() => await PostAsync("servers/players/remove", DataExternalIp);`
`58`	`58`
`59`		`- public async static Task<WebServerResponse<string>> AddLobbyPlayerAsync() => await PostAsync("servers/players/add", DataExternalIp);`
	`59`	`+ public async Task<WebServerResponse<string>> AddLobbyPlayerAsync() => await PostAsync("servers/players/add", DataExternalIp);`
`60`	`60`
`61`		`- private static Dictionary<string, string> DataExternalIp => new() { { "Ip", ExternalIp } };`
	`61`	`+ private Dictionary<string, string> DataExternalIp => new() { { "Ip", ExternalIp } };`
`62`	`62`
`63`		`- public async static Task<WebServerResponse<string>> AddLobbyAsync(LobbyListing info)`
	`63`	`+ public async Task<WebServerResponse<string>> AddLobbyAsync(LobbyListing info)`
`64`	`64`	`{`
`65`	`65`	`var values = new Dictionary<string, string>`
`66`	`66`	`{`
`@@ -75,7 +75,7 @@ public async static Task<WebServerResponse<string>> AddLobbyAsync(LobbyListing i`
`75`	`75`	`return await PostAsync("servers/add", values);`
`76`	`76`	`}`
`77`	`77`
`78`		`- private async static Task<WebServerResponse<string>> PostAsync(string path, Dictionary<string, string> values = null)`
	`78`	`+ private async Task<WebServerResponse<string>> PostAsync(string path, Dictionary<string, string> values = null)`
`79`	`79`	`{`
`80`	`80`	`if (!ConnectionAlive)`
`81`	`81`	`return new() { Status = WebServerStatus.OFFLINE };`
`@@ -106,7 +106,7 @@ private async static Task<WebServerResponse<string>> PostAsync(string path, Dict`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`- public static async Task UpdateIsAlive()`
	`109`	`+ public async Task UpdateIsAlive()`
`110`	`110`	`{`
`111`	`111`	`try`
`112`	`112`	`{`
`@@ -120,7 +120,7 @@ public static async Task UpdateIsAlive()`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`- public static async Task<WebServerResponse<T>> Get<T>(string path)`
	`123`	`+ public async Task<WebServerResponse<T>> Get<T>(string path)`
`124`	`124`	`{`
`125`	`125`	`if (!ConnectionAlive)`
`126`	`126`	`return new() { Status = WebServerStatus.OFFLINE };`
`@@ -153,7 +153,7 @@ public static async Task<WebServerResponse<T>> Get<T>(string path)`
`153`	`153`
`154`	`154`	`public async void OnTimerPingMasterServerEvent(System.Object source, ElapsedEventArgs args)`
`155`	`155`	`{`
`156`		`- var res = await WebClient.PostAsync("servers/ping", new Dictionary<string, string> { { "Name", NetworkManager.CurrentLobby.Name } });`
	`156`	`+ var res = await PostAsync("servers/ping", new Dictionary<string, string> { { "Name", NetworkManager.CurrentLobby.Name } });`
`157`	`157`	`if (res.Status == WebServerStatus.ERROR)`
`158`	`158`	`{`
`159`	`159`	`FailedPingAttempts++;`
Original file line number	Diff line number	Diff line change
`@@ -62,17 +62,17 @@ public override async void _Ready()`
`62`	`62`	`GameManager.SpawnPopupMessage(message);`
`63`	`63`	`}`
`64`	`64`
`65`		`- await WebClient.UpdateIsAlive();`
	`65`	`+ await NetworkManager.WebClient.UpdateIsAlive();`
`66`	`66`
`67`		`- if (WebClient.ConnectionAlive)`
	`67`	`+ if (NetworkManager.WebClient.ConnectionAlive)`
`68`	`68`	`await ListServers();`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public override void _Input(InputEvent @event)`
`72`	`72`	`{`
`73`	`73`	`SceneManager.EscapePressed(async () =>`
`74`	`74`	`{`
`75`		`- WebClient.Client.CancelPendingRequests();`
	`75`	`+ NetworkManager.WebClient.Client.CancelPendingRequests();`
`76`	`76`
`77`	`77`	`if (NetworkManager.GameClient != null)`
`78`	`78`	`NetworkManager.GameClient.Stop();`
`@@ -122,7 +122,7 @@ public async Task ListServers()`
`122`	`122`	`GettingServers = true;`
`123`	`123`	`UIGameServersNavBtns.BtnRefresh.Disabled = true;`
`124`	`124`
`125`		`- var res = await WebClient.TaskGetServers;`
	`125`	`+ var res = await NetworkManager.WebClient.TaskGetServers;`
`126`	`126`
`127`	`127`	`if (!SceneManager.InGameServers())`
`128`	`128`	`return;`
`@@ -197,7 +197,7 @@ public async Task ListServers()`
`197`	`197`
`198`	`198`	`public async void PostServer(LobbyListing info)`
`199`	`199`	`{`
`200`		`- await WebClient.AddLobbyAsync(info);`
	`200`	`+ await NetworkManager.WebClient.AddLobbyAsync(info);`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`private void _on_Control_resized()`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ private async void _on_Refresh_pressed()`
`43`	`43`
`44`	`44`	`SceneGameServersScript.ClearServers();`
`45`	`45`
`46`		`- if (WebClient.ConnectionAlive)`
	`46`	`+ if (NetworkManager.WebClient.ConnectionAlive)`
`47`	`47`	`await SceneGameServersScript.ListServers();`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -60,15 +60,15 @@ public override async void _Input(InputEvent @event)`
`60`	`60`
`61`	`61`	`if (NetworkManager.IsHost)`
`62`	`62`	`{`
`63`		`- WebClient.Client.CancelPendingRequests();`
`64`		`- WebClient.TimerPingMasterServer.Stop();`
	`63`	`+ NetworkManager.WebClient.Client.CancelPendingRequests();`
	`64`	`+ NetworkManager.WebClient.TimerPingMasterServer.Stop();`
`65`	`65`
`66`	`66`	`if (NetworkManager.GameServer != null)`
`67`	`67`	`NetworkManager.GameServer.Stop();`
`68`	`68`
`69`	`69`	`NetworkManager.IsHost = false;`
`70`	`70`
`71`		`- await WebClient.RemoveLobbyAsync();`
	`71`	`+ await NetworkManager.WebClient.RemoveLobbyAsync();`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -82,12 +82,12 @@ private async void TimerCountdownCallback()`
`82`	`82`
`83`	`83`	`if (NetworkManager.IsHost)`
`84`	`84`	`{`
`85`		`- WebClient.TimerPingMasterServer.Stop();`
	`85`	`+ NetworkManager.WebClient.TimerPingMasterServer.Stop();`
`86`	`86`
`87`	`87`	`// tell everyone game has started`
`88`	`88`	`await NetworkManager.GameClient.Send(ClientPacketOpcode.Lobby, new CPacketLobby(LobbyOpcode.LobbyGameStart));`
`89`	`89`
`90`		`- await WebClient.RemoveLobbyAsync();`
	`90`	`+ await NetworkManager.WebClient.RemoveLobbyAsync();`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
`@@ -107,7 +107,7 @@ public async void AddPlayer(uint id, string name)`
`107`	`107`	`player.SetId(id);`
`108`	`108`
`109`	`109`	`if (NetworkManager.IsHost)`
`110`		`- await WebClient.AddLobbyPlayerAsync();`
	`110`	`+ await NetworkManager.WebClient.AddLobbyPlayerAsync();`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public async void RemovePlayer(uint id)`
`@@ -120,7 +120,7 @@ public async void RemovePlayer(uint id)`
`120`	`120`	`UIPlayers.Remove(id);`
`121`	`121`
`122`	`122`	`if (NetworkManager.IsHost)`
`123`		`- await WebClient.RemoveLobbyPlayerAsync();`
	`123`	`+ await NetworkManager.WebClient.RemoveLobbyPlayerAsync();`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`public void SetReady(uint id, bool ready)`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ private void SetupUI()`
`49`	`49`	`SliderSFX.Value = Options.VolumeSFX;`
`50`	`50`	`VSync.Pressed = Options.VSync;`
`51`	`51`	`InputUsername.Text = Options.OnlineUsername;`
`52`		`- InputWebServer.Text = WebClient.WEB_SERVER_IP;`
	`52`	`+ InputWebServer.Text = NetworkManager.WebClient.WEB_SERVER_IP;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private void SetupFullscreenOptions()`
`@@ -107,7 +107,7 @@ private void _on_OnlineUsername_text_changed(string text)`
`107`	`107`
`108`	`108`	`private void _on_WebServerIp_text_changed(string text)`
`109`	`109`	`{`
`110`		`- WebClient.WEB_SERVER_IP = text;`
	`110`	`+ NetworkManager.WebClient.WEB_SERVER_IP = text;`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`}`