faye-rails 1.0.10 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2976de989429620397c37b316df564e99a52cd80
-  data.tar.gz: 3055dfe04ebf7305c89c2c9a7a8a5b2ec388021d
+  metadata.gz: 7bd83a3a2e962e010685339f78b0a1eb76e03566
+  data.tar.gz: abf0cbaa64b7c53a407aa550eba83de311a5e35d
 SHA512:
-  metadata.gz: ae291a6cabe521c879f2867b828aebae22069f309b6acef2fa332709557e82ba4396a70c9e19f45b42e713c70d49bb2f234950a931fcd81638e6514cc924081c
-  data.tar.gz: f39fb18c87eeafeb8d68269312dddc6f8a792992a8ff107001accdbb8eaa206c37b33d5486adce01f22ca020a2b11bda3c855fd222b02eb77c7ed9f5f84f41da
+  metadata.gz: 3b3a36d23a807a8bab2443cafb911f1d14f0e57cf5d25e5bb3b1248345ef56a97d43f294d2c33c98eb8e8fbe9c110e830fde936c05e0da6143def36920a71b4d
+  data.tar.gz: 544853c580199160d8bfcf19530c574ea17585346b2b7cbd942be8a9eb852105b7bdfde4106814fc4a864d42fcb871422ed53652d6574d6ee4255f10ad61314b

data/README.md

@@ -149,6 +149,16 @@ App::Application.routes.draw do
 end
 ```
 
+# Running on Phusion Passenger
+
+If you want to run faye-rails on passenger, make sure you are using passenger 4.0 standalone or passenger 4.0 on nginx 1.4+ for nginx with websocket support. Passenger on apache is not supported. Because passenger uses a multi-process model, you must use the faye redis backend. Add `gem 'faye-redis'` to your Gemfile and configure your routes like this:
+
+```ruby
+App::Application.routes.draw do
+  faye_server '/faye', timeout: 25, server: 'passenger', engine: {type: Faye::Redis, host: 'localhost'}
+end
+```
+
 # Thanks.
 
 Thanks to James Coglan for the excellent Faye Bayeux implementetation and great support for Faye users.

data/lib/faye-rails.rb

@@ -1,6 +1,6 @@
 require 'faye'
 require 'faye-rails/version'
-require 'faye-rails/routing_hooks'
+require 'faye-rails/middleware'
 require 'faye-rails/server_list'
 
 module FayeRails

data/lib/faye-rails/middleware.rb

@@ -0,0 +1,54 @@
+module FayeRails
+  class Middleware
+
+    DEFAULTS = {
+      :mount => '/faye',
+      :timeout => 25,
+      :extensions => nil,
+      :engine => nil,
+      :ping => nil,
+      :server => 'thin'
+    }
+
+    def initialize(app, options={}, &block)
+      @app = app
+
+      if Rails.application.config.middleware.include? Rack::Lock
+        message = <<-EOF
+
+WARNING: You have the Rack::Lock middlware enabled.
+
+faye-rails can't work when Rack::Lock is enabled, as it will cause
+a deadlock on every request.
+
+Please add:
+
+    config.middleware.delete Rack::Lock
+
+to your application config in application.rb
+
+        EOF
+        Rails.logger.fatal message
+        $stdout.puts message
+        exit 1
+      end
+
+      unknown_options = options.keys - DEFAULTS.keys
+      if unknown_options.one?
+        raise ArgumentError, "Unknown option: #{unknown_options.first}."
+      elsif unknown_options.any?
+        raise ArgumentError, "Unknown options: #{unknown_options * ", "}."
+      end
+
+      options = DEFAULTS.merge(options)
+      Faye::WebSocket.load_adapter(options.delete(:server))
+
+      @adapter = FayeRails::RackAdapter.new(@app, options)
+      @adapter.instance_eval(&block) if block.respond_to? :call
+    end
+
+    def call(env)
+      @adapter.call(env)
+    end
+  end
+end

data/lib/faye-rails/version.rb

@@ -1,3 +1,3 @@
 module FayeRails
-  VERSION = "1.0.10"
+  VERSION = "2.0.0"
 end

data/vendor/assets/javascripts/faye-browser-min.js

@@ -1,4 +1,5 @@
 (function() {
-'use strict';var Faye={VERSION:'0.8.9',BAYEUX_VERSION:'1.0',ID_LENGTH:160,JSONP_CALLBACK:'jsonpcallback',CONNECTION_TYPES:['long-polling','cross-origin-long-polling','callback-polling','websocket','eventsource','in-process'],MANDATORY_CONNECTION_TYPES:['long-polling','callback-polling','in-process'],ENV:(typeof global==='undefined')?window:global,extend:function(a,b,d){if(!b)return a;for(var f in b){if(!b.hasOwnProperty(f))continue;if(a.hasOwnProperty(f)&&d===false)continue;if(a[f]!==b[f])a[f]=b[f]}return a},random:function(a){a=a||this.ID_LENGTH;if(a>32){var b=Math.ceil(a/32),d='';while(b--)d+=this.random(32);var f=d.split(''),g='';while(f.length>0)g+=f.pop();return g}var h=Math.pow(2,a)-1,i=h.toString(36).length,d=Math.floor(Math.random()*h).toString(36);while(d.length<i)d='0'+d;return d},clientIdFromMessages:function(a){var b=[].concat(a)[0];return b&&b.clientId},copyObject:function(a){var b,d,f;if(a instanceof Array){b=[];d=a.length;while(d--)b[d]=Faye.copyObject(a[d]);return b}else if(typeof a==='object'){b=(a===null)?null:{};for(f in a)b[f]=Faye.copyObject(a[f]);return b}else{return a}},commonElement:function(a,b){for(var d=0,f=a.length;d<f;d++){if(this.indexOf(b,a[d])!==-1)return a[d]}return null},indexOf:function(a,b){if(a.indexOf)return a.indexOf(b);for(var d=0,f=a.length;d<f;d++){if(a[d]===b)return d}return-1},map:function(a,b,d){if(a.map)return a.map(b,d);var f=[];if(a instanceof Array){for(var g=0,h=a.length;g<h;g++){f.push(b.call(d||null,a[g],g))}}else{for(var i in a){if(!a.hasOwnProperty(i))continue;f.push(b.call(d||null,i,a[i]))}}return f},filter:function(a,b,d){var f=[];for(var g=0,h=a.length;g<h;g++){if(b.call(d||null,a[g],g))f.push(a[g])}return f},asyncEach:function(a,b,d,f){var g=a.length,h=-1,i=0,k=false;var j=function(){i-=1;h+=1;if(h===g)return d&&d.call(f);b(a[h],n)};var m=function(){if(k)return;k=true;while(i>0)j();k=false};var n=function(){i+=1;m()};n()},toJSON:function(a){if(this.stringify)return this.stringify(a,function(key,value){return(this[key]instanceof Array)?this[key]:value});return JSON.stringify(a)},logger:function(a){if(typeof console!=='undefined')console.log(a)},timestamp:function(){var b=new Date(),d=b.getFullYear(),f=b.getMonth()+1,g=b.getDate(),h=b.getHours(),i=b.getMinutes(),k=b.getSeconds();var j=function(a){return a<10?'0'+a:String(a)};return j(d)+'-'+j(f)+'-'+j(g)+' '+j(h)+':'+j(i)+':'+j(k)}};if(typeof window!=='undefined')window.Faye=Faye;Faye.Class=function(a,b){if(typeof a!=='function'){b=a;a=Object}var d=function(){if(!this.initialize)return this;return this.initialize.apply(this,arguments)||this};var f=function(){};f.prototype=a.prototype;d.prototype=new f();Faye.extend(d.prototype,b);return d};Faye.Namespace=Faye.Class({initialize:function(){this._e={}},exists:function(a){return this._e.hasOwnProperty(a)},generate:function(){var a=Faye.random();while(this._e.hasOwnProperty(a))a=Faye.random();return this._e[a]=a},release:function(a){delete this._e[a]}});Faye.Error=Faye.Class({initialize:function(a,b,d){this.code=a;this.params=Array.prototype.slice.call(b);this.message=d},toString:function(){return this.code+':'+this.params.join(',')+':'+this.message}});Faye.Error.parse=function(a){a=a||'';if(!Faye.Grammar.ERROR.test(a))return new this(null,[],a);var b=a.split(':'),d=parseInt(b[0]),f=b[1].split(','),a=b[2];return new this(d,f,a)};Faye.Error.versionMismatch=function(){return new this(300,arguments,"Version mismatch").toString()};Faye.Error.conntypeMismatch=function(){return new this(301,arguments,"Connection types not supported").toString()};Faye.Error.extMismatch=function(){return new this(302,arguments,"Extension mismatch").toString()};Faye.Error.badRequest=function(){return new this(400,arguments,"Bad request").toString()};Faye.Error.clientUnknown=function(){return new this(401,arguments,"Unknown client").toString()};Faye.Error.parameterMissing=function(){return new this(402,arguments,"Missing required parameter").toString()};Faye.Error.channelForbidden=function(){return new this(403,arguments,"Forbidden channel").toString()};Faye.Error.channelUnknown=function(){return new this(404,arguments,"Unknown channel").toString()};Faye.Error.channelInvalid=function(){return new this(405,arguments,"Invalid channel").toString()};Faye.Error.extUnknown=function(){return new this(406,arguments,"Unknown extension").toString()};Faye.Error.publishFailed=function(){return new this(407,arguments,"Failed to publish").toString()};Faye.Error.serverError=function(){return new this(500,arguments,"Internal server error").toString()};Faye.Deferrable={callback:function(a,b){if(!a)return;if(this._v==='succeeded')return a.apply(b,this._j);this._k=this._k||[];this._k.push([a,b])},timeout:function(a,b){var d=this;var f=Faye.ENV.setTimeout(function(){d.setDeferredStatus('failed',b)},a*1000);this._w=f},errback:function(a,b){if(!a)return;if(this._v==='failed')return a.apply(b,this._j);this._l=this._l||[];this._l.push([a,b])},setDeferredStatus:function(){if(this._w)Faye.ENV.clearTimeout(this._w);var a=Array.prototype.slice.call(arguments),b=a.shift(),d;this._v=b;this._j=a;if(b==='succeeded')d=this._k;else if(b==='failed')d=this._l;if(!d)return;var f;while(f=d.shift())f[0].apply(f[1],this._j)}};Faye.Publisher={countListeners:function(a){if(!this._4||!this._4[a])return 0;return this._4[a].length},bind:function(a,b,d){this._4=this._4||{};var f=this._4[a]=this._4[a]||[];f.push([b,d])},unbind:function(a,b,d){if(!this._4||!this._4[a])return;if(!b){delete this._4[a];return}var f=this._4[a],g=f.length;while(g--){if(b!==f[g][0])continue;if(d&&f[g][1]!==d)continue;f.splice(g,1)}},trigger:function(){var a=Array.prototype.slice.call(arguments),b=a.shift();if(!this._4||!this._4[b])return;var d=this._4[b].slice(),f;for(var g=0,h=d.length;g<h;g++){f=d[g];f[0].apply(f[1],a)}}};Faye.Timeouts={addTimeout:function(a,b,d,f){this._6=this._6||{};if(this._6.hasOwnProperty(a))return;var g=this;this._6[a]=Faye.ENV.setTimeout(function(){delete g._6[a];d.call(f)},1000*b)},removeTimeout:function(a){this._6=this._6||{};var b=this._6[a];if(!b)return;clearTimeout(b);delete this._6[a]}};Faye.Logging={LOG_LEVELS:{error:3,warn:2,info:1,debug:0},logLevel:'error',log:function(a,b){if(!Faye.logger)return;var d=Faye.Logging.LOG_LEVELS;if(d[Faye.Logging.logLevel]>d[b])return;var a=Array.prototype.slice.apply(a),f=' ['+b.toUpperCase()+'] [Faye',g=this.className,h=a.shift().replace(/\?/g,function(){try{return Faye.toJSON(a.shift())}catch(e){return'[Object]'}});for(var i in Faye){if(g)continue;if(typeof Faye[i]!=='function')continue;if(this instanceof Faye[i])g=i}if(g)f+='.'+g;f+='] ';Faye.logger(Faye.timestamp()+f+h)}};(function(){for(var d in Faye.Logging.LOG_LEVELS)(function(a,b){Faye.Logging[a]=function(){this.log(arguments,a)}})(d,Faye.Logging.LOG_LEVELS[d])})();Faye.Grammar={LOWALPHA:/^[a-z]$/,UPALPHA:/^[A-Z]$/,ALPHA:/^([a-z]|[A-Z])$/,DIGIT:/^[0-9]$/,ALPHANUM:/^(([a-z]|[A-Z])|[0-9])$/,MARK:/^(\-|\_|\!|\~|\(|\)|\$|\@)$/,STRING:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*$/,TOKEN:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+$/,INTEGER:/^([0-9])+$/,CHANNEL_SEGMENT:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+$/,CHANNEL_SEGMENTS:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,CHANNEL_NAME:/^\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,WILD_CARD:/^\*{1,2}$/,CHANNEL_PATTERN:/^(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*\/\*{1,2}$/,VERSION_ELEMENT:/^(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*$/,VERSION:/^([0-9])+(\.(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*)*$/,CLIENT_ID:/^((([a-z]|[A-Z])|[0-9]))+$/,ID:/^((([a-z]|[A-Z])|[0-9]))+$/,ERROR_MESSAGE:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*$/,ERROR_ARGS:/^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*$/,ERROR_CODE:/^[0-9][0-9][0-9]$/,ERROR:/^([0-9][0-9][0-9]:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*|[0-9][0-9][0-9]::(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/};Faye.Extensible={addExtension:function(a){this._7=this._7||[];this._7.push(a);if(a.added)a.added(this)},removeExtension:function(a){if(!this._7)return;var b=this._7.length;while(b--){if(this._7[b]!==a)continue;this._7.splice(b,1);if(a.removed)a.removed(this)}},pipeThroughExtensions:function(d,f,g,h){this.debug('Passing through ? extensions: ?',d,f);if(!this._7)return g.call(h,f);var i=this._7.slice();var k=function(a){if(!a)return g.call(h,a);var b=i.shift();if(!b)return g.call(h,a);if(b[d])b[d](a,k);else k(a)};k(f)}};Faye.extend(Faye.Extensible,Faye.Logging);Faye.Channel=Faye.Class({initialize:function(a){this.id=this.name=a},push:function(a){this.trigger('message',a)},isUnused:function(){return this.countListeners('message')===0}});Faye.extend(Faye.Channel.prototype,Faye.Publisher);Faye.extend(Faye.Channel,{HANDSHAKE:'/meta/handshake',CONNECT:'/meta/connect',SUBSCRIBE:'/meta/subscribe',UNSUBSCRIBE:'/meta/unsubscribe',DISCONNECT:'/meta/disconnect',META:'meta',SERVICE:'service',expand:function(a){var b=this.parse(a),d=['/**',a];var f=b.slice();f[f.length-1]='*';d.push(this.unparse(f));for(var g=1,h=b.length;g<h;g++){f=b.slice(0,g);f.push('**');d.push(this.unparse(f))}return d},isValid:function(a){return Faye.Grammar.CHANNEL_NAME.test(a)||Faye.Grammar.CHANNEL_PATTERN.test(a)},parse:function(a){if(!this.isValid(a))return null;return a.split('/').slice(1)},unparse:function(a){return'/'+a.join('/')},isMeta:function(a){var b=this.parse(a);return b?(b[0]===this.META):null},isService:function(a){var b=this.parse(a);return b?(b[0]===this.SERVICE):null},isSubscribable:function(a){if(!this.isValid(a))return null;return!this.isMeta(a)&&!this.isService(a)},Set:Faye.Class({initialize:function(){this._2={}},getKeys:function(){var a=[];for(var b in this._2)a.push(b);return a},remove:function(a){delete this._2[a]},hasSubscription:function(a){return this._2.hasOwnProperty(a)},subscribe:function(a,b,d){if(!b)return;var f;for(var g=0,h=a.length;g<h;g++){f=a[g];var i=this._2[f]=this._2[f]||new Faye.Channel(f);i.bind('message',b,d)}},unsubscribe:function(a,b,d){var f=this._2[a];if(!f)return false;f.unbind('message',b,d);if(f.isUnused()){this.remove(a);return true}else{return false}},distributeMessage:function(a){var b=Faye.Channel.expand(a.channel);for(var d=0,f=b.length;d<f;d++){var g=this._2[b[d]];if(g)g.trigger('message',a.data)}}})});Faye.Publication=Faye.Class(Faye.Deferrable);Faye.Subscription=Faye.Class({initialize:function(a,b,d,f){this._8=a;this._2=b;this._m=d;this._n=f;this._x=false},cancel:function(){if(this._x)return;this._8.unsubscribe(this._2,this._m,this._n);this._x=true},unsubscribe:function(){this.cancel()}});Faye.extend(Faye.Subscription.prototype,Faye.Deferrable);Faye.Client=Faye.Class({UNCONNECTED:1,CONNECTING:2,CONNECTED:3,DISCONNECTED:4,HANDSHAKE:'handshake',RETRY:'retry',NONE:'none',CONNECTION_TIMEOUT:60.0,DEFAULT_RETRY:5.0,DEFAULT_ENDPOINT:'/bayeux',INTERVAL:0.0,initialize:function(a,b){this.info('New client created for ?',a);this._f=b||{};this.endpoint=a||this.DEFAULT_ENDPOINT;this.endpoints=this._f.endpoints||{};this.transports={};this._D=Faye.CookieJar&&new Faye.CookieJar();this._y={};this._o=[];this.retry=this._f.retry||this.DEFAULT_RETRY;this._1=this.UNCONNECTED;this._2=new Faye.Channel.Set();this._g=0;this._p={};this._9={reconnect:this.RETRY,interval:1000*(this._f.interval||this.INTERVAL),timeout:1000*(this._f.timeout||this.CONNECTION_TIMEOUT)};if(Faye.Event)Faye.Event.on(Faye.ENV,'beforeunload',function(){if(Faye.indexOf(this._o,'autodisconnect')<0)this.disconnect()},this)},disable:function(a){this._o.push(a)},setHeader:function(a,b){this._y[a]=b},getClientId:function(){return this._0},getState:function(){switch(this._1){case this.UNCONNECTED:return'UNCONNECTED';case this.CONNECTING:return'CONNECTING';case this.CONNECTED:return'CONNECTED';case this.DISCONNECTED:return'DISCONNECTED'}},handshake:function(b,d){if(this._9.reconnect===this.NONE)return;if(this._1!==this.UNCONNECTED)return;this._1=this.CONNECTING;var f=this;this.info('Initiating handshake with ?',this.endpoint);this._z(Faye.MANDATORY_CONNECTION_TYPES);this._a({channel:Faye.Channel.HANDSHAKE,version:Faye.BAYEUX_VERSION,supportedConnectionTypes:[this._5.connectionType]},function(a){if(a.successful){this._1=this.CONNECTED;this._0=a.clientId;this._z(a.supportedConnectionTypes);this.info('Handshake successful: ?',this._0);this.subscribe(this._2.getKeys(),true);if(b)b.call(d)}else{this.info('Handshake unsuccessful');Faye.ENV.setTimeout(function(){f.handshake(b,d)},this._9.interval);this._1=this.UNCONNECTED}},this)},connect:function(a,b){if(this._9.reconnect===this.NONE)return;if(this._1===this.DISCONNECTED)return;if(this._1===this.UNCONNECTED)return this.handshake(function(){this.connect(a,b)},this);this.callback(a,b);if(this._1!==this.CONNECTED)return;this.info('Calling deferred actions for ?',this._0);this.setDeferredStatus('succeeded');this.setDeferredStatus('deferred');if(this._q)return;this._q=true;this.info('Initiating connection for ?',this._0);this._a({channel:Faye.Channel.CONNECT,clientId:this._0,connectionType:this._5.connectionType},this._A,this)},disconnect:function(){if(this._1!==this.CONNECTED)return;this._1=this.DISCONNECTED;this.info('Disconnecting ?',this._0);this._a({channel:Faye.Channel.DISCONNECT,clientId:this._0},function(a){if(a.successful)this._5.close()},this);this.info('Clearing channel listeners for ?',this._0);this._2=new Faye.Channel.Set()},subscribe:function(d,f,g){if(d instanceof Array)return Faye.map(d,function(c){return this.subscribe(c,f,g)},this);var h=new Faye.Subscription(this,d,f,g),i=(f===true),k=this._2.hasSubscription(d);if(k&&!i){this._2.subscribe([d],f,g);h.setDeferredStatus('succeeded');return h}this.connect(function(){this.info('Client ? attempting to subscribe to ?',this._0,d);if(!i)this._2.subscribe([d],f,g);this._a({channel:Faye.Channel.SUBSCRIBE,clientId:this._0,subscription:d},function(a){if(!a.successful){h.setDeferredStatus('failed',Faye.Error.parse(a.error));return this._2.unsubscribe(d,f,g)}var b=[].concat(a.subscription);this.info('Subscription acknowledged for ? to ?',this._0,b);h.setDeferredStatus('succeeded')},this)},this);return h},unsubscribe:function(d,f,g){if(d instanceof Array)return Faye.map(d,function(c){return this.unsubscribe(c,f,g)},this);var h=this._2.unsubscribe(d,f,g);if(!h)return;this.connect(function(){this.info('Client ? attempting to unsubscribe from ?',this._0,d);this._a({channel:Faye.Channel.UNSUBSCRIBE,clientId:this._0,subscription:d},function(a){if(!a.successful)return;var b=[].concat(a.subscription);this.info('Unsubscription acknowledged for ? from ?',this._0,b)},this)},this)},publish:function(b,d){var f=new Faye.Publication();this.connect(function(){this.info('Client ? queueing published message to ?: ?',this._0,b,d);this._a({channel:b,data:d,clientId:this._0},function(a){if(a.successful)f.setDeferredStatus('succeeded');else f.setDeferredStatus('failed',Faye.Error.parse(a.error))},this)},this);return f},receiveMessage:function(d){this.pipeThroughExtensions('incoming',d,function(a){if(!a)return;if(a.advice)this._E(a.advice);this._F(a);if(a.successful===undefined)return;var b=this._p[a.id];if(!b)return;delete this._p[a.id];b[0].call(b[1],a)},this)},_z:function(b){Faye.Transport.get(this,b,this._o,function(a){this.debug('Selected ? transport for ?',a.connectionType,a.endpoint);if(a===this._5)return;if(this._5)this._5.close();this._5=a;this._5.cookies=this._D;this._5.headers=this._y;a.bind('down',function(){if(this._b!==undefined&&!this._b)return;this._b=false;this.trigger('transport:down')},this);a.bind('up',function(){if(this._b!==undefined&&this._b)return;this._b=true;this.trigger('transport:up')},this)},this)},_a:function(b,d,f){b.id=this._G();if(d)this._p[b.id]=[d,f];this.pipeThroughExtensions('outgoing',b,function(a){if(!a)return;this._5.send(a,this._9.timeout/1000)},this)},_G:function(){this._g+=1;if(this._g>=Math.pow(2,32))this._g=0;return this._g.toString(36)},_E:function(a){Faye.extend(this._9,a);if(this._9.reconnect===this.HANDSHAKE&&this._1!==this.DISCONNECTED){this._1=this.UNCONNECTED;this._0=null;this._A()}},_F:function(a){if(!a.channel||a.data===undefined)return;this.info('Client ? calling listeners for ? with ?',this._0,a.channel,a.data);this._2.distributeMessage(a)},_H:function(){if(!this._q)return;this._q=null;this.info('Closed connection for ?',this._0)},_A:function(){this._H();var a=this;Faye.ENV.setTimeout(function(){a.connect()},this._9.interval)}});Faye.extend(Faye.Client.prototype,Faye.Deferrable);Faye.extend(Faye.Client.prototype,Faye.Publisher);Faye.extend(Faye.Client.prototype,Faye.Logging);Faye.extend(Faye.Client.prototype,Faye.Extensible);Faye.Transport=Faye.extend(Faye.Class({MAX_DELAY:0.0,batching:true,initialize:function(a,b){this._8=a;this.endpoint=b;this._c=[]},close:function(){},send:function(a,b){this.debug('Client ? sending message to ?: ?',this._8._0,this.endpoint,a);if(!this.batching)return this.request([a],b);this._c.push(a);this._I=b;if(a.channel===Faye.Channel.HANDSHAKE)return this.addTimeout('publish',0.01,this.flush,this);if(a.channel===Faye.Channel.CONNECT)this._r=a;if(this.shouldFlush&&this.shouldFlush(this._c))return this.flush();this.addTimeout('publish',this.MAX_DELAY,this.flush,this)},flush:function(){this.removeTimeout('publish');if(this._c.length>1&&this._r)this._r.advice={timeout:0};this.request(this._c,this._I);this._r=null;this._c=[]},receive:function(a){this.debug('Client ? received from ?: ?',this._8._0,this.endpoint,a);for(var b=0,d=a.length;b<d;b++){this._8.receiveMessage(a[b])}},retry:function(a,b){var d=false,f=this._8.retry*1000,g=this;return function(){if(d)return;d=true;Faye.ENV.setTimeout(function(){g.request(a,b)},f)}}}),{MAX_URL_LENGTH:2048,get:function(k,j,m,n,o){var l=k.endpoint;Faye.asyncEach(this._B,function(d,f){var g=d[0],h=d[1],i=k.endpoints[g]||l;if(Faye.indexOf(m,g)>=0)return f();if(Faye.indexOf(j,g)<0){h.isUsable(k,i,function(){});return f()}h.isUsable(k,i,function(a){if(!a)return f();var b=h.hasOwnProperty('create')?h.create(k,i):new h(k,i);n.call(o,b)})},function(){throw new Error('Could not find a usable connection type for '+l);})},register:function(a,b){this._B.push([a,b]);b.prototype.connectionType=a},_B:[]});Faye.extend(Faye.Transport.prototype,Faye.Logging);Faye.extend(Faye.Transport.prototype,Faye.Publisher);Faye.extend(Faye.Transport.prototype,Faye.Timeouts);Faye.Event={_h:[],on:function(a,b,d,f){var g=function(){d.call(f)};if(a.addEventListener)a.addEventListener(b,g,false);else a.attachEvent('on'+b,g);this._h.push({_i:a,_s:b,_m:d,_n:f,_C:g})},detach:function(a,b,d,f){var g=this._h.length,h;while(g--){h=this._h[g];if((a&&a!==h._i)||(b&&b!==h._s)||(d&&d!==h._m)||(f&&f!==h._n))continue;if(h._i.removeEventListener)h._i.removeEventListener(h._s,h._C,false);else h._i.detachEvent('on'+h._s,h._C);this._h.splice(g,1);h=null}}};Faye.Event.on(Faye.ENV,'unload',Faye.Event.detach,Faye.Event);Faye.URI=Faye.extend(Faye.Class({queryString:function(){var a=[];for(var b in this.params){if(!this.params.hasOwnProperty(b))continue;a.push(encodeURIComponent(b)+'='+encodeURIComponent(this.params[b]))}return a.join('&')},isSameOrigin:function(){var a=Faye.URI.parse(Faye.ENV.location.href,false);var b=(a.hostname!==this.hostname)||(a.port!==this.port)||(a.protocol!==this.protocol);return!b},toURL:function(){var a=this.queryString();return this.protocol+'//'+this.hostname+(this.port?':'+this.port:'')+this.pathname+(a?'?'+a:'')+this.hash}}),{parse:function(g,h){if(typeof g!=='string')return g;var i=new this(),k;var j=function(b,d,f){g=g.replace(d,function(a){i[b]=a;return''});if(i[b]===undefined)i[b]=f?Faye.ENV.location[b]:''};j('protocol',/^https?\:/,true);j('host',/^\/\/[^\/]+/,true);if(!/^\//.test(g))g=Faye.ENV.location.pathname.replace(/[^\/]*$/,'')+g;j('pathname',/^\/[^\?#]*/);j('search',/^\?[^#]*/);j('hash',/^#.*/);if(/^\/\//.test(i.host)){i.host=i.host.substr(2);k=i.host.split(':');i.hostname=k[0];i.port=k[1]||''}else{i.hostname=Faye.ENV.location.hostname;i.port=Faye.ENV.location.port}if(h===false){i.params={}}else{var m=i.search.replace(/^\?/,''),n=m?m.split('&'):[],o=n.length,l={};while(o--){k=n[o].split('=');l[decodeURIComponent(k[0]||'')]=decodeURIComponent(k[1]||'')}if(typeof h==='object')Faye.extend(l,h);i.params=l}return i}});if(!this.JSON){JSON={}}(function(){function m(a){return a<10?'0'+a:a}if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(a){return this.getUTCFullYear()+'-'+m(this.getUTCMonth()+1)+'-'+m(this.getUTCDate())+'T'+m(this.getUTCHours())+':'+m(this.getUTCMinutes())+':'+m(this.getUTCSeconds())+'Z'};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()}}var n=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,o=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,l,q,t={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},p;function s(d){o.lastIndex=0;return o.test(d)?'"'+d.replace(o,function(a){var b=t[a];return typeof b==='string'?b:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+d+'"'}function r(a,b){var d,f,g,h,i=l,k,j=b[a];if(j&&typeof j==='object'&&typeof j.toJSON==='function'){j=j.toJSON(a)}if(typeof p==='function'){j=p.call(b,a,j)}switch(typeof j){case'string':return s(j);case'number':return isFinite(j)?String(j):'null';case'boolean':case'null':return String(j);case'object':if(!j){return'null'}l+=q;k=[];if(Object.prototype.toString.apply(j)==='[object Array]'){h=j.length;for(d=0;d<h;d+=1){k[d]=r(d,j)||'null'}g=k.length===0?'[]':l?'[\n'+l+k.join(',\n'+l)+'\n'+i+']':'['+k.join(',')+']';l=i;return g}if(p&&typeof p==='object'){h=p.length;for(d=0;d<h;d+=1){f=p[d];if(typeof f==='string'){g=r(f,j);if(g){k.push(s(f)+(l?': ':':')+g)}}}}else{for(f in j){if(Object.hasOwnProperty.call(j,f)){g=r(f,j);if(g){k.push(s(f)+(l?': ':':')+g)}}}}g=k.length===0?'{}':l?'{\n'+l+k.join(',\n'+l)+'\n'+i+'}':'{'+k.join(',')+'}';l=i;return g}}Faye.stringify=function(a,b,d){var f;l='';q='';if(typeof d==='number'){for(f=0;f<d;f+=1){q+=' '}}else if(typeof d==='string'){q=d}p=b;if(b&&typeof b!=='function'&&(typeof b!=='object'||typeof b.length!=='number')){throw new Error('JSON.stringify');}return r('',{'':a})};if(typeof JSON.stringify!=='function'){JSON.stringify=Faye.stringify}if(typeof JSON.parse!=='function'){JSON.parse=function(h,i){var k;function j(a,b){var d,f,g=a[b];if(g&&typeof g==='object'){for(d in g){if(Object.hasOwnProperty.call(g,d)){f=j(g,d);if(f!==undefined){g[d]=f}else{delete g[d]}}}}return i.call(a,b,g)}n.lastIndex=0;if(n.test(h)){h=h.replace(n,function(a){return'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(h.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){k=eval('('+h+')');return typeof i==='function'?j({'':k},''):k}throw new SyntaxError('JSON.parse');}}}());Faye.Transport.WebSocket=Faye.extend(Faye.Class(Faye.Transport,{UNCONNECTED:1,CONNECTING:2,CONNECTED:3,batching:false,isUsable:function(a,b){this.callback(function(){a.call(b,true)});this.errback(function(){a.call(b,false)});this.connect()},request:function(b,d){if(b.length===0)return;this._d=this._d||{};for(var f=0,g=b.length;f<g;f++){this._d[b[f].id]=b[f]}this.callback(function(a){a.send(Faye.toJSON(b))});this.connect()},close:function(){if(!this._3)return;this._3.onclose=this._3.onerror=null;this._3.close();delete this._3;this.setDeferredStatus('deferred');this._1=this.UNCONNECTED},connect:function(){if(Faye.Transport.WebSocket._J)return;this._1=this._1||this.UNCONNECTED;if(this._1!==this.UNCONNECTED)return;this._1=this.CONNECTING;var g=Faye.Transport.WebSocket.getClass();if(!g)return this.setDeferredStatus('failed');this._3=new g(Faye.Transport.WebSocket.getSocketUrl(this.endpoint));var h=this;this._3.onopen=function(){h._1=h.CONNECTED;h._t=true;h.setDeferredStatus('succeeded',h._3);h.trigger('up')};this._3.onmessage=function(a){var b=JSON.parse(a.data);if(!b)return;b=[].concat(b);for(var d=0,f=b.length;d<f;d++){delete h._d[b[d].id]}h.receive(b)};this._3.onclose=this._3.onerror=function(){var a=(h._1===h.CONNECTED);h.setDeferredStatus('deferred');h._1=h.UNCONNECTED;h.close();if(a)return h.resend();if(!h._t)return h.setDeferredStatus('failed');var b=h._8.retry*1000;Faye.ENV.setTimeout(function(){h.connect()},b);h.trigger('down')}},resend:function(){if(!this._d)return;var d=Faye.map(this._d,function(a,b){return b});this.request(d)}}),{getSocketUrl:function(a){if(Faye.URI)a=Faye.URI.parse(a).toURL();return a.replace(/^http(s?):/ig,'ws$1:')},getClass:function(){return(Faye.WebSocket&&Faye.WebSocket.Client)||Faye.ENV.WebSocket||Faye.ENV.MozWebSocket},isUsable:function(a,b,d,f){this.create(a,b).isUsable(d,f)},create:function(a,b){var d=a.transports.websocket=a.transports.websocket||{};d[b]=d[b]||new this(a,b);return d[b]}});Faye.extend(Faye.Transport.WebSocket.prototype,Faye.Deferrable);Faye.Transport.register('websocket',Faye.Transport.WebSocket);if(Faye.Event)Faye.Event.on(Faye.ENV,'beforeunload',function(){Faye.Transport.WebSocket._J=true});Faye.Transport.EventSource=Faye.extend(Faye.Class(Faye.Transport,{initialize:function(b,d){Faye.Transport.prototype.initialize.call(this,b,d);if(!Faye.ENV.EventSource)return this.setDeferredStatus('failed');this._K=new Faye.Transport.XHR(b,d);var f=new EventSource(d+'/'+b.getClientId()),g=this;f.onopen=function(){g._t=true;g.setDeferredStatus('succeeded');g.trigger('up')};f.onerror=function(){if(g._t){g.trigger('down')}else{g.setDeferredStatus('failed');f.close()}};f.onmessage=function(a){g.receive(JSON.parse(a.data));g.trigger('up')};this._3=f},isUsable:function(a,b){this.callback(function(){a.call(b,true)});this.errback(function(){a.call(b,false)})},request:function(a,b){this._K.request(a,b)},close:function(){if(!this._3)return;this._3.onerror=null;this._3.close();delete this._3}}),{isUsable:function(b,d,f,g){var h=b.getClientId();if(!h)return f.call(g,false);Faye.Transport.XHR.isUsable(b,d,function(a){if(!a)return f.call(g,false);this.create(b,d).isUsable(f,g)},this)},create:function(a,b){var d=a.transports.eventsource=a.transports.eventsource||{},f=a.getClientId(),b=b+'/'+(f||'');d[b]=d[b]||new this(a,b);return d[b]}});Faye.extend(Faye.Transport.EventSource.prototype,Faye.Deferrable);Faye.Transport.register('eventsource',Faye.Transport.EventSource);Faye.Transport.XHR=Faye.extend(Faye.Class(Faye.Transport,{request:function(f,g){var h=this.retry(f,g),i=Faye.URI.parse(this.endpoint).pathname,k=this,j=Faye.ENV.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();j.open('POST',i,true);j.setRequestHeader('Content-Type','application/json');j.setRequestHeader('Pragma','no-cache');j.setRequestHeader('X-Requested-With','XMLHttpRequest');var m=this.headers;for(var n in m){if(!m.hasOwnProperty(n))continue;j.setRequestHeader(n,m[n])}var o=function(){j.abort()};Faye.Event.on(Faye.ENV,'beforeunload',o);var l=function(){Faye.Event.detach(Faye.ENV,'beforeunload',o);j.onreadystatechange=function(){};j=null};j.onreadystatechange=function(){if(j.readyState!==4)return;var a=null,b=j.status,d=((b>=200&&b<300)||b===304||b===1223);if(!d){l();h();return k.trigger('down')}try{a=JSON.parse(j.responseText)}catch(e){}l();if(a){k.receive(a);k.trigger('up')}else{h();k.trigger('down')}};j.send(Faye.toJSON(f))}}),{isUsable:function(a,b,d,f){d.call(f,Faye.URI.parse(b).isSameOrigin())}});Faye.Transport.register('long-polling',Faye.Transport.XHR);Faye.Transport.CORS=Faye.extend(Faye.Class(Faye.Transport,{request:function(b,d){var f=Faye.ENV.XDomainRequest?XDomainRequest:XMLHttpRequest,g=new f(),h=this.retry(b,d),i=this;g.open('POST',this.endpoint,true);if(g.setRequestHeader)g.setRequestHeader('Pragma','no-cache');var k=function(){if(!g)return false;g.onload=g.onerror=g.ontimeout=g.onprogress=null;g=null;Faye.ENV.clearTimeout(m);return true};g.onload=function(){var a=null;try{a=JSON.parse(g.responseText)}catch(e){}k();if(a){i.receive(a);i.trigger('up')}else{h();i.trigger('down')}};var j=function(){k();h();i.trigger('down')};var m=Faye.ENV.setTimeout(j,1.5*1000*d);g.onerror=j;g.ontimeout=j;g.onprogress=function(){};g.send('message='+encodeURIComponent(Faye.toJSON(b)))}}),{isUsable:function(a,b,d,f){if(Faye.URI.parse(b).isSameOrigin())return d.call(f,false);if(Faye.ENV.XDomainRequest)return d.call(f,Faye.URI.parse(b).protocol===Faye.URI.parse(Faye.ENV.location).protocol);if(Faye.ENV.XMLHttpRequest){var g=new Faye.ENV.XMLHttpRequest();return d.call(f,g.withCredentials!==undefined)}return d.call(f,false)}});Faye.Transport.register('cross-origin-long-polling',Faye.Transport.CORS);Faye.Transport.JSONP=Faye.extend(Faye.Class(Faye.Transport,{shouldFlush:function(a){var b={message:Faye.toJSON(a),jsonp:'__jsonp'+Faye.Transport.JSONP._u+'__'};var d=Faye.URI.parse(this.endpoint,b).toURL();return d.length>=Faye.Transport.MAX_URL_LENGTH},request:function(b,d){var f={message:Faye.toJSON(b)},g=document.getElementsByTagName('head')[0],h=document.createElement('script'),i=Faye.Transport.JSONP.getCallbackName(),k=Faye.URI.parse(this.endpoint,f),j=this.retry(b,d),m=this;Faye.ENV[i]=function(a){o();m.receive(a);m.trigger('up')};var n=Faye.ENV.setTimeout(function(){o();j();m.trigger('down')},1.5*1000*d);var o=function(){if(!Faye.ENV[i])return false;Faye.ENV[i]=undefined;try{delete Faye.ENV[i]}catch(e){}Faye.ENV.clearTimeout(n);h.parentNode.removeChild(h);return true};k.params.jsonp=i;h.type='text/javascript';h.src=k.toURL();g.appendChild(h)}}),{_u:0,getCallbackName:function(){this._u+=1;return'__jsonp'+this._u+'__'},isUsable:function(a,b,d,f){d.call(f,true)}});Faye.Transport.register('callback-polling',Faye.Transport.JSONP);
+!function(){"use strict";var Faye={VERSION:"1.0.1",BAYEUX_VERSION:"1.0",ID_LENGTH:160,JSONP_CALLBACK:"jsonpcallback",CONNECTION_TYPES:["long-polling","cross-origin-long-polling","callback-polling","websocket","eventsource","in-process"],MANDATORY_CONNECTION_TYPES:["long-polling","callback-polling","in-process"],ENV:"undefined"!=typeof window?window:global,extend:function(e,t,n){if(!t)return e;for(var i in t)t.hasOwnProperty(i)&&(e.hasOwnProperty(i)&&n===!1||e[i]!==t[i]&&(e[i]=t[i]));return e},random:function(e){return e=e||this.ID_LENGTH,csprng(e,36)},clientIdFromMessages:function(e){var t=this.filter([].concat(e),function(e){return"/meta/connect"===e.channel});return t[0]&&t[0].clientId},copyObject:function(e){var t,n,i;if(e instanceof Array){for(t=[],n=e.length;n--;)t[n]=Faye.copyObject(e[n]);return t}if("object"==typeof e){t=null===e?null:{};for(i in e)t[i]=Faye.copyObject(e[i]);return t}return e},commonElement:function(e,t){for(var n=0,i=e.length;i>n;n++)if(-1!==this.indexOf(t,e[n]))return e[n];return null},indexOf:function(e,t){if(e.indexOf)return e.indexOf(t);for(var n=0,i=e.length;i>n;n++)if(e[n]===t)return n;return-1},map:function(e,t,n){if(e.map)return e.map(t,n);var i=[];if(e instanceof Array)for(var s=0,r=e.length;r>s;s++)i.push(t.call(n||null,e[s],s));else for(var o in e)e.hasOwnProperty(o)&&i.push(t.call(n||null,o,e[o]));return i},filter:function(e,t,n){if(e.filter)return e.filter(t,n);for(var i=[],s=0,r=e.length;r>s;s++)t.call(n||null,e[s],s)&&i.push(e[s]);return i},asyncEach:function(e,t,n,i){var s=e.length,r=-1,o=0,a=!1,c=function(){return o-=1,r+=1,r===s?n&&n.call(i):(t(e[r],h),void 0)},u=function(){if(!a){for(a=!0;o>0;)c();a=!1}},h=function(){o+=1,u()};h()},toJSON:function(e){return this.stringify?this.stringify(e,function(e,t){return this[e]instanceof Array?this[e]:t}):JSON.stringify(e)}};"undefined"!=typeof module?module.exports=Faye:"undefined"!=typeof window&&(window.Faye=Faye),Faye.Class=function(e,t){"function"!=typeof e&&(t=e,e=Object);var n=function(){return this.initialize?this.initialize.apply(this,arguments)||this:this},i=function(){};return i.prototype=e.prototype,n.prototype=new i,Faye.extend(n.prototype,t),n},function(){function e(e,t){if(e.indexOf)return e.indexOf(t);for(var n=0;n<e.length;n++)if(t===e[n])return n;return-1}var t=Faye.EventEmitter=function(){},n="function"==typeof Array.isArray?Array.isArray:function(e){return"[object Array]"===Object.prototype.toString.call(e)};t.prototype.emit=function(e){if("error"===e&&(!this._events||!this._events.error||n(this._events.error)&&!this._events.error.length))throw arguments[1]instanceof Error?arguments[1]:Error("Uncaught, unspecified 'error' event.");if(!this._events)return!1;var t=this._events[e];if(!t)return!1;if("function"==typeof t){switch(arguments.length){case 1:t.call(this);break;case 2:t.call(this,arguments[1]);break;case 3:t.call(this,arguments[1],arguments[2]);break;default:var i=Array.prototype.slice.call(arguments,1);t.apply(this,i)}return!0}if(n(t)){for(var i=Array.prototype.slice.call(arguments,1),s=t.slice(),r=0,o=s.length;o>r;r++)s[r].apply(this,i);return!0}return!1},t.prototype.addListener=function(e,t){if("function"!=typeof t)throw Error("addListener only takes instances of Function");return this._events||(this._events={}),this.emit("newListener",e,t),this._events[e]?n(this._events[e])?this._events[e].push(t):this._events[e]=[this._events[e],t]:this._events[e]=t,this},t.prototype.on=t.prototype.addListener,t.prototype.once=function(e,t){var n=this;return n.on(e,function i(){n.removeListener(e,i),t.apply(this,arguments)}),this},t.prototype.removeListener=function(t,i){if("function"!=typeof i)throw Error("removeListener only takes instances of Function");if(!this._events||!this._events[t])return this;var s=this._events[t];if(n(s)){var r=e(s,i);if(0>r)return this;s.splice(r,1),0==s.length&&delete this._events[t]}else this._events[t]===i&&delete this._events[t];return this},t.prototype.removeAllListeners=function(e){return 0===arguments.length?(this._events={},this):(e&&this._events&&this._events[e]&&(this._events[e]=null),this)},t.prototype.listeners=function(e){return this._events||(this._events={}),this._events[e]||(this._events[e]=[]),n(this._events[e])||(this._events[e]=[this._events[e]]),this._events[e]}}(),Faye.Namespace=Faye.Class({initialize:function(){this._used={}},exists:function(e){return this._used.hasOwnProperty(e)},generate:function(){for(var e=Faye.random();this._used.hasOwnProperty(e);)e=Faye.random();return this._used[e]=e},release:function(e){delete this._used[e]}}),function(){var e,t=setTimeout;e="function"==typeof setImmediate?function(e){setImmediate(e)}:"object"==typeof process&&process.nextTick?function(e){process.nextTick(e)}:function(e){t(e,0)};var n=0,i=1,s=2,r=function(e){return e},o=function(e){throw e},a=function(e){if(this._state=n,this._callbacks=[],this._errbacks=[],"function"==typeof e){var t=this;e(function(e){f(t,e)},function(e){p(t,e)})}};a.prototype.then=function(e,t){var n={},i=this;return n.promise=new a(function(s,r){n.fulfill=s,n.reject=r,c(i,e,n),u(i,t,n)}),n.promise};var c=function(e,t,s){"function"!=typeof t&&(t=r);var o=function(e){h(t,e,s)};e._state===n?e._callbacks.push(o):e._state===i&&o(e._value)},u=function(e,t,i){"function"!=typeof t&&(t=o);var r=function(e){h(t,e,i)};e._state===n?e._errbacks.push(r):e._state===s&&r(e._reason)},h=function(t,n,i){e(function(){l(t,n,i)})},l=function(e,t,n){var i,s,o,a=!1;try{if(i=e(t),s=typeof i,o=null!==i&&("function"===s||"object"===s)&&i.then,i===n.promise)return n.reject(new TypeError("Recursive promise chain detected"));if("function"!=typeof o)return n.fulfill(i);o.call(i,function(e){a||(a=!0,l(r,e,n))},function(e){a||(a=!0,n.reject(e))})}catch(c){if(a)return;a=!0,n.reject(c)}},f=a.fulfill=a.resolve=function(e,t){if(e._state===n){e._state=i,e._value=t,e._errbacks=[];for(var s,r=e._callbacks;s=r.shift();)s(t)}},p=a.reject=function(e,t){if(e._state===n){e._state=s,e._reason=t,e._callbacks=[];for(var i,r=e._errbacks;i=r.shift();)i(t)}};a.defer=e,a.deferred=a.pending=function(){var e={};return e.promise=new a(function(t,n){e.fulfill=e.resolve=t,e.reject=n}),e},a.fulfilled=a.resolved=function(e){return new a(function(t){t(e)})},a.rejected=function(e){return new a(function(t,n){n(e)})},void 0===Faye?module.exports=a:Faye.Promise=a}(),Faye.Set=Faye.Class({initialize:function(){this._index={}},add:function(e){var t=void 0!==e.id?e.id:e;return this._index.hasOwnProperty(t)?!1:(this._index[t]=e,!0)},forEach:function(e,t){for(var n in this._index)this._index.hasOwnProperty(n)&&e.call(t,this._index[n])},isEmpty:function(){for(var e in this._index)if(this._index.hasOwnProperty(e))return!1;return!0},member:function(e){for(var t in this._index)if(this._index[t]===e)return!0;return!1},remove:function(e){var t=void 0!==e.id?e.id:e,n=this._index[t];return delete this._index[t],n},toArray:function(){var e=[];return this.forEach(function(t){e.push(t)}),e}}),Faye.URI={isURI:function(e){return e&&e.protocol&&e.host&&e.path},isSameOrigin:function(e){var t=Faye.ENV.location;return e.protocol===t.protocol&&e.hostname===t.hostname&&e.port===t.port},parse:function(e){if("string"!=typeof e)return e;var t,n,i,s,r,o,a={},c=function(t,n){e=e.replace(n,function(e){return a[t]=e,""}),a[t]=a[t]||""};for(c("protocol",/^[a-z]+\:/i),c("host",/^\/\/[^\/\?#]+/),/^\//.test(e)||a.host||(e=Faye.ENV.location.pathname.replace(/[^\/]*$/,"")+e),c("pathname",/^[^\?#]*/),c("search",/^\?[^#]*/),c("hash",/^#.*/),a.protocol=a.protocol||Faye.ENV.location.protocol,a.host?(a.host=a.host.substr(2),t=a.host.split(":"),a.hostname=t[0],a.port=t[1]||""):(a.host=Faye.ENV.location.host,a.hostname=Faye.ENV.location.hostname,a.port=Faye.ENV.location.port),a.pathname=a.pathname||"/",a.path=a.pathname+a.search,n=a.search.replace(/^\?/,""),i=n?n.split("&"):[],o={},s=0,r=i.length;r>s;s++)t=i[s].split("="),o[decodeURIComponent(t[0]||"")]=decodeURIComponent(t[1]||"");return a.query=o,a.href=this.stringify(a),a},stringify:function(e){var t=e.protocol+"//"+e.hostname;return e.port&&(t+=":"+e.port),t+=e.pathname+this.queryString(e.query)+(e.hash||"")},queryString:function(e){var t=[];for(var n in e)e.hasOwnProperty(n)&&t.push(encodeURIComponent(n)+"="+encodeURIComponent(e[n]));return 0===t.length?"":"?"+t.join("&")}},Faye.Error=Faye.Class({initialize:function(e,t,n){this.code=e,this.params=Array.prototype.slice.call(t),this.message=n},toString:function(){return this.code+":"+this.params.join(",")+":"+this.message}}),Faye.Error.parse=function(e){if(e=e||"",!Faye.Grammar.ERROR.test(e))return new this(null,[],e);var t=e.split(":"),n=parseInt(t[0]),i=t[1].split(","),e=t[2];return new this(n,i,e)},Faye.Error.versionMismatch=function(){return""+new this(300,arguments,"Version mismatch")},Faye.Error.conntypeMismatch=function(){return""+new this(301,arguments,"Connection types not supported")},Faye.Error.extMismatch=function(){return""+new this(302,arguments,"Extension mismatch")},Faye.Error.badRequest=function(){return""+new this(400,arguments,"Bad request")},Faye.Error.clientUnknown=function(){return""+new this(401,arguments,"Unknown client")},Faye.Error.parameterMissing=function(){return""+new this(402,arguments,"Missing required parameter")},Faye.Error.channelForbidden=function(){return""+new this(403,arguments,"Forbidden channel")},Faye.Error.channelUnknown=function(){return""+new this(404,arguments,"Unknown channel")},Faye.Error.channelInvalid=function(){return""+new this(405,arguments,"Invalid channel")},Faye.Error.extUnknown=function(){return""+new this(406,arguments,"Unknown extension")},Faye.Error.publishFailed=function(){return""+new this(407,arguments,"Failed to publish")},Faye.Error.serverError=function(){return""+new this(500,arguments,"Internal server error")},Faye.Deferrable={then:function(e,t){var n=this;return this._promise||(this._promise=new Faye.Promise(function(e,t){n._fulfill=e,n._reject=t})),0===arguments.length?this._promise:this._promise.then(e,t)},callback:function(e,t){return this.then(function(n){e.call(t,n)})},errback:function(e,t){return this.then(null,function(n){e.call(t,n)})},timeout:function(e,t){this.then();var n=this;this._timer=Faye.ENV.setTimeout(function(){n._reject(t)},1e3*e)},setDeferredStatus:function(e,t){this._timer&&Faye.ENV.clearTimeout(this._timer);this.then();"succeeded"===e?this._fulfill(t):"failed"===e?this._reject(t):delete this._promise}},Faye.Publisher={countListeners:function(e){return this.listeners(e).length},bind:function(e,t,n){var i=Array.prototype.slice,s=function(){t.apply(n,i.call(arguments))};return this._listeners=this._listeners||[],this._listeners.push([e,t,n,s]),this.on(e,s)},unbind:function(e,t,n){this._listeners=this._listeners||[];for(var i,s=this._listeners.length;s--;)i=this._listeners[s],i[0]===e&&(!t||i[1]===t&&i[2]===n)&&(this._listeners.splice(s,1),this.removeListener(e,i[3]))}},Faye.extend(Faye.Publisher,Faye.EventEmitter.prototype),Faye.Publisher.trigger=Faye.Publisher.emit,Faye.Timeouts={addTimeout:function(e,t,n,i){if(this._timeouts=this._timeouts||{},!this._timeouts.hasOwnProperty(e)){var s=this;this._timeouts[e]=Faye.ENV.setTimeout(function(){delete s._timeouts[e],n.call(i)},1e3*t)}},removeTimeout:function(e){this._timeouts=this._timeouts||{};var t=this._timeouts[e];t&&(clearTimeout(t),delete this._timeouts[e])},removeAllTimeouts:function(){this._timeouts=this._timeouts||{};for(var e in this._timeouts)this.removeTimeout(e)}},Faye.Logging={LOG_LEVELS:{fatal:4,error:3,warn:2,info:1,debug:0},writeLog:function(e,t){if(Faye.logger){var e=Array.prototype.slice.apply(e),n="[Faye",i=this.className,s=e.shift().replace(/\?/g,function(){try{return Faye.toJSON(e.shift())}catch(t){return"[Object]"}});for(var r in Faye)i||"function"==typeof Faye[r]&&this instanceof Faye[r]&&(i=r);i&&(n+="."+i),n+="] ","function"==typeof Faye.logger[t]?Faye.logger[t](n+s):"function"==typeof Faye.logger&&Faye.logger(n+s)}}},function(){for(var e in Faye.Logging.LOG_LEVELS)(function(e){Faye.Logging[e]=function(){this.writeLog(arguments,e)}})(e,Faye.Logging.LOG_LEVELS[e])}(),Faye.Grammar={CHANNEL_NAME:/^\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,CHANNEL_PATTERN:/^(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*\/\*{1,2}$/,ERROR:/^([0-9][0-9][0-9]:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*|[0-9][0-9][0-9]::(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/,VERSION:/^([0-9])+(\.(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*)*$/},Faye.Extensible={addExtension:function(e){this._extensions=this._extensions||[],this._extensions.push(e),e.added&&e.added(this)},removeExtension:function(e){if(this._extensions)for(var t=this._extensions.length;t--;)this._extensions[t]===e&&(this._extensions.splice(t,1),e.removed&&e.removed(this))},pipeThroughExtensions:function(e,t,n,i,s){if(this.debug("Passing through ? extensions: ?",e,t),!this._extensions)return i.call(s,t);var r=this._extensions.slice(),o=function(t){if(!t)return i.call(s,t);var a=r.shift();if(!a)return i.call(s,t);var c=a[e];return c?(c.length>=3?a[e](t,n,o):a[e](t,o),void 0):o(t)};o(t)}},Faye.extend(Faye.Extensible,Faye.Logging),Faye.Channel=Faye.Class({initialize:function(e){this.id=this.name=e},push:function(e){this.trigger("message",e)},isUnused:function(){return 0===this.countListeners("message")}}),Faye.extend(Faye.Channel.prototype,Faye.Publisher),Faye.extend(Faye.Channel,{HANDSHAKE:"/meta/handshake",CONNECT:"/meta/connect",SUBSCRIBE:"/meta/subscribe",UNSUBSCRIBE:"/meta/unsubscribe",DISCONNECT:"/meta/disconnect",META:"meta",SERVICE:"service",expand:function(e){var t=this.parse(e),n=["/**",e],i=t.slice();i[i.length-1]="*",n.push(this.unparse(i));for(var s=1,r=t.length;r>s;s++)i=t.slice(0,s),i.push("**"),n.push(this.unparse(i));return n},isValid:function(e){return Faye.Grammar.CHANNEL_NAME.test(e)||Faye.Grammar.CHANNEL_PATTERN.test(e)},parse:function(e){return this.isValid(e)?e.split("/").slice(1):null},unparse:function(e){return"/"+e.join("/")},isMeta:function(e){var t=this.parse(e);return t?t[0]===this.META:null},isService:function(e){var t=this.parse(e);return t?t[0]===this.SERVICE:null},isSubscribable:function(e){return this.isValid(e)?!this.isMeta(e)&&!this.isService(e):null},Set:Faye.Class({initialize:function(){this._channels={}},getKeys:function(){var e=[];for(var t in this._channels)e.push(t);return e},remove:function(e){delete this._channels[e]},hasSubscription:function(e){return this._channels.hasOwnProperty(e)},subscribe:function(e,t,n){if(t)for(var i,s=0,r=e.length;r>s;s++){i=e[s];var o=this._channels[i]=this._channels[i]||new Faye.Channel(i);o.bind("message",t,n)}},unsubscribe:function(e,t,n){var i=this._channels[e];return i?(i.unbind("message",t,n),i.isUnused()?(this.remove(e),!0):!1):!1},distributeMessage:function(e){for(var t=Faye.Channel.expand(e.channel),n=0,i=t.length;i>n;n++){var s=this._channels[t[n]];s&&s.trigger("message",e.data)}}})}),Faye.Envelope=Faye.Class({initialize:function(e,t){this.id=e.id,this.message=e,void 0!==t&&this.timeout(t/1e3,!1)}}),Faye.extend(Faye.Envelope.prototype,Faye.Deferrable),Faye.Publication=Faye.Class(Faye.Deferrable),Faye.Subscription=Faye.Class({initialize:function(e,t,n,i){this._client=e,this._channels=t,this._callback=n,this._context=i,this._cancelled=!1},cancel:function(){this._cancelled||(this._client.unsubscribe(this._channels,this._callback,this._context),this._cancelled=!0)},unsubscribe:function(){this.cancel()}}),Faye.extend(Faye.Subscription.prototype,Faye.Deferrable),Faye.Client=Faye.Class({UNCONNECTED:1,CONNECTING:2,CONNECTED:3,DISCONNECTED:4,HANDSHAKE:"handshake",RETRY:"retry",NONE:"none",CONNECTION_TIMEOUT:60,DEFAULT_RETRY:5,MAX_REQUEST_SIZE:2048,DEFAULT_ENDPOINT:"/bayeux",INTERVAL:0,initialize:function(e,t){this.info("New client created for ?",e),this._options=t||{},this.endpoint=Faye.URI.parse(e||this.DEFAULT_ENDPOINT),this.endpoints=this._options.endpoints||{},this.transports={},this.cookies=Faye.CookieJar&&new Faye.CookieJar,this.headers={},this.ca=this._options.ca,this._disabled=[],this._retry=this._options.retry||this.DEFAULT_RETRY;for(var n in this.endpoints)this.endpoints[n]=Faye.URI.parse(this.endpoints[n]);this.maxRequestSize=this.MAX_REQUEST_SIZE,this._state=this.UNCONNECTED,this._channels=new Faye.Channel.Set,this._messageId=0,this._responseCallbacks={},this._advice={reconnect:this.RETRY,interval:1e3*(this._options.interval||this.INTERVAL),timeout:1e3*(this._options.timeout||this.CONNECTION_TIMEOUT)},Faye.Event&&void 0!==Faye.ENV.onbeforeunload&&Faye.Event.on(Faye.ENV,"beforeunload",function(){Faye.indexOf(this._disabled,"autodisconnect")<0&&this.disconnect()},this)},disable:function(e){this._disabled.push(e)},setHeader:function(e,t){this.headers[e]=t},handshake:function(e,t){if(this._advice.reconnect!==this.NONE&&this._state===this.UNCONNECTED){this._state=this.CONNECTING;var n=this;this.info("Initiating handshake with ?",Faye.URI.stringify(this.endpoint)),this._selectTransport(Faye.MANDATORY_CONNECTION_TYPES),this._send({channel:Faye.Channel.HANDSHAKE,version:Faye.BAYEUX_VERSION,supportedConnectionTypes:[this._transport.connectionType]},function(i){i.successful?(this._state=this.CONNECTED,this._clientId=i.clientId,this._selectTransport(i.supportedConnectionTypes),this.info("Handshake successful: ?",this._clientId),this.subscribe(this._channels.getKeys(),!0),e&&Faye.Promise.defer(function(){e.call(t)})):(this.info("Handshake unsuccessful"),Faye.ENV.setTimeout(function(){n.handshake(e,t)},this._advice.interval),this._state=this.UNCONNECTED)},this)}},connect:function(e,t){if(this._advice.reconnect!==this.NONE&&this._state!==this.DISCONNECTED){if(this._state===this.UNCONNECTED)return this.handshake(function(){this.connect(e,t)},this);this.callback(e,t),this._state===this.CONNECTED&&(this.info("Calling deferred actions for ?",this._clientId),this.setDeferredStatus("succeeded"),this.setDeferredStatus("unknown"),this._connectRequest||(this._connectRequest=!0,this.info("Initiating connection for ?",this._clientId),this._send({channel:Faye.Channel.CONNECT,clientId:this._clientId,connectionType:this._transport.connectionType},this._cycleConnection,this)))}},disconnect:function(){this._state===this.CONNECTED&&(this._state=this.DISCONNECTED,this.info("Disconnecting ?",this._clientId),this._send({channel:Faye.Channel.DISCONNECT,clientId:this._clientId},function(e){e.successful&&(this._transport.close(),delete this._transport)},this),this.info("Clearing channel listeners for ?",this._clientId),this._channels=new Faye.Channel.Set)},subscribe:function(e,t,n){if(e instanceof Array)return Faye.map(e,function(e){return this.subscribe(e,t,n)},this);var i=new Faye.Subscription(this,e,t,n),s=t===!0,r=this._channels.hasSubscription(e);return r&&!s?(this._channels.subscribe([e],t,n),i.setDeferredStatus("succeeded"),i):(this.connect(function(){this.info("Client ? attempting to subscribe to ?",this._clientId,e),s||this._channels.subscribe([e],t,n),this._send({channel:Faye.Channel.SUBSCRIBE,clientId:this._clientId,subscription:e},function(s){if(!s.successful)return i.setDeferredStatus("failed",Faye.Error.parse(s.error)),this._channels.unsubscribe(e,t,n);var r=[].concat(s.subscription);this.info("Subscription acknowledged for ? to ?",this._clientId,r),i.setDeferredStatus("succeeded")},this)},this),i)},unsubscribe:function(e,t,n){if(e instanceof Array)return Faye.map(e,function(e){return this.unsubscribe(e,t,n)},this);var i=this._channels.unsubscribe(e,t,n);i&&this.connect(function(){this.info("Client ? attempting to unsubscribe from ?",this._clientId,e),this._send({channel:Faye.Channel.UNSUBSCRIBE,clientId:this._clientId,subscription:e},function(e){if(e.successful){var t=[].concat(e.subscription);this.info("Unsubscription acknowledged for ? from ?",this._clientId,t)}},this)},this)},publish:function(e,t){var n=new Faye.Publication;return this.connect(function(){this.info("Client ? queueing published message to ?: ?",this._clientId,e,t),this._send({channel:e,data:t,clientId:this._clientId},function(e){e.successful?n.setDeferredStatus("succeeded"):n.setDeferredStatus("failed",Faye.Error.parse(e.error))},this)},this),n},receiveMessage:function(e){var t,n=e.id;void 0!==e.successful&&(t=this._responseCallbacks[n],delete this._responseCallbacks[n]),this.pipeThroughExtensions("incoming",e,null,function(e){e&&(e.advice&&this._handleAdvice(e.advice),this._deliverMessage(e),t&&t[0].call(t[1],e))},this),this._transportUp!==!0&&(this._transportUp=!0,this.trigger("transport:up"))},messageError:function(e,t){for(var n,i,s=this._retry,r=this,o=0,a=e.length;a>o;o++)i=e[o],n=i.id,t?this._transportSend(i):Faye.ENV.setTimeout(function(){r._transportSend(i)},1e3*s);t||this._transportUp===!1||(this._transportUp=!1,this.trigger("transport:down"))},_selectTransport:function(e){Faye.Transport.get(this,e,this._disabled,function(e){this.debug("Selected ? transport for ?",e.connectionType,Faye.URI.stringify(e.endpoint)),e!==this._transport&&(this._transport&&this._transport.close(),this._transport=e)},this)},_send:function(e,t,n){this._transport&&(e.id=e.id||this._generateMessageId(),this.pipeThroughExtensions("outgoing",e,null,function(e){e&&(t&&(this._responseCallbacks[e.id]=[t,n]),this._transportSend(e))},this))},_transportSend:function(e){if(this._transport){var t=1.2*(this._advice.timeout||1e3*this._retry),n=new Faye.Envelope(e,t);n.errback(function(t){this.messageError([e],t)},this),this._transport.send(n)}},_generateMessageId:function(){return this._messageId+=1,this._messageId>=Math.pow(2,32)&&(this._messageId=0),this._messageId.toString(36)},_handleAdvice:function(e){Faye.extend(this._advice,e),this._advice.reconnect===this.HANDSHAKE&&this._state!==this.DISCONNECTED&&(this._state=this.UNCONNECTED,this._clientId=null,this._cycleConnection())},_deliverMessage:function(e){e.channel&&void 0!==e.data&&(this.info("Client ? calling listeners for ? with ?",this._clientId,e.channel,e.data),this._channels.distributeMessage(e))},_cycleConnection:function(){this._connectRequest&&(this._connectRequest=null,this.info("Closed connection for ?",this._clientId));var e=this;Faye.ENV.setTimeout(function(){e.connect()},this._advice.interval)}}),Faye.extend(Faye.Client.prototype,Faye.Deferrable),Faye.extend(Faye.Client.prototype,Faye.Publisher),Faye.extend(Faye.Client.prototype,Faye.Logging),Faye.extend(Faye.Client.prototype,Faye.Extensible),Faye.Transport=Faye.extend(Faye.Class({MAX_DELAY:0,batching:!0,initialize:function(e,t){this._client=e,this.endpoint=t,this._outbox=[]},close:function(){},encode:function(){return""},send:function(e){var t=e.message;return this.debug("Client ? sending message to ?: ?",this._client._clientId,Faye.URI.stringify(this.endpoint),t),this.batching?(this._outbox.push(e),t.channel===Faye.Channel.HANDSHAKE?this.addTimeout("publish",.01,this.flush,this):(t.channel===Faye.Channel.CONNECT&&(this._connectMessage=t),this.flushLargeBatch(),this.addTimeout("publish",this.MAX_DELAY,this.flush,this),void 0)):this.request([e])},flush:function(){this.removeTimeout("publish"),this._outbox.length>1&&this._connectMessage&&(this._connectMessage.advice={timeout:0}),this.request(this._outbox),this._connectMessage=null,this._outbox=[]},flushLargeBatch:function(){var e=this.encode(this._outbox);if(!(e.length<this._client.maxRequestSize)){var t=this._outbox.pop();this.flush(),t&&this._outbox.push(t)}},receive:function(e,t){for(var n=e.length;n--;)e[n].setDeferredStatus("succeeded");t=[].concat(t),this.debug("Client ? received from ?: ?",this._client._clientId,Faye.URI.stringify(this.endpoint),t);for(var i=0,n=t.length;n>i;i++)this._client.receiveMessage(t[i])},handleError:function(e,t){for(var n=e.length;n--;)e[n].setDeferredStatus("failed",t)},_getCookies:function(){var e=this._client.cookies;return e?e.getCookies({domain:this.endpoint.hostname,path:this.endpoint.path,secure:"https:"===this.endpoint.protocol}).toValueString():""},_storeCookies:function(e){if(e&&this._client.cookies){e=[].concat(e);for(var t,n=0,i=e.length;i>n;n++)t=this._client.cookies.setCookie(e[n]),t=t[0]||t,t.domain=t.domain||this.endpoint.hostname}}}),{get:function(e,t,n,i,s){var r=e.endpoint;Faye.asyncEach(this._transports,function(o,a){var c=o[0],u=o[1],h=e.endpoints[c]||r;return Faye.indexOf(n,c)>=0?a():Faye.indexOf(t,c)<0?(u.isUsable(e,h,function(){}),a()):(u.isUsable(e,h,function(t){if(!t)return a();var n=u.hasOwnProperty("create")?u.create(e,h):new u(e,h);i.call(s,n)}),void 0)},function(){throw Error("Could not find a usable connection type for "+Faye.URI.stringify(r))})},register:function(e,t){this._transports.push([e,t]),t.prototype.connectionType=e},_transports:[]}),Faye.extend(Faye.Transport.prototype,Faye.Logging),Faye.extend(Faye.Transport.prototype,Faye.Timeouts),Faye.Event={_registry:[],on:function(e,t,n,i){var s=function(){n.call(i)};e.addEventListener?e.addEventListener(t,s,!1):e.attachEvent("on"+t,s),this._registry.push({_element:e,_type:t,_callback:n,_context:i,_handler:s})},detach:function(e,t,n,i){for(var s,r=this._registry.length;r--;)s=this._registry[r],e&&e!==s._element||t&&t!==s._type||n&&n!==s._callback||i&&i!==s._context||(s._element.removeEventListener?s._element.removeEventListener(s._type,s._handler,!1):s._element.detachEvent("on"+s._type,s._handler),this._registry.splice(r,1),s=null)}},void 0!==Faye.ENV.onunload&&Faye.Event.on(Faye.ENV,"unload",Faye.Event.detach,Faye.Event),"object"!=typeof JSON&&(JSON={}),function(){function f(e){return 10>e?"0"+e:e}function quote(e){return escapable.lastIndex=0,escapable.test(e)?'"'+e.replace(escapable,function(e){var t=meta[e];return"string"==typeof t?t:"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+e+'"'}function str(e,t){var n,i,s,r,o,a=gap,c=t[e];switch(c&&"object"==typeof c&&"function"==typeof c.toJSON&&(c=c.toJSON(e)),"function"==typeof rep&&(c=rep.call(t,e,c)),typeof c){case"string":return quote(c);case"number":return isFinite(c)?c+"":"null";case"boolean":case"null":return c+"";case"object":if(!c)return"null";if(gap+=indent,o=[],"[object Array]"===Object.prototype.toString.apply(c)){for(r=c.length,n=0;r>n;n+=1)o[n]=str(n,c)||"null";return s=0===o.length?"[]":gap?"[\n"+gap+o.join(",\n"+gap)+"\n"+a+"]":"["+o.join(",")+"]",gap=a,s}if(rep&&"object"==typeof rep)for(r=rep.length,n=0;r>n;n+=1)"string"==typeof rep[n]&&(i=rep[n],s=str(i,c),s&&o.push(quote(i)+(gap?": ":":")+s));else for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(s=str(i,c),s&&o.push(quote(i)+(gap?": ":":")+s));return s=0===o.length?"{}":gap?"{\n"+gap+o.join(",\n"+gap)+"\n"+a+"}":"{"+o.join(",")+"}",gap=a,s}}"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()});var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","	":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;Faye.stringify=function(e,t,n){var i;if(gap="",indent="","number"==typeof n)for(i=0;n>i;i+=1)indent+=" ";else"string"==typeof n&&(indent=n);if(rep=t,t&&"function"!=typeof t&&("object"!=typeof t||"number"!=typeof t.length))throw Error("JSON.stringify");return str("",{"":e})},"function"!=typeof JSON.stringify&&(JSON.stringify=Faye.stringify),"function"!=typeof JSON.parse&&(JSON.parse=function(text,reviver){function walk(e,t){var n,i,s=e[t];if(s&&"object"==typeof s)for(n in s)Object.prototype.hasOwnProperty.call(s,n)&&(i=walk(s,n),void 0!==i?s[n]=i:delete s[n]);return reviver.call(e,t,s)}var j;if(text+="",cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(e){return"\\u"+("0000"+e.charCodeAt(0).toString(16)).slice(-4)})),/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return j=eval("("+text+")"),"function"==typeof reviver?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}(),Faye.Transport.WebSocket=Faye.extend(Faye.Class(Faye.Transport,{UNCONNECTED:1,CONNECTING:2,CONNECTED:3,batching:!1,isUsable:function(e,t){this.callback(function(){e.call(t,!0)}),this.errback(function(){e.call(t,!1)}),this.connect()},request:function(e){this._pending=this._pending||new Faye.Set;for(var t=0,n=e.length;n>t;t++)this._pending.add(e[t]);this.callback(function(t){if(t){var n=Faye.map(e,function(e){return e.message});t.send(Faye.toJSON(n))}},this),this.connect()},connect:function(){if(!Faye.Transport.WebSocket._unloaded&&(this._state=this._state||this.UNCONNECTED,this._state===this.UNCONNECTED)){this._state=this.CONNECTING;var e=this._createSocket();if(!e)return this.setDeferredStatus("failed");var t=this;e.onopen=function(){e.headers&&t._storeCookies(e.headers["set-cookie"]),t._socket=e,t._state=t.CONNECTED,t._everConnected=!0,t._ping(),t.setDeferredStatus("succeeded",e)};var n=!1;e.onclose=e.onerror=function(){if(!n){n=!0;var i=t._state===t.CONNECTED;e.onopen=e.onclose=e.onerror=e.onmessage=null,delete t._socket,t._state=t.UNCONNECTED,t.removeTimeout("ping"),t.setDeferredStatus("unknown");var s=t._pending?t._pending.toArray():[];delete t._pending,i?t.handleError(s,!0):t._everConnected?t.handleError(s):t.setDeferredStatus("failed")}},e.onmessage=function(e){var n,i=JSON.parse(e.data),s=[];if(i){i=[].concat(i);for(var r=0,o=i.length;o>r;r++)void 0!==i[r].successful&&(n=t._pending.remove(i[r]),n&&s.push(n));t.receive(s,i)}}}},close:function(){this._socket&&this._socket.close()},_createSocket:function(){var e=Faye.Transport.WebSocket.getSocketUrl(this.endpoint),t={headers:Faye.copyObject(this._client.headers),ca:this._client.ca};return t.headers.Cookie=this._getCookies(),Faye.WebSocket?new Faye.WebSocket.Client(e,[],t):Faye.ENV.MozWebSocket?new MozWebSocket(e):Faye.ENV.WebSocket?new WebSocket(e):void 0},_ping:function(){this._socket&&(this._socket.send("[]"),this.addTimeout("ping",this._client._advice.timeout/2e3,this._ping,this))}}),{PROTOCOLS:{"http:":"ws:","https:":"wss:"},create:function(e,t){var n=e.transports.websocket=e.transports.websocket||{};return n[t.href]=n[t.href]||new this(e,t),n[t.href]},getSocketUrl:function(e){return e=Faye.copyObject(e),e.protocol=this.PROTOCOLS[e.protocol],Faye.URI.stringify(e)},isUsable:function(e,t,n,i){this.create(e,t).isUsable(n,i)}}),Faye.extend(Faye.Transport.WebSocket.prototype,Faye.Deferrable),Faye.Transport.register("websocket",Faye.Transport.WebSocket),Faye.Event&&Faye.Event.on(Faye.ENV,"beforeunload",function(){Faye.Transport.WebSocket._unloaded=!0}),Faye.Transport.EventSource=Faye.extend(Faye.Class(Faye.Transport,{initialize:function(e,t){if(Faye.Transport.prototype.initialize.call(this,e,t),!Faye.ENV.EventSource)return this.setDeferredStatus("failed");this._xhr=new Faye.Transport.XHR(e,t),t=Faye.copyObject(t),t.pathname+="/"+e._clientId;var n=new EventSource(Faye.URI.stringify(t)),i=this;n.onopen=function(){i._everConnected=!0,i.setDeferredStatus("succeeded")},n.onerror=function(){i._everConnected?i._client.messageError([]):(i.setDeferredStatus("failed"),n.close())},n.onmessage=function(e){i.receive([],JSON.parse(e.data))},this._socket=n},close:function(){this._socket&&(this._socket.onopen=this._socket.onerror=this._socket.onmessage=null,this._socket.close(),delete this._socket)},isUsable:function(e,t){this.callback(function(){e.call(t,!0)}),this.errback(function(){e.call(t,!1)})},encode:function(e){return this._xhr.encode(e)},request:function(e){this._xhr.request(e)}}),{isUsable:function(e,t,n,i){var s=e._clientId;
+return s?(Faye.Transport.XHR.isUsable(e,t,function(s){return s?(this.create(e,t).isUsable(n,i),void 0):n.call(i,!1)},this),void 0):n.call(i,!1)},create:function(e,t){var n=e.transports.eventsource=e.transports.eventsource||{},i=e._clientId;t=Faye.copyObject(t),t.pathname+="/"+(i||"");var s=Faye.URI.stringify(t);return n[s]=n[s]||new this(e,t),n[s]}}),Faye.extend(Faye.Transport.EventSource.prototype,Faye.Deferrable),Faye.Transport.register("eventsource",Faye.Transport.EventSource),Faye.Transport.XHR=Faye.extend(Faye.Class(Faye.Transport,{encode:function(e){var t=Faye.map(e,function(e){return e.message});return Faye.toJSON(t)},request:function(e){var t=this.endpoint.path,n=Faye.ENV.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest,i=this;n.open("POST",t,!0),n.setRequestHeader("Content-Type","application/json"),n.setRequestHeader("Pragma","no-cache"),n.setRequestHeader("X-Requested-With","XMLHttpRequest");var s=this._client.headers;for(var r in s)s.hasOwnProperty(r)&&n.setRequestHeader(r,s[r]);var o=function(){n.abort()};Faye.Event.on(Faye.ENV,"beforeunload",o),n.onreadystatechange=function(){if(n&&4===n.readyState){var t=null,s=n.status,r=n.responseText,a=s>=200&&300>s||304===s||1223===s;if(Faye.Event.detach(Faye.ENV,"beforeunload",o),n.onreadystatechange=function(){},n=null,!a)return i.handleError(e);try{t=JSON.parse(r)}catch(c){}t?i.receive(e,t):i.handleError(e)}},n.send(this.encode(e))}}),{isUsable:function(e,t,n,i){n.call(i,Faye.URI.isSameOrigin(t))}}),Faye.Transport.register("long-polling",Faye.Transport.XHR),Faye.Transport.CORS=Faye.extend(Faye.Class(Faye.Transport,{encode:function(e){var t=Faye.map(e,function(e){return e.message});return"message="+encodeURIComponent(Faye.toJSON(t))},request:function(e){var t,n=Faye.ENV.XDomainRequest?XDomainRequest:XMLHttpRequest,i=new n,s=this._client.headers,r=this;if(i.open("POST",Faye.URI.stringify(this.endpoint),!0),i.setRequestHeader){i.setRequestHeader("Pragma","no-cache");for(t in s)s.hasOwnProperty(t)&&i.setRequestHeader(t,s[t])}var o=function(){return i?(i.onload=i.onerror=i.ontimeout=i.onprogress=null,i=null,void 0):!1};i.onload=function(){var t=null;try{t=JSON.parse(i.responseText)}catch(n){}o(),t?r.receive(e,t):r.handleError(e)},i.onerror=i.ontimeout=function(){o(),r.handleError(e)},i.onprogress=function(){},i.send(this.encode(e))}}),{isUsable:function(e,t,n,i){if(Faye.URI.isSameOrigin(t))return n.call(i,!1);if(Faye.ENV.XDomainRequest)return n.call(i,t.protocol===Faye.ENV.location.protocol);if(Faye.ENV.XMLHttpRequest){var s=new Faye.ENV.XMLHttpRequest;return n.call(i,void 0!==s.withCredentials)}return n.call(i,!1)}}),Faye.Transport.register("cross-origin-long-polling",Faye.Transport.CORS),Faye.Transport.JSONP=Faye.extend(Faye.Class(Faye.Transport,{encode:function(e){var t=Faye.map(e,function(e){return e.message}),n=Faye.copyObject(this.endpoint);return n.query.message=Faye.toJSON(t),n.query.jsonp="__jsonp"+Faye.Transport.JSONP._cbCount+"__",Faye.URI.stringify(n)},request:function(e){var t=Faye.map(e,function(e){return e.message}),n=document.getElementsByTagName("head")[0],i=document.createElement("script"),s=Faye.Transport.JSONP.getCallbackName(),r=Faye.copyObject(this.endpoint),o=this;r.query.message=Faye.toJSON(t),r.query.jsonp=s,Faye.ENV[s]=function(t){if(!Faye.ENV[s])return!1;Faye.ENV[s]=void 0;try{delete Faye.ENV[s]}catch(n){}i.parentNode.removeChild(i),o.receive(e,t)},i.type="text/javascript",i.src=Faye.URI.stringify(r),n.appendChild(i)}}),{_cbCount:0,getCallbackName:function(){return this._cbCount+=1,"__jsonp"+this._cbCount+"__"},isUsable:function(e,t,n,i){n.call(i,!0)}}),Faye.Transport.register("callback-polling",Faye.Transport.JSONP)}();
 //@ sourceMappingURL=faye-browser-min.js.map
-})();
+})(this);

data/vendor/assets/javascripts/faye-browser.js

@@ -1,8 +1,9 @@
 (function() {
+(function() {
 'use strict';
 
 var Faye = {
-  VERSION:          '0.8.9',
+  VERSION:          '1.0.1',
 
   BAYEUX_VERSION:   '1.0',
   ID_LENGTH:        160,
@@ -11,7 +12,7 @@ var Faye = {
 
   MANDATORY_CONNECTION_TYPES: ['long-polling', 'callback-polling', 'in-process'],
 
-  ENV: (typeof global === 'undefined') ? window : global,
+  ENV: (typeof window !== 'undefined') ? window : global,
 
   extend: function(dest, source, overwrite) {
     if (!source) return dest;
@@ -26,25 +27,14 @@ var Faye = {
 
   random: function(bitlength) {
     bitlength = bitlength || this.ID_LENGTH;
-    if (bitlength > 32) {
-      var parts  = Math.ceil(bitlength / 32),
-          string = '';
-      while (parts--) string += this.random(32);
-      var chars = string.split(''), result = '';
-      while (chars.length > 0) result += chars.pop();
-      return result;
-    }
-    var limit   = Math.pow(2, bitlength) - 1,
-        maxSize = limit.toString(36).length,
-        string  = Math.floor(Math.random() * limit).toString(36);
-
-    while (string.length < maxSize) string = '0' + string;
-    return string;
+    return csprng(bitlength, 36);
   },
 
   clientIdFromMessages: function(messages) {
-    var first = [].concat(messages)[0];
-    return first && first.clientId;
+    var connect = this.filter([].concat(messages), function(message) {
+      return message.channel === '/meta/connect';
+    });
+    return connect[0] && connect[0].clientId;
   },
 
   copyObject: function(object) {
@@ -98,6 +88,7 @@ var Faye = {
   },
 
   filter: function(array, callback, context) {
+    if (array.filter) return array.filter(callback, context);
     var result = [];
     for (var i = 0, n = array.length; i < n; i++) {
       if (callback.call(context || null, array[i], i))
@@ -135,42 +126,19 @@ var Faye = {
 
   // http://assanka.net/content/tech/2009/09/02/json2-js-vs-prototype/
   toJSON: function(object) {
-    if (this.stringify)
-      return this.stringify(object, function(key, value) {
-        return (this[key] instanceof Array)
-            ? this[key]
-            : value;
-      });
-
-    return JSON.stringify(object);
-  },
+    if (!this.stringify) return JSON.stringify(object);
 
-  logger: function(message) {
-    if (typeof console !== 'undefined') console.log(message);
-  },
-
-  timestamp: function() {
-    var date   = new Date(),
-        year   = date.getFullYear(),
-        month  = date.getMonth() + 1,
-        day    = date.getDate(),
-        hour   = date.getHours(),
-        minute = date.getMinutes(),
-        second = date.getSeconds();
-
-    var pad = function(n) {
-      return n < 10 ? '0' + n : String(n);
-    };
-
-    return pad(year) + '-' + pad(month) + '-' + pad(day) + ' ' +
-           pad(hour) + ':' + pad(minute) + ':' + pad(second);
+    return this.stringify(object, function(key, value) {
+      return (this[key] instanceof Array) ? this[key] : value;
+    });
   }
 };
 
-if (typeof window !== 'undefined')
+if (typeof module !== 'undefined')
+  module.exports = Faye;
+else if (typeof window !== 'undefined')
   window.Faye = Faye;
 
-
 Faye.Class = function(parent, methods) {
   if (typeof parent !== 'function') {
     methods = parent;
@@ -191,6 +159,180 @@ Faye.Class = function(parent, methods) {
   return klass;
 };
 
+(function() {
+var EventEmitter = Faye.EventEmitter = function() {};
+
+/*
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+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.
+*/
+
+var isArray = typeof Array.isArray === 'function'
+    ? Array.isArray
+    : function (xs) {
+        return Object.prototype.toString.call(xs) === '[object Array]'
+    }
+;
+function indexOf (xs, x) {
+    if (xs.indexOf) return xs.indexOf(x);
+    for (var i = 0; i < xs.length; i++) {
+        if (x === xs[i]) return i;
+    }
+    return -1;
+}
+
+
+EventEmitter.prototype.emit = function(type) {
+  // If there is no 'error' event listener then throw.
+  if (type === 'error') {
+    if (!this._events || !this._events.error ||
+        (isArray(this._events.error) && !this._events.error.length))
+    {
+      if (arguments[1] instanceof Error) {
+        throw arguments[1]; // Unhandled 'error' event
+      } else {
+        throw new Error("Uncaught, unspecified 'error' event.");
+      }
+      return false;
+    }
+  }
+
+  if (!this._events) return false;
+  var handler = this._events[type];
+  if (!handler) return false;
+
+  if (typeof handler == 'function') {
+    switch (arguments.length) {
+      // fast cases
+      case 1:
+        handler.call(this);
+        break;
+      case 2:
+        handler.call(this, arguments[1]);
+        break;
+      case 3:
+        handler.call(this, arguments[1], arguments[2]);
+        break;
+      // slower
+      default:
+        var args = Array.prototype.slice.call(arguments, 1);
+        handler.apply(this, args);
+    }
+    return true;
+
+  } else if (isArray(handler)) {
+    var args = Array.prototype.slice.call(arguments, 1);
+
+    var listeners = handler.slice();
+    for (var i = 0, l = listeners.length; i < l; i++) {
+      listeners[i].apply(this, args);
+    }
+    return true;
+
+  } else {
+    return false;
+  }
+};
+
+// EventEmitter is defined in src/node_events.cc
+// EventEmitter.prototype.emit() is also defined there.
+EventEmitter.prototype.addListener = function(type, listener) {
+  if ('function' !== typeof listener) {
+    throw new Error('addListener only takes instances of Function');
+  }
+
+  if (!this._events) this._events = {};
+
+  // To avoid recursion in the case that type == "newListeners"! Before
+  // adding it to the listeners, first emit "newListeners".
+  this.emit('newListener', type, listener);
+
+  if (!this._events[type]) {
+    // Optimize the case of one listener. Don't need the extra array object.
+    this._events[type] = listener;
+  } else if (isArray(this._events[type])) {
+    // If we've already got an array, just append.
+    this._events[type].push(listener);
+  } else {
+    // Adding the second element, need to change to array.
+    this._events[type] = [this._events[type], listener];
+  }
+
+  return this;
+};
+
+EventEmitter.prototype.on = EventEmitter.prototype.addListener;
+
+EventEmitter.prototype.once = function(type, listener) {
+  var self = this;
+  self.on(type, function g() {
+    self.removeListener(type, g);
+    listener.apply(this, arguments);
+  });
+
+  return this;
+};
+
+EventEmitter.prototype.removeListener = function(type, listener) {
+  if ('function' !== typeof listener) {
+    throw new Error('removeListener only takes instances of Function');
+  }
+
+  // does not use listeners(), so no side effect of creating _events[type]
+  if (!this._events || !this._events[type]) return this;
+
+  var list = this._events[type];
+
+  if (isArray(list)) {
+    var i = indexOf(list, listener);
+    if (i < 0) return this;
+    list.splice(i, 1);
+    if (list.length == 0)
+      delete this._events[type];
+  } else if (this._events[type] === listener) {
+    delete this._events[type];
+  }
+
+  return this;
+};
+
+EventEmitter.prototype.removeAllListeners = function(type) {
+  if (arguments.length === 0) {
+    this._events = {};
+    return this;
+  }
+
+  // does not use listeners(), so no side effect of creating _events[type]
+  if (type && this._events && this._events[type]) this._events[type] = null;
+  return this;
+};
+
+EventEmitter.prototype.listeners = function(type) {
+  if (!this._events) this._events = {};
+  if (!this._events[type]) this._events[type] = [];
+  if (!isArray(this._events[type])) {
+    this._events[type] = [this._events[type]];
+  }
+  return this._events[type];
+};
+
+})();
 
 Faye.Namespace = Faye.Class({
   initialize: function() {
@@ -213,6 +355,283 @@ Faye.Namespace = Faye.Class({
   }
 });
 
+(function() {
+'use strict';
+
+var timeout = setTimeout;
+
+var defer;
+if (typeof setImmediate === 'function')
+  defer = function(fn) { setImmediate(fn) };
+else if (typeof process === 'object' && process.nextTick)
+  defer = function(fn) { process.nextTick(fn) };
+else
+  defer = function(fn) { timeout(fn, 0) };
+
+var PENDING   = 0,
+    FULFILLED = 1,
+    REJECTED  = 2;
+
+var RETURN = function(x) { return x },
+    THROW  = function(x) { throw x  };
+
+var Promise = function(task) {
+  this._state     = PENDING;
+  this._callbacks = [];
+  this._errbacks  = [];
+
+  if (typeof task !== 'function') return;
+  var self = this;
+
+  task(function(value)  { fulfill(self, value) },
+       function(reason) { reject(self, reason) });
+};
+
+Promise.prototype.then = function(callback, errback) {
+  var next = {}, self = this;
+
+  next.promise = new Promise(function(fulfill, reject) {
+    next.fulfill = fulfill;
+    next.reject  = reject;
+
+    registerCallback(self, callback, next);
+    registerErrback(self, errback, next);
+  });
+  return next.promise;
+};
+
+var registerCallback = function(promise, callback, next) {
+  if (typeof callback !== 'function') callback = RETURN;
+  var handler = function(value) { invoke(callback, value, next) };
+  if (promise._state === PENDING) {
+    promise._callbacks.push(handler);
+  } else if (promise._state === FULFILLED) {
+    handler(promise._value);
+  }
+};
+
+var registerErrback = function(promise, errback, next) {
+  if (typeof errback !== 'function') errback = THROW;
+  var handler = function(reason) { invoke(errback, reason, next) };
+  if (promise._state === PENDING) {
+    promise._errbacks.push(handler);
+  } else if (promise._state === REJECTED) {
+    handler(promise._reason);
+  }
+};
+
+var invoke = function(fn, value, next) {
+  defer(function() { _invoke(fn, value, next) });
+};
+
+var _invoke = function(fn, value, next) {
+  var called = false, outcome, type, then;
+
+  try {
+    outcome = fn(value);
+    type    = typeof outcome;
+    then    = outcome !== null && (type === 'function' || type === 'object') && outcome.then;
+
+    if (outcome === next.promise)
+      return next.reject(new TypeError('Recursive promise chain detected'));
+
+    if (typeof then !== 'function') return next.fulfill(outcome);
+
+    then.call(outcome, function(v) {
+      if (called) return;
+      called = true;
+      _invoke(RETURN, v, next);
+    }, function(r) {
+      if (called) return;
+      called = true;
+      next.reject(r);
+    });
+
+  } catch (error) {
+    if (called) return;
+    called = true;
+    next.reject(error);
+  }
+};
+
+var fulfill = Promise.fulfill = Promise.resolve = function(promise, value) {
+  if (promise._state !== PENDING) return;
+
+  promise._state    = FULFILLED;
+  promise._value    = value;
+  promise._errbacks = [];
+
+  var callbacks = promise._callbacks, cb;
+  while (cb = callbacks.shift()) cb(value);
+};
+
+var reject = Promise.reject = function(promise, reason) {
+  if (promise._state !== PENDING) return;
+
+  promise._state     = REJECTED;
+  promise._reason    = reason;
+  promise._callbacks = [];
+
+  var errbacks = promise._errbacks, eb;
+  while (eb = errbacks.shift()) eb(reason);
+};
+
+Promise.defer = defer;
+
+Promise.deferred = Promise.pending = function() {
+  var tuple = {};
+
+  tuple.promise = new Promise(function(fulfill, reject) {
+    tuple.fulfill = tuple.resolve = fulfill;
+    tuple.reject  = reject;
+  });
+  return tuple;
+};
+
+Promise.fulfilled = Promise.resolved = function(value) {
+  return new Promise(function(fulfill, reject) { fulfill(value) });
+};
+
+Promise.rejected = function(reason) {
+  return new Promise(function(fulfill, reject) { reject(reason) });
+};
+
+if (typeof Faye === 'undefined')
+  module.exports = Promise;
+else
+  Faye.Promise = Promise;
+
+})();
+
+Faye.Set = Faye.Class({
+  initialize: function() {
+    this._index = {};
+  },
+
+  add: function(item) {
+    var key = (item.id !== undefined) ? item.id : item;
+    if (this._index.hasOwnProperty(key)) return false;
+    this._index[key] = item;
+    return true;
+  },
+
+  forEach: function(block, context) {
+    for (var key in this._index) {
+      if (this._index.hasOwnProperty(key))
+        block.call(context, this._index[key]);
+    }
+  },
+
+  isEmpty: function() {
+    for (var key in this._index) {
+      if (this._index.hasOwnProperty(key)) return false;
+    }
+    return true;
+  },
+
+  member: function(item) {
+    for (var key in this._index) {
+      if (this._index[key] === item) return true;
+    }
+    return false;
+  },
+
+  remove: function(item) {
+    var key = (item.id !== undefined) ? item.id : item;
+    var removed = this._index[key];
+    delete this._index[key];
+    return removed;
+  },
+
+  toArray: function() {
+    var array = [];
+    this.forEach(function(item) { array.push(item) });
+    return array;
+  }
+});
+
+Faye.URI = {
+  isURI: function(uri) {
+    return uri && uri.protocol && uri.host && uri.path;
+  },
+
+  isSameOrigin: function(uri) {
+    var location = Faye.ENV.location;
+    return uri.protocol === location.protocol &&
+           uri.hostname === location.hostname &&
+           uri.port     === location.port;
+  },
+
+  parse: function(url) {
+    if (typeof url !== 'string') return url;
+    var uri = {}, parts, query, pairs, i, n, data;
+
+    var consume = function(name, pattern) {
+      url = url.replace(pattern, function(match) {
+        uri[name] = match;
+        return '';
+      });
+      uri[name] = uri[name] || '';
+    };
+
+    consume('protocol', /^[a-z]+\:/i);
+    consume('host',     /^\/\/[^\/\?#]+/);
+
+    if (!/^\//.test(url) && !uri.host)
+      url = Faye.ENV.location.pathname.replace(/[^\/]*$/, '') + url;
+
+    consume('pathname', /^[^\?#]*/);
+    consume('search',   /^\?[^#]*/);
+    consume('hash',     /^#.*/);
+
+    uri.protocol = uri.protocol || Faye.ENV.location.protocol;
+
+    if (uri.host) {
+      uri.host     = uri.host.substr(2);
+      parts        = uri.host.split(':');
+      uri.hostname = parts[0];
+      uri.port     = parts[1] || '';
+    } else {
+      uri.host     = Faye.ENV.location.host;
+      uri.hostname = Faye.ENV.location.hostname;
+      uri.port     = Faye.ENV.location.port;
+    }
+
+    uri.pathname = uri.pathname || '/';
+    uri.path = uri.pathname + uri.search;
+
+    query = uri.search.replace(/^\?/, '');
+    pairs = query ? query.split('&') : [];
+    data  = {};
+
+    for (i = 0, n = pairs.length; i < n; i++) {
+      parts = pairs[i].split('=');
+      data[decodeURIComponent(parts[0] || '')] = decodeURIComponent(parts[1] || '');
+    }
+
+    uri.query = data;
+
+    uri.href = this.stringify(uri);
+    return uri;
+  },
+
+  stringify: function(uri) {
+    var string = uri.protocol + '//' + uri.hostname;
+    if (uri.port) string += ':' + uri.port;
+    string += uri.pathname + this.queryString(uri.query) + (uri.hash || '');
+    return string;
+  },
+
+  queryString: function(query) {
+    var pairs = [];
+    for (var key in query) {
+      if (!query.hasOwnProperty(key)) continue;
+      pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(query[key]));
+    }
+    if (pairs.length === 0) return '';
+    return '?' + pairs.join('&');
+  }
+};
 
 Faye.Error = Faye.Class({
   initialize: function(code, params, message) {
@@ -240,143 +659,133 @@ Faye.Error.parse = function(message) {
   return new this(code, params, message);
 };
 
+
+
+
 Faye.Error.versionMismatch = function() {
-  return new this(300, arguments, "Version mismatch").toString();
+  return new this(300, arguments, 'Version mismatch').toString();
 };
+
 Faye.Error.conntypeMismatch = function() {
-  return new this(301, arguments, "Connection types not supported").toString();
+  return new this(301, arguments, 'Connection types not supported').toString();
 };
+
 Faye.Error.extMismatch = function() {
-  return new this(302, arguments, "Extension mismatch").toString();
+  return new this(302, arguments, 'Extension mismatch').toString();
 };
+
 Faye.Error.badRequest = function() {
-  return new this(400, arguments, "Bad request").toString();
+  return new this(400, arguments, 'Bad request').toString();
 };
+
 Faye.Error.clientUnknown = function() {
-  return new this(401, arguments, "Unknown client").toString();
+  return new this(401, arguments, 'Unknown client').toString();
 };
+
 Faye.Error.parameterMissing = function() {
-  return new this(402, arguments, "Missing required parameter").toString();
+  return new this(402, arguments, 'Missing required parameter').toString();
 };
+
 Faye.Error.channelForbidden = function() {
-  return new this(403, arguments, "Forbidden channel").toString();
+  return new this(403, arguments, 'Forbidden channel').toString();
 };
+
 Faye.Error.channelUnknown = function() {
-  return new this(404, arguments, "Unknown channel").toString();
+  return new this(404, arguments, 'Unknown channel').toString();
 };
+
 Faye.Error.channelInvalid = function() {
-  return new this(405, arguments, "Invalid channel").toString();
+  return new this(405, arguments, 'Invalid channel').toString();
 };
+
 Faye.Error.extUnknown = function() {
-  return new this(406, arguments, "Unknown extension").toString();
+  return new this(406, arguments, 'Unknown extension').toString();
 };
+
 Faye.Error.publishFailed = function() {
-  return new this(407, arguments, "Failed to publish").toString();
+  return new this(407, arguments, 'Failed to publish').toString();
 };
+
 Faye.Error.serverError = function() {
-  return new this(500, arguments, "Internal server error").toString();
+  return new this(500, arguments, 'Internal server error').toString();
 };
 
 
 Faye.Deferrable = {
-  callback: function(callback, context) {
-    if (!callback) return;
-
-    if (this._deferredStatus === 'succeeded')
-      return callback.apply(context, this._deferredArgs);
+  then: function(callback, errback) {
+    var self = this;
+    if (!this._promise)
+      this._promise = new Faye.Promise(function(fulfill, reject) {
+        self._fulfill = fulfill;
+        self._reject  = reject;
+      });
 
-    this._callbacks = this._callbacks || [];
-    this._callbacks.push([callback, context]);
+    if (arguments.length === 0)
+      return this._promise;
+    else
+      return this._promise.then(callback, errback);
   },
 
-  timeout: function(seconds, message) {
-    var _this = this;
-    var timer = Faye.ENV.setTimeout(function() {
-      _this.setDeferredStatus('failed', message);
-    }, seconds * 1000);
-    this._timer = timer;
+  callback: function(callback, context) {
+    return this.then(function(value) { callback.call(context, value) });
   },
 
   errback: function(callback, context) {
-    if (!callback) return;
-
-    if (this._deferredStatus === 'failed')
-      return callback.apply(context, this._deferredArgs);
-
-    this._errbacks = this._errbacks || [];
-    this._errbacks.push([callback, context]);
+    return this.then(null, function(reason) { callback.call(context, reason) });
   },
 
-  setDeferredStatus: function() {
-    if (this._timer)
-      Faye.ENV.clearTimeout(this._timer);
+  timeout: function(seconds, message) {
+    this.then();
+    var self = this;
+    this._timer = Faye.ENV.setTimeout(function() {
+      self._reject(message);
+    }, seconds * 1000);
+  },
 
-    var args   = Array.prototype.slice.call(arguments),
-        status = args.shift(),
-        callbacks;
+  setDeferredStatus: function(status, value) {
+    if (this._timer) Faye.ENV.clearTimeout(this._timer);
 
-    this._deferredStatus = status;
-    this._deferredArgs = args;
+    var promise = this.then();
 
     if (status === 'succeeded')
-      callbacks = this._callbacks;
+      this._fulfill(value);
     else if (status === 'failed')
-      callbacks = this._errbacks;
-
-    if (!callbacks) return;
-
-    var callback;
-    while (callback = callbacks.shift())
-      callback[0].apply(callback[1], this._deferredArgs);
+      this._reject(value);
+    else
+      delete this._promise;
   }
 };
 
-
 Faye.Publisher = {
   countListeners: function(eventType) {
-    if (!this._subscribers || !this._subscribers[eventType]) return 0;
-    return this._subscribers[eventType].length;
+    return this.listeners(eventType).length;
   },
 
   bind: function(eventType, listener, context) {
-    this._subscribers = this._subscribers || {};
-    var list = this._subscribers[eventType] = this._subscribers[eventType] || [];
-    list.push([listener, context]);
-  },
-
-  unbind: function(eventType, listener, context) {
-    if (!this._subscribers || !this._subscribers[eventType]) return;
-
-    if (!listener) {
-      delete this._subscribers[eventType];
-      return;
-    }
-    var list = this._subscribers[eventType],
-        i    = list.length;
+    var slice   = Array.prototype.slice,
+        handler = function() { listener.apply(context, slice.call(arguments)) };
 
-    while (i--) {
-      if (listener !== list[i][0]) continue;
-      if (context && list[i][1] !== context) continue;
-      list.splice(i,1);
-    }
+    this._listeners = this._listeners || [];
+    this._listeners.push([eventType, listener, context, handler]);
+    return this.on(eventType, handler);
   },
 
-  trigger: function() {
-    var args = Array.prototype.slice.call(arguments),
-        eventType = args.shift();
-
-    if (!this._subscribers || !this._subscribers[eventType]) return;
-
-    var listeners = this._subscribers[eventType].slice(),
-        listener;
-
-    for (var i = 0, n = listeners.length; i < n; i++) {
-      listener = listeners[i];
-      listener[0].apply(listener[1], args);
+  unbind: function(eventType, listener, context) {
+    this._listeners = this._listeners || [];
+    var n = this._listeners.length, tuple;
+
+    while (n--) {
+      tuple = this._listeners[n];
+      if (tuple[0] !== eventType) continue;
+      if (listener && (tuple[1] !== listener || tuple[2] !== context)) continue;
+      this._listeners.splice(n, 1);
+      this.removeListener(eventType, tuple[3]);
     }
   }
 };
 
+Faye.extend(Faye.Publisher, Faye.EventEmitter.prototype);
+Faye.Publisher.trigger = Faye.Publisher.emit;
 
 Faye.Timeouts = {
   addTimeout: function(name, delay, callback, context) {
@@ -395,29 +804,29 @@ Faye.Timeouts = {
     if (!timeout) return;
     clearTimeout(timeout);
     delete this._timeouts[name];
+  },
+
+  removeAllTimeouts: function() {
+    this._timeouts = this._timeouts || {};
+    for (var name in this._timeouts) this.removeTimeout(name);
   }
 };
 
-
 Faye.Logging = {
   LOG_LEVELS: {
+    fatal:  4,
     error:  3,
     warn:   2,
     info:   1,
     debug:  0
   },
 
-  logLevel: 'error',
-
-  log: function(messageArgs, level) {
+  writeLog: function(messageArgs, level) {
     if (!Faye.logger) return;
 
-    var levels = Faye.Logging.LOG_LEVELS;
-    if (levels[Faye.Logging.logLevel] > levels[level]) return;
-
     var messageArgs = Array.prototype.slice.apply(messageArgs),
-        banner = ' [' + level.toUpperCase() + '] [Faye',
-        klass  = this.className,
+        banner      = '[Faye',
+        klass       = this.className,
 
         message = messageArgs.shift().replace(/\?/g, function() {
           try {
@@ -435,7 +844,10 @@ Faye.Logging = {
     if (klass) banner += '.' + klass;
     banner += '] ';
 
-    Faye.logger(Faye.timestamp() + banner + message);
+    if (typeof Faye.logger[level] === 'function')
+      Faye.logger[level](banner + message);
+    else if (typeof Faye.logger === 'function')
+      Faye.logger(banner + message);
   }
 };
 
@@ -443,38 +855,18 @@ Faye.Logging = {
   for (var key in Faye.Logging.LOG_LEVELS)
     (function(level, value) {
       Faye.Logging[level] = function() {
-        this.log(arguments, level);
+        this.writeLog(arguments, level);
       };
     })(key, Faye.Logging.LOG_LEVELS[key]);
 })();
 
-
 Faye.Grammar = {
-  LOWALPHA:     /^[a-z]$/,
-  UPALPHA:     /^[A-Z]$/,
-  ALPHA:     /^([a-z]|[A-Z])$/,
-  DIGIT:     /^[0-9]$/,
-  ALPHANUM:     /^(([a-z]|[A-Z])|[0-9])$/,
-  MARK:     /^(\-|\_|\!|\~|\(|\)|\$|\@)$/,
-  STRING:     /^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*$/,
-  TOKEN:     /^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+$/,
-  INTEGER:     /^([0-9])+$/,
-  CHANNEL_SEGMENT:     /^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+$/,
-  CHANNEL_SEGMENTS:     /^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,
   CHANNEL_NAME:     /^\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*$/,
-  WILD_CARD:     /^\*{1,2}$/,
-  CHANNEL_PATTERN:     /^(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*\/\*{1,2}$/,
-  VERSION_ELEMENT:     /^(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*$/,
-  VERSION:     /^([0-9])+(\.(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*)*$/,
-  CLIENT_ID:     /^((([a-z]|[A-Z])|[0-9]))+$/,
-  ID:     /^((([a-z]|[A-Z])|[0-9]))+$/,
-  ERROR_MESSAGE:     /^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*$/,
-  ERROR_ARGS:     /^(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*$/,
-  ERROR_CODE:     /^[0-9][0-9][0-9]$/,
-  ERROR:     /^([0-9][0-9][0-9]:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*|[0-9][0-9][0-9]::(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/
+  CHANNEL_PATTERN:  /^(\/(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)))+)*\/\*{1,2}$/,
+  ERROR:            /^([0-9][0-9][0-9]:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*(,(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)*:(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*|[0-9][0-9][0-9]::(((([a-z]|[A-Z])|[0-9])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/,
+  VERSION:          /^([0-9])+(\.(([a-z]|[A-Z])|[0-9])(((([a-z]|[A-Z])|[0-9])|\-|\_))*)*$/
 };
 
-
 Faye.Extensible = {
   addExtension: function(extension) {
     this._extensions = this._extensions || [];
@@ -492,7 +884,7 @@ Faye.Extensible = {
     }
   },
 
-  pipeThroughExtensions: function(stage, message, callback, context) {
+  pipeThroughExtensions: function(stage, message, request, callback, context) {
     this.debug('Passing through ? extensions: ?', stage, message);
 
     if (!this._extensions) return callback.call(context, message);
@@ -504,8 +896,11 @@ Faye.Extensible = {
       var extension = extensions.shift();
       if (!extension) return callback.call(context, message);
 
-      if (extension[stage]) extension[stage](message, pipe);
-      else pipe(message);
+      var fn = extension[stage];
+      if (!fn) return pipe(message);
+
+      if (fn.length >= 3) extension[stage](message, request, pipe);
+      else                extension[stage](message, pipe);
     };
     pipe(message);
   }
@@ -638,9 +1033,18 @@ Faye.extend(Faye.Channel, {
   })
 });
 
+Faye.Envelope = Faye.Class({
+  initialize: function(message, timeout) {
+    this.id      = message.id;
+    this.message = message;
 
-Faye.Publication = Faye.Class(Faye.Deferrable);
+    if (timeout !== undefined) this.timeout(timeout / 1000, false);
+  }
+});
+
+Faye.extend(Faye.Envelope.prototype, Faye.Deferrable);
 
+Faye.Publication = Faye.Class(Faye.Deferrable);
 
 Faye.Subscription = Faye.Class({
   initialize: function(client, channels, callback, context) {
@@ -664,7 +1068,6 @@ Faye.Subscription = Faye.Class({
 
 Faye.extend(Faye.Subscription.prototype, Faye.Deferrable);
 
-
 Faye.Client = Faye.Class({
   UNCONNECTED:          1,
   CONNECTING:           2,
@@ -675,23 +1078,30 @@ Faye.Client = Faye.Class({
   RETRY:                'retry',
   NONE:                 'none',
 
-  CONNECTION_TIMEOUT:   60.0,
-  DEFAULT_RETRY:        5.0,
+  CONNECTION_TIMEOUT:   60,
+  DEFAULT_RETRY:        5,
+  MAX_REQUEST_SIZE:     2048,
 
   DEFAULT_ENDPOINT:     '/bayeux',
-  INTERVAL:             0.0,
+  INTERVAL:             0,
 
   initialize: function(endpoint, options) {
     this.info('New client created for ?', endpoint);
 
     this._options   = options || {};
-    this.endpoint   = endpoint || this.DEFAULT_ENDPOINT;
+    this.endpoint   = Faye.URI.parse(endpoint || this.DEFAULT_ENDPOINT);
     this.endpoints  = this._options.endpoints || {};
     this.transports = {};
-    this._cookies   = Faye.CookieJar && new Faye.CookieJar();
-    this._headers   = {};
+    this.cookies    = Faye.CookieJar && new Faye.CookieJar();
+    this.headers    = {};
+    this.ca         = this._options.ca;
     this._disabled  = [];
-    this.retry      = this._options.retry || this.DEFAULT_RETRY;
+    this._retry     = this._options.retry || this.DEFAULT_RETRY;
+
+    for (var key in this.endpoints)
+      this.endpoints[key] = Faye.URI.parse(this.endpoints[key]);
+
+    this.maxRequestSize = this.MAX_REQUEST_SIZE;
 
     this._state     = this.UNCONNECTED;
     this._channels  = new Faye.Channel.Set();
@@ -705,7 +1115,7 @@ Faye.Client = Faye.Class({
       timeout:   1000 * (this._options.timeout  || this.CONNECTION_TIMEOUT)
     };
 
-    if (Faye.Event)
+    if (Faye.Event && Faye.ENV.onbeforeunload !== undefined)
       Faye.Event.on(Faye.ENV, 'beforeunload', function() {
         if (Faye.indexOf(this._disabled, 'autodisconnect') < 0)
           this.disconnect();
@@ -717,20 +1127,7 @@ Faye.Client = Faye.Class({
   },
 
   setHeader: function(name, value) {
-    this._headers[name] = value;
-  },
-
-  getClientId: function() {
-    return this._clientId;
-  },
-
-  getState: function() {
-    switch (this._state) {
-      case this.UNCONNECTED:  return 'UNCONNECTED';
-      case this.CONNECTING:   return 'CONNECTING';
-      case this.CONNECTED:    return 'CONNECTED';
-      case this.DISCONNECTED: return 'DISCONNECTED';
-    }
+    this.headers[name] = value;
   },
 
   // Request
@@ -759,12 +1156,12 @@ Faye.Client = Faye.Class({
     this._state = this.CONNECTING;
     var self = this;
 
-    this.info('Initiating handshake with ?', this.endpoint);
+    this.info('Initiating handshake with ?', Faye.URI.stringify(this.endpoint));
     this._selectTransport(Faye.MANDATORY_CONNECTION_TYPES);
 
     this._send({
-      channel:      Faye.Channel.HANDSHAKE,
-      version:      Faye.BAYEUX_VERSION,
+      channel:                  Faye.Channel.HANDSHAKE,
+      version:                  Faye.BAYEUX_VERSION,
       supportedConnectionTypes: [this._transport.connectionType]
 
     }, function(response) {
@@ -778,7 +1175,7 @@ Faye.Client = Faye.Class({
         this.info('Handshake successful: ?', this._clientId);
 
         this.subscribe(this._channels.getKeys(), true);
-        if (callback) callback.call(context);
+        if (callback) Faye.Promise.defer(function() { callback.call(context) });
 
       } else {
         this.info('Handshake unsuccessful');
@@ -809,7 +1206,7 @@ Faye.Client = Faye.Class({
 
     this.info('Calling deferred actions for ?', this._clientId);
     this.setDeferredStatus('succeeded');
-    this.setDeferredStatus('deferred');
+    this.setDeferredStatus('unknown');
 
     if (this._connectRequest) return;
     this._connectRequest = true;
@@ -838,11 +1235,13 @@ Faye.Client = Faye.Class({
     this.info('Disconnecting ?', this._clientId);
 
     this._send({
-      channel:    Faye.Channel.DISCONNECT,
-      clientId:   this._clientId
+      channel:  Faye.Channel.DISCONNECT,
+      clientId: this._clientId
 
     }, function(response) {
-      if (response.successful) this._transport.close();
+      if (!response.successful) return;
+      this._transport.close();
+      delete this._transport;
     }, this);
 
     this.info('Clearing channel listeners for ?', this._clientId);
@@ -948,9 +1347,10 @@ Faye.Client = Faye.Class({
       this.info('Client ? queueing published message to ?: ?', this._clientId, channel, data);
 
       this._send({
-        channel:      channel,
-        data:         data,
-        clientId:     this._clientId
+        channel:  channel,
+        data:     data,
+        clientId: this._clientId
+
       }, function(response) {
         if (response.successful)
           publication.setDeferredStatus('succeeded');
@@ -963,57 +1363,82 @@ Faye.Client = Faye.Class({
   },
 
   receiveMessage: function(message) {
-    this.pipeThroughExtensions('incoming', message, function(message) {
+    var id = message.id, timeout, callback;
+
+    if (message.successful !== undefined) {
+      callback = this._responseCallbacks[id];
+      delete this._responseCallbacks[id];
+    }
+
+    this.pipeThroughExtensions('incoming', message, null, function(message) {
       if (!message) return;
 
       if (message.advice) this._handleAdvice(message.advice);
       this._deliverMessage(message);
 
-      if (message.successful === undefined) return;
+      if (callback) callback[0].call(callback[1], message);
+    }, this);
 
-      var callback = this._responseCallbacks[message.id];
-      if (!callback) return;
+    if (this._transportUp === true) return;
+    this._transportUp = true;
+    this.trigger('transport:up');
+  },
 
-      delete this._responseCallbacks[message.id];
-      callback[0].call(callback[1], message);
-    }, this);
+  messageError: function(messages, immediate) {
+    var retry = this._retry,
+        self  = this,
+        id, message, timeout;
+
+    for (var i = 0, n = messages.length; i < n; i++) {
+      message = messages[i];
+      id      = message.id;
+
+      if (immediate)
+        this._transportSend(message);
+      else
+        Faye.ENV.setTimeout(function() { self._transportSend(message) }, retry * 1000);
+    }
+
+    if (immediate || this._transportUp === false) return;
+    this._transportUp = false;
+    this.trigger('transport:down');
   },
 
   _selectTransport: function(transportTypes) {
     Faye.Transport.get(this, transportTypes, this._disabled, function(transport) {
-      this.debug('Selected ? transport for ?', transport.connectionType, transport.endpoint);
+      this.debug('Selected ? transport for ?', transport.connectionType, Faye.URI.stringify(transport.endpoint));
 
       if (transport === this._transport) return;
       if (this._transport) this._transport.close();
 
       this._transport = transport;
-      this._transport.cookies = this._cookies;
-      this._transport.headers = this._headers;
-
-      transport.bind('down', function() {
-        if (this._transportUp !== undefined && !this._transportUp) return;
-        this._transportUp = false;
-        this.trigger('transport:down');
-      }, this);
-
-      transport.bind('up', function() {
-        if (this._transportUp !== undefined && this._transportUp) return;
-        this._transportUp = true;
-        this.trigger('transport:up');
-      }, this);
     }, this);
   },
 
   _send: function(message, callback, context) {
-    message.id = this._generateMessageId();
-    if (callback) this._responseCallbacks[message.id] = [callback, context];
+    if (!this._transport) return;
+    message.id = message.id || this._generateMessageId();
 
-    this.pipeThroughExtensions('outgoing', message, function(message) {
+    this.pipeThroughExtensions('outgoing', message, null, function(message) {
       if (!message) return;
-      this._transport.send(message, this._advice.timeout / 1000);
+      if (callback) this._responseCallbacks[message.id] = [callback, context];
+      this._transportSend(message);
     }, this);
   },
 
+  _transportSend: function(message) {
+    if (!this._transport) return;
+
+    var timeout  = 1.2 * (this._advice.timeout || this._retry * 1000),
+        envelope = new Faye.Envelope(message, timeout);
+
+    envelope.errback(function(immediate) {
+      this.messageError([message], immediate);
+    }, this);
+
+    this._transport.send(envelope);
+  },
+
   _generateMessageId: function() {
     this._messageId += 1;
     if (this._messageId >= Math.pow(2,32)) this._messageId = 0;
@@ -1036,14 +1461,11 @@ Faye.Client = Faye.Class({
     this._channels.distributeMessage(message);
   },
 
-  _teardownConnection: function() {
-    if (!this._connectRequest) return;
-    this._connectRequest = null;
-    this.info('Closed connection for ?', this._clientId);
-  },
-
   _cycleConnection: function() {
-    this._teardownConnection();
+    if (this._connectRequest) {
+      this._connectRequest = null;
+      this.info('Closed connection for ?', this._clientId);
+    }
     var self = this;
     Faye.ENV.setTimeout(function() { self.connect() }, this._advice.interval);
   }
@@ -1054,9 +1476,8 @@ Faye.extend(Faye.Client.prototype, Faye.Publisher);
 Faye.extend(Faye.Client.prototype, Faye.Logging);
 Faye.extend(Faye.Client.prototype, Faye.Extensible);
 
-
 Faye.Transport = Faye.extend(Faye.Class({
-  MAX_DELAY: 0.0,
+  MAX_DELAY: 0,
   batching:  true,
 
   initialize: function(client, endpoint) {
@@ -1067,14 +1488,19 @@ Faye.Transport = Faye.extend(Faye.Class({
 
   close: function() {},
 
-  send: function(message, timeout) {
+  encode: function(envelopes) {
+    return '';
+  },
+
+  send: function(envelope) {
+    var message = envelope.message;
+
     this.debug('Client ? sending message to ?: ?',
-               this._client._clientId, this.endpoint, message);
+               this._client._clientId, Faye.URI.stringify(this.endpoint), message);
 
-    if (!this.batching) return this.request([message], timeout);
+    if (!this.batching) return this.request([envelope]);
 
-    this._outbox.push(message);
-    this._timeout = timeout;
+    this._outbox.push(envelope);
 
     if (message.channel === Faye.Channel.HANDSHAKE)
       return this.addTimeout('publish', 0.01, this.flush, this);
@@ -1082,9 +1508,7 @@ Faye.Transport = Faye.extend(Faye.Class({
     if (message.channel === Faye.Channel.CONNECT)
       this._connectMessage = message;
 
-    if (this.shouldFlush && this.shouldFlush(this._outbox))
-      return this.flush();
-
+    this.flushLargeBatch();
     this.addTimeout('publish', this.MAX_DELAY, this.flush, this);
   },
 
@@ -1094,36 +1518,62 @@ Faye.Transport = Faye.extend(Faye.Class({
     if (this._outbox.length > 1 && this._connectMessage)
       this._connectMessage.advice = {timeout: 0};
 
-    this.request(this._outbox, this._timeout);
+    this.request(this._outbox);
 
     this._connectMessage = null;
     this._outbox = [];
   },
 
-  receive: function(responses) {
+  flushLargeBatch: function() {
+    var string = this.encode(this._outbox);
+    if (string.length < this._client.maxRequestSize) return;
+    var last = this._outbox.pop();
+    this.flush();
+    if (last) this._outbox.push(last);
+  },
+
+  receive: function(envelopes, responses) {
+    var n = envelopes.length;
+    while (n--) envelopes[n].setDeferredStatus('succeeded');
+
+    responses = [].concat(responses);
+
     this.debug('Client ? received from ?: ?',
-               this._client._clientId, this.endpoint, responses);
+               this._client._clientId, Faye.URI.stringify(this.endpoint), responses);
 
-    for (var i = 0, n = responses.length; i < n; i++) {
+    for (var i = 0, n = responses.length; i < n; i++)
       this._client.receiveMessage(responses[i]);
-    }
   },
 
-  retry: function(message, timeout) {
-    var called = false,
-        retry  = this._client.retry * 1000,
-        self   = this;
+  handleError: function(envelopes, immediate) {
+    var n = envelopes.length;
+    while (n--) envelopes[n].setDeferredStatus('failed', immediate);
+  },
 
-    return function() {
-      if (called) return;
-      called = true;
-      Faye.ENV.setTimeout(function() { self.request(message, timeout) }, retry);
-    };
+  _getCookies: function() {
+    var cookies = this._client.cookies;
+    if (!cookies) return '';
+
+    return cookies.getCookies({
+      domain: this.endpoint.hostname,
+      path:   this.endpoint.path,
+      secure: this.endpoint.protocol === 'https:'
+    }).toValueString();
+  },
+
+  _storeCookies: function(setCookie) {
+    if (!setCookie || !this._client.cookies) return;
+    setCookie = [].concat(setCookie);
+    var cookie;
+
+    for (var i = 0, n = setCookie.length; i < n; i++) {
+      cookie = this._client.cookies.setCookie(setCookie[i]);
+      cookie = cookie[0] || cookie;
+      cookie.domain = cookie.domain || this.endpoint.hostname;
+    }
   }
 
 }), {
-  MAX_URL_LENGTH: 2048,
-
   get: function(client, allowed, disabled, callback, context) {
     var endpoint = client.endpoint;
 
@@ -1145,7 +1595,7 @@ Faye.Transport = Faye.extend(Faye.Class({
         callback.call(context, transport);
       });
     }, function() {
-      throw new Error('Could not find a usable connection type for ' + endpoint);
+      throw new Error('Could not find a usable connection type for ' + Faye.URI.stringify(endpoint));
     });
   },
 
@@ -1158,10 +1608,8 @@ Faye.Transport = Faye.extend(Faye.Class({
 });
 
 Faye.extend(Faye.Transport.prototype, Faye.Logging);
-Faye.extend(Faye.Transport.prototype, Faye.Publisher);
 Faye.extend(Faye.Transport.prototype, Faye.Timeouts);
 
-
 Faye.Event = {
   _registry: [],
 
@@ -1204,91 +1652,11 @@ Faye.Event = {
   }
 };
 
-Faye.Event.on(Faye.ENV, 'unload', Faye.Event.detach, Faye.Event);
-
-
-Faye.URI = Faye.extend(Faye.Class({
-  queryString: function() {
-    var pairs = [];
-    for (var key in this.params) {
-      if (!this.params.hasOwnProperty(key)) continue;
-      pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(this.params[key]));
-    }
-    return pairs.join('&');
-  },
-
-  isSameOrigin: function() {
-    var host = Faye.URI.parse(Faye.ENV.location.href, false);
-
-    var external = (host.hostname !== this.hostname) ||
-                   (host.port !== this.port) ||
-                   (host.protocol !== this.protocol);
-
-    return !external;
-  },
-
-  toURL: function() {
-    var query = this.queryString();
-    return this.protocol + '//' + this.hostname + (this.port ? ':' + this.port : '') +
-           this.pathname + (query ? '?' + query : '') + this.hash;
-  }
-}), {
-  parse: function(url, params) {
-    if (typeof url !== 'string') return url;
-    var uri = new this(), parts;
-
-    var consume = function(name, pattern, infer) {
-      url = url.replace(pattern, function(match) {
-        uri[name] = match;
-        return '';
-      });
-      if (uri[name] === undefined)
-        uri[name] = infer ? Faye.ENV.location[name] : '';
-    };
-
-    consume('protocol', /^https?\:/,    true);
-    consume('host',     /^\/\/[^\/]+/,  true);
-
-    if (!/^\//.test(url)) url = Faye.ENV.location.pathname.replace(/[^\/]*$/, '') + url;
-    consume('pathname', /^\/[^\?#]*/);
-    consume('search',   /^\?[^#]*/);
-    consume('hash',     /^#.*/);
-
-    if (/^\/\//.test(uri.host)) {
-      uri.host = uri.host.substr(2);
-      parts = uri.host.split(':');
-      uri.hostname = parts[0];
-      uri.port = parts[1] || '';
-    } else {
-      uri.hostname = Faye.ENV.location.hostname;
-      uri.port = Faye.ENV.location.port;
-    }
-
-    if (params === false) {
-      uri.params = {};
-    } else {
-      var query = uri.search.replace(/^\?/, ''),
-          pairs = query ? query.split('&') : [],
-          n     = pairs.length,
-          data  = {};
-
-      while (n--) {
-        parts = pairs[n].split('=');
-        data[decodeURIComponent(parts[0] || '')] = decodeURIComponent(parts[1] || '');
-      }
-      if (typeof params === 'object') Faye.extend(data, params);
-
-      uri.params = data;
-    }
-
-    return uri;
-  }
-});
-
+if (Faye.ENV.onunload !== undefined) Faye.Event.on(Faye.ENV, 'unload', Faye.Event.detach, Faye.Event);
 
 /*
-    http://www.JSON.org/json2.js
-    2009-04-16
+    json2.js
+    2013-05-26
 
     Public Domain.
 
@@ -1296,6 +1664,14 @@ Faye.URI = Faye.extend(Faye.Class({
 
     See http://www.JSON.org/js.html
 
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
     This file creates a global JSON object containing two methods: stringify
     and parse.
 
@@ -1321,7 +1697,7 @@ Faye.URI = Faye.extend(Faye.Class({
             value represented by the name/value pair that should be serialized,
             or undefined if nothing should be serialized. The toJSON method
             will be passed the key associated with the value, and this will be
-            bound to the object holding the key.
+            bound to the value
 
             For example, this would serialize Dates as ISO strings.
 
@@ -1424,17 +1800,9 @@ Faye.URI = Faye.extend(Faye.Class({
 
     This is a reference implementation. You are free to copy, modify, or
     redistribute.
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
 */
 
-/*jslint evil: true */
-
-/*global JSON */
+/*jslint evil: true, regexp: true */
 
 /*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
     call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
@@ -1443,13 +1811,16 @@ Faye.URI = Faye.extend(Faye.Class({
     test, toJSON, toString, valueOf
 */
 
+
 // Create a JSON object only if one does not already exist. We create the
 // methods in a closure to avoid creating global variables.
 
-if (!this.JSON) {
+if (typeof JSON !== 'object') {
     JSON = {};
 }
+
 (function () {
+    'use strict';
 
     function f(n) {
         // Format integers to have at least two digits.
@@ -1458,21 +1829,23 @@ if (!this.JSON) {
 
     if (typeof Date.prototype.toJSON !== 'function') {
 
-        Date.prototype.toJSON = function (key) {
+        Date.prototype.toJSON = function () {
 
-            return this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z';
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
         };
 
-        String.prototype.toJSON =
-        Number.prototype.toJSON =
-        Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-        };
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function () {
+                return this.valueOf();
+            };
     }
 
     var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
@@ -1499,13 +1872,12 @@ if (!this.JSON) {
 // sequences.
 
         escapable.lastIndex = 0;
-        return escapable.test(string) ?
-            '"' + string.replace(escapable, function (a) {
-                var c = meta[a];
-                return typeof c === 'string' ? c :
-                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            }) + '"' :
-            '"' + string + '"';
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
     }
 
 
@@ -1588,11 +1960,11 @@ if (!this.JSON) {
 // Join all of the elements together, separated with commas, and wrap them in
 // brackets.
 
-                v = partial.length === 0 ? '[]' :
-                    gap ? '[\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                                mind + ']' :
-                          '[' + partial.join(',') + ']';
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
                 gap = mind;
                 return v;
             }
@@ -1602,8 +1974,8 @@ if (!this.JSON) {
             if (rep && typeof rep === 'object') {
                 length = rep.length;
                 for (i = 0; i < length; i += 1) {
-                    k = rep[i];
-                    if (typeof k === 'string') {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
                         v = str(k, value);
                         if (v) {
                             partial.push(quote(k) + (gap ? ': ' : ':') + v);
@@ -1615,7 +1987,7 @@ if (!this.JSON) {
 // Otherwise, iterate through all of the keys in the object.
 
                 for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
                         v = str(k, value);
                         if (v) {
                             partial.push(quote(k) + (gap ? ': ' : ':') + v);
@@ -1627,9 +1999,11 @@ if (!this.JSON) {
 // Join all of the member texts together, separated with commas,
 // and wrap them in braces.
 
-            v = partial.length === 0 ? '{}' :
-                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
-                        mind + '}' : '{' + partial.join(',') + '}';
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
             gap = mind;
             return v;
         }
@@ -1637,10 +2011,7 @@ if (!this.JSON) {
 
 // If the JSON object does not yet have a stringify method, give it one.
 
-// NOTE we've hacked this to expose this method to Faye. We need to use this
-// to avoid problems with buggy Firefox version and bad #toJSON implementations
-
-        Faye.stringify = function (value, replacer, space) {
+    Faye.stringify = function (value, replacer, space) {
 
 // The stringify method takes a value and an optional replacer, and an optional
 // space parameter, and returns a JSON text. The replacer can be a function
@@ -1648,45 +2019,44 @@ if (!this.JSON) {
 // A default replacer method can be provided. Use of the space parameter can
 // produce text that is more easily readable.
 
-            var i;
-            gap = '';
-            indent = '';
+        var i;
+        gap = '';
+        indent = '';
 
 // If the space parameter is a number, make an indent string containing that
 // many spaces.
 
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
+        if (typeof space === 'number') {
+            for (i = 0; i < space; i += 1) {
+                indent += ' ';
+            }
 
 // If the space parameter is a string, it will be used as the indent string.
 
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
+        } else if (typeof space === 'string') {
+            indent = space;
+        }
 
 // If there is a replacer, it must be a function or an array.
 // Otherwise, throw an error.
 
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                     typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
+        rep = replacer;
+        if (replacer && typeof replacer !== 'function' &&
+                (typeof replacer !== 'object' ||
+                typeof replacer.length !== 'number')) {
+            throw new Error('JSON.stringify');
+        }
 
 // Make a fake root object containing our value under the key of ''.
 // Return the result of stringifying the value.
 
-            return str('', {'': value});
-        };
+        return str('', {'': value});
+    };
 
     if (typeof JSON.stringify !== 'function') {
         JSON.stringify = Faye.stringify;
     }
 
-
 // If the JSON object does not yet have a parse method, give it one.
 
     if (typeof JSON.parse !== 'function') {
@@ -1705,7 +2075,7 @@ if (!this.JSON) {
                 var k, v, value = holder[key];
                 if (value && typeof value === 'object') {
                     for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
                             v = walk(value, k);
                             if (v !== undefined) {
                                 value[k] = v;
@@ -1723,6 +2093,7 @@ if (!this.JSON) {
 // Unicode characters with escape sequences. JavaScript handles many characters
 // incorrectly, either silently deleting them, or treating them as line endings.
 
+            text = String(text);
             cx.lastIndex = 0;
             if (cx.test(text)) {
                 text = text.replace(cx, function (a) {
@@ -1744,10 +2115,10 @@ if (!this.JSON) {
 // we look to see that the remaining characters are only whitespace or ']' or
 // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
 
-            if (/^[\],:{}\s]*$/.
-test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 
 // In the third stage we use the eval function to compile the text into a
 // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
@@ -1759,8 +2130,9 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 // In the optional fourth stage, we recursively walk the new structure, passing
 // each name/value pair to a reviver function for possible transformation.
 
-                return typeof reviver === 'function' ?
-                    walk({'': j}, '') : j;
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
             }
 
 // If the text is not JSON parseable, then a SyntaxError is thrown.
@@ -1770,7 +2142,6 @@ replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
     }
 }());
 
-
 Faye.Transport.WebSocket = Faye.extend(Faye.Class(Faye.Transport, {
   UNCONNECTED:  1,
   CONNECTING:   2,
@@ -1784,99 +2155,123 @@ Faye.Transport.WebSocket = Faye.extend(Faye.Class(Faye.Transport, {
     this.connect();
   },
 
-  request: function(messages, timeout) {
-    if (messages.length === 0) return;
-    this._messages = this._messages || {};
+  request: function(envelopes) {
+    this._pending = this._pending || new Faye.Set();
+    for (var i = 0, n = envelopes.length; i < n; i++) this._pending.add(envelopes[i]);
 
-    for (var i = 0, n = messages.length; i < n; i++) {
-      this._messages[messages[i].id] = messages[i];
-    }
-    this.callback(function(socket) { socket.send(Faye.toJSON(messages)) });
+    this.callback(function(socket) {
+      if (!socket) return;
+      var messages = Faye.map(envelopes, function(e) { return e.message });
+      socket.send(Faye.toJSON(messages));
+    }, this);
     this.connect();
   },
 
-  close: function() {
-    if (!this._socket) return;
-    this._socket.onclose = this._socket.onerror = null;
-    this._socket.close();
-    delete this._socket;
-    this.setDeferredStatus('deferred');
-    this._state = this.UNCONNECTED;
-  },
-
   connect: function() {
     if (Faye.Transport.WebSocket._unloaded) return;
 
     this._state = this._state || this.UNCONNECTED;
     if (this._state !== this.UNCONNECTED) return;
-
     this._state = this.CONNECTING;
 
-    var ws = Faye.Transport.WebSocket.getClass();
-    if (!ws) return this.setDeferredStatus('failed');
+    var socket = this._createSocket();
+    if (!socket) return this.setDeferredStatus('failed');
 
-    this._socket = new ws(Faye.Transport.WebSocket.getSocketUrl(this.endpoint));
     var self = this;
 
-    this._socket.onopen = function() {
+    socket.onopen = function() {
+      if (socket.headers) self._storeCookies(socket.headers['set-cookie']);
+      self._socket = socket;
       self._state = self.CONNECTED;
       self._everConnected = true;
-      self.setDeferredStatus('succeeded', self._socket);
-      self.trigger('up');
+      self._ping();
+      self.setDeferredStatus('succeeded', socket);
+    };
+
+    var closed = false;
+    socket.onclose = socket.onerror = function() {
+      if (closed) return;
+      closed = true;
+
+      var wasConnected = (self._state === self.CONNECTED);
+      socket.onopen = socket.onclose = socket.onerror = socket.onmessage = null;
+
+      delete self._socket;
+      self._state = self.UNCONNECTED;
+      self.removeTimeout('ping');
+      self.setDeferredStatus('unknown');
+
+      var pending = self._pending ? self._pending.toArray() : [];
+      delete self._pending;
+
+      if (wasConnected) {
+        self.handleError(pending, true);
+      } else if (self._everConnected) {
+        self.handleError(pending);
+      } else {
+        self.setDeferredStatus('failed');
+      }
     };
 
-    this._socket.onmessage = function(event) {
-      var messages = JSON.parse(event.data);
+    socket.onmessage = function(event) {
+      var messages  = JSON.parse(event.data),
+          envelopes = [],
+          envelope;
+
       if (!messages) return;
       messages = [].concat(messages);
 
       for (var i = 0, n = messages.length; i < n; i++) {
-        delete self._messages[messages[i].id];
+        if (messages[i].successful === undefined) continue;
+        envelope = self._pending.remove(messages[i]);
+        if (envelope) envelopes.push(envelope);
       }
-      self.receive(messages);
+      self.receive(envelopes, messages);
     };
+  },
 
-    this._socket.onclose = this._socket.onerror = function() {
-      var wasConnected = (self._state === self.CONNECTED);
-      self.setDeferredStatus('deferred');
-      self._state = self.UNCONNECTED;
+  close: function() {
+    if (!this._socket) return;
+    this._socket.close();
+  },
 
-      self.close();
+  _createSocket: function() {
+    var url     = Faye.Transport.WebSocket.getSocketUrl(this.endpoint),
+        options = {headers: Faye.copyObject(this._client.headers), ca: this._client.ca};
 
-      if (wasConnected) return self.resend();
-      if (!self._everConnected) return self.setDeferredStatus('failed');
+    options.headers['Cookie'] = this._getCookies();
 
-      var retry = self._client.retry * 1000;
-      Faye.ENV.setTimeout(function() { self.connect() }, retry);
-      self.trigger('down');
-    };
+    if (Faye.WebSocket)        return new Faye.WebSocket.Client(url, [], options);
+    if (Faye.ENV.MozWebSocket) return new MozWebSocket(url);
+    if (Faye.ENV.WebSocket)    return new WebSocket(url);
   },
 
-  resend: function() {
-    if (!this._messages) return;
-    var messages = Faye.map(this._messages, function(id, msg) { return msg });
-    this.request(messages);
+  _ping: function() {
+    if (!this._socket) return;
+    this._socket.send('[]');
+    this.addTimeout('ping', this._client._advice.timeout/2000, this._ping, this);
   }
+
 }), {
-  getSocketUrl: function(endpoint) {
-    if (Faye.URI) endpoint = Faye.URI.parse(endpoint).toURL();
-    return endpoint.replace(/^http(s?):/ig, 'ws$1:');
+  PROTOCOLS: {
+    'http:':  'ws:',
+    'https:': 'wss:'
   },
 
-  getClass: function() {
-    return (Faye.WebSocket && Faye.WebSocket.Client) ||
-            Faye.ENV.WebSocket ||
-            Faye.ENV.MozWebSocket;
+  create: function(client, endpoint) {
+    var sockets = client.transports.websocket = client.transports.websocket || {};
+    sockets[endpoint.href] = sockets[endpoint.href] || new this(client, endpoint);
+    return sockets[endpoint.href];
   },
 
-  isUsable: function(client, endpoint, callback, context) {
-    this.create(client, endpoint).isUsable(callback, context);
+  getSocketUrl: function(endpoint) {
+    endpoint = Faye.copyObject(endpoint);
+    endpoint.protocol = this.PROTOCOLS[endpoint.protocol];
+    return Faye.URI.stringify(endpoint);
   },
 
-  create: function(client, endpoint) {
-    var sockets = client.transports.websocket = client.transports.websocket || {};
-    sockets[endpoint] = sockets[endpoint] || new this(client, endpoint);
-    return sockets[endpoint];
+  isUsable: function(client, endpoint, callback, context) {
+    this.create(client, endpoint).isUsable(callback, context);
   }
 });
 
@@ -1888,7 +2283,6 @@ if (Faye.Event)
     Faye.Transport.WebSocket._unloaded = true;
   });
 
-
 Faye.Transport.EventSource = Faye.extend(Faye.Class(Faye.Transport, {
   initialize: function(client, endpoint) {
     Faye.Transport.prototype.initialize.call(this, client, endpoint);
@@ -1896,18 +2290,20 @@ Faye.Transport.EventSource = Faye.extend(Faye.Class(Faye.Transport, {
 
     this._xhr = new Faye.Transport.XHR(client, endpoint);
 
-    var socket = new EventSource(endpoint + '/' + client.getClientId()),
+    endpoint = Faye.copyObject(endpoint);
+    endpoint.pathname += '/' + client._clientId;
+
+    var socket = new EventSource(Faye.URI.stringify(endpoint)),
         self   = this;
 
     socket.onopen = function() {
       self._everConnected = true;
       self.setDeferredStatus('succeeded');
-      self.trigger('up');
     };
 
     socket.onerror = function() {
       if (self._everConnected) {
-        self.trigger('down');
+        self._client.messageError([]);
       } else {
         self.setDeferredStatus('failed');
         socket.close();
@@ -1915,31 +2311,35 @@ Faye.Transport.EventSource = Faye.extend(Faye.Class(Faye.Transport, {
     };
 
     socket.onmessage = function(event) {
-      self.receive(JSON.parse(event.data));
-      self.trigger('up');
+      self.receive([], JSON.parse(event.data));
     };
 
     this._socket = socket;
   },
 
+  close: function() {
+    if (!this._socket) return;
+    this._socket.onopen = this._socket.onerror = this._socket.onmessage = null;
+    this._socket.close();
+    delete this._socket;
+  },
+
   isUsable: function(callback, context) {
     this.callback(function() { callback.call(context, true) });
     this.errback(function() { callback.call(context, false) });
   },
 
-  request: function(message, timeout) {
-    this._xhr.request(message, timeout);
+  encode: function(envelopes) {
+    return this._xhr.encode(envelopes);
   },
 
-  close: function() {
-    if (!this._socket) return;
-    this._socket.onerror = null;
-    this._socket.close();
-    delete this._socket;
+  request: function(envelopes) {
+    this._xhr.request(envelopes);
   }
+
 }), {
   isUsable: function(client, endpoint, callback, context) {
-    var id = client.getClientId();
+    var id = client._clientId;
     if (!id) return callback.call(context, false);
 
     Faye.Transport.XHR.isUsable(client, endpoint, function(usable) {
@@ -1949,34 +2349,38 @@ Faye.Transport.EventSource = Faye.extend(Faye.Class(Faye.Transport, {
   },
 
   create: function(client, endpoint) {
-    var sockets  = client.transports.eventsource = client.transports.eventsource || {},
-        id       = client.getClientId(),
-        endpoint = endpoint + '/' + (id || '');
+    var sockets = client.transports.eventsource = client.transports.eventsource || {},
+        id      = client._clientId;
+
+    endpoint = Faye.copyObject(endpoint);
+    endpoint.pathname += '/' + (id || '');
+    var url = Faye.URI.stringify(endpoint);
 
-    sockets[endpoint] = sockets[endpoint] || new this(client, endpoint);
-    return sockets[endpoint];
+    sockets[url] = sockets[url] || new this(client, endpoint);
+    return sockets[url];
   }
 });
 
 Faye.extend(Faye.Transport.EventSource.prototype, Faye.Deferrable);
 Faye.Transport.register('eventsource', Faye.Transport.EventSource);
 
-
 Faye.Transport.XHR = Faye.extend(Faye.Class(Faye.Transport, {
-  request: function(message, timeout) {
-    var retry = this.retry(message, timeout),
-        path  = Faye.URI.parse(this.endpoint).pathname,
-        self  = this,
-        xhr   = Faye.ENV.ActiveXObject
-              ? new ActiveXObject("Microsoft.XMLHTTP")
-              : new XMLHttpRequest();
+  encode: function(envelopes) {
+    var messages = Faye.map(envelopes, function(e) { return e.message });
+    return Faye.toJSON(messages);
+  },
+
+  request: function(envelopes) {
+    var path = this.endpoint.path,
+        xhr  = Faye.ENV.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : new XMLHttpRequest(),
+        self = this;
 
     xhr.open('POST', path, true);
     xhr.setRequestHeader('Content-Type', 'application/json');
     xhr.setRequestHeader('Pragma', 'no-cache');
     xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 
-    var headers = this.headers;
+    var headers = this._client.headers;
     for (var key in headers) {
       if (!headers.hasOwnProperty(key)) continue;
       xhr.setRequestHeader(key, headers[key]);
@@ -1985,68 +2389,67 @@ Faye.Transport.XHR = Faye.extend(Faye.Class(Faye.Transport, {
     var abort = function() { xhr.abort() };
     Faye.Event.on(Faye.ENV, 'beforeunload', abort);
 
-    var cleanUp = function() {
-      Faye.Event.detach(Faye.ENV, 'beforeunload', abort);
-      xhr.onreadystatechange = function() {};
-      xhr = null;
-    };
-
     xhr.onreadystatechange = function() {
-      if (xhr.readyState !== 4) return;
+      if (!xhr || xhr.readyState !== 4) return;
 
       var parsedMessage = null,
           status        = xhr.status,
-          successful    = ((status >= 200 && status < 300) ||
-                            status === 304 ||
-                            status === 1223);
-
-      if (!successful) {
-        cleanUp();
-        retry();
-        return self.trigger('down');
-      }
+          text          = xhr.responseText,
+          successful    = (status >= 200 && status < 300) || status === 304 || status === 1223;
+
+      Faye.Event.detach(Faye.ENV, 'beforeunload', abort);
+      xhr.onreadystatechange = function() {};
+      xhr = null;
+
+      if (!successful) return self.handleError(envelopes);
 
       try {
-        parsedMessage = JSON.parse(xhr.responseText);
+        parsedMessage = JSON.parse(text);
       } catch (e) {}
 
-      cleanUp();
-
-      if (parsedMessage) {
-        self.receive(parsedMessage);
-        self.trigger('up');
-      } else {
-        retry();
-        self.trigger('down');
-      }
+      if (parsedMessage)
+        self.receive(envelopes, parsedMessage);
+      else
+        self.handleError(envelopes);
     };
 
-    xhr.send(Faye.toJSON(message));
+    xhr.send(this.encode(envelopes));
   }
 }), {
   isUsable: function(client, endpoint, callback, context) {
-    callback.call(context, Faye.URI.parse(endpoint).isSameOrigin());
+    callback.call(context, Faye.URI.isSameOrigin(endpoint));
   }
 });
 
 Faye.Transport.register('long-polling', Faye.Transport.XHR);
 
 Faye.Transport.CORS = Faye.extend(Faye.Class(Faye.Transport, {
-  request: function(message, timeout) {
+  encode: function(envelopes) {
+    var messages = Faye.map(envelopes, function(e) { return e.message });
+    return 'message=' + encodeURIComponent(Faye.toJSON(messages));
+  },
+
+  request: function(envelopes) {
     var xhrClass = Faye.ENV.XDomainRequest ? XDomainRequest : XMLHttpRequest,
         xhr      = new xhrClass(),
-        retry    = this.retry(message, timeout),
-        self     = this;
+        headers  = this._client.headers,
+        self     = this,
+        key;
+
+    xhr.open('POST', Faye.URI.stringify(this.endpoint), true);
 
-    xhr.open('POST', this.endpoint, true);
-    if (xhr.setRequestHeader) xhr.setRequestHeader('Pragma', 'no-cache');
+    if (xhr.setRequestHeader) {
+      xhr.setRequestHeader('Pragma', 'no-cache');
+      for (key in headers) {
+        if (!headers.hasOwnProperty(key)) continue;
+        xhr.setRequestHeader(key, headers[key]);
+      }
+    }
 
     var cleanUp = function() {
       if (!xhr) return false;
       xhr.onload = xhr.onerror = xhr.ontimeout = xhr.onprogress = null;
       xhr = null;
-      Faye.ENV.clearTimeout(timer);
-      return true;
     };
 
     xhr.onload = function() {
@@ -2057,35 +2460,27 @@ Faye.Transport.CORS = Faye.extend(Faye.Class(Faye.Transport, {
 
       cleanUp();
 
-      if (parsedMessage) {
-        self.receive(parsedMessage);
-        self.trigger('up');
-      } else {
-        retry();
-        self.trigger('down');
-      }
+      if (parsedMessage)
+        self.receive(envelopes, parsedMessage);
+      else
+        self.handleError(envelopes);
     };
 
-    var onerror = function() {
+    xhr.onerror = xhr.ontimeout = function() {
       cleanUp();
-      retry();
-      self.trigger('down');
+      self.handleError(envelopes);
     };
-    var timer = Faye.ENV.setTimeout(onerror, 1.5 * 1000 * timeout);
-    xhr.onerror = onerror;
-    xhr.ontimeout = onerror;
 
     xhr.onprogress = function() {};
-    xhr.send('message=' + encodeURIComponent(Faye.toJSON(message)));
+    xhr.send(this.encode(envelopes));
   }
 }), {
   isUsable: function(client, endpoint, callback, context) {
-    if (Faye.URI.parse(endpoint).isSameOrigin())
+    if (Faye.URI.isSameOrigin(endpoint))
       return callback.call(context, false);
 
     if (Faye.ENV.XDomainRequest)
-      return callback.call(context, Faye.URI.parse(endpoint).protocol ===
-                                    Faye.URI.parse(Faye.ENV.location).protocol);
+      return callback.call(context, endpoint.protocol === Faye.ENV.location.protocol);
 
     if (Faye.ENV.XMLHttpRequest) {
       var xhr = new Faye.ENV.XMLHttpRequest();
@@ -2097,50 +2492,36 @@ Faye.Transport.CORS = Faye.extend(Faye.Class(Faye.Transport, {
 
 Faye.Transport.register('cross-origin-long-polling', Faye.Transport.CORS);
 
-
 Faye.Transport.JSONP = Faye.extend(Faye.Class(Faye.Transport, {
-  shouldFlush: function(messages) {
-    var params = {
-      message:  Faye.toJSON(messages),
-      jsonp:    '__jsonp' + Faye.Transport.JSONP._cbCount + '__'
-    };
-    var location = Faye.URI.parse(this.endpoint, params).toURL();
-    return location.length >= Faye.Transport.MAX_URL_LENGTH;
+ encode: function(envelopes) {
+    var messages = Faye.map(envelopes, function(e) { return e.message });
+    var url = Faye.copyObject(this.endpoint);
+    url.query.message = Faye.toJSON(messages);
+    url.query.jsonp   = '__jsonp' + Faye.Transport.JSONP._cbCount + '__';
+    return Faye.URI.stringify(url);
   },
 
-  request: function(messages, timeout) {
-    var params       = {message: Faye.toJSON(messages)},
+  request: function(envelopes) {
+    var messages     = Faye.map(envelopes, function(e) { return e.message }),
         head         = document.getElementsByTagName('head')[0],
         script       = document.createElement('script'),
         callbackName = Faye.Transport.JSONP.getCallbackName(),
-        location     = Faye.URI.parse(this.endpoint, params),
-        retry        = this.retry(messages, timeout),
+        endpoint     = Faye.copyObject(this.endpoint),
         self         = this;
 
-    Faye.ENV[callbackName] = function(data) {
-      cleanUp();
-      self.receive(data);
-      self.trigger('up');
-    };
-
-    var timer = Faye.ENV.setTimeout(function() {
-      cleanUp();
-      retry();
-      self.trigger('down');
-    }, 1.5 * 1000 * timeout);
+    endpoint.query.message = Faye.toJSON(messages);
+    endpoint.query.jsonp   = callbackName;
 
-    var cleanUp = function() {
+    Faye.ENV[callbackName] = function(data) {
       if (!Faye.ENV[callbackName]) return false;
       Faye.ENV[callbackName] = undefined;
       try { delete Faye.ENV[callbackName] } catch (e) {}
-      Faye.ENV.clearTimeout(timer);
       script.parentNode.removeChild(script);
-      return true;
+      self.receive(envelopes, data);
     };
 
-    location.params.jsonp = callbackName;
     script.type = 'text/javascript';
-    script.src  = location.toURL();
+    script.src  = Faye.URI.stringify(endpoint);
     head.appendChild(script);
   }
 }), {
@@ -2158,4 +2539,5 @@ Faye.Transport.JSONP = Faye.extend(Faye.Class(Faye.Transport, {
 
 Faye.Transport.register('callback-polling', Faye.Transport.JSONP);
 
-})();
+})();
+})(this);