feat(repeater): address pr comments

closes #170

src/SecTester.Repeater/Bus/IncomingRequest.cs

@@ -6,16 +6,19 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using MessagePack;
-using SecTester.Repeater.Bus.Formatters;
+using SecTester.Repeater.Internal;
 using SecTester.Repeater.Runners;
 
 namespace SecTester.Repeater.Bus;
 
 [MessagePackObject]
-public record IncomingRequest(Uri Url) : HttpMessage, IRequest
+public record IncomingRequest(Uri Url) : IRequest
 {
   private const string UrlKey = "url";
   private const string MethodKey = "method";
+  private const string HeadersKey = "headers";
+  private const string BodyKey = "body";
+  private const string ProtocolKey = "protocol";
 
   private static readonly Dictionary<string, Protocol> ProtocolEntries = typeof(Protocol)
     .GetFields(BindingFlags.Public | BindingFlags.Static)
@@ -26,8 +29,18 @@ public record IncomingRequest(Uri Url) : HttpMessage, IRequest
     })
     .ToDictionary(x => x.StringValue, x => x.Value);
 
+
+  [Key(ProtocolKey)]
+  public Protocol Protocol { get; set; } = Protocol.Http;
+
+  [Key(HeadersKey)]
+  public IEnumerable<KeyValuePair<string, IEnumerable<string>>> Headers { get; set; } =
+    new List<KeyValuePair<string, IEnumerable<string>>>();
+
+  [Key(BodyKey)]
+  public string? Body { get; set; }
+
   [Key(MethodKey)]
-  [MessagePackFormatter(typeof(MessagePackHttpMethodFormatter))]
   public HttpMethod Method { get; set; } = HttpMethod.Get;
 
   [Key(UrlKey)]

src/SecTester.Repeater/Bus/OutgoingResponse.cs

@@ -1,17 +1,30 @@
+using System.Collections.Generic;
 using MessagePack;
+using SecTester.Repeater.Internal;
 using SecTester.Repeater.Runners;
 
 namespace SecTester.Repeater.Bus;
 
 [MessagePackObject]
-public record OutgoingResponse : HttpMessage, IResponse
+public record OutgoingResponse : IResponse
 {
+  [Key("protocol")]
+  public Protocol Protocol { get; set; } = Protocol.Http;
+
   [Key("statusCode")]
   public int? StatusCode { get; set; }
 
+  [Key("body")]
+  public string? Body { get; set; }
+
   [Key("message")]
   public string? Message { get; set; }
 
   [Key("errorCode")]
   public string? ErrorCode { get; set; }
+
+  [Key("headers")]
+  public IEnumerable<KeyValuePair<string, IEnumerable<string>>> Headers { get; set; } =
+    new List<KeyValuePair<string, IEnumerable<string>>>();
+
 }

src/SecTester.Repeater/Bus/SocketIoMessage.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using SecTester.Repeater.Bus.Formatters;
+using SecTester.Repeater.Internal;
 using SocketIOClient;
 
 namespace SecTester.Repeater.Bus;
@@ -16,15 +16,7 @@ public SocketIoMessage(SocketIOResponse response)
     _response = response ?? throw new ArgumentNullException(nameof(response));
   }
 
-  public virtual T GetValue<T>(int index = 0)
-  {
-    if (typeof(T) == typeof(IncomingRequest))
-    {
-      return (T)(object)IncomingRequest.FromDictionary(_response.GetValue<Dictionary<object, object>>(index));
-    }
-
-    return _response.GetValue<T>(index);
-  }
+  public virtual T GetValue<T>(int index = 0) => _response.GetValue<T>(index);
 
   public virtual Task CallbackAsync(params object[] data) => _response.CallbackAsync(data);
 

src/SecTester.Repeater/Bus/SocketIoRepeaterBus.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
@@ -64,7 +65,7 @@ private void DelegateEvents()
       }
 
       var ct = new CancellationTokenSource(_options.AckTimeout);
-      var request = response.GetValue<IncomingRequest>();
+      var request = IncomingRequest.FromDictionary(response.GetValue<Dictionary<object, object>>());
       var result = await RequestReceived.Invoke(request).ConfigureAwait(false);
       await response.CallbackAsync(ct.Token, result).ConfigureAwait(false);
     });