From 3a4401038a5842fccd1027d3cb91d75a59c4598d Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.tarsonis@gmail.com>
Date: Fri, 10 Feb 2023 12:31:08 +0100
Subject: [PATCH] Messagepack (#43)

* add messagepack to client

* add resolvers

* fixes on client

---------

Co-authored-by: Stanley Dimant <stanley.dimant@varian.com>
Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
---
 MareAPI                                |  2 +-
 MareSynchronos/MareSynchronos.csproj   |  3 ++-
 MareSynchronos/WebAPI/ApiController.cs | 32 ++++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/MareAPI b/MareAPI
index f604e6d..24faa35 160000
--- a/MareAPI
+++ b/MareAPI
@@ -1 +1 @@
-Subproject commit f604e6d27ebf760dd44feb53a11b8c04e91edc67
+Subproject commit 24faa352e7a7dee6df8fc1413075a9129b3357d5
diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj
index 9e8dd22..c35577b 100644
--- a/MareSynchronos/MareSynchronos.csproj
+++ b/MareSynchronos/MareSynchronos.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.7.22</Version>
+    <Version>0.7.23</Version>
     <Description></Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/Penumbra-Sync/client</PackageProjectUrl>
@@ -33,6 +33,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.2" />
     <PackageReference Include="Penumbra.Api" Version="1.0.7" />
     <PackageReference Include="Penumbra.String" Version="1.0.1" />
   </ItemGroup>
diff --git a/MareSynchronos/WebAPI/ApiController.cs b/MareSynchronos/WebAPI/ApiController.cs
index 602cee0..6cf50ca 100644
--- a/MareSynchronos/WebAPI/ApiController.cs
+++ b/MareSynchronos/WebAPI/ApiController.cs
@@ -13,6 +13,9 @@ using MareSynchronos.Managers;
 using Dalamud.Utility;
 using MareSynchronos.MareConfiguration;
 using MareSynchronos.Mediator;
+using MessagePack;
+using Microsoft.Extensions.DependencyInjection;
+using MessagePack.Resolvers;
 
 namespace MareSynchronos.WebAPI;
 public partial class ApiController : MediatorSubscriberBase, IDisposable, IMareHubClient
@@ -183,12 +186,12 @@ public partial class ApiController : MediatorSubscriberBase, IDisposable, IMareH
 
                 await _mareHub.StartAsync(token).ConfigureAwait(false);
 
-                await InitializeData().ConfigureAwait(false);
-
                 _connectionDto = await GetConnectionDto().ConfigureAwait(false);
 
                 ServerState = ServerState.Connected;
 
+                await InitializeData().ConfigureAwait(false);
+
                 if (_connectionDto.ServerVersion != IMareHub.ApiVersion)
                 {
                     await StopConnection(token, ServerState.VersionMisMatch).ConfigureAwait(false);
@@ -315,6 +318,25 @@ public partial class ApiController : MediatorSubscriberBase, IDisposable, IMareH
                 options.Headers.Add("Authorization", "Bearer " + _serverManager.GetToken());
                 options.Transports = HttpTransportType.WebSockets | HttpTransportType.ServerSentEvents | HttpTransportType.LongPolling;
             })
+            .AddMessagePackProtocol(opt =>
+            {
+                var resolver = CompositeResolver.Create(StandardResolverAllowPrivate.Instance,
+                    BuiltinResolver.Instance,
+                    AttributeFormatterResolver.Instance,
+                    // replace enum resolver
+                    DynamicEnumAsStringResolver.Instance,
+                    DynamicGenericResolver.Instance,
+                    DynamicUnionResolver.Instance,
+                    DynamicObjectResolver.Instance,
+                    PrimitiveObjectResolver.Instance,
+                    // final fallback(last priority)
+                    StandardResolver.Instance);
+
+                opt.SerializerOptions =
+                    MessagePackSerializerOptions.Standard
+                        .WithCompression(MessagePackCompression.Lz4Block)
+                        .WithResolver(resolver);
+            })
             .WithAutomaticReconnect(new ForeverRetryPolicy(Mediator))
             .ConfigureLogging(a =>
             {
@@ -352,6 +374,12 @@ public partial class ApiController : MediatorSubscriberBase, IDisposable, IMareH
         ServerState = ServerState.Connecting;
         await InitializeData().ConfigureAwait(false);
         _connectionDto = await GetConnectionDto().ConfigureAwait(false);
+        if (_connectionDto.ServerVersion != IMareHub.ApiVersion)
+        {
+            CancellationTokenSource cts = new();
+            await StopConnection(cts.Token, ServerState.VersionMisMatch).ConfigureAwait(false);
+            return;
+        }
         ServerState = ServerState.Connected;
     }