wip: cadente coverage 91/95 tests

Author: gscat

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

@@ -2,7 +2,7 @@
 
 	<!-- supported frameworks -->
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<RootNamespace>Sisk.Cadente.CoreEngine</RootNamespace>
 		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>

cadente/Sisk.Cadente/HttpConnection.cs

@@ -56,8 +56,11 @@ public async Task<HttpConnectionState> HandleConnectionEvents () {
                 managedSession.Response.Headers.Set ( new HttpHeader ( HttpHeaderName.Connection, "close" ) );
             }
 
-            if (managedSession.ResponseHeadersAlreadySent == false && !managedSession.WriteHttpResponseHeaders ()) {
-                return HttpConnectionState.ResponseWriteException;
+            if (managedSession.ResponseHeadersAlreadySent == false) {
+                managedSession.Response.Headers.Set ( new HttpHeader ( HttpHeaderName.ContentLength, "0" ) );
+
+                if (!managedSession.WriteHttpResponseHeaders ())
+                    return HttpConnectionState.ResponseWriteException;
             }
 
             await _connectionStream.FlushAsync ();

cadente/Sisk.Cadente/HttpEventStreamWriter.cs

@@ -78,6 +78,29 @@ public static string [] Get ( this HttpHeader [] headers, string? name ) {
         return results.ToArray ();
     }
 
+    /// <summary>
+    /// Determines whether the specified list of <see cref="HttpHeader"/> contains a header with the given name.
+    /// </summary>
+    /// <param name="headers">The list of <see cref="HttpHeader"/> to search.</param>
+    /// <param name="name">The name of the header to search for. May be <see langword="null"/>.</param>
+    /// <returns>
+    /// <see langword="true"/> if the list contains a header with the specified name; otherwise, <see langword="false"/>.
+    /// </returns>
+    public static bool Contains ( this List<HttpHeader> headers, string? name ) {
+
+        List<string> results = new ();
+        lock (((ICollection) headers).SyncRoot) {
+            var span = CollectionsMarshal.AsSpan ( headers );
+            for (int i = span.Length - 1; i >= 0; i--) {
+                if (Ascii.EqualsIgnoreCase ( span [ i ].NameBytes.Span, name )) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     /// <summary>
     /// Removes all <see cref="HttpHeader"/> with the given name from the list. Thread-safe.
     /// </summary>

cadente/Sisk.Cadente/HttpHeaderExtensions.cs

@@ -104,14 +104,21 @@ public sealed class HttpRequest {
         /// </summary>
         public Stream GetRequestStream () {
 
+            if (ContentLength == 0) {
+                return Stream.Null;
+            }
+
             if (_baseRequest.IsExpecting100 && !wasExpectationSent) {
                 wasExpectationSent = HttpResponseSerializer.WriteExpectationContinue ( _requestStream );
 
                 if (!wasExpectationSent)
                     throw new InvalidOperationException ( "Unable to obtain the input stream for the request." );
             }
 
-            return _requestStream;
+            return _baseRequest.IsChunked switch {
+                true => new HttpChunkedReadStream2 ( _requestStream ),
+                false => _requestStream
+            };
         }
 
         internal HttpRequest ( HttpRequestBase request, HttpRequestStream requestStream ) {
@@ -126,7 +133,7 @@ internal HttpRequest ( HttpRequestBase request, HttpRequestStream requestStream
     public sealed class HttpResponse {
         private Stream _baseOutputStream;
         private HttpHostContext _session;
-        private bool headersSent = false;
+        internal bool headersSent = false;
 
         /// <summary>
         /// Gets or sets the HTTP status code of the response.
@@ -143,34 +150,6 @@ public sealed class HttpResponse {
         /// </summary>
         public List<HttpHeader> Headers { get; set; }
 
-        /// <summary>
-        /// Asynchronously gets an event stream writer with UTF-8 encoding.
-        /// </summary>
-        /// <returns>A task that represents the asynchronous operation, with a <see cref="HttpEventStreamWriter"/> as the result.</returns>
-        public HttpEventStreamWriter GetEventStream () => GetEventStream ( Encoding.UTF8 );
-
-        /// <summary>
-        /// Asynchronously gets an event stream writer with the specified encoding.
-        /// </summary>
-        /// <param name="encoding">The encoding to use for the event stream.</param>
-        /// <returns>A task that represents the asynchronous operation, with a <see cref="HttpEventStreamWriter"/> as the result.</returns>
-        /// <exception cref="InvalidOperationException">Thrown when unable to obtain an output stream for the response.</exception>
-        public HttpEventStreamWriter GetEventStream ( Encoding encoding ) {
-            if (headersSent) {
-                throw new InvalidOperationException ( "Headers already sent for this HTTP response." );
-            }
-
-            Headers.Set ( new HttpHeader ( "Content-Type", "text/event-stream" ) );
-            Headers.Set ( new HttpHeader ( "Cache-Control", "no-cache" ) );
-
-            if (!_session.WriteHttpResponseHeaders ()) {
-                throw new InvalidOperationException ( "Unable to obtain the output stream for the response." );
-            }
-
-            headersSent = true;
-            return new HttpEventStreamWriter ( _baseOutputStream, encoding );
-        }
-
         /// <summary>
         /// Gets the content stream for the response.
         /// </summary>
@@ -185,6 +164,11 @@ public Stream GetResponseStream ( bool chunked = false ) {
                 Headers.Set ( new HttpHeader ( HttpHeaderName.TransferEncoding, "chunked" ) );
                 Headers.Remove ( HttpHeaderName.ContentLength );
             }
+            else {
+                if (!Headers.Contains ( HttpHeaderName.ContentLength )) {
+                    throw new InvalidOperationException ( "Content-Length header must be set for non-chunked responses." );
+                }
+            }
 
             if (!_session.WriteHttpResponseHeaders ()) {
                 throw new InvalidOperationException ( "Unable to obtain an output stream for the response." );

cadente/Sisk.Cadente/HttpHostContext.cs

@@ -18,6 +18,7 @@ sealed class HttpRequestBase {
     private HttpHeader []? _headers;
 
     public bool IsExpecting100;
+    public bool IsChunked;
 
     public long ContentLength;
     public bool CanKeepAlive;

cadente/Sisk.Cadente/HttpSerializer/HttpRequestBase.cs

@@ -60,6 +60,7 @@ public bool TryReadHttpRequest ( [NotNullWhen ( true )] out HttpRequestBase? req
         long contentLength = 0;
         bool keepAliveEnabled = true;
         bool expect100 = false;
+        bool isChunked = false;
 
         List<HttpHeader> headers = new List<HttpHeader> ( 32 );
         while (reader.TryReadToAny ( out ReadOnlySpan<byte> headerLine, RequestLineDelimiters, advancePastDelimiter: true )) {
@@ -84,6 +85,9 @@ public bool TryReadHttpRequest ( [NotNullWhen ( true )] out HttpRequestBase? req
             else if (Ascii.EqualsIgnoreCase ( headerLineName, "Expect"u8 )) {
                 expect100 = Ascii.Equals ( headerLineValue, "100-continue"u8 );
             }
+            else if (Ascii.EqualsIgnoreCase ( headerLineName, "Transfer-Encoding"u8 )) {
+                isChunked = Ascii.Equals ( headerLineValue, "chunked"u8 );
+            }
 
             headers.Add ( new HttpHeader ( headerLineName.ToArray (), headerLineValue.ToArray () ) );
         }
@@ -95,10 +99,14 @@ public bool TryReadHttpRequest ( [NotNullWhen ( true )] out HttpRequestBase? req
             MethodRef = method.ToArray (),
             PathRef = path.ToArray (),
 
-            ContentLength = contentLength,
+            ContentLength = isChunked switch {
+                true => -1,
+                false => contentLength
+            },
             CanKeepAlive = keepAliveEnabled,
 
-            IsExpecting100 = expect100
+            IsExpecting100 = expect100,
+            IsChunked = isChunked
         };
     }
 }

cadente/Sisk.Cadente/HttpSerializer/HttpRequestReader.cs

@@ -2,7 +2,7 @@
 
 	<!-- supported frameworks -->
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>net9.0</TargetFrameworks>
 		<RootNamespace>Sisk.Cadente</RootNamespace>
 		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>