[revert] Make generateId method async (#535)

That is a breaking change, which mandates a major bump.

Author: darrachequesne

README.md

@@ -261,7 +261,7 @@ to a single process.
     - Overwrite this method to generate your custom socket id.
     - **Parameters**
       - `http.IncomingMessage`: a node request object
-      - `Function`: a callback method which contains an error (if there is) object and the generated id value
+  - **Returns** A socket id for connected client.
 
 <hr><br>
 

lib/server.js

@@ -277,8 +277,8 @@ function sendErrorMessage (req, res, code) {
  * @api public
  */
 
-Server.prototype.generateId = function (req, callback) {
-  callback(null, base64id.generateId());
+Server.prototype.generateId = function (req) {
+  return base64id.generateId();
 };
 
 /**
@@ -290,56 +290,52 @@ Server.prototype.generateId = function (req, callback) {
  */
 
 Server.prototype.handshake = function (transportName, req) {
-  var self = this;
-  this.generateId(req, function (err, id) {
-    if (err) {
-      sendErrorMessage(req, req.res, Server.errors.BAD_REQUEST);
-      return;
-    }
-    debug('handshaking client "%s"', id);
-
-    try {
-      var transport = new transports[transportName](req);
-      if ('polling' === transportName) {
-        transport.maxHttpBufferSize = self.maxHttpBufferSize;
-        transport.httpCompression = self.httpCompression;
-      } else if ('websocket' === transportName) {
-        transport.perMessageDeflate = self.perMessageDeflate;
-      }
+  var id = this.generateId(req);
 
-      if (req._query && req._query.b64) {
-        transport.supportsBinary = false;
-      } else {
-        transport.supportsBinary = true;
-      }
-    } catch (e) {
-      sendErrorMessage(req, req.res, Server.errors.BAD_REQUEST);
-      return;
+  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;
     }
-    var socket = new Socket(id, self, transport, req);
-
-    if (false !== self.cookie) {
-      transport.on('headers', function (headers) {
-        headers['Set-Cookie'] = cookieMod.serialize(self.cookie, id,
-          {
-            path: self.cookiePath,
-            httpOnly: self.cookiePath ? self.cookieHttpOnly : false
-          });
-      });
+
+    if (req._query && req._query.b64) {
+      transport.supportsBinary = false;
+    } else {
+      transport.supportsBinary = true;
     }
+  } catch (e) {
+    sendErrorMessage(req, req.res, Server.errors.BAD_REQUEST);
+    return;
+  }
+  var socket = new Socket(id, this, transport, req);
+  var self = this;
 
-    transport.onRequest(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
+        });
+    });
+  }
 
-    self.clients[id] = socket;
-    self.clientsCount++;
+  transport.onRequest(req);
 
-    socket.once('close', function () {
-      delete self.clients[id];
-      self.clientsCount--;
-    });
+  this.clients[id] = socket;
+  this.clientsCount++;
 
-    self.emit('connection', socket);
+  socket.once('close', function () {
+    delete self.clients[id];
+    self.clientsCount--;
   });
+
+  this.emit('connection', socket);
 };
 
 /**

test/server.js

@@ -1,4 +1,3 @@
-'use strict';
 /* eslint-disable standard/no-callback-literal */
 
 /**
@@ -248,8 +247,8 @@ describe('server', function () {
 
         var customId = 'CustomId' + Date.now();
 
-        engine.generateId = function (req, callback) {
-          callback(null, customId);
+        engine.generateId = function (req) {
+          return customId;
         };
 
         var socket = new eioc.Socket('ws://localhost:%d'.s(port));
@@ -263,18 +262,6 @@ describe('server', function () {
       });
     });
 
-    it('should disallow connection when custom id cannot be generated', function (done) {
-      let engine = listen({ allowUpgrades: false }, port => {
-        engine.generateId = (req, callback) => {
-          callback(new Error('no ID found'));
-        };
-
-        let socket = new eioc.Socket('ws://localhost:%d'.s(port));
-        socket.on('open', () => done(new Error('should not be able to connect')));
-        socket.on('error', () => done());
-      });
-    });
-
     it('should exchange handshake data', function (done) {
       listen({ allowUpgrades: false }, function (port) {
         var socket = new eioc.Socket('ws://localhost:%d'.s(port));