fixes

Author: st0o0

.github/workflows/build-and-release.yml

@@ -107,13 +107,13 @@ jobs:
         working-directory: './src'
         run: >
           dotnet test 
-            --configuration Release 
-            --no-ansi 
-            --no-build 
-            --coverage 
-            --coverage-output-format cobertura 
-            --results-directory ${{ env.TEST_OUTPUT_DIRECTORY }} 
-            --solution *.sln
+          --configuration Release
+          --no-ansi
+          --no-build
+          --coverage
+          --coverage-output-format cobertura
+          --results-directory ${{ env.TEST_OUTPUT_DIRECTORY }}
+          --solution *.slnx
 
       - name: Create NuGet package
         run: >

src/TurboHTTP.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt

@@ -43,7 +43,7 @@ private static byte[] GzipCompress(byte[] data)
     private static byte[] DeflateCompress(byte[] data)
     {
         using var output = new MemoryStream();
-        using (var deflate = new DeflateStream(output, CompressionMode.Compress))
+        using (var deflate = new ZLibStream(output, CompressionMode.Compress))
         {
             deflate.Write(data, 0, data.Length);
         }

src/TurboHTTP.API.Tests/verify/CoreAPISpec.ApproveCore.received.txt

@@ -13,8 +13,7 @@ namespace TurboHTTP.AcceptanceTests.H10;
 
 public sealed class RequestCompressionSpec : AcceptanceTestBase
 {
-    private static Http10Engine Engine => new(new Http1EngineOptions(16, 6, 3, 64 * 1024, 64, 1024 * 1024, TimeSpan.FromSeconds(2)));
-
+    
     private static byte[] MakePayload(int size)
     {
         var payload = new byte[size];
@@ -29,21 +28,21 @@ private static BidiFlow<HttpRequestMessage, IOutputItem, IInputItem, HttpRespons
         CreateCompressionEngine(string encoding)
     {
         var stage = new ContentEncodingBidiStage(true, new CompressionPolicy { Encoding = encoding });
-        return BidiFlow.FromGraph(stage).Atop(Engine.CreateFlow());
+        return BidiFlow.FromGraph(stage).Atop(CreateHttp10Engine().CreateFlow());
     }
 
     private static BidiFlow<HttpRequestMessage, IOutputItem, IInputItem, HttpResponseMessage, NotUsed>
         CreateDefaultCompressionEngine()
     {
         var stage = new ContentEncodingBidiStage(true, CompressionPolicy.Default);
-        return BidiFlow.FromGraph(stage).Atop(Engine.CreateFlow());
+        return BidiFlow.FromGraph(stage).Atop(CreateHttp10Engine().CreateFlow());
     }
 
     private static BidiFlow<HttpRequestMessage, IOutputItem, IInputItem, HttpResponseMessage, NotUsed>
         CreateDecompressingAndCompressingEngine(string encoding)
     {
         var stage = new ContentEncodingBidiStage(true, new CompressionPolicy { Encoding = encoding });
-        return BidiFlow.FromGraph(stage).Atop(Engine.CreateFlow());
+        return BidiFlow.FromGraph(stage).Atop(CreateHttp10Engine().CreateFlow());
     }
 
     private static byte[] BuildResponse(byte[] body, string? extraHeaders = null)
@@ -144,7 +143,7 @@ public async Task RequestCompression_should_send_and_verify_gzip_request_body()
             Content = new ByteArrayContent(payload)
         };
 
-        var (response, fake) = await SendCompressedAsync(
+        var (response, _) = await SendCompressedAsync(
             CreateCompressionEngine("gzip"),
             request,
             (_, outbound) =>
@@ -223,7 +222,7 @@ public async Task RequestCompression_should_not_compress_small_body_below_thresh
             Content = new ByteArrayContent(payload)
         };
 
-        var (response, fake) = await SendCompressedAsync(
+        var (response, _) = await SendCompressedAsync(
             CreateDefaultCompressionEngine(),
             request,
             (_, outbound) =>

src/TurboHTTP.AcceptanceTests/H10/CompressionSpec.cs

@@ -11,19 +11,17 @@ namespace TurboHTTP.AcceptanceTests.H10;
 
 public sealed class ResilienceSpec : AcceptanceTestBase
 {
-    private static Http10Engine Engine => new(new Http1EngineOptions(16, 6, 3, 64 * 1024, 64, 1024 * 1024, TimeSpan.FromSeconds(2)));
-
     private static BidiFlow<HttpRequestMessage, IOutputItem, IInputItem, HttpResponseMessage, NotUsed>
         CreateDecompressingEngine()
     {
         var decomp = BidiFlow.FromGraph(new ContentEncodingBidiStage());
-        return decomp.Atop(Engine.CreateFlow());
+        return decomp.Atop(CreateHttp10Engine().CreateFlow());
     }
 
     private async Task<HttpResponseMessage> SendScriptedAsync(HttpRequestMessage request, Func<int, byte[], byte[]?> factory)
     {
         var fake = new ScriptedFakeConnectionStage(factory);
-        var flow = Engine.CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
+        var flow = CreateHttp10Engine().CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
 
         var tcs = new TaskCompletionSource<HttpResponseMessage>();
         _ = Source.Single(request)
@@ -59,7 +57,7 @@ public async Task Resilience_should_cause_exception_on_content_length_mismatch()
         var raw = "HTTP/1.0 200 OK\r\nContent-Length: 100\r\n\r\nhello";
 
         var fake = new ScriptedFakeConnectionStage((_, _) => Encoding.Latin1.GetBytes(raw));
-        var flow = Engine.CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
+        var flow = CreateHttp10Engine().CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
 
         var tcs = new TaskCompletionSource<HttpResponseMessage>();
         _ = Source.Single(request)
@@ -148,7 +146,7 @@ public async Task Resilience_should_detect_truncated_body()
         truncatedBody.CopyTo(responseBytes, headerBytes.Length);
 
         var fake = new ScriptedFakeConnectionStage((_, _) => responseBytes);
-        var flow = Engine.CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
+        var flow = CreateHttp10Engine().CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
 
         var tcs = new TaskCompletionSource<HttpResponseMessage>();
         _ = Source.Single(request)
@@ -190,7 +188,7 @@ public async Task Resilience_should_cause_cancellation_when_slow_headers_exceed_
 
         // Simulate server that never responds (abort connection)
         var fake = new ScriptedFakeConnectionStage((_, _) => null);
-        var flow = Engine.CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
+        var flow = CreateHttp10Engine().CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
 
         var tcs = new TaskCompletionSource<HttpResponseMessage>();
         _ = Source.Single(request)
@@ -212,7 +210,7 @@ public async Task Resilience_should_cause_exception_on_empty_response()
 
         // Server closes connection without sending anything
         var fake = new ScriptedFakeConnectionStage((_, _) => null);
-        var flow = Engine.CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
+        var flow = CreateHttp10Engine().CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
 
         var tcs = new TaskCompletionSource<HttpResponseMessage>();
         _ = Source.Single(request)

src/TurboHTTP.AcceptanceTests/H10/RequestCompressionSpec.cs

@@ -10,8 +10,6 @@ namespace TurboHTTP.AcceptanceTests.H10;
 
 public sealed class SmokeSpec : AcceptanceTestBase
 {
-    private static Http10Engine Engine => new(new Http1EngineOptions(16, 6, 3, 64 * 1024, 64, 1024 * 1024, TimeSpan.FromSeconds(2)));
-
     [Fact(Timeout = 5000)]
     [Trait("RFC", "RFC1945-4.1")]
     public async Task SmokeTest_should_return_200_hello_world()
@@ -26,7 +24,7 @@ public async Task SmokeTest_should_return_200_hello_world()
         var responseBytes = Encoding.Latin1.GetBytes(raw);
 
         var fake = new ScriptedFakeConnectionStage((_, _) => responseBytes);
-        var flow = Engine.CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
+        var flow = CreateHttp10Engine().CreateFlow().Join(Flow.FromGraph<IOutputItem, IInputItem, NotUsed>(fake));
 
         var tcs = new TaskCompletionSource<HttpResponseMessage>();
         _ = Source.Single(request)
@@ -39,4 +37,4 @@ public async Task SmokeTest_should_return_200_hello_world()
         var responseBody = await response.Content.ReadAsStringAsync(TestContext.Current.CancellationToken);
         Assert.Equal("Hello World", responseBody);
     }
-}
+}

src/TurboHTTP.AcceptanceTests/H10/ResilienceSpec.cs

@@ -44,7 +44,7 @@ private static byte[] GzipCompress(byte[] data)
     private static byte[] DeflateCompress(byte[] data)
     {
         using var output = new MemoryStream();
-        using (var deflate = new DeflateStream(output, CompressionMode.Compress))
+        using (var deflate = new ZLibStream(output, CompressionMode.Compress))
         {
             deflate.Write(data, 0, data.Length);
         }

src/TurboHTTP.AcceptanceTests/H10/SmokeSpec.cs

@@ -40,7 +40,7 @@ private static byte[] GzipCompress(byte[] data)
     private static byte[] DeflateCompress(byte[] data)
     {
         using var output = new MemoryStream();
-        using (var deflate = new DeflateStream(output, CompressionMode.Compress))
+        using (var deflate = new ZLibStream(output, CompressionMode.Compress))
         {
             deflate.Write(data, 0, data.Length);
         }

src/TurboHTTP.AcceptanceTests/H11/CompressionSpec.cs

@@ -40,7 +40,7 @@ private static byte[] GzipCompress(byte[] data)
     private static byte[] DeflateCompress(byte[] data)
     {
         using var output = new MemoryStream();
-        using (var deflate = new DeflateStream(output, CompressionMode.Compress))
+        using (var deflate = new ZLibStream(output, CompressionMode.Compress))
         {
             deflate.Write(data, 0, data.Length);
         }