Release 1.4.1

Improve the chat demo

.travis.yml

@@ -1,16 +1,20 @@
+sudo: false
+before_install:
+  - npm install -g npm@'>=1.4.3'
 language: node_js
 node_js:
   - "0.8"
   - "0.10"
-  - "0.11"
+  - "0.12"
+  - "4"
 
 git:
   depth: 1
 
-matrix:
-  fast_finish: true
-  allow_failures:
-    - node_js: "0.11"
+#matrix:
+  #fast_finish: true
+  #allow_failures:
+    #- node_js: "0.11"
 
 notifications:
   irc: "irc.freenode.org#socket.io"

History.md

@@ -1,4 +1,64 @@
 
+1.4.1 / 2016-01-07
+==================
+
+  * version bump
+
+1.4.0 / 2015-11-28
+==================
+
+  * socket.io: increase large binary data test timeout
+  * package: bump `engine.io` for release
+  * trigger callback even when joining an already joined room
+  * package: bump parser
+  * namespace: clear rooms flag after a clients call (fixes #1978)
+  * package: bump `socket.io-parser`
+  * fixed tests with large data
+  * fixed a typo in the example code
+  * package: bump mocha
+  * package: bump `has-binary` and `zuul-ngrok`
+  * package: bump `engine.io` and `socket.io-client`
+  * README: clarified documentation of Socket.in
+  * README: fixed up legacy repo links
+  * test: better timeout for stress test
+  * socket: don't set request property which has a getter
+  * removed proxy index file
+  * support flags on namespace
+  * improve Socket#packet and Client#packet
+  * socket: warn node_redis-style about missing `error`
+  * test: added failing test
+  * test: increase timeout for large binary data test
+  * package: bump `has-binary` to work with all objects (fixes #1955)
+  * fix origin verification default https port [evanlucas]
+  * support compression [nkzawa]
+
+1.3.7 / 2015-09-21
+==================
+
+  * package: bump `socket.io-client` for node4 compatibility
+  * package: bump `engine.io` for node4 compatibility
+
+1.3.6 / 2015-07-14
+==================
+
+  * package: bump `engine.io` to fix build on windows
+
+1.3.5 / 2015-03-03
+==================
+
+ * package: bump `socket.io-parser`
+
+1.3.4 / 2015-02-14
+==================
+
+ * package: bump `socket.io-client`
+
+1.3.3 / 2015-02-03
+==================
+
+ * socket: warn node_redis-style about missing `error`
+ * package: bump parser to better handle bad binary packets
+
 1.3.2 / 2015-01-19
 ==================
 

Readme.md

@@ -1,9 +1,10 @@
 
 # socket.io
 
-[![Build Status](https://secure.travis-ci.org/Automattic/socket.io.svg)](http://travis-ci.org/Automattic/socket.io)
+[![Build Status](https://secure.travis-ci.org/socketio/socket.io.svg)](https://travis-ci.org/socketio/socket.io)
 ![NPM version](https://badge.fury.io/js/socket.io.svg)
-![Downloads](http://img.shields.io/npm/dm/socket.io.svg?style=flat)
+![Downloads](https://img.shields.io/npm/dm/socket.io.svg?style=flat)
+[![](http://slack.socket.io/badge.svg?)](http://slack.socket.io)
 
 ## How to use
 
@@ -85,7 +86,7 @@ server.listen(3000);
 
   The same options passed to socket.io are always passed to
   the `engine.io` `Server` that gets created. See engine.io
-  [options](https://github.com/learnboost/engine.io#methods-1)
+  [options](https://github.com/socketio/engine.io#methods-1)
   as reference.
 
 ### Server(srv:http#Server, opts:Object)
@@ -127,7 +128,7 @@ server.listen(3000);
 
   Sets the adapter `v`. Defaults to an instance of the `Adapter` that
   ships with socket.io which is memory based. See
-  [socket.io-adapter](https://github.com/Automattic/socket.io-adapter).
+  [socket.io-adapter](https://github.com/socketio/socket.io-adapter).
 
   If no arguments are supplied this method returns the current value.
 
@@ -144,7 +145,7 @@ server.listen(3000);
   __Potential drawbacks__:
   * in some situations, when it is not possible to determine `origin` it may have value of `*`
   * As this function will be executed for every request, it is advised to make this function work as fast as possible
-  * If `socket.io` is used together with `Express`, the CORS headers will be affected only for `socket.io` requests. For Express can use [cors](https://github.com/troygoode/node-cors/)
+  * If `socket.io` is used together with `Express`, the CORS headers will be affected only for `socket.io` requests. For Express can use [cors](https://github.com/expressjs/cors)
 
 
 ### Server#sockets:Namespace
@@ -347,7 +348,7 @@ server.listen(3000);
 
   The mechanics of joining  rooms are handled by the `Adapter`
   that has been configured (see `Server#adapter` above), defaulting to
-  [socket.io-adapter](https://github.com/Automattic/socket.io-adapter).
+  [socket.io-adapter](https://github.com/socketio/socket.io-adapter).
 
 ### Socket#leave(name:String[, fn:Function]):Socket
 
@@ -358,10 +359,9 @@ server.listen(3000);
 
   The mechanics of leaving rooms are handled by the `Adapter`
   that has been configured (see `Server#adapter` above), defaulting to
-  [socket.io-adapter](https://github.com/Automattic/socket.io-adapter).
+  [socket.io-adapter](https://github.com/socketio/socket.io-adapter).
 
 ### Socket#to(room:String):Socket
-### Socket#in(room:String):Socket
 
   Sets a modifier for a subsequent event emission that the event will
   only be _broadcasted_ to sockets that have joined the given `room`.
@@ -375,6 +375,10 @@ server.listen(3000);
   });
   ```
 
+### Socket#in(room:String):Socket
+
+  Same as `Socket#to`
+
 ### Socket#compress(v:Boolean):Socket
 
   Sets a modifier for a subsequent event emission that the event data will
@@ -405,7 +409,7 @@ server.listen(3000);
 
 ## Debug / logging
 
-Socket.IO is powered by [debug](http://github.com/visionmedia/debug).
+Socket.IO is powered by [debug](https://github.com/visionmedia/debug).
 In order to see all the debug output, run your app with the environment variable
 `DEBUG` including the desired scope.
 

examples/chat/index.js

@@ -14,8 +14,6 @@ app.use(express.static(__dirname + '/public'));
 
 // Chatroom
 
-// usernames which are currently connected to the chat
-var usernames = {};
 var numUsers = 0;
 
 io.on('connection', function (socket) {
@@ -32,10 +30,10 @@ io.on('connection', function (socket) {
 
   // when the client emits 'add user', this listens and executes
   socket.on('add user', function (username) {
+    if (addedUser) return;
+
     // we store the username in the socket session for this client
     socket.username = username;
-    // add the client's username to the global list
-    usernames[username] = username;
     ++numUsers;
     addedUser = true;
     socket.emit('login', {
@@ -64,9 +62,7 @@ io.on('connection', function (socket) {
 
   // when the user disconnects.. perform this
   socket.on('disconnect', function () {
-    // remove the username from global usernames list
     if (addedUser) {
-      delete usernames[socket.username];
       --numUsers;
 
       // echo globally that this client has left

examples/chat/public/main.js

@@ -7,7 +7,7 @@ $(function() {
     '#3b88eb', '#3824aa', '#a700ff', '#d300e7'
   ];
 
-  // Initialize varibles
+  // Initialize variables
   var $window = $(window);
   var $usernameInput = $('.usernameInput'); // Input for username
   var $messages = $('.messages'); // Messages area

index.js

@@ -1,2 +0,0 @@
-
-module.exports = require('./lib');

lib/client.js

@@ -28,7 +28,7 @@ function Client(server, conn){
   this.id = conn.id;
   this.request = conn.request;
   this.setup();
-  this.sockets = [];
+  this.sockets = {};
   this.nsps = {};
   this.connectBuffer = [];
 }
@@ -60,11 +60,12 @@ Client.prototype.setup = function(){
 
 Client.prototype.connect = function(name){
   debug('connecting to namespace %s', name);
-  if (!this.server.nsps[name]) {
-    this.packet({ type: parser.ERROR, nsp: name, data : 'Invalid namespace'}, false, false, true);
+  var nsp = this.server.nsps[name];
+  if (!nsp) {
+    this.packet({ type: parser.ERROR, nsp: name, data : 'Invalid namespace'});
     return;
   }
-  var nsp = this.server.of(name);
+
   if ('/' != name && !this.nsps['/']) {
     this.connectBuffer.push(name);
     return;
@@ -72,7 +73,7 @@ Client.prototype.connect = function(name){
 
   var self = this;
   var socket = nsp.add(this, function(){
-    self.sockets.push(socket);
+    self.sockets[socket.id] = socket;
     self.nsps[nsp.name] = socket;
 
     if ('/' == nsp.name && self.connectBuffer.length > 0) {
@@ -89,12 +90,12 @@ Client.prototype.connect = function(name){
  */
 
 Client.prototype.disconnect = function(){
-  var socket;
-  // we don't use a for loop because the length of
-  // `sockets` changes upon each iteration
-  while (socket = this.sockets.shift()) {
-    socket.disconnect();
+  for (var id in this.sockets) {
+    if (this.sockets.hasOwnProperty(id)) {
+      this.sockets[id].disconnect();
+    }
   }
+  this.sockets = {};
   this.close();
 };
 
@@ -105,10 +106,9 @@ Client.prototype.disconnect = function(){
  */
 
 Client.prototype.remove = function(socket){
-  var i = this.sockets.indexOf(socket);
-  if (~i) {
-    var nsp = this.sockets[i].nsp.name;
-    this.sockets.splice(i, 1);
+  if (this.sockets.hasOwnProperty(socket.id)) {
+    var nsp = this.sockets[socket.id].nsp.name;
+    delete this.sockets[socket.id];
     delete this.nsps[nsp];
   } else {
     debug('ignoring remove for %s', socket.id);
@@ -133,26 +133,25 @@ Client.prototype.close = function(){
  * Writes a packet to the transport.
  *
  * @param {Object} packet object
- * @param {Boolean} whether packet is already encoded
- * @param {Boolean} whether packet is volatile
- * @param {Boolean} whether packet should be compressed
+ * @param {Object} options
  * @api private
  */
 
-Client.prototype.packet = function(packet, preEncoded, volatile, compress){
+Client.prototype.packet = function(packet, opts){
+  opts = opts || {};
   var self = this;
 
   // this writes to the actual connection
   function writeToEngine(encodedPackets) {
-    if (volatile && !self.conn.transport.writable) return;
+    if (opts.volatile && !self.conn.transport.writable) return;
     for (var i = 0; i < encodedPackets.length; i++) {
-      self.conn.write(encodedPackets[i], { compress: compress });
+      self.conn.write(encodedPackets[i], { compress: opts.compress });
     }
   }
 
   if ('open' == this.conn.readyState) {
     debug('writing packet %j', packet);
-    if(!preEncoded) { // not broadcasting, need to encode
+    if (!opts.preEncoded) { // not broadcasting, need to encode
       this.encoder.encode(packet, function (encodedPackets) { // encode, then write results to engine
         writeToEngine(encodedPackets);
       });
@@ -206,9 +205,11 @@ Client.prototype.ondecoded = function(packet) {
  */
 
 Client.prototype.onerror = function(err){
-  this.sockets.forEach(function(socket){
-    socket.onerror(err);
-  });
+  for (var id in this.sockets) {
+    if (this.sockets.hasOwnProperty(id)) {
+      this.sockets[id].onerror(err);
+    }
+  }
   this.onclose('client error');
 };
 
@@ -226,10 +227,12 @@ Client.prototype.onclose = function(reason){
   this.destroy();
 
   // `nsps` and `sockets` are cleaned up seamlessly
-  var socket;
-  while (socket = this.sockets.shift()) {
-    socket.onclose(reason);
+  for (var id in this.sockets) {
+    if (this.sockets.hasOwnProperty(id)) {
+      this.sockets[id].onclose(reason);
+    }
   }
+  this.sockets = {};
 
   this.decoder.destroy(); // clean up decoder
 };

lib/index.js

@@ -222,7 +222,7 @@ Server.prototype.attach = function(srv, opts){
   opts = opts || {};
   opts.path = opts.path || this.path();
   // set origins verification
-  opts.allowRequest = this.checkRequest.bind(this);
+  opts.allowRequest = opts.allowRequest || this.checkRequest.bind(this);
 
   // initialize engine
   debug('creating engine.io instance with opts %j', opts);
@@ -330,13 +330,14 @@ Server.prototype.onconnection = function(conn){
 Server.prototype.of = function(name, fn){
   if (String(name)[0] !== '/') name = '/' + name;
   
-  if (!this.nsps[name]) {
+  var nsp = this.nsps[name];
+  if (!nsp) {
     debug('initializing namespace %s', name);
-    var nsp = new Namespace(this, name);
+    nsp = new Namespace(this, name);
     this.nsps[name] = nsp;
   }
-  if (fn) this.nsps[name].on('connect', fn);
-  return this.nsps[name];
+  if (fn) nsp.on('connect', fn);
+  return nsp;
 };
 
 /**
@@ -346,9 +347,11 @@ Server.prototype.of = function(name, fn){
  */
 
 Server.prototype.close = function(){
-  this.nsps['/'].sockets.forEach(function(socket){
-    socket.onclose();
-  });
+  for (var id in this.nsps['/'].sockets) {
+    if (this.nsps['/'].sockets.hasOwnProperty(id)) {
+      this.nsps['/'].sockets[id].onclose();
+    }
+  }
 
   this.engine.close();
 
@@ -361,7 +364,7 @@ Server.prototype.close = function(){
  * Expose main namespace (/).
  */
 
-['on', 'to', 'in', 'use', 'emit', 'send', 'write', 'clients'].forEach(function(fn){
+['on', 'to', 'in', 'use', 'emit', 'send', 'write', 'clients', 'compress'].forEach(function(fn){
   Server.prototype[fn] = function(){
     var nsp = this.sockets[fn];
     return nsp.apply(this.sockets, arguments);
@@ -369,8 +372,9 @@ Server.prototype.close = function(){
 });
 
 Namespace.flags.forEach(function(flag){
-  Server.prototype.__defineGetter__(flag, function(name){
-    this.flags.push(name);
+  Server.prototype.__defineGetter__(flag, function(){
+    this.sockets.flags = this.sockets.flags || {};
+    this.sockets.flags[flag] = true;
     return this;
   });
 });

lib/namespace.js

@@ -29,7 +29,10 @@ exports.events = [
  * Flags.
  */
 
-exports.flags = ['json'];
+exports.flags = [
+  'json',
+  'volatile'
+];
 
 /**
  * `EventEmitter#emit` reference.
@@ -48,11 +51,10 @@ var emit = Emitter.prototype.emit;
 function Namespace(server, name){
   this.name = name;
   this.server = server;
-  this.sockets = [];
+  this.sockets = {};
   this.connected = {};
   this.fns = [];
   this.ids = 0;
-  this.acks = {};
   this.initAdapter();
 }
 
@@ -158,7 +160,7 @@ Namespace.prototype.add = function(client, fn){
         if (err) return socket.error(err.data || err.message);
 
         // track socket
-        self.sockets.push(socket);
+        self.sockets[socket.id] = socket;
 
         // it's paramount that the internal `onconnect` logic
         // fires before user-set events to prevent state order
@@ -185,9 +187,8 @@ Namespace.prototype.add = function(client, fn){
  */
 
 Namespace.prototype.remove = function(socket){
-  var i = this.sockets.indexOf(socket);
-  if (~i) {
-    this.sockets.splice(i, 1);
+  if (this.sockets.hasOwnProperty(socket.id)) {
+    delete this.sockets[socket.id];
   } else {
     debug('ignoring remove for %s', socket.id);
   }
@@ -250,5 +251,22 @@ Namespace.prototype.write = function(){
 
 Namespace.prototype.clients = function(fn){
   this.adapter.clients(this.rooms, fn);
+  // delete rooms flag for scenario:
+  // .in('room').clients() (GH-1978)
+  delete this.rooms;
+  return this;
+};
+
+/**
+ * Sets the compress flag.
+ *
+ * @param {Boolean} if `true`, compresses the sending data
+ * @return {Socket} self
+ * @api public
+ */
+
+Namespace.prototype.compress = function(compress){
+  this.flags = this.flags || {};
+  this.flags.compress = compress;
   return this;
 };

lib/socket.js

@@ -59,11 +59,10 @@ function Socket(nsp, client){
   this.nsp = nsp;
   this.server = nsp.server;
   this.adapter = this.nsp.adapter;
-  this.id = client.id;
-  this.request = client.request;
+  this.id = nsp.name + '#' + client.id;
   this.client = client;
   this.conn = client.conn;
-  this.rooms = [];
+  this.rooms = {};
   this.acks = {};
   this.connected = true;
   this.disconnected = false;
@@ -132,10 +131,11 @@ Socket.prototype.emit = function(ev){
     var packet = {};
     packet.type = hasBin(args) ? parser.BINARY_EVENT : parser.EVENT;
     packet.data = args;
+    var flags = this.flags || {};
 
     // access last argument to see if it's an ACK callback
     if ('function' == typeof args[args.length - 1]) {
-      if (this._rooms || (this.flags && this.flags.broadcast)) {
+      if (this._rooms || flags.broadcast) {
         throw new Error('Callbacks are not supported when broadcasting');
       }
 
@@ -144,15 +144,18 @@ Socket.prototype.emit = function(ev){
       packet.id = this.nsp.ids++;
     }
 
-    if (this._rooms || (this.flags && this.flags.broadcast)) {
+    if (this._rooms || flags.broadcast) {
       this.adapter.broadcast(packet, {
         except: [this.id],
         rooms: this._rooms,
-        flags: this.flags
+        flags: flags
       });
     } else {
       // dispatch packet
-      this.packet(packet);
+      this.packet(packet, {
+        volatile: flags.volatile,
+        compress: flags.compress
+      });
     }
 
     // reset flags
@@ -196,14 +199,15 @@ Socket.prototype.write = function(){
  * Writes a packet.
  *
  * @param {Object} packet object
+ * @param {Object} options
  * @api private
  */
 
-Socket.prototype.packet = function(packet, preEncoded){
+Socket.prototype.packet = function(packet, opts){
   packet.nsp = this.nsp.name;
-  var volatile = this.flags && this.flags.volatile;
-  var compress = !this.flags || false !== this.flags.compress;
-  this.client.packet(packet, preEncoded, volatile, compress);
+  opts = opts || {};
+  opts.compress = false !== opts.compress;
+  this.client.packet(packet, opts);
 };
 
 /**
@@ -218,11 +222,14 @@ Socket.prototype.packet = function(packet, preEncoded){
 Socket.prototype.join = function(room, fn){
   debug('joining room %s', room);
   var self = this;
-  if (~this.rooms.indexOf(room)) return this;
+  if (this.rooms.hasOwnProperty(room)) {
+    fn && fn(null);
+    return this;
+  }
   this.adapter.add(this.id, room, function(err){
     if (err) return fn && fn(err);
     debug('joined room %s', room);
-    self.rooms.push(room);
+    self.rooms[room] = room;
     fn && fn(null);
   });
   return this;
@@ -243,10 +250,7 @@ Socket.prototype.leave = function(room, fn){
   this.adapter.del(this.id, room, function(err){
     if (err) return fn && fn(err);
     debug('left room %s', room);
-    var idx = self.rooms.indexOf(room);
-    if (idx >= 0) {
-      self.rooms.splice(idx, 1);
-    }
+    delete self.rooms[room];
     fn && fn(null);
   });
   return this;
@@ -260,7 +264,7 @@ Socket.prototype.leave = function(room, fn){
 
 Socket.prototype.leaveAll = function(){
   this.adapter.delAll(this.id);
-  this.rooms = [];
+  this.rooms = {};
 };
 
 /**
@@ -272,9 +276,9 @@ Socket.prototype.leaveAll = function(){
 
 Socket.prototype.onconnect = function(){
   debug('socket connected - writing packet');
+  this.nsp.connected[this.id] = this;
   this.join(this.id);
   this.packet({ type: parser.CONNECT });
-  this.nsp.connected[this.id] = this;
 };
 
 /**
@@ -353,6 +357,8 @@ Socket.prototype.ack = function(id){
       type: type,
       data: args
     });
+
+    sent = true;
   };
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -11,6 +11,8 @@
     "socket",
     "io"
   ],
+  "main": "./lib/index",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git://github.com/Automattic/socket.io"
@@ -19,19 +21,20 @@
     "test": "mocha --reporter dot --slow 200ms --bail"
   },
   "dependencies": {
-    "engine.io": "automattic/engine.io#ddc64a",
-    "socket.io-parser": "2.2.3",
-    "socket.io-client": "automattic/socket.io-client#210d65",
-    "socket.io-adapter": "automattic/socket.io-adapter#ae79d8",
-    "has-binary": "0.1.6",
-    "debug": "2.1.0"
+    "engine.io": "1.6.5",
+    "socket.io-parser": "2.2.6",
+    "socket.io-client": "1.4.1",
+    "socket.io-adapter": "0.4.0",
+    "has-binary": "0.1.7",
+    "debug": "2.2.0"
   },
   "devDependencies": {
-    "mocha": "1.16.2",
     "expect.js": "0.3.1",
-    "supertest": "0.8.2",
+    "istanbul": "0.2.3",
+    "mocha": "2.3.4",
     "superagent": "0.17.0",
-    "istanbul": "0.2.3"
+    "supertest": "0.8.2",
+    "zuul-ngrok": "3.1.0"
   },
   "contributors": [
     {

test/socket.io.js

@@ -328,6 +328,32 @@ describe('socket.io', function(){
           done();
         });
     });
+
+    it('should allow request if custom function in opts.allowRequest returns true', function(done){
+      var sockets = io(http().listen(54022), { allowRequest: function (req, callback) {
+        return callback(null, true);
+      }, origins: 'http://foo.example:*' });
+
+      request.get('http://localhost:54022/socket.io/default/')
+       .query({ transport: 'polling' })
+       .end(function (err, res) {
+          expect(res.status).to.be(200);
+          done();
+        });
+    });
+
+    it('should disallow request if custom function in opts.allowRequest returns false', function(done){
+      var sockets = io(http().listen(54023), { allowRequest: function (req, callback) {
+        return callback(null, false);
+      } });
+      request.get('http://localhost:54023/socket.io/default/')
+       .set('origin', 'http://foo.example')
+       .query({ transport: 'polling' })
+       .end(function (err, res) {
+          expect(res.status).to.be(400);
+          done();
+        });
+    });
   });
 
   describe('close', function(){
@@ -342,12 +368,12 @@ describe('socket.io', function(){
       var clientSocket = client(srv, { reconnection: false });
 
       clientSocket.on('disconnect', function init() {
-        expect(sio.nsps['/'].sockets.length).to.equal(0);
+        expect(Object.keys(sio.nsps['/'].sockets).length).to.equal(0);
         server.listen(PORT);
       });
 
       clientSocket.on('connect', function init() {
-        expect(sio.nsps['/'].sockets.length).to.equal(1);
+        expect(Object.keys(sio.nsps['/'].sockets).length).to.equal(1);
         sio.close();
       });
 
@@ -369,12 +395,12 @@ describe('socket.io', function(){
       var clientSocket = ioc('ws://0.0.0.0:' + PORT);
 
       clientSocket.on('disconnect', function init() {
-        expect(sio.nsps['/'].sockets.length).to.equal(0);
+        expect(Object.keys(sio.nsps['/'].sockets).length).to.equal(0);
         server.listen(PORT);
       });
 
       clientSocket.on('connect', function init() {
-        expect(sio.nsps['/'].sockets.length).to.equal(1);
+        expect(Object.keys(sio.nsps['/'].sockets).length).to.equal(1);
         sio.close();
       });
 
@@ -405,6 +431,12 @@ describe('socket.io', function(){
       expect(sio.emit).to.be.a('function');
       expect(sio.send).to.be.a('function');
       expect(sio.write).to.be.a('function');
+      expect(sio.clients).to.be.a('function');
+      expect(sio.compress).to.be.a('function');
+      expect(sio.json).to.be(sio);
+      expect(sio.volatile).to.be(sio);
+      expect(sio.sockets.flags).to.eql({ json: true, volatile: true });
+      delete sio.sockets.flags;
     });
 
     it('should automatically connect', function(done){
@@ -636,7 +668,7 @@ describe('socket.io', function(){
       });
       function getClients() {
         sio.of('/chat').clients(function(error, sids) {
-          expect(error).to.be.undefined;
+          expect(error).to.not.be.ok();
           expect(sids).to.contain(chatSids[0]);
           expect(sids).to.contain(chatSids[1]);
           expect(sids).to.not.contain(otherSid);
@@ -679,7 +711,7 @@ describe('socket.io', function(){
       });
       function getClients() {
         sio.of('/chat').in('foo').clients(function(error, sids) {
-          expect(error).to.be.undefined;
+          expect(error).to.not.be.ok();
           expect(sids).to.contain(chatFooSid);
           expect(sids).to.not.contain(chatBarSid);
           expect(sids).to.not.contain(otherSid);
@@ -722,7 +754,7 @@ describe('socket.io', function(){
       });
       function getClients() {
         sio.of('/chat').clients(function(error, sids) {
-          expect(error).to.be.undefined;
+          expect(error).to.not.be.ok();
           expect(sids).to.contain(chatFooSid);
           expect(sids).to.contain(chatBarSid);
           expect(sids).to.not.contain(otherSid);
@@ -730,6 +762,87 @@ describe('socket.io', function(){
         });
       }
     });
+
+    it('should not emit volatile event after regular event', function(done) {
+      var srv = http();
+      var sio = io(srv);
+
+      var counter = 0;
+      srv.listen(function(){
+        sio.of('/chat').on('connection', function(s){
+          // Wait to make sure there are no packets being sent for opening the connection
+          setTimeout(function() {
+            sio.of('/chat').emit('ev', 'data');
+            sio.of('/chat').volatile.emit('ev', 'data');
+          }, 20);
+        });
+
+        var socket = client(srv, '/chat');
+        socket.on('ev', function() {
+          counter++;
+        });
+      });
+
+      setTimeout(function() {
+        expect(counter).to.be(1);
+        done();
+      }, 200);
+    });
+
+    it('should emit volatile event', function(done) {
+      var srv = http();
+      var sio = io(srv);
+
+      var counter = 0;
+      srv.listen(function(){
+        sio.of('/chat').on('connection', function(s){
+          // Wait to make sure there are no packets being sent for opening the connection
+          setTimeout(function() {
+            sio.of('/chat').volatile.emit('ev', 'data');
+          }, 20);
+        });
+
+        var socket = client(srv, '/chat');
+        socket.on('ev', function() {
+          counter++;
+        });
+      });
+
+      setTimeout(function() {
+        expect(counter).to.be(1);
+        done();
+      }, 200);
+    });
+
+    it('should enable compression by default', function(done){
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv, '/chat');
+        sio.of('/chat').on('connection', function(s){
+          s.conn.once('packetCreate', function(packet) {
+            expect(packet.options.compress).to.be(true);
+            done();
+          });
+          sio.of('/chat').emit('woot', 'hi');
+        });
+      });
+    });
+
+    it('should disable compression', function(done){
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv, '/chat');
+        sio.of('/chat').on('connection', function(s){
+          s.conn.once('packetCreate', function(packet) {
+            expect(packet.options.compress).to.be(false);
+            done();
+          });
+          sio.of('/chat').compress(false).emit('woot', 'hi');
+        });
+      });
+    });
   });
 
   describe('socket', function(){
@@ -1398,7 +1511,7 @@ describe('socket.io', function(){
     it('should handle very large json', function(done){
       this.timeout(30000);
       var srv = http();
-      var sio = io(srv);
+      var sio = io(srv, { perMessageDeflate: false });
       var received = 0;
       srv.listen(function(){
         var socket = client(srv);
@@ -1423,10 +1536,9 @@ describe('socket.io', function(){
     });
 
     it('should handle very large binary data', function(done){
-      this.timeout(10000);
-
+      this.timeout(30000);
       var srv = http();
-      var sio = io(srv);
+      var sio = io(srv, { perMessageDeflate: false });
       var received = 0;
       srv.listen(function(){
         var socket = client(srv);
@@ -1480,13 +1592,13 @@ describe('socket.io', function(){
       var srv = http();
       var sio = io(srv);
       srv.listen(function(){
-        var socket = client(srv);
-        sio.on('connection', function(s){
+        var socket = client(srv, '/chat');
+        sio.of('/chat').on('connection', function(s){
           s.conn.once('packetCreate', function(packet) {
             expect(packet.options.compress).to.be(true);
             done();
           });
-          s.emit('woot', 'hi');
+          sio.of('/chat').emit('woot', 'hi');
         });
       });
     });
@@ -1495,13 +1607,13 @@ describe('socket.io', function(){
       var srv = http();
       var sio = io(srv);
       srv.listen(function(){
-        var socket = client(srv);
-        sio.on('connection', function(s){
+        var socket = client(srv, '/chat');
+        sio.of('/chat').on('connection', function(s){
           s.conn.once('packetCreate', function(packet) {
             expect(packet.options.compress).to.be(false);
             done();
           });
-          s.compress(false).emit('woot', 'hi');
+          sio.of('/chat').compress(false).emit('woot', 'hi');
         });
       });
     });
@@ -1539,6 +1651,55 @@ describe('socket.io', function(){
         });
       });
     });
+
+    it('should handle empty binary packet', function(done){
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv);
+        sio.on('connection', function(s){
+          s.once('error', function(err){
+            expect(err.message).to.match(/Illegal attachments/);
+            done();
+          });
+          s.conn.on('upgrade', function(){
+            socket.io.engine.write('5');
+          });
+        });
+      });
+    });
+
+    it('should not crash when messing with Object prototype', function(done){
+      Object.prototype.foo = 'bar';
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv);
+
+        sio.on('connection', function(s){
+          s.disconnect(true);
+          sio.close();
+          setTimeout(function(){
+            done();
+          }, 100);
+        });
+      });
+    });
+
+    it('should always trigger the callback (if provided) when joining a room', function(done){
+      var srv = http();
+      var sio = io(srv);
+
+      srv.listen(function(){
+        var socket = client(srv);
+        sio.on('connection', function(s){
+          s.join('a', function(){
+            s.join('a', done);
+          });
+        });
+      });
+    });
+
   });
 
   describe('messaging many', function(){
@@ -1803,15 +1964,15 @@ describe('socket.io', function(){
         var socket = client(srv);
         sio.on('connection', function(s){
           s.join('a', function(){
-            expect(s.rooms).to.eql([s.id, 'a']);
+            expect(Object.keys(s.rooms)).to.eql([s.id, 'a']);
             s.join('b', function(){
-              expect(s.rooms).to.eql([s.id, 'a', 'b']);
+              expect(Object.keys(s.rooms)).to.eql([s.id, 'a', 'b']);
               s.join( 'c', function(){
-                expect(s.rooms).to.eql([s.id, 'a', 'b', 'c']);
+                expect(Object.keys(s.rooms)).to.eql([s.id, 'a', 'b', 'c']);
                 s.leave('b', function(){
-                  expect(s.rooms).to.eql([s.id, 'a', 'c']);
+                  expect(Object.keys(s.rooms)).to.eql([s.id, 'a', 'c']);
                   s.leaveAll();
-                  expect(s.rooms).to.eql([]);
+                  expect(Object.keys(s.rooms)).to.eql([]);
                   done();
                 });
               });
@@ -1847,13 +2008,13 @@ describe('socket.io', function(){
         var socket = client(srv);
         sio.on('connection', function(s){
           s.join('a', function(){
-            expect(s.rooms).to.eql([s.id, 'a']);
+            expect(Object.keys(s.rooms)).to.eql([s.id, 'a']);
             s.join('b', function(){
-              expect(s.rooms).to.eql([s.id, 'a', 'b']);
+              expect(Object.keys(s.rooms)).to.eql([s.id, 'a', 'b']);
               s.leave('unknown', function(){
-                expect(s.rooms).to.eql([s.id, 'a', 'b']);
+                expect(Object.keys(s.rooms)).to.eql([s.id, 'a', 'b']);
                 s.leaveAll();
-                expect(s.rooms).to.eql([]);
+                expect(Object.keys(s.rooms)).to.eql([]);
                 done();
               });
             });