Skip to content

Add support for Native AOT in NetCord.Hosting* #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KubaZ2 merged 2 commits into from
Sep 24, 2024
Merged

Add support for Native AOT in NetCord.Hosting* #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
216d040
Add support for Native AOT in NetCord.Hosting*
KubaZ2 Sep 24, 2024
9dc1140
Update sharding guides
KubaZ2 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/guides/advanced/sharding.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Sharding is splitting your bot into multiple @"NetCord.Gateway.GatewayClient"s.
To start sharding with the generic host, instead of calling @NetCord.Hosting.Gateway.GatewayClientServiceCollectionExtensions.AddDiscordGateway(Microsoft.Extensions.DependencyInjection.IServiceCollection), you need to call @NetCord.Hosting.Gateway.ShardedGatewayClientServiceCollectionExtensions.AddDiscordShardedGateway(Microsoft.Extensions.DependencyInjection.IServiceCollection). Example:
[!code-cs[Program.cs](ShardingHosting/Program.cs)]

Also note that you need to use @NetCord.Hosting.Gateway.IShardedGatewayEventHandler or @NetCord.Hosting.Gateway.IShardedGatewayEventHandler`1 instead of @NetCord.Hosting.Gateway.IGatewayEventHandler or @NetCord.Hosting.Gateway.IGatewayEventHandler`1 for event handlers. You also need to use @NetCord.Hosting.Gateway.GatewayEventHandlerServiceCollectionExtensions.AddShardedGatewayEventHandlers(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly) to add event handlers.
Also note that you need to use @NetCord.Hosting.Gateway.IShardedGatewayEventHandler or @NetCord.Hosting.Gateway.IShardedGatewayEventHandler`1 instead of @NetCord.Hosting.Gateway.IGatewayEventHandler or @NetCord.Hosting.Gateway.IGatewayEventHandler`1 for event handlers. You also need to use @NetCord.Hosting.Gateway.GatewayEventHandlerServiceCollectionExtensions.AddShardedGatewayEventHandlers(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly) to add event handlers and @NetCord.Hosting.Gateway.GatewayEventHandlerHostExtensions.UseShardedGatewayEventHandlers(Microsoft.Extensions.Hosting.IHost) to bind them.

## [Bare Bones](#tab/bare-bones)

Expand Down
2 changes: 1 addition & 1 deletion Documentation/guides/events/first-events.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ When you run this code, when someone reacts to a message, the bot will notify ev
Other events work similar to these. You can play with them if you want!

> [!NOTE]
> When using @NetCord.Gateway.ShardedGatewayClient, you need to implement @NetCord.Hosting.Gateway.IShardedGatewayEventHandler or @NetCord.Hosting.Gateway.IShardedGatewayEventHandler`1 instead. You also need to use @NetCord.Hosting.Gateway.GatewayEventHandlerServiceCollectionExtensions.AddShardedGatewayEventHandlers(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly) to add event handlers instead.
> When using @NetCord.Gateway.ShardedGatewayClient, you need to implement @NetCord.Hosting.Gateway.IShardedGatewayEventHandler or @NetCord.Hosting.Gateway.IShardedGatewayEventHandler`1 instead. You also need to use @NetCord.Hosting.Gateway.GatewayEventHandlerServiceCollectionExtensions.AddShardedGatewayEventHandlers(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly) to add event handlers and @NetCord.Hosting.Gateway.GatewayEventHandlerHostExtensions.UseShardedGatewayEventHandlers(Microsoft.Extensions.Hosting.IHost) to bind them instead.

## [Bare Bones](#tab/bare-bones)

Expand Down
8 changes: 5 additions & 3 deletions Hosting/NetCord.Hosting.AspNetCore/EndpointRouteBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ public static class EndpointRouteBuilderExtensions
{
public static IEndpointConventionBuilder UseHttpInteractions(this IEndpointRouteBuilder endpoints, string pattern)
{
var publicKey = endpoints.ServiceProvider.GetRequiredService<IOptions<IDiscordOptions>>().Value.PublicKey ?? throw new InvalidOperationException($"'{nameof(IDiscordOptions.PublicKey)}' must be set.");
var services = endpoints.ServiceProvider;

var publicKey = services.GetRequiredService<IOptions<IDiscordOptions>>().Value.PublicKey ?? throw new InvalidOperationException($"'{nameof(IDiscordOptions.PublicKey)}' must be set.");
HttpInteractionValidator validator = new(publicKey);

var handlers = endpoints.ServiceProvider.GetServices<IHttpInteractionHandler>().ToArray();
var handlers = services.GetServices<IHttpInteractionHandler>().ToArray();
var tasks = new ValueTask[handlers.Length];

var client = endpoints.ServiceProvider.GetRequiredService<RestClient>();
var client = services.GetRequiredService<RestClient>();

var routePattern = RoutePatternHelper.ParseLiteral(pattern);

Expand Down
2 changes: 1 addition & 1 deletion Hosting/NetCord.Hosting.AspNetCore/NetCord.Hosting.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<IsAotCompatible>false</IsAotCompatible>
<IsAotCompatible>true</IsAotCompatible>

<RepositoryUrl>https://github.com/NetCordDev/NetCord</RepositoryUrl>
<PackageProjectUrl>https://netcord.dev</PackageProjectUrl>
Expand Down
6 changes: 5 additions & 1 deletion Hosting/NetCord.Hosting.Services/ApplicationCommands/ApplicationCommandInteractionHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
namespace NetCord.Hosting.Services.ApplicationCommands;

[GatewayEvent(nameof(GatewayClient.InteractionCreate))]
internal unsafe partial class ApplicationCommandInteractionHandler<TInteraction, TContext> : IGatewayEventHandler<Interaction>, IShardedGatewayEventHandler<Interaction>, IHttpInteractionHandler where TInteraction : ApplicationCommandInteraction where TContext : IApplicationCommandContext
internal unsafe partial class ApplicationCommandInteractionHandler<TInteraction, [DAM(DAMT.PublicConstructors)] TContext>
: IGatewayEventHandler<Interaction>,
IShardedGatewayEventHandler<Interaction>,
IHttpInteractionHandler
where TInteraction : ApplicationCommandInteraction where TContext : IApplicationCommandContext
{
private IServiceProvider Services { get; }

Expand Down
4 changes: 3 additions & 1 deletion Hosting/NetCord.Hosting.Services/ApplicationCommands/ApplicationCommandResultHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@

namespace NetCord.Hosting.Services.ApplicationCommands;

public class ApplicationCommandResultHandler<TContext>(MessageFlags? messageFlags = null) : IApplicationCommandResultHandler<TContext> where TContext : IApplicationCommandContext
public class ApplicationCommandResultHandler<TContext>(MessageFlags? messageFlags = null)
: IApplicationCommandResultHandler<TContext>
where TContext : IApplicationCommandContext
{
public ValueTask HandleResultAsync(IExecutionResult result, TContext context, GatewayClient? client, ILogger logger, IServiceProvider services)
{
Expand Down
80 changes: 58 additions & 22 deletions ...rd.Hosting.Services/ApplicationCommands/ApplicationCommandServiceHostBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,60 @@ public static class ApplicationCommandServiceHostBuilderExtensions
{
// Configure

public static IHostBuilder ConfigureApplicationCommands(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions> configureOptions)
public static IHostBuilder ConfigureApplicationCommands(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions> configureOptions)
{
return builder.ConfigureApplicationCommands((options, _) => configureOptions(options));
}

public static IHostBuilder ConfigureApplicationCommands(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions, IServiceProvider> configureOptions)
public static IHostBuilder ConfigureApplicationCommands(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions, IServiceProvider> configureOptions)
{
return builder.ConfigureServices((context, services) => services.ConfigureApplicationCommands(configureOptions));
}

public static IHostBuilder ConfigureApplicationCommands<TInteraction, TContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>> configureOptions)
public static IHostBuilder ConfigureApplicationCommands<TInteraction,
TContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
{
return builder.ConfigureApplicationCommands<TInteraction, TContext>((options, _) => configureOptions(options));
}

public static IHostBuilder ConfigureApplicationCommands<TInteraction, TContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>, IServiceProvider> configureOptions)
public static IHostBuilder ConfigureApplicationCommands<TInteraction, TContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>, IServiceProvider> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
{
return builder.ConfigureServices((context, services) => services.ConfigureApplicationCommands(configureOptions));
}

public static IHostBuilder ConfigureApplicationCommands<TInteraction, TContext, TAutocompleteContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>> configureOptions)
public static IHostBuilder ConfigureApplicationCommands<TInteraction,
TContext,
TAutocompleteContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
where TAutocompleteContext : IAutocompleteInteractionContext
{
return builder.ConfigureApplicationCommands<TInteraction, TContext, TAutocompleteContext>((options, _) => configureOptions(options));
}

public static IHostBuilder ConfigureApplicationCommands<TInteraction, TContext, TAutocompleteContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>, IServiceProvider> configureOptions)
public static IHostBuilder ConfigureApplicationCommands<TInteraction,
TContext,
TAutocompleteContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>, IServiceProvider> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
where TAutocompleteContext : IAutocompleteInteractionContext
Expand All @@ -56,47 +71,68 @@ public static IHostBuilder ConfigureApplicationCommands<TInteraction, TContext,

// Use

public static IHostBuilder UseApplicationCommands<TInteraction, TContext>(this IHostBuilder builder)
public static IHostBuilder UseApplicationCommands<TInteraction,
[DAM(DAMT.PublicConstructors)] TContext>(
this IHostBuilder builder)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
{
return builder.UseApplicationCommands<TInteraction, TContext>((_, _) => { });
}

public static IHostBuilder UseApplicationCommands<TInteraction, TContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>> configureOptions)
public static IHostBuilder UseApplicationCommands<TInteraction,
[DAM(DAMT.PublicConstructors)] TContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
{
return builder.UseApplicationCommands<TInteraction, TContext>((options, _) => configureOptions(options));
}

public static IHostBuilder UseApplicationCommands<TInteraction, TContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>, IServiceProvider> configureOptions)
public static IHostBuilder UseApplicationCommands<TInteraction,
[DAM(DAMT.PublicConstructors)] TContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext>, IServiceProvider> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
{
return builder.ConfigureServices((context, services) => services.AddApplicationCommands(configureOptions));
}

public static IHostBuilder UseApplicationCommands<TInteraction, TContext, TAutocompleteContext>(this IHostBuilder builder)
public static IHostBuilder UseApplicationCommands<TInteraction,
[DAM(DAMT.PublicConstructors)] TContext,
[DAM(DAMT.PublicConstructors)] TAutocompleteContext>(
this IHostBuilder builder)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext where TAutocompleteContext : IAutocompleteInteractionContext
{
return builder.UseApplicationCommands<TInteraction, TContext, TAutocompleteContext>((_, _) => { });
}

public static IHostBuilder UseApplicationCommands<TInteraction, TContext, TAutocompleteContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>> configureOptions)
public static IHostBuilder UseApplicationCommands<TInteraction,
[DAM(DAMT.PublicConstructors)] TContext,
[DAM(DAMT.PublicConstructors)] TAutocompleteContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
where TAutocompleteContext : IAutocompleteInteractionContext
{
return builder.UseApplicationCommands<TInteraction, TContext, TAutocompleteContext>((options, _) => configureOptions(options));
}

public static IHostBuilder UseApplicationCommands<TInteraction, TContext, TAutocompleteContext>(this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>, IServiceProvider> configureOptions)
public static IHostBuilder UseApplicationCommands<TInteraction,
[DAM(DAMT.PublicConstructors)] TContext,
[DAM(DAMT.PublicConstructors)] TAutocompleteContext>(
this IHostBuilder builder,
Action<ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>, IServiceProvider> configureOptions)

where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
where TAutocompleteContext : IAutocompleteInteractionContext
Expand Down
12 changes: 10 additions & 2 deletions ...g/NetCord.Hosting.Services/ApplicationCommands/ApplicationCommandServiceHostExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,22 @@ public static IHost AddMessageCommand<TContext>(this IHost host,
return host;
}

public static IHost AddApplicationCommandModule<TContext>(this IHost host, Type type) where TContext : IApplicationCommandContext
public static IHost AddApplicationCommandModule<TContext>(
this IHost host,
[DAM(DAMT.PublicConstructors | DAMT.PublicMethods | DAMT.PublicNestedTypes)] Type type)

where TContext : IApplicationCommandContext
{
var service = host.Services.GetRequiredService<ApplicationCommandService<TContext>>();
service.AddModule(type);
return host;
}

public static IHost AddApplicationCommandModule<TContext, T>(this IHost host) where TContext : IApplicationCommandContext
public static IHost AddApplicationCommandModule<TContext,
[DAM(DAMT.PublicConstructors | DAMT.PublicMethods | DAMT.PublicNestedTypes)] T>(
this IHost host)

where TContext : IApplicationCommandContext
{
var service = host.Services.GetRequiredService<ApplicationCommandService<TContext>>();
service.AddModule<T>();
Expand Down
10 changes: 8 additions & 2 deletions Hosting/NetCord.Hosting.Services/ApplicationCommands/ApplicationCommandServiceOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ public class ApplicationCommandServiceOptions
public bool? UseScopes { get; set; }
}

public class ApplicationCommandServiceOptions<TInteraction, TContext> where TInteraction : ApplicationCommandInteraction where TContext : IApplicationCommandContext
public class ApplicationCommandServiceOptions<TInteraction, TContext>
where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
{
public Dictionary<Type, SlashCommandTypeReader<TContext>> TypeReaders { get; set; } = ApplicationCommandServiceConfiguration<TContext>.Default.TypeReaders.ToDictionary();

Expand Down Expand Up @@ -106,7 +108,11 @@ internal ApplicationCommandServiceConfiguration<TContext> CreateConfiguration()
}
}

public class ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext> : ApplicationCommandServiceOptions<TInteraction, TContext> where TInteraction : ApplicationCommandInteraction where TContext : IApplicationCommandContext where TAutocompleteContext : IAutocompleteInteractionContext
public class ApplicationCommandServiceOptions<TInteraction, TContext, TAutocompleteContext>
: ApplicationCommandServiceOptions<TInteraction, TContext>
where TInteraction : ApplicationCommandInteraction
where TContext : IApplicationCommandContext
where TAutocompleteContext : IAutocompleteInteractionContext
{
public Func<AutocompleteInteraction, GatewayClient?, IServiceProvider, TAutocompleteContext>? CreateAutocompleteContext { get; set; }

Expand Down
Loading