fix OnPing

Author: doghappy

src/SocketIOClient/SocketIO.cs

@@ -101,7 +101,6 @@ public Uri ServerUri
         List<OnAnyHandler> _onAnyHandlers;
         Dictionary<string, Action<SocketIOResponse>> _eventHandlers;
         CancellationTokenSource _connectionTokenSorce;
-        DateTime _pingTime;
         double _reconnectionDelay;
 
 
@@ -169,7 +168,8 @@ private void CreateRouterIfNull()
                     Namespace = Namespace,
                     Path = Options.Path,
                     ServerUri = ServerUri,
-                    JsonSerializer = JsonSerializer
+                    JsonSerializer = JsonSerializer,
+                    ConnectionTimeout = Options.ConnectionTimeout
                 };
                 if (Options.Query != null)
                 {
@@ -206,7 +206,7 @@ public async Task ConnectAsync()
                 }
                 catch (Exception e)
                 {
-                    if (e is TimeoutException || e is WebSocketException || e is HttpRequestException)
+                    if (e is TimeoutException || e is WebSocketException || e is HttpRequestException || e is TimeoutException)
                     {
                         if (!Options.Reconnection)
                         {
@@ -247,9 +247,10 @@ private async void PingHandler()
         {
             try
             {
-                _pingTime = DateTime.Now;
+                OnPing?.Invoke(this, EventArgs.Empty);
+                DateTime pingTime = DateTime.Now;
                 await Router.SendAsync(new PongMessage(), CancellationToken.None).ConfigureAwait(false);
-                OnPong?.Invoke(this, DateTime.Now - _pingTime);
+                OnPong?.Invoke(this, DateTime.Now - pingTime);
             }
             catch (Exception e)
             {
@@ -258,11 +259,6 @@ private async void PingHandler()
             }
         }
 
-        private void PongHandler()
-        {
-            OnPong?.Invoke(this, DateTime.Now - _pingTime);
-        }
-
         private void ConnectedHandler(ConnectedMessage msg)
         {
             Id = msg.Sid;
@@ -380,7 +376,7 @@ private void OnMessageReceived(IMessage msg)
                         PingHandler();
                         break;
                     case MessageType.Pong:
-                        PongHandler();
+                        //PongHandler();
                         break;
                     case MessageType.Connected:
                         ConnectedHandler(msg as ConnectedMessage);

src/SocketIOClient/SocketIOOptions.cs

@@ -7,7 +7,7 @@ public sealed class SocketIOOptions
     {
         public SocketIOOptions()
         {
-            RandomizationFactor = new Random().NextDouble();
+            RandomizationFactor = 0.5;
             ReconnectionDelay = 1000;
             ReconnectionDelayMax = 5000;
             ReconnectionAttempts = int.MaxValue;
@@ -21,7 +21,7 @@ public SocketIOOptions()
 
         public TimeSpan ConnectionTimeout { get; set; }
 
-        public Dictionary<string, string> Query { get; set; }
+        public IEnumerable<KeyValuePair<string, string>> Query { get; set; }
 
         /// <summary>
         /// Whether to allow reconnection if accidentally disconnected