feat(core): add register req provider helper

Author: kamilmysliwiec

packages/core/helpers/external-context-creator.ts

@@ -12,6 +12,7 @@ import { GuardsConsumer } from '../guards/guards-consumer';
 import { GuardsContextCreator } from '../guards/guards-context-creator';
 import { STATIC_CONTEXT } from '../injector/constants';
 import { NestContainer } from '../injector/container';
+import { ContextId } from '../injector/instance-wrapper';
 import { Module } from '../injector/module';
 import { ModulesContainer } from '../injector/modules-container';
 import { InterceptorsConsumer } from '../interceptors/interceptors-consumer';
@@ -40,6 +41,7 @@ export class ExternalContextCreator {
   private readonly handlerMetadataStorage = new HandlerMetadataStorage<
     ExternalHandlerMetadata
   >();
+  private container: NestContainer;
 
   constructor(
     private readonly guardsContextCreator: GuardsContextCreator,
@@ -72,7 +74,8 @@ export class ExternalContextCreator {
       container,
       container.applicationConfig,
     );
-    return new ExternalContextCreator(
+
+    const externalContextCreator = new ExternalContextCreator(
       guardsContextCreator,
       guardsConsumer,
       interceptorsContextCreator,
@@ -82,6 +85,8 @@ export class ExternalContextCreator {
       pipesConsumer,
       filtersContextCreator,
     );
+    externalContextCreator.container = container;
+    return externalContextCreator;
   }
 
   public create<
@@ -342,4 +347,8 @@ export class ExternalContextCreator {
     };
     return guards.length ? canActivateFn : null;
   }
+
+  public registerRequestProvider<T = any>(request: T, contextId: ContextId) {
+    this.container.registerRequestProvider<T>(request, contextId);
+  }
 }

packages/core/injector/container.ts

@@ -8,7 +8,9 @@ import { InvalidModuleException } from '../errors/exceptions/invalid-module.exce
 import { UnknownModuleException } from '../errors/exceptions/unknown-module.exception';
 import { ExternalContextCreator } from '../helpers/external-context-creator';
 import { HttpAdapterHost } from '../helpers/http-adapter-host';
+import { REQUEST } from '../router/request/request-constants';
 import { ModuleCompiler } from './compiler';
+import { ContextId } from './instance-wrapper';
 import { InternalCoreModule } from './internal-core-module';
 import { InternalProvidersStorage } from './internal-providers-storage';
 import { Module } from './module';
@@ -236,4 +238,12 @@ export class NestContainer {
   public getModuleTokenFactory(): ModuleTokenFactory {
     return this.moduleTokenFactory;
   }
+
+  public registerRequestProvider<T = any>(request: T, contextId: ContextId) {
+    const wrapper = this.internalCoreModule.getProviderByKey(REQUEST);
+    wrapper.setInstanceByContextId(contextId, {
+      instance: request,
+      isResolved: true,
+    });
+  }
 }

packages/core/middleware/middleware-module.ts

@@ -13,17 +13,14 @@ import { InvalidMiddlewareException } from '../errors/exceptions/invalid-middlew
 import { RuntimeException } from '../errors/exceptions/runtime.exception';
 import { createContextId } from '../helpers/context-id-factory';
 import { ExecutionContextHost } from '../helpers/execution-context-host';
+import { STATIC_CONTEXT } from '../injector/constants';
 import { NestContainer } from '../injector/container';
-import { ContextId, InstanceWrapper } from '../injector/instance-wrapper';
+import { Injector } from '../injector/injector';
+import { InstanceWrapper } from '../injector/instance-wrapper';
 import { Module } from '../injector/module';
-import {
-  REQUEST,
-  REQUEST_CONTEXT_ID,
-} from '../router/request/request-constants';
+import { REQUEST_CONTEXT_ID } from '../router/request/request-constants';
 import { RouterExceptionFilters } from '../router/router-exception-filters';
 import { RouterProxy } from '../router/router-proxy';
-import { STATIC_CONTEXT } from '../injector/constants';
-import { Injector } from '../injector/injector';
 import { MiddlewareBuilder } from './builder';
 import { MiddlewareContainer } from './container';
 import { MiddlewareResolver } from './resolver';
@@ -216,7 +213,7 @@ export class MiddlewareModule {
               writable: false,
               configurable: false,
             });
-            this.registerRequestProvider(req, contextId);
+            this.container.registerRequestProvider(req, contextId);
           }
           const contextInstance = await this.injector.loadPerContext(
             instance,
@@ -278,14 +275,4 @@ export class MiddlewareModule {
     }
     router(basePath + path, proxy);
   }
-
-  private registerRequestProvider<T = any>(request: T, contextId: ContextId) {
-    const coreModuleRef = this.container.getInternalCoreModuleRef();
-    const wrapper = coreModuleRef.getProviderByKey(REQUEST);
-
-    wrapper.setInstanceByContextId(contextId, {
-      instance: request,
-      isResolved: true,
-    });
-  }
 }

packages/core/router/router-explorer.ts

@@ -28,7 +28,6 @@ import { MetadataScanner } from '../metadata-scanner';
 import { PipesConsumer } from '../pipes/pipes-consumer';
 import { PipesContextCreator } from '../pipes/pipes-context-creator';
 import { ExceptionsFilter } from './interfaces/exceptions-filter.interface';
-import { REQUEST } from './request';
 import { REQUEST_CONTEXT_ID } from './request/request-constants';
 import { RouteParamsFactory } from './route-params-factory';
 import { RouterExecutionContext } from './router-execution-context';
@@ -250,7 +249,7 @@ export class RouterExplorer {
     ) => {
       try {
         const contextId = this.getContextId(req);
-        this.registerRequestProvider(req, contextId);
+        this.container.registerRequestProvider(req, contextId);
 
         const contextInstance = await this.injector.loadPerContext(
           instance,
@@ -285,16 +284,6 @@ export class RouterExplorer {
     };
   }
 
-  private registerRequestProvider<T = any>(request: T, contextId: ContextId) {
-    const coreModuleRef = this.container.getInternalCoreModuleRef();
-    const wrapper = coreModuleRef.getProviderByKey(REQUEST);
-
-    wrapper.setInstanceByContextId(contextId, {
-      instance: request,
-      isResolved: true,
-    });
-  }
-
   private getContextId<T extends Record<any, any> = any>(
     request: T,
   ): ContextId {

packages/microservices/listeners-controller.ts

@@ -121,10 +121,13 @@ export class ListenersController {
       try {
         const [data, reqCtx] = args;
         const contextId = createContextId();
-        this.registerRequestProvider(
-          RequestContextHost.create(pattern, data, reqCtx as BaseRpcContext),
-          contextId,
+
+        const req = RequestContextHost.create(
+          pattern,
+          data,
+          reqCtx as BaseRpcContext,
         );
+        this.container.registerRequestProvider(req, contextId);
 
         const contextInstance = await this.injector.loadPerContext(
           instance,

packages/microservices/test/listeners-controller.spec.ts

@@ -95,7 +95,7 @@ describe('ListenersController', () => {
       );
 
       sinon
-        .stub(instance as any, 'registerRequestProvider')
+        .stub((instance as any).container, 'registerRequestProvider')
         .callsFake(() => ({} as any));
     });