refactor: code

Author: alexander-akait

lib/Server.js

@@ -1142,9 +1142,6 @@ class Server {
   }
 
   createServer() {
-    const https = require("https");
-    const http = require("http");
-
     if (this.options.https) {
       if (this.options.http2) {
         // TODO: we need to replace spdy with http2 which is an internal module
@@ -1158,18 +1155,22 @@ class Server {
           this.app
         );
       } else {
+        const https = require("https");
+
         this.server = https.createServer(this.options.https, this.app);
       }
     } else {
+      const http = require("http");
+
       this.server = http.createServer(this.app);
     }
 
     this.server.on("connection", (socket) => {
-      // add socket to list
+      // Add socket to list
       this.sockets.push(socket);
 
       socket.once("close", () => {
-        // remove socket from list
+        // Remove socket from list
         this.sockets.splice(this.sockets.indexOf(socket), 1);
       });
     });
@@ -1783,40 +1784,42 @@ class Server {
   }
 
   async stop() {
-    if (this.webSocketProxies.length > 0) {
-      this.webSocketProxies = [];
-    }
+    this.webSocketProxies = [];
 
-    if (this.staticWatchers.length > 0) {
-      await Promise.all(this.staticWatchers.map((watcher) => watcher.close()));
+    await Promise.all(this.staticWatchers.map((watcher) => watcher.close()));
 
-      this.staticWatchers = [];
-    }
+    this.staticWatchers = [];
 
     if (this.webSocketServer) {
       await new Promise((resolve) => {
         this.webSocketServer.implementation.close(() => {
+          this.webSocketServer = null;
+
           resolve();
         });
-      });
 
-      this.webSocketServer = null;
+        for (const client of this.webSocketServer.clients) {
+          client.terminate();
+        }
+
+        this.webSocketServer.clients = [];
+      });
     }
 
     if (this.server) {
       await new Promise((resolve) => {
-        this.server.kill((cb) => {
-          this.server.stopCallback(cb);
-          this.sockets.forEach((socket) => {
-            socket.destroy();
-          });
-          // reset so the server can be restarted
-          this.sockets = [];
+        this.server.close(() => {
+          this.server = null;
+
           resolve();
         });
-      });
 
-      this.server = null;
+        for (const socket of this.sockets) {
+          socket.destroy();
+        }
+
+        this.sockets = [];
+      });
 
       if (this.middleware) {
         await new Promise((resolve, reject) => {

lib/servers/BaseServer.js

@@ -5,6 +5,6 @@
 module.exports = class BaseServer {
   constructor(server) {
     this.server = server;
-    this.clients = new Set();
+    this.clients = [];
   }
 };

lib/servers/SockJSServer.js

@@ -67,20 +67,14 @@ module.exports = class SockJSServer extends BaseServer {
       client.send = client.write;
       client.terminate = client.close;
 
-      this.clients.add(client);
+      this.clients.push(client);
 
       client.on("close", () => {
-        this.clients.delete(client);
+        this.clients.splice(this.clients.indexOf(client), 1);
       });
     });
 
     this.implementation.close = (callback) => {
-      for (const client of this.clients) {
-        client.close();
-      }
-
-      this.clients.clear();
-
       callback();
     };
   }

lib/servers/WebsocketServer.js

@@ -54,7 +54,7 @@ module.exports = class WebsocketServer extends BaseServer {
     }, WebsocketServer.heartbeatInterval);
 
     this.implementation.on("connection", (client) => {
-      this.clients.add(client);
+      this.clients.push(client);
 
       client.isAlive = true;
 
@@ -63,18 +63,12 @@ module.exports = class WebsocketServer extends BaseServer {
       });
 
       client.on("close", () => {
-        this.clients.delete(client);
+        this.clients.splice(this.clients.indexOf(client), 1);
       });
     });
 
     this.implementation.on("close", () => {
       clearInterval(interval);
-
-      for (const ws of this.clients) {
-        ws.terminate();
-      }
-
-      this.clients.clear();
     });
   }
 };

test/e2e/web-socket-communication.test.js

@@ -96,7 +96,7 @@ describe("web socket communication", () => {
         }, 200);
       });
 
-      expect(server.webSocketServer.clients.size).toBe(0);
+      expect(server.webSocketServer.clients.length).toBe(0);
       expect(consoleMessages.map((message) => message.text())).toMatchSnapshot(
         "console messages"
       );