snyk 1.725.0 → 1.726.0

package/dist/cli/64.index.js

@@ -6595,21 +6595,24 @@ exports.rootSpecName = rootSpecName;
 
 "use strict";
 
-/* eslint-disable no-await-in-loop */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.extendAnalysis = exports.analyzeFolders = exports.analyzeBundle = void 0;
+/* eslint-disable no-await-in-loop */
+const lodash_omit_1 = __importDefault(__webpack_require__(76427));
 const files_1 = __webpack_require__(32083);
+const constants_1 = __webpack_require__(65765);
 const http_1 = __webpack_require__(60776);
+const utils_1 = __webpack_require__(24054);
 const bundles_1 = __webpack_require__(86639);
-const emitter_1 = __importDefault(__webpack_require__(37544));
+const emitter_1 = __webpack_require__(37544);
 const sleep = (duration) => new Promise(resolve => setTimeout(resolve, duration));
 async function pollAnalysis(options) {
     let analysisResponse;
     let analysisData;
-    emitter_1.default.analyseProgress({
+    emitter_1.emitter.analyseProgress({
         status: http_1.AnalysisStatus.waiting,
         progress: 0,
     });
@@ -6625,7 +6628,7 @@ async function pollAnalysis(options) {
             analysisData.status === http_1.AnalysisStatus.analyzing ||
             analysisData.status === http_1.AnalysisStatus.done) {
             // Report progress of fetching
-            emitter_1.default.analyseProgress(analysisData);
+            emitter_1.emitter.analyseProgress(analysisData);
         }
         else if (analysisData.status === http_1.AnalysisStatus.complete) {
             // Return data of analysis
@@ -6636,7 +6639,7 @@ async function pollAnalysis(options) {
             // Report failure of analysing
             return analysisResponse;
         }
-        await sleep(500);
+        await sleep(constants_1.POLLING_INTERVAL);
     }
 }
 async function analyzeBundle(options) {
@@ -6651,6 +6654,15 @@ async function analyzeBundle(options) {
     return analysisData.value;
 }
 exports.analyzeBundle = analyzeBundle;
+function normalizeResultFiles(files, baseDir) {
+    if (baseDir) {
+        return (0, utils_1.fromEntries)(Object.entries(files).map(([path, positions]) => {
+            const filePath = (0, files_1.resolveBundleFilePath)(baseDir, path);
+            return [filePath, positions];
+        }));
+    }
+    return files;
+}
 async function analyzeFolders(options) {
     const fileBundle = await (0, bundles_1.createBundleFromFolders)({
         ...options.connection,
@@ -6664,12 +6676,20 @@ async function analyzeFolders(options) {
         ...options.connection,
         ...options.analysisOptions,
     });
-    // TODO: expand relative file names to absolute ones
-    // analysisResults.files = normalizeResultFiles(analysisData.analysisResults.files, baseDir);
+    if (analysisResults.type === 'legacy') {
+        // expand relative file names to absolute ones only for legacy results
+        analysisResults.files = normalizeResultFiles(analysisResults.files, fileBundle.baseDir);
+    }
     return { fileBundle, analysisResults, ...options };
 }
 exports.analyzeFolders = analyzeFolders;
-function mergeBundleResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles = []) {
+function mergeBundleResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles = [], baseDir) {
+    if (newAnalysisResults.type == 'sarif') {
+        return mergeSarifResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles);
+    }
+    return mergeLegacyResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles, baseDir);
+}
+function mergeSarifResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles = []) {
     // Start from the new analysis results
     // For each finding of the old analysis,
     //  if it's location is not part of the limitToFiles or removedFiles (removedFiles should also be checked against condeFlow),
@@ -6733,6 +6753,35 @@ function mergeBundleResults(oldAnalysisResults, newAnalysisResults, limitToFiles
     newAnalysisResults.sarif.runs[0].tool.driver.rules = sarifRules;
     return newAnalysisResults;
 }
+const moveSuggestionIndexes = (suggestionIndex, suggestions) => {
+    const entries = Object.entries(suggestions);
+    return (0, utils_1.fromEntries)(entries.map(([i, s]) => {
+        return [`${parseInt(i, 10) + suggestionIndex + 1}`, s];
+    }));
+};
+function mergeLegacyResults(oldAnalysisResults, newAnalysisResults, limitToFiles, removedFiles = [], baseDir) {
+    // expand relative file names to absolute ones only for legacy results
+    newAnalysisResults.files = normalizeResultFiles(newAnalysisResults.files, baseDir);
+    // Determine max suggestion index in our data
+    const suggestionIndex = Math.max(...Object.keys(oldAnalysisResults.suggestions).map(i => parseInt(i, 10))) || -1;
+    // Addup all new suggestions' indexes
+    const newSuggestions = moveSuggestionIndexes(suggestionIndex, newAnalysisResults.suggestions);
+    const suggestions = { ...oldAnalysisResults.suggestions, ...newSuggestions };
+    const newFiles = (0, utils_1.fromEntries)(Object.entries(newAnalysisResults.files).map(([fn, s]) => {
+        return [fn, moveSuggestionIndexes(suggestionIndex, s)];
+    }));
+    // expand relative file names to absolute ones only for legacy results
+    const changedFiles = [...limitToFiles, ...removedFiles].map(path => (0, files_1.resolveBundleFilePath)(baseDir, path));
+    const files = {
+        ...(0, lodash_omit_1.default)(oldAnalysisResults.files, changedFiles),
+        ...newFiles,
+    };
+    return {
+        ...newAnalysisResults,
+        files,
+        suggestions,
+    };
+}
 async function extendAnalysis(options) {
     const { files, removedFiles } = await (0, files_1.prepareExtendingBundle)(options.fileBundle.baseDir, options.fileBundle.supportedFiles, options.fileBundle.fileIgnores, options.files, options.fileOptions.maxPayload, options.fileOptions.symlinksEnabled);
     if (!files.length && !removedFiles.length) {
@@ -6760,9 +6809,7 @@ async function extendAnalysis(options) {
         ...options.analysisOptions,
         limitToFiles,
     });
-    // TODO: Transform relative paths into absolute
-    // analysisData.analysisResults.files = normalizeResultFiles(analysisData.analysisResults.files, bundle.baseDir);
-    analysisResults = mergeBundleResults(options.analysisResults, analysisResults, limitToFiles, removedFiles);
+    analysisResults = mergeBundleResults(options.analysisResults, analysisResults, limitToFiles, removedFiles, options.fileBundle.baseDir);
     return { ...options, fileBundle, analysisResults };
 }
 exports.extendAnalysis = extendAnalysis;
@@ -6787,12 +6834,12 @@ const p_map_1 = __importDefault(__webpack_require__(49503));
 const files_1 = __webpack_require__(32083);
 const http_1 = __webpack_require__(60776);
 const constants_1 = __webpack_require__(65765);
-const emitter_1 = __importDefault(__webpack_require__(37544));
+const emitter_1 = __webpack_require__(37544);
 async function* prepareRemoteBundle({ maxPayload = constants_1.MAX_PAYLOAD, ...options }) {
     let response;
     let { bundleHash } = options;
     let cumulativeProgress = 0;
-    emitter_1.default.createBundleProgress(cumulativeProgress, options.files.length);
+    emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
     for (const chunkedFiles of (0, files_1.composeFilePayloads)(options.files, maxPayload)) {
         const apiParams = {
             ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'removedFiles']),
@@ -6807,7 +6854,7 @@ async function* prepareRemoteBundle({ maxPayload = constants_1.MAX_PAYLOAD, ...o
             response = await (0, http_1.extendBundle)({ bundleHash, ...apiParams });
         }
         cumulativeProgress += chunkedFiles.length;
-        emitter_1.default.createBundleProgress(cumulativeProgress, options.files.length);
+        emitter_1.emitter.createBundleProgress(cumulativeProgress, options.files.length);
         if (response.type === 'error') {
             // TODO: process Error
             yield response;
@@ -6825,7 +6872,7 @@ async function* prepareRemoteBundle({ maxPayload = constants_1.MAX_PAYLOAD, ...o
  */
 async function uploadRemoteBundle({ maxPayload = constants_1.MAX_PAYLOAD, ...options }) {
     let uploadedFiles = 0;
-    emitter_1.default.uploadBundleProgress(0, options.files.length);
+    emitter_1.emitter.uploadBundleProgress(0, options.files.length);
     const apiParams = (0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source', 'bundleHash']);
     const uploadFileChunks = async (bucketFiles) => {
         const resp = await (0, http_1.extendBundle)({
@@ -6835,7 +6882,7 @@ async function uploadRemoteBundle({ maxPayload = constants_1.MAX_PAYLOAD, ...opt
         // During upload process, we expect the bundleHash not to change (same file map)
         if (resp.type !== 'error' && resp.value.bundleHash === apiParams.bundleHash) {
             uploadedFiles += bucketFiles.length;
-            emitter_1.default.uploadBundleProgress(uploadedFiles, options.files.length);
+            emitter_1.emitter.uploadBundleProgress(uploadedFiles, options.files.length);
             return true;
         }
         return false;
@@ -6901,13 +6948,13 @@ exports.remoteBundleFactory = remoteBundleFactory;
  * @returns
  */
 async function getSupportedFiles(baseURL, source) {
-    emitter_1.default.supportedFilesLoaded(null);
+    emitter_1.emitter.supportedFilesLoaded(null);
     const resp = await (0, http_1.getFilters)(baseURL, source);
     if (resp.type === 'error') {
         throw resp.error;
     }
     const supportedFiles = resp.value;
-    emitter_1.default.supportedFilesLoaded(supportedFiles);
+    emitter_1.emitter.supportedFilesLoaded(supportedFiles);
     return supportedFiles;
 }
 /**
@@ -6924,7 +6971,7 @@ async function createBundleFromFolders(options) {
         // Scan for custom ignore rules
         (0, files_1.collectIgnoreRules)(options.paths, options.symlinksEnabled, options.defaultFileIgnores),
     ]);
-    emitter_1.default.scanFilesProgress(0);
+    emitter_1.emitter.scanFilesProgress(0);
     const bundleFiles = [];
     let totalFiles = 0;
     const bundleFileCollector = (0, files_1.collectBundleFiles)({
@@ -6936,7 +6983,7 @@ async function createBundleFromFolders(options) {
     for await (const f of bundleFileCollector) {
         bundleFiles.push(f);
         totalFiles += 1;
-        emitter_1.default.scanFilesProgress(totalFiles);
+        emitter_1.emitter.scanFilesProgress(totalFiles);
     }
     const bundleOptions = {
         ...(0, lodash_pick_1.default)(options, ['baseURL', 'sessionToken', 'source']),
@@ -7044,7 +7091,7 @@ exports.readJSON = readJSON;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DEFAULT_ERROR_MESSAGES = exports.ErrorCodes = exports.DCIGNORE_DRAFTS = exports.IGNORE_FILES_NAMES = exports.IGNORES_DEFAULT = exports.REQUEST_RETRY_DELAY = exports.MAX_RETRY_ATTEMPTS = exports.UPLOAD_CONCURRENCY = exports.MAX_UPLOAD_ATTEMPTS = exports.CACHE_KEY = exports.EXCLUDED_NAMES = exports.DOTSNYK_FILENAME = exports.DCIGNORE_FILENAME = exports.GITIGNORE_FILENAME = exports.GIT_FILENAME = exports.ENCODE_TYPE = exports.HASH_ALGORITHM = exports.defaultBaseURL = exports.MAX_PAYLOAD = void 0;
+exports.DEFAULT_ERROR_MESSAGES = exports.ErrorCodes = exports.DCIGNORE_DRAFTS = exports.IGNORE_FILES_NAMES = exports.IGNORES_DEFAULT = exports.REQUEST_RETRY_DELAY = exports.MAX_RETRY_ATTEMPTS = exports.POLLING_INTERVAL = exports.UPLOAD_CONCURRENCY = exports.MAX_UPLOAD_ATTEMPTS = exports.CACHE_KEY = exports.EXCLUDED_NAMES = exports.DOTSNYK_FILENAME = exports.DCIGNORE_FILENAME = exports.GITIGNORE_FILENAME = exports.GIT_FILENAME = exports.ENCODE_TYPE = exports.HASH_ALGORITHM = exports.defaultBaseURL = exports.MAX_PAYLOAD = void 0;
 const dcignore_1 = __webpack_require__(55086);
 exports.MAX_PAYLOAD = 4 * 1024 * 1024;
 exports.defaultBaseURL = 'https://api.snyk.deepcode.ai';
@@ -7058,6 +7105,7 @@ exports.EXCLUDED_NAMES = [exports.GIT_FILENAME, exports.GITIGNORE_FILENAME, expo
 exports.CACHE_KEY = '.dccache';
 exports.MAX_UPLOAD_ATTEMPTS = 5;
 exports.UPLOAD_CONCURRENCY = 5;
+exports.POLLING_INTERVAL = 500;
 exports.MAX_RETRY_ATTEMPTS = 5; // Request retries on network errors
 exports.REQUEST_RETRY_DELAY = 30 * 1000; // 30 seconds delay between retries
 exports.IGNORES_DEFAULT = [`**/${exports.GIT_FILENAME}/**`];
@@ -7106,7 +7154,7 @@ exports.DEFAULT_ERROR_MESSAGES = {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.EmitterDC = void 0;
+exports.emitter = exports.EmitterDC = void 0;
 const events_1 = __webpack_require__(28614);
 // eslint-disable-next-line no-shadow
 var CUSTOM_EVENTS;
@@ -7147,8 +7195,7 @@ class EmitterDC extends events_1.EventEmitter {
     }
 }
 exports.EmitterDC = EmitterDC;
-const emitter = new EmitterDC();
-exports.default = emitter;
+exports.emitter = new EmitterDC();
 //# sourceMappingURL=emitter.js.map
 
 /***/ }),
@@ -7270,6 +7317,7 @@ function parseIgnoreRulesToGlobs(rules, baseDir) {
     }, []);
 }
 function parseFileIgnores(path) {
+    var _a, _b;
     let rules = [];
     const dirname = nodePath.dirname(path);
     try {
@@ -7278,7 +7326,9 @@ function parseFileIgnores(path) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             const parsed = (0, yaml_1.parse)(f);
             const concatIgnorePath = (p) => `${nodePath.dirname(path)}/${p}`;
-            return [...parsed.exclude.code.map(concatIgnorePath), ...parsed.exclude.global.map(concatIgnorePath)];
+            const codeIgnoredPaths = ((_a = parsed.exclude.code) === null || _a === void 0 ? void 0 : _a.map(concatIgnorePath)) || [];
+            const globalIgnoredPaths = ((_b = parsed.exclude.global) === null || _b === void 0 ? void 0 : _b.map(concatIgnorePath)) || [];
+            return [...codeIgnoredPaths, ...globalIgnoredPaths];
         }
         rules = f
             .split('\n')
@@ -7838,8 +7888,7 @@ async function getAnalysis(options) {
                 hash: options.bundleHash,
                 limitToFiles: options.limitToFiles || [],
             },
-            ...(0, lodash_pick_1.default)(options, ['severity', 'prioritized']),
-            // severity: options.severity || AnalysisSeverity.info,
+            ...(0, lodash_pick_1.default)(options, ['severity', 'prioritized', 'legacy']),
         },
     };
     try {
@@ -7881,21 +7930,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.AnalysisSeverity = exports.constants = exports.emitter = exports.checkSession = exports.startSession = exports.getAnalysis = exports.createBundleFromFolders = exports.analyzeFolders = exports.getGlobPatterns = void 0;
+exports.getIpFamily = exports.checkSession = exports.startSession = exports.getAnalysis = exports.AnalysisSeverity = exports.constants = exports.emitter = exports.extendAnalysis = exports.createBundleFromFolders = exports.analyzeFolders = exports.getGlobPatterns = void 0;
 const analysis_1 = __webpack_require__(54151);
 Object.defineProperty(exports, "analyzeFolders", ({ enumerable: true, get: function () { return analysis_1.analyzeFolders; } }));
+Object.defineProperty(exports, "extendAnalysis", ({ enumerable: true, get: function () { return analysis_1.extendAnalysis; } }));
 const bundles_1 = __webpack_require__(86639);
 Object.defineProperty(exports, "createBundleFromFolders", ({ enumerable: true, get: function () { return bundles_1.createBundleFromFolders; } }));
-const emitter_1 = __importDefault(__webpack_require__(37544));
-exports.emitter = emitter_1.default;
+const emitter_1 = __webpack_require__(37544);
+Object.defineProperty(exports, "emitter", ({ enumerable: true, get: function () { return emitter_1.emitter; } }));
 const http_1 = __webpack_require__(60776);
 Object.defineProperty(exports, "startSession", ({ enumerable: true, get: function () { return http_1.startSession; } }));
 Object.defineProperty(exports, "checkSession", ({ enumerable: true, get: function () { return http_1.checkSession; } }));
 Object.defineProperty(exports, "getAnalysis", ({ enumerable: true, get: function () { return http_1.getAnalysis; } }));
+Object.defineProperty(exports, "getIpFamily", ({ enumerable: true, get: function () { return http_1.getIpFamily; } }));
 const constants = __importStar(__webpack_require__(65765));
 exports.constants = constants;
 const files_1 = __webpack_require__(32083);
@@ -7924,6 +7972,24 @@ var AnalysisSeverity;
 
 /***/ }),
 
+/***/ 24054:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.fromEntries = void 0;
+function fromEntries(entries) {
+    return [...entries].reduce((obj, [key, val]) => {
+        obj[key] = val; // eslint-disable-line no-param-reassign
+        return obj;
+    }, {});
+}
+exports.fromEntries = fromEntries;
+//# sourceMappingURL=utils.js.map
+
+/***/ }),
+
 /***/ 14577:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
@@ -7958,7 +8024,7 @@ const needle_1 = __importDefault(__webpack_require__(11642));
 const querystring = __importStar(__webpack_require__(71191));
 const https_1 = __importDefault(__webpack_require__(57211));
 const url_1 = __webpack_require__(78835);
-const emitter_1 = __importDefault(__webpack_require__(37544));
+const emitter_1 = __webpack_require__(37544);
 const constants_1 = __webpack_require__(65765);
 const agentOptions = {
     keepAlive: true,
@@ -7995,14 +8061,14 @@ async function makeRequest(payload) {
         rejectUnauthorized: !global.ignoreUnknownCA,
         agent,
     };
-    emitter_1.default.apiRequestLog(`=> HTTP ${method === null || method === void 0 ? void 0 : method.toUpperCase()} ${url} ${data !== null && data !== void 0 ? data : ''}`.slice(0, 399));
+    emitter_1.emitter.apiRequestLog(`=> HTTP ${method === null || method === void 0 ? void 0 : method.toUpperCase()} ${url} ${data !== null && data !== void 0 ? data : ''}`.slice(0, 399));
     let attempts = (_a = payload.attempts) !== null && _a !== void 0 ? _a : constants_1.MAX_RETRY_ATTEMPTS;
     let retryDelay = (_b = payload.retryDelay) !== null && _b !== void 0 ? _b : constants_1.REQUEST_RETRY_DELAY;
     let response, success;
     do {
         try {
             response = await (0, needle_1.default)(method, url, data, options);
-            emitter_1.default.apiRequestLog(`<= Response: ${response.statusCode} ${JSON.stringify(response.body)}`.slice(0, 399));
+            emitter_1.emitter.apiRequestLog(`<= Response: ${response.statusCode} ${JSON.stringify(response.body)}`);
             success = !!(response.statusCode && response.statusCode >= 200 && response.statusCode < 300);
             if (success)
                 return { success, response };
@@ -8022,7 +8088,7 @@ async function makeRequest(payload) {
             }
         }
         catch (err) {
-            emitter_1.default.apiRequestLog(`Request error --> ${err}`.slice(0, 399));
+            emitter_1.emitter.apiRequestLog(`Request error --> ${err}`.slice(0, 399));
             throw err;
         }
     } while (attempts > 0);
@@ -8723,7 +8789,7 @@ var digest = {};
 
 digest.parse_header = function(header) {
   var challenge = {},
-      matches   = header.match(/([a-z0-9_-]+)="?([a-z0-9=\/\.@\s-\+)()]+)"?/gi);
+      matches   = header.match(/([a-z0-9_-]+)="?([a-z0-9_=\/\.@\s-\+)()]+)"?/gi);
 
   for (var i = 0, l = matches.length; i < l; i++) {
     var parts = matches[i].split('='),
@@ -9221,6 +9287,28 @@ function get_stream_length(stream, given_length, cb) {
   });
 }
 
+function resolve_url(href, base) {
+  if (url.URL)
+    return new url.URL(href, base);
+
+  // older Node version (< v6.13)
+  return url.resolve(base, href);
+}
+
+function pump_streams(streams, cb) {
+  if (stream.pipeline)
+    return stream.pipeline.apply(null, streams.concat(cb));
+
+  var tmp = streams.shift();
+  while (streams.length) {
+    tmp = tmp.pipe(streams.shift());
+    tmp.once('error', function(e) {
+      cb && cb(e);
+      cb = null;
+    })
+  }
+}
+
 //////////////////////////////////////////
 // the main act
 
@@ -9232,7 +9320,7 @@ function Needle(method, uri, data, options, callback) {
   if (typeof uri !== 'string')
     throw new TypeError('URL must be a string, not ' + uri);
 
-  this.method   = method;
+  this.method   = method.toLowerCase();
   this.uri      = uri;
   this.data     = data;
 
@@ -9395,7 +9483,7 @@ Needle.prototype.start = function() {
 
     } else if (is_stream(data)) {
 
-      if (method.toUpperCase() == 'GET')
+      if (method == 'get')
         throw new Error('Refusing to pipe() a stream via GET. Did you mean .post?');
 
       if (config.stream_length > 0 || (config.stream_length === 0 && data.path)) {
@@ -9417,7 +9505,7 @@ Needle.prototype.start = function() {
 
       body = data; // use the raw buffer as request body.
 
-    } else if (method.toUpperCase() == 'GET' && !json) {
+    } else if (method == 'get' && !json) {
 
       // append the data to the URI as a querystring.
       uri = uri.replace(/\?.*|$/, '?' + stringify(data));
@@ -9513,7 +9601,8 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
     uri = modified_uri;
   }
 
-  var timer,
+  var request,
+      timer,
       returned     = 0,
       self         = this,
       request_opts = this.get_request_opts(method, uri, config),
@@ -9525,6 +9614,7 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
 
     if (timer) clearTimeout(timer);
     request.removeListener('error', had_error);
+    out.done = true;
 
     if (callback)
       return callback(err, resp, resp ? resp.body : undefined);
@@ -9532,6 +9622,11 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
     // NOTE: this event used to be called 'end', but the behaviour was confusing
     // when errors ocurred, because the stream would still emit an 'end' event.
     out.emit('done', err);
+
+    // trigger the 'done' event on streams we're being piped to, if any
+    var pipes = out._readableState.pipes || [];
+    if (!pipes.forEach) pipes = [pipes];
+    pipes.forEach(function(st) { st.emit('done', err); })
   }
 
   function had_error(err) {
@@ -9563,7 +9658,7 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
   }
 
   debug('Making request #' + count, request_opts);
-  var request = protocol.request(request_opts, function(resp) {
+  request = protocol.request(request_opts, function(resp) {
 
     var headers = resp.headers;
     debug('Got response', resp.statusCode, headers);
@@ -9611,8 +9706,9 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
 
         config.headers['host'] = null; // clear previous Host header to avoid conflicts.
 
-        debug('Redirecting to ' + url.resolve(uri, headers.location));
-        return self.send_request(++count, method, url.resolve(uri, headers.location), config, post_data, out, callback);
+        var redirect_url = resolve_url(headers.location, uri);
+        debug('Redirecting to ' +  redirect_url.toString());
+        return self.send_request(++count, method, redirect_url.toString(), config, post_data, out, callback);
       } else if (config.follow_max > 0) {
         return done(new Error('Max redirects reached. Possible loop in: ' + headers.location));
       }
@@ -9636,7 +9732,7 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
 
     var pipeline      = [],
         mime          = parse_content_type(headers['content-type']),
-        text_response = mime.type && mime.type.indexOf('text/') != -1;
+        text_response = mime.type && (mime.type.indexOf('text/') != -1 || !!mime.type.match(/(\/|\+)(xml|json)$/));
 
     // To start, if our body is compressed and we're able to inflate it, do it.
     if (headers['content-encoding'] && decompressors[headers['content-encoding']]) {
@@ -9666,18 +9762,21 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
 
     // If we're not parsing, and unless decoding was disabled, we'll try
     // decoding non UTF-8 bodies to UTF-8, using the iconv-lite library.
-    } else if (text_response && config.decode_response
-      && mime.charset) {
-        pipeline.push(decoder(mime.charset));
+    } else if (text_response && config.decode_response && mime.charset) {
+      pipeline.push(decoder(mime.charset));
     }
+
     // And `out` is the stream we finally push the decoded/parsed output to.
     pipeline.push(out);
 
     // Now, release the kraken!
-    var tmp = resp;
-    while (pipeline.length) {
-      tmp = tmp.pipe(pipeline.shift());
-    }
+    pump_streams([resp].concat(pipeline), function(err) {
+      if (err) debug(err)
+
+      // on node v8.x, if an error ocurrs on the receiving end,
+      // then we want to abort the request to avoid having dangling sockets
+      if (err && err.message == 'write after end') request.destroy();
+    });
 
     // If the user has requested and output file, pipe the output stream to it.
     // In stream mode, we will still get the response stream to play with.
@@ -9718,7 +9817,6 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
 
       // Gather and count the amount of (raw) bytes using a PassThrough stream.
       var clean_pipe = new stream.PassThrough();
-      resp.pipe(clean_pipe);
 
       clean_pipe.on('readable', function() {
         var chunk;
@@ -9728,6 +9826,10 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
         }
       })
 
+      pump_streams([resp, clean_pipe], function(err) {
+        if (err) debug(err);
+      });
+
       // Listen on the 'readable' event to aggregate the chunks, but only if
       // file output wasn't requested. Otherwise we'd have two stream readers.
       if (!config.output || resp.statusCode != 200) {
@@ -9775,14 +9877,21 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
       // is triggered after all data has been written to it.
       if (out.file) {
         out.file.on('close', function() {
-          done(null, resp, resp.body);
+          done(null, resp);
         })
       } else { // elvis has left the building.
-        done(null, resp, resp.body);
+        done(null, resp);
       }
 
     });
 
+    // out.on('error', function(err) {
+    //   had_error(err);
+    //   if (err.code == 'ERR_STREAM_DESTROYED' || err.code == 'ERR_STREAM_PREMATURE_CLOSE') {
+    //     request.abort();
+    //   }
+    // })
+
   }); // end request call
 
   // unless open_timeout was disabled, set a timeout to abort the request.
@@ -9806,7 +9915,10 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
       set_timeout('response', config.response_timeout);
     }
 
-    // console.log(socket);
+    // socket.once('close', function(e) {
+    //   console.log('socket closed!', e);
+    // })
+
     if (!socket.on_socket_end) {
       socket.on_socket_end = on_socket_end;
       socket.once('end', function() { process.nextTick(on_socket_end.bind(socket)) });
@@ -9815,7 +9927,9 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
 
   if (post_data) {
     if (is_stream(post_data)) {
-      post_data.pipe(request);
+      pump_streams([post_data, request], function(err) {
+        if (err) debug(err);
+      });
     } else {
       request.write(post_data, config.encoding);
       request.end();
@@ -9824,6 +9938,7 @@ Needle.prototype.send_request = function(count, method, uri, config, post_data,
     request.end();
   }
 
+  out.abort = function() { request.abort() }; // easier access
   out.request = request;
   return out;
 }
@@ -9840,7 +9955,7 @@ if (typeof Promise !== 'undefined') {
     else
       verb = args.shift();
 
-    if (verb.match(/get|head/) && args.length == 2)
+    if (verb.match(/get|head/i) && args.length == 2)
       args.splice(1, 0, null); // assume no data if head/get with two args (url, options)
 
     return new Promise(function(resolve, reject) {
@@ -274273,7 +274388,7 @@ module.exports = __webpack_require__(93419).YAML
 /***/ ((module) => {
 
 "use strict";
-module.exports = {"i8":"2.8.0"};
+module.exports = {"i8":"3.0.0"};
 
 /***/ }),