Put web socket support via proxy behind an option wall, proxy.ws.

Websocket proxying is not the common use-case and introducing
an extra port requirement would be a breaking change for some users.

Author: Shane Osbourne

lib/async.js

@@ -42,6 +42,13 @@ module.exports = {
             return done();
         }
 
+        /**
+         * Web socket support is disabled by default
+         */
+        if (!bs.options.getIn(["proxy", "ws"])) {
+            return done();
+        }
+
         /**
          * Use 1 higher than server port by default...
          */

lib/browser-sync.js

@@ -468,7 +468,7 @@ BrowserSync.prototype.getExternalSocketConnector = function (opts) {
     return connectUtils.socketConnector(
         bs.options.withMutations(function (item) {
             item.set("socket", item.get("socket").merge(opts));
-            if (bs.options.get("mode") !== "proxy") {
+            if (!bs.options.getIn(["proxy", "ws"])) {
                 item.set("mode", "snippet");
             }
         })

lib/connect-utils.js

@@ -101,7 +101,7 @@ var connectUtils = {
             string   = withHostnamePort;
         }
 
-        if (options.get("mode") === "proxy") {
+        if (options.get("mode") === "proxy" && options.getIn(["proxy", "ws"])) {
             port = options.getIn(["socket", "port"]);
         }
 

lib/sockets.js

@@ -25,7 +25,7 @@ module.exports.init = function (server, clientEvents, bs) {
         .get("socket")
         .toJS();
 
-    if (bs.options.get("mode") === "proxy") {
+    if (bs.options.get("mode") === "proxy" && bs.options.getIn(["proxy", "ws"])) {
         server = utils.getServer(null, bs.options).server;
         server.listen(bs.options.getIn(["socket", "port"]));
         bs.registerCleanupTask(function () {

test/specs/e2e/e2e.options.port.js

@@ -37,7 +37,10 @@ describe("E2E `port` option", function () {
 
         var config = {
             logLevel: "silent",
-            proxy:   "localhost",
+            proxy:   {
+                target: "localhost",
+                ws: true
+            },
             online:   false,
             open:     false
         };
@@ -61,7 +64,10 @@ describe("E2E `port` option", function () {
 
         var config = {
             logLevel: "silent",
-            proxy:   "localhost",
+            proxy:   {
+                target: "localhost",
+                ws: true
+            },
             socket: {
                 port: 8001
             },

test/specs/utils/utils.connect.js

@@ -37,6 +37,10 @@ describe("Connection utils", function () {
             port: 3002,
             scheme: "http",
             mode: "proxy",
+            proxy: {
+                target: "localhost",
+                ws: true
+            },
             socket: {
                 port: 4000
             }