Merge pull request #1 from Garados007/develop

Develop

Author: Garados007

.gitignore

@@ -4,3 +4,5 @@ obj
 TestResults
 # vscode files
 .vscode
+# under development
+MaxLib.WebServer.Files

MaxLib.WebServer.Test/Services/TestHttpHeaderParser.cs

@@ -19,8 +19,8 @@ public void Init()
             server.AddWebService(new HttpHeaderParser());
             test = new TestTask(server)
             {
-                CurrentState = WebServiceType.PreParseRequest,
-                TerminationState = WebServiceType.PreParseRequest
+                CurrentStage = ServerStage.ReadRequest,
+                TerminationStage = ServerStage.ReadRequest,
             };
         }
 

MaxLib.WebServer.Test/Services/TestHttpHeaderPostParser.cs

@@ -18,8 +18,8 @@ public void Init()
             server.AddWebService(new HttpHeaderPostParser());
             test = new TestTask(server)
             {
-                CurrentState = WebServiceType.PostParseRequest,
-                TerminationState = WebServiceType.PostParseRequest,
+                CurrentStage = ServerStage.ParseRequest,
+                TerminationStage = ServerStage.ParseRequest,
             };
         }
 

MaxLib.WebServer.Test/Services/TestHttpHeaderSpecialAction.cs

@@ -18,8 +18,8 @@ public void Init()
             server.AddWebService(new HttpHeaderSpecialAction());
             test = new TestTask(server)
             {
-                CurrentState = WebServiceType.PostParseRequest,
-                TerminationState = WebServiceType.PostParseRequest,
+                CurrentStage = ServerStage.ParseRequest,
+                TerminationStage = ServerStage.ParseRequest,
             };
         }
 

MaxLib.WebServer.Test/Services/TestHttpResponseCreator.cs

@@ -18,8 +18,8 @@ public void Init()
             server.AddWebService(new HttpResponseCreator());
             test = new TestTask(server)
             {
-                CurrentState = WebServiceType.PreCreateResponse,
-                TerminationState = WebServiceType.PreCreateResponse,
+                CurrentStage = ServerStage.CreateResponse,
+                TerminationStage = ServerStage.CreateResponse,
             };
         }
 

MaxLib.WebServer.Test/Services/TestHttpSender.cs

@@ -19,8 +19,8 @@ public void Init()
             server.AddWebService(new HttpSender());
             test = new TestTask(server)
             {
-                CurrentState = WebServiceType.SendResponse,
-                TerminationState = WebServiceType.SendResponse,
+                CurrentStage = ServerStage.SendResponse,
+                TerminationStage = ServerStage.SendResponse,
             };
         }
 

MaxLib.WebServer/Api/ApiService.cs

@@ -6,7 +6,7 @@ namespace MaxLib.WebServer.Api
     public abstract class ApiService : WebService
     {
         public ApiService(params string[] endpoint) 
-            : base(WebServiceType.PreCreateDocument)
+            : base(ServerStage.CreateDocument)
         {
             Endpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
         }

MaxLib.WebServer/Chunked/ChunkedResponseCreator.cs

@@ -8,7 +8,8 @@ public class ChunkedResponseCreator : WebService
     {
         public bool OnlyWithLazy { get; private set; }
 
-        public ChunkedResponseCreator(bool onlyWithLazy = false) : base(WebServiceType.PreCreateResponse)
+        public ChunkedResponseCreator(bool onlyWithLazy = false)
+            : base(ServerStage.CreateResponse)
         {
             OnlyWithLazy = onlyWithLazy;
             if (onlyWithLazy) 

MaxLib.WebServer/HttpSession.cs MaxLib.WebServer/HttpConnection.cs

@@ -6,9 +6,9 @@
 namespace MaxLib.WebServer
 {
     [Serializable]
-    public class HttpSession
+    public class HttpConnection
     {
-        public byte[] SessionKey { get; set; }
+        public byte[] ConnectionKey { get; set; }
 
         public string Ip { get; set; }
 
@@ -18,7 +18,8 @@ public class HttpSession
 
         public int LastWorkTime { get; set; }
 
-        public Dictionary<object, object> SessionInformation { get; private set; } = new Dictionary<object, object>();
+        public Dictionary<object, object> SessionInformation { get; private set; } 
+            = new Dictionary<object, object>();
 
         public void AlwaysSyncSessionInformation(Dictionary<object, object> information)
             => SessionInformation = information ?? throw new ArgumentNullException(nameof(information));

MaxLib.WebServer/HttpDocument.cs

@@ -27,8 +27,6 @@ public object this[object identifer]
             set => Information[identifer] = value;
         }
 
-        public HttpSession Session { get; set; }
-
         public void Dispose()
         {
             foreach (var ds in DataSources.ToArray()) ds.Dispose();

MaxLib.WebServer/Lazy/LazyTask.cs

@@ -1,4 +1,5 @@
-using System;
+using System.Data;
+using System;
 using System.Collections.Generic;
 
 namespace MaxLib.WebServer.Lazy
@@ -8,7 +9,7 @@ public class LazyTask
     {
         public Server Server { get; }
 
-        public HttpSession Session { get; }
+        public HttpConnection Connection { get; }
 
         public HttpRequestHeader Header { get; }
 
@@ -24,7 +25,7 @@ public LazyTask(WebProgressTask task)
         {
             _ = task ?? throw new ArgumentNullException(nameof(task));
             Server = task.Server;
-            Session = task.Session;
+            Connection = task.Connection;
             Header = task.Document.RequestHeader;
             Information = task.Document.Information;
         }

MaxLib.WebServer/MaxLib.WebServer.csproj.include

@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-    <Version>1.0.1</Version>
+    <Version>2.0.0</Version>
     <AssemblyVersion>$(Version).0</AssemblyVersion>
     <FileVersion>$(Version).0</FileVersion>
   </PropertyGroup>

MaxLib.WebServer/SSL/DualSecureWebServer.cs

@@ -16,16 +16,16 @@ public DualSecureWebServer(DualSecureWebServerSettings settings) : base(settings
             WebServerLog.Add(ServerLogType.Information, GetType(), "StartUp", "The use of dual mode is critical");
         }
 
-        protected override async Task ClientStartListen(HttpSession session)
+        protected override async Task ClientStartListen(HttpConnection connection)
         {
-            if (session.NetworkStream == null && DualSettings.Certificate != null)
+            if (connection.NetworkStream == null && DualSettings.Certificate != null)
             {
-                var peaker = new StreamPeaker(session.NetworkClient.GetStream());
+                var peaker = new StreamPeaker(connection.NetworkClient.GetStream());
                 var mark = peaker.FirstByte;
                 if (mark != 0 && (mark < 32 || mark >= 127))
                 {
                     var ssl = new SslStream(peaker, false);
-                    session.NetworkStream = ssl;
+                    connection.NetworkStream = ssl;
                     ssl.AuthenticateAsServer(
                         serverCertificate:          DualSettings.Certificate,
                         clientCertificateRequired:  false,
@@ -35,14 +35,14 @@ protected override async Task ClientStartListen(HttpSession session)
                     if (!ssl.IsAuthenticated)
                     {
                         ssl.Dispose();
-                        session.NetworkClient.Close();
-                        AllSessions.Remove(session);
+                        connection.NetworkClient.Close();
+                        AllConnections.Remove(connection);
                         return;
                     }
                 }
-                else session.NetworkStream = peaker;
+                else connection.NetworkStream = peaker;
             }
-            await base.ClientStartListen(session);
+            await base.ClientStartListen(connection);
         }
 
         class StreamPeaker : Stream

MaxLib.WebServer/SSL/SecureWebServer.cs

@@ -76,18 +76,18 @@ protected virtual void SecureClientConnected(TcpClient client)
                 return;
             }
             //prepare session
-            var session = CreateRandomSession();
-            session.NetworkClient = client;
-            session.Ip = client.Client.RemoteEndPoint is IPEndPoint iPEndPoint
+            var connection = CreateRandomConnection();
+            connection.NetworkClient = client;
+            connection.Ip = client.Client.RemoteEndPoint is IPEndPoint iPEndPoint
                 ? iPEndPoint.Address.ToString()
                 : client.Client.RemoteEndPoint.ToString();
-            AllSessions.Add(session);
+            AllConnections.Add(connection);
             //listen to connection
             _ = Task.Run(async () =>
             {
                 //authentificate as server and establish ssl connection
                 var stream = new SslStream(client.GetStream(), false);
-                session.NetworkStream = stream;
+                connection.NetworkStream = stream;
                 stream.AuthenticateAsServer(
                     serverCertificate:          SecureSettings.Certificate, 
                     clientCertificateRequired:  false, 
@@ -98,11 +98,11 @@ protected virtual void SecureClientConnected(TcpClient client)
                 {
                     stream.Dispose();
                     client.Close();
-                    AllSessions.Remove(session);
+                    AllConnections.Remove(connection);
                     return;
                 }
 
-                await SafeClientStartListen(session);
+                await SafeClientStartListen(connection);
             });
         }
     }