Fix errors with multiple consumers

Directory.Build.props

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>2.1.0</Version>
+    <Version>2.2.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/ReflectionEventing.Demo.Wpf/Events/BackgroundTicked.cs

@@ -5,4 +5,4 @@
 
 namespace ReflectionEventing.Demo.Wpf.Events;
 
-public sealed record BackgroundTicked(int Value);
+public sealed record BackgroundTicked(int Value) : ITickedEvent;

src/ReflectionEventing.Demo.Wpf/Events/ITickedEvent.cs

@@ -0,0 +1,11 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and ReflectionEventing Contributors.
+// All Rights Reserved.
+
+namespace ReflectionEventing.Demo.Wpf.Events;
+
+public interface ITickedEvent
+{
+    int Value { get; }
+}

src/ReflectionEventing.Demo.Wpf/Events/OtherEvent.cs

@@ -0,0 +1,8 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and ReflectionEventing Contributors.
+// All Rights Reserved.
+
+namespace ReflectionEventing.Demo.Wpf.Events;
+
+public class OtherEvent;

src/ReflectionEventing.Demo.Wpf/ViewModels/MainWindowViewModel.cs

@@ -8,13 +8,16 @@
 
 namespace ReflectionEventing.Demo.Wpf.ViewModels;
 
-public partial class MainWindowViewModel : ObservableObject, IConsumer<BackgroundTicked>
+public partial class MainWindowViewModel
+    : ObservableObject,
+        IConsumer<ITickedEvent>,
+        IConsumer<OtherEvent>
 {
     [ObservableProperty]
     private int _currentTick = 0;
 
     /// <inheritdoc />
-    public async Task ConsumeAsync(BackgroundTicked payload, CancellationToken cancellationToken)
+    public async Task ConsumeAsync(ITickedEvent payload, CancellationToken cancellationToken)
     {
         int tickValue = payload.Value;
 
@@ -23,4 +26,10 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
             CurrentTick = tickValue;
         });
     }
+
+    /// <inheritdoc />
+    public async Task ConsumeAsync(OtherEvent payload, CancellationToken cancellationToken)
+    {
+        await Task.CompletedTask;
+    }
 }

src/ReflectionEventing/ConsumerTypesProviderExtensions.cs

@@ -0,0 +1,22 @@
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
+// Copyright (C) Leszek Pomianowski and ReflectionEventing Contributors.
+// All Rights Reserved.
+
+namespace ReflectionEventing;
+
+/// <summary>
+/// Provides extension methods for the <see cref="IConsumerTypesProvider"/> class.
+/// </summary>
+public static class ConsumerTypesProviderExtensions
+{
+    /// <summary>
+    /// Gets the consumers for the specified event type.
+    /// </summary>
+    /// <typeparam name="TEvent">The type of the event to get the consumers for.</typeparam>
+    /// <returns>A collection of consumer types that can handle the specified event type.</returns>
+    public static IEnumerable<Type> GetConsumerTypes<TEvent>(this IConsumerTypesProvider provider)
+    {
+        return provider.GetConsumerTypes(typeof(TEvent));
+    }
+}

src/ReflectionEventing/EventBus.cs

@@ -36,7 +36,7 @@ public void Publish<TEvent>(TEvent eventItem)
     public async Task PublishAsync<TEvent>(TEvent eventItem, CancellationToken cancellationToken)
     {
         List<Task> tasks = new();
-        IEnumerable<Type> consumerTypes = consumerTypesProvider.GetConsumerTypes<TEvent>();
+        IEnumerable<Type> consumerTypes = consumerTypesProvider.GetConsumerTypes(typeof(TEvent));
 
         foreach (Type consumerType in consumerTypes)
         {

src/ReflectionEventing/EventBusBuilder.cs

@@ -56,7 +56,7 @@ Type consumerType
         {
             Type consumedEventType = consumerInterface.GetGenericArguments()[0];
 
-            if (!consumers.ContainsKey(consumedEventType))
+            if (!consumers.ContainsKey(consumerType))
             {
                 consumers[consumerType] = new HashSet<Type>();
             }

src/ReflectionEventing/HashedConsumerTypesProvider.cs

@@ -15,8 +15,31 @@ public class HashedConsumerTypesProvider(IDictionary<Type, IEnumerable<Type>> co
     : IConsumerTypesProvider
 {
     /// <inheritdoc />
-    public IEnumerable<Type> GetConsumerTypes<TEvent>()
+    public IEnumerable<Type> GetConsumerTypes(Type eventType)
     {
-        return consumers.Where(x => x.Value.Contains(typeof(TEvent))).Select(x => x.Key);
+        foreach (KeyValuePair<Type, IEnumerable<Type>> consumer in consumers)
+        {
+            if (consumer.Value.Contains(eventType))
+            {
+                yield return consumer.Key;
+
+                continue;
+            }
+
+            // Fallback reflection
+            if (!consumer.Value.Any(x => ExtendsEvent(x, eventType)))
+            {
+                continue;
+            }
+
+            _ = ((HashSet<Type>)consumer.Value)?.Add(eventType);
+
+            yield return consumer.Key;
+        }
+    }
+
+    private static bool ExtendsEvent(Type consumerType, Type eventType)
+    {
+        return consumerType.IsAssignableFrom(eventType);
     }
 }

src/ReflectionEventing/IConsumerTypesProvider.cs

@@ -16,7 +16,6 @@ public interface IConsumerTypesProvider
     /// <summary>
     /// Gets the consumers for the specified event type.
     /// </summary>
-    /// <typeparam name="TEvent">The type of the event to get the consumers for.</typeparam>
     /// <returns>A collection of consumer types that can handle the specified event type.</returns>
-    IEnumerable<Type> GetConsumerTypes<TEvent>();
+    IEnumerable<Type> GetConsumerTypes(Type eventType);
 }