Use AsyncEventHandler<MessagingEvent> for consumer message handling

samples/MerQure.Samples/DeadLetterExample.cs

@@ -51,12 +51,12 @@ public async Task RunAsync()
 
         // Get the consumer on the existing queue and consume its messages
         var consumer = await _messagingService.GetConsumerAsync("deadletter.queue");
-        await consumer.ConsumeAsync((object sender, IMessagingEvent args) =>
+        await consumer.ConsumeAsync((object sender, MessagingEvent args) =>
         {
             var realDelay = DateTime.Now.Subtract(dateStart).TotalSeconds;
             Console.WriteLine(string.Format("{0} received after {1:#.##}s.", args.Message.GetRoutingKey(), realDelay));
             // send ACK: acknowlegdment to the queue
-            consumer.AcknowlegdeDeliveredMessageAsync(args);
+            return consumer.AcknowlegdeDeliveredMessageAsync(args).AsTask();
         });
     }
 }

samples/MerQure.Samples/SimpleExample.cs

@@ -32,20 +32,20 @@ public async Task RunAsync()
         // Get the consumer on the existing queue and consume its messages
         var consumer = await _messagingService.GetConsumerAsync("simple.queue");
         var random = new Random();
-        await consumer.ConsumeAsync((object sender, IMessagingEvent args) =>
+        await consumer.ConsumeAsync((object sender, MessagingEvent args) =>
         {
             // we simulate the delivery success
             if (random.Next() % 2 == 0)
             {
                 Console.WriteLine("Retry " + args.Message.GetRoutingKey());
                 // send NACK: negative acknowlegdment to the queue
-                consumer.RejectDeliveredMessageAsync(args);
+                return consumer.RejectDeliveredMessageAsync(args).AsTask();
             }
             else
             {
                 Console.WriteLine(args.Message.GetBody());
                 // send ACK: acknowlegdment to the queue
-                consumer.AcknowlegdeDeliveredMessageAsync(args);
+                return consumer.AcknowlegdeDeliveredMessageAsync(args).AsTask();
             }
         });
     }

samples/MerQure.Samples/StopExample.cs

@@ -39,7 +39,7 @@ await consumer.ConsumeAsync((_, args) =>
             Thread.Sleep(10);
             Console.WriteLine(args.Message.GetBody());
             // send ACK: acknowlegdment to the queue
-            consumer.AcknowlegdeDeliveredMessageAsync(args);
+            return consumer.AcknowlegdeDeliveredMessageAsync(args).AsTask();
         });
 
         // Stop Consuming after 100 ms ~ 10 messages

src/MerQure.RbMQ/Clients/Consumer.cs

@@ -1,12 +1,12 @@
 using MerQure.Messages;
 using MerQure.RbMQ.Content;
-using MerQure.RbMQ.Events;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace MerQure.RbMQ.Clients;
@@ -17,33 +17,37 @@ class Consumer : RabbitMqClient, IConsumer
 
     private AsyncEventingBasicConsumer _consumer;
     private readonly ushort _prefetchCount;
-    private readonly object _consumingLock;
+    private readonly SemaphoreSlim _consumingLock;
 
     public Consumer(IChannel channel, string queueName, ushort prefetchCount)
         : base(channel)
     {
         QueueName = queueName.ToLowerInvariant();
         _prefetchCount = prefetchCount;
-        _consumingLock = new object();
+        _consumingLock = new SemaphoreSlim(1, 1);
     }
 
-    public async Task ConsumeAsync(EventHandler<IMessagingEvent> onMessageReceived)
+    public async Task ConsumeAsync(AsyncEventHandler<MessagingEvent> onMessageReceived)
     {
         await Channel.BasicQosAsync(0, _prefetchCount, false);
 
         _consumer = new AsyncEventingBasicConsumer(Channel);
-        _consumer.ReceivedAsync += (sender, args) =>
+        _consumer.ReceivedAsync += async (sender, args) =>
         {
             if (onMessageReceived != null)
             {
-                lock (_consumingLock)
+                await _consumingLock.WaitAsync();
+                try
                 {
                     var message = ParseDeliveredMessage(args);
                     var messageEventArgs = new MessagingEvent(message, args.DeliveryTag.ToString());
-                    onMessageReceived(sender, messageEventArgs);
+                    await onMessageReceived(sender, messageEventArgs);
+                }
+                finally
+                {
+                    _consumingLock.Release();
                 }
             }
-            return Task.CompletedTask;
         };
 
         await Channel.BasicConsumeAsync(QueueName, false, _consumer);
@@ -89,17 +93,18 @@ public async Task StopConsuming(AsyncEventHandler<ConsumerEventArgs> onConsumerS
     {
         if (IsConsuming())
         {
-            lock (_consumingLock)
+            await _consumingLock.WaitAsync();
+            try
             {
                 if (onConsumerStopped != null)
                 {
-                    _consumer.UnregisteredAsync  += (sender, e) =>
-                    {
-                        onConsumerStopped(sender, e);
-                        return Task.CompletedTask;
-                    };
+                    _consumer.UnregisteredAsync += onConsumerStopped;
                 }
             }
+            finally
+            {
+                _consumingLock.Release();
+            }
 
             // Must be outside the lock to avoid deadlock
             foreach (var tag in _consumer.ConsumerTags)

src/MerQure.Tools/Buses/Consumer.cs

@@ -24,6 +24,7 @@
         await consumer.ConsumeAsync((_, messagingEvent) =>
         {
             OnMessageReceived(callback, messagingEvent);
+            return Task.CompletedTask;
         });
     }
 
@@ -52,12 +53,12 @@
         callback(this, retryMessage.OriginalMessage);
     }
 
     private static string EncodeDeliveryTag(string deliveryTag) //TODO CLEAN !! this is just a fast fix ...
     {
         return $"{deliveryTag}_{Guid.NewGuid().ToString()}";
     }
 
     private static string DecodeDeliveryTag(string deliveryTag) //TODO CLEAN !! this is just a fast fix
     {
         return deliveryTag.Split('_')[0];
     }

src/MerQure/Clients/IConsumer.cs

@@ -19,7 +19,7 @@
         /// Start listening on the queue
         /// </summary>
         /// <param name="onMessageReceived">Handler called each time a message arrives for this consumer.</param>
-        Task ConsumeAsync(EventHandler<IMessagingEvent> onMessageReceived);
+        Task ConsumeAsync(AsyncEventHandler<MessagingEvent> onMessageReceived);
 
         /// <summary>
         /// Indicates if the Consumer is registred on the queue and waiting for messages
@@ -30,7 +30,7 @@
         /// Unregister Consumer from the queue
         /// </summary>
         /// <param name="onConsumerStopped">Handler called when queu has unregistered the consumer</param>
         Task StopConsuming(AsyncEventHandler<ConsumerEventArgs> onConsumerStopped);
 
         /// <summary>
         /// Acknowledge a delivered message.

src/MerQure.RbMQ/Events/MessagingEvent.cs → src/MerQure/Events/MessagingEvent.cs

@@ -1,6 +1,9 @@
-namespace MerQure.RbMQ.Events
+using MerQure.Messages;
+using RabbitMQ.Client.Events;
+
+namespace MerQure
 {
-    class MessagingEvent : IMessagingEvent
+    public class MessagingEvent : AsyncEventArgs, IMessagingEvent
     {
         public IMessage Message { get; set; }
 

tests/MerQure.Tools.Tests/Buses/ConsumerTests.cs

@@ -1,8 +1,10 @@
-using MerQure.Tools.Buses;
+using MerQure.Messages;
+using MerQure.Tools.Buses;
 using MerQure.Tools.Configurations;
 using MerQure.Tools.Messages;
 using Moq;
 using Newtonsoft.Json;
+using RabbitMQ.Client.Events;
 using System;
 using System.Threading.Tasks;
 using Xunit;
@@ -18,9 +20,9 @@ public class ConsumerTests : IDisposable
     public ConsumerTests()
     {
         _mockMerQureConsumer = new Mock<IConsumer>();
-        _mockMerQureConsumer.Setup(m => m.ConsumeAsync(It.IsAny<EventHandler<IMessagingEvent>>())).Callback((EventHandler<IMessagingEvent> action) =>
+        _mockMerQureConsumer.Setup(m => m.ConsumeAsync(It.IsAny<AsyncEventHandler<MessagingEvent>>())).Callback((AsyncEventHandler<MessagingEvent> action) =>
         {
-            action(this, new Mock<IMessagingEvent>().Object);
+            action(this, new MessagingEvent(new Mock<IMessage>().Object, "1"));
         });
 
         _mockMessagingService = new Mock<IMessagingService>();