[refactor] Use pipe for websockets

mmalecki · mmalecki · commit 674240289fab · 2012-11-30T03:34:07.000+01:00
diff --git a/lib/http-proxy/http-proxy.js b/lib/http-proxy/http-proxy.js
@@ -348,7 +348,6 @@ HttpProxy.prototype.proxyRequest = function (req, res, buffer) {
 HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer) {
   var self      = this,
       outgoing  = new(this.target.base),
-      listeners = {},
       errState  = false,
       CRLF      = '\r\n';
 
@@ -439,93 +438,17 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, buffer)
     // Any incoming data on this WebSocket to the proxy target
     // will be written to the `reverseProxy` socket.
     //
-    proxySocket.on('data', listeners.onIncoming = function (data) {
-      if (reverseProxy.incoming.socket.writable) {
-        try {
-          self.emit('websocket:outgoing', req, socket, head, data);
-          var flushed = reverseProxy.incoming.socket.write(data);
-          if (!flushed) {
-            proxySocket.pause();
-            reverseProxy.incoming.socket.once('drain', function () {
-              try { proxySocket.resume() }
-              catch (er) { console.error("proxySocket.resume error: %s", er.message) }
-            });
-
-            //
-            // Force the `drain` event in 100ms if it hasn't
-            // happened on its own.
-            //
-            setTimeout(function () {
-              reverseProxy.incoming.socket.emit('drain');
-            }, 100);
-          }
-        }
-        catch (ex) {
-          detach();
-        }
-      }
-    });
+    proxySocket.pipe(reverseProxy.incoming.socket);
 
     //
     // Any outgoing data on this Websocket from the proxy target
     // will be written to the `proxySocket` socket.
     //
-    reverseProxy.incoming.socket.on('data', listeners.onOutgoing = function (data) {
-      try {
-        self.emit('websocket:incoming', reverseProxy, reverseProxy.incoming, head, data);
-        var flushed = proxySocket.write(data);
-        if (!flushed) {
-          reverseProxy.incoming.socket.pause();
-          proxySocket.once('drain', function () {
-            try { reverseProxy.incoming.socket.resume() }
-            catch (er) { console.error("reverseProxy.incoming.socket.resume error: %s", er.message) }
-          });
+    reverseProxy.incoming.socket.pipe(proxySocket);
 
-          //
-          // Force the `drain` event in 100ms if it hasn't
-          // happened on its own.
-          //
-          setTimeout(function () {
-            proxySocket.emit('drain');
-          }, 100);
-        }
-      }
-      catch (ex) {
-        detach();
-      }
-    });
-
-    //
-    // Helper function to detach all event listeners
-    // from `reverseProxy` and `proxySocket`.
-    //
-    function detach() {
-      proxySocket.destroySoon();
-      proxySocket.removeListener('end', listeners.onIncomingClose);
-      proxySocket.removeListener('data', listeners.onIncoming);
-      reverseProxy.incoming.socket.destroySoon();
-      reverseProxy.incoming.socket.removeListener('end', listeners.onOutgoingClose);
-      reverseProxy.incoming.socket.removeListener('data', listeners.onOutgoing);
-    }
-
-    //
-    // If the incoming `proxySocket` socket closes, then
-    // detach all event listeners.
-    //
-    proxySocket.on('end', listeners.onIncomingClose = function() {
-      detach();
-
-      // Emit the `end` event now that we have completed proxying
+    proxySocket.on('end', function () {
       self.emit('websocket:end', req, socket, head);
     });
-
-    //
-    // If the `reverseProxy` socket closes, then detach all
-    // event listeners.
-    //
-    reverseProxy.incoming.socket.on('end', listeners.onOutgoingClose = function() {
-      detach();
-    });
   }
 
   function getPort (port) {
