chore(@nestjs) publish v8.0.2 release

Merge pull request #7149 from nestjs/renovate/nest-monorepo
fix(deps): update nest monorepo to v8.0.1
2026-02-23 15:52:50 +00:00 · 2021-07-12 12:17:00 +02:00 · 2021-07-12 12:16:01 +02:00 · 2021-07-12 12:15:21 +02:00 · 2021-07-12 12:15:15 +02:00 · 2021-07-12 10:21:58 +02:00
530 changed files with 145745 additions and 295963 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -74,6 +74,11 @@ jobs:
    <<: *unit-tests-template
    docker:
      - image: circleci/node:14
+    
+  test_node_16:
+    <<: *unit-tests-template
+    docker:
+      - image: circleci/node:16

  lint:
    working_directory: ~/nest
@@ -160,6 +165,9 @@ workflows:
  build-and-test:
    jobs:
      - build
+      - test_node_16:
+          requires:
+            - build
      - test_node_14:
          requires:
            - build
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,7 +9,6 @@ module.exports = {
    'plugin:@typescript-eslint/eslint-recommended',
    'plugin:@typescript-eslint/recommended',
    'prettier',
-    'prettier/@typescript-eslint',
  ],
  root: true,
  env: {
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,15 +10,13 @@ Please check if your PR fulfills the following requirements:
 What kind of change does this PR introduce?

 <!-- Please check the one that applies to this PR using "x". -->
-```
-[ ] Bugfix
-[ ] Feature
-[ ] Code style update (formatting, local variables)
-[ ] Refactoring (no functional changes, no api changes)
-[ ] Build related changes
-[ ] CI related changes
-[ ] Other... Please describe:
-```
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Build related changes
+- [ ] CI related changes
+- [ ] Other... Please describe:

 ## What is the current behavior?
 <!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
@@ -30,10 +28,8 @@ Issue Number: N/A


 ## Does this PR introduce a breaking change?
-```
-[ ] Yes
-[ ] No
-```
+- [ ] Yes
+- [ ] No

 <!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->

--- a/.mocharc.js
+++ b/.mocharc.js
@@ -0,0 +1,7 @@
+module.exports = {
+  mochaHooks: {
+    beforeAll: function() {
+      require('reflect-metadata');
+    }
+  }
+};
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 (The MIT License)

-Copyright (c) 2017-2020 Kamil Mysliwiec <https://kamilmysliwiec.com>
+Copyright (c) 2017-2021 Kamil Mysliwiec <https://kamilmysliwiec.com>

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/Readme.md
+++ b/Readme.md
@@ -37,6 +37,8 @@ Nest is a framework for building efficient, scalable <a href="http://nodejs.org"

 * To check out the [guide](https://docs.nestjs.com), visit [docs.nestjs.com](https://docs.nestjs.com). :books:
 * 要查看中文 [指南](readme_zh.md), 请访问 [docs.nestjs.cn](https://docs.nestjs.cn). :books:
+* [가이드](readme_kr.md)를 확인하려면, [docs.nestjs.com](https://docs.nestjs.com)를 방문하세요.:books: 
+* チェックするには [ガイド](readme_jp.md), 詳しくは [docs.nestjs.com](https://docs.nestjs.com). :books: 

 ## Questions

@@ -56,18 +58,26 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors

 #### Principal Sponsors
 <table style="text-align:center;"><tr><td>
-<a href="https://github.com/Sanofi-IADC" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/sanofi.png" width="180" valign="middle" /></a></td><td>
-<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="180" valign="middle" /></a></td>
+<a href="https://github.com/Sanofi-IADC" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/sanofi.png" width="180" valign="middle" /></a></td>
+<td>
+<a href="https://trilon.io" target="_blank"><img src="https://nestjs.com/img/trilon.svg" width="200" valign="middle" /></a></td>
 </tr></table>

+#### Gold Sponsors
+
+<table style="text-align:center;"><tr><td>
+  <a href="https://careers.labster.com/departments/platform" target="_blank"><img src="https://nestjs.com/img/labster-logo.png" width="170" valign="middle" /></a></td><td>
+<a href="https://weld.so/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td><td>
+<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td></tr></table>
+
 #### Silver Sponsors

 <table style="text-align:center;"><tr><td>
 <a href="https://neoteric.eu/" target="_blank"><img src="https://nestjs.com/img/neoteric-cut.png" width="120" valign="middle" /></a> </td><td>
  <a href="http://gojob.com" target="_blank"><img src="http://nestjs.com/img/gojob-logo.png" valign="middle" width="100" /></a> </td><td>
-    <a href="https://trilon.io" target="_blank"><img src="https://nestjs.com/img/trilon.svg" width="170" valign="middle" /></a> </td><td>
 <a href="http://www.leogistics.com" target="_blank"><img src="https://nestjs.com/img/leogistics-logo.jpeg" width="150" valign="middle" /></td><td>
-<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-wide-logo.png" width="150" valign="middle" /></td></tr></table>
+<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-wide-logo.png" width="150" valign="middle" /></td><td>
+<a href="https://www.castlecraft.in" target="_blank"><img src="https://nestjs.com/img/castlecraft-logo.png" width="150" valign="middle" /></td></tr></table>

 #### Sponsors

@@ -90,6 +100,14 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
  <td align="center" valign="middle">
  <a href="https://genuinebee.com/" target="_blank"><img src="https://nestjs.com/img/genuinebee.svg" width="97" valign="middle" /></a> </td>
 <td align="center" valign="middle"><a href="https://sanyodigital.com/" target="_blank"><img src="https://nestjs.com/img/sanyo-digital.png" width="130" valign="middle" /></a></td></tr><tr><td align="center" valign="middle"><a href="https://vpn-review.com/vpn-for-torrenting" target="_blank"><img src="https://nestjs.com/img/vpn-review-logo.png" width="85" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://lambda-it.ch/" target="_blank"><img src="https://nestjs.com/img/lambda-it-logo.svg" width="115" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://pickwriters.com/top-10-translation-services" target="_blank"><img src="https://nestjs.com/img/pickwriters-logo.png" width="40" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://thewordpoint.com/services/localization" target="_blank"><img src="https://nestjs.com/img/thewordpoint-logo.png" width="40" valign="middle" /></a></td>
+<td align="center" valign="middle"><a href="https://meercode.io/" target="_blank"><img src="https://nestjs.com/img/meercode-logo.png" width="60" valign="middle" /></a></td>
+  <td align="center" valign="middle"><a href="https://www.najlepszeplatformyforex.pl/blog/broker-xtb/" target="_blank"><img src="https://nestjs.com/img/npf-logo.jpg" width="200" valign="middle" /></a></td></tr><tr>
+<td align="center" valign="middle"><a href="https://thestandarddaily.com/" target="_blank"><img src="https://nestjs.com/img/the-standard-daily-logo.png" width="180" valign="middle" /></a></td>
+<td align="center" valign="middle"><a href="https://houseofangular.io/" target="_blank"><img src="https://nestjs.com/img/house-of-angular.png" width="100" valign="middle" /></a></td>
+<td align="center" valign="middle"><a href="https://rocketech.it/cases/?utm_source=google&utm_medium=badge&utm_campaign=nestjs" target="_blank"><img src="https://nestjs.com/img/rocketech-logo.svg" width="110" valign="middle" /></a></td>
+  <td align="center" valign="middle"><a href="https://www.bystored.com/" target="_blank"><img src="https://nestjs.com/img/stored-logo.svg" width="110" valign="middle" /></a></td>
+  <td align="center" valign="middle"><a href="https://studyclerk.com/pay-for-research-paper" target="_blank"><img src="https://nestjs.com/img/studyclerk-logo.png" width="125" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://xyndata.com" target="_blank"><img src="https://nestjs.com/img/xyndata-logo.png" width="125" valign="middle" /></a></td></tr><tr>
+  <td align="center" valign="middle"><a href="https://www.anonymistic.com/" target="_blank"><img src="https://nestjs.com/img/anonymistic-logo.png" width="125" valign="middle" /></a></td>
  </tr></table>

 ## Backers
--- a/benchmarks/all_output.txt
+++ b/benchmarks/all_output.txt
@@ -2,47 +2,87 @@
 express
 -----------------------
 Running 10s test @ http://localhost:3000
-  8 threads and 1024 connections
-  Thread Stats   Avg      Stdev     Max   +/- Stdev
-    Latency    47.78ms   19.09ms 212.47ms   66.94%
-    Req/Sec     1.31k   268.90     2.07k    72.38%
-  104687 requests in 10.02s, 21.47MB read
-  Socket errors: connect 0, read 877, write 0, timeout 0
-Requests/sec:  10444.24
-Transfer/sec:      2.14MB
+1024 connections
+
+┌─────────┬───────┬───────┬───────┬────────┬──────────┬──────────┬────────┐
+│ Stat    │ 2.5%  │ 50%   │ 97.5% │ 99%    │ Avg      │ Stdev    │ Max    │
+├─────────┼───────┼───────┼───────┼────────┼──────────┼──────────┼────────┤
+│ Latency │ 55 ms │ 58 ms │ 91 ms │ 138 ms │ 61.88 ms │ 23.95 ms │ 747 ms │
+└─────────┴───────┴───────┴───────┴────────┴──────────┴──────────┴────────┘
+┌───────────┬─────────┬─────────┬─────────┬─────────┬──────────┬─────────┬─────────┐
+│ Stat      │ 1%      │ 2.5%    │ 50%     │ 97.5%   │ Avg      │ Stdev   │ Min     │
+├───────────┼─────────┼─────────┼─────────┼─────────┼──────────┼─────────┼─────────┤
+│ Req/Sec   │ 8407    │ 8407    │ 17407   │ 17743   │ 16454.41 │ 2716.94 │ 8402    │
+├───────────┼─────────┼─────────┼─────────┼─────────┼──────────┼─────────┼─────────┤
+│ Bytes/Sec │ 1.81 MB │ 1.81 MB │ 3.74 MB │ 3.81 MB │ 3.54 MB  │ 584 kB  │ 1.81 MB │
+└───────────┴─────────┴─────────┴─────────┴─────────┴──────────┴─────────┴─────────┘
+
+Req/Bytes counts sampled once per second.
+
+165k requests in 10.17s, 35.4 MB read
+-----------------------
+nest (with "@nestjs/platform-express")
+-----------------------
+Running 10s test @ http://localhost:3000
+1024 connections
+
+┌─────────┬───────┬───────┬───────┬───────┬──────────┬──────────┬────────┐
+│ Stat    │ 2.5%  │ 50%   │ 97.5% │ 99%   │ Avg      │ Stdev    │ Max    │
+├─────────┼───────┼───────┼───────┼───────┼──────────┼──────────┼────────┤
+│ Latency │ 61 ms │ 64 ms │ 71 ms │ 94 ms │ 65.44 ms │ 17.35 ms │ 325 ms │
+└─────────┴───────┴───────┴───────┴───────┴──────────┴──────────┴────────┘
+┌───────────┬─────────┬─────────┬─────────┬─────────┬─────────┬────────┬─────────┐
+│ Stat      │ 1%      │ 2.5%    │ 50%     │ 97.5%   │ Avg     │ Stdev  │ Min     │
+├───────────┼─────────┼─────────┼─────────┼─────────┼─────────┼────────┼─────────┤
+│ Req/Sec   │ 14183   │ 14183   │ 15767   │ 15991   │ 15640   │ 501.13 │ 14182   │
+├───────────┼─────────┼─────────┼─────────┼─────────┼─────────┼────────┼─────────┤
+│ Bytes/Sec │ 3.06 MB │ 3.06 MB │ 3.41 MB │ 3.45 MB │ 3.38 MB │ 108 kB │ 3.06 MB │
+└───────────┴─────────┴─────────┴─────────┴─────────┴─────────┴────────┴─────────┘
+
+Req/Bytes counts sampled once per second.
+
+156k requests in 10.24s, 33.8 MB read
 -----------------------
 fastify
 -----------------------
 Running 10s test @ http://localhost:3000
-  8 threads and 1024 connections
-  Thread Stats   Avg      Stdev     Max   +/- Stdev
-    Latency    21.80ms    8.73ms  78.12ms   55.78%
-    Req/Sec     2.99k     0.92k    5.67k    68.88%
-  238550 requests in 10.02s, 31.17MB read
-  Socket errors: connect 0, read 862, write 0, timeout 0
-Requests/sec:  23795.79
-Transfer/sec:      3.11MB
+1024 connections
+
+┌─────────┬───────┬───────┬───────┬───────┬──────────┬──────────┬─────────┐
+│ Stat    │ 2.5%  │ 50%   │ 97.5% │ 99%   │ Avg      │ Stdev    │ Max     │
+├─────────┼───────┼───────┼───────┼───────┼──────────┼──────────┼─────────┤
+│ Latency │ 27 ms │ 30 ms │ 39 ms │ 78 ms │ 31.62 ms │ 26.59 ms │ 1232 ms │
+└─────────┴───────┴───────┴───────┴───────┴──────────┴──────────┴─────────┘
+┌───────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐
+│ Stat      │ 1%      │ 2.5%    │ 50%     │ 97.5%   │ Avg     │ Stdev   │ Min     │
+├───────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤
+│ Req/Sec   │ 19935   │ 19935   │ 33247   │ 34111   │ 32030.4 │ 4103.84 │ 19931   │
+├───────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┤
+│ Bytes/Sec │ 3.03 MB │ 3.03 MB │ 5.05 MB │ 5.19 MB │ 4.87 MB │ 624 kB  │ 3.03 MB │
+└───────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
+
+Req/Bytes counts sampled once per second.
+
+320k requests in 10.18s, 48.7 MB read
 -----------------------
-nest
+nest (with "@nestjs/platform-fastify")
 -----------------------
 Running 10s test @ http://localhost:3000
-  8 threads and 1024 connections
-  Thread Stats   Avg      Stdev     Max   +/- Stdev
-    Latency    54.00ms   22.33ms 200.25ms   62.23%
-    Req/Sec     1.15k   338.60     1.88k    66.12%
-  91348 requests in 10.05s, 18.82MB read
-  Socket errors: connect 0, read 983, write 0, timeout 0
-Requests/sec:   9093.64
-Transfer/sec:      1.87MB
-----------------------
-nest-fastify
-----------------------
-Running 10s test @ http://localhost:3000
-  8 threads and 1024 connections
-  Thread Stats   Avg      Stdev     Max   +/- Stdev
-    Latency    29.31ms   11.71ms 101.96ms   70.03%
-    Req/Sec     2.17k     0.93k    4.12k    63.13%
-  173241 requests in 10.05s, 22.80MB read
-  Socket errors: connect 0, read 934, write 0, timeout 0
-Requests/sec:  17233.87
-Transfer/sec:      2.27MB
+1024 connections
+
+┌─────────┬───────┬───────┬───────┬───────┬──────────┬──────────┬────────┐
+│ Stat    │ 2.5%  │ 50%   │ 97.5% │ 99%   │ Avg      │ Stdev    │ Max    │
+├─────────┼───────┼───────┼───────┼───────┼──────────┼──────────┼────────┤
+│ Latency │ 31 ms │ 33 ms │ 38 ms │ 52 ms │ 34.41 ms │ 11.73 ms │ 245 ms │
+└─────────┴───────┴───────┴───────┴───────┴──────────┴──────────┴────────┘
+┌───────────┬─────────┬─────────┬────────┬─────────┬─────────┬─────────┬─────────┐
+│ Stat      │ 1%      │ 2.5%    │ 50%    │ 97.5%   │ Avg     │ Stdev   │ Min     │
+├───────────┼─────────┼─────────┼────────┼─────────┼─────────┼─────────┼─────────┤
+│ Req/Sec   │ 24911   │ 24911   │ 30031  │ 30335   │ 29470.4 │ 1564.48 │ 24907   │
+├───────────┼─────────┼─────────┼────────┼─────────┼─────────┼─────────┼─────────┤
+│ Bytes/Sec │ 3.81 MB │ 3.81 MB │ 4.6 MB │ 4.64 MB │ 4.51 MB │ 239 kB  │ 3.81 MB │
+└───────────┴─────────┴─────────┴────────┴─────────┴─────────┴─────────┴─────────┘
+
+Req/Bytes counts sampled once per second.
+
+295k requests in 10.17s, 45.1 MB read
--- a/integration/cache/e2e/multi-store.spec.ts
+++ b/integration/cache/e2e/multi-store.spec.ts
@@ -0,0 +1,31 @@
+import { INestApplication } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { MultiStoreModule } from '../src/multi-store/multi-store.module';
+
+describe('Caching Multi Store', () => {
+  let server;
+  let app: INestApplication;
+
+  before(async () => {
+    const module = await Test.createTestingModule({
+      imports: [MultiStoreModule],
+    }).compile();
+
+    app = module.createNestApplication();
+    server = app.getHttpServer();
+    await app.init();
+  });
+
+  it(`should return empty`, async () => {
+    return request(server).get('/').expect(200, '');
+  });
+
+  it(`should return data`, async () => {
+    return request(server).get('/').expect(200, 'multi-store-value');
+  });
+
+  after(async () => {
+    await app.close();
+  });
+});
--- a/integration/cache/src/multi-store/multi-store.controller.ts
+++ b/integration/cache/src/multi-store/multi-store.controller.ts
@@ -0,0 +1,16 @@
+import { Controller, Get, Inject, CACHE_MANAGER } from '@nestjs/common';
+import { Cache } from 'cache-manager';
+
+@Controller()
+export class MultiStoreController {
+  constructor(@Inject(CACHE_MANAGER) private cacheManager: Cache) {}
+
+  @Get()
+  async getFromMultiStore(): Promise<unknown> {
+    const value = await this.cacheManager.get('multi-store-key');
+    if (!value) {
+      await this.cacheManager.set('multi-store-key', 'multi-store-value');
+    }
+    return value;
+  }
+}
--- a/integration/cache/src/multi-store/multi-store.module.ts
+++ b/integration/cache/src/multi-store/multi-store.module.ts
@@ -0,0 +1,23 @@
+import { CacheModule, Module } from '@nestjs/common';
+import * as redisStore from 'cache-manager-redis-store';
+import { MultiStoreController } from './multi-store.controller';
+
+@Module({
+  imports: [CacheModule.register([
+      {
+        store: 'memory',
+        max: 100,
+        ttl: 10,
+      },
+      {
+        store: redisStore,
+        host: 'localhost',
+        port: 6379,
+        db: 0,
+        ttl: 600
+      }
+    ],
+  )],
+  controllers: [MultiStoreController],
+})
+export class MultiStoreModule {}
--- a/integration/cache/src/multi-store/tsconfig.json
+++ b/integration/cache/src/multi-store/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es6",
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "./dist"
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+  ]
+}
--- a/integration/cors/e2e/express.spec.ts
+++ b/integration/cors/e2e/express.spec.ts
@@ -0,0 +1,177 @@
+import { NestFastifyApplication } from '@nestjs/platform-fastify';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+describe('Express Cors', () => {
+  let app: NestFastifyApplication;
+  const configs = [
+    {
+      origin: 'example.com',
+      methods: 'GET',
+      credentials: true,
+      exposedHeaders: ['foo', 'bar'],
+      allowedHeaders: ['baz', 'woo'],
+      maxAge: 123,
+    },
+    {
+      origin: 'sample.com',
+      methods: 'GET',
+      credentials: true,
+      exposedHeaders: ['zoo', 'bar'],
+      allowedHeaders: ['baz', 'foo'],
+      maxAge: 321,
+    },
+  ];
+  describe('Dynamic config', () => {
+    describe('enableCors', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        app = module.createNestApplication<NestFastifyApplication>();
+
+        let requestId = 0;
+        const configDelegation = function (req, cb) {
+          const config = configs[requestId];
+          requestId++;
+          cb(null, config);
+        };
+        app.enableCors(configDelegation);
+
+        await app.init();
+      });
+
+      it(`Should add cors headers based on the first config`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+
+      it(`Should add cors headers based on the second config`, async () => {
+        return request(app.getHttpServer())
+          .options('/')
+          .expect('access-control-allow-origin', 'sample.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'zoo,bar')
+          .expect('access-control-allow-methods', 'GET')
+          .expect('access-control-allow-headers', 'baz,foo')
+          .expect('access-control-max-age', '321')
+          .expect('content-length', '0');
+      });
+
+      after(async () => {
+        await app.close();
+      });
+    });
+
+    describe('Application Options', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        let requestId = 0;
+        const configDelegation = function (req, cb) {
+          const config = configs[requestId];
+          requestId++;
+          cb(null, config);
+        };
+
+        app = module.createNestApplication<NestFastifyApplication>(null, {
+          cors: configDelegation,
+        });
+
+        await app.init();
+      });
+
+      it(`Should add cors headers based on the first config`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+
+      it(`Should add cors headers based on the second config`, async () => {
+        return request(app.getHttpServer())
+          .options('/')
+          .expect('access-control-allow-origin', 'sample.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'zoo,bar')
+          .expect('access-control-allow-methods', 'GET')
+          .expect('access-control-allow-headers', 'baz,foo')
+          .expect('access-control-max-age', '321')
+          .expect('content-length', '0');
+      });
+
+      after(async () => {
+        await app.close();
+      });
+    });
+  });
+  describe('Static config', () => {
+    describe('enableCors', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        app = module.createNestApplication<NestFastifyApplication>();
+        app.enableCors(configs[0]);
+
+        await app.init();
+      });
+
+      it(`CORS headers`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+    });
+
+    after(async () => {
+      await app.close();
+    });
+
+    describe('Application Options', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        app = module.createNestApplication<NestFastifyApplication>(null, {
+          cors: configs[0],
+        });
+        await app.init();
+      });
+
+      it(`CORS headers`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+
+      after(async () => {
+        await app.close();
+      });
+    });
+  });
+});
--- a/integration/cors/e2e/fastify.spec.ts
+++ b/integration/cors/e2e/fastify.spec.ts
@@ -0,0 +1,177 @@
+import { NestFastifyApplication } from '@nestjs/platform-fastify';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+describe('Fastify Cors', () => {
+  let app: NestFastifyApplication;
+  const configs = [
+    {
+      origin: 'example.com',
+      methods: 'GET',
+      credentials: true,
+      exposedHeaders: ['foo', 'bar'],
+      allowedHeaders: ['baz', 'woo'],
+      maxAge: 123,
+    },
+    {
+      origin: 'sample.com',
+      methods: 'GET',
+      credentials: true,
+      exposedHeaders: ['zoo', 'bar'],
+      allowedHeaders: ['baz', 'foo'],
+      maxAge: 321,
+    },
+  ];
+  describe('Dynamic config', () => {
+    describe('enableCors', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        app = module.createNestApplication<NestFastifyApplication>();
+
+        let requestId = 0;
+        const configDelegation = function (req, cb) {
+          const config = configs[requestId];
+          requestId++;
+          cb(null, config);
+        };
+        app.enableCors(configDelegation);
+
+        await app.init();
+      });
+
+      it(`Should add cors headers based on the first config`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+
+      it(`Should add cors headers based on the second config`, async () => {
+        return request(app.getHttpServer())
+          .options('/')
+          .expect('access-control-allow-origin', 'sample.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'zoo,bar')
+          .expect('access-control-allow-methods', 'GET')
+          .expect('access-control-allow-headers', 'baz,foo')
+          .expect('access-control-max-age', '321')
+          .expect('content-length', '0');
+      });
+
+      after(async () => {
+        await app.close();
+      });
+    });
+
+    describe('Application Options', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        let requestId = 0;
+        const configDelegation = function (req, cb) {
+          const config = configs[requestId];
+          requestId++;
+          cb(null, config);
+        };
+
+        app = module.createNestApplication<NestFastifyApplication>(null, {
+          cors: configDelegation,
+        });
+
+        await app.init();
+      });
+
+      it(`Should add cors headers based on the first config`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+
+      it(`Should add cors headers based on the second config`, async () => {
+        return request(app.getHttpServer())
+          .options('/')
+          .expect('access-control-allow-origin', 'sample.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'zoo,bar')
+          .expect('access-control-allow-methods', 'GET')
+          .expect('access-control-allow-headers', 'baz,foo')
+          .expect('access-control-max-age', '321')
+          .expect('content-length', '0');
+      });
+
+      after(async () => {
+        await app.close();
+      });
+    });
+  });
+
+  describe('Static config', () => {
+    describe('enableCors', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        app = module.createNestApplication<NestFastifyApplication>();
+        app.enableCors(configs[0]);
+
+        await app.init();
+      });
+
+      it(`CORS headers`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+    });
+
+    after(async () => {
+      await app.close();
+    });
+    describe('Application Options', () => {
+      before(async () => {
+        const module = await Test.createTestingModule({
+          imports: [AppModule],
+        }).compile();
+
+        app = module.createNestApplication<NestFastifyApplication>(null, {
+          cors: configs[0],
+        });
+        await app.init();
+      });
+
+      it(`CORS headers`, async () => {
+        return request(app.getHttpServer())
+          .get('/')
+          .expect('access-control-allow-origin', 'example.com')
+          .expect('vary', 'Origin')
+          .expect('access-control-allow-credentials', 'true')
+          .expect('access-control-expose-headers', 'foo,bar')
+          .expect('content-length', '0');
+      });
+    });
+
+    after(async () => {
+      await app.close();
+    });
+  });
+});
--- a/integration/cors/src/app.controller.ts
+++ b/integration/cors/src/app.controller.ts
@@ -0,0 +1,9 @@
+import { Controller, Get } from '@nestjs/common';
+
+@Controller()
+export class AppController {
+  @Get()
+  getGlobals() {
+    return '';
+  }
+}
--- a/integration/cors/src/app.module.ts
+++ b/integration/cors/src/app.module.ts
@@ -0,0 +1,7 @@
+import { Module } from '@nestjs/common';
+import { AppController } from './app.controller';
+
+@Module({
+  controllers: [AppController],
+})
+export class AppModule {}
--- a/integration/cors/tsconfig.json
+++ b/integration/cors/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es6",
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "./dist"
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+  ]
+}
--- a/integration/docker-compose.yml
+++ b/integration/docker-compose.yml
@@ -23,7 +23,7 @@ services:
      - "9001:9001"
    restart: always
  mysql:
-    image: mysql:5.7.32
+    image: mysql:5.7.34
    environment:
      MYSQL_ROOT_PASSWORD: root
      MYSQL_DATABASE: test
@@ -48,7 +48,7 @@ services:
  zookeeper:
    container_name: test-zookeeper
    hostname: zookeeper
-    image: confluentinc/cp-zookeeper:5.5.2
+    image: confluentinc/cp-zookeeper:6.2.0
    ports:
      - "2181:2181"
    environment:
@@ -57,7 +57,7 @@ services:
  kafka:
    container_name: test-kafka
    hostname: kafka
-    image: confluentinc/cp-kafka:5.5.2
+    image: confluentinc/cp-kafka:6.2.0
    depends_on:
      - zookeeper
    ports:
@@ -70,3 +70,4 @@ services:
      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_DELETE_TOPIC_ENABLE: 'true'
--- a/integration/graphql-code-first/e2e/pipes.spec.ts
+++ b/integration/graphql-code-first/e2e/pipes.spec.ts
@@ -33,6 +33,7 @@ describe('GraphQL Pipes', () => {
              code: 'INTERNAL_SERVER_ERROR',
              exception: {
                message: 'Bad Request Exception',
+                name: 'BadRequestException',
                response: {
                  message: [
                    'description must be longer than or equal to 30 characters',
--- a/integration/hello-world/e2e/fastify-adapter.spec.ts
+++ b/integration/hello-world/e2e/fastify-adapter.spec.ts
@@ -63,6 +63,22 @@ describe('Hello world (fastify adapter)', () => {
      });
  });

+  it(`/GET { host: [":tenant.example1.com", ":tenant.example2.com"] } not matched`, () => {
+    return app
+      .inject({
+        method: 'GET',
+        url: '/host-array',
+      })
+      .then(({ payload }) => {
+        expect(JSON.parse(payload)).to.be.eql({
+          error: 'Internal Server Error',
+          message:
+            'HTTP adapter does not support filtering on hosts: [":tenant.example1.com", ":tenant.example2.com"]',
+          statusCode: 500,
+        });
+      });
+  });
+
  it(`/GET inject with LightMyRequest chaining API`, () => {
    return app
      .inject()
--- a/integration/hello-world/e2e/hello-world.spec.ts
+++ b/integration/hello-world/e2e/hello-world.spec.ts
@@ -28,6 +28,16 @@ describe('Hello world (default adapter)', () => {
      path: '/host',
      greeting: 'Host Greeting! tenant=acme',
    },
+    {
+      host: 'acme.example1.com',
+      path: '/host-array',
+      greeting: 'Host Greeting! tenant=acme',
+    },
+    {
+      host: 'acme.example2.com',
+      path: '/host-array',
+      greeting: 'Host Greeting! tenant=acme',
+    },
  ].forEach(({ host, path, greeting }) => {
    describe(`host=${host}`, () => {
      describe('/GET', () => {
--- a/integration/hello-world/e2e/router-module-middleware.spec.ts
+++ b/integration/hello-world/e2e/router-module-middleware.spec.ts
@@ -0,0 +1,77 @@
+import {
+  Controller,
+  Get,
+  INestApplication,
+  MiddlewareConsumer,
+  Module,
+} from '@nestjs/common';
+import { RouterModule } from '@nestjs/core';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { ApplicationModule } from '../src/app.module';
+
+const RETURN_VALUE = 'test';
+const SCOPED_VALUE = 'test_scoped';
+
+@Controller()
+class TestController {
+  @Get('test')
+  test() {
+    return RETURN_VALUE;
+  }
+
+  @Get('test2')
+  test2() {
+    return RETURN_VALUE;
+  }
+}
+
+@Module({
+  imports: [ApplicationModule],
+  controllers: [TestController],
+})
+class TestModule {
+  configure(consumer: MiddlewareConsumer) {
+    consumer
+      .apply((req, res, next) => res.send(SCOPED_VALUE))
+      .forRoutes(TestController);
+  }
+}
+
+describe('RouterModule with Middleware functions', () => {
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    app = (
+      await Test.createTestingModule({
+        imports: [
+          TestModule,
+          RouterModule.register([
+            {
+              path: '/module-path/',
+              module: TestModule,
+            },
+          ]),
+        ],
+      }).compile()
+    ).createNestApplication();
+
+    await app.init();
+  });
+
+  it(`forRoutes(TestController) - /test`, () => {
+    return request(app.getHttpServer())
+      .get('/module-path/test')
+      .expect(200, SCOPED_VALUE);
+  });
+
+  it(`forRoutes(TestController) - /test2`, () => {
+    return request(app.getHttpServer())
+      .get('/module-path/test2')
+      .expect(200, SCOPED_VALUE);
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+});
--- a/integration/hello-world/e2e/router-module.spec.ts
+++ b/integration/hello-world/e2e/router-module.spec.ts
@@ -0,0 +1,99 @@
+import { Controller, Get, INestApplication, Module } from '@nestjs/common';
+import { RouterModule, Routes } from '@nestjs/core';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+
+describe('RouterModule', () => {
+  let app: INestApplication;
+
+  abstract class BaseController {
+    @Get()
+    getName() {
+      return this.constructor.name;
+    }
+  }
+
+  @Controller('/parent-controller')
+  class ParentController extends BaseController {}
+  @Controller('/child-controller')
+  class ChildController extends BaseController {}
+  @Controller('no-slash-controller')
+  class NoSlashController extends BaseController {}
+
+  class UnknownController {}
+  @Module({ controllers: [ParentController] })
+  class ParentModule {}
+
+  @Module({ controllers: [ChildController] })
+  class ChildModule {}
+
+  @Module({})
+  class AuthModule {}
+  @Module({})
+  class PaymentsModule {}
+
+  @Module({ controllers: [NoSlashController] })
+  class NoSlashModule {}
+
+  const routes1: Routes = [
+    {
+      path: 'parent',
+      module: ParentModule,
+      children: [
+        {
+          path: 'child',
+          module: ChildModule,
+        },
+      ],
+    },
+  ];
+  const routes2: Routes = [
+    { path: 'v1', children: [AuthModule, PaymentsModule, NoSlashModule] },
+  ];
+
+  @Module({
+    imports: [ParentModule, ChildModule, RouterModule.register(routes1)],
+  })
+  class MainModule {}
+
+  @Module({
+    imports: [
+      AuthModule,
+      PaymentsModule,
+      NoSlashModule,
+      RouterModule.register(routes2),
+    ],
+  })
+  class AppModule {}
+
+  before(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [MainModule, AppModule],
+    }).compile();
+
+    app = moduleRef.createNestApplication();
+    await app.init();
+  });
+
+  it('should hit the "ParentController"', async () => {
+    return request(app.getHttpServer())
+      .get('/parent/parent-controller')
+      .expect(200, 'ParentController');
+  });
+
+  it('should hit the "ChildController"', async () => {
+    return request(app.getHttpServer())
+      .get('/parent/child/child-controller')
+      .expect(200, 'ChildController');
+  });
+
+  it('should hit the "NoSlashController"', async () => {
+    return request(app.getHttpServer())
+      .get('/v1/no-slash-controller')
+      .expect(200, 'NoSlashController');
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+});
--- a/integration/hello-world/src/app.module.ts
+++ b/integration/hello-world/src/app.module.ts
@@ -1,8 +1,9 @@
 import { Module } from '@nestjs/common';
 import { HelloModule } from './hello/hello.module';
+import { HostArrayModule } from './host-array/host-array.module';
 import { HostModule } from './host/host.module';

@Module({
-  imports: [HelloModule, HostModule],
+  imports: [HelloModule, HostModule, HostArrayModule],
 })
 export class ApplicationModule {}
--- a/integration/hello-world/src/host-array/dto/test.dto.ts
+++ b/integration/hello-world/src/host-array/dto/test.dto.ts
@@ -0,0 +1,10 @@
+import { IsString, IsNotEmpty, IsNumber } from 'class-validator';
+
+export class TestDto {
+  @IsString()
+  @IsNotEmpty()
+  string: string;
+
+  @IsNumber()
+  number: number;
+}
--- a/integration/hello-world/src/host-array/host-array.controller.ts
+++ b/integration/hello-world/src/host-array/host-array.controller.ts
@@ -0,0 +1,37 @@
+import { Controller, Get, Header, HostParam, Param } from '@nestjs/common';
+import { Observable, of } from 'rxjs';
+import { HostArrayService } from './host-array.service';
+import { UserByIdPipe } from './users/user-by-id.pipe';
+
+@Controller({
+  path: 'host-array',
+  host: [':tenant.example1.com', ':tenant.example2.com'],
+})
+export class HostArrayController {
+  constructor(private readonly hostService: HostArrayService) {}
+
+  @Get()
+  @Header('Authorization', 'Bearer')
+  greeting(@HostParam('tenant') tenant: string): string {
+    return `${this.hostService.greeting()} tenant=${tenant}`;
+  }
+
+  @Get('async')
+  async asyncGreeting(@HostParam('tenant') tenant: string): Promise<string> {
+    return `${await this.hostService.greeting()} tenant=${tenant}`;
+  }
+
+  @Get('stream')
+  streamGreeting(@HostParam('tenant') tenant: string): Observable<string> {
+    return of(`${this.hostService.greeting()} tenant=${tenant}`);
+  }
+
+  @Get('local-pipe/:id')
+  localPipe(
+    @Param('id', UserByIdPipe)
+    user: any,
+    @HostParam('tenant') tenant: string,
+  ): any {
+    return { ...user, tenant };
+  }
+}
--- a/integration/hello-world/src/host-array/host-array.module.ts
+++ b/integration/hello-world/src/host-array/host-array.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { HostArrayController } from './host-array.controller';
+import { HostArrayService } from './host-array.service';
+import { UsersService } from './users/users.service';
+
+@Module({
+  controllers: [HostArrayController],
+  providers: [HostArrayService, UsersService],
+})
+export class HostArrayModule {}
--- a/integration/hello-world/src/host-array/host-array.service.ts
+++ b/integration/hello-world/src/host-array/host-array.service.ts
@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class HostArrayService {
+  greeting(): string {
+    return 'Host Greeting!';
+  }
+}
--- a/integration/hello-world/src/host-array/users/user-by-id.pipe.ts
+++ b/integration/hello-world/src/host-array/users/user-by-id.pipe.ts
@@ -0,0 +1,11 @@
+import { PipeTransform, Injectable, ArgumentMetadata } from '@nestjs/common';
+import { UsersService } from './users.service';
+
+@Injectable()
+export class UserByIdPipe implements PipeTransform<string> {
+  constructor(private readonly usersService: UsersService) {}
+
+  transform(value: string, metadata: ArgumentMetadata) {
+    return this.usersService.findById(value);
+  }
+}
--- a/integration/hello-world/src/host-array/users/users.service.ts
+++ b/integration/hello-world/src/host-array/users/users.service.ts
@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class UsersService {
+  findById(id: string) {
+    return { id, host: true };
+  }
+}
--- a/integration/hooks/e2e/before-app-shutdown.spec.ts
+++ b/integration/hooks/e2e/before-app-shutdown.spec.ts
@@ -1,4 +1,4 @@
-import { BeforeApplicationShutdown, Injectable } from '@nestjs/common';
+import { BeforeApplicationShutdown, Injectable, Module } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as Sinon from 'sinon';
@@ -19,35 +19,46 @@ describe('BeforeApplicationShutdown', () => {
    const instance = module.get(TestInjectable);
    expect(instance.beforeApplicationShutdown.called).to.be.true;
  });
-  /*
-  it('should not stop the server once beforeApplicationShutdown has been called', async () => {
-    let resolve;
-    const promise = new Promise(r => (resolve = r));
+
+  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';
+      }
+    }
+
+    @Module({
+      providers: [BB],
+      exports: [BB],
+    })
+    class B {}
+
+    @Injectable()
+    class AA implements BeforeApplicationShutdown {
+      public field: string;
+      constructor(private bb: BB) {}
+
+      async beforeApplicationShutdown() {
+        this.field = this.bb.field + '_a-field';
+      }
+    }
+    @Module({
+      imports: [B],
+      providers: [AA],
+    })
+    class A {}
+
    const module = await Test.createTestingModule({
-      providers: [
-        {
-          provide: 'Test',
-          useValue: {
-            beforeApplicationShutdown: () => promise,
-          },
-        },
-      ],
+      imports: [A],
    }).compile();
-    Sinon.stub(module, 'dispose' as any);
+
    const app = module.createNestApplication();
+    await app.init();
+    await app.close();

-    app.close();
-
-    expect(((module as any).dispose as Sinon.SinonSpy).called, 'dispose').to.be
-      .false;
-
-    resolve();
-
-    setTimeout(
-      () =>
-        expect(((module as any).dispose as Sinon.SinonSpy).called, 'dispose').to
-          .be.true,
-      0,
-    );
-  });*/
+    const instance = module.get(AA);
+    expect(instance.field).to.equal('b-field_a-field');
+  });
 });
--- a/integration/hooks/e2e/enable-shutdown-hook.spec.ts
+++ b/integration/hooks/e2e/enable-shutdown-hook.spec.ts
@@ -15,7 +15,7 @@ describe('enableShutdownHooks', () => {
    expect(calls[0]).to.equal('beforeApplicationShutdown SIGHUP');
    expect(calls[1]).to.equal('onApplicationShutdown SIGHUP');
    done();
-  }).timeout(5000);
+  }).timeout(10000);

  it('should call the correct hooks if a specific shutdown signal gets invoked', done => {
    const result = spawnSync('ts-node', [
@@ -30,7 +30,7 @@ describe('enableShutdownHooks', () => {
    expect(calls[0]).to.equal('beforeApplicationShutdown SIGINT');
    expect(calls[1]).to.equal('onApplicationShutdown SIGINT');
    done();
-  }).timeout(5000);
+  }).timeout(10000);

  it('should ignore system signals which are not specified', done => {
    const result = spawnSync('ts-node', [
@@ -40,7 +40,7 @@ describe('enableShutdownHooks', () => {
    ]);
    expect(result.stdout.toString().trim()).to.be.eq('');
    done();
-  }).timeout(5000);
+  }).timeout(10000);

  it('should ignore system signals if "enableShutdownHooks" was not called', done => {
    const result = spawnSync('ts-node', [
@@ -50,5 +50,5 @@ describe('enableShutdownHooks', () => {
    ]);
    expect(result.stdout.toString().trim()).to.be.eq('');
    done();
-  }).timeout(5000);
+  }).timeout(10000);
 });
--- a/integration/hooks/e2e/on-app-boostrap.spec.ts
+++ b/integration/hooks/e2e/on-app-boostrap.spec.ts
@@ -1,7 +1,7 @@
+import { Injectable, Module, OnApplicationBootstrap } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as Sinon from 'sinon';
-import { Injectable, OnApplicationBootstrap } from '@nestjs/common';

@Injectable()
 class TestInjectable implements OnApplicationBootstrap {
@@ -41,4 +41,45 @@ describe('OnApplicationBootstrap', () => {
    const app = module.createNestApplication();
    await app.init().then(obj => expect(obj).to.not.be.undefined);
  });
+
+  it('should sort modules by distance (topological sort) - DESC order', async () => {
+    @Injectable()
+    class BB implements OnApplicationBootstrap {
+      public field: string;
+      async onApplicationBootstrap() {
+        this.field = 'b-field';
+      }
+    }
+
+    @Module({
+      providers: [BB],
+      exports: [BB],
+    })
+    class B {}
+
+    @Injectable()
+    class AA implements OnApplicationBootstrap {
+      public field: string;
+      constructor(private bb: BB) {}
+
+      async onApplicationBootstrap() {
+        this.field = this.bb.field + '_a-field';
+      }
+    }
+    @Module({
+      imports: [B],
+      providers: [AA],
+    })
+    class A {}
+
+    const module = await Test.createTestingModule({
+      imports: [A],
+    }).compile();
+
+    const app = module.createNestApplication();
+    await app.init();
+
+    const instance = module.get(AA);
+    expect(instance.field).to.equal('b-field_a-field');
+  });
 });
--- a/integration/hooks/e2e/on-app-shutdown.spec.ts
+++ b/integration/hooks/e2e/on-app-shutdown.spec.ts
@@ -1,4 +1,4 @@
-import { Injectable, OnApplicationShutdown } from '@nestjs/common';
+import { Injectable, Module, OnApplicationShutdown } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as Sinon from 'sinon';
@@ -19,4 +19,46 @@ describe('OnApplicationShutdown', () => {
    const instance = module.get(TestInjectable);
    expect(instance.onApplicationShutdown.called).to.be.true;
  });
+
+  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';
+      }
+    }
+
+    @Module({
+      providers: [BB],
+      exports: [BB],
+    })
+    class B {}
+
+    @Injectable()
+    class AA implements OnApplicationShutdown {
+      public field: string;
+      constructor(private bb: BB) {}
+
+      async onApplicationShutdown() {
+        this.field = this.bb.field + '_a-field';
+      }
+    }
+    @Module({
+      imports: [B],
+      providers: [AA],
+    })
+    class A {}
+
+    const module = await Test.createTestingModule({
+      imports: [A],
+    }).compile();
+
+    const app = module.createNestApplication();
+    await app.init();
+    await app.close();
+
+    const instance = module.get(AA);
+    expect(instance.field).to.equal('b-field_a-field');
+  });
 });
--- a/integration/hooks/e2e/on-module-destroy.spec.ts
+++ b/integration/hooks/e2e/on-module-destroy.spec.ts
@@ -1,4 +1,4 @@
-import { Injectable, OnModuleDestroy } from '@nestjs/common';
+import { Injectable, Module, OnModuleDestroy } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as Sinon from 'sinon';
@@ -39,4 +39,46 @@ describe('OnModuleDestroy', () => {
    const app = module.createNestApplication();
    await app.init().then(obj => expect(obj).to.not.be.undefined);
  });
+
+  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';
+      }
+    }
+
+    @Module({
+      providers: [BB],
+      exports: [BB],
+    })
+    class B {}
+
+    @Injectable()
+    class AA implements OnModuleDestroy {
+      public field: string;
+      constructor(private bb: BB) {}
+
+      async onModuleDestroy() {
+        this.field = this.bb.field + '_a-field';
+      }
+    }
+    @Module({
+      imports: [B],
+      providers: [AA],
+    })
+    class A {}
+
+    const module = await Test.createTestingModule({
+      imports: [A],
+    }).compile();
+
+    const app = module.createNestApplication();
+    await app.init();
+    await app.close();
+
+    const instance = module.get(AA);
+    expect(instance.field).to.equal('b-field_a-field');
+  });
 });
--- a/integration/hooks/e2e/on-module-init.spec.ts
+++ b/integration/hooks/e2e/on-module-init.spec.ts
@@ -1,7 +1,7 @@
+import { Injectable, Module, OnModuleInit } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as Sinon from 'sinon';
-import { Injectable, OnModuleInit } from '@nestjs/common';

@Injectable()
 class TestInjectable implements OnModuleInit {
@@ -37,4 +37,45 @@ describe('OnModuleInit', () => {
    const app = module.createNestApplication();
    await app.init().then(obj => expect(obj).to.not.be.undefined);
  });
+
+  it('should sort modules by distance (topological sort) - DESC order', async () => {
+    @Injectable()
+    class BB implements OnModuleInit {
+      public field: string;
+      async onModuleInit() {
+        this.field = 'b-field';
+      }
+    }
+
+    @Module({
+      providers: [BB],
+      exports: [BB],
+    })
+    class B {}
+
+    @Injectable()
+    class AA implements OnModuleInit {
+      public field: string;
+      constructor(private bb: BB) {}
+
+      async onModuleInit() {
+        this.field = this.bb.field + '_a-field';
+      }
+    }
+    @Module({
+      imports: [B],
+      providers: [AA],
+    })
+    class A {}
+
+    const module = await Test.createTestingModule({
+      imports: [A],
+    }).compile();
+
+    const app = module.createNestApplication();
+    await app.init();
+
+    const instance = module.get(AA);
+    expect(instance.field).to.equal('b-field_a-field');
+  });
 });
--- a/integration/hooks/src/enable-shutdown-hooks-main.ts
+++ b/integration/hooks/src/enable-shutdown-hooks-main.ts
@@ -26,7 +26,7 @@ class TestInjectable
 class AppModule {}

 async function bootstrap() {
-  const app = await NestFactory.create(AppModule, { logger: true });
+  const app = await NestFactory.create(AppModule, { logger: false });

  if (SIGNAL_TO_LISTEN && SIGNAL_TO_LISTEN !== 'NONE') {
    app.enableShutdownHooks([SIGNAL_TO_LISTEN]);
--- a/integration/microservices/e2e/broadcast-mqtt.spec.ts
+++ b/integration/microservices/e2e/broadcast-mqtt.spec.ts
@@ -28,7 +28,7 @@ describe('MQTT transport', () => {
        host: '0.0.0.0',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

--- a/integration/microservices/e2e/broadcast-nats.spec.ts
+++ b/integration/microservices/e2e/broadcast-nats.spec.ts
@@ -19,16 +19,16 @@ describe('NATS transport', () => {
    app.connectMicroservice({
      transport: Transport.NATS,
      options: {
-        url: 'nats://0.0.0.0:4222',
+        servers: 'nats://0.0.0.0:4222',
      },
    });
    app.connectMicroservice({
      transport: Transport.NATS,
      options: {
-        url: 'nats://0.0.0.0:4222',
+        servers: 'servers://0.0.0.0:4222',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

--- a/integration/microservices/e2e/broadcast-redis.spec.ts
+++ b/integration/microservices/e2e/broadcast-redis.spec.ts
@@ -28,7 +28,7 @@ describe('REDIS transport', () => {
        url: 'redis://0.0.0.0:6379',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

--- a/integration/microservices/e2e/concurrent-kafka.spec.ts
+++ b/integration/microservices/e2e/concurrent-kafka.spec.ts
@@ -0,0 +1,291 @@
+import { INestApplication, Logger } from '@nestjs/common';
+import { Transport } from '@nestjs/microservices';
+import { Test } from '@nestjs/testing';
+import { Admin, ITopicMetadata, Kafka } from 'kafkajs';
+import * as request from 'supertest';
+import * as util from 'util';
+import { KafkaConcurrentController } from '../src/kafka-concurrent/kafka-concurrent.controller';
+import { KafkaConcurrentMessagesController } from '../src/kafka-concurrent/kafka-concurrent.messages.controller';
+
+describe.skip('Kafka concurrent', function () {
+  const numbersOfServers = 3;
+
+  const requestTopic = 'math.sum.sync.number.wait';
+  const responseTopic = 'math.sum.sync.number.wait.reply';
+
+  let admin: Admin;
+  const servers: any[] = [];
+  const apps: INestApplication[] = [];
+
+  const logger = new Logger('concurrent-kafka.spec.ts');
+
+  // set timeout to be longer (especially for the after hook)
+  this.timeout(30000);
+
+  const startServer = async () => {
+    const module = await Test.createTestingModule({
+      controllers: [
+        KafkaConcurrentController,
+        KafkaConcurrentMessagesController,
+      ],
+    }).compile();
+
+    // use our own logger for a little
+    // Logger.overrideLogger(new Logger());
+
+    const app = module.createNestApplication();
+
+    const server = app.getHttpAdapter().getInstance();
+
+    app.connectMicroservice({
+      transport: Transport.KAFKA,
+      options: {
+        client: {
+          brokers: ['localhost:9092'],
+        },
+        run: {
+          partitionsConsumedConcurrently: numbersOfServers,
+        },
+      },
+    });
+
+    // enable these for clean shutdown
+    app.enableShutdownHooks();
+
+    // push to the collection
+    servers.push(server);
+    apps.push(app);
+
+    // await the start
+    await app.startAllMicroservices();
+    await app.init();
+  };
+
+  it(`Create kafka topics/partitions`, async () => {
+    const kafka = new Kafka({
+      clientId: 'concurrent-test-admin',
+      brokers: ['localhost:9092'],
+    });
+
+    admin = kafka.admin();
+    await admin.connect();
+
+    let topicMetadata: {
+      topics: ITopicMetadata[];
+    };
+
+    try {
+      topicMetadata = await admin.fetchTopicMetadata({
+        topics: [requestTopic, responseTopic],
+      });
+    } catch (e) {
+      // create with number of servers
+      try {
+        await admin.createTopics({
+          topics: [
+            {
+              topic: requestTopic,
+              numPartitions: numbersOfServers,
+              replicationFactor: 1,
+            },
+            {
+              topic: responseTopic,
+              numPartitions: numbersOfServers,
+              replicationFactor: 1,
+            },
+          ],
+        });
+      } catch (e) {
+        logger.error(util.format('Create topics error: %o', e));
+      }
+    }
+
+    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) {
+          try {
+            await admin.createPartitions({
+              topicPartitions: [
+                {
+                  topic: topic.name,
+                  count: numbersOfServers,
+                },
+              ],
+            });
+          } catch (e) {
+            logger.error(util.format('Create partitions error: %o', e));
+          }
+        }
+      }
+    }
+
+    // create with number of servers
+    try {
+      await admin.createTopics({
+        topics: [
+          {
+            topic: requestTopic,
+            numPartitions: numbersOfServers,
+            replicationFactor: 1,
+          },
+          {
+            topic: responseTopic,
+            numPartitions: numbersOfServers,
+            replicationFactor: 1,
+          },
+        ],
+      });
+    } catch (e) {
+      logger.error(util.format('Create topics error: %o', e));
+    }
+
+    // disconnect
+    await admin.disconnect();
+  });
+
+  it(`Start Kafka apps`, async () => {
+    // start all at once
+    await Promise.all(
+      Array(numbersOfServers)
+        .fill(1)
+        .map(async (v, i) => {
+          // return startServer();
+
+          // wait in intervals so the consumers start in order
+          return new Promise<void>(resolve => {
+            setTimeout(async () => {
+              await startServer();
+
+              return resolve();
+            }, 1000 * i);
+          });
+        }),
+    );
+  }).timeout(30000);
+
+  it(`Concurrent messages without forcing a rebalance.`, async () => {
+    // wait a second before notifying the servers to respond
+    setTimeout(async () => {
+      // notify the other servers that it is time to respond
+      await Promise.all(
+        servers.map(async server => {
+          // send to all servers since indexes don't necessarily align with server consumers
+          return request(server).post('/go').send();
+        }),
+      );
+    }, 1000);
+
+    await Promise.all(
+      servers.map(async (server, index) => {
+        // send requests
+        const payload = {
+          key: index,
+          numbers: [1, index],
+        };
+        const result = (1 + index).toString();
+
+        return request(server)
+          .post('/mathSumSyncNumberWait')
+          .send(payload)
+          .expect(200)
+          .expect(200, result);
+      }),
+    );
+  });
+
+  it(`Close kafka client consumer while waiting for message pattern response.`, async () => {
+    await Promise.all(
+      servers.map(async (server, index) => {
+        // shut off and delete the leader
+        if (index === 0) {
+          return new Promise<void>(resolve => {
+            // wait a second before closing so the producers can send the message to the server consumers
+            setTimeout(async () => {
+              // get the controller
+              const controller = apps[index].get(KafkaConcurrentController);
+
+              // close the controller clients
+              await controller.client.close();
+
+              // notify the other servers that we have stopped
+              await Promise.all(
+                servers.map(async server => {
+                  // send to all servers since indexes don't necessarily align with server consumers
+                  return request(server).post('/go').send();
+                }),
+              );
+
+              return resolve();
+            }, 1000);
+          });
+        }
+
+        // send requests
+        const payload = {
+          key: index,
+          numbers: [1, index],
+        };
+        const result = (1 + index).toString();
+
+        return request(server)
+          .post('/mathSumSyncNumberWait')
+          .send(payload)
+          .expect(200)
+          .expect(200, result);
+      }),
+    );
+  });
+
+  it(`Start kafka client consumer while waiting for message pattern response.`, async () => {
+    await Promise.all(
+      servers.map(async (server, index) => {
+        // shut off and delete the leader
+        if (index === 0) {
+          return new Promise<void>(resolve => {
+            // wait a second before closing so the producers can send the message to the server consumers
+            setTimeout(async () => {
+              // get the controller
+              const controller = apps[index].get(KafkaConcurrentController);
+
+              // connect the controller client
+              await controller.client.connect();
+
+              // notify the servers that we have started
+              await Promise.all(
+                servers.map(async server => {
+                  // send to all servers since indexes don't necessarily align with server consumers
+                  return request(server).post('/go').send();
+                }),
+              );
+
+              return resolve();
+            }, 1000);
+          });
+        }
+
+        // send requests
+        const payload = {
+          key: index,
+          numbers: [1, index],
+        };
+        const result = (1 + index).toString();
+
+        return request(server)
+          .post('/mathSumSyncNumberWait')
+          .send(payload)
+          .expect(200)
+          .expect(200, result);
+      }),
+    );
+  });
+
+  after(`Stopping Kafka app`, async () => {
+    // close all concurrently
+    return Promise.all(
+      apps.map(async app => {
+        return app.close();
+      }),
+    );
+  });
+});
--- a/integration/microservices/e2e/disconnected-client.spec.ts
+++ b/integration/microservices/e2e/disconnected-client.spec.ts
@@ -46,7 +46,7 @@ describe('Disconnected client', () => {
      .send({
        transport: Transport.NATS,
        options: {
-          url: 'nats://localhost:4224',
+          servers: 'nats://localhost:4224',
        },
      })
      .expect(408);
--- a/integration/microservices/e2e/orders-grpc.spec.ts
+++ b/integration/microservices/e2e/orders-grpc.spec.ts
@@ -1,3 +1,4 @@
+import * as GRPC from '@grpc/grpc-js';
 import * as ProtoLoader from '@grpc/proto-loader';
 import { INestApplication } from '@nestjs/common';
 import { Transport } from '@nestjs/microservices';
@@ -6,7 +7,6 @@ import { Test } from '@nestjs/testing';
 import { fail } from 'assert';
 import { expect } from 'chai';
 import * as express from 'express';
-import * as GRPC from 'grpc';
 import { join } from 'path';
 import * as request from 'supertest';
 import { AdvancedGrpcController } from '../src/grpc-advanced/advanced.grpc.controller';
@@ -39,7 +39,7 @@ describe('Advanced GRPC transport', () => {
      },
    });
    // Start gRPC microservice
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
    // Load proto-buffers for test gRPC dispatch
    const proto = ProtoLoader.loadSync('root.proto', {
--- a/integration/microservices/e2e/sum-grpc.spec.ts
+++ b/integration/microservices/e2e/sum-grpc.spec.ts
@@ -1,10 +1,10 @@
+import * as GRPC from '@grpc/grpc-js';
 import * as ProtoLoader from '@grpc/proto-loader';
 import { INestApplication } from '@nestjs/common';
 import { Transport } from '@nestjs/microservices';
 import { Test } from '@nestjs/testing';
 import { fail } from 'assert';
 import { expect } from 'chai';
-import * as GRPC from 'grpc';
 import { join } from 'path';
 import * as request from 'supertest';
 import { GrpcController } from '../src/grpc/grpc.controller';
@@ -33,7 +33,7 @@ describe('GRPC transport', () => {
      },
    });
    // Start gRPC microservice
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
    // Load proto-buffers for test gRPC dispatch
    const proto = ProtoLoader.loadSync(
@@ -113,6 +113,5 @@ describe('GRPC transport', () => {

  after(async () => {
    await app.close();
-    client.close();
  });
 });
--- a/integration/microservices/e2e/sum-kafka.spec.ts
+++ b/integration/microservices/e2e/sum-kafka.spec.ts
@@ -9,11 +9,19 @@ import { UserEntity } from '../src/kafka/entities/user.entity';
 import { KafkaController } from '../src/kafka/kafka.controller';
 import { KafkaMessagesController } from '../src/kafka/kafka.messages.controller';

-describe('Kafka transport', () => {
-  let server;
+/**
+ * Skip this flaky test in CI/CD pipeline as it frequently
+ * fails to connect to Kafka container in the cloud.
+ */
+describe.skip('Kafka transport', function () {
+  let server: any;
  let app: INestApplication;

-  it(`Start Kafka app`, async () => {
+  // set timeout to be longer (especially for the after hook)
+  this.timeout(50000);
+  this.retries(10);
+
+  before(`Start Kafka app`, async function () {
    const module = await Test.createTestingModule({
      controllers: [KafkaController, KafkaMessagesController],
    }).compile();
@@ -29,11 +37,12 @@ describe('Kafka transport', () => {
        },
      },
    });
-    await app.startAllMicroservicesAsync();
+    app.enableShutdownHooks();
+    await app.startAllMicroservices();
    await app.init();
-  }).timeout(30000);
+  });

-  it(`/POST (sync sum kafka message)`, () => {
+  it(`/POST (sync sum kafka message)`, function () {
    return request(server)
      .post('/mathSumSyncKafkaMessage')
      .send([1, 2, 3, 4, 5])
@@ -126,4 +135,4 @@ describe('Kafka transport', () => {
  after(`Stopping Kafka app`, async () => {
    await app.close();
  });
-}).timeout(30000);
+});
--- a/integration/microservices/e2e/sum-mqtt.spec.ts
+++ b/integration/microservices/e2e/sum-mqtt.spec.ts
@@ -23,7 +23,7 @@ describe('MQTT transport', () => {
        url: 'mqtt://0.0.0.0:1883',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

--- a/integration/microservices/e2e/sum-nats.spec.ts
+++ b/integration/microservices/e2e/sum-nats.spec.ts
@@ -4,6 +4,7 @@ import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
 import * as request from 'supertest';
 import { NatsController } from '../src/nats/nats.controller';
+import { NatsService } from '../src/nats/nats.service';

 describe('NATS transport', () => {
  let server;
@@ -12,6 +13,7 @@ describe('NATS transport', () => {
  beforeEach(async () => {
    const module = await Test.createTestingModule({
      controllers: [NatsController],
+      providers: [NatsService],
    }).compile();

    app = module.createNestApplication();
@@ -20,10 +22,10 @@ describe('NATS transport', () => {
    app.connectMicroservice({
      transport: Transport.NATS,
      options: {
-        url: 'nats://0.0.0.0:4222',
+        servers: 'nats://0.0.0.0:4222',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

@@ -88,6 +90,7 @@ describe('NATS transport', () => {
      .end(() => {
        setTimeout(() => {
          expect(NatsController.IS_NOTIFIED).to.be.true;
+          expect(NatsController.IS_NOTIFIED2).to.be.true;
          done();
        }, 1000);
      });
--- a/integration/microservices/e2e/sum-redis.spec.ts
+++ b/integration/microservices/e2e/sum-redis.spec.ts
@@ -23,7 +23,7 @@ describe('REDIS transport', () => {
        url: 'redis://0.0.0.0:6379',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

--- a/integration/microservices/e2e/sum-rmq.spec.ts
+++ b/integration/microservices/e2e/sum-rmq.spec.ts
@@ -26,7 +26,7 @@ describe('RabbitMQ transport', () => {
        socketOptions: { noDelay: true },
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

--- a/integration/microservices/e2e/sum-rpc.spec.ts
+++ b/integration/microservices/e2e/sum-rpc.spec.ts
@@ -24,7 +24,7 @@ describe('RPC transport', () => {
        host: '0.0.0.0',
      },
    });
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
    await app.init();
  });

@@ -105,6 +105,22 @@ describe('RPC transport', () => {
      });
  });

+  it('/POST (custom client)', () => {
+    return request(server)
+      .post('/error?client=custom')
+      .send({})
+      .expect(200)
+      .expect('true');
+  });
+
+  it('/POST (standard client)', () => {
+    return request(server)
+      .post('/error?client=standard')
+      .send({})
+      .expect(200)
+      .expect('false');
+  });
+
  afterEach(async () => {
    await app.close();
  });
--- a/integration/microservices/src/app.controller.ts
+++ b/integration/microservices/src/app.controller.ts
@@ -11,16 +11,18 @@ import {
  ClientProxy,
  EventPattern,
  MessagePattern,
+  RpcException,
  Transport,
 } from '@nestjs/microservices';
-import { from, Observable, of } from 'rxjs';
-import { scan } from 'rxjs/operators';
+import { from, lastValueFrom, Observable, of, throwError } from 'rxjs';
+import { catchError, scan } from 'rxjs/operators';

@Controller()
 export class AppController {
  constructor(
    @Inject('USE_CLASS_CLIENT') private useClassClient: ClientProxy,
    @Inject('USE_FACTORY_CLIENT') private useFactoryClient: ClientProxy,
+    @Inject('CUSTOM_PROXY_CLIENT') private customClient: ClientProxy,
  ) {}
  static IS_NOTIFIED = false;

@@ -64,9 +66,9 @@ export class AppController {
  concurrent(@Body() data: number[][]): Promise<boolean> {
    const send = async (tab: number[]) => {
      const expected = tab.reduce((a, b) => a + b);
-      const result = await this.client
-        .send<number>({ cmd: 'sum' }, tab)
-        .toPromise();
+      const result = await lastValueFrom(
+        this.client.send<number>({ cmd: 'sum' }, tab),
+      );

      return result === expected;
    };
@@ -75,6 +77,20 @@ export class AppController {
      .reduce(async (a, b) => (await a) && b);
  }

+  @Post('error')
+  @HttpCode(200)
+  serializeError(
+    @Query('client') query: 'custom' | 'standard' = 'standard',
+    @Body() body: Record<string, any>,
+  ): Observable<boolean> {
+    const client = query === 'custom' ? this.customClient : this.client;
+    return client.send({ cmd: 'err' }, {}).pipe(
+      catchError(err => {
+        return of(err instanceof RpcException);
+      }),
+    );
+  }
+
  @MessagePattern({ cmd: 'sum' })
  sum(data: number[]): number {
    return (data || []).reduce((a, b) => a + b);
@@ -95,6 +111,11 @@ export class AppController {
    return from(data);
  }

+  @MessagePattern({ cmd: 'err' })
+  throwAnError() {
+    return throwError(() => new Error('err'));
+  }
+
  @Post('notify')
  async sendNotification(): Promise<any> {
    return this.client.emit<number>('notification', true);
--- a/integration/microservices/src/app.module.ts
+++ b/integration/microservices/src/app.module.ts
@@ -5,8 +5,16 @@ import {
  Transport,
  ClientsModuleOptionsFactory,
  ClientOptions,
+  ClientTCP,
+  RpcException,
 } from '@nestjs/microservices';

+class ErrorHandlingProxy extends ClientTCP {
+  serializeError(err) {
+    return new RpcException(err);
+  }
+}
+
@Injectable()
 class ConfigService {
  private readonly config = {
@@ -51,7 +59,14 @@ class ClientOptionService implements ClientsModuleOptionsFactory {
        name: 'USE_CLASS_CLIENT',
        useClass: ClientOptionService,
        inject: [ConfigService],
-      },
+      }, {
+        imports: [ConfigModule],
+        inject: [ConfigService],
+        name: 'CUSTOM_PROXY_CLIENT',
+        useFactory: (config: ConfigService) => ({
+          customClass: ErrorHandlingProxy
+        })
+      }
    ]),
  ],
  controllers: [AppController],
--- a/integration/microservices/src/disconnected.controller.ts
+++ b/integration/microservices/src/disconnected.controller.ts
@@ -18,13 +18,15 @@ export class DisconnectedClientController {
      .send<number, number[]>({ cmd: 'none' }, [1, 2, 3])
      .pipe(
        /*tap(
-        console.log.bind(console, 'data'),
-        console.error.bind(console, 'error'),
-      ),*/
+          console.log.bind(console, 'data'),
+          console.error.bind(console, 'error'),
+        ),*/
        catchError(error => {
          const { code } = error || { code: 'CONN_ERR' };
-          return throwError(
-            code === 'ECONNREFUSED' || code === 'CONN_ERR'
+          return throwError(() =>
+            code === 'ECONNREFUSED' ||
+            code === 'CONN_ERR' ||
+            code === 'CONNECTION_REFUSED'
              ? new RequestTimeoutException('ECONNREFUSED')
              : new InternalServerErrorException(),
          );
--- a/integration/microservices/src/grpc-advanced/advanced.grpc.controller.ts
+++ b/integration/microservices/src/grpc-advanced/advanced.grpc.controller.ts
@@ -1,3 +1,4 @@
+import { Metadata } from '@grpc/grpc-js';
 import { Body, Controller, HttpCode, Post } from '@nestjs/common';
 import {
  Client,
@@ -9,7 +10,6 @@ import {
 } from '@nestjs/microservices';
 import { join } from 'path';
 import { Observable, of, ReplaySubject, Subject } from 'rxjs';
-import { Metadata } from 'grpc';

@Controller()
 export class AdvancedGrpcController {
--- a/integration/microservices/src/kafka-concurrent/dto/sum.dto.ts
+++ b/integration/microservices/src/kafka-concurrent/dto/sum.dto.ts
@@ -0,0 +1,4 @@
+export class SumDto {
+  key: string;
+  numbers: number[];
+}
--- a/integration/microservices/src/kafka-concurrent/kafka-concurrent.controller.ts
+++ b/integration/microservices/src/kafka-concurrent/kafka-concurrent.controller.ts
@@ -0,0 +1,70 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  OnModuleDestroy,
+  OnModuleInit,
+  Post,
+} from '@nestjs/common';
+import { Logger } from '@nestjs/common/services/logger.service';
+import { Client, ClientKafka, Transport } from '@nestjs/microservices';
+import { PartitionerArgs } from 'kafkajs';
+import { Observable } from 'rxjs';
+import { SumDto } from './dto/sum.dto';
+
+/**
+ * The following function explicity sends messages to the key representing the partition.
+ */
+const explicitPartitioner = () => {
+  return ({ message }: PartitionerArgs) => {
+    return parseFloat(message.headers.toPartition.toString());
+  };
+};
+
+@Controller()
+export class KafkaConcurrentController
+  implements OnModuleInit, OnModuleDestroy {
+  protected readonly logger = new Logger(KafkaConcurrentController.name);
+
+  @Client({
+    transport: Transport.KAFKA,
+    options: {
+      client: {
+        brokers: ['localhost:9092'],
+      },
+      run: {
+        partitionsConsumedConcurrently: 3,
+      },
+      producer: {
+        createPartitioner: explicitPartitioner,
+      },
+    },
+  })
+  public readonly client: ClientKafka;
+
+  async onModuleInit() {
+    const requestPatterns = ['math.sum.sync.number.wait'];
+
+    requestPatterns.forEach(pattern => {
+      this.client.subscribeToResponseOf(pattern);
+    });
+
+    await this.client.connect();
+  }
+
+  async onModuleDestroy() {
+    await this.client.close();
+  }
+
+  @Post('mathSumSyncNumberWait')
+  @HttpCode(200)
+  public mathSumSyncNumberWait(@Body() data: SumDto): Observable<string> {
+    return this.client.send('math.sum.sync.number.wait', {
+      headers: {
+        toPartition: data.key.toString(),
+      },
+      key: data.key.toString(),
+      value: data.numbers,
+    });
+  }
+}
--- a/integration/microservices/src/kafka-concurrent/kafka-concurrent.messages.controller.ts
+++ b/integration/microservices/src/kafka-concurrent/kafka-concurrent.messages.controller.ts
@@ -0,0 +1,37 @@
+import { Controller, HttpCode, Post } from '@nestjs/common';
+import { MessagePattern } from '@nestjs/microservices';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { first, map, skipWhile } from 'rxjs/operators';
+
+@Controller()
+export class KafkaConcurrentMessagesController {
+  public waiting = new BehaviorSubject<boolean>(false);
+
+  @Post('go')
+  @HttpCode(200)
+  async go() {
+    // no longer waiting
+    this.waiting.next(false);
+
+    return;
+  }
+
+  @MessagePattern('math.sum.sync.number.wait')
+  public mathSumSyncNumberWait(data: any): Observable<number> {
+    // start waiting
+    this.waiting.next(true);
+
+    // find sum
+    const sum = data.value[0] + data.value[1];
+
+    return this.waiting.asObservable().pipe(
+      skipWhile(isWaiting => {
+        return isWaiting;
+      }),
+      map(() => {
+        return sum;
+      }),
+      first(),
+    );
+  }
+}
--- a/integration/microservices/src/kafka/kafka.controller.ts
+++ b/integration/microservices/src/kafka/kafka.controller.ts
@@ -1,12 +1,19 @@
-import { Body, Controller, HttpCode, OnModuleInit, Post } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  HttpCode,
+  OnModuleDestroy,
+  OnModuleInit,
+  Post,
+} from '@nestjs/common';
 import { Logger } from '@nestjs/common/services/logger.service';
 import { Client, ClientKafka, Transport } from '@nestjs/microservices';
-import { Observable } from 'rxjs';
+import { lastValueFrom, Observable } from 'rxjs';
 import { BusinessDto } from './dtos/business.dto';
 import { UserDto } from './dtos/user.dto';

@Controller()
-export class KafkaController implements OnModuleInit {
+export class KafkaController implements OnModuleInit, OnModuleDestroy {
  protected readonly logger = new Logger(KafkaController.name);
  static IS_NOTIFIED = false;
  static MATH_SUM = 0;
@@ -21,7 +28,7 @@ export class KafkaController implements OnModuleInit {
  })
  private readonly client: ClientKafka;

-  onModuleInit() {
+  async onModuleInit() {
    const requestPatterns = [
      'math.sum.sync.kafka.message',
      'math.sum.sync.without.key',
@@ -36,6 +43,12 @@ export class KafkaController implements OnModuleInit {
    requestPatterns.forEach(pattern => {
      this.client.subscribeToResponseOf(pattern);
    });
+
+    await this.client.connect();
+  }
+
+  async onModuleDestroy() {
+    await this.client.close();
  }

  // sync send kafka message
@@ -44,14 +57,14 @@ export class KafkaController implements OnModuleInit {
  async mathSumSyncKafkaMessage(
    @Body() data: number[],
  ): Promise<Observable<any>> {
-    const result = await this.client
-      .send('math.sum.sync.kafka.message', {
+    const result = await lastValueFrom(
+      this.client.send('math.sum.sync.kafka.message', {
        key: '1',
        value: {
          numbers: data,
        },
-      })
-      .toPromise();
+      }),
+    );
    return result;
  }

@@ -61,13 +74,13 @@ export class KafkaController implements OnModuleInit {
  async mathSumSyncWithoutKey(
    @Body() data: number[],
  ): Promise<Observable<any>> {
-    const result = await this.client
-      .send('math.sum.sync.without.key', {
+    const result = await lastValueFrom(
+      this.client.send('math.sum.sync.without.key', {
        value: {
          numbers: data,
        },
-      })
-      .toPromise();
+      }),
+    );
    return result;
  }

@@ -77,11 +90,11 @@ export class KafkaController implements OnModuleInit {
  async mathSumSyncPlainObject(
    @Body() data: number[],
  ): Promise<Observable<any>> {
-    const result = await this.client
-      .send('math.sum.sync.plain.object', {
+    const result = await lastValueFrom(
+      this.client.send('math.sum.sync.plain.object', {
        numbers: data,
-      })
-      .toPromise();
+      }),
+    );
    return result;
  }

@@ -89,9 +102,9 @@ export class KafkaController implements OnModuleInit {
  @Post('mathSumSyncArray')
  @HttpCode(200)
  async mathSumSyncArray(@Body() data: number[]): Promise<Observable<any>> {
-    const result = await this.client
-      .send('math.sum.sync.array', data)
-      .toPromise();
+    const result = await lastValueFrom(
+      this.client.send('math.sum.sync.array', data),
+    );
    return result;
  }

@@ -99,18 +112,18 @@ export class KafkaController implements OnModuleInit {
  @HttpCode(200)
  async mathSumSyncString(@Body() data: number[]): Promise<Observable<any>> {
    // this.logger.error(util.format('mathSumSyncString() data: %o', data));
-    const result = await this.client
-      .send('math.sum.sync.string', data.toString())
-      .toPromise();
+    const result = await lastValueFrom(
+      this.client.send('math.sum.sync.string', data.toString()),
+    );
    return result;
  }

  @Post('mathSumSyncNumber')
  @HttpCode(200)
  async mathSumSyncNumber(@Body() data: number[]): Promise<Observable<any>> {
-    const result = await this.client
-      .send('math.sum.sync.number', data[0])
-      .toPromise();
+    const result = await lastValueFrom(
+      this.client.send('math.sum.sync.number', data[0]),
+    );
    return result;
  }

@@ -124,14 +137,14 @@ export class KafkaController implements OnModuleInit {
  @Post('/user')
  @HttpCode(200)
  async createUser(@Body() user: UserDto): Promise<Observable<any>> {
-    const result = await this.client
-      .send('user.create', {
+    const result = await lastValueFrom(
+      this.client.send('user.create', {
        key: '1',
        value: {
          user,
        },
-      })
-      .toPromise();
+      }),
+    );
    return result;
  }

@@ -139,14 +152,14 @@ export class KafkaController implements OnModuleInit {
  @Post('/business')
  @HttpCode(200)
  async createBusiness(@Body() business: BusinessDto) {
-    const result = await this.client
-      .send('business.create', {
+    const result = await lastValueFrom(
+      this.client.send('business.create', {
        key: '1',
        value: {
          business,
        },
-      })
-      .toPromise();
+      }),
+    );
    return result;
  }
 }
--- a/integration/microservices/src/mqtt/mqtt.controller.ts
+++ b/integration/microservices/src/mqtt/mqtt.controller.ts
@@ -6,7 +6,7 @@ import {
  MessagePattern,
  Transport,
 } from '@nestjs/microservices';
-import { from, Observable, of } from 'rxjs';
+import { from, lastValueFrom, Observable, of } from 'rxjs';
 import { scan } from 'rxjs/operators';

@Controller()
@@ -30,10 +30,13 @@ export class MqttController {

  @Post('stream')
  @HttpCode(200)
-  stream(@Body() data: number[]): Observable<number> {
-    return this.client
-      .send<number>({ cmd: 'streaming' }, data)
-      .pipe(scan((a, b) => a + b));
+  async stream(@Body() data: number[]) {
+    const result = lastValueFrom(
+      await this.client
+        .send<number>({ cmd: 'streaming' }, data)
+        .pipe(scan((a, b) => a + b, 0)),
+    );
+    return result;
  }

  @Post('concurrent')
@@ -41,9 +44,9 @@ export class MqttController {
  async concurrent(@Body() data: number[][]): Promise<boolean> {
    const send = async (tab: number[]) => {
      const expected = tab.reduce((a, b) => a + b);
-      const result = await this.client
-        .send<number>({ cmd: 'sum' }, tab)
-        .toPromise();
+      const result = await lastValueFrom(
+        this.client.send<number>({ cmd: 'sum' }, tab),
+      );

      return result === expected;
    };
--- a/integration/microservices/src/nats/nats-broadcast.controller.ts
+++ b/integration/microservices/src/nats/nats-broadcast.controller.ts
@@ -10,7 +10,12 @@ import { scan, take } from 'rxjs/operators';

@Controller()
 export class NatsBroadcastController {
-  @Client({ transport: Transport.NATS })
+  @Client({
+    transport: Transport.NATS,
+    options: {
+      servers: 'nats://localhost:4222',
+    },
+  })
  client: ClientProxy;

  @Get('broadcast')
--- a/integration/microservices/src/nats/nats.controller.ts
+++ b/integration/microservices/src/nats/nats.controller.ts
@@ -1,7 +1,7 @@
 import { Body, Controller, Get, HttpCode, Post, Query } from '@nestjs/common';
 import {
-  Client,
  ClientProxy,
+  ClientProxyFactory,
  Ctx,
  EventPattern,
  MessagePattern,
@@ -10,20 +10,23 @@ import {
  RpcException,
  Transport,
 } from '@nestjs/microservices';
-import { from, Observable, of, throwError } from 'rxjs';
+import { from, lastValueFrom, Observable, of, throwError } from 'rxjs';
 import { catchError, scan } from 'rxjs/operators';
+import { NatsService } from './nats.service';

@Controller()
 export class NatsController {
  static IS_NOTIFIED = false;
+  static IS_NOTIFIED2 = false;

-  @Client({
+  constructor(private readonly natsService: NatsService) {}
+
+  client: ClientProxy = ClientProxyFactory.create({
    transport: Transport.NATS,
    options: {
-      url: 'nats://localhost:4222',
+      servers: 'nats://localhost:4222',
    },
-  })
-  client: ClientProxy;
+  });

  @Post()
  @HttpCode(200)
@@ -48,9 +51,9 @@ export class NatsController {
  concurrent(@Body() data: number[][]): Promise<boolean> {
    const send = async (tab: number[]) => {
      const expected = tab.reduce((a, b) => a + b);
-      const result = await this.client
-        .send<number>('math.sum', tab)
-        .toPromise();
+      const result = await lastValueFrom(
+        this.client.send<number>('math.sum', tab),
+      );

      return result === expected;
    };
@@ -88,7 +91,7 @@ export class NatsController {

  @MessagePattern('exception')
  throwError(): Observable<number> {
-    return throwError(new RpcException('test'));
+    return throwError(() => new RpcException('test'));
  }

  @Post('notify')
@@ -100,4 +103,9 @@ export class NatsController {
  eventHandler(@Payload() data: boolean) {
    NatsController.IS_NOTIFIED = data;
  }
+
+  @EventPattern('notification')
+  eventHandler2(@Payload() data: boolean) {
+    NatsController.IS_NOTIFIED2 = data;
+  }
 }
--- a/integration/microservices/src/nats/nats.service.ts
+++ b/integration/microservices/src/nats/nats.service.ts
@@ -0,0 +1,7 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { CONTEXT } from '@nestjs/microservices';
+
+@Injectable()
+export class NatsService {
+  constructor(@Inject(CONTEXT) public ctx) {}
+}
--- a/integration/microservices/src/redis/redis.controller.ts
+++ b/integration/microservices/src/redis/redis.controller.ts
@@ -6,7 +6,7 @@ import {
  MessagePattern,
  Transport,
 } from '@nestjs/microservices';
-import { from, Observable, of } from 'rxjs';
+import { from, lastValueFrom, Observable, of } from 'rxjs';
 import { scan } from 'rxjs/operators';

@Controller()
@@ -35,9 +35,9 @@ export class RedisController {
  concurrent(@Body() data: number[][]): Promise<boolean> {
    const send = async (tab: number[]) => {
      const expected = tab.reduce((a, b) => a + b);
-      const result = await this.client
-        .send<number>({ cmd: 'sum' }, tab)
-        .toPromise();
+      const result = await lastValueFrom(
+        this.client.send<number>({ cmd: 'sum' }, tab),
+      );

      return result === expected;
    };
--- a/integration/microservices/src/rmq/rmq.controller.ts
+++ b/integration/microservices/src/rmq/rmq.controller.ts
@@ -6,7 +6,7 @@ import {
  MessagePattern,
  Transport,
 } from '@nestjs/microservices';
-import { from, Observable, of } from 'rxjs';
+import { from, lastValueFrom, Observable, of } from 'rxjs';
 import { scan } from 'rxjs/operators';

@Controller()
@@ -46,9 +46,9 @@ export class RMQController {
  concurrent(@Body() data: number[][]): Promise<boolean> {
    const send = async (tab: number[]) => {
      const expected = tab.reduce((a, b) => a + b);
-      const result = await this.client
-        .send<number>({ cmd: 'sum' }, tab)
-        .toPromise();
+      const result = await lastValueFrom(
+        this.client.send<number>({ cmd: 'sum' }, tab),
+      );

      return result === expected;
    };
--- a/integration/nest-application/global-prefix/e2e/global-prefix.spec.ts
+++ b/integration/nest-application/global-prefix/e2e/global-prefix.spec.ts
@@ -0,0 +1,96 @@
+import { INestApplication } from '@nestjs/common';
+import { RequestMethod } from '@nestjs/common/enums/request-method.enum';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+describe('Global prefix', () => {
+  let server;
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    const module = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = module.createNestApplication();
+  });
+
+  it(`should use the global prefix`, async () => {
+    app.setGlobalPrefix('/api/v1');
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/health').expect(404);
+
+    await request(server).get('/api/v1/health').expect(200);
+  });
+
+  it(`should exclude the path as string`, async () => {
+    app.setGlobalPrefix('/api/v1', { exclude: ['/test'] });
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/test').expect(200);
+    await request(server).post('/test').expect(201);
+
+    await request(server).get('/api/v1/test').expect(404);
+    await request(server).post('/api/v1/test').expect(404);
+  });
+
+  it(`should exclude the path as RouteInfo`, async () => {
+    app.setGlobalPrefix('/api/v1', {
+      exclude: [{ path: '/health', method: RequestMethod.GET }],
+    });
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/health').expect(200);
+
+    await request(server).get('/api/v1/health').expect(404);
+  });
+
+  it(`should only exclude the GET RequestMethod`, async () => {
+    app.setGlobalPrefix('/api/v1', {
+      exclude: [{ path: '/test', method: RequestMethod.GET }],
+    });
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/test').expect(200);
+
+    await request(server).post('/test').expect(404);
+
+    await request(server).post('/api/v1/test').expect(201);
+  });
+
+  it(`should exclude the path as a mix of string and RouteInfo`, async () => {
+    app.setGlobalPrefix('/api/v1', {
+      exclude: ['test', { path: '/health', method: RequestMethod.GET }],
+    });
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/health').expect(200);
+
+    await request(server).get('/test').expect(200);
+  });
+
+  it(`should exclude the path with route param`, async () => {
+    app.setGlobalPrefix('/api/v1', { exclude: ['/hello/:name'] });
+
+    server = app.getHttpServer();
+    await app.init();
+
+    await request(server).get('/hello/foo').expect(200);
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+});
--- a/integration/nest-application/global-prefix/src/app.controller.ts
+++ b/integration/nest-application/global-prefix/src/app.controller.ts
@@ -0,0 +1,24 @@
+import { Controller, Get, Post } from '@nestjs/common';
+
+@Controller()
+export class AppController {
+  @Get('hello/:name')
+  getHello(): string {
+    return 'hello';
+  }
+
+  @Get('health')
+  getHealth(): string {
+    return 'up';
+  }
+
+  @Get('test')
+  getTest(): string {
+    return 'test';
+  }
+
+  @Post('test')
+  postTest(): string {
+    return 'test';
+  }
+}
--- a/integration/nest-application/global-prefix/src/app.module.ts
+++ b/integration/nest-application/global-prefix/src/app.module.ts
@@ -0,0 +1,7 @@
+import { Module } from '@nestjs/common';
+import { AppController } from './app.controller';
+
+@Module({
+  controllers: [AppController],
+})
+export class AppModule {}
--- a/integration/nest-application/global-prefix/tsconfig.json
+++ b/integration/nest-application/global-prefix/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es6",
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "./dist"
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
--- a/integration/nest-application/listen/e2e/express.spec.ts
+++ b/integration/nest-application/listen/e2e/express.spec.ts
@@ -0,0 +1,47 @@
+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;
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    testModule = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+    app = testModule.createNestApplication(new ExpressAdapter(express()));
+  });
+
+  afterEach(async () => {
+    app.close();
+  });
+
+  it('should resolve with httpServer on success', async () => {
+    const response = await app.listen(3000);
+    expect(response).to.eql(app.getHttpServer());
+  });
+
+  it('should reject if the port is not available', async () => {
+    await app.listen(3000);
+    const secondApp = testModule.createNestApplication(
+      new ExpressAdapter(express()),
+    );
+    try {
+      await secondApp.listen(3000);
+    } catch (error) {
+      expect(error.code).to.equal('EADDRINUSE');
+    }
+  });
+
+  it('should reject if there is an invalid host', async () => {
+    try {
+      await app.listen(3000, '1');
+    } catch (error) {
+      expect(error.code).to.equal('EADDRNOTAVAIL');
+    }
+  });
+});
--- a/integration/nest-application/listen/e2e/fastify.spec.ts
+++ b/integration/nest-application/listen/e2e/fastify.spec.ts
@@ -0,0 +1,46 @@
+import { INestApplication } from '@nestjs/common';
+import { FastifyAdapter } from '@nestjs/platform-fastify';
+import { Test, TestingModule } from '@nestjs/testing';
+import { expect } from 'chai';
+import { AppModule } from '../src/app.module';
+
+describe('Listen (Fastify Application)', () => {
+  let testModule: TestingModule;
+  let app: INestApplication;
+
+  beforeEach(async () => {
+    testModule = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+    app = testModule.createNestApplication(new FastifyAdapter());
+  });
+
+  afterEach(async () => {
+    app.close();
+  });
+
+  it('should resolve with httpServer on success', async () => {
+    const response = await app.listen(3000);
+    expect(response).to.eql(app.getHttpServer());
+  });
+
+  it('should reject if the port is not available', async () => {
+    await app.listen(3000);
+    const secondApp = testModule.createNestApplication(new FastifyAdapter());
+    try {
+      await secondApp.listen(3000);
+    } catch (error) {
+      expect(error.code).to.equal('EADDRINUSE');
+    }
+
+    await secondApp.close();
+  });
+
+  it('should reject if there is an invalid host', async () => {
+    try {
+      await app.listen(3000, '1');
+    } catch (error) {
+      expect(error.code).to.equal('EADDRNOTAVAIL');
+    }
+  });
+});
--- a/integration/nest-application/listen/src/app.controller.ts
+++ b/integration/nest-application/listen/src/app.controller.ts
@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { AppService } from './app.service';
+
+@Controller()
+export class AppController {
+  constructor(private readonly appService: AppService) {}
+
+  @Get()
+  getHello(): string {
+    return this.appService.sayHello();
+  }
+}
--- a/integration/nest-application/listen/src/app.module.ts
+++ b/integration/nest-application/listen/src/app.module.ts
@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { AppController } from './app.controller';
+import { AppService } from './app.service';
+
+@Module({
+  controllers: [AppController],
+  providers: [AppService],
+})
+export class AppModule {}
--- a/integration/nest-application/listen/src/app.service.ts
+++ b/integration/nest-application/listen/src/app.service.ts
@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class AppService {
+  sayHello(): string {
+    return 'Hello World!';
+  }
+}
--- a/integration/scopes/e2e/msvc-request-scope.spec.ts
+++ b/integration/scopes/e2e/msvc-request-scope.spec.ts
@@ -35,7 +35,7 @@ describe('Request scope (microservices)', () => {

    server = app.getHttpServer();
    await app.init();
-    await app.startAllMicroservicesAsync();
+    await app.startAllMicroservices();
  });

  describe('when one service is request scoped', () => {
--- a/integration/send-files/e2e/express.spec.ts
+++ b/integration/send-files/e2e/express.spec.ts
@@ -0,0 +1,53 @@
+import { ExpressAdapter, NestExpressApplication } from '@nestjs/platform-express';
+import { Test } from '@nestjs/testing';
+import { expect } from 'chai';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+const readmeString = readFileSync(join(process.cwd(), 'Readme.md')).toString();
+
+describe('Express FileSend', () => {
+  let app: NestExpressApplication;
+
+  beforeEach(async () => {
+    const modRef = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = modRef.createNestApplication(new ExpressAdapter());
+    await app.init();
+  });
+
+  it('should return a file from a stream', async () => {
+    return request(app.getHttpServer())
+      .get('/file/stream/')
+      .expect(200)
+      .expect((res) => {
+        expect(res.body.toString()).to.be.eq(readmeString);
+      });
+  });
+  it('should return a file from a buffer', async () => {
+    return request(app.getHttpServer())
+      .get('/file/buffer')
+      .expect(200)
+      .expect((res) => {
+        expect(res.body.toString()).to.be.eq(readmeString);
+      });
+  });
+  it('should not stream a non-file', async () => {
+    return request(app.getHttpServer())
+      .get('/non-file/pipe-method')
+      .expect(200)
+      .expect({ value: 'Hello world' });
+  });
+  it('should return a file from an RxJS stream', async () => {
+    return request(app.getHttpServer())
+      .get('/file/rxjs/stream/')
+      .expect(200)
+      .expect((res) => {
+        expect(res.body.toString()).to.be.eq(readmeString);
+      });
+  });
+});
--- a/integration/send-files/e2e/fastify.spec.ts
+++ b/integration/send-files/e2e/fastify.spec.ts
@@ -0,0 +1,59 @@
+import { FastifyAdapter, NestFastifyApplication } from '@nestjs/platform-fastify';
+import { Test } from '@nestjs/testing';
+import { expect } from 'chai';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+import { AppModule } from '../src/app.module';
+
+const readmeString = readFileSync(join(process.cwd(), 'Readme.md')).toString();
+
+describe('Fastify FileSend', () => {
+  let app: NestFastifyApplication;
+
+  beforeEach(async () => {
+    const modRef = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = modRef.createNestApplication(new FastifyAdapter());
+    await app.init();
+  });
+
+  it('should return a file from a stream', async () => {
+    return app.inject({
+      method: 'GET',
+      url: '/file/stream'
+    }).then(({ payload }) => {
+      expect(payload.toString()).to.be.eq(readmeString);
+    });
+  });
+  it('should return a file from a buffer', async () => {
+    return app.inject({
+      method: 'GET',
+      url: '/file/buffer',
+    }).then(({ payload }) => {
+      expect(payload.toString()).to.be.eq(readmeString);
+    });
+  });
+  /**
+   * It seems that Fastify has a similar issue as Kamil initially pointed out
+   * If a class has a `pipe` method, it will be treated as a stream. This means
+   * that the `NonFile` test is a failed case for fastify, hence the skip.
+   */
+  it.skip('should not stream a non-file', async () => {
+    return app.inject({
+      url: '/non-file/pipe-method',
+      method: 'get'
+    }).then(({ payload }) => {
+      expect(payload).to.be.eq({ value: 'Hello world' });
+    });
+  });
+  it('should return a file from an RxJS stream', async () => {
+    return app.inject({
+      method: 'GET',
+      url: '/file/rxjs/stream'
+    }).then(({ payload }) => {
+      expect(payload.toString()).to.be.eq(readmeString);
+    });
+  });
+});
--- a/integration/send-files/src/app.controller.ts
+++ b/integration/send-files/src/app.controller.ts
@@ -0,0 +1,29 @@
+import { Controller, Get, StreamableFile } from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { AppService } from './app.service';
+import { NonFile } from './non-file';
+
+@Controller()
+export class AppController {
+  constructor(private readonly appService: AppService) {}
+
+  @Get('file/stream')
+  getFile(): StreamableFile {
+    return this.appService.getReadStream();
+  }
+
+  @Get('file/buffer')
+  getBuffer(): StreamableFile {
+    return this.appService.getBuffer();
+  }
+
+  @Get('non-file/pipe-method')
+  getNonFile(): NonFile {
+    return this.appService.getNonFile();
+  }
+
+  @Get('file/rxjs/stream')
+  getRxJSFile(): Observable<StreamableFile> {
+    return this.appService.getRxJSFile();
+  }
+}
--- a/integration/send-files/src/app.module.ts
+++ b/integration/send-files/src/app.module.ts
@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { AppController } from './app.controller';
+import { AppService } from './app.service';
+
+@Module({
+  controllers: [AppController],
+  providers: [AppService],
+})
+export class AppModule {}
--- a/integration/send-files/src/app.service.ts
+++ b/integration/send-files/src/app.service.ts
@@ -0,0 +1,26 @@
+import { Injectable, StreamableFile } from '@nestjs/common';
+import { createReadStream, readFileSync } from 'fs';
+import { join } from 'path';
+import { Observable, of } from 'rxjs';
+import { NonFile } from './non-file';
+
+@Injectable()
+export class AppService {
+  getReadStream(): StreamableFile {
+    return new StreamableFile(
+      createReadStream(join(process.cwd(), 'Readme.md')),
+    );
+  }
+
+  getBuffer(): StreamableFile {
+    return new StreamableFile(readFileSync(join(process.cwd(), 'Readme.md')));
+  }
+
+  getNonFile(): NonFile {
+    return new NonFile('Hello world');
+  }
+
+  getRxJSFile(): Observable<StreamableFile> {
+    return of(this.getReadStream());
+  }
+}
--- a/integration/send-files/src/non-file.ts
+++ b/integration/send-files/src/non-file.ts
@@ -0,0 +1,7 @@
+export class NonFile {
+  constructor(private readonly value: string) {}
+
+  pipe() {
+    return this.value;
+  }
+}
--- a/integration/send-files/tsconfig.json
+++ b/integration/send-files/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es6",
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "./dist"
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+  ]
+}
--- a/integration/versioning/e2e/header-versioning.spec.ts
+++ b/integration/versioning/e2e/header-versioning.spec.ts
@@ -0,0 +1,284 @@
+import { INestApplication, VersioningType } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+describe('Versioning', () => {
+  let app: INestApplication;
+
+  before(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = moduleRef.createNestApplication();
+    app.enableVersioning({
+      type: VersioningType.HEADER,
+      header: 'X-API-Version',
+    });
+    await app.init();
+  });
+
+  describe('GET /', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          'X-API-Version': '1',
+        })
+        .expect(200)
+        .expect('Hello World V1!');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          'X-API-Version': '2',
+        })
+        .expect(200)
+        .expect('Hello World V2!');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          'X-API-Version': '3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          'X-API-Version': '',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/').expect(404);
+    });
+  });
+
+  describe('GET /:param', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          'X-API-Version': '1',
+        })
+        .expect(200)
+        .expect('Parameter V1!');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          'X-API-Version': '2',
+        })
+        .expect(200)
+        .expect('Parameter V2!');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          'X-API-Version': '3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          'X-API-Version': '',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/').expect(404);
+    });
+  });
+
+  describe('GET /multiple', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          'X-API-Version': '1',
+        })
+        .expect(200)
+        .expect('Multiple Versions 1 or 2');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          'X-API-Version': '2',
+        })
+        .expect(200)
+        .expect('Multiple Versions 1 or 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          'X-API-Version': '3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          'X-API-Version': '',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/multiple').expect(404);
+    });
+  });
+
+  describe('GET /neutral', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .set({
+          'X-API-Version': '1',
+        })
+        .expect(200)
+        .expect('Neutral');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .set({
+          'X-API-Version': '2',
+        })
+        .expect(200)
+        .expect('Neutral');
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .set({
+          'X-API-Version': '',
+        })
+        .expect(200)
+        .expect('Neutral');
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .expect(200)
+        .expect('Neutral');
+    });
+  });
+
+  describe('GET /override', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          'X-API-Version': '1',
+        })
+        .expect(200)
+        .expect('Override Version 1');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          'X-API-Version': '2',
+        })
+        .expect(200)
+        .expect('Override Version 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          'X-API-Version': '3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          'X-API-Version': '',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/override').expect(404);
+    });
+  });
+
+  describe('GET /override-partial', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          'X-API-Version': '1',
+        })
+        .expect(200)
+        .expect('Override Partial Version 1');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          'X-API-Version': '2',
+        })
+        .expect(200)
+        .expect('Override Partial Version 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          'X-API-Version': '3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          'X-API-Version': '',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/override-partial').expect(404);
+    });
+  });
+
+  after(async () => {
+    await app.close();
+  });
+});
--- a/integration/versioning/e2e/media-type-versioning.spec.ts
+++ b/integration/versioning/e2e/media-type-versioning.spec.ts
@@ -0,0 +1,284 @@
+import { INestApplication, VersioningType } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+describe('Versioning', () => {
+  let app: INestApplication;
+
+  before(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = moduleRef.createNestApplication();
+    app.enableVersioning({
+      type: VersioningType.MEDIA_TYPE,
+      key: 'v=',
+    });
+    await app.init();
+  });
+
+  describe('GET /', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          Accept: 'application/json;v=1',
+        })
+        .expect(200)
+        .expect('Hello World V1!');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          Accept: 'application/json;v=2',
+        })
+        .expect(200)
+        .expect('Hello World V2!');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          Accept: 'application/json;v=3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/')
+        .set({
+          Accept: 'application/json',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/').expect(404);
+    });
+  });
+
+  describe('GET /:param', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          Accept: 'application/json;v=1',
+        })
+        .expect(200)
+        .expect('Parameter V1!');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          Accept: 'application/json;v=2',
+        })
+        .expect(200)
+        .expect('Parameter V2!');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          Accept: 'application/json;v=3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/param/hello')
+        .set({
+          Accept: '',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/').expect(404);
+    });
+  });
+
+  describe('GET /multiple', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          Accept: 'application/json;v=1',
+        })
+        .expect(200)
+        .expect('Multiple Versions 1 or 2');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          Accept: 'application/json;v=2',
+        })
+        .expect(200)
+        .expect('Multiple Versions 1 or 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          Accept: 'application/json;v=3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/multiple')
+        .set({
+          Accept: 'application/json',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/multiple').expect(404);
+    });
+  });
+
+  describe('GET /neutral', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .set({
+          Accept: 'application/json;v=1',
+        })
+        .expect(200)
+        .expect('Neutral');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .set({
+          Accept: 'application/json;v=2',
+        })
+        .expect(200)
+        .expect('Neutral');
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .set({
+          Accept: 'application/json',
+        })
+        .expect(200)
+        .expect('Neutral');
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .expect(200)
+        .expect('Neutral');
+    });
+  });
+
+  describe('GET /override', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          Accept: 'application/json;v=1',
+        })
+        .expect(200)
+        .expect('Override Version 1');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          Accept: 'application/json;v=2',
+        })
+        .expect(200)
+        .expect('Override Version 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          Accept: 'application/json;v=3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/override')
+        .set({
+          Accept: 'application/json',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/override').expect(404);
+    });
+  });
+
+  describe('GET /override-partial', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          Accept: 'application/json;v=1',
+        })
+        .expect(200)
+        .expect('Override Partial Version 1');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          Accept: 'application/json;v=2',
+        })
+        .expect(200)
+        .expect('Override Partial Version 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          Accept: 'application/json;v=3',
+        })
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/override-partial')
+        .set({
+          Accept: 'application/json',
+        })
+        .expect(404);
+    });
+
+    it('No Header', () => {
+      return request(app.getHttpServer()).get('/override-partial').expect(404);
+    });
+  });
+
+  after(async () => {
+    await app.close();
+  });
+});
--- a/integration/versioning/e2e/uri-versioning.spec.ts
+++ b/integration/versioning/e2e/uri-versioning.spec.ts
@@ -0,0 +1,155 @@
+import { INestApplication, VersioningType } from '@nestjs/common';
+import { Test } from '@nestjs/testing';
+import * as request from 'supertest';
+import { AppModule } from '../src/app.module';
+
+describe('Versioning', () => {
+  let app: INestApplication;
+
+  before(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = moduleRef.createNestApplication();
+    app.enableVersioning({
+      type: VersioningType.URI,
+    });
+    await app.init();
+  });
+
+  describe('GET /', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/v1/')
+        .expect(200)
+        .expect('Hello World V1!');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/v2/')
+        .expect(200)
+        .expect('Hello World V2!');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer()).get('/v3/').expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer()).get('/').expect(404);
+    });
+  });
+
+  describe('GET /:param', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/v1/param/hello')
+        .expect(200)
+        .expect('Parameter V1!');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/v2/param/hello')
+        .expect(200)
+        .expect('Parameter V2!');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer()).get('/v3/param/hello').expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer()).get('/param/hello').expect(404);
+    });
+  });
+
+  describe('GET /multiple', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/v1/multiple')
+        .expect(200)
+        .expect('Multiple Versions 1 or 2');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/v2/multiple')
+        .expect(200)
+        .expect('Multiple Versions 1 or 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer()).get('/v3/multiple').expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer()).get('/multiple').expect(404);
+    });
+  });
+
+  describe('GET /neutral', () => {
+    it('No Version', () => {
+      return request(app.getHttpServer())
+        .get('/neutral')
+        .expect(200)
+        .expect('Neutral');
+    });
+  });
+
+  describe('GET /override', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/v1/override')
+        .expect(200)
+        .expect('Override Version 1');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/v2/override')
+        .expect(200)
+        .expect('Override Version 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer()).get('/v3/override').expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer()).get('/override').expect(404);
+    });
+  });
+
+  describe('GET /override-partial', () => {
+    it('V1', () => {
+      return request(app.getHttpServer())
+        .get('/v1/override-partial')
+        .expect(200)
+        .expect('Override Partial Version 1');
+    });
+
+    it('V2', () => {
+      return request(app.getHttpServer())
+        .get('/v2/override-partial')
+        .expect(200)
+        .expect('Override Partial Version 2');
+    });
+
+    it('V3', () => {
+      return request(app.getHttpServer())
+        .get('/v3/override-partial')
+        .expect(404);
+    });
+
+    it('No Version', () => {
+      return request(app.getHttpServer()).get('/override-partial').expect(404);
+    });
+  });
+
+  after(async () => {
+    await app.close();
+  });
+});
--- a/integration/versioning/src/app-v1.controller.ts
+++ b/integration/versioning/src/app-v1.controller.ts
@@ -0,0 +1,16 @@
+import { Controller, Get } from '@nestjs/common';
+
+@Controller({
+  version: '1',
+})
+export class AppV1Controller {
+  @Get('/')
+  helloWorldV1() {
+    return 'Hello World V1!';
+  }
+
+  @Get('/:param/hello')
+  paramV1() {
+    return 'Parameter V1!';
+  }
+}
--- a/integration/versioning/src/app-v2.controller.ts
+++ b/integration/versioning/src/app-v2.controller.ts
@@ -0,0 +1,16 @@
+import { Controller, Get } from '@nestjs/common';
+
+@Controller({
+  version: '2',
+})
+export class AppV2Controller {
+  @Get('/')
+  helloWorldV2() {
+    return 'Hello World V2!';
+  }
+
+  @Get('/:param/hello')
+  paramV1() {
+    return 'Parameter V2!';
+  }
+}
--- a/integration/versioning/src/app.module.ts
+++ b/integration/versioning/src/app.module.ts
@@ -0,0 +1,20 @@
+import { Module } from '@nestjs/common';
+import { AppV1Controller } from './app-v1.controller';
+import { AppV2Controller } from './app-v2.controller';
+import { MultipleVersionController } from './multiple.controller';
+import { VersionNeutralController } from './neutral.controller';
+import { OverrideController } from './override.controller';
+import { OverridePartialController } from './override-partial.controller';
+
+@Module({
+  imports: [],
+  controllers: [
+    AppV1Controller,
+    AppV2Controller,
+    MultipleVersionController,
+    VersionNeutralController,
+    OverrideController,
+    OverridePartialController,
+  ],
+})
+export class AppModule {}
--- a/integration/versioning/src/main.ts
+++ b/integration/versioning/src/main.ts
@@ -0,0 +1,15 @@
+import { VersioningType } from '@nestjs/common';
+import { NestFactory } from '@nestjs/core';
+import { AppModule } from './app.module';
+
+async function bootstrap() {
+  const app = await NestFactory.create(AppModule);
+  app.enableVersioning({
+    type: VersioningType.MEDIA_TYPE,
+    key: 'v=',
+  });
+
+  await app.listen(3000);
+  console.log(`Application is running on: ${await app.getUrl()}`);
+}
+bootstrap();
--- a/integration/versioning/src/multiple.controller.ts
+++ b/integration/versioning/src/multiple.controller.ts
@@ -0,0 +1,11 @@
+import { Controller, Get } from '@nestjs/common';
+
+@Controller({
+  version: ['1', '2'],
+})
+export class MultipleVersionController {
+  @Get('/multiple')
+  multiple() {
+    return 'Multiple Versions 1 or 2';
+  }
+}
--- a/integration/versioning/src/neutral.controller.ts
+++ b/integration/versioning/src/neutral.controller.ts
@@ -0,0 +1,11 @@
+import { Controller, Get, VERSION_NEUTRAL } from '@nestjs/common';
+
+@Controller({
+  version: VERSION_NEUTRAL,
+})
+export class VersionNeutralController {
+  @Get('/neutral')
+  neutral() {
+    return 'Neutral';
+  }
+}
--- a/integration/versioning/src/override-partial.controller.ts
+++ b/integration/versioning/src/override-partial.controller.ts
@@ -0,0 +1,17 @@
+import { Controller, Get, Version } from '@nestjs/common';
+
+@Controller({
+  version: '1'
+})
+export class OverridePartialController {
+  @Get('/override-partial')
+  overridePartialV1() {
+    return 'Override Partial Version 1';
+  }
+
+  @Version('2')
+  @Get('/override-partial')
+  overridePartialV2() {
+    return 'Override Partial Version 2';
+  }
+}
--- a/integration/versioning/src/override.controller.ts
+++ b/integration/versioning/src/override.controller.ts
@@ -0,0 +1,16 @@
+import { Controller, Get, Version } from '@nestjs/common';
+
+@Controller()
+export class OverrideController {
+  @Version('1')
+  @Get('/override')
+  overrideV1() {
+    return 'Override Version 1';
+  }
+
+  @Version('2')
+  @Get('/override')
+  overrideV2() {
+    return 'Override Version 2';
+  }
+}
--- a/integration/versioning/tsconfig.json
+++ b/integration/versioning/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": false,
+    "noImplicitAny": false,
+    "removeComments": true,
+    "noLib": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es6",
+    "sourceMap": true,
+    "allowJs": true,
+    "outDir": "./dist"
+  },
+  "include": [
+    "src/**/*",
+    "e2e/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+  ]
+}
--- a/integration/websockets/e2e/error-gateway.spec.ts
+++ b/integration/websockets/e2e/error-gateway.spec.ts
@@ -1,7 +1,7 @@
 import { INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
-import * as io from 'socket.io-client';
+import { io } from 'socket.io-client';
 import { ErrorGateway } from '../src/error.gateway';

 describe('ErrorGateway', () => {
@@ -12,15 +12,15 @@ describe('ErrorGateway', () => {
      providers: [ErrorGateway],
    }).compile();
    app = await testingModule.createNestApplication();
-    await app.listenAsync(3000);
+    await app.listen(3000);
  });

  it(`should handle error`, async () => {
-    const ws = io.connect('http://localhost:8080');
+    const ws = io('http://localhost:8080');
    ws.emit('push', {
      test: 'test',
    });
-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('exception', data => {
        expect(data).to.be.eql({
          status: 'error',
--- a/integration/websockets/e2e/gateway-ack.spec.ts
+++ b/integration/websockets/e2e/gateway-ack.spec.ts
@@ -1,14 +1,14 @@
 import { INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
-import * as io from 'socket.io-client';
+import { io } from 'socket.io-client';
 import { AckGateway } from '../src/ack.gateway';

 async function createNestApp(...gateways): Promise<INestApplication> {
  const testingModule = await Test.createTestingModule({
    providers: gateways,
  }).compile();
-  const app = await testingModule.createNestApplication();
+  const app = testingModule.createNestApplication();
  return app;
 }

@@ -17,10 +17,10 @@ describe('WebSocketGateway (ack)', () => {

  it(`should handle message with ack (http)`, async () => {
    app = await createNestApp(AckGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

-    ws = io.connect('http://localhost:8080');
-    await new Promise(resolve =>
+    ws = io('http://localhost:8080');
+    await new Promise<void>(resolve =>
      ws.emit('push', { test: 'test' }, data => {
        expect(data).to.be.eql('pong');
        resolve();
@@ -30,10 +30,10 @@ describe('WebSocketGateway (ack)', () => {

  it(`should handle message with ack & without data (http)`, async () => {
    app = await createNestApp(AckGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

-    ws = io.connect('http://localhost:8080');
-    await new Promise(resolve =>
+    ws = io('http://localhost:8080');
+    await new Promise<void>(resolve =>
      ws.emit('push', data => {
        expect(data).to.be.eql('pong');
        resolve();
--- a/integration/websockets/e2e/gateway.spec.ts
+++ b/integration/websockets/e2e/gateway.spec.ts
@@ -1,7 +1,7 @@
 import { INestApplication } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { expect } from 'chai';
-import * as io from 'socket.io-client';
+import { io } from 'socket.io-client';
 import { ApplicationGateway } from '../src/app.gateway';
 import { NamespaceGateway } from '../src/namespace.gateway';
 import { ServerGateway } from '../src/server.gateway';
@@ -10,7 +10,7 @@ async function createNestApp(...gateways): Promise<INestApplication> {
  const testingModule = await Test.createTestingModule({
    providers: gateways,
  }).compile();
-  const app = await testingModule.createNestApplication();
+  const app = testingModule.createNestApplication();
  return app;
 }

@@ -19,13 +19,13 @@ describe('WebSocketGateway', () => {

  it(`should handle message (2nd port)`, async () => {
    app = await createNestApp(ApplicationGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

-    ws = io.connect('http://localhost:8080');
+    ws = io('http://localhost:8080');
    ws.emit('push', {
      test: 'test',
    });
-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('pop', data => {
        expect(data.test).to.be.eql('test');
        resolve();
@@ -35,13 +35,13 @@ describe('WebSocketGateway', () => {

  it(`should handle message (http)`, async () => {
    app = await createNestApp(ServerGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

-    ws = io.connect('http://localhost:3000');
+    ws = io('http://localhost:3000');
    ws.emit('push', {
      test: 'test',
    });
-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('pop', data => {
        expect(data.test).to.be.eql('test');
        resolve();
@@ -51,14 +51,14 @@ describe('WebSocketGateway', () => {

  it(`should handle message (2 gateways)`, async () => {
    app = await createNestApp(ApplicationGateway, NamespaceGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

-    ws = io.connect('http://localhost:8080');
-    io.connect('http://localhost:8080/test').emit('push', {});
+    ws = io('http://localhost:8080');
+    io('http://localhost:8080/test').emit('push', {});
    ws.emit('push', {
      test: 'test',
    });
-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('pop', data => {
        expect(data.test).to.be.eql('test');
        resolve();
--- a/integration/websockets/e2e/ws-gateway.spec.ts
+++ b/integration/websockets/e2e/ws-gateway.spec.ts
@@ -5,7 +5,10 @@ import { expect } from 'chai';
 import * as WebSocket from 'ws';
 import { ApplicationGateway } from '../src/app.gateway';
 import { CoreGateway } from '../src/core.gateway';
+import { ExamplePathGateway } from '../src/example-path.gateway';
 import { ServerGateway } from '../src/server.gateway';
+import { WsPathGateway } from '../src/ws-path.gateway';
+import { WsPathGateway2 } from '../src/ws-path2.gateway';

 async function createNestApp(...gateways): Promise<INestApplication> {
  const testingModule = await Test.createTestingModule({
@@ -21,7 +24,7 @@ describe('WebSocketGateway (WsAdapter)', () => {

  it(`should handle message (2nd port)`, async () => {
    app = await createNestApp(ApplicationGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

    ws = new WebSocket('ws://localhost:8080');
    await new Promise(resolve => ws.on('open', resolve));
@@ -34,7 +37,7 @@ describe('WebSocketGateway (WsAdapter)', () => {
        },
      }),
    );
-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('message', data => {
        expect(JSON.parse(data).data.test).to.be.eql('test');
        resolve();
@@ -44,7 +47,7 @@ describe('WebSocketGateway (WsAdapter)', () => {

  it(`should handle message (http)`, async () => {
    app = await createNestApp(ServerGateway);
-    await app.listenAsync(3000);
+    await app.listen(3000);

    ws = new WebSocket('ws://localhost:3000');
    await new Promise(resolve => ws.on('open', resolve));
@@ -57,7 +60,7 @@ describe('WebSocketGateway (WsAdapter)', () => {
        },
      }),
    );
-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('message', data => {
        expect(JSON.parse(data).data.test).to.be.eql('test');
        resolve();
@@ -65,19 +68,48 @@ describe('WebSocketGateway (WsAdapter)', () => {
    );
  });

-  it(`should support 2 different gateways`, async function () {
+  it(`should handle message on a different path`, async () => {
+    app = await createNestApp(WsPathGateway);
+    await app.listenAsync(3000);
+    try {
+      ws = new WebSocket('ws://localhost:3000/ws-path');
+      await new Promise((resolve, reject) => {
+        ws.on('open', resolve);
+        ws.on('error', reject);
+      });
+
+      ws.send(
+        JSON.stringify({
+          event: 'push',
+          data: {
+            test: 'test',
+          },
+        }),
+      );
+      await new Promise<void>(resolve =>
+        ws.on('message', data => {
+          expect(JSON.parse(data).data.test).to.be.eql('test');
+          resolve();
+        }),
+      );
+    } catch (err) {
+      console.log(err);
+    }
+  });
+
+  it(`should support 2 different gateways running on different paths`, async function () {
    this.retries(10);

-    app = await createNestApp(ApplicationGateway, CoreGateway);
+    app = await createNestApp(ExamplePathGateway, WsPathGateway2);
    await app.listenAsync(3000);

    // open websockets delay
    await new Promise(resolve => setTimeout(resolve, 1000));

-    ws = new WebSocket('ws://localhost:8080');
-    ws2 = new WebSocket('ws://localhost:8090');
+    ws = new WebSocket('ws://localhost:3000/example');
+    ws2 = new WebSocket('ws://localhost:3000/ws-path');

-    await new Promise(resolve =>
+    await new Promise<void>(resolve =>
      ws.on('open', () => {
        ws.on('message', data => {
          expect(JSON.parse(data).data.test).to.be.eql('test');
@@ -94,7 +126,52 @@ describe('WebSocketGateway (WsAdapter)', () => {
      }),
    );

-    await new Promise(resolve => {
+    await new Promise<void>(resolve => {
+      ws2.on('message', data => {
+        expect(JSON.parse(data).data.test).to.be.eql('test');
+        resolve();
+      });
+      ws2.send(
+        JSON.stringify({
+          event: 'push',
+          data: {
+            test: 'test',
+          },
+        }),
+      );
+    });
+  });
+
+  it(`should support 2 different gateways running on the same path (but different ports)`, async function () {
+    this.retries(10);
+
+    app = await createNestApp(ApplicationGateway, CoreGateway);
+    await app.listen(3000);
+
+    // open websockets delay
+    await new Promise(resolve => setTimeout(resolve, 1000));
+
+    ws = new WebSocket('ws://localhost:8080');
+    ws2 = new WebSocket('ws://localhost:8090');
+
+    await new Promise<void>(resolve =>
+      ws.on('open', () => {
+        ws.on('message', data => {
+          expect(JSON.parse(data).data.test).to.be.eql('test');
+          resolve();
+        });
+        ws.send(
+          JSON.stringify({
+            event: 'push',
+            data: {
+              test: 'test',
+            },
+          }),
+        );
+      }),
+    );
+
+    await new Promise<void>(resolve => {
      ws2.on('message', data => {
        expect(JSON.parse(data).data.test).to.be.eql('test');
        resolve();
--- a/integration/websockets/src/error.gateway.ts
+++ b/integration/websockets/src/error.gateway.ts
@@ -9,6 +9,6 @@ import { throwError } from 'rxjs';
 export class ErrorGateway {
  @SubscribeMessage('push')
  onPush(client, data) {
-    return throwError(new WsException('test'));
+    return throwError(() => new WsException('test'));
  }
 }
--- a/integration/websockets/src/example-path.gateway.ts
+++ b/integration/websockets/src/example-path.gateway.ts
@@ -0,0 +1,14 @@
+import { SubscribeMessage, WebSocketGateway } from '@nestjs/websockets';
+
+@WebSocketGateway({
+  path: '/example',
+})
+export class ExamplePathGateway {
+  @SubscribeMessage('push')
+  onPush(client, data) {
+    return {
+      event: 'pop',
+      data,
+    };
+  }
+}
--- a/integration/websockets/src/ws-path.gateway.ts
+++ b/integration/websockets/src/ws-path.gateway.ts
@@ -0,0 +1,14 @@
+import { SubscribeMessage, WebSocketGateway } from '@nestjs/websockets';
+
+@WebSocketGateway({
+  path: '/ws-path',
+})
+export class WsPathGateway {
+  @SubscribeMessage('push')
+  onPush(client, data) {
+    return {
+      event: 'pop',
+      data,
+    };
+  }
+}
--- a/integration/websockets/src/ws-path2.gateway.ts
+++ b/integration/websockets/src/ws-path2.gateway.ts
@@ -0,0 +1,14 @@
+import { SubscribeMessage, WebSocketGateway } from '@nestjs/websockets';
+
+@WebSocketGateway({
+  path: '/ws-path',
+})
+export class WsPathGateway2 {
+  @SubscribeMessage('push')
+  onPush(client, data) {
+    return {
+      event: 'pop',
+      data,
+    };
+  }
+}
--- a/Show More
+++ b/Show More