Merge pull request #84 from dave30406/main

update SocketIOClient to 3.0.8

Author: itisnajim

Runtime/SocketIOClient.Newtonsoft.Json.meta

@@ -7,13 +7,28 @@ namespace SocketIOClient.Newtonsoft.Json
 {
     public class NewtonsoftJsonSerializer : IJsonSerializer
     {
-        public Func<JsonSerializerSettings> JsonSerializerOptions { get; }
+        public NewtonsoftJsonSerializer() : this(new JsonSerializerSettings())
+        {
+        }
+
+        public NewtonsoftJsonSerializer(JsonSerializerSettings settings)
+        {
+            _settings = settings;
+        }
+
+        private readonly JsonSerializerSettings _settings;
+
+        private JsonSerializerSettings NewSettings(ByteArrayConverter converter)
+        {
+            var settings = new JsonSerializerSettings(_settings);
+            settings.Converters.Add(converter);
+            return settings;
+        }
 
         public JsonSerializeResult Serialize(object[] data)
         {
             var converter = new ByteArrayConverter();
-            var settings = GetOptions();
-            settings.Converters.Add(converter);
+            var settings = NewSettings(converter);
             string json = JsonConvert.SerializeObject(data, settings);
             return new JsonSerializeResult
             {
@@ -24,43 +39,28 @@ public JsonSerializeResult Serialize(object[] data)
 
         public T Deserialize<T>(string json)
         {
-            var settings = GetOptions();
-            return JsonConvert.DeserializeObject<T>(json, settings);
+            return JsonConvert.DeserializeObject<T>(json, _settings);
+        }
+
+        public object Deserialize(string json, Type type)
+        {
+            return JsonConvert.DeserializeObject(json, type, _settings);
         }
 
         public T Deserialize<T>(string json, IList<byte[]> bytes)
         {
             var converter = new ByteArrayConverter();
             converter.Bytes.AddRange(bytes);
-            var settings = GetOptions();
-            settings.Converters.Add(converter);
+            var settings = NewSettings(converter);
             return JsonConvert.DeserializeObject<T>(json, settings);
         }
 
-        private JsonSerializerSettings GetOptions()
-        {
-            JsonSerializerSettings options;
-            if (OptionsProvider != null)
-            {
-                options = OptionsProvider();
-            }
-            else
-            {
-                options = CreateOptions();
-            }
-            if (options == null)
-            {
-                options = new JsonSerializerSettings();
-            }
-            return options;
-        }
-
-        [Obsolete("Use Options instead.")]
-        public virtual JsonSerializerSettings CreateOptions()
+        public object Deserialize(string json, Type type, IList<byte[]> bytes)
         {
-            return new JsonSerializerSettings();
+            var converter = new ByteArrayConverter();
+            converter.Bytes.AddRange(bytes);
+            var settings = NewSettings(converter);
+            return JsonConvert.DeserializeObject(json, type, settings);
         }
-
-        public Func<JsonSerializerSettings> OptionsProvider { get; set; }
     }
-}
+}

Runtime/SocketIOClient.Newtonsoft.Json/ByteArrayConverter.cs.meta

@@ -0,0 +1,8 @@
+namespace SocketIOClient
+{
+    public enum EngineIO
+    {
+        V3 = 3,
+        V4 = 4
+    }
+}

Runtime/SocketIOClient.Newtonsoft.Json/NewtonsoftJsonSerializer.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 
 namespace SocketIOClient