Random listen for mocked servers

1 files changed, 21 insertions, 23 deletions

diff --git a/shared/extra-utils/mock-servers/mock-object-storage.ts b/shared/extra-utils/mock-servers/mock-object-storage.ts
index 144f2819d..d135c2631 100644
--- a/shared/extra-utils/mock-servers/mock-object-storage.ts
+++ b/shared/extra-utils/mock-servers/mock-object-storage.ts
@@ -2,39 +2,37 @@ import express from 'express'
 import got, { RequestError } from 'got'
 import { Server } from 'http'
 import { pipeline } from 'stream'
-import { randomInt } from '@shared/core-utils'
 import { ObjectStorageCommand } from '../server'
-import { terminateServer } from './utils'
+import { getPort, randomListen, terminateServer } from './utils'
 
 export class MockObjectStorage {
   private server: Server
 
-  initialize () {
-    return new Promise<number>(res => {
-      const app = express()
+  async initialize () {
+    const app = express()
 
-      app.get('/:bucketName/:path(*)', (req: express.Request, res: express.Response, next: express.NextFunction) => {
-        const url = `http://${req.params.bucketName}.${ObjectStorageCommand.getEndpointHost()}/${req.params.path}`
+    app.get('/:bucketName/:path(*)', (req: express.Request, res: express.Response, next: express.NextFunction) => {
+      const url = `http://${req.params.bucketName}.${ObjectStorageCommand.getEndpointHost()}/${req.params.path}`
 
-        if (process.env.DEBUG) {
-          console.log('Receiving request on mocked server %s.', req.url)
-          console.log('Proxifying request to %s', url)
-        }
-
-        return pipeline(
-          got.stream(url, { throwHttpErrors: false }),
-          res,
-          (err: RequestError) => {
-            if (!err) return
+      if (process.env.DEBUG) {
+        console.log('Receiving request on mocked server %s.', req.url)
+        console.log('Proxifying request to %s', url)
+      }
 
-            console.error('Pipeline failed.', err)
-          }
-        )
-      })
+      return pipeline(
+        got.stream(url, { throwHttpErrors: false }),
+        res,
+        (err: RequestError) => {
+          if (!err) return
 
-      const port = 44000 + randomInt(1, 1000)
-      this.server = app.listen(port, () => res(port))
+          console.error('Pipeline failed.', err)
+        }
+      )
     })
+
+    this.server = await randomListen(app)
+
+    return getPort(this.server)
   }
 
   terminate () {