WIP

apollographql · Jan 24, 2017 · d96db0e · d96db0e
1 parent 3d297c9
commit d96db0e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 148 deletions.
diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-lambda",
-  "version": "0.4.3",
+  "version": "0.5.1",
   "description": "Production-ready Node.js GraphQL server for AWS Lambda",
   "main": "dist/index.js",
   "scripts": {
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "graphql-server-core": "^0.5.0",
+    "graphql-server-core": "^0.5.1",
     "graphql-server-module-graphiql": "^0.4.4"
   },
   "devDependencies": {

diff --git a/packages/graphql-server-lambda/src/lambdaApollo.test.ts b/packages/graphql-server-lambda/src/lambdaApollo.test.ts
@@ -30,6 +30,7 @@ function createLambda(options: CreateAppOptions = {}) {
       };
       context = {};
       callback = function(error, result) {
+          console.log('Called callback');
         res.statusCode = result.statusCode;
         for (let key in result.headers) {
           if (result.headers.hasOwnProperty(key)) {
@@ -52,7 +53,7 @@ describe('lambdaApollo', () => {
 
   it('throws an error if called with more than one argument', function(){
     expect(() => (<any>graphqlLambda)({}, {})).to.throw(
-       'Apollo Server expects exactly one arguments, got 2');
+       'Apollo Server expects exactly one argument, got 2');
   });
 });
 

diff --git a/packages/graphql-server-lambda/src/lambdaApollo.ts b/packages/graphql-server-lambda/src/lambdaApollo.ts
@@ -1,7 +1,6 @@
 import * as lambda from 'aws-lambda';
-import * as graphql from 'graphql';
 import * as url from 'url';
-import { GraphQLOptions, runQuery } from 'graphql-server-core';
+import { GraphQLOptions, runHttpQuery } from 'graphql-server-core';
 import * as GraphiQL from 'graphql-server-module-graphiql';
 
 export interface LambdaGraphQLOptionsFunction {
@@ -26,168 +25,46 @@ export function graphqlLambda( options: GraphQLOptions | LambdaGraphQLOptionsFun
     throw new Error('Apollo Server requires options.');
   }
 
-  if (arguments.length > 2) {
+  if (arguments.length > 1) {
     throw new Error(`Apollo Server expects exactly one argument, got ${arguments.length}`);
   }
 
   return async (event, lambdaContext: lambda.Context, callback: lambda.Callback) => {
-    const headers: string[] = [];
-    let optionsObject: GraphQLOptions;
-    if (isOptionsFunction(options)) {
-      try {
-        optionsObject = await options(event, lambdaContext);
-      } catch (e) {
-        callback(
-          null,
-          {
-            'statusCode': 500,
-            'headers': headers,
-            'body': `Invalid options provided to ApolloServer: ${e.message}`,
-          },
-        );
-        return;
-      }
-    } else {
-      optionsObject = options;
-    }
-
-    const formatErrorFn = optionsObject.formatError || graphql.formatError;
-
-    if (event.httpMethod !== 'POST') {
-      headers['Allow'] = 'Post';
-      callback(
-        null,
-        {
-          'statusCode': 405,
-          'headers': headers,
-          'body': 'Apollo Server supports only POST requests.',
-        },
-      );
-      return;
-    }
+    const query = event.httpMethod === 'POST' ? JSON.parse(event.body) : event.queryStringParameters;
+    let statusCode: number = null,
+      gqlResponse = null,
+      headers: string[] = [];
 
-    if (!event.body) {
-      callback(
-        null,
-        {
-          'statusCode': 500,
-          'headers': headers,
-          'body': 'POST body missing.',
-        },
-      );
-      return;
-    }
-
-    let b;
     try {
-       b = JSON.parse(event.body);
+        console.log(query);
+      gqlResponse = await runHttpQuery([event, lambdaContext], {
+        method: event.httpMethod,
+        options: options,
+        query: query,
+      });
+      headers['Content-Type'] = 'application/json';
+      statusCode = 200;
     } catch (error) {
-      callback(
-        null,
-        {
-          'statusCode': 500,
-          'headers': headers,
-          'body': 'POST body is invalid JSON.',
-        },
-      );
-      return;
-    }
-    let isBatch = true;
-    // TODO: do something different here if the body is an array.
-    // Throw an error if body isn't either array or object.
-    if (!Array.isArray(b)) {
-      isBatch = false;
-      b = [b];
-    }
-
-    let responses: Array<graphql.GraphQLResult> = [];
-    for (let requestParams of b) {
-      try {
-        const query = requestParams.query;
-        const operationName = requestParams.operationName;
-        let variables = requestParams.variables;
-
-        if (typeof variables === 'string') {
-          try {
-            variables = JSON.parse(variables);
-          } catch (error) {
-            callback(
-              null,
-              {
-                'statusCode': 400,
-                'headers': headers,
-                'body': 'Variables are invalid JSON.',
-              },
-            );
-            return;
-          }
-        }
-
-        // Shallow clone context for queries in batches. This allows
-        // users to distinguish multiple queries in the batch and to
-        // modify the context object without interfering with each other.
-        let context = optionsObject.context;
-        if (isBatch) {
-          context = Object.assign({},  context || {});
-        }
-
-        let params = {
-          schema: optionsObject.schema,
-          query: query,
-          variables: variables,
-          context: context,
-          rootValue: optionsObject.rootValue,
-          operationName: operationName,
-          logFunction: optionsObject.logFunction,
-          validationRules: optionsObject.validationRules,
-          formatError: formatErrorFn,
-          formatResponse: optionsObject.formatResponse,
-          debug: optionsObject.debug,
-        };
-
-        if (optionsObject.formatParams) {
-          params = optionsObject.formatParams(params);
-        }
-
-        responses.push(await runQuery(params));
-      } catch (e) {
-        responses.push({ errors: [formatErrorFn(e)] });
+      if ( 'HttpQueryError' !== error.name ) {
+        throw error;
       }
-    }
 
-    let statusCode = 200;
-    headers['Content-Type'] = 'application/json';
-    if (isBatch) {
+      headers = error.headers;
+      statusCode = error.statusCode;
+      gqlResponse = error.response;
+    } finally {
       callback(
         null,
         {
           'statusCode': statusCode,
           'headers': headers,
-          'body': JSON.stringify(responses),
-        },
-      );
-    } else {
-      const gqlResponse = responses[0];
-      if (gqlResponse.errors && typeof gqlResponse.data === 'undefined') {
-        statusCode = 400;
-      }
-      callback(
-        null,
-        {
-          'statusCode': statusCode,
-          'headers': headers,
-          'body': JSON.stringify(gqlResponse),
+          'body': gqlResponse,
         },
       );
     }
-
   };
 }
 
-function isOptionsFunction(arg: GraphQLOptions | LambdaGraphQLOptionsFunction): arg is LambdaGraphQLOptionsFunction {
-  return typeof arg === 'function';
-}
-
 /* This Lambda Function Handler returns the html for the GraphiQL interactive query UI
  *
  * GraphiQLData arguments

diff --git a/packages/graphql-server-lambda/tsconfig.json b/packages/graphql-server-lambda/tsconfig.json
@@ -15,7 +15,7 @@
         "node_modules/@types"
     ],
     "types": [
-        "typed-graphql",
+        "@types/graphql",
         "@types/node"
     ]
   },

diff --git a/test/tests.js b/test/tests.js
@@ -11,3 +11,4 @@ require('../packages/graphql-server-express/dist/connectApollo.test');
 require('../packages/graphql-server-hapi/dist/hapiApollo.test');
 require('../packages/graphql-server-koa/dist/koaApollo.test');
 require('../packages/graphql-server-express/dist/apolloServerHttp.test');
+require('../packages/graphql-server-lambda/dist/lambdaApollo.test');