Event context ground work

src/Shiny.Mediator.Maui/Middleware/MainTheadEventMiddleware.cs

@@ -1,27 +1,27 @@
-using Shiny.Mediator.Infrastructure;
-
 namespace Shiny.Mediator.Middleware;
 
 
 public class MainTheadEventMiddleware<TEvent> : IEventMiddleware<TEvent> where TEvent : IEvent
 {
     public async Task Process(
-        IEvent @event, 
-        EventHandlerDelegate next, 
-        IEventHandler<TEvent> eventHandler, 
-        CancellationToken cancellationToken
+        EventExecutionContext<TEvent> context, 
+        EventHandlerDelegate next
     )
     {
-        var attr = eventHandler.GetHandlerHandleMethodAttribute<TEvent, MainThreadAttribute>();
-
-        if (attr != null)
+        var attr = context.EventHandler.GetHandlerHandleMethodAttribute<TEvent, MainThreadAttribute>();
+
+        if (attr == null)
+        {
+            await next().ConfigureAwait(false);
+        }
+        else
         {
             var tcs = new TaskCompletionSource();
             MainThread.BeginInvokeOnMainThread(async () =>
             {
                 try
                 {
-                    await next();
+                    await next().ConfigureAwait(false);
                     tcs.SetResult();
                 }
                 catch (Exception ex)
@@ -31,9 +31,5 @@ CancellationToken cancellationToken
             });
             await tcs.Task.ConfigureAwait(false);
         }
-        else
-        {
-            await next().ConfigureAwait(false);
-        }
     }
 }

src/Shiny.Mediator/EventExecutionContext.cs

@@ -0,0 +1,18 @@
+namespace Shiny.Mediator;
+
+
+public class EventExecutionContext<TEvent>(
+    TEvent @event,
+    IEventHandler<TEvent> eventHandler,
+    CancellationToken cancellationToken
+) where TEvent : IEvent
+{
+    public TEvent Event => @event;
+    public IEventHandler<TEvent> EventHandler => eventHandler;
+    public CancellationToken CancellationToken => cancellationToken;
+}
+public class EventAggregatedExecutionContext<TEvent>(IReadOnlyList<EventExecutionContext<TEvent>> contexts)
+    where TEvent : IEvent
+{
+
+}

src/Shiny.Mediator/IEventMiddleware.cs

@@ -5,9 +5,7 @@ namespace Shiny.Mediator;
 public interface IEventMiddleware<TEvent> where TEvent : IEvent
 {
     Task Process(
-        IEvent @event, 
-        EventHandlerDelegate next, 
-        IEventHandler<TEvent> eventHandler,
-        CancellationToken cancellationToken
+        EventExecutionContext<TEvent> context, 
+        EventHandlerDelegate next
     );
 }

src/Shiny.Mediator/Infrastructure/IEventPublisher.cs

@@ -9,13 +9,11 @@ public interface IEventPublisher
     /// <param name="cancellationToken"></param>
     /// <typeparam name="TEvent"></typeparam>
     /// <returns></returns>
-    Task Publish<TEvent>(
+    Task<EventAggregatedExecutionContext<TEvent>> Publish<TEvent>(
         TEvent @event,
         CancellationToken cancellationToken = default
     ) where TEvent : IEvent;
 
-    // Task Publish(object arg, CancellationToken cancellationToken = default)
-
     /// <summary>
     /// 
     /// </summary>

src/Shiny.Mediator/Impl/DefaultEventPublisher.cs → src/Shiny.Mediator/Infrastructure/Impl/DefaultEventPublisher.cs

@@ -1,8 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Shiny.Mediator.Infrastructure;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 public class DefaultEventPublisher(
@@ -13,7 +12,7 @@ IEnumerable<IEventCollector> collectors
     readonly SubscriptionEventCollector subscriptions = new();
 
 
-    public async Task Publish<TEvent>(
+    public async Task<EventAggregatedExecutionContext<TEvent>> Publish<TEvent>(
         TEvent @event, 
         CancellationToken cancellationToken = default
     ) where TEvent : IEvent
@@ -31,18 +30,27 @@ public async Task Publish<TEvent>(
         foreach (var collector in collectors)
             AppendHandlersIf(handlers, collector);
 
+        var list = new List<EventExecutionContext<TEvent>>();
+        var context = new EventAggregatedExecutionContext<TEvent>(list);
+
         if (handlers.Count == 0)
-            return;
+            return context;
 
         var logger = services.GetRequiredService<ILogger<TEvent>>();
         var middlewares = scope.ServiceProvider.GetServices<IEventMiddleware<TEvent>>().ToList();
         var tasks = handlers
-            .Select(x => Execute(@event, x, logger, middlewares, cancellationToken))
+            .Select(async x =>
+            {
+                var econtext = await Execute(@event, x, logger, middlewares, cancellationToken).ConfigureAwait(false);
+                list.Add(econtext);
+            })
             .ToList();
 
         await Task
             .WhenAll(tasks)
             .ConfigureAwait(false);
+
+        return context;
     }
 
 
@@ -54,21 +62,23 @@ public IDisposable Subscribe<TEvent>(Func<TEvent, CancellationToken, Task> actio
     }
 
 
-    static async Task Execute<TEvent>(
+    static async Task<EventExecutionContext<TEvent>> Execute<TEvent>(
         TEvent @event,
         IEventHandler<TEvent> eventHandler, 
         ILogger logger,
         IEnumerable<IEventMiddleware<TEvent>> middlewares,
         CancellationToken cancellationToken
     ) where TEvent : IEvent
     {
+        var context = new EventExecutionContext<TEvent>(@event, eventHandler, cancellationToken);
+
         var handlerDelegate = new EventHandlerDelegate(() =>
         {
             logger.LogDebug(
                 "Executing Event Handler {HandlerType}", 
                 eventHandler.GetType().FullName
             );
-            return eventHandler.Handle(@event, cancellationToken);
+            return eventHandler.Handle(context.Event, context.CancellationToken);
         });
 
         await middlewares
@@ -78,22 +88,20 @@ await middlewares
                 (next, middleware) => () =>
                 {
                     logger.LogDebug(
-                        "Executing event middleware {MiddlewareType} for {RequestType}",
-                        middleware.GetType().FullName,
-                        @event.GetType().FullName
+                        "Executing event middleware {MiddlewareType}",
+                        middleware.GetType().FullName
                     );
 
-                    return middleware.Process(
-                        @event,
-                        next,
-                        eventHandler,
-                        cancellationToken
-                    );
-                })
+                    return middleware.Process(context, next);
+                }
+            )
             .Invoke()
             .ConfigureAwait(false);
+
+        return context;
     }
 
+
     static void AppendHandlersIf<TEvent>(List<IEventHandler<TEvent>> list, IEventCollector collector) where TEvent : IEvent
     {
         var handlers = collector.GetHandlers<TEvent>();

src/Shiny.Mediator/Impl/DefaultRequestSender.cs → src/Shiny.Mediator/Infrastructure/Impl/DefaultRequestSender.cs

@@ -1,8 +1,7 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
-using Shiny.Mediator.Infrastructure;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 public class DefaultRequestSender(IServiceProvider services) : IRequestSender

src/Shiny.Mediator/Impl/Mediator.cs → src/Shiny.Mediator/Infrastructure/Impl/Mediator.cs

@@ -1,6 +1,4 @@
-using Shiny.Mediator.Infrastructure;
-
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 public class Mediator(
@@ -49,7 +47,7 @@ public IAsyncEnumerable<TResult> Request<TResult>(IStreamRequest<TResult> reques
     public ExecutionResult<IAsyncEnumerable<TResult>> RequestWithContext<TResult>(IStreamRequest<TResult> request, CancellationToken cancellationToken = default)
         => requestSender.RequestWithContext(request, cancellationToken);
 
-    public Task Publish<TEvent>(TEvent @event, CancellationToken cancellationToken = default) where TEvent : IEvent
+    public Task<EventAggregatedExecutionContext<TEvent>> Publish<TEvent>(TEvent @event, CancellationToken cancellationToken = default) where TEvent : IEvent
         => eventPublisher.Publish(@event, cancellationToken);
 
     public IDisposable Subscribe<TEvent>(Func<TEvent, CancellationToken, Task> action) where TEvent : IEvent

src/Shiny.Mediator/Impl/RequestExecutor.cs → src/Shiny.Mediator/Infrastructure/Impl/RequestExecutor.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 static class RequestExecutor

src/Shiny.Mediator/Impl/RequestVoidWrapper.cs → src/Shiny.Mediator/Infrastructure/Impl/RequestVoidWrapper.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 class RequestVoidWrapper<TRequest> where TRequest : IRequest

src/Shiny.Mediator/Impl/RequestWrapper.cs → src/Shiny.Mediator/Infrastructure/Impl/RequestWrapper.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 class RequestWrapper<TRequest, TResult> where TRequest : IRequest<TResult>

src/Shiny.Mediator/Impl/StreamRequestWrapper.cs → src/Shiny.Mediator/Infrastructure/Impl/StreamRequestWrapper.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure.Impl;
 
 
 class StreamRequestWrapper<TRequest, TResult> where TRequest : IStreamRequest<TResult>

src/Shiny.Mediator/Impl/SubscriptionEventCollector.cs → src/Shiny.Mediator/Infrastructure/SubscriptionEventCollector.cs

@@ -1,6 +1,6 @@
 using Shiny.Mediator.Infrastructure;
 
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure;
 
 
 public class SubscriptionEventCollector : IEventCollector

src/Shiny.Mediator/Impl/SubscriptionEventHandler.cs → src/Shiny.Mediator/Infrastructure/SubscriptionEventHandler.cs

@@ -1,4 +1,4 @@
-namespace Shiny.Mediator.Impl;
+namespace Shiny.Mediator.Infrastructure;
 
 
 public class SubscriptionEventHandler<TEvent> : IDisposable, IEventHandler<TEvent> where TEvent : IEvent

src/Shiny.Mediator/MediatorExtensions.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
-using Shiny.Mediator.Impl;
 using Shiny.Mediator.Infrastructure;
+using Shiny.Mediator.Infrastructure.Impl;
 using Shiny.Mediator.Middleware;
 
 namespace Shiny.Mediator;
@@ -52,7 +52,7 @@ public static IServiceCollection AddShinyMediator(this IServiceCollection servic
             cfg.AddPerformanceLoggingMiddleware();
         }
 
-        services.TryAddSingleton<IMediator, Impl.Mediator>();
+        services.TryAddSingleton<IMediator, Infrastructure.Impl.Mediator>();
         services.TryAddSingleton<IRequestSender, DefaultRequestSender>();
         services.TryAddSingleton<IEventPublisher, DefaultEventPublisher>();
         return services;

src/Shiny.Mediator/Middleware/ExceptionHandlerEventMiddleware.cs

@@ -6,10 +6,8 @@ namespace Shiny.Mediator.Middleware;
 public class ExceptionHandlerEventMiddleware<TEvent>(ILogger<TEvent> logger) : IEventMiddleware<TEvent> where TEvent : IEvent
 {
     public async Task Process(
-        IEvent @event,
-        EventHandlerDelegate next, 
-        IEventHandler<TEvent> eventHandler, 
-        CancellationToken cancellationToken
+        EventExecutionContext<TEvent> context,
+        EventHandlerDelegate next
     )
     {
         try
@@ -18,7 +16,7 @@ CancellationToken cancellationToken
         }
         catch (Exception ex)
         {
-            logger.LogError(ex, "Error in event {EventType}", @event.GetType().FullName);
+            logger.LogError(ex, "Error in event {EventType}", context.Event.GetType().FullName);
         }
     }
 }

tests/Shiny.Mediator.Tests/OfflineAvailableMiddlewareTests.cs

@@ -1,6 +1,4 @@
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration.Memory;
-using Shiny.Mediator.Impl;
 using Shiny.Mediator.Infrastructure;
 using Shiny.Mediator.Middleware;