@rsdk/graphql 4.0.0-next.1 → 4.0.0-next.11

package/CHANGELOG.md

@@ -3,6 +3,52 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.0-next.11](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.10...v4.0.0-next.11) (2023-11-29)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.10](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.9...v4.0.0-next.10) (2023-11-29)
+
+## [3.8.0](https://github.com/R-Vision/rsdk/compare/v3.7.0...v3.8.0) (2023-11-15)
+
+### Features
+
+* added configuration for request logging and move to trace level all request logging ([#158](https://github.com/R-Vision/rsdk/issues/158)) ([0304672](https://github.com/R-Vision/rsdk/commit/0304672c112fd626642a2d44b0384fbf188e71b4))
+
+## [4.0.0-next.9](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.8...v4.0.0-next.9) (2023-11-29)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.8](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.7...v4.0.0-next.8) (2023-11-29)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.7](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.6...v4.0.0-next.7) (2023-11-21)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.6](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.5...v4.0.0-next.6) (2023-11-21)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.5](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.4...v4.0.0-next.5) (2023-11-13)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.4](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.3...v4.0.0-next.4) (2023-11-12)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.0.0-next.3](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.2...v4.0.0-next.3) (2023-11-12)
+
+### Bug Fixes
+
+* all yarn peers dependency issues ([e0db9ef](https://github.com/R-Vision/rsdk/commit/e0db9ef1ab8a4df4e1f8ff6f6a9e3728f497549b))
+
+## [4.0.0-next.2](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.1...v4.0.0-next.2) (2023-11-10)
+
+**Note:** Version bump only for package @rsdk/graphql
+
 ## [4.0.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.0...v4.0.0-next.1) (2023-11-10)
 
 **Note:** Version bump only for package @rsdk/graphql

package/dist/graphql-logger.interceptor.d.ts

@@ -0,0 +1,10 @@
+import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { ILogger } from '@rsdk/logging';
+import type { Observable } from 'rxjs/internal/Observable';
+import { GraphQLConfig } from './graphql.config';
+export declare class GraphqlLoggerInterceptor implements NestInterceptor {
+    private logger;
+    private graphQLConfig;
+    constructor(logger: ILogger, graphQLConfig: GraphQLConfig);
+    intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any> | Promise<Observable<any>>;
+}

package/dist/graphql-logger.interceptor.js

@@ -0,0 +1,80 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GraphqlLoggerInterceptor = void 0;
+const common_1 = require("@nestjs/common");
+const graphql_1 = require("@nestjs/graphql");
+const core_1 = require("@rsdk/core");
+const throwError_1 = require("rxjs/internal/observable/throwError");
+const catchError_1 = require("rxjs/internal/operators/catchError");
+const tap_1 = require("rxjs/internal/operators/tap");
+const graphql_config_1 = require("./graphql.config");
+let GraphqlLoggerInterceptor = class GraphqlLoggerInterceptor {
+    logger;
+    graphQLConfig;
+    constructor(logger, graphQLConfig) {
+        this.logger = logger;
+        this.graphQLConfig = graphQLConfig;
+    }
+    intercept(context, next) {
+        if (!this.graphQLConfig.requestLogging) {
+            return next.handle();
+        }
+        const isGraphql = context.getType() === 'graphql';
+        if (!isGraphql) {
+            return next.handle();
+        }
+        const { req: request } = graphql_1.GqlExecutionContext.create(context).getContext();
+        const startDate = Date.now();
+        const requestForLog = {
+            body: request.body,
+            query: request.query,
+            params: request.params,
+            method: request.method,
+            url: request.url,
+            headers: request.headers,
+        };
+        this.logger.trace('received graphql request', {
+            request: requestForLog,
+            timestamp: startDate,
+        });
+        return next.handle().pipe((0, catchError_1.catchError)((error) => {
+            const endDate = Date.now();
+            this.logger.trace('handled graphql request with error', {
+                request: requestForLog,
+                startDate,
+                endDate,
+                duration: endDate - startDate,
+                error,
+            });
+            return (0, throwError_1.throwError)(() => error);
+        }), (0, tap_1.tap)((response) => {
+            const endDate = Date.now();
+            this.logger.trace('handled graphql request', {
+                request: requestForLog,
+                startDate,
+                endDate,
+                duration: endDate - startDate,
+                response,
+            });
+        }));
+    }
+};
+exports.GraphqlLoggerInterceptor = GraphqlLoggerInterceptor;
+exports.GraphqlLoggerInterceptor = GraphqlLoggerInterceptor = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, core_1.InjectLogger)(GraphqlLoggerInterceptor)),
+    __metadata("design:paramtypes", [Object, graphql_config_1.GraphQLConfig])
+], GraphqlLoggerInterceptor);
+//# sourceMappingURL=graphql-logger.interceptor.js.map

package/dist/graphql-logger.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graphql-logger.interceptor.js","sourceRoot":"","sources":["../src/graphql-logger.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAA4C;AAE5C,6CAAsD;AACtD,qCAA0C;AAG1C,oEAAiE;AACjE,mEAAgE;AAChE,qDAAkD;AAElD,qDAAiD;AAG1C,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEe;IACxC;IAFV,YACkD,MAAe,EACvD,aAA4B;QADY,WAAM,GAAN,MAAM,CAAS;QACvD,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IAEJ,SAAS,CACP,OAAyB,EACzB,IAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE;YACtC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;SACtB;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAkB,KAAK,SAAS,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;SACtB;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAE1E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YAC5C,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACvB,IAAA,uBAAU,EAAC,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;gBACtD,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,KAAK;aACN,CAAC,CAAC;YACH,OAAO,IAAA,uBAAU,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,EACF,IAAA,SAAG,EAAC,CAAC,QAAQ,EAAE,EAAE;YACf,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBAC3C,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA7DY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,mBAAY,EAAC,wBAAwB,CAAC,CAAA;6CAChB,8BAAa;GAH3B,wBAAwB,CA6DpC"}

package/dist/graphql.config.d.ts

@@ -1,4 +1,5 @@
 import { Config } from '@rsdk/core';
 export declare class GraphQLConfig extends Config {
     playground: boolean;
+    requestLogging: boolean;
 }

package/dist/graphql.config.js

@@ -11,9 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLConfig = void 0;
 const core_1 = require("@rsdk/core");
-let GraphQLConfig = exports.GraphQLConfig = class GraphQLConfig extends core_1.Config {
+let GraphQLConfig = class GraphQLConfig extends core_1.Config {
     playground;
+    requestLogging;
 };
+exports.GraphQLConfig = GraphQLConfig;
 __decorate([
     (0, core_1.Property)('GRAPHQL_ENABLE_PLAYGROUND', new core_1.BoolParser(), {
         defaultValue: false,
@@ -21,6 +23,13 @@ __decorate([
     }),
     __metadata("design:type", Boolean)
 ], GraphQLConfig.prototype, "playground", void 0);
+__decorate([
+    (0, core_1.Property)('GRAPHQL_REQUEST_LOGGING', new core_1.BoolParser(), {
+        defaultValue: false,
+        description: 'Enable trace logging all requests',
+    }),
+    __metadata("design:type", Boolean)
+], GraphQLConfig.prototype, "requestLogging", void 0);
 exports.GraphQLConfig = GraphQLConfig = __decorate([
     (0, core_1.ConfigSection)({
         tags: [core_1.ConfigTag.infrastructure, core_1.ConfigTag.transport, core_1.ConfigTag.graphql],

package/dist/graphql.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.config.js","sourceRoot":"","sources":["../src/graphql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAMoB;AAKb,IAAM,aAAa,2BAAnB,MAAM,aAAc,SAAQ,aAAM;IAKvC,UAAU,CAAW;CACtB,CAAA;AADC;IAJC,IAAA,eAAQ,EAAC,2BAA2B,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,8CAA8C;KAC5D,CAAC;;iDACmB;wBALV,aAAa;IAHzB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,OAAO,CAAC;KACzE,CAAC;GACW,aAAa,CAMzB"}
+{"version":3,"file":"graphql.config.js","sourceRoot":"","sources":["../src/graphql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAMoB;AAKb,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,aAAM;IAKvC,UAAU,CAAW;IAMrB,cAAc,CAAW;CAC1B,CAAA;AAZY,sCAAa;AAKxB;IAJC,IAAA,eAAQ,EAAC,2BAA2B,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,8CAA8C;KAC5D,CAAC;;iDACmB;AAMrB;IAJC,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;qDACuB;wBAXd,aAAa;IAHzB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,OAAO,CAAC;KACzE,CAAC;GACW,aAAa,CAYzB"}

package/dist/graphql.plugin.d.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareConsumer } from '@nestjs/common';
-import type { IErrorsFormatter, IErrorsSender, PlatformAppPlugin } from '@rsdk/core';
+import type { IErrorsFormatter, IErrorsSender, NestModuleDefinitions, PlatformAppPlugin } from '@rsdk/core';
 export type Approach = 'schema-first' | 'code-first';
 export interface GraphQLPluginOptions<T extends Approach> {
     approach: T;
@@ -19,7 +19,7 @@ export declare class GraphQLPlugin implements PlatformAppPlugin {
     private readonly path;
     constructor(options: GraphQLPluginCodeFirstOptions | GraphQLPluginSchemaFirstOptions);
     forTransports(): Readonly<string[]>;
-    modules(): any[];
+    modules(): NestModuleDefinitions;
     configureMiddleware(consumer: MiddlewareConsumer): void;
     errorFormatter(): IErrorsFormatter;
     errorSender(): IErrorsSender;

package/dist/graphql.plugin.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLPlugin = exports.isCodeFirst = exports.isSchemaFirst = void 0;
 const apollo_1 = require("@nestjs/apollo");
+const core_1 = require("@nestjs/core");
 const graphql_1 = require("@nestjs/graphql");
 const logging_1 = require("@rsdk/logging");
 const apollo_logger_adapter_1 = require("./apollo-logger.adapter");
 const error_handling_1 = require("./error-handling");
 const graphql_config_1 = require("./graphql.config");
+const graphql_logger_interceptor_1 = require("./graphql-logger.interceptor");
 const onConnect = (connectionParams) => {
     const out = connectionParams ?? {};
     const headers = out.headers ?? {};
@@ -26,7 +28,7 @@ class GraphQLPlugin {
     path;
     constructor(options) {
         this.options = options;
-        this.path = options.path || '/graphql';
+        this.path = options?.path || '/graphql';
         if (!this.path.startsWith('/')) {
             this.path = '/' + this.path;
         }
@@ -36,6 +38,15 @@ class GraphQLPlugin {
     }
     modules() {
         return [
+            {
+                module: GraphQLPlugin,
+                providers: [
+                    {
+                        provide: core_1.APP_INTERCEPTOR,
+                        useClass: graphql_logger_interceptor_1.GraphqlLoggerInterceptor,
+                    },
+                ],
+            },
             graphql_1.GraphQLModule.forRootAsync({
                 inject: [graphql_config_1.GraphQLConfig],
                 driver: apollo_1.ApolloDriver,

package/dist/graphql.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/graphql",
-  "version": "4.0.0-next.1",
+  "version": "4.0.0-next.11",
   "description": "Plugin for graphql",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -13,17 +13,23 @@
   "scripts": {
     "prepublishOnly": "npm run build"
   },
+  "dependencies": {
+    "@apollo/server": "^4.9.5",
+    "@apollo/utils.logger": "^2.0.0"
+  },
   "peerDependencies": {
-    "@apollo/utils.logger": "^2.0.0",
-    "@nestjs/apollo": "^12.0.7",
-    "@nestjs/common": "^10.1.3",
-    "@nestjs/graphql": "^12.0.8",
-    "@rsdk/common": "^3.5.0",
-    "@rsdk/core": "^4.0.0-next.1",
-    "@rsdk/logging": "^4.0.0-next.1",
+    "@nestjs/apollo": "^12.0.0",
+    "@nestjs/common": "^10.0.0",
+    "@nestjs/core": "^10.0.0",
+    "@nestjs/graphql": "^12.0.0",
+    "@rsdk/common": "^4.0.0-next.11",
+    "@rsdk/core": "^4.0.0-next.11",
+    "@rsdk/http.server.express": "^4.0.0-next.11",
+    "@rsdk/logging": "^4.0.0-next.11",
     "graphql": "^16.6.0",
     "graphql-subscriptions": "^2.0.0",
+    "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "d21a800ef5dd191b5effec59846c3a44a7ca3d1e"
+  "gitHead": "f1339ae22d78b41382b82a0feabacd49be19acd2"
 }

package/src/graphql-logger.interceptor.ts

@@ -0,0 +1,80 @@
+import type {
+  CallHandler,
+  ExecutionContext,
+  NestInterceptor,
+} from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
+import type { GqlContextType } from '@nestjs/graphql';
+import { GqlExecutionContext } from '@nestjs/graphql';
+import { InjectLogger } from '@rsdk/core';
+import { ILogger } from '@rsdk/logging';
+import type { Observable } from 'rxjs/internal/Observable';
+import { throwError } from 'rxjs/internal/observable/throwError';
+import { catchError } from 'rxjs/internal/operators/catchError';
+import { tap } from 'rxjs/internal/operators/tap';
+
+import { GraphQLConfig } from './graphql.config';
+
+@Injectable()
+export class GraphqlLoggerInterceptor implements NestInterceptor {
+  constructor(
+    @InjectLogger(GraphqlLoggerInterceptor) private logger: ILogger,
+    private graphQLConfig: GraphQLConfig,
+  ) {}
+
+  intercept(
+    context: ExecutionContext,
+    next: CallHandler<any>,
+  ): Observable<any> | Promise<Observable<any>> {
+    if (!this.graphQLConfig.requestLogging) {
+      return next.handle();
+    }
+    const isGraphql = context.getType<GqlContextType>() === 'graphql';
+    if (!isGraphql) {
+      return next.handle();
+    }
+
+    const { req: request } = GqlExecutionContext.create(context).getContext();
+
+    const startDate = Date.now();
+    const requestForLog = {
+      body: request.body,
+      query: request.query,
+      params: request.params,
+      method: request.method,
+      url: request.url,
+      headers: request.headers,
+    };
+
+    this.logger.trace('received graphql request', {
+      request: requestForLog,
+      timestamp: startDate,
+    });
+
+    return next.handle().pipe(
+      catchError((error) => {
+        const endDate = Date.now();
+
+        this.logger.trace('handled graphql request with error', {
+          request: requestForLog,
+          startDate,
+          endDate,
+          duration: endDate - startDate,
+          error,
+        });
+        return throwError(() => error);
+      }),
+      tap((response) => {
+        const endDate = Date.now();
+
+        this.logger.trace('handled graphql request', {
+          request: requestForLog,
+          startDate,
+          endDate,
+          duration: endDate - startDate,
+          response,
+        });
+      }),
+    );
+  }
+}

package/src/graphql.config.ts

@@ -15,4 +15,10 @@ export class GraphQLConfig extends Config {
     description: 'Enables GraphQL playground and introspection',
   })
   playground!: boolean;
+
+  @Property('GRAPHQL_REQUEST_LOGGING', new BoolParser(), {
+    defaultValue: false,
+    description: 'Enable trace logging all requests',
+  })
+  requestLogging!: boolean;
 }

package/src/graphql.plugin.ts

@@ -1,10 +1,12 @@
 import type { ApolloDriverConfig } from '@nestjs/apollo';
 import { ApolloDriver } from '@nestjs/apollo';
 import type { MiddlewareConsumer } from '@nestjs/common';
+import { APP_INTERCEPTOR } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
 import type {
   IErrorsFormatter,
   IErrorsSender,
+  NestModuleDefinitions,
   PlatformAppPlugin,
 } from '@rsdk/core';
 import { LoggerFactory } from '@rsdk/logging';
@@ -12,6 +14,7 @@ import { LoggerFactory } from '@rsdk/logging';
 import { ApolloLoggerAdapter } from './apollo-logger.adapter';
 import { GraphQLErrorsFormatter, GraphQLErrorsSender } from './error-handling';
 import { GraphQLConfig } from './graphql.config';
+import { GraphqlLoggerInterceptor } from './graphql-logger.interceptor';
 
 const onConnect = (connectionParams: any): any => {
   const out = connectionParams ?? {};
@@ -67,7 +70,7 @@ export class GraphQLPlugin implements PlatformAppPlugin {
       | GraphQLPluginCodeFirstOptions
       | GraphQLPluginSchemaFirstOptions,
   ) {
-    this.path = options.path || '/graphql';
+    this.path = options?.path || '/graphql';
     if (!this.path.startsWith('/')) {
       this.path = '/' + this.path;
     }
@@ -77,8 +80,17 @@ export class GraphQLPlugin implements PlatformAppPlugin {
     return ['http'];
   }
 
-  modules(): any[] {
+  modules(): NestModuleDefinitions {
     return [
+      {
+        module: GraphQLPlugin,
+        providers: [
+          {
+            provide: APP_INTERCEPTOR,
+            useClass: GraphqlLoggerInterceptor,
+          },
+        ],
+      },
       GraphQLModule.forRootAsync<ApolloDriverConfig>({
         inject: [GraphQLConfig],
         driver: ApolloDriver,