Merge branch 'master' of github.com:Urigo/graphql-modules

Author: ardatan

packages/core/src/graphql-module.ts

@@ -1020,14 +1020,30 @@ export class GraphQLModule<
                 try {
                   moduleContext = await this.context(info.session, true);
                 } catch (e) {
+                  moduleContext.injector.callHookWithArgsAsync({
+                    hook: 'onError',
+                    args: [e],
+                    instantiate: true
+                  });
                   const logger = this.selfLogger;
                   if ('clientError' in logger) {
                     logger.clientError(e);
                   }
                   throw e;
                 }
                 info.schema = this.schema;
-                return resolver.call(typeResolvers, root, moduleContext, info);
+                let result;
+                try {
+                  result = await resolver.call(typeResolvers, root, moduleContext, info);
+                } catch (e) {
+                  moduleContext.injector.callHookWithArgsAsync({
+                    hook: 'onError',
+                    args: [e],
+                    instantiate: true
+                  });
+                  throw e;
+                }
+                return result;
               };
             } else {
               typeResolvers[prop] = async (root: any, args: any, appContext: any, info: any) => {
@@ -1041,14 +1057,30 @@ export class GraphQLModule<
                 try {
                   moduleContext = await this.context(info.session, true);
                 } catch (e) {
+                  moduleContext.injector.callHookWithArgsAsync({
+                    hook: 'onError',
+                    args: [e],
+                    instantiate: true
+                  });
                   const logger = this.selfLogger;
                   if ('clientError' in logger) {
                     logger.clientError(e);
                   }
                   throw e;
                 }
                 info.schema = this.schema;
-                return resolver.call(typeResolvers[prop], root, args, moduleContext, info);
+                let result;
+                try {
+                  result = await resolver.call(typeResolvers[prop], root, args, moduleContext, info);
+                } catch (e) {
+                  moduleContext.injector.callHookWithArgsAsync({
+                    hook: 'onError',
+                    args: [e],
+                    instantiate: true
+                  });
+                  throw e;
+                }
+                return result;
               };
             }
           } else if (resolver && typeof resolver === 'object' && resolver['subscribe']) {
@@ -1071,7 +1103,18 @@ export class GraphQLModule<
                 throw e;
               }
               info.schema = this.schema;
-              return subscriber.call(typeResolvers[prop], root, args, moduleContext, info);
+              let result;
+              try {
+                result = await subscriber.call(typeResolvers[prop], root, args, moduleContext, info);
+              } catch (e) {
+                moduleContext.injector.callHookWithArgsAsync({
+                  hook: 'onError',
+                  args: [e],
+                  instantiate: true
+                });
+                throw e;
+              }
+              return result;
             };
           }
         }

packages/core/src/types.ts

@@ -37,15 +37,20 @@ export type OnOperationCompleteFn<WebSocket = any, OpId = string, OnOperationCom
   opId: OpId
 ) => OnOperationCompleteResult;
 export interface OnOperationComplete<WebSocket = any, OpId = string, OnOperationCompleteResult = any> {
-  onOperationComplete?: OnOperationCompleteFn<WebSocket, OpId, OnOperationCompleteResult>;
+  onOperationComplete: OnOperationCompleteFn<WebSocket, OpId, OnOperationCompleteResult>;
 }
 
 export type OnDisconnectFn<WebSocket = any, ConnectionContext = any, Result = any> = (
   websocket: WebSocket,
   connectionContext: ConnectionContext
 ) => Result;
 export interface OnDisconnect<WebSocket = any, ConnectionContext = any, Result = any> {
-  onDisconnect?: OnDisconnectFn<WebSocket, ConnectionContext, Result>;
+  onDisconnect: OnDisconnectFn<WebSocket, ConnectionContext, Result>;
+}
+
+export type OnErrorFn = (e: Error) => any;
+export interface OnError {
+  onError: OnError;
 }
 
 export interface SubscriptionHooks<