fix: make handler and schema creation pluginable

webiny · Mar 24, 2020 · cab9340 · cab9340
1 parent 87c6610
commit cab9340
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 35 deletions.
diff --git a/packages/http-handler-apollo-server/src/index.ts b/packages/http-handler-apollo-server/src/index.ts
@@ -1,8 +1,8 @@
 import { HttpHandlerApolloServerOptions } from "./types";
-import apolloHandlerPlugin from "./apolloHandlerPlugin";
-import createHandlerApolloServerPlugin from "./createHandlerApolloServerPlugin";
+import { createSchema, createHandlerApolloServer, apolloHandler } from "./plugins";
 
 export default (options: HttpHandlerApolloServerOptions = {}) => [
-    createHandlerApolloServerPlugin(options),
-    apolloHandlerPlugin
+    createHandlerApolloServer(options),
+    apolloHandler,
+    createSchema
 ];
diff --git a/...-apollo-server/src/apolloHandlerPlugin.ts → ...pollo-server/src/plugins/apolloHandler.ts b/...-apollo-server/src/apolloHandlerPlugin.ts → ...pollo-server/src/plugins/apolloHandler.ts
@@ -1,8 +1,7 @@
 import { ApolloServer } from "apollo-server-lambda";
-import { CreateApolloHandlerPlugin } from "./types";
+import { CreateApolloHandlerPlugin } from "./../types";
 import { boolean } from "boolean";
-import { Plugin, PluginsContainer } from "@webiny/plugins/types";
-import { GraphQLSchema } from "graphql";
+import { CreateSchemaPlugin } from "@webiny/http-handler-apollo-server/types";
 
 function normalizeEvent(event) {
     // In AWS, when enabling binary support, received body gets base64 encoded. Did not find a way to solve this
@@ -13,16 +12,16 @@ function normalizeEvent(event) {
     }
 }
 
-export type CreateSchemaPlugin = Plugin & {
-    name: "handler-apollo-server-create-schema";
-    type: "handler-apollo-server-create-schema";
-    create(params: { plugins: PluginsContainer }): { schema: GraphQLSchema };
-};
+let cache;
 
 const plugin: CreateApolloHandlerPlugin = {
-    name: "handler-apollo-server-create",
-    type: "handler-apollo-server-create",
+    name: "handler-apollo-server-create-handler",
+    type: "handler-apollo-server-create-handler",
     async create({ context, options }) {
+        if (cache) {
+            return cache;
+        }
+
         const { server = {}, handler = {} } = options;
 
         const createSchemaPlugin = context.plugins.byName<CreateSchemaPlugin>(
@@ -58,7 +57,7 @@ const plugin: CreateApolloHandlerPlugin = {
             }
         });
 
-        return {
+        cache = {
             schema,
             handler: (event, context) => {
                 normalizeEvent(event);
@@ -73,6 +72,8 @@ const plugin: CreateApolloHandlerPlugin = {
                 });
             }
         };
+
+        return cache;
     }
 };
 

diff --git a/...er/src/createHandlerApolloServerPlugin.ts → .../src/plugins/createHandlerApolloServer.ts b/...er/src/createHandlerApolloServerPlugin.ts → .../src/plugins/createHandlerApolloServer.ts
@@ -1,9 +1,7 @@
 import { createResponse } from "@webiny/http-handler";
 import { HttpHandlerPlugin } from "@webiny/http-handler/types";
 import { boolean } from "boolean";
-import { CreateApolloHandlerPlugin, HttpHandlerApolloServerOptions } from "./types";
-
-let apolloHandler;
+import { CreateApolloHandlerPlugin, HttpHandlerApolloServerOptions } from "./../types";
 
 export default (options: HttpHandlerApolloServerOptions = {}): HttpHandlerPlugin => ({
     type: "handler",
@@ -15,25 +13,22 @@ export default (options: HttpHandlerApolloServerOptions = {}): HttpHandlerPlugin
     async handle({ args, context }) {
         const [event] = args;
         try {
-            if (!apolloHandler) {
-                const createApolloHandlerPlugin = context.plugins.byName<CreateApolloHandlerPlugin>(
-                    "handler-apollo-server-create"
-                );
-
-                if (!createApolloHandlerPlugin) {
-                    throw Error(`"handler-apollo-server-create" plugin is not configured!`);
-                }
-
-                const { handler } = await createApolloHandlerPlugin.create({
-                    context,
-                    options
-                });
+            const createApolloHandlerPlugin = context.plugins.byName<CreateApolloHandlerPlugin>(
+                "handler-apollo-server-create-handler"
+            );
 
-                apolloHandler = handler;
+            if (!createApolloHandlerPlugin) {
+                throw Error(`"handler-apollo-server-create-handler" plugin is not configured!`);
             }
 
+            const { handler } = await createApolloHandlerPlugin.create({
+                args,
+                context,
+                options
+            });
+
             // Will return the complete response, including "statusCode", "headers", and "body" fields.
-            return await apolloHandler(event, context);
+            return await handler(event, context);
         } catch (e) {
             const { ...requestContext } = event.requestContext;
             const report = {

diff --git a/packages/http-handler-apollo-server/src/plugins/createSchema.ts b/packages/http-handler-apollo-server/src/plugins/createSchema.ts
@@ -0,0 +1,7 @@
+import { createSchema } from "@webiny/graphql";
+
+export default {
+    type: "handler-apollo-server-create-schema",
+    name: "handler-apollo-server-create-schema",
+    create: createSchema
+};
diff --git a/packages/http-handler-apollo-server/src/plugins/index.ts b/packages/http-handler-apollo-server/src/plugins/index.ts
@@ -0,0 +1,3 @@
+export { default as createSchema } from "./createSchema";
+export { default as createHandlerApolloServer } from "./createHandlerApolloServer";
+export { default as apolloHandler } from "./apolloHandler";
diff --git a/packages/http-handler-apollo-server/src/types.ts b/packages/http-handler-apollo-server/src/types.ts
@@ -1,6 +1,6 @@
 import { HttpHandlerContext } from "@webiny/http-handler/types";
 import { GraphQLSchema } from "graphql";
-import { Plugin } from "@webiny/plugins/types";
+import { Plugin, PluginsContainer } from "@webiny/plugins/types";
 
 export interface HttpHandlerApolloServerOptions {
     debug?: boolean | string;
@@ -19,9 +19,16 @@ type CreateApolloHandlerPluginCreateResponse = {
 };
 
 export type CreateApolloHandlerPlugin = Plugin & {
-    type: "handler-apollo-server-create";
+    type: "handler-apollo-server-create-handler";
     create(params: {
+        args: Array<{ [key: string]: any }>;
         options: HttpHandlerApolloServerOptions;
         context: HttpHandlerContext;
     }): CreateApolloHandlerPluginCreateResponse | Promise<CreateApolloHandlerPluginCreateResponse>;
 };
+
+export type CreateSchemaPlugin = Plugin & {
+    name: "handler-apollo-server-create-schema";
+    type: "handler-apollo-server-create-schema";
+    create(params: { plugins: PluginsContainer }): { schema: GraphQLSchema };
+};