HttpServer ready promise

HttpServer.js

@@ -58,7 +58,18 @@ const StringStream = require('./StringStream')
  * ```
  */
 const HttpServer = function (httpHandler) {
-  return http.createServer(httpHandler)
+  const server = http.createServer(httpHandler)
+
+  server.ready = new Promise(resolve => {
+    server._listeningResolve = resolve
+  })
+  const originalListen = server.listen
+  server.listen = (...args) => {
+    server._listeningResolve()
+    return originalListen.apply(server, args)
+  }
+
+  return server
 }
 
 module.exports = HttpServer

HttpServer.test.js

@@ -12,14 +12,15 @@ const test = Test('HttpServer', HttpServer)
   response.write('hello')
   response.end()
 }, async server => {
-  await new Promise(resolve => {
-    server.listen(3001, async () => {
-      const response0 = await fetch('http://localhost:3001')
-      assert.strictEqual(await response0.text(), 'hello')
-      assert.strictEqual(response0.headers.get('content-type'), 'text/plain')
-      server.close(resolve)
-    })
+  server.listen(3001, async () => {
+    console.log('Test server listening on port 3001')
   })
+  await server.ready
+
+  const response0 = await fetch('http://localhost:3001')
+  assert.strictEqual(await response0.text(), 'hello')
+  assert.strictEqual(response0.headers.get('content-type'), 'text/plain')
+  server.close()
 })
 
 if (process.argv[1] == __filename) {