Handle streaming better

kriszyp · Dec 8, 2010 · 722bfc4 · 722bfc4
1 parent eba6dd2
commit 722bfc4
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/lib/jsgi/comet.js b/lib/jsgi/comet.js
@@ -27,6 +27,7 @@ exports.Broadcaster = function(nextApp){
 	return function(request){
 		nextApp && nextApp(request); // ignore the response
 		var headers = request.headers;
+		var streaming = !!headers.stream;
 		var clientConnection = exports.getClientConnection(request);
 		if(!clientConnection){
 			throw new Error("No client connection");
@@ -39,23 +40,27 @@ exports.Broadcaster = function(nextApp){
 				forEach: function(callback){
 					if(clientConnection.length){
 						clientConnection.splice(0, clientConnection.length).forEach(callback);
-					}else{
+						if(!streaming){
-						var promiseCallback;
+							return;
-						var observer = clientConnection.observe("message", function(message){
+						}
+					}
+					var promiseCallback;
+					var observer = clientConnection.observe("message", function(message){
+						// TODO: maybe queue this up for the next event turn
+						clientConnection.splice(0, clientConnection.length).forEach(callback);
+						if(promiseCallback){
 							observer.dismiss();
-							// TODO: maybe queue this up for the next event turn
+							promiseCallback();
-							clientConnection.splice(0, clientConnection.length).forEach(callback);
+						}
-							if(promiseCallback){
+					});
-								promiseCallback();
+					return {
-							}
+						then: function(callback, errback){
-						});
+							if(!streaming){
-						return {
-							then: function(callback, errback){
 								promiseCallback = callback;
-							},
-							cancel: function(){
-								clientConnection.close();
 							}
+						},
+						cancel: function(){
+							clientConnection.close();
 						}
 					}
 				}