refactor: rename properties

Author: alexander-akait

lib/Server.js

@@ -32,7 +32,7 @@ class Server {
     this.compiler = compiler;
     this.options = options;
     this.logger = this.compiler.getInfrastructureLogger('webpack-dev-server');
-    this.sockets = [];
+    this.webSocketConnections = [];
     this.staticWatchers = [];
     // Keep track of websocket proxies for external websocket upgrade.
     this.webSocketProxies = [];
@@ -43,7 +43,7 @@ class Server {
 
     this.applyDevServerPlugin();
 
-    this.SocketServerImplementation = getSocketServerImplementation(
+    this.webSocketServerImplementation = getSocketServerImplementation(
       this.options
     );
 
@@ -99,7 +99,7 @@ class Server {
         msg = `${msg} (${addInfo})`;
       }
 
-      this.sendMessage(this.sockets, 'progress-update', {
+      this.sendMessage(this.webSocketConnections, 'progress-update', {
         percent,
         msg,
         pluginName,
@@ -120,7 +120,7 @@ class Server {
   setupHooks() {
     // Listening for events
     const invalidPlugin = () => {
-      this.sendMessage(this.sockets, 'invalid');
+      this.sendMessage(this.webSocketConnections, 'invalid');
     };
 
     const addHooks = (compiler) => {
@@ -129,7 +129,7 @@ class Server {
       compile.tap('webpack-dev-server', invalidPlugin);
       invalid.tap('webpack-dev-server', invalidPlugin);
       done.tap('webpack-dev-server', (stats) => {
-        this.sendStats(this.sockets, this.getStats(stats));
+        this.sendStats(this.webSocketConnections, this.getStats(stats));
         this.stats = stats;
       });
     };
@@ -474,9 +474,10 @@ class Server {
   }
 
   createWebSocketServer() {
-    this.socketServer = new this.SocketServerImplementation(this);
+    // eslint-disable-next-line new-cap
+    this.webSocketServer = new this.webSocketServerImplementation(this);
 
-    this.socketServer.onConnection((connection, headers) => {
+    this.webSocketServer.onConnection((connection, headers) => {
       if (!connection) {
         return;
       }
@@ -495,18 +496,18 @@ class Server {
       ) {
         this.sendMessage([connection], 'error', 'Invalid Host/Origin header');
 
-        this.socketServer.closeConnection(connection);
+        this.webSocketServer.closeConnection(connection);
 
         return;
       }
 
-      this.sockets.push(connection);
+      this.webSocketConnections.push(connection);
 
-      this.socketServer.onConnectionClose(connection, () => {
-        const idx = this.sockets.indexOf(connection);
+      this.webSocketServer.onConnectionClose(connection, () => {
+        const idx = this.webSocketConnections.indexOf(connection);
 
         if (idx >= 0) {
-          this.sockets.splice(idx, 1);
+          this.webSocketConnections.splice(idx, 1);
         }
       });
 
@@ -748,9 +749,9 @@ class Server {
   }
 
   close(callback) {
-    if (this.socketServer) {
-      this.socketServer.close();
-      this.sockets = [];
+    if (this.webSocketServer) {
+      this.webSocketServer.close();
+      this.webSocketConnections = [];
     }
 
     const prom = Promise.all(
@@ -928,9 +929,12 @@ class Server {
     return false;
   }
 
-  sendMessage(sockets, type, data) {
-    sockets.forEach((socket) => {
-      this.socketServer.send(socket, JSON.stringify({ type, data }));
+  sendMessage(webSocketConnections, type, data) {
+    webSocketConnections.forEach((webSocketConnection) => {
+      this.webSocketServer.send(
+        webSocketConnection,
+        JSON.stringify({ type, data })
+      );
     });
   }
 
@@ -960,7 +964,7 @@ class Server {
   }
 
   // Send stats to a socket or multiple sockets
-  sendStats(sockets, stats, force) {
+  sendStats(webSocketConnections, stats, force) {
     const shouldEmit =
       !force &&
       stats &&
@@ -970,23 +974,23 @@ class Server {
       stats.assets.every((asset) => !asset.emitted);
 
     if (shouldEmit) {
-      this.sendMessage(sockets, 'still-ok');
+      this.sendMessage(webSocketConnections, 'still-ok');
 
       return;
     }
 
-    this.sendMessage(sockets, 'hash', stats.hash);
+    this.sendMessage(webSocketConnections, 'hash', stats.hash);
 
     if (stats.errors.length > 0 || stats.warnings.length > 0) {
       if (stats.errors.length > 0) {
-        this.sendMessage(sockets, 'errors', stats.errors);
+        this.sendMessage(webSocketConnections, 'errors', stats.errors);
       }
 
       if (stats.warnings.length > 0) {
-        this.sendMessage(sockets, 'warnings', stats.warnings);
+        this.sendMessage(webSocketConnections, 'warnings', stats.warnings);
       }
     } else {
-      this.sendMessage(sockets, 'ok');
+      this.sendMessage(webSocketConnections, 'ok');
     }
   }
 
@@ -1027,7 +1031,11 @@ class Server {
     // disabling refreshing on changing the content
     if (this.options.liveReload) {
       watcher.on('change', (item) => {
-        this.sendMessage(this.sockets, 'static-changed', item);
+        this.sendMessage(
+          this.webSocketConnections,
+          'static-changed',
+            item
+        );
       });
     }