chore: update error message

Fix shutdown hooks order

.circleci/config.yml

@@ -6,16 +6,16 @@ parameters:
     default: false
   legacy-node-version:
     type: string
-    default: '14.21.3'
+    default: '18.20'
   maintenance-node-version:
     type: string
-    default: '16.20'
+    default: '20.18'
   active-node-version:
     type: string
-    default: '18.17'
+    default: '22.11'
   current-node-version:
     type: string
-    default: '20.5'
+    default: '23.3'
 
 aliases:
   - &restore-cache
@@ -121,14 +121,14 @@ jobs:
   lint:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:<< pipeline.parameters.maintenance-node-version >>
+      - image: cimg/node:<< pipeline.parameters.active-node-version >>
     steps:
       - checkout
       - *restore-cache
       - *install-deps
       - run:
           name: Lint
-          command: npm run lint
+          command: npm run lint:ci
 
   integration_tests:
     working_directory: ~/nest

.circleci/install-wrk.sh

@@ -6,8 +6,8 @@ cd "$(dirname "$0")"
 
 cd /tmp/
 sudo apt-get install build-essential libssl-dev git -y
-git clone https://github.com/wg/wrk.git wrk
+git clone --depth=1 https://github.com/wg/wrk.git wrk
 cd wrk
 sudo make
 # move the executable to somewhere in your PATH, ex:
-sudo cp wrk /usr/local/bin
+sudo cp wrk /usr/local/bin

.eslintignore

@@ -1,3 +0,0 @@
-**/node_modules/**
-*.d.ts
-*.js

.eslintrc.js

@@ -1,47 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-  },
-  plugins: ['@typescript-eslint/eslint-plugin'],
-  extends: [
-    'plugin:@typescript-eslint/recommended',
-    'prettier',
-  ],
-  overrides: [
-    {
-      files: ['**/*.ts'],
-      parser: '@typescript-eslint/parser',
-      parserOptions: {
-        project: 'tsconfig.json',
-        sourceType: 'module',
-      },
-      rules: {
-        '@typescript-eslint/interface-name-prefix': 'off',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/ban-types': 'off',
-        '@typescript-eslint/no-array-constructor': 'off',
-      },
-    },
-    {
-      files: ['**/*.spec.ts', 'integration/**/*.ts'],
-      parser: '@typescript-eslint/parser',
-      parserOptions: {
-        project: 'tsconfig.spec.json',
-        sourceType: 'module',
-      },
-      rules: {
-        '@typescript-eslint/interface-name-prefix': 'off',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/ban-types': 'off',
-        '@typescript-eslint/no-empty-function': 'off',
-      },
-    }
-  ]
-};

.gitignore

@@ -50,3 +50,4 @@ build/config\.gypi
 
 .npmrc
 pnpm-lock.yaml
+/.history

eslint.config.mjs

@@ -0,0 +1,55 @@
+// @ts-check
+import eslint from '@eslint/js';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  {
+    ignores: ['node_modules', '**/node_modules/**', '**/*.js', '**/*.d.ts'],
+  },
+  eslint.configs.recommended,
+  ...tseslint.configs.recommendedTypeChecked,
+  eslintPluginPrettierRecommended,
+  {
+    languageOptions: {
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+      ecmaVersion: 5,
+      sourceType: 'module',
+      parserOptions: {
+        project: ['tsconfig.json', 'tsconfig.spec.json'],
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+  },
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-function-type': 'off',
+      '@typescript-eslint/no-unsafe-argument': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/no-unused-expressions': 'off',
+      '@typescript-eslint/no-require-imports': 'off',
+      '@typescript-eslint/no-unused-vars': 'off',
+      "@typescript-eslint/no-misused-promises": [
+        "error",
+        {
+          "checksVoidReturn": false,
+          "checksConditionals": false
+        }
+      ],
+      "@typescript-eslint/require-await": "off",
+      '@typescript-eslint/prefer-promise-reject-errors': 'off',
+      '@typescript-eslint/no-base-to-string': 'off',
+      '@typescript-eslint/unbound-method': 'off',
+      '@typescript-eslint/only-throw-error': 'off',
+    },
+  },
+);

integration/auto-mock/test/bar.service.spec.ts

@@ -4,6 +4,7 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import { BarService } from '../src/bar.service';
 import { FooService } from '../src/foo.service';
+
 chai.use(chaiAsPromised);
 const { expect } = chai;
 

integration/auto-mock/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],
@@ -32,7 +33,8 @@
   },
   "include": [
     "src/**/*",
-    "e2e/**/*"
+    "e2e/**/*",
+    "test/**/*"
   ],
   "exclude": [
     "node_modules",

integration/cors/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/discovery/src/webhooks.explorer.ts

@@ -17,17 +17,17 @@ export class WebhooksExplorer {
       const { name } = this.discoveryService.getMetadataByDecorator(
         Webhook,
         wrapper,
-      );
+      )!;
       return {
         name,
         handlers: this.metadataScanner
-          .getAllMethodNames(wrapper.metatype.prototype)
+          .getAllMethodNames(wrapper.metatype!.prototype)
           .map(methodName => {
             const { event } = this.discoveryService.getMetadataByDecorator(
               WebhookHandler,
               wrapper,
               methodName,
-            );
+            )!;
             return {
               methodName,
               event,

integration/discovery/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/docker-compose.yml

@@ -25,8 +25,9 @@ services:
       - "9001:9001"
     restart: always
   mysql:
-    image: mysql:8.3.0
+    image: mysql:8.4.3
     environment:
+      MYSQL_ROOT_HOST: '%'
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: test
     ports:
@@ -50,7 +51,7 @@ services:
   zookeeper:
     container_name: test-zookeeper
     hostname: zookeeper
-    image: confluentinc/cp-zookeeper:7.5.3
+    image: confluentinc/cp-zookeeper:7.7.1
     ports:
       - "2181:2181"
     environment:
@@ -59,7 +60,7 @@ services:
   kafka:
     container_name: test-kafka
     hostname: kafka
-    image: confluentinc/cp-kafka:7.5.3
+    image: confluentinc/cp-kafka:7.7.1
     depends_on:
       - zookeeper
     ports:

integration/graphql-code-first/src/main.ts

@@ -7,4 +7,4 @@ async function bootstrap() {
   app.useGlobalPipes(new ValidationPipe());
   await app.listen(3000);
 }
-bootstrap();
+void bootstrap();

integration/graphql-code-first/src/recipes/recipes.resolver.ts

@@ -35,7 +35,7 @@ export class RecipesResolver {
     @Args('newRecipeData') newRecipeData: NewRecipeInput,
   ): Promise<Recipe> {
     const recipe = await this.recipesService.create(newRecipeData);
-    pubSub.publish('recipeAdded', { recipeAdded: recipe });
+    void pubSub.publish('recipeAdded', { recipeAdded: recipe });
     return recipe;
   }
 

integration/graphql-code-first/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/graphql-schema-first/e2e/graphql-request-scoped.spec.ts

@@ -42,7 +42,7 @@ describe('GraphQL request scoped', () => {
             ],
           },
         })
-        .end((err, res) => {
+        .end(err => {
           if (err) return end(err);
           end();
         });

integration/graphql-schema-first/src/cats/cats-request-scoped.service.ts

@@ -20,6 +20,6 @@ export class CatsRequestScopedService {
   }
 
   findOneById(id: number): Cat {
-    return this.cats.find(cat => cat.id === id);
+    return this.cats.find(cat => cat.id === id)!;
   }
 }

integration/graphql-schema-first/src/cats/cats.resolvers.ts

@@ -27,8 +27,8 @@ export class CatsResolvers {
 
   @Mutation('createCat')
   async create(@Args() args: Cat): Promise<Cat> {
-    const createdCat = await this.catsService.create(args);
-    pubSub.publish('catCreated', { catCreated: createdCat });
+    const createdCat = this.catsService.create(args);
+    void pubSub.publish('catCreated', { catCreated: createdCat });
     return createdCat;
   }
 

integration/graphql-schema-first/src/cats/cats.service.ts

@@ -20,6 +20,6 @@ export class CatsService {
   }
 
   findOneById(id: number): Cat {
-    return this.cats.find(cat => cat.id === id);
+    return this.cats.find(cat => cat.id === id)!;
   }
 }

integration/graphql-schema-first/src/main.ts

@@ -5,4 +5,4 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   await app.listen(3000);
 }
-bootstrap();
+void bootstrap();

integration/graphql-schema-first/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/hello-world/e2e/exclude-middleware-fastify.spec.ts

@@ -50,6 +50,16 @@ class TestController {
     return RETURN_VALUE;
   }
 
+  @Get('legacy-wildcard/overview')
+  testLegacyWildcard() {
+    return RETURN_VALUE;
+  }
+
+  @Get('splat-wildcard/overview')
+  testSplatWildcard() {
+    return RETURN_VALUE;
+  }
+
   @Get('overview/:id')
   overviewById() {
     return RETURN_VALUE;
@@ -64,10 +74,17 @@ class TestModule {
   configure(consumer: MiddlewareConsumer) {
     consumer
       .apply((req, res, next) => res.end(MIDDLEWARE_VALUE))
-      .exclude('test', 'overview/:id', 'wildcard/(.*)', {
-        path: 'middleware',
-        method: RequestMethod.POST,
-      })
+      .exclude(
+        'test',
+        'overview/:id',
+        'wildcard/*',
+        'legacy-wildcard/(.*)',
+        'splat-wildcard/*splat',
+        {
+          path: 'middleware',
+          method: RequestMethod.POST,
+        },
+      )
       .forRoutes('*');
   }
 }
@@ -126,6 +143,18 @@ describe('Exclude middleware (fastify)', () => {
       .expect(200, RETURN_VALUE);
   });
 
+  it(`should exclude "/legacy-wildcard/overview" endpoint (by wildcard, legacy syntax)`, () => {
+    return request(app.getHttpServer())
+      .get('/legacy-wildcard/overview')
+      .expect(200, RETURN_VALUE);
+  });
+
+  it(`should exclude "/splat-wildcard/overview" endpoint (by wildcard, new syntax)`, () => {
+    return request(app.getHttpServer())
+      .get('/splat-wildcard/overview')
+      .expect(200, RETURN_VALUE);
+  });
+
   afterEach(async () => {
     await app.close();
   });

integration/hello-world/e2e/exclude-middleware.spec.ts

@@ -41,6 +41,16 @@ class TestController {
     return RETURN_VALUE;
   }
 
+  @Get('legacy-wildcard/overview')
+  testLegacyWildcard() {
+    return RETURN_VALUE;
+  }
+
+  @Get('splat-wildcard/overview')
+  testSplatWildcard() {
+    return RETURN_VALUE;
+  }
+
   @Get('overview/:id')
   overviewById() {
     return RETURN_VALUE;
@@ -60,12 +70,19 @@ class TestModule {
   configure(consumer: MiddlewareConsumer) {
     consumer
       .apply((req, res, next) => res.send(MIDDLEWARE_VALUE))
-      .exclude('test', 'overview/:id', 'wildcard/(.*)', {
-        path: 'middleware',
-        method: RequestMethod.POST,
-      })
+      .exclude(
+        'test',
+        'overview/:id',
+        'wildcard/*',
+        'legacy-wildcard/(.*)',
+        'splat-wildcard/*splat',
+        {
+          path: 'middleware',
+          method: RequestMethod.POST,
+        },
+      )
       .exclude('multiple/exclude')
-      .forRoutes('*');
+      .forRoutes('*path');
   }
 }
 
@@ -116,6 +133,18 @@ describe('Exclude middleware', () => {
       .expect(200, RETURN_VALUE);
   });
 
+  it(`should exclude "/legacy-wildcard/overview" endpoint (by wildcard, legacy syntax)`, () => {
+    return request(app.getHttpServer())
+      .get('/legacy-wildcard/overview')
+      .expect(200, RETURN_VALUE);
+  });
+
+  it(`should exclude "/splat-wildcard/overview" endpoint (by wildcard, new syntax)`, () => {
+    return request(app.getHttpServer())
+      .get('/splat-wildcard/overview')
+      .expect(200, RETURN_VALUE);
+  });
+
   it(`should exclude "/multiple/exclude" endpoint`, () => {
     return request(app.getHttpServer())
       .get('/multiple/exclude')

integration/hello-world/e2e/express-instance.spec.ts

@@ -3,10 +3,11 @@ import { ExpressAdapter } from '@nestjs/platform-express';
 import { Test } from '@nestjs/testing';
 import * as express from 'express';
 import * as request from 'supertest';
+import { App } from 'supertest/types';
 import { AppModule } from '../src/app.module';
 
 describe('Hello world (express instance)', () => {
-  let server;
+  let server: App;
   let app: INestApplication;
 
   beforeEach(async () => {

integration/hello-world/e2e/interceptors.spec.ts

@@ -48,7 +48,7 @@ export class HeaderInterceptor {
     const ctx = context.switchToHttp();
     const res = ctx.getResponse();
     for (const key in this.headers) {
-      if (this.headers.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(this.headers, key)) {
         res.header(key, this.headers[key]);
       }
     }

integration/hello-world/e2e/middleware-class.spec.ts

@@ -8,9 +8,9 @@ import {
   RequestMethod,
 } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
+import { Response } from 'express';
 import * as request from 'supertest';
 import { AppModule } from '../src/app.module';
-import { Response } from 'express';
 
 const INCLUDED_VALUE = 'test_included';
 const RETURN_VALUE = 'test';

integration/hello-world/e2e/middleware-fastify.spec.ts

@@ -15,6 +15,8 @@ import {
 } from '@nestjs/platform-fastify';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
+import { FastifyRequest } from 'fastify';
+import * as request from 'supertest';
 import { AppModule } from '../src/app.module';
 
 describe('Middleware (FastifyAdapter)', () => {
@@ -35,6 +37,11 @@ describe('Middleware (FastifyAdapter)', () => {
         return RETURN_VALUE;
       }
 
+      @Get('legacy_style_wildcard/wildcard_nested')
+      legacy_style_wildcard() {
+        return RETURN_VALUE;
+      }
+
       @Get('test')
       test() {
         return RETURN_VALUE;
@@ -74,9 +81,13 @@ describe('Middleware (FastifyAdapter)', () => {
           .apply((req, res, next) => res.end(INCLUDED_VALUE))
           .forRoutes({ path: 'tests/included', method: RequestMethod.POST })
           .apply((req, res, next) => res.end(REQ_URL_VALUE))
-          .forRoutes('req/url/(.*)')
+          .forRoutes('req/url/*')
           .apply((req, res, next) => res.end(WILDCARD_VALUE))
-          .forRoutes('express_style_wildcard/*', 'tests/(.*)')
+          .forRoutes(
+            'express_style_wildcard/*',
+            'tests/*path',
+            'legacy_style_wildcard/(.*)',
+          )
           .apply((req, res, next) => res.end(QUERY_VALUE))
           .forRoutes('query')
           .apply((req, res, next) => next())
@@ -85,7 +96,7 @@ describe('Middleware (FastifyAdapter)', () => {
           .forRoutes(TestController)
           .apply((req, res, next) => res.end(RETURN_VALUE))
           .exclude({ path: QUERY_VALUE, method: -1 as any })
-          .forRoutes('(.*)');
+          .forRoutes('*');
       }
     }
 
@@ -99,7 +110,7 @@ describe('Middleware (FastifyAdapter)', () => {
       await app.init();
     });
 
-    it(`forRoutes((.*))`, () => {
+    it(`forRoutes(*)`, () => {
       return app
         .inject({
           method: 'GET',
@@ -141,7 +152,7 @@ describe('Middleware (FastifyAdapter)', () => {
         .then(({ payload }) => expect(payload).to.be.eql(QUERY_VALUE));
     });
 
-    it(`forRoutes(tests/(.*))`, () => {
+    it(`forRoutes(tests/*path)`, () => {
       return app
         .inject({
           method: 'GET',
@@ -159,6 +170,15 @@ describe('Middleware (FastifyAdapter)', () => {
         .then(({ payload }) => expect(payload).to.be.eql(WILDCARD_VALUE));
     });
 
+    it(`forRoutes(legacy_style_wildcard/*)`, () => {
+      return app
+        .inject({
+          method: 'GET',
+          url: '/legacy_style_wildcard/wildcard_nested',
+        })
+        .then(({ payload }) => expect(payload).to.be.eql(WILDCARD_VALUE));
+    });
+
     it(`forRoutes(req/url/)`, () => {
       const reqUrl = '/test';
       return app
@@ -398,4 +418,133 @@ describe('Middleware (FastifyAdapter)', () => {
       await app.close();
     });
   });
+
+  describe('should have data attached in middleware', () => {
+    @Controller()
+    class DataController {
+      @Get('data')
+      async data(@Req() req: FastifyRequest['raw']) {
+        return {
+          success: true,
+          extras: req?.['raw']?.extras,
+          pong: req?.['raw']?.headers?.ping,
+        };
+      }
+      @Get('pong')
+      async pong(@Req() req: FastifyRequest['raw']) {
+        return { success: true, pong: req?.['raw']?.headers?.ping };
+      }
+
+      @Get('')
+      async rootPath(@Req() req: FastifyRequest['raw']) {
+        return { success: true, root: true };
+      }
+    }
+
+    @Module({
+      controllers: [DataController],
+    })
+    class DataModule implements NestModule {
+      configure(consumer: MiddlewareConsumer) {
+        consumer
+          .apply((req, res, next) => {
+            req.extras = { data: 'Data attached in middleware' };
+            req.headers['ping'] = 'pong';
+            next();
+          })
+          .forRoutes('*');
+      }
+    }
+
+    beforeEach(async () => {
+      app = (
+        await Test.createTestingModule({
+          imports: [DataModule],
+        }).compile()
+      ).createNestApplication<NestFastifyApplication>(new FastifyAdapter());
+    });
+
+    it(`GET forRoutes('*') with global prefix`, async () => {
+      app.setGlobalPrefix('/api');
+      await app.init();
+      await app.getHttpAdapter().getInstance().ready();
+      return app
+        .inject({
+          method: 'GET',
+          url: '/api/pong',
+        })
+        .then(({ payload }) =>
+          expect(payload).to.be.eql(
+            JSON.stringify({
+              success: true,
+              pong: 'pong',
+            }),
+          ),
+        );
+    });
+
+    it(`GET forRoutes('*') without prefix config`, async () => {
+      await app.init();
+      await app.getHttpAdapter().getInstance().ready();
+      return app
+        .inject({
+          method: 'GET',
+          url: '/pong',
+        })
+        .then(({ payload }) =>
+          expect(payload).to.be.eql(
+            JSON.stringify({
+              success: true,
+              pong: 'pong',
+            }),
+          ),
+        );
+    });
+
+    it(`GET forRoutes('*') with global prefix and exclude patterns`, async () => {
+      app.setGlobalPrefix('/api', { exclude: ['/'] });
+      await app.init();
+      await app.getHttpAdapter().getInstance().ready();
+
+      await request(app.getHttpServer())
+        .get('/')
+        .expect(200, { success: true, root: true });
+    });
+
+    it(`GET forRoutes('*') with global prefix and global prefix options`, async () => {
+      app.setGlobalPrefix('/api', { exclude: ['/'] });
+      await app.init();
+      await app.getHttpAdapter().getInstance().ready();
+
+      await request(app.getHttpServer())
+        .get('/api/data')
+        .expect(200, {
+          success: true,
+          extras: { data: 'Data attached in middleware' },
+          pong: 'pong',
+        });
+      await request(app.getHttpServer())
+        .get('/')
+        .expect(200, { success: true, root: true });
+    });
+
+    it(`GET forRoutes('*') with global prefix that not starts with /`, async () => {
+      app.setGlobalPrefix('api');
+      await app.init();
+      await app.getHttpAdapter().getInstance().ready();
+
+      await request(app.getHttpServer())
+        .get('/api/data')
+        .expect(200, {
+          success: true,
+          extras: { data: 'Data attached in middleware' },
+          pong: 'pong',
+        });
+      await request(app.getHttpServer()).get('/').expect(404);
+    });
+
+    afterEach(async () => {
+      await app.close();
+    });
+  });
 });

integration/hello-world/e2e/middleware.spec.ts

@@ -26,6 +26,11 @@ class TestController {
     return RETURN_VALUE;
   }
 
+  @Get('legacy-wildcard/overview')
+  legacyWildcard() {
+    return RETURN_VALUE;
+  }
+
   @Get('exclude')
   exclude() {
     return EXCLUDE_VALUE;
@@ -40,7 +45,7 @@ class TestModule {
   configure(consumer: MiddlewareConsumer) {
     consumer
       .apply((req, res, next) => res.send(WILDCARD_VALUE))
-      .forRoutes('tests/*')
+      .forRoutes('tests/*path', 'legacy-wildcard/*')
       .apply((req, res, next) => res.send(SCOPED_VALUE))
       .exclude('exclude')
       .forRoutes(TestController)
@@ -86,6 +91,13 @@ describe('Middleware', () => {
       .expect(200, WILDCARD_VALUE);
   });
 
+  it(`forRoutes(legacy-wildcard/*)`, async () => {
+    app = await createApp();
+    return request(app.getHttpServer())
+      .get('/legacy-wildcard/overview')
+      .expect(200, WILDCARD_VALUE);
+  });
+
   afterEach(async () => {
     await app.close();
   });

integration/hello-world/src/host-array/host-array.controller.ts

@@ -18,7 +18,7 @@ export class HostArrayController {
 
   @Get('async')
   async asyncGreeting(@HostParam('tenant') tenant: string): Promise<string> {
-    return `${await this.hostService.greeting()} tenant=${tenant}`;
+    return `${this.hostService.greeting()} tenant=${tenant}`;
   }
 
   @Get('stream')

integration/hello-world/src/host/host.controller.ts

@@ -18,7 +18,7 @@ export class HostController {
 
   @Get('async')
   async asyncGreeting(@HostParam('tenant') tenant: string): Promise<string> {
-    return `${await this.hostService.greeting()} tenant=${tenant}`;
+    return `${this.hostService.greeting()} tenant=${tenant}`;
   }
 
   @Get('stream')

integration/hello-world/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/hooks/e2e/before-app-shutdown.spec.ts

@@ -23,10 +23,7 @@ describe('BeforeApplicationShutdown', () => {
   it('should sort modules by distance (topological sort) - DESC order', async () => {
     @Injectable()
     class BB implements BeforeApplicationShutdown {
-      public field: string;
-      async beforeApplicationShutdown() {
-        this.field = 'b-field';
-      }
+      beforeApplicationShutdown = Sinon.spy();
     }
 
     @Module({
@@ -37,12 +34,8 @@ describe('BeforeApplicationShutdown', () => {
 
     @Injectable()
     class AA implements BeforeApplicationShutdown {
-      public field: string;
       constructor(private bb: BB) {}
-
-      async beforeApplicationShutdown() {
-        this.field = this.bb.field + '_a-field';
-      }
+      beforeApplicationShutdown = Sinon.spy();
     }
     @Module({
       imports: [B],
@@ -58,7 +51,11 @@ describe('BeforeApplicationShutdown', () => {
     await app.init();
     await app.close();
 
-    const instance = module.get(AA);
-    expect(instance.field).to.equal('b-field_a-field');
+    const aa = module.get(AA);
+    const bb = module.get(BB);
+    Sinon.assert.callOrder(
+      aa.beforeApplicationShutdown,
+      bb.beforeApplicationShutdown,
+    );
   });
 });

integration/hooks/e2e/on-app-shutdown.spec.ts

@@ -23,10 +23,7 @@ describe('OnApplicationShutdown', () => {
   it('should sort modules by distance (topological sort) - DESC order', async () => {
     @Injectable()
     class BB implements OnApplicationShutdown {
-      public field: string;
-      async onApplicationShutdown() {
-        this.field = 'b-field';
-      }
+      onApplicationShutdown = Sinon.spy();
     }
 
     @Module({
@@ -37,12 +34,8 @@ describe('OnApplicationShutdown', () => {
 
     @Injectable()
     class AA implements OnApplicationShutdown {
-      public field: string;
       constructor(private bb: BB) {}
-
-      async onApplicationShutdown() {
-        this.field = this.bb.field + '_a-field';
-      }
+      onApplicationShutdown = Sinon.spy();
     }
     @Module({
       imports: [B],
@@ -58,7 +51,8 @@ describe('OnApplicationShutdown', () => {
     await app.init();
     await app.close();
 
-    const instance = module.get(AA);
-    expect(instance.field).to.equal('b-field_a-field');
+    const aa = module.get(AA);
+    const bb = module.get(BB);
+    Sinon.assert.callOrder(aa.onApplicationShutdown, bb.onApplicationShutdown);
   });
 });

integration/hooks/e2e/on-module-destroy.spec.ts

@@ -43,10 +43,7 @@ describe('OnModuleDestroy', () => {
   it('should sort modules by distance (topological sort) - DESC order', async () => {
     @Injectable()
     class BB implements OnModuleDestroy {
-      public field: string;
-      async onModuleDestroy() {
-        this.field = 'b-field';
-      }
+      onModuleDestroy = Sinon.spy();
     }
 
     @Module({
@@ -57,13 +54,10 @@ describe('OnModuleDestroy', () => {
 
     @Injectable()
     class AA implements OnModuleDestroy {
-      public field: string;
       constructor(private bb: BB) {}
-
-      async onModuleDestroy() {
-        this.field = this.bb.field + '_a-field';
-      }
+      onModuleDestroy = Sinon.spy();
     }
+
     @Module({
       imports: [B],
       providers: [AA],
@@ -78,7 +72,8 @@ describe('OnModuleDestroy', () => {
     await app.init();
     await app.close();
 
-    const instance = module.get(AA);
-    expect(instance.field).to.equal('b-field_a-field');
+    const aa = module.get(AA);
+    const bb = module.get(BB);
+    Sinon.assert.callOrder(aa.onModuleDestroy, bb.onModuleDestroy);
   });
 });

integration/hooks/e2e/on-module-init.spec.ts

@@ -39,11 +39,39 @@ describe('OnModuleInit', () => {
   });
 
   it('should sort modules by distance (topological sort) - DESC order', async () => {
+    @Injectable()
+    class CC implements OnModuleInit {
+      public field: string;
+
+      async onModuleInit() {
+        this.field = 'c-field';
+      }
+    }
+
+    @Module({})
+    class C {
+      static forRoot() {
+        return {
+          module: C,
+          global: true,
+          providers: [
+            {
+              provide: CC,
+              useValue: new CC(),
+            },
+          ],
+          exports: [CC],
+        };
+      }
+    }
+
     @Injectable()
     class BB implements OnModuleInit {
       public field: string;
+      constructor(private cc: CC) {}
+
       async onModuleInit() {
-        this.field = 'b-field';
+        this.field = this.cc.field + '_b-field';
       }
     }
 
@@ -68,14 +96,19 @@ describe('OnModuleInit', () => {
     })
     class A {}
 
+    @Module({
+      imports: [A, C.forRoot()],
+    })
+    class AppModule {}
+
     const module = await Test.createTestingModule({
-      imports: [A],
+      imports: [AppModule],
     }).compile();
 
     const app = module.createNestApplication();
     await app.init();
 
     const instance = module.get(AA);
-    expect(instance.field).to.equal('b-field_a-field');
+    expect(instance.field).to.equal('c-field_b-field_a-field');
   });
 });

integration/hooks/src/enable-shutdown-hooks-main.ts

@@ -39,4 +39,4 @@ async function bootstrap() {
   process.kill(process.pid, SIGNAL);
 }
 
-bootstrap();
+void bootstrap();

integration/hooks/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/injector/src/circular-structure-dynamic-module/circular.module.ts

@@ -6,7 +6,7 @@ export class CircularModule {
     const a = {
       module: CircularModule,
       providers: [InputService],
-      b: null,
+      b: null as any,
     };
     a.b = a;
     return a;

integration/injector/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/inspector/src/external-svc/external-svc.controller.ts

@@ -1,8 +1,8 @@
 import { Controller } from '@nestjs/common';
 import { MessagePattern, Payload } from '@nestjs/microservices';
-import { ExternalSvcService } from './external-svc.service';
 import { CreateExternalSvcDto } from './dto/create-external-svc.dto';
 import { UpdateExternalSvcDto } from './dto/update-external-svc.dto';
+import { ExternalSvcService } from './external-svc.service';
 
 @Controller()
 export class ExternalSvcController {

integration/inspector/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/lazy-modules/e2e/lazy-import-global-modules.spec.ts

@@ -2,12 +2,11 @@ import { INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import * as chai from 'chai';
 import { expect } from 'chai';
-import chaiAsPromised = require('chai-as-promised');
 import { AppModule } from '../src/app.module';
+import chaiAsPromised = require('chai-as-promised');
 chai.use(chaiAsPromised);
 
 describe('Lazy imports', () => {
-  let server;
   let app: INestApplication;
 
   beforeEach(async () => {
@@ -16,7 +15,6 @@ describe('Lazy imports', () => {
     }).compile();
 
     app = module.createNestApplication();
-    server = app.getHttpAdapter().getInstance();
   });
 
   it(`should allow imports of global modules`, async () => {

integration/lazy-modules/e2e/lazy-import-transient-providers.spec.ts

@@ -0,0 +1,32 @@
+import { INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import { TransientLazyModule } from '../src/transient.module';
+import { LazyController } from '../src/lazy.controller';
+import * as chai from 'chai';
+import { expect } from 'chai';
+import * as request from 'supertest';
+
+describe('Lazy Transient providers', () => {
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    const module = await Test.createTestingModule({
+      controllers: [LazyController],
+    }).compile();
+
+    app = module.createNestApplication();
+    await app.init();
+  });
+
+  it('should not recreate dependencies for default scope', async () => {
+    const resultOne = await request(app.getHttpServer()).get('/lazy/transient');
+
+    const resultTwo = await request(app.getHttpServer()).get('/lazy/transient');
+
+    expect(resultOne.text).to.be.equal('Hi! Counter is 1');
+    expect(resultOne.statusCode).to.be.equal(200);
+
+    expect(resultTwo.text).to.be.equal('Hi! Counter is 2');
+    expect(resultTwo.statusCode).to.be.equal(200);
+  });
+});

integration/lazy-modules/src/eager.module.ts

@@ -3,7 +3,13 @@ import { GlobalService } from './global.module';
 
 @Injectable()
 export class EagerService {
+  private counter = 0;
   constructor(public globalService: GlobalService) {}
+
+  sayHello() {
+    this.counter++;
+    return 'Hi! Counter is ' + this.counter;
+  }
 }
 
 @Module({

integration/lazy-modules/src/lazy.controller.ts

@@ -0,0 +1,18 @@
+import { Controller, Get } from '@nestjs/common';
+import { LazyModuleLoader } from '@nestjs/core';
+
+@Controller('lazy')
+export class LazyController {
+  constructor(private lazyLoadModule: LazyModuleLoader) {}
+
+  @Get('transient')
+  async exec() {
+    const { TransientLazyModule } = await import('./transient.module');
+    const moduleRef = await this.lazyLoadModule.load(() => TransientLazyModule);
+
+    const { TransientService } = await import('./transient.service');
+    const _service = await moduleRef.resolve(TransientService);
+
+    return _service.eager();
+  }
+}

integration/lazy-modules/src/main.ts

@@ -5,4 +5,4 @@ async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   await app.listen(3000);
 }
-bootstrap();
+void bootstrap();

integration/lazy-modules/src/transient.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { GlobalService } from './global.module';
+import { EagerService } from './eager.module';
+import { TransientService } from './transient.service';
+
+@Module({
+  imports: [],
+  providers: [TransientService, GlobalService, EagerService],
+  exports: [TransientService],
+})
+export class TransientLazyModule {}

integration/lazy-modules/src/transient.service.ts

@@ -0,0 +1,11 @@
+import { Injectable, Scope } from '@nestjs/common';
+import { EagerService } from './eager.module';
+
+@Injectable({ scope: Scope.TRANSIENT })
+export class TransientService {
+  constructor(private eagerService: EagerService) {}
+
+  eager() {
+    return this.eagerService.sayHello();
+  }
+}

integration/lazy-modules/tsconfig.json

@@ -0,0 +1,41 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "ES2021",
+    "sourceMap": true,
+    "allowJs": true,
+    "strictNullChecks": true,
+    "outDir": "./dist",
+    "paths": {
+      "@nestjs/common": ["../../packages/common"],
+      "@nestjs/common/*": ["../../packages/common/*"],
+      "@nestjs/core": ["../../packages/core"],
+      "@nestjs/core/*": ["../../packages/core/*"],
+      "@nestjs/microservices": ["../../packages/microservices"],
+      "@nestjs/microservices/*": ["../../packages/microservices/*"],
+      "@nestjs/websockets": ["../../packages/websockets"],
+      "@nestjs/websockets/*": ["../../packages/websockets/*"],
+      "@nestjs/testing": ["../../packages/testing"],
+      "@nestjs/testing/*": ["../../packages/testing/*"],
+      "@nestjs/platform-express": ["../../packages/platform-express"],
+      "@nestjs/platform-express/*": ["../../packages/platform-express/*"],
+      "@nestjs/platform-socket.io": ["../../packages/platform-socket.io"],
+      "@nestjs/platform-socket.io/*": ["../../packages/platform-socket.io/*"],
+      "@nestjs/platform-ws": ["../../packages/platform-ws"],
+      "@nestjs/platform-ws/*": ["../../packages/platform-ws/*"]
+    }
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+  ]
+}

integration/microservices/e2e/concurrent-kafka.spec.ts

@@ -100,7 +100,7 @@ describe.skip('Kafka concurrent', function () {
       }
     }
 
-    if (topicMetadata && topicMetadata.topics.length > 0) {
+    if (topicMetadata! && topicMetadata.topics.length > 0) {
       // we have topics, how many partitions do they have?
       for (const topic of topicMetadata.topics) {
         if (topic.partitions.length < numbersOfServers) {

integration/microservices/e2e/disconnected-client.spec.ts

@@ -2,10 +2,11 @@ import { INestApplication } from '@nestjs/common';
 import { Transport } from '@nestjs/microservices';
 import { Test } from '@nestjs/testing';
 import * as request from 'supertest';
+import { App } from 'supertest/types';
 import { DisconnectedClientController } from '../src/disconnected.controller';
 
 describe('Disconnected client', () => {
-  let server;
+  let server: App;
   let app: INestApplication;
 
   beforeEach(async () => {

integration/microservices/e2e/math-grpc.spec.ts

@@ -180,7 +180,7 @@ describe('GRPC transport', () => {
 
         stream.on('error', err => {
           if (err.code !== GRPC.status.CANCELLED) {
-            reject(err);
+            reject(err as Error);
           }
         });
 

integration/microservices/e2e/sum-kafka.spec.ts

@@ -91,7 +91,7 @@ describe.skip('Kafka transport', function () {
   });
 
   it(`/POST (async event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send()
       .end(() => {
@@ -123,7 +123,7 @@ describe.skip('Kafka transport', function () {
   });
 
   it(`/POST (sync command create user) Concurrency Test`, async () => {
-    const promises = [];
+    const promises = [] as Array<Promise<any>>;
     for (let concurrencyKey = 0; concurrencyKey < 100; concurrencyKey++) {
       const innerUserDto = JSON.parse(JSON.stringify(userDto));
       innerUserDto.name += `+${concurrencyKey}`;

integration/microservices/e2e/sum-mqtt.spec.ts

@@ -75,7 +75,7 @@ describe('MQTT transport', () => {
   }).timeout(5000);
 
   it(`/POST (event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send([1, 2, 3, 4, 5])
       .end(() => {
@@ -87,7 +87,7 @@ describe('MQTT transport', () => {
   });
 
   it(`/POST (wildcard EVENT #)`, done => {
-    request(server)
+    void request(server)
       .post('/wildcard-event')
       .send([1, 2, 3, 4, 5])
       .end(() => {
@@ -106,7 +106,7 @@ describe('MQTT transport', () => {
   });
 
   it(`/POST (wildcard EVENT +)`, done => {
-    request(server)
+    void request(server)
       .post('/wildcard-event2')
       .send([1, 2, 3, 4, 5])
       .end(() => {
@@ -125,7 +125,7 @@ describe('MQTT transport', () => {
   });
 
   it(`/POST (shared wildcard EVENT #)`, done => {
-    request(server)
+    void request(server)
       .post('/shared-wildcard-event')
       .send([1, 2, 3, 4, 5])
       .end(() => {
@@ -144,7 +144,7 @@ describe('MQTT transport', () => {
   });
 
   it(`/POST (shared wildcard EVENT +)`, done => {
-    request(server)
+    void request(server)
       .post('/shared-wildcard-event2')
       .send([1, 2, 3, 4, 5])
       .end(() => {

integration/microservices/e2e/sum-nats.spec.ts

@@ -84,7 +84,7 @@ describe('NATS transport', () => {
   });
 
   it(`/POST (event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send([1, 2, 3, 4, 5])
       .end(() => {

integration/microservices/e2e/sum-redis.spec.ts

@@ -78,7 +78,7 @@ describe('REDIS transport', () => {
   });
 
   it(`/POST (event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send([1, 2, 3, 4, 5])
       .end(() => {

integration/microservices/e2e/sum-rmq.spec.ts

@@ -85,7 +85,7 @@ describe('RabbitMQ transport', () => {
   }).timeout(10000);
 
   it(`/POST (event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send([1, 2, 3, 4, 5])
       .end(() => {

integration/microservices/e2e/sum-rpc-async.spec.ts

@@ -0,0 +1,98 @@
+import {
+  Controller,
+  INestMicroservice,
+  Injectable,
+  Module,
+} from '@nestjs/common';
+import { NestFactory } from '@nestjs/core';
+import {
+  AsyncOptions,
+  ClientTCP,
+  ClientsModule,
+  MessagePattern,
+  MicroserviceOptions,
+  Payload,
+  TcpOptions,
+  Transport,
+} from '@nestjs/microservices';
+import { expect } from 'chai';
+
+let port: number;
+
+do {
+  port = Math.round(Math.random() * 10000);
+} while (port < 1000);
+
+@Injectable()
+class RpcOptionsProvider {
+  getOptions(): TcpOptions {
+    return {
+      transport: Transport.TCP,
+      options: {
+        port,
+        host: '0.0.0.0',
+      },
+    };
+  }
+}
+
+@Controller()
+class RpcController {
+  @MessagePattern({ cmd: 'sum' })
+  sumPayload(@Payload() payload: number[]) {
+    return payload.reduce((a, b) => a + b, 0);
+  }
+}
+
+@Module({
+  imports: [
+    ClientsModule.register([
+      {
+        name: 'RPC_CLIENT',
+        transport: Transport.TCP,
+        options: {
+          port,
+          host: '0.0.0.0',
+        },
+      },
+    ]),
+  ],
+  controllers: [RpcController],
+  providers: [RpcOptionsProvider],
+})
+class RpcModule {}
+
+describe('RPC Async transport', () => {
+  let app: INestMicroservice;
+  let client: ClientTCP;
+
+  beforeEach(async () => {
+    app = await NestFactory.createMicroservice<
+      AsyncOptions<MicroserviceOptions>
+    >(RpcModule, {
+      logger: false,
+      inject: [RpcOptionsProvider],
+      useFactory: (optionsProvider: RpcOptionsProvider) =>
+        optionsProvider.getOptions(),
+    });
+
+    await app.listen();
+    client = app.get('RPC_CLIENT', { strict: false });
+  });
+
+  it(`/POST`, done => {
+    let retData = 0;
+    client.send({ cmd: 'sum' }, [1, 2, 3, 4, 5]).subscribe({
+      next: val => (retData += val),
+      error: done,
+      complete: () => {
+        expect(retData).to.eq(15);
+        done();
+      },
+    });
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+});

integration/microservices/e2e/sum-rpc-tls.spec.ts

@@ -2,11 +2,11 @@ import { INestApplication } from '@nestjs/common';
 import { Transport } from '@nestjs/microservices';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
+import * as fs from 'fs';
+import * as path from 'path';
 import * as request from 'supertest';
 import { AppController } from '../src/tcp-tls/app.controller';
 import { ApplicationModule } from '../src/tcp-tls/app.module';
-import * as fs from 'fs';
-import * as path from 'path';
 
 describe('RPC TLS transport', () => {
   let server;
@@ -109,7 +109,7 @@ describe('RPC TLS transport', () => {
   });
 
   it(`/POST (event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send([1, 2, 3, 4, 5])
       .end(() => {

integration/microservices/e2e/sum-rpc.spec.ts

@@ -94,7 +94,7 @@ describe('RPC transport', () => {
   });
 
   it(`/POST (event notification)`, done => {
-    request(server)
+    void request(server)
       .post('/notify')
       .send([1, 2, 3, 4, 5])
       .end(() => {

integration/microservices/src/disconnected.controller.ts

@@ -7,7 +7,7 @@ import {
 } from '@nestjs/common';
 import { ClientProxyFactory } from '@nestjs/microservices';
 import { Observable, throwError } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs/operators';
 
 @Controller()
 export class DisconnectedClientController {
@@ -24,12 +24,16 @@ export class DisconnectedClientController {
         return throwError(() =>
           code === 'ECONNREFUSED' ||
           code === 'CONN_ERR' ||
+          code === 'ENOTFOUND' ||
           code === 'CONNECTION_REFUSED' ||
-          error.message === 'Connection is closed.'
+          error.message.includes('Connection is closed.')
             ? new RequestTimeoutException('ECONNREFUSED')
             : new InternalServerErrorException(),
         );
       }),
+      tap({
+        error: () => client.close(),
+      }),
     );
   }
 }

integration/microservices/src/grpc/grpc.controller.ts

@@ -2,15 +2,15 @@ import { Body, Controller, HttpCode, Post, Query } from '@nestjs/common';
 import {
   Client,
   ClientGrpc,
+  ClientGrpcProxy,
   GrpcMethod,
   GrpcStreamCall,
   GrpcStreamMethod,
-  Transport,
-  ClientGrpcProxy,
   RpcException,
+  Transport,
 } from '@nestjs/microservices';
 import { join } from 'path';
-import { Observable, of, catchError, from, mergeMap } from 'rxjs';
+import { catchError, from, mergeMap, Observable, of } from 'rxjs';
 
 class ErrorHandlingProxy extends ClientGrpcProxy {
   serializeError(err) {
@@ -81,7 +81,7 @@ export class GrpcController {
           });
         },
         error: err => {
-          reject(err);
+          reject(err as Error);
         },
       });
     });

integration/microservices/src/kafka-concurrent/kafka-concurrent.controller.ts

@@ -17,7 +17,7 @@ import { SumDto } from './dto/sum.dto';
  */
 const explicitPartitioner = () => {
   return ({ message }: PartitionerArgs) => {
-    return parseFloat(message.headers.toPartition.toString());
+    return parseFloat(message.headers!.toPartition!.toString());
   };
 };
 

integration/microservices/src/main.ts

@@ -5,4 +5,4 @@ async function bootstrap() {
   const app = await NestFactory.create(ApplicationModule);
   await app.listen(3000);
 }
-bootstrap();
+void bootstrap();

integration/microservices/src/mqtt/mqtt.controller.ts

@@ -138,7 +138,7 @@ export class MqttController {
   }
 
   @MessagePattern('wildcard-message/#')
-  wildcardMessageHandler(data: number[]): number {
+  wildcardMessageHandler(data: number[]): number | undefined {
     if ((data as any).response) {
       return;
     }
@@ -186,7 +186,7 @@ export class MqttController {
   }
 
   @MessagePattern('$share/test-group/shared-wildcard-message/#')
-  sharedWildcardMessageHandler(data: number[]): number {
+  sharedWildcardMessageHandler(data: number[]): number | undefined {
     if ((data as any).response) {
       return;
     }

integration/microservices/src/tcp-tls/app.module.ts

@@ -1,13 +1,13 @@
-import { Module, Injectable } from '@nestjs/common';
-import { AppController } from './app.controller';
+import { Injectable, Module } from '@nestjs/common';
 import {
-  ClientsModule,
-  Transport,
-  ClientsModuleOptionsFactory,
   ClientOptions,
+  ClientsModule,
+  ClientsModuleOptionsFactory,
   ClientTCP,
   RpcException,
+  Transport,
 } from '@nestjs/microservices';
+import { AppController } from './app.controller';
 
 import * as fs from 'fs';
 import * as path from 'path';

integration/microservices/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/module-utils/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],
@@ -32,7 +33,8 @@
   },
   "include": [
     "src/**/*",
-    "e2e/**/*"
+    "e2e/**/*",
+    "test/**/*"
   ],
   "exclude": [
     "node_modules",

integration/mongoose/src/main.ts

@@ -5,4 +5,4 @@ async function bootstrap() {
   const app = await NestFactory.create(ApplicationModule);
   await app.listen(3001);
 }
-bootstrap();
+void bootstrap();

integration/mongoose/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/nest-application/app-locals/tsconfig.json

@@ -11,6 +11,7 @@
     "sourceMap": true,
     "allowJs": true,
     "outDir": "./dist",
+    "strictNullChecks": true,
     "paths": {
       "@nestjs/common": ["../../../packages/common"],
       "@nestjs/common/*": ["../../../packages/common/*"],
@@ -20,8 +21,8 @@
       "@nestjs/microservices/*": ["../../../packages/microservices/*"],
       "@nestjs/websockets": ["../../../packages/websockets"],
       "@nestjs/websockets/*": ["../../../packages/websockets/*"],
-      "@nestjs/testing": ["../../../packages/websockets"],
-      "@nestjs/testing/*": ["../../../packages/websockets/*"],
+      "@nestjs/testing": ["../../../packages/testing"],
+      "@nestjs/testing/*": ["../../../packages/testing/*"],
       "@nestjs/platform-express": ["../../../packages/platform-express"],
       "@nestjs/platform-express/*": ["../../../packages/platform-express/*"],
       "@nestjs/platform-socket.io": ["../../../packages/platform-socket.io"],

integration/nest-application/get-url/tsconfig.json

@@ -11,6 +11,7 @@
     "sourceMap": true,
     "allowJs": true,
     "outDir": "./dist",
+    "strictNullChecks": true,
     "paths": {
       "@nestjs/common": ["../../../packages/common"],
       "@nestjs/common/*": ["../../../packages/common/*"],
@@ -20,8 +21,8 @@
       "@nestjs/microservices/*": ["../../../packages/microservices/*"],
       "@nestjs/websockets": ["../../../packages/websockets"],
       "@nestjs/websockets/*": ["../../../packages/websockets/*"],
-      "@nestjs/testing": ["../../../packages/websockets"],
-      "@nestjs/testing/*": ["../../../packages/websockets/*"],
+      "@nestjs/testing": ["../../../packages/testing"],
+      "@nestjs/testing/*": ["../../../packages/testing/*"],
       "@nestjs/platform-express": ["../../../packages/platform-express"],
       "@nestjs/platform-express/*": ["../../../packages/platform-express/*"],
       "@nestjs/platform-socket.io": ["../../../packages/platform-socket.io"],

integration/nest-application/global-prefix/e2e/global-prefix.spec.ts

@@ -127,7 +127,7 @@ describe('Global prefix', () => {
 
     await request(server)
       .get('/api/test/params')
-      .expect(200, { '0': 'params', tenantId: 'test' });
+      .expect(200, { tenantId: 'test', path: ['params'] });
   });
 
   it(`should execute middleware only once`, async () => {

integration/nest-application/global-prefix/src/app.module.ts

@@ -16,24 +16,30 @@ export class AppModule {
       .apply((req, res, next) => res.status(201).end(MIDDLEWARE_VALUE))
       .forRoutes({ path: MIDDLEWARE_VALUE, method: RequestMethod.POST })
       .apply((req, res, next) => res.end(MIDDLEWARE_PARAM_VALUE))
-      .forRoutes({ path: MIDDLEWARE_VALUE + '/*', method: RequestMethod.GET })
+      .forRoutes({
+        path: MIDDLEWARE_VALUE + '/*path',
+        method: RequestMethod.GET,
+      })
       .apply((req, res, next) => res.status(201).end(MIDDLEWARE_PARAM_VALUE))
-      .forRoutes({ path: MIDDLEWARE_VALUE + '/*', method: RequestMethod.POST })
+      .forRoutes({
+        path: MIDDLEWARE_VALUE + '/*path',
+        method: RequestMethod.POST,
+      })
       .apply((req, res, next) => {
         req.extras = { data: 'Data attached in middleware' };
         next();
       })
-      .forRoutes({ path: '*', method: RequestMethod.GET })
+      .forRoutes({ path: '*path', method: RequestMethod.GET })
       .apply((req, res, next) => {
         req.middlewareParams = req.params;
         next();
       })
-      .forRoutes({ path: '*', method: RequestMethod.GET })
+      .forRoutes({ path: '*path', method: RequestMethod.GET })
       .apply((req, res, next) => {
         this.count += 1;
         req.count = this.count;
         next();
       })
-      .forRoutes('*');
+      .forRoutes('*path');
   }
 }

integration/nest-application/global-prefix/tsconfig.json

@@ -11,6 +11,7 @@
     "sourceMap": true,
     "allowJs": true,
     "outDir": "./dist",
+    "strictNullChecks": true,
     "paths": {
       "@nestjs/common": ["../../../packages/common"],
       "@nestjs/common/*": ["../../../packages/common/*"],
@@ -20,8 +21,8 @@
       "@nestjs/microservices/*": ["../../../packages/microservices/*"],
       "@nestjs/websockets": ["../../../packages/websockets"],
       "@nestjs/websockets/*": ["../../../packages/websockets/*"],
-      "@nestjs/testing": ["../../../packages/websockets"],
-      "@nestjs/testing/*": ["../../../packages/websockets/*"],
+      "@nestjs/testing": ["../../../packages/testing"],
+      "@nestjs/testing/*": ["../../../packages/testing/*"],
       "@nestjs/platform-express": ["../../../packages/platform-express"],
       "@nestjs/platform-express/*": ["../../../packages/platform-express/*"],
       "@nestjs/platform-socket.io": ["../../../packages/platform-socket.io"],

integration/nest-application/listen/e2e/express.spec.ts

@@ -1,9 +1,9 @@
+import { INestApplication } from '@nestjs/common';
 import { ExpressAdapter } from '@nestjs/platform-express';
 import { Test, TestingModule } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as express from 'express';
 import { AppModule } from '../src/app.module';
-import { INestApplication } from '@nestjs/common';
 
 describe('Listen (Express Application)', () => {
   let testModule: TestingModule;
@@ -17,7 +17,7 @@ describe('Listen (Express Application)', () => {
   });
 
   afterEach(async () => {
-    app.close();
+    await app.close();
   });
 
   it('should resolve with httpServer on success', async () => {

integration/nest-application/listen/e2e/fastify.spec.ts

@@ -16,7 +16,7 @@ describe('Listen (Fastify Application)', () => {
   });
 
   afterEach(async () => {
-    app.close();
+    await app.close();
   });
 
   it('should resolve with httpServer on success', async () => {

integration/nest-application/listen/tsconfig.json

@@ -0,0 +1,41 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "ES2021",
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "./dist",
+    "strictNullChecks": true,
+    "paths": {
+      "@nestjs/common": ["../../../packages/common"],
+      "@nestjs/common/*": ["../../../packages/common/*"],
+      "@nestjs/core": ["../../../packages/core"],
+      "@nestjs/core/*": ["../../../packages/core/*"],
+      "@nestjs/microservices": ["../../../packages/microservices"],
+      "@nestjs/microservices/*": ["../../../packages/microservices/*"],
+      "@nestjs/websockets": ["../../../packages/websockets"],
+      "@nestjs/websockets/*": ["../../../packages/websockets/*"],
+      "@nestjs/testing": ["../../../packages/testing"],
+      "@nestjs/testing/*": ["../../../packages/testing/*"],
+      "@nestjs/platform-express": ["../../../packages/platform-express"],
+      "@nestjs/platform-express/*": ["../../../packages/platform-express/*"],
+      "@nestjs/platform-socket.io": ["../../../packages/platform-socket.io"],
+      "@nestjs/platform-socket.io/*": ["../../../packages/platform-socket.io/*"],
+      "@nestjs/platform-ws": ["../../../packages/platform-ws"],
+      "@nestjs/platform-ws/*": ["../../../packages/platform-ws/*"]
+    }
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+  ]
+}

integration/nest-application/raw-body/src/express.controller.ts

@@ -7,7 +7,7 @@ export class ExpressController {
   getRawBody(@Req() req: RawBodyRequest<Request>) {
     return {
       parsed: req.body,
-      raw: req.rawBody.toString(),
+      raw: req.rawBody!.toString(),
     };
   }
 }

integration/nest-application/raw-body/src/fastify.controller.ts

@@ -7,7 +7,7 @@ export class FastifyController {
   getRawBody(@Req() req: RawBodyRequest<FastifyRequest>) {
     return {
       parsed: req.body,
-      raw: req.rawBody.toString(),
+      raw: req.rawBody!.toString(),
     };
   }
 }

integration/nest-application/raw-body/tsconfig.json

@@ -11,6 +11,7 @@
     "sourceMap": true,
     "allowJs": true,
     "outDir": "./dist",
+    "strictNullChecks": true,
     "paths": {
       "@nestjs/common": ["../../../packages/common"],
       "@nestjs/common/*": ["../../../packages/common/*"],
@@ -20,8 +21,8 @@
       "@nestjs/microservices/*": ["../../../packages/microservices/*"],
       "@nestjs/websockets": ["../../../packages/websockets"],
       "@nestjs/websockets/*": ["../../../packages/websockets/*"],
-      "@nestjs/testing": ["../../../packages/websockets"],
-      "@nestjs/testing/*": ["../../../packages/websockets/*"],
+      "@nestjs/testing": ["../../../packages/testing"],
+      "@nestjs/testing/*": ["../../../packages/testing/*"],
       "@nestjs/platform-express": ["../../../packages/platform-express"],
       "@nestjs/platform-express/*": ["../../../packages/platform-express/*"],
       "@nestjs/platform-socket.io": ["../../../packages/platform-socket.io"],

integration/nest-application/sse/src/app.controller.ts

@@ -6,7 +6,7 @@ export class AppController {
   @Sse('sse')
   sse(): Observable<MessageEvent> {
     return interval(1000).pipe(
-      map(_ => ({ data: { hello: 'world' } }) as MessageEvent),
+      map(() => ({ data: { hello: 'world' } }) as MessageEvent),
     );
   }
 }

integration/nest-application/sse/tsconfig.json

@@ -21,8 +21,8 @@
       "@nestjs/microservices/*": ["../../../packages/microservices/*"],
       "@nestjs/websockets": ["../../../packages/websockets"],
       "@nestjs/websockets/*": ["../../../packages/websockets/*"],
-      "@nestjs/testing": ["../../../packages/websockets"],
-      "@nestjs/testing/*": ["../../../packages/websockets/*"],
+      "@nestjs/testing": ["../../../packages/testing"],
+      "@nestjs/testing/*": ["../../../packages/testing/*"],
       "@nestjs/platform-express": ["../../../packages/platform-express"],
       "@nestjs/platform-express/*": ["../../../packages/platform-express/*"],
       "@nestjs/platform-socket.io": ["../../../packages/platform-socket.io"],

integration/repl/e2e/repl.spec.ts

@@ -1,14 +1,14 @@
 import { clc } from '@nestjs/common/utils/cli-colors.util';
 import { repl } from '@nestjs/core';
-import { ReplContext } from '@nestjs/core/repl/repl-context';
 import {
-  HelpReplFn,
+  DebugReplFn,
   GetReplFn,
+  HelpReplFn,
+  MethodsReplFn,
   ResolveReplFn,
   SelectReplFn,
-  DebugReplFn,
-  MethodsReplFn,
 } from '@nestjs/core/repl/native-functions';
+import { ReplContext } from '@nestjs/core/repl/repl-context';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 import { AppModule } from '../src/app.module';
@@ -34,7 +34,7 @@ describe('REPL', () => {
     server.context;
     let outputText = '';
     sinon.stub(process.stdout, 'write').callsFake(text => {
-      outputText += text;
+      outputText += text as string;
       return true;
     });
     server.emit('line', 'get(UsersService)');
@@ -63,7 +63,7 @@ ${PROMPT}`);
     server.context;
     let outputText = '';
     sinon.stub(process.stdout, 'write').callsFake(text => {
-      outputText += text;
+      outputText += text as string;
       return true;
     });
     server.emit('line', '$(UsersService)');
@@ -92,7 +92,7 @@ ${PROMPT}`);
 
     let outputText = '';
     sinon.stub(process.stdout, 'write').callsFake(text => {
-      outputText += text;
+      outputText += text as string;
       return true;
     });
     server.emit('line', 'debug(UsersModule)');
@@ -115,7 +115,7 @@ ${PROMPT}`,
 
     let outputText = '';
     sinon.stub(process.stdout, 'write').callsFake(text => {
-      outputText += text;
+      outputText += text as string;
       return true;
     });
     server.emit('line', 'methods("UsersRepository")');
@@ -153,7 +153,7 @@ ${PROMPT}`,
       ).fnDefinition;
       let outputText = '';
       sinon.stub(process.stdout, 'write').callsFake(text => {
-        outputText += text;
+        outputText += text as string;
         return true;
       });
 
@@ -172,7 +172,7 @@ ${PROMPT}`);
       ).fnDefinition;
       let outputText = '';
       sinon.stub(process.stdout, 'write').callsFake(text => {
-        outputText += text;
+        outputText += text as string;
         return true;
       });
 
@@ -191,7 +191,7 @@ ${PROMPT}`);
       ).fnDefinition;
       let outputText = '';
       sinon.stub(process.stdout, 'write').callsFake(text => {
-        outputText += text;
+        outputText += text as string;
         return true;
       });
 
@@ -210,7 +210,7 @@ ${PROMPT}`);
       ).fnDefinition;
       let outputText = '';
       sinon.stub(process.stdout, 'write').callsFake(text => {
-        outputText += text;
+        outputText += text as string;
         return true;
       });
 
@@ -229,7 +229,7 @@ ${PROMPT}`);
       ).fnDefinition;
       let outputText = '';
       sinon.stub(process.stdout, 'write').callsFake(text => {
-        outputText += text;
+        outputText += text as string;
         return true;
       });
 
@@ -248,7 +248,7 @@ ${PROMPT}`);
       ).fnDefinition;
       let outputText = '';
       sinon.stub(process.stdout, 'write').callsFake(text => {
-        outputText += text;
+        outputText += text as string;
         return true;
       });
 

integration/repl/tsconfig.json

@@ -10,6 +10,7 @@
     "target": "ES2021",
     "sourceMap": true,
     "allowJs": true,
+    "strictNullChecks": true,
     "outDir": "./dist",
     "paths": {
       "@nestjs/common": ["../../packages/common"],

integration/scopes/e2e/circular-request-scope.spec.ts

@@ -48,19 +48,19 @@ describe('Circular request scope', () => {
       await new Promise(resolve => performHttpCall(resolve));
     });
 
-    it(`should create controller for each request`, async () => {
+    it(`should create controller for each request`, () => {
       expect(HelloController.COUNTER).to.be.eql(3);
     });
 
-    it(`should create service for each request`, async () => {
+    it(`should create service for each request`, () => {
       expect(UsersService.COUNTER).to.be.eql(3);
     });
 
-    it(`should create service for each request`, async () => {
+    it(`should create service for each request`, () => {
       expect(HelloService.COUNTER).to.be.eql(3);
     });
 
-    it(`should create provider for each inquirer`, async () => {
+    it(`should create provider for each inquirer`, () => {
       expect(Meta.COUNTER).to.be.eql(3);
     });
   });

integration/scopes/e2e/circular-transient-scope.spec.ts

@@ -39,7 +39,7 @@ describe('Circular transient scope', () => {
       const performHttpCall = end =>
         request(server)
           .get('/hello')
-          .end((err, res) => {
+          .end(err => {
             if (err) return end(err);
             end();
           });

integration/scopes/e2e/durable-providers.spec.ts

@@ -27,10 +27,14 @@ describe('Durable providers', () => {
       tenantId: number,
       end: (err?: any) => void,
       endpoint = '/durable',
+      opts: {
+        forceError: boolean;
+      } = { forceError: false },
     ) =>
       request(server)
         .get(endpoint)
-        .set({ ['x-tenant-id']: tenantId })
+        .set({ ['x-tenant-id']: String(tenantId) })
+        .set({ ['x-force-error']: opts.forceError ? 'true' : 'false' })
         .end((err, res) => {
           if (err) return end(err);
           end(res);
@@ -84,6 +88,42 @@ describe('Durable providers', () => {
       );
       expect(result.body).deep.equal({ tenantId: '3' });
     });
+
+    it(`should return the same tenantId both from durable request scoped service and non-durable request scoped service`, async () => {
+      let result: request.Response;
+      result = await new Promise<request.Response>(resolve =>
+        performHttpCall(1, resolve, '/durable/request-context'),
+      );
+      expect(result.body).deep.equal({
+        durableService: '1',
+        nonDurableService: '1',
+      });
+
+      result = await new Promise<request.Response>(resolve =>
+        performHttpCall(2, resolve, '/durable/request-context'),
+      );
+      expect(result.body).deep.equal({
+        durableService: '2',
+        nonDurableService: '2',
+      });
+    });
+
+    it(`should not cache durable providers that throw errors`, async () => {
+      let result: request.Response;
+
+      result = await new Promise<request.Response>(resolve =>
+        performHttpCall(10, resolve, '/durable/echo', { forceError: true }),
+      );
+
+      expect(result.statusCode).equal(412);
+
+      // The second request should be successful
+      result = await new Promise<request.Response>(resolve =>
+        performHttpCall(10, resolve, '/durable/echo'),
+      );
+
+      expect(result.body).deep.equal({ tenantId: '10' });
+    });
   });
 
   after(async () => {

integration/scopes/e2e/msvc-request-scope.spec.ts

@@ -47,29 +47,29 @@ describe('Request scope (microservices)', () => {
             if (err) return end(err);
             end();
           });
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
     });
 
-    it(`should create controller for each request`, async () => {
+    it(`should create controller for each request`, () => {
       expect(HelloController.COUNTER).to.be.eql(3);
     });
 
-    it(`should create service for each request`, async () => {
+    it(`should create service for each request`, () => {
       expect(UsersService.COUNTER).to.be.eql(3);
     });
 
-    it(`should share static provider across requests`, async () => {
+    it(`should share static provider across requests`, () => {
       expect(Meta.COUNTER).to.be.eql(1);
     });
 
-    it(`should create request scoped interceptor for each request`, async () => {
+    it(`should create request scoped interceptor for each request`, () => {
       expect(Interceptor.COUNTER).to.be.eql(3);
       expect(Interceptor.REQUEST_SCOPED_DATA).to.deep.equal([1, 1, 1]);
     });
 
-    it(`should create request scoped guard for each request`, async () => {
+    it(`should create request scoped guard for each request`, () => {
       expect(Guard.COUNTER).to.be.eql(3);
       expect(Guard.REQUEST_SCOPED_DATA).to.deep.equal([1, 1, 1]);
     });

integration/scopes/e2e/request-modules-scope.spec.ts

@@ -24,16 +24,16 @@ describe('Request scope (modules propagation)', () => {
       const performHttpCall = end =>
         request(server)
           .get('/hello')
-          .end((err, res) => {
+          .end(err => {
             if (err) return end(err);
             end();
           });
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
     });
 
-    it(`should not fail`, async () => {
+    it(`should not fail`, () => {
       expect(RequestChainService.COUNTER).to.be.eql(3);
     });
   });

integration/scopes/e2e/request-scope.spec.ts

@@ -40,38 +40,38 @@ describe('Request scope', () => {
       const performHttpCall = end =>
         request(server)
           .get('/hello')
-          .end((err, res) => {
+          .end(err => {
             if (err) return end(err);
             end();
           });
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
     });
 
-    it(`should create controller for each request`, async () => {
+    it(`should create controller for each request`, () => {
       expect(HelloController.COUNTER).to.be.eql(3);
     });
 
-    it(`should create service for each request`, async () => {
+    it(`should create service for each request`, () => {
       expect(UsersService.COUNTER).to.be.eql(3);
     });
 
-    it(`should share static provider across requests`, async () => {
+    it(`should share static provider across requests`, () => {
       expect(Meta.COUNTER).to.be.eql(1);
     });
 
-    it(`should create request scoped pipe for each request`, async () => {
+    it(`should create request scoped pipe for each request`, () => {
       expect(UserByIdPipe.COUNTER).to.be.eql(3);
       expect(UserByIdPipe.REQUEST_SCOPED_DATA).to.deep.equal([1, 1, 1]);
     });
 
-    it(`should create request scoped interceptor for each request`, async () => {
+    it(`should create request scoped interceptor for each request`, () => {
       expect(Interceptor.COUNTER).to.be.eql(3);
       expect(Interceptor.REQUEST_SCOPED_DATA).to.deep.equal([1, 1, 1]);
     });
 
-    it(`should create request scoped guard for each request`, async () => {
+    it(`should create request scoped guard for each request`, () => {
       expect(Guard.COUNTER).to.be.eql(3);
       expect(Guard.REQUEST_SCOPED_DATA).to.deep.equal([1, 1, 1]);
     });

integration/scopes/e2e/transient-scope.spec.ts

@@ -41,36 +41,36 @@ describe('Transient scope', () => {
       const performHttpCall = end =>
         request(server)
           .get('/hello')
-          .end((err, res) => {
+          .end(err => {
             if (err) return end(err);
             end();
           });
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
-      await new Promise(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
+      await new Promise<any>(resolve => performHttpCall(resolve));
     });
 
-    it(`should create controller for each request`, async () => {
+    it(`should create controller for each request`, () => {
       expect(HelloController.COUNTER).to.be.eql(3);
     });
 
-    it(`should create service for each request`, async () => {
+    it(`should create service for each request`, () => {
       expect(UsersService.COUNTER).to.be.eql(3);
     });
 
-    it(`should create provider for each inquirer`, async () => {
+    it(`should create provider for each inquirer`, () => {
       expect(Meta.COUNTER).to.be.eql(7);
     });
 
-    it(`should create transient pipe for each controller (3 requests, 1 static)`, async () => {
+    it(`should create transient pipe for each controller (3 requests, 1 static)`, () => {
       expect(UserByIdPipe.COUNTER).to.be.eql(4);
     });
 
-    it(`should create transient interceptor for each controller (3 requests, 1 static)`, async () => {
+    it(`should create transient interceptor for each controller (3 requests, 1 static)`, () => {
       expect(Interceptor.COUNTER).to.be.eql(4);
     });
 
-    it(`should create transient guard for each controller (3 requests, 1 static)`, async () => {
+    it(`should create transient guard for each controller (3 requests, 1 static)`, () => {
       expect(Guard.COUNTER).to.be.eql(4);
     });
   });

integration/scopes/src/durable/durable-context-id.strategy.ts

@@ -1,23 +1,35 @@
 import { ContextId, ContextIdStrategy, HostComponentInfo } from '@nestjs/core';
 import { Request } from 'express';
 
+export type TenantContext = {
+  tenantId: string;
+  forceError?: boolean;
+};
+
 const tenants = new Map<string, ContextId>();
 
 export class DurableContextIdStrategy implements ContextIdStrategy {
   attach(contextId: ContextId, request: Request) {
     const tenantId = request.headers['x-tenant-id'] as string;
+    const forceError = request.headers['x-force-error'] === 'true';
+
     let tenantSubTreeId: ContextId;
 
     if (tenants.has(tenantId)) {
-      tenantSubTreeId = tenants.get(tenantId);
+      tenantSubTreeId = tenants.get(tenantId)!;
     } else {
       tenantSubTreeId = { id: +tenantId } as ContextId;
       tenants.set(tenantId, tenantSubTreeId);
     }
+
+    const payload: TenantContext = { tenantId };
+    if (forceError) {
+      payload.forceError = true;
+    }
     return {
       resolve: (info: HostComponentInfo) =>
         info.isTreeDurable ? tenantSubTreeId : contextId,
-      payload: { tenantId },
+      payload,
     };
   }
 }

integration/scopes/src/durable/durable.controller.ts

@@ -1,9 +1,13 @@
 import { Controller, Get } from '@nestjs/common';
 import { DurableService } from './durable.service';
+import { NonDurableService } from './non-durable.service';
 
 @Controller('durable')
 export class DurableController {
-  constructor(private readonly durableService: DurableService) {}
+  constructor(
+    private readonly durableService: DurableService,
+    private readonly nonDurableService: NonDurableService,
+  ) {}
 
   @Get()
   greeting(): string {
@@ -12,6 +16,16 @@ export class DurableController {
 
   @Get('echo')
   echo() {
-    return this.durableService.requestPayload;
+    return {
+      tenantId: this.durableService.getTenantId(),
+    };
+  }
+
+  @Get('request-context')
+  getRequestContext() {
+    return {
+      durableService: this.durableService.getTenantId(),
+      nonDurableService: this.nonDurableService.getTenantId(),
+    };
   }
 }

integration/scopes/src/durable/durable.module.ts

@@ -3,11 +3,13 @@ import { APP_GUARD } from '@nestjs/core';
 import { DurableController } from './durable.controller';
 import { DurableGuard } from './durable.guard';
 import { DurableService } from './durable.service';
+import { NonDurableService } from './non-durable.service';
 
 @Module({
   controllers: [DurableController],
   providers: [
     DurableService,
+    NonDurableService,
     {
       provide: APP_GUARD,
       useClass: DurableGuard,

integration/scopes/src/durable/durable.service.ts

@@ -1,14 +1,28 @@
-import { Inject, Injectable, Scope } from '@nestjs/common';
+import {
+  Inject,
+  Injectable,
+  PreconditionFailedException,
+  Scope,
+} from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
+import { TenantContext } from './durable-context-id.strategy';
 
 @Injectable({ scope: Scope.REQUEST, durable: true })
 export class DurableService {
   public instanceCounter = 0;
 
-  constructor(@Inject(REQUEST) public readonly requestPayload: unknown) {}
+  constructor(@Inject(REQUEST) private readonly requestPayload: TenantContext) {
+    if (requestPayload.forceError) {
+      throw new PreconditionFailedException('Forced error');
+    }
+  }
 
   greeting() {
     ++this.instanceCounter;
     return `Hello world! Counter: ${this.instanceCounter}`;
   }
+
+  getTenantId() {
+    return this.requestPayload.tenantId;
+  }
 }

integration/scopes/src/durable/non-durable.service.ts

@@ -0,0 +1,14 @@
+import { Inject, Injectable, Scope } from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+import { TenantContext } from './durable-context-id.strategy';
+
+@Injectable()
+export class NonDurableService {
+  constructor(
+    @Inject(REQUEST) private readonly requestPayload: TenantContext,
+  ) {}
+
+  getTenantId() {
+    return this.requestPayload.tenantId;
+  }
+}

integration/scopes/src/hello/guards/request-scoped.guard.ts

@@ -10,7 +10,7 @@ import { Observable } from 'rxjs';
 @Injectable({ scope: Scope.REQUEST })
 export class Guard implements CanActivate {
   static COUNTER = 0;
-  static REQUEST_SCOPED_DATA = [];
+  static REQUEST_SCOPED_DATA = [] as number[];
 
   constructor(@Inject('REQUEST_ID') private readonly requestId: number) {
     Guard.COUNTER++;

integration/scopes/src/hello/interceptors/logging.interceptor.ts

@@ -11,7 +11,7 @@ import { Observable } from 'rxjs';
 @Injectable({ scope: Scope.REQUEST })
 export class Interceptor implements NestInterceptor {
   static COUNTER = 0;
-  static REQUEST_SCOPED_DATA = [];
+  static REQUEST_SCOPED_DATA = [] as number[];
 
   constructor(@Inject('REQUEST_ID') private readonly requestId: number) {
     Interceptor.COUNTER++;

integration/scopes/src/hello/users/user-by-id.pipe.ts

@@ -9,7 +9,7 @@ import { UsersService } from './users.service';
 @Injectable()
 export class UserByIdPipe implements PipeTransform<string> {
   static COUNTER = 0;
-  static REQUEST_SCOPED_DATA = [];
+  static REQUEST_SCOPED_DATA = [] as number[];
 
   constructor(
     @Inject('REQUEST_ID') private readonly requestId: number,