Add new factory overloads.

Source/MQTTnet.AspnetCore/MQTTnet.AspNetCore.csproj

@@ -19,7 +19,11 @@
   </ItemGroup>
     
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Connections" Version="1.1.0" />
+  </ItemGroup>
+    
+  <ItemGroup>
+    <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
   </ItemGroup>
 
   <ItemGroup>

Source/MQTTnet.AspnetCore/MqttConnectionContext.cs

@@ -11,11 +11,18 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.AspNetCore.Extensions;
+using MQTTnet.Internal;
 
 namespace MQTTnet.AspNetCore
 {
-    public class MqttConnectionContext : IMqttChannelAdapter
+    public sealed class MqttConnectionContext : IMqttChannelAdapter
     {
+        readonly AsyncLock _writerLock = new AsyncLock();
+        readonly SpanBasedMqttPacketBodyReader _reader;
+        
+        PipeReader _input;
+        PipeWriter _output;
+        
         public MqttConnectionContext(MqttPacketFormatterAdapter packetFormatterAdapter, ConnectionContext connection)
         {
             PacketFormatterAdapter = packetFormatterAdapter ?? throw new ArgumentNullException(nameof(packetFormatterAdapter));
@@ -30,10 +37,6 @@ namespace MQTTnet.AspNetCore
             _reader = new SpanBasedMqttPacketBodyReader();
         }
 
-        private PipeReader _input;
-        private PipeWriter _output;
-        private readonly SpanBasedMqttPacketBodyReader _reader;
-
         public string Endpoint
         {
             get
@@ -58,9 +61,8 @@ namespace MQTTnet.AspNetCore
 
         public X509Certificate2 ClientCertificate => Http?.HttpContext?.Connection?.ClientCertificate;
 
-        private IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();
-
         public ConnectionContext Connection { get; }
+        
         public MqttPacketFormatterAdapter PacketFormatterAdapter { get; }
 
         public long BytesSent { get; set; }
@@ -69,7 +71,7 @@ namespace MQTTnet.AspNetCore
         public Action ReadingPacketStartedCallback { get; set; }
         public Action ReadingPacketCompletedCallback { get; set; }
 
-        private readonly SemaphoreSlim _writerSemaphore = new SemaphoreSlim(1, 1);
+        IHttpContextFeature Http => Connection.Features.Get<IHttpContextFeature>();
 
         public async Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
         {
@@ -165,8 +167,7 @@ namespace MQTTnet.AspNetCore
             var msg = buffer.AsMemory();
             var output = _output;
 
-            await _writerSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+            using (await _writerLock.WaitAsync(cancellationToken).ConfigureAwait(false))
-            try
             {
                 var result = await output.WriteAsync(msg, cancellationToken).ConfigureAwait(false);
                 if (result.IsCompleted)
@@ -176,10 +177,6 @@ namespace MQTTnet.AspNetCore
 
                 PacketFormatterAdapter.FreeBuffer();
             }
-            finally
-            {
-                _writerSemaphore.Release();
-            }
         }
 
         public void Dispose()

Source/MQTTnet.AspnetCore/MqttSubProtocolSelector.cs

@@ -1,12 +1,29 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Http;
 
 namespace MQTTnet.AspNetCore
 {
     public static class MqttSubProtocolSelector
     {
+        public static string SelectSubProtocol(HttpRequest request)
+        {
+            if (request == null) throw new ArgumentNullException(nameof(request));
+
+            string subProtocol = null;
+            if (request.Headers.TryGetValue("Sec-WebSocket-Protocol", out var requestedSubProtocolValues))
+            {
+                subProtocol = SelectSubProtocol(requestedSubProtocolValues);
+            }
+
+            return subProtocol;
+        }
+        
         public static string SelectSubProtocol(IList<string> requestedSubProtocolValues)
         {
+            if (requestedSubProtocolValues == null) throw new ArgumentNullException(nameof(requestedSubProtocolValues));
+
             // Order the protocols to also match "mqtt", "mqttv-3.1", "mqttv-3.11" etc.
             return requestedSubProtocolValues
                 .OrderByDescending(p => p.Length)

Source/MQTTnet.Server/MQTTnet.Server.csproj

@@ -39,12 +39,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IronPython" Version="2.7.10-candidate1" />
+    <PackageReference Include="IronPython" Version="2.7.10" />
-    <PackageReference Include="IronPython.StdLib" Version="2.7.10-candidate1" />
+    <PackageReference Include="IronPython.StdLib" Version="2.7.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.3.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.4.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.3.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.4.1" />
   </ItemGroup>
 
   <ItemGroup>

Source/MQTTnet/Client/IMqttClientFactory.cs

@@ -1,5 +1,7 @@
-using MQTTnet.Adapter;
+using System;
+using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
+using MQTTnet.LowLevelClient;
 
 namespace MQTTnet.Client
 {
@@ -7,6 +9,14 @@ namespace MQTTnet.Client
     {
         IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory);
 
+        ILowLevelMqttClient CreateLowLevelMqttClient();
+
+        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger);
+
+        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttClientAdapterFactory clientAdapterFactory);
+
+        ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactory);
+
         IMqttClient CreateMqttClient();
 
         IMqttClient CreateMqttClient(IMqttNetLogger logger);

Source/MQTTnet/IMqttFactory.cs

@@ -1,4 +1,5 @@
-using MQTTnet.Client;
+using System.Collections.Generic;
+using MQTTnet.Client;
 using MQTTnet.Diagnostics;
 using MQTTnet.Server;
 
@@ -7,5 +8,7 @@ namespace MQTTnet
     public interface IMqttFactory : IMqttClientFactory, IMqttServerFactory
     {
         IMqttNetLogger DefaultLogger { get; }
+
+        IDictionary<object, object> Properties { get; }
     }
 }

Source/MQTTnet/Internal/AsyncLock.cs

@@ -5,10 +5,10 @@ using System.Threading.Tasks;
 namespace MQTTnet.Internal
 {
     // From Stephen Toub (https://blogs.msdn.microsoft.com/pfxteam/2012/02/12/building-async-coordination-primitives-part-6-asynclock/)
-    public class AsyncLock : IDisposable
+    public sealed class AsyncLock : IDisposable
     {
-        private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+        readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-        private readonly Task<IDisposable> _releaser;
+        readonly Task<IDisposable> _releaser;
 
         public AsyncLock()
         {
@@ -39,9 +39,9 @@ namespace MQTTnet.Internal
             _semaphore?.Dispose();
         }
 
-        private class Releaser : IDisposable
+        class Releaser : IDisposable
         {
-            private readonly AsyncLock _toRelease;
+            readonly AsyncLock _toRelease;
 
             internal Releaser(AsyncLock toRelease)
             {

Source/MQTTnet/MqttFactory.cs

@@ -6,6 +6,7 @@ using MQTTnet.LowLevelClient;
 using MQTTnet.Server;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MQTTnet
 {
@@ -25,6 +26,13 @@ namespace MQTTnet
 
         public IMqttNetLogger DefaultLogger { get; }
 
+        public IList<Func<IMqttFactory, IMqttServerAdapter>> DefaultServerAdapters { get; } = new List<Func<IMqttFactory, IMqttServerAdapter>>
+        {
+            factory => new MqttTcpServerAdapter(factory.DefaultLogger)
+        };
+
+        public IDictionary<object, object> Properties { get; } = new Dictionary<object, object>();
+
         public IMqttFactory UseClientAdapterFactory(IMqttClientAdapterFactory clientAdapterFactory)
         {
             _clientAdapterFactory = clientAdapterFactory ?? throw new ArgumentNullException(nameof(clientAdapterFactory));
@@ -50,10 +58,10 @@ namespace MQTTnet
             return new LowLevelMqttClient(_clientAdapterFactory, DefaultLogger);
         }
 
-        public ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactoryy)
+        public ILowLevelMqttClient CreateLowLevelMqttClient(IMqttNetLogger logger, IMqttClientAdapterFactory clientAdapterFactory)
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
-            if (clientAdapterFactoryy == null) throw new ArgumentNullException(nameof(clientAdapterFactoryy));
+            if (clientAdapterFactory == null) throw new ArgumentNullException(nameof(clientAdapterFactory));
 
             return new LowLevelMqttClient(_clientAdapterFactory, logger);
         }
@@ -94,7 +102,8 @@ namespace MQTTnet
         {
             if (logger == null) throw new ArgumentNullException(nameof(logger));
 
-            return CreateMqttServer(new List<IMqttServerAdapter> { new MqttTcpServerAdapter(logger) }, logger);
+            var serverAdapters = DefaultServerAdapters.Select(a => a.Invoke(this));
+            return CreateMqttServer(serverAdapters, logger);
         }
 
         public IMqttServer CreateMqttServer(IEnumerable<IMqttServerAdapter> serverAdapters, IMqttNetLogger logger)

Source/MQTTnet/Server/IMqttServerFactory.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using MQTTnet.Adapter;
 using MQTTnet.Diagnostics;
 
@@ -6,6 +7,8 @@ namespace MQTTnet.Server
 {
     public interface IMqttServerFactory
     {
+        IList<Func<IMqttFactory, IMqttServerAdapter>> DefaultServerAdapters { get; }
+
         IMqttServer CreateMqttServer();
 
         IMqttServer CreateMqttServer(IMqttNetLogger logger);

Tests/MQTTnet.AspNetCore.Tests/MQTTnet.AspNetCore.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
   </ItemGroup>

Tests/MQTTnet.Benchmarks/MQTTnet.Benchmarks.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="System.IO.Pipelines" Version="4.7.1" />
+    <PackageReference Include="System.IO.Pipelines" Version="4.7.2" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
   </ItemGroup>
 

Tests/MQTTnet.Core.Tests/MQTTnet.Tests.csproj

@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
   <ItemGroup>