v.1.0.0

foo123 · May 11, 2016 · 4cbf0b0 · 4cbf0b0
1 parent 273c29b
commit 4cbf0b0
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 223 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,8 @@ Unified Node/XPCOM/JS client-side real-time communication with underlying implem
 * [WebSocket](https://en.wikipedia.org/wiki/WebSocket)
 
 
+**Note** `RT` is not only a simple framework around real-time layer implementations, it is also a small protocol additional to an implementation, which enables optimum performance, e.g by multiplexing multiple requests transparently (where applicable).
+
 
 **Example API**
 
@@ -48,7 +50,7 @@ var rt_chat = RT({
         <span class="message">' + textify( m.message ) + '</span>\
         </div>';
     })
-    /*.on('open', function( ){
+    /*.one('open', function( ){
         alert('OPENED');
     })*/
     .on('close', function( ){

diff --git a/src/RT.BOSH.js b/src/RT.BOSH.js
@@ -39,14 +39,14 @@ RT.Client.BOSH[PROTO].$queue$ = null;
 RT.Client.BOSH[PROTO].$mID$ = null;
 RT.Client.BOSH[PROTO].dispose = function( ){
     var self = this;
-    if ( self.$bosh$ ) { self.$bosh$.abort( false ); self.$bosh$ = null; }
+    if ( self.$bosh$ ) { self.$bosh$.abort( ); self.$bosh$ = null; }
     self.$queue$ = null;
     self.$mID$ = null;
     return __super__.dispose.call( self );
 };
 RT.Client.BOSH[PROTO].abort = function( trigger ){
     var self = this;
-    if ( self.$bosh$ ) { self.$bosh$.abort( true===trigger ); self.$bosh$ = null; }
+    if ( self.$bosh$ ) { self.$bosh$.abort( ); self.$bosh$ = null; }
     return __super__.abort.call( self, true===trigger );
 };
 RT.Client.BOSH[PROTO].send = function( payload ){
@@ -58,6 +58,7 @@ RT.Client.BOSH[PROTO].listen = function( ){
     var self = this;
     var listen = function listen( ) {
         var headers = {
+            'Connection'        : 'Keep-Alive',
             'Content-Type'      : 'application/x-www-form-urlencoded; charset=utf8',
             'X-RT--BOSH'        : '1', // this uses BOSH
             'X-RT--Receive'     : '1', // this is the receive channel
@@ -79,36 +80,46 @@ RT.Client.BOSH[PROTO].listen = function( ){
             //mimeType        : 'text/plain; charset=utf8',
             headers         : headers,
             onError         : function( xhr ) {
-                self.emit('error', xhr.statusText);
                 self.$bosh$ = null;
+                self.emit( 'error', xhr.statusText );
             },
             onTimeout       : function( xhr ) {
+                self.$bosh$ = null;
                 setTimeout( listen, 0 );
             },
             onComplete      : function( xhr ) {
-                var rt_msg = xhr.responseHeader( 'X-RT--Message' ),
-                    rt_close = xhr.responseHeader( 'X-RT--Close' ),
-                    rt_error = xhr.responseHeader( 'X-RT--Error' ),
-                    rt_mID = xhr.responseHeader( 'X-RT--mID' )
+                var rt_msg = xhr.getResponseHeader( 'X-RT--Message' ),
+                    rt_close = xhr.getResponseHeader( 'X-RT--Close' ),
+                    rt_error = xhr.getResponseHeader( 'X-RT--Error' ),
+                    rt_mID = xhr.getResponseHeader( 'X-RT--mID' )
                 ;
                 if ( rt_error )
                 {
+                    self.$bosh$ = null;
                     return self.emit( 'error', rt_error );
                 }
                 if ( rt_close )
                 {
+                    self.$bosh$ = null;
                     return self.close( );
                 }
+
+                if ( rt_mID ) self.$mID$ = rt_mID;
+                // message(s) sent
+                if ( msgs ) self.$queue$.splice( 0, msgs.length );
+
                 if ( rt_msg )
                 {
                     // at the same time, handle incoming message(s)
-                    var msgs = (xhr.responseText||'').split( rt_msg ), i, l;
-                    for(i=0,l=msgs.length; i<l; i++)
-                        self.emit('receive', msgs[i]);
+                    var received = (xhr.responseText||'').split( rt_msg ), i, l;
+                    for(i=0,l=received.length; i<l; i++) self.emit( 'receive', received[i] );
                 }
-                if ( rt_mID ) self.$mID$ = rt_mID;
-                // message(s) sent
-                if ( msgs ) self.$queue$.splice( 0, msgs.length );
+                else if ( !!xhr.responseText )
+                {
+                    self.emit( 'receive', xhr.responseText );
+                }
+
+                self.$bosh$ = null;
                 setTimeout( listen, 0 );
             }
         }, msgs ? ('x-rt--payload='+U.Url.encode( msgs.join( rt_msg ) )) : null);

diff --git a/src/RT.BOSH.min.js b/src/RT.BOSH.min.js
diff --git a/src/RT.Poll.js b/src/RT.Poll.js
@@ -42,15 +42,15 @@ RT.Client.Poll[PROTO].$mID$ = null;
 RT.Client.Poll[PROTO].dispose = function( ){
     var self = this;
     if ( self.$timer$ ) { clearTimeout( self.$timer$ ); self.$timer$ = null; }
-    if ( self.$xhr$ ) { self.$xhr$.abort( false ); self.$xhr$ = null; }
+    if ( self.$xhr$ ) { self.$xhr$.abort( ); self.$xhr$ = null; }
     self.$mID$ = null;
     self.$queue$ = null;
     return __super__.dispose.call( self );
 };
 RT.Client.Poll[PROTO].abort = function( trigger ){
     var self = this;
     if ( self.$timer$ ) { clearTimeout( self.$timer$ ); self.$timer$ = null; }
-    if ( self.$xhr$ ) { self.$xhr$.abort( true===trigger ); self.$xhr$ = null; }
+    if ( self.$xhr$ ) { self.$xhr$.abort( ); self.$xhr$ = null; }
     return __super__.abort.call( self, true===trigger );
 };
 RT.Client.Poll[PROTO].send = function( payload ){
@@ -82,35 +82,47 @@ RT.Client.Poll[PROTO].listen = function( ){
             //mimeType        : 'text/plain; charset=utf8',
             headers         : headers,
             onError         : function( xhr ) {
+                self.$xhr$ = null;
                 self.emit( 'error', xhr.statusText );
             },
             onTimeout       : function( xhr ) {
+                self.$xhr$ = null;
                 self.$timer$ = setTimeout( poll, self.$cfg$.pollInterval );
             },
             onComplete      : function( xhr ) {
-                var rt_msg = xhr.responseHeader( 'X-RT--Message' ),
-                    rt_close = xhr.responseHeader( 'X-RT--Close' ),
-                    rt_error = xhr.responseHeader( 'X-RT--Error' ),
-                    rt_mID = xhr.responseHeader( 'X-RT--mID' )
+                var rt_msg = xhr.getResponseHeader( 'X-RT--Message' ),
+                    rt_close = xhr.getResponseHeader( 'X-RT--Close' ),
+                    rt_error = xhr.getResponseHeader( 'X-RT--Error' ),
+                    rt_mID = xhr.getResponseHeader( 'X-RT--mID' )
                 ;
                 if ( rt_error )
                 {
+                    self.$xhr$ = null;
                     return self.emit( 'error', rt_error );
                 }
                 if ( rt_close )
                 {
+                    self.$xhr$ = null;
                     return self.close( );
                 }
+
+                if ( rt_mID ) self.$mID$ = rt_mID;
+                // message(s) sent
+                if ( msgs ) self.$queue$.splice( 0, msgs.length );
+
                 if ( rt_msg )
                 {
                     // at the same time, handle incoming message(s)
-                    var msgs = (xhr.responseText||'').split( rt_msg ), i, l;
-                    for(i=0,l=msgs.length; i<l; i++) self.emit( 'receive', msgs[i] );
+                    var received = (xhr.responseText||'').split( rt_msg ), i, l;
+                    for(i=0,l=received.length; i<l; i++) self.emit( 'receive', received[i] );
                 }
-                if ( rt_mID ) self.$mID$ = rt_mID;
-                // message(s) sent
-                if ( msgs ) self.$queue$.splice( 0, msgs.length );
-                self.$timer$ = setTimeout(poll, self.$cfg$.pollInterval);
+                else if ( !!xhr.responseText )
+                {
+                    self.emit( 'receive', xhr.responseText );
+                }
+
+                self.$xhr$ = null;
+                self.$timer$ = setTimeout( poll, self.$cfg$.pollInterval );
             }
         }, msgs ? ('x-rt--payload='+U.Url.encode( msgs.join( rt_msg ) )) : null);
     };

diff --git a/src/RT.Poll.min.js b/src/RT.Poll.min.js