faye 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.3.2 / 2010-04-04
+
+* Fix problems with JSON serialization when Prototype, MooTools present
+* Make the client reconnect if it doesn't hear from the server after a timeout
+* Stop JavaScript server returning NaN for advice.interval
+* Make Ruby server return an integer for advice.interval
+* Ensure EventMachine is running before handling messages
+* Handle 'data' and 'end' events properly in Node HTTP API
+* Switch to application/json for content types and stop using querystring format in POST bodies
+* Respond to any URL path under the mount point, not just the exact match
+
+
 === 0.3.1 / 2010-03-09
 
 * Pass client down through Rack stack as env['faye.client']

data/Manifest.txt

@@ -10,6 +10,8 @@ examples/README.rdoc
 examples/shared/public/index.html
 examples/shared/public/favicon.ico
 examples/shared/public/jquery.js
+examples/shared/public/mootools.js
+examples/shared/public/prototype.js
 examples/shared/public/robots.txt
 examples/shared/public/soapbox.js
 examples/shared/public/style.css
@@ -30,9 +32,12 @@ lib/faye/grammar.rb
 lib/faye/namespace.rb
 lib/faye/rack_adapter.rb
 lib/faye/server.rb
+lib/faye/timeouts.rb
 lib/faye/transport.rb
 test/scenario.js
+test/scenario.rb
 test/test_channel.rb
 test/test_clients.js
+test/test_clients.rb
 test/test_grammar.rb
 test/test_server.rb

data/README.txt

@@ -34,7 +34,7 @@ project of mine, but was not written to scale across multiple processes
 as required for deployment under Passenger. It has since been ported to
 Node.js which is better designed for handling highly concurrent traffic.
 If you use the Ruby version, I recommend deploying it behind Thin, an
-event-driver Ruby web server.
+event-driven Ruby web server.
 
 The two backends are architecturally identical, using evented messaging
 throughout and maintaining subscription data in memory. Neither is geared
@@ -64,9 +64,19 @@ You should set up the client as follows:
   <script type="text/javascript" src="/faye.js"></script>
   
   <script type="text/javascript">
-    fayeClient = new Faye.Client('/faye');
+    fayeClient = new Faye.Client('/faye', {timeout: 120});
   </script>
 
+The client (and the Node.js and Rack server-side clients) accepts the following
+options in its constructor:
+
+* +timeout+ - the maximum time (seconds) to wait for a connection response
+  from the server before attempting to reconnect. This should be greater than
+  the timeout set up on the server side, the idea being that if the server
+  doesn't send a connection response within this time then there has probably
+  been a network failure and we should reconnect. When the client reconnects,
+  any existing channel subscriptions are re-established automatically.
+
 Take care only to have one instance of the client per page; since each one
 opens a long-running request you will hit the two-requests-per-host limit
 and block all other Ajax calls if you use more than one client.
@@ -146,6 +156,12 @@ Both backends support the following initialization options:
   on your frontend webserver to make sure Faye sends a response before
   the server kills the connection.
 
+Regarding the +mount+ parameter: Faye will respond to any path under the
+mount point, so <tt>/faye</tt>, <tt>/faye.js</tt> and <tt>/faye/some/subpath</tt>
+will all be handled by Faye rather than your application. This is so that
+Faye can interoperate with clients that use different URLs for different
+message types.
+
 Usage examples and a demo app are in the +examples+ directory.
 
 
@@ -180,10 +196,10 @@ over HTTP or connect directly to the <tt>NodeAdapter</tt>. Either way,
 the API for the client is exactly as it is in the browser.
 
   // Remote client
-  client = new Faye.Client('http://example.com/faye');
+  client = new faye.Client('http://example.com/faye', {timeout: 120});
   
   // Local client
-  server = new Faye.NodeAdapter(options);
+  server = new faye.NodeAdapter(options);
   client = server.getClient();
 
 Note <tt>getClient()</tt> returns the same client object every time you
@@ -218,11 +234,11 @@ stack of Rack middlewares.
 
 === Rack client
 
-Again mirroring the Node tools, Faye has a client-side Ruby client that
+Again mirroring the Node tools, Faye has a server-side Ruby client that
 can be used under EventMachine. Setup is identical:
 
   # Remote client
-  client = Faye::Client.new('http://example.com/faye')
+  client = Faye::Client.new('http://example.com/faye', :timeout => 120)
   
   # Local client
   server = Faye::RackAdapter.new(options)
@@ -257,7 +273,7 @@ the Rack environment, for example in a Sinatra application:
 If you want to hack on Faye, you'll need Node.js, Ruby and the following
 gems installed:
 
-  sudo gem install eventmachine em-http-request rack thin json jake
+  sudo gem install eventmachine em-http-request rack thin json jake hoe
 
 DO NOT edit any JavaScript files outside the +javascript+ and +test+
 directories. They are generated using Jake, which you should run after
@@ -276,6 +292,8 @@ changes where appropriate.
 == To-do
 
 * Investigate WebSockets as a possible message transport
+* Support Bayeux extensions for authentication
+* Let local server-side clients listen to <tt>/meta/*</tt> channels
 * Provide support for user-defined <tt>/service/*</tt> channels
 * Allow server to scale to multiple nodes
 

data/Rakefile

@@ -11,6 +11,7 @@ Hoe.spec('faye') do |p|
     ['eventmachine', '>= 0.12'],
     ['em-http-request', '>= 0.2'],
     ['rack', '>= 1.0'],
+    ['thin', '>= 1.2'],
     ['json', '>= 1.0']
   ]
 end

data/build/faye-client-min.js

@@ -1 +1 @@
-if(!this.Faye)Faye={};Faye.extend=function(a,b,c){if(!b)return a;for(var d in b){if(!b.hasOwnProperty(d))continue;if(a.hasOwnProperty(d)&&c===false)continue;if(a[d]!==b[d])a[d]=b[d]}return a};Faye.extend(Faye,{VERSION:'0.3.1',BAYEUX_VERSION:'1.0',ID_LENGTH:128,JSONP_CALLBACK:'jsonpcallback',CONNECTION_TYPES:["long-polling","callback-polling"],ENV:this,random:function(a){a=a||this.ID_LENGTH;if(a>32){var b=Math.ceil(a/32),c='';while(b--)c+=this.random(32);return c}var d=Math.pow(2,a);return Math.floor(Math.random()*d).toString(16)},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])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/},commonElement:function(a,b){for(var c=0,d=a.length;c<d;c++){if(this.indexOf(b,a[c])!==-1)return a[c]}return null},indexOf:function(a,b){for(var c=0,d=a.length;c<d;c++){if(a[c]===b)return c}return-1},each:function(a,b,c){if(a instanceof Array){for(var d=0,f=a.length;d<f;d++){if(a[d]!==undefined)b.call(c||null,a[d],d)}}else{for(var g in a){if(a.hasOwnProperty(g))b.call(c||null,g,a[g])}}},filter:function(a,b,c){var d=[];this.each(a,function(){if(b.apply(c,arguments))d.push(arguments[0])});return d},size:function(a){var b=0;this.each(a,function(){b+=1});return b},enumEqual:function(c,d){if(d instanceof Array){if(!(c instanceof Array))return false;var f=c.length;if(f!==d.length)return false;while(f--){if(c[f]!==d[f])return false}return true}else{if(!(c instanceof Object))return false;if(this.size(d)!==this.size(c))return false;var g=true;this.each(c,function(a,b){g=g&&(d[a]===b)});return g}}});Faye.Class=function(a,b){if(typeof a!=='function'){b=a;a=Object}var c=function(){if(!this.initialize)return this;return this.initialize.apply(this,arguments)||this};var d=function(){};d.prototype=a.prototype;c.prototype=new d();Faye.extend(c.prototype,b);return c};Faye.Deferrable={callback:function(a,b){if(this._t==='succeeded')return a.apply(b,this._m);this._9=this._9||[];this._9.push([a,b])},setDeferredStatus:function(){var b=Array.prototype.slice.call(arguments),c=b.shift();this._t=c;this._m=b;if(c!=='succeeded')return;if(!this._9)return;Faye.each(this._9,function(a){a[0].apply(a[1],this._m)},this);this._9=[]}};Faye.Observable={on:function(a,b,c){this._0=this._0||{};var d=this._0[a]=this._0[a]||[];d.push([b,c])},stopObserving:function(a,b,c){if(!this._0||!this._0[a])return;if(!b){delete this._0[a];return}var d=this._0[a],f=d.length;while(f--){if(b&&d[f][0]!==b)continue;if(c&&d[f][1]!==c)continue;d.splice(f,1)}},fire:function(){var b=Array.prototype.slice.call(arguments),c=b.shift();if(!this._0||!this._0[c])return;Faye.each(this._0[c],function(a){a[0].apply(a[1],b.slice())})}};Faye.Channel=Faye.Class({initialize:function(a){this.__id=this.name=a},push:function(a){this.fire('message',a)}});Faye.extend(Faye.Channel.prototype,Faye.Observable);Faye.extend(Faye.Channel,{HANDSHAKE:'/meta/handshake',CONNECT:'/meta/connect',SUBSCRIBE:'/meta/subscribe',UNSUBSCRIBE:'/meta/unsubscribe',DISCONNECT:'/meta/disconnect',META:'meta',SERVICE:'service',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)},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)},Tree:Faye.Class({initialize:function(a){this._1=a;this._5={}},eachChild:function(c,d){Faye.each(this._5,function(a,b){c.call(d,a,b)})},each:function(c,d,f){this.eachChild(function(a,b){a=c.concat(a);b.each(a,d,f)});if(this._1!==undefined)d.call(f,c,this._1)},map:function(c,d){var f=[];this.each([],function(a,b){f.push(c.call(d,a,b))});return f},get:function(a){var b=this.traverse(a);return b?b._1:null},set:function(a,b){var c=this.traverse(a,true);if(c)c._1=b},traverse:function(a,b){if(typeof a==='string')a=Faye.Channel.parse(a);if(a===null)return null;if(a.length===0)return this;var c=this._5[a[0]];if(!c&&!b)return null;if(!c)c=this._5[a[0]]=new Faye.Channel.Tree();return c.traverse(a.slice(1),b)},findOrCreate:function(a){var b=this.get(a);if(b)return b;b=new Faye.Channel(a);this.set(a,b);return b},glob:function(f){if(typeof f==='string')f=Faye.Channel.parse(f);if(f===null)return[];if(f.length===0)return(this._1===undefined)?[]:[this._1];var g=[];if(Faye.enumEqual(f,['*'])){Faye.each(this._5,function(a,b){if(b._1!==undefined)g.push(b._1)});return g}if(Faye.enumEqual(f,['**'])){g=this.map(function(a,b){return b});if(this._1!==undefined)g.pop();return g}Faye.each(this._5,function(b,c){if(b!==f[0]&&b!=='*')return;var d=c.glob(f.slice(1));Faye.each(d,function(a){g.push(a)})});if(this._5['**'])g.push(this._5['**']._1);return g}})});Faye.Namespace=Faye.Class({initialize:function(){this._n={}},generate:function(){var a=Faye.random();while(this._n.hasOwnProperty(a))a=Faye.random();return this._n[a]=a}});Faye.Transport=Faye.extend(Faye.Class({initialize:function(a,b){this._f=a;this._6=b},send:function(c,d,f){if(!(c instanceof Array)&&!c.id)c.id=this._f._o.generate();this.request(c,function(b){if(!d)return;Faye.each([].concat(b),function(a){if(a.id===c.id)d.call(f,a);if(a.advice)this._f.handleAdvice(a.advice);if(a.data&&a.channel)this._f.sendToSubscribers(a)},this)},this)}}),{get:function(c,d){var f=c._6;if(d===undefined)d=this.supportedConnectionTypes();var g=null;Faye.each(this._g,function(a,b){if(Faye.indexOf(d,a)<0)return;if(g)return;if(b.isUsable(f))g=b});if(!g)throw'Could not find a usable connection type for '+f;return new g(c,f)},register:function(a,b){this._g[a]=b;b.prototype.connectionType=a},_g:{},supportedConnectionTypes:function(){var c=[],d;Faye.each(this._g,function(a,b){c.push(a)});return c}});Faye.Client=Faye.Class({UNCONNECTED:1,CONNECTING:2,CONNECTED:3,DISCONNECTED:4,HANDSHAKE:'handshake',RETRY:'retry',NONE:'none',DEFAULT_ENDPOINT:'/bayeux',MAX_DELAY:0.1,INTERVAL:1000.0,initialize:function(a){this._6=a||this.DEFAULT_ENDPOINT;this._4=Faye.Transport.get(this);this._2=this.UNCONNECTED;this._o=new Faye.Namespace();this._h=[];this._a=new Faye.Channel.Tree();this._p=[];this._7={reconnect:this.RETRY,interval:this.INTERVAL};if(!Faye.Event)return;Faye.Event.on(Faye.ENV,'beforeunload',this.disconnect,this)},handshake:function(b,c){if(this._7.reconnect===this.NONE)return;if(this._2!==this.UNCONNECTED)return;this._2=this.CONNECTING;var d=this;this._4.send({channel:Faye.Channel.HANDSHAKE,version:Faye.BAYEUX_VERSION,supportedConnectionTypes:Faye.Transport.supportedConnectionTypes()},function(a){if(!a.successful){setTimeout(function(){d.handshake(b,c)},this._7.interval);return this._2=this.UNCONNECTED}this._2=this.CONNECTED;this._8=a.clientId;this._4=Faye.Transport.get(this,a.supportedConnectionTypes);if(b)b.call(c)},this)},connect:function(b,c){if(this._7.reconnect===this.NONE)return;if(this._2===this.DISCONNECTED)return;if(this._7.reconnect===this.HANDSHAKE||this._2===this.UNCONNECTED)return this.handshake(function(){this.connect(b,c)},this);if(this._2===this.CONNECTING)return this.callback(b,c);if(this._2!==this.CONNECTED)return;this.setDeferredStatus('succeeded');this.setDeferredStatus('deferred');if(b)b.call(c);if(this._i)return;this._i=this._o.generate();var d=this;this._4.send({channel:Faye.Channel.CONNECT,clientId:this._8,connectionType:this._4.connectionType,id:this._i},function(a){delete this._i;setTimeout(function(){d.connect()},this._7.interval)},this)},disconnect:function(){if(this._2!==this.CONNECTED)return;this._2=this.DISCONNECTED;this._4.send({channel:Faye.Channel.DISCONNECT,clientId:this._8});this._a=new Faye.Channel.Tree()},subscribe:function(c,d,f){this.connect(function(){c=[].concat(c);this._j(c);this._4.send({channel:Faye.Channel.SUBSCRIBE,clientId:this._8,subscription:c},function(b){if(!b.successful)return;c=[].concat(b.subscription);Faye.each(c,function(a){this._a.set(a,[d,f])},this)},this)},this)},unsubscribe:function(c,d,f){this.connect(function(){c=[].concat(c);this._j(c);this._4.send({channel:Faye.Channel.UNSUBSCRIBE,clientId:this._8,subscription:c},function(b){if(!b.successful)return;c=[].concat(b.subscription);Faye.each(c,function(a){this._a.set(a,null)},this)},this)},this)},publish:function(b,c){this.connect(function(){this._j([b]);this._u({channel:b,data:c,clientId:this._8});if(this._q)return;var a=this;this._q=setTimeout(function(){delete a._q;a._v()},this.MAX_DELAY*1000)},this)},handleAdvice:function(a){Faye.extend(this._7,a);if(this._7.reconnect===this.HANDSHAKE)this._8=null},sendToSubscribers:function(b){var c=this._a.glob(b.channel);Faye.each(c,function(a){if(!a)return;a[0].call(a[1],b.data)})},_u:function(a){this._h.push(a)},_v:function(){this._4.send(this._h);this._h=[]},_j:function(b){Faye.each(b,function(a){if(!Faye.Channel.isValid(a))throw'"'+a+'" is not a valid channel name';if(!Faye.Channel.isSubscribable(a))throw'Clients may not subscribe to channel "'+a+'"';})}});Faye.extend(Faye.Client.prototype,Faye.Deferrable);Faye.Event={_b:[],on:function(a,b,c,d){var f=function(){c.call(d)};if(a.addEventListener)a.addEventListener(b,f,false);else a.attachEvent('on'+b,f);this._b.push({_c:a,_k:b,_w:c,_d:d,_r:f})},detach:function(a,b,c,d){var f=this._b.length,g;while(f--){g=this._b[f];if((a&&a!==g._c)||(b&&b!==g._k)||(c&&c!==g._w)||(d&&d!==g._d))continue;if(g._c.removeEventListener)g._c.removeEventListener(g._k,g._r,false);else g._c.detachEvent('on'+g._k,g._r);this._b.splice(f,1);g=null}}};Faye.Event.on(Faye.ENV,'unload',Faye.Event.detach,Faye.Event);Faye.URI=Faye.extend(Faye.Class({queryString:function(){var c=[],d;Faye.each(this.params,function(a,b){c.push(encodeURIComponent(a)+'='+encodeURIComponent(b))});return c.join('&')},isLocal:function(){var a=Faye.URI.parse(Faye.ENV.location.href);var b=(a.hostname!==this.hostname)||(a.port!==this.port)||(a.protocol!==this.protocol);return!b},toURL:function(){return this.protocol+this.hostname+':'+this.port+this.pathname+'?'+this.queryString()}}),{parse:function(d,f){if(typeof d!=='string')return d;var g=new this();var k=function(b,c){d=d.replace(c,function(a){if(a)g[b]=a;return''})};k('protocol',/^https?\:\/+/);k('hostname',/^[^\/\:]+/);k('port',/^:[0-9]+/);Faye.extend(g,{protocol:'http://',hostname:Faye.ENV.location.hostname,port:Faye.ENV.location.port},false);if(!g.port)g.port=(g.protocol==='https://')?'443':'80';g.port=g.port.replace(/\D/g,'');var i=d.split('?'),h=i.shift(),l=i.join('?'),n=l?l.split('&'):[],o=n.length,j={};while(o--){i=n[o].split('=');j[decodeURIComponent(i[0]||'')]=decodeURIComponent(i[1]||'')}Faye.extend(j,f);g.pathname=h;g.params=j;return g}});Faye.XHR={request:function(a,b,c,d,f){var g=new this.Request(a,b,c,d,f);g.send();return g},getXhrObject:function(){return Faye.ENV.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},Request:Faye.Class({initialize:function(a,b,c,d,f){this._e=a.toUpperCase();this._6=Faye.URI.parse(b,c);this._p=(typeof d==='function')?{success:d}:d;this._d=f||null;this._3=null},send:function(){if(this._l)return;var a=this._6.pathname,b=this._6.queryString();if(this._e==='GET')a+='?'+b;var c=this._e==='POST'?b:'';this._l=true;this._3=Faye.XHR.getXhrObject();this._3.open(this._e,a,true);if(this._e==='POST')this._3.setRequestHeader('Content-Type','application/x-www-form-urlencoded');var d=this,f=function(){if(d._3.readyState!==4)return;if(g){clearInterval(g);g=null}Faye.Event.detach(Faye.ENV,'beforeunload',d.abort,d);d._l=false;d._x();d=null};var g=setInterval(f,10);Faye.Event.on(Faye.ENV,'beforeunload',this.abort,this);this._3.send(c)},abort:function(){this._3.abort()},_x:function(){var a=this._p;if(!a)return;return this.success()?a.success&&a.success.call(this._d,this):a.failure&&a.failure.call(this._d,this)},waiting:function(){return!!this._l},complete:function(){return this._3&&!this.waiting()},success:function(){if(!this.complete())return false;var a=this._3.status;return(a>=200&&a<300)||a===304||a===1223},failure:function(){if(!this.complete())return false;return!this.success()},text:function(){if(!this.complete())return null;return this._3.responseText},status:function(){if(!this.complete())return null;return this._3.status}})};if(!this.JSON){JSON={}}(function(){function l(a){return a<10?'0'+a:a}if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(a){return this.getUTCFullYear()+'-'+l(this.getUTCMonth()+1)+'-'+l(this.getUTCDate())+'T'+l(this.getUTCHours())+':'+l(this.getUTCMinutes())+':'+l(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,j,p,s={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},m;function r(c){o.lastIndex=0;return o.test(c)?'"'+c.replace(o,function(a){var b=s[a];return typeof b==='string'?b:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+c+'"'}function q(a,b){var c,d,f,g,k=j,i,h=b[a];if(h&&typeof h==='object'&&typeof h.toJSON==='function'){h=h.toJSON(a)}if(typeof m==='function'){h=m.call(b,a,h)}switch(typeof h){case'string':return r(h);case'number':return isFinite(h)?String(h):'null';case'boolean':case'null':return String(h);case'object':if(!h){return'null'}j+=p;i=[];if(Object.prototype.toString.apply(h)==='[object Array]'){g=h.length;for(c=0;c<g;c+=1){i[c]=q(c,h)||'null'}f=i.length===0?'[]':j?'[\n'+j+i.join(',\n'+j)+'\n'+k+']':'['+i.join(',')+']';j=k;return f}if(m&&typeof m==='object'){g=m.length;for(c=0;c<g;c+=1){d=m[c];if(typeof d==='string'){f=q(d,h);if(f){i.push(r(d)+(j?': ':':')+f)}}}}else{for(d in h){if(Object.hasOwnProperty.call(h,d)){f=q(d,h);if(f){i.push(r(d)+(j?': ':':')+f)}}}}f=i.length===0?'{}':j?'{\n'+j+i.join(',\n'+j)+'\n'+k+'}':'{'+i.join(',')+'}';j=k;return f}}if(typeof JSON.stringify!=='function'){JSON.stringify=function(a,b,c){var d;j='';p='';if(typeof c==='number'){for(d=0;d<c;d+=1){p+=' '}}else if(typeof c==='string'){p=c}m=b;if(b&&typeof b!=='function'&&(typeof b!=='object'||typeof b.length!=='number')){throw new Error('JSON.stringify');}return q('',{'':a})}}if(typeof JSON.parse!=='function'){JSON.parse=function(g,k){var i;function h(a,b){var c,d,f=a[b];if(f&&typeof f==='object'){for(c in f){if(Object.hasOwnProperty.call(f,c)){d=h(f,c);if(d!==undefined){f[c]=d}else{delete f[c]}}}}return k.call(a,b,f)}n.lastIndex=0;if(n.test(g)){g=g.replace(n,function(a){return'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(g.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){i=eval('('+g+')');return typeof k==='function'?h({'':i},''):i}throw new SyntaxError('JSON.parse');}}}());Faye.XHRTransport=Faye.Class(Faye.Transport,{request:function(b,c,d){var f={message:JSON.stringify(b)};Faye.XHR.request('post',this._6,f,function(a){if(c)c.call(d,JSON.parse(a.text()))})}});Faye.XHRTransport.isUsable=function(a){return Faye.URI.parse(a).isLocal()};Faye.Transport.register('long-polling',Faye.XHRTransport);Faye.JSONPTransport=Faye.extend(Faye.Class(Faye.Transport,{request:function(b,c,d){var f={message:JSON.stringify(b)},g=document.getElementsByTagName('head')[0],k=document.createElement('script'),i=Faye.JSONPTransport.getCallbackName(),h=Faye.URI.parse(this._6,f);Faye.ENV[i]=function(a){Faye.ENV[i]=undefined;try{delete Faye.ENV[i]}catch(e){}g.removeChild(k);if(c)c.call(d,a)};h.params.jsonp=i;k.type='text/javascript';k.src=h.toURL();g.appendChild(k)}}),{_s:0,getCallbackName:function(){this._s+=1;return'__jsonp'+this._s+'__'}});Faye.JSONPTransport.isUsable=function(a){return true};Faye.Transport.register('callback-polling',Faye.JSONPTransport);
+if(!this.Faye)Faye={};Faye.extend=function(a,b,c){if(!b)return a;for(var d in b){if(!b.hasOwnProperty(d))continue;if(a.hasOwnProperty(d)&&c===false)continue;if(a[d]!==b[d])a[d]=b[d]}return a};Faye.extend(Faye,{VERSION:'0.3.2',BAYEUX_VERSION:'1.0',ID_LENGTH:128,JSONP_CALLBACK:'jsonpcallback',CONNECTION_TYPES:["long-polling","callback-polling"],ENV:this,random:function(a){a=a||this.ID_LENGTH;if(a>32){var b=Math.ceil(a/32),c='';while(b--)c+=this.random(32);return c}var d=Math.pow(2,a);return Math.floor(Math.random()*d).toString(16)},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])|(\-|\_|\!|\~|\(|\)|\$|\@)| |\/|\*|\.))*)$/},commonElement:function(a,b){for(var c=0,d=a.length;c<d;c++){if(this.indexOf(b,a[c])!==-1)return a[c]}return null},indexOf:function(a,b){for(var c=0,d=a.length;c<d;c++){if(a[c]===b)return c}return-1},each:function(a,b,c){if(a instanceof Array){for(var d=0,f=a.length;d<f;d++){if(a[d]!==undefined)b.call(c||null,a[d],d)}}else{for(var g in a){if(a.hasOwnProperty(g))b.call(c||null,g,a[g])}}},filter:function(a,b,c){var d=[];this.each(a,function(){if(b.apply(c,arguments))d.push(arguments[0])});return d},size:function(a){var b=0;this.each(a,function(){b+=1});return b},enumEqual:function(c,d){if(d instanceof Array){if(!(c instanceof Array))return false;var f=c.length;if(f!==d.length)return false;while(f--){if(c[f]!==d[f])return false}return true}else{if(!(c instanceof Object))return false;if(this.size(d)!==this.size(c))return false;var g=true;this.each(c,function(a,b){g=g&&(d[a]===b)});return g}},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)},timestamp:function(){var b=new Date(),c=b.getFullYear(),d=b.getMonth()+1,f=b.getDate(),g=b.getHours(),j=b.getMinutes(),i=b.getSeconds();var h=function(a){return a<10?'0'+a:String(a)};return h(c)+'-'+h(d)+'-'+h(f)+' '+h(g)+':'+h(j)+':'+h(i)}});Faye.Class=function(a,b){if(typeof a!=='function'){b=a;a=Object}var c=function(){if(!this.initialize)return this;return this.initialize.apply(this,arguments)||this};var d=function(){};d.prototype=a.prototype;c.prototype=new d();Faye.extend(c.prototype,b);return c};Faye.Deferrable={callback:function(a,b){if(this._w==='succeeded')return a.apply(b,this._o);this._a=this._a||[];this._a.push([a,b])},setDeferredStatus:function(){var b=Array.prototype.slice.call(arguments),c=b.shift();this._w=c;this._o=b;if(c!=='succeeded')return;if(!this._a)return;Faye.each(this._a,function(a){a[0].apply(a[1],this._o)},this);this._a=[]}};Faye.Observable={on:function(a,b,c){this._2=this._2||{};var d=this._2[a]=this._2[a]||[];d.push([b,c])},stopObserving:function(a,b,c){if(!this._2||!this._2[a])return;if(!b){delete this._2[a];return}var d=this._2[a],f=d.length;while(f--){if(b&&d[f][0]!==b)continue;if(c&&d[f][1]!==c)continue;d.splice(f,1)}},fire:function(){var b=Array.prototype.slice.call(arguments),c=b.shift();if(!this._2||!this._2[c])return;Faye.each(this._2[c],function(a){a[0].apply(a[1],b.slice())})}};Faye.Logging={LOG_LEVELS:{error:3,warn:2,info:1,debug:0},logLevel:'error',log:function(a,b){if(!Faye.logger)return;var c=Faye.Logging.LOG_LEVELS;if(c[Faye.Logging.logLevel]>c[b])return;var d='['+b.toUpperCase()+'] [Faye',f=null;for(var g in Faye){if(f)continue;if(typeof Faye[g]!=='function')continue;if(this instanceof Faye[g])f=g}if(f)d+='.'+f;d+='] ';Faye.logger(Faye.timestamp()+' '+d+a)},error:function(a){this.log(a,'error')},warn:function(a){this.log(a,'warn')},info:function(a){this.log(a,'info')},debug:function(a){this.log(a,'debug')}};Faye.Timeouts={addTimeout:function(a,b,c,d){this._6=this._6||{};if(this._6.hasOwnProperty(a))return;var f=this;this._6[a]=setTimeout(function(){delete f._6[a];c.call(d)},1000*b)},removeTimeout:function(a){this._6=this._6||{};var b=this._6[a];if(!b)return;clearTimeout(b);delete this._6[a]}};Faye.Channel=Faye.Class({initialize:function(a){this.__id=this.name=a},push:function(a){this.fire('message',a)}});Faye.extend(Faye.Channel.prototype,Faye.Observable);Faye.extend(Faye.Channel,{HANDSHAKE:'/meta/handshake',CONNECT:'/meta/connect',SUBSCRIBE:'/meta/subscribe',UNSUBSCRIBE:'/meta/unsubscribe',DISCONNECT:'/meta/disconnect',META:'meta',SERVICE:'service',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)},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)},Tree:Faye.Class({initialize:function(a){this._3=a;this._8={}},eachChild:function(c,d){Faye.each(this._8,function(a,b){c.call(d,a,b)})},each:function(c,d,f){this.eachChild(function(a,b){a=c.concat(a);b.each(a,d,f)});if(this._3!==undefined)d.call(f,c,this._3)},getKeys:function(){return this.map(function(a,b){return'/'+a.join('/')})},map:function(c,d){var f=[];this.each([],function(a,b){f.push(c.call(d,a,b))});return f},get:function(a){var b=this.traverse(a);return b?b._3:null},set:function(a,b){var c=this.traverse(a,true);if(c)c._3=b},traverse:function(a,b){if(typeof a==='string')a=Faye.Channel.parse(a);if(a===null)return null;if(a.length===0)return this;var c=this._8[a[0]];if(!c&&!b)return null;if(!c)c=this._8[a[0]]=new Faye.Channel.Tree();return c.traverse(a.slice(1),b)},findOrCreate:function(a){var b=this.get(a);if(b)return b;b=new Faye.Channel(a);this.set(a,b);return b},glob:function(f){if(typeof f==='string')f=Faye.Channel.parse(f);if(f===null)return[];if(f.length===0)return(this._3===undefined)?[]:[this._3];var g=[];if(Faye.enumEqual(f,['*'])){Faye.each(this._8,function(a,b){if(b._3!==undefined)g.push(b._3)});return g}if(Faye.enumEqual(f,['**'])){g=this.map(function(a,b){return b});if(this._3!==undefined)g.pop();return g}Faye.each(this._8,function(b,c){if(b!==f[0]&&b!=='*')return;var d=c.glob(f.slice(1));Faye.each(d,function(a){g.push(a)})});if(this._8['**'])g.push(this._8['**']._3);return g}})});Faye.Namespace=Faye.Class({initialize:function(){this._p={}},generate:function(){var a=Faye.random();while(this._p.hasOwnProperty(a))a=Faye.random();return this._p[a]=a}});Faye.Transport=Faye.extend(Faye.Class({initialize:function(a,b){this.debug('Created new transport for '+b);this._b=a;this._4=b},send:function(f,g,j){if(!(f instanceof Array)&&!f.id)f.id=this._b._q.generate();this.debug('Client '+this._b._0+' sending message to '+this._4+': '+Faye.toJSON(f));this.request(f,function(b){this.debug('Client '+this._b._0+' received from '+this._4+': '+Faye.toJSON(b));if(!g)return;var c=[],d=true;Faye.each([].concat(b),function(a){if(a.id===f.id){if(g.call(j,a)===false)d=false}if(a.advice)this._b.handleAdvice(a.advice);if(a.data&&a.channel)c.push(a)},this);if(d)this._b.deliverMessages(c)},this)}}),{get:function(c,d){var f=c._4;if(d===undefined)d=this.supportedConnectionTypes();var g=null;Faye.each(this._i,function(a,b){if(Faye.indexOf(d,a)<0)return;if(g)return;if(b.isUsable(f))g=b});if(!g)throw'Could not find a usable connection type for '+f;return new g(c,f)},register:function(a,b){this._i[a]=b;b.prototype.connectionType=a},_i:{},supportedConnectionTypes:function(){var c=[],d;Faye.each(this._i,function(a,b){c.push(a)});return c}});Faye.extend(Faye.Transport.prototype,Faye.Logging);Faye.Client=Faye.Class({UNCONNECTED:1,CONNECTING:2,CONNECTED:3,DISCONNECTED:4,HANDSHAKE:'handshake',RETRY:'retry',NONE:'none',CONNECTION_TIMEOUT:60.0,DEFAULT_ENDPOINT:'/bayeux',MAX_DELAY:0.1,INTERVAL:1000.0,initialize:function(a,b){this.info('New client created for '+a);this._4=a||this.DEFAULT_ENDPOINT;this._x=b||{};this._r=this._x.timeout||this.CONNECTION_TIMEOUT;this._7=Faye.Transport.get(this);this._1=this.UNCONNECTED;this._q=new Faye.Namespace();this._j=[];this._c=new Faye.Channel.Tree();this._s=[];this._9={reconnect:this.RETRY,interval:this.INTERVAL};if(!Faye.Event)return;Faye.Event.on(Faye.ENV,'beforeunload',this.disconnect,this)},handshake:function(b,c){if(this._9.reconnect===this.NONE)return;if(this._1!==this.UNCONNECTED)return;this._1=this.CONNECTING;var d=this;this.info('Initiating handshake with '+this._4);this._7.send({channel:Faye.Channel.HANDSHAKE,version:Faye.BAYEUX_VERSION,supportedConnectionTypes:Faye.Transport.supportedConnectionTypes()},function(a){if(!a.successful){this.info('Handshake unsuccessful');setTimeout(function(){d.handshake(b,c)},this._9.interval);return this._1=this.UNCONNECTED}this._1=this.CONNECTED;this._0=a.clientId;this._7=Faye.Transport.get(this,a.supportedConnectionTypes);this.info('Handshake successful: '+this._0);if(b)b.call(c)},this)},connect:function(b,c){if(this._9.reconnect===this.NONE)return;if(this._1===this.DISCONNECTED)return;if(this._9.reconnect===this.HANDSHAKE||this._1===this.UNCONNECTED){this._t();return this.handshake(function(){this.connect(b,c)},this)}if(this._1===this.CONNECTING)return this.callback(b,c);if(this._1!==this.CONNECTED)return;this.info('Calling deferred actions for '+this._0);this.setDeferredStatus('succeeded');this.setDeferredStatus('deferred');if(b)b.call(c);if(this._d)return;this._d=this._q.generate();var d=this;this.info('Initiating connection for '+this._0);this._7.send({channel:Faye.Channel.CONNECT,clientId:this._0,connectionType:this._7.connectionType,id:this._d},this._k(function(a){delete this._d;this.removeTimeout('reconnect');this.info('Closed connection for '+this._0);setTimeout(function(){d.connect()},this._9.interval)}));this._t()},disconnect:function(){if(this._1!==this.CONNECTED)return;this._1=this.DISCONNECTED;this.info('Disconnecting '+this._0);this._7.send({channel:Faye.Channel.DISCONNECT,clientId:this._0});this.info('Clearing channel listeners for '+this._0);this._c=new Faye.Channel.Tree()},subscribe:function(c,d,f){this.connect(function(){c=[].concat(c);this._l(c);this.info('Client '+this._0+' attempting to subscribe to ['+c.join(', ')+']');this._7.send({channel:Faye.Channel.SUBSCRIBE,clientId:this._0,subscription:c},this._k(function(b){if(!b.successful||!d)return;this.info('Subscription acknowledged for '+this._0+' to ['+c.join(', ')+']');c=[].concat(b.subscription);Faye.each(c,function(a){this._c.set(a,[d,f])},this)}))},this)},unsubscribe:function(c,d,f){this.connect(function(){c=[].concat(c);this._l(c);this.info('Client '+this._0+' attempting to unsubscribe from ['+c.join(', ')+']');this._7.send({channel:Faye.Channel.UNSUBSCRIBE,clientId:this._0,subscription:c},this._k(function(b){if(!b.successful)return;this.info('Unsubscription acknowledged for '+this._0+' from ['+c.join(', ')+']');c=[].concat(b.subscription);Faye.each(c,function(a){this._c.set(a,null)},this)}))},this)},publish:function(a,b){this.connect(function(){this._l([a]);this.info('Client '+this._0+' queueing published message to '+a+': '+Faye.toJSON(b));this._y({channel:a,data:b,clientId:this._0});this.addTimeout('publish',this.MAX_DELAY,this._z,this)},this)},handleAdvice:function(a){Faye.extend(this._9,a);if(this._9.reconnect===this.HANDSHAKE)this._0=null},deliverMessages:function(d){Faye.each(d,function(b){this.info('Client '+this._0+' calling listeners for '+b.channel+' with '+Faye.toJSON(b.data));var c=this._c.glob(b.channel);Faye.each(c,function(a){if(!a)return;a[0].call(a[1],b.data)})},this)},_t:function(){this.addTimeout('reconnect',this._r,function(){delete this._d;delete this._0;this._1=this.UNCONNECTED;this.info('Server took >'+this._r+'s to reply to connection for '+this._0+': attempting to reconnect');this.subscribe(this._c.getKeys())},this)},_y:function(a){this._j.push(a)},_z:function(){this._7.send(this._j);this._j=[]},_l:function(b){Faye.each(b,function(a){if(!Faye.Channel.isValid(a))throw'"'+a+'" is not a valid channel name';if(!Faye.Channel.isSubscribable(a))throw'Clients may not subscribe to channel "'+a+'"';})},_k:function(b){var c=this;return function(a){if(a.clientId!==c._0)return false;b.call(c,a);return true}}});Faye.extend(Faye.Client.prototype,Faye.Deferrable);Faye.extend(Faye.Client.prototype,Faye.Timeouts);Faye.extend(Faye.Client.prototype,Faye.Logging);Faye.Event={_e:[],on:function(a,b,c,d){var f=function(){c.call(d)};if(a.addEventListener)a.addEventListener(b,f,false);else a.attachEvent('on'+b,f);this._e.push({_f:a,_m:b,_A:c,_g:d,_u:f})},detach:function(a,b,c,d){var f=this._e.length,g;while(f--){g=this._e[f];if((a&&a!==g._f)||(b&&b!==g._m)||(c&&c!==g._A)||(d&&d!==g._g))continue;if(g._f.removeEventListener)g._f.removeEventListener(g._m,g._u,false);else g._f.detachEvent('on'+g._m,g._u);this._e.splice(f,1);g=null}}};Faye.Event.on(Faye.ENV,'unload',Faye.Event.detach,Faye.Event);Faye.URI=Faye.extend(Faye.Class({queryString:function(){var c=[],d;Faye.each(this.params,function(a,b){c.push(encodeURIComponent(a)+'='+encodeURIComponent(b))});return c.join('&')},isLocal:function(){var a=Faye.URI.parse(Faye.ENV.location.href);var b=(a.hostname!==this.hostname)||(a.port!==this.port)||(a.protocol!==this.protocol);return!b},toURL:function(){return this.protocol+this.hostname+':'+this.port+this.pathname+'?'+this.queryString()}}),{parse:function(d,f){if(typeof d!=='string')return d;var g=new this();var j=function(b,c){d=d.replace(c,function(a){if(a)g[b]=a;return''})};j('protocol',/^https?\:\/+/);j('hostname',/^[^\/\:]+/);j('port',/^:[0-9]+/);Faye.extend(g,{protocol:'http://',hostname:Faye.ENV.location.hostname,port:Faye.ENV.location.port},false);if(!g.port)g.port=(g.protocol==='https://')?'443':'80';g.port=g.port.replace(/\D/g,'');var i=d.split('?'),h=i.shift(),l=i.join('?'),n=l?l.split('&'):[],o=n.length,k={};while(o--){i=n[o].split('=');k[decodeURIComponent(i[0]||'')]=decodeURIComponent(i[1]||'')}if(typeof f==='object')Faye.extend(k,f);g.pathname=h;g.params=k;return g}});Faye.XHR={request:function(a,b,c,d,f){var g=new this.Request(a,b,c,d,f);g.send();return g},getXhrObject:function(){return Faye.ENV.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},Request:Faye.Class({initialize:function(a,b,c,d,f){this._h=a.toUpperCase();this._4=Faye.URI.parse(b,c);this._B=(typeof c==='string')?c:null;this._s=(typeof d==='function')?{success:d}:d;this._g=f||null;this._5=null},send:function(){if(this._n)return;var a=this._4.pathname,b=this._4.queryString();if(this._h==='GET')a+='?'+b;var c=(this._h==='POST')?(this._B||b):'';this._n=true;this._5=Faye.XHR.getXhrObject();this._5.open(this._h,a,true);if(this._h==='POST')this._5.setRequestHeader('Content-Type','application/json');var d=this,f=function(){if(d._5.readyState!==4)return;if(g){clearInterval(g);g=null}Faye.Event.detach(Faye.ENV,'beforeunload',d.abort,d);d._n=false;d._C();d=null};var g=setInterval(f,10);Faye.Event.on(Faye.ENV,'beforeunload',this.abort,this);this._5.send(c)},abort:function(){this._5.abort()},_C:function(){var a=this._s;if(!a)return;return this.success()?a.success&&a.success.call(this._g,this):a.failure&&a.failure.call(this._g,this)},waiting:function(){return!!this._n},complete:function(){return this._5&&!this.waiting()},success:function(){if(!this.complete())return false;var a=this._5.status;return(a>=200&&a<300)||a===304||a===1223},failure:function(){if(!this.complete())return false;return!this.success()},text:function(){if(!this.complete())return null;return this._5.responseText},status:function(){if(!this.complete())return null;return this._5.status}})};if(!this.JSON){JSON={}}(function(){function l(a){return a<10?'0'+a:a}if(typeof Date.prototype.toJSON!=='function'){Date.prototype.toJSON=function(a){return this.getUTCFullYear()+'-'+l(this.getUTCMonth()+1)+'-'+l(this.getUTCDate())+'T'+l(this.getUTCHours())+':'+l(this.getUTCMinutes())+':'+l(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,k,p,s={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'},m;function r(c){o.lastIndex=0;return o.test(c)?'"'+c.replace(o,function(a){var b=s[a];return typeof b==='string'?b:'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+c+'"'}function q(a,b){var c,d,f,g,j=k,i,h=b[a];if(h&&typeof h==='object'&&typeof h.toJSON==='function'){h=h.toJSON(a)}if(typeof m==='function'){h=m.call(b,a,h)}switch(typeof h){case'string':return r(h);case'number':return isFinite(h)?String(h):'null';case'boolean':case'null':return String(h);case'object':if(!h){return'null'}k+=p;i=[];if(Object.prototype.toString.apply(h)==='[object Array]'){g=h.length;for(c=0;c<g;c+=1){i[c]=q(c,h)||'null'}f=i.length===0?'[]':k?'[\n'+k+i.join(',\n'+k)+'\n'+j+']':'['+i.join(',')+']';k=j;return f}if(m&&typeof m==='object'){g=m.length;for(c=0;c<g;c+=1){d=m[c];if(typeof d==='string'){f=q(d,h);if(f){i.push(r(d)+(k?': ':':')+f)}}}}else{for(d in h){if(Object.hasOwnProperty.call(h,d)){f=q(d,h);if(f){i.push(r(d)+(k?': ':':')+f)}}}}f=i.length===0?'{}':k?'{\n'+k+i.join(',\n'+k)+'\n'+j+'}':'{'+i.join(',')+'}';k=j;return f}}Faye.stringify=function(a,b,c){var d;k='';p='';if(typeof c==='number'){for(d=0;d<c;d+=1){p+=' '}}else if(typeof c==='string'){p=c}m=b;if(b&&typeof b!=='function'&&(typeof b!=='object'||typeof b.length!=='number')){throw new Error('JSON.stringify');}return q('',{'':a})};if(typeof JSON.stringify!=='function'){JSON.stringify=Faye.stringify}if(typeof JSON.parse!=='function'){JSON.parse=function(g,j){var i;function h(a,b){var c,d,f=a[b];if(f&&typeof f==='object'){for(c in f){if(Object.hasOwnProperty.call(f,c)){d=h(f,c);if(d!==undefined){f[c]=d}else{delete f[c]}}}}return j.call(a,b,f)}n.lastIndex=0;if(n.test(g)){g=g.replace(n,function(a){return'\\u'+('0000'+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(g.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,''))){i=eval('('+g+')');return typeof j==='function'?h({'':i},''):i}throw new SyntaxError('JSON.parse');}}}());Faye.XHRTransport=Faye.Class(Faye.Transport,{request:function(b,c,d){Faye.XHR.request('post',this._4,Faye.toJSON(b),function(a){if(c)c.call(d,JSON.parse(a.text()))})}});Faye.XHRTransport.isUsable=function(a){return Faye.URI.parse(a).isLocal()};Faye.Transport.register('long-polling',Faye.XHRTransport);Faye.JSONPTransport=Faye.extend(Faye.Class(Faye.Transport,{request:function(b,c,d){var f={message:Faye.toJSON(b)},g=document.getElementsByTagName('head')[0],j=document.createElement('script'),i=Faye.JSONPTransport.getCallbackName(),h=Faye.URI.parse(this._4,f);Faye.ENV[i]=function(a){Faye.ENV[i]=undefined;try{delete Faye.ENV[i]}catch(e){}g.removeChild(j);if(c)c.call(d,a)};h.params.jsonp=i;j.type='text/javascript';j.src=h.toURL();g.appendChild(j)}}),{_v:0,getCallbackName:function(){this._v+=1;return'__jsonp'+this._v+'__'}});Faye.JSONPTransport.isUsable=function(a){return true};Faye.Transport.register('callback-polling',Faye.JSONPTransport);

data/build/faye.js

@@ -12,7 +12,7 @@ Faye.extend = function(dest, source, overwrite) {
 };
 
 Faye.extend(Faye, {
-  VERSION:          '0.3.1',
+  VERSION:          '0.3.2',
   
   BAYEUX_VERSION:   '1.0',
   ID_LENGTH:        128,
@@ -143,6 +143,35 @@ Faye.extend(Faye, {
       });
       return result;
     }
+  },
+  
+  // 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);
+  },
+  
+  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);
   }
 });
 
@@ -233,6 +262,72 @@ Faye.Observable = {
 };
 
 
+Faye.Logging = {
+  LOG_LEVELS: {
+    error:  3,
+    warn:   2,
+    info:   1,
+    debug:  0
+  },
+  
+  logLevel: 'error',
+  
+  log: function(message, level) {
+    if (!Faye.logger) return;
+    
+    var levels = Faye.Logging.LOG_LEVELS;
+    if (levels[Faye.Logging.logLevel] > levels[level]) return;
+    
+    var banner = '[' + level.toUpperCase() + '] [Faye',
+        klass  = null;
+    
+    for (var key in Faye) {
+      if (klass) continue;
+      if (typeof Faye[key] !== 'function') continue;
+      if (this instanceof Faye[key]) klass = key;
+    }
+    if (klass) banner += '.' + klass;
+    banner += '] ';
+    
+    Faye.logger(Faye.timestamp() + ' ' + banner + message);
+  },
+  
+  error: function(message) {
+    this.log(message, 'error');
+  },
+  warn: function(message) {
+    this.log(message, 'warn');
+  },
+  info: function(message) {
+    this.log(message, 'info');
+  },
+  debug: function(message) {
+    this.log(message, 'debug');
+  }
+};
+
+
+Faye.Timeouts = {
+  addTimeout: function(name, delay, callback, scope) {
+    this._timeouts = this._timeouts || {};
+    if (this._timeouts.hasOwnProperty(name)) return;
+    var self = this;
+    this._timeouts[name] = setTimeout(function() {
+      delete self._timeouts[name];
+      callback.call(scope);
+    }, 1000 * delay);
+  },
+  
+  removeTimeout: function(name) {
+    this._timeouts = this._timeouts || {};
+    var timeout = this._timeouts[name];
+    if (!timeout) return;
+    clearTimeout(timeout);
+    delete this._timeouts[name];
+  }
+};
+
+
 Faye.Channel = Faye.Class({
   initialize: function(name) {
     this.__id = this.name = name;
@@ -300,6 +395,10 @@ Faye.extend(Faye.Channel, {
       if (this._value !== undefined) block.call(context, prefix, this._value);
     },
     
+    getKeys: function() {
+      return this.map(function(key, value) { return '/' + key.join('/') });
+    },
+    
     map: function(block, context) {
       var result = [];
       this.each([], function(path, value) {
@@ -389,6 +488,7 @@ Faye.Namespace = Faye.Class({
 
 Faye.Transport = Faye.extend(Faye.Class({
   initialize: function(client, endpoint) {
+    this.debug('Created new transport for ' + endpoint);
     this._client   = client;
     this._endpoint = endpoint;
   },
@@ -397,20 +497,34 @@ Faye.Transport = Faye.extend(Faye.Class({
     if (!(message instanceof Array) && !message.id)
       message.id = this._client._namespace.generate();
     
+    this.debug('Client ' + this._client._clientId +
+               ' sending message to ' + this._endpoint + ': ' +
+               Faye.toJSON(message));
+    
     this.request(message, function(responses) {
+      this.debug('Client ' + this._client._clientId +
+                 ' received from ' + this._endpoint + ': ' +
+                 Faye.toJSON(responses));
+      
       if (!callback) return;
+      
+      var messages = [], deliverable = true;
       Faye.each([].concat(responses), function(response) {
-        
-        if (response.id === message.id)
-          callback.call(scope, response);
+    
+        if (response.id === message.id) {
+          if (callback.call(scope, response) === false)
+            deliverable = false;
+        }
         
         if (response.advice)
           this._client.handleAdvice(response.advice);
         
         if (response.data && response.channel)
-          this._client.sendToSubscribers(response);
+          messages.push(response);
         
       }, this);
+      
+      if (deliverable) this._client.deliverMessages(messages);
     }, this);
   }
 }), {
@@ -444,23 +558,32 @@ Faye.Transport = Faye.extend(Faye.Class({
   }
 });
 
+Faye.extend(Faye.Transport.prototype, Faye.Logging);
+
 
 Faye.Client = Faye.Class({
-  UNCONNECTED:   1,
-  CONNECTING:    2,
-  CONNECTED:     3,
-  DISCONNECTED:  4,
+  UNCONNECTED:          1,
+  CONNECTING:           2,
+  CONNECTED:            3,
+  DISCONNECTED:         4,
+  
+  HANDSHAKE:            'handshake',
+  RETRY:                'retry',
+  NONE:                 'none',
   
-  HANDSHAKE:     'handshake',
-  RETRY:         'retry',
-  NONE:          'none',
+  CONNECTION_TIMEOUT:   60.0,
   
-  DEFAULT_ENDPOINT:   '/bayeux',
-  MAX_DELAY:          0.1,
-  INTERVAL:           1000.0,
+  DEFAULT_ENDPOINT:     '/bayeux',
+  MAX_DELAY:            0.1,
+  INTERVAL:             1000.0,
   
-  initialize: function(endpoint) {
+  initialize: function(endpoint, options) {
+    this.info('New client created for ' + endpoint);
+    
     this._endpoint  = endpoint || this.DEFAULT_ENDPOINT;
+    this._options   = options || {};
+    this._timeout   = this._options.timeout || this.CONNECTION_TIMEOUT;
+    
     this._transport = Faye.Transport.get(this);
     this._state     = this.UNCONNECTED;
     this._namespace = new Faye.Namespace();
@@ -500,6 +623,8 @@ Faye.Client = Faye.Class({
     this._state = this.CONNECTING;
     var self = this;
     
+    this.info('Initiating handshake with ' + this._endpoint);
+    
     this._transport.send({
       channel:      Faye.Channel.HANDSHAKE,
       version:      Faye.BAYEUX_VERSION,
@@ -508,6 +633,7 @@ Faye.Client = Faye.Class({
     }, function(response) {
       
       if (!response.successful) {
+        this.info('Handshake unsuccessful');
         setTimeout(function() { self.handshake(callback, scope) }, this._advice.interval);
         return this._state = this.UNCONNECTED;
       }
@@ -516,6 +642,7 @@ Faye.Client = Faye.Class({
       this._clientId  = response.clientId;
       this._transport = Faye.Transport.get(this, response.supportedConnectionTypes);
       
+      this.info('Handshake successful: ' + this._clientId);
       if (callback) callback.call(scope);
     }, this);
   },
@@ -533,14 +660,17 @@ Faye.Client = Faye.Class({
     if (this._advice.reconnect === this.NONE) return;
     if (this._state === this.DISCONNECTED) return;
     
-    if (this._advice.reconnect === this.HANDSHAKE || this._state === this.UNCONNECTED)
+    if (this._advice.reconnect === this.HANDSHAKE || this._state === this.UNCONNECTED) {
+      this._beginReconnectTimeout();
       return this.handshake(function() { this.connect(callback, scope) }, this);
+    }
     
     if (this._state === this.CONNECTING)
       return this.callback(callback, scope);
     
     if (this._state !== this.CONNECTED) return;
     
+    this.info('Calling deferred actions for ' + this._clientId);
     this.setDeferredStatus('succeeded');
     this.setDeferredStatus('deferred');
     if (callback) callback.call(scope);
@@ -548,6 +678,7 @@ Faye.Client = Faye.Class({
     if (this._connectionId) return;
     this._connectionId = this._namespace.generate();
     var self = this;
+    this.info('Initiating connection for ' + this._clientId);
     
     this._transport.send({
       channel:        Faye.Channel.CONNECT,
@@ -555,10 +686,15 @@ Faye.Client = Faye.Class({
       connectionType: this._transport.connectionType,
       id:             this._connectionId
       
-    }, function(response) {
+    }, this._verifyClientId(function(response) {
       delete this._connectionId;
+      this.removeTimeout('reconnect');
+      
+      this.info('Closed connection for ' + this._clientId);
       setTimeout(function() { self.connect() }, this._advice.interval);
-    }, this);
+    }));
+    
+    this._beginReconnectTimeout();
   },
   
   // Request                              Response
@@ -572,11 +708,14 @@ Faye.Client = Faye.Class({
     if (this._state !== this.CONNECTED) return;
     this._state = this.DISCONNECTED;
     
+    this.info('Disconnecting ' + this._clientId);
+    
     this._transport.send({
       channel:    Faye.Channel.DISCONNECT,
       clientId:   this._clientId
     });
     
+    this.info('Clearing channel listeners for ' + this._clientId);
     this._channels = new Faye.Channel.Tree();
   },
   
@@ -596,19 +735,25 @@ Faye.Client = Faye.Class({
       channels = [].concat(channels);
       this._validateChannels(channels);
       
+      this.info('Client ' + this._clientId + ' attempting to subscribe to [' +
+                channels.join(', ') + ']');
+      
       this._transport.send({
         channel:      Faye.Channel.SUBSCRIBE,
         clientId:     this._clientId,
         subscription: channels
         
-      }, function(response) {
-        if (!response.successful) return;
+      }, this._verifyClientId(function(response) {
+        if (!response.successful || !callback) return;
         
+        this.info('Subscription acknowledged for ' + this._clientId + ' to [' +
+                  channels.join(', ') + ']');
+      
         channels = [].concat(response.subscription);
         Faye.each(channels, function(channel) {
           this._channels.set(channel, [callback, scope]);
         }, this);
-      }, this);
+      }));
       
     }, this);
   },
@@ -629,19 +774,25 @@ Faye.Client = Faye.Class({
       channels = [].concat(channels);
       this._validateChannels(channels);
       
+      this.info('Client ' + this._clientId + ' attempting to unsubscribe from [' +
+                channels.join(', ') + ']');
+      
       this._transport.send({
         channel:      Faye.Channel.UNSUBSCRIBE,
         clientId:     this._clientId,
         subscription: channels
         
-      }, function(response) {
+      }, this._verifyClientId(function(response) {
         if (!response.successful) return;
         
+        this.info('Unsubscription acknowledged for ' + this._clientId + ' from [' +
+                  channels.join(', ') + ']');
+      
         channels = [].concat(response.subscription);
         Faye.each(channels, function(channel) {
           this._channels.set(channel, null);
         }, this);
-      }, this);
+      }));
       
     }, this);
   },
@@ -657,19 +808,16 @@ Faye.Client = Faye.Class({
       
       this._validateChannels([channel]);
       
+      this.info('Client ' + this._clientId + ' queueing published message to ' +
+                channel + ': ' + Faye.toJSON(data));
+      
       this._enqueue({
         channel:      channel,
         data:         data,
         clientId:     this._clientId
       });
       
-      if (this._timeout) return;
-      var self = this;
-      
-      this._timeout = setTimeout(function() {
-        delete self._timeout;
-        self._flush();
-      }, this.MAX_DELAY * 1000);
+      this.addTimeout('publish', this.MAX_DELAY, this._flush, this);
       
     }, this);
   },
@@ -679,12 +827,30 @@ Faye.Client = Faye.Class({
     if (this._advice.reconnect === this.HANDSHAKE) this._clientId = null;
   },
   
-  sendToSubscribers: function(message) {
-    var channels = this._channels.glob(message.channel);
-    Faye.each(channels, function(callback) {
-      if (!callback) return;
-      callback[0].call(callback[1], message.data);
-    });
+  deliverMessages: function(messages) {
+    Faye.each(messages, function(message) {
+      this.info('Client ' + this._clientId + ' calling listeners for ' +
+                message.channel + ' with ' + Faye.toJSON(message.data));
+      
+      var channels = this._channels.glob(message.channel);
+      Faye.each(channels, function(callback) {
+        if (!callback) return;
+        callback[0].call(callback[1], message.data);
+      });
+    }, this);
+  },
+  
+  _beginReconnectTimeout: function() {
+    this.addTimeout('reconnect', this._timeout, function() {
+      delete this._connectionId;
+      delete this._clientId;
+      this._state = this.UNCONNECTED;
+      
+      this.info('Server took >' + this._timeout + 's to reply to connection for ' +
+                this._clientId + ': attempting to reconnect');
+      
+      this.subscribe(this._channels.getKeys());
+    }, this);
   },
   
   _enqueue: function(message) {
@@ -703,10 +869,21 @@ Faye.Client = Faye.Class({
       if (!Faye.Channel.isSubscribable(channel))
         throw 'Clients may not subscribe to channel "' + channel + '"';
     });
+  },
+  
+  _verifyClientId: function(callback) {
+    var self = this;
+    return function(response) {
+      if (response.clientId !== self._clientId) return false;
+      callback.call(self, response);
+      return true;
+    };
   }
 });
 
 Faye.extend(Faye.Client.prototype, Faye.Deferrable);
+Faye.extend(Faye.Client.prototype, Faye.Timeouts);
+Faye.extend(Faye.Client.prototype, Faye.Logging);
 
 
 Faye.Set = Faye.Class({
@@ -757,6 +934,7 @@ Faye.Set = Faye.Class({
 
 Faye.Server = Faye.Class({
   initialize: function(options) {
+    this.info('New server created');
     this._options   = options || {};
     this._channels  = new Faye.Channel.Tree();
     this._clients   = {};
@@ -770,6 +948,8 @@ Faye.Server = Faye.Class({
   },
   
   process: function(messages, local, callback) {
+    this.debug('Processing messages from ' + (local ? 'LOCAL' : 'REMOTE') + ' client');
+    
     messages = [].concat(messages);
     var processed = 0, responses = [];
     
@@ -777,8 +957,9 @@ Faye.Server = Faye.Class({
       this._handle(message, local, function(reply) {
         responses = responses.concat(reply);
         processed += 1;
-        if (processed === messages.length) callback(responses);
-      });
+        if (processed < messages.length) return;
+        callback(responses);
+      }, this);
     }, this);
   },
   
@@ -803,42 +984,54 @@ Faye.Server = Faye.Class({
     delete this._clients[client.id];
   },
   
-  _handle: function(message, local, callback) {
-    var clientId = message.clientId,
-        channel  = message.channel,
+  _handle: function(message, local, callback, scope) {
+    var channel = message.channel,
         response;
     
     message.__id = Faye.random();
-    Faye.each(this._channels.glob(channel), function(c) { c.push(message) });
+    Faye.each(this._channels.glob(channel), function(c) {
+      c.push(message);
+      this.info('Publishing message ' + Faye.toJSON(message.data) +
+                ' from client ' + clientId + ' to ' + c.name);
+    }, this);
     
     if (Faye.Channel.isMeta(channel)) {
       response = this[Faye.Channel.parse(channel)[1]](message, local);
       
-      clientId = clientId || response.clientId;
+      var clientId = response.clientId;
       response.advice = response.advice || {};
       Faye.extend(response.advice, {
         reconnect:  this._clients.hasOwnProperty(clientId) ? 'retry' : 'handshake',
-        interval:   Faye.Connection.INTERVAL * 1000
+        interval:   Math.floor(Faye.Connection.prototype.INTERVAL * 1000)
       }, false);
       
-      response.id = message.id;
-      
       if (response.channel !== Faye.Channel.CONNECT ||
           response.successful !== true)
-        return callback(response);
+        return callback.call(scope, response);
       
+      this.info('Accepting connection from ' + response.clientId);
       return this._connection(response.clientId).connect(function(events) {
+        this.info('Sending event messages to ' + response.clientId);
+        this.debug('Events for ' + response.clientId + ': ' + Faye.toJSON(events));
         Faye.each(events, function(e) { delete e.__id });
-        callback([response].concat(events));
-      });
+        callback.call(scope, [response].concat(events));
+      }, this);
     }
     
     if (!message.clientId || Faye.Channel.isService(channel))
       return callback([]);
     
-    callback( { channel:      channel,
-                successful:   true,
-                id:           message.id  } );
+    response = this._makeResponse(message);
+    response.successful = true;
+    callback(response);
+  },
+  
+  _makeResponse: function(message) {
+    var response = {};
+    Faye.each(['id', 'clientId', 'channel'], function(field) {
+      if (message[field]) response[field] = message[field];
+    });
+    return response;
   },
   
   // MUST contain  * version
@@ -847,9 +1040,8 @@ Faye.Server = Faye.Class({
   //               * ext
   //               * id
   handshake: function(message, local) {
-    var response = { channel:   Faye.Channel.HANDSHAKE,
-                     version:   Faye.BAYEUX_VERSION,
-                     id:        message.id };
+    var response = this._makeResponse(message);
+    response.version = Faye.BAYEUX_VERSION;
     
     if (!message.version)
       response.error = Faye.Error.parameterMissing('version');
@@ -876,6 +1068,7 @@ Faye.Server = Faye.Class({
     
     var clientId = this._namespace.generate();
     response.clientId = this._connection(clientId).id;
+    this.info('Accepting handshake from client ' + response.clientId);
     return response;
   },
   
@@ -884,8 +1077,7 @@ Faye.Server = Faye.Class({
   // MAY contain   * ext
   //               * id
   connect: function(message, local) {
-    var response = { channel:   Faye.Channel.CONNECT,
-                     id:        message.id };
+    var response = this._makeResponse(message);
     
     var clientId = message.clientId,
         client   = clientId ? this._clients[clientId] : null,
@@ -896,6 +1088,7 @@ Faye.Server = Faye.Class({
     if (!connectionType) response.error = Faye.Error.parameterMissing('connectionType');
     
     response.successful = !response.error;
+    if (!response.successful) delete response.clientId;
     if (!response.successful) return response;
     
     response.clientId = client.id;
@@ -906,8 +1099,7 @@ Faye.Server = Faye.Class({
   // MAY contain   * ext
   //               * id
   disconnect: function(message, local) {
-    var response = { channel:   Faye.Channel.DISCONNECT,
-                     id:        message.id };
+    var response = this._makeResponse(message);
     
     var clientId = message.clientId,
         client   = clientId ? this._clients[clientId] : null;
@@ -916,10 +1108,12 @@ Faye.Server = Faye.Class({
     if (!clientId) response.error = Faye.Error.parameterMissing('clientId');
     
     response.successful = !response.error;
+    if (!response.successful) delete response.clientId;
     if (!response.successful) return response;
     
     this._destroyClient(client);
     
+    this.info('Disconnected client: ' + clientId);
     response.clientId = clientId;
     return response;
   },
@@ -929,9 +1123,7 @@ Faye.Server = Faye.Class({
   // MAY contain   * ext
   //               * id
   subscribe: function(message, local) {
-    var response     = { channel:   Faye.Channel.SUBSCRIBE,
-                         clientId:  message.clientId,
-                         id:        message.id };
+    var response = this._makeResponse(message);
     
     var clientId     = message.clientId,
         client       = clientId ? this._clients[clientId] : null,
@@ -952,6 +1144,8 @@ Faye.Server = Faye.Class({
       
       if (response.error) return;
       channel = this._channels.findOrCreate(channel);
+      
+      this.info('Subscribing client ' + clientId + ' to ' + channel.name);
       client.subscribe(channel);
     }, this);
     
@@ -964,9 +1158,7 @@ Faye.Server = Faye.Class({
   // MAY contain   * ext
   //               * id
   unsubscribe: function(message, local) {
-    var response     = { channel:   Faye.Channel.UNSUBSCRIBE,
-                         clientId:  message.clientId,
-                         id:        message.id };
+    var response = this._makeResponse(message);
     
     var clientId     = message.clientId,
         client       = clientId ? this._clients[clientId] : null,
@@ -985,7 +1177,10 @@ Faye.Server = Faye.Class({
         return response.error = Faye.Error.channelInvalid(channel);
       
       channel = this._channels.get(channel);
-      if (channel) client.unsubscribe(channel);
+      if (!channel) return;
+      
+      this.info('Unsubscribing client ' + clientId + ' from ' + channel.name);
+      client.unsubscribe(channel);
     }, this);
     
     response.successful = !response.error;
@@ -993,6 +1188,8 @@ Faye.Server = Faye.Class({
   }
 });
 
+Faye.extend(Faye.Server.prototype, Faye.Logging);
+
 
 Faye.Connection = Faye.Class({
   MAX_DELAY:  0.1,
@@ -1002,12 +1199,10 @@ Faye.Connection = Faye.Class({
   initialize: function(id, options) {
     this.id         = id;
     this._options   = options;
+    this._timeout   = this._options.timeout || this.TIMEOUT;
     this._channels  = new Faye.Set();
     this._inbox     = new Faye.Set();
-  },
-  
-  getTimeout: function() {
-    return this._options.timeout || this.TIMEOUT;
+    this._connected = false
   },
   
   _onMessage: function(event) {
@@ -1027,16 +1222,12 @@ Faye.Connection = Faye.Class({
     channel.stopObserving('message', this._onMessage, this);
   },
   
-  connect: function(callback) {
-    this.callback(callback);
+  connect: function(callback, scope) {
+    this.callback(callback, scope);
     if (this._connected) return;
     
     this._connected = true;
-    
-    if (this._deletionTimeout) {
-      clearTimeout(this._deletionTimeout);
-      delete this._deletionTimeout;
-    }
+    this.removeTimeout('deletion');
     
     this._beginDeliveryTimeout();
     this._beginConnectionTimeout();
@@ -1059,50 +1250,29 @@ Faye.Connection = Faye.Class({
   },
   
   _beginDeliveryTimeout: function() {
-    if (this._deliveryTimeout || !this._connected || this._inbox.isEmpty())
-      return;
-    
-    var self = this;
-    this._deliveryTimeout = setTimeout(function () { self.flush() },
-                                       this.MAX_DELAY * 1000);
+    if (!this._connected || this._inbox.isEmpty()) return;
+    this.addTimeout('delivery', this.MAX_DELAY, this.flush, this);
   },
   
   _beginConnectionTimeout: function() {
-    if (this._connectionTimeout || !this._connected)
-      return;
-    
-    var self = this;
-    this._connectionTimeout = setTimeout(function() { self.flush() },
-                                         this.getTimeout() * 1000);
+    if (!this._connected) return;
+    this.addTimeout('connection', this._timeout, this.flush, this);
   },
   
   _releaseConnection: function() {
-    if (this._connectionTimeout) {
-      clearTimeout(this._connectionTimeout);
-      delete this._connectionTimeout;
-    }
-    
-    if (this._deliveryTimeout) {
-      clearTimeout(this._deliveryTimeout);
-      delete this._deliveryTimeout;
-    }
-    
+    this.removeTimeout('connection');
+    this.removeTimeout('delivery');
     this._connected = false;
-    this._scheduleForDeletion();
-  },
-  
-  _scheduleForDeletion: function() {
-    if (this._deletionTimeout) return;
-    var self = this;
     
-    this._deletionTimeout = setTimeout(function() {
-      self.fire('staleClient', self);
-    }, 10 * 1000 * this.INTERVAL);
+    this.addTimeout('deletion', 10 * this.INTERVAL, function() {
+      this.fire('staleClient', this);
+    }, this);
   }
 });
 
 Faye.extend(Faye.Connection.prototype, Faye.Deferrable);
 Faye.extend(Faye.Connection.prototype, Faye.Observable);
+Faye.extend(Faye.Connection.prototype, Faye.Timeouts);
 
 
 Faye.Error = Faye.Class({
@@ -1170,53 +1340,6 @@ Faye.Error.serverError = function() {
 
 
 
-Faye.NodeHttpTransport = Faye.Class(Faye.Transport, {
-  request: function(message, callback, scope) {
-    var params  = {message: JSON.stringify(message)},
-        request = this.createRequest();
-    
-    request.write(querystring.stringify(params));
-    
-    request.addListener('response', function(response) {
-      if (!callback) return;
-      response.addListener('data', function(chunk) {
-        callback.call(scope, JSON.parse(chunk));
-      });
-    });
-    request.close();
-  },
-  
-  createRequest: function() {
-    var uri    = url.parse(this._endpoint),
-        client = http.createClient(uri.port, uri.hostname);
-        
-    return client.request('POST', uri.pathname, {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    });
-  }
-});
-
-Faye.NodeHttpTransport.isUsable = function(endpoint) {
-  return typeof endpoint === 'string';
-};
-
-Faye.Transport.register('long-polling', Faye.NodeHttpTransport);
-
-Faye.NodeLocalTransport = Faye.Class(Faye.Transport, {
-  request: function(message, callback, scope) {
-    this._endpoint.process(message, true, function(response) {
-      callback.call(scope, response);
-    });
-  }
-});
-
-Faye.NodeLocalTransport.isUsable = function(endpoint) {
-  return endpoint instanceof Faye.Server;
-};
-
-Faye.Transport.register('in-process', Faye.NodeLocalTransport);
-
-
 var path  = require('path'),
     fs    = require('fs'),
     sys   = require('sys'),
@@ -1224,19 +1347,31 @@ var path  = require('path'),
     http  = require('http'),
     querystring = require('querystring');
 
+Faye.logger = function(message) {
+  sys.puts(message);
+};
+
+Faye.withDataFor = function(transport, callback, scope) {
+  var data = '';
+  transport.addListener('data', function(chunk) { data += chunk });
+  transport.addListener('end', function() {
+    callback.call(scope, data);
+  });
+};
+
 Faye.NodeAdapter = Faye.Class({
   DEFAULT_ENDPOINT: '/bayeux',
   SCRIPT_PATH:      path.dirname(__filename) + '/faye-client-min.js',
   
-  TYPE_JSON:    {'Content-Type': 'text/json'},
+  TYPE_JSON:    {'Content-Type': 'application/json'},
   TYPE_SCRIPT:  {'Content-Type': 'text/javascript'},
   TYPE_TEXT:    {'Content-Type': 'text/plain'},
   
   initialize: function(options) {
-    this._options  = options || {};
-    this._endpoint = this._options.mount || this.DEFAULT_ENDPOINT;
-    this._script   = this._endpoint + '.js';
-    this._server   = new Faye.Server(this._options);
+    this._options    = options || {};
+    this._endpoint   = this._options.mount || this.DEFAULT_ENDPOINT;
+    this._endpointRe = new RegExp('^' + this._endpoint + '(/[^/]+)*(\\.js)?$');
+    this._server     = new Faye.Server(this._options);
   },
   
   getClient: function() {
@@ -1252,35 +1387,30 @@ Faye.NodeAdapter = Faye.Class({
   
   call: function(request, response) {
     var requestUrl = url.parse(request.url, true),
-        self = this;
+        self = this, data;
+    
+    if (!this._endpointRe.test(requestUrl.pathname))
+      return false;
     
-    switch (requestUrl.pathname) {
+    if (/\.js$/.test(requestUrl.pathname)) {
+      fs.readFile(this.SCRIPT_PATH, function(err, content) {
+        response.sendHeader(200, self.TYPE_SCRIPT);
+        response.write(content);
+        response.close();
+      });
       
-      case this._endpoint:
-        var isGet = (request.method === 'GET');
-        
-        if (isGet)
-          this._callWithParams(request, response, requestUrl.query);
-        
-        else
-          request.addListener('data', function(chunk) {
-            self._callWithParams(request, response, querystring.parse(chunk));
-          });
-        
-        return true;
-        break;
+    } else {
+      var isGet = (request.method === 'GET');
       
-      case this._script:
-        fs.readFile(this.SCRIPT_PATH, function(err, content) {
-          response.sendHeader(200, self.TYPE_SCRIPT);
-          response.write(content);
-          response.close();
-        });
-        return true;
-        break;
+      if (isGet)
+        this._callWithParams(request, response, requestUrl.query);
       
-      default: return false;
+      else
+        Faye.withDataFor(request, function(data) {
+          self._callWithParams(request, response, {message: data});
+        });
     }
+    return true;
   },
   
   _callWithParams: function(request, response, params) {
@@ -1308,4 +1438,55 @@ Faye.NodeAdapter = Faye.Class({
 });
 
 exports.NodeAdapter = Faye.NodeAdapter;
-exports.Client = Faye.Client;
+exports.Client = Faye.Client;
+
+
+Faye.NodeHttpTransport = Faye.Class(Faye.Transport, {
+  request: function(message, callback, scope) {
+    var request = this.createRequestForMessage(message);
+    
+    request.addListener('response', function(response) {
+      if (!callback) return;
+      Faye.withDataFor(response, function(data) {
+        callback.call(scope, JSON.parse(data));
+      });
+    });
+    request.close();
+  },
+  
+  createRequestForMessage: function(message) {
+    var content = JSON.stringify(message),
+        uri     = url.parse(this._endpoint),
+        client  = http.createClient(uri.port, uri.hostname);
+    
+    if (parseInt(uri.port) === 443) client.setSecure('X509_PEM');
+    
+    var request = client.request('POST', uri.pathname, {
+      'Content-Type':   'application/json',
+      'host':           uri.hostname,
+      'Content-Length': content.length
+    });
+    request.write(content);
+    return request;
+  }
+});
+
+Faye.NodeHttpTransport.isUsable = function(endpoint) {
+  return typeof endpoint === 'string';
+};
+
+Faye.Transport.register('long-polling', Faye.NodeHttpTransport);
+
+Faye.NodeLocalTransport = Faye.Class(Faye.Transport, {
+  request: function(message, callback, scope) {
+    this._endpoint.process(message, true, function(response) {
+      callback.call(scope, response);
+    });
+  }
+});
+
+Faye.NodeLocalTransport.isUsable = function(endpoint) {
+  return endpoint instanceof Faye.Server;
+};
+
+Faye.Transport.register('in-process', Faye.NodeLocalTransport);