Update web-socket-js to bb5797cad.

Syncs with same change to websockify (7534574a2f).

Primary change is removal of FABridge interface.

Seems to improve overall latency by perhaps 10%. Also, the slowdown
over time in Opera is about half as bad (but still there).

include/web-socket-js/web_socket.js

@@ -12,8 +12,8 @@
     console = {log: function(){ }, error: function(){ }};
   }
   
-  if (!swfobject.hasFlashPlayerVersion("9.0.0")) {
-    console.error("Flash Player is not installed.");
+  if (!swfobject.hasFlashPlayerVersion("10.0.0")) {
+    console.error("Flash Player >= 10.0.0 is required.");
     return;
   }
   if (location.protocol == "file:") {
@@ -23,33 +23,38 @@
       "Open the page via Web server i.e. http://...");
   }
 
+  /**
+   * This class represents a faux web socket.
+   * @param {string} url
+   * @param {string} protocol
+   * @param {string} proxyHost
+   * @param {int} proxyPort
+   * @param {string} headers
+   */
   WebSocket = function(url, protocol, proxyHost, proxyPort, headers) {
     var self = this;
+    self.__id = WebSocket.__nextId++;
+    WebSocket.__instances[self.__id] = self;
     self.readyState = WebSocket.CONNECTING;
     self.bufferedAmount = 0;
+    self.__events = {};
     // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
     // Otherwise, when onopen fires immediately, onopen is called before it is set.
     setTimeout(function() {
       WebSocket.__addTask(function() {
-        self.__createFlash(url, protocol, proxyHost, proxyPort, headers);
+        WebSocket.__flash.create(
+            self.__id, url, protocol, proxyHost || null, proxyPort || 0, headers || null);
       });
     }, 0);
   };
-  
-  WebSocket.prototype.__createFlash = function(url, protocol, proxyHost, proxyPort, headers) {
-    var self = this;
-    self.__flash =
-      WebSocket.__flash.create(url, protocol, proxyHost || null, proxyPort || 0, headers || null);
-    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);
-    });
-    //console.log("[WebSocket] Flash object is ready");
-  };
 
+  /**
+   * Send data to the web socket.
+   * @param {string} data  The data to send to the socket.
+   * @return {boolean}  True for success, false for failure.
+   */
   WebSocket.prototype.send = function(data) {
-    if (!this.__flash || this.readyState == WebSocket.CONNECTING) {
+    if (this.readyState == WebSocket.CONNECTING) {
       throw "INVALID_STATE_ERR: Web Socket connection has not been established";
     }
     // We use encodeURIComponent() here, because FABridge doesn't work if
@@ -58,7 +63,9 @@
     // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
     // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
     // preserve all Unicode characters either e.g. "\uffff" in Firefox.
-    var result = this.__flash.send(encodeURIComponent(data));
+    // Note by wtritch: Hopefully this will not be necessary using ExternalInterface.  Will require
+    // additional testing.
+    var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data));
     if (result < 0) { // success
       return true;
     } else {
@@ -67,21 +74,15 @@
     }
   };
 
+  /**
+   * Close this web socket gracefully.
+   */
   WebSocket.prototype.close = function() {
-    var self = this;
-    if (!self.__flash) return;
-    if (self.readyState == WebSocket.CLOSED || self.readyState == WebSocket.CLOSING) return;
-    self.__flash.close();
-    // Sets/calls them manually here because Flash WebSocketConnection.close cannot fire events
-    // which causes weird error:
-    // > You are trying to call recursively into the Flash Player which is not allowed.
-    self.readyState = WebSocket.CLOSED;
-    if (self.__timer) clearInterval(self.__timer);
-    if (self.onclose) {
-       // Make it asynchronous so that it looks more like an actual
-       // close event
-       setTimeout(self.onclose, 0);
-     }
+    if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) {
+      return;
+    }
+    this.readyState = WebSocket.CLOSING;
+    WebSocket.__flash.close(this.__id);
   };
 
   /**
@@ -89,19 +90,12 @@
    *
    * @param {string} type
    * @param {function} listener
-   * @param {boolean} useCapture !NB Not implemented yet
+   * @param {boolean} useCapture
    * @return void
    */
   WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
-    if (!('__events' in this)) {
-      this.__events = {};
-    }
     if (!(type in this.__events)) {
       this.__events[type] = [];
-      if ('function' == typeof this['on' + type]) {
-        this.__events[type].defaultHandler = this['on' + type];
-        this['on' + type] = this.__createEventHandler(this, type);
-      }
     }
     this.__events[type].push(listener);
   };
@@ -111,17 +105,15 @@
    *
    * @param {string} type
    * @param {function} listener
-   * @param {boolean} useCapture NB! Not implemented yet
+   * @param {boolean} useCapture
    * @return void
    */
   WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
-    if (!('__events' in this)) {
-      this.__events = {};
-    }
     if (!(type in this.__events)) return;
-    for (var i = this.__events.length; i > -1; --i) {
-      if (listener === this.__events[type][i]) {
-        this.__events[type].splice(i, 1);
+    var events = this.__events[type];
+    for (var i = events.length - 1; i >= 0; --i) {
+      if (events[i] === listener) {
+        events.splice(i, 1);
         break;
       }
     }
@@ -130,164 +122,93 @@
   /**
    * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
    *
-   * @param {WebSocketEvent} event
+   * @param {Event} event
    * @return void
    */
   WebSocket.prototype.dispatchEvent = function(event) {
-    if (!('__events' in this)) throw 'UNSPECIFIED_EVENT_TYPE_ERR';
-    if (!(event.type in this.__events)) throw 'UNSPECIFIED_EVENT_TYPE_ERR';
-
-    for (var i = 0, l = this.__events[event.type].length; i < l; ++ i) {
-      this.__events[event.type][i](event);
-      if (event.cancelBubble) break;
-    }
-
-    if (false !== event.returnValue &&
-        'function' == typeof this.__events[event.type].defaultHandler)
-    {
-      this.__events[event.type].defaultHandler(event);
+    var events = this.__events[event.type] || [];
+    for (var i = 0; i < events.length; ++i) {
+      events[i](event);
     }
+    var handler = this["on" + event.type];
+    if (handler) handler(event);
   };
 
-  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 events = this.__flash.receiveEvents();
-    for (var i = 0; i < events.length; i++) {
-      try {
-        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.
-            var that = this;
-            this.__timer = setInterval(function () {
-              that.__handleEvents();
-            }, 500);
-          }
-          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;
-        }
-      } catch (e) {
-        console.error(e.toString());
-      }
+  /**
+   * Handles an event from Flash.
+   * @param {Object} flashEvent
+   */
+  WebSocket.prototype.__handleEvent = function(flashEvent) {
+    if ("readyState" in flashEvent) {
+      this.readyState = flashEvent.readyState;
+    }
+    
+    var jsEvent;
+    if (flashEvent.type == "open" || flashEvent.type == "error") {
+      jsEvent = this.__createSimpleEvent(flashEvent.type);
+    } else if (flashEvent.type == "close") {
+      // TODO implement jsEvent.wasClean
+      jsEvent = this.__createSimpleEvent("close");
+    } else if (flashEvent.type == "message") {
+      var data = decodeURIComponent(flashEvent.message);
+      jsEvent = this.__createMessageEvent("message", data);
+    } else {
+      throw "unknown event type: " + flashEvent.type;
+    }
+    
+    this.dispatchEvent(jsEvent);
+  };
+  
+  WebSocket.prototype.__createSimpleEvent = function(type) {
+    if (document.createEvent && window.Event) {
+      var event = document.createEvent("Event");
+      event.initEvent(type, false, false);
+      return event;
+    } else {
+      return {type: type, bubbles: false, cancelable: false};
+    }
+  };
+  
+  WebSocket.prototype.__createMessageEvent = function(type, data) {
+    if (document.createEvent && window.MessageEvent && !window.opera) {
+      var event = document.createEvent("MessageEvent");
+      event.initMessageEvent("message", false, false, data, null, null, window, null);
+      return event;
+    } else {
+      // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
+      return {type: type, data: data, bubbles: false, cancelable: false};
     }
   };
   
   /**
-   * @param {object} object
-   * @param {string} type
+   * Define the WebSocket readyState enumeration.
    */
-  WebSocket.prototype.__createEventHandler = function(object, type) {
-    return function(data) {
-      var event = new WebSocketEvent();
-      event.initEvent(type, true, true);
-      event.target = event.currentTarget = object;
-      for (var key in data) {
-        event[key] = data[key];
-      }
-      object.dispatchEvent(event, arguments);
-    };
-  };
-
-  /**
-   * Basic implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface">DOM 2 EventInterface</a>}
-   *
-   * @class
-   * @constructor
-   */
-  function WebSocketEvent(){}
-
-  /**
-   *
-   * @type boolean
-   */
-  WebSocketEvent.prototype.cancelable = true;
-
-  /**
-   *
-   * @type boolean
-   */
-  WebSocketEvent.prototype.cancelBubble = false;
-
-  /**
-   *
-   * @return void
-   */
-  WebSocketEvent.prototype.preventDefault = function() {
-    if (this.cancelable) {
-      this.returnValue = false;
-    }
-  };
-
-  /**
-   *
-   * @return void
-   */
-  WebSocketEvent.prototype.stopPropagation = function() {
-    this.cancelBubble = true;
-  };
-
-  /**
-   *
-   * @param {string} eventTypeArg
-   * @param {boolean} canBubbleArg
-   * @param {boolean} cancelableArg
-   * @return void
-   */
-  WebSocketEvent.prototype.initEvent = function(eventTypeArg, canBubbleArg, cancelableArg) {
-    this.type = eventTypeArg;
-    this.cancelable = cancelableArg;
-    this.timeStamp = new Date();
-  };
-
-
   WebSocket.CONNECTING = 0;
   WebSocket.OPEN = 1;
   WebSocket.CLOSING = 2;
   WebSocket.CLOSED = 3;
 
+  WebSocket.__flash = null;
+  WebSocket.__instances = {};
   WebSocket.__tasks = [];
-
-  WebSocket.loadFlashPolicyFile = function(url) {
+  WebSocket.__nextId = 0;
+  
+  /**
+   * Load a new flash security policy file.
+   * @param {string} url
+   */
+  WebSocket.loadFlashPolicyFile = function(url){
     WebSocket.__addTask(function() {
       WebSocket.__flash.loadManualPolicyFile(url);
     });
-  }
+  };
 
+  /**
+   * Loads WebSocketMain.swf and creates WebSocketMain object in Flash.
+   */
   WebSocket.__initialize = function() {
+    if (WebSocket.__flash) return;
+    
     if (WebSocket.__swfLocation) {
       // For backword compatibility.
       window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
@@ -318,29 +239,70 @@
     // See this article for hasPriority:
     // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
     swfobject.embedSWF(
-      WEB_SOCKET_SWF_LOCATION, "webSocketFlash",
-      "1" /* width */, "1" /* height */, "9.0.0" /* SWF version */,
-      null, {bridgeName: "webSocket"}, {hasPriority: true, allowScriptAccess: "always"}, null,
+      WEB_SOCKET_SWF_LOCATION,
+      "webSocketFlash",
+      "1" /* width */,
+      "1" /* height */,
+      "10.0.0" /* SWF version */,
+      null,
+      null,
+      {hasPriority: true, swliveconnect : true, allowScriptAccess: "always"},
+      null,
       function(e) {
-        if (!e.success) console.error("[WebSocket] swfobject.embedSWF failed");
-      }
-    );
-    FABridge.addInitializationCallback("webSocket", function() {
-      try {
-        //console.log("[WebSocket] FABridge initializad");
-        WebSocket.__flash = FABridge.webSocket.root();
-        WebSocket.__flash.setCallerUrl(location.href);
-        WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
-        for (var i = 0; i < WebSocket.__tasks.length; ++i) {
-          WebSocket.__tasks[i]();
+        if (!e.success) {
+          console.error("[WebSocket] swfobject.embedSWF failed");
         }
-        WebSocket.__tasks = [];
-      } catch (e) {
-        console.error("[WebSocket] " + e.toString());
-      }
-    });
+      });
   };
-
+  
+  /**
+   * Called by Flash to notify JS that it's fully loaded and ready
+   * for communication.
+   */
+  WebSocket.__onFlashInitialized = function() {
+    // We need to set a timeout here to avoid round-trip calls
+    // to flash during the initialization process.
+    setTimeout(function() {
+      WebSocket.__flash = document.getElementById("webSocketFlash");
+      WebSocket.__flash.setCallerUrl(location.href);
+      WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
+      for (var i = 0; i < WebSocket.__tasks.length; ++i) {
+        WebSocket.__tasks[i]();
+      }
+      WebSocket.__tasks = [];
+    }, 0);
+  };
+  
+  /**
+   * Called by Flash to notify WebSockets events are fired.
+   */
+  WebSocket.__onFlashEvent = function() {
+    setTimeout(function() {
+      try {
+        // 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 events = WebSocket.__flash.receiveEvents();
+        for (var i = 0; i < events.length; ++i) {
+          WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }, 0);
+    return true;
+  };
+  
+  // Called by Flash.
+  WebSocket.__log = function(message) {
+    console.log(decodeURIComponent(message));
+  };
+  
+  // Called by Flash.
+  WebSocket.__error = function(message) {
+    console.error(decodeURIComponent(message));
+  };
+  
   WebSocket.__addTask = function(task) {
     if (WebSocket.__flash) {
       task();
@@ -349,28 +311,30 @@
     }
   };
   
+  /**
+   * Test if the browser is running flash lite.
+   * @return {boolean} True if flash lite is running, false otherwise.
+   */
   WebSocket.__isFlashLite = function() {
-    if (!window.navigator || !window.navigator.mimeTypes) return false;
+    if (!window.navigator || !window.navigator.mimeTypes) {
+      return false;
+    }
     var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
-    if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) return false;
+    if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) {
+      return false;
+    }
     return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
   };
-
-  // called from Flash
-  window.webSocketLog = function(message) {
-    console.log(decodeURIComponent(message));
-  };
-
-  // called from Flash
-  window.webSocketError = function(message) {
-    console.error(decodeURIComponent(message));
-  };
-
+  
   if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
     if (window.addEventListener) {
-      window.addEventListener("load", WebSocket.__initialize, false);
+      window.addEventListener("load", function(){
+        WebSocket.__initialize();
+      }, false);
     } else {
-      window.attachEvent("onload", WebSocket.__initialize);
+      window.attachEvent("onload", function(){
+        WebSocket.__initialize();
+      });
     }
   }