Updating handler signatures for requestcontext

samples/Sample.Api/Handlers/GetResultRequestHandler.cs

@@ -4,10 +4,8 @@ namespace Sample.Api.Handlers;
 [MediatorHttpGet("GetThing", "/getthing/{parameter}")]
 public class GetResultRequestHandler : IRequestHandler<GetThingRequest, string>
 {
-    public Task<string> Handle(GetThingRequest request, CancellationToken cancellationToken)
-    {
-        return Task.FromResult($"Route: {request.Parameter} - Query: {request.Query}");
-    }
+    public Task<string> Handle(GetThingRequest request, RequestContext<GetThingRequest> context, CancellationToken cancellationToken)
+        => Task.FromResult($"Route: {request.Parameter} - Query: {request.Query}");
 }
 
 public class GetThingRequest : IRequest<string>

samples/Sample.Api/Handlers/MappedRequestHandler.cs

@@ -5,8 +5,6 @@ public record MappedRequest : IRequest<string>;
 [SingletonHandler]
 public class MappedRequestHandler : IRequestHandler<MappedRequest, string>
 {
-    public Task<string> Handle(MappedRequest request, CancellationToken cancellationToken)
-    {
-        return Task.FromResult("Hello world from mapped handler");
-    }
+    public Task<string> Handle(MappedRequest request, RequestContext<MappedRequest> context, CancellationToken cancellationToken)
+        => Task.FromResult("Hello world from mapped handler");
 }

samples/Sample.Api/Handlers/TestResultRequestHandler.cs

@@ -8,8 +8,6 @@ public record TestResult;
 [MediatorHttpPost("TestResult", "/testresult")]
 public class TestResultRequestHandler : IRequestHandler<TestResultRequest, TestResult>
 {
-    public Task<TestResult> Handle(TestResultRequest request, CancellationToken cancellationToken)
-    {
-        return Task.FromResult(new TestResult());
-    }
+    public Task<TestResult> Handle(TestResultRequest request, RequestContext<TestResultRequest> context, CancellationToken cancellationToken)
+        => Task.FromResult(new TestResult());
 }

samples/Sample.Blazor/Handlers/DoThingRequestHandler.cs

@@ -7,12 +7,12 @@ namespace Sample.Blazor.Handlers;
 public class DoThingRequestHandler(IMediator mediator) : IRequestHandler<DoThing, int>
 {
     [OfflineAvailable]
-    public async Task<int> Handle(DoThing request, CancellationToken cancellationToken)
+    public async Task<int> Handle(DoThing request, RequestContext<DoThing> context, CancellationToken cancellationToken)
     {
         var num = new Random().Next(1, 1000000);
         var value = $"{request.Text} - number: {num}";
         await mediator.Publish(new TheThing(value), cancellationToken);
-
+            
         return num;
     }
 }

samples/Sample.Blazor/Pages/Home.razor

@@ -58,7 +58,7 @@ Welcome to your new app.
         this.text = null;
     }
 
-    public Task Handle(TheThing @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(TheThing @event, EventContext<TheThing> context, CancellationToken cancellationToken)
     {
         Console.WriteLine("Received TheThing");
         this.eventText = @event.Text;

samples/Sample/AnotherViewModel.cs

@@ -26,6 +26,6 @@ public void OnNavigatedTo(INavigationParameters parameters)
     [ObservableProperty] string arg;
 
     [MainThread]
-    public Task Handle(MyMessageEvent @event, EventContext context, CancellationToken cancellationToken) =>
+    public Task Handle(MyMessageEvent @event, EventContext<MyMessageEvent> context, CancellationToken cancellationToken) =>
         conn.Log("AnotherViewModel", @event);
 }

samples/Sample/Components/Pages/Home.razor

@@ -9,7 +9,7 @@ Welcome to your new app.
 
 @code {
     // TODO: should nav to another page to test that this disconnects
-    public async Task Handle(MyMessageEvent @event, EventContext context, CancellationToken cancellationToken)
+    public async Task Handle(MyMessageEvent @event, EventContext<MyMessageEvent> context, CancellationToken cancellationToken)
     {
         await conn.Log("BlazorPage-Home.razor", @event);
     }

samples/Sample/Handlers/CachedRequestHandler.cs

@@ -7,7 +7,7 @@ namespace Sample.Handlers;
 public class CachedRequestHandler : IRequestHandler<CacheRequest, string>
 {
     [Cache(AbsoluteExpirationSeconds = 20)]
-    public Task<string> Handle(CacheRequest request, CancellationToken cancellationToken)
+    public Task<string> Handle(CacheRequest request, RequestContext<CacheRequest> context, CancellationToken cancellationToken)
     {
         var r = DateTimeOffset.Now.ToString("h:mm:ss tt");
         return Task.FromResult(r);

samples/Sample/Handlers/OfflineRequestHandler.cs

@@ -7,7 +7,7 @@ namespace Sample.Handlers;
 public class OfflineRequestHandler : IRequestHandler<OfflineRequest, string>
 {
     [OfflineAvailable]
-    public Task<string> Handle(OfflineRequest request, CancellationToken cancellationToken)
+    public Task<string> Handle(OfflineRequest request, RequestContext<OfflineRequest> context, CancellationToken cancellationToken)
     {
         var r = DateTimeOffset.Now.ToString("h:mm:ss tt");
         return Task.FromResult(r);

samples/Sample/Handlers/ResilientRequestHandler.cs

@@ -8,7 +8,7 @@ public class ResilientRequestHandler : IRequestHandler<ResilientRequest, string>
 {
     static bool timeoutRequest;
 
-    public async Task<string> Handle(ResilientRequest request, CancellationToken cancellationToken)
+    public async Task<string> Handle(ResilientRequest request, RequestContext<ResilientRequest> context, CancellationToken cancellationToken)
     {
         if (timeoutRequest)
         {

samples/Sample/Handlers/SingletonEventHandler.cs

@@ -6,7 +6,7 @@ namespace Sample.Handlers;
 [SingletonHandler]
 public class SingletonEventHandler(IMediator mediator, AppSqliteConnection data) : IEventHandler<MyMessageEvent>
 {
-    public async Task Handle(MyMessageEvent @event, EventContext context, CancellationToken cancellationToken)
+    public async Task Handle(MyMessageEvent @event, EventContext<MyMessageEvent> context, CancellationToken cancellationToken)
     {
         var random = new Random();
         var wait = random.Next(500, 5000);

samples/Sample/Handlers/SingletonRequestHandler.cs

@@ -8,7 +8,7 @@ public class SingletonRequestHandler(IMediator mediator, AppSqliteConnection dat
 {
     // [Cache(Storage = StoreType.File, MaxAgeSeconds = 30, OnlyForOffline = true)]
     [OfflineAvailable]
-    public async Task<MyMessageResponse> Handle(MyMessageRequest request, CancellationToken cancellationToken)
+    public async Task<MyMessageResponse> Handle(MyMessageRequest request, RequestContext<MyMessageRequest> context, CancellationToken cancellationToken)
     {
         var e = new MyMessageEvent(
             request.Arg,

samples/Sample/TriggerViewModel.cs

@@ -24,7 +24,7 @@ IPageDialogService dialogs
 
 
     [MainThread]
-    public Task Handle(MyMessageEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(MyMessageEvent @event, EventContext<MyMessageEvent> context, CancellationToken cancellationToken)
     {
         // do something async here
         Console.WriteLine("Scoped Handler: " + @event.Arg);

src/Shiny.Mediator.AppSupport/Middleware/OfflineFlushEventHandler.cs

@@ -8,12 +8,12 @@ public class OfflineFlushEventHandlers(IOfflineService offline) :
     IEventHandler<FlushStoreByRequestEvent>,
     IEventHandler<FlushStoreByTypeEvent>
 {
-    public Task Handle(FlushAllStoresEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(FlushAllStoresEvent @event, EventContext<FlushAllStoresEvent> context, CancellationToken cancellationToken)
         => offline.Clear();
 
-    public Task Handle(FlushStoreByRequestEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(FlushStoreByRequestEvent @event, EventContext<FlushStoreByRequestEvent> context, CancellationToken cancellationToken)
         => offline.ClearByRequest(@event.Request);
 
-    public Task Handle(FlushStoreByTypeEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(FlushStoreByTypeEvent @event, EventContext<FlushStoreByTypeEvent> context, CancellationToken cancellationToken)
         => offline.ClearByType(@event.Type);
 }

src/Shiny.Mediator.DapperRequests/Handlers/DapperFirstQueryRequestHandler.cs

@@ -7,12 +7,15 @@ public class DapperFirstQueryRequestHandler<TResult>(
     IConnectionProvider connectionProvider
 ) : IRequestHandler<DapperFirstQuery<TResult>, TResult>
 {
-    public Task<TResult> Handle(DapperFirstQuery<TResult> request, CancellationToken cancellationToken)
-        => connectionProvider
-            .Create(request)
-            .QueryBuilder(request.Sql)
-            .QueryFirstOrDefaultAsync<TResult>(
-                commandTimeout: request.CommandTimeout,
-                cancellationToken: cancellationToken
-            );
+    public Task<TResult> Handle(
+        DapperFirstQuery<TResult> request, 
+        RequestContext<DapperFirstQuery<TResult>> context, 
+        CancellationToken cancellationToken
+    ) => connectionProvider
+        .Create(request)
+        .QueryBuilder(request.Sql)
+        .QueryFirstOrDefaultAsync<TResult>(
+            commandTimeout: request.CommandTimeout,
+            cancellationToken: cancellationToken
+        );
 }

src/Shiny.Mediator.DapperRequests/Handlers/DapperQueryRequestHandler.cs

@@ -6,13 +6,16 @@ public class DapperQueryRequestHandler<TResult>(
     IConnectionProvider connectionProvider
 ) : IRequestHandler<DapperQuery<TResult>, IEnumerable<TResult>>
 {
-    public Task<IEnumerable<TResult>> Handle(DapperQuery<TResult> request, CancellationToken cancellationToken)
-        => connectionProvider
-            .Create(request)
-            .QueryBuilder(request.Sql)
-            .QueryAsync<TResult>(
-                null,
-                request.CommandTimeout,
-                cancellationToken: cancellationToken
-            );
+    public Task<IEnumerable<TResult>> Handle(
+        DapperQuery<TResult> request, 
+        RequestContext<DapperQuery<TResult>> context, 
+        CancellationToken cancellationToken
+    ) => connectionProvider
+        .Create(request)
+        .QueryBuilder(request.Sql)
+        .QueryAsync<TResult>(
+            null,
+            request.CommandTimeout,
+            cancellationToken: cancellationToken
+        );
 }

src/Shiny.Mediator.DapperRequests/Handlers/DapperScalarRequestHandler.cs

@@ -5,7 +5,7 @@ namespace Shiny.Mediator.DapperRequests.Handlers;
 
 public class DapperScalarRequestHandler(IConnectionProvider connectionProvider) : IRequestHandler<DapperScalar, object>
 {
-    public Task<object> Handle(DapperScalar request, CancellationToken cancellationToken)
+    public Task<object> Handle(DapperScalar request, RequestContext<DapperScalar> context, CancellationToken cancellationToken)
         => connectionProvider
             .Create(request)
             .QueryBuilder(request.Sql)

src/Shiny.Mediator/Caching/Infrastructure/FlushStoreEventHandlers.cs

@@ -6,20 +6,20 @@ public class FlushStoreEventHandlers(ICacheService cache) :
     IEventHandler<FlushStoreByRequestEvent>,
     IEventHandler<FlushStoreByTypeEvent>
 {
-    public Task Handle(FlushAllStoresEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(FlushAllStoresEvent @event, EventContext<FlushAllStoresEvent> context, CancellationToken cancellationToken)
     {
         cache.Clear();
         return Task.CompletedTask;
     }
 
-    public Task Handle(FlushStoreByRequestEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(FlushStoreByRequestEvent @event, EventContext<FlushStoreByRequestEvent> context, CancellationToken cancellationToken)
     {
         var requestkey = Utils.GetRequestKey(@event.Request);
         cache.Remove(requestkey);
         return Task.CompletedTask;
     }
 
-    public Task Handle(FlushStoreByTypeEvent @event, EventContext context, CancellationToken cancellationToken)
+    public Task Handle(FlushStoreByTypeEvent @event, EventContext<FlushStoreByTypeEvent> context, CancellationToken cancellationToken)
     {
         var t = @event.Type;
         var startsWith = $"{t.Namespace}.{t.Name}";

src/Shiny.Mediator/CommandContext.cs

@@ -7,7 +7,15 @@ public class CommandContext(ICommandHandler handler, ICommand command)
     public Guid CommandId { get; }= Guid.NewGuid();
     public IReadOnlyDictionary<string, object> Values => this.store.ToDictionary();
     public void Add(string key, object value) => this.store.Add(key, value);
-
+
+
     public ICommand Command => command;
     public ICommandHandler Handler => handler;
+}
+
+public class CommandContext<TCommand>(ICommandHandler<TCommand> handler, TCommand command) : CommandContext(handler, command)
+    where TCommand : ICommand
+{
+    public new TCommand Command => command;
+    public new ICommandHandler<TCommand> Handler => handler;
 }

src/Shiny.Mediator/EventAggregatedContext.cs

@@ -0,0 +1,6 @@
+namespace Shiny.Mediator;
+
+public class EventAggregatedContext<TEvent>(IReadOnlyList<EventContext<TEvent>> contexts) where TEvent : IEvent
+{
+    public IReadOnlyList<EventContext<TEvent>> HandlerExecutions => contexts;
+}

src/Shiny.Mediator/Http/HttpRequestHandler.cs

@@ -19,7 +19,7 @@ IEnumerable<IHttpRequestDecorator<TRequest, TResult>> decorators
     readonly HttpClient httpClient = new();
 
 
-    public async Task<TResult> Handle(TRequest request, CancellationToken cancellationToken)
+    public async Task<TResult> Handle(TRequest request, RequestContext<TRequest> context, CancellationToken cancellationToken)
     {
         var http = request.GetType().GetCustomAttribute<HttpAttribute>();
         if (http == null)

src/Shiny.Mediator/ICommandMiddleware.cs

@@ -5,8 +5,7 @@ namespace Shiny.Mediator;
 public interface ICommandMiddleware<TCommand> where TCommand : ICommand
 {
     Task Process(
-        TCommand command, 
-        CommandContext context,
+        CommandContext<TCommand> context,
         CommandHandlerDelegate next,
         CancellationToken cancellationToken
     );

src/Shiny.Mediator/IEventHandler.cs

@@ -4,13 +4,13 @@ namespace Shiny.Mediator;
 /// 
 /// </summary>
 /// <typeparam name="TEvent"></typeparam>
-public interface IEventHandler<in TEvent> where TEvent : IEvent
+public interface IEventHandler<TEvent> where TEvent : IEvent
 {
     /// <summary>
     /// /
     /// </summary>
     /// <param name="event"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task Handle(TEvent @event, EventContext context, CancellationToken cancellationToken);
+    Task Handle(TEvent @event, EventContext<TEvent> context, CancellationToken cancellationToken);
 }

src/Shiny.Mediator/IMediator.cs

@@ -21,7 +21,7 @@ Task<RequestResult<TResult>> RequestWithContext<TResult>(
     /// <param name="request"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    Task<CommandContext> Send<TCommand>(
+    Task<CommandContext<TCommand>> Send<TCommand>(
         TCommand request,
         CancellationToken cancellationToken = default
     ) where TCommand : ICommand;
@@ -46,7 +46,7 @@ RequestResult<IAsyncEnumerable<TResult>> RequestWithContext<TResult>(
     /// <param name="cancellationToken"></param>
     /// <typeparam name="TEvent"></typeparam>
     /// <returns></returns>
-    Task<EventAggregatedExecutionContext<TEvent>> Publish<TEvent>(
+    Task<EventAggregatedContext<TEvent>> Publish<TEvent>(
         TEvent @event,
         CancellationToken cancellationToken = default,
         bool executeInParallel = true
@@ -59,6 +59,6 @@ Task<EventAggregatedExecutionContext<TEvent>> Publish<TEvent>(
     /// <typeparam name="TEvent"></typeparam>
     /// <returns></returns>
     IDisposable Subscribe<TEvent>(
-        Func<TEvent, EventContext, CancellationToken, Task> action
+        Func<TEvent, EventContext<TEvent>, CancellationToken, Task> action
     ) where TEvent : IEvent;
 }

src/Shiny.Mediator/IRequestHandler.cs

@@ -5,5 +5,5 @@ public interface IRequestHandler { }
 
 public interface IRequestHandler<TRequest, TResult> : IRequestHandler where TRequest : IRequest<TResult>
 {
-    Task<TResult> Handle(TRequest request, CancellationToken cancellationToken);
+    Task<TResult> Handle(TRequest request, RequestContext<TRequest> context, CancellationToken cancellationToken);
 }

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

@@ -6,7 +6,7 @@ namespace Shiny.Mediator.Infrastructure.Impl;
 
 public partial class Mediator
 {
-    public async Task<CommandContext> Send<TCommand>(
+    public async Task<CommandContext<TCommand>> Send<TCommand>(
         TCommand command, 
         CancellationToken cancellationToken = default
     ) where TCommand : ICommand
@@ -16,7 +16,7 @@ public async Task<CommandContext> Send<TCommand>(
         if (commandHandler == null)
             throw new InvalidOperationException("No command handler found for " + command.GetType().FullName);
 
-        var context = new CommandContext(commandHandler, command);
+        var context = new CommandContext<TCommand>(commandHandler, command);
         var logger = scope.ServiceProvider.GetRequiredService<ILogger<TCommand>>();
         var handlerExec = new CommandHandlerDelegate(async () =>
         {
@@ -42,7 +42,6 @@ await middlewares
                     );
 
                     return middleware.Process(
-                        command, 
                         context, 
                         next, 
                         cancellationToken

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

@@ -8,7 +8,7 @@ public partial class Mediator
 {
     readonly SubscriptionEventCollector subscriptions = new();
 
-    public virtual async Task<EventAggregatedExecutionContext<TEvent>> Publish<TEvent>(
+    public virtual async Task<EventAggregatedContext<TEvent>> Publish<TEvent>(
         TEvent @event,
         CancellationToken cancellationToken = default,
         bool executeInParallel = true
@@ -28,7 +28,7 @@ public virtual async Task<EventAggregatedExecutionContext<TEvent>> Publish<TEven
             AppendHandlersIf(handlers, collector);
 
         var list = new List<EventContext<TEvent>>();
-        var context = new EventAggregatedExecutionContext<TEvent>(list);
+        var context = new EventAggregatedContext<TEvent>(list);
 
         if (handlers.Count == 0)
             return context;
@@ -67,7 +67,7 @@ await Task
         return context;
     }
 
-    public IDisposable Subscribe<TEvent>(Func<TEvent, EventContext, CancellationToken, Task> action) where TEvent : IEvent
+    public IDisposable Subscribe<TEvent>(Func<TEvent, EventContext<TEvent>, CancellationToken, Task> action) where TEvent : IEvent
     {
         var handler = new SubscriptionEventHandler<TEvent>(this.subscriptions);
         handler.OnHandle = action;