Release 1.0.4

Add/binary ack

History.md

@@ -1,4 +1,27 @@
 
+1.0.4 / 2014-06-02
+==================
+
+ * package: bump socket.io-client
+
+1.0.3 / 2014-05-31
+==================
+
+ * package: bump `socket.io-client`
+ * package: bump `socket.io-parser` for binary ACK fix
+ * package: bump `engine.io` for binary UTF8 fix
+ * example: fix XSS in chat example
+
+1.0.2 / 2014-05-28
+==================
+
+ * package: bump `socket.io-parser` for windows fix
+
+1.0.1 / 2014-05-28
+==================
+
+ * bump due to bad npm tag
+
 1.0.0 / 2014-05-28
 ==================
 

Readme.md

@@ -1,10 +1,7 @@
-### This Readme corresponds to the upcoming 1.0 release. Please refer to http://socket.io for the current 0.9.x documentation.
-
-<hr />
 
 # socket.io
 
-[![Build Status](https://secure.travis-ci.org/LearnBoost/socket.io.png)](http://travis-ci.org/LearnBoost/socket.io)
+[![Build Status](https://secure.travis-ci.org/Automattic/socket.io.png)](http://travis-ci.org/Automattic/socket.io)
 [![NPM version](https://badge.fury.io/js/socket.io.png)](http://badge.fury.io/js/socket.io)
 
 ## How to use
@@ -129,7 +126,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/learnboost/socket.io-adapter).
+  [socket.io-adapter](https://github.com/Automattic/socket.io-adapter).
 
   If no arguments are supplied this method returns the current value.
 
@@ -288,7 +285,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/socket.io/socket.io-adapter).
+  [socket.io-adapter](https://github.com/Automattic/socket.io-adapter).
 
 ### Socket#leave(name:String[, fn:Function]):Socket
 
@@ -299,7 +296,7 @@ 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/socket.io/socket.io-adapter).
+  [socket.io-adapter](https://github.com/Automattic/socket.io-adapter).
 
 ### Socket#to(room:String):Socket
 ### Socket#in(room:String):Socket

examples/chat/public/main.js

@@ -70,8 +70,8 @@ $(function() {
 
   // Log a message
   function log (message, options) {
-    var el = '<li class="log">' + message + '</li>';
-    addMessageElement(el, options);
+    var $el = $('<li>').addClass('log').text(message);
+    addMessageElement($el, options);
   }
 
   // Adds the visual chat message to the message list
@@ -84,16 +84,17 @@ $(function() {
       $typingMessages.remove();
     }
 
-    var colorStyle = 'style="color:' + getUsernameColor(data.username) + '"';
-    var usernameDiv = '<span class="username"' + colorStyle + '>' +
-      data.username + '</span>';
-    var messageBodyDiv = '<span class="messageBody">' +
-      data.message + '</span>';
+    var $usernameDiv = $('<span class="username"/>')
+      .text(data.username)
+      .css('color', getUsernameColor(data.username));
+    var $messageBodyDiv = $('<span class="messageBody">')
+      .text(data.message);
 
     var typingClass = data.typing ? 'typing' : '';
-    var messageDiv = '<li class="message ' + typingClass + '">' +
-    usernameDiv + messageBodyDiv + '</li>';
-    var $messageDiv = $(messageDiv).data('username', data.username);
+    var $messageDiv = $('<li class="message"/>')
+      .data('username', data.username)
+      .addClass(typingClass)
+      .append($usernameDiv, $messageBodyDiv);
 
     addMessageElement($messageDiv, options);
   }
@@ -145,7 +146,7 @@ $(function() {
 
   // Prevents input from having injected markup
   function cleanInput (input) {
-    return $('<div/>').text(input).html() || input;
+    return $('<div/>').text(input).text();
   }
 
   // Updates the typing event

examples/chat/public/style.css

@@ -25,6 +25,7 @@ html, body {
 
 ul {
   list-style: none;
+  word-wrap: break-word;
 }
 
 /* Pages */

lib/client.js

@@ -199,9 +199,10 @@ Client.prototype.onclose = function(reason){
   this.destroy();
 
   // `nsps` and `sockets` are cleaned up seamlessly
-  this.sockets.forEach(function(socket){
+  var socket;
+  while (socket = this.sockets.shift()) {
     socket.onclose(reason);
-  });
+  }
 
   this.decoder.destroy(); // clean up decoder
 };

lib/socket.js

@@ -293,6 +293,10 @@ Socket.prototype.onpacket = function(packet){
       this.onack(packet);
       break;
 
+    case parser.BINARY_ACK:
+      this.onack(packet);
+      break;
+
     case parser.DISCONNECT:
       this.ondisconnect();
       break;
@@ -336,9 +340,11 @@ Socket.prototype.ack = function(id){
     if (sent) return;
     var args = Array.prototype.slice.call(arguments);
     debug('sending ack %j', args);
+
+    var type = hasBin(args) ? parser.BINARY_ACK : parser.ACK;
     self.packet({
       id: id,
-      type: parser.ACK,
+      type: type,
       data: args
     });
   };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -19,9 +19,9 @@
     "test": "make test"
   },
   "dependencies": {
-    "engine.io": "1.2.1",
-    "socket.io-parser": "2.1.4",
-    "socket.io-client": "1.0.0",
+    "engine.io": "1.2.2",
+    "socket.io-parser": "2.2.0",
+    "socket.io-client": "1.0.4",
     "socket.io-adapter": "0.2.0",
     "has-binary-data": "0.1.1",
     "debug": "0.7.4"

test/socket.io.js

@@ -395,6 +395,33 @@ describe('socket.io', function(){
           }
         });
       });
+
+      it('should disconnect both default and custom namespace upon disconnect', function(done){
+        var srv = http();
+        var sio = io(srv);
+        srv.listen(function(){
+          var lolcats = client(srv, '/lolcats');
+          var total = 2;
+          var totald = 2;
+          var s;
+          sio.of('/', function(socket){
+            socket.on('disconnect', function(reason){
+              --totald || done();
+            });
+            --total || close();
+          });
+          sio.of('/lolcats', function(socket){
+            s = socket;
+            socket.on('disconnect', function(reason){
+              --totald || done();
+            });
+            --total || close();
+          });
+          function close(){
+            s.disconnect(true);
+          }
+        });
+      });
     });
   });
 
@@ -446,6 +473,28 @@ describe('socket.io', function(){
       });
     });
 
+    it('should emit events with utf8 multibyte character', function(done) {
+      var srv = http();
+      var sio = io(srv);
+      srv.listen(function(){
+        var socket = client(srv);
+        var i = 0;
+        socket.on('hoot', function(a){
+          expect(a).to.be('utf8 — string');
+          i++;
+
+          if (3 == i) {
+            done();
+          }
+        });
+        sio.on('connection', function(s){
+          s.emit('hoot', 'utf8 — string');
+          s.emit('hoot', 'utf8 — string');
+          s.emit('hoot', 'utf8 — string');
+        });
+      });
+    });
+
     it('should emit events with binary data', function(done){
       var srv = http();
       var sio = io(srv);
@@ -746,6 +795,59 @@ describe('socket.io', function(){
         });
       });
     });
+
+    it('should handle very large json', function(done){
+      this.timeout();
+      var srv = http();
+      var sio = io(srv);
+      var received = 0;
+      srv.listen(function(){
+        var socket = client(srv);
+        socket.on('big', function(a){
+          expect(Buffer.isBuffer(a.json)).to.be(false);
+          if (++received == 3)
+            done();
+          else
+            socket.emit('big', a);
+        });
+        sio.on('connection', function(s){
+          fs.readFile(join(__dirname, 'fixtures', 'big.json'), function(err, data){
+            if (err) return done(err);
+            data = JSON.parse(data);
+            s.emit('big', {hello: 'friend', json: data});
+          });
+          s.on('big', function(a){
+            s.emit('big', a);
+          });
+        });
+      });
+    });
+
+    it('should handle very large binary data', function(done){
+      var srv = http();
+      var sio = io(srv);
+      var received = 0;
+      srv.listen(function(){
+        var socket = client(srv);
+        socket.on('big', function(a){
+          expect(Buffer.isBuffer(a.image)).to.be(true);
+          if (++received == 3)
+            done();
+          else
+            socket.emit('big', a);
+        });
+        sio.on('connection', function(s){
+          fs.readFile(join(__dirname, 'fixtures', 'big.jpg'), function(err, data){
+            if (err) return done(err);
+            s.emit('big', {hello: 'friend', image: data});
+          });
+          s.on('big', function(a){
+            expect(Buffer.isBuffer(a.image)).to.be(true);
+            s.emit('big', a);
+          });
+        });
+      });
+    });
   });
 
   describe('messaging many', function(){