Refactor session and connection handling in server. Fix QoS level 2 issues.

Source/MQTTnet/Formatter/IMqttDataConverter.cs

@@ -1,5 +1,7 @@
 using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Options;
+using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Packets;
@@ -12,7 +14,7 @@ namespace MQTTnet.Formatter
 
         MqttApplicationMessage CreateApplicationMessage(MqttPublishPacket publishPacket);
 
-        MqttClientConnectResult CreateClientConnectResult(MqttConnAckPacket connAckPacket);
+        MqttClientAuthenticateResult CreateClientConnectResult(MqttConnAckPacket connAckPacket);
 
         MqttConnectPacket CreateConnectPacket(MqttApplicationMessage willApplicationMessage, IMqttClientOptions options);
 
@@ -23,5 +25,11 @@ namespace MQTTnet.Formatter
         MqttSubscribePacket CreateSubscribePacket(MqttClientSubscribeOptions options);
 
         MqttUnsubscribePacket CreateUnsubscribePacket(MqttClientUnsubscribeOptions options);
+
+        MqttDisconnectPacket CreateDisconnectPacket(MqttClientDisconnectOptions options);
+
+        MqttClientPublishResult CreatePublishResult(MqttPubAckPacket pubAckPacket);
+
+        MqttClientPublishResult CreatePublishResult(MqttPubRecPacket pubRecPacket, MqttPubCompPacket pubCompPacket);
     }
 }

Source/MQTTnet/Formatter/V3/MqttV310DataConverter.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Linq;
 using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Options;
+using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Exceptions;
@@ -44,7 +46,7 @@ namespace MQTTnet.Formatter.V3
             };
         }
 
-        public MqttClientConnectResult CreateClientConnectResult(MqttConnAckPacket connAckPacket)
+        public MqttClientAuthenticateResult CreateClientConnectResult(MqttConnAckPacket connAckPacket)
         {
             if (connAckPacket == null) throw new ArgumentNullException(nameof(connAckPacket));
 
@@ -91,7 +93,7 @@ namespace MQTTnet.Formatter.V3
                     throw new MqttProtocolViolationException("Received unexpected return code.");
             }
 
-            return new MqttClientConnectResult
+            return new MqttClientAuthenticateResult
             {
                 IsSessionPresent = connAckPacket.IsSessionPresent,
                 ResultCode = resultCode
@@ -173,5 +175,39 @@ namespace MQTTnet.Formatter.V3
 
             return unsubscribePacket;
         }
+
+        public MqttDisconnectPacket CreateDisconnectPacket(MqttClientDisconnectOptions options)
+        {
+            if (options != null)
+            {
+                throw new MqttProtocolViolationException("Reason codes for disconnect are only supported for MQTTv5.");
+            }
+
+            return new MqttDisconnectPacket();
+        }
+
+        public MqttClientPublishResult CreatePublishResult(MqttPubAckPacket pubAckPacket)
+        {
+            return new MqttClientPublishResult
+            {
+                ReasonCode = MqttClientPublishReasonCode.Success
+            };
+        }
+
+        public MqttClientPublishResult CreatePublishResult(MqttPubRecPacket pubRecPacket, MqttPubCompPacket pubCompPacket)
+        {
+            if (pubRecPacket == null || pubCompPacket == null)
+            {
+                return new MqttClientPublishResult
+                {
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError
+                };
+            }
+
+            return new MqttClientPublishResult
+            {
+                ReasonCode = MqttClientPublishReasonCode.Success
+            };
+        }
     }
 }

Source/MQTTnet/Formatter/V5/MqttV500DataConverter.cs

@@ -2,11 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using MQTTnet.Client.Connecting;
+using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Options;
+using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Client.Unsubscribing;
 using MQTTnet.Exceptions;
 using MQTTnet.Packets;
+using MQTTnet.Protocol;
 
 namespace MQTTnet.Formatter.V5
 {
@@ -55,11 +58,11 @@ namespace MQTTnet.Formatter.V5
             };
         }
 
-        public MqttClientConnectResult CreateClientConnectResult(MqttConnAckPacket connAckPacket)
+        public MqttClientAuthenticateResult CreateClientConnectResult(MqttConnAckPacket connAckPacket)
         {
             if (connAckPacket == null) throw new ArgumentNullException(nameof(connAckPacket));
 
-            return new MqttClientConnectResult
+            return new MqttClientAuthenticateResult
             {
                 IsSessionPresent = connAckPacket.IsSessionPresent,
                 ResultCode = (MqttClientConnectResultCode)connAckPacket.ReasonCode.Value
@@ -158,5 +161,65 @@ namespace MQTTnet.Formatter.V5
 
             return packet;
         }
+
+        public MqttDisconnectPacket CreateDisconnectPacket(MqttClientDisconnectOptions options)
+        {
+            var packet = new MqttDisconnectPacket();
+
+            if (options == null)
+            {
+                packet.ReasonCode = MqttDisconnectReasonCode.NormalDisconnection;
+            }
+            else
+            {
+                packet.ReasonCode = (MqttDisconnectReasonCode)options.ReasonCode;
+            }
+
+            return packet;
+        }
+
+        public MqttClientPublishResult CreatePublishResult(MqttPubAckPacket pubAckPacket)
+        {
+            var result = new MqttClientPublishResult();
+
+            if (pubAckPacket?.ReasonCode != null)
+            {
+                result.ReasonCode = (MqttClientPublishReasonCode)pubAckPacket.ReasonCode;
+            }
+
+            return result;
+        }
+
+        public MqttClientPublishResult CreatePublishResult(MqttPubRecPacket pubRecPacket, MqttPubCompPacket pubCompPacket)
+        {
+            if (pubRecPacket == null || pubCompPacket == null)
+            {
+                return new MqttClientPublishResult
+                {
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError
+                };
+            }
+
+            if (pubCompPacket.ReasonCode == MqttPubCompReasonCode.PacketIdentifierNotFound)
+            {
+                return new MqttClientPublishResult
+                {
+                    ReasonCode = MqttClientPublishReasonCode.UnspecifiedError
+                };
+            }
+
+            var result = new MqttClientPublishResult
+            {
+                ReasonCode = MqttClientPublishReasonCode.Success
+            };
+
+            if (pubRecPacket.ReasonCode.HasValue)
+            {
+                // Both enums share the same values.
+                result.ReasonCode = (MqttClientPublishReasonCode)pubRecPacket.ReasonCode.Value;
+            }
+
+            return result;
+        }
     }
 }