More centralized JsonSerializer options

Author: hhvrc

API/Services/Email/Mailjet/MailjetEmailService.cs

@@ -79,7 +79,7 @@ private async Task SendMails(MailBase[] mails, CancellationToken cancellationTok
         var json = JsonSerializer.Serialize(new MailsWrap
         {
             Messages = mails
-        }, JsonSettings.CamelCase);
+        }, JsonSettings.MailJetSettings);
 
         var response = await _httpClient.PostAsync("send",
             new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json), cancellationToken);

Common/JsonSerialization/JsonSettings.cs

@@ -1,22 +1,41 @@
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace OpenShock.Common.JsonSerialization;
 
 public static class JsonSettings
 {
-    public static readonly JsonSerializerOptions FlagCompatibleCaseInsensitive = new()
+    private static void ConfigureBase(JsonSerializerOptions options)
     {
-        PropertyNameCaseInsensitive = true,
-        Converters = { new FlagCompatibleJsonStringEnumConverter() }
+        options.PropertyNameCaseInsensitive = true;
+        options.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+        options.Converters.Add(new PermissionTypeConverter());
+    }
+    
+    public static void HttpOptions(Microsoft.AspNetCore.Http.Json.JsonOptions options)
+    {
+        ConfigureBase(options.SerializerOptions);
+        options.SerializerOptions.Converters.Add(new JsonStringEnumConverter()); // TODO: Why does this differ from the one below?
+    }
+    
+    public static void MvcOptions(Microsoft.AspNetCore.Mvc.JsonOptions options)
+    {
+        ConfigureBase(options.JsonSerializerOptions);
+        options.JsonSerializerOptions.Converters.Add(new FlagCompatibleJsonStringEnumConverter()); // TODO: Why does this differ from the one above?
+    }
+    
+    public static readonly JsonSerializerOptions MailJetSettings = new()
+    {
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
     };
 
-    public static readonly JsonSerializerOptions CaseInsensitive = new()
+    public static readonly JsonSerializerOptions LiveControlSettings = new() // TODO: Why does this differ from the one below?
     {
         PropertyNameCaseInsensitive = true
     };
-    
-    public static readonly JsonSerializerOptions CamelCase = new()
+    public static readonly JsonSerializerOptions LiveControlSettings2 = new() // TODO: Why does this differ from the one above?
     {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+        PropertyNameCaseInsensitive = true,
+        Converters = { new FlagCompatibleJsonStringEnumConverter() }
     };
 }

Common/OpenShockServiceHelper.cs

@@ -25,8 +25,6 @@
 using Redis.OM;
 using Redis.OM.Contracts;
 using StackExchange.Redis;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using System.Threading.RateLimiting;
 using OpenShock.Common.Extensions;
 using OpenShock.Common.Utils;
@@ -133,21 +131,8 @@ public static IServiceCollection AddOpenShockServices(this IServiceCollection se
 
         services.AddSingleton<IAuthorizationMiddlewareResultHandler, OpenShockAuthorizationMiddlewareResultHandler>();
 
-        services.ConfigureHttpJsonOptions(options =>
-        {
-            options.SerializerOptions.PropertyNameCaseInsensitive = true;
-            options.SerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
-            options.SerializerOptions.Converters.Add(new PermissionTypeConverter());
-            options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
-        });
-        
-        services.AddControllers().AddJsonOptions(x =>
-        {
-            x.JsonSerializerOptions.PropertyNameCaseInsensitive = true;
-            x.JsonSerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
-            x.JsonSerializerOptions.Converters.Add(new PermissionTypeConverter());
-            x.JsonSerializerOptions.Converters.Add(new FlagCompatibleJsonStringEnumConverter());
-        });
+        services.ConfigureHttpJsonOptions(JsonSettings.HttpOptions);
+        services.AddControllers().AddJsonOptions(JsonSettings.MvcOptions);
 
         var apiVersioningBuilder = services.AddApiVersioning(options =>
         {

Common/Utils/JsonWebSocketUtils.cs

@@ -13,8 +13,7 @@ public static class JsonWebSocketUtils
 
     public static readonly RecyclableMemoryStreamManager RecyclableMemory = new();
 
-    public static async Task<OneOf.OneOf<T?, DeserializeFailed, WebsocketClosure>> ReceiveFullMessageAsyncNonAlloc<T>(
-        WebSocket socket, CancellationToken cancellationToken)
+    public static async Task<OneOf.OneOf<T?, DeserializeFailed, WebsocketClosure>> ReceiveFullMessageAsyncNonAlloc<T>(WebSocket socket, JsonSerializerOptions? options = null, CancellationToken cancellationToken = default)
     {
         var buffer = ArrayPool<byte>.Shared.Rent(4096);
         try
@@ -39,7 +38,7 @@ public static class JsonWebSocketUtils
             try
             {
                 var data = message.GetSpan(bytes)[..bytes];
-                return JsonSerializer.Deserialize<T>(data, JsonSettings.FlagCompatibleCaseInsensitive);
+                return JsonSerializer.Deserialize<T>(data, options);
             }
             catch (Exception e)
             {

LiveControlGateway/Controllers/LiveControlController.cs

@@ -257,9 +257,11 @@ await QueueMessage(new LiveControlResponse<LiveResponseType>
     /// <inheritdoc />
     protected override async Task<bool> HandleReceive(CancellationToken cancellationToken)
     {
-        var message =
-            await JsonWebSocketUtils.ReceiveFullMessageAsyncNonAlloc<BaseRequest<LiveRequestType>>(WebSocket!,
-                LinkedToken);
+        var message = await JsonWebSocketUtils.ReceiveFullMessageAsyncNonAlloc<BaseRequest<LiveRequestType>>(
+            WebSocket!, 
+            JsonSettings.LiveControlSettings2, 
+            LinkedToken
+            );
 
         var continueLoop = await message.Match(async request =>
             {
@@ -343,7 +345,7 @@ private async Task IntakeBulkFrame(JsonDocument? requestData)
         ClientLiveFrame[]? frames;
         try
         {
-            frames = requestData?.Deserialize<ClientLiveFrame[]>(JsonSettings.CaseInsensitive);
+            frames = requestData?.Deserialize<ClientLiveFrame[]>(JsonSettings.LiveControlSettings);
 
             if (frames is not { Length: > 0 })
             {
@@ -387,7 +389,7 @@ private async Task IntakeFrame(JsonDocument? requestData)
         ClientLiveFrame? frame;
         try
         {
-            frame = requestData?.Deserialize<ClientLiveFrame>(JsonSettings.CaseInsensitive);
+            frame = requestData?.Deserialize<ClientLiveFrame>(JsonSettings.LiveControlSettings);
 
             if (frame is null)
             {