github/socket.io
1
1
Fork 0
mirror of https://github.com/socketio/socket.io.git synced 2026-04-30 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

transports: fix jshint warnings and style

Browse Source
This commit is contained in:
Guillermo Rauch
2014-03-06 14:03:44 -08:00
parent 38ef3810d1
commit 4d08358017
1 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
lib/transports/polling.js
View File

@@ -71,34 +71,35 @@ Polling.prototype.onPollRequest = function (req, res) {
// assert: this.res, '.req and .res should be (un)set together'
this.onError('overlap from client');
res.writeHead(500);
} else {
debug('setting request');
return;
}
this.req = req;
this.res = res;
debug('setting request');
var self = this;
this.req = req;
this.res = res;
function onClose () {
self.onError('poll connection closed prematurely');
}
var self = this;
function cleanup () {
req.removeListener('close', onClose);
self.req = self.res = null;
}
function onClose () {
self.onError('poll connection closed prematurely');
}
req.cleanup = cleanup;
req.on('close', onClose);
function cleanup () {
req.removeListener('close', onClose);
self.req = self.res = null;
}
this.writable = true;
this.emit('drain');
req.cleanup = cleanup;
req.on('close', onClose);
// if we're still writable but had a pending close, trigger an empty send
if (this.writable && this.shouldClose) {
debug('triggering empty send to append close packet');
this.send([{ type: 'noop' }]);
}
this.writable = true;
this.emit('drain');
// if we're still writable but had a pending close, trigger an empty send
if (this.writable && this.shouldClose) {
debug('triggering empty send to append close packet');
this.send([{ type: 'noop' }]);
}
};
@@ -113,54 +114,55 @@ Polling.prototype.onDataRequest = function (req, res) {
// assert: this.dataRes, '.dataReq and .dataRes should be (un)set together'
this.onError('data request overlap from client');
res.writeHead(500);
} else {
var isBinary = 'application/octet-stream' == req.headers['content-type'];
this.dataReq = req;
this.dataRes = res;
var chunks = isBinary ? new Buffer(0) : ''
, self = this
function cleanup () {
chunks = isBinary ? new Buffer(0) : '';
req.removeListener('data', onData);
req.removeListener('end', onEnd);
req.removeListener('close', onClose);
self.dataReq = self.dataRes = null;
};
function onClose () {
cleanup();
self.onError('data request connection closed prematurely');
};
function onData (data) {
if (typeof data == 'string') {
chunks += data;
} else {
chunks = Buffer.concat([chunks, data]);
}
};
function onEnd () {
self.onData(chunks);
res.writeHead(200, self.headers(req, {
'Content-Length': 2
// text/html is required instead of text/plain to avoid an
// unwanted download dialog on certain user-agents (GH-43)
, 'Content-Type': 'text/html'
}));
res.end('ok');
cleanup();
};
req.abort = cleanup;
req.on('close', onClose);
req.on('data', onData);
req.on('end', onEnd);
if (!isBinary) { req.setEncoding('utf8'); }
return;
}
var isBinary = 'application/octet-stream' == req.headers['content-type'];
this.dataReq = req;
this.dataRes = res;
var chunks = isBinary ? new Buffer(0) : '';
var self = this;
function cleanup () {
chunks = isBinary ? new Buffer(0) : '';
req.removeListener('data', onData);
req.removeListener('end', onEnd);
req.removeListener('close', onClose);
self.dataReq = self.dataRes = null;
}
function onClose () {
cleanup();
self.onError('data request connection closed prematurely');
}
function onData (data) {
if (typeof data == 'string') {
chunks += data;
} else {
chunks = Buffer.concat([chunks, data]);
}
}
function onEnd () {
self.onData(chunks);
res.writeHead(200, self.headers(req, {
'Content-Length': 2
// text/html is required instead of text/plain to avoid an
// unwanted download dialog on certain user-agents (GH-43)
, 'Content-Type': 'text/html'
}));
res.end('ok');
cleanup();
}
req.abort = cleanup;
req.on('close', onClose);
req.on('data', onData);
req.on('end', onEnd);
if (!isBinary) req.setEncoding('utf8');
};
/**