only do stuff with master server if alive

Author: valkyrienyanko

Scripts/Msc/UIPopupCreateLobby.cs

@@ -96,7 +96,8 @@ private async void _on_Create_pressed()
             };
 
             SceneGameServersScript.AddServer(info);
-            SceneGameServersScript.PostServer(info);
+            if (WebClient.ConnectionAlive)
+                SceneGameServersScript.PostServer(info);
             SceneLobby.CurrentLobby = info;
 
             Hide();

Scripts/Netcode/Server/ENetServer.cs

@@ -119,7 +119,7 @@ protected virtual void ServerCmds()
         private async Task ENetThreadWorker(ushort port, int maxClients)
         {
             Thread.CurrentThread.Name = "Server";
-            if (SceneLobby.CurrentLobby.Public)
+            if (SceneLobby.CurrentLobby.Public && WebClient.ConnectionAlive)
                 WebClient.TimerPingMasterServer.Start();
 
             MaxPlayers = (ushort)maxClients;

Scripts/Netcode/Web/WebClient.cs

@@ -12,6 +12,7 @@ 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 { get; set; }
         public static string ExternalIp { get; set; }
         private static int FailedPingAttempts { get; set; }
@@ -31,6 +32,16 @@ public WebClient()
             TimerPingMasterServer = new(WebClient.WEB_PING_INTERVAL);
             TimerPingMasterServer.AutoReset = true;
             TimerPingMasterServer.Elapsed += new(OnTimerPingMasterServerEvent);
+
+            try 
+            {
+                ExternalIp = new System.Net.WebClient().DownloadString("http://icanhazip.com").Replace("\\r\\n", "").Replace("\\n", "").Trim();
+            }
+            catch (Exception e)
+            {
+                ExternalIp = "";
+                System.Console.WriteLine($"Failed to get external IP {e.Message}\n{e.StackTrace}");
+            }
         }
 
         public async static Task<WebServerResponse<string>> Post(string path, Dictionary<string, string> values)
@@ -61,6 +72,20 @@ public async static Task<WebServerResponse<string>> Post(string path, Dictionary
             }
         }
 
+        public static async Task UpdateIsAlive()
+        {
+            try 
+            {
+                var response = await Client.GetAsync($"http://{WEB_SERVER_IP}/api/ping");
+                await response.Content.ReadAsStringAsync();
+                ConnectionAlive = true;
+            }
+            catch (Exception)
+            {
+                ConnectionAlive = false;
+            }
+        }
+
         public static async Task<WebServerResponse<T>> Get<T>(string path)
         {
             try
@@ -91,7 +116,7 @@ public static async Task<WebServerResponse<T>> Get<T>(string path)
 
         public async void OnTimerPingMasterServerEvent(System.Object source, ElapsedEventArgs args)
         {
-            var res = await WebClient.Post("ping", new Dictionary<string, string> { { "Name", SceneLobby.CurrentLobby.Name } });
+            var res = await WebClient.Post("servers/ping", new Dictionary<string, string> { { "Name", SceneLobby.CurrentLobby.Name } });
             if (res.Status == WebServerStatus.ERROR)
             {
                 FailedPingAttempts++;
@@ -104,12 +129,6 @@ public async void OnTimerPingMasterServerEvent(System.Object source, ElapsedEven
             FailedPingAttempts = 0; // reset failed ping attempts if a ping gets through
         }
 
-        public static void GetExternalIp()
-        {
-            string externalIpString = new System.Net.WebClient().DownloadString("http://icanhazip.com").Replace("\\r\\n", "").Replace("\\n", "").Trim();
-            ExternalIp = IPAddress.Parse(externalIpString).ToString();
-        }
-
         public void Dispose()
         {
             TimerPingMasterServer.Dispose();

Scripts/Scenes/Game Servers/UIGameServersNavBtns.cs

@@ -42,7 +42,9 @@ private async void _on_Refresh_pressed()
                 return;
 
             SceneGameServersScript.ClearServers();
-            await SceneGameServersScript.ListServers();
+
+            if (WebClient.ConnectionAlive)
+                await SceneGameServersScript.ListServers();
         }
 
         private void _on_Direct_Connect_pressed()