Update SocketIO

ElectronSharp.API/BridgeConnector.cs

@@ -440,7 +440,7 @@ private static void EnsureSocketTaskIsCreated()
                             {
                                 var socket = new SocketIO($"http://localhost:{BridgeSettings.SocketPort}", new SocketIOOptions()
                                 {
-                                    EIO = 4,
+                                    EIO = EngineIO.V4,
                                     Reconnection = true,
                                     ReconnectionAttempts = int.MaxValue,
                                     ReconnectionDelay = 500,

ElectronSharp.API/SocketIO/EngineIO.cs

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

ElectronSharp.API/SocketIO/Exceptions/ConnectionException.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace SocketIOClient
+{
+    public class ConnectionException : Exception
+    {
+        public ConnectionException(string message, Exception innerException) : base(message, innerException) { }
+    }
+}

ElectronSharp.API/SocketIO/Exceptions/TransportException.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace SocketIOClient.Transport
+{
+    public class TransportException : Exception
+    {
+        public TransportException() : base() { }
+        public TransportException(string message) : base(message) { }
+        public TransportException(string message, Exception innerException) : base(message, innerException) { }
+    }
+}

ElectronSharp.API/SocketIO/Extensions/CancellationTokenSourceExtensions.cs

@@ -7,12 +7,22 @@ internal static class CancellationTokenSourceExtensions
     {
         public static void TryDispose(this CancellationTokenSource cts)
         {
-            cts?.Dispose();
+            try
+            {
+                cts?.Dispose();
+            }
+            catch
+            {
+                //Ignore
+            }
         }
 
         public static void TryCancel(this CancellationTokenSource cts)
         {
-            cts?.Cancel();
+            if (cts != null && !cts.IsCancellationRequested)
+            {
+                cts.TryCancel();
+            }
         }
     }
 }

ElectronSharp.API/SocketIO/Extensions/EventHandlerExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 
 namespace SocketIOClient.Extensions
 {
@@ -13,5 +14,25 @@ public static void TryInvoke(this EventHandler handler, object sender, EventArgs
         {
             handler?.Invoke(sender, args);
         }
+
+        public static void TryInvoke<T>(this Action<T> action, T arg1)
+        {
+            action?.Invoke(arg1);
+        }
+
+        public static async Task TryInvokeAsync<T>(this Func<T, Task> func, T arg1)
+        {
+            if (func is null)
+            {
+                return;
+            }
+
+            var task = func(arg1);
+
+            if(task is not null)
+            {
+                await task;
+            }
+        }
     }
 }

ElectronSharp.API/SocketIO/Messages/BinaryMessage.cs

@@ -5,7 +5,7 @@
 
 namespace SocketIOClient.Messages
 {
-    public class BinaryMessage : IMessage
+    public class BinaryMessage : IJsonMessage
     {
         public MessageType Type => MessageType.BinaryMessage;
 
@@ -21,7 +21,7 @@ public class BinaryMessage : IMessage
 
         public int BinaryCount { get; set; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/ClientAckMessage.cs

@@ -9,7 +9,7 @@ namespace SocketIOClient.Messages
     /// <summary>
     /// The server calls the client's callback
     /// </summary>
-    public class ClientAckMessage : IMessage
+    public class ClientAckMessage : IJsonMessage
     {
         public MessageType Type => MessageType.AckMessage;
 
@@ -29,7 +29,7 @@ public class ClientAckMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/ClientBinaryAckMessage.cs

@@ -9,7 +9,7 @@ namespace SocketIOClient.Messages
     /// <summary>
     /// The server calls the client's callback with binary
     /// </summary>
-    public class ClientBinaryAckMessage : IMessage
+    public class ClientBinaryAckMessage : IJsonMessage
     {
         public MessageType Type => MessageType.BinaryAckMessage;
 
@@ -25,7 +25,7 @@ public class ClientBinaryAckMessage : IMessage
 
         public int BinaryCount { get; set; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/ConnectedMessage.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
+using Microsoft.Extensions.ObjectPool;
 
 namespace SocketIOClient.Messages
 {
@@ -20,7 +21,7 @@ public class ConnectedMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 
@@ -29,7 +30,7 @@ public class ConnectedMessage : IMessage
 
         public void Read(string msg)
         {
-            if (Eio == 3)
+            if (EIO == EngineIO.V3)
             {
                 Eio3Read(msg);
             }
@@ -41,14 +42,14 @@ public void Read(string msg)
 
         public string Write()
         {
-            if (Eio == 3)
+            if (EIO == EngineIO.V3)
             {
                 return Eio3Write();
             }
             return Eio4Write();
         }
 
-        public void Eio4Read(string msg)
+        private void Eio4Read(string msg)
         {
             int index = msg.IndexOf('{');
             if (index > 0)
@@ -63,18 +64,26 @@ public void Eio4Read(string msg)
             Sid = JsonDocument.Parse(msg).RootElement.GetProperty("sid").GetString();
         }
 
-        public string Eio4Write()
+        private static ObjectPool<StringBuilder> _sbPool = new DefaultObjectPool<StringBuilder>(new StringBuilderPooledObjectPolicy());
+
+        private string Eio4Write()
         {
-            var builder = new StringBuilder("40");
+            var builder = _sbPool.Get();
+            builder.Append("40");
+
             if (!string.IsNullOrEmpty(Namespace))
             {
                 builder.Append(Namespace).Append(',');
             }
+
             builder.Append(AuthJsonStr);
-            return builder.ToString();
+
+            var final = builder.ToString();
+            _sbPool.Return(builder);
+            return final;
         }
 
-        public void Eio3Read(string msg)
+        private void Eio3Read(string msg)
         {
             if (msg.Length >= 2)
             {
@@ -96,14 +105,18 @@ public void Eio3Read(string msg)
             }
         }
 
-        public string Eio3Write()
+        private string Eio3Write()
         {
             if (string.IsNullOrEmpty(Namespace))
             {
                 return string.Empty;
             }
-            var builder = new StringBuilder("40");
+
+            var builder = _sbPool.Get();
+            builder.Append("40");
+
             builder.Append(Namespace);
+
             if (Query != null)
             {
                 int i = -1;
@@ -122,7 +135,9 @@ public string Eio3Write()
                 }
             }
             builder.Append(',');
-            return builder.ToString();
+            var final = builder.ToString();
+            _sbPool.Return(builder);
+            return final;
         }
     }
 }

ElectronSharp.API/SocketIO/Messages/DisconnectedMessage.cs

@@ -15,7 +15,7 @@ public class DisconnectedMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/ErrorMessage.cs

@@ -19,13 +19,13 @@ public class ErrorMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 
         public void Read(string msg)
         {
-            if (Eio == 3)
+            if (EIO == EngineIO.V3)
             {
                 Message = msg.Trim('"');
             }

ElectronSharp.API/SocketIO/Messages/EventMessage.cs

@@ -5,7 +5,7 @@
 
 namespace SocketIOClient.Messages
 {
-    public class EventMessage : IMessage
+    public class EventMessage : IJsonMessage
     {
         public MessageType Type => MessageType.EventMessage;
 
@@ -25,7 +25,7 @@ public class EventMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/IJsonMessage.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace SocketIOClient.Messages
+{
+    public interface IJsonMessage : IMessage
+    {
+        List<JsonElement> JsonElements { get; }
+    }
+}

ElectronSharp.API/SocketIO/Messages/IMessage.cs

@@ -13,7 +13,7 @@ public interface IMessage
 
         int BinaryCount { get; }
 
-        int Eio { get; set; }
+        EngineIO EIO { get; set; }
 
         TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/MessageFactory.cs

@@ -37,7 +37,7 @@ private static IMessage CreateMessage(MessageType type)
 
         private static readonly Dictionary<string, MessageType> _messageTypes = Enum.GetValues<MessageType>().ToDictionary(v => ((int)v).ToString(), v => v);
 
-        public static IMessage CreateMessage(int eio, string msg)
+        public static IMessage CreateMessage(EngineIO eio, string msg)
         {
             foreach (var (prefix,item) in _messageTypes)
             {
@@ -46,7 +46,7 @@ public static IMessage CreateMessage(int eio, string msg)
                     IMessage result = CreateMessage(item);
                     if (result != null)
                     {
-                        result.Eio = eio;
+                        result.EIO = eio;
                         result.Read(msg.Substring(prefix.Length));
                         return result;
                     }
@@ -60,12 +60,12 @@ public static OpenedMessage CreateOpenedMessage(string msg)
             var openedMessage = new OpenedMessage();
             if (msg[0] == '0')
             {
-                openedMessage.Eio = 4;
+                openedMessage.EIO = EngineIO.V4;
                 openedMessage.Read(msg.Substring(1));
             }
             else
             {
-                openedMessage.Eio = 3;
+                openedMessage.EIO = EngineIO.V3;
                 int index = msg.IndexOf(':');
                 openedMessage.Read(msg.Substring(index + 2));
             }

ElectronSharp.API/SocketIO/Messages/OpenedMessage.cs

@@ -25,7 +25,7 @@ public class OpenedMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/PingMessage.cs

@@ -13,7 +13,7 @@ public class PingMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/PongMessage.cs

@@ -14,7 +14,7 @@ public class PongMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }
 

ElectronSharp.API/SocketIO/Messages/ServerAckMessage.cs

@@ -23,7 +23,7 @@ public class ServerAckMessage : IMessage
 
         public int BinaryCount { get; }
 
-        public int Eio { get; set; }
+        public EngineIO EIO { get; set; }
 
         public TransportProtocol Protocol { get; set; }