release: Improve JsonSerializer.

Author: Aetopia

src/Flarial.Runtime/Core/FlarialClient.cs

@@ -24,8 +24,6 @@ protected FlarialClient() { }
 
     public static FlarialClient Current { get; } = new FlarialClientRelease();
 
-    static readonly JsonSerializer<Dictionary<string, string>> s_serializer = JsonSerializer<Dictionary<string, string>>.Get();
-
     protected abstract string Build { get; }
     protected abstract string FileName { get; }
     protected abstract string DownloadUri { get; }
@@ -57,7 +55,8 @@ public bool Launch(bool initialized)
     async Task<string> GetRemoteHashAsync()
     {
         using var stream = await HttpStack.GetStreamAsync(HashesUrl);
-        return (await s_serializer.DeserializeAsync(stream))[Build];
+        var json = await JsonSerializer.DeserializeAsync<Dictionary<string,string>>(stream);
+        return json[Build];
     }
 
     async Task<string> GetLocalHashAsync() => await Task.Run(() =>

src/Flarial.Runtime/Core/FlarialLauncher.cs

@@ -39,8 +39,12 @@ static FlarialLauncher()
     const string LauncherDownloadUri = "https://cdn.flarial.xyz/launcher/Flarial.Launcher.exe";
     const string Arguments = "/e:on /f:off /v:off /d /c call \"{0}\" & \"{1}\" /c start \"\" \"{2}\"";
 
-    static readonly string s_filename, s_arguments, s_version, s_source, s_script, s_content;
-    static readonly JsonSerializer<Dictionary<string, string>> s_serializer = JsonSerializer<Dictionary<string, string>>.Get();
+    static readonly string s_source;
+    static readonly string s_script;
+    static readonly string s_content;
+    static readonly string s_version;
+    static readonly string s_filename;
+    static readonly string s_arguments;
 
     public static async Task<bool> VerifyConnectionAsync()
     {
@@ -55,7 +59,8 @@ public static async Task<bool> VerifyConnectionAsync()
     public static async Task<bool> CheckForUpdatesAsync()
     {
         using var stream = await HttpStack.GetStreamAsync(LauncherVersionUri);
-        return s_version != (await s_serializer.DeserializeAsync(stream))["version"];
+        var json = await JsonSerializer.DeserializeAsync<Dictionary<string, string>>(stream);
+        return s_version != json["version"];
     }
 
     public static async Task DownloadAsync(Action<int> callback)

src/Flarial.Runtime/Services/JsonSerializer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization;
@@ -8,45 +9,20 @@
 
 namespace Flarial.Runtime.Services;
 
-sealed class JsonSerializer<T>
+static class JsonSerializer
 {
-    JsonSerializer() { }
+    static readonly DataContractJsonSerializerSettings s_settings;
+    static readonly ConcurrentDictionary<Type, DataContractJsonSerializer> s_serializers;
 
     static JsonSerializer()
     {
         s_serializers = [];
-        s_lock = ((ICollection)s_serializers).SyncRoot;
-        s_settings = new()
-        {
-            UseSimpleDictionaryFormat = true,
-            MaxItemsInObjectGraph = int.MaxValue,
-            EmitTypeInformation = EmitTypeInformation.Never
-        };
+        s_settings = new() { UseSimpleDictionaryFormat = true, MaxItemsInObjectGraph = int.MaxValue, EmitTypeInformation = EmitTypeInformation.Never };
     }
 
-    static readonly object s_lock;
-    static readonly Dictionary<Type, JsonSerializer<T>> s_serializers;
-    static readonly DataContractJsonSerializerSettings s_settings = new();
+    static DataContractJsonSerializer Get<T>() => s_serializers.GetOrAdd(typeof(T), static _ => new(_, s_settings));
 
-    readonly DataContractJsonSerializer _serializer = new(typeof(T), s_settings);
+    internal static T Deserialize<T>(Stream stream) => (T)Get<T>().ReadObject(stream);
 
-    internal T Deserialize(Stream stream) => (T)_serializer.ReadObject(stream);
-
-    internal async Task<T> DeserializeAsync(Stream stream) => await Task.Run(() => Deserialize(stream));
-
-    internal static JsonSerializer<T> Get()
-    {
-        lock (s_lock)
-        {
-            var type = typeof(T);
-
-            if (!s_serializers.TryGetValue(type, out var serializer))
-            {
-                serializer = new();
-                s_serializers.Add(type, serializer);
-            }
-
-            return serializer;
-        }
-    }
+    internal static async Task<T> DeserializeAsync<T>(Stream stream) => await Task.Run(() => Deserialize<T>(stream));
 }

src/Flarial.Runtime/Services/PromotionManager.cs

@@ -1,20 +1,19 @@
+using System;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 namespace Flarial.Runtime.Services;
 
 public static class PromotionManager
 {
-    const string PromotionUri = "https://cdn.flarial.xyz/launcher/Promotions.json";
-
-    static readonly JsonSerializer<Promotion[]> s_serializer = JsonSerializer<Promotion[]>.Get();
+    const string PromotionsUri = "https://cdn.flarial.xyz/launcher/Promotions.json";
 
     public static async Task<Promotion[]> GetDetailsAsync()
     {
         try
         {
-            using var stream = await HttpStack.GetStreamAsync(PromotionUri);
-            return await s_serializer.DeserializeAsync(stream);
+            using var stream = await HttpStack.GetStreamAsync(PromotionsUri);
+            return await JsonSerializer.DeserializeAsync<Promotion[]>(stream);
         }
         catch { return []; }
     }

src/Flarial.Runtime/Versions/GDKVersionItem.cs

@@ -19,9 +19,6 @@ sealed class GDKVersionItem : VersionItem
     const string GameLaunchHelperUri = "https://cdn.flarial.xyz/launcher/gamelaunchhelper.dll";
     const string MSIXVCPackagesUri = "https://cdn.jsdelivr.net/gh/MinecraftBedrockArchiver/GdkLinks@latest/urls.json";
 
-    static readonly JsonSerializer<Dictionary<string, Dictionary<string, string[]>>> s_serializer;
-    static GDKVersionItem() => s_serializer = JsonSerializer<Dictionary<string, Dictionary<string, string[]>>>.Get();
-
     readonly string[] _downloadUris;
     readonly byte[] _gameLaunchHelper;
 
@@ -31,27 +28,26 @@ sealed class GDKVersionItem : VersionItem
         _gameLaunchHelper = gameLaunchHelper;
     }
 
-    internal static async Task QueryAsync(SortedDictionary<string, VersionRegistry.VersionEntry> versionRegistry) => await Task.Run(async () =>
+    internal static async Task QueryAsync(SortedDictionary<string, VersionRegistry.VersionEntry> registry)
     {
         var msixvcPackagesTask = HttpStack.GetStreamAsync(MSIXVCPackagesUri);
         var gameLaunchHelperTask = HttpStack.GetBytesAsync(GameLaunchHelperUri);
+       
         await Task.WhenAll(msixvcPackagesTask, gameLaunchHelperTask);
-
         var gameLaunchHelper = await gameLaunchHelperTask;
-        using var msixvcPackages = await msixvcPackagesTask;
+       
+        using var stream = await msixvcPackagesTask;
+        var json = await JsonSerializer.DeserializeAsync<Dictionary<string, Dictionary<string, string[]>>>(stream);
 
-        foreach (var item in s_serializer.Deserialize(msixvcPackages)["release"])
+        foreach (var item in json["release"])
         {
             var index = item.Key.LastIndexOf('.');
             var key = item.Key.Substring(0, index);
 
-            lock (((ICollection)versionRegistry).SyncRoot)
-            {
-                if (!versionRegistry.TryGetValue(key, out var entry)) continue;
-                entry._item = new GDKVersionItem(key, item.Value, gameLaunchHelper);
-            }
+            if (!registry.TryGetValue(key, out var entry)) continue;
+            entry._item = new GDKVersionItem(key, item.Value, gameLaunchHelper);
         }
-    });
+    }
 
     static async Task<string?> PingAsync(string uri, CancellationToken token)
     {

src/Flarial.Runtime/Versions/VersionRegistry.cs

@@ -18,7 +18,6 @@ internal sealed class VersionEntry
     }
 
     static readonly VersionItemComparer s_comparer = new();
-    static readonly JsonSerializer<Dictionary<string, bool>> s_serializer = JsonSerializer<Dictionary<string, bool>>.Get();
 
     const string SupportedVersionsUri = "https://cdn.flarial.xyz/launcher/Supported.json";
 
@@ -44,9 +43,11 @@ internal sealed class VersionEntry
     public static async Task<VersionRegistry> CreateAsync() => await Task.Run(static async () =>
     {
         SortedDictionary<string, VersionEntry> registry = new(s_comparer);
+
         using var stream = await HttpStack.GetStreamAsync(SupportedVersionsUri);
+        var json = await JsonSerializer.DeserializeAsync<Dictionary<string, bool>>(stream);
 
-        foreach (var item in s_serializer.Deserialize(stream))
+        foreach (var item in json)
             registry.Add(item.Key, new(item.Value));
 
         await GDKVersionItem.QueryAsync(registry);