Proxy websocket requests

Author: Niels Giesen

lib/http-server.js

@@ -157,12 +157,13 @@ function HttpServer(options) {
 
   if (typeof options.proxy === 'string') {
     var proxyOptions = options.proxyOptions || {};
-    var proxy = httpProxy.createProxyServer(proxyOptions);
+    var proxy = httpProxy.createProxyServer({
+      ...proxyOptions,
+      target: options.proxy,
+      changeOrigin: true,
+    });
     before.push(function (req, res) {
-      proxy.web(req, res, {
-        target: options.proxy,
-        changeOrigin: true
-      }, function (err, req, res) {
+      proxy.web(req, res, {}, function (err, req, res) {
         if (options.logFn) {
           options.logFn(req, res, {
             message: err.message,
@@ -193,6 +194,11 @@ 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) {
+    this.server.on('upgrade', function (request, socket, head) {
+      proxy.ws(request, socket, head);
+    });
+  }
 
   if (options.timeout !== undefined) {
     this.server.setTimeout(options.timeout);