ok

src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs

@@ -13,34 +13,22 @@ internal class WebSocketBuilder(Response response) : IWebSocketBuilder
 {
     private readonly List<(IMatcher matcher, List<WebSocketMessageBuilder> messages)> _conditionalMessages = [];
 
-    /// <inheritdoc />
     public string? AcceptProtocol { get; private set; }
 
-    /// <inheritdoc />
     public bool IsEcho { get; private set; }
 
-    /// <inheritdoc />
-    public bool IsBroadcast { get; private set; }
-
-    /// <inheritdoc />
     public Func<WebSocketMessage, IWebSocketContext, Task>? MessageHandler { get; private set; }
 
-    /// <inheritdoc />
     public ProxyAndRecordSettings? ProxySettings { get; private set; }
 
-    /// <inheritdoc />
     public TimeSpan? CloseTimeout { get; private set; }
 
-    /// <inheritdoc />
     public int? MaxMessageSize { get; private set; }
 
-    /// <inheritdoc />
     public int? ReceiveBufferSize { get; private set; }
 
-    /// <inheritdoc />
     public TimeSpan? KeepAliveIntervalSeconds { get; private set; }
 
-    /// <inheritdoc />
     public IWebSocketBuilder WithAcceptProtocol(string protocol)
     {
         AcceptProtocol = Guard.NotNull(protocol);
@@ -117,12 +105,6 @@ internal class WebSocketBuilder(Response response) : IWebSocketBuilder
         return this;
     }
 
-    public IWebSocketBuilder WithBroadcast()
-    {
-        IsBroadcast = true;
-        return this;
-    }
-
     public IWebSocketBuilder WithProxy(ProxyAndRecordSettings settings)
     {
         ProxySettings = Guard.NotNull(settings);

src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs

@@ -3,7 +3,6 @@
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.WebSockets;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace WireMock.WebSockets;
 
@@ -27,7 +26,7 @@ internal class WebSocketConnectionRegistry
     /// </summary>
     public void RemoveConnection(Guid connectionId)
     {
-        _connections.TryRemove(connectionId, out _);
+        _ = _connections.TryRemove(connectionId, out _);
     }
 
     /// <summary>
@@ -67,6 +66,6 @@ internal class WebSocketConnectionRegistry
     private IEnumerable<WireMockWebSocketContext> Filter(Guid? excludeConnectionId)
     {
         return _connections.Values
-            .Where(c =>c.WebSocket.State == WebSocketState.Open && (!excludeConnectionId.HasValue || c.ConnectionId != excludeConnectionId));
+            .Where(c => c.WebSocket.State == WebSocketState.Open && (!excludeConnectionId.HasValue || c.ConnectionId != excludeConnectionId));
     }
 }

src/WireMock.Net.Minimal/WebSockets/WireMockWebSocketContext.cs

@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Buffers;
 using System.Diagnostics;
 using System.Net.WebSockets;
 using System.Text;
@@ -33,7 +34,7 @@ public class WireMockWebSocketContext : IWebSocketContext
     /// <inheritdoc />
     public IMapping Mapping { get; }
 
-    internal WebSocketConnectionRegistry? Registry { get; }
+    internal WebSocketConnectionRegistry Registry { get; }
 
     internal WebSocketBuilder Builder { get; }
 
@@ -49,7 +50,7 @@ public class WireMockWebSocketContext : IWebSocketContext
         WebSocket webSocket,
         IRequestMessage requestMessage,
         IMapping mapping,
-        WebSocketConnectionRegistry? registry,
+        WebSocketConnectionRegistry registry,
         WebSocketBuilder builder,
         IWireMockMiddlewareOptions options,
         IWireMockMiddlewareLogger logger,
@@ -96,29 +97,31 @@ public class WireMockWebSocketContext : IWebSocketContext
     /// <inheritdoc />
     public async Task CloseAsync(WebSocketCloseStatus closeStatus, string statusDescription, CancellationToken cancellationToken = default)
     {
-        await WebSocket.CloseAsync(closeStatus, statusDescription, cancellationToken);
+        await WebSocket.CloseAsync(closeStatus, statusDescription, cancellationToken).ConfigureAwait(false);
 
         LogWebSocketMessage(WebSocketMessageDirection.Send, WebSocketMessageType.Close, $"CloseStatus: {closeStatus}, Description: {statusDescription}", null);
     }
 
+    /// <inheritdoc />
+    public void Abort(string? statusDescription = null)
+    {
+        WebSocket.Abort();
+
+        LogWebSocketMessage(WebSocketMessageDirection.Send, WebSocketMessageType.Close, $"CloseStatus: Abort, Description: {statusDescription}", null);
+    }
+
     /// <inheritdoc />
     public async Task BroadcastAsync(string text, bool excludeSender = false, CancellationToken cancellationToken = default)
     {
-        if (Registry != null)
-        {
-            Guid? excludeConnectionId = excludeSender ? ConnectionId : null;
-            await Registry.BroadcastAsync(text, excludeConnectionId, cancellationToken);
-        }
+        Guid? excludeConnectionId = excludeSender ? ConnectionId : null;
+        await Registry.BroadcastAsync(text, excludeConnectionId, cancellationToken);
     }
 
     /// <inheritdoc />
     public async Task BroadcastAsync(byte[] bytes, bool excludeSender = false, CancellationToken cancellationToken = default)
     {
-        if (Registry != null)
-        {
-            Guid? excludeConnectionId = excludeSender ? ConnectionId : null;
-            await Registry.BroadcastAsync(bytes, excludeConnectionId, cancellationToken);
-        }
+        Guid? excludeConnectionId = excludeSender ? ConnectionId : null;
+        await Registry.BroadcastAsync(bytes, excludeConnectionId, cancellationToken);
     }
 
     internal void LogWebSocketMessage(