pass apolloContext to handle method

rickdotnet · Oct 15, 2024 · 9cf321a · 9cf321a
1 parent c1738cb
commit 9cf321a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 18 deletions.
diff --git a/build/version.props b/build/version.props
@@ -1,8 +1,8 @@
 <Project>
 	<PropertyGroup>
 		<VersionMajor>0</VersionMajor>
-		<VersionMinor>4</VersionMinor>
-		<VersionPatch>4</VersionPatch>
+		<VersionMinor>5</VersionMinor>
+		<VersionPatch>0</VersionPatch>
 		<VersionQuality />
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)$(VersionQuality)</VersionPrefix>
 	</PropertyGroup>

diff --git a/demo/ConsoleDemo/Demo/AsbDemo.cs b/demo/ConsoleDemo/Demo/AsbDemo.cs
@@ -60,15 +60,14 @@ private static Task Handle(ApolloContext context, CancellationToken token)
     {
         Log.Warning($"Anonymous handler received: {count++}");
         Log.Debug("Headers");
-        var msg = context.Message;
-        foreach (var header in msg.Headers)
+        foreach (var header in context.Headers)
         {
             Log.Debug("{Key}: {Value}", header.Key, header.Value);
         }
 
         Log.Debug("Payload");
-        if (msg.Data != null)
-            Log.Debug(Encoding.UTF8.GetString(msg.Data));
+        if (context.Data != null)
+            Log.Debug(Encoding.UTF8.GetString(context.Data));
 
 
         // let me see some messages before they spam through

diff --git a/demo/ConsoleDemo/Program.cs b/demo/ConsoleDemo/Program.cs
@@ -12,5 +12,5 @@
 
 //await OriginalDemo.Demo();
 //await Direct.Demo();
-await HostDemo.Demo(useNats: true);
+await HostDemo.Demo();
 //await AsbDemo.Demo();
diff --git a/demo/ConsoleDemo/TestEndpoint.cs b/demo/ConsoleDemo/TestEndpoint.cs
@@ -1,4 +1,5 @@
-using Apollo.Abstractions;
+using Apollo;
+using Apollo.Abstractions;
 using Serilog;
 
 namespace ConsoleDemo;
@@ -11,22 +12,22 @@ public record TestResponse(string Message);
 public class TestEndpoint : IListenFor<TestEvent>, IHandle<TestCommand>, IReplyTo<TestRequest, TestResponse>
 {
     private static int count = 0;
-    public Task Handle(TestEvent message, CancellationToken cancellationToken = default)
+    public Task Handle(TestEvent message, ApolloContext context, CancellationToken cancellationToken = default)
     {
         count++;
         Log.Information("Endpoint: {Message}, Count: {Count}", message, count);
         // simulate a delay to demonstrate concurrency
         return Task.Delay(500);
     }
 
-    public Task Handle(TestCommand message, CancellationToken cancellationToken)
+    public Task Handle(TestCommand message, ApolloContext context, CancellationToken cancellationToken)
     {
         Log.Information("TestEndpoint Received TestCommand");
         Log.Information("Message: {Message}", message);
         return Task.CompletedTask;
     }
 
-    public Task<TestResponse> Handle(TestRequest message, CancellationToken cancellationToken = default)
+    public Task<TestResponse> Handle(TestRequest message, ApolloContext context, CancellationToken cancellationToken = default)
     { 
         Log.Information("TestEndpoint Received TestRequest");
         Log.Information("Message: {Message}", message);

diff --git a/src/Apollo/Abstractions/IHandle.cs b/src/Apollo/Abstractions/IHandle.cs
@@ -6,5 +6,5 @@ public interface IHandle
 }
 public interface IHandle<in T> : IHandle where T : ICommand
 {
-    Task Handle(T message, CancellationToken cancellationToken);
+    Task Handle(T message, ApolloContext context, CancellationToken cancellationToken);
 }
diff --git a/src/Apollo/Abstractions/IListenFor.cs b/src/Apollo/Abstractions/IListenFor.cs
@@ -6,5 +6,5 @@ public interface IListenFor
 }
 public interface IListenFor<in TEvent> : IListenFor where TEvent : IEvent
 {
-    public Task Handle(TEvent message, CancellationToken cancellationToken = default);
+    public Task Handle(TEvent message, ApolloContext context, CancellationToken cancellationToken = default);
 }
diff --git a/src/Apollo/Abstractions/IReplyTo.cs b/src/Apollo/Abstractions/IReplyTo.cs
@@ -2,5 +2,5 @@
 
 public interface IReplyTo<in TRequest, TResponse> where TRequest : IRequest<TResponse>
 {
-    public Task<TResponse> Handle(TRequest message, CancellationToken cancellationToken = default);
+    public Task<TResponse> Handle(TRequest message, ApolloContext context, CancellationToken cancellationToken = default);
 }
diff --git a/src/Apollo/ApolloContext.cs b/src/Apollo/ApolloContext.cs
@@ -1,17 +1,22 @@
 using Apollo.Abstractions;
+using Microsoft.Extensions.Primitives;
 
 namespace Apollo;
 
 public class ApolloContext
 {
-    public ApolloMessage Message { get; }
+    public IReadOnlyDictionary<string, StringValues> Headers { get; }
+    public string Subject => Message.Subject;
+    public byte[]? Data => Message.Data;
+    internal ApolloMessage Message { get; }
     public bool ReplyAvailable => ReplyFunc is not null;
     private Func<byte[] , CancellationToken, Task>? ReplyFunc { get; }
 
     public ApolloContext(ApolloMessage message, Func<byte[] , CancellationToken, Task>? replyFunc = null)
     {
         Message = message;
         ReplyFunc = replyFunc;
+        Headers = Message.Headers.AsReadOnly();
     }
 
     public Task Reply(byte[] response, CancellationToken cancellationToken)

diff --git a/src/Apollo/Internal/SynchronousEndpoint.cs b/src/Apollo/Internal/SynchronousEndpoint.cs
@@ -111,7 +111,7 @@ private async Task InternalHandle(ApolloContext context, CancellationToken cance
         if (handleMethod is null)
         {
             handleMethod = endpointType!.GetMethod("Handle",
-                [context.Message.MessageType!, typeof(CancellationToken)]);
+                [context.Message.MessageType!, typeof(ApolloContext), typeof(CancellationToken)]);
 
             if (handleMethod is null)
                 throw new InvalidOperationException("Handle method not found");
@@ -130,7 +130,7 @@ private async Task InternalHandle(ApolloContext context, CancellationToken cance
                 throw new InvalidOperationException("Uh, oh: No reply available");
 
             var response =
-                await (dynamic)handleMethod.Invoke(endpointInstance, [messageObject, cancellationToken])!;
+                await (dynamic)handleMethod.Invoke(endpointInstance, [messageObject, context,  cancellationToken])!;
 
             // TODO: serialization point
             var responseJson = JsonSerializer.Serialize(response);
@@ -139,7 +139,7 @@ private async Task InternalHandle(ApolloContext context, CancellationToken cance
         }
         else
         {
-            var result = (Task)handleMethod.Invoke(endpointInstance, [messageObject, cancellationToken])!;
+            var result = (Task)handleMethod.Invoke(endpointInstance, [messageObject, context, cancellationToken])!;
             await result;
         }
     }