Battle metrics Update

DiscordPlayerCountBot/Attributes/AttributeHelper.cs

@@ -0,0 +1,14 @@
+using System.Linq;
+
+namespace DiscordPlayerCountBot.Attributes
+{
+    public static class AttributeHelper
+    {
+        public static string GetNameFromAttribute(object obj)
+        {
+            var nameAttribute = obj.GetType().GetCustomAttributes(true).Where(attribute => attribute.GetType() == typeof(NameAttribute)).Cast<NameAttribute>().FirstOrDefault();
+            var label = nameAttribute?.Name ?? obj.GetType().Name;
+            return label;
+        }
+    }
+}

DiscordPlayerCountBot/Attributes/NameAttribute.cs

@@ -2,7 +2,7 @@
 
 namespace DiscordPlayerCountBot.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class)]
     public class NameAttribute : Attribute
     {
         public string Name { get; set; }

DiscordPlayerCountBot/Bot/Bot.cs

@@ -1,5 +1,6 @@
 using Discord;
 using Discord.WebSocket;
+using DiscordPlayerCountBot;
 using DiscordPlayerCountBot.Enum;
 using DiscordPlayerCountBot.Http;
 using DiscordPlayerCountBot.Providers;
@@ -51,17 +52,11 @@ public async Task StartAsync()
         {
             if (Information.Address.Contains("hostname") || Information.Address.Contains("localhost"))
             {
-                string[] splitAddr = Information.Address.Split(":");
-                string address = await GetHostAddress();
-                string port = splitAddr[1].ToLower();
-                Information.Address = address + ":" + port;
+                Information.Address = await AddressHelper.ResolveAddress(Information.Address);
             }
 
             Logger.Info($"[Bot] - Loaded {Information.Name} at address and port: {Information.Address}, {Information.ProviderType}");
-
-            await DiscordClient.LoginAsync(TokenType.Bot, Information.Token);
-            await DiscordClient.SetGameAsync($"Starting: {Information.Address}");
-            await DiscordClient.StartAsync();
+            await DiscordClient.LoginAndStartAsync(Information.Token, Information.Address);
         }
 
         public async Task StopAsync()
@@ -123,27 +118,5 @@ public async Task UpdateAsync()
                 }
             }
         }
-
-        public async Task<string> GetHostAddress()
-        {
-            string publicIPAddress = string.Empty;
-            var httpClient = new HttpExecuter(new HttpClient());
-
-
-            try
-            {
-                var ipAddress = await httpClient.GET<object, string>("http://ifconfig.me");
-
-                if (string.IsNullOrEmpty(ipAddress))
-                    throw new ApplicationException("IP Address cannot be null. Host failed to resolve address.");
-
-                return ipAddress;
-            }
-            catch (WebException ex)
-            {
-                Logger.Error($"[Bot] - Error Reaching ifconfig.me: {ex.Status}", ex);
-                throw ex;
-            }
-        }
     }
 }

DiscordPlayerCountBot/Bot/BotInformation.cs

@@ -14,7 +14,7 @@ public class BotInformation
         public string Address { get; set; }
 
         [JsonProperty]
-        public string? Token { get; set; }
+        public string Token { get; set; }
 
         [JsonProperty]
         public int Status { get; set; }

DiscordPlayerCountBot/Data/Minecraft/MinecraftServer.cs

@@ -17,7 +17,7 @@ public class MinecraftServer
         public MinecraftMotd Motd { get; set; }
 
         [JsonProperty("players")]
-        public MinecraftPlayerInfo Players { get; set; }
+        public MinecraftPlayerInfo? Players { get; set; }
 
         [JsonProperty("version")]
         public string? Version { get; set; }

DiscordPlayerCountBot/DiscordClient.cs

@@ -0,0 +1,16 @@
+using Discord;
+using Discord.WebSocket;
+using System.Threading.Tasks;
+
+namespace DiscordPlayerCountBot
+{
+    public static class DiscordClient
+    {
+        public static async Task LoginAndStartAsync(this DiscordSocketClient client, string token, string address)
+        {
+            await client.LoginAsync(TokenType.Bot, token);
+            await client.SetGameAsync($"Starting: {address}");
+            await client.StartAsync();
+        }
+    }
+}

DiscordPlayerCountBot/Http/AddressHelper.cs

@@ -0,0 +1,35 @@
+using log4net.Repository.Hierarchy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualBasic;
+
+namespace DiscordPlayerCountBot.Http
+{
+    public static class AddressHelper
+    {
+        public static async Task<string> GetHostAddress()
+        {
+            var publicIPAddress = string.Empty;
+            var httpClient = new HttpExecuter();
+            var ipAddress = await httpClient.GET<object, string>("http://ifconfig.me");
+
+            if (string.IsNullOrEmpty(ipAddress))
+                throw new ApplicationException("IP Address cannot be null. Host failed to resolve address.");
+
+            return ipAddress;
+        }
+
+        public static async Task<string> ResolveAddress(string address)
+        {
+            var splitAddr = address.Split(":");
+            var resolvedAddress = await GetHostAddress();
+            var port = splitAddr[1];
+            return resolvedAddress + ":" + port;
+        }
+    }
+}

DiscordPlayerCountBot/Http/HttpExecuter.cs

@@ -12,9 +12,9 @@ public class HttpExecuter : IHttpExecuter, IDisposable
     {
         public readonly HttpClient HttpClient;
 
-        public HttpExecuter(HttpClient httpClient)
+        public HttpExecuter()
         {
-            HttpClient = httpClient;
+            HttpClient = new HttpClient();
         }
 
         public void Dispose()

DiscordPlayerCountBot/Providers/Base/ServerInformationProvider.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
+using System.Net;
 using System.Threading.Tasks;
 using log4net;
 using PlayerCountBot;
+using DiscordPlayerCountBot.Attributes;
 
 namespace DiscordPlayerCountBot.Providers.Base
 {
@@ -11,21 +14,79 @@ public abstract class ServerInformationProvider : IServerInformationProvider
         public bool WasLastExecutionAFailure { get; set; } = false;
         public Exception? LastException { get; set; }
         protected ILog Logger { get; set; }
+        public readonly string Label;
 
         public ServerInformationProvider()
         {
             Logger = LogManager.GetLogger(GetType());
+            Label = AttributeHelper.GetNameFromAttribute(this);
         }
 
         public abstract Task<GenericServerInformation?> GetServerInformation(BotInformation information, Dictionary<string, string> applicationVariables);
         protected void HandleLastException(BotInformation information)
         {
             if (WasLastExecutionAFailure)
             {
-                Logger.Info($"[{GetType().Name}] - Bot for Address: {information.Address} successfully fetched data after failure.");
+
+                Logger.Info($"[{Label}] - Bot named: {information.Name} at address: {information.Address} successfully fetched data after failure.");
                 LastException = null;
                 WasLastExecutionAFailure = false;
             }
         }
+
+        protected void HandleException(Exception e)
+        {
+            if (e.Message == LastException?.Message)
+                return;
+
+            WasLastExecutionAFailure = true;
+            LastException = e;
+
+            if (e is TaskCanceledException canceledException)
+            {
+                Logger.Error($"[{Label}] - Update task was canceled likely because of system timeout.");
+                return;
+            }
+
+            if (e is KeyNotFoundException keyNotFoundException)
+            {
+                Logger.Error($"[{Label}] - SteamAPIKey is missing from Application variable configuration.");
+                return;
+            }
+
+            if (e is HttpRequestException requestException)
+            {
+                Logger.Error($"[{Label}] - The {Label} has failed to respond. {requestException.StatusCode}");
+                return;
+            }
+
+            if (e is WebException webException)
+            {
+                if (webException.Status == WebExceptionStatus.Timeout)
+                {
+                    Logger.Error($"[{Label}] - Speaking with {Label} has timed out.");
+                    return;
+                }
+                else if (webException.Status == WebExceptionStatus.ConnectFailure)
+                {
+                    Logger.Error($"[{Label}] - Could not connect to {Label}.");
+                    return;
+                }
+                else
+                {
+                    Logger.Error($"[{Label}] - There was an error speaking with your {Label} server.", e);
+                    return;
+                }
+            }
+
+            if (e is ApplicationException applicationException)
+            {
+                Logger.Error($"[{Label}] - {applicationException.Message}");
+                return;
+            }
+
+            Logger.Error($"[{Label}] - There was an error speaking with {Label}.", e);
+            throw e;
+        }
     }
 }

DiscordPlayerCountBot/Providers/BattleMetricsProvider.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
+using DiscordPlayerCountBot.Attributes;
 using DiscordPlayerCountBot.Providers.Base;
 using DiscordPlayerCountBot.Services;
 using PlayerCountBot;
 
 namespace DiscordPlayerCountBot.Providers
 {
+    [Name("BattleMetrics")]
     public class BattleMetricsProvider : ServerInformationProvider
     {
         public async override Task<GenericServerInformation?> GetServerInformation(BotInformation information, Dictionary<string, string> applicationVariables)
@@ -36,51 +36,8 @@ public class BattleMetricsProvider : ServerInformationProvider
             }
             catch (Exception e)
             {
-                if (e.Message == LastException?.Message)
-                    return null;
-
-                WasLastExecutionAFailure = true;
-                LastException = e;
-
-                if (e is KeyNotFoundException keyNotFoundException)
-                {
-                    Logger.Error($"[BattleMetricsProvider] - BattleMetricKey is missing from Application variable configuration.");
-                    return null;
-                }
-
-                if (e is HttpRequestException requestException)
-                {
-                    Logger.Error($"[BattleMetricsProvider] - The BattleMetric host has failed to respond.");
-                    return null;
-                }
-
-                if (e is WebException webException)
-                {
-                    if (webException.Status == WebExceptionStatus.Timeout)
-                    {
-                        Logger.Error($"[BattleMetricsProvider] - Speaking with BattleMetric has timed out.");
-                        return null;
-                    }
-                    else if (webException.Status == WebExceptionStatus.ConnectFailure)
-                    {
-                        Logger.Error($"[BattleMetricsProvider] - Could not connect to BattleMetric.");
-                        return null;
-                    }
-                    else
-                    {
-                        Logger.Error($"[BattleMetricsProvider] - There was an error speaking with your BattleMetric server.", e);
-                        return null;
-                    }
-                }
-
-                if (e is ApplicationException applicationException)
-                {
-                    Logger.Error($"[BattleMetricsProvider] - {applicationException.Message}");
-                    return null;
-                }
-
-                Logger.Error($"[BattleMetricsProvider] - There was an error speaking with BattleMetric.", e);
-                throw;
+                HandleException(e);
+                return null;
             }
         }
     }

DiscordPlayerCountBot/Providers/CFXProvider.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
+using DiscordPlayerCountBot.Attributes;
 using DiscordPlayerCountBot.Providers.Base;
 using DiscordPlayerCountBot.Services;
 using PlayerCountBot;
 
 namespace DiscordPlayerCountBot.Providers
 {
+    [Name("CFX")]
     public class CFXProvider : ServerInformationProvider
     {
         public async override Task<GenericServerInformation?> GetServerInformation(BotInformation information, Dictionary<string, string> applicationVariables)
@@ -39,45 +39,8 @@ public class CFXProvider : ServerInformationProvider
             }
             catch (Exception e)
             {
-                if (e.Message == LastException?.Message)
-                    return null;
-
-                WasLastExecutionAFailure = true;
-                LastException = e;
-
-                if (e is HttpRequestException requestException)
-                {
-                    Logger.Error($"[CFXProvider] - The CFX host has failed to respond. {requestException.StatusCode}");
-                    return null;
-                }
-
-                if (e is WebException webException)
-                {
-                    if (webException.Status == WebExceptionStatus.Timeout)
-                    {
-                        Logger.Error($"[CFXProvider] - Speaking with CFX has timed out.");
-                        return null;
-                    }
-                    else if (webException.Status == WebExceptionStatus.ConnectFailure)
-                    {
-                        Logger.Error($"[CFXProvider] - Could not connect to CFX.");
-                        return null;
-                    }
-                    else
-                    {
-                        Logger.Error($"[CFXProvider] - There was an error speaking with your CFX server.", e);
-                        return null;
-                    }
-                }
-
-                if (e is ApplicationException applicationException)
-                {
-                    Logger.Error($"[CFXProvider] - {applicationException.Message}");
-                    return null;
-                }
-
-                Logger.Error($"[CFXProvider] - There was an error speaking with CFX.", e);
-                throw;
+                HandleException(e);
+                return null;
             }
         }
     }