release: Delegate loading promotions to CDN.

Author: Aetopia

src/Flarial.Launcher.Runtime/Client/FlarialClient.cs

@@ -20,17 +20,18 @@ sealed class FlarialClientRelease : FlarialClient
 
 public abstract class FlarialClient
 {
-    internal FlarialClient() { }
+    protected FlarialClient() { }
 
     public static FlarialClient Current { get; } = new FlarialClientRelease();
-    static readonly JsonService<Dictionary<string, string>> s_json = JsonService<Dictionary<string, string>>.GetJson();
+
+    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; }
     protected abstract string WindowClass { get; }
 
-    public bool? Launch(bool initialized)
+    public bool Launch(bool initialized)
     {
         if (Minecraft.GetWindow(WindowClass) is { } client)
         {
@@ -43,8 +44,8 @@ internal FlarialClient() { }
         }
 
         Library library = new(FileName);
-        if (!library.IsLoadable) return null;
-        
+        if (!library.IsLoadable) return false;
+
         return Injector.Launch(initialized, library) is { };
     }
 
@@ -56,7 +57,7 @@ internal FlarialClient() { }
     async Task<string> GetRemoteHashAsync()
     {
         using var stream = await HttpService.GetStreamAsync(HashesUrl);
-        return s_json.ReadStream(stream)[Build];
+        return s_serializer.Deserialize(stream)[Build];
     }
 
     async Task<string> GetLocalHashAsync() => await Task.Run(() =>

src/Flarial.Launcher.Runtime/Client/FlarialLauncher.cs

@@ -40,7 +40,7 @@ static FlarialLauncher()
     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 JsonService<Dictionary<string, string>> s_json = JsonService<Dictionary<string, string>>.GetJson();
+    static readonly JsonSerializer<Dictionary<string, string> > s_serializer  = JsonSerializer<Dictionary<string, string>>.Get();
 
     public static async Task<bool> ConnectAsync()
     {
@@ -55,7 +55,7 @@ public static async Task<bool> ConnectAsync()
     public static async Task<bool> CheckAsync()
     {
         using var stream = await HttpService.GetStreamAsync(LauncherVersionUri);
-        return s_version != s_json.ReadStream(stream)["version"];
+        return s_version != s_serializer.Deserialize(stream)["version"];
     }
 
     public static async Task DownloadAsync(Action<int> callback)

src/Flarial.Launcher.Runtime/Game/Minecraft.cs

@@ -26,7 +26,7 @@ internal Minecraft() { }
     public static Minecraft Current { get; } = new MinecraftGDK();
     public static string PackageFamilyName { get; } = "Microsoft.MinecraftUWP_8wekyb3d8bbwe";
 
-    internal static Package Package => PackageService.GetPackage(PackageFamilyName)!;
+    internal static Package Package => PackageService.Get(PackageFamilyName)!;
     internal static string Version { get { var _ = Package.Id.Version; return $"{_.Major}.{_.Minor}.{_.Build / 100}"; } }
 
     protected abstract uint? Activate();
@@ -42,7 +42,7 @@ internal Minecraft() { }
 
     public static bool IsInstalled => Package is { };
     public static bool IsPackaged => Package.SignatureKind is PackageSignatureKind.Store;
-    public static bool IsGamingServicesInstalled => PackageService.GetPackage("Microsoft.GamingServices_8wekyb3d8bbwe") is { };
+    public static bool IsGamingServicesInstalled => PackageService.Get("Microsoft.GamingServices_8wekyb3d8bbwe") is { };
 
     static uint? GetProcessId(string processName)
     {

src/Flarial.Launcher.Runtime/Services/JsonSerializer.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+
+namespace Flarial.Launcher.Runtime.Services;
+
+sealed class JsonSerializer<T>
+{
+    JsonSerializer() { }
+
+    static JsonSerializer()
+    {
+        s_serializers = [];
+        s_lock = ((ICollection)s_serializers).SyncRoot;
+        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();
+
+    readonly DataContractJsonSerializer _serializer = new(typeof(T), s_settings);
+
+    internal T Deserialize(Stream stream) => (T)_serializer.ReadObject(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;
+        }
+    }
+}

src/Flarial.Launcher.Runtime/Services/JsonService.cs

@@ -12,9 +12,9 @@ unsafe static class PackageService
 {
     static readonly PackageManager s_pm = new();
 
-    internal static Package? GetPackage(string packageFamilyName) => s_pm.FindPackagesForUser(string.Empty, packageFamilyName).FirstOrDefault();
+    internal static Package? Get(string packageFamilyName) => s_pm.FindPackagesForUser(string.Empty, packageFamilyName).FirstOrDefault();
 
-    internal static bool AddPackage(Uri uri, Action<int> callback)
+    internal static bool Add(Uri uri, Action<int> callback)
     {
         var handle = CreateEvent(null, true, false, null);
         var info = s_pm.AddPackageAsync(uri, null, ForceApplicationShutdown | ForceUpdateFromAnyVersion);

src/Flarial.Launcher.Runtime/Services/PackageService.cs

@@ -0,0 +1,33 @@
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
+namespace Flarial.Launcher.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();
+
+    public static async Task<Promotion[]> GetDetailsAsync()
+    {
+        try
+        {
+            using var stream = await HttpService.GetStreamAsync(PromotionUri);
+            return await Task.Run(() => s_serializer.Deserialize(stream));
+        }
+        catch { return []; }
+    }
+}
+
+[DataContract]
+public sealed class Promotion
+{
+    Promotion() { }
+
+    [DataMember]
+    public readonly string Uri = null!;
+
+    [DataMember]
+    public readonly string Image = null!;
+}

src/Flarial.Launcher.Runtime/Services/PromotionManager.cs

@@ -18,13 +18,17 @@ 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 JsonService<Dictionary<string, Dictionary<string, string[]>>> s_json;
-    static GDKVersionItem() => s_json = JsonService<Dictionary<string, Dictionary<string, string[]>>>.GetJson();
+    static readonly JsonSerializer<Dictionary<string, Dictionary<string, string[]>>> s_serializer;
+    static GDKVersionItem() => s_serializer = JsonSerializer<Dictionary<string, Dictionary<string, string[]>>>.Get();
 
-    readonly string[] _uris;
+    readonly string[] _downloadUris;
     readonly byte[] _gameLaunchHelper;
 
-    GDKVersionItem(string version, string[] uris, byte[] gameLaunchHelper) : base(version) => (_uris, _gameLaunchHelper) = (uris, gameLaunchHelper);
+    GDKVersionItem(string version, string[] downloadUris, byte[] gameLaunchHelper) : base(version)
+    {
+        _downloadUris = downloadUris;
+        _gameLaunchHelper = gameLaunchHelper;
+    }
 
     internal static async Task QueryAsync(SortedDictionary<string, VersionRegistry.VersionEntry> registry) => await Task.Run(async () =>
     {
@@ -35,7 +39,7 @@ internal static async Task QueryAsync(SortedDictionary<string, VersionRegistry.V
         var gameLaunchHelper = await gameLaunchHelperTask;
         using var msixvcPackages = await msixvcPackagesTask;
 
-        foreach (var item in s_json.ReadStream(msixvcPackages)["release"])
+        foreach (var item in s_serializer.Deserialize(msixvcPackages)["release"])
         {
             var index = item.Key.LastIndexOf('.');
             var key = item.Key.Substring(0, index);
@@ -64,7 +68,7 @@ internal static async Task QueryAsync(SortedDictionary<string, VersionRegistry.V
     protected override async Task<string> GetUriAsync()
     {
         using CancellationTokenSource source = new();
-        HashSet<Task<string?>> tasks = [.. _uris.Select(_ => PingAsync(_, source.Token))];
+        HashSet<Task<string?>> tasks = [.. _downloadUris.Select(_ => PingAsync(_, source.Token))];
 
         while (tasks.Count > 0)
         {

src/Flarial.Launcher.Runtime/Versions/GDKVersionItem.cs

@@ -31,6 +31,6 @@ public virtual async Task InstallAsync(Action<int, bool> callback)
 
         var path = Path.Combine(s_path, Path.GetRandomFileName());
         await HttpService.DownloadAsync(await GetUriAsync(), path, (_) => callback(_, false));
-        await Task.Run(() => PackageService.AddPackage(new(path), _ => callback(_, true)));
+        await Task.Run(() => PackageService.Add(new(path), _ => callback(_, true)));
     }
 }

src/Flarial.Launcher.Runtime/Versions/VersionItem.cs

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