Switch to ChilliCream.Nitro.App.Embed

src/Directory.Packages.props

@@ -20,6 +20,7 @@
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.dotMemory" Version="0.15.8" />
     <PackageVersion Include="ChilliCream.ModelContextProtocol.AspNetCore" Version="1.4.1" />
     <PackageVersion Include="ChilliCream.Nitro.App" Version="$(NitroVersion)" />
+    <PackageVersion Include="ChilliCream.Nitro.App.Embed" Version="$(NitroVersion)" />
     <PackageVersion Include="CliWrap" Version="3.10.5" />
     <PackageVersion Include="Confluent.Kafka" Version="2.14.2" />
     <PackageVersion Include="Dapper" Version="2.1.79" />

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Extensions/EndpointRouteBuilderExtensions.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using ChilliCream.Nitro.App;
+using ChilliCream.Nitro.App.Embed;
 using HotChocolate.AspNetCore;
 using HotChocolate.AspNetCore.Extensions;
 using Microsoft.AspNetCore.Http;
@@ -86,7 +87,7 @@ public static GraphQLEndpointConventionBuilder MapGraphQL(
         var pattern = Parse(path + "/{**slug}");
         var requestPipeline = endpointRouteBuilder.CreateApplicationBuilder();
         var services = endpointRouteBuilder.ServiceProvider;
-        requestPipeline.MapGraphQL(path, schemaNameOrDefault);
+        MapGraphQLPipeline(requestPipeline, path, schemaNameOrDefault, mountedOnEndpoint: true);
         var serverOptions = services.GetServerOptions(schemaNameOrDefault);
 
         return new GraphQLEndpointConventionBuilder(
@@ -123,6 +124,15 @@ public static IApplicationBuilder MapGraphQL(
         ArgumentNullException.ThrowIfNull(applicationBuilder);
         ArgumentException.ThrowIfNullOrEmpty(schemaName);
 
+        return MapGraphQLPipeline(applicationBuilder, path, schemaName, mountedOnEndpoint: false);
+    }
+
+    private static IApplicationBuilder MapGraphQLPipeline(
+        IApplicationBuilder applicationBuilder,
+        PathString path,
+        string schemaName,
+        bool mountedOnEndpoint)
+    {
         path = path.ToString().TrimEnd('/');
 
         var services = applicationBuilder.ApplicationServices;
@@ -144,7 +154,20 @@ public static IApplicationBuilder MapGraphQL(
                 executor, serverOptions, path, MiddlewareRoutingType.Integrated))
             .UseWhen(
                 context => context.MayReachNitroApp(path),
-                branch => branch.UseNitroApp(path, serverOptions.Tool))
+                branch =>
+                {
+                    if (mountedOnEndpoint)
+                    {
+                        branch.UseNitroApp(serverOptions.Tool, EmbeddedNitroApp.AssetSource);
+                    }
+                    else
+                    {
+                        branch.Use(NitroAppMiddleware.Create(
+                            serverOptions.Tool,
+                            path,
+                            embeddedAssetSource: EmbeddedNitroApp.AssetSource));
+                    }
+                })
             .Use(MiddlewareFactory.CreateHttpUnsupportedRequestMiddleware(
                 executor,
                 serverOptions,
@@ -529,7 +552,7 @@ public static NitroAppEndpointConventionBuilder MapNitroApp(
         var nitroOptions = new NitroAppOptions { GraphQLEndpoint = relativeRequestPath };
 
         requestPipeline
-            .UseNitroApp(toolPath, nitroOptions)
+            .UseNitroApp(nitroOptions, EmbeddedNitroApp.AssetSource)
             .Use(_ => context =>
             {
                 context.Response.StatusCode = 404;

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Extensions/HttpContextExtensions.cs

@@ -1,6 +1,8 @@
+using ChilliCream.Nitro.App;
 using HotChocolate.AspNetCore.Formatters;
 using HotChocolate.AspNetCore.Utilities;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 
 namespace HotChocolate.AspNetCore;
 
@@ -29,7 +31,7 @@ public static bool MayReachNitroApp(this HttpContext context, PathString path)
     {
         var request = context.Request;
 
-        if (!request.IsGetOrHeadMethod() || !request.IsEndpointPath(path))
+        if (!request.IsGetOrHeadMethod() || !IsGraphQLEndpointPath(context, path))
         {
             return true;
         }
@@ -40,6 +42,13 @@ public static bool MayReachNitroApp(this HttpContext context, PathString path)
             && DefaultHttpResponseFormatter.PrefersHtml(acceptHeader.AcceptMediaTypes);
     }
 
+    // Inside a route group, path is relative to the group. On an endpoint, an empty slug route
+    // value identifies the endpoint path instead.
+    private static bool IsGraphQLEndpointPath(HttpContext context, PathString path)
+        => context.Request.IsEndpointPath(path)
+            || (context.GetEndpoint() is not null
+                && string.IsNullOrEmpty(context.GetRouteValue(NitroAppMiddleware.SlugRouteValueName)?.ToString()));
+
     public static string? TryGetCostSwitch(this HttpContext context)
     {
         var headers = context.Request.Headers;

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/HotChocolate.AspNetCore.Pipeline.csproj

@@ -20,6 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="ChilliCream.Nitro.App" />
+    <PackageReference Include="ChilliCream.Nitro.App.Embed" />
   </ItemGroup>
 
   <ItemGroup>

src/HotChocolate/AspNetCore/src/AspNetCore/HotChocolate.AspNetCore.csproj

@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="ChilliCream.Nitro.App" />
+    <PackageReference Include="ChilliCream.Nitro.App.Embed" />
   </ItemGroup>
 
   <ItemGroup>