Refactor namespaces.

Source/MQTTnet/Server/MqttClientSession.cs

@@ -7,7 +7,6 @@ using MQTTnet.Client;
 using MQTTnet.Diagnostics;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
-using MQTTnet.Internal;
 using MQTTnet.Packets;
 using MQTTnet.Protocol;
 
@@ -89,10 +88,10 @@ namespace MQTTnet.Server
         {
             if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
 
-            _subscriptionsManager.Subscribe(new MqttSubscribePacket
-            {
-                TopicFilters = topicFilters
-            });
+            var packet = new MqttSubscribePacket();
+            packet.TopicFilters.AddRange(topicFilters);
+
+            _subscriptionsManager.Subscribe(packet);
 
             EnqueueSubscribedRetainedMessages(topicFilters);
             return Task.FromResult(0);
@@ -102,10 +101,10 @@ namespace MQTTnet.Server
         {
             if (topicFilters == null) throw new ArgumentNullException(nameof(topicFilters));
 
-            _subscriptionsManager.Unsubscribe(new MqttUnsubscribePacket
-            {
-                TopicFilters = topicFilters
-            });
+            var packet = new MqttUnsubscribePacket();
+            packet.TopicFilters.AddRange(topicFilters);
+
+            _subscriptionsManager.Unsubscribe(packet);
 
             return Task.FromResult(0);
         }
@@ -278,7 +277,7 @@ namespace MQTTnet.Server
                 return;
             }
 
-            var publishPacket = _channelAdapter.PacketFormatterAdapter.ConvertApplicationMessageToPublishPacket(applicationMessage);
+            var publishPacket = _channelAdapter.PacketFormatterAdapter.DataConverter.CreatePublishPacket(applicationMessage);
             
             // Set the retain flag to true according to [MQTT-3.3.1-8] and [MQTT-3.3.1-9].
             publishPacket.Retain = isRetainedApplicationMessage;
@@ -345,7 +344,8 @@ namespace MQTTnet.Server
             {
                 var responsePacket = new MqttPubCompPacket
                 {
-                    PacketIdentifier = pubRelPacket.PacketIdentifier
+                    PacketIdentifier = pubRelPacket.PacketIdentifier,
+                    ReasonCode = MqttPubCompReasonCode.Success
                 };
 
                 adapter.SendPacketAsync(responsePacket, cancellationToken).GetAwaiter().GetResult();
@@ -356,7 +356,8 @@ namespace MQTTnet.Server
             {
                 var responsePacket = new MqttPubRelPacket
                 {
-                    PacketIdentifier = pubRecPacket.PacketIdentifier
+                    PacketIdentifier = pubRecPacket.PacketIdentifier,
+                    ReasonCode = MqttPubRelReasonCode.Success
                 };
 
                 adapter.SendPacketAsync(responsePacket, cancellationToken).GetAwaiter().GetResult();
@@ -454,7 +455,9 @@ namespace MQTTnet.Server
 
         private void HandleIncomingPublishPacketWithQoS0(MqttPublishPacket publishPacket)
         {
-            _sessionsManager.EnqueueApplicationMessage(this, publishPacket.ToApplicationMessage());
+            _sessionsManager.EnqueueApplicationMessage(
+                this, 
+                _channelAdapter.PacketFormatterAdapter.DataConverter.CreateApplicationMessage(publishPacket));
         }
 
         private void HandleIncomingPublishPacketWithQoS1(
@@ -462,11 +465,14 @@ namespace MQTTnet.Server
             MqttPublishPacket publishPacket,
             CancellationToken cancellationToken)
         {
-            _sessionsManager.EnqueueApplicationMessage(this, publishPacket.ToApplicationMessage());
+            _sessionsManager.EnqueueApplicationMessage(
+                this, 
+                _channelAdapter.PacketFormatterAdapter.DataConverter.CreateApplicationMessage(publishPacket));
 
             var response = new MqttPubAckPacket
             {
-                PacketIdentifier = publishPacket.PacketIdentifier
+                PacketIdentifier = publishPacket.PacketIdentifier,
+                ReasonCode = MqttPubAckReasonCode.Success
             };
 
             adapter.SendPacketAsync(response, cancellationToken).GetAwaiter().GetResult();
@@ -478,11 +484,12 @@ namespace MQTTnet.Server
             CancellationToken cancellationToken)
         {
             // QoS 2 is implement as method "B" (4.3.3 QoS 2: Exactly once delivery)
-            _sessionsManager.EnqueueApplicationMessage(this, publishPacket.ToApplicationMessage());
+            _sessionsManager.EnqueueApplicationMessage(this, _channelAdapter.PacketFormatterAdapter.DataConverter.CreateApplicationMessage(publishPacket));
 
             var response = new MqttPubRecPacket
             {
-                PacketIdentifier = publishPacket.PacketIdentifier
+                PacketIdentifier = publishPacket.PacketIdentifier,
+                ReasonCode = MqttPubRecReasonCode.Success
             };
 
             adapter.SendPacketAsync(response, cancellationToken).GetAwaiter().GetResult();

Source/MQTTnet/Server/MqttClientSessionsManager.cs

@@ -215,6 +215,7 @@ namespace MQTTnet.Server
             
             try
             {
+                // TODO: Catch cancel exception here if the first packet was not received and log properly.
                 var firstPacket = await clientAdapter.ReceivePacketAsync(_options.DefaultCommunicationTimeout, cancellationToken).ConfigureAwait(false);
                 if (firstPacket == null)
                 {
@@ -234,7 +235,7 @@ namespace MQTTnet.Server
                     await clientAdapter.SendPacketAsync(
                         new MqttConnAckPacket
                         {
-                            ConnectReturnCode = connectReturnCode
+                            ReturnCode = connectReturnCode
                         },
                         cancellationToken).ConfigureAwait(false);
 
@@ -246,7 +247,8 @@ namespace MQTTnet.Server
                 await clientAdapter.SendPacketAsync(
                     new MqttConnAckPacket
                     {
-                        ConnectReturnCode = connectReturnCode,
+                        ReturnCode = connectReturnCode,
+                        ReasonCode = MqttConnectReasonCode.Success,
                         IsSessionPresent = result.IsExistingSession
                     },
                     cancellationToken).ConfigureAwait(false);

Source/MQTTnet/Server/MqttClientSubscriptionsManager.cs

@@ -39,11 +39,13 @@ namespace MQTTnet.Server
                 var interceptorContext = InterceptSubscribe(topicFilter);
                 if (!interceptorContext.AcceptSubscription)
                 {
-                    result.ResponsePacket.SubscribeReturnCodes.Add(MqttSubscribeReturnCode.Failure);
+                    result.ResponsePacket.ReturnCodes.Add(MqttSubscribeReturnCode.Failure);
+                    result.ResponsePacket.ReasonCodes.Add(MqttSubscribeReasonCode.UnspecifiedError);
                 }
                 else
                 {
-                    result.ResponsePacket.SubscribeReturnCodes.Add(ConvertToMaximumQoS(topicFilter.QualityOfServiceLevel));
+                    result.ResponsePacket.ReturnCodes.Add(ConvertToSubscribeReturnCode(topicFilter.QualityOfServiceLevel));
+                    result.ResponsePacket.ReasonCodes.Add(ConvertToSubscribeReasonCode(topicFilter.QualityOfServiceLevel));
                 }
 
                 if (interceptorContext.CloseConnection)
@@ -69,20 +71,29 @@ namespace MQTTnet.Server
         {
             if (unsubscribePacket == null) throw new ArgumentNullException(nameof(unsubscribePacket));
 
+            var unsubAckPacket = new MqttUnsubAckPacket
+            {
+                PacketIdentifier = unsubscribePacket.PacketIdentifier
+            };
+
             lock (_subscriptions)
             {
                 foreach (var topicFilter in unsubscribePacket.TopicFilters)
                 {
-                    _subscriptions.Remove(topicFilter);
+                    if (_subscriptions.Remove(topicFilter))
+                    {
+                        unsubAckPacket.ReasonCodes.Add(MqttUnsubscribeReasonCode.Success);
+                    }
+                    else
+                    {
+                        unsubAckPacket.ReasonCodes.Add(MqttUnsubscribeReasonCode.NoSubscriptionExisted);
+                    }
 
                     _eventDispatcher.OnClientUnsubscribedTopic(_clientId, topicFilter);
                 }
             }
 
-            return new MqttUnsubAckPacket
-            {
-                PacketIdentifier = unsubscribePacket.PacketIdentifier
-            };
+            return unsubAckPacket;
         }
 
         public CheckSubscriptionsResult CheckSubscriptions(string topic, MqttQualityOfServiceLevel qosLevel)
@@ -113,7 +124,7 @@ namespace MQTTnet.Server
             return CreateSubscriptionResult(qosLevel, qosLevels);
         }
 
-        private static MqttSubscribeReturnCode ConvertToMaximumQoS(MqttQualityOfServiceLevel qualityOfServiceLevel)
+        private static MqttSubscribeReturnCode ConvertToSubscribeReturnCode(MqttQualityOfServiceLevel qualityOfServiceLevel)
         {
             switch (qualityOfServiceLevel)
             {
@@ -124,6 +135,17 @@ namespace MQTTnet.Server
             }
         }
 
+        private static MqttSubscribeReasonCode ConvertToSubscribeReasonCode(MqttQualityOfServiceLevel qualityOfServiceLevel)
+        {
+            switch (qualityOfServiceLevel)
+            {
+                case MqttQualityOfServiceLevel.AtMostOnce: return MqttSubscribeReasonCode.GrantedQoS0;
+                case MqttQualityOfServiceLevel.AtLeastOnce: return MqttSubscribeReasonCode.GrantedQoS1;
+                case MqttQualityOfServiceLevel.ExactlyOnce: return MqttSubscribeReasonCode.GrantedQoS2;
+                default: return MqttSubscribeReasonCode.UnspecifiedError;
+            }
+        }
+
         private MqttSubscriptionInterceptorContext InterceptSubscribe(TopicFilter topicFilter)
         {
             var interceptorContext = new MqttSubscriptionInterceptorContext(_clientId, topicFilter);

Source/MQTTnet/Server/MqttServer.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet.Adapter;
+using MQTTnet.Client.Publishing;
 using MQTTnet.Diagnostics;
-using MQTTnet.Internal;
 
 namespace MQTTnet.Server
 {
@@ -77,7 +77,7 @@ namespace MQTTnet.Server
             return _clientSessionsManager.UnsubscribeAsync(clientId, topicFilters);
         }
 
-        public Task PublishAsync(MqttApplicationMessage applicationMessage)
+        public Task<MqttClientPublishResult> PublishAsync(MqttApplicationMessage applicationMessage)
         {
             if (applicationMessage == null) throw new ArgumentNullException(nameof(applicationMessage));
 
@@ -85,7 +85,7 @@ namespace MQTTnet.Server
 
             _clientSessionsManager.EnqueueApplicationMessage(null, applicationMessage);
 
-            return Task.FromResult(0);
+            return Task.FromResult(new MqttClientPublishResult());
         }
 
         public async Task StartAsync(IMqttServerOptions options)

Source/MQTTnet/Server/MqttServerOptions.cs

@@ -11,6 +11,7 @@ namespace MQTTnet.Server
         public bool EnablePersistentSessions { get; set; }
 
         public int MaxPendingMessagesPerClient { get; set; } = 250;
+
         public MqttPendingMessagesOverflowStrategy PendingMessagesOverflowStrategy { get; set; } = MqttPendingMessagesOverflowStrategy.DropOldestQueuedMessage;
 
         public TimeSpan DefaultCommunicationTimeout { get; set; } = TimeSpan.FromSeconds(15);

Source/MQTTnet/Server/MqttSubscribeResult.cs

@@ -1,11 +0,0 @@
-using MQTTnet.Packets;
-
-namespace MQTTnet.Server
-{
-    public class MqttSubscribeResult
-    {
-        public MqttSubAckPacket ResponsePacket { get; set; }
-
-        public bool CloseConnection { get; set; }
-    }
-}