refactor: code

Author: alexander-akait

lib/Server.js

@@ -14,6 +14,8 @@ const routes = require('./utils/routes');
 const getSocketServerImplementation = require('./utils/getSocketServerImplementation');
 const getCompilerConfigArray = require('./utils/getCompilerConfigArray');
 const setupExitSignals = require('./utils/setupExitSignals');
+const getStatsOption = require('./utils/getStatsOption');
+const getColorsOption = require('./utils/getColorsOption');
 const schema = require('./options.json');
 
 if (!process.env.WEBPACK_SERVE) {
@@ -40,6 +42,7 @@ class Server {
     this.wsHeartbeatInterval = 30000;
 
     normalizeOptions(this.compiler, this.options);
+
     this.applyDevServerPlugin();
 
     this.SocketServerImplementation = getSocketServerImplementation(
@@ -629,8 +632,6 @@ class Server {
   }
 
   showStatus() {
-    const getColorsOption = require('./utils/getColorsOption');
-
     const useColor = getColorsOption(getCompilerConfigArray(this.compiler));
     const protocol = this.options.https ? 'https' : 'http';
     const { address, port } = this.server.address();
@@ -761,38 +762,55 @@ class Server {
   }
 
   listen(port, hostname, fn) {
-    if (typeof hostname !== 'undefined' && hostname !== this.options.host) {
-      throw new Error(
-        'The host specified in options is different from the host passed as an argument.'
+    if (
+      typeof port !== 'undefined' &&
+      typeof this.options.port !== 'undefined' &&
+      port !== this.options.port
+    ) {
+      this.options.port = port;
+
+      this.logger.warn(
+        'The "port" specified in options is different from the port passed as an argument. Will be used from arguments.'
       );
     }
 
-    if (typeof port !== 'undefined' && port !== this.options.port) {
+    if (!this.options.port) {
+      this.options.port = port;
+    }
+
+    if (
+      typeof hostname !== 'undefined' &&
+      typeof this.options.host !== 'undefined' &&
+      hostname !== this.options.host
+    ) {
+      this.options.host = hostname;
+
       this.logger.warn(
-        'The port specified in options is different from the port passed as an argument.'
+        'The "host" specified in options is different from the host passed as an argument. Will be used from arguments.'
       );
     }
 
-    hostname = this.options.host;
+    if (!this.options.host) {
+      this.options.host = hostname;
+    }
 
-    if (hostname === 'local-ip') {
+    if (this.options.host === 'local-ip') {
       this.options.host =
         internalIp.v4.sync() || internalIp.v6.sync() || '0.0.0.0';
-    } else if (hostname === 'local-ipv4') {
+    } else if (this.options.host === 'local-ipv4') {
       this.options.host = internalIp.v4.sync() || '0.0.0.0';
-    } else if (hostname === 'local-ipv6') {
+    } else if (this.options.host === 'local-ipv6') {
       this.options.host = internalIp.v6.sync() || '::';
-    } else {
-      this.options.host = hostname;
     }
 
-    return (
-      Server.getFreePort(port || this.options.port)
-        // eslint-disable-next-line no-shadow
-        .then((port) => {
-          this.options.port = port;
+    return Server.getFreePort(this.options.port)
+      .then((foundPort) => {
+        this.options.port = foundPort;
 
-          return this.server.listen(port, this.options.host, (error) => {
+        return this.server.listen(
+          this.options.port,
+          this.options.host,
+          (error) => {
             if (this.options.hot || this.options.liveReload) {
               this.createSocketServer();
             }
@@ -812,14 +830,14 @@ class Server {
             if (typeof this.options.onListening === 'function') {
               this.options.onListening(this);
             }
-          });
-        })
-        .catch((error) => {
-          if (fn) {
-            fn.call(this.server, error);
           }
-        })
-    );
+        );
+      })
+      .catch((error) => {
+        if (fn) {
+          fn.call(this.server, error);
+        }
+      });
   }
 
   close(cb) {
@@ -883,8 +901,6 @@ class Server {
   }
 
   getStats(statsObj) {
-    const getStatsOption = require('./utils/getStatsOption');
-
     const stats = Server.DEFAULT_STATS;
 
     const configArr = getCompilerConfigArray(this.compiler);

test/helpers/test-server.js

@@ -21,16 +21,25 @@ function startFullSetup(config, options, done) {
   server = new Server(options, compiler);
 
   let port;
+
   if (Object.prototype.hasOwnProperty.call(options, 'port')) {
     port = options.port;
   } else {
     console.warn('Using the default port for testing is not recommended');
     port = 8080;
   }
 
-  server.listen(port, options.host, (err) => {
-    if (err && done) {
-      return done(err);
+  let host;
+
+  if (Object.prototype.hasOwnProperty.call(options, 'host')) {
+    host = options.host;
+  } else {
+    host = 'localhost';
+  }
+
+  server.listen(port, host, (error) => {
+    if (error && done) {
+      return done(error);
     }
 
     if (done) {

test/server/Server.test.js

@@ -170,41 +170,83 @@ describe('Server', () => {
       compiler = webpack(config);
     });
 
-    it('should listen and not throw error', (done) => {
+    it('should work and using "port" and "host" from options', (done) => {
       const options = {
         host: 'localhost',
         port,
       };
 
-      server = new Server(compiler, options);
+      server = new Server(options, compiler);
+
+      // eslint-disable-next-line no-undefined
+      server.listen(undefined, undefined, () => {
+        const info = server.server.address();
+
+        expect(info.address).toBe('127.0.0.1');
+        expect(info.port).toBe(port);
+
+        server.close(done);
+      });
+    });
 
-      expect(() => server.listen(port, 'localhost')).not.toThrowError();
-      server.close(done);
+    it('should work and using "port" and "host" from arguments', (done) => {
+      server = new Server({}, compiler);
+
+      server.listen(port, '127.0.0.1', () => {
+        const info = server.server.address();
+
+        expect(info.address).toBe('127.0.0.1');
+        expect(info.port).toBe(port);
+
+        server.close(done);
+      });
     });
 
-    it('should work and listen', (done) => {
+    it('should work and using the same "port" and "host" from options and arguments', (done) => {
       const options = {
         host: 'localhost',
+        port,
       };
 
-      server = new Server(compiler, options);
+      server = new Server(options, compiler);
 
-      expect(() => server.listen(9000)).not.toThrowError();
-      server.close(done);
+      server.listen(options.port, options.host, () => {
+        const info = server.server.address();
+
+        expect(info.address).toBe('127.0.0.1');
+        expect(info.port).toBe(port);
+
+        server.close(done);
+      });
     });
 
-    it('should throw an error', (done) => {
+    it('should log warning when the "port" and "host" options from options different from arguments', (done) => {
       const options = {
-        host: '192.160.21.34',
-        port,
+        host: '127.0.0.2',
+        port: '9999',
       };
 
       server = new Server(compiler, options);
 
-      expect(() => server.listen(port, 'localhost')).toThrowError(
-        'The host specified in options is different from the host passed as an argument.'
-      );
-      server.close(done);
+      const loggerWarnSpy = jest.spyOn(server.logger, 'warn');
+
+      server.listen(port, '127.0.0.1', () => {
+        const info = server.server.address();
+
+        expect(loggerWarnSpy).toHaveBeenNthCalledWith(
+          1,
+          'The "port" specified in options is different from the port passed as an argument. Will be used from arguments.'
+        );
+        expect(loggerWarnSpy).toHaveBeenNthCalledWith(
+          2,
+          'The "host" specified in options is different from the host passed as an argument. Will be used from arguments.'
+        );
+        expect(info.address).toBe('127.0.0.1');
+        expect(info.port).toBe(port);
+
+        loggerWarnSpy.mockRestore();
+        server.close(done);
+      });
     });
   });
 

test/server/host-option.test.js

@@ -35,7 +35,7 @@ describe('host option', () => {
     it('server address', () => {
       const address = server.server.address();
 
-      expect(address.address).toBe('::');
+      expect(address.address).toBe('127.0.0.1');
       expect(address.port).toBe(port);
     });
 

test/server/port-option.test.js

@@ -25,7 +25,6 @@ describe('port', () => {
             watch: false,
           },
           port,
-          host: 'localhost',
         },
         done
       );
@@ -58,7 +57,6 @@ describe('port', () => {
           },
           // eslint-disable-next-line no-undefined
           port: undefined,
-          host: 'localhost',
         },
         done
       );
@@ -90,7 +88,6 @@ describe('port', () => {
             watch: false,
           },
           port: 'auto',
-          host: 'localhost',
         },
         done
       );
@@ -122,7 +119,6 @@ describe('port', () => {
             watch: false,
           },
           port: '33333',
-          host: 'localhost',
         },
         done
       );
@@ -153,7 +149,6 @@ describe('port', () => {
             watch: false,
           },
           port: '33333',
-          host: 'localhost',
         },
         done
       );

test/server/stats-option.test.js

@@ -29,11 +29,7 @@ describe('stats option', () => {
           () =>
             new Promise((resolve) => {
               const compiler = webpack(Object.assign({}, config, { stats }));
-              const server = createServer(compiler, {
-                static: false,
-                port,
-                host: 'localhost',
-              });
+              const server = createServer(compiler, { static: false, port });
 
               compiler.hooks.done.tap('webpack-dev-server', (s) => {
                 expect(
@@ -57,11 +53,7 @@ describe('stats option', () => {
         stats: { warningsFilter: 'test' },
       })
     );
-    const server = createServer(compiler, {
-      static: false,
-      port,
-      host: 'localhost',
-    });
+    const server = createServer(compiler, { static: false, port });
 
     compiler.hooks.done.tap('webpack-dev-server', (s) => {
       s.compilation.warnings = ['test', 'another warning'];