Adding global BaseAddress config option

Author: bfren

src/Rqlite.Client/RqliteClientFactory.cs

@@ -2,11 +2,11 @@
 // Copyright (c) bfren - licensed under https://mit.bfren.dev/2023
 
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Rqlite.Client.Exceptions;
+using Wrap;
 
 namespace Rqlite.Client;
 
@@ -58,29 +58,24 @@ public IRqliteClient CreateClient() =>
 
 	/// <inheritdoc/>
 	public IRqliteClient CreateClient(string httpClientName) =>
-		Options.Clients.GetValueOrDefault(httpClientName) switch
-		{
-			RqliteOptions.Client client =>
-				new RqliteClient(
-					httpClient: HttpClientFactory.CreateClient(httpClientName),
-					includeTimings: client.IncludeTimings ?? Options.IncludeTimings,
-					logger: Logger
-				),
-
-			_ =>
-				throw new UnknownClientException($"Client '{httpClientName}' cannot be found in Rqlite settings.")
-		};
+		Options.Clients.GetValueOrNone(httpClientName).Match(
+			none: () => throw new UnknownClientException($"Client '{httpClientName}' cannot be found in Rqlite settings."),
+			some: x => new RqliteClient(
+				httpClient: HttpClientFactory.CreateClient(httpClientName),
+				includeTimings: x.IncludeTimings ?? Options.IncludeTimings,
+				logger: Logger
+			)
+		);
 
 	/// <inheritdoc/>
 	public IRqliteClient CreateClientWithDefaults()
 	{
 		// get default options
 		var options = new RqliteOptions();
-		var clientOptions = new RqliteOptions.Client();
 
 		// create and configure the HttpClient
 		var httpClient = HttpClientFactory.CreateClient();
-		httpClient.BaseAddress = new(clientOptions.BaseAddress);
+		httpClient.BaseAddress = new(options.BaseAddress);
 		httpClient.Timeout = TimeSpan.FromSeconds(options.TimeoutInSeconds);
 
 		// return default RqliteClient

src/Rqlite.Client/RqliteOptions.cs

@@ -15,6 +15,11 @@ public sealed record class RqliteOptions
 	/// </summary>
 	public string? DefaultClientName { get; init; }
 
+	/// <summary>
+	/// The default base address for all clients (without trailing slash).
+	/// </summary>
+	public string BaseAddress { get; init; } = "http://localhost:4001";
+
 	/// <summary>
 	/// If set to true, timings will be included with each request.
 	/// </summary>
@@ -36,9 +41,9 @@ public sealed record class RqliteOptions
 	public sealed record class Client
 	{
 		/// <summary>
-		/// The base address of the Rqlite database instance (without trailing slash).
+		/// Set to override the base address of the Rqlite database instance (without trailing slash).
 		/// </summary>
-		public string BaseAddress { get; init; } = "http://localhost:4001";
+		public string? BaseAddress { get; init; }
 
 		/// <summary>
 		/// Set to override the global setting to include timings with each request.

src/Rqlite.Client/ServiceCollectionExtensions.cs

@@ -30,7 +30,7 @@ public static IServiceCollection AddRqlite(this IServiceCollection @this)
 		{
 			_ = @this.AddHttpClient(name, opt =>
 			{
-				opt.BaseAddress = new(connection.BaseAddress);
+				opt.BaseAddress = new(connection.BaseAddress ?? rqliteOptions.BaseAddress);
 				opt.Timeout = TimeSpan.FromSeconds(connection.TimeoutInSeconds ?? rqliteOptions.TimeoutInSeconds);
 			});
 		}