Merge pull request #2 from Garados007/develop

Develop
Garados007 · Dec 18, 2020 · b8c402a · b8c402a
2 parents 11ab664 + 1b8ac0c
commit b8c402a
Show file tree

Hide file tree

Showing 47 changed files with 460 additions and 176 deletions.
diff --git a/MaxLib.WebServer.Test/Testing/TestTestTask.cs b/MaxLib.WebServer.Test/Testing/TestTestTask.cs
@@ -12,7 +12,7 @@ public void TestGetAddedCookies()
         {
             var server = new TestWebServer();
             var test = new TestTask(server);
-            test.Task.Document.RequestHeader.Cookie.AddedCookies.Add(
+            test.Task.Request.Cookie.AddedCookies.Add(
                 "test1",
                 new MaxLib.WebServer.HttpCookie.Cookie("test2", "test3"));
             var added = test.GetAddedCookies().ToArray();

diff --git a/MaxLib.WebServer/Api/ApiService.cs b/MaxLib.WebServer/Api/ApiService.cs
@@ -25,19 +25,19 @@ public string[] Endpoint
         public override bool CanWorkWith(WebProgressTask task)
         {
             _ = task ?? throw new ArgumentNullException(nameof(task));
-            return task.Document.RequestHeader.Location.StartsUrlWith(endpoint, IgnoreCase);
+            return task.Request.Location.StartsUrlWith(endpoint, IgnoreCase);
         }
 
         public override async Task ProgressTask(WebProgressTask task)
         {
             _ = task ?? throw new ArgumentNullException(nameof(task));
-            var tiles = task.Document.RequestHeader.Location.DocumentPathTiles;
+            var tiles = task.Request.Location.DocumentPathTiles;
             var location = new string[tiles.Length - endpoint.Length];
             Array.Copy(tiles, endpoint.Length, location, 0, location.Length);
             var data = await HandleRequest(task, location);
             if (data != null)
                 task.Document.DataSources.Add(data);
-            else task.Document.ResponseHeader.StatusCode = HttpStateCode.InternalServerError;
+            else task.Response.StatusCode = HttpStateCode.InternalServerError;
         }
     }
 }
diff --git a/MaxLib.WebServer/Api/Rest/RestApiService.cs b/MaxLib.WebServer/Api/Rest/RestApiService.cs
@@ -33,14 +33,14 @@ protected virtual RestQueryArgs GetQueryArgs(WebProgressTask task, string[] loca
         {
             _ = task ?? throw new ArgumentNullException(nameof(task));
             _ = location ?? throw new ArgumentNullException(nameof(location));
-            return new RestQueryArgs(location, task.Document.RequestHeader.Location.GetParameter, task.Document.RequestHeader.Post);
+            return new RestQueryArgs(location, task.Request.Location.GetParameter, task.Request.Post);
         }
 
         protected virtual HttpDataSource NoEndpoint(WebProgressTask task, RestQueryArgs args)
         {
             _ = task ?? throw new ArgumentNullException(nameof(task));
             _ = args ?? throw new ArgumentNullException(nameof(args));
-            task.Document.ResponseHeader.StatusCode = HttpStateCode.NotFound;
+            task.Response.StatusCode = HttpStateCode.NotFound;
             return new HttpStringDataSource("no endpoint");
         }
     }

diff --git a/MaxLib.WebServer/Chunked/ChunkedResponseCreator.cs b/MaxLib.WebServer/Chunked/ChunkedResponseCreator.cs
@@ -26,8 +26,8 @@ public override bool CanWorkWith(WebProgressTask task)
 
         public override async Task ProgressTask(WebProgressTask task)
         {
-            var request = task.Document.RequestHeader;
-            var response = task.Document.ResponseHeader;
+            var request = task.Request;
+            var response = task.Response;
             response.FieldContentType = task.Document.PrimaryMime;
             response.SetActualDate();
             response.HttpProtocol = request.HttpProtocol;

diff --git a/MaxLib.WebServer/Chunked/ChunkedSender.cs b/MaxLib.WebServer/Chunked/ChunkedSender.cs
@@ -28,7 +28,7 @@ public override bool CanWorkWith(WebProgressTask task)
 
         public override async Task ProgressTask(WebProgressTask task)
         {
-            var header = task.Document.ResponseHeader;
+            var header = task.Response;
             var stream = task.NetworkStream;
             var writer = new StreamWriter(stream);
             await writer.WriteAsync(header.HttpProtocol);
@@ -43,7 +43,7 @@ public override async Task ProgressTask(WebProgressTask task)
                 await writer.WriteAsync(": ");
                 await writer.WriteLineAsync(e.Value);
             }
-            foreach (var cookie in task.Document.RequestHeader.Cookie.AddedCookies) //Cookies
+            foreach (var cookie in task.Request.Cookie.AddedCookies) //Cookies
             {
                 await writer.WriteAsync("Set-Cookie: ");
                 await writer.WriteLineAsync(cookie.ToString());

diff --git a/MaxLib.WebServer/HttpConnection.cs b/MaxLib.WebServer/HttpConnection.cs
@@ -3,25 +3,19 @@
 using System.IO;
 using System.Net.Sockets;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
     public class HttpConnection
     {
-        public byte[] ConnectionKey { get; set; }
-
-        public string Ip { get; set; }
-
-        public TcpClient NetworkClient { get; set; }
-
-        public Stream NetworkStream { get; set; }
+        public string? Ip { get; set; }
 
-        public int LastWorkTime { get; set; }
+        public TcpClient? NetworkClient { get; set; }
 
-        public Dictionary<object, object> SessionInformation { get; private set; } 
-            = new Dictionary<object, object>();
+        public Stream? NetworkStream { get; set; }
 
-        public void AlwaysSyncSessionInformation(Dictionary<object, object> information)
-            => SessionInformation = information ?? throw new ArgumentNullException(nameof(information));
+        public int LastWorkTime { get; set; } = -1;
     }
 }
diff --git a/MaxLib.WebServer/HttpCookie.cs b/MaxLib.WebServer/HttpCookie.cs
@@ -3,6 +3,8 @@
 using System.Collections.ObjectModel;
 using System.Text;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
@@ -68,7 +70,7 @@ public override string ToString()
             }
         }
 
-        public string CompleteRequestCookie { get; private set; }
+        public string CompleteRequestCookie { get; private set; } = "";
 
         public Dictionary<string, Cookie> AddedCookies { get; }
 

diff --git a/MaxLib.WebServer/HttpDataSource.cs b/MaxLib.WebServer/HttpDataSource.cs
@@ -3,6 +3,8 @@
 using System.IO;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
@@ -43,7 +45,8 @@ public async Task<long> WriteStream(Stream stream, long start, long? stop)
         {
             _ = stream ?? throw new ArgumentNullException(nameof(stream));
             if (start < 0) throw new ArgumentOutOfRangeException(nameof(start));
-            if (Length() != null && start >= Length().Value)
+            var length = Length();
+            if (length != null && start >= length.Value)
                 throw new ArgumentOutOfRangeException(nameof(start));
             if (stop != null && stop < start) throw new ArgumentOutOfRangeException(nameof(stop));
             return await WriteStreamInternal(stream, start, stop);

diff --git a/MaxLib.WebServer/HttpDocument.cs b/MaxLib.WebServer/HttpDocument.cs
@@ -2,26 +2,31 @@
 using System.Collections.Generic;
 using System.Linq;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
     public class HttpDocument : IDisposable
     {
         public List<HttpDataSource> DataSources { get; } = new List<HttpDataSource>();
 
-        public string PrimaryMime
+        public string? PrimaryMime
         {
             get { return DataSources.Count == 0 ? null : DataSources[0].MimeType; }
         }
 
-        public string PrimaryEncoding { get; set; } = null;
+        public string? PrimaryEncoding { get; set; } = null;
+
+        [Obsolete("Use WebProgressTask.Request. this will be removed in a future release.")]
+        public HttpRequestHeader RequestHeader { get; set; } = new HttpRequestHeader();
 
-        public HttpRequestHeader RequestHeader { get; set; }
+        [Obsolete("Use WebProgressTask.Response. this will be removed in a future release.")]
+        public HttpResponseHeader ResponseHeader { get; set; } = new HttpResponseHeader();
 
-        public HttpResponseHeader ResponseHeader { get; set; }
-        public Dictionary<object, object> Information { get; } = new Dictionary<object, object>();
+        public Dictionary<object?, object?> Information { get; } = new Dictionary<object?, object?>();
 
-        public object this[object identifer]
+        public object? this[object? identifer]
         {
             get => Information[identifer];
             set => Information[identifer] = value;

diff --git a/MaxLib.WebServer/HttpFileDataSource.cs b/MaxLib.WebServer/HttpFileDataSource.cs
@@ -3,15 +3,17 @@
 using System.IO;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
     public class HttpFileDataSource : HttpDataSource
     {
-        public FileStream File { get; private set; }
+        public FileStream? File { get; private set; }
 
-        private string path = null;
-        public virtual string Path
+        private string? path = null;
+        public virtual string? Path
         {
             get => path;
             set
@@ -37,7 +39,7 @@ public virtual string Path
 
         public override bool CanProvideData => true;
 
-        public HttpFileDataSource(string path, bool readOnly = true)
+        public HttpFileDataSource(string? path, bool readOnly = true)
         {
             ReadOnly = readOnly;
             Path = path;
@@ -54,6 +56,8 @@ public override void Dispose()
         protected override async Task<long> WriteStreamInternal(Stream stream, long start, long? stop)
         {
             await Task.CompletedTask;
+            if (File == null)
+                return 0;
             File.Position = start;
             using (var skip = new SkipableStream(File, 0))
             {
@@ -75,6 +79,8 @@ protected override async Task<long> ReadStreamInternal(Stream stream, long? leng
             await Task.CompletedTask;
             if (ReadOnly)
                 throw new NotSupportedException();
+            if (File == null)
+                return 0;
             File.Position = 0;
             using (var skip = new SkipableStream(File, 0))
             {

diff --git a/MaxLib.WebServer/HttpHeader.cs b/MaxLib.WebServer/HttpHeader.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
@@ -20,11 +22,33 @@ public string HttpProtocol
 
         public Dictionary<string, string> HeaderParameter { get; } = new Dictionary<string, string>();
 
-        public void SetHeader(IEnumerable<(string, string)> headers)
+        public string? GetHeader(string key)
+        {
+            _ = key ?? throw new ArgumentNullException(nameof(key));
+            return HeaderParameter.TryGetValue(key, out string value) ? value : null;
+        }
+
+        public void SetHeader(IEnumerable<(string, string?)> headers)
         {
             _ = headers ?? throw new ArgumentNullException(nameof(headers));
             foreach (var (key, value) in headers)
+                if (value != null)
+                    HeaderParameter[key] = value;
+                else HeaderParameter.Remove(key);
+        }
+
+        public void SetHeader(params (string, string?)[] header)
+        {
+            _ = header ?? throw new ArgumentNullException(nameof(header));
+            SetHeader(headers: header);
+        }
+
+        public void SetHeader(string key, string? value)
+        {
+            _ = key ?? throw new ArgumentNullException(nameof(key));
+            if (value != null)
                 HeaderParameter[key] = value;
+            else HeaderParameter.Remove(key);
         }
 
         private string protocolMethod = HttpProtocollMethod.Get;

diff --git a/MaxLib.WebServer/HttpLocation.cs b/MaxLib.WebServer/HttpLocation.cs
@@ -3,6 +3,8 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
@@ -56,8 +58,11 @@ public virtual void SetLocation(string url)
 
         public HttpLocation(string url)
         {
-            _ = url ?? throw new ArgumentNullException(nameof(url));
+            Url = url ?? throw new ArgumentNullException(nameof(url));
             GetParameter = new Dictionary<string, string>();
+            DocumentPath = "";
+            DocumentPathTiles = new string[0];
+            CompleteGet = "";
             SetLocation(url);
         }
 

diff --git a/MaxLib.WebServer/HttpPost.cs b/MaxLib.WebServer/HttpPost.cs
@@ -2,18 +2,20 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
     public class HttpPost
     {
         public string CompletePost { get; private set; }
 
-        public string MimeType { get; private set; }
+        public string? MimeType { get; private set; }
 
         public Dictionary<string, string> PostParameter { get; }
 
-        public virtual void SetPost(string post, string mime)
+        public virtual void SetPost(string post, string? mime)
         {
             CompletePost = post ?? throw new ArgumentNullException("Post");
 
@@ -73,9 +75,9 @@ protected virtual void SetPostFormData(string post, string boundary)
 
         }
 
-        public HttpPost(string post, string mime)
+        public HttpPost(string post, string? mime)
         {
-            _ = post ?? throw new ArgumentNullException(nameof(post));
+            CompletePost = post ?? throw new ArgumentNullException(nameof(post));
             PostParameter = new Dictionary<string, string>();
             SetPost(post, mime);
         }

diff --git a/MaxLib.WebServer/HttpProtocollDefinition.cs b/MaxLib.WebServer/HttpProtocollDefinition.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Linq;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     public static class HttpProtocollDefinition

diff --git a/MaxLib.WebServer/HttpRequestHeader.cs b/MaxLib.WebServer/HttpRequestHeader.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 
+#nullable enable
+
 namespace MaxLib.WebServer
 {
     [Serializable]
@@ -27,10 +29,10 @@ public string Host
         public HttpConnectionType FieldConnection { get; set; } = HttpConnectionType.Close;
         public HttpCookie Cookie { get; } = new HttpCookie("");
 
-        public string FieldUserAgent
+        public string? FieldUserAgent
         {
-            get => HeaderParameter.TryGetValue("User-Agent", out string value) ? value : null;
-            set => HeaderParameter["User-Agent"] = value;
+            get => GetHeader("User-Agent");
+            set => SetHeader("User-Agent", value);
         }
     }
 }