Merge pull request #29 from open-olive/SIDE-969-network-sensor-headers-node-csharp

[SIDE-969] - network sensor headers in C# and NodeJS clients

Author: bbrewer-oliveai

ldk/csharp/OliveHelpsLDK/OliveHelpsLDK/Network/INetworkService.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,12 +16,16 @@ public struct HTTPRequest
         public string Method;
 
         public byte[] Body;
+
+        public IDictionary<string, IList<string>> Headers;
     }
 
     public struct HTTPResponse
     {
         public int ResponseCode;
 
         public byte[] Data;
+
+        public IDictionary<string, IList<string>> Headers;
     }
 }

ldk/csharp/OliveHelpsLDK/OliveHelpsLDK/Network/NetworkClient.cs

@@ -1,6 +1,8 @@
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Google.Protobuf;
+using Google.Protobuf.Collections;
 using Grpc.Core;
 using OliveHelpsLDK.Logging;
 using Proto;
@@ -21,26 +23,62 @@ internal NetworkClient(ChannelBase channelBase, Session session, ILogger logger)
 
 
         public Task<HTTPResponse> HTTPRequest(HTTPRequest request, CancellationToken cancellationToken = default)
+        {
+            var message = ToProto(request);
+
+            return Client.HTTPRequestAsync(message, CreateOptions(cancellationToken)).ResponseAsync
+                .ContinueWith(LoggedParser<Task<HTTPResponseMsg>, HTTPResponse>(task => FromProto(task.Result)),
+                    cancellationToken);
+        }
+
+        private HTTPRequestMsg ToProto(HTTPRequest request)
         {
             var message = new HTTPRequestMsg
             {
                 Session = CreateSession(),
                 Body = ByteString.CopyFrom(request.Body),
                 Method = request.Method,
                 Url = request.URL
-            };
-            return Client.HTTPRequestAsync(message, CreateOptions(cancellationToken)).ResponseAsync
-                .ContinueWith(LoggedParser<Task<HTTPResponseMsg>, HTTPResponse>(task => FromProto(task.Result)),
-                    cancellationToken);
+            };        
+            
+            AddHeadersToMessage(message, request.Headers);
+            
+            return message;
+        }
+        
+        private static void AddHeadersToMessage(HTTPRequestMsg message, IDictionary<string, IList<string>> requestHeaders)
+        {
+            foreach (var kvp in requestHeaders)
+            {
+                var header = new HTTPHeader();
+                header.Values.Add(kvp.Value);
+                message.Headers.Add(kvp.Key, header);
+            }
         }
 
         internal static HTTPResponse FromProto(HTTPResponseMsg response)
         {
-            return new HTTPResponse
+            var clientResponse = new HTTPResponse
             {
                 Data = response.ToByteArray(),
-                ResponseCode = checked((int) response.ResponseCode)
+                ResponseCode = checked((int) response.ResponseCode),
+                Headers = ParseHeaders(response.Headers)
             };
+
+            return clientResponse;
+        }
+
+        private static IDictionary<string, IList<string>> ParseHeaders(MapField<string, HTTPHeader> headers)
+        {
+            var parsedHeaders = new Dictionary<string, IList<string>>();
+
+            foreach (var kvp in headers)
+            {
+                var values = new List<string>(kvp.Value.Values);
+                parsedHeaders.Add(kvp.Key, values);
+            }
+
+            return parsedHeaders;
         }
     }
 }