pixl-server-web - npm Package Compare versions

Comparing version 1.3.17 to 1.3.18

lib/http.js

@@ -144,4 +144,5 @@ // Simple HTTP / HTTPS Web Server
 				if (args.callback) {
-					args.callback();
-					delete args.callback;
+					args.http_code = 0;
+					args.http_status = "Socket Error";
+					self.finishRequest(args);
 				}
@@ -205,4 +206,5 @@ } );
 			if (args.callback) {
-				args.callback();
-				delete args.callback;
+				args.http_code = 0;
+				args.http_status = "Socket Error";
+				self.finishRequest(args);
 			}
@@ -209,0 +211,0 @@ });

lib/https.js

@@ -142,4 +142,5 @@ // Simple HTTP / HTTPS Web Server
 				if (args.callback) {
-					args.callback();
-					delete args.callback;
+					args.http_code = 0;
+					args.http_status = "Socket Error";
+					self.finishRequest(args);
 				}
@@ -203,4 +204,5 @@ } );
 			if (args.callback) {
-				args.callback();
-				delete args.callback;
+				args.http_code = 0;
+				args.http_status = "Socket Error";
+				self.finishRequest(args);
 			}
@@ -207,0 +209,0 @@ });

lib/response.js

@@ -40,11 +40,6 @@ // Simple HTTP / HTTPS Web Server
 			
-			args.perf.end();
-			var metrics = args.perf.metrics();
-			this.emit('metrics', metrics, args);
+			args.http_code = 0;
+			args.http_status = "Socket Closed";
+			this.finishRequest(args);
 			
-			if (args.callback) {
-				args.callback();
-				delete args.callback;
-			}
-			
 			// destroy stream if appliable (prevents filehandle leak)
@@ -147,8 +142,5 @@ if (body && body.pipe && body.destroy) body.destroy();
 				
-				args.perf.end();
-				var metrics = args.perf.metrics();
-				self.emit('metrics', metrics, args);
-				
-				args.callback(); // queue
-				delete args.callback;
+				args.http_code = 0;
+				args.http_status = "Socket Closed";
+				self.finishRequest(args);
 			}
@@ -321,2 +313,5 @@ });
 		// finish up request tracking
+		if (args.requestFinished) return;
+		args.requestFinished = true;
+		
 		args.perf.count('num_requests', 1);
@@ -387,2 +382,3 @@ args.perf.end();
 				uri: args.request.url,
+				ip: args.ip,
 				ips: args.ips,
@@ -436,3 +432,4 @@ host: args.request.headers['host'] || '',
 		
-		switch (this.keepAlives) {
+		// only do this if socket is still open
+		if (args.http_code != 0) switch (this.keepAlives) {
 			case 0:
@@ -439,0 +436,0 @@ case 'close':

package.json

 {
 	"name": "pixl-server-web",
-	"version": "1.3.17",
+	"version": "1.3.18",
 	"description": "A web server component for the pixl-server framework.",
@@ -5,0 +5,0 @@ "author": "Joseph Huckaby <[e-mail]>",

No alert changes

Improved metrics

Total package byte prevSize

229627

increased by0.08%

Lines of code

3663

increased by0.05%

No dependency changes