Use latest language features (#2176)

* Make use of language features line AsyncDispose, init etc.

* Fix build errors

* Improve Unit Tests

* Improve Unit Tests

* Improve Unit Tests

* Update samples

* Remove obsolete benchmarks

* Code cleanup

* Improve unit tests

* Improve Unit Tests

* Fix Unit Tests

* Improve Unit Tests

* Improve Unit Tests

* Restore unit tests

* Exclude load tests from unit tests

Source/MQTTnet.AspnetCore/ApplicationBuilderExtensions.cs

@@ -33,10 +33,8 @@ public static class ApplicationBuilderExtensions
                 }
 
                 var adapter = app.ApplicationServices.GetRequiredService<MqttWebSocketServerAdapter>();
-                using (var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol).ConfigureAwait(false))
-                {
-                    await adapter.RunWebSocketConnectionAsync(webSocket, context);
-                }
+                using var webSocket = await context.WebSockets.AcceptWebSocketAsync(subProtocol).ConfigureAwait(false);
+                await adapter.RunWebSocketConnectionAsync(webSocket, context);
             });
 
         return app;

Source/MQTTnet.AspnetCore/ConnectionBuilderExtensions.cs

@@ -4,13 +4,12 @@
 
 using Microsoft.AspNetCore.Connections;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public static class ConnectionBuilderExtensions
 {
-    public static class ConnectionBuilderExtensions
+    public static IConnectionBuilder UseMqtt(this IConnectionBuilder builder)
     {
-        public static IConnectionBuilder UseMqtt(this IConnectionBuilder builder)
-        {
-            return builder.UseConnectionHandler<MqttConnectionHandler>();
-        }
+        return builder.UseConnectionHandler<MqttConnectionHandler>();
     }
-}
+}

Source/MQTTnet.AspnetCore/EndpointRouterExtensions.cs

@@ -6,19 +6,17 @@ using System;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public static class EndpointRouterExtensions
 {
-    public static class EndpointRouterExtensions
+    public static void MapMqtt(this IEndpointRouteBuilder endpoints, string pattern)
     {
-        public static void MapMqtt(this IEndpointRouteBuilder endpoints, string pattern)
+        ArgumentNullException.ThrowIfNull(endpoints);
+
+        endpoints.MapConnectionHandler<MqttConnectionHandler>(pattern, options =>
         {
-            ArgumentNullException.ThrowIfNull(endpoints);
-
-            endpoints.MapConnectionHandler<MqttConnectionHandler>(pattern, options =>
-            {
-                options.WebSockets.SubProtocolSelector = MqttSubProtocolSelector.SelectSubProtocol;
-            });
-        }
+            options.WebSockets.SubProtocolSelector = MqttSubProtocolSelector.SelectSubProtocol;
+        });
     }
-}
-
+}

Source/MQTTnet.AspnetCore/MqttClientConnectionContextFactory.cs

@@ -7,28 +7,27 @@ using MQTTnet.Adapter;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Formatter;
 
-namespace MQTTnet.AspNetCore
+namespace MQTTnet.AspNetCore;
+
+public sealed class MqttClientConnectionContextFactory : IMqttClientAdapterFactory
 {
-    public sealed class MqttClientConnectionContextFactory : IMqttClientAdapterFactory
+    public IMqttChannelAdapter CreateClientAdapter(MqttClientOptions options, MqttPacketInspector packetInspector, IMqttNetLogger logger)
     {
-        public IMqttChannelAdapter CreateClientAdapter(MqttClientOptions options, MqttPacketInspector packetInspector, IMqttNetLogger logger)
+        if (options == null) throw new ArgumentNullException(nameof(options));
+
+        switch (options.ChannelOptions)
         {
-            if (options == null) throw new ArgumentNullException(nameof(options));
-
-            switch (options.ChannelOptions)
+            case MqttClientTcpOptions tcpOptions:
             {
-                case MqttClientTcpOptions tcpOptions:
-                    {
-                        var tcpConnection = new SocketConnection(tcpOptions.RemoteEndpoint);
+                var tcpConnection = new SocketConnection(tcpOptions.RemoteEndpoint);
 
-                        var formatter = new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(4096, 65535));
-                        return new MqttConnectionContext(formatter, tcpConnection);
-                    }
-                default:
-                    {
-                        throw new NotSupportedException();
-                    }
+                var formatter = new MqttPacketFormatterAdapter(options.ProtocolVersion, new MqttBufferWriter(4096, 65535));
+                return new MqttConnectionContext(formatter, tcpConnection);
+            }
+            default:
+            {
+                throw new NotSupportedException();
             }
         }
     }
-}
+}

Source/MQTTnet.AspnetCore/MqttConnectionHandler.cs

@@ -33,13 +33,11 @@ public sealed class MqttConnectionHandler : ConnectionHandler, IMqttServerAdapte
         }
 
         var formatter = new MqttPacketFormatterAdapter(new MqttBufferWriter(_serverOptions.WriterBufferSize, _serverOptions.WriterBufferSizeMax));
-        using (var adapter = new MqttConnectionContext(formatter, connection))
+        using var adapter = new MqttConnectionContext(formatter, connection);
+        var clientHandler = ClientHandler;
+        if (clientHandler != null)
         {
-            var clientHandler = ClientHandler;
-            if (clientHandler != null)
-            {
-                await clientHandler(adapter).ConfigureAwait(false);
-            }
+            await clientHandler(adapter).ConfigureAwait(false);
         }
     }
 

Source/MQTTnet.AspnetCore/MqttWebSocketServerAdapter.cs

@@ -43,10 +43,8 @@ public sealed class MqttWebSocketServerAdapter : IMqttServerAdapter
                 var formatter = new MqttPacketFormatterAdapter(new MqttBufferWriter(4096, 65535));
                 var channel = new MqttWebSocketChannel(webSocket, remoteEndPoint, isSecureConnection, clientCertificate);
 
-                using (var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger))
-                {
-                    await clientHandler(channelAdapter).ConfigureAwait(false);
-                }
+                using var channelAdapter = new MqttChannelAdapter(channel, formatter, _logger);
+                await clientHandler(channelAdapter).ConfigureAwait(false);
             }
         }
         finally

Source/MQTTnet.AspnetCore/SocketAwaitable.cs

@@ -12,34 +12,28 @@ using System.Threading.Tasks;
 
 namespace MQTTnet.AspNetCore;
 
-public class SocketAwaitable : ICriticalNotifyCompletion
+public class SocketAwaitable(PipeScheduler ioScheduler) : ICriticalNotifyCompletion
 {
-    static readonly Action _callbackCompleted = () =>
+    static readonly Action CallbackCompleted = () =>
     {
     };
 
-    readonly PipeScheduler _ioScheduler;
     int _bytesTransferred;
 
     Action _callback;
     SocketError _error;
 
-    public SocketAwaitable(PipeScheduler ioScheduler)
-    {
-        _ioScheduler = ioScheduler;
-    }
-
-    public bool IsCompleted => ReferenceEquals(_callback, _callbackCompleted);
+    public bool IsCompleted => ReferenceEquals(_callback, CallbackCompleted);
 
     public void Complete(int bytesTransferred, SocketError socketError)
     {
         _error = socketError;
         _bytesTransferred = bytesTransferred;
-        var continuation = Interlocked.Exchange(ref _callback, _callbackCompleted);
+        var continuation = Interlocked.Exchange(ref _callback, CallbackCompleted);
 
         if (continuation != null)
         {
-            _ioScheduler.Schedule(state => ((Action)state)(), continuation);
+            ioScheduler.Schedule(state => ((Action)state)(), continuation);
         }
     }
 
@@ -50,7 +44,7 @@ public class SocketAwaitable : ICriticalNotifyCompletion
 
     public int GetResult()
     {
-        Debug.Assert(ReferenceEquals(_callback, _callbackCompleted));
+        Debug.Assert(ReferenceEquals(_callback, CallbackCompleted));
 
         _callback = null;
 
@@ -64,7 +58,7 @@ public class SocketAwaitable : ICriticalNotifyCompletion
 
     public void OnCompleted(Action continuation)
     {
-        if (ReferenceEquals(_callback, _callbackCompleted) || ReferenceEquals(Interlocked.CompareExchange(ref _callback, continuation, null), _callbackCompleted))
+        if (ReferenceEquals(_callback, CallbackCompleted) || ReferenceEquals(Interlocked.CompareExchange(ref _callback, continuation, null), CallbackCompleted))
         {
             Task.Run(continuation);
         }

Source/MQTTnet.AspnetCore/SocketConnection.cs

@@ -18,11 +18,11 @@ namespace MQTTnet.AspNetCore;
 public sealed class SocketConnection : ConnectionContext
 {
     readonly EndPoint _endPoint;
+
     volatile bool _aborted;
     IDuplexPipe _application;
     SocketReceiver _receiver;
     SocketSender _sender;
-
     Socket _socket;
 
     public SocketConnection(EndPoint endPoint)
@@ -40,10 +40,13 @@ public sealed class SocketConnection : ConnectionContext
     }
 
     public override string ConnectionId { get; set; }
+
     public override IFeatureCollection Features { get; }
 
     public bool IsConnected { get; private set; }
+
     public override IDictionary<object, object> Items { get; set; }
+
     public override IDuplexPipe Transport { get; set; }
 
     public override ValueTask DisposeAsync()
@@ -78,7 +81,7 @@ public sealed class SocketConnection : ConnectionContext
         IsConnected = true;
     }
 
-    Exception ConnectionAborted()
+    static Exception ConnectionAborted()
     {
         return new MqttCommunicationException("Connection Aborted");
     }
@@ -95,8 +98,7 @@ public sealed class SocketConnection : ConnectionContext
         {
             error = new MqttCommunicationException(ex);
         }
-        catch (SocketException ex) when (ex.SocketErrorCode == SocketError.OperationAborted || ex.SocketErrorCode == SocketError.ConnectionAborted ||
-                                         ex.SocketErrorCode == SocketError.Interrupted || ex.SocketErrorCode == SocketError.InvalidArgument)
+        catch (SocketException ex) when (ex.SocketErrorCode is SocketError.OperationAborted or SocketError.ConnectionAborted or SocketError.Interrupted or SocketError.InvalidArgument)
         {
             if (!_aborted)
             {
@@ -123,10 +125,10 @@ public sealed class SocketConnection : ConnectionContext
         {
             if (_aborted)
             {
-                error = error ?? ConnectionAborted();
+                error ??= ConnectionAborted();
             }
 
-            _application.Output.Complete(error);
+            await _application.Output.CompleteAsync(error);
         }
     }