Merge pull request #50 from GedasFX/dev

Dev

Author: GedasFX

Alderto.Web/Helpers/SnowflakeConverter.cs

@@ -1,14 +1,28 @@
 using System;
+using System.Buffers;
+using System.Buffers.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Alderto.Web.Helpers
 {
     // Due to number in JavaScript having an upper limit of size (2^53), send all UInt64 as strings.
+
     public class SnowflakeConverter : JsonConverter<ulong>
     {
         public override ulong Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
+
+                if (Utf8Parser.TryParse(span, out ulong number, out var bytesConsumed) && span.Length == bytesConsumed)
+                    return number;
+
+                if (ulong.TryParse(reader.GetString(), out number))
+                    return number;
+            }
+
             return reader.GetUInt64();
         }
 
@@ -17,4 +31,31 @@ public override void Write(Utf8JsonWriter writer, ulong value, JsonSerializerOpt
             writer.WriteStringValue(value.ToString());
         }
     }
+
+    public class NullableSnowflakeConverter : JsonConverter<ulong?>
+    {
+        public override ulong? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
+
+                if (Utf8Parser.TryParse(span, out ulong number, out var bytesConsumed) && span.Length == bytesConsumed)
+                    return number;
+
+                if (ulong.TryParse(reader.GetString(), out number))
+                    return number;
+            }
+
+            if (reader.TryGetUInt64(out var snowflake))
+                return snowflake;
+
+            return null;
+        }
+
+        public override void Write(Utf8JsonWriter writer, ulong? value, JsonSerializerOptions options)
+        {
+            writer.WriteStringValue(value?.ToString());
+        }
+    }
 }

Alderto.Web/Startup.cs

@@ -93,6 +93,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddMvcCore().AddJsonOptions(options =>
             {
                 options.JsonSerializerOptions.Converters.Add(new SnowflakeConverter());
+                options.JsonSerializerOptions.Converters.Add(new NullableSnowflakeConverter());
             });
 
             // In production, the Angular files will be served from this directory