parallelize batch requests before apollographql#176

remind101 · Dec 15, 2016 · 55f4a08 · 55f4a08
1 parent 964e9e2
commit 55f4a08
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "graphql-server-express",
-  "version": "0.4.3",
+  "name": "@remind/graphql-server-express",
+  "version": "0.4.3-p1",
   "description": "Production-ready Node.js GraphQL server for Express and Connect",
   "main": "dist/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-express"
+    "url": "https://github.com/remind101/graphql-server/tree/master/packages/graphql-server-express"
   },
   "keywords": [
     "GraphQL",
@@ -22,7 +22,7 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/graphql-server/issues"
+    "url": "https://github.com/remind101/graphql-server/issues"
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {

diff --git a/packages/graphql-server-express/src/expressApollo.ts b/packages/graphql-server-express/src/expressApollo.ts
@@ -67,8 +67,7 @@ export function graphqlExpress(options: GraphQLOptions | ExpressGraphQLOptionsFu
       b = [b];
     }
 
-    let responses: Array<graphql.GraphQLResult> = [];
-    for (let requestParams of b) {
+    const requests = b.map(async (requestParams) => {
       try {
         const query = requestParams.query;
         const operationName = requestParams.operationName;
@@ -111,11 +110,13 @@ export function graphqlExpress(options: GraphQLOptions | ExpressGraphQLOptionsFu
           params = optionsObject.formatParams(params);
         }
 
-        responses.push(await runQuery(params));
+        return await runQuery(params);
       } catch (e) {
-        responses.push({ errors: [formatErrorFn(e)] });
+        return { errors: [formatErrorFn(e)] };
       }
-    }
+    });
+
+    const responses: graphql.GraphQLResult[] = await Promise.all(requests);
 
     res.setHeader('Content-Type', 'application/json');
     if (isBatch) {