support async lambda handler

apollographql · Mar 9, 2021 · 5a72050 · 5a72050
1 parent 6378cfe
commit 5a72050
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/packages/apollo-server-lambda/src/ApolloServer.ts b/packages/apollo-server-lambda/src/ApolloServer.ts
@@ -116,6 +116,17 @@ export class ApolloServer extends ApolloServerBase {
       context: LambdaContext,
       callback: APIGatewayProxyCallback,
     ) => {
+
+      const callbackOverride: APIGatewayProxyCallback = (error, result) => {
+        if (error === null) {
+          return result;
+        }
+
+        throw error;
+      };
+
+      callback = callback || callbackOverride;
+
       // We re-load the headers into a Fetch API-compatible `Headers`
       // interface within `graphqlLambda`, but we still need to respect the
       // case-insensitivity within this logic here, so we'll need to do it
@@ -183,7 +194,7 @@ export class ApolloServer extends ApolloServerBase {
           },
         };
         if (onHealthCheck) {
-          onHealthCheck(event)
+          return onHealthCheck(event)
             .then(() => {
               return callback(null, successfulResponse);
             })
@@ -197,7 +208,6 @@ export class ApolloServer extends ApolloServerBase {
                 },
               });
             });
-          return;
         } else {
           return callback(null, successfulResponse);
         }
@@ -230,7 +240,7 @@ export class ApolloServer extends ApolloServerBase {
       const response = new Writable() as ServerResponse;
       const callbackFilter: APIGatewayProxyCallback = (error, result) => {
         response.end();
-        callback(
+        return callback(
           error,
           result && {
             ...result,
@@ -273,7 +283,7 @@ export class ApolloServer extends ApolloServerBase {
         }
       };
 
-      fileUploadHandler(() => graphqlLambda(async () => {
+      return fileUploadHandler(() => graphqlLambda(async () => {
         // In a world where this `createHandler` was async, we might avoid this
         // but since we don't want to introduce a breaking change to this API
         // (by switching it to `async`), we'll leverage the

diff --git a/packages/apollo-server-lambda/src/lambdaApollo.ts b/packages/apollo-server-lambda/src/lambdaApollo.ts
@@ -30,7 +30,7 @@ export function graphqlLambda(
     event,
     context,
     callback,
-  ): void => {
+  ): any => {
     context.callbackWaitsForEmptyEventLoop = false;
     let { body, headers, isBase64Encoded } = event;
     let query: Record<string, any> | Record<string, any>[];
@@ -58,7 +58,7 @@ export function graphqlLambda(
       query = event.queryStringParameters || {};
     }
 
-    runHttpQuery([event, context], {
+    return runHttpQuery([event, context], {
       method: event.httpMethod,
       options: options,
       query,
@@ -69,15 +69,15 @@ export function graphqlLambda(
       },
     }).then(
       ({ graphqlResponse, responseInit }) => {
-        callback(null, {
+        return callback(null, {
           body: graphqlResponse,
           statusCode: 200,
           headers: responseInit.headers,
         });
       },
       (error: HttpQueryError) => {
         if ('HttpQueryError' !== error.name) return callback(error);
-        callback(null, {
+        return callback(null, {
           body: error.message,
           statusCode: error.statusCode,
           headers: error.headers,