core: change gqlResponse to graphqlResponse and add custom RequestIni…

…t type
apollographql · Jun 11, 2018 · cf75381 · cf75381
1 parent 8ada9a4
commit cf75381
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 65 deletions.
diff --git a/packages/apollo-server-adonis/src/adonisApollo.ts b/packages/apollo-server-adonis/src/adonisApollo.ts
@@ -37,9 +37,9 @@ export function graphqlAdonis(
       query,
       request: convertNodeHttpToRequest(request.request),
     }).then(
-      ({ gqlResponse, responseInit }) => {
+      ({ graphqlResponse, responseInit }) => {
         response.type(responseInit.headers['Content-Type']);
-        response.json(gqlResponse);
+        response.json(graphqlResponse);
       },
       (error: HttpQueryError) => {
         if ('HttpQueryError' !== error.name) {

diff --git a/packages/apollo-server-azure-functions/src/azureFunctionsApollo.ts b/packages/apollo-server-azure-functions/src/azureFunctionsApollo.ts
@@ -66,11 +66,11 @@ export function graphqlAzureFunctions(
     }
 
     return runHttpQuery([httpContext, request], queryRequest as any)
-      .then(({ gqlResponse, responseInit }) => {
+      .then(({ graphqlResponse, responseInit }) => {
         const result = {
           status: HttpStatusCodes.OK,
           headers: responseInit.headers,
-          body: gqlResponse,
+          body: graphqlResponse,
           isRaw: true,
         };
         httpContext.res = result;

diff --git a/packages/apollo-server-cloudflare/src/cloudflareApollo.ts b/packages/apollo-server-cloudflare/src/cloudflareApollo.ts
@@ -39,8 +39,8 @@ export function graphqlCloudflare(options: GraphQLOptions) {
       query,
       request: req as Request,
     }).then(
-      ({ gqlResponse, responseInit }) =>
-        new Response(gqlResponse, responseInit),
+      ({ graphqlResponse, responseInit }) =>
+        new Response(graphqlResponse, responseInit),
       (error: HttpQueryError) => {
         if ('HttpQueryError' !== error.name) throw error;
 

diff --git a/packages/apollo-server-core/src/ApolloServer.test.ts b/packages/apollo-server-core/src/ApolloServer.test.ts
@@ -86,15 +86,11 @@ function createHttpServer(server) {
               : JSON.parse(body),
           request: convertNodeHttpToRequest(req),
         })
-          .then(({ gqlResponse, responseInit }) => {
+          .then(({ graphqlResponse, responseInit }) => {
             Object.keys(responseInit.headers).forEach(key =>
               res.setHeader(key, responseInit.headers[key]),
             );
-            res.setHeader(
-              'Content-Length',
-              Buffer.byteLength(gqlResponse, 'utf8').toString(),
-            );
-            res.write(gqlResponse);
+            res.write(graphqlResponse);
             res.end();
           })
           .catch(error => {

diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts
@@ -32,9 +32,16 @@ function prettyJSONStringify(toStringfy) {
   return JSON.stringify(toStringfy) + '\n';
 }
 
+export interface ApolloServerHttpResponse {
+  headers?: Record<string, string>;
+  // ResponseInit contains the follow, which we do not use
+  // status?: number;
+  // statusText?: string;
+}
+
 export interface HttpQueryResponse {
-  gqlResponse: string;
-  responseInit: ResponseInit;
+  graphqlResponse: string;
+  responseInit: ApolloServerHttpResponse;
 }
 
 export class HttpQueryError extends Error {
@@ -338,28 +345,41 @@ export async function runHttpQuery(
 
   const responses = await Promise.all(requests);
 
-  const responseInit: ResponseInit = {
-    status: 200,
+  const responseInit: ApolloServerHttpResponse = {
     headers: {
       'Content-Type': 'application/json',
     },
   };
 
   if (!isBatch) {
-    const gqlResponse = responses[0];
+    const graphqlResponse = responses[0];
     //This code is run on parse/validation errors and any other error that
     //doesn't reach GraphQL execution
-    if (gqlResponse.errors && typeof gqlResponse.data === 'undefined') {
-      throwHttpGraphQLError(400, gqlResponse.errors as any, optionsObject);
+    if (graphqlResponse.errors && typeof graphqlResponse.data === 'undefined') {
+      throwHttpGraphQLError(400, graphqlResponse.errors as any, optionsObject);
     }
+    const stringified = prettyJSONStringify(graphqlResponse);
+
+    responseInit['Content-Length'] = Buffer.byteLength(
+      stringified,
+      'utf8',
+    ).toString();
+
     return {
-      gqlResponse: prettyJSONStringify(gqlResponse),
+      graphqlResponse: stringified,
       responseInit,
     };
   }
 
+  const stringified = prettyJSONStringify(responses);
+
+  responseInit['Content-Length'] = Buffer.byteLength(
+    stringified,
+    'utf8',
+  ).toString();
+
   return {
-    gqlResponse: prettyJSONStringify(responses),
+    graphqlResponse: stringified,
     responseInit,
   };
 }
diff --git a/packages/apollo-server-express/src/expressApollo.ts b/packages/apollo-server-express/src/expressApollo.ts
@@ -48,15 +48,11 @@ export function graphqlExpress(
       query: req.method === 'POST' ? req.body : req.query,
       request: convertNodeHttpToRequest(req),
     }).then(
-      ({ gqlResponse, responseInit }) => {
+      ({ graphqlResponse, responseInit }) => {
         Object.keys(responseInit.headers).forEach(key =>
           res.setHeader(key, responseInit.headers[key]),
         );
-        res.setHeader(
-          'Content-Length',
-          Buffer.byteLength(gqlResponse, 'utf8').toString(),
-        );
-        res.write(gqlResponse);
+        res.write(graphqlResponse);
         res.end();
       },
       (error: HttpQueryError) => {

diff --git a/packages/apollo-server-hapi/src/hapiApollo.ts b/packages/apollo-server-hapi/src/hapiApollo.ts
@@ -42,25 +42,24 @@ const graphqlHapi: IPlugin = {
       options: options.route || {},
       handler: async (request, h) => {
         try {
-          const { gqlResponse, responseInit } = await runHttpQuery([request], {
-            method: request.method.toUpperCase(),
-            options: options.graphqlOptions,
-            query:
-              request.method === 'post'
-                ? //TODO type payload as string or Record
-                  (request.payload as any)
-                : request.query,
-            request: convertNodeHttpToRequest(request.raw.req),
-          });
+          const { graphqlResponse, responseInit } = await runHttpQuery(
+            [request],
+            {
+              method: request.method.toUpperCase(),
+              options: options.graphqlOptions,
+              query:
+                request.method === 'post'
+                  ? //TODO type payload as string or Record
+                    (request.payload as any)
+                  : request.query,
+              request: convertNodeHttpToRequest(request.raw.req),
+            },
+          );
 
-          const response = h.response(gqlResponse);
+          const response = h.response(graphqlResponse);
           Object.keys(responseInit.headers).forEach(key =>
             response.header(key, responseInit.headers[key]),
           );
-          response.header(
-            'Content-Length',
-            Buffer.byteLength(gqlResponse, 'utf8').toString(),
-          );
           return response;
         } catch (error) {
           if ('HttpQueryError' !== error.name) {

diff --git a/packages/apollo-server-koa/src/koaApollo.ts b/packages/apollo-server-koa/src/koaApollo.ts
@@ -36,15 +36,11 @@ export function graphqlKoa(
         ctx.request.method === 'POST' ? ctx.request.body : ctx.request.query,
       request: convertNodeHttpToRequest(ctx.req),
     }).then(
-      ({ gqlResponse, responseInit }) => {
+      ({ graphqlResponse, responseInit }) => {
         Object.keys(responseInit.headers).forEach(key =>
           ctx.set(key, responseInit.headers[key]),
         );
-        ctx.set(
-          'Content-Length',
-          Buffer.byteLength(gqlResponse, 'utf8').toString(),
-        );
-        ctx.body = gqlResponse;
+        ctx.body = graphqlResponse;
       },
       (error: HttpQueryError) => {
         if ('HttpQueryError' !== error.name) {

diff --git a/packages/apollo-server-lambda/src/lambdaApollo.ts b/packages/apollo-server-lambda/src/lambdaApollo.ts
@@ -42,7 +42,7 @@ export function graphqlLambda(
     let query =
         event.httpMethod === 'POST' ? event.body : event.queryStringParameters,
       statusCode: number = null,
-      gqlResponse = null,
+      graphqlResponse = null,
       headers: { [headerName: string]: string } = {};
 
     if (query && typeof query === 'string') {
@@ -56,22 +56,22 @@ export function graphqlLambda(
         query: query,
         request: event,
       });
-      gqlResponse = result.gqlResponse;
+      graphqlResponse = result.graphqlResponse;
       headers = result.responseInit.headers as Record<string, string>;
-      statusCode = result.responseInit.status;
+      statusCode = 200;
     } catch (error) {
       if ('HttpQueryError' !== error.name) {
         throw error;
       }
 
       headers = error.headers;
       statusCode = error.statusCode;
-      gqlResponse = error.message;
+      graphqlResponse = error.message;
     } finally {
       callback(null, {
         statusCode: statusCode,
         headers: headers,
-        body: gqlResponse,
+        body: graphqlResponse,
       });
     }
   };

diff --git a/packages/apollo-server-micro/src/microApollo.ts b/packages/apollo-server-micro/src/microApollo.ts
@@ -38,7 +38,7 @@ export function microGraphql(
     }
 
     try {
-      const { gqlResponse, responseInit } = await runHttpQuery([req, res], {
+      const { graphqlResponse, responseInit } = await runHttpQuery([req, res], {
         method: req.method,
         options: options,
         query: query,
@@ -47,11 +47,7 @@ export function microGraphql(
       Object.keys(responseInit.headers).forEach(key =>
         res.setHeader(key, responseInit.headers[key]),
       );
-      res.setHeader(
-        'Content-Length',
-        Buffer.byteLength(gqlResponse, 'utf8').toString(),
-      );
-      return gqlResponse;
+      return graphqlResponse;
     } catch (error) {
       if ('HttpQueryError' === error.name) {
         if (error.headers) {

diff --git a/packages/apollo-server-restify/src/restifyApollo.ts b/packages/apollo-server-restify/src/restifyApollo.ts
@@ -47,15 +47,11 @@ export function graphqlRestify(
       query: req.method === 'POST' ? req.body : req.query,
       request: convertNodeHttpToRequest(req),
     }).then(
-      ({ gqlResponse, responseInit }) => {
+      ({ graphqlResponse, responseInit }) => {
         Object.keys(responseInit.headers).forEach(key =>
           res.setHeader(key, responseInit.headers[key]),
         );
-        res.setHeader(
-          'Content-Length',
-          Buffer.byteLength(gqlResponse, 'utf8').toString(),
-        );
-        res.write(gqlResponse);
+        res.write(graphqlResponse);
         res.end();
         next();
       },