update socket.io-client 0.9.1-1

nowelium · Mar 8, 2012 · b88576b · b88576b
1 parent 02f76dd
commit b88576b
Show file tree

Hide file tree

Showing 17 changed files with 199 additions and 63 deletions.
diff --git a/Resources/socket.io/History.md b/Resources/socket.io/History.md
@@ -1,4 +1,45 @@
 
+0.9.1-1 / 2012-03-02
+====================
+
+  * Fixed active-x-obfuscator NPM dependency.
+
+0.9.1 / 2012-03-02
+==================
+
+  * Misc corrections.
+  * Added warning within Firefox about webworker test in test runner.
+  * Update ws dependency [einaros]
+  * Implemented client side heartbeat checks. [felixge]
+  * Improved Firewall support with ActiveX obfuscation. [felixge]
+  * Fixed error handling during connection process. [Outsideris]
+
+0.9.0 / 2012-02-26
+==================
+
+  * Added DS_Store to gitignore.
+  * Updated depedencies.
+  * Bumped uglify
+  * Tweaking code so it doesn't throw an exception when used inside a WebWorker in Firefox
+  * Do not rely on Array.prototype.indexOf as it breaks with pages that use the Prototype.js library.
+  * Windows support landed
+  * Use @einaros ws module instead of the old crap one
+  * Fix for broken closeTimeout and 'IE + xhr' goes into infinite loop on disconnection
+  * Disabled reconnection on error if reconnect option is set to false
+  * Set withCredentials to true before xhr to fix authentication
+  * Clears the timeout from reconnection attempt when there is a successful or failed reconnection. 
+    This fixes the issue of setTimeout's carrying over from previous reconnection
+    and changing (skipping) values of self.reconnectionDelay in the newer reconnection.
+  * Removed decoding of parameters when chunking the query string.
+    This was used later on to construct the url to post to the socket.io server
+    for connection and if we're adding custom parameters of our own to this url
+    (for example for OAuth authentication) they were being sent decoded, which is wrong.
+
+0.8.7 / 2011-11-05
+==================
+
+  * Bumped client
+
 0.8.6 / 2011-10-27 
 ==================
 

diff --git a/Resources/socket.io/bin/builder.js b/Resources/socket.io/bin/builder.js
@@ -10,7 +10,8 @@
 
 var fs = require('fs')
   , socket = require('../lib/io')
-  , uglify = require('uglify-js');
+  , uglify = require('uglify-js')
+  , activeXObfuscator = require('active-x-obfuscator');
 
 /**
  * License headers.
@@ -182,6 +183,8 @@ var builder = module.exports = function () {
         });
       }
 
+      code = activeXObfuscator(code);
+
       // Search for conditional code blocks that need to be removed as they
       // where designed for a server side env. but only if we don't want to
       // make this build node compatible.

diff --git a/Resources/socket.io/dist/socket.io.js b/Resources/socket.io/dist/socket.io.js
diff --git a/Resources/socket.io/dist/socket.io.min.js b/Resources/socket.io/dist/socket.io.min.js
diff --git a/Resources/socket.io/lib/io.js b/Resources/socket.io/lib/io.js
@@ -21,7 +21,7 @@
    * @api public
    */
 
-  io.version = '0.8.7';
+  io.version = '0.9.1-1';
 
   /**
    * Protocol implemented.

diff --git a/Resources/socket.io/lib/socket.js b/Resources/socket.io/lib/socket.js
@@ -1,4 +1,3 @@
-
 /**
  * socket.io
  * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
@@ -149,6 +148,7 @@
       var xhr = io.util.request();
 
       xhr.open('GET', url, true);
+      xhr.withCredentials = true;
       xhr.onreadystatechange = function () {
         if (xhr.readyState == 4) {
           xhr.onreadystatechange = empty;
@@ -208,6 +208,8 @@
         , self.options.transports
       );
 
+      self.setHeartbeatTimeout();
+
       function connect (transports){
         if (self.transport) self.transport.clearTimeouts();
 
@@ -259,6 +261,22 @@
     return this;
   };
 
+  /**
+   * Clears and sets a new heartbeat timeout using the value given by the
+   * server during the handshake.
+   *
+   * @api private
+   */
+
+  Socket.prototype.setHeartbeatTimeout = function () {
+    clearTimeout(this.heartbeatTimeoutTimer);
+
+    var self = this;
+    this.heartbeatTimeoutTimer = setTimeout(function () {
+      self.transport.onClose();
+    }, this.heartbeatTimeout);
+  };
+
   /**
    * Sends a message.
    *
@@ -300,7 +318,7 @@
    */
 
   Socket.prototype.disconnect = function () {
-    if (this.connected) {
+    if (this.connected || this.connecting) {
       if (this.open) {
         this.of('').packet({ type: 'disconnect' });
       }
@@ -385,6 +403,7 @@
 
   Socket.prototype.onClose = function () {
     this.open = false;
+    clearTimeout(this.heartbeatTimeoutTimer);
   };
 
   /**
@@ -405,9 +424,11 @@
 
   Socket.prototype.onError = function (err) {
     if (err && err.advice) {
-      if (err.advice === 'reconnect' && this.connected) {
+      if (err.advice === 'reconnect' && (this.connected || this.connecting)) {
         this.disconnect();
-        this.reconnect();
+        if (this.options.reconnect) {
+          this.reconnect();
+        }
       }
     }
 
@@ -421,19 +442,22 @@
    */
 
   Socket.prototype.onDisconnect = function (reason) {
-    var wasConnected = this.connected;
+    var wasConnected = this.connected
+      , wasConnecting = this.connecting;
 
     this.connected = false;
     this.connecting = false;
     this.open = false;
 
-    if (wasConnected) {
+    if (wasConnected || wasConnecting) {
       this.transport.close();
       this.transport.clearTimeouts();
-      this.publish('disconnect', reason);
+      if (wasConnected) {
+        this.publish('disconnect', reason);
 
-      if ('booted' != reason && this.options.reconnect && !this.reconnecting) {
-        this.reconnect();
+        if ('booted' != reason && this.options.reconnect && !this.reconnecting) {
+          this.reconnect();
+        }
       }
     }
   };
@@ -464,6 +488,8 @@
         self.publish('reconnect', self.transport.name, self.reconnectionAttempts);
       }
 
+      clearTimeout(self.reconnectionTimer);
+
       self.removeListener('connect_failed', maybeReconnect);
       self.removeListener('connect', maybeReconnect);
 

diff --git a/Resources/socket.io/lib/transport.js b/Resources/socket.io/lib/transport.js
@@ -45,7 +45,7 @@
     // If the connection in currently open (or in a reopening state) reset the close 
     // timeout since we have just received data. This check is necessary so
     // that we don't reset the timeout on an explicitly disconnected connection.
-    if (this.connected || this.connecting || this.reconnecting) {
+    if (this.socket.connected || this.socket.connecting || this.socket.reconnecting) {
       this.setCloseTimeout();
     }
 
@@ -70,6 +70,8 @@
    */
 
   Transport.prototype.onPacket = function (packet) {
+    this.socket.setHeartbeatTimeout();
+
     if (packet.type == 'heartbeat') {
       return this.onHeartbeat();
     }

diff --git a/Resources/socket.io/lib/transports/htmlfile.js b/Resources/socket.io/lib/transports/htmlfile.js
@@ -1,4 +1,3 @@
-
 /**
  * socket.io
  * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
@@ -136,7 +135,7 @@
    */
 
   HTMLFile.check = function () {
-    if ('ActiveXObject' in window){
+    if (typeof window != "undefined" && 'ActiveXObject' in window){
       try {
         var a = new ActiveXObject('htmlfile');
         return a && io.Transport.XHR.check();

diff --git a/Resources/socket.io/lib/transports/websocket.js b/Resources/socket.io/lib/transports/websocket.js
@@ -56,7 +56,7 @@
       , Socket
 
     // if node
-    Socket = require('websocket-client').WebSocket;
+    Socket = require('ws');
     // end node
 
     if (!Socket) {

diff --git a/Resources/socket.io/lib/transports/xhr-polling.js b/Resources/socket.io/lib/transports/xhr-polling.js
@@ -88,14 +88,20 @@
 
     function onload () {
       this.onload = empty;
+      this.onerror = empty;
       self.onData(this.responseText);
       self.get();
     };
 
+    function onerror () {
+      self.onClose();
+    };
+
     this.xhr = this.request();
 
     if (global.XDomainRequest && this.xhr instanceof XDomainRequest) {
-      this.xhr.onload = this.xhr.onerror = onload;
+      this.xhr.onload = onload;
+      this.xhr.onerror = onerror;
     } else {
       this.xhr.onreadystatechange = stateChange;
     }
@@ -113,7 +119,7 @@
     io.Transport.XHR.prototype.onClose.call(this);
 
     if (this.xhr) {
-      this.xhr.onreadystatechange = this.xhr.onload = empty;
+      this.xhr.onreadystatechange = this.xhr.onload = this.xhr.onerror = empty;
       try {
         this.xhr.abort();
       } catch(e){}

diff --git a/Resources/socket.io/lib/util.js b/Resources/socket.io/lib/util.js
@@ -1,4 +1,3 @@
-
 /**
  * socket.io
  * Copyright(c) 2011 LearnBoost <dev@learnboost.com>
@@ -106,7 +105,7 @@
     for (; i < l; ++i) {
       kv = params[i].split('=');
       if (kv[0]) {
-        query[kv[0]] = decodeURIComponent(kv[1]);
+        query[kv[0]] = kv[1];
       }
     }
 
@@ -299,10 +298,7 @@
    */
 
   util.indexOf = function (arr, o, i) {
-    if (Array.prototype.indexOf) {
-      return Array.prototype.indexOf.call(arr, o, i);
-    }
-
+
     for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0; 
          i < j && arr[i] !== o; i++) {}
 

diff --git a/Resources/socket.io/package.json b/Resources/socket.io/package.json
@@ -1,7 +1,7 @@
 {
     "name": "socket.io-client"
   , "description": "Socket.IO client for the browser and node.js"
-  , "version": "0.8.7"
+  , "version": "0.9.1-1"
   , "main" : "./lib/io.js"
   , "browserify": "./dist/socket.io.js"
   , "homepage": "http://socket.io"
@@ -18,17 +18,18 @@
       , "url": "https://github.com/LearnBoost/socket.io-client.git"
     }
   , "dependencies": {
-        "uglify-js": "1.0.6"
-      , "websocket-client": "1.0.0"
+        "uglify-js": "1.2.5"
+      , "ws": "0.4.x"
       , "xmlhttprequest": "1.2.2"
+      , "active-x-obfuscator": "0.0.1"
     }
   , "devDependencies": {
-        "expresso": "0.7.7"
-      , "express": "2.3.11"
-      , "jade": "0.12.1"
-      , "stylus": "0.13.3"
-      , "socket.io": "0.8.7"
-      , "socket.io-client": "0.8.7"
+        "expresso": "*"
+      , "express": "2.5.x"
+      , "jade": "*"
+      , "stylus": "*"
+      , "socket.io": "0.9.1-1"
+      , "socket.io-client": "0.9.1-1"
     }
   , "engines": { "node": ">= 0.4.0" }
 }
diff --git a/Resources/socket.io/support/test-runner/app.js b/Resources/socket.io/support/test-runner/app.js
@@ -54,6 +54,7 @@ app.get('/', function (req, res) {
   res.render('index', {
       layout: false
     , testsPorts: testsPorts
+    , transport: transport
   });
 });
 

diff --git a/Resources/socket.io/support/test-runner/index.jade b/Resources/socket.io/support/test-runner/index.jade
@@ -26,3 +26,13 @@ html
     title Socket.IO tests runner
   body
     h2 Socket.IO test runner
+
+    if ('websocket' == transport)
+      #warn-ff: p.warn
+      script
+        if ($.browser.mozilla)
+          $(function () {
+            $('#warn-ff p').html('<b>WARN:</b> WebSocket within WebWorker '
+              + '<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=504553">'
+              + 'expected to fail</a> on Firefox');
+          });
diff --git a/Resources/socket.io/support/test-runner/public/javascript/should.js b/Resources/socket.io/support/test-runner/public/javascript/should.js
@@ -0,0 +1 @@
+../../../should.js
diff --git a/Resources/socket.io/support/test-runner/public/stylesheets/main.css b/Resources/socket.io/support/test-runner/public/stylesheets/main.css
@@ -1,5 +1,5 @@
 body {
-  font-family: "Helvetica", "Helvetica Neue", sans-serif;
+  font-family: 'Helvetica', 'Helvetica Neue', sans-serif;
   margin: 0;
   color: #333;
   font-size: 16px;
@@ -114,3 +114,14 @@ h2 a {
   padding-left: 14px;
   padding-bottom: 5px;
 }
+.warn {
+  background: #ffefc6;
+  padding: 5px;
+  text-align: center;
+  font-size: 15px;
+  text-shadow: 0 1px 0 #fff;
+  margin-bottom: 30px;
+}
+.warn b {
+  color: #ae0000;
+}
diff --git a/Resources/socket.io/support/test-runner/public/stylesheets/main.styl b/Resources/socket.io/support/test-runner/public/stylesheets/main.styl
@@ -99,3 +99,13 @@ h2
         line-height 5px
         padding-left 14px
         padding-bottom 5px
+
+.warn
+  background: #FFEFC6
+  padding: 5px
+  text-align: center
+  font-size: 15px
+  text-shadow: 0 1px 0 white
+  margin-bottom: 30px
+  b
+    color: #AE0000