some minor touchups

6 files changed, 65 insertions, 92 deletions

diff --git a/lib/Net.Http/src/Core/Buffering/ContextLockedBufferManager.cs b/lib/Net.Http/src/Core/Buffering/ContextLockedBufferManager.cs
index 90bdd8c..d8def92 100644
--- a/lib/Net.Http/src/Core/Buffering/ContextLockedBufferManager.cs
+++ b/lib/Net.Http/src/Core/Buffering/ContextLockedBufferManager.cs
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Vaughn Nugent
+* Copyright (c) 2024 Vaughn Nugent
 * 
 * Library: VNLib
 * Package: VNLib.Net.Http
@@ -33,40 +33,22 @@
 
 using System;
 using System.Buffers;
+using System.Diagnostics;
 
 using VNLib.Utils.Memory;
 
 namespace VNLib.Net.Http.Core.Buffering
 {
 
-    internal sealed class ContextLockedBufferManager : IHttpBufferManager
+    internal sealed class ContextLockedBufferManager(in HttpBufferConfig config, bool chunkingEnabled) : IHttpBufferManager
     {
-        private readonly HttpBufferConfig Config;
-        private readonly int TotalBufferSize;
+        private readonly HttpBufferConfig Config = config;
+        private readonly bool _chunkingEnabled = chunkingEnabled;
+        private readonly int TotalBufferSize = ComputeTotalBufferSize(in config, chunkingEnabled);
 
-        private readonly HeaderAccumulatorBuffer _requestHeaderBuffer;
-        private readonly HeaderAccumulatorBuffer _responseHeaderBuffer;
-        private readonly ChunkAccBuffer _chunkAccBuffer;
-        private readonly bool _chunkingEnabled;
-
-        public ContextLockedBufferManager(in HttpBufferConfig config, bool chunkingEnabled)
-        {
-            Config = config;
-            _chunkingEnabled = chunkingEnabled;
-
-            //Compute total buffer size from server config
-            TotalBufferSize = ComputeTotalBufferSize(in config, chunkingEnabled);
-
-             /*
-              * Individual instances of the header accumulator buffer are required
-              * because the user controls the size of the binary buffer for responses 
-              * and requests. The buffer segment is shared between the two instances.
-              */
-            _requestHeaderBuffer = new(config.RequestHeaderBufferSize);           
-            _responseHeaderBuffer = new(config.ResponseHeaderBufferSize);
-
-            _chunkAccBuffer = new();
-        }
+        private readonly HeaderAccumulatorBuffer _requestHeaderBuffer = new(config.RequestHeaderBufferSize);
+        private readonly HeaderAccumulatorBuffer _responseHeaderBuffer = new(config.ResponseHeaderBufferSize);
+        private readonly ChunkAccBuffer _chunkAccBuffer = new();       
 
         private IMemoryOwner<byte>? _handle;
         private HttpBufferSegments<byte> _segments;
@@ -76,6 +58,8 @@ namespace VNLib.Net.Http.Core.Buffering
         ///<inheritdoc/>
         public void AllocateBuffer(IHttpMemoryPool allocator)
         {
+            Debug.Assert(_handle == null, "Memory Leak: new http buffer alloacted when an existing buffer was not freed.");
+
             //Alloc a single buffer for the entire context
             _handle = allocator.AllocateBufferForContext(TotalBufferSize);
 
@@ -85,11 +69,9 @@ namespace VNLib.Net.Http.Core.Buffering
 
                 //Header parse buffer is a special case as it will be double the size due to the char buffer
                 int headerParseBufferSize = GetMaxHeaderBufferSize(in Config);
-
-                //Response/form data buffer
+                
                 int responseAndFormDataSize = ComputeResponseAndFormDataBuffer(in Config);
-
-                //Slice and store the buffer segments
+               
                 _segments = new()
                 {
                     //Shared header buffer
@@ -238,11 +220,9 @@ namespace VNLib.Net.Http.Core.Buffering
         }  
       
 
-        private sealed class HeaderAccumulatorBuffer: SplitHttpBufferElement, IResponseHeaderAccBuffer, IHttpHeaderParseBuffer
-        {
-            public HeaderAccumulatorBuffer(int binSize):base(binSize)
-            { }
-        }
+        private sealed class HeaderAccumulatorBuffer(int binSize) : 
+            SplitHttpBufferElement(binSize), IResponseHeaderAccBuffer, IHttpHeaderParseBuffer
+        { }
 
         private sealed class ChunkAccBuffer : HttpBufferElement, IChunkAccumulatorBuffer
         { }
diff --git a/lib/Net.Http/src/Core/Buffering/SplitHttpBufferElement.cs b/lib/Net.Http/src/Core/Buffering/SplitHttpBufferElement.cs
index b6d0d39..19a463c 100644
--- a/lib/Net.Http/src/Core/Buffering/SplitHttpBufferElement.cs
+++ b/lib/Net.Http/src/Core/Buffering/SplitHttpBufferElement.cs
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Vaughn Nugent
+* Copyright (c) 2024 Vaughn Nugent
 * 
 * Library: VNLib
 * Package: VNLib.Net.Http
@@ -30,12 +30,10 @@ using VNLib.Utils.Memory;
 
 namespace VNLib.Net.Http.Core.Buffering
 {
-    internal abstract class SplitHttpBufferElement : HttpBufferElement, ISplitHttpBuffer
+    internal abstract class SplitHttpBufferElement(int binSize) : HttpBufferElement, ISplitHttpBuffer
     {
         ///<inheritdoc/>
-        public int BinSize { get; }
-
-        internal SplitHttpBufferElement(int binSize) => BinSize = binSize;
+        public int BinSize { get; } = binSize;
 
         ///<inheritdoc/>
         public Span<char> GetCharSpan()
diff --git a/lib/Net.Http/src/Core/HttpContext.cs b/lib/Net.Http/src/Core/HttpContext.cs
index f742e97..dc857b8 100644
--- a/lib/Net.Http/src/Core/HttpContext.cs
+++ b/lib/Net.Http/src/Core/HttpContext.cs
@@ -106,14 +106,11 @@ namespace VNLib.Net.Http.Core
 
             //Init buffer manager, if compression is supported, we need to alloc a buffer for the compressor
             Buffers = new(server.Config.BufferConfig, _compressor != null);
-
-            //Create new request
+         
             Request = new (this, server.Config.MaxUploadsPerRequest);
-            
-            //create a new response object
+           
             Response = new (this, Buffers);
-
-            //Init response writer
+          
             ResponseBody =  new ResponseWriter();
         }
 
diff --git a/lib/Utils/src/ArgumentList.cs b/lib/Utils/src/ArgumentList.cs
index c02ebee..7226b27 100644
--- a/lib/Utils/src/ArgumentList.cs
+++ b/lib/Utils/src/ArgumentList.cs
@@ -41,18 +41,16 @@ namespace VNLib.Utils
         /// </summary>
         /// <param name="args">The array of arguments to clone</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public ArgumentList(string[] args)
-        {
-            ArgumentNullException.ThrowIfNull(args);
-            _args = args.ToList();
-        }
+        [Obsolete("Deprecated in preference to ctor(IEnumerable<string>)")]
+        public ArgumentList(string[] args) : this(args as IEnumerable<string>)
+        { }
 
         /// <summary>
         /// Initalizes the argument parser by copying the given argument list
         /// </summary>
         /// <param name="args">The argument list to clone</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public ArgumentList(IReadOnlyList<string> args)
+        public ArgumentList(IEnumerable<string> args)
         {
             ArgumentNullException.ThrowIfNull(args);
             _args = args.ToList();
@@ -102,5 +100,21 @@ namespace VNLib.Utils
 
         ///<inheritdoc/>
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        /// <summary>
+        /// Captures the command line arguments from the currently executing process
+        /// and returns them as an ArgumentList
+        /// </summary>
+        /// <returns>The <see cref="ArgumentList"/> containing the current process's argument list</returns>
+        public static ArgumentList CaptureCurrentArgs()
+        {
+            /*
+             *  Capture the current command line arguments and 
+             *  pop the first argument which is always the program 
+             *  name
+             */
+            string[] strings = Environment.GetCommandLineArgs();
+            return new ArgumentList(strings.Skip(1));
+        }
     }
 }
\ No newline at end of file
diff --git a/lib/Utils/src/IO/ArrayPoolStreamBuffer.cs b/lib/Utils/src/IO/ArrayPoolStreamBuffer.cs
index b62412f..a943a5b 100644
--- a/lib/Utils/src/IO/ArrayPoolStreamBuffer.cs
+++ b/lib/Utils/src/IO/ArrayPoolStreamBuffer.cs
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2023 Vaughn Nugent
+* Copyright (c) 2024 Vaughn Nugent
 * 
 * Library: VNLib
 * Package: VNLib.Utils
@@ -28,7 +28,13 @@ using System.Buffers;
 namespace VNLib.Utils.IO
 {
 
-    internal class ArrayPoolStreamBuffer<T> : ISlindingWindowBuffer<T>
+    /// <summary>
+    /// Creates a new <see cref="ArrayPoolStreamBuffer{T}"/> from the 
+    /// given array instance and <see cref="ArrayPool{T}"/> it came from.
+    /// </summary>
+    /// <param name="array">The rented array to use</param>
+    /// <param name="pool">The pool to return the array to when completed</param>
+    internal class ArrayPoolStreamBuffer<T>(T[] array, ArrayPool<T> pool) : ISlindingWindowBuffer<T>
     {
         /// <summary>
         /// The shared <see cref="IStreamBufferFactory{T}"/> instance to allocate buffers 
@@ -36,20 +42,8 @@ namespace VNLib.Utils.IO
         /// </summary>
         public static IStreamBufferFactory<T> Shared { get; } = new DefaultFactory();
 
-        private readonly ArrayPool<T> _pool;
-        private T[] _buffer;
-
-        /// <summary>
-        /// Creates a new <see cref="ArrayPoolStreamBuffer{T}"/> from the 
-        /// given array instance and <see cref="ArrayPool{T}"/> it came from.
-        /// </summary>
-        /// <param name="array">The rented array to use</param>
-        /// <param name="pool">The pool to return the array to when completed</param>
-        public ArrayPoolStreamBuffer(T[] array, ArrayPool<T> pool)
-        {
-            _pool = pool;
-            _buffer = array;
-        }
+        private readonly ArrayPool<T> _pool = pool;
+        private T[] _buffer = array;
 
         ///<inheritdoc/>
         public int WindowStartPos { get; set; }
diff --git a/lib/Utils/src/IO/VnStreamWriter.cs b/lib/Utils/src/IO/VnStreamWriter.cs
index ddebc07..7d43f48 100644
--- a/lib/Utils/src/IO/VnStreamWriter.cs
+++ b/lib/Utils/src/IO/VnStreamWriter.cs
@@ -41,21 +41,29 @@ namespace VNLib.Utils.IO
     /// Provides a memory optimized <see cref="TextWriter"/> implementation. Optimized for writing
     /// to network streams
     /// </summary>
-    public class VnStreamWriter : TextWriter
+    /// <remarks>
+    /// Creates a new <see cref="VnStreamWriter"/> that writes encoded data to the base stream 
+    /// and uses the specified buffer.
+    /// </remarks>
+    /// <param name="baseStream">The underlying stream to write data to</param>
+    /// <param name="encoding">The <see cref="Encoding"/> to use when writing to the stream</param>
+    /// <param name="buffer">The internal <see cref="ISlindingWindowBuffer{T}"/> to use</param>
+    /// <exception cref="ArgumentNullException"></exception>
+    public class VnStreamWriter(Stream baseStream, Encoding encoding, ISlindingWindowBuffer<byte> buffer) : TextWriter
     {
-        private readonly Encoder Enc;
+        private readonly Encoder Enc = encoding.GetEncoder();
 
-        private readonly ISlindingWindowBuffer<byte> _buffer;
+        private readonly ISlindingWindowBuffer<byte> _buffer = buffer ?? throw new ArgumentNullException(nameof(buffer));
        
         private bool closed;
 
         /// <summary>
         /// Gets the underlying stream that interfaces with the backing store
         /// </summary>
-        public virtual Stream BaseStream { get; }
+        public virtual Stream BaseStream { get; } = baseStream ?? throw new ArgumentNullException(nameof(buffer));
 
         ///<inheritdoc/>
-        public override Encoding Encoding { get; }
+        public override Encoding Encoding { get; } = encoding ?? throw new ArgumentNullException(nameof(encoding));
 
         /// <summary>
         /// Line termination to use when writing lines to the output
@@ -97,24 +105,6 @@ namespace VNLib.Utils.IO
         {
         }
 
-        /// <summary>
-        /// Creates a new <see cref="VnStreamWriter"/> that writes encoded data to the base stream 
-        /// and uses the specified buffer.
-        /// </summary>
-        /// <param name="baseStream">The underlying stream to write data to</param>
-        /// <param name="encoding">The <see cref="Encoding"/> to use when writing to the stream</param>
-        /// <param name="buffer">The internal <see cref="ISlindingWindowBuffer{T}"/> to use</param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public VnStreamWriter(Stream baseStream, Encoding encoding, ISlindingWindowBuffer<byte> buffer)
-        {
-            BaseStream = baseStream ?? throw new ArgumentNullException(nameof(buffer));
-            Encoding = encoding ?? throw new ArgumentNullException(nameof(encoding));
-            _buffer = buffer ?? throw new ArgumentNullException(nameof(buffer));
-
-            //Get an encoder
-            Enc = encoding.GetEncoder();
-        }
-
         ///<inheritdoc/>
         public void Write(byte value)
         {