wip: add slow connection tests; fix req chunked issues

Author: CypherPotato

cadente/Sisk.Cadente.CoreEngine/Sisk.Cadente.CoreEngine.csproj

@@ -47,7 +47,7 @@
 	<PropertyGroup>
 		<AssemblyVersion>1.6.0</AssemblyVersion>
 		<FileVersion>1.6.0</FileVersion>
-		<Version>1.6.0-beta7</Version>
+		<Version>1.6.0-beta8</Version>
 	</PropertyGroup>
 
 	<!-- licensing, readme, signing -->

cadente/Sisk.Cadente/Sisk.Cadente.csproj

@@ -47,7 +47,7 @@
 	<PropertyGroup>
 		<AssemblyVersion>1.0</AssemblyVersion>
 		<FileVersion>1.0</FileVersion>
-		<Version>1.0-beta7</Version>
+		<Version>1.0-beta8</Version>
 	</PropertyGroup>
 
 	<!-- licensing, readme, signing -->

cadente/Sisk.Cadente/Streams/HttpChunkedReadStream2.cs

@@ -47,46 +47,54 @@ public override int Read ( byte [] buffer, int offset, int count ) {
         if (currentBlockSize == 0) {
             return 0;
         }
-        else if (currentBlockSize > 0) {
-            var expected = Math.Min ( count, currentBlockSize - currentBlockRead );
-            var read = _s.Read ( buffer, offset, expected );
 
-            currentBlockRead += read;
-
-            if (currentBlockRead == currentBlockSize) {
-                // read trailing \r\n
-                _ = _s.Read ( _buffer, 0, 2 );
-                currentBlockSize = -1;
-                currentBlockRead = 0;
+        if (currentBlockSize == -1) {
+            // read next chunked header
+            int ptr = 0;
+            while (true) {
+                int b = _s.ReadByte ();
+                if (b == -1) break;
+                _buffer [ ptr++ ] = (byte) b;
+
+                if (ptr >= 2 && _buffer [ ptr - 1 ] == '\n' && _buffer [ ptr - 2 ] == '\r') {
+                    break;
+                }
+                if (ptr >= _buffer.Length) throw new InvalidOperationException ( "Chunk header too long" );
             }
 
-            return read;
-        }
-        else if (currentBlockSize == -1) {
-            // read next chunked header
-            int read = _s.Read ( _buffer, 0, 16 );
-            var headerLine = Encoding.ASCII.GetString ( _buffer, 0, read );
+            if (ptr == 0) return 0;
 
-            var numEnd = headerLine.IndexOf ( '\r' );
-            var numberString = headerLine.Substring ( 0, numEnd );
+            var headerLine = Encoding.ASCII.GetString ( _buffer, 0, ptr - 2 );
+            var extIndex = headerLine.IndexOf ( ';' );
+            var numberString = extIndex > -1 ? headerLine.Substring ( 0, extIndex ) : headerLine;
 
             if (numberString == "0") {
                 currentBlockSize = 0;
                 return 0;
             }
 
-            var number = Convert.ToInt32 ( numberString, 16 );
+            currentBlockSize = Convert.ToInt32 ( numberString, 16 );
+            currentBlockRead = 0;
+        }
 
-            var current = _buffer [ 0..read ].AsSpan () [ (numEnd + 2).. ];
-            current.CopyTo ( buffer.AsSpan () [ offset.. ] );
+        var expected = Math.Min ( count, currentBlockSize - currentBlockRead );
+        var read = _s.Read ( buffer, offset, expected );
 
-            currentBlockSize = number;
-            currentBlockRead = current.Length;
+        currentBlockRead += read;
 
-            return current.Length;
+        if (currentBlockRead == currentBlockSize) {
+            // read trailing \r\n
+            int r = 0;
+            while (r < 2) {
+                int x = _s.Read ( _buffer, 0, 2 - r );
+                if (x == 0) break;
+                r += x;
+            }
+            currentBlockSize = -1;
+            currentBlockRead = 0;
         }
 
-        return 1;
+        return read;
     }
 
     public override long Seek ( long offset, SeekOrigin origin ) {

src/Http/HttpRequest.cs

@@ -12,7 +12,6 @@
 using System.Globalization;
 using System.Net;
 using System.Net.Http.Headers;
-using System.Net.WebSockets;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;

src/Http/HttpServerExecutionResult.cs

@@ -12,6 +12,7 @@ namespace Sisk.Core.Http {
     /// Represents the results of an request execution on the HTTP server.
     /// </summary>
     public sealed class HttpServerExecutionResult {
+
         /// <summary>
         /// Gets the <see cref="HttpRequest"/> received in this diagnosis.
         /// </summary>

src/Internal/LogFormatter.cs

@@ -16,6 +16,7 @@
 namespace Sisk.Core.Internal;
 
 static class LogFormatter {
+
     public static string FormatExceptionEntr ( HttpServerExecutionResult executionResult ) {
         StringBuilder errLineBuilder = new StringBuilder ( 128 );
         errLineBuilder.Append ( '[' );

tests/Sisk.Core/Server.cs

@@ -299,6 +299,13 @@ public static void AssemblyInit ( TestContext testContext ) {
                 router.SetRoute ( RouteMethod.Get, "/tests/sse/cors", ( req ) => { var es = req.GetEventSource (); es.AppendHeader ( "X-Test-SSE", "cors" ); es.Send ( "cors message 1" ); return es.Close (); } );
                 router.SetRoute ( RouteMethod.Get, "/tests/sse/empty", ( req ) => { var es = req.GetEventSource (); es.Send ( "" ); es.Send ( null ); es.Send ( "", fieldName: "customEmpty" ); es.Send ( null, fieldName: "customNull" ); return es.Close (); } );
 
+                router.SetRoute ( RouteMethod.Get, "/tests/headers/repeated", ( req ) => {
+                    var resp = new HttpResponse ( "ok" );
+                    resp.Headers.Add ( "X-Custom-Header", "value1" );
+                    resp.Headers.Add ( "X-Custom-Header", "value2" );
+                    return resp;
+                } );
+
                 // WebSocket routes
                 router.SetRoute ( RouteMethod.Get, "/tests/ws/echo", async ( HttpRequest request ) => {
                     HttpWebSocket client = await request.GetWebSocketAsync ();

tests/Sisk.Core/Tests/CadenteEngineRareTests.cs renamed to tests/Sisk.Core/Tests/EngineRareTests.cs

@@ -4,26 +4,19 @@
 // The code below is licensed under the MIT license as
 // of the date of its publication, available at
 //
-// File name:   CadenteEngineRareTests.cs
+// File name:   EngineRareTests.cs
 // Repository:  https://github.com/sisk-http/core
 
 using System.Net.Http.Json;
 using System.Text;
-using Sisk.Cadente.CoreEngine;
 
 namespace tests.Tests;
 
 [TestClass]
-public sealed class CadenteEngineRareTests {
-    private static void AssumeCadenteEngine () {
-        if (Server.Instance.HttpServer.ServerConfiguration.Engine is not CadenteHttpServerEngine) {
-            Assert.Inconclusive ( "Cadente HTTP engine is not active for this test run." );
-        }
-    }
+public sealed class EngineRareTests {
 
     [TestMethod]
     public async Task ExpectContinue_LargePayload_Succeeds () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
         client.DefaultRequestHeaders.ExpectContinue = true;
 
@@ -44,7 +37,6 @@ public async Task ExpectContinue_LargePayload_Succeeds () {
 
     [TestMethod]
     public async Task FormContent_ThousandFields_RoundTrips () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
         var formData = Enumerable.Range ( 0, 1000 ).ToDictionary ( i => $"field{i:0000}", i => $"value-{i}" );
         using var content = new FormUrlEncodedContent ( formData );
@@ -62,7 +54,6 @@ public async Task FormContent_ThousandFields_RoundTrips () {
 
     [TestMethod]
     public async Task JsonContent_LargeStringPayload_RoundTrips () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
         var nameBuilder = new StringBuilder ( 128 * 1024 );
         for (int i = 0; i < 2048; i++) {
@@ -81,7 +72,6 @@ public async Task JsonContent_LargeStringPayload_RoundTrips () {
 
     [TestMethod]
     public async Task ResponseStreamChunked_ReadIncrementally () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
 
         using var response = await client.GetAsync ( "tests/responsestream/chunked", HttpCompletionOption.ResponseHeadersRead );
@@ -106,7 +96,6 @@ public async Task ResponseStreamChunked_ReadIncrementally () {
 
     [TestMethod]
     public async Task ServerSentEvents_CancelAfterFirstEvent () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
         using var cts = new CancellationTokenSource ( TimeSpan.FromSeconds ( 5 ) );
 
@@ -141,7 +130,6 @@ public async Task ServerSentEvents_CancelAfterFirstEvent () {
 
     [TestMethod]
     public async Task Plaintext_ManyConcurrentRequests_Succeed () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
 
         var tasks = Enumerable.Range ( 0, 12 ).Select ( async _ => {
@@ -156,7 +144,6 @@ public async Task Plaintext_ManyConcurrentRequests_Succeed () {
 
     [TestMethod]
     public async Task Plaintext_LongQueryString_Succeeds () {
-        AssumeCadenteEngine ();
         using var client = Server.GetHttpClient ();
         var uriBuilder = new StringBuilder ( "tests/plaintext?" );
         for (int i = 0; i < 200; i++) {