Skip to content

Commit 95d7b15

Browse files
authored
Merge pull request #204 from vintageluke/patch-1
Update TransportRouter.cs
2 parents 7d80e0e + 41f6f6a commit 95d7b15

File tree

3 files changed

+6
-26
lines changed

3 files changed

+6
-26
lines changed

src/SocketIOClient/SocketIO.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ private void CreateRouterIfNull()
177177
Namespace = Namespace,
178178
Path = Options.Path,
179179
ServerUri = ServerUri,
180-
JsonSerializer = JsonSerializer,
181180
ConnectionTimeout = Options.ConnectionTimeout
182181
};
183182
if (Options.Query != null)

src/SocketIOClient/Transport/HandshakeInfo.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/SocketIOClient/Transport/TransportRouter.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Diagnostics;
77
using System.Net.Http;
88
using System.Net.WebSockets;
9+
using System.Text.Json;
910
using System.Threading;
1011
using System.Threading.Tasks;
1112

@@ -52,8 +53,6 @@ public TransportRouter(HttpClient httpClient, Func<IClientWebSocket> clientWebSo
5253

5354
public IUriConverter UriConverter { get; set; }
5455

55-
public IJsonSerializer JsonSerializer { get; set; }
56-
5756
public Action<IMessage> OnMessageReceived { get; set; }
5857

5958
public Action OnTransportClosed { get; set; }
@@ -77,9 +76,11 @@ public async Task ConnectAsync()
7776

7877
int index = text.IndexOf('{');
7978
string json = text.Substring(index);
80-
var info = System.Text.Json.JsonSerializer.Deserialize<HandshakeInfo>(json);
81-
Sid = info.Sid;
82-
if (info.Upgrades.Contains("websocket") && AutoUpgrade)
79+
80+
var doc= JsonDocument.Parse(json).RootElement;
81+
Sid = doc.GetProperty("sid").GetString();
82+
string upgrades = doc.GetProperty("upgrades").GetRawText();
83+
if (upgrades.Contains("websocket") && AutoUpgrade)
8384
{
8485
_clientWebSocket = _clientWebSocketProvider();
8586
_webSocketTransport = new WebSocketTransport(_clientWebSocket)

0 commit comments

Comments
 (0)