Proxy websockets only with --websocket

Author: Niels Giesen

bin/http-server

@@ -59,6 +59,7 @@ if (argv.h || argv.help) {
     '',
     '  -P --proxy       Fallback proxy if the request cannot be resolved. e.g.: http://someurl.com',
     '  --proxy-options  Pass options to proxy using nested dotted objects. e.g.: --proxy-options.secure false',
+    '  --websocket      Enable websocket proxy',
     '',
     '  --username   Username for basic authentication [none]',
     '               Can also be specified with the env variable NODE_HTTP_SERVER_USERNAME',
@@ -84,6 +85,7 @@ var port = argv.p || argv.port || parseInt(process.env.PORT, 10),
     sslPassphrase = process.env.NODE_HTTP_SERVER_SSL_PASSPHRASE,
     proxy = argv.P || argv.proxy,
     proxyOptions = argv['proxy-options'],
+    websocket = argv.websocket,
     utc = argv.U || argv.utc,
     version = argv.v || argv.version,
     baseDir = argv['base-dir'],
@@ -181,6 +183,14 @@ function listen(port) {
     }
   }
 
+  if (websocket) {
+    if (!proxy) {
+      logger.warning(colors.yellow('WebSocket proxy will not be enabled because proxy is not enabled'));
+    } else {
+      options.websocket = true;
+    }
+  }
+
   if (argv.cors) {
     options.cors = true;
     if (typeof argv.cors === 'string') {

lib/http-server.js

@@ -194,7 +194,7 @@ function HttpServer(options) {
     // if passphrase is set, shim must be used as union does not support
     ? require('./shims/https-server-shim')(serverOptions)
     : union.createServer(serverOptions);
-  if (proxy) {
+  if (proxy && options.websocket) {
     this.server.on('upgrade', function (request, socket, head) {
       proxy.ws(request, socket, head);
     });