Merge pull request #18 from Ali-YousefiTelori/develop

Fix work on linux
EasyMicroservices · Oct 26, 2023 · 31b4746 · 31b4746
2 parents f6c8a0a + 6d3a43c
commit 31b4746
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/src/CSharp/EasyMicroservices.Laboratory.Tests/Engine/Net/BaseHandlerTest.cs b/src/CSharp/EasyMicroservices.Laboratory.Tests/Engine/Net/BaseHandlerTest.cs
@@ -17,17 +17,17 @@ public abstract class BaseHandlerTest
         public HttpClient GetHttpClient()
         {
             HttpClient httpClient = default;
-//            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
-//            {
-//#if (NET452)
-//                httpClient = new HttpClient();
-//#else
-//                var handler = new WinHttpHandler();
-//                httpClient = new HttpClient(handler);
-//#endif
-//            }
-//            else
-                httpClient = new HttpClient();
+            //            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+            //            {
+            //#if (NET452)
+            //                httpClient = new HttpClient();
+            //#else
+            //                var handler = new WinHttpHandler();
+            //                httpClient = new HttpClient(handler);
+            //#endif
+            //            }
+            //            else
+            httpClient = new HttpClient();
 
 #if (!NET452 && !NET48)
             httpClient.DefaultRequestVersion = HttpVersion.Version20;
@@ -86,7 +86,7 @@ public async Task ConcurrentCheckSimpleRequestAndResponse(string request, string
             var port = await GetHandler(resourceManager).Start();
 
             List<Task<bool>> all = new List<Task<bool>>();
-            for (int i = 0; i < 100; i++)
+            for (int i = 0; i < 10; i++)
             {
                 all.Add(Task.Run(async () =>
                 {
@@ -115,7 +115,7 @@ public async Task ConcurrentSingleHttpClientCheckSimpleRequestAndResponse(string
             HttpClient httpClient = GetHttpClient();
 
             List<Task<bool>> all = new List<Task<bool>>();
-            for (int i = 0; i < 20; i++)
+            for (int i = 0; i < 5; i++)
             {
                 all.Add(Task.Run(async () =>
                 {

diff --git a/src/CSharp/EasyMicroservices.Laboratory.Tests/Engine/Net/HostHttpHandlerTest.cs b/src/CSharp/EasyMicroservices.Laboratory.Tests/Engine/Net/HostHttpHandlerTest.cs
@@ -10,7 +10,8 @@ public class HostHttpHandlerTest : BaseHandlerTest
     {
         protected override BaseHandler GetHandler(ResourceManager resourceManager)
         {
-            return BaseHandler.CreateOSHandler(resourceManager);
+            return new HostHttpHandler(resourceManager);
+            //return BaseHandler.CreateOSHandler(resourceManager);
         }
     }
 }

diff --git a/src/CSharp/EasyMicroservices.Laboratory.Tests/Engine/Net/HttpHandlerTest.cs b/src/CSharp/EasyMicroservices.Laboratory.Tests/Engine/Net/HttpHandlerTest.cs
@@ -9,7 +9,8 @@ public class HttpHandlerTest : BaseHandlerTest
     {
         protected override BaseHandler GetHandler(ResourceManager resourceManager)
         {
-            return BaseHandler.CreateOSHandler(resourceManager);
+            return new HttpHandler(resourceManager);
+            //return BaseHandler.CreateOSHandler(resourceManager);
         }
     }
 }
diff --git a/src/CSharp/EasyMicroservices.Laboratory/Engine/Net/Http/HostHttpHandler.cs b/src/CSharp/EasyMicroservices.Laboratory/Engine/Net/Http/HostHttpHandler.cs
@@ -1,4 +1,4 @@
-#if(NET6_0_OR_GREATER)
+#if (NET6_0_OR_GREATER)
 using Microsoft.AspNetCore.Http;
 using System;
 using System.IO;
@@ -29,7 +29,7 @@ public HostHttpHandler(ResourceManager resourceManager) : base(resourceManager)
         /// <param name="httpClient"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        protected override async Task HandleHttpClient(HttpContext httpClient)
+        protected override async Task<bool> HandleHttpClient(HttpContext httpClient)
         {
             var reader = new StreamReader(httpClient.Request.Body);
             var requestBody = await reader.ReadToEndAsync();
@@ -63,6 +63,7 @@ protected override async Task HandleHttpClient(HttpContext httpClient)
 
                 await httpClient.Response.Body.WriteAsync(bytes, 0, bytes.Length);
             }
+            return true;
         }
     }
 }

diff --git a/src/CSharp/EasyMicroservices.Laboratory/Engine/Net/Http/HostHttpHandlerBase.cs b/src/CSharp/EasyMicroservices.Laboratory/Engine/Net/Http/HostHttpHandlerBase.cs
@@ -75,12 +75,14 @@ public override void Stop()
         protected virtual async Task InternalStart(int port)
         {
             var builder = WebApplication.CreateBuilder();
-            builder.WebHost.UseUrls($"http://*:{port}");
+            builder.WebHost
+                .UseUrls($"http://*:{port}")
+                .UseKestrel();
             var app = builder.Build();
             app.Use(async (context, next) =>
             {
-                await HandleHttpClient(context);
-                await next(context);
+                if (!await HandleHttpClient(context))
+                    await next(context);
             });
             await Task.WhenAny(app.RunAsync(null), Task.Delay(3000));
         }
@@ -90,7 +92,7 @@ protected virtual async Task InternalStart(int port)
         /// </summary>
         /// <param name="httpClient"></param>
         /// <returns></returns>
-        protected abstract Task HandleHttpClient(HttpContext httpClient);
+        protected abstract Task<bool> HandleHttpClient(HttpContext httpClient);
 
         string _lastResponseBody = "";
         /// <summary>