Update version info. Fix typo. Add MqttServerOptionsBuilder.

MQTTnet.Core/Server/MqttClientSubscriptionsManager.cs

@@ -27,7 +27,7 @@ namespace MQTTnet.Core.Server
                 foreach (var topicFilter in subscribePacket.TopicFilters)
                 {
                     var interceptorContext = new MqttSubscriptionInterceptorContext(clientId, topicFilter);
-                    _options.SubscriptionsInterceptor?.Invoke(interceptorContext);
+                    _options.SubscriptionInterceptor?.Invoke(interceptorContext);
                     responsePacket.SubscribeReturnCodes.Add(interceptorContext.AcceptSubscription ? MqttSubscribeReturnCode.SuccessMaximumQoS1 : MqttSubscribeReturnCode.Failure);
                     
                     if (interceptorContext.CloseConnection)

MQTTnet.Core/Server/MqttConnectionValidatorContext.cs

@@ -0,0 +1,25 @@
+using MQTTnet.Core.Protocol;
+
+namespace MQTTnet.Core.Server
+{
+    public class MqttConnectionValidatorContext
+    {
+        public MqttConnectionValidatorContext(string clientId, string username, string password, MqttApplicationMessage willMessage)
+        {
+            ClientId = clientId;
+            Username = username;
+            Password = password;
+            WillMessage = willMessage;
+        }
+
+        public string ClientId { get; }
+
+        public string Username { get; }
+
+        public string Password { get; }
+
+        public MqttApplicationMessage WillMessage { get; }
+
+        public MqttConnectReturnCode ReturnCode { get; set; } = MqttConnectReturnCode.ConnectionAccepted;
+    }
+}

MQTTnet.Core/Server/MqttServerOptions.cs

@@ -11,14 +11,14 @@ namespace MQTTnet.Core.Server
         public MqttServerTlsEndpointOptions TlsEndpointOptions { get; } = new MqttServerTlsEndpointOptions();
 
         public int ConnectionBacklog { get; set; } = 10;
-
+        
         public TimeSpan DefaultCommunicationTimeout { get; set; } = TimeSpan.FromSeconds(15);
 
         public Func<MqttConnectPacket, MqttConnectReturnCode> ConnectionValidator { get; set; }
 
         public Action<MqttApplicationMessageInterceptorContext> ApplicationMessageInterceptor { get; set; }
 
-        public Action<MqttSubscriptionInterceptorContext> SubscriptionsInterceptor { get; set; }
+        public Action<MqttSubscriptionInterceptorContext> SubscriptionInterceptor { get; set; }
 
         public IMqttServerStorage Storage { get; set; }
     }

MQTTnet.Core/Server/MqttServerOptionsBuilder.cs

@@ -0,0 +1,88 @@
+using System;
+using MQTTnet.Core.Packets;
+using MQTTnet.Core.Protocol;
+
+namespace MQTTnet.Core.Server
+{
+    public class MqttServerOptionsBuilder
+    {
+        private readonly MqttServerOptions _options = new MqttServerOptions();
+
+        public MqttServerOptionsBuilder WithConnectionBacklog(int value)
+        {
+            _options.ConnectionBacklog = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithDefaultCommunicationTimeout(TimeSpan value)
+        {
+            _options.DefaultCommunicationTimeout = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithDefaultEndpointPort(int value)
+        {
+            _options.DefaultEndpointOptions.Port = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithDefaultEndpoint()
+        {
+            _options.DefaultEndpointOptions.IsEnabled = true;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithoutDefaultEndpoint()
+        {
+            _options.DefaultEndpointOptions.IsEnabled = false;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithEncryptedEndpoint()
+        {
+            _options.TlsEndpointOptions.IsEnabled = true;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithoutEncryptedEndpoint()
+        {
+            _options.TlsEndpointOptions.IsEnabled = false;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithEncryptionCertificate(byte[] value)
+        {
+            _options.TlsEndpointOptions.Certificate = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithStorage(IMqttServerStorage value)
+        {
+            _options.Storage = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithConnectionValidator(Func<MqttConnectPacket, MqttConnectReturnCode> value)
+        {
+            _options.ConnectionValidator = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithApplicationMessageInterceptor(Action<MqttApplicationMessageInterceptorContext> value)
+        {
+            _options.ApplicationMessageInterceptor = value;
+            return this;
+        }
+
+        public MqttServerOptionsBuilder WithSubscriptionInterceptor(Action<MqttSubscriptionInterceptorContext> value)
+        {
+            _options.SubscriptionInterceptor = value;
+            return this;
+        }
+
+        public MqttServerOptions Build()
+        {
+            return _options;
+        }
+    }
+}