enhancing server.close with killable

Author: shellscape

.gitignore

@@ -6,3 +6,4 @@ node_modules
 /coverage
 *.pem
 .idea/
+.DS_Store

lib/Server.js

@@ -13,6 +13,7 @@ const del = require('del');
 const express = require('express');
 const httpProxyMiddleware = require('http-proxy-middleware');
 const ip = require('ip');
+const killable = require('killable');
 const serveIndex = require('serve-index');
 const historyApiFallback = require('connect-history-api-fallback');
 const selfsigned = require('selfsigned');
@@ -474,6 +475,8 @@ function Server(compiler, options) {
     this.listeningApp = http.createServer(app);
   }
 
+  killable(this.listeningApp);
+
   // Proxy websockets without the initial http request
   // https://github.com/chimurai/http-proxy-middleware#external-websocket-upgrade
   websocketProxies.forEach(function (wsProxy) {
@@ -610,14 +613,15 @@ Server.prototype.close = function (callback) {
     sock.close();
   });
   this.sockets = [];
-  this.listeningApp.close(() => {
-    this.middleware.close(callback);
-  });
 
   this.contentBaseWatchers.forEach((watcher) => {
     watcher.close();
   });
   this.contentBaseWatchers = [];
+
+  this.listeningApp.kill(() => {
+    this.middleware.close(callback);
+  });
 };
 
 Server.prototype.sockWrite = function (sockets, type, data) {

package-lock.json

@@ -54,6 +54,7 @@
     "import-local": "^0.1.1",
     "internal-ip": "1.2.0",
     "ip": "^1.1.5",
+    "killable": "^1.0.0",
     "loglevel": "^1.4.1",
     "opn": "^5.1.0",
     "portfinder": "^1.0.9",