Skip to content

Commit

Permalink
[fix] more jshint intendation
Browse files Browse the repository at this point in the history
  • Loading branch information
@yawnt
yawnt committed Sep 25, 2013
1 parent 0aeaba7 commit 17399e7
Show file tree
Hide file tree
Showing 3 changed files with 219 additions and 224 deletions.
224 changes: 112 additions & 112 deletions lib/caronte/passes/web-incoming.js
View file
Expand Up @@ -18,132 +18,132 @@ web_o = Object.keys(web_o).map(function(pass) {

[ // <--

/**
* Sets `content-length` to '0' if request is of DELETE type.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function deleteLength(req, res, options) {
if(req.method === 'DELETE' && !req.headers['content-length']) {
req.headers['content-length'] = '0';
}
},

/**
* Sets timeout in request socket if it was specified in options.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function timeout(req, res, options) {
if(options.timeout) {
req.socket.setTimeout(options.timeout);
}
},

/**
* Sets `x-forwarded-*` headers if specified in config.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function XHeaders(req, res, options) {
if(!options.xfwd) return;

var values = {
for : req.connection.remoteAddress || req.socket.remoteAddress,
port : req.connection.remotePort || req.socket.remotePort,
proto: req.isSpdy ? 'https' : (req.connection.pair ? 'https' : 'http')
};

['for', 'port', 'proto'].forEach(function(header) {
req.headers['x-forwarded-' + header] =
(req.headers['x-forwarded-' + header] || '') +
(req.headers['x-forwarded-' + header] ? ',' : '') +
values[header]
});
},

/**
* Does the actual proxying. If `forward` is enabled fires up
* a ForwardStream, same happens for ProxyStream. The request
* just dies otherwise.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/
/**
* Sets `content-length` to '0' if request is of DELETE type.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function deleteLength(req, res, options) {
if(req.method === 'DELETE' && !req.headers['content-length']) {
req.headers['content-length'] = '0';
}
},

/**
* Sets timeout in request socket if it was specified in options.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function timeout(req, res, options) {
if(options.timeout) {
req.socket.setTimeout(options.timeout);
}
},

/**
* Sets `x-forwarded-*` headers if specified in config.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function XHeaders(req, res, options) {
if(!options.xfwd) return;

var values = {
for : req.connection.remoteAddress || req.socket.remoteAddress,
port : req.connection.remotePort || req.socket.remotePort,
proto: req.isSpdy ? 'https' : (req.connection.pair ? 'https' : 'http')
};

['for', 'port', 'proto'].forEach(function(header) {
req.headers['x-forwarded-' + header] =
(req.headers['x-forwarded-' + header] || '') +
(req.headers['x-forwarded-' + header] ? ',' : '') +
values[header];
});
},

/**
* Does the actual proxying. If `forward` is enabled fires up
* a ForwardStream, same happens for ProxyStream. The request
* just dies otherwise.
*
* @param {ClientRequest} Req Request object
* @param {IncomingMessage} Res Response object
* @param {Object} Options Config object passed to the proxy
*
* @api private
*/

function stream(req, res, options) {
if(options.forward) {
// If forward enable, so just pipe the request
var forwardReq = (options.forward.protocol === 'https:' ? https : http).request(
common.setupOutgoing(options.ssl || {}, options, req, 'forward')
);
req.pipe(forwardReq);
return res.end();
}

function stream(req, res, options) {
if(options.forward) {
// If forward enable, so just pipe the request
var forwardReq = (options.forward.protocol === 'https:' ? https : http).request(
common.setupOutgoing(options.ssl || {}, options, req, 'forward')
// Request initalization
var proxyReq = (options.target.protocol === 'https:' ? https : http).request(
common.setupOutgoing(options.ssl || {}, options, req)
);
req.pipe(forwardReq);
return res.end();
}

// Request initalization
var proxyReq = (options.target.protocol === 'https:' ? https : http).request(
common.setupOutgoing(options.ssl || {}, options, req)
);

// Error Handler
proxyReq.on('error', function(err){
var ev = 'caronte:outgoing:web:';
// If no error listeners, so throw the error.
if (options.ee.listeners(ev + 'error').length == 0){
// Error Handler
proxyReq.on('error', function(err){
var ev = 'caronte:outgoing:web:';
// If no error listeners, so throw the error.
if (!options.ee.listeners(ev + 'error').length){
throw err;
}
// Also emit the error events
options.ee.emit(ev + 'error', err, req, res);
});
}
// Also emit the error events
options.ee.emit(ev + 'error', err, req, res);
});

req.pipe(proxyReq);
req.pipe(proxyReq);

proxyReq.on('response', function(proxyRes) {
var ev = 'caronte:outgoing:web:';
proxyReq.on('response', function(proxyRes) {
var ev = 'caronte:outgoing:web:';

options.ee.emit(ev + 'begin', req, res);
options.ee.emit(ev + 'begin', req, res);

// When the previous request respond, we apply the
// outgoing passes to the response
web_o.some(function(pass) {
var evnt = ev + pass.name.toLowerCase() + ':';
// When the previous request respond, we apply the
// outgoing passes to the response
web_o.some(function(pass) {
var evnt = ev + pass.name.toLowerCase() + ':', val;

options.ee.emit(evnt + 'begin', req, res);
// Call the pass with the proxy response
// pass(ClientRequest, IncomingMessage, proxyResponse)
var val = pass(req, res, proxyRes);
options.ee.emit(evnt + 'end');
options.ee.emit(evnt + 'begin', req, res);
// Call the pass with the proxy response
// pass(ClientRequest, IncomingMessage, proxyResponse)
val = pass(req, res, proxyRes);
options.ee.emit(evnt + 'end');

return val;
});
return val;
});

options.ee.emit(ev + 'end');
options.ee.emit(ev + 'end');


proxyRes.pipe(res);
});
proxyRes.pipe(res);
});

//proxyReq.end();
}
//proxyReq.end();
}

] // <--
.forEach(function(func) {
Expand Down
11 changes: 2 additions & 9 deletions lib/caronte/passes/web-outgoing.js
View file
Expand Up @@ -37,16 +37,9 @@ var passes = exports;
*/
function setConnection(req, res, proxyRes) {
if (req.httpVersion === '1.0') {
if (req.headers.connection) {
proxyRes.headers.connection = req.headers.connection
} else {
proxyRes.headers.connection = 'close'
}
proxyRes.headers.connection = req.headers.connection || 'close';
} else if (!proxyRes.headers.connection) {
if (req.headers.connection) { proxyRes.headers.connection = req.headers.connection }
else {
proxyRes.headers.connection = 'keep-alive'
}
proxyRes.headers.connection = req.headers.connection || 'keep-alive';
}
},

Expand Down

0 comments on commit 17399e7

Please sign in to comment.