Merge branch 'master' of github.com:doghappy/socket.io-client-csharp into master

Author: doghappy

src/SocketIOClient.Test/SocketIOTests/EmitTest.cs

@@ -287,7 +287,7 @@ public virtual async Task EmitWith1ParamsObject()
             Assert.AreEqual(97, result.A);
             Assert.AreEqual("b", result.B);
             Assert.AreEqual("d", result.C.D);
-            Assert.AreEqual("2.71828182846", result.C.E.ToString());
+            Assert.AreEqual(2.71828182846, result.C.E);
         }
 
         public virtual async Task EmitWith1ParamsBytes()
@@ -531,7 +531,7 @@ public virtual async Task EmitWith2ParamsStringObject()
             Assert.AreEqual(97, result1.A);
             Assert.AreEqual("b", result1.B);
             Assert.AreEqual("d", result1.C.D);
-            Assert.AreEqual("2.71828182846", result1.C.E.ToString());
+            Assert.AreEqual(2.71828182846, result1.C.E);
         }
 
         public virtual async Task EmitWith2ParamsBytes()
@@ -651,7 +651,7 @@ await client.EmitAsync("2 params | cb: 2 params", response =>
             Assert.AreEqual(97, model.A);
             Assert.AreEqual("b", model.B);
             Assert.AreEqual("d", model.C.D);
-            Assert.AreEqual("2.71828182846", model.C.E.ToString());
+            Assert.AreEqual(2.71828182846, model.C.E);
         }
 
         public virtual async Task TwoParams_TwoParams_2Binary()

src/SocketIOClient/Processors/PingProcessor.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 
 namespace SocketIOClient.Processors
 {
@@ -8,10 +9,22 @@ public override async void Process(MessageContext ctx)
         {
             if (ctx.SocketIO.Options.EIO == 4)
             {
-                ctx.SocketIO.InvokePing();
-                DateTime pingTime = DateTime.Now;
-                await ctx.SocketIO.Socket.SendMessageAsync("3");
-                ctx.SocketIO.InvokePong(DateTime.Now - pingTime);
+                try
+                {
+                    ctx.SocketIO.InvokePing();
+                    DateTime pingTime = DateTime.Now;
+                    await ctx.SocketIO.Socket.SendMessageAsync("3");
+                    ctx.SocketIO.InvokePong(DateTime.Now - pingTime);
+                }
+                catch (System.Net.WebSockets.WebSocketException e)
+                {
+                    ctx.SocketIO.InvokeDisconnect(e.Message);
+                }
+                catch (Exception ex)
+                {
+                    Trace.TraceError(ex.ToString());
+                }
+                
             }
         }
     }

src/SocketIOClient/SocketIO.cs

@@ -1,6 +1,7 @@
 using SocketIOClient.ConnectInterval;
 using SocketIOClient.EioHandler;
 using SocketIOClient.EventArguments;
+using SocketIOClient.Exceptions;
 using SocketIOClient.JsonSerializer;
 using SocketIOClient.Response;
 using SocketIOClient.WebSocketClient;
@@ -112,6 +113,8 @@ public Uri ServerUri
 
         public IJsonSerializer JsonSerializer { get; set; }
 
+        static readonly SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(1, 1);
+
         #region Socket.IO event
         public event EventHandler OnConnected;
         //public event EventHandler<string> OnConnectError;
@@ -299,15 +302,27 @@ private async Task EmityCoreAsync(string eventName, int packetId, string data, C
             }
             builder.Append(']');
             string message = builder.ToString();
-            await Socket.SendMessageAsync(message, cancellationToken);
-            if (OutGoingBytes.Count > 0)
+            try
             {
-                foreach (var item in OutGoingBytes)
+                await Socket.SendMessageAsync(message, cancellationToken);
+                if (OutGoingBytes.Count > 0)
                 {
-                    await Socket.SendMessageAsync(item, cancellationToken);
+                    foreach (var item in OutGoingBytes)
+                    {
+                        await Socket.SendMessageAsync(item, cancellationToken);
+                    }
+                    OutGoingBytes.Clear();
                 }
-                OutGoingBytes.Clear();
             }
+            catch (System.Net.WebSockets.WebSocketException e)
+            {
+                this.InvokeDisconnect(e.Message);
+            }
+            catch (InvalidSocketStateException e)
+            {
+                this.InvokeDisconnect(e.Message);
+            }
+            
         }
 
         internal async Task EmitCallbackAsync(int packetId, params object[] data)
@@ -364,8 +379,16 @@ public async Task EmitAsync(string eventName, params object[] data)
 
         public async Task EmitAsync(string eventName, CancellationToken cancellationToken, params object[] data)
         {
-            string dataString = GetDataString(data);
-            await EmityCoreAsync(eventName, -1, dataString, cancellationToken);
+            await _semaphoreSlim.WaitAsync();
+            try
+            {
+                string dataString = GetDataString(data);
+                await EmityCoreAsync(eventName, -1, dataString, cancellationToken);
+            }
+            finally
+            {
+                _semaphoreSlim.Release();
+            }
         }
 
         /// <summary>
@@ -382,9 +405,17 @@ public async Task EmitAsync(string eventName, Action<SocketIOResponse> ack, para
 
         public async Task EmitAsync(string eventName, CancellationToken cancellationToken, Action<SocketIOResponse> ack, params object[] data)
         {
-            Acks.Add(++PacketId, ack);
-            string dataString = GetDataString(data);
-            await EmityCoreAsync(eventName, PacketId, dataString, cancellationToken);
+            await _semaphoreSlim.WaitAsync();
+            try
+            {
+                Acks.Add(++PacketId, ack);
+                string dataString = GetDataString(data);
+                await EmityCoreAsync(eventName, PacketId, dataString, cancellationToken);
+            }
+            finally
+            {
+                _semaphoreSlim.Release();
+            }
         }
 
         internal void Open(OpenResponse openResponse)