Skip to content

Adding async-await for generateId function #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
efkan wants to merge 6 commits into from
Closed

Adding async-await for generateId function #485

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d1ccba
Adding async-await for generateId function
efkan Feb 27, 2017
ed173d5
Update server.js
efkan Feb 28, 2017
494bf53
Update server.js
efkan Feb 28, 2017
c7df642
Update server.js
efkan Feb 28, 2017
12aa627
Update server.js
efkan Feb 28, 2017
48f675f
Update server.js
efkan Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 41 additions & 40 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ function sendErrorMessage (req, res, code) {
* @api public
*/

Server.prototype.generateId = function (req) {
return base64id.generateId();
Server.prototype.generateId = function (req, done) {
done(base64id.generateId());
};

/**
Expand All @@ -291,52 +291,53 @@ Server.prototype.generateId = function (req) {
*/

Server.prototype.handshake = function (transportName, req) {
var id = this.generateId(req);

debug('handshaking client "%s"', id);
var self = this;
var this_ = this;
this.generateId(req, function (id) {
debug('handshaking client "%s"', id);

try {
var transport = new transports[transportName](req);
if ('polling' === transportName) {
transport.maxHttpBufferSize = this_.maxHttpBufferSize;
transport.httpCompression = this_.httpCompression;
} else if ('websocket' === transportName) {
transport.perMessageDeflate = this_.perMessageDeflate;
}

try {
var transport = new transports[transportName](req);
if ('polling' === transportName) {
transport.maxHttpBufferSize = this.maxHttpBufferSize;
transport.httpCompression = this.httpCompression;
} else if ('websocket' === transportName) {
transport.perMessageDeflate = this.perMessageDeflate;
if (req._query && req._query.b64) {
transport.supportsBinary = false;
} else {
transport.supportsBinary = true;
}
} catch (e) {
sendErrorMessage(req, req.res, Server.errors.BAD_REQUEST);
return;
}

if (req._query && req._query.b64) {
transport.supportsBinary = false;
} else {
transport.supportsBinary = true;
var socket = new Socket(id, this_, transport, req);

if (false !== this.cookie) {
transport.on('headers', function (headers) {
headers['Set-Cookie'] = cookieMod.serialize(self.cookie, id,
{
path: self.cookiePath,
httpOnly: self.cookiePath ? self.cookieHttpOnly : false
});
});
}
} catch (e) {
sendErrorMessage(req, req.res, Server.errors.BAD_REQUEST);
return;
}
var socket = new Socket(id, this, transport, req);
var self = this;

if (false !== this.cookie) {
transport.on('headers', function (headers) {
headers['Set-Cookie'] = cookieMod.serialize(self.cookie, id,
{
path: self.cookiePath,
httpOnly: self.cookiePath ? self.cookieHttpOnly : false
});
});
}
transport.onRequest(req);

transport.onRequest(req);
this.clients[id] = socket;
this.clientsCount++;

this.clients[id] = socket;
this.clientsCount++;
socket.once('close', function () {
delete self.clients[id];
self.clientsCount--;
});

socket.once('close', function () {
delete self.clients[id];
self.clientsCount--;
this.emit('connection', socket);
});

this.emit('connection', socket);
};

/**
Expand Down