wip: cadente, 77/* coverage

Author: CypherPotato

cadente/Sisk.Cadente.CoreEngine/CadenteHttpServerEngine.cs

@@ -8,14 +8,8 @@
 // File name:   CadenteHttpServerEngine.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Channels;
 using Sisk.Core.Http.Engine;
 
 namespace Sisk.Cadente.CoreEngine {
@@ -32,8 +26,11 @@ public sealed class CadenteHttpServerEngine : HttpServerEngine, IDisposable {
         private bool isDisposed;
 
         private Action<HttpHost>? setupHostAction;
-        private readonly ConcurrentQueue<TaskCompletionSource<HttpServerEngineContext>> _pendingContextRequests = new ();
-        private readonly ConcurrentQueue<HttpServerEngineContext> _readyContexts = new ();
+        private Channel<CadenteHttpServerEngineContext> _pendingContexts = Channel.CreateBounded<CadenteHttpServerEngineContext> ( new BoundedChannelOptions ( capacity: Environment.ProcessorCount * 512 ) {
+            AllowSynchronousContinuations = false,
+            SingleReader = true,
+            SingleWriter = false
+        } );
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CadenteHttpServerEngine"/> class.
@@ -56,6 +53,9 @@ public override TimeSpan IdleConnectionTimeout {
             set => idleConnectionTimeout = value;
         }
 
+        /// <inheritdoc/>
+        public override HttpServerEngineContextEventLoopMecanism EventLoopMecanism => HttpServerEngineContextEventLoopMecanism.InlineAsyncronousGetContext;
+
         /// <inheritdoc/>
         public override void AddListeningPrefix ( string prefix ) {
             prefixes.Add ( prefix );
@@ -88,6 +88,7 @@ public override void StartServer () {
                 host.TimeoutManager.ClientWriteTimeout = idleConnectionTimeout;
                 host.Handler = new CadenteHttpEngineHostHandler ( this );
                 setupHostAction?.Invoke ( host );
+
                 host.Start ();
                 hosts.Add ( host );
             }
@@ -110,37 +111,25 @@ public override void Dispose () {
             GC.SuppressFinalize ( this );
         }
 
-        internal void EnqueueContext ( CadenteHttpServerEngineContext context ) {
-            if (_pendingContextRequests.TryDequeue ( out var tcs )) {
-                tcs.SetResult ( context );
-            }
-            else {
-                _readyContexts.Enqueue ( context );
-            }
+        /// <inheritdoc/>
+        public override IAsyncResult BeginGetContext ( AsyncCallback? callback, object? state ) {
+            throw new NotImplementedException ();
         }
 
         /// <inheritdoc/>
-        public override IAsyncResult BeginGetContext ( AsyncCallback? callback, object? state ) {
-            if (_readyContexts.TryDequeue ( out var context )) {
-                var tcs = new TaskCompletionSource<HttpServerEngineContext> ( state );
-                tcs.SetResult ( context );
-                callback?.Invoke ( tcs.Task );
-                return tcs.Task;
-            }
-            else {
-                var tcs = new TaskCompletionSource<HttpServerEngineContext> ( state );
-                _pendingContextRequests.Enqueue ( tcs );
-                if (callback != null) {
-                    tcs.Task.ContinueWith ( t => callback ( t ) );
-                }
-                return tcs.Task;
+        public override HttpServerEngineContext EndGetContext ( IAsyncResult asyncResult ) {
+            throw new NotImplementedException ();
+        }
+
+        internal void EnqueueContext ( CadenteHttpServerEngineContext context ) {
+            if (!_pendingContexts.Writer.TryWrite ( context )) {
+                throw new InvalidOperationException ( "Failed to enqueue HTTP context." );
             }
         }
 
         /// <inheritdoc/>
-        public override HttpServerEngineContext EndGetContext ( IAsyncResult asyncResult ) {
-            var task = (Task<HttpServerEngineContext>) asyncResult;
-            return task.Result;
+        public override async Task<HttpServerEngineContext> GetContextAsync ( CancellationToken cancellationToken = default ) {
+            return await _pendingContexts.Reader.ReadAsync ( cancellationToken );
         }
     }
 }

cadente/Sisk.Cadente.CoreEngine/CadenteHttpServerEngineContext.cs

@@ -8,11 +8,9 @@
 // File name:   CadenteHttpServerEngineContext.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Net.WebSockets;
+using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 using Sisk.Core.Http.Engine;
 
 namespace Sisk.Cadente.CoreEngine {
@@ -30,7 +28,7 @@ public sealed class CadenteHttpServerEngineContext : HttpServerEngineContext {
         /// </summary>
         public Task ProcessingTask => _processingTcs.Task;
 
-        internal void CompleteProcessing () => _processingTcs.SetResult ( null );
+        internal void CompleteProcessing () => _processingTcs.TrySetResult ( null );
 
         /// <inheritdoc/>
         public CadenteHttpServerEngineContext ( CadenteHttpServerEngineRequest request, CadenteHttpServerEngineResponse response ) {
@@ -50,8 +48,49 @@ public CadenteHttpServerEngineContext ( CadenteHttpServerEngineRequest request,
 
         /// <inheritdoc/>
         public override Task<HttpServerEngineWebSocket> AcceptWebSocketAsync ( string? subProtocol ) {
-            // Sisk.Cadente does not support WebSockets yet.
-            throw new NotSupportedException ( "Sisk.Cadente does not support WebSockets yet." );
+
+            string? wsKey = _request._context.Request.Headers.Get ( "Sec-WebSocket-Key" ).FirstOrDefault ()
+                ?? throw new InvalidOperationException ( "Missing 'Sec-WebSocket-Key' header in WebSocket upgrade request." );
+
+            byte [] wsAcceptToken = SHA1.HashData ( Encoding.UTF8.GetBytes ( $"{wsKey}258EAFA5-E914-47DA-95CA-C5AB0DC85B11" ) );
+
+            var underlyingResponse = _request._context.Response;
+
+            underlyingResponse.StatusCode = 101;
+            underlyingResponse.StatusDescription = "Switching Protocols";
+
+            underlyingResponse.Headers.Set ( new HttpHeader ( "Connection", "Upgrade" ) );
+            underlyingResponse.Headers.Set ( new HttpHeader ( "Upgrade", "websocket" ) );
+            underlyingResponse.Headers.Set ( new HttpHeader ( "Sec-WebSocket-Accept", Convert.ToBase64String ( wsAcceptToken ) ) );
+            underlyingResponse.Headers.Set ( new HttpHeader ( "Sec-WebSocket-Version", "13" ) );
+
+            if (subProtocol is { Length: > 0 }) {
+
+                string [] clientSubProtocols = _request._context.Request.Headers.Get ( "Sec-WebSocket-Protocol" )
+                    .SelectMany ( s => s.Split ( ",", StringSplitOptions.RemoveEmptyEntries ) )
+                    .Select ( s => s.Trim () )
+                    .ToArray ();
+
+                if (!clientSubProtocols.Contains ( subProtocol, StringComparer.Ordinal )) {
+
+                    underlyingResponse.StatusCode = 426;
+                    underlyingResponse.StatusDescription = "Upgrade Required";
+
+                    throw new InvalidOperationException ( $"The requested sub-protocol '{subProtocol}' is not supported by the client." );
+                }
+
+                underlyingResponse.Headers.Set ( new HttpHeader ( "Sec-WebSocket-Protocol", subProtocol ) );
+            }
+
+            Stream underlyingStream = underlyingResponse.GetResponseStream ( chunked: false );
+
+            var ws = WebSocket.CreateFromStream ( underlyingStream, new WebSocketCreationOptions () {
+                IsServer = true,
+                SubProtocol = subProtocol,
+                KeepAliveInterval = TimeSpan.FromSeconds ( 20 )
+            } );
+
+            return Task.FromResult ( HttpServerEngineWebSocket.CreateFromWebSocket ( ws ) );
         }
     }
 }

cadente/Sisk.Cadente.CoreEngine/CadenteHttpServerEngineRequest.cs

@@ -8,15 +8,10 @@
 // File name:   CadenteHttpServerEngineRequest.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 using System.Net;
 using System.Net.Http.Headers;
-using System.Net.Mime;
 using System.Text;
-using System.Threading.Tasks;
 using Sisk.Core.Http;
 using Sisk.Core.Http.Engine;
 
@@ -77,11 +72,7 @@ public override NameValueCollection QueryString {
         public override IPEndPoint RemoteEndPoint => _context.Client.ClientEndpoint;
 
         /// <inheritdoc/>
-#if NET9_0_OR_GREATER
-        public override Guid RequestTraceIdentifier => Guid.CreateVersion7 ();
-#else
-        public override Guid RequestTraceIdentifier => Guid.NewGuid ();
-#endif
+        public override Guid RequestTraceIdentifier { get; } = Guid.NewGuid ();
 
         /// <inheritdoc/>
         public override NameValueCollection Headers {

cadente/Sisk.Cadente/HttpHeaderExtensions.cs

@@ -37,6 +37,47 @@ public static void Set ( this List<HttpHeader> headers, in HttpHeader header ) {
         }
     }
 
+    /// <summary>
+    /// Retrieves all values for the specified header name from the list.
+    /// This operation is thread‑safe.
+    /// </summary>
+    /// <param name="headers">The list of <see cref="HttpHeader"/> to query.</param>
+    /// <param name="name">The name of the header to retrieve values for. May be <see langword="null"/>.</param>
+    /// <returns>An array of header values that match the specified name.</returns>
+    public static string [] Get ( 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 )) {
+                    results.Add ( span [ i ].Value );
+                }
+            }
+        }
+
+        return results.ToArray ();
+    }
+
+    /// <summary>
+    /// Retrieves all values for the specified header name from the array.
+    /// </summary>
+    /// <param name="headers">The array of <see cref="HttpHeader"/> to query.</param>
+    /// <param name="name">The name of the header to retrieve values for. May be <see langword="null"/>.</param>
+    /// <returns>An array of header values that match the specified name.</returns>
+    public static string [] Get ( this HttpHeader [] headers, string? name ) {
+
+        List<string> results = new ();
+        var span = headers.AsSpan ();
+        for (int i = span.Length - 1; i >= 0; i--) {
+            if (Ascii.EqualsIgnoreCase ( span [ i ].NameBytes.Span, name )) {
+                results.Add ( span [ i ].Value );
+            }
+        }
+
+        return results.ToArray ();
+    }
+
     /// <summary>
     /// Removes all <see cref="HttpHeader"/> with the given name from the list. Thread-safe.
     /// </summary>

cadente/Sisk.Cadente/Streams/HttpRequestStream.cs

@@ -38,7 +38,7 @@ public override void Flush () {
     }
 
     public override int Read ( byte [] buffer, int offset, int count ) {
-        if (read >= baseRequest.ContentLength) {
+        if (baseRequest.ContentLength > 0 && read >= baseRequest.ContentLength) {
             return 0;
         }
 

extensions/Sisk.BasicAuth/BasicAuthenticateRequestHandler.cs

@@ -7,7 +7,6 @@
 // File name:   BasicAuthenticateRequestHandler.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System.Text;
 using Sisk.Core.Http;
 using Sisk.Core.Routing;
 
@@ -88,7 +87,7 @@ public BasicAuthenticateRequestHandler ( Func<BasicAuthenticationCredentials, Ht
             try {
                 var auth = ParseAuth ( authorization );
                 if (auth == null) {
-                    return DefaultMessagePage.CreateDefaultResponse ( HttpStatusInformation.BadRequest, "Invalid Authorization Header" );
+                    return DefaultMessagePage.Instance.CreateMessageHtml ( HttpStatusInformation.BadRequest, "Invalid Authorization Header" );
                 }
                 var res = OnValidating ( auth, context );
                 return res;

src/Http/Engine/HttpListenerAbstractEngine.cs

@@ -7,14 +7,9 @@
 // File name:   HttpListenerAbstractEngine.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System;
-using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
 using System.Net;
-using System.Net.WebSockets;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Sisk.Core.Http.Engine;
 
@@ -45,6 +40,9 @@ public override TimeSpan IdleConnectionTimeout {
         set => _listener.TimeoutManager.IdleConnection = value;
     }
 
+    /// <inheritdoc/>
+    public override HttpServerEngineContextEventLoopMecanism EventLoopMecanism => HttpServerEngineContextEventLoopMecanism.UnboundAsyncronousGetContext;
+
     /// <inheritdoc/>
     public override void AddListeningPrefix ( string prefix ) {
         _listener.Prefixes.Add ( prefix );
@@ -81,6 +79,11 @@ public override void StopServer () {
         _listener.Stop ();
     }
 
+    /// <inheritdoc/>
+    public override Task<HttpServerEngineContext> GetContextAsync ( CancellationToken cancellationToken = default ) {
+        throw new NotImplementedException ();
+    }
+
     sealed class HttpListenerContextAbstraction ( HttpListenerContext context ) : HttpServerEngineContext {
 
         HttpListenerContext _context = context;
@@ -93,7 +96,7 @@ sealed class HttpListenerContextAbstraction ( HttpListenerContext context ) : Ht
 
         public override async Task<HttpServerEngineWebSocket> AcceptWebSocketAsync ( string? subProtocol ) {
             var ws = await _context.AcceptWebSocketAsync ( subProtocol ).ConfigureAwait ( false );
-            return new HttpListenerContextWebSocketAbstraction ( ws.WebSocket );
+            return HttpServerEngineWebSocket.CreateFromWebSocket ( ws.WebSocket );
         }
     }
 
@@ -175,26 +178,4 @@ public void SetHeader ( string name, string value ) {
             }
         }
     }
-
-    sealed class HttpListenerContextWebSocketAbstraction ( WebSocket ws ) : HttpServerEngineWebSocket {
-        readonly WebSocket _ws = ws;
-
-        public override WebSocketState State => _ws.State;
-
-        public override Task CloseAsync ( WebSocketCloseStatus closeStatus, string? reason, CancellationToken cancellation ) {
-            return _ws.CloseAsync ( closeStatus, reason, cancellation );
-        }
-
-        public override Task CloseOutputAsync ( WebSocketCloseStatus closeStatus, string? reason, CancellationToken cancellation ) {
-            return _ws.CloseOutputAsync ( closeStatus, reason, cancellation );
-        }
-
-        public override async ValueTask<ValueWebSocketReceiveResult> ReceiveAsync ( Memory<byte> buffer, CancellationToken cancellationToken ) {
-            return await _ws.ReceiveAsync ( buffer, cancellationToken ).ConfigureAwait ( false );
-        }
-
-        public override async ValueTask SendAsync ( ReadOnlyMemory<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken ) {
-            await _ws.SendAsync ( buffer, messageType, endOfMessage, cancellationToken ).ConfigureAwait ( false );
-        }
-    }
 }