Pair incoming responses to the original requests (#61)

c-sharp/Data/EnumConverter.cs → c-sharp/JsonUtils/EnumConverter.cs

@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using PtxUtils;
 
-namespace Paranext.DataProvider.Data;
+namespace Paranext.DataProvider.JsonUtils;
 
 /// <summary>
 /// Handles serialization and deserialization of string enums

c-sharp/Data/MessageConverter.cs → c-sharp/JsonUtils/MessageConverter.cs

@@ -1,29 +1,27 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Paranext.DataProvider.Utils;
+using Paranext.DataProvider.Messages;
 using PtxUtils;
 
-namespace Paranext.DataProvider.Data;
+namespace Paranext.DataProvider.JsonUtils;
 
 /// <summary>
 /// Handles serialization and deserialization of Messages
 /// </summary>
 internal sealed class MessageConverter : JsonConverter<Message>
 {
-    #region Member variables
     private static readonly JsonSerializerOptions recursiveSafeOptions =
-        JsonUtils.CreateSerializationOptions();
+        SerializationOptions.CreateSerializationOptions();
     private static readonly Dictionary<Enum<MessageType>, Type> messageTypeMap =
         new()
         {
             { MessageType.InitClient, typeof(MessageInitClient) },
             { MessageType.ClientConnect, typeof(MessageClientConnect) },
             { MessageType.Request, typeof(MessageRequest) },
             { MessageType.Response, typeof(MessageResponse) },
+            { MessageType.Event, typeof(MessageEvent) },
         };
-    #endregion
 
-    #region Implementation of JsonConverter
     public override bool CanConvert(Type typeToConvert) =>
         typeof(Message).IsAssignableFrom(typeToConvert);
 
@@ -54,9 +52,7 @@ JsonSerializerOptions options
     {
         JsonSerializer.Serialize(writer, message, message.GetType(), recursiveSafeOptions);
     }
-    #endregion
 
-    #region Private helper methods
     /// <summary>
     /// Reads the type property from the message given the specified reader
     /// </summary>
@@ -85,5 +81,4 @@ private static Enum<MessageType> ReadType(ref Utf8JsonReader reader)
             return new Enum<MessageType>(reader.GetString());
         } while (true);
     }
-    #endregion
 }

c-sharp/Data/PrivateConstructorResolver.cs → c-sharp/JsonUtils/PrivateConstructorResolver.cs

@@ -2,7 +2,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 
-namespace Paranext.DataProvider.Data;
+namespace Paranext.DataProvider.JsonUtils;
 
 /// <summary>
 /// Type resolver for creation objects that have a private default constructor

c-sharp/Utils/JsonUtils.cs → c-sharp/JsonUtils/SerializationOptions.cs

@@ -1,11 +1,11 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Unicode;
-using Paranext.DataProvider.Data;
+using Paranext.DataProvider.Messages;
 
-namespace Paranext.DataProvider.Utils;
+namespace Paranext.DataProvider.JsonUtils;
 
-internal static class JsonUtils
+internal static class SerializationOptions
 {
     /// <summary>
     /// Creates new serialization options used for communicating with the PAPI.
@@ -23,7 +23,7 @@ public static JsonSerializerOptions CreateSerializationOptions()
             };
 
         options.Converters.Add(new EnumConverter<MessageType>());
-        options.Converters.Add(new EnumConverter<RequestTypes>());
+        options.Converters.Add(new EnumConverter<RequestType>());
         return options;
     }
 }

c-sharp/MessageHandlers/IMessageHandler.cs

@@ -0,0 +1,13 @@
+using Paranext.DataProvider.Messages;
+
+namespace Paranext.DataProvider.MessageHandlers;
+
+internal interface IMessageHandler
+{
+    /// <summary>
+    /// Handle an incoming message, and optionally respond with another message
+    /// </summary>
+    /// <param name="message">Incoming message to handle</param>
+    /// <returns>Optional response to the incoming message</returns>
+    public Message? HandleMessage(Message message);
+}

c-sharp/MessageHandlers/MessageHandlerEvent.cs

@@ -0,0 +1,22 @@
+using Paranext.DataProvider.Messages;
+
+namespace Paranext.DataProvider.MessageHandlers;
+
+/// <summary>
+/// Handler for "Event" messages
+/// </summary>
+internal class MessageHandlerEvent : IMessageHandler
+{
+    public Message? HandleMessage(Message message)
+    {
+        if (message == null)
+            throw new ArgumentNullException(nameof(message));
+
+        if (message.Type != MessageType.Event)
+            throw new ArgumentException("Incorrect message type", nameof(message));
+
+        Console.WriteLine($"Event received: {message}");
+
+        return null;
+    }
+}