Fix ugly A2S_INFO Edf solution

Author: cyilcode

SteamQueryNet/SteamQueryNet.Tests/ServerQueryTests.cs

@@ -16,6 +16,7 @@ public class ServerQueryTests
         public void ShouldInitializeWithProperHost(string host)
         {
             var squery = new ServerQuery(host, PORT);
+            squery.GetServerInfo();
         }
 
         [Theory]

SteamQueryNet/SteamQueryNet/Enums/EDFFlags.cs

@@ -0,0 +1,12 @@
+namespace SteamQueryNet.Enums
+{
+    public enum EDFFlags : byte
+    {
+        Port = 0x80,
+        SteamID = 0x10,
+        SourceTVPort = 0x40,
+        SourceTVServerName = 0x40,
+        Keywords = 0x20,
+        GameID = 0x01
+    }
+}

SteamQueryNet/SteamQueryNet/Models/ServerInfo.cs

@@ -73,6 +73,7 @@ public sealed class ServerInfo
 
         /// <summary>
         /// This property only exist in a response if the server is running The Ship.
+        /// Warning: this property information is not supported by SteamQueryNet yet.
         /// </summary>
         [ParseCustom]
         public ShipGameInfo ShipGameInfo { get; set; }
@@ -90,38 +91,38 @@ public sealed class ServerInfo
         /// <summary>
         /// The server's game port number.
         /// </summary>
-        [EDF]
+        [EDF((byte)EDFFlags.Port)]
         public short Port { get; set; }
 
         /// <summary>
         /// Server's SteamID.
         /// </summary>
-        [EDF]
+        [EDF((byte)EDFFlags.SteamID)]
         public long SteamID { get; set; }
 
         /// <summary>
         /// Spectator port number for SourceTV.
         /// </summary>
-        [EDF]
+        [EDF((byte)EDFFlags.SourceTVPort)]
         public short SourceTVPort { get; set; }
 
         /// <summary>
         /// Name of the spectator server for SourceTV.
         /// </summary>
-        [EDF]
+        [EDF((byte)EDFFlags.SourceTVServerName)]
         public string SourceTVServerName { get; set; }
 
         /// <summary>
         /// Tags that describe the game according to the server (for future use.)
         /// </summary>
-        [EDF]
+        [EDF((byte)EDFFlags.Keywords)]
         public string Keywords { get; set; }
 
         /// <summary>
         /// The server's 64-bit GameID. If this is present, a more accurate AppID is present in the low 24 bits.
         /// The earlier AppID could have been truncated as it was forced into 16-bit storage.
         /// </summary>
-        [EDF]
+        [EDF((byte)EDFFlags.GameID)]
         public long GameID { get; set; }
 
         /// <summary>

SteamQueryNet/SteamQueryNet/ServerQuery.cs

@@ -106,49 +106,10 @@ public ServerInfo GetServerInfo()
             try
             {
                 sInfo.Ping = new Ping().Send(_ipEndpoint.Address).RoundtripTime;
-                var request = BuildRequest(RequestHeaders.A2S_INFO, Encoding.UTF8.GetBytes(requestPayload));
-                _client.Send(request, request.Length);
-                byte[] response = _client.Receive(ref _ipEndpoint);
+                byte[] response = SendRequest(RequestHeaders.A2S_INFO, Encoding.UTF8.GetBytes(requestPayload));
                 if (response.Length > 0)
                 {
-                    IEnumerable<byte> lastSource = ExtractData(sInfo, response, nameof(sInfo.EDF));
-
-                    // Handle EDF's. This part looks hideous but i will get back to this after i get done with everything. Right now this works.
-                    if ((sInfo.EDF & 0x80) > 0)
-                    {
-                        (object result, int size) = ExtractMarshalType(lastSource, sInfo.Port.GetType());
-                        sInfo.Port = (short)result;
-                        lastSource = lastSource.Skip(size);
-                    }
-                    if ((sInfo.EDF & 0x10) > 0)
-                    {
-                        (object result, int size) = ExtractMarshalType(lastSource, sInfo.SteamID.GetType());
-                        sInfo.SteamID = (long)result;
-                        lastSource = lastSource.Skip(size);
-                    }
-                    if ((sInfo.EDF & 0x40) > 0)
-                    {
-                        (object result, int size) = ExtractMarshalType(lastSource, sInfo.SourceTVPort.GetType());
-                        sInfo.SourceTVPort = (short)result;
-                        lastSource = lastSource.Skip(size);
-
-                        IEnumerable<byte> takenBytes = lastSource.TakeWhile(x => x != 0);
-                        sInfo.SourceTVServerName = Encoding.UTF8.GetString(takenBytes.ToArray());
-                        lastSource = lastSource.Skip(takenBytes.Count() + 1);
-
-                    }
-                    if ((sInfo.EDF & 0x20) > 0)
-                    {
-                        IEnumerable<byte> takenBytes = lastSource.TakeWhile(x => x != 0);
-                        sInfo.Keywords = Encoding.UTF8.GetString(takenBytes.ToArray());
-                        lastSource = lastSource.Skip(takenBytes.Count() + 1);
-                    }
-                    if ((sInfo.EDF & 0x01) > 0)
-                    {
-                        (object result, int size) = ExtractMarshalType(lastSource, sInfo.GameID.GetType());
-                        sInfo.GameID = (long)result;
-                        lastSource = lastSource.Skip(size);
-                    }
+                    ExtractData(sInfo, response, nameof(sInfo.EDF));
                 }
             }
             catch (Exception)
@@ -160,6 +121,13 @@ public ServerInfo GetServerInfo()
             return sInfo;
         }
 
+        private byte[] SendRequest(byte requestHeader, byte[] payload = null)
+        {
+            var request = BuildRequest(requestHeader, payload);
+            _client.Send(request, request.Length);
+            return _client.Receive(ref _ipEndpoint);
+        }
+
         public void RenewChallenge()
         {
             throw new NotImplementedException();
@@ -171,7 +139,7 @@ private byte[] BuildRequest(byte headerCode, byte[] extraParams = null)
             return extraParams != null ? request.Concat(extraParams).ToArray() : request;
         }
 
-        private IEnumerable<byte> ExtractData<TObject>(TObject objectRef, byte[] dataSource, string stopAt = "")
+        private void ExtractData<TObject>(TObject objectRef, byte[] dataSource, string edfPropName = "")
             where TObject : class
         {
             IEnumerable<byte> takenBytes = new List<byte>();
@@ -182,6 +150,14 @@ private IEnumerable<byte> ExtractData<TObject>(TObject objectRef, byte[] dataSou
 
             foreach (PropertyInfo property in propsOfObject)
             {
+                CustomAttributeData edfInfo = property.CustomAttributes.FirstOrDefault(x => x.AttributeType == typeof(EDFAttribute));
+                if (edfInfo != null)
+                {
+                    byte edfValue = (byte)typeof(TObject).GetProperty(edfPropName).GetValue(objectRef);
+                    byte edfPropertyConditionValue = (byte)edfInfo.ConstructorArguments[0].Value;
+                    if ((edfValue & edfPropertyConditionValue) <= 0) { continue; }
+                }
+
                 if (property.PropertyType == typeof(string))
                 {
                     takenBytes = strippedSource.TakeWhile(x => x != 0);
@@ -195,14 +171,7 @@ private IEnumerable<byte> ExtractData<TObject>(TObject objectRef, byte[] dataSou
                     property.SetValue(objectRef, property.PropertyType.IsEnum ? Enum.Parse(property.PropertyType, result.ToString()) : result);
                     strippedSource = strippedSource.Skip(size);
                 }
-
-                if (property.Name == stopAt)
-                {
-                    break;
-                }
             }
-
-            return strippedSource;
         }
 
         private (object, int) ExtractMarshalType(IEnumerable<byte> source, Type type)

SteamQueryNet/SteamQueryNet/Utils/EDFAttribute.cs

@@ -3,5 +3,8 @@
 namespace SteamQueryNet.Utils
 {
     [AttributeUsage(AttributeTargets.Property)]
-    public class EDFAttribute : Attribute { }
+    public class EDFAttribute : Attribute
+    {
+        public EDFAttribute(byte condition) { }
+    }
 }