Add location tag to errors and also close sockets on errors.

lib/proxy.js

@@ -91,7 +91,7 @@ module.exports.createProxyServer = function (opts) {
             try {
                 return wrapped(req, res);
             } catch (error) {
-                emitter.emit('error', error);
+                emitter.emit('error', error, 'request/response wrapper');
             }
         };
     };
@@ -151,7 +151,8 @@ module.exports.createProxyServer = function (opts) {
                       }
 
                       proxy_response.on('error', function (error) {
-                          emitter.emit('error', error);
+                          response.end();
+                          emitter.emit('error', error, 'proxyResponse');
                       });
 
                       proxy_response.on('data', function (chunk) {
@@ -175,7 +176,7 @@ module.exports.createProxyServer = function (opts) {
                                var encoding = recompress ? responseEncoding : undefined;
                                var writeOutput = function (error, b) {
                                    if (error) {
-                                       emitter.emit('error', error);
+                                       emitter.emit('error', error, 'recompressing');
                                    }
                                    response.end(b);
                                };
@@ -193,7 +194,7 @@ module.exports.createProxyServer = function (opts) {
 
                            var setupIntercept = function (error, newBuffer) {
                                if (error) {
-                                   emitter.emit('error', error);
+                                   emitter.emit('error', error, 'decompressing');
                                }
                                emitOrRun('interceptResponseContent', function () { writeResponse(newBuffer); },
                                          newBuffer, proxy_response, is_ssl, charset, writeResponse);
@@ -228,7 +229,10 @@ module.exports.createProxyServer = function (opts) {
                   }
                });
 
-               proxy_request.on('error', function (error) { emitter.emit('error', error); });
+               proxy_request.on('error', function (error) {
+                    response.end();
+                    emitter.emit('error', error, 'proxyRequest', request_info);
+               });
 
                request.on('data', function (chunk) { proxy_request.write(chunk, 'binary'); });
                request.on('end', function (chunk) { proxy_request.end(); });
@@ -257,8 +261,8 @@ module.exports.createProxyServer = function (opts) {
     /* Start http server */
     var httpServer = http.createServer(serverDefinition(false));
     httpServer.listen(main_port, hostname);
-    httpServer.on('clientError', function (error) { emitter.emit('clientError', error); });
-    httpServer.on('error', function (error) { emitter.emit('error', error); });
+    httpServer.on('clientError', function (error) { emitter.emit('clientError', error, 'proxyClient'); });
+    httpServer.on('error', function (error) { emitter.emit('error', error, 'proxyServer'); });
 
 
     /* Parse the ssl options and create sslRouting, sslExact, and sslServers */
@@ -299,8 +303,8 @@ module.exports.createProxyServer = function (opts) {
 
         var httpsServer = https.createServer(sslOptions, serverDefinition(true));
         httpsServer.listen(socketPath);
-        httpsServer.on('clientError', function (error) { emitter.emit('clientError', error); });
-        httpsServer.on('error', function (error) { emitter.emit('error', error); });
+        httpsServer.on('clientError', function (error) { emitter.emit('clientError', error, 'httpsClient'); });
+        httpsServer.on('error', function (error) { emitter.emit('error', error, 'httpsServer'); });
         httpsServers.push(httpsServer);
     }
 
@@ -336,15 +340,18 @@ module.exports.createProxyServer = function (opts) {
                     socket.write('HTTP/1.0 200 Connection established\r\n\r\n');
                 }
             } catch (error) {
-                emitter.emit('error', error);
+                emitter.emit('error', error, 'httpsSocket');
             }
         });
 
         clientSocket.on('data', function (data) {
             try {
                 socket.write(data);
             } catch (error) {
-                emitter.emit('error', error);
+                try {
+                    clientSocket.end();
+                } catch (error) {}
+                emitter.emit('error', error, 'httpsSocketData');
             }
         });
 
@@ -354,7 +361,10 @@ module.exports.createProxyServer = function (opts) {
             try {
                 clientSocket.write(data);
             } catch (error) {
-                emitter.emit('error', error);
+                try {
+                    socket.end();
+                } catch (error) {}
+                emitter.emit('error', error, 'httpsClientSocketData');
             }
         });
         socket.on('end', function () { clientSocket.end(); });
@@ -397,7 +407,7 @@ module.exports.createProxyServer = function (opts) {
                   server.listen(opts['transSslPort'], hostname);
                 }, 1000);
             } else {
-                emitter.emit('error', e);
+                emitter.emit('error', e, 'transSslError');
             }
         });