refactor: move https normalization (#3331)

Author: anshumanv

lib/Server.js

@@ -1,8 +1,6 @@
 'use strict';
 
-const path = require('path');
 const url = require('url');
-const fs = require('graceful-fs');
 const ipaddr = require('ipaddr.js');
 const internalIp = require('internal-ip');
 const killable = require('killable');
@@ -41,7 +39,7 @@ class Server {
     // this value of ws can be overwritten for tests
     this.wsHeartbeatInterval = 30000;
 
-    normalizeOptions(this.compiler, this.options);
+    normalizeOptions(this.compiler, this.options, this.logger);
 
     this.applyDevServerPlugin();
 
@@ -63,7 +61,6 @@ class Server {
 
     this.setupWatchFiles();
     this.setupFeatures();
-    this.setupHttps();
     this.createServer();
 
     killable(this.server);
@@ -505,51 +502,6 @@ class Server {
     });
   }
 
-  setupHttps() {
-    // if the user enables http2, we can safely enable https
-    if (
-      (this.options.http2 && !this.options.https) ||
-      this.options.https === true
-    ) {
-      this.options.https = {
-        requestCert: false,
-      };
-    }
-
-    if (this.options.https) {
-      const getCertificate = require('./utils/getCertificate');
-
-      for (const property of ['cacert', 'pfx', 'key', 'cert']) {
-        const value = this.options.https[property];
-        const isBuffer = value instanceof Buffer;
-
-        if (value && !isBuffer) {
-          let stats = null;
-
-          try {
-            stats = fs.lstatSync(fs.realpathSync(value)).isFile();
-          } catch (error) {
-            // ignore error
-          }
-
-          // It is file
-          this.options.https[property] = stats
-            ? fs.readFileSync(path.resolve(value))
-            : value;
-        }
-      }
-
-      let fakeCert;
-
-      if (!this.options.https.key || !this.options.https.cert) {
-        fakeCert = getCertificate(this.logger);
-      }
-
-      this.options.https.key = this.options.https.key || fakeCert;
-      this.options.https.cert = this.options.https.cert || fakeCert;
-    }
-  }
-
   createServer() {
     const https = require('https');
     const http = require('http');

lib/utils/normalizeOptions.js

@@ -1,10 +1,11 @@
 'use strict';
 
 const path = require('path');
+const fs = require('graceful-fs');
 const isAbsoluteUrl = require('is-absolute-url');
 const getCompilerConfigArray = require('./getCompilerConfigArray');
 
-function normalizeOptions(compiler, options) {
+function normalizeOptions(compiler, options, logger) {
   // TODO: improve this to not use .find for compiler watchOptions
   const configArr = getCompilerConfigArray(compiler);
   const watchOptionsConfig = configArr.find(
@@ -127,6 +128,46 @@ function normalizeOptions(compiler, options) {
   if (typeof options.compress === 'undefined') {
     options.compress = true;
   }
+
+  // if the user enables http2, we can safely enable https
+  if ((options.http2 && !options.https) || options.https === true) {
+    options.https = {
+      requestCert: false,
+    };
+  }
+
+  if (options.https) {
+    const getCertificate = require('./getCertificate');
+
+    for (const property of ['cacert', 'pfx', 'key', 'cert']) {
+      const value = options.https[property];
+      const isBuffer = value instanceof Buffer;
+
+      if (value && !isBuffer) {
+        let stats = null;
+
+        try {
+          stats = fs.lstatSync(fs.realpathSync(value)).isFile();
+        } catch (error) {
+          // ignore error
+        }
+
+        // It is file
+        options.https[property] = stats
+          ? fs.readFileSync(path.resolve(value))
+          : value;
+      }
+    }
+
+    let fakeCert;
+
+    if (!options.https.key || !options.https.cert) {
+      fakeCert = getCertificate(logger);
+    }
+
+    options.https.key = options.https.key || fakeCert;
+    options.https.cert = options.https.cert || fakeCert;
+  }
 }
 
 module.exports = normalizeOptions;