Refactor health check and disposal logic, update versions

Refactored health check extension methods to use ArgumentNullException.ThrowIfNull and simplified path handling. Updated HealthCheckResult and FunctionalHealthCheck to use primary constructors. Standardized ObjectDisposedException.ThrowIf usage for .NET version compatibility in ConnectionTracker and SmtpServer. Updated project versions in Zetian and Zetian.HealthCheck csproj files. Improved test assertion in SmtpServerRaceConditionTests for clarity.

Author: Taiizor

.pages/app/layout.tsx

@@ -20,11 +20,13 @@ export const metadata: Metadata = {
     ".NET",
     "C#",
     "mail server",
+    "smtp server",
     "TLS",
     "authentication",
     "rate limiting",
     "async",
     "dotnet",
+    "health check",
   ],
   authors: [{ name: "Taiizor", url: "https://github.com/Taiizor" }],
   creator: "Taiizor",
@@ -40,8 +42,8 @@ export const metadata: Metadata = {
     images: [
       {
         url: "/Logo.png",
-        width: 1200,
-        height: 630,
+        width: 512,
+        height: 512,
         alt: "Zetian SMTP Server",
       },
     ],

src/Zetian.HealthCheck/Extensions/HealthCheckExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -42,25 +41,22 @@ public static HealthCheckService EnableHealthCheck(
             int port,
             string path = "/health/")
         {
-            if (server == null)
-            {
-                throw new ArgumentNullException(nameof(server));
-            }
+            ArgumentNullException.ThrowIfNull(server);
 
             if (string.IsNullOrWhiteSpace(hostname))
             {
                 throw new ArgumentNullException(nameof(hostname));
             }
 
             // Ensure path ends with /
-            if (!path.EndsWith("/"))
+            if (!path.EndsWith('/'))
             {
-                path += "/";
+                path += '/';
             }
 
             HealthCheckServiceOptions options = new()
             {
-                Prefixes = new List<string> { $"http://{hostname}:{port}{path}" }
+                Prefixes = new() { $"http://{hostname}:{port}{path}" }
             };
 
             HealthCheckService service = new(options, server.Configuration.LoggerFactory);
@@ -86,15 +82,9 @@ public static HealthCheckService EnableHealthCheck(
             int port,
             string path = "/health/")
         {
-            if (server == null)
-            {
-                throw new ArgumentNullException(nameof(server));
-            }
+            ArgumentNullException.ThrowIfNull(server);
 
-            if (ipAddress == null)
-            {
-                throw new ArgumentNullException(nameof(ipAddress));
-            }
+            ArgumentNullException.ThrowIfNull(ipAddress);
 
             string hostname = ipAddress.ToString();
             if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
@@ -117,15 +107,9 @@ public static HealthCheckService EnableHealthCheck(
             HealthCheckServiceOptions serviceOptions,
             SmtpHealthCheckOptions? healthCheckOptions = null)
         {
-            if (server == null)
-            {
-                throw new ArgumentNullException(nameof(server));
-            }
+            ArgumentNullException.ThrowIfNull(server);
 
-            if (serviceOptions == null)
-            {
-                throw new ArgumentNullException(nameof(serviceOptions));
-            }
+            ArgumentNullException.ThrowIfNull(serviceOptions);
 
             HealthCheckService service = new(serviceOptions, server.Configuration.LoggerFactory);
 
@@ -218,20 +202,14 @@ public static HealthCheckService AddHealthCheck(
             string name,
             Func<CancellationToken, Task<HealthCheckResult>> healthCheckFunc)
         {
-            if (service == null)
-            {
-                throw new ArgumentNullException(nameof(service));
-            }
+            ArgumentNullException.ThrowIfNull(service);
 
             if (string.IsNullOrWhiteSpace(name))
             {
                 throw new ArgumentNullException(nameof(name));
             }
 
-            if (healthCheckFunc == null)
-            {
-                throw new ArgumentNullException(nameof(healthCheckFunc));
-            }
+            ArgumentNullException.ThrowIfNull(healthCheckFunc);
 
             FunctionalHealthCheck functionalHealthCheck = new(healthCheckFunc);
             service.AddHealthCheck(name, functionalHealthCheck);
@@ -243,14 +221,9 @@ public static HealthCheckService AddHealthCheck(
     /// <summary>
     /// Functional health check implementation
     /// </summary>
-    internal class FunctionalHealthCheck : IHealthCheck
+    internal class FunctionalHealthCheck(Func<CancellationToken, Task<HealthCheckResult>> checkFunc) : IHealthCheck
     {
-        private readonly Func<CancellationToken, Task<HealthCheckResult>> _checkFunc;
-
-        public FunctionalHealthCheck(Func<CancellationToken, Task<HealthCheckResult>> checkFunc)
-        {
-            _checkFunc = checkFunc ?? throw new ArgumentNullException(nameof(checkFunc));
-        }
+        private readonly Func<CancellationToken, Task<HealthCheckResult>> _checkFunc = checkFunc ?? throw new ArgumentNullException(nameof(checkFunc));
 
         public Task<HealthCheckResult> CheckHealthAsync(CancellationToken cancellationToken = default)
         {

src/Zetian.HealthCheck/HealthCheck/HealthCheckResult.cs

@@ -6,38 +6,30 @@ namespace Zetian.HealthCheck
     /// <summary>
     /// Represents the result of a health check
     /// </summary>
-    public class HealthCheckResult
+    /// <remarks>
+    /// Initializes a new instance of HealthCheckResult
+    /// </remarks>
+    public class HealthCheckResult(HealthStatus status, string? description = null, Exception? exception = null, Dictionary<string, object>? data = null)
     {
-        /// <summary>
-        /// Initializes a new instance of HealthCheckResult
-        /// </summary>
-        public HealthCheckResult(HealthStatus status, string? description = null, Exception? exception = null, Dictionary<string, object>? data = null)
-        {
-            Status = status;
-            Description = description;
-            Exception = exception;
-            Data = data ?? new();
-        }
-
         /// <summary>
         /// Gets the health status
         /// </summary>
-        public HealthStatus Status { get; }
+        public HealthStatus Status { get; } = status;
 
         /// <summary>
         /// Gets the description
         /// </summary>
-        public string? Description { get; }
+        public string? Description { get; } = description;
 
         /// <summary>
         /// Gets the exception if any
         /// </summary>
-        public Exception? Exception { get; }
+        public Exception? Exception { get; } = exception;
 
         /// <summary>
         /// Gets additional data
         /// </summary>
-        public Dictionary<string, object> Data { get; }
+        public Dictionary<string, object> Data { get; } = data ?? new();
 
         /// <summary>
         /// Creates a healthy result

src/Zetian.HealthCheck/HealthCheck/HealthCheckService.cs

@@ -59,10 +59,14 @@ public void AddHealthCheck(string name, IHealthCheck healthCheck)
         /// </summary>
         public async Task StartAsync(CancellationToken cancellationToken = default)
         {
+#if NET6_0
             if (_disposed)
             {
                 throw new ObjectDisposedException(nameof(HealthCheckService));
             }
+#else
+            ObjectDisposedException.ThrowIf(_disposed, this);
+#endif
 
             if (IsRunning)
             {
@@ -182,7 +186,7 @@ private async Task HandleRequestAsync(HttpListenerContext context, CancellationT
                     {
                         // Extract the path after the prefix
                         effectivePath = fullPath[prefixPath.Length..];
-                        if (!effectivePath.StartsWith("/"))
+                        if (!effectivePath.StartsWith('/'))
                         {
                             effectivePath = "/" + effectivePath;
                         }
@@ -305,7 +309,7 @@ private async Task WriteJsonResponse(HttpListenerResponse response, object data)
             byte[] buffer = Encoding.UTF8.GetBytes(json);
             response.ContentLength64 = buffer.Length;
 
-            await response.OutputStream.WriteAsync(buffer, 0, buffer.Length);
+            await response.OutputStream.WriteAsync(buffer);
             response.Close();
         }
 

src/Zetian.HealthCheck/Zetian.HealthCheck.csproj

@@ -11,7 +11,7 @@
 
     <PropertyGroup>
         <ApplicationIcon>Resources\Zetian.ico</ApplicationIcon>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Title>Zetian.HealthCheck</Title>

src/Zetian/Internal/ConnectionTracker.cs

@@ -299,8 +299,8 @@ public Task LockAsync(CancellationToken cancellationToken = default)
                 {
                     throw new ObjectDisposedException(nameof(ConnectionInfo));
                 }
-#elif NET7_0_OR_GREATER
-                ObjectDisposedException.ThrowIf(_disposed, nameof(ConnectionInfo));
+#else
+                ObjectDisposedException.ThrowIf(_disposed, this);
 #endif
                 return _syncLock.WaitAsync(cancellationToken);
             }
@@ -315,8 +315,8 @@ public void Lock()
                 {
                     throw new ObjectDisposedException(nameof(ConnectionInfo));
                 }
-#elif NET7_0_OR_GREATER
-                ObjectDisposedException.ThrowIf(_disposed, nameof(ConnectionInfo));
+#else
+                ObjectDisposedException.ThrowIf(_disposed, this);
 #endif
                 _syncLock.Wait();
             }

src/Zetian/SmtpServer.cs

@@ -413,7 +413,7 @@ private void ThrowIfDisposed()
             {
                 throw new ObjectDisposedException(GetType().FullName);
             }
-#elif NET7_0_OR_GREATER
+#else
             ObjectDisposedException.ThrowIf(_disposed, this);
 #endif
         }

src/Zetian/Zetian.csproj

@@ -11,7 +11,7 @@
 
     <PropertyGroup>
         <ApplicationIcon>Resources\Zetian.ico</ApplicationIcon>
-        <Version>1.0.9</Version>
+        <Version>1.0.10</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Title>Zetian</Title>

tests/Zetian.Tests/SmtpServerRaceConditionTests.cs

@@ -264,7 +264,7 @@ public async Task SmtpServer_ShouldHandleConcurrentSmtpClients()
             if (successCount == 0)
             {
                 string errorDetails = string.Join("\n", failureMessages.Take(5));
-                Assert.True(false, $"No connections succeeded. Sample errors:\n{errorDetails}");
+                Assert.Fail($"No connections succeeded. Sample errors:\n{errorDetails}");
             }
             Assert.True(successCount > 0, "At least some connections should succeed");
         }