wip

lib/utilities/retrieveData.js

@@ -12,7 +12,7 @@ export default function retrieveData(locations, retrieveDataFn, response, log) {
     };
     response.once('close', () => {
         log.debug('received close event before response end');
-        _destroyResponse();
+        responseDestroyed = true;
     });
 
     eachSeries(locations,
@@ -38,18 +38,9 @@ export default function retrieveData(locations, retrieveDataFn, response, log) {
             }
             if (responseDestroyed) {
                 log.debug('response destroyed before readable could stream');
-                readable.emit('close');
+                readable.destroy();
                 return _next(responseErr);
             }
-            // client closed the connection abruptly
-            response.once('close', () => {
-                log.debug('received close event before readable end');
-                if (!responseDestroyed) {
-                    _destroyResponse();
-                }
-                readable.emit('close');
-                return _next(responseErr);
-            });
             // readable stream successfully consumed
             readable.on('end', () => {
                 log.debug('readable stream end reached');
@@ -58,6 +49,7 @@ export default function retrieveData(locations, retrieveDataFn, response, log) {
             // errors on server side with readable stream
             readable.on('error', err => {
                 log.error('error piping data from source');
+                _destroyResponse();
                 return _next(err);
             });
             return readable.pipe(response, { end: false });