fix: web socket server closing

Author: alexander-akait

lib/Server.js

@@ -747,12 +747,11 @@ class Server {
       });
   }
 
-  close(cb) {
-    this.sockets.forEach((socket) => {
-      this.socketServer.closeConnection(socket);
-    });
-
-    this.sockets = [];
+  close(callback) {
+    if (this.socketServer) {
+      this.socketServer.close();
+      this.sockets = [];
+    }
 
     const prom = Promise.all(
       this.staticWatchers.map((watcher) => watcher.close())
@@ -762,7 +761,7 @@ class Server {
     this.server.kill(() => {
       // watchers must be closed before closing middleware
       prom.then(() => {
-        this.middleware.close(cb);
+        this.middleware.close(callback);
       });
     });
   }

lib/servers/SockJSServer.js

@@ -72,6 +72,16 @@ module.exports = class SockJSServer extends BaseServer {
     connection.write(message);
   }
 
+  close(callback) {
+    [...this.server.sockets].forEach((socket) => {
+      this.closeConnection(socket);
+    });
+
+    if (callback) {
+      callback();
+    }
+  }
+
   closeConnection(connection) {
     connection.close();
   }

lib/servers/WebsocketServer.js

@@ -31,7 +31,7 @@ module.exports = class WebsocketServer extends BaseServer {
 
     const noop = () => {};
 
-    setInterval(() => {
+    const interval = setInterval(() => {
       this.implementation.clients.forEach((socket) => {
         if (socket.isAlive === false) {
           return socket.terminate();
@@ -41,6 +41,10 @@ module.exports = class WebsocketServer extends BaseServer {
         socket.ping(noop);
       });
     }, this.server.webSocketHeartbeatInterval);
+
+    this.implementation.on('close', () => {
+      clearInterval(interval);
+    });
   }
 
   send(connection, message) {
@@ -52,6 +56,10 @@ module.exports = class WebsocketServer extends BaseServer {
     connection.send(message);
   }
 
+  close(callback) {
+    this.implementation.close(callback);
+  }
+
   closeConnection(connection) {
     connection.close();
   }

test/e2e/hot-and-live-reload.test.js

@@ -69,7 +69,7 @@ describe('hot and live reload', () => {
         hot: true,
       },
     },
-    // "ws" web socket serve
+    // "ws" web socket server
     {
       title: 'should work and refresh content using hot module replacement',
       options: {
@@ -117,7 +117,7 @@ describe('hot and live reload', () => {
         hot: true,
       },
     },
-    // "sockjs" web socket serve
+    // "sockjs" web socket server
     {
       title: 'should work and refresh content using hot module replacement',
       options: {
@@ -200,6 +200,7 @@ describe('hot and live reload', () => {
       await new Promise((resolve, reject) => {
         server.listen(devServerOptions.port, devServerOptions.host, (error) => {
           if (error) {
+            console.log(error);
             reject(error);
 
             return;
@@ -214,6 +215,7 @@ describe('hot and live reload', () => {
           .get('/main')
           .expect(200, (error) => {
             if (error) {
+              console.log(error);
               reject(error);
 
               return;