Start migration of server to new packet bus.

Tests/MQTTnet.Core.Tests/Client/LowLevelMqttClient_Tests.cs

@@ -143,7 +143,7 @@ namespace MQTTnet.Tests.Client
             await client.SendAsync(new MqttSubscribePacket
             {
                 PacketIdentifier = 1,
-                TopicFilters = new List<MqttTopicFilter>
+                TopicFilters =
                 {
                     new MqttTopicFilter
                     {

Tests/MQTTnet.Core.Tests/Client/MqttClient_Tests.cs

@@ -10,6 +10,7 @@ using MQTTnet.Client;
 using MQTTnet.Client.Connecting;
 using MQTTnet.Client.Disconnecting;
 using MQTTnet.Client.Options;
+using MQTTnet.Client.Publishing;
 using MQTTnet.Client.Receiving;
 using MQTTnet.Client.Subscribing;
 using MQTTnet.Exceptions;
@@ -870,5 +871,83 @@ namespace MQTTnet.Tests.Client
                 Assert.IsFalse(disconnectedFired);
             }
         }
+        
+        [DataTestMethod]
+        [DataRow(MqttQualityOfServiceLevel.ExactlyOnce)]
+        [DataRow(MqttQualityOfServiceLevel.AtMostOnce)]
+        [DataRow(MqttQualityOfServiceLevel.AtLeastOnce)]
+        public async Task Concurrent_Processing(MqttQualityOfServiceLevel qos)
+        {
+            long concurrency = 0;
+            bool success = false;
+
+            using (var testEnvironment = new TestEnvironment(TestContext))
+            {
+                await testEnvironment.StartServer();
+                var publisher = await testEnvironment.ConnectClient();
+                var subscriber = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithClientId(qos.ToString()));
+                await subscriber.SubscribeAsync("#", qos);
+
+                subscriber.UseApplicationMessageReceivedHandler(c =>
+                {
+                    c.AutoAcknowledge = false;
+
+                    async Task InvokeInternal()
+                    {
+                        if (Interlocked.Increment(ref concurrency) > 1) success = true;
+                        await Task.Delay(100);
+                        Interlocked.Decrement(ref concurrency);
+                    }
+
+                    _ = InvokeInternal();
+                    return Task.CompletedTask;
+                });
+
+                var publishes = Task.WhenAll(
+                    publisher.PublishAsync("a", null, qos),
+                    publisher.PublishAsync("b", null, qos)
+                );
+
+                await Task.Delay(200);
+
+                await publishes;
+                Assert.IsTrue(success);
+            }
+        }
+
+        [DataTestMethod]
+        [DataRow(MqttQualityOfServiceLevel.ExactlyOnce)]
+        [DataRow(MqttQualityOfServiceLevel.AtLeastOnce)]
+        public async Task Retry_If_Not_PubAck(MqttQualityOfServiceLevel qos)
+        {
+            long count = 0;
+            using (var testEnvironment = new TestEnvironment(TestContext))
+            {
+                await testEnvironment.StartServer();
+                var publisher = await testEnvironment.ConnectClient();
+                var subscriber = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithClientId(qos.ToString()));
+                await subscriber.SubscribeAsync("#", qos);
+
+                subscriber.UseApplicationMessageReceivedHandler(c =>
+                {
+                    c.AutoAcknowledge = false;
+                    ++count;
+                    Console.WriteLine("process");
+                    return Task.CompletedTask;
+                });
+
+                var pub = publisher.PublishAsync("a", null, qos);
+
+                await Task.Delay(100);
+                await subscriber.DisconnectAsync();
+                await subscriber.ReconnectAsync();
+                await Task.Delay(100);
+
+                var res = await pub;
+
+                Assert.AreEqual(MqttClientPublishReasonCode.Success, res.ReasonCode);
+                Assert.AreEqual(2, count);
+            }
+        }
     }
 }

Tests/MQTTnet.Core.Tests/MqttPacketSerializer_Tests.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Adapter;
-using MQTTnet.Diagnostics;
 using MQTTnet.Diagnostics.Logger;
 using MQTTnet.Exceptions;
 using MQTTnet.Formatter;
@@ -278,12 +276,6 @@ namespace MQTTnet.Tests
         [TestMethod]
         public void SerializeV500_MqttPublishPacket()
         {
-            var prop = new MqttPublishPacketProperties { UserProperties = new List<MqttUserProperty>() };
-
-            prop.ResponseTopic = "/Response";
-
-            prop.UserProperties.Add(new MqttUserProperty("Foo", "Bar"));
-
             var p = new MqttPublishPacket
             {
                 PacketIdentifier = 123,
@@ -292,12 +284,17 @@ namespace MQTTnet.Tests
                 Payload = Encoding.ASCII.GetBytes("HELLO"),
                 QualityOfServiceLevel = MqttQualityOfServiceLevel.AtLeastOnce,
                 Topic = "A/B/C",
-                Properties = prop
+                Properties =
+                {
+                    ResponseTopic = "/Response"
+                }
             };
 
+            p.Properties.UserProperties.Add(new MqttUserProperty("Foo", "Bar"));
+
             var deserialized = Roundtrip(p, MqttProtocolVersion.V500);
 
-            Assert.AreEqual(prop.ResponseTopic, deserialized.Properties.ResponseTopic);
+            Assert.AreEqual(p.Properties.ResponseTopic, deserialized.Properties.ResponseTopic);
             Assert.IsTrue(deserialized.Properties.UserProperties.Any(x => x.Name == "Foo"));
         }
 
@@ -314,7 +311,7 @@ namespace MQTTnet.Tests
                       .WithQualityOfServiceLevel(MqttQualityOfServiceLevel.AtMostOnce)
                       .Build();
 
-            var p = new MqttV500DataConverter().CreatePublishPacket(req);
+            var p = new MqttPublishPacketFactory().Create(req);
 
             var deserialized = Roundtrip(p, MqttProtocolVersion.V500);
 

Tests/MQTTnet.Core.Tests/Server/Assigned_Client_ID_Tests.cs

@@ -21,7 +21,7 @@ namespace MQTTnet.Tests.Server
         [TestMethod]
         public Task Connect_With_Client_Id()
         {
-            return Connect_With_Client_Id("Connect_With_Client_Idtest_456", null, "test_456", null);
+            return Connect_With_Client_Id("Connect_With_Client_Id_test_456", null, "test_456", null);
         }
 
         async Task Connect_With_Client_Id(string expectedClientId, string expectedReturnedClientId, string usedClientId, string assignedClientId)

Tests/MQTTnet.Core.Tests/Server/General.cs

@@ -955,23 +955,23 @@ namespace MQTTnet.Tests.Server
         {
             using (var testEnvironment = CreateTestEnvironment())
             {
-                var receivedMessagesCount = 0;
-
                 await testEnvironment.StartServer();
 
                 var c1 = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithClientId("receiver"));
-                c1.UseApplicationMessageReceivedHandler(c => Interlocked.Increment(ref receivedMessagesCount));
+                var c1MessageHandler = testEnvironment.CreateApplicationMessageHandler(c1);
                 await c1.SubscribeAsync(new MqttTopicFilterBuilder().WithTopic(topicFilter).WithQualityOfServiceLevel(filterQualityOfServiceLevel).Build());
 
                 var c2 = await testEnvironment.ConnectClient(new MqttClientOptionsBuilder().WithClientId("sender"));
                 await c2.PublishAsync(new MqttApplicationMessageBuilder().WithTopic(topic).WithPayload(new byte[0]).WithQualityOfServiceLevel(qualityOfServiceLevel).Build());
+                await Task.Delay(500);
+                
                 await c2.DisconnectAsync().ConfigureAwait(false);
 
                 await Task.Delay(500);
                 await c1.UnsubscribeAsync(topicFilter);
                 await Task.Delay(500);
 
-                Assert.AreEqual(expectedReceivedMessagesCount, receivedMessagesCount);
+                Assert.AreEqual(expectedReceivedMessagesCount, c1MessageHandler.ReceivedApplicationMessages.Count);
             }
         }