Improved SubAck Handling: Match packet IDs before completing event. (#223)

Co-authored-by: Peter Giacomo Lombardo <[email protected]>

Author: JaggerJo

Source/HiveMQtt/Client/HiveMQClient.cs

@@ -316,13 +316,22 @@ public async Task<SubscribeResult> SubscribeAsync(SubscribeOptions options)
 
         // Setup the task completion source to wait for the SUBACK
         var taskCompletionSource = new TaskCompletionSource<SubAckPacket>();
-        void TaskHandler(object? sender, OnSubAckReceivedEventArgs args) => taskCompletionSource.SetResult(args.SubAckPacket);
+        void TaskHandler(object? sender, OnSubAckReceivedEventArgs args)
+        {
+            if (args.SubAckPacket.PacketIdentifier == subscribePacket.PacketIdentifier)
+            {
+                taskCompletionSource.SetResult(args.SubAckPacket);
+            }
+        }
+
         EventHandler<OnSubAckReceivedEventArgs> eventHandler = TaskHandler;
         this.OnSubAckReceived += eventHandler;
 
         // Queue the constructed packet to be sent on the wire
         this.Connection.SendQueue.Enqueue(subscribePacket);
 
+
+
         SubAckPacket subAck;
         SubscribeResult subscribeResult;
         try
@@ -423,7 +432,14 @@ public async Task<UnsubscribeResult> UnsubscribeAsync(UnsubscribeOptions unsubOp
         var unsubscribePacket = new UnsubscribePacket(unsubOptions, (ushort)packetIdentifier);
 
         var taskCompletionSource = new TaskCompletionSource<UnsubAckPacket>();
-        void TaskHandler(object? sender, OnUnsubAckReceivedEventArgs args) => taskCompletionSource.SetResult(args.UnsubAckPacket);
+        void TaskHandler(object? sender, OnUnsubAckReceivedEventArgs args)
+        {
+            if (args.UnsubAckPacket.PacketIdentifier == unsubscribePacket.PacketIdentifier)
+            {
+                taskCompletionSource.SetResult(args.UnsubAckPacket);
+            }
+        }
+
         EventHandler<OnUnsubAckReceivedEventArgs> eventHandler = TaskHandler;
         this.OnUnsubAckReceived += eventHandler;