-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extracted parts of Yarp resource into abstract WebApplication resource
- Loading branch information
Showing
7 changed files
with
598 additions
and
240 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
src/Aspirant.Hosting.WebApplication/Aspirant.Hosting.WebApplication.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| <Description>A custom ASP.NET Core web app resource for .NET Aspire App Host projects.</Description> | ||
| <PackageTags>aspire hosting aspnet aspnetcore</PackageTags> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Aspire.Hosting" /> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Aspirant.Hosting\Aspirant.Hosting.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
225 changes: 225 additions & 0 deletions
225
src/Aspirant.Hosting.WebApplication/WebApplicationResource.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,225 @@ | ||
| using Aspire.Hosting; | ||
| using Aspire.Hosting.ApplicationModel; | ||
| using Aspire.Hosting.Lifecycle; | ||
| using Microsoft.AspNetCore.Builder; | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.AspNetCore.Hosting.Server; | ||
| using Microsoft.AspNetCore.Hosting.Server.Features; | ||
| using Microsoft.AspNetCore.Http.Features; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Microsoft.Extensions.Logging; | ||
|
|
||
| namespace Aspirant.Hosting; | ||
|
|
||
| /// <summary> | ||
| /// Represents a ASP.NET Web Application resource. | ||
| /// </summary> | ||
| public class WebApplicationResource(string name) : Resource(name), IResourceWithServiceDiscovery, IResourceWithEnvironment | ||
| { | ||
|
|
||
| } | ||
|
|
||
| public abstract class WebApplicationResourceLifecycleHook<TResource>( | ||
| IHostEnvironment hostEnvironment, | ||
| DistributedApplicationExecutionContext executionContext, | ||
| ResourceNotificationService resourceNotificationService, | ||
| ResourceLoggerService resourceLoggerService) : IDistributedApplicationLifecycleHook, IAsyncDisposable | ||
| where TResource : WebApplicationResource | ||
| { | ||
| protected abstract string ResourceTypeName { get; } | ||
|
|
||
| private WebApplication? _app; | ||
|
|
||
| /// <inheritdoc /> | ||
| public async Task BeforeStartAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default) | ||
| { | ||
| if (executionContext.IsPublishMode) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var resource = appModel.Resources.OfType<TResource>().SingleOrDefault(); | ||
|
|
||
| if (resource is null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| await resourceNotificationService.PublishUpdateAsync(resource, s => s with | ||
| { | ||
| ResourceType = ResourceTypeName, | ||
| State = "Starting" | ||
| }); | ||
|
|
||
| var bindings = resource.Annotations.OfType<EndpointAnnotation>().ToList(); | ||
|
|
||
| foreach (var b in bindings) | ||
| { | ||
| b.IsProxied = false; | ||
| } | ||
| } | ||
|
|
||
| /// <inheritdoc /> | ||
| public async Task AfterEndpointsAllocatedAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default) | ||
| { | ||
| if (executionContext.IsPublishMode) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var resource = appModel.Resources.OfType<TResource>().SingleOrDefault(); | ||
|
|
||
| if (resource is null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var builder = WebApplication.CreateSlimBuilder(new WebApplicationOptions | ||
| { | ||
| ContentRootPath = hostEnvironment.ContentRootPath, | ||
| EnvironmentName = hostEnvironment.EnvironmentName, | ||
| WebRootPath = Path.Combine(hostEnvironment.ContentRootPath, "wwwroot") | ||
| }); | ||
|
|
||
| builder.Logging.ClearProviders(); | ||
|
|
||
| builder.Logging.AddProvider(new ResourceLoggerProvider(resourceLoggerService.GetLogger(resource.Name))); | ||
|
|
||
| if (resource.TryGetEnvironmentVariables(out var environmentVariables)) | ||
| { | ||
| var context = new EnvironmentCallbackContext(executionContext, cancellationToken: cancellationToken); | ||
|
|
||
| foreach (var cb in environmentVariables) | ||
| { | ||
| await cb.Callback(context); | ||
| } | ||
|
|
||
| var dict = new Dictionary<string, string?>(); | ||
| foreach (var (k, v) in context.EnvironmentVariables) | ||
| { | ||
| var val = v switch | ||
| { | ||
| string s => s, | ||
| IValueProvider vp => await vp.GetValueAsync(context.CancellationToken), | ||
| _ => throw new NotSupportedException() | ||
| }; | ||
|
|
||
| if (val is not null) | ||
| { | ||
| dict[k.Replace("__", ":")] = val; | ||
| } | ||
| } | ||
|
|
||
| builder.Configuration.AddInMemoryCollection(dict); | ||
|
|
||
| await ConfigureBuilderAsync(builder, resource, cancellationToken); | ||
|
|
||
| resource.TryGetEndpoints(out var endpoints); | ||
| var defaultScheme = Environment.GetEnvironmentVariable("ASPNETCORE_URLS")?.Contains("https://") == true ? "https" : "http"; | ||
| var needHttps = defaultScheme == "https" || endpoints?.Any(ep => ep.UriScheme == "https") == true; | ||
|
|
||
| if (needHttps) | ||
| { | ||
| builder.WebHost.UseKestrelHttpsConfiguration(); | ||
| } | ||
|
|
||
| _app = builder.Build(); | ||
|
|
||
| var urlToEndpointNameMap = new Dictionary<string, string>(); | ||
|
|
||
| if (endpoints is null) | ||
| { | ||
| var url = $"{defaultScheme}://127.0.0.1:0/"; | ||
| _app.Urls.Add(url); | ||
| urlToEndpointNameMap[url] = "default"; | ||
| } | ||
| else | ||
| { | ||
| foreach (var ep in endpoints) | ||
| { | ||
| var scheme = ep.UriScheme ?? defaultScheme; | ||
| needHttps = needHttps || scheme == "https"; | ||
|
|
||
| var url = ep.Port switch | ||
| { | ||
| null => $"{scheme}://127.0.0.1:0/", | ||
| _ => $"{scheme}://localhost:{ep.Port}" | ||
| }; | ||
|
|
||
| var uri = new Uri(url); | ||
| _app.Urls.Add(url); | ||
| urlToEndpointNameMap[uri.ToString()] = ep.Name; | ||
| } | ||
| } | ||
|
|
||
| await ConfigureApplicationAsync(_app, resource, cancellationToken); | ||
|
|
||
| await _app.StartAsync(cancellationToken); | ||
|
|
||
| var addresses = _app.Services.GetRequiredService<IServer>().Features.GetRequiredFeature<IServerAddressesFeature>().Addresses; | ||
|
|
||
| foreach (var url in addresses) | ||
| { | ||
| if (urlToEndpointNameMap.TryGetValue(new Uri(url).ToString(), out var name) | ||
| || urlToEndpointNameMap.TryGetValue((new UriBuilder(url) { Port = 0 }).Uri.ToString(), out name)) | ||
| { | ||
| var ep = endpoints?.FirstOrDefault(ep => ep.Name == name); | ||
| if (ep is not null) | ||
| { | ||
| var uri = new Uri(url); | ||
| var host = uri.Host is "127.0.0.1" or "[::1]" ? "localhost" : uri.Host; | ||
| ep.AllocatedEndpoint = new(ep, host, uri.Port); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| await resourceNotificationService.PublishUpdateAsync(resource, s => s with | ||
| { | ||
| State = "Running", | ||
| Urls = [.. endpoints?.Select(ep => new UrlSnapshot(ep.Name, ep.AllocatedEndpoint?.UriString ?? "", IsInternal: false))], | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| protected abstract ValueTask ConfigureBuilderAsync(WebApplicationBuilder builder, TResource resource, CancellationToken cancellationToken); | ||
|
|
||
| protected abstract ValueTask ConfigureApplicationAsync(WebApplication application, TResource resource, CancellationToken cancellationToken); | ||
|
|
||
| /// <inheritdoc /> | ||
| public ValueTask DisposeAsync() | ||
| { | ||
| return _app?.DisposeAsync() ?? default; | ||
| } | ||
|
|
||
| private class ResourceLoggerProvider(ILogger logger) : ILoggerProvider | ||
| { | ||
| public ILogger CreateLogger(string categoryName) | ||
| { | ||
| return new ResourceLogger(logger); | ||
| } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| } | ||
|
|
||
| private class ResourceLogger(ILogger logger) : ILogger | ||
| { | ||
| public IDisposable? BeginScope<TState>(TState state) where TState : notnull | ||
| { | ||
| return logger.BeginScope(state); | ||
| } | ||
|
|
||
| public bool IsEnabled(LogLevel logLevel) | ||
| { | ||
| return logger.IsEnabled(logLevel); | ||
| } | ||
|
|
||
| public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter) | ||
| { | ||
| logger.Log(logLevel, eventId, state, exception, formatter); | ||
| } | ||
| } | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
src/Aspirant.Hosting.WebApplication/WebApplicationResourceExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| using Aspire.Hosting; | ||
| using Aspire.Hosting.ApplicationModel; | ||
| using Aspire.Hosting.Lifecycle; | ||
|
|
||
| namespace Aspirant.Hosting; | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Extensions method to add WebApplication resources. | ||
| /// </summary> | ||
| public static class WebApplicationResourceExtensions | ||
| { | ||
| public static IResourceBuilder<TResource> AddWebApplication<TResource, TLifecycleHook>(this IDistributedApplicationBuilder builder, TResource resource, bool excludeFromManifest = false) | ||
| where TResource : WebApplicationResource | ||
| where TLifecycleHook : WebApplicationResourceLifecycleHook<TResource> | ||
| { | ||
| var webApplicationResource = builder.Resources.OfType<TResource>().SingleOrDefault(); | ||
|
|
||
| if (webApplicationResource is not null) | ||
| { | ||
| throw new InvalidOperationException($"A resource of type {nameof(TResource)} has already been added to this application"); | ||
| } | ||
|
|
||
| builder.Services.TryAddLifecycleHook<TLifecycleHook>(); | ||
|
|
||
| var resourceBuilder = builder.AddResource(resource); | ||
|
|
||
| if (excludeFromManifest) | ||
| { | ||
| resourceBuilder = resourceBuilder.ExcludeFromManifest(); | ||
| } | ||
|
|
||
| return resourceBuilder; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.