feat(dandi-contrib/mvc-express): support HttpServer injection token

- move server initialization / port binding out to separate server provider
- refactor `ExpressMvcApplication` to use `HttpServer` injection token instead of automatically doing its own port binding

Author: DanielSchaffer

packages/dandi-contrib/mvc-express/src/express-mvc-application.ts

@@ -1,31 +1,31 @@
-import { EntryPoint, Inject, Injectable, Logger } from '@dandi/core'
+import { Server } from 'http'
+
+import { EntryPoint, Inject, Injectable, Injector, Logger } from '@dandi/core'
+import { HttpServer } from '@dandi/http-pipeline'
 import { Route, RouteMapper, Routes } from '@dandi/mvc'
 
 import * as bodyParser from 'body-parser'
 import { Express } from 'express'
 
 import { ExpressInstance } from './express-instance'
-import { ExpressMvcConfig } from './express-mvc-config'
 
 @Injectable(EntryPoint)
-export class ExpressMvcApplication implements EntryPoint {
+export class ExpressMvcApplication implements EntryPoint<Server> {
   constructor(
     @Inject(ExpressInstance) private app: Express,
-    @Inject(ExpressMvcConfig) private config: ExpressMvcConfig,
     @Inject(Routes) private routes: Route[],
     @Inject(RouteMapper) private routeMapper: RouteMapper,
+    @Inject(Injector) private injector: Injector,
     @Inject(Logger) private logger: Logger,
   ) {}
 
-  public run(): void {
+  public async run(): Promise<Server> {
     this.app.use(bodyParser.raw({ type: '*/*' }))
 
     for (const route of this.routes) {
       this.routeMapper.mapRoute(route)
     }
 
-    this.logger.debug(`starting on ${this.config.host}:${this.config.port}`)
-    this.app.listen(this.config.port, this.config.host)
-    this.logger.info(`listening on http://${this.config.host}:${this.config.port}`)
+    return await this.injector.inject(HttpServer)
   }
 }

packages/dandi-contrib/mvc-express/src/express-mvc-server-provider.ts

@@ -0,0 +1,19 @@
+import { ExpressMvcConfig } from '@dandi-contrib/mvc-express'
+import { Logger } from '@dandi/core'
+import { HttpServer } from '@dandi/http-pipeline'
+import { Express } from 'express'
+
+import { ExpressInstance } from './express-instance'
+
+function expressMvcServerFactory(app: Express, config: ExpressMvcConfig, logger: Logger): HttpServer {
+  logger.debug(`starting on ${config.host}:${config.port}`)
+  const server = app.listen(config.port, config.host)
+  logger.info(`listening on http://${config.host}:${config.port}`)
+  return server
+}
+
+export const ExpressMvcServerProvider = {
+  provide: HttpServer,
+  useFactory: expressMvcServerFactory,
+  deps: [ExpressInstance, ExpressMvcConfig, Logger],
+}

packages/dandi-contrib/mvc-express/src/mvc-express.module.ts

@@ -6,6 +6,7 @@ import { ExpressMvcApplication } from './express-mvc-application'
 import { ExpressMvcConfig } from './express-mvc-config'
 import { DefaultExpressMvcConfigProvider, expressMvcConfigFactory } from './express-mvc-config-factory'
 import { ExpressMvcRouteMapper } from './express-mvc-route-mapper'
+import { ExpressMvcServerProvider } from './express-mvc-server-provider'
 import { localToken } from './local-token'
 
 export class MvcExpressModuleBuilder extends ModuleBuilder<MvcExpressModuleBuilder> {
@@ -23,5 +24,6 @@ export const MvcExpressModule = new MvcExpressModuleBuilder(
   ExpressInstanceProvider,
   ExpressMvcApplication,
   ExpressMvcRouteMapper,
+  ExpressMvcServerProvider,
   MvcModule,
 )