faye 0.2.2 → 0.3.0

data/examples/node/app.js

@@ -1,4 +1,4 @@
-var posix = require('posix'),
+var fs    = require('fs'),
     path  = require('path'),
     sys   = require('sys'), 
     http  = require('http')
@@ -17,10 +17,10 @@ http.createServer(function(request, response) {
   
   var path = (request.url === '/') ? '/index.html' : request.url;
   
-  posix.cat(PUBLIC_DIR + path).addCallback(function(content) {
+  fs.readFile(PUBLIC_DIR + path, function(err, content) {
     response.sendHeader(200, {'Content-Type': 'text/html'});
-    response.sendBody(content);
-    response.finish();
+    response.write(content);
+    response.close();
   });
 }).listen(Number(port));
 

data/examples/node/client.js

@@ -0,0 +1,23 @@
+// This script demonstrates a logger for the chat app. First, start
+// the chat server in one terminal then run this in another:
+// 
+//   $ node examples/node/app.js
+//   $ node examples/node/client.js
+// 
+// The client connects to the chat server and logs all messages
+// sent by all connected users.
+
+var sys  = require('sys'),
+    faye = require('./faye');
+
+var client = new faye.Client('http://localhost:8000/comet');
+
+client.subscribe('/from/*', function(message) {
+  var user = message.user;
+  sys.puts('[' + user + ']: ' + message.message);
+  client.publish('/mentioning/' + user, {
+    user:   'node-logger',
+    message:  'Got your message, ' + user + '!'
+  });
+});
+

data/examples/node/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)&&a[d]!==b[d]){if(!a.hasOwnProperty(d)||c!==false)a[d]=b[d]}}return a};Faye.extend(Faye,{BAYEUX_VERSION:'1.0',VERSION:'0.2.2',JSONP_CALLBACK:'jsonpcallback',ID_LENGTH:128,CONNECTION_TYPES:["long-polling","callback-polling"],ENV:this,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])}}},size:function(a){var b=0;this.each(a,function(){b+=1});return b},random:function(){var a=Math.pow(2,this.ID_LENGTH);return(Math.random()*a).toString(16).replace(/0*$/,'')},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.Observable={on:function(a,b,c){this._1=this._1||{};var d=this._1[a]=this._1[a]||[];d.push([b,c])},stopObserving:function(a,b,c){if(!this._1||!this._1[a])return;if(!b){delete this._1[a];return}var d=this._1[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._1||!this._1[c])return;Faye.each(this._1[c],function(a){a[0].apply(a[1],b.slice())})}};Faye.Channel=Faye.Class({initialize:function(a){this.__id=this._A=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._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._3!==undefined)d.call(f,c,this._3)},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._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._3===undefined)?[]:[this._3];var g=[];if(Faye.enumEqual(f,['*'])){Faye.each(this._5,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});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['**']._3);return g}})});Faye.Event={_a:[],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._a.push({_b:a,_h:b,_s:c,_c:d,_m:f})},detach:function(a,b,c,d){var f=this._a.length,g;while(f--){g=this._a[f];if((a&&a!==g._b)||(b&&b!==g._h)||(c&&c!==g._s)||(d&&d!==g._c))continue;if(g._b.removeEventListener)g._b.removeEventListener(g._h,g._m,false);else g._b.detachEvent('on'+g._h,g._m);this._a.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._d=a.toUpperCase();this._6=Faye.URI.parse(b,c);this._t=(typeof d==='function')?{success:d}:d;this._c=f||null;this._2=null},send:function(){if(this._i)return;var a=this._6.pathname,b=this._6.queryString();if(this._d==='GET')a+='?'+b;var c=this._d==='POST'?b:'';this._i=true;this._2=Faye.XHR.getXhrObject();this._2.open(this._d,a,true);if(this._d==='POST')this._2.setRequestHeader('Content-Type','application/x-www-form-urlencoded');var d=this,f=function(){if(d._2.readyState!==4)return;if(g){clearInterval(g);g=null}Faye.Event.detach(Faye.ENV,'beforeunload',d.abort,d);d._i=false;d._u();d=null};var g=setInterval(f,10);Faye.Event.on(Faye.ENV,'beforeunload',this.abort,this);this._2.send(c)},abort:function(){this._2.abort()},_u:function(){var a=this._t;if(!a)return;return this.success()?a.success&&a.success.call(this._c,this):a.failure&&a.failure.call(this._c,this)},waiting:function(){return!!this._i},complete:function(){return this._2&&!this.waiting()},success:function(){if(!this.complete())return false;var a=this._2.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._2.responseText},status:function(){if(!this.complete())return null;return this._2.status}})};Faye.Transport=Faye.extend(Faye.Class({initialize:function(a,b){this._n=a;this._6=b},send:function(c,d,f){c={message:JSON.stringify(c)};return this.request(c,function(b){if(!d)return;Faye.each([].concat(b),function(a){d.call(f,a);if(a.advice)this._n._v(a.advice);if(a.data&&a.channel)this._n._w(a)},this)},this)}}),{get:function(a,b){var c=a._6;if(b===undefined)b=this.supportedConnectionTypes();var d=Faye.URI.parse(c).isLocal()?['long-polling','callback-polling']:['callback-polling'];var f=Faye.commonElement(d,b);if(!f)throw'Could not find a usable connection type for '+c;var g=this._j[f];return new g(a,c)},register:function(a,b){this._j[a]=b;b.prototype.connectionType=a},_j:{},supportedConnectionTypes:function(){var c=[],d;Faye.each(this._j,function(a,b){c.push(a)});return c}});Faye.XHRTransport=Faye.Class(Faye.Transport,{request:function(b,c,d){Faye.XHR.request('post',this._6,b,function(a){if(c)c.call(d,JSON.parse(a.text()))})}});Faye.Transport.register('long-polling',Faye.XHRTransport);Faye.JSONPTransport=Faye.extend(Faye.Class(Faye.Transport,{request:function(b,c,d){var f=document.getElementsByTagName('head')[0],g=document.createElement('script'),k=Faye.JSONPTransport.getCallbackName(),i=Faye.URI.parse(this._6,b);Faye.ENV[k]=function(a){Faye.ENV[k]=undefined;try{delete Faye.ENV[k]}catch(e){}f.removeChild(g);if(c)c.call(d,a)};i.params.jsonp=k;g.type='text/javascript';g.src=i.toURL();f.appendChild(g)}}),{_o:0,getCallbackName:function(){this._o+=1;return'__jsonp'+this._o+'__'}});Faye.Transport.register('callback-polling',Faye.JSONPTransport);Faye.Client=Faye.Class({_e:{},_x:{},_8:{},_y:{},_p:'handshake',_z:'retry',_q:'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._0=this._e;this._k=[];this._f=new Faye.Channel.Tree();this._7={reconnect:this._z,interval:this.INTERVAL};Faye.Event.on(Faye.ENV,'beforeunload',this.disconnect,this)},handshake:function(b,c){if(this._7.reconnect===this._q)return;if(this._0!==this._e)return;this._0=this._x;var d=this,f=this.generateId();this._4.send({channel:Faye.Channel.HANDSHAKE,version:Faye.BAYEUX_VERSION,supportedConnectionTypes:Faye.Transport.supportedConnectionTypes(),id:f},function(a){if(a.id!==f)return;if(!a.successful){setTimeout(function(){d.handshake(b,c)},this._7.interval);return this._0=this._e}this._0=this._8;this._9=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._q)return;if(this._7.reconnect===this._p||this._0===this._e)return this.handshake(function(){this.connect(b,c)},this);if(this._0!==this._8)return;if(this._g)return;this._g=this.generateId();var d=this;this._4.send({channel:Faye.Channel.CONNECT,clientId:this._9,connectionType:this._4.connectionType,id:this._g},function(a){if(a.id!==this._g)return;delete this._g;if(a.successful)this.connect();else setTimeout(function(){d.connect()},this._7.interval)},this);if(b)b.call(c)},disconnect:function(){if(this._0!==this._8)return;this._0=this._y;this._4.send({channel:Faye.Channel.DISCONNECT,clientId:this._9});this._f=new Faye.Channel.Tree()},subscribe:function(c,d,f){if(this._0!==this._8)return;c=[].concat(c);this._l(c);var g=this.generateId();this._4.send({channel:Faye.Channel.SUBSCRIBE,clientId:this._9,subscription:c,id:g},function(b){if(b.id!==g)return;if(!b.successful)return;c=[].concat(b.subscription);Faye.each(c,function(a){this._f.set(a,[d,f])},this)},this)},unsubscribe:function(c,d,f){if(this._0!==this._8)return;c=[].concat(c);this._l(c);var g=this.generateId();this._4.send({channel:Faye.Channel.UNSUBSCRIBE,clientId:this._9,subscription:c,id:g},function(b){if(b.id!==g)return;if(!b.successful)return;c=[].concat(b.subscription);Faye.each(c,function(a){this._f.set(a,null)},this)},this)},publish:function(a,b){if(this._0!==this._8)return;this._l([a]);this.enqueue({channel:a,data:b,clientId:this._9});if(this._r)return;var c=this;this._r=setTimeout(function(){delete c._r;c.flush()},this.MAX_DELAY*1000)},generateId:function(a){a=a||32;return Math.floor(Math.pow(2,a)*Math.random()).toString(16)},enqueue:function(a){this._k.push(a)},flush:function(){this._4.send(this._k);this._k=[]},_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+'"';})},_v:function(a){Faye.extend(this._7,a);if(this._7.reconnect===this._p)this._9=null},_w:function(b){var c=this._f.glob(b.channel);Faye.each(c,function(a){if(!a)return;a[0].call(a[1],b.data)})}});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');}}}());
+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.0',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.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._m={}},generate:function(){var a=Faye.random();while(this._m.hasOwnProperty(a))a=Faye.random();return this._m[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._n.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._n=new Faye.Namespace();this._h=[];this._a=new Faye.Channel.Tree();this._9=[];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._9.push([b,c]);if(this._2!==this.CONNECTED)return;Faye.each(this._9,function(a){a[0].call(a[1])});this._9=[];if(b)b.call(c);if(this._i)return;this._i=this._n.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._r({channel:b,data:c,clientId:this._8});if(this._o)return;var a=this;this._o=setTimeout(function(){delete a._o;a._s()},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)})},_r:function(a){this._h.push(a)},_s: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.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,_t:c,_d:d,_p: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._t)||(d&&d!==g._d))continue;if(g._c.removeEventListener)g._c.removeEventListener(g._k,g._p,false);else g._c.detachEvent('on'+g._k,g._p);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._9=(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._u();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()},_u:function(){var a=this._9;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)}}),{_q:0,getCallbackName:function(){this._q+=1;return'__jsonp'+this._q+'__'}});Faye.JSONPTransport.isUsable=function(a){return true};Faye.Transport.register('callback-polling',Faye.JSONPTransport);

data/examples/node/faye.js

@@ -3,23 +3,36 @@ if (!this.Faye) Faye = {};
 Faye.extend = function(dest, source, overwrite) {
   if (!source) return dest;
   for (var key in source) {
-    if (source.hasOwnProperty(key) && dest[key] !== source[key]) {
-      if (!dest.hasOwnProperty(key) || overwrite !== false)
-        dest[key] = source[key];
-    }
+    if (!source.hasOwnProperty(key)) continue;
+    if (dest.hasOwnProperty(key) && overwrite === false) continue;
+    if (dest[key] !== source[key])
+      dest[key] = source[key];
   }
   return dest;
 };
 
 Faye.extend(Faye, {
+  VERSION:          '0.3.0',
+  
   BAYEUX_VERSION:   '1.0',
-  VERSION:          '0.2.2',
-  JSONP_CALLBACK:   'jsonpcallback',
   ID_LENGTH:        128,
+  JSONP_CALLBACK:   'jsonpcallback',
   CONNECTION_TYPES: ["long-polling", "callback-polling"],
   
   ENV:              this,
   
+  random: function(bitlength) {
+    bitlength = bitlength || this.ID_LENGTH;
+    if (bitlength > 32) {
+      var parts  = Math.ceil(bitlength / 32),
+          string = '';
+      while (parts--) string += this.random(32);
+      return string;
+    }
+    var field = Math.pow(2, bitlength);
+    return Math.floor(Math.random() * field).toString(16);
+  },
+  
   Grammar: {
 
     LOWALPHA:     /^[a-z]$/,
@@ -97,17 +110,21 @@ Faye.extend(Faye, {
     }
   },
   
+  filter: function(array, callback, scope) {
+    var result = [];
+    this.each(array, function() {
+      if (callback.apply(scope, arguments))
+        result.push(arguments[0]);
+    });
+    return result;
+  },
+  
   size: function(object) {
     var size = 0;
     this.each(object, function() { size += 1 });
     return size;
   },
   
-  random: function() {
-    var field = Math.pow(2, this.ID_LENGTH);
-    return (Math.random() * field).toString(16).replace(/0*$/, '');
-  },
-  
   enumEqual: function(actual, expected) {
     if (expected instanceof Array) {
       if (!(actual instanceof Array)) return false;
@@ -190,7 +207,7 @@ Faye.Observable = {
 
 Faye.Channel = Faye.Class({
   initialize: function(name) {
-    this.__id = this._name = name;
+    this.__id = this.name = name;
   },
   
   push: function(message) {
@@ -311,7 +328,7 @@ Faye.extend(Faye.Channel, {
       
       if (Faye.enumEqual(path, ['**'])) {
         list = this.map(function(key, value) { return value });
-        list.pop();
+        if (this._value !== undefined) list.pop();
         return list;
       }
       
@@ -324,23 +341,341 @@ Faye.extend(Faye.Channel, {
       if (this._children['**']) list.push(this._children['**']._value);
       return list;
     }
+  })
+});
+
+
+Faye.Namespace = Faye.Class({
+  initialize: function() {
+    this._used = {};
+  },
+  
+  generate: function() {
+    var name = Faye.random();
+    while (this._used.hasOwnProperty(name))
+      name = Faye.random();
+    return this._used[name] = name;
+  }
+});
+
+
+Faye.Transport = Faye.extend(Faye.Class({
+  initialize: function(client, endpoint) {
+    this._client   = client;
+    this._endpoint = endpoint;
+  },
+  
+  send: function(message, callback, scope) {
+    if (!(message instanceof Array) && !message.id)
+      message.id = this._client._namespace.generate();
     
-    /**
-      Tests
-      
-      glob = new Faye.Channel.Tree();
-      list = '/foo/bar /foo/boo /foo /foobar /foo/bar/boo /foobar/boo /foo/* /foo/**'.split(' ');
+    this.request(message, function(responses) {
+      if (!callback) return;
+      Faye.each([].concat(responses), function(response) {
+        
+        if (response.id === message.id)
+          callback.call(scope, response);
+        
+        if (response.advice)
+          this._client.handleAdvice(response.advice);
+        
+        if (response.data && response.channel)
+          this._client.sendToSubscribers(response);
+        
+      }, this);
+    }, this);
+  }
+}), {
+  get: function(client, connectionTypes) {
+    var endpoint = client._endpoint;
+    if (connectionTypes === undefined) connectionTypes = this.supportedConnectionTypes();
+    
+    var candidateClass = null;
+    Faye.each(this._transports, function(connType, klass) {
+      if (Faye.indexOf(connectionTypes, connType) < 0) return;
+      if (candidateClass) return;
+      if (klass.isUsable(endpoint)) candidateClass = klass;
+    });
+    
+    if (!candidateClass) throw 'Could not find a usable connection type for ' + endpoint;
+    
+    return new candidateClass(client, endpoint);
+  },
+  
+  register: function(type, klass) {
+    this._transports[type] = klass;
+    klass.prototype.connectionType = type;
+  },
+  
+  _transports: {},
+  
+  supportedConnectionTypes: function() {
+    var list = [], key;
+    Faye.each(this._transports, function(key, type) { list.push(key) });
+    return list;
+  }
+});
 
-      Faye.each(list, function(c, i) {
-          glob.set(c, i + 1);
-      });
 
-      console.log(glob.glob('/foo/*').sort());        // 1,2,7,8
-      console.log(glob.glob('/foo/bar').sort());      // 1,7,8
-      console.log(glob.glob('/foo/**').sort());       // 1,2,5,7,8
-      console.log(glob.glob('/foo/bar/boo').sort());  // 5,8
-    **/
-  })
+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(endpoint) {
+    this._endpoint  = endpoint || this.DEFAULT_ENDPOINT;
+    this._transport = Faye.Transport.get(this);
+    this._state     = this.UNCONNECTED;
+    this._namespace = new Faye.Namespace();
+    this._outbox    = [];
+    this._channels  = new Faye.Channel.Tree();
+    this._callbacks = [];
+    
+    this._advice = {reconnect: this.RETRY, interval: this.INTERVAL};
+    
+    if (!Faye.Event) return;
+    Faye.Event.on(Faye.ENV, 'beforeunload', this.disconnect, this);
+  },
+  
+  // Request
+  // MUST include:  * channel
+  //                * version
+  //                * supportedConnectionTypes
+  // MAY include:   * minimumVersion
+  //                * ext
+  //                * id
+  // 
+  // Success Response                             Failed Response
+  // MUST include:  * channel                     MUST include:  * channel
+  //                * version                                    * successful
+  //                * supportedConnectionTypes                   * error
+  //                * clientId                    MAY include:   * supportedConnectionTypes
+  //                * successful                                 * advice
+  // MAY include:   * minimumVersion                             * version
+  //                * advice                                     * minimumVersion
+  //                * ext                                        * ext
+  //                * id                                         * id
+  //                * authSuccessful
+  handshake: function(callback, scope) {
+    if (this._advice.reconnect === this.NONE) return;
+    if (this._state !== this.UNCONNECTED) return;
+    
+    this._state = this.CONNECTING;
+    var self = this;
+    
+    this._transport.send({
+      channel:      Faye.Channel.HANDSHAKE,
+      version:      Faye.BAYEUX_VERSION,
+      supportedConnectionTypes: Faye.Transport.supportedConnectionTypes()
+      
+    }, function(response) {
+      
+      if (!response.successful) {
+        setTimeout(function() { self.handshake(callback, scope) }, this._advice.interval);
+        return this._state = this.UNCONNECTED;
+      }
+      
+      this._state     = this.CONNECTED;
+      this._clientId  = response.clientId;
+      this._transport = Faye.Transport.get(this, response.supportedConnectionTypes);
+      
+      if (callback) callback.call(scope);
+    }, this);
+  },
+  
+  // Request                              Response
+  // MUST include:  * channel             MUST include:  * channel
+  //                * clientId                           * successful
+  //                * connectionType                     * clientId
+  // MAY include:   * ext                 MAY include:   * error
+  //                * id                                 * advice
+  //                                                     * ext
+  //                                                     * id
+  //                                                     * timestamp
+  connect: function(callback, scope) {
+    if (this._advice.reconnect === this.NONE) return;
+    if (this._state === this.DISCONNECTED) return;
+    
+    if (this._advice.reconnect === this.HANDSHAKE || this._state === this.UNCONNECTED)
+      return this.handshake(function() { this.connect(callback, scope) }, this);
+    
+    if (this._state === this.CONNECTING)
+      return this._callbacks.push([callback, scope]);
+    
+    if (this._state !== this.CONNECTED) return;
+    
+    Faye.each(this._callbacks, function(listener) { listener[0].call(listener[1]) });
+    this._callbacks = [];
+    if (callback) callback.call(scope);
+    
+    if (this._connectionId) return;
+    this._connectionId = this._namespace.generate();
+    var self = this;
+    
+    this._transport.send({
+      channel:        Faye.Channel.CONNECT,
+      clientId:       this._clientId,
+      connectionType: this._transport.connectionType,
+      id:             this._connectionId
+      
+    }, function(response) {
+      delete this._connectionId;
+      setTimeout(function() { self.connect() }, this._advice.interval);
+    }, this);
+  },
+  
+  // Request                              Response
+  // MUST include:  * channel             MUST include:  * channel
+  //                * clientId                           * successful
+  // MAY include:   * ext                                * clientId
+  //                * id                  MAY include:   * error
+  //                                                     * ext
+  //                                                     * id
+  disconnect: function() {
+    if (this._state !== this.CONNECTED) return;
+    this._state = this.DISCONNECTED;
+    
+    this._transport.send({
+      channel:    Faye.Channel.DISCONNECT,
+      clientId:   this._clientId
+    });
+    
+    this._channels = new Faye.Channel.Tree();
+  },
+  
+  // Request                              Response
+  // MUST include:  * channel             MUST include:  * channel
+  //                * clientId                           * successful
+  //                * subscription                       * clientId
+  // MAY include:   * ext                                * subscription
+  //                * id                  MAY include:   * error
+  //                                                     * advice
+  //                                                     * ext
+  //                                                     * id
+  //                                                     * timestamp
+  subscribe: function(channels, callback, scope) {
+    this.connect(function() {
+      
+      channels = [].concat(channels);
+      this._validateChannels(channels);
+      
+      this._transport.send({
+        channel:      Faye.Channel.SUBSCRIBE,
+        clientId:     this._clientId,
+        subscription: channels
+        
+      }, function(response) {
+        if (!response.successful) return;
+        
+        channels = [].concat(response.subscription);
+        Faye.each(channels, function(channel) {
+          this._channels.set(channel, [callback, scope]);
+        }, this);
+      }, this);
+      
+    }, this);
+  },
+  
+  // Request                              Response
+  // MUST include:  * channel             MUST include:  * channel
+  //                * clientId                           * successful
+  //                * subscription                       * clientId
+  // MAY include:   * ext                                * subscription
+  //                * id                  MAY include:   * error
+  //                                                     * advice
+  //                                                     * ext
+  //                                                     * id
+  //                                                     * timestamp
+  unsubscribe: function(channels, callback, scope) {
+    this.connect(function() {
+      
+      channels = [].concat(channels);
+      this._validateChannels(channels);
+      
+      this._transport.send({
+        channel:      Faye.Channel.UNSUBSCRIBE,
+        clientId:     this._clientId,
+        subscription: channels
+        
+      }, function(response) {
+        if (!response.successful) return;
+        
+        channels = [].concat(response.subscription);
+        Faye.each(channels, function(channel) {
+          this._channels.set(channel, null);
+        }, this);
+      }, this);
+      
+    }, this);
+  },
+  
+  // Request                              Response
+  // MUST include:  * channel             MUST include:  * channel
+  //                * data                               * successful
+  // MAY include:   * clientId            MAY include:   * id
+  //                * id                                 * error
+  //                * ext                                * ext
+  publish: function(channel, data) {
+    this.connect(function() {
+      
+      this._validateChannels([channel]);
+      
+      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);
+  },
+  
+  handleAdvice: function(advice) {
+    Faye.extend(this._advice, advice);
+    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);
+    });
+  },
+  
+  _enqueue: function(message) {
+    this._outbox.push(message);
+  },
+  
+  _flush: function() {
+    this._transport.send(this._outbox);
+    this._outbox = [];
+  },
+  
+  _validateChannels: function(channels) {
+    Faye.each(channels, function(channel) {
+      if (!Faye.Channel.isValid(channel))
+        throw '"' + channel + '" is not a valid channel name';
+      if (!Faye.Channel.isSubscribable(channel))
+        throw 'Clients may not subscribe to channel "' + channel + '"';
+    });
+  }
 });
 
 
@@ -392,9 +727,10 @@ Faye.Set = Faye.Class({
 
 Faye.Server = Faye.Class({
   initialize: function(options) {
-    this._options  = options || {};
-    this._channels = new Faye.Channel.Tree();
-    this._clients  = {};
+    this._options   = options || {};
+    this._channels  = new Faye.Channel.Tree();
+    this._clients   = {};
+    this._namespace = new Faye.Namespace();
   },
   
   clientIds: function() {
@@ -404,7 +740,7 @@ Faye.Server = Faye.Class({
   },
   
   process: function(messages, local, callback) {
-    messages = (messages instanceof Array) ? messages : [messages];
+    messages = [].concat(messages);
     var processed = 0, responses = [];
     
     Faye.each(messages, function(message) {
@@ -417,29 +753,23 @@ Faye.Server = Faye.Class({
   },
   
   flushConnection: function(messages) {
-    messages = (messages instanceof Array) ? messages : [messages];
+    messages = [].concat(messages);
     Faye.each(messages, function(message) {
       var client = this._clients[message.clientId];
       if (client) client.flush();
     }, this);
   },
   
-  _generateId: function() {
-    var id = Faye.random();
-    while (this._clients.hasOwnProperty(id)) id = Faye.random();
-    return this._connection(id).id;
-  },
-  
   _connection: function(id) {
     if (this._clients.hasOwnProperty(id)) return this._clients[id];
     var client = new Faye.Connection(id, this._options);
-    client.on('stale', this._destroyClient, this);
+    client.on('staleClient', this._destroyClient, this);
     return this._clients[id] = client;
   },
   
   _destroyClient: function(client) {
     client.disconnect();
-    client.stopObserving('stale', this._destroyClient, this);
+    client.stopObserving('staleClient', this._destroyClient, this);
     delete this._clients[client.id];
   },
   
@@ -448,6 +778,9 @@ Faye.Server = Faye.Class({
         channel  = message.channel,
         response;
     
+    message.__id = Faye.random();
+    Faye.each(this._channels.glob(channel), function(c) { c.push(message) });
+    
     if (Faye.Channel.isMeta(channel)) {
       response = this[Faye.Channel.parse(channel)[1]](message, local);
       
@@ -473,18 +806,19 @@ Faye.Server = Faye.Class({
     if (!message.clientId || Faye.Channel.isService(channel))
       return callback([]);
     
-    message.__id = Faye.random();
-    Faye.each(this._channels.glob(channel), function(c) { c.push(message) });
-    
     callback( { channel:      channel,
                 successful:   true,
                 id:           message.id  } );
   },
   
+  // MUST contain  * version
+  //               * supportedConnectionTypes
+  // MAY contain   * minimumVersion
+  //               * ext
+  //               * id
   handshake: function(message, local) {
     var response = { channel:   Faye.Channel.HANDSHAKE,
                      version:   Faye.BAYEUX_VERSION,
-                     supportedConnectionTypes: Faye.CONNECTION_TYPES,
                      id:        message.id };
     
     if (!message.version)
@@ -493,23 +827,32 @@ Faye.Server = Faye.Class({
     var clientConns = message.supportedConnectionTypes,
         commonConns;
     
-    if (clientConns) {
-      commonConns = clientConns.filter(function(conn) {
-        return Faye.CONNECTION_TYPES.indexOf(conn) !== -1;
-      });
-      if (commonConns.length === 0)
-        response.error = Faye.Error.conntypeMismatch(clientConns);
-    } else {
-      response.error = Faye.Error.parameterMissing('supportedConnectionTypes');
+    if (!local) {
+      response.supportedConnectionTypes = Faye.CONNECTION_TYPES;
+      
+      if (clientConns) {
+        commonConns = Faye.filter(clientConns, function(conn) {
+          return Faye.indexOf(Faye.CONNECTION_TYPES, conn) !== -1;
+        });
+        if (commonConns.length === 0)
+          response.error = Faye.Error.conntypeMismatch(clientConns);
+      } else {
+        response.error = Faye.Error.parameterMissing('supportedConnectionTypes');
+      }
     }
     
     response.successful = !response.error;
     if (!response.successful) return response;
     
-    response.clientId = this._generateId();
+    var clientId = this._namespace.generate();
+    response.clientId = this._connection(clientId).id;
     return response;
   },
   
+  // MUST contain  * clientId
+  //               * connectionType
+  // MAY contain   * ext
+  //               * id
   connect: function(message, local) {
     var response = { channel:   Faye.Channel.CONNECT,
                      id:        message.id };
@@ -529,6 +872,9 @@ Faye.Server = Faye.Class({
     return response;
   },
   
+  // MUST contain  * clientId
+  // MAY contain   * ext
+  //               * id
   disconnect: function(message, local) {
     var response = { channel:   Faye.Channel.DISCONNECT,
                      id:        message.id };
@@ -548,6 +894,10 @@ Faye.Server = Faye.Class({
     return response;
   },
   
+  // MUST contain  * clientId
+  //               * subscription
+  // MAY contain   * ext
+  //               * id
   subscribe: function(message, local) {
     var response     = { channel:   Faye.Channel.SUBSCRIBE,
                          clientId:  message.clientId,
@@ -557,7 +907,7 @@ Faye.Server = Faye.Class({
         client       = clientId ? this._clients[clientId] : null,
         subscription = message.subscription;
     
-    subscription = (subscription instanceof Array) ? subscription : [subscription];
+    subscription = [].concat(subscription);
     
     if (!client)               response.error = Faye.Error.clientUnknown(clientId);
     if (!clientId)             response.error = Faye.Error.parameterMissing('clientId');
@@ -567,8 +917,8 @@ Faye.Server = Faye.Class({
     
     Faye.each(subscription, function(channel) {
       if (response.error) return;
-      if (!Faye.Channel.isSubscribable(channel)) response.error = Faye.Error.channelForbidden(channel);
-      if (!Faye.Channel.isValid(channel))        response.error = Faye.Error.channelInvalid(channel);
+      if (!local && !Faye.Channel.isSubscribable(channel)) response.error = Faye.Error.channelForbidden(channel);
+      if (!Faye.Channel.isValid(channel))                  response.error = Faye.Error.channelInvalid(channel);
       
       if (response.error) return;
       channel = this._channels.findOrCreate(channel);
@@ -579,6 +929,10 @@ Faye.Server = Faye.Class({
     return response;
   },
   
+  // MUST contain  * clientId
+  //               * subscription
+  // MAY contain   * ext
+  //               * id
   unsubscribe: function(message, local) {
     var response     = { channel:   Faye.Channel.UNSUBSCRIBE,
                          clientId:  message.clientId,
@@ -588,7 +942,7 @@ Faye.Server = Faye.Class({
         client       = clientId ? this._clients[clientId] : null,
         subscription = message.subscription;
     
-    subscription = (subscription instanceof Array) ? subscription : [subscription];
+    subscription = [].concat(subscription);
     
     if (!client)               response.error = Faye.Error.clientUnknown(clientId);
     if (!clientId)             response.error = Faye.Error.parameterMissing('clientId');
@@ -611,16 +965,19 @@ Faye.Server = Faye.Class({
 
 
 Faye.Connection = Faye.Class({
+  MAX_DELAY:  0.1,
+  INTERVAL:   1.0,
+  TIMEOUT:    60.0,
+  
   initialize: function(id, options) {
     this.id         = id;
     this._options   = options;
-    this._observers = {};
     this._channels  = new Faye.Set();
     this._inbox     = new Faye.Set();
   },
   
-  timeout: function() {
-    return this._options.timeout || Faye.Connection.TIMEOUT;
+  getTimeout: function() {
+    return this._options.timeout || this.TIMEOUT;
   },
   
   _onMessage: function(event) {
@@ -644,10 +1001,14 @@ Faye.Connection = Faye.Class({
     this.on('flush', callback);
     if (this._connected) return;
     
-    this._markForDeletion = false;
-    this._connected       = true;
+    this._connected = true;
+    
+    if (this._deletionTimeout) {
+      clearTimeout(this._deletionTimeout);
+      delete this._deletionTimeout;
+    }
     
-    if (!this._inbox.isEmpty()) this._beginDeliveryTimeout();
+    this._beginDeliveryTimeout();
     this._beginConnectionTimeout();
   },
   
@@ -673,7 +1034,7 @@ Faye.Connection = Faye.Class({
     
     var self = this;
     this._deliveryTimeout = setTimeout(function () { self.flush() },
-                                       Faye.Connection.MAX_DELAY * 1000);
+                                       this.MAX_DELAY * 1000);
   },
   
   _beginConnectionTimeout: function() {
@@ -682,7 +1043,7 @@ Faye.Connection = Faye.Class({
     
     var self = this;
     this._connectionTimeout = setTimeout(function() { self.flush() },
-                                         this.timeout() * 1000);
+                                         this.getTimeout() * 1000);
   },
   
   _releaseConnection: function() {
@@ -701,25 +1062,17 @@ Faye.Connection = Faye.Class({
   },
   
   _scheduleForDeletion: function() {
-    if (this._markForDeletion) return;
-    this._markForDeletion = true;
+    if (this._deletionTimeout) return;
     var self = this;
     
-    setTimeout(function() {
-      if (!self._markForDeletion) return;
-      self.fire('stale', self);
-    }, 10000 * Faye.Connection.INTERVAL);
+    this._deletionTimeout = setTimeout(function() {
+      self.fire('staleClient', self);
+    }, 10 * 1000 * this.INTERVAL);
   }
 });
 
 Faye.extend(Faye.Connection.prototype, Faye.Observable);
 
-Faye.extend(Faye.Connection, {
-  MAX_DELAY:  0.1,
-  INTERVAL:   1.0,
-  TIMEOUT:    60.0
-});
-
 
 Faye.Error = Faye.Class({
   initialize: function(code, args, message) {
@@ -786,33 +1139,100 @@ 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'),
-    posix = require('posix'),
+    fs    = require('fs'),
     sys   = require('sys'),
     url   = require('url'),
+    http  = require('http'),
     querystring = require('querystring');
 
 Faye.NodeAdapter = Faye.Class({
+  DEFAULT_ENDPOINT: '/bayeux',
+  SCRIPT_PATH:      path.dirname(__filename) + '/faye-client-min.js',
+  
+  TYPE_JSON:    {'Content-Type': 'text/json'},
+  TYPE_SCRIPT:  {'Content-Type': 'text/javascript'},
+  TYPE_TEXT:    {'Content-Type': 'text/plain'},
+  
   initialize: function(options) {
     this._options  = options || {};
-    this._endpoint = this._options.mount || Faye.NodeAdapter.DEFAULT_ENDPOINT;
+    this._endpoint = this._options.mount || this.DEFAULT_ENDPOINT;
     this._script   = this._endpoint + '.js';
     this._server   = new Faye.Server(this._options);
   },
   
+  getClient: function() {
+    return this._client = this._client || new Faye.Client(this._server);
+  },
+  
+  run: function(port) {
+    var self = this;
+    http.createServer(function(request, response) {
+      self.call(request, response);
+    }).listen(Number(port));
+  },
+  
   call: function(request, response) {
-    var requestUrl = url.parse(request.url, true);
+    var requestUrl = url.parse(request.url, true),
+        self = this;
+    
     switch (requestUrl.pathname) {
       
       case this._endpoint:
-        var isGet = (request.method === 'GET'),
-            self  = this;
+        var isGet = (request.method === 'GET');
         
         if (isGet)
           this._callWithParams(request, response, requestUrl.query);
         
         else
-          request.addListener('body', function(chunk) {
+          request.addListener('data', function(chunk) {
             self._callWithParams(request, response, querystring.parse(chunk));
           });
         
@@ -820,10 +1240,10 @@ Faye.NodeAdapter = Faye.Class({
         break;
       
       case this._script:
-        posix.cat(Faye.NodeAdapter.SCRIPT_PATH).addCallback(function(content) {
-          response.sendHeader(200, Faye.NodeAdapter.TYPE_SCRIPT);
-          response.sendBody(content);
-          response.finish();
+        fs.readFile(this.SCRIPT_PATH, function(err, content) {
+          response.sendHeader(200, self.TYPE_SCRIPT);
+          response.write(content);
+          response.close();
         });
         return true;
         break;
@@ -837,7 +1257,7 @@ Faye.NodeAdapter = Faye.Class({
       var message = JSON.parse(params.message),
           jsonp   = params.jsonp || Faye.JSONP_CALLBACK,
           isGet   = (request.method === 'GET'),
-          type    = isGet ? Faye.NodeAdapter.TYPE_SCRIPT : Faye.NodeAdapter.TYPE_JSON;
+          type    = isGet ? this.TYPE_SCRIPT : this.TYPE_JSON;
       
       if (isGet) this._server.flushConnection(message);
       
@@ -845,24 +1265,16 @@ Faye.NodeAdapter = Faye.Class({
         var body = JSON.stringify(replies);
         if (isGet) body = jsonp + '(' + body + ');';
         response.sendHeader(200, type);
-        response.sendBody(body);
-        response.finish();
+        response.write(body);
+        response.close();
       });
     } catch (e) {
-      response.sendHeader(400, {'Content-Type': 'text/plain'});
-      response.sendBody('Bad request');
-      response.finish();
+      response.sendHeader(400, this.TYPE_TEXT);
+      response.write('Bad request');
+      response.close();
     }
   }
 });
 
-Faye.extend(Faye.NodeAdapter, {
-  DEFAULT_ENDPOINT: '/bayeux',
-  SCRIPT_PATH:      path.dirname(__filename) + '/faye-client-min.js',
-  
-  TYPE_JSON:    {'Content-Type': 'text/json'},
-  TYPE_SCRIPT:  {'Content-Type': 'text/javascript'},
-  TYPE_TEXT:    {'Content-Type': 'text/plain'}
-});
-
-exports.NodeAdapter = Faye.NodeAdapter;
+exports.NodeAdapter = Faye.NodeAdapter;
+exports.Client = Faye.Client;