Release 0.9.5

Issue795 fix

History.md

@@ -1,4 +1,19 @@
 
+0.9.5 / 2012-04-05
+==================
+
+  * Added test for polling and socket close.
+  * Ensure close upon request close.
+  * Fix disconnection reason being lost for polling transports.
+  * Ensure that polling transports work with Connection: close.
+  * Log disconnection reason.
+
+0.9.4 / 2012-04-01
+==================
+
+  * Disconnecting from namespace improvement (#795) [DanielBaulig]
+  * Bumped client with polling reconnection loop (#438)
+
 0.9.3 / 2012-03-28
 ==================
 

Readme.md

@@ -6,7 +6,9 @@ horizontal scalability, automatic JSON encoding/decoding, and more.
 
 ## How to Install
 
-    npm install socket.io
+```bash
+npm install socket.io
+```
 
 ## How to use
 

lib/socket.io.js

@@ -15,7 +15,7 @@ var client = require('socket.io-client');
  * Version.
  */
 
-exports.version = '0.9.3';
+exports.version = '0.9.5';
 
 /**
  * Supported protocol version.

lib/socket.js

@@ -291,12 +291,19 @@ Socket.prototype.disconnect = function () {
   if (!this.disconnected) {
     this.log.info('booting client');
 
-    if (this.manager.transports[this.id] && this.manager.transports[this.id].open) {
-      this.manager.transports[this.id].onForcedDisconnect();
+    if ('' === this.namespace.name) {
+      if (this.manager.transports[this.id] && this.manager.transports[this.id].open) {
+        this.manager.transports[this.id].onForcedDisconnect();
+      } else {
+        this.manager.onClientDisconnect(this.id);
+        this.manager.store.publish('disconnect:' + this.id);
+      }
     } else {
-      this.manager.onClientDisconnect(this.id);
-      this.manager.store.publish('disconnect:' + this.id);
+      this.packet({type: 'disconnect'});
+      this.manager.onLeave(this.id, this.namespace.name);
+      this.$emit('disconnect', 'booted');
     }
+
   }
 
   return this;

lib/transport.js

@@ -455,7 +455,7 @@ Transport.prototype.onClose = function () {
 
 Transport.prototype.end = function (reason) {
   if (!this.disconnected) {
-    this.log.info('transport end');
+    this.log.info('transport end (' + reason + ')');
 
     var local = this.manager.transports[this.id];
 

lib/transports/http-polling.js

@@ -43,6 +43,18 @@ HTTPPolling.prototype.__proto__ = HTTPTransport.prototype;
 
 HTTPPolling.prototype.name = 'httppolling';
 
+/**
+ * Override setHandlers
+ *
+ * @api private
+ */
+
+HTTPPolling.prototype.setHandlers = function () {
+  HTTPTransport.prototype.setHandlers.call(this);
+  this.socket.removeListener('end', this.bound.end);
+  this.socket.removeListener('close', this.bound.close);
+};
+
 /**
  * Removes heartbeat timeouts for polling.
  */
@@ -128,8 +140,8 @@ HTTPPolling.prototype.write = function (data, close) {
  * @api private
  */
 
-HTTPPolling.prototype.end = function () {
+HTTPPolling.prototype.end = function (reason) {
   this.clearPollTimeout();
-  return HTTPTransport.prototype.end.call(this);
+  return HTTPTransport.prototype.end.call(this, reason);
 };
 

lib/transports/http.js

@@ -68,6 +68,7 @@ HTTPTransport.prototype.handleRequest = function (req) {
     // prevent memory leaks for uncompleted requests
     req.on('close', function () {
       buffer = '';
+      self.onClose();
     });
 
     if (origin) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "socket.io"
-  , "version": "0.9.3"
+  , "version": "0.9.5"
   , "description": "Real-time apps made cross-browser & easy with a WebSocket-like API"
   , "homepage": "http://socket.io"
   , "keywords": ["websocket", "socket", "realtime", "socket.io", "comet", "ajax"]
@@ -16,7 +16,7 @@
       , "url": "https://github.com/LearnBoost/socket.io.git"
     }
   , "dependencies": {
-        "socket.io-client": "0.9.3"
+        "socket.io-client": "0.9.5"
       , "policyfile": "0.0.4"
       , "redis": "0.6.7"
     }

test/namespace.test.js

@@ -282,5 +282,46 @@ module.exports = {
         }
       });
     });
+  },
+  'disconnecting from namespace only': function (done) {
+    var cl = client(++ports)
+      , io = create(cl)
+      , ws1
+      , ws2;
+
+    io.of('/foo').on('connection', function (socket) {
+      socket.disconnect();
+    });
+
+    cl.handshake(function (sid) {
+      ws1 = websocket(cl, sid);
+      ws1.on('open', function () {
+        ws1.packet({
+            type: 'connect'
+          , endpoint: '/bar'
+        });
+        cl.handshake(function (sid) {
+          ws2 = websocket(cl, sid);
+          ws2.on('open', function () {
+            ws2.packet({
+                type: 'connect'
+              , endpoint: '/foo'
+            });
+          });
+          ws2.on('message', function (data) {
+            if ('disconnect' === data.type) {
+              cl.end();
+              ws1.finishClose();
+              ws2.finishClose();
+              io.server.close();
+
+              data.endpoint.should.eql('/foo');
+
+              done();
+            }
+          });
+        });
+      });
+    });
   }
 };

test/transports.xhr-polling.test.js

@@ -289,6 +289,40 @@ module.exports = {
     });
   },
 
+  'test that connection close does not mean disconnect': function (done) {
+    var cl = client(++ports)
+      , io = create(cl)
+      , sid
+      , end
+      , disconnected = false
+
+    io.configure(function () {
+      io.set('polling duration', .2);
+      io.set('close timeout', .5);
+    });
+
+    io.sockets.on('connection', function (client) {
+      end = function () {
+        cl.end();
+        console.log('ending');
+        client.on('disconnect', function () {
+          disconnected = true;
+        });
+      }
+    });
+
+    cl.handshake(function (sid) {
+      cl.get('/socket.io/{protocol}/xhr-polling/' + sid);
+      setTimeout(end, 30);
+      setTimeout(function () {
+        console.log('finished');
+        disconnected.should.be.false;
+        io.server.close();
+        done();
+      }, 100);
+    });
+  },
+
   'test sending back data': function (done) {
     var cl = client(++ports)
       , io = create(cl);