Merge pull request #7 from kriszyp/master

Fix node request adaptor
persvr · Aug 22, 2012 · 2129c0d · 2129c0d
2 parents bd55a1d + 3455ff8
commit 2129c0d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/jsgi-node.js b/jsgi-node.js
@@ -197,11 +197,14 @@ function Response( response, stream ) {
       }
       try{
       	// if it is not too late, set the status
-      	response.writeHead(500, {});
+      	if(!response.statusCode){
+      	  response.writeHead(500, {});
+      	}
       }catch(e2){}
       try{
 	    response.write( "Error: " + e.stack );
 	    response.end();
+    	console.log("error",e);
       }catch(e3){
       	sys.puts(e3.stack);
       }

diff --git a/jsgi/node.js b/jsgi/node.js
@@ -6,28 +6,30 @@ exports.Node = function(nodeApp){
 		var endListeners = [];
 		var bodyDeferred;
 		var responseDeferred = defer();
-		nodeApp({
+		var nodeRequest = {
 			headers: request.headers,
 			httpVersionMajor: request.version[0],
 			httpVersionMinor: request.version[1],
 			addListener: function(event, callback){
-				if(event == "data"){
+				process.nextTick(function(){
-					when(request.body && request.body.forEach(function(data){
+					if(event == "data"){
-						callback(data);
+						when(request.body && request.body.forEach(function(data){
-					}), function(){
+							callback(data);
-						endListeners.forEach(function(listener){
+						}), function(){
-							listener();
+							endListeners.forEach(function(listener){
+								listener();
+							});
+							endListeners = null;
 						});
-						endListeners = null;
-					});
-				}
-				if(event == "end"){
-					if(endListeners){
-						endListeners.push(callback);
-					}else{
-						callback();
 					}
-				}
+					if(event == "end"){
+						if(endListeners){
+							endListeners.push(callback);
+						}else{
+							callback();
+						}
+					}
+				});
 				return this;
 			},
 			pause: function(){
@@ -36,7 +38,9 @@ exports.Node = function(nodeApp){
 			resume: function(){
 
 			}
-		},
+		}
+		nodeRequest.on = nodeRequest.addListener;
+		nodeApp(nodeRequest,
 		{
 			writeHead: function(status, headers){
 				var write;