fix: resolve Timer.Start dueTime bugs and v3.0 hardening

Fix Timer.Start(TimeSpan) using .Milliseconds (component only) instead of .TotalMilliseconds, and both overloads not storing the dueTime parameter to the DueTime property. The int overload also used the stale DueTime value in the else branch instead of the parameter.

Add Timer tests covering all Start overloads, stop, and dispose. Add test projects for MADE.Foundation and MADE.Runtime. Fix nullable annotations in MADE.Networking and add async safety to AppDiagnostics event handlers. Remove x64/x86 platform configurations from solution.

Author: jamesmcroft

MADE.NET.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32228.430
@@ -59,6 +59,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Testing.Tests", "tests
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Web.Mvc.Tests", "tests\MADE.Web.Mvc.Tests\MADE.Web.Mvc.Tests.csproj", "{F994F941-474A-4FDD-A9CB-280EB0D78407}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Foundation.Tests", "tests\MADE.Foundation.Tests\MADE.Foundation.Tests.csproj", "{EE7B8716-5B54-45EC-91AD-4764F4AC863B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MADE.Runtime.Tests", "tests\MADE.Runtime.Tests\MADE.Runtime.Tests.csproj", "{D360BA13-4DAD-4C62-AE4A-737553F34E01}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -169,6 +173,14 @@ Global
 		{F994F941-474A-4FDD-A9CB-280EB0D78407}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F994F941-474A-4FDD-A9CB-280EB0D78407}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F994F941-474A-4FDD-A9CB-280EB0D78407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE7B8716-5B54-45EC-91AD-4764F4AC863B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE7B8716-5B54-45EC-91AD-4764F4AC863B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE7B8716-5B54-45EC-91AD-4764F4AC863B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE7B8716-5B54-45EC-91AD-4764F4AC863B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D360BA13-4DAD-4C62-AE4A-737553F34E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D360BA13-4DAD-4C62-AE4A-737553F34E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D360BA13-4DAD-4C62-AE4A-737553F34E01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D360BA13-4DAD-4C62-AE4A-737553F34E01}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -200,6 +212,8 @@ Global
 		{865FBD49-C64B-4B36-AEFC-FD960DDC4CF8} = {69149D0F-BB09-411B-88F0-A1E845058D70}
 		{40B5F4EB-45DD-410A-B0FB-2384C863FC33} = {69149D0F-BB09-411B-88F0-A1E845058D70}
 		{F994F941-474A-4FDD-A9CB-280EB0D78407} = {69149D0F-BB09-411B-88F0-A1E845058D70}
+		{EE7B8716-5B54-45EC-91AD-4764F4AC863B} = {69149D0F-BB09-411B-88F0-A1E845058D70}
+		{D360BA13-4DAD-4C62-AE4A-737553F34E01} = {69149D0F-BB09-411B-88F0-A1E845058D70}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3921AD86-E6C0-4436-8880-2D9EDFAD6151}

src/MADE.Diagnostics/AppDiagnostics.cs

@@ -78,38 +78,52 @@ public void StopRecordingDiagnostics()
 
     private async void OnTaskUnobservedException(object? sender, UnobservedTaskExceptionEventArgs args)
     {
-        args.SetObserved();
-
-        var correlationId = Guid.NewGuid();
+        try
+        {
+            args.SetObserved();
 
-        await this.EventLogger.WriteCritical(
-            args.Exception != null
-                ? $"An unobserved task exception was thrown. Correlation ID: {correlationId}. Error: {args.Exception}."
-                : $"An unobserved task exception was thrown. Correlation ID: {correlationId}. Error: No exception information was available.").ConfigureAwait(false);
+            var correlationId = Guid.NewGuid();
 
-        if (args.Exception != null)
+            await this.EventLogger.WriteCritical(
+                args.Exception != null
+                    ? $"An unobserved task exception was thrown. Correlation ID: {correlationId}. Error: {args.Exception}."
+                    : $"An unobserved task exception was thrown. Correlation ID: {correlationId}. Error: No exception information was available.").ConfigureAwait(false);
+
+            if (args.Exception != null)
+            {
+                this.ExceptionObserved?.Invoke(this, new ExceptionObservedEventArgs(correlationId, args.Exception));
+            }
+        }
+        catch
         {
-            this.ExceptionObserved?.Invoke(this, new ExceptionObservedEventArgs(correlationId, args.Exception));
+            // Swallow exceptions in last-resort exception handlers to prevent crashing the process.
         }
     }
 
     private async void OnAppUnhandledException(object sender, UnhandledExceptionEventArgs args)
     {
-        if (args.IsTerminating)
+        try
         {
-            await this.EventLogger.WriteCritical(
-                "The application is terminating due to an unhandled exception being thrown.").ConfigureAwait(false);
-        }
+            if (args.IsTerminating)
+            {
+                await this.EventLogger.WriteCritical(
+                    "The application is terminating due to an unhandled exception being thrown.").ConfigureAwait(false);
+            }
 
-        if (args.ExceptionObject is not Exception ex)
-        {
-            return;
-        }
+            if (args.ExceptionObject is not Exception ex)
+            {
+                return;
+            }
 
-        var correlationId = Guid.NewGuid();
+            var correlationId = Guid.NewGuid();
 
-        await this.EventLogger.WriteCritical($"An unhandled exception was thrown. Correlation ID: {correlationId}. Error: {ex}").ConfigureAwait(false);
+            await this.EventLogger.WriteCritical($"An unhandled exception was thrown. Correlation ID: {correlationId}. Error: {ex}").ConfigureAwait(false);
 
-        this.ExceptionObserved?.Invoke(this, new ExceptionObservedEventArgs(correlationId, ex));
+            this.ExceptionObserved?.Invoke(this, new ExceptionObservedEventArgs(correlationId, ex));
+        }
+        catch
+        {
+            // Swallow exceptions in last-resort exception handlers to prevent crashing the process.
+        }
     }
 }

src/MADE.Networking/Extensions/UriExtensions.cs

@@ -17,7 +17,7 @@ public static class UriExtensions
     /// <param name="uri">The <see cref="Uri"/> to extract a query value from.</param>
     /// <param name="queryParam">The key of the parameter in the query to extract the value for.</param>
     /// <returns>The value for the query parameter.</returns>
-    public static string GetQueryValue(this Uri uri, string queryParam)
+    public static string? GetQueryValue(this Uri uri, string queryParam)
     {
         NameValueCollection queryDictionary = System.Web.HttpUtility.ParseQueryString(uri.Query);
         return queryDictionary.Get(queryParam);

src/MADE.Networking/Http/INetworkRequestManager.cs

@@ -2,6 +2,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Concurrent;
+using System.Threading.Tasks;
 using MADE.Networking.Http.Requests;
 
 namespace MADE.Networking.Http;
@@ -100,5 +101,6 @@ void AddOrUpdate<TRequest, TResponse, TErrorResponse>(
     /// <summary>
     /// Processes the current queue of network requests.
     /// </summary>
-    void ProcessCurrentQueue();
+    /// <returns>An asynchronous operation.</returns>
+    Task ProcessCurrentQueueAsync();
 }

src/MADE.Networking/Http/NetworkRequestFactory.cs

@@ -33,43 +33,43 @@ private NetworkRequestFactory(IHttpClientFactory httpClientFactory, string? clie
     /// <inheritdoc/>
     public JsonGetNetworkRequest Get(string url, Dictionary<string, string>? headers = null)
     {
-        return new JsonGetNetworkRequest(this.CreateClient(), url, headers!);
+        return new JsonGetNetworkRequest(this.CreateClient(), url, headers);
     }
 
     /// <inheritdoc/>
     public JsonPostNetworkRequest Post(string url, string? jsonData = null, Dictionary<string, string>? headers = null)
     {
-        return new JsonPostNetworkRequest(this.CreateClient(), url, jsonData!, headers!);
+        return new JsonPostNetworkRequest(this.CreateClient(), url, jsonData, headers);
     }
 
     /// <inheritdoc/>
     public JsonPutNetworkRequest Put(string url, string? jsonData = null, Dictionary<string, string>? headers = null)
     {
-        return new JsonPutNetworkRequest(this.CreateClient(), url, jsonData!, headers!);
+        return new JsonPutNetworkRequest(this.CreateClient(), url, jsonData, headers);
     }
 
     /// <inheritdoc/>
     public JsonPatchNetworkRequest Patch(string url, string? jsonData = null, Dictionary<string, string>? headers = null)
     {
-        return new JsonPatchNetworkRequest(this.CreateClient(), url, jsonData!, headers!);
+        return new JsonPatchNetworkRequest(this.CreateClient(), url, jsonData, headers);
     }
 
     /// <inheritdoc/>
     public JsonDeleteNetworkRequest Delete(string url, Dictionary<string, string>? headers = null)
     {
-        return new JsonDeleteNetworkRequest(this.CreateClient(), url, headers!);
+        return new JsonDeleteNetworkRequest(this.CreateClient(), url, headers);
     }
 
     /// <inheritdoc/>
     public StreamGetNetworkRequest GetStream(string url, Dictionary<string, string>? headers = null)
     {
-        return new StreamGetNetworkRequest(this.CreateClient(), url, headers!);
+        return new StreamGetNetworkRequest(this.CreateClient(), url, headers);
     }
 
     /// <inheritdoc/>
     public MultipartFormDataPostNetworkRequest PostMultipart(string url, Dictionary<string, string>? headers = null)
     {
-        return new MultipartFormDataPostNetworkRequest(this.CreateClient(), url, headers!);
+        return new MultipartFormDataPostNetworkRequest(this.CreateClient(), url, headers);
     }
 
     /// <inheritdoc/>

src/MADE.Networking/Http/NetworkRequestManager.cs

@@ -84,7 +84,8 @@ public void Dispose()
     /// <summary>
     /// Processes the current queue of network requests.
     /// </summary>
-    public void ProcessCurrentQueue()
+    /// <returns>An asynchronous operation.</returns>
+    public async Task ProcessCurrentQueueAsync()
     {
         if (this.CurrentQueue.Count == 0 || this.isProcessingRequests)
         {
@@ -102,13 +103,13 @@ public void ProcessCurrentQueue()
             {
                 if (this.CurrentQueue.TryRemove(
                         this.CurrentQueue.FirstOrDefault().Key,
-                        out NetworkRequestCallback request))
+                        out NetworkRequestCallback? request))
                 {
                     requestTasks.Add(ExecuteRequestsAsync(this.CurrentQueue, request, cts.Token));
                 }
             }
 
-            Task.WhenAll(requestTasks).GetAwaiter().GetResult();
+            await Task.WhenAll(requestTasks).ConfigureAwait(false);
         }
         finally
         {
@@ -220,23 +221,39 @@ private static async Task ExecuteRequestsAsync(
         }
 
         NetworkRequest request = requestCallback.Request;
-        WeakReferenceCallback successCallback = requestCallback.SuccessCallback;
-        WeakReferenceCallback errorCallback = requestCallback.ErrorCallback;
+        WeakReferenceCallback? successCallback = requestCallback.SuccessCallback;
+        WeakReferenceCallback? errorCallback = requestCallback.ErrorCallback;
 
         try
         {
+            if (successCallback is null)
+            {
+                return;
+            }
+
             object response = await request.ExecuteAsync(successCallback.Type, cancellationToken).ConfigureAwait(false);
             successCallback.Invoke(response);
         }
         catch (Exception ex)
         {
-            successCallback.Invoke(Activator.CreateInstance(successCallback.Type));
+            if (successCallback is not null)
+            {
+                successCallback.Invoke(Activator.CreateInstance(successCallback.Type)!);
+            }
+
             errorCallback?.Invoke(ex);
         }
     }
 
-    private void OnProcessTimerTick(object sender, object e)
+    private async void OnProcessTimerTick(object sender, object e)
     {
-        this.ProcessCurrentQueue();
+        try
+        {
+            await this.ProcessCurrentQueueAsync().ConfigureAwait(false);
+        }
+        catch
+        {
+            // Swallow exceptions in timer callback to prevent unobserved task exceptions.
+        }
     }
 }

src/MADE.Networking/Http/Requests/Json/JsonDeleteNetworkRequest.cs

@@ -15,6 +15,8 @@ namespace MADE.Networking.Http.Requests.Json;
 /// </summary>
 public sealed class JsonDeleteNetworkRequest : NetworkRequest
 {
+    private static readonly JsonSerializerOptions DefaultJsonOptions = new() { PropertyNameCaseInsensitive = true };
+
     private readonly HttpClient client;
 
     /// <summary>
@@ -43,7 +45,7 @@ public JsonDeleteNetworkRequest(HttpClient client, string url)
     /// <param name="headers">
     /// The additional headers.
     /// </param>
-    public JsonDeleteNetworkRequest(HttpClient client, string url, Dictionary<string, string> headers)
+    public JsonDeleteNetworkRequest(HttpClient client, string url, Dictionary<string, string>? headers)
         : base(url, headers)
     {
         this.client = client ?? throw new ArgumentNullException(nameof(client));
@@ -64,7 +66,7 @@ public JsonDeleteNetworkRequest(HttpClient client, string url, Dictionary<string
     public override async Task<TResponse> ExecuteAsync<TResponse>(CancellationToken cancellationToken = default)
     {
         string json = await this.GetJsonResponseAsync(cancellationToken).ConfigureAwait(false);
-        return JsonSerializer.Deserialize<TResponse>(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        return JsonSerializer.Deserialize<TResponse>(json, DefaultJsonOptions);
     }
 
     /// <summary>
@@ -84,7 +86,7 @@ public override async Task<object> ExecuteAsync(
         CancellationToken cancellationToken = default)
     {
         string json = await this.GetJsonResponseAsync(cancellationToken).ConfigureAwait(false);
-        return JsonSerializer.Deserialize(json, expectedResponse, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        return JsonSerializer.Deserialize(json, expectedResponse, DefaultJsonOptions);
     }
 
     private async Task<string> GetJsonResponseAsync(CancellationToken cancellationToken = default)
@@ -118,6 +120,6 @@ private async Task<string> GetJsonResponseAsync(CancellationToken cancellationTo
 
         response.EnsureSuccessStatusCode();
 
-        return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        return await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
     }
 }

src/MADE.Networking/Http/Requests/Json/JsonGetNetworkRequest.cs

@@ -15,6 +15,8 @@ namespace MADE.Networking.Http.Requests.Json;
 /// </summary>
 public sealed class JsonGetNetworkRequest : NetworkRequest
 {
+    private static readonly JsonSerializerOptions DefaultJsonOptions = new() { PropertyNameCaseInsensitive = true };
+
     private readonly HttpClient client;
 
     /// <summary>
@@ -43,7 +45,7 @@ public JsonGetNetworkRequest(HttpClient client, string url)
     /// <param name="headers">
     /// The additional headers.
     /// </param>
-    public JsonGetNetworkRequest(HttpClient client, string url, Dictionary<string, string> headers)
+    public JsonGetNetworkRequest(HttpClient client, string url, Dictionary<string, string>? headers)
         : base(url, headers)
     {
         this.client = client ?? throw new ArgumentNullException(nameof(client));
@@ -64,7 +66,7 @@ public JsonGetNetworkRequest(HttpClient client, string url, Dictionary<string, s
     public override async Task<TResponse> ExecuteAsync<TResponse>(CancellationToken cancellationToken = default)
     {
         string json = await this.GetJsonResponseAsync(cancellationToken).ConfigureAwait(false);
-        return JsonSerializer.Deserialize<TResponse>(json, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        return JsonSerializer.Deserialize<TResponse>(json, DefaultJsonOptions);
     }
 
     /// <summary>
@@ -84,7 +86,7 @@ public override async Task<object> ExecuteAsync(
         CancellationToken cancellationToken = default)
     {
         string json = await this.GetJsonResponseAsync(cancellationToken).ConfigureAwait(false);
-        return JsonSerializer.Deserialize(json, expectedResponse, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        return JsonSerializer.Deserialize(json, expectedResponse, DefaultJsonOptions);
     }
 
     private async Task<string> GetJsonResponseAsync(CancellationToken cancellationToken = default)
@@ -118,6 +120,6 @@ private async Task<string> GetJsonResponseAsync(CancellationToken cancellationTo
 
         response.EnsureSuccessStatusCode();
 
-        return await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+        return await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
     }
 }