Merge pull request socketio#1008 from faeldt/master

Increase performance of generateId by avoiding sync calls to crypto.randomBytes

lib/manager.js

@@ -12,6 +12,7 @@ var fs = require('fs')
   , url = require('url')
   , tty = require('tty')
   , crypto = require('crypto')
+  , base64id = require('base64id')
   , util = require('./util')
   , store = require('./store')
   , client = require('socket.io-client')
@@ -729,31 +730,6 @@ Manager.prototype.handleClient = function (data, req) {
   }
 };
 
-/**
- * Generates a session id.
- *
- * @api private
- */
-
-Manager.prototype.generateId = function () {
-  var rand = new Buffer(15); // multiple of 3 for base64
-  if (!rand.writeInt32BE) {
-    return Math.abs(Math.random() * Math.random() * Date.now() | 0).toString()
-      + Math.abs(Math.random() * Math.random() * Date.now() | 0).toString();
-  }
-  this.sequenceNumber = (this.sequenceNumber + 1) | 0;
-  rand.writeInt32BE(this.sequenceNumber, 11);
-  if (crypto.randomBytes) {
-    crypto.randomBytes(12).copy(rand);
-  } else {
-    // not secure for node 0.4
-    [0, 4, 8].forEach(function(i) {
-      rand.writeInt32BE(Math.random() * Math.pow(2, 32) | 0, i);
-    });
-  }
-  return rand.toString('base64').replace(/\//g, '_').replace(/\+/g, '-');
-};
-
 /**
  * Handles a handshake request.
  *
@@ -799,7 +775,7 @@ Manager.prototype.handleHandshake = function (data, req, res) {
     if (err) return error(err);
 
     if (authorized) {
-      var id = self.generateId()
+      var id = base64id.generateId()
         , hs = [
               id
             , self.enabled('heartbeats') ? self.get('heartbeat timeout') || '' : ''

package.json

@@ -19,6 +19,7 @@
         "socket.io-client": "0.9.10"
       , "policyfile": "0.0.4"
       , "ws": "~0.4.21"
+      , "base64id": "0.1.0"
     }
   , "devDependencies": {
         "expresso": "0.9.2"