Added support of automatic websocket tunneling, added test for it

http-party · Sep 16, 2010 · 56003b5 · 56003b5
1 parent cd78af5
commit 56003b5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/lib/node-http-proxy.js b/lib/node-http-proxy.js
@@ -60,9 +60,17 @@ exports.createServer = function () {
     }
   });
 
-  // WebSocket support
-  server.on('update', function() {
-  });
+  // If callback is empty - tunnel websocket request automatically
+  if (!callback) {
+    // WebSocket support
+    server.on('upgrade', function(req, socket, head) {
+      var proxy = new HttpProxy(req, socket, head);
+
+      // Tunnel websocket requests too
+      proxy.proxyWebSocketRequest(port, host);
+
+    });
+  }
 
   return server;
 };
@@ -325,12 +333,12 @@ HttpProxy.prototype = {
           request.end();
           socket.end();
         }
-        
+
         // Catch socket errors
         socket.on('error', function() {
           request.end();
         });
-        
+
         // Remove data listener
         request.socket.removeListener('data', t);
       });
@@ -344,7 +352,7 @@ HttpProxy.prototype = {
       }
       self.unwatch(socket);
     });
-    
+
     // Request
 
     function onUpgrade(reverse_proxy) {

diff --git a/test/node-http-proxy-websocket-test.js b/test/node-http-proxy-websocket-test.js
@@ -48,4 +48,7 @@ server.on('upgrade', function(req, socket, head) {
   p.proxyWebSocketRequest(8080, 'localhost');
 });
 
-server.listen(80);
+server.listen(8000);
+
+httpProxy.createServer(8080, 'localhost').listen(8001);
+