[Fusion] Support new error handling modes (#8612)

Author: tobias-tengler

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

@@ -6,20 +6,19 @@ internal static class HttpContextExtensions
 {
     public static GraphQLServerOptions? GetGraphQLServerOptions(this HttpContext context)
         => context.GetEndpoint()?.Metadata.GetMetadata<GraphQLServerOptions>() ??
-           (context.Items.TryGetValue(nameof(GraphQLServerOptions), out var o)
-            && o is GraphQLServerOptions options
+            (context.Items.TryGetValue(nameof(GraphQLServerOptions), out var o) && o is GraphQLServerOptions options
                 ? options
                 : null);
 
     public static GraphQLSocketOptions? GetGraphQLSocketOptions(this HttpContext context)
         => GetGraphQLServerOptions(context)?.Sockets;
 
-    public static bool IncludeQueryPlan(this HttpContext context)
+    public static bool IncludeOperationPlan(this HttpContext context)
     {
         var headers = context.Request.Headers;
 
-        if (headers.TryGetValue(HttpHeaderKeys.QueryPlan, out var values)
-            && values.Any(v => v == HttpHeaderValues.IncludeQueryPlan))
+        if (headers.TryGetValue(HttpHeaderKeys.OperationPlan, out var values)
+            && values.Any(v => v == HttpHeaderValues.IncludeOperationPlan))
         {
             return true;
         }

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/HttpHeaderKeys.cs

@@ -2,7 +2,7 @@ namespace HotChocolate.AspNetCore;
 
 internal static class HttpHeaderKeys
 {
-    public const string QueryPlan = "GraphQL-Query-Plan";
+    public const string OperationPlan = "Fusion-Operation-Plan";
 
     public const string CacheControl = "Cache-Control";
 

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/HttpHeaderValues.cs

@@ -2,7 +2,7 @@ namespace HotChocolate.AspNetCore;
 
 internal static class HttpHeaderValues
 {
-    public const string IncludeQueryPlan = "1";
+    public const string IncludeOperationPlan = "1";
 
     public const string NoCache = "no-cache";
 

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Interceptors/DefaultHttpRequestInterceptor.cs

@@ -27,9 +27,9 @@ public virtual ValueTask OnCreateAsync(
         requestBuilder.TryAddGlobalState(nameof(HttpContext), context);
         requestBuilder.TryAddGlobalState(nameof(ClaimsPrincipal), userState.User);
 
-        if (context.IncludeQueryPlan())
+        if (context.IncludeOperationPlan())
         {
-            requestBuilder.TryAddGlobalState(IncludeQueryPlan, true);
+            requestBuilder.TryAddGlobalState(IncludeOperationPlan, true);
         }
 
         if (context.TryGetCostSwitch() is { } costSwitch)

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Interceptors/DefaultSocketSessionInterceptor.cs

@@ -35,9 +35,9 @@ public virtual ValueTask OnRequestAsync(
         requestBuilder.TryAddGlobalState(OperationSessionId, operationSessionId);
         requestBuilder.TryAddGlobalState(nameof(ClaimsPrincipal), userState.User);
 
-        if (context.IncludeQueryPlan())
+        if (context.IncludeOperationPlan())
         {
-            requestBuilder.TryAddGlobalState(IncludeQueryPlan, true);
+            requestBuilder.TryAddGlobalState(IncludeOperationPlan, true);
         }
 
         return default;

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Parsers/DefaultHttpRequestParser.cs

@@ -16,6 +16,7 @@ internal sealed class DefaultHttpRequestParser : IHttpRequestParser
     private const int MinRequestSize = 256;
     internal const string QueryIdKey = "id";
     private const string OperationNameKey = "operationName";
+    private const string OnErrorKey = "onError";
     internal const string QueryKey = "query";
     private const string VariablesKey = "variables";
     internal const string ExtensionsKey = "extensions";
@@ -100,6 +101,7 @@ public GraphQLRequest ParseRequestFromParams(IQueryCollection parameters)
         string? query = parameters[QueryKey];
         string? queryId = parameters[QueryIdKey];
         string? operationName = parameters[OperationNameKey];
+        string? onError = parameters[OnErrorKey];
         IReadOnlyDictionary<string, object?>? extensions = null;
 
         // if we have no query or query id, we cannot execute anything.
@@ -155,11 +157,18 @@ public GraphQLRequest ParseRequestFromParams(IQueryCollection parameters)
                 extensions = ParseJsonObject(se);
             }
 
+            ErrorHandlingMode? errorHandlingMode = null;
+            if (!string.IsNullOrEmpty(onError))
+            {
+                errorHandlingMode = ParseErrorHandlingMode(onError);
+            }
+
             return new GraphQLRequest(
                 document,
                 queryId,
                 documentHash,
                 operationName,
+                errorHandlingMode,
                 variableSet,
                 extensions);
         }
@@ -196,11 +205,20 @@ public GraphQLRequest ParsePersistedOperationRequestFromParams(
                 extensions = ParseJsonObject(se);
             }
 
+            string? onError = parameters[OnErrorKey];
+
+            ErrorHandlingMode? errorHandlingMode = null;
+            if (!string.IsNullOrEmpty(onError))
+            {
+                errorHandlingMode = ParseErrorHandlingMode(onError);
+            }
+
             return new GraphQLRequest(
                 null,
                 operationId,
                 null,
                 operationName,
+                errorHandlingMode,
                 variableSet,
                 extensions);
         }
@@ -238,6 +256,26 @@ public GraphQLRequest ParsePersistedOperationRequestFromParams(
         return (documentHash, document);
     }
 
+    private ErrorHandlingMode? ParseErrorHandlingMode(string onError)
+    {
+        if (onError.Equals("PROPAGATE", StringComparison.OrdinalIgnoreCase))
+        {
+            return ErrorHandlingMode.Propagate;
+        }
+
+        if (onError.Equals("NULL", StringComparison.OrdinalIgnoreCase))
+        {
+            return ErrorHandlingMode.Null;
+        }
+
+        if (onError.Equals("HALT", StringComparison.OrdinalIgnoreCase))
+        {
+            return ErrorHandlingMode.Halt;
+        }
+
+        return null;
+    }
+
     public IReadOnlyList<GraphQLRequest> ParseRequest(
         string sourceText)
     {

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Subscriptions/OperationSession.cs

@@ -135,6 +135,11 @@ private static OperationRequestBuilder CreateRequestBuilder(GraphQLRequest reque
             requestBuilder.SetOperationName(request.OperationName);
         }
 
+        if (request.ErrorHandlingMode is { } errorHandlingMode)
+        {
+            requestBuilder.SetErrorHandlingMode(errorHandlingMode);
+        }
+
         if (request.DocumentId is not null)
         {
             requestBuilder.SetDocumentId(request.DocumentId);

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/Subscriptions/WebSocketSession.cs

@@ -48,7 +48,6 @@ public static async Task AcceptAsync(
             connection.ApplicationStopping);
         var ct = cts.Token;
         var protocol = await connection.TryAcceptConnection();
-        var interceptor = executorSession.SocketSessionInterceptor;
 
         if (protocol is not null)
         {

src/HotChocolate/AspNetCore/src/Transport.Abstractions/HotChocolate.Transport.Abstractions.csproj

@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Language\src\Language.SyntaxTree\HotChocolate.Language.SyntaxTree.csproj" />
+    <ProjectReference Include="..\..\..\Language\src\Language.Web\HotChocolate.Language.Web.csproj" />
     <ProjectReference Include="..\..\..\Utilities\src\Utilities.Buffers\HotChocolate.Utilities.Buffers.csproj" />
   </ItemGroup>
 

src/HotChocolate/AspNetCore/src/Transport.Abstractions/IOperationRequest.cs

@@ -19,6 +19,11 @@ public interface IOperationRequest : IRequestBody
     /// </summary>
     string? OperationName { get; }
 
+    /// <summary>
+    /// Gets the requested error handling mode.
+    /// </summary>
+    ErrorHandlingMode? OnError { get; }
+
     /// <summary>
     /// Gets a dictionary containing extension values to include with the operation.
     /// </summary>