socket.io - npm Package Compare versions

Comparing version 0.6.8 to 0.6.9

History.md

 
+0.6.9 / 2011-02-06 
+==================
+
+  * 0.3 compatibility
+  * Updated socket.io client to 0.6.2
+  * Fixed Flash inline policy serving for Firefox 4
+  * Updated expresso
+  * Added comments and version number to socket.io/index
+
 0.6.8 / 2011-01-10 
@@ -3,0 +12,0 @@ ==================

lib/socket.io/index.js

@@ -1,4 +0,26 @@
-exports.Listener = require('./listener');
+
+/**
+ * Listener creation shorcut
+ *
+ * @param {Server} node HTTP server
+ * @param {Object} options
+ * @api public
+ */
+
 exports.listen = function(server, options){
   return new exports.Listener(server, options);
-};
+};
+
+/**
+ * Listener constructor
+ *
+ * @api public
+ */
+
+exports.Listener = require('./listener');
+
+/**
+ * Version
+ */
+
+exports.version = '0.6.9';

lib/socket.io/transports/flashsocket.js

@@ -48,4 +48,3 @@ var net = require('net')
                            + 'served inline instead of on port 843. This will slow '
-                           + 'down initial connections slightly. NOTE: this fails '
-                           + 'with Firefox 4 betas.');
+                           + 'down initial connections slightly.');
       netserver = null;
@@ -52,0 +51,0 @@ }

package.json

 { "name" : "socket.io"
 , "description" : "The cross-browser WebSocket"
-, "version" : "0.6.8"
+, "version" : "0.6.9"
 , "author" : "LearnBoost"
@@ -5,0 +5,0 @@ , "licenses" :

support/expresso/docs/index.md

@@ -40,3 +40,3 @@
 
-	exports['test String#length'] = function(assert){
+	exports['test String#length'] = function(){
 		assert.equal(6, 'foobar'.length);
@@ -50,3 +50,3 @@ };
     module.exports = {
-      	'test String#length': function(assert){
+      	'test String#length': function(){
         	assert.equal(6, 'foobar'.length);
@@ -58,11 +58,11 @@ }
 
-	exports.testsStringLength = function(assert){
+	exports.testsStringLength = function(){
 		assert.equal(6, 'foobar'.length);
 	};
 
-The second argument passed to each callback is _beforeExit_,
+The argument passed to each callback is _beforeExit_,
 which is typically used to assert that callbacks have been
 invoked.
 
-    exports.testAsync = function(assert, beforeExit){
+    exports.testAsync = function(beforeExit){
 		var n = 0;
@@ -170,5 +170,5 @@ setTimeout(function(){
 
-  - _body_ assert response body
+  - _body_ assert response body (regexp or string)
   - _status_ assert response status code
-  - _header_ assert that all given headers match (unspecified are ignored)
+  - _header_ assert that all given headers match (unspecified are ignored, use a regexp or string)
 
@@ -291,5 +291,5 @@ When providing _res_ you may then also pass a callback function
 	setTimeout(function(){
-	    exports['test async exports'] = function(assert){
+	    exports['test async exports'] = function(){
 	        assert.ok('wahoo');
 	    };
 	}, 100);

support/expresso/History.md

 
+0.7.2 / 2010-12-29 
+==================
+
+  * Fixed problem with `listen()` sometimes firing on the same tick [guillermo]
+
+0.7.1 / 2010-12-28 
+==================
+
+  * Fixed `assert.request()` client logic into an issue() function, fired upon the `listen()` callback if the server doesn't have an assigned fd. [guillermo]
+  * Removed `--watch`
+
+0.7.0 / 2010-11-19 
+==================
+
+  * Removed `assert` from test function signature
+    Just use `require('assert')` :) this will make integration
+    with libraries like [should](http://github.com/visionmedia/should) cleaner.
+
+0.6.4 / 2010-11-02 
+==================
+
+  * Added regexp support to `assert.response()` headers
+  * Removed `waitForExit` code, causing issues
+
+0.6.3 / 2010-11-02 
+==================
+
+  * Added `assert.response()` body RegExp support
+  * Fixed issue with _--serial_ not executing files sequentially. Closes #42
+  * Fixed hang when modules use `setInterval` - monitor running tests & force the process to quit after all have completed + timeout [Steve Mason]
+
 0.6.2 / 2010-09-17 
@@ -3,0 +34,0 @@ ==================

support/expresso/package.json

 { "name": "expresso",
-  "version": "0.6.2",
+  "version": "0.7.2",
   "description": "TDD framework, light-weight, fast, CI-friendly",
@@ -4,0 +4,0 @@ "author": "TJ Holowaychuk <[e-mail]>",

support/expresso/Readme.md

@@ -38,3 +38,25 @@
 
+## License 
 
+(The MIT License)
 
+Copyright (c) 2010 TJ Holowaychuk <[e-mail]>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

support/expresso/test/assert.test.js

@@ -0,7 +1,14 @@
+
+/**
+ * Module dependencies.
+ */
+
+var assert = require('assert');
+
 module.exports = {
-    'assert.eql()': function(assert){
+    'assert.eql()': function(){
         assert.equal(assert.deepEqual, assert.eql);
     },
     
-    'assert.type()': function(assert){
+    'assert.type()': function(){
         assert.type('foobar', 'string');
@@ -14,3 +21,3 @@ assert.type(2, 'number');
     
-    'assert.includes()': function(assert){
+    'assert.includes()': function(){
         assert.includes('some random string', 'dom');
@@ -35,3 +42,3 @@ assert.throws(function(){
     
-    'assert.isNull()': function(assert){
+    'assert.isNull()': function(){
         assert.isNull(null);
@@ -46,3 +53,3 @@ assert.throws(function(){
     
-    'assert.isUndefined()': function(assert){
+    'assert.isUndefined()': function(){
         assert.isUndefined(undefined);
@@ -57,3 +64,3 @@ assert.throws(function(){
     
-    'assert.isNotNull()': function(assert){
+    'assert.isNotNull()': function(){
         assert.isNotNull(false);
@@ -66,3 +73,3 @@ assert.isNotNull(undefined);
     
-    'assert.isDefined()': function(assert){
+    'assert.isDefined()': function(){
         assert.isDefined(false);
@@ -75,3 +82,3 @@ assert.isDefined(null);
     
-    'assert.match()': function(assert){
+    'assert.match()': function(){
         assert.match('foobar', /foo(bar)?/);
@@ -83,3 +90,3 @@ assert.throws(function(){
     
-    'assert.length()': function(assert){
+    'assert.length()': function(){
         assert.length('test', 4);
@@ -86,0 +93,0 @@ assert.length([1,2,3,4], 4);

support/expresso/test/async.test.js

 
+/**
+ * Module dependencies.
+ */
+
+var assert = require('assert');
+
 setTimeout(function(){
-    exports['test async exports'] = function(assert){
+    exports['test async exports'] = function(){
         assert.ok('wahoo');
     };
 }, 100);

support/expresso/test/bar.test.js

@@ -6,8 +6,9 @@
 
-var bar = require('bar');
+var assert = require('assert')
+  , bar = require('bar');
 
 module.exports = {
-    'bar()': function(assert){
+    'bar()': function(){
         assert.equal('bar', bar.bar());
     }
 };

support/expresso/test/foo.test.js

@@ -6,6 +6,7 @@
 
-var foo = require('foo');
+var assert = require('assert')
+  , foo = require('foo');
 
 module.exports = {
-    'foo()': function(assert){
+    'foo()': function(){
         assert.equal('foo', foo.foo());
@@ -12,0 +13,0 @@ assert.equal('foo', foo.foo());

support/expresso/test/http.test.js

@@ -6,78 +6,142 @@
 
-var http = require('http');
+var assert = require('assert')
+  , http = require('http');
 
 var server = http.createServer(function(req, res){
-    if (req.method === 'GET') {
-        if (req.url === '/delay') {
-            setTimeout(function(){
-                res.writeHead(200, {});
-                res.end('delayed');
-            }, 200);
-        } else {
-            var body = JSON.stringify({ name: 'tj' });
-            res.writeHead(200, {
-                'Content-Type': 'application/json; charset=utf8',
-                'Content-Length': body.length
-            });
-            res.end(body);
-        }
+  if (req.method === 'GET') {
+    if (req.url === '/delay') {
+      setTimeout(function(){
+        res.writeHead(200, {});
+        res.end('delayed');
+      }, 200);
     } else {
-        var body = '';
-        req.setEncoding('utf8');
-        req.addListener('data', function(chunk){ body += chunk });
-        req.addListener('end', function(){
-            res.writeHead(200, {});
-            res.end(req.url + ' ' + body);
-        });
+      var body = JSON.stringify({ name: 'tj' });
+      res.writeHead(200, {
+        'Content-Type': 'application/json; charset=utf8',
+        'Content-Length': body.length
+      });
+      res.end(body);
     }
+  } else {
+    var body = '';
+    req.setEncoding('utf8');
+    req.on('data', function(chunk){ body += chunk });
+    req.on('end', function(){
+      res.writeHead(200, {});
+      res.end(req.url + ' ' + body);
+    });
+  }
 });
 
+var delayedServer = http.createServer(function(req, res){
+  res.writeHead(200);
+  res.end('it worked');
+});
+
+var oldListen = delayedServer.listen;
+delayedServer.listen = function(){
+  var args = arguments;
+  setTimeout(function(){
+    oldListen.apply(delayedServer, args);
+  }, 100);
+};
+
 module.exports = {
-    'test assert.response()': function(assert, beforeExit){
-        var called = 0;
+  'test assert.response(req, res, fn)': function(beforeExit){
+    var calls = 0;
 
-        assert.response(server, {
-            url: '/',
-            method: 'GET'
-        },{
-            body: '{"name":"tj"}',
-            status: 200,
-            headers: {
-                'Content-Type': 'application/json; charset=utf8'
-            }
-        });
-        
-        assert.response(server, {
-            url: '/foo',
-            method: 'POST',
-            data: 'bar baz'
-        },{
-            body: '/foo bar baz',
-            status: 200
-        }, function(res){
-            ++called;
-            assert.ok(res);
-        });
-        
-        assert.response(server, {
-            url: '/foo'
-        }, function(res){
-            ++called;
-            assert.ok(res.body.indexOf('tj') >= 0, 'Test assert.response() callback');
-        });
-        
-        assert.response(server,
-            { url: '/delay', timeout: 300 },
-            { body: 'delayed' });
-        
-        beforeExit(function(){
-            assert.equal(2, called);
-        });
-    },
+    assert.response(server, {
+      url: '/',
+      method: 'GET'
+    },{
+      body: '{"name":"tj"}',
+      status: 200,
+      headers: {
+        'Content-Type': 'application/json; charset=utf8'
+      }
+    }, function(res){
+      ++calls;
+      assert.ok(res);
+    });
     
-    'test assert.response() regexp': function(assert){
-      assert.response(server,
-        { url: '/foo', method: 'POST', data: 'foobar' },
-        { body: /^\/foo foo(bar)?/ });
-    }
-};
+    beforeExit(function(){
+      assert.equal(1, calls);
+    })
+  },
+
+  'test assert.response(req, fn)': function(beforeExit){
+    var calls = 0;
+
+    assert.response(server, {
+      url: '/foo'
+    }, function(res){
+      ++calls;
+      assert.ok(res.body.indexOf('tj') >= 0, 'Test assert.response() callback');
+    });
+
+    beforeExit(function(){
+      assert.equal(1, calls);
+    });
+  },
+  
+  'test assert.response() delay': function(beforeExit){
+    var calls = 0;
+
+    assert.response(server,
+      { url: '/delay', timeout: 1500 },
+      { body: 'delayed' },
+      function(){
+        ++calls;
+      });
+
+    beforeExit(function(){
+      assert.equal(1, calls);
+    });
+  },
+
+  'test assert.response() regexp': function(beforeExit){
+    var calls = 0;
+
+    assert.response(server,
+      { url: '/foo', method: 'POST', data: 'foobar' },
+      { body: /^\/foo foo(bar)?/ },
+      function(){
+        ++calls;
+      });
+    
+    beforeExit(function(){
+      assert.equal(1, calls);
+    });
+  },
+  
+  'test assert.response() regexp headers': function(beforeExit){
+    var calls = 0;
+
+    assert.response(server,
+      { url: '/' },
+      { body: '{"name":"tj"}', headers: { 'Content-Type': /^application\/json/ } },
+      function(){
+        ++calls;
+      });
+    
+    beforeExit(function(){
+      assert.equal(1, calls);
+    });
+  },
+
+  // [!] if this test doesn't pass, an uncaught ECONNREFUSED will display
+  'test assert.response() with deferred listen()': function(beforeExit){
+    var calls = 0;
+
+    assert.response(delayedServer,
+      { url: '/' },
+      { body: 'it worked' },
+      function(){
+        ++calls;
+      });
+
+    beforeExit(function(){
+      assert.equal(1, calls);
+    });
+  }
+};

support/expresso/test/serial/async.test.js

 
-var setup = 0,
-    order = [];
+var assert = require('assert')
+  , setup = 0
+  , order = [];
 
@@ -11,3 +12,3 @@ module.exports = {
 
-    a: function(assert, done){
+    a: function(done){
         assert.equal(1, setup);
@@ -20,3 +21,3 @@ order.push('a');
     
-    b: function(assert, done){
+    b: function(done){
         assert.equal(2, setup);
@@ -29,3 +30,3 @@ order.push('b');
     
-    c: function(assert, done){
+    c: function(done){
         assert.equal(3, setup);
@@ -38,5 +39,5 @@ order.push('c');
 
-    d: function(assert){
+    d: function(){
         assert.eql(order, ['a', 'b', 'c']);
     }
 };

support/expresso/test/serial/http.test.js

@@ -6,3 +6,4 @@
 
-var http = require('http');
+var assert = require('assert')
+  , http = require('http');
 
@@ -36,3 +37,3 @@ var server = http.createServer(function(req, res){
 module.exports = {
-    'test assert.response()': function(assert, done){
+    'test assert.response()': function(done){
         assert.response(server, {
@@ -39,0 +40,0 @@ url: '/',

support/socket.io-client/lib/io.js

@@ -10,3 +10,3 @@ /**
 this.io = {
-	version: '0.6.1',
+	version: '0.6.2',
 	
@@ -13,0 +13,0 @@ setPath: function(path){

support/socket.io-client/lib/socket.js

@@ -62,2 +62,3 @@ /**
 			this.connecting = true;
+			this.emit('connecting', [this.transport.type]);
 			this.transport.connect();
@@ -70,12 +71,13 @@ if (this.options.connectTimeout){
 						if (self.options.tryTransportsOnConnectTimeout && !self._rememberedTransport){
-							var remainingTransports = [], transports = self.options.transports;
-							for (var i = 0, transport; transport = transports[i]; i++){
-								if (transport != self.transport.type) remainingTransports.push(transport);
-							}
-							if (remainingTransports.length){
-								self.transport = self.getTransport(remainingTransports);
+							if(!self._remainingTransports) self._remainingTransports = self.options.transports.slice(0);
+							var transports = self._remainingTransports;
+							while(transports.length > 0 && transports.splice(0,1)[0] != self.transport.type){}
+							if(transports.length){
+								self.transport = self.getTransport(transports);
 								self.connect();
 							}
 						}
+						if(!self._remainingTransports || self._remainingTransports.length == 0) self.emit('connect_failed');
 					}
+					if(self._remainingTransports && self._remainingTransports.length == 0) delete self._remainingTransports;
 				}, this.options.connectTimeout);
@@ -82,0 +84,0 @@ }

support/socket.io-client/lib/transports/xhr-multipart.js

@@ -23,3 +23,3 @@ /**
 		this._xhr.onreadystatechange = function(){
-			if (self._xhr.readyState == 3) self._onData(self._xhr.responseText);
+			if (self._xhr.readyState == 4) self._onData(self._xhr.responseText);
 		};
@@ -26,0 +26,0 @@ this._xhr.send(null);

support/socket.io-client/lib/vendor/web-socket-js/web_socket.js

@@ -11,4 +11,6 @@ // Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
   var console = window.console;
-  if (!console) console = {log: function(){ }, error: function(){ }};
-
+  if (!console || !console.log || !console.error) {
+    console = {log: function(){ }, error: function(){ }};
+  }
+  
   if (!swfobject.hasFlashPlayerVersion("9.0.0")) {
@@ -35,4 +37,4 @@ console.error("Flash Player is not installed.");
       });
-    }, 1);
-  }
+    }, 0);
+  };
   
@@ -43,55 +45,7 @@ WebSocket.prototype.__createFlash = function(url, protocol, proxyHost, proxyPort, headers) {
       WebSocket.__flash.create(url, protocol, proxyHost || null, proxyPort || 0, headers || null);
-
-    self.__flash.addEventListener("open", function(fe) {
-      try {
-        self.readyState = self.__flash.getReadyState();
-        if (self.__timer) clearInterval(self.__timer);
-        if (window.opera) {
-          // Workaround for weird behavior of Opera which sometimes drops events.
-          self.__timer = setInterval(function () {
-            self.__handleMessages();
-          }, 500);
-        }
-        if (self.onopen) self.onopen();
-      } catch (e) {
-        console.error(e.toString());
-      }
+    self.__flash.addEventListener("event", function(fe) {
+      // Uses setTimeout() to workaround the error:
+      // > You are trying to call recursively into the Flash Player which is not allowed.
+      setTimeout(function() { self.__handleEvents(); }, 0);
     });
-
-    self.__flash.addEventListener("close", function(fe) {
-      try {
-        self.readyState = self.__flash.getReadyState();
-        if (self.__timer) clearInterval(self.__timer);
-        if (self.onclose) self.onclose();
-      } catch (e) {
-        console.error(e.toString());
-      }
-    });
-
-    self.__flash.addEventListener("message", function() {
-      try {
-        self.__handleMessages();
-      } catch (e) {
-        console.error(e.toString());
-      }
-    });
-
-    self.__flash.addEventListener("error", function(fe) {
-      try {
-        if (self.__timer) clearInterval(self.__timer);
-        if (self.onerror) self.onerror();
-      } catch (e) {
-        console.error(e.toString());
-      }
-    });
-
-    self.__flash.addEventListener("stateChange", function(fe) {
-      try {
-        self.readyState = self.__flash.getReadyState();
-        self.bufferedAmount = fe.getBufferedAmount();
-      } catch (e) {
-        console.error(e.toString());
-      }
-    });
-
     //console.log("[WebSocket] Flash object is ready");
@@ -101,5 +55,2 @@ };
   WebSocket.prototype.send = function(data) {
-    if (this.__flash) {
-      this.readyState = this.__flash.getReadyState();
-    }
     if (!this.__flash || this.readyState == WebSocket.CONNECTING) {
@@ -118,3 +69,3 @@ throw "INVALID_STATE_ERR: Web Socket connection has not been established";
     } else {
-      this.bufferedAmount = result;
+      this.bufferedAmount += result;
       return false;
@@ -127,3 +78,2 @@ }
     if (!self.__flash) return;
-    self.readyState = self.__flash.getReadyState();
     if (self.readyState == WebSocket.CLOSED || self.readyState == WebSocket.CLOSING) return;
@@ -139,3 +89,3 @@ self.__flash.close();
        // close event
-       setTimeout(self.onclose, 1);
+       setTimeout(self.onclose, 0);
      }
@@ -209,19 +159,51 @@ };
 
-  WebSocket.prototype.__handleMessages = function() {
-    // Gets data using readSocketData() instead of getting it from event object
+  WebSocket.prototype.__handleEvents = function() {
+    // Gets events using receiveEvents() instead of getting it from event object
     // of Flash event. This is to make sure to keep message order.
     // It seems sometimes Flash events don't arrive in the same order as they are sent.
-    var arr = this.__flash.readSocketData();
-    for (var i = 0; i < arr.length; i++) {
-      var data = decodeURIComponent(arr[i]);
+    var events = this.__flash.receiveEvents();
+    for (var i = 0; i < events.length; i++) {
       try {
-        if (this.onmessage) {
-          var e;
-          if (window.MessageEvent) {
-            e = document.createEvent("MessageEvent");
-            e.initMessageEvent("message", false, false, data, null, null, window, null);
-          } else { // IE
-            e = {data: data};
+        var event = events[i];
+        if ("readyState" in event) {
+          this.readyState = event.readyState;
+        }
+        if (event.type == "open") {
+          
+          if (this.__timer) clearInterval(this.__timer);
+          if (window.opera) {
+            // Workaround for weird behavior of Opera which sometimes drops events.
+            this.__timer = setInterval(function () {
+              this.__handleEvents();
+            }, 500);
           }
-          this.onmessage(e);
+          if (this.onopen) this.onopen();
+          
+        } else if (event.type == "close") {
+          
+          if (this.__timer) clearInterval(this.__timer);
+          if (this.onclose) this.onclose();
+          
+        } else if (event.type == "message") {
+          
+          if (this.onmessage) {
+            var data = decodeURIComponent(event.data);
+            var e;
+            if (window.MessageEvent && !window.opera) {
+              e = document.createEvent("MessageEvent");
+              e.initMessageEvent("message", false, false, data, null, null, window, null);
+            } else {
+              // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
+              e = {data: data};
+            }
+            this.onmessage(e);
+          }
+          
+        } else if (event.type == "error") {
+          
+          if (this.__timer) clearInterval(this.__timer);
+          if (this.onerror) this.onerror();
+          
+        } else {
+          throw "unknown event type: " + event.type;
         }
@@ -233,3 +215,3 @@ } catch (e) {
   };
-
+  
   /**
@@ -249,3 +231,3 @@ * @param {object} object
     };
-  }
+  };
 
@@ -311,2 +293,8 @@ /**
 
+  WebSocket.loadFlashPolicyFile = function(url) {
+    WebSocket.__addTask(function() {
+      WebSocket.__flash.loadManualPolicyFile(url);
+    });
+  }
+
   WebSocket.__initialize = function() {
@@ -313,0 +301,0 @@ if (WebSocket.__swfLocation) {

support/socket.io-client/README.md

@@ -49,11 +49,3 @@ socket.io
 ### How to use
-	
-The recommended way of including the Socket.IO client is through the Socket.IO CDN:
 
-In your <head>
-
-	<script src="http://cdn.socket.io/stable/socket.io.js"></script>
-
-Then, in your code
-
 	socket = new io.Socket('localhost');
@@ -167,2 +159,13 @@ socket.connect();
 	
+- *connecting(transport_type)*
+
+  Fired when a connection is attempted, passing the transport name
+	
+- *connect_failed*
+
+  Fired when the connection timeout occurs after the last connection attempt.
+	This only fires if the `connectTimeout` option is set.
+	If the `tryTransportsOnConnectTimeout` option is set, this only fires once all
+	possible transports have been tried.
+	
 - *message(message)*
@@ -180,10 +183,2 @@
 
-### Changelog
-
-2010 08 02 - **0.5.4** (9.95KB)
-
-* Added io.util.load as a reusable onload handler
-* Added io.util.ios which reports if the UA is running on iPhone or iPad
-* No more loading bar on iPhone: XHR-Polling now connects `onload` for the iOS WebKit, and waits 10 ms to launch the initial connection.
-
 ### Credits
@@ -216,2 +211,2 @@
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

tests/index.js

 var io = require('socket.io')
+  , assert = require('assert')
   , Listener = io.Listener;
@@ -6,3 +7,3 @@
 
-  'test server initialization': function(assert){
+  'test server initialization': function(){
     var _server = require('http').createServer(function(){})
@@ -18,2 +19,2 @@ , _socket = io.listen(_server, { log: null });
 
-};
+};

tests/listener.js

 var http = require('http')
   , net = require('net')
   , io = require('socket.io')
+  , assert = require('assert')
   , decode = require('socket.io/utils').decode
@@ -33,3 +34,3 @@ , port = 7100
   
-  'test serving static javascript client': function(assert){
+  'test serving static javascript client': function(){
     var _server = server()
@@ -54,3 +55,3 @@ , _socket = socket(_server);
   
-  'test serving non-socket.io requests': function(assert){
+  'test serving non-socket.io requests': function(){
     var _server = server()
@@ -69,4 +70,5 @@ , _socket = socket(_server);
   
-  'test destroying an upgrade connection that is not WebSocket': function(assert){
+  'test destroying an upgrade connection that is not WebSocket': function(){
     var _server = server()
+
       , _socket = socket(_server);
@@ -86,3 +88,6 @@ listen(_server, function(){
         _server.close();
-      })
+      });
+      client.on('error', function (e) {
+        // ignore errors
+      });
       request.end();
@@ -92,3 +97,3 @@ });
   
-  'test broadcasting to clients': function(assert){
+  'test broadcasting to clients': function(){
     var _server = server()
@@ -131,3 +136,3 @@ , _socket = socket(_server);
   
-  'test connecting with an invalid sessionid': function(assert){
+  'test connecting with an invalid sessionid': function(){
     var _server = server()
@@ -148,3 +153,3 @@ , _socket = socket(_server);
   
-  'test connecting to an invalid transport': function(assert){
+  'test connecting to an invalid transport': function(){
     var _server = server(function(req, res){
@@ -159,2 +164,2 @@ res.writeHead(200);
   
-};
+};

tests/transports.flashsocket.js

 var io = require('socket.io')
   , net = require('net')
   , http = require('http')
+  , assert = require('assert')
   , querystring = require('querystring')
@@ -34,3 +35,3 @@ , port = 7700
   
-  'test xml policy added to connection': function(assert){
+  'test xml policy added to connection': function(){
     var _server = server()
@@ -49,2 +50,2 @@ , _socket = socket(_server);
   
-}
+}

tests/transports.htmlfile.js

 var io = require('socket.io')
   , net = require('net')
+  , assert = require('assert')
   , http = require('http')
@@ -65,3 +66,6 @@ , querystring = require('querystring')
   client.end = function(){
-    request.connection.destroy();
+    if (request.abort)
+      request.abort();
+    else
+      request.connection.destroy();
   };
@@ -81,3 +85,3 @@
   
-  'test connection and handshake': function(assert){
+  'test connection and handshake': function(){
     var _server = server()
@@ -110,3 +114,2 @@ , _socket = socket(_server)
         client.on('message', function(msg){
-          assert.ok(msg == 'from client');
           --trips || close();
@@ -123,3 +126,3 @@ });
   
-  'test clients tracking': function(assert){
+  'test clients tracking': function(){
     var _server = server()
@@ -149,3 +152,3 @@ , _socket = socket(_server);
   
-  'test buffered messages': function(assert){
+  'test buffered messages': function(){
     var _server = server()
@@ -189,3 +192,3 @@ , _socket = socket(_server, { transportOptions: {
   
-  'test hearbeat timeout': function(assert){
+  'test hearbeat timeout': function(){
     var _server = server()
@@ -220,2 +223,2 @@ , _socket = socket(_server, {
   
-};
+};

tests/transports.jsonp-polling.js

 var io = require('socket.io')
   , http = require('http')
   , querystring = require('querystring')
+  , assert = require('assert')
   , port = 7500
@@ -69,3 +70,3 @@ , encode = require('socket.io/utils').encode
   
-  'test connection and handshake': function(assert){
+  'test connection and handshake': function(){
     var _server = server()
@@ -102,3 +103,3 @@ , _socket = socket(_server)
   
-  'test clients tracking': function(assert){
+  'test clients tracking': function(){
     var _server = server()
@@ -118,3 +119,3 @@ , _socket = socket(_server);
   
-  'test buffered messages': function(assert){
+  'test buffered messages': function(){
     var _server = server()
@@ -151,2 +152,2 @@ , _socket = socket(_server, { transportOptions: {
   
-};
+};

tests/transports.websocket.js

 var io = require('socket.io')
+  , assert = require('assert')
   , encode = require('socket.io/utils').encode
@@ -33,3 +34,3 @@ , decode = require('socket.io/utils').decode
   
-  'test connection and handshake': function(assert){
+  'test connection and handshake': function(){
     var _server = server()
@@ -70,3 +71,3 @@ , _socket = socket(_server)
   
-  'test clients tracking': function(assert){
+  'test clients tracking': function(){
     var _server = server()
@@ -92,3 +93,3 @@ , _socket = socket(_server);
   
-  'test buffered messages': function(assert){
+  'test buffered messages': function(){
     var _server = server()
@@ -134,3 +135,3 @@ , _socket = socket(_server, {
   
-  'test json encoding': function(assert){
+  'test json encoding': function(){
     var _server = server()
@@ -169,3 +170,3 @@ , _socket = socket(_server)
   
-  'test hearbeat timeout': function(assert){
+  'test hearbeat timeout': function(){
     var _server = server()
@@ -199,3 +200,3 @@ , _socket = socket(_server, {
   
-  'test client broadcast': function(assert){
+  'test client broadcast': function(){
     var _server = server()
@@ -251,2 +252,2 @@ , _socket = socket(_server);
   
-};
+};

tests/transports.xhr-multipart.js

 var io = require('socket.io')
   , net = require('net')
   , http = require('http')
+  , assert = require('assert')
   , querystring = require('querystring')
@@ -81,3 +82,3 @@ , port = 7300
   
-  'test connection and handshake': function(assert){
+  'test connection and handshake': function(){
     var _server = server()
@@ -122,3 +123,3 @@ , _socket = socket(_server)
   
-  'test clients tracking': function(assert){
+  'test clients tracking': function(){
     var _server = server()
@@ -148,3 +149,3 @@ , _socket = socket(_server);
   
-  'test buffered messages': function(assert){
+  'test buffered messages': function(){
     var _server = server()
@@ -188,3 +189,3 @@ , _socket = socket(_server, { transportOptions: {
   
-  'test hearbeat timeout': function(assert){
+  'test hearbeat timeout': function(){
     var _server = server()
@@ -219,2 +220,2 @@ , _socket = socket(_server, {
   
-};
+};

tests/transports.xhr-polling.js

 var io = require('socket.io')
   , http = require('http')
+  , assert = require('assert')
   , querystring = require('querystring')
@@ -59,3 +60,3 @@ , port = 7400
   
-  'test connection and handshake': function(assert){
+  'test connection and handshake': function(){
     var _server = server()
@@ -92,3 +93,3 @@ , _socket = socket(_server)
   
-  'test clients tracking': function(assert){
+  'test clients tracking': function(){
     var _server = server()
@@ -108,3 +109,3 @@ , _socket = socket(_server);
   
-  'test buffered messages': function(assert){
+  'test buffered messages': function(){
     var _server = server()
@@ -141,2 +142,2 @@ , _socket = socket(_server, { transportOptions: {
   
-};
+};

tests/utils.js

@@ -1,6 +0,7 @@
-var encode = require('socket.io/utils').encode,
+var assert = require('assert')
+    encode = require('socket.io/utils').encode,
     decode = require('socket.io/utils').decode;
 
 module.exports = {
-  'test decoding': function(assert){
+  'test decoding': function(){
     var decoded = decode('~m~5~m~abcde' + '~m~9~m~123456789');
@@ -12,3 +13,3 @@ assert.equal(decoded.length, 2);
   
-  'test decoding of bad framed messages': function(assert){
+  'test decoding of bad framed messages': function(){
     var decoded = decode('~m~5~m~abcde' + '~m\uffsdaasdfd9~m~1aaa23456789');
@@ -20,3 +21,3 @@ assert.equal(decoded.length, 1);
   
-  'test encoding': function(assert){
+  'test encoding': function(){
     assert.equal(encode(['abcde', '123456789']), '~m~5~m~abcde' + '~m~9~m~123456789');
@@ -27,2 +28,2 @@ assert.equal(encode('asdasdsad'), '~m~9~m~asdasdsad');
   }
-};
+};

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

8286295

increased by0.1%

Lines of code

16965

increased by0.46%

Worsened metrics

Number of package files

800

decreased by-0.12%

No dependency changes