fix integration tests

Author: doghappy

src/SocketIOClient.Test/SocketIOTests/OffTest.cs

@@ -25,6 +25,7 @@ public async virtual Task Test()
             await Task.Delay(200);
             Assert.AreEqual($"{SocketIOCreator.Prefix}.net core", result);
             Assert.AreEqual(1, hiCount);
+            await Task.Delay(200);
 
             client.Off("hi");
             await client.EmitAsync("hi", ".net core 1");

src/SocketIOClient/Messages/ErrorMessage.cs

@@ -25,14 +25,21 @@ public class ErrorMessage : IMessage
 
         public void Read(string msg)
         {
-            int index = msg.IndexOf('{');
-            if (index > 0)
+            if (Eio == 3)
             {
-                Namespace = msg.Substring(0, index - 1);
-                msg = msg.Substring(index);
+                Message = msg.Trim('"');
+            }
+            else
+            {
+                int index = msg.IndexOf('{');
+                if (index > 0)
+                {
+                    Namespace = msg.Substring(0, index - 1);
+                    msg = msg.Substring(index);
+                }
+                var doc = JsonDocument.Parse(msg);
+                Message = doc.RootElement.GetProperty("message").GetString();
             }
-            var doc = JsonDocument.Parse(msg);
-            Message = doc.RootElement.GetProperty("message").GetString();
         }
 
         public string Write()

src/SocketIOClient/Transport/TransportRouter.cs

@@ -80,7 +80,7 @@ public async Task ConnectAsync()
             if (openedMessage.Upgrades.Contains("websocket") && _options.AutoUpgrade)
             {
                 _clientWebSocket = _clientWebSocketProvider();
-                _webSocketTransport = new WebSocketTransport(_clientWebSocket)
+                _webSocketTransport = new WebSocketTransport(_clientWebSocket, Eio)
                 {
                     ConnectionTimeout = _options.ConnectionTimeout
                 };
@@ -233,6 +233,10 @@ private async void OnTextReceived(string text)
                                 }
                                 _ = Task.Factory.StartNew(PingAsync, TaskCreationOptions.LongRunning);
                             }
+                            else
+                            {
+                                return;
+                            }
                         }
                         else if (msg.Type == MessageType.Pong)
                         {

src/SocketIOClient/Transport/WebSocketTransport.cs

@@ -9,8 +9,9 @@ namespace SocketIOClient.Transport
 {
     public class WebSocketTransport : IReceivable, IDisposable
     {
-        public WebSocketTransport(IClientWebSocket ws)
+        public WebSocketTransport(IClientWebSocket ws, int eio)
         {
+            _eio = eio;
             _ws = ws;
             ReceiveChunkSize = 1024 * 8;
             SendChunkSize = 1024 * 8;
@@ -27,6 +28,7 @@ public WebSocketTransport(IClientWebSocket ws)
         public Action<byte[]> OnBinaryReceived { get; set; }
         public Action<Exception> OnAborted { get; set; }
 
+        readonly int _eio;
         readonly IClientWebSocket _ws;
         readonly CancellationTokenSource _listenCancellation;
 
@@ -53,7 +55,17 @@ public async Task DisconnectAsync(CancellationToken cancellationToken)
         /// <exception cref="TaskCanceledException"></exception>
         public async Task SendAsync(byte[] bytes, CancellationToken cancellationToken)
         {
-            await SendAsync(WebSocketMessageType.Binary, bytes, cancellationToken);
+            if (_eio == 3)
+            {
+                byte[] buffer = new byte[bytes.Length + 1];
+                buffer[0] = 4;
+                Buffer.BlockCopy(bytes, 0, buffer, 1, bytes.Length);
+                await SendAsync(WebSocketMessageType.Binary, buffer, cancellationToken);
+            }
+            else
+            {
+                await SendAsync(WebSocketMessageType.Binary, bytes, cancellationToken);
+            }
         }
 
         private async Task SendAsync(WebSocketMessageType type, byte[] bytes, CancellationToken cancellationToken)
@@ -135,8 +147,17 @@ private async Task ListenAsync()
                         OnTextReceived(text);
                         break;
                     case WebSocketMessageType.Binary:
-                        byte[] bytes = new byte[count];
-                        Buffer.BlockCopy(buffer, 0, bytes, 0, bytes.Length);
+                        byte[] bytes;
+                        if (_eio == 3)
+                        {
+                            bytes = new byte[count - 1];
+                            Buffer.BlockCopy(buffer, 1, bytes, 0, bytes.Length);
+                        }
+                        else
+                        {
+                            bytes = new byte[count];
+                            Buffer.BlockCopy(buffer, 0, bytes, 0, bytes.Length);
+                        }
                         OnBinaryReceived(bytes);
                         break;
                     case WebSocketMessageType.Close:

src/socket.io-server-v2/app.js

@@ -25,16 +25,19 @@ io.on('connection', socket => {
         socket.emit('hi', prefix + msg);
     });
 
+    socket.on('headers', cb => {
+        cb(socket.request.headers)
+    });
+
     socket.on('welcome', () => {
-        socket.emit('welcome', Buffer.from("welcome " + socket.id, 'utf8'));
+        socket.emit('welcome', Buffer.from("welcome " + socket.id, 'utf8'), Buffer.from("test", 'utf8'));
     });
 
     socket.on("no params", () => {
         socket.emit("no params");
     });
 
     socket.on("1 params", p1 => {
-        console.log(p1);
         socket.emit("1 params", p1);
     });