refactor(core) improve performance by moving reflection part (redirect)

Author: kamilmysliwiec

packages/core/helpers/handler-metadata-storage.ts

@@ -2,7 +2,6 @@ import { Controller } from '@nestjs/common/interfaces';
 import * as hash from 'object-hash';
 import { ContextId } from './../injector/instance-wrapper';
 import { ParamProperties } from './context-utils';
-import { RedirectResponse } from '../router/router-response-controller';
 
 export const HANDLER_METADATA_SYMBOL = Symbol.for('handler_metadata:cache');
 
@@ -12,7 +11,6 @@ export interface HandlerMetadata {
   httpStatusCode: number;
   responseHeaders: any[];
   hasCustomHeaders: boolean;
-  httpRedirectResponse: RedirectResponse;
   getParamsMetadata: (
     moduleKey: string,
     contextId?: ContextId,

packages/core/router/router-execution-context.ts

@@ -9,9 +9,9 @@ import {
   CUSTOM_ROUTE_AGRS_METADATA,
   HEADERS_METADATA,
   HTTP_CODE_METADATA,
+  REDIRECT_METADATA,
   RENDER_METADATA,
   ROUTE_ARGS_METADATA,
-  REDIRECT_METADATA,
 } from '@nestjs/common/constants';
 import { RouteParamsMetadata } from '@nestjs/common/decorators';
 import { RouteParamtypes } from '@nestjs/common/enums/route-paramtypes.enum';
@@ -88,7 +88,6 @@ export class RouterExecutionContext {
       httpStatusCode,
       responseHeaders,
       hasCustomHeaders,
-      httpRedirectResponse,
     } = this.getMetadata(instance, callback, methodName, module, requestMethod);
 
     const paramsOptions = this.contextUtils.mergeParamsMetatypes(
@@ -195,9 +194,11 @@ export class RouterExecutionContext {
         type === RouteParamtypes.RESPONSE || type === RouteParamtypes.NEXT,
     );
 
+    const httpRedirectResponse = this.reflectRedirect(callback);
     const fnHandleResponse = this.createHandleResponseFn(
       callback,
       isResponseHandled,
+      httpRedirectResponse,
     );
 
     const httpCode = this.reflectHttpStatusCode(callback);
@@ -207,17 +208,13 @@ export class RouterExecutionContext {
 
     const responseHeaders = this.reflectResponseHeaders(callback);
     const hasCustomHeaders = !isEmpty(responseHeaders);
-
-    const httpRedirectResponse = this.reflectRedirect(callback);
-
     const handlerMetadata: HandlerMetadata = {
       argsLength,
       fnHandleResponse,
       paramtypes,
       getParamsMetadata,
       httpStatusCode,
       hasCustomHeaders,
-      httpRedirectResponse,
       responseHeaders,
     };
     this.handlerMetadataStorage.set(instance, methodName, handlerMetadata);
@@ -368,22 +365,20 @@ export class RouterExecutionContext {
   public createHandleResponseFn(
     callback: (...args: any[]) => any,
     isResponseHandled: boolean,
+    redirectResponse?: RedirectResponse,
     httpStatusCode?: number,
   ) {
-    const redirectResponse = this.reflectRedirect(callback);
-    if (redirectResponse && redirectResponse.url) {
-      return async <TResult, TResponse>(result: TResult, res: TResponse) => {
-        await this.responseController.redirect(result, res, redirectResponse);
-      };
-    }
-
     const renderTemplate = this.reflectRenderTemplate(callback);
-
     if (renderTemplate) {
       return async <TResult, TResponse>(result: TResult, res: TResponse) => {
         await this.responseController.render(result, res, renderTemplate);
       };
     }
+    if (redirectResponse && redirectResponse.url) {
+      return async <TResult, TResponse>(result: TResult, res: TResponse) => {
+        await this.responseController.redirect(result, res, redirectResponse);
+      };
+    }
     return async <TResult, TResponse>(result: TResult, res: TResponse) => {
       result = await this.responseController.transformToResult(result);
       !isResponseHandled &&

packages/core/test/router/router-execution-context.spec.ts

@@ -298,11 +298,15 @@ describe('RouterExecutionContext', () => {
         const value = 'test';
         const response = { render: sinon.spy() };
 
-        sinon.stub(contextCreator, 'reflectRedirect').returns(undefined);
         sinon.stub(contextCreator, 'reflectResponseHeaders').returns([]);
         sinon.stub(contextCreator, 'reflectRenderTemplate').returns(template);
 
-        const handler = contextCreator.createHandleResponseFn(null, true, 200);
+        const handler = contextCreator.createHandleResponseFn(
+          null,
+          true,
+          undefined,
+          200,
+        );
         await handler(value, response);
 
         expect(response.render.calledWith(template, value)).to.be.true;
@@ -313,11 +317,15 @@ describe('RouterExecutionContext', () => {
         const result = Promise.resolve('test');
         const response = { render: sinon.spy() };
 
-        sinon.stub(contextCreator, 'reflectRedirect').returns(undefined);
         sinon.stub(contextCreator, 'reflectResponseHeaders').returns([]);
         sinon.stub(contextCreator, 'reflectRenderTemplate').returns(undefined);
 
-        const handler = contextCreator.createHandleResponseFn(null, true, 200);
+        const handler = contextCreator.createHandleResponseFn(
+          null,
+          true,
+          undefined,
+          200,
+        );
         handler(result, response);
 
         expect(response.render.called).to.be.false;
@@ -338,9 +346,12 @@ describe('RouterExecutionContext', () => {
         };
         const response = { redirect: sinon.spy() };
 
-        sinon.stub(contextCreator, 'reflectRedirect').returns(redirectResponse);
-
-        const handler = contextCreator.createHandleResponseFn(null, true, 200);
+        const handler = contextCreator.createHandleResponseFn(
+          () => {},
+          true,
+          redirectResponse,
+          200,
+        );
         await handler(redirectResponse, response);
 
         expect(
@@ -357,11 +368,15 @@ describe('RouterExecutionContext', () => {
         const result = Promise.resolve('test');
         const response = { redirect: sinon.spy() };
 
-        sinon.stub(contextCreator, 'reflectRedirect').returns(undefined);
         sinon.stub(contextCreator, 'reflectResponseHeaders').returns([]);
         sinon.stub(contextCreator, 'reflectRenderTemplate').returns(undefined);
 
-        const handler = contextCreator.createHandleResponseFn(null, true, 200);
+        const handler = contextCreator.createHandleResponseFn(
+          null,
+          true,
+          undefined,
+          200,
+        );
         handler(result, response);
 
         expect(response.redirect.called).to.be.false;