[browser][websockets] Support for CloseOutputAsync

src/libraries/System.Net.WebSockets.Client/src/System/Net/WebSockets/WebSocketHandle.Browser.cs

@@ -24,6 +24,7 @@ public void Dispose()
 
         public void Abort()
         {
+            _abortSource.Cancel();
             WebSocket?.Abort();
         }
 
@@ -67,7 +68,7 @@ public async Task ConnectAsync(Uri uri, CancellationToken cancellationToken, Cli
                     case OperationCanceledException _ when cancellationToken.IsCancellationRequested:
                         throw;
                     default:
-                        throw new WebSocketException(SR.net_webstatus_ConnectFailure, exc);
+                        throw new WebSocketException(WebSocketError.Faulted, SR.net_webstatus_ConnectFailure, exc);
                 }
             }
         }

src/libraries/System.Net.WebSockets.Client/tests/AbortTest.cs

@@ -17,7 +17,6 @@ public AbortTest(ITestOutputHelper output) : base(output) { }
 
         [OuterLoop]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45674", TestPlatforms.Browser)]
         public async Task Abort_ConnectAndAbort_ThrowsWebSocketExceptionWithmessage(Uri server)
         {
             using (var cws = new ClientWebSocket())
@@ -43,7 +42,6 @@ public async Task Abort_ConnectAndAbort_ThrowsWebSocketExceptionWithmessage(Uri
 
         [OuterLoop]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45674", TestPlatforms.Browser)]
         public async Task Abort_SendAndAbort_Success(Uri server)
         {
             await TestCancellation(async (cws) =>
@@ -64,7 +62,6 @@ await TestCancellation(async (cws) =>
 
         [OuterLoop]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45674", TestPlatforms.Browser)]
         public async Task Abort_ReceiveAndAbort_Success(Uri server)
         {
             await TestCancellation(async (cws) =>
@@ -89,7 +86,6 @@ await cws.SendAsync(
 
         [OuterLoop]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45674", TestPlatforms.Browser)]
         public async Task Abort_CloseAndAbort_Success(Uri server)
         {
             await TestCancellation(async (cws) =>
@@ -114,7 +110,6 @@ await cws.SendAsync(
 
         [OuterLoop]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45468", TestPlatforms.Browser)]
         public async Task ClientWebSocket_Abort_CloseOutputAsync(Uri server)
         {
             await TestCancellation(async (cws) =>

src/libraries/System.Net.WebSockets.Client/tests/CancelTest.cs

@@ -91,7 +91,6 @@ await cws.SendAsync(
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45468", TestPlatforms.Browser)]
         public async Task CloseOutputAsync_Cancel_Success(Uri server)
         {
             await TestCancellation(async (cws) =>
@@ -131,7 +130,6 @@ public async Task ReceiveAsync_CancelThenReceive_ThrowsOperationCanceledExceptio
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45674", TestPlatforms.Browser)]
         public async Task ReceiveAsync_ReceiveThenCancel_ThrowsOperationCanceledException(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
@@ -148,7 +146,6 @@ public async Task ReceiveAsync_ReceiveThenCancel_ThrowsOperationCanceledExceptio
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45674", TestPlatforms.Browser)]
         public async Task ReceiveAsync_AfterCancellationDoReceiveAsync_ThrowsWebSocketException(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))

src/libraries/System.Net.WebSockets.Client/tests/ClientWebSocketTestBase.cs

@@ -26,6 +26,7 @@ public class ClientWebSocketTestBase
         }).ToArray();
 
         public const int TimeOutMilliseconds = 20000;
+        public const int BrowserTimeOutMilliseconds = 30000;
         public const int CloseDescriptionMaxLength = 123;
         public readonly ITestOutputHelper _output;
 

src/libraries/System.Net.WebSockets.Client/tests/CloseTest.cs

@@ -158,13 +158,55 @@ public async Task CloseAsync_CloseDescriptionIsNull_Success(Uri server)
 
                 await cws.CloseAsync(closeStatus, closeDescription, cts.Token);
                 Assert.Equal(closeStatus, cws.CloseStatus);
+            }
+        }
+
+        [OuterLoop("Uses external server")]
+        [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
+        public async Task CloseOutputAsync_ExpectedStates(Uri server)
+        {
+            using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
+            {
+                var cts = new CancellationTokenSource(TimeOutMilliseconds);
+
+                var closeStatus = WebSocketCloseStatus.NormalClosure;
+                string closeDescription = null;
+
+                await cws.CloseOutputAsync(closeStatus, closeDescription, cts.Token);
+                Assert.True(
+                    cws.State == WebSocketState.CloseSent || cws.State == WebSocketState.Closed,
+                    $"Expected CloseSent or Closed, got {cws.State}");
+                Assert.True(string.IsNullOrEmpty(cws.CloseStatusDescription));
+            }
+        }
+
+        [OuterLoop("Uses external server")]
+        [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
+        public async Task CloseAsync_CloseOutputAsync_Throws(Uri server)
+        {
+            using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
+            {
+                var cts = new CancellationTokenSource(TimeOutMilliseconds);
+
+                var closeStatus = WebSocketCloseStatus.NormalClosure;
+                string closeDescription = null;
+
+                await cws.CloseAsync(closeStatus, closeDescription, cts.Token);
+                Assert.True(
+                    cws.State == WebSocketState.CloseSent || cws.State == WebSocketState.Closed,
+                    $"Expected CloseSent or Closed, got {cws.State}");
+                Assert.True(string.IsNullOrEmpty(cws.CloseStatusDescription));
+                await Assert.ThrowsAnyAsync<WebSocketException>(async () =>
+                    { await cws.CloseOutputAsync(closeStatus, closeDescription, cts.Token); });
+                Assert.True(
+                    cws.State == WebSocketState.CloseSent || cws.State == WebSocketState.Closed,
+                    $"Expected CloseSent or Closed, got {cws.State}");
                 Assert.True(string.IsNullOrEmpty(cws.CloseStatusDescription));
             }
         }
 
         [OuterLoop("Uses external server")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45468", TestPlatforms.Browser)]
         public async Task CloseOutputAsync_ClientInitiated_CanReceive_CanClose(Uri server)
         {
             string message = "Hello WebSockets!";
@@ -173,15 +215,16 @@ public async Task CloseOutputAsync_ClientInitiated_CanReceive_CanClose(Uri serve
             {
                 var cts = new CancellationTokenSource(TimeOutMilliseconds);
 
-                var closeStatus = WebSocketCloseStatus.InvalidPayloadData;
+                // See issue for Browser websocket differences https://github.com/dotnet/runtime/issues/45538
+                var closeStatus = PlatformDetection.IsBrowser ? WebSocketCloseStatus.NormalClosure : WebSocketCloseStatus.InvalidPayloadData;
                 string closeDescription = "CloseOutputAsync_Client_InvalidPayloadData";
 
                 await cws.SendAsync(WebSocketData.GetBufferFromText(message), WebSocketMessageType.Text, true, cts.Token);
                 // Need a short delay as per WebSocket rfc6455 section 5.5.1 there isn't a requirement to receive any
                 // data fragments after a close has been sent. The delay allows the received data fragment to be
                 // available before calling close. The WinRT MessageWebSocket implementation doesn't allow receiving
                 // after a call to Close.
-                await Task.Delay(100);
+                await Task.Delay(PlatformDetection.IsBrowser ? 500 : 100); // default timeout is not enough for browser sometimes so we will extend it
                 await cws.CloseOutputAsync(closeStatus, closeDescription, cts.Token);
 
                 // Should be able to receive the message echoed by the server.
@@ -251,7 +294,6 @@ await cws.SendAsync(
 
         [OuterLoop("Uses external server")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45468", TestPlatforms.Browser)]
         public async Task CloseOutputAsync_CloseDescriptionIsNull_Success(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))

src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs

@@ -88,7 +88,7 @@ public async Task SendReceive_PartialMessageDueToSmallReceiveBuffer_Success(Uri
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45586", TestPlatforms.Browser)]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/46983", TestPlatforms.Browser)]  // JS Websocket does not support see issue
         public async Task SendReceive_PartialMessageBeforeCompleteMessageArrives_Success(Uri server)
         {
             var rand = new Random();
@@ -131,7 +131,6 @@ public async Task SendReceive_PartialMessageBeforeCompleteMessageArrives_Success
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45586", TestPlatforms.Browser)]
         public async Task SendAsync_SendCloseMessageType_ThrowsArgumentExceptionWithMessage(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
@@ -219,12 +218,13 @@ public async Task SendAsync_MultipleOutstandingSendOperations_Throws(Uri server)
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45586", TestPlatforms.Browser)]
         public async Task ReceiveAsync_MultipleOutstandingReceiveOperations_Throws(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
             {
-                var cts = new CancellationTokenSource(TimeOutMilliseconds);
+                // It seems that sometimes the default timeout is not enough for browser so we will extend it
+                // See issue https://github.com/dotnet/runtime/issues/46909
+                var cts = PlatformDetection.IsBrowser ? new CancellationTokenSource(BrowserTimeOutMilliseconds) : new CancellationTokenSource(TimeOutMilliseconds);
 
                 Task[] tasks = new Task[2];
 
@@ -284,7 +284,6 @@ await SendAsync(
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45586", TestPlatforms.Browser)]
         public async Task SendAsync_SendZeroLengthPayloadAsEndOfMessage_Success(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
@@ -329,7 +328,10 @@ public async Task SendReceive_VaryingLengthBuffers_Success(Uri server)
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))
             {
                 var rand = new Random();
-                var ctsDefault = new CancellationTokenSource(TimeOutMilliseconds);
+
+                // It seems that sometimes the default timeout is not enough for browser so we will extend it
+                // See issue https://github.com/dotnet/runtime/issues/46909
+                var ctsDefault = PlatformDetection.IsBrowser ? new CancellationTokenSource(BrowserTimeOutMilliseconds) : new CancellationTokenSource(TimeOutMilliseconds);
 
                 // Values chosen close to boundaries in websockets message length handling as well
                 // as in vectors used in mask application.
@@ -463,7 +465,6 @@ await LoopbackServer.CreateServerAsync(async (server, url) =>
 
         [OuterLoop("Uses external servers")]
         [ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/45586", TestPlatforms.Browser)]
         public async Task ZeroByteReceive_CompletesWhenDataAvailable(Uri server)
         {
             using (ClientWebSocket cws = await WebSocketHelper.GetConnectedWebSocket(server, TimeOutMilliseconds, _output))