Release 0.9.1

Make heartbeat timeout > heartbeat interval

.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - 0.6
+
+notifications:
+  irc: "irc.freenode.org#socket.io"

History.md

@@ -1,4 +1,42 @@
 
+0.9.1 / 2012-03-02
+==================
+
+  * Changed heartbeat timeout and interval defaults (60 and 25 seconds)
+  * Make tests work both on 0.4 and 0.6
+  * Updated client (improvements + bug fixes).
+
+0.9.0 / 2012-02-26
+==================
+
+  * Make it possible to use a regexp to match the socket.io resource URL.
+    We need this because we have to prefix the socket.io URL with a variable ID.
+  * Supplemental fix to gavinuhma/authfix, it looks like the same Access-Control-Origin logic is needed in the http and xhr-polling transports
+  * Updated express dep for windows compatibility.
+  * Combine two substr calls into one in decodePayload to improve performance
+  * Minor documentation fix
+  * Minor. Conform to style of other files.
+  * Switching setting to 'match origin protocol'
+  * Revert "Fixes leaking Redis subscriptions for #663. The local flag was not getting passed through onClientDisconnect()."
+  * Revert "Handle leaked dispatch:[id] subscription."
+  * Merge pull request #667 from dshaw/patch/redis-disconnect
+  * Handle leaked dispatch:[id] subscription.
+  * Fixes leaking Redis subscriptions for #663. The local flag was not getting passed through onClientDisconnect().
+  * Prevent memory leaking on uncompleted requests & add max post size limitation
+  * Fix for testcase
+  * Set Access-Control-Allow-Credentials true, regardless of cookie
+  * Remove assertvarnish from package as it breaks on 0.6
+  * Correct irc channel
+  * Added proper return after reserved field error
+  * Fixes manager.js failure to close connection after transport error has happened
+  * Added implicit port 80 for origin checks. fixes #638
+  * Fixed bug #432 in 0.8.7
+  * Set Access-Control-Allow-Origin header to origin to enable withCredentials
+  * Adding configuration variable matchOriginProtocol
+  * Fixes location mismatch error in Safari.
+  * Use tty to detect if we should add colors or not by default.
+  * Updated the package location.
+
 0.8.7 / 2011-11-05
 ==================
 

Readme.md

@@ -131,7 +131,7 @@ The following example defines a socket that listens on '/chat' and one for
 var io = require('socket.io').listen(80);
 
 var chat = io
-  .of('/chat');
+  .of('/chat')
   .on('connection', function (socket) {
     socket.emit('a message', { that: 'only', '/chat': 'will get' });
     chat.emit('a message', { everyone: 'in', '/chat': 'will get' });

examples/chat/package.json

@@ -3,7 +3,7 @@
   , "description": "example chat application with socket.io"
   , "version": "0.0.1"
   , "dependencies": {
-        "express": "2.5.0"
+        "express": "2.5.5"
       , "jade": "0.16.4"
       , "stylus": "0.19.0"
       , "nib": "0.2.0"

examples/irc-output/package.json

@@ -2,7 +2,7 @@
     "name": "socket.io-irc"
   , "version": "0.0.1"
   , "dependencies": {
-        "express": "2.5.0"
+        "express": "2.5.5"
       , "jade": "0.16.4"
       , "stylus": "0.19.0"
       , "nib": "0.2.0"

lib/manager.js

@@ -10,6 +10,7 @@
 
 var fs = require('fs')
   , url = require('url')
+  , tty = require('tty')
   , util = require('./util')
   , store = require('./store')
   , client = require('socket.io-client')
@@ -69,14 +70,15 @@ function Manager (server, options) {
     , authorization: false
     , blacklist: ['disconnect']
     , 'log level': 3
-    , 'log colors': true
+    , 'log colors': tty.isatty(process.stdout.fd)
     , 'close timeout': 25
-    , 'heartbeat timeout': 15
-    , 'heartbeat interval': 20
+    , 'heartbeat interval': 25
+    , 'heartbeat timeout': 60
     , 'polling duration': 20
     , 'flash policy server': true
     , 'flash policy port': 10843
     , 'destroy upgrade': true
+    , 'destroy buffer size': 10E7
     , 'browser client': true
     , 'browser client cache': true
     , 'browser client minification': false
@@ -85,6 +87,7 @@ function Manager (server, options) {
     , 'browser client gzip': false
     , 'browser client handler': false
     , 'client store expiration': 15
+    , 'match origin protocol': false
   };
 
   for (var i in options) {
@@ -468,7 +471,8 @@ Manager.prototype.onClientMessage = function (id, packet) {
 
 Manager.prototype.onClientDisconnect = function (id, reason) {
   for (var name in this.namespaces) {
-    this.namespaces[name].handleDisconnect(id, reason, typeof this.roomClients[id][name] !== 'undefined');
+    this.namespaces[name].handleDisconnect(id, reason, typeof this.roomClients[id] !== 'undefined' &&
+      typeof this.roomClients[id][name] !== 'undefined');
   }
 
   this.onDisconnect(id);
@@ -624,6 +628,11 @@ Manager.prototype.handleClient = function (data, req) {
   var transport = new transports[data.transport](this, data, req)
     , handshaken = this.handshaken[data.id];
 
+  if (transport.disconnected) {
+    // failed during transport setup
+    req.connection.end();
+    return;
+  }
   if (handshaken) {
     if (transport.open) {
       if (this.closed[data.id] && this.closed[data.id].length) {
@@ -720,11 +729,8 @@ Manager.prototype.handleHandshake = function (data, req, res) {
 
   if (origin) {
     // https://developer.mozilla.org/En/HTTP_Access_Control
-    headers['Access-Control-Allow-Origin'] = '*';
-
-    if (req.headers.cookie) {
-      headers['Access-Control-Allow-Credentials'] = 'true';
-    }
+    headers['Access-Control-Allow-Origin'] = origin;
+    headers['Access-Control-Allow-Credentials'] = 'true';
   }
 
   this.authorize(handshakeData, function (err, authorized, newData) {
@@ -774,12 +780,12 @@ Manager.prototype.handshakeData = function (data) {
     connectionAddress = {
         address: connection.remoteAddress
       , port: connection.remotePort
-    }; 
+    };
   } else if (connection.socket && connection.socket.remoteAddress) {
     connectionAddress = {
         address: connection.socket.remoteAddress
       , port: connection.socket.remotePort
-    }; 
+    };
   }
 
   return {
@@ -813,6 +819,7 @@ Manager.prototype.verifyOrigin = function (request) {
   if (origin) {
     try {
       var parts = url.parse(origin);
+      parts.port = parts.port || 80;
       var ok =
         ~origins.indexOf(parts.hostname + ':' + parts.port) ||
         ~origins.indexOf(parts.hostname + ':*') ||
@@ -824,7 +831,7 @@ Manager.prototype.verifyOrigin = function (request) {
     }
   }
   else {
-    this.log.warn('origin missing from handshake, yet required by config');        
+    this.log.warn('origin missing from handshake, yet required by config');
   }
   return false;
 };
@@ -897,8 +904,17 @@ var regexp = /^\/([^\/]+)\/?([^\/]+)?\/?([^\/]+)?\/?$/
 Manager.prototype.checkRequest = function (req) {
   var resource = this.get('resource');
 
-  if (req.url.substr(0, resource.length) == resource) {
-    var uri = url.parse(req.url.substr(resource.length), true)
+  var match;
+  if (typeof resource === 'string') {
+    match = req.url.substr(0, resource.length);
+    if (match !== resource) match = null;
+  } else {
+    match = resource.exec(req.url);
+    if (match) match = match[0];
+  }
+
+  if (match) {
+    var uri = url.parse(req.url.substr(match.length), true)
       , path = uri.pathname || ''
       , pieces = path.match(regexp);
 

lib/parser.js

@@ -234,7 +234,7 @@ exports.decodePayload = function (data) {
 
     for (var i = 1, length = ''; i < data.length; i++) {
       if (data[i] == '\ufffd') {
-        ret.push(exports.decodePacket(data.substr(i + 1).substr(0, length)));
+        ret.push(exports.decodePacket(data.substr(i + 1, length)));
         i += Number(length) + 1;
         length = '';
       } else {

lib/socket.io.js

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

lib/transports/http.js

@@ -51,6 +51,11 @@ HTTPTransport.prototype.handleRequest = function (req) {
 
     req.on('data', function (data) {
       buffer += data;
+
+      if (Buffer.byteLength(buffer) >= self.manager.get('destroy buffer size')) {
+        buffer = '';
+        req.connection.destroy();
+      }
     });
 
     req.on('end', function () {
@@ -60,13 +65,15 @@ HTTPTransport.prototype.handleRequest = function (req) {
       self.onData(self.postEncoded ? qs.parse(buffer).d : buffer);
     });
 
+    // prevent memory leaks for uncompleted requests
+    req.on('close', function () {
+      buffer = '';
+    });
+
     if (origin) {
       // https://developer.mozilla.org/En/HTTP_Access_Control
-      headers['Access-Control-Allow-Origin'] = '*';
-
-      if (req.headers.cookie) {
-        headers['Access-Control-Allow-Credentials'] = 'true';
-      }
+      headers['Access-Control-Allow-Origin'] = origin;
+      headers['Access-Control-Allow-Credentials'] = 'true';
     }
   } else {
     this.response = req.res;

lib/transports/websocket/default.js

@@ -88,8 +88,10 @@ WebSocket.prototype.onSocketConnect = function () {
     return;
   }
 
-  var origin = this.req.headers.origin
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+  var origin = this.req.headers['origin']
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url
     , waitingForNonce = false;
 

lib/transports/websocket/hybi-07-12.js

@@ -99,7 +99,9 @@ WebSocket.prototype.onSocketConnect = function () {
   }
 
   var origin = this.req.headers['sec-websocket-origin']
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url;
   
   if (!this.verifyOrigin(origin)) {
@@ -159,6 +161,7 @@ WebSocket.prototype.verifyOrigin = function (origin) {
   if (origin) {
     try {
       var parts = url.parse(origin);
+      parts.port = parts.port || 80;
       var ok =
         ~origins.indexOf(parts.hostname + ':' + parts.port) ||
         ~origins.indexOf(parts.hostname + ':*') ||
@@ -505,7 +508,9 @@ Parser.prototype.expect = function(what, length, handler) {
  */
 
 Parser.prototype.processPacket = function (data) {
-  if ((data[0] & 0x70) != 0) this.error('reserved fields must be empty');
+  if ((data[0] & 0x70) != 0) {
+    this.error('reserved fields must be empty');
+  }
   this.state.lastFragment = (data[0] & 0x80) == 0x80; 
   this.state.masked = (data[1] & 0x80) == 0x80;
   var opcode = data[0] & 0xf;

lib/transports/websocket/hybi-16.js

@@ -99,7 +99,9 @@ WebSocket.prototype.onSocketConnect = function () {
   }
 
   var origin = this.req.headers['origin']
-    , location = (this.socket.encrypted ? 'wss' : 'ws')
+    , location = ((this.manager.settings['match origin protocol'] ?
+                      origin.match(/^https/) : this.socket.encrypted) ?
+                        'wss' : 'ws')
                + '://' + this.req.headers.host + this.req.url;
   
   if (!this.verifyOrigin(origin)) {
@@ -159,6 +161,7 @@ WebSocket.prototype.verifyOrigin = function (origin) {
   if (origin) {
     try {
       var parts = url.parse(origin);
+      parts.port = parts.port || 80;
       var ok =
         ~origins.indexOf(parts.hostname + ':' + parts.port) ||
         ~origins.indexOf(parts.hostname + ':*') ||
@@ -505,7 +508,10 @@ Parser.prototype.expect = function(what, length, handler) {
  */
 
 Parser.prototype.processPacket = function (data) {
-  if ((data[0] & 0x70) != 0) this.error('reserved fields must be empty');
+  if ((data[0] & 0x70) != 0) {
+    this.error('reserved fields must be empty');
+    return;
+  } 
   this.state.lastFragment = (data[0] & 0x80) == 0x80; 
   this.state.masked = (data[1] & 0x80) == 0x80;
   var opcode = data[0] & 0xf;

lib/transports/xhr-polling.js

@@ -59,11 +59,8 @@ XHRPolling.prototype.doWrite = function (data) {
 
   if (origin) {
     // https://developer.mozilla.org/En/HTTP_Access_Control
-    headers['Access-Control-Allow-Origin'] = '*';
-
-    if (this.req.headers.cookie) {
-      headers['Access-Control-Allow-Credentials'] = 'true';
-    }
+    headers['Access-Control-Allow-Origin'] = origin;
+    headers['Access-Control-Allow-Credentials'] = 'true';
   }
 
   this.response.writeHead(200, headers);

package.json

@@ -1,6 +1,6 @@
 {
     "name": "socket.io"
-  , "version": "0.8.7"
+  , "version": "0.9.1"
   , "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,18 +16,20 @@
       , "url": "https://github.com/LearnBoost/socket.io.git"
     }
   , "dependencies": {
-        "socket.io-client": "0.8.7"
+        "socket.io-client": "0.9.1"
       , "policyfile": "0.0.4"
       , "redis": "0.6.7"
     }
   , "devDependencies": {
         "expresso": "0.9.2"
       , "should": "0.0.4"
-      , "assertvanish": "0.0.3-1"
       , "benchmark": "0.2.2"
       , "microtime": "0.1.3-1"
       , "colors": "0.5.1"
     }
   , "main": "index"
   , "engines": { "node": ">= 0.4.0" }
+  , "scripts": {
+        "test": "make test"
+    }
 }

test/common.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var io = require('socket.io')
+var io = require('../')
   , parser = io.parser
   , http = require('http')
   , https = require('https')
@@ -227,7 +227,7 @@ function WSClient (port, sid, transport) {
   this.transportName = transport || 'websocket';
   WebSocket.call(
       this
-    , 'ws://localhost:' + port + '/socket.io/' 
+    , 'ws://localhost:' + port + '/socket.io/'
         + io.protocol + '/' + this.transportName + '/' + sid
   );
 };

test/hybi-common.js

@@ -43,7 +43,7 @@ mask = function(buf, maskString) {
   if (typeof buf == 'string') buf = new Buffer(buf);
   var mask = getBufferFromHexString(maskString || '34 83 a8 68');
   for (var i = 0; i < buf.length; ++i) {
-    buf[i] ^= mask[i % 4];    
+    buf[i] ^= mask[i % 4];
   }
   return buf;
 }
@@ -51,8 +51,8 @@ mask = function(buf, maskString) {
 /**
  * Returns a hex string representing the length of a message
  */
- 
-getHybiLengthAsHexString = function(len, masked) {  
+
+getHybiLengthAsHexString = function(len, masked) {
   if (len < 126) {
     var buf = new Buffer(1);
     buf[0] = (masked ? 0x80 : 0) | len;
@@ -94,6 +94,6 @@ pack = function(length, number) {
  * Left pads the string 's' to a total length of 'n' with char 'c'.
  */
 
-padl = function(s, n, c) { 
+padl = function(s, n, c) {
   return new Array(1 + n - s.length).join(c) + s;
 }

test/io.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , fs = require('fs')
   , http = require('http')
   , https = require('https')

test/manager.test.js

@@ -8,7 +8,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , http = require('http')
   , should = require('./common')
   , ports = 15100;
@@ -277,6 +277,23 @@ module.exports = {
     });
   },
 
+  'test that a referer with implicit port 80 is accepted for foo.bar.com:80 origin': function (done) {
+    var port = ++ports
+      , io = sio.listen(port)
+      , cl = client(port);
+
+    io.configure(function () {
+      io.set('origins', 'foo.bar.com:80');
+    });
+
+    cl.get('/socket.io/{protocol}', { headers: { referer: 'http://foo.bar.com/something' } }, function (res, data) {
+      res.statusCode.should.eql(200);
+      cl.end();
+      io.server.close();
+      done();
+    });
+  },
+
   'test that erroneous referer is denied for addr:* origin': function (done) {
     var port = ++ports
       , io = sio.listen(port)
@@ -339,7 +356,7 @@ module.exports = {
 
     cl.get('/socket.io/{protocol}/', { headers:headers }, function (res, data) {
       res.statusCode.should.eql(200);
-      res.headers['access-control-allow-origin'].should.eql('*');
+      res.headers['access-control-allow-origin'].should.eql('http://example.org:1337');
       res.headers['access-control-allow-credentials'].should.eql('true');
 
       cl.end();

test/parser.test.js

@@ -3,7 +3,7 @@
  * Test dependencies.
  */
 
-var parser = require('socket.io').parser
+var parser = require('../').parser
   , decode = parser.decode
   , should = require('./common');
 

test/static.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('./common')
   , ports = 15400;
 
@@ -94,7 +94,7 @@ module.exports = {
 
   'test that the client is build with the enabled transports': function (done) {
     var port = ++ports
-      , io = sio.listen(port) 
+      , io = sio.listen(port)
       , cl = client(port);
 
     io.set('transports', ['websocket']);

test/stores.memory.test.js

@@ -5,7 +5,7 @@
  * @api private
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('should')
   , MemoryStore = sio.MemoryStore;
 
@@ -45,7 +45,7 @@ module.exports = {
 
                 client.set('b', 'c', function (err) {
                   should.strictEqual(err, null);
-                  
+
                   client.set('c', 'd', function (err) {
                     should.strictEqual(err, null);
 

test/stores.redis.test.js

@@ -5,7 +5,7 @@
  * @api private
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , redis = require('redis')
   , should = require('should')
   , RedisStore = sio.RedisStore;
@@ -95,7 +95,7 @@ module.exports = {
 
                 client.set('b', 'c', function (err) {
                   should.strictEqual(err, null);
-                  
+
                   client.set('c', 'd', function (err) {
                     should.strictEqual(err, null);
 

test/transports.flashsocket.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , net = require('net')
   , http = require('http')
   , should = require('./common')
@@ -30,7 +30,7 @@ function FlashSocket (port, sid) {
 
   WebSocket.call(
       this
-    , 'ws://localhost:' + port + '/socket.io/' 
+    , 'ws://localhost:' + port + '/socket.io/'
         + sio.protocol + '/flashsocket/' + sid
   );
 };

test/transports.htmlfile.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('./common')
   , HTTPClient = should.HTTPClient
   , parser = sio.parser

test/transports.jsonp-polling.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('./common')
   , qs = require('querystring')
   , HTTPClient = should.HTTPClient

test/transports.websocket.hybi07-12.parser.test.js

@@ -2,7 +2,7 @@
  * Test dependencies.
  */
 
-var assert = require('assert'); 
+var assert = require('assert');
 var Parser = require('../lib/transports/websocket/hybi-07-12.js').Parser;
 require('./hybi-common');
 
@@ -14,38 +14,38 @@ module.exports = {
   'can parse unmasked text message': function() {
     var p = new Parser();
     var packet = '81 05 48 65 6c 6c 6f';
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
       assert.equal('Hello', data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
   'can parse close message': function() {
     var p = new Parser();
     var packet = '88 00';
-  
+
     var gotClose = false;
     p.on('close', function(data) {
       gotClose = true;
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotClose);
   },
   'can parse masked text message': function() {
     var p = new Parser();
     var packet = '81 93 34 83 a8 68 01 b9 92 52 4f a1 c6 09 59 e6 8a 52 16 e6 cb 00 5b a1 d5';
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
       assert.equal('5:::{"name":"echo"}', data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -54,13 +54,13 @@ module.exports = {
     var message = 'A';
     for (var i = 0; i < 300; ++i) message += (i % 5).toString();
     var packet = '81 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
       assert.equal(message, data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -75,7 +75,7 @@ module.exports = {
       gotData = true;
       assert.equal(message, data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -87,13 +87,13 @@ module.exports = {
     var msgpiece2 = message.substr(150);
     var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
     var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
     var gotData = false;
     p.on('data', function(data) {
-      gotData = true;      
+      gotData = true;
       assert.equal(message, data);
     });
-  
+
     p.add(getBufferFromHexString(packet1));
     p.add(getBufferFromHexString(packet2));
     assert.ok(gotData);
@@ -102,25 +102,25 @@ module.exports = {
     var p = new Parser();
     var message = 'Hello';
     var packet = '89 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
     var gotPing = false;
     p.on('ping', function(data) {
       gotPing = true;
       assert.equal(message, data);
     });
-    
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotPing);
   },
   'can parse a ping with no data': function() {
     var p = new Parser();
     var packet = '89 00';
-    
+
     var gotPing = false;
     p.on('ping', function(data) {
       gotPing = true;
     });
-    
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotPing);
   },
@@ -128,16 +128,16 @@ module.exports = {
     var p = new Parser();
     var message = 'A';
     for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
     var msgpiece1 = message.substr(0, 150);
     var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
     var pingMessage = 'Hello';
     var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
     var msgpiece2 = message.substr(150);
     var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
@@ -148,7 +148,7 @@ module.exports = {
       gotPing = true;
       assert.equal(pingMessage, data);
     });
-    
+
     p.add(getBufferFromHexString(packet1));
     p.add(getBufferFromHexString(pingPacket));
     p.add(getBufferFromHexString(packet2));
@@ -159,16 +159,16 @@ module.exports = {
     var p = new Parser();
     var message = 'A';
     for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
     var msgpiece1 = message.substr(0, 150);
     var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
     var pingMessage = 'Hello';
     var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
     var msgpiece2 = message.substr(150);
     var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
@@ -179,7 +179,7 @@ module.exports = {
       gotPing = true;
       assert.equal(pingMessage, data);
     });
-    
+
     var buffers = [];
     buffers = buffers.concat(splitBuffer(getBufferFromHexString(packet1)));
     buffers = buffers.concat(splitBuffer(getBufferFromHexString(pingPacket)));
@@ -195,7 +195,7 @@ module.exports = {
     var length = 100;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
 
     var gotData = false;
@@ -203,7 +203,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -212,7 +212,7 @@ module.exports = {
     var length = 256;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
 
     var gotData = false;
@@ -220,7 +220,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -229,7 +229,7 @@ module.exports = {
     var length = 200 * 1024;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
 
     var gotData = false;
@@ -237,7 +237,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -246,7 +246,7 @@ module.exports = {
     var length = 200 * 1024;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, false) + ' ' + getHexStringFromBuffer(message);
 
     var gotData = false;
@@ -254,7 +254,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },

test/transports.websocket.hybi16.parser.test.js

@@ -2,7 +2,7 @@
  * Test dependencies.
  */
 
-var assert = require('assert'); 
+var assert = require('assert');
 var Parser = require('../lib/transports/websocket/hybi-16.js').Parser;
 require('./hybi-common');
 
@@ -14,38 +14,38 @@ module.exports = {
   'can parse unmasked text message': function() {
     var p = new Parser();
     var packet = '81 05 48 65 6c 6c 6f';
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
       assert.equal('Hello', data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
   'can parse close message': function() {
     var p = new Parser();
     var packet = '88 00';
-  
+
     var gotClose = false;
     p.on('close', function(data) {
       gotClose = true;
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotClose);
   },
   'can parse masked text message': function() {
     var p = new Parser();
     var packet = '81 93 34 83 a8 68 01 b9 92 52 4f a1 c6 09 59 e6 8a 52 16 e6 cb 00 5b a1 d5';
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
       assert.equal('5:::{"name":"echo"}', data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -54,13 +54,13 @@ module.exports = {
     var message = 'A';
     for (var i = 0; i < 300; ++i) message += (i % 5).toString();
     var packet = '81 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
       assert.equal(message, data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -75,7 +75,7 @@ module.exports = {
       gotData = true;
       assert.equal(message, data);
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -87,13 +87,13 @@ module.exports = {
     var msgpiece2 = message.substr(150);
     var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
     var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
     var gotData = false;
     p.on('data', function(data) {
-      gotData = true;      
+      gotData = true;
       assert.equal(message, data);
     });
-  
+
     p.add(getBufferFromHexString(packet1));
     p.add(getBufferFromHexString(packet2));
     assert.ok(gotData);
@@ -102,25 +102,25 @@ module.exports = {
     var p = new Parser();
     var message = 'Hello';
     var packet = '89 FE ' + pack(4, message.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
-    
+
     var gotPing = false;
     p.on('ping', function(data) {
       gotPing = true;
       assert.equal(message, data);
     });
-    
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotPing);
   },
   'can parse a ping with no data': function() {
     var p = new Parser();
     var packet = '89 00';
-    
+
     var gotPing = false;
     p.on('ping', function(data) {
       gotPing = true;
     });
-    
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotPing);
   },
@@ -128,16 +128,16 @@ module.exports = {
     var p = new Parser();
     var message = 'A';
     for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
     var msgpiece1 = message.substr(0, 150);
     var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
     var pingMessage = 'Hello';
     var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
     var msgpiece2 = message.substr(150);
     var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
@@ -148,7 +148,7 @@ module.exports = {
       gotPing = true;
       assert.equal(pingMessage, data);
     });
-    
+
     p.add(getBufferFromHexString(packet1));
     p.add(getBufferFromHexString(pingPacket));
     p.add(getBufferFromHexString(packet2));
@@ -159,16 +159,16 @@ module.exports = {
     var p = new Parser();
     var message = 'A';
     for (var i = 0; i < 300; ++i) message += (i % 5).toString();
-  
+
     var msgpiece1 = message.substr(0, 150);
     var packet1 = '01 FE ' + pack(4, msgpiece1.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece1, '34 83 a8 68'));
-  
+
     var pingMessage = 'Hello';
     var pingPacket = '89 FE ' + pack(4, pingMessage.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(pingMessage, '34 83 a8 68'));
-  
+
     var msgpiece2 = message.substr(150);
     var packet2 = '80 FE ' + pack(4, msgpiece2.length) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(msgpiece2, '34 83 a8 68'));
-  
+
     var gotData = false;
     p.on('data', function(data) {
       gotData = true;
@@ -179,7 +179,7 @@ module.exports = {
       gotPing = true;
       assert.equal(pingMessage, data);
     });
-    
+
     var buffers = [];
     buffers = buffers.concat(splitBuffer(getBufferFromHexString(packet1)));
     buffers = buffers.concat(splitBuffer(getBufferFromHexString(pingPacket)));
@@ -195,7 +195,7 @@ module.exports = {
     var length = 100;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
 
     var gotData = false;
@@ -203,7 +203,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -212,7 +212,7 @@ module.exports = {
     var length = 256;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
 
     var gotData = false;
@@ -220,7 +220,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -229,7 +229,7 @@ module.exports = {
     var length = 200 * 1024;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, true) + ' 34 83 a8 68 ' + getHexStringFromBuffer(mask(message, '34 83 a8 68'));
 
     var gotData = false;
@@ -237,7 +237,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },
@@ -246,7 +246,7 @@ module.exports = {
     var length = 200 * 1024;
     var message = new Buffer(length);
     for (var i = 0; i < length; ++i) message[i] = i % 256;
-    var originalMessage = getHexStringFromBuffer(message); 
+    var originalMessage = getHexStringFromBuffer(message);
     var packet = '82 ' + getHybiLengthAsHexString(length, false) + ' ' + getHexStringFromBuffer(message);
 
     var gotData = false;
@@ -254,7 +254,7 @@ module.exports = {
       gotData = true;
       assert.equal(originalMessage, getHexStringFromBuffer(data));
     });
-  
+
     p.add(getBufferFromHexString(packet));
     assert.ok(gotData);
   },

test/transports.xhr-polling.test.js

@@ -9,7 +9,7 @@
  * Test dependencies.
  */
 
-var sio = require('socket.io')
+var sio = require('../')
   , should = require('./common')
   , HTTPClient = should.HTTPClient
   , parser = sio.parser
@@ -768,7 +768,7 @@ module.exports = {
     var cl = client(++ports)
       , io = create(cl)
       , messages = 0;
-    
+
     io.configure(function () {
       io.set('polling duration', 0);
       io.set('close timeout', .1);
@@ -2652,8 +2652,8 @@ module.exports = {
       }, function (res, packs) {
         var headers = res.headers;
 
-        headers['access-control-allow-origin'].should.equal('*');
-        should.strictEqual(headers['access-control-allow-credentials'], undefined);
+        headers['access-control-allow-origin'].should.equal('http://localhost:3500');
+        headers['access-control-allow-credentials'].should.equal('true');
 
         packs.should.have.length(1);
         packs[0].type.should.eql('message');
@@ -2669,7 +2669,7 @@ module.exports = {
           }
         }, function (res, data) {
           var headers = res.headers;
-          headers['access-control-allow-origin'].should.equal('*');
+          headers['access-control-allow-origin'].should.equal('http://localhost:3500');
           headers['access-control-allow-credentials'].should.equal('true');
 
           data.should.equal('1');
@@ -2751,7 +2751,7 @@ module.exports = {
               }
           );
         });
-        
+
       });
     });
   }