Use simpler interface for Bootstrap app server

packages/server/src/application/Bootstrap.ts

@@ -130,13 +130,14 @@ export class Bootstrap implements IBootstrap {
     await this.database.connect()
 
     await new Promise((resolve, reject) => {
+      const _resolve = () => resolve()
       if (!port) {
-        this.server = this.application.server.listen(resolve)
+        this.server = this.application.server.listen(_resolve)
         return
       } else if (typeof port === 'number' && hostname) {
-        this.server = this.application.server.listen(port, hostname, resolve)
+        this.server = this.application.server.listen(port, hostname, _resolve)
       } else {
-        this.server = this.application.server.listen(port, resolve)
+        this.server = this.application.server.listen(port, _resolve)
       }
     })
 

packages/server/src/application/IAppServer.ts

@@ -0,0 +1,8 @@
+import { Server } from 'http';
+
+export interface IAppServer {
+  listen(callback?: () => void): Server
+  listen(callback?: () => void): Server
+  listen(portOrPath: number | string, callback?: () => void): Server
+  listen(port: number, hostname: string, callback?: () => void): Server
+}

packages/server/src/application/IApplication.ts

@@ -1,9 +1,7 @@
-import express from 'express'
+import { IDatabase } from '../database/IDatabase';
-import {AsyncRouter} from '../router'
+import { IAppServer } from './IAppServer';
-import {IRoutes} from '@rondo.dev/common'
-import {IDatabase} from '../database/IDatabase'
 
 export interface IApplication {
-  readonly server: express.Application
+  readonly server: IAppServer
   readonly database: IDatabase
 }

packages/server/src/test-utils/TestUtils.ts

@@ -13,12 +13,13 @@ import shortid from 'shortid'
 import { AddressInfo } from 'net'
 import { createRemoteClient, FunctionPropertyNames, TAsyncified } from '@rondo.dev/jsonrpc'
 import {Server} from 'http'
+import { IAppServer } from '../application/IAppServer'
 
 export class TestUtils<T extends IRoutes> {
   readonly username = `test${process.env.JEST_WORKER_ID}@user.com`
   readonly password = 'Password10'
 
-  readonly app: express.Application
+  readonly app: IAppServer
   readonly context: string
   readonly transactionManager: ITransactionManager
 
@@ -134,7 +135,7 @@ export class TestUtils<T extends IRoutes> {
 
     return {
       headers: {
-        "cookie": [cookies, cookie].join('; '),
+        'cookie': [cookies, cookie].join('; '),
         'x-csrf-token': token,
       },
       userId: response.body.id,
@@ -155,7 +156,7 @@ export class TestUtils<T extends IRoutes> {
 
     return {
       headers: {
-        "cookie": [cookies, cookie].join('; '),
+        'cookie': [cookies, cookie].join('; '),
         'x-csrf-token': token,
       },
     }