DSharpPlus · akiraveliara · Jun 2, 2024 · May 17, 2024 · May 17, 2024 · May 17, 2024
diff --git a/DSharpPlus.Commands/CommandsConfiguration.cs b/DSharpPlus.Commands/CommandsConfiguration.cs
@@ -1,17 +1,10 @@
-using System;
-
 namespace DSharpPlus.Commands;
 
 /// <summary>
 /// The configuration copied to an instance of <see cref="CommandsExtension"/>.
 /// </summary>
 public sealed record CommandsConfiguration
 {
-    /// <summary>
-    /// The service provider to use for dependency injection.
-    /// </summary>
-    public required IServiceProvider ServiceProvider { get; set; }
-
     /// <summary>
     /// The guild id to use for debugging. Leave as 0 to disable.
     /// </summary>

diff --git a/DSharpPlus.Commands/CommandsExtension.cs b/DSharpPlus.Commands/CommandsExtension.cs
@@ -8,6 +8,7 @@
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+
 using DSharpPlus.AsyncEvents;
 using DSharpPlus.Commands.ContextChecks;
 using DSharpPlus.Commands.ContextChecks.ParameterChecks;
@@ -23,16 +24,19 @@
 using DSharpPlus.Commands.Trees.Metadata;
 using DSharpPlus.Entities;
 using DSharpPlus.Exceptions;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+
 using CheckFunc = System.Func
 <
     object,
     DSharpPlus.Commands.ContextChecks.ContextCheckAttribute,
     DSharpPlus.Commands.CommandContext,
     System.Threading.Tasks.ValueTask<string?>
 >;
+
 using ParameterCheckFunc = System.Func
 <
     object,
@@ -49,8 +53,8 @@ namespace DSharpPlus.Commands;
 /// </summary>
 public sealed class CommandsExtension : BaseExtension
 {
-    /// <inheritdoc cref="CommandsConfiguration.ServiceProvider"/>
-    public IServiceProvider ServiceProvider { get; init; }
+    /// <inheritdoc cref="DiscordClient.ServiceProvider"/>
+    public IServiceProvider ServiceProvider { get; private set; }
 
     /// <inheritdoc cref="CommandsConfiguration.DebugGuildId"/>
     public ulong DebugGuildId { get; init; }
@@ -106,7 +110,6 @@ internal CommandsExtension(CommandsConfiguration configuration)
     {
         ArgumentNullException.ThrowIfNull(configuration);
 
-        this.ServiceProvider = configuration.ServiceProvider;
         this.DebugGuildId = configuration.DebugGuildId;
         this.UseDefaultCommandErrorHandler = configuration.UseDefaultCommandErrorHandler;
         this.RegisterDefaultCommandProcessors = configuration.RegisterDefaultCommandProcessors;
@@ -136,6 +139,7 @@ protected override void Setup(DiscordClient client)
         }
 
         this.Client = client;
+        this.ServiceProvider = client.ServiceProvider;
         this.Client.SessionCreated += async (_, _) => await RefreshAsync();
 
         AddCheck<DirectMessageUsageCheck>();

diff --git a/DSharpPlus.CommandsNext/CommandsNextConfiguration.cs b/DSharpPlus.CommandsNext/CommandsNextConfiguration.cs
@@ -83,13 +83,6 @@ public sealed class CommandsNextConfiguration
     /// </summary>
     public bool EnableDms { internal get; set; } = true;
 
-    /// <summary>
-    /// <para>Sets the service provider for this CommandsNext instance.</para>
-    /// <para>Objects in this provider are used when instantiating command modules. This allows passing data around without resorting to static members.</para>
-    /// <para>Defaults to null.</para>
-    /// </summary>
-    public IServiceProvider Services { internal get; set; } = new ServiceCollection().BuildServiceProvider(true);
-
     /// <summary>
     /// <para>Gets whether any extra arguments passed to commands should be ignored or not. If this is set to false, extra arguments will throw, otherwise they will be ignored.</para>
     /// <para>Defaults to false.</para>

diff --git a/DSharpPlus.CommandsNext/CommandsNextExtension.cs b/DSharpPlus.CommandsNext/CommandsNextExtension.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+
 using DSharpPlus.AsyncEvents;
 using DSharpPlus.CommandsNext.Attributes;
 using DSharpPlus.CommandsNext.Builders;
@@ -15,6 +16,7 @@
 using DSharpPlus.CommandsNext.Executors;
 using DSharpPlus.Entities;
 using DSharpPlus.EventArgs;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -38,7 +40,7 @@ internal CultureInfo DefaultParserCulture
     /// Gets the service provider this CommandsNext module was configured with.
     /// </summary>
     public IServiceProvider Services
-        => this.Config.Services;
+        => this.Client.ServiceProvider;
 
     internal CommandsNextExtension(CommandsNextConfiguration cfg)
     {

diff --git a/DSharpPlus/Clients/DiscordClient.cs b/DSharpPlus/Clients/DiscordClient.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+
 using DSharpPlus.AsyncEvents;
 using DSharpPlus.Entities;
 using DSharpPlus.EventArgs;
@@ -15,7 +16,9 @@
 using DSharpPlus.Net.Abstractions;
 using DSharpPlus.Net.Models;
 using DSharpPlus.Net.Serialization;
+
 using Microsoft.Extensions.Logging;
+
 using Newtonsoft.Json.Linq;
 
 namespace DSharpPlus;
@@ -38,6 +41,11 @@ public sealed partial class DiscordClient : BaseDiscordClient
     #endregion
 
     #region Public Fields/Properties
+    /// <summary>
+    /// Gets the service provider used within this Discord application.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; internal set; }
+
     /// <summary>
     /// Gets the gateway protocol version.
     /// </summary>

diff --git a/DSharpPlus/Clients/DiscordClientBuilder.cs b/DSharpPlus/Clients/DiscordClientBuilder.cs
@@ -0,0 +1,66 @@
+using System;
+
+using DSharpPlus.Extensions;
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace DSharpPlus;
+
+/// <summary>
+/// Enables building a DiscordClient from complex configuration, registering extensions and fine-tuning behavioural aspects.
+/// </summary>
+public sealed class DiscordClientBuilder
+{
+    private readonly IServiceCollection serviceCollection;
+    private bool addDefaultLogging = true;
+
+    /// <summary>
+    /// Creates a new DiscordClientBuilder from the provided service collection. This is private in favor of static
+    /// methods that control creation based on certain presets. IServiceCollection-based configuration occurs separate
+    /// from this type.
+    /// </summary>
+    private DiscordClientBuilder(IServiceCollection serviceCollection)
+        => this.serviceCollection = serviceCollection;
+
+    /// <summary>
+    /// Creates a new DiscordClientBuilder without sharding, using the specified token.
+    /// </summary>
+    /// <param name="token">The token to use for this application.</param>
+    /// <param name="serviceCollection">The service collection to base this builder on.</param>
+    /// <returns>A new DiscordClientBuilder.</returns>
+    public static DiscordClientBuilder Default(string token, IServiceCollection? serviceCollection = null)
+    {
+        serviceCollection ??= new ServiceCollection();
+
+        DiscordClientBuilder builder = new(serviceCollection);
+        builder.serviceCollection.Configure<TokenContainer>(x => x.GetToken = () => token);
+        builder.serviceCollection.AddDSharpPlusDefaultsSingleShard();
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Disables the DSharpPlus default logger for this DiscordClientBuilder.
+    /// </summary>
+    /// <returns>The current instance for chaining.</returns>
+    public DiscordClientBuilder DisableDefaultLogging()
+    {
+        this.addDefaultLogging = false;
+        return this;
+    }
+
+    /// <summary>
+    /// Builds a new client from the present builder.
+    /// </summary>
+    public DiscordClient Build()
+    {
+        if (this.addDefaultLogging)
+        {
+            this.serviceCollection.AddLogging(builder => builder.AddProvider(new DefaultLoggerProvider()));
+        }
+
+        IServiceProvider provider = this.serviceCollection.BuildServiceProvider();
+        return provider.GetRequiredService<DiscordClient>();
+    }
+}
diff --git a/DSharpPlus/DSharpPlus.csproj b/DSharpPlus/DSharpPlus.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="Polly.Core" />

diff --git a/DSharpPlus/DiscordConfiguration.cs b/DSharpPlus/DiscordConfiguration.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Net;
+
+using DSharpPlus.Net;
 using DSharpPlus.Net.Udp;
 using DSharpPlus.Net.WebSocket;
 using Microsoft.Extensions.Logging;
@@ -99,12 +101,8 @@ public string Token
     /// </summary>
     public IWebProxy Proxy { internal get; set; } = null;
 
-    /// <summary>
-    /// <para>Sets the timeout for HTTP requests.</para>
-    /// <para>Set to <see cref="System.Threading.Timeout.InfiniteTimeSpan"/> to disable timeouts.</para>
-    /// <para>Defaults to 10 seconds.</para>
-    /// </summary>
-    public TimeSpan HttpTimeout { internal get; set; } = TimeSpan.FromSeconds(100);
+    /// <inheritdoc cref="RestClientOptions.Timeout"/>
+    public TimeSpan HttpTimeout { internal get; set; } = TimeSpan.FromSeconds(10);
 
     /// <summary>
     /// <para>Defines that the client should attempt to reconnect indefinitely.</para>

diff --git a/DSharpPlus/Extensions/ServiceCollectionExtensions.InternalSetup.cs b/DSharpPlus/Extensions/ServiceCollectionExtensions.InternalSetup.cs
@@ -0,0 +1,35 @@
+using System.Net.Http;
+
+using DSharpPlus.Net;
+
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace DSharpPlus.Extensions;
+
+public static class ServiceCollectionExtensions
+{
+    internal static IServiceCollection AddDSharpPlusDefaultsSingleShard(this IServiceCollection serviceCollection)
+    {
+        // peripheral setup
+        serviceCollection.AddSingleton<IMessageCacheProvider, MessageCache>();
+
+        // rest setup
+        serviceCollection.AddKeyedSingleton<HttpClient>("DSharpPlus.Rest.HttpClient")
+            .AddSingleton<RestClient>
+            (
+                serviceProvider =>
+                {
+                    HttpClient client = serviceProvider.GetRequiredKeyedService<HttpClient>("DSharpPlus.Rest.HttpClient");
+                    ILogger<RestClient> logger = serviceProvider.GetRequiredService<ILogger<RestClient>>();
+                    IOptions<RestClientOptions> options = serviceProvider.GetRequiredService<IOptions<RestClientOptions>>();
+                    IOptions<TokenContainer> token = serviceProvider.GetRequiredService<IOptions<TokenContainer>>();
+
+                    return new(logger, client, options, token);
+                }
+            );
+
+        return serviceCollection;
+    }
+}
diff --git a/DSharpPlus/Net/Rest/RestClient.cs b/DSharpPlus/Net/Rest/RestClient.cs
@@ -6,7 +6,10 @@
 using System.Threading.Tasks;
 using DSharpPlus.Exceptions;
 using DSharpPlus.Metrics;
+
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
 using Polly;
 
 namespace DSharpPlus.Net;
@@ -29,26 +32,34 @@ internal sealed partial class RestClient : IDisposable
 
     private volatile bool disposed;
 
-    internal RestClient(DiscordConfiguration config, ILogger logger)
+    internal RestClient
+    (
+        ILogger<RestClient> logger,
+        HttpClient client,
+        IOptions<RestClientOptions> options,
+        IOptions<TokenContainer> tokenContainer
+    )
         : this
         (
-            config.Proxy,
-            config.HttpTimeout,
+            client,
+            options.Value.Timeout,
             logger,
-            config.MaximumRatelimitRetries,
-            config.RatelimitRetryDelayFallback,
-            config.TimeoutForInitialApiRequest,
-            config.MaximumRestRequestsPerSecond
+            options.Value.MaximumRatelimitRetries,
+            options.Value.RatelimitRetryDelayFallback,
+            options.Value.InitialRequestTimeout,
+            options.Value.MaximumConcurrentRestRequests
         )
     {
-        this.httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Authorization", Utilities.GetFormattedToken(config));
+        string token = tokenContainer.Value.GetToken();
+
+        this.httpClient.DefaultRequestHeaders.TryAddWithoutValidation("Authorization", $"Bot {token}");
         this.httpClient.BaseAddress = new(Endpoints.BASE_URI);
     }
 
     // This is for meta-clients, such as the webhook client
     internal RestClient
     (
-        IWebProxy proxy,
+        HttpClient client,
         TimeSpan timeout,
         ILogger logger,
         int maxRetries = int.MaxValue,
@@ -58,21 +69,10 @@ internal RestClient
     )
     {
         this.logger = logger;
+        this.httpClient = client;
 
-        HttpClientHandler httphandler = new()
-        {
-            UseCookies = false,
-            AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip,
-            UseProxy = proxy != null,
-            Proxy = proxy
-        };
-
-        this.httpClient = new HttpClient(httphandler)
-        {
-            BaseAddress = new Uri(Utilities.GetApiBaseUri()),
-            Timeout = timeout
-        };
-
+        this.httpClient.BaseAddress = new Uri(Utilities.GetApiBaseUri());
+        this.httpClient.Timeout = timeout;
         this.httpClient.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", Utilities.GetUserAgent());
         this.httpClient.BaseAddress = new(Endpoints.BASE_URI);