fix(graphql): fix writing http status code

nestjs · Jan 15, 2023 · 951f907 · 951f907
1 parent cdf4998
commit 951f907
Show file tree

Hide file tree

Showing 4 changed files with 86 additions and 59 deletions.
diff --git a/packages/apollo/lib/drivers/apollo-base.driver.ts b/packages/apollo/lib/drivers/apollo-base.driver.ts
@@ -17,6 +17,18 @@ import * as omit from 'lodash.omit';
 import { ApolloDriverConfig } from '../interfaces';
 import { createAsyncIterator } from '../utils/async-iterator.util';
 
+import { ApolloServer, type BaseContext } from '@apollo/server';
+import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer';
+import { expressMiddleware } from '@apollo/server/express4';
+import * as express from 'express';
+import * as http from 'node:http';
+import * as cors from 'cors';
+
+import fastifyApollo, {
+  fastifyApolloHandler,
+  fastifyApolloDrainPlugin,
+} from '@as-integrations/fastify';
+
 const apolloPredefinedExceptions: Partial<
   Record<HttpStatus, typeof ApolloError | typeof UserInputError>
 > = {
@@ -28,10 +40,10 @@ const apolloPredefinedExceptions: Partial<
 export abstract class ApolloBaseDriver<
   T extends Record<string, any> = ApolloDriverConfig,
 > extends AbstractGraphQLDriver<T> {
-  protected _apolloServer: ApolloServerBase;
+  protected apolloServer: ApolloServerBase | ApolloServer<BaseContext>;
 
-  get instance(): ApolloServerBase {
-    return this._apolloServer;
+  get instance(): ApolloServerBase | ApolloServer<BaseContext> {
+    return this.apolloServer;
   }
 
   public async start(apolloOptions: T) {
@@ -48,7 +60,7 @@ export abstract class ApolloBaseDriver<
   }
 
   public stop() {
-    return this._apolloServer?.stop();
+    return this.apolloServer?.stop();
   }
 
   public async mergeDefaultOptions(options: T): Promise<T> {
@@ -115,68 +127,72 @@ export abstract class ApolloBaseDriver<
       );
   }
 
-  protected async registerExpress(
-    apolloOptions: T,
-    { preStartHook }: { preStartHook?: () => void } = {},
-  ) {
-    const { ApolloServer } = loadPackage(
-      'apollo-server-express',
-      'GraphQLModule',
-      () => require('apollo-server-express'),
-    );
-    const { disableHealthCheck, path, onHealthCheck, cors, bodyParserConfig } =
-      apolloOptions;
+  protected async registerExpress(options: T, hooks?: any) {
+    if (hooks?.preStartHook) {
+      hooks?.preStartHook();
+    }
+
+    const { path, typeDefs, resolvers, schema } = options;
 
     const httpAdapter = this.httpAdapterHost.httpAdapter;
     const app = httpAdapter.getInstance();
+    const httpServer = http.createServer(app);
 
-    preStartHook?.();
+    // Set up Apollo Server
+    const server = new ApolloServer({
+      typeDefs,
+      resolvers,
+      schema,
+      ...options,
+      /**
+       * @TODO
+       * should remove serverWillStart from default plugins.
+       * after include plugins here
+       */
+      plugins: [ApolloServerPluginDrainHttpServer({ httpServer })],
+    });
 
-    const apolloServer = new ApolloServer(apolloOptions as any);
-    await apolloServer.start();
+    await server.start();
 
-    apolloServer.applyMiddleware({
-      app,
+    app.use(
       path,
-      disableHealthCheck,
-      onHealthCheck,
-      cors,
-      bodyParserConfig,
-    });
+      cors(options.cors),
+      express.json(),
+      expressMiddleware(server),
+    );
 
-    this._apolloServer = apolloServer;
+    this.apolloServer = server;
   }
 
-  protected async registerFastify(
-    apolloOptions: T,
-    { preStartHook }: { preStartHook?: () => void } = {},
-  ) {
-    const { ApolloServer } = loadPackage(
-      'apollo-server-fastify',
-      'GraphQLModule',
-      () => require('apollo-server-fastify'),
-    );
+  protected async registerFastify(options: T, hooks?: any) {
+    if (hooks?.preStartHook) {
+      hooks?.preStartHook();
+    }
 
     const httpAdapter = this.httpAdapterHost.httpAdapter;
     const app = httpAdapter.getInstance();
 
-    preStartHook?.();
-    const apolloServer = new ApolloServer(apolloOptions as any);
-    await apolloServer.start();
-
-    const { disableHealthCheck, onHealthCheck, cors, bodyParserConfig, path } =
-      apolloOptions;
-    await app.register(
-      apolloServer.createHandler({
-        disableHealthCheck,
-        onHealthCheck,
-        cors,
-        bodyParserConfig,
-        path,
-      }),
-    );
+    const { path, typeDefs, resolvers, schema } = options;
+
+    const server = new ApolloServer<BaseContext>({
+      typeDefs,
+      resolvers,
+      schema,
+      plugins: [fastifyApolloDrainPlugin(app)],
+    });
+
+    await server.start();
+
+    app.route({
+      url: path,
+      method: ['POST', 'OPTIONS'],
+      handler: fastifyApolloHandler(server),
+    });
+
+    await app.register(fastifyApollo(server));
+    await app.register(cors, options.cors);
 
-    this._apolloServer = apolloServer;
+    this.apolloServer = server;
   }
 
   private wrapFormatErrorFn(options: T) {

diff --git a/packages/apollo/lib/interfaces/apollo-driver-config.interface.ts b/packages/apollo/lib/interfaces/apollo-driver-config.interface.ts
@@ -10,6 +10,7 @@ import {
   GraphQLExecutor,
 } from 'apollo-server-core';
 import { GraphQLSchema } from 'graphql';
+import { CorsOptions } from 'cors';
 
 export interface ServerRegistration {
   /**
@@ -20,7 +21,7 @@ export interface ServerRegistration {
   /**
    * CORS configuration
    */
-  cors?: any | boolean;
+  cors?: CorsOptions;
 
   /**
    * Body-parser configuration

diff --git a/packages/apollo/lib/utils/get-apollo-server.ts b/packages/apollo/lib/utils/get-apollo-server.ts
@@ -3,19 +3,24 @@ import { GraphQLModule } from '@nestjs/graphql';
 import { ApolloServerBase } from 'apollo-server-core';
 import { ApolloDriver } from '..';
 
+import { ApolloServer, type BaseContext } from '@apollo/server';
+
+type GetApolloServer = (
+  app: INestApplicationContext,
+) => ApolloServerBase | ApolloServer<BaseContext>;
+
 /**
  * Returns the underlying ApolloServer instance for a given application.
  * @param app Nest application reference
  * @returns Apollo Server instance used by the host application
  */
-export function getApolloServer(
-  app: INestApplicationContext,
-): ApolloServerBase {
+export const getApolloServer: GetApolloServer = (app) => {
   try {
     const graphqlModule = app.get<GraphQLModule<ApolloDriver>>(GraphQLModule);
     return graphqlModule.graphQlAdapter?.instance;
   } catch (error) {}
+
   throw new Error(
     `Nest could not find the "GraphQLModule" in your application's container. Please, double-check if it's registered in the given application.`,
   );
-}
+};
diff --git a/packages/graphql/lib/interfaces/graphql-exception.interface.ts b/packages/graphql/lib/interfaces/graphql-exception.interface.ts
@@ -1,7 +1,12 @@
-import type { GraphQLErrorOptions } from 'graphql/error';
+import type {
+  GraphQLErrorOptions,
+  GraphQLErrorExtensions,
+} from 'graphql/error';
 
 export interface ExpcetionOptions extends GraphQLErrorOptions {
-  http: {
-    status: number;
+  extensions: GraphQLErrorExtensions & {
+    http: {
+      status: number;
+    };
   };
 }