refactor: code

Author: alexander-akait

lib/Server.js

@@ -160,6 +160,12 @@ class Server {
       options.allowedHosts = [options.allowedHosts];
     }
 
+    if (typeof options.bonjour === "undefined") {
+      options.bonjour = false;
+    } else if (typeof options.bonjour === "boolean") {
+      options.bonjour = options.bonjour ? {} : false;
+    }
+
     if (
       typeof options.client === "undefined" ||
       (typeof options.client === "object" && options.client !== null)
@@ -203,7 +209,22 @@ class Server {
       options.compress = true;
     }
 
-    options.devMiddleware = options.devMiddleware || {};
+    if (typeof options.devMiddleware === "undefined") {
+      options.devMiddleware = {};
+    }
+
+    // No need to normalize `headers`
+
+    if (typeof options.historyApiFallback === "undefined") {
+      options.historyApiFallback = false;
+    } else if (
+      typeof options.historyApiFallback === "boolean" &&
+      options.historyApiFallback
+    ) {
+      options.historyApiFallback = {};
+    }
+
+    // No need to normalize `host`
 
     options.hot =
       typeof options.hot === "boolean" || options.hot === "only"
@@ -525,6 +546,31 @@ class Server {
       });
     }
 
+    if (typeof options.watchFiles === "string") {
+      options.watchFiles = [{ paths: options.watchFiles, options: {} }];
+    } else if (
+      typeof options.watchFiles === "object" &&
+      options.watchFiles !== null &&
+      !Array.isArray(options.watchFiles)
+    ) {
+      options.watchFiles = [
+        {
+          paths: options.watchFiles.paths,
+          options: options.watchFiles.options || {},
+        },
+      ];
+    } else if (Array.isArray(options.watchFiles)) {
+      options.watchFiles = options.watchFiles.map((item) => {
+        if (typeof item === "string") {
+          return { paths: item, options: {} };
+        }
+
+        return { paths: item.paths, options: item.options || {} };
+      });
+    } else {
+      options.watchFiles = [];
+    }
+
     const defaultWebSocketServerType = "ws";
     const defaultWebSocketServerOptions = { path: "/ws" };
 
@@ -844,24 +890,20 @@ class Server {
   }
 
   setupHistoryApiFallbackFeature() {
-    const historyApiFallback = require("connect-history-api-fallback");
+    const { historyApiFallback } = this.options;
 
-    const options =
-      typeof this.options.historyApiFallback !== "boolean"
-        ? this.options.historyApiFallback
-        : {};
-
-    let logger;
-
-    if (typeof options.verbose === "undefined") {
-      logger = this.logger.log.bind(
+    if (
+      typeof historyApiFallback.logger === "undefined" &&
+      !historyApiFallback.verbose
+    ) {
+      historyApiFallback.logger = this.logger.log.bind(
         this.logger,
         "[connect-history-api-fallback]"
       );
     }
 
     // Fall back to /index.html if nothing else matches.
-    this.app.use(historyApiFallback({ logger, ...options }));
+    this.app.use(require("connect-history-api-fallback")(historyApiFallback));
   }
 
   setupStaticFeature() {
@@ -911,23 +953,12 @@ class Server {
   }
 
   setupWatchFiles() {
-    if (this.options.watchFiles) {
-      const { watchFiles } = this.options;
-
-      if (typeof watchFiles === "string") {
-        this.watchFiles(watchFiles, {});
-      } else if (Array.isArray(watchFiles)) {
-        watchFiles.forEach((file) => {
-          if (typeof file === "string") {
-            this.watchFiles(file, {});
-          } else {
-            this.watchFiles(file.paths, file.options || {});
-          }
-        });
-      } else {
-        // { paths: [...], options: {} }
-        this.watchFiles(watchFiles.paths, watchFiles.options || {});
-      }
+    const { watchFiles } = this.options;
+
+    if (watchFiles.length > 0) {
+      watchFiles.forEach((item) => {
+        this.watchFiles(item.paths, item.options);
+      });
     }
   }
 
@@ -940,7 +971,7 @@ class Server {
   }
 
   setupHeadersFeature() {
-    this.app.all("*", this.setContentHeaders.bind(this));
+    this.app.all("*", this.setHeaders.bind(this));
   }
 
   setupMagicHtmlFeature() {
@@ -1555,12 +1586,14 @@ class Server {
     return statsObj.toJson(stats);
   }
 
-  setContentHeaders(req, res, next) {
+  setHeaders(req, res, next) {
     let { headers } = this.options;
+
     if (headers) {
       if (typeof headers === "function") {
         headers = headers(req, res, this.middleware.context);
       }
+
       // eslint-disable-next-line guard-for-in
       for (const name in headers) {
         res.setHeader(name, headers[name]);
@@ -1623,11 +1656,11 @@ class Server {
       return true;
     }
 
-    const allowedHosts = this.options.allowedHosts;
+    const { allowedHosts } = this.options;
 
     // always allow localhost host, for convenience
     // allow if hostname is in allowedHosts
-    if (Array.isArray(allowedHosts) && allowedHosts.length) {
+    if (Array.isArray(allowedHosts) && allowedHosts.length > 0) {
       for (let hostIdx = 0; hostIdx < allowedHosts.length; hostIdx++) {
         const allowedHost = allowedHosts[hostIdx];
 

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

@@ -8,6 +8,8 @@ const config = require("../fixtures/client-config/webpack.config");
 const runBrowser = require("../helpers/run-browser");
 const port = require("../ports-map")["web-socket-communication"];
 
+jest.setTimeout(60000);
+
 describe("web socket communication", () => {
   const webSocketServers = ["ws", "sockjs"];
 
@@ -224,6 +226,7 @@ describe("web socket communication", () => {
       });
 
       await page.waitForNavigation({
+        timeout: 60000,
         waitUntil: "networkidle0",
       });