Merge pull request #4 from cyilcode/response-header-strip-miscalculation

Response header strip miscalculation

Author: cyilcode

SteamQueryNet/SteamQueryNet/Models/Player.cs

@@ -35,9 +35,18 @@ public string TotalDurationAsString
             get
             {
                 TimeSpan totalSpan = TimeSpan.FromSeconds(Duration);
-                string parsedHours = totalSpan.Hours >= 10 ? totalSpan.Hours.ToString() : $"0{totalSpan.Hours}";
-                string parsedMinutes = totalSpan.Minutes >= 10 ? totalSpan.Minutes.ToString() : $"0{totalSpan.Minutes}";
-                string parsedSeconds = totalSpan.Seconds >= 10 ? totalSpan.Seconds.ToString() : $"0{totalSpan.Seconds}";
+                string parsedHours = totalSpan.Hours >= 10
+                    ? totalSpan.Hours.ToString()
+                    : $"0{totalSpan.Hours}";
+
+                string parsedMinutes = totalSpan.Minutes >= 10
+                    ? totalSpan.Minutes.ToString()
+                    : $"0{totalSpan.Minutes}";
+
+                string parsedSeconds = totalSpan.Seconds >= 10
+                    ? totalSpan.Seconds.ToString()
+                    : $"0{totalSpan.Seconds}";
+
                 return $"{parsedHours}:{parsedMinutes}:{parsedSeconds}";
             }
         }

SteamQueryNet/SteamQueryNet/ServerQuery.cs

@@ -81,7 +81,7 @@ public interface IServerQuery
 
     public class ServerQuery : IServerQuery, IDisposable
     {
-        private const int RESPONSE_HEADER_COUNT = 6;
+        private const int RESPONSE_HEADER_COUNT = 5;
         private const int RESPONSE_CODE_INDEX = 5;
 
         private readonly UdpClient _client = new UdpClient(new IPEndPoint(IPAddress.Any, 0));
@@ -211,7 +211,6 @@ public async Task<List<Rule>> GetRulesAsync()
             byte[] response = await SendRequestAsync(RequestHeaders.A2S_RULES, BitConverter.GetBytes(_currentChallenge));
             if (response.Length > 0)
             {
-                var rls = ExtractListData<Rule>(response);
                 return ExtractListData<Rule>(response);
             }
             else
@@ -330,7 +329,7 @@ private IEnumerable<byte> ExtractData<TObject>(TObject objectRef, byte[] dataSou
 
             // We can be a good guy and ask for any extra jobs :)
             IEnumerable<byte> enumerableSource = stripHeaders
-                ? dataSource.Skip(RESPONSE_HEADER_COUNT) 
+                ? dataSource.Skip(RESPONSE_HEADER_COUNT)
                 : dataSource;
 
             // We get every property that does not contain ParseCustom and NotParsable attributes on them to iterate through all and parse/assign their values.
@@ -369,8 +368,10 @@ private IEnumerable<byte> ExtractData<TObject>(TObject objectRef, byte[] dataSou
                  */
                 if (property.PropertyType == typeof(string))
                 {
-                    // Take till the termination.
-                    takenBytes = enumerableSource.TakeWhile(x => x != 0);
+                    // Clear the buffer first then take till the termination.
+                    takenBytes = enumerableSource
+                        .SkipWhile(x => x == 0)
+                        .TakeWhile(x => x != 0);
 
                     // Parse it into a string.
                     property.SetValue(objectRef, Encoding.UTF8.GetString(takenBytes.ToArray()));
@@ -386,11 +387,11 @@ private IEnumerable<byte> ExtractData<TObject>(TObject objectRef, byte[] dataSou
                         : property.PropertyType;
 
                     // Extract the value and the size from the source.
-                    (object result, int size) = ExtractMarshalType(enumerableSource, typeOfProperty);
+                    (object result, int size) = ExtractMarshalType(enumerableSource.SkipWhile(x => x == 0), typeOfProperty);
 
                     /* If the property is an enum we should parse it first then assign its value,
                      * if not we can just give it to SetValue since it was converted by ExtractMarshalType already.*/
-                    property.SetValue(objectRef, property.PropertyType.IsEnum 
+                    property.SetValue(objectRef, property.PropertyType.IsEnum
                         ? Enum.Parse(property.PropertyType, result.ToString())
                         : result);
 

SteamQueryNet/SteamQueryNet/SteamQueryNet.csproj

@@ -1,15 +1,26 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Authors>Cem YILMAZ</Authors>
     <Company>Cem YILMAZ</Company>
-    <Version>1.0.3</Version>
-    <AssemblyVersion>1.0.0.3</AssemblyVersion>
+    <Version>1.0.5</Version>
+    <AssemblyVersion>1.0.0.5</AssemblyVersion>
     <NeutralLanguage>en</NeutralLanguage>
     <PackageTags>steam,query,net,steamquery,steamquerynet</PackageTags>
-    <FileVersion>1.0.0.3</FileVersion>
-    <PackageReleaseNotes>Add async API support</PackageReleaseNotes>
+    <FileVersion>1.0.0.5</FileVersion>
+    <PackageReleaseNotes>Fix response header strip miscalculation</PackageReleaseNotes>
+    <Description>SteamQueryNet is a C# wrapper for Steam Server Queries UDP protocol. It is;
+
+Light
+Dependency free
+Written in .net standard 2.0 so that it works with both .NET framework 4.6+ and core.</Description>
+    <Copyright />
+    <license>https://github.com/cyilcode/SteamQueryNet/blob/master/LICENSE</license>
+    <PackageProjectUrl>https://github.com/cyilcode/SteamQueryNet</PackageProjectUrl>
+    <PackageIconUrl>https://github.com/cyilcode/SteamQueryNet</PackageIconUrl>
+    <RepositoryUrl>https://github.com/cyilcode/SteamQueryNet</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">