fix(server): don’t send an error if the client cancelled

lazarentertainment · Feb 20, 2024 · 369c486 · 369c486
1 parent 1eed42a
commit 369c486
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -693,7 +693,10 @@ export function makeServer<
                   stringifyMessage<MessageType.Next>(nextMessage, replacer),
                 );
               },
-              error: async (errors: readonly GraphQLError[]) => {
+              error: async (
+                errors: readonly GraphQLError[],
+                notifyClient: boolean,
+              ) => {
                 let errorMessage: ErrorMessage = {
                   id,
                   type: MessageType.Error,
@@ -705,9 +708,10 @@ export function makeServer<
                     ...errorMessage,
                     payload: maybeErrors,
                   };
-                await socket.send(
-                  stringifyMessage<MessageType.Error>(errorMessage, replacer),
-                );
+                if (notifyClient)
+                  await socket.send(
+                    stringifyMessage<MessageType.Error>(errorMessage, replacer),
+                  );
               },
               complete: async (notifyClient: boolean) => {
                 const completeMessage: CompleteMessage = {
@@ -730,7 +734,10 @@ export function makeServer<
               const maybeExecArgsOrErrors = await onSubscribe?.(ctx, message);
               if (maybeExecArgsOrErrors) {
                 if (areGraphQLErrors(maybeExecArgsOrErrors))
-                  return await emit.error(maybeExecArgsOrErrors);
+                  return await emit.error(
+                    maybeExecArgsOrErrors,
+                    id in ctx.subscriptions,
+                  );
                 else if (Array.isArray(maybeExecArgsOrErrors))
                   throw new Error(
                     'Invalid return value from onSubscribe hook, expected an array of GraphQLError objects',
@@ -760,17 +767,21 @@ export function makeServer<
                   execArgs.document,
                 );
                 if (validationErrors.length > 0)
-                  return await emit.error(validationErrors);
+                  return await emit.error(
+                    validationErrors,
+                    id in ctx.subscriptions,
+                  );
               }
 
               const operationAST = getOperationAST(
                 execArgs.document,
                 execArgs.operationName,
               );
               if (!operationAST)
-                return await emit.error([
-                  new GraphQLError('Unable to identify operation'),
-                ]);
+                return await emit.error(
+                  [new GraphQLError('Unable to identify operation')],
+                  id in ctx.subscriptions,
+                );
 
               // if `onSubscribe` didn't specify a rootValue, inject one
               if (!('rootValue' in execArgs))