Update Protocols

opengsq · Jan 26, 2024 · 1a20b60 · 1a20b60
1 parent 81b2700
commit 1a20b60
Show file tree

Hide file tree

Showing 30 changed files with 96 additions and 87 deletions.
diff --git a/OpenGSQ/Protocols/EOS.cs b/OpenGSQ/Protocols/EOS.cs
@@ -29,11 +29,11 @@ public class EOS : ProtocolBase
         /// </summary>
         /// <param name="host">The host name of the server.</param>
         /// <param name="port">The port number of the server.</param>
-        /// <param name="timeout">The timeout value for the connection, in milliseconds. Default is 5000.</param>
         /// <param name="deploymentId">The deployment ID for the application.</param>
         /// <param name="accessToken">The access token for the application.</param>
+        /// <param name="timeout">The timeout value for the connection, in milliseconds. Default is 5000.</param>
         /// <exception cref="ArgumentException">Thrown when either deploymentId or accessToken is null.</exception>
-        public EOS(string host, int port, int timeout = 5000, string deploymentId = null, string accessToken = null) : base(host, port, timeout)
+        public EOS(string host, int port, string deploymentId,string accessToken, int timeout = 5000) : base(host, port, timeout)
         {
             if (deploymentId == null || accessToken == null)
             {
@@ -82,7 +82,12 @@ public static async Task<string> GetAccessTokenAsync(string clientId, string cli
 
                 var data = await response.Content.ReadFromJsonAsync<Dictionary<string, object>>();
 
-                return data["access_token"].ToString();
+                if (data == null || !data.TryGetValue("access_token", out var accessToken))
+                {
+                    throw new Exception($"Failed to get access token from {url}");
+                }
+
+                return accessToken.ToString()!;
             }
         }
 
@@ -126,7 +131,12 @@ public static async Task<string> GetExternalAuthTokenAsync(string clientId, stri
 
                     var data = await response.Content.ReadFromJsonAsync<Dictionary<string, object>>();
 
-                    return data["access_token"].ToString();
+                    if (data == null || !data.TryGetValue("access_token", out var accessToken))
+                    {
+                        throw new Exception($"Failed to get access token from {url}");
+                    }
+
+                    return accessToken.ToString()!;
                 }
             }
 
@@ -171,7 +181,7 @@ public static async Task<Matchmaking> GetMatchmakingAsync(string deploymentId, s
 
                 var responseData = await response.Content.ReadFromJsonAsync<Matchmaking>();
 
-                return responseData;
+                return responseData ?? throw new Exception($"Failed to load data from {url}"); ;
             }
         }
 

diff --git a/OpenGSQ/Protocols/FiveM.cs b/OpenGSQ/Protocols/FiveM.cs
@@ -33,7 +33,7 @@ private async Task<T> GetAsync<T>(string filename)
                 HttpResponseMessage response = await client.GetAsync(url);
                 response.EnsureSuccessStatusCode();
 
-                return await response.Content.ReadFromJsonAsync<T>();
+                return await response.Content.ReadFromJsonAsync<T>() ?? throw new Exception($"Failed to load data from {url}");
             }
         }
 

diff --git a/OpenGSQ/Protocols/Scum.cs b/OpenGSQ/Protocols/Scum.cs
@@ -42,7 +42,7 @@ public Scum(string host, int port, int timeout = 5000) : base(host, port, timeou
         /// <returns>The status of the server.</returns>
         /// <exception cref="TimeoutException">Thrown when the operation times out.</exception>
         /// <exception cref="ServerNotFoundException">Thrown when the server is not found in the list of master servers.</exception>
-        public async Task<Status> GetStatus(List<Status> masterServers = null)
+        public async Task<Status> GetStatus(List<Status>? masterServers = null)
         {
             var ip = await GetIPAddress();
 

diff --git a/OpenGSQ/RconProtocols/SourceRcon.cs b/OpenGSQ/RconProtocols/SourceRcon.cs
@@ -13,7 +13,7 @@ namespace OpenGSQ.RconProtocols
     /// </summary>
     public class SourceRcon : ProtocolBase, IDisposable
     {
-        private System.Net.Sockets.TcpClient _tcpClient;
+        private System.Net.Sockets.TcpClient? _tcpClient;
 
         /// <inheritdoc/>
         public override string FullName => "Source RCON Protocol";

diff --git a/OpenGSQ/Responses/ASE/Player.cs b/OpenGSQ/Responses/ASE/Player.cs
@@ -8,17 +8,17 @@ public class Player
         /// <summary>
         /// Gets or sets the name of the player.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the team of the player.
         /// </summary>
-        public string Team { get; set; }
+        public string Team { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the skin of the player.
         /// </summary>
-        public string Skin { get; set; }
+        public string Skin { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the score of the player.

diff --git a/OpenGSQ/Responses/ASE/Status.cs b/OpenGSQ/Responses/ASE/Status.cs
@@ -10,7 +10,7 @@ public class Status
         /// <summary>
         /// Gets or sets the name of the game.
         /// </summary>
-        public string GameName { get; set; }
+        public string GameName { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the port of the game.
@@ -20,22 +20,22 @@ public class Status
         /// <summary>
         /// Gets or sets the host name of the game.
         /// </summary>
-        public string Hostname { get; set; }
+        public string Hostname { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the type of the game.
         /// </summary>
-        public string GameType { get; set; }
+        public string GameType { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the map of the game.
         /// </summary>
-        public string Map { get; set; }
+        public string Map { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the version of the game.
         /// </summary>
-        public string Version { get; set; }
+        public string Version { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets a value indicating whether a password is required.
@@ -55,11 +55,11 @@ public class Status
         /// <summary>
         /// Gets or sets the rules of the game.
         /// </summary>
-        public Dictionary<string, string> Rules { get; set; }
+        public Dictionary<string, string> Rules { get; set; } = new Dictionary<string, string>();
 
         /// <summary>
         /// Gets or sets the players in the game.
         /// </summary>
-        public List<Player> Players { get; set; }
+        public List<Player> Players { get; set; } = new List<Player>();
     }
 }
diff --git a/OpenGSQ/Responses/Battlefield/Info.cs b/OpenGSQ/Responses/Battlefield/Info.cs
@@ -10,7 +10,7 @@ public class Info
         /// <summary>
         /// Gets or sets the hostname of the game server.
         /// </summary>
-        public string Hostname { get; set; }
+        public string Hostname { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the number of players in the game.
@@ -25,12 +25,12 @@ public class Info
         /// <summary>
         /// Gets or sets the type of the game.
         /// </summary>
-        public string GameType { get; set; }
+        public string GameType { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the current map of the game.
         /// </summary>
-        public string Map { get; set; }
+        public string Map { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the number of rounds played.
@@ -45,7 +45,7 @@ public class Info
         /// <summary>
         /// Gets or sets the list of teams.
         /// </summary>
-        public List<float> Teams { get; set; }
+        public List<float> Teams { get; set; } = new List<float>();
 
         /// <summary>
         /// Gets or sets the target score.
@@ -55,7 +55,7 @@ public class Info
         /// <summary>
         /// Gets or sets the status of the game.
         /// </summary>
-        public string Status { get; set; }
+        public string Status { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets a value indicating whether the game is ranked.
@@ -87,17 +87,17 @@ public class Info
         /// <summary>
         /// Gets or sets the game mod. This property is optional.
         /// </summary>
-        public string Mod { get; set; }
+        public string Mod { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the IP port of the game server. This property is optional.
         /// </summary>
-        public string IpPort { get; set; }
+        public string IpPort { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the version of PunkBuster. This property is optional.
         /// </summary>
-        public string PunkBusterVersion { get; set; }
+        public string? PunkBusterVersion { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the join queue is enabled. This property is optional.
@@ -107,17 +107,17 @@ public class Info
         /// <summary>
         /// Gets or sets the region of the game server. This property is optional.
         /// </summary>
-        public string Region { get; set; }
+        public string? Region { get; set; }
 
         /// <summary>
         /// Gets or sets the ping site of the game server. This property is optional.
         /// </summary>
-        public string PingSite { get; set; }
+        public string? PingSite { get; set; }
 
         /// <summary>
         /// Gets or sets the country of the game server. This property is optional.
         /// </summary>
-        public string Country { get; set; }
+        public string? Country { get; set; }
 
         /// <summary>
         /// Gets or sets the number of players in the Blaze game state. This property is optional.
@@ -127,7 +127,7 @@ public class Info
         /// <summary>
         /// Gets or sets the Blaze game state. This property is optional.
         /// </summary>
-        public string BlazeGameState { get; set; }
+        public string? BlazeGameState { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether quick match is enabled. This property is optional.

diff --git a/OpenGSQ/Responses/Battlefield/VersionInfo.cs b/OpenGSQ/Responses/Battlefield/VersionInfo.cs
@@ -8,11 +8,11 @@ public class VersionInfo
         /// <summary>
         /// Gets or sets the mod of the game.
         /// </summary>
-        public string Mod { get; set; }
+        public string Mod { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the version of the mod.
         /// </summary>
-        public string Version { get; set; }
+        public string Version { get; set; } = string.Empty;
     }
 }
diff --git a/OpenGSQ/Responses/EOS/Matchmaking.cs b/OpenGSQ/Responses/EOS/Matchmaking.cs
@@ -11,7 +11,7 @@ public class Matchmaking
         /// Gets or sets the list of sessions returned by the matchmaking request.
         /// Each session is represented as a dictionary of string keys and object values.
         /// </summary>
-        public List<Dictionary<string, object>> Sessions { get; set; }
+        public List<Dictionary<string, object>> Sessions { get; set; } = new List<Dictionary<string, object>>();
 
         /// <summary>
         /// Gets or sets the count of sessions returned by the matchmaking request.

diff --git a/OpenGSQ/Responses/GameSpy1/Status.cs b/OpenGSQ/Responses/GameSpy1/Status.cs
@@ -16,16 +16,16 @@ public class Status
         /// Server's Info
         /// <para>If <see cref="IsXServerQuery"/> is <see langword="true"/>, then it includes \info\xserverquery\rules\xserverquery, else \basic\\info\\rules\\</para>
         /// </summary>
-        public Dictionary<string, string> Info { get; set; }
+        public Dictionary<string, string> Info { get; set; } = new Dictionary<string, string>();
 
         /// <summary>
         /// Server's Players
         /// </summary>
-        public List<Dictionary<string, string>> Players { get; set; }
+        public List<Dictionary<string, string>> Players { get; set; } = new List<Dictionary<string, string>>();
 
         /// <summary>
         /// Server's Teams (Only when <see cref="IsXServerQuery"/> is <see langword="true"/>)
         /// </summary>
-        public List<Dictionary<string, string>> Teams { get; set; }
+        public List<Dictionary<string, string>> Teams { get; set; } = new List<Dictionary<string, string>>();
     }
 }
diff --git a/OpenGSQ/Responses/GameSpy2/Status.cs b/OpenGSQ/Responses/GameSpy2/Status.cs
@@ -10,16 +10,16 @@ public class Status
         /// <summary>
         /// Gets or sets the server information.
         /// </summary>
-        public Dictionary<string, string> Info { get; set; }
+        public Dictionary<string, string> Info { get; set; } = new Dictionary<string, string>();
 
         /// <summary>
         /// Gets or sets the list of players.
         /// </summary>
-        public List<Dictionary<string, string>> Players { get; set; }
+        public List<Dictionary<string, string>> Players { get; set; } = new List<Dictionary<string, string>>();
 
         /// <summary>
         /// Gets or sets the list of teams.
         /// </summary>
-        public List<Dictionary<string, string>> Teams { get; set; }
+        public List<Dictionary<string, string>> Teams { get; set; } = new List<Dictionary<string, string>>();
     }
 }
diff --git a/OpenGSQ/Responses/Minecraft/StatusPre17.cs b/OpenGSQ/Responses/Minecraft/StatusPre17.cs
@@ -8,17 +8,17 @@ public class StatusPre17
         /// <summary>
         /// Gets or sets the protocol of the game.
         /// </summary>
-        public string Protocol { get; set; }
+        public string Protocol { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the version of the game.
         /// </summary>
-        public string Version { get; set; }
+        public string Version { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the message of the day.
         /// </summary>
-        public string Motd { get; set; }
+        public string Motd { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the number of players in the game.

diff --git a/OpenGSQ/Responses/Quake1/Player.cs b/OpenGSQ/Responses/Quake1/Player.cs
@@ -28,12 +28,12 @@ public class Player
         /// <summary>
         /// Gets or sets the player's name.
         /// </summary>
-        public string Name { get; set; }
+        public string Name { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the player's skin.
         /// </summary>
-        public string Skin { get; set; }
+        public string Skin { get; set; } = string.Empty;
 
         /// <summary>
         /// Gets or sets the player's first color.

diff --git a/OpenGSQ/Responses/Quake1/Status.cs b/OpenGSQ/Responses/Quake1/Status.cs
@@ -10,11 +10,11 @@ public class Status
         /// <summary>
         /// Gets or sets the server information.
         /// </summary>
-        public Dictionary<string, string> Info { get; set; }
+        public Dictionary<string, string> Info { get; set; } = new Dictionary<string, string>();
 
         /// <summary>
         /// Gets or sets the list of players.
         /// </summary>
-        public List<Player> Players { get; set; }
+        public List<Player> Players { get; set; } = new List<Player>();
     }
 }
diff --git a/OpenGSQ/Responses/Quake2/Player.cs b/OpenGSQ/Responses/Quake2/Player.cs
@@ -18,11 +18,11 @@ public class Player
         /// <summary>
         /// Gets or sets the player's name.
         /// </summary>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the player's address.
         /// </summary>
-        public string Address { get; set; }
+        public string? Address { get; set; }
     }
 }
diff --git a/OpenGSQ/Responses/Quake2/Status.cs b/OpenGSQ/Responses/Quake2/Status.cs
@@ -10,11 +10,11 @@ public class Status
         /// <summary>
         /// Gets or sets the server information.
         /// </summary>
-        public Dictionary<string, string> Info { get; set; }
+        public Dictionary<string, string> Info { get; set; } = new Dictionary<string, string>();
 
         /// <summary>
         /// Gets or sets the list of players.
         /// </summary>
-        public List<Player> Players { get; set; }
+        public List<Player> Players { get; set; } = new List<Player>();
     }
 }