fix: disconnect reason

doghappy · doghappy · commit 6b62ba681401 · 2021-08-03T19:07:31.000+08:00
[skip ci]
diff --git a/src/SocketIOClient.Windows7/ClientWebSocketManaged.cs b/src/SocketIOClient.Windows7/ClientWebSocketManaged.cs
@@ -145,8 +145,8 @@ public async Task SendMessageAsync(byte[] bytes, CancellationToken cancellationT
 
         public async Task DisconnectAsync()
         {
-            await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
             OnClosed("io client disconnect");
+            await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
         }
 
         private async Task ListenAsync(CancellationToken cancellationToken)
diff --git a/src/SocketIOClient/SocketIO.cs b/src/SocketIOClient/SocketIO.cs
@@ -245,24 +245,18 @@ public async Task DisconnectAsync()
         {
             if (Connected && !Disconnected)
             {
-                if (Options.EIO == 3)
-                {
-                    _pingTokenSorce.Cancel();
-                }
                 try
                 {
                     await Socket.SendMessageAsync("41" + Namespace + ',');
                 }
                 catch (Exception ex) { Trace.WriteLine(ex.Message); }
-                Connected = false;
-                Disconnected = true;
                 try
                 {
                     await Socket.DisconnectAsync();
                 }
-                catch (Exception ex) { Trace.WriteLine(ex.Message); }
-                finally
+                catch (Exception ex)
                 {
+                    Trace.WriteLine(ex.Message);
                     await InvokeDisconnectAsync("io client disconnect");
                 }
             }
diff --git a/src/SocketIOClient/WebSocketClient/ClientWebSocket.cs b/src/SocketIOClient/WebSocketClient/ClientWebSocket.cs
@@ -147,8 +147,8 @@ public async Task SendMessageAsync(byte[] bytes, CancellationToken cancellationT
 
         public async Task DisconnectAsync()
         {
-            await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
             OnClosed("io client disconnect");
+            await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
         }
 
         private async Task ListenAsync(CancellationToken cancellationToken)

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ public async Task SendMessageAsync(byte[] bytes, CancellationToken cancellationT`
`145`	`145`
`146`	`146`	`public async Task DisconnectAsync()`
`147`	`147`	`{`
`148`		`- await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);`
`149`	`148`	`OnClosed("io client disconnect");`
	`149`	`+ await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`private async Task ListenAsync(CancellationToken cancellationToken)`
Original file line number	Diff line number	Diff line change
`@@ -245,24 +245,18 @@ public async Task DisconnectAsync()`
`245`	`245`	`{`
`246`	`246`	`if (Connected && !Disconnected)`
`247`	`247`	`{`
`248`		`- if (Options.EIO == 3)`
`249`		`- {`
`250`		`- _pingTokenSorce.Cancel();`
`251`		`- }`
`252`	`248`	`try`
`253`	`249`	`{`
`254`	`250`	`await Socket.SendMessageAsync("41" + Namespace + ',');`
`255`	`251`	`}`
`256`	`252`	`catch (Exception ex) { Trace.WriteLine(ex.Message); }`
`257`		`- Connected = false;`
`258`		`- Disconnected = true;`
`259`	`253`	`try`
`260`	`254`	`{`
`261`	`255`	`await Socket.DisconnectAsync();`
`262`	`256`	`}`
`263`		`- catch (Exception ex) { Trace.WriteLine(ex.Message); }`
`264`		`- finally`
	`257`	`+ catch (Exception ex)`
`265`	`258`	`{`
	`259`	`+ Trace.WriteLine(ex.Message);`
`266`	`260`	`await InvokeDisconnectAsync("io client disconnect");`
`267`	`261`	`}`
`268`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,8 @@ public async Task SendMessageAsync(byte[] bytes, CancellationToken cancellationT`
`147`	`147`
`148`	`148`	`public async Task DisconnectAsync()`
`149`	`149`	`{`
`150`		`- await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);`
`151`	`150`	`OnClosed("io client disconnect");`
	`151`	`+ await _ws.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`private async Task ListenAsync(CancellationToken cancellationToken)`