refactor HttpRequestConfig to use typed records

Author: mythz

src/ServiceStack.Text/HttpRequestConfig.cs

@@ -11,17 +11,54 @@ public class HttpRequestConfig
     public string? Accept { get; set; } 
     public string? UserAgent { get; set; } 
     public string? ContentType { get; set; }
-    public KeyValuePair<string,string>? Authorization { get; set; }
-    public Dictionary<string, string>? Headers { get; set; }
+    public HttpHeader? Authorization { get; set; }
+    public RangeHeader? Range { get; set; }
+    public List<HttpHeader> Headers { get; set; } = new();
 
     public string AuthBearer
     {
         set => Authorization = new("Bearer", value);
     }
 
-    public KeyValuePair<string, string> AuthBasic
+    public HttpHeader AuthBasic
     {
         set => Authorization = new("Basic",
-            Convert.ToBase64String(Encoding.UTF8.GetBytes(value.Key + ":" + value.Value)));
+            Convert.ToBase64String(Encoding.UTF8.GetBytes(value.Name + ":" + value.Value)));
+    }
+}
+
+public record HttpHeader
+{
+    public HttpHeader(string name, string value)
+    {
+        this.Name = name;
+        this.Value = value;
+    }
+
+    public string Name { get; }
+    public string Value { get; }
+
+    public void Deconstruct(out string name, out string value)
+    {
+        name = this.Name;
+        value = this.Value;
+    }
+}
+
+public record RangeHeader
+{
+    public RangeHeader(long from, long? to = null)
+    {
+        this.From = from;
+        this.To = to;
+    }
+
+    public long From { get; }
+    public long? To { get; }
+
+    public void Deconstruct(out long from, out long? to)
+    {
+        from = this.From;
+        to = this.To;
     }
 }

src/ServiceStack.Text/HttpUtils.HttpClient.cs

@@ -1089,35 +1089,36 @@ public static HttpRequestMessage With(this HttpRequestMessage httpReq, Action<Ht
         var config = new HttpRequestConfig();
         configure(config);
 
-        config.Headers ??= new Dictionary<string, string>();
         var headers = config.Headers;
 
         if (config.Accept != null)
-            headers[HttpHeaders.Accept] = config.Accept;
+            headers.Add(new(HttpHeaders.Accept, config.Accept));
         if (config.UserAgent != null)
-            headers[HttpHeaders.UserAgent] = config.UserAgent;
+            headers.Add(new(HttpHeaders.UserAgent, config.UserAgent));
         if (config.ContentType != null)
-            headers[HttpHeaders.ContentType] = config.ContentType;
+            headers.Add(new(HttpHeaders.ContentType, config.ContentType));
         if (config.Authorization != null)
             httpReq.Headers.Authorization =
-                new AuthenticationHeaderValue(config.Authorization.Value.Key, config.Authorization.Value.Value);
+                new AuthenticationHeaderValue(config.Authorization.Name, config.Authorization.Value);
+        if (config.Range != null)
+            httpReq.Headers.Range = new RangeHeaderValue(config.Range.From, config.Range.To);
 
         foreach (var entry in headers)
         {
-            httpReq.WithHeader(entry.Key, entry.Value);
+            httpReq.WithHeader(entry.Name, entry.Value);
         }
 
         return httpReq;
     }
 
     public static void DownloadFileTo(this string downloadUrl, string fileName, 
-        Dictionary<string,string>? headers = null)
+        List<HttpHeader>? headers = null)
     {
         var client = Create();
         var httpReq = new HttpRequestMessage(HttpMethod.Get, downloadUrl)
             .With(c => {
                 c.Accept = "*/*"; 
-                c.Headers = headers;
+                if (headers != null) c.Headers = headers;
             });
 
         var httpRes = client.Send(httpReq);

src/ServiceStack.Text/HttpUtils.WebRequest.cs

@@ -1074,18 +1074,40 @@ private static byte[] GetHeaderBytes(string fileName, string mimeType, string fi
     }
 
     public static void DownloadFileTo(this string downloadUrl, string fileName, 
-        Dictionary<string,string> headers = null)
+        List<HttpHeader> headers = null)
     {
         var webClient = new WebClient();
         if (headers != null)
         {
-            foreach (var entry in headers)
+            foreach (var header in headers)
             {
-                webClient.Headers[entry.Key] = entry.Value;
+                webClient.Headers[header.Name] = header.Value;
             }
         }
         webClient.DownloadFile(downloadUrl, fileName);
     }
+    
+    public static void SetRange(this HttpWebRequest request, long from, long? to) 
+    {
+        var rangeSpecifier = "bytes";
+        var curRange = request.Headers[HttpRequestHeader.Range];
+ 
+        if (string.IsNullOrEmpty(curRange)) 
+        {
+            curRange = rangeSpecifier + "=";
+        }
+        else
+        {
+            if (string.Compare(curRange.Substring(0, curRange.IndexOf('=')), rangeSpecifier, StringComparison.OrdinalIgnoreCase) != 0)
+                throw new NotSupportedException("Invalid Range: " + curRange);
+            curRange = string.Empty;
+        }
+        curRange += from.ToString();
+        if (to != null) {
+            curRange += "-" + to;
+        }
+        request.Headers[HttpRequestHeader.Range] = curRange;
+    }
 
     public static void AddHeader(this HttpWebRequest res, string name, string value) =>
         res.Headers[name] = value;
@@ -1120,14 +1142,14 @@ public static HttpWebRequest With(this HttpWebRequest httpReq, Action<HttpReques
 
         if (config.Authorization != null)
             httpReq.Headers[HttpHeaders.Authorization] = 
-                config.Authorization.Value.Key + " " + config.Authorization.Value.Value;
+                config.Authorization.Name + " " + config.Authorization.Value;
+        
+        if (config.Range != null)
+            httpReq.SetRange(config.Range.From, config.Range.To);
 
-        if (config.Headers != null)
+        foreach (var entry in config.Headers)
         {
-            foreach (var entry in config.Headers)
-            {
-                httpReq.Headers[entry.Key] = entry.Value;
-            }
+            httpReq.Headers[entry.Name] = entry.Value;
         }
 
         return httpReq;

src/ServiceStack.Text/PclExport.cs

@@ -142,11 +142,6 @@ public virtual void WriteLine(string line, params object[] args)
         {
         }
 
-        public virtual HttpWebRequest CreateWebRequest(string requestUri, bool? emulateHttpViaPost = null)
-        {
-            return (HttpWebRequest)WebRequest.Create(requestUri);
-        }
-
         public virtual void Config(HttpWebRequest req,
             bool? allowAutoRedirect = null,
             TimeSpan? timeout = null,