Commit 3bb458e1 authored by indexzero's avatar indexzero

[api] Integrated commits from donnerjack and worked on pool changes

parents 5d54ea58 7e61f0cf
...@@ -61,6 +61,18 @@ exports.createServer = function () { ...@@ -61,6 +61,18 @@ exports.createServer = 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; return server;
}; };
...@@ -74,12 +86,21 @@ exports.setMax = function (value) { ...@@ -74,12 +86,21 @@ exports.setMax = function (value) {
manager.setMaxClients(max); manager.setMaxClients(max);
}; };
var HttpProxy = function (req, res) { var HttpProxy = function (req, res, head) {
this.emitter = new(events.EventEmitter); this.emitter = new(events.EventEmitter);
this.events = {}; this.events = {};
this.req = req; this.req = req;
// If this request is upgrade request
// No response will be passed
if (!req.headers.upgrade) {
this.res = res; this.res = res;
this.watch(req); this.watch(req);
} else {
// Second argument will be socket
this.sock = res;
this.head = head;
this.watch(res);
}
}; };
HttpProxy.prototype = { HttpProxy.prototype = {
...@@ -124,27 +145,25 @@ HttpProxy.prototype = { ...@@ -124,27 +145,25 @@ HttpProxy.prototype = {
// Open new HTTP request to internal resource with will act as a reverse proxy pass // Open new HTTP request to internal resource with will act as a reverse proxy pass
var p = manager.getPool(port, server); var p = manager.getPool(port, server);
sys.puts('current pool count for ' + req.headers.host + ":" + port + ' ' +p.clients.length); sys.puts('current pool count for ' + req.headers.host + ":" + port + ' ' +p.clients.length);
p.on('error', function (err) { p.on('error', function (err) {
// Remark: We should probably do something here // Remark: We should probably do something here
// but this is a hot-fix because I don't think 'pool' // but this is a hot-fix because I don't think 'pool'
// should be emitting this event. // should be emitting this event.
sys.puts('p.on, error fired'.red);
eyes.inspect(err);
this.res.end();
}); });
p.request(req.method, req.url, req.headers, function (reverse_proxy) { p.request(req.method, req.url, req.headers, function (reverse_proxy) {
// Create an error handler so we can use it temporarily // Create an error handler so we can use it temporarily
var error = function (err) { var error = function (err) {
res.writeHead(200, {'Content-Type': 'text/plain'}); res.writeHead(500, {'Content-Type': 'text/plain'});
if(req.method !== 'HEAD') { if(req.method !== 'HEAD') {
res.write('An error has occurred: ' + sys.puts(JSON.stringify(err))); res.write('An error has occurred: ' + JSON.stringify(err));
} }
// Response end may never come so removeListener here
reverse_proxy.removeListener('error', error);
res.end(); res.end();
}; };
...@@ -161,6 +180,13 @@ HttpProxy.prototype = { ...@@ -161,6 +180,13 @@ HttpProxy.prototype = {
// Set the response headers of the client response // Set the response headers of the client response
res.writeHead(response.statusCode, response.headers); res.writeHead(response.statusCode, response.headers);
// Status code = 304
// No 'data' event and no 'end'
if (response.statusCode === 304) {
res.end();
return;
}
// Add event handler for the proxied response in chunks // Add event handler for the proxied response in chunks
response.addListener('data', function (chunk) { response.addListener('data', function (chunk) {
if(req.method !== 'HEAD') { if(req.method !== 'HEAD') {
...@@ -173,6 +199,7 @@ HttpProxy.prototype = { ...@@ -173,6 +199,7 @@ HttpProxy.prototype = {
response.addListener('end', function () { response.addListener('end', function () {
// Remark: Emit the end event for testability // Remark: Emit the end event for testability
self.emitter.emit('proxy', null, self.body); self.emitter.emit('proxy', null, self.body);
reverse_proxy.removeListener('error', error);
res.end(); res.end();
}); });
}); });
...@@ -185,11 +212,206 @@ HttpProxy.prototype = { ...@@ -185,11 +212,206 @@ HttpProxy.prototype = {
// At the end of the client request, we are going to stop the proxied request // At the end of the client request, we are going to stop the proxied request
req.addListener('end', function () { req.addListener('end', function () {
reverse_proxy.end(); reverse_proxy.end();
reverse_proxy.removeListener('error', error);
}); });
self.unwatch(req); self.unwatch(req);
}); });
},
/**
* WebSocket Tunnel realization
* Copyright (c) 2010 Fedor Indutny : http://github.com/donnerjack13589
*/
proxyWebSocketRequest: function (port, server, host) {
var self = this, req = self.req, socket = self.sock, head = self.head,
headers = new _headers(req.headers), CRLF = '\r\n';
// Will generate clone of headers
// To not change original
function _headers(headers) {
var h = {};
for (var i in headers) {
h[i] = headers[i];
}
return h;
}
// WebSocket requests has
// method = GET
if (req.method !== 'GET' || headers.upgrade.toLowerCase() !== 'websocket') {
// This request is not WebSocket request
return;
}
// Turn of all bufferings
// For server set KeepAlive
// For client set encoding
function _socket(socket, server) {
socket.setTimeout(0);
socket.setNoDelay(true);
if (server) {
socket.setKeepAlive(true, 0);
}
else {
socket.setEncoding('utf8');
}
}
// Client socket
_socket(socket);
// If host is undefined
// Get it from headers
if (!host) {
host = headers.Host;
}
// Remote host address
var remote_host = server + (port - 80 === 0 ? '' : ':' + port);
// Change headers
headers.Host = remote_host;
headers.Origin = 'http://' + remote_host;
// Open request
var p = manager.getPool(port, server);
p.getClient(function(client) {
// Based on 'pool/main.js'
var request = client.request('GET', req.url, headers);
var errorListener = function (error) {
client.removeListener('error', errorListener);
// Remove the client from the pool's available clients since it has errored
p.clients.splice(p.clients.indexOf(client), 1);
socket.end();
}
// Not disconnect on update
client.on('upgrade', function(request, remote_socket, head) {
// Prepare socket
_socket(remote_socket, true);
// Emit event
onUpgrade(remote_socket);
});
client.on('error', errorListener);
request.on('response', function (response) {
response.on('end', function () {
client.removeListener('error', errorListener);
client.busy = false;
p.onFree(client);
})
})
client.busy = true;
var handshake;
request.socket.on('data', handshake = function(data) {
// Handshaking
// Ok, kind of harmfull part of code
// Socket.IO is sending hash at the end of handshake
// If protocol = 76
// But we need to replace 'host' and 'origin' in response
// So we split data to printable data and to non-printable
// (Non-printable will come after double-CRLF)
var sdata = data.toString();
// Get Printable
sdata = sdata.substr(0, sdata.search(CRLF + CRLF));
// Get Non-Printable
data = data.slice(Buffer.byteLength(sdata), data.length);
// Replace host and origin
sdata = sdata.replace(remote_host, host)
.replace(remote_host, host);
try {
// Write printable
socket.write(sdata);
// Write non-printable
socket.write(data);
}
catch (e) {
request.end();
socket.end();
}
// Catch socket errors
socket.on('error', function() {
request.end();
});
// Remove data listener now that the 'handshake' is complete
request.socket.removeListener('data', handshake);
});
// Write upgrade-head
try {
request.write(head);
}
catch(e) {
request.end();
socket.end();
}
self.unwatch(socket);
});
// Request
function onUpgrade(reverse_proxy) {
var listeners = {};
// We're now connected to the server, so lets change server socket
reverse_proxy.on('data', listeners._r_data = function(data) {
// Pass data to client
if (socket.writable) {
try {
socket.write(data);
}
catch (e) {
socket.end();
reverse_proxy.end();
}
}
});
socket.on('data', listeners._data = function(data){
// Pass data from client to server
try {
reverse_proxy.write(data);
}
catch (e) {
reverse_proxy.end();
socket.end();
}
});
// Detach event listeners from reverse_proxy
function detach() {
reverse_proxy.removeListener('close', listeners._r_close);
reverse_proxy.removeListener('data', listeners._r_data);
socket.removeListener('data', listeners._data);
socket.removeListener('close', listeners._close);
}
// Hook disconnections
reverse_proxy.on('end', listeners._r_close = function() {
socket.end();
detach();
});
socket.on('end', listeners._close = function() {
reverse_proxy.end();
detach();
});
};
} }
}; };
......
/*
node-http-proxy-websocket-test.js: http proxy for node.js
Copyright (c) 2010 Fedor Indutny
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
var vows = require('vows'),
sys = require('sys'),
assert = require('assert'),
http = require('http');
var httpProxy = require('./../lib/node-http-proxy');
var testServers = {};
var server = httpProxy.createServer(function(req, res) {
var p = new httpProxy.HttpProxy(req, res);
sys.puts('http request');
p.proxyRequest(8080, 'localhost');
});
server.on('upgrade', function(req, socket, head) {
var p = new httpProxy.HttpProxy(req, socket, head);
sys.puts('websocket request');
p.proxyWebSocketRequest(8080, 'localhost');
});
server.listen(8000);
httpProxy.createServer(8080, 'localhost').listen(8001);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment