[chore] release 1.5.0 (#2711)

Documentation update to help new programmers

.gitignore

@@ -9,3 +9,5 @@ lib-cov
 benchmarks/*.png
 node_modules
 coverage
+.idea
+dist

.npmignore

@@ -1,4 +0,0 @@
-support
-test
-examples
-.gitignore

.travis.yml

@@ -3,14 +3,22 @@ before_install:
   - npm install -g npm@'>=1.4.3'
 language: node_js
 node_js:
-  - "0.8"
   - "0.10"
   - "0.12"
   - "4"
+  - "node"
 
 git:
   depth: 1
 
+matrix:
+  include:
+  - node_js: '0.10'
+    env: TEST_VERSION=compat
+  - node_js: '0.12'
+    env: TEST_VERSION=compat
+  - node_js: '4'
+    env: TEST_VERSION=compat
 #matrix:
   #fast_finish: true
   #allow_failures:

History.md

@@ -1,4 +1,40 @@
 
+1.5.0 / 2016-10-06
+==================
+
+  * [feature] stop append /# before id when no namespace (#2508)
+  * [feature] Add a 'disconnecting' event to access to socket.rooms upon disconnection (#2332)
+  * [fix] Fix query string management (#2422)
+  * [fix] add quote to exec paths, prevent error when spaces in path (#2508)
+  * [docs] Prevent mixup for new programmers (#2599)
+  * [example] Fix chat display in Firefox (#2477)
+  * [chore] Add gulp & babel in the build process (#2471)
+  * [chore] Bump engine.io to 1.7.0 (#2707)
+  * [chore] Remove unused zuul-ngrok dependency (#2708)
+  * [chore] Point towards current master of socket.io-client (#2710)
+  * [chore] Restrict files included in npm package (#2709)
+  * [chore] Link build badge to master branch (#2549)
+
+1.4.8 / 2016-06-23
+==================
+
+  * package: bump `engine.io`
+
+1.4.7 / 2016-06-23
+==================
+
+  * package: bump `engine.io`
+
+1.4.6 / 2016-05-02
+==================
+
+  * package: bump engine.io
+
+1.4.5 / 2016-01-26
+==================
+
+  * fix closing the underlying `http.Server`
+
 1.4.4 / 2016-01-10
 ==================
 
@@ -46,6 +82,7 @@
   * package: bump `has-binary` to work with all objects (fixes #1955)
   * fix origin verification default https port [evanlucas]
   * support compression [nkzawa]
+  * changed type of `Client#sockets`, `Namespace#sockets` and `Socket#rooms` to maps (instead of arrays)
 
 1.3.7 / 2015-09-21
 ==================

Makefile

@@ -1,15 +1,8 @@
 
-REPORTER = dot
-
 test:
-	@./node_modules/.bin/mocha \
-		--reporter $(REPORTER) \
-		--slow 200ms \
-		--bail
+	@./node_modules/.bin/gulp test
 
 test-cov:
-	@./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- \
-		--reporter $(REPORTER) \
-		test/
+	@./node_modules/.bin/gulp test-cov
 
 .PHONY: test

Readme.md

@@ -1,7 +1,9 @@
 
 # socket.io
 
-[![Build Status](https://secure.travis-ci.org/socketio/socket.io.svg)](https://travis-ci.org/socketio/socket.io)
+[![Build Status](https://secure.travis-ci.org/socketio/socket.io.svg?branch=master)](https://travis-ci.org/socketio/socket.io)
+[![Dependency Status](https://david-dm.org/socketio/socket.io.svg)](https://david-dm.org/socketio/socket.io)
+[![devDependency Status](https://david-dm.org/socketio/socket.io/dev-status.svg)](https://david-dm.org/socketio/socket.io#info=devDependencies)
 ![NPM version](https://badge.fury.io/js/socket.io.svg)
 ![Downloads](https://img.shields.io/npm/dm/socket.io.svg?style=flat)
 [![](http://slack.socket.io/badge.svg?)](http://slack.socket.io)
@@ -14,9 +16,9 @@ HTTP server listening on port `3000`.
 ```js
 var server = require('http').createServer();
 var io = require('socket.io')(server);
-io.on('connection', function(socket){
-  socket.on('event', function(data){});
-  socket.on('disconnect', function(){});
+io.on('connection', function(client){
+  client.on('event', function(data){});
+  client.on('disconnect', function(){});
 });
 server.listen(3000);
 ```
@@ -25,7 +27,7 @@ server.listen(3000);
 
 ```js
 var io = require('socket.io')();
-io.on('connection', function(socket){});
+io.on('connection', function(client){});
 io.listen(3000);
 ```
 
@@ -198,7 +200,7 @@ server.listen(3000);
 
 ### Server#close
 
-  Closes socket server
+  Closes socket.io server
 
   ```js
   var Server = require('socket.io');
@@ -298,10 +300,14 @@ server.listen(3000);
   A `Socket` is the fundamental class for interacting with browser
   clients. A `Socket` belongs to a certain `Namespace` (by default `/`)
   and uses an underlying `Client` to communicate.
+  
+  It should be noted the `Socket` doesn't relate directly to the actual
+  underlying TCP/IP `socket` and it is only the name of the class.
 
-### Socket#rooms:Array
+### Socket#rooms:Object
 
-  A list of strings identifying the rooms this socket is in.
+  A hash of strings identifying the rooms this client is in, indexed by
+  room name.
 
 ### Socket#client:Client
 
@@ -310,7 +316,8 @@ server.listen(3000);
 ### Socket#conn:Socket
 
   A reference to the underlying `Client` transport connection (engine.io
-  `Socket` object).
+  `Socket` object). This allows access to the IO transport layer, which
+  still (mostly) asbtracts the actual TCP/IP socket.
 
 ### Socket#request:Request
 
@@ -320,30 +327,30 @@ server.listen(3000);
 
 ### Socket#id:String
 
-  A unique identifier for the socket session, that comes from the
+  A unique identifier for the session, that comes from the
   underlying `Client`.
 
 ### Socket#emit(name:String[, …]):Socket
 
-  Emits an event to the socket identified by the string `name`. Any
-  other parameters can be included.
+  Emits an event identified by the string `name` to the client.
+  Any other parameters can be included.
 
   All datastructures are supported, including `Buffer`. JavaScript
   functions can't be serialized/deserialized.
 
   ```js
   var io = require('socket.io')();
-  io.on('connection', function(socket){
-    socket.emit('an event', { some: 'data' });
+  io.on('connection', function(client){
+    client.emit('an event', { some: 'data' });
   });
   ```
 
 ### Socket#join(name:String[, fn:Function]):Socket
 
-  Adds the socket to the `room`, and fires optionally a callback `fn`
+  Adds the client to the `room`, and fires optionally a callback `fn`
   with `err` signature (if any).
 
-  The socket is automatically a member of a room identified with its
+  The client is automatically a member of a room identified with its
   session id (see `Socket#id`).
 
   The mechanics of joining  rooms are handled by the `Adapter`
@@ -352,7 +359,7 @@ server.listen(3000);
 
 ### Socket#leave(name:String[, fn:Function]):Socket
 
-  Removes the socket from `room`, and fires optionally a callback `fn`
+  Removes the client from `room`, and fires optionally a callback `fn`
   with `err` signature (if any).
 
   **Rooms are left automatically upon disconnection**.
@@ -364,14 +371,14 @@ server.listen(3000);
 ### Socket#to(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`.
+  only be _broadcasted_ to clients that have joined the given `room`.
 
   To emit to multiple rooms, you can call `to` several times.
 
   ```js
   var io = require('socket.io')();
-  io.on('connection', function(socket){
-    socket.to('others').emit('an event', { some: 'data' });
+  io.on('connection', function(client){
+    client.to('others').emit('an event', { some: 'data' });
   });
   ```
 
@@ -386,10 +393,33 @@ server.listen(3000);
 
   ```js
   var io = require('socket.io')();
-  io.on('connection', function(socket){
-    socket.compress(false).emit('an event', { some: 'data' });
+  io.on('connection', function(client){
+    client.compress(false).emit('an event', { some: 'data' });
   });
   ```
+  
+### Socket#disconnect(close:Boolean):Socket
+    
+  Disconnects this client. If value of close is `true`, closes the underlying connection. 
+  Otherwise, it just disconnects the namespace.
+
+#### Events
+
+- `disconnect`
+    - Fired upon disconnection.
+    - **Arguments**
+      - `String`: the reason of the disconnection (either client or server-side)
+- `error`
+    - Fired when an error occurs.
+    - **Arguments**
+      - `Object`: error data
+- `disconnecting`
+    - Fired when the client is going to be disconnected (but hasn't left its `rooms` yet).
+    - **Arguments**
+      - `String`: the reason of the disconnection (either client or server-side)
+
+These are reserved events (along with `connect`, `newListener` and `removeListener`) which cannot be used as event names.
+
 
 ### Client
 
@@ -419,6 +449,17 @@ To see the output from all of Socket.IO's debugging scopes you can use:
 DEBUG=socket.io* node myapp
 ```
 
+## Testing
+
+```
+npm test
+```
+This runs the `gulp` task `test`. By default the test will be run with the source code in `lib` directory.
+
+Set the environmental variable `TEST_VERSION` to `compat` to test the transpiled es5-compat version of the code.
+
+The `gulp` task `test` will always transpile the source code into es5 and export to `dist` first before running the test.
+
 ## License
 
 MIT

examples/chat/package.json

@@ -7,6 +7,6 @@
   "private": true,
   "license": "BSD",
   "dependencies": {
-    "express": "3.4.8"
+    "express": "4.13.4"
   }
-}
+}

examples/chat/public/style.css

@@ -128,7 +128,6 @@ ul {
 }
 
 .username {
-  float: left;
   font-weight: 700;
   overflow: hidden;
   padding-right: 15px;

gulpfile.js

@@ -0,0 +1,69 @@
+const gulp = require('gulp');
+const mocha = require('gulp-mocha');
+const babel = require("gulp-babel");
+const istanbul = require('gulp-istanbul');
+const help = require('gulp-task-listing');
+const del = require('del');
+
+gulp.task('help', help);
+
+gulp.task('default', ['transpile']);
+
+const TRANSPILE_DEST_DIR = './dist';
+
+// By default, individual js files are transformed by babel and exported to /dist
+gulp.task('transpile', function () {
+  return gulp.src("lib/*.js")
+    .pipe(babel({ "presets": ["es2015"] }))
+    .pipe(gulp.dest(TRANSPILE_DEST_DIR));
+});
+
+gulp.task('clean', function () {
+  return del([TRANSPILE_DEST_DIR]);
+})
+
+gulp.task('test', ['transpile'], function(){
+  return gulp.src('test/socket.io.js', {read: false})
+    .pipe(mocha({
+      slow: 200,
+      reporter: 'spec',
+      bail: true,
+      timeout: 10000
+    }))
+    .once('error', function (err) {
+      console.error(err.stack);
+      process.exit(1);
+    })
+    .once('end', function () {
+      process.exit();
+    });
+});
+
+gulp.task('set-compat-node-env', function() {
+  process.env.TEST_VERSION = 'compat';
+});
+
+gulp.task('test-compat', ['set-compat-node-env', 'test']);
+
+gulp.task('istanbul-pre-test', function () {
+  return gulp.src(['lib/**/*.js'])
+    // Covering files
+    .pipe(istanbul())
+    // Force `require` to return covered files
+    .pipe(istanbul.hookRequire());
+});
+
+gulp.task('test-cov', ['istanbul-pre-test'], function(){
+  return gulp.src('test/socket.io.js', {read: false})
+    .pipe(mocha({
+      reporter: 'dot'
+    }))
+    .pipe(istanbul.writeReports())
+    .once('error', function (err){
+      console.error(err.stack);
+      process.exit(1);
+    })
+    .once('end', function (){
+      process.exit();
+    });
+});

lib/client.js

@@ -5,6 +5,7 @@
 
 var parser = require('socket.io-parser');
 var debug = require('debug')('socket.io:client');
+var url = require('url');
 
 /**
  * Module exports.
@@ -16,7 +17,7 @@ module.exports = Client;
  * Client constructor.
  *
  * @param {Server} server instance
- * @param {Socket} connection
+ * @param {Socket} conn
  * @api private
  */
 
@@ -54,11 +55,11 @@ Client.prototype.setup = function(){
 /**
  * Connects a client to a namespace.
  *
- * @param {String} namespace name
+ * @param {String} name namespace
  * @api private
  */
 
-Client.prototype.connect = function(name){
+Client.prototype.connect = function(name, query){
   debug('connecting to namespace %s', name);
   var nsp = this.server.nsps[name];
   if (!nsp) {
@@ -72,7 +73,7 @@ Client.prototype.connect = function(name){
   }
 
   var self = this;
-  var socket = nsp.add(this, function(){
+  var socket = nsp.add(this, query, function(){
     self.sockets[socket.id] = socket;
     self.nsps[nsp.name] = socket;
 
@@ -133,7 +134,7 @@ Client.prototype.close = function(){
  * Writes a packet to the transport.
  *
  * @param {Object} packet object
- * @param {Object} options
+ * @param {Object} opts
  * @api private
  */
 
@@ -186,7 +187,7 @@ Client.prototype.ondata = function(data){
 
 Client.prototype.ondecoded = function(packet) {
   if (parser.CONNECT == packet.type) {
-    this.connect(packet.nsp);
+    this.connect(url.parse(packet.nsp).pathname, url.parse(packet.nsp, true).query);
   } else {
     var socket = this.nsps[packet.nsp];
     if (socket) {
@@ -200,7 +201,7 @@ Client.prototype.ondecoded = function(packet) {
 /**
  * Handles an error.
  *
- * @param {Objcet} error object
+ * @param {Object} err object
  * @api private
  */
 

lib/index.js

@@ -5,7 +5,6 @@
 
 var http = require('http');
 var read = require('fs').readFileSync;
-var parse = require('url').parse;
 var engine = require('engine.io');
 var client = require('socket.io-client');
 var clientVersion = require('socket.io-client/package').version;
@@ -30,8 +29,8 @@ var clientSource = read(require.resolve('socket.io-client/socket.io.js'), 'utf-8
 /**
  * Server constructor.
  *
- * @param {http.Server|Number|Object} http server, port or options
- * @param {Object} options
+ * @param {http.Server|Number|Object} srv http server, port or options
+ * @param {Object} opts
  * @api public
  */
 
@@ -54,8 +53,8 @@ function Server(srv, opts){
 /**
  * Server request verification function, that checks for allowed origins
  *
- * @param {http.IncomingMessage} request
- * @param {Function} callback to be called with the result: `fn(err, success)`
+ * @param {http.IncomingMessage} req request
+ * @param {Function} fn callback to be called with the result: `fn(err, success)`
  */
 
 Server.prototype.checkRequest = function(req, fn) {
@@ -87,7 +86,7 @@ Server.prototype.checkRequest = function(req, fn) {
 /**
  * Sets/gets whether client code is being served.
  *
- * @param {Boolean} whether to serve client code
+ * @param {Boolean} v whether to serve client code
  * @return {Server|Boolean} self when setting or value when getting
  * @api public
  */
@@ -140,7 +139,7 @@ Server.prototype.set = function(key, val){
 /**
  * Sets the client serving path.
  *
- * @param {String} pathname
+ * @param {String} v pathname
  * @return {Server|String} self when setting or value when getting
  * @api public
  */
@@ -154,7 +153,7 @@ Server.prototype.path = function(v){
 /**
  * Sets the adapter for rooms.
  *
- * @param {Adapter} pathname
+ * @param {Adapter} v pathname
  * @return {Server|Adapter} self when setting or value when getting
  * @api public
  */
@@ -173,7 +172,7 @@ Server.prototype.adapter = function(v){
 /**
  * Sets the allowed origins for requests.
  *
- * @param {String} origins
+ * @param {String} v origins
  * @return {Server|Adapter} self when setting or value when getting
  * @api public
  */
@@ -243,7 +242,7 @@ Server.prototype.attach = function(srv, opts){
 /**
  * Attaches the static file serving.
  *
- * @param {Function|http.Server} http server
+ * @param {Function|http.Server} srv http server
  * @api private
  */
 
@@ -293,7 +292,7 @@ Server.prototype.serve = function(req, res){
 /**
  * Binds socket.io to an engine.io instance.
  *
- * @param {engine.Server} engine.io (or compatible) server
+ * @param {engine.Server} engine engine.io (or compatible) server
  * @return {Server} self
  * @api public
  */
@@ -307,7 +306,7 @@ Server.prototype.bind = function(engine){
 /**
  * Called with each incoming transport connection.
  *
- * @param {engine.Socket} socket
+ * @param {engine.Socket} conn
  * @return {Server} self
  * @api public
  */
@@ -322,8 +321,8 @@ Server.prototype.onconnection = function(conn){
 /**
  * Looks up a namespace.
  *
- * @param {String} nsp name
- * @param {Function} optional, nsp `connection` ev handler
+ * @param {String} name nsp name
+ * @param {Function} fn optional, nsp `connection` ev handler
  * @api public
  */
 

lib/namespace.js

@@ -104,7 +104,7 @@ Namespace.prototype.use = function(fn){
  * Executes the middleware for an incoming client.
  *
  * @param {Socket} socket that will get added
- * @param {Function} last fn call in the middleware
+ * @param {Function} fn last fn call in the middleware
  * @api private
  */
 
@@ -150,9 +150,9 @@ Namespace.prototype['in'] = function(name){
  * @api private
  */
 
-Namespace.prototype.add = function(client, fn){
+Namespace.prototype.add = function(client, query, fn){
   debug('adding socket to nsp %s', this.name);
-  var socket = new Socket(this, client);
+  var socket = new Socket(this, client, query);
   var self = this;
   this.run(socket, function(err){
     process.nextTick(function(){
@@ -260,7 +260,7 @@ Namespace.prototype.clients = function(fn){
 /**
  * Sets the compress flag.
  *
- * @param {Boolean} if `true`, compresses the sending data
+ * @param {Boolean} compress if `true`, compresses the sending data
  * @return {Socket} self
  * @api public
  */

lib/socket.js

@@ -25,6 +25,7 @@ exports.events = [
   'error',
   'connect',
   'disconnect',
+  'disconnecting',
   'newListener',
   'removeListener'
 ];
@@ -55,18 +56,18 @@ var emit = Emitter.prototype.emit;
  * @api public
  */
 
-function Socket(nsp, client){
+function Socket(nsp, client, query){
   this.nsp = nsp;
   this.server = nsp.server;
   this.adapter = this.nsp.adapter;
-  this.id = nsp.name + '#' + client.id;
+  this.id = nsp.name !== '/' ? nsp.name + '#' + client.id : client.id;
   this.client = client;
   this.conn = client.conn;
   this.rooms = {};
   this.acks = {};
   this.connected = true;
   this.disconnected = false;
-  this.handshake = this.buildHandshake();
+  this.handshake = this.buildHandshake(query);
 }
 
 /**
@@ -88,7 +89,7 @@ flags.forEach(function(flag){
 });
 
 /**
- * `request` engine.io shorcut.
+ * `request` engine.io shortcut.
  *
  * @api public
  */
@@ -103,7 +104,19 @@ Socket.prototype.__defineGetter__('request', function(){
  * @api private
  */
 
-Socket.prototype.buildHandshake = function(){
+Socket.prototype.buildHandshake = function(query){
+  var self = this;
+  function buildQuery(){
+    var requestQuery = url.parse(self.request.url, true).query;
+    //if socket-specific query exist, replace query strings in requestQuery
+    if(query){
+      query.t = requestQuery.t;
+      query.EIO = requestQuery.EIO;
+      query.transport = requestQuery.transport;
+      return query;
+    }
+    return requestQuery || {};
+  }
   return {
     headers: this.request.headers,
     time: (new Date) + '',
@@ -112,7 +125,7 @@ Socket.prototype.buildHandshake = function(){
     secure: !!this.request.connection.encrypted,
     issued: +(new Date),
     url: this.request.url,
-    query: url.parse(this.request.url, true).query || {}
+    query: buildQuery()
   };
 };
 
@@ -199,7 +212,7 @@ Socket.prototype.write = function(){
  * Writes a packet.
  *
  * @param {Object} packet object
- * @param {Object} options
+ * @param {Object} opts options
  * @api private
  */
 
@@ -214,7 +227,7 @@ Socket.prototype.packet = function(packet, opts){
  * Joins a room.
  *
  * @param {String} room
- * @param {Function} optional, callback
+ * @param {Function} fn optional, callback
  * @return {Socket} self
  * @api private
  */
@@ -239,7 +252,7 @@ Socket.prototype.join = function(room, fn){
  * Leaves a room.
  *
  * @param {String} room
- * @param {Function} optional, callback
+ * @param {Function} fn optional, callback
  * @return {Socket} self
  * @api private
  */
@@ -338,7 +351,7 @@ Socket.prototype.onevent = function(packet){
 /**
  * Produces an ack callback to emit with an event.
  *
- * @param {Number} packet id
+ * @param {Number} id packet id
  * @api private
  */
 
@@ -409,13 +422,14 @@ Socket.prototype.onerror = function(err){
  * Called upon closing. Called by `Client`.
  *
  * @param {String} reason
- * @param {Error} optional error object
+ * @throw {Error} optional error object
  * @api private
  */
 
 Socket.prototype.onclose = function(reason){
   if (!this.connected) return this;
   debug('closing socket - reason %s', reason);
+  this.emit('disconnecting', reason);
   this.leaveAll();
   this.nsp.remove(this);
   this.client.remove(this);
@@ -428,7 +442,7 @@ Socket.prototype.onclose = function(reason){
 /**
  * Produces an `error` packet.
  *
- * @param {Object} error object
+ * @param {Object} err error object
  * @api private
  */
 
@@ -439,7 +453,7 @@ Socket.prototype.error = function(err){
 /**
  * Disconnects this client.
  *
- * @param {Boolean} if `true`, closes the underlying connection
+ * @param {Boolean} close if `true`, closes the underlying connection
  * @return {Socket} self
  * @api public
  */
@@ -458,7 +472,7 @@ Socket.prototype.disconnect = function(close){
 /**
  * Sets the compress flag.
  *
- * @param {Boolean} if `true`, compresses the sending data
+ * @param {Boolean} compress if `true`, compresses the sending data
  * @return {Socket} self
  * @api public
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.4.4",
+  "version": "1.5.0",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -12,29 +12,38 @@
     "io"
   ],
   "main": "./lib/index",
+  "files": [
+    "lib/"
+  ],
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/Automattic/socket.io"
+    "url": "git://github.com/socketio/socket.io"
   },
   "scripts": {
-    "test": "mocha --reporter dot --slow 200ms --bail"
+    "test": "gulp test"
   },
   "dependencies": {
-    "engine.io": "1.6.7",
+    "engine.io": "1.7.0",
     "socket.io-parser": "2.2.6",
-    "socket.io-client": "1.4.4",
+    "socket.io-client": "1.5.0",
     "socket.io-adapter": "0.4.0",
     "has-binary": "0.1.7",
     "debug": "2.2.0"
   },
   "devDependencies": {
+    "babel-preset-es2015": "6.3.13",
+    "del": "2.2.0",
     "expect.js": "0.3.1",
-    "istanbul": "0.2.3",
+    "gulp": "3.9.0",
+    "gulp-babel": "6.1.1",
+    "gulp-istanbul": "0.10.3",
+    "gulp-mocha": "2.2.0",
+    "gulp-task-listing": "1.0.1",
+    "istanbul": "0.4.1",
     "mocha": "2.3.4",
-    "superagent": "0.17.0",
-    "supertest": "0.8.2",
-    "zuul-ngrok": "3.1.0"
+    "superagent": "1.6.1",
+    "supertest": "1.1.0"
   },
   "contributors": [
     {

test/fixtures/server-close.js

@@ -0,0 +1,11 @@
+var server = require('http').createServer();
+var ioc = require('socket.io-client');
+var io = require('../..')(server);
+
+var srv = server.listen(function() {
+  var socket = ioc('ws://localhost:' + server.address().port);
+  socket.on('connect', function() {
+    io.close();
+    socket.close();
+  });
+});

test/socket.io.js

@@ -1,8 +1,15 @@
-
+var testVersion = process.env.TEST_VERSION;
 var http = require('http').Server;
-var io = require('..');
+var io;
+if (testVersion === 'compat') {
+  console.log('testing compat version');
+  io = require('../dist');
+} else {
+  io = require('../lib');
+}
 var fs = require('fs');
 var join = require('path').join;
+var exec = require('child_process').exec;
 var ioc = require('socket.io-client');
 var request = require('supertest');
 var expect = require('expect.js');
@@ -412,12 +419,31 @@ describe('socket.io', function(){
       });
     });
 
+    describe('graceful close', function(){
+      function fixture(filename) {
+        return '"' + process.execPath + '" "' +
+          join(__dirname, 'fixtures', filename) + '"';
+      }
+
+      it('should stop socket and timers', function(done){
+        exec(fixture('server-close.js'), done);
+      });
+    });
   });
 
   describe('namespaces', function(){
-    var Socket = require('../lib/socket');
-    var Namespace = require('../lib/namespace');
-
+    var Socket;
+    if (testVersion === 'compat') {
+      Socket = require('../dist/socket');
+    } else {
+      Socket = require('../lib/socket');
+    }
+    var Namespace;
+    if (testVersion === 'compat') {
+      Namespace = require('../dist/namespace');
+    } else {
+      Namespace = require('../lib/namespace');
+    }
     it('should be accessible through .sockets', function(){
       var sio = io();
       expect(sio.sockets).to.be.a(Namespace);
@@ -618,6 +644,31 @@ describe('socket.io', function(){
       });
     });
 
+    it('should fire a `disconnecting` event just before leaving all rooms', 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.disconnect();
+          });
+
+          var total = 2;
+          s.on('disconnecting', function(reason){
+            expect(Object.keys(s.rooms)).to.eql([s.id, 'a']);
+            total--;
+          });
+
+          s.on('disconnect', function(reason){
+            expect(Object.keys(s.rooms)).to.eql([]);
+            --total || done();
+          });
+        });
+      });
+    });
+
     it('should return error connecting to non-existent namespace', function(done){
       var srv = http();
       var sio = io(srv);
@@ -640,7 +691,7 @@ describe('socket.io', function(){
         var clientSocket2 = client(srv);
         sio.on('connection', function() {
           connections++;
-          if(connections === 2) {
+          if (connections === 2) {
             done();
           }
         });
@@ -774,7 +825,7 @@ describe('socket.io', function(){
           setTimeout(function() {
             sio.of('/chat').emit('ev', 'data');
             sio.of('/chat').volatile.emit('ev', 'data');
-          }, 20);
+          }, 50);
         });
 
         var socket = client(srv, '/chat');
@@ -786,7 +837,7 @@ describe('socket.io', function(){
       setTimeout(function() {
         expect(counter).to.be(1);
         done();
-      }, 200);
+      }, 500);
     });
 
     it('should emit volatile event', function(done) {
@@ -799,7 +850,7 @@ describe('socket.io', function(){
           // Wait to make sure there are no packets being sent for opening the connection
           setTimeout(function() {
             sio.of('/chat').volatile.emit('ev', 'data');
-          }, 20);
+          }, 100);
         });
 
         var socket = client(srv, '/chat');
@@ -811,7 +862,7 @@ describe('socket.io', function(){
       setTimeout(function() {
         expect(counter).to.be(1);
         done();
-      }, 200);
+      }, 500);
     });
 
     it('should enable compression by default', function(done){
@@ -1128,7 +1179,7 @@ describe('socket.io', function(){
           // Wait to make sure there are no packets being sent for opening the connection
           setTimeout(function() {
             s.volatile.emit('ev', 'data');
-          }, 20);
+          }, 100);
         });
 
         var socket = client(srv, { transports: ['polling'] });
@@ -1140,7 +1191,7 @@ describe('socket.io', function(){
       setTimeout(function() {
         expect(counter).to.be(1);
         done();
-      }, 200);
+      }, 500);
     });
 
     it('should emit volatile event (ws)', function(done) {
@@ -1179,7 +1230,7 @@ describe('socket.io', function(){
           setTimeout(function() {
             s.volatile.emit('ev', 'data');
             s.volatile.emit('ev', 'data');
-          }, 20);
+          }, 100);
         });
 
         var socket = client(srv, { transports: ['polling'] });
@@ -1191,7 +1242,7 @@ describe('socket.io', function(){
       setTimeout(function() {
         expect(counter).to.be(1);
         done();
-      }, 200);
+      }, 500);
     });
 
     it('should emit only one consecutive volatile event (ws)', function(done) {
@@ -1507,6 +1558,24 @@ describe('socket.io', function(){
         });
       });
     });
+    
+    it('should see query parameters sent from secondary namespace connections in handshake object', function(done){
+      var srv = http();
+      var sio = io(srv);
+      var addr = srv.listen().address();
+      var url = 'ws://localhost:' + addr.port;
+      var client1 = ioc(url);
+      var client2 = ioc(url + '/connection2', {query: {key1: 'aa', key2: '&=bb'}});
+      sio.on('connection', function(s){
+      });
+      sio.of('/connection2').on('connection', function(s){
+        expect(s.handshake.query.key1).to.be('aa');
+        expect(s.handshake.query.key2).to.be('&=bb');
+        done();
+      });
+
+
+    });
 
     it('should handle very large json', function(done){
       this.timeout(30000);
@@ -2025,7 +2094,12 @@ describe('socket.io', function(){
   });
 
   describe('middleware', function(done){
-    var Socket = require('../lib/socket');
+    var Socket;
+    if (testVersion === 'compat') {
+      Socket = require('../dist/socket');
+    } else {
+      Socket = require('../lib/socket');
+    }
 
     it('should call functions', function(done){
       var srv = http();