directly ref options to ensure that it can be updated

Author: doghappy

src/SocketIOClient/SocketIO.cs

@@ -162,32 +162,15 @@ private void Initialize()
             };
         }
 
-        internal static bool IsNamespaceDefault(string @namespace)
-        {
-            return string.IsNullOrEmpty(@namespace) || @namespace.Equals("/");
-        }
-
         private void CreateRouterIfNull()
         {
             if (Router == null)
             {
-                Router = new TransportRouter(HttpClient, ClientWebSocketProvider)
+                Router = new TransportRouter(HttpClient, ClientWebSocketProvider, Options)
                 {
-                    AutoUpgrade = Options.AutoUpgrade,
                     Namespace = Namespace,
-                    Path = Options.Path,
-                    ServerUri = ServerUri,
-                    ConnectionTimeout = Options.ConnectionTimeout
+                    ServerUri = ServerUri
                 };
-                if (Options.Query != null)
-                {
-                    var kvs = new List<KeyValuePair<string, string>>();
-                    foreach (var item in Options.Query)
-                    {
-                        kvs.Add(new KeyValuePair<string, string>(item.Key, item.Value));
-                    }
-                    Router.QueryParams = kvs;
-                }
                 Router.OnMessageReceived = OnMessageReceived;
                 Router.OnTransportClosed = OnTransportClosed;
             }

src/SocketIOClient/Transport/TransportRouter.cs

@@ -1,5 +1,4 @@
-using SocketIOClient.JsonSerializer;
-using SocketIOClient.Messages;
+using SocketIOClient.Messages;
 using SocketIOClient.UriConverters;
 using System;
 using System.Collections.Generic;
@@ -14,20 +13,20 @@ namespace SocketIOClient.Transport
 {
     public class TransportRouter : IDisposable
     {
-        public TransportRouter(HttpClient httpClient, Func<IClientWebSocket> clientWebSocketProvider)
+        public TransportRouter(HttpClient httpClient, Func<IClientWebSocket> clientWebSocketProvider, SocketIOOptions options)
         {
             _httpClient = httpClient;
             _clientWebSocketProvider = clientWebSocketProvider;
             UriConverter = new UriConverter();
-            Path = "/socket.io";
-            ConnectionTimeout = TimeSpan.FromSeconds(20);
             _messageQueue = new Queue<IMessage>();
+            _options = options;
         }
 
         readonly HttpClient _httpClient;
         IClientWebSocket _clientWebSocket;
         readonly Queue<IMessage> _messageQueue;
         readonly Func<IClientWebSocket> _clientWebSocketProvider;
+        readonly SocketIOOptions _options;
 
         HttpTransport _httpTransport;
         WebSocketTransport _webSocketTransport;
@@ -37,16 +36,8 @@ public TransportRouter(HttpClient httpClient, Func<IClientWebSocket> clientWebSo
 
         public Uri ServerUri { get; set; }
 
-        public string Path { get; set; }
-
         public string Namespace { get; set; }
 
-        public bool AutoUpgrade { get; set; }
-
-        public IEnumerable<KeyValuePair<string, string>> QueryParams { get; set; }
-
-        public TimeSpan ConnectionTimeout { get; set; }
-
         public TransportProtocol Protocol { get; private set; }
 
         public string Sid { get; private set; }
@@ -63,11 +54,11 @@ public async Task ConnectAsync()
             {
                 _webSocketTransport.Dispose();
             }
-            Uri uri = UriConverter.GetHandshakeUri(ServerUri, Path, QueryParams);
+            Uri uri = UriConverter.GetHandshakeUri(ServerUri, _options.Path, _options.Query);
 
             var req = new HttpRequestMessage(HttpMethod.Get, uri);
 
-            var resMsg = await _httpClient.SendAsync(req, new CancellationTokenSource(ConnectionTimeout).Token).ConfigureAwait(false);
+            var resMsg = await _httpClient.SendAsync(req, new CancellationTokenSource(_options.ConnectionTimeout).Token).ConfigureAwait(false);
             if (!resMsg.IsSuccessStatusCode)
             {
                 throw new HttpRequestException($"Response status code does not indicate success: {resMsg.StatusCode}");
@@ -77,15 +68,15 @@ public async Task ConnectAsync()
             int index = text.IndexOf('{');
             string json = text.Substring(index);
 
-            var doc= JsonDocument.Parse(json).RootElement;
+            var doc = JsonDocument.Parse(json).RootElement;
             Sid = doc.GetProperty("sid").GetString();
             string upgrades = doc.GetProperty("upgrades").GetRawText();
-            if (upgrades.Contains("websocket") && AutoUpgrade)
+            if (upgrades.Contains("websocket") && _options.AutoUpgrade)
             {
                 _clientWebSocket = _clientWebSocketProvider();
                 _webSocketTransport = new WebSocketTransport(_clientWebSocket)
                 {
-                    ConnectionTimeout = ConnectionTimeout
+                    ConnectionTimeout = _options.ConnectionTimeout
                 };
                 await WebSocketConnectAsync().ConfigureAwait(false);
                 Protocol = TransportProtocol.WebSocket;
@@ -101,7 +92,7 @@ public async Task ConnectAsync()
 
         private async Task WebSocketConnectAsync()
         {
-            Uri uri = UriConverter.GetWebSocketUri(ServerUri, Path, QueryParams, Sid);
+            Uri uri = UriConverter.GetWebSocketUri(ServerUri, _options.Path, _options.Query, Sid);
             await _webSocketTransport.ConnectAsync(uri).ConfigureAwait(false);
             _webSocketTransport.OnTextReceived = OnWebSocketTextReceived;
             _webSocketTransport.OnBinaryReceived = OnBinaryReceived;