fixed XML reading for geometry dash 2.2

stream optimization

(cherry picked from commit 69c3cc5)

Author: flightlex

Examples/Examples.csproj

@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="JetBrains.Profiler.Api" Version="1.2.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="JetBrains.Profiler.Api" Version="1.4.3" />
   </ItemGroup>
 
 </Project>

GeometryDashAPI.Benchmarks/GeometryDashAPI.Benchmarks.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
     </ItemGroup>
 
     <ItemGroup>

GeometryDashAPI.Tests/GeometryDashAPI.Tests.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="FluentAssertions" Version="6.0.0-alpha0002" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0">
       <PrivateAssets>all</PrivateAssets>

GeometryDashAPI/Crypt.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.IO.Compression;
 using System.Security.Cryptography;
 using System.Text;
@@ -34,24 +35,22 @@ public static string XOR(string text, string key)
             return result.ToString();
         }
 
-        public static string GZipDecompress(byte[] data)
+        public static Stream? GZipDecompress(byte[] data)
         {
             if (data == null || data.Length <= 0)
-                return string.Empty;
-            using var stream = new MemoryStream(data);
-            using var zip = new GZipStream(stream, CompressionMode.Decompress);
-            using var reader = new StreamReader(zip);
-            return reader.ReadToEnd();
+                return null;
+
+            var stream = new MemoryStream(data);
+            return new GZipStream(stream, CompressionMode.Decompress);
         }
 
-        public static string ZLibDecompress(byte[] data)
+        public static Stream? ZLibDecompress(byte[] data)
         {
             if (data == null || data.Length <= 0)
-                return string.Empty;
-            using var stream = new MemoryStream(data);
-            using var zip = new InflaterInputStream(stream);
-            using var reader = new StreamReader(zip);
-            return reader.ReadToEnd();
+                return null;
+
+            var stream = new MemoryStream(data);
+            return new InflaterInputStream(stream);
         }
 
         public static byte[] GZipCompress(byte[] data)

GeometryDashAPI/Data/GameData.cs

@@ -54,7 +54,11 @@ public virtual async Task LoadAsync(string fileName)
             var gZipDecompress =
                 Crypt.GZipDecompress(
                     GameConvert.FromBase64(Encoding.ASCII.GetString(xor, 0, index >= 0 ? index : xor.Length)));
-            DataPlist = new Plist(Encoding.ASCII.GetBytes(gZipDecompress));
+
+            if (gZipDecompress is null)
+                throw new InvalidOperationException("Data was empty");
+
+            DataPlist = new Plist(gZipDecompress);
         }
 
         /// <summary>

GeometryDashAPI/Extensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 
 namespace GeometryDashAPI
@@ -75,6 +76,12 @@ public static GameType GetGameType(this OfficialLevel level)
             };
         }
 
+        internal static string StreamToString(this Stream stream)
+        {
+            using var streamReader = new StreamReader(stream);
+            return streamReader.ReadToEnd();
+        }
+
         internal static IEnumerable<KeyValuePair<T, T>> Pairs<T>(this IEnumerable<T> source)
         {
             var first = false;

GeometryDashAPI/GeometryDashAPI.csproj

@@ -25,10 +25,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="csFastFloat" Version="4.1.0" />
+    <PackageReference Include="csFastFloat" Version="4.1.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
-    <PackageReference Include="UrlBase64" Version="0.1.2" />
+    <PackageReference Include="UrlBase64" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>

GeometryDashAPI/Levels/Level.cs

@@ -109,10 +109,13 @@ public string SaveAsString(bool compress = true)
         public static string Decompress(string data)
         {
             var bytes = GameConvert.FromBase64(data);
+
             if (bytes[0] == 0x78)
-                return Crypt.ZLibDecompress(bytes);
+                return Crypt.ZLibDecompress(bytes)?.StreamToString();
+
             if (bytes[0] == 0x1F && bytes[1] == 0x8B)
-                return Crypt.GZipDecompress(bytes);
+                return Crypt.GZipDecompress(bytes)?.StreamToString();
+
             throw new InvalidOperationException(
                 "Unsupported data signature. There is no gzip and zlib. Please check your level data. If your level is correct and works in the game, please create an issue: https://github.com/Folleach/GeometryDashAPI/issues. Or fix it yourself: https://github.com/Folleach/GeometryDashAPI/blob/master/GeometryDashAPI/Levels/Level.cs");
         }

GeometryDashAPI/Serialization/Plist.cs

@@ -15,6 +15,7 @@ public class Plist : Dictionary<string, dynamic>
     {
         private static readonly XmlReaderSettings xmlSettings = new XmlReaderSettings()
         {
+            CheckCharacters = false, // to skip XML reserved characters
             DtdProcessing = DtdProcessing.Ignore,
             XmlResolver = null
         };