fix(fastify): return reply object from async handlers (#6798)

This is the recommended pattern, and will be required in Fastify 4. Co-authored-by: David Glasser <glasser@davidglasser.net>
apollographql · Aug 25, 2022 · 70ad2f1 · 70ad2f1
1 parent 149d686
commit 70ad2f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,10 @@ The version headers in this history reflect the versions of Apollo Server itself
 
 ## vNEXT
 
-## 3.7.0 (RESTDataSource only)
+## v3.10.2
 
-- [apollo-datasource-rest] Add option `memoizeGetRequests` to disable GET cache [PR #6650](https://github.com/apollographql/apollo-server/pull/6650) and [PR #6834](https://github.com/apollographql/apollo-server/pull/6834)
+- `apollo-server-fastify`: Use `return reply.send` in handlers to match the pattern encouraged by Fastify 4 (although [`apollo-server-fastify@3` only works with Fastify 3](https://github.com/apollographql/apollo-server/issues/6576#issuecomment-1159249244)). [PR #6798](https://github.com/apollographql/apollo-server/pull/6798)
+- `apollo-datasource-rest@3.7.0`: Add option `memoizeGetRequests` to disable GET cache [PR #6650](https://github.com/apollographql/apollo-server/pull/6650) and [PR #6834](https://github.com/apollographql/apollo-server/pull/6834)
 
 ## v3.10.1
 

diff --git a/packages/apollo-server-fastify/src/ApolloServer.ts b/packages/apollo-server-fastify/src/ApolloServer.ts
@@ -56,12 +56,12 @@ export class ApolloServer<
           if (onHealthCheck) {
             try {
               await onHealthCheck(request);
-              reply.send('{"status":"pass"}');
+              return reply.send('{"status":"pass"}');
             } catch (e) {
-              reply.status(503).send('{"status":"fail"}');
+              return reply.status(503).send('{"status":"fail"}');
             }
           } else {
-            reply.send('{"status":"pass"}');
+            return reply.send('{"status":"pass"}');
           }
         });
       }
@@ -94,9 +94,11 @@ export class ApolloServer<
 
                   if (prefersHtml) {
                     reply.type('text/html');
-                    reply.send(landingPage.html);
+                    return reply.send(landingPage.html);
                   }
                 }
+
+                return undefined;
               }
             : undefined;
 
@@ -129,7 +131,7 @@ export class ApolloServer<
                 }
                 reply.status(responseInit.status || 200);
                 reply.serializer((payload: string) => payload);
-                reply.send(graphqlResponse);
+                return reply.send(graphqlResponse);
               } catch (error) {
                 if (!isHttpQueryError(error)) {
                   throw error;
@@ -143,7 +145,7 @@ export class ApolloServer<
 
                 reply.code(error.statusCode);
                 reply.serializer((payload: string) => payload);
-                reply.send(error.message);
+                return reply.send(error.message);
               }
             },
           });