superagent 10.2.3 → 10.4.0

package/dist/superagent.js

@@ -1585,9 +1585,11 @@ var parseValues = function parseQueryStringValues(str, options) {
       val = options.strictNullHandling ? null : '';
     } else {
       key = options.decoder(part.slice(0, pos), defaults.decoder, charset, 'key');
-      val = utils.maybeMap(parseArrayValue(part.slice(pos + 1), options, isArray(obj[key]) ? obj[key].length : 0), function (encodedVal) {
-        return options.decoder(encodedVal, defaults.decoder, charset, 'value');
-      });
+      if (key !== null) {
+        val = utils.maybeMap(parseArrayValue(part.slice(pos + 1), options, isArray(obj[key]) ? obj[key].length : 0), function (encodedVal) {
+          return options.decoder(encodedVal, defaults.decoder, charset, 'value');
+        });
+      }
     }
     if (val && options.interpretNumericEntities && charset === 'iso-8859-1') {
       val = interpretNumericEntities(String(val));
@@ -1595,11 +1597,13 @@ var parseValues = function parseQueryStringValues(str, options) {
     if (part.indexOf('[]=') > -1) {
       val = isArray(val) ? [val] : val;
     }
-    var existing = has.call(obj, key);
-    if (existing && options.duplicates === 'combine') {
-      obj[key] = utils.combine(obj[key], val);
-    } else if (!existing || options.duplicates === 'last') {
-      obj[key] = val;
+    if (key !== null) {
+      var existing = has.call(obj, key);
+      if (existing && options.duplicates === 'combine') {
+        obj[key] = utils.combine(obj[key], val, options.arrayLimit, options.plainObjects);
+      } else if (!existing || options.duplicates === 'last') {
+        obj[key] = val;
+      }
     }
   }
   return obj;
@@ -1615,7 +1619,11 @@ var parseObject = function (chain, val, options, valuesParsed) {
     var obj;
     var root = chain[i];
     if (root === '[]' && options.parseArrays) {
-      obj = options.allowEmptyArrays && (leaf === '' || options.strictNullHandling && leaf === null) ? [] : utils.combine([], leaf);
+      if (utils.isOverflow(leaf)) {
+        obj = leaf;
+      } else {
+        obj = options.allowEmptyArrays && (leaf === '' || options.strictNullHandling && leaf === null) ? [] : utils.combine([], leaf, options.arrayLimit, options.plainObjects);
+      }
     } else {
       obj = options.plainObjects ? {
         __proto__: null
@@ -1638,14 +1646,19 @@ var parseObject = function (chain, val, options, valuesParsed) {
   }
   return leaf;
 };
-var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesParsed) {
-  if (!givenKey) {
-    return;
-  }
+var splitKeyIntoSegments = function splitKeyIntoSegments(givenKey, options) {
   var key = options.allowDots ? givenKey.replace(/\.([^.[]+)/g, '[$1]') : givenKey;
+  if (options.depth <= 0) {
+    if (!options.plainObjects && has.call(Object.prototype, key)) {
+      if (!options.allowPrototypes) {
+        return;
+      }
+    }
+    return [key];
+  }
   var brackets = /(\[[^[\]]*])/;
   var child = /(\[[^[\]]*])/g;
-  var segment = options.depth > 0 && brackets.exec(key);
+  var segment = brackets.exec(key);
   var parent = segment ? key.slice(0, segment.index) : key;
   var keys = [];
   if (parent) {
@@ -1657,9 +1670,10 @@ var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesPars
     keys.push(parent);
   }
   var i = 0;
-  while (options.depth > 0 && (segment = child.exec(key)) !== null && i < options.depth) {
+  while ((segment = child.exec(key)) !== null && i < options.depth) {
     i += 1;
-    if (!options.plainObjects && has.call(Object.prototype, segment[1].slice(1, -1))) {
+    var segmentContent = segment[1].slice(1, -1);
+    if (!options.plainObjects && has.call(Object.prototype, segmentContent)) {
       if (!options.allowPrototypes) {
         return;
       }
@@ -1672,6 +1686,16 @@ var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesPars
     }
     keys.push('[' + key.slice(segment.index) + ']');
   }
+  return keys;
+};
+var parseKeys = function parseQueryStringKeys(givenKey, val, options, valuesParsed) {
+  if (!givenKey) {
+    return;
+  }
+  var keys = splitKeyIntoSegments(givenKey, options);
+  if (!keys) {
+    return;
+  }
   return parseObject(keys, val, options, valuesParsed);
 };
 var normalizeParseOptions = function normalizeParseOptions(opts) {
@@ -1993,8 +2017,23 @@ module.exports = function (object, opts) {
 'use strict';
 
 var formats = require('./formats');
+var getSideChannel = require('side-channel');
 var has = Object.prototype.hasOwnProperty;
 var isArray = Array.isArray;
+var overflowChannel = getSideChannel();
+var markOverflow = function markOverflow(obj, maxIndex) {
+  overflowChannel.set(obj, maxIndex);
+  return obj;
+};
+var isOverflow = function isOverflow(obj) {
+  return overflowChannel.has(obj);
+};
+var getMaxIndex = function getMaxIndex(obj) {
+  return overflowChannel.get(obj);
+};
+var setMaxIndex = function setMaxIndex(obj, maxIndex) {
+  overflowChannel.set(obj, maxIndex);
+};
 var hexTable = function () {
   var array = [];
   for (var i = 0; i < 256; ++i) {
@@ -2036,7 +2075,11 @@ var merge = function merge(target, source, options) {
     if (isArray(target)) {
       target.push(source);
     } else if (target && typeof target === 'object') {
-      if (options && (options.plainObjects || options.allowPrototypes) || !has.call(Object.prototype, source)) {
+      if (isOverflow(target)) {
+        var newIndex = getMaxIndex(target) + 1;
+        target[newIndex] = source;
+        setMaxIndex(target, newIndex);
+      } else if (options && (options.plainObjects || options.allowPrototypes) || !has.call(Object.prototype, source)) {
         target[source] = true;
       }
     } else {
@@ -2045,6 +2088,20 @@ var merge = function merge(target, source, options) {
     return target;
   }
   if (!target || typeof target !== 'object') {
+    if (isOverflow(source)) {
+      var sourceKeys = Object.keys(source);
+      var result = options && options.plainObjects ? {
+        __proto__: null,
+        0: target
+      } : {
+        0: target
+      };
+      for (var m = 0; m < sourceKeys.length; m++) {
+        var oldKey = parseInt(sourceKeys[m], 10);
+        result[oldKey + 1] = source[sourceKeys[m]];
+      }
+      return markOverflow(result, getMaxIndex(source) + 1);
+    }
     return [target].concat(source);
   }
   var mergeTarget = target;
@@ -2175,8 +2232,20 @@ var isBuffer = function isBuffer(obj) {
   }
   return !!(obj.constructor && obj.constructor.isBuffer && obj.constructor.isBuffer(obj));
 };
-var combine = function combine(a, b) {
-  return [].concat(a, b);
+var combine = function combine(a, b, arrayLimit, plainObjects) {
+  if (isOverflow(a)) {
+    var newIndex = getMaxIndex(a) + 1;
+    a[newIndex] = b;
+    setMaxIndex(a, newIndex);
+    return a;
+  }
+  var result = [].concat(a, b);
+  if (result.length > arrayLimit) {
+    return markOverflow(arrayToObject(result, {
+      plainObjects: plainObjects
+    }), result.length - 1);
+  }
+  return result;
 };
 var maybeMap = function maybeMap(val, fn) {
   if (isArray(val)) {
@@ -2196,12 +2265,13 @@ module.exports = {
   decode: decode,
   encode: encode,
   isBuffer: isBuffer,
+  isOverflow: isOverflow,
   isRegExp: isRegExp,
   maybeMap: maybeMap,
   merge: merge
 };
 
-},{"./formats":40}],45:[function(require,module,exports){
+},{"./formats":40,"side-channel":48}],45:[function(require,module,exports){
 'use strict';
 
 var inspect = require('object-inspect');
@@ -2556,13 +2626,14 @@ request.types = {
   'form-data': 'application/x-www-form-urlencoded'
 };
 request.serialize = {
-  'application/x-www-form-urlencoded': obj => {
-    return qs.stringify(obj, {
+  'application/x-www-form-urlencoded'(object) {
+    return qs.stringify(object, {
       indices: false,
       strictNullHandling: true
     });
   },
-  'application/json': safeStringify
+  'application/json': safeStringify,
+  'application/csp-report': safeStringify
 };
 request.parse = {
   'application/x-www-form-urlencoded': parseString,
@@ -2608,8 +2679,10 @@ function Response(request_) {
   this._setHeaderProperties(this.header);
   if (this.text === null && request_._responseType) {
     this.body = this.xhr.response;
+  } else if (this.req.method === 'HEAD') {
+    this.body = null;
   } else {
-    this.body = this.req.method === 'HEAD' ? null : this._parseBody(this.text ? this.text : this.xhr.response);
+    this.body = this._parseBody(this.text || this.xhr.response);
   }
 }
 mixin(Response.prototype, ResponseBase.prototype);
@@ -2659,7 +2732,7 @@ function Request(method, url) {
       error.original = err;
       if (self.xhr) {
         error.rawResponse = typeof self.xhr.responseType === 'undefined' ? self.xhr.responseText : self.xhr.response;
-        error.status = self.xhr.status ? self.xhr.status : null;
+        error.status = self.xhr.status || null;
         error.statusCode = error.status;
       } else {
         error.rawResponse = null;
@@ -2707,12 +2780,17 @@ Request.prototype.auth = function (user, pass, options) {
       type: typeof btoa === 'function' ? 'basic' : 'auto'
     };
   }
-  const encoder = options.encoder ? options.encoder : string => {
-    if (typeof btoa === 'function') {
-      return btoa(string);
-    }
-    throw new Error('Cannot use basic auth, btoa is not a function');
-  };
+  let {
+    encoder
+  } = options;
+  if (!encoder) {
+    encoder = string => {
+      if (typeof btoa === 'function') {
+        return btoa(string);
+      }
+      throw new Error('Cannot use basic auth, btoa is not a function');
+    };
+  }
   return this._auth(user, pass, options, encoder);
 };
 Request.prototype.query = function (value) {
@@ -2855,18 +2933,30 @@ Request.prototype._end = function () {
     }
     if (serialize) data = serialize(data);
   }
-  for (const field in this.header) {
-    if (this.header[field] === null) continue;
-    if (hasOwn(this.header, field)) xhr.setRequestHeader(field, this.header[field]);
-  }
-  if (this._responseType) {
-    xhr.responseType = this._responseType;
+  try {
+    for (const field in this.header) {
+      if (this.header[field] === null) continue;
+      if (hasOwn(this.header, field)) xhr.setRequestHeader(field, this.header[field]);
+    }
+    if (this._responseType) {
+      xhr.responseType = this._responseType;
+    }
+    this.emit('request', this);
+    xhr.send(typeof data === 'undefined' ? null : data);
+  } catch (err) {
+    try {
+      xhr.abort();
+    } catch (err) {}
+    return this.callback(err);
   }
-  this.emit('request', this);
-  xhr.send(typeof data === 'undefined' ? null : data);
 };
-request.agent = () => new Agent();
-for (const method of ['GET', 'POST', 'OPTIONS', 'PATCH', 'PUT', 'DELETE']) {
+const proxyAgent = new Proxy(Agent, {
+  apply(target, thisArg, argumentsList) {
+    return new target(...argumentsList);
+  }
+});
+request.agent = proxyAgent;
+for (const method of ['GET', 'HEAD', 'POST', 'OPTIONS', 'PATCH', 'PUT', 'DELETE']) {
   Agent.prototype[method.toLowerCase()] = function (url, fn) {
     const request_ = new request.Request(method, url);
     this._setDefaults(request_);
@@ -3054,7 +3144,7 @@ RequestBase.prototype.then = function (resolve, reject) {
     }
     this._fullfilledPromise = new Promise((resolve, reject) => {
       self.on('abort', () => {
-        if (this._maxRetries && this._maxRetries > this._retries) {
+        if (this.timedout && this._maxRetries && this._maxRetries > this._retries) {
           return;
         }
         if (this.timedout && this.timedoutError) {
@@ -3301,7 +3391,7 @@ ResponseBase.prototype._setHeaderProperties = function (header) {
   this.type = utils.type(ct);
   const parameters = utils.params(ct);
   for (const key in parameters) {
-    if (Object.prototype.hasOwnProperty.call(parameters, key)) this[key] = parameters[key];
+    if (Object.prototype.hasOwnProperty.call(parameters, key) && !(key in this)) this[key] = parameters[key];
   }
   this.links = {};
   try {
@@ -3349,8 +3439,14 @@ exports.parseLinks = value => {
   for (const string_ of value.split(/ *, */)) {
     const parts = string_.split(/ *; */);
     const url = parts[0].slice(1, -1);
-    const rel = parts[1].split(/ *= */)[1].slice(1, -1);
-    object[rel] = url;
+    for (const part of parts.slice(1)) {
+      const [key, keyValue] = part.split(/ *= */, 2);
+      if (key && key.toLowerCase() === 'rel' && keyValue) {
+        const relationship = keyValue.replace(/^"|"$/g, '');
+        if (relationship) object[relationship] = url;
+        break;
+      }
+    }
   }
   return object;
 };
@@ -3366,17 +3462,17 @@ exports.cleanHeader = (header, changesOrigin) => {
   return header;
 };
 exports.normalizeHostname = hostname => {
-  const [, normalized] = hostname.match(/^\[([^\]]+)\]$/) || [];
+  const [, normalized] = hostname.match(/^\[([^\]]+)]$/) || [];
   return normalized || hostname;
 };
 exports.isObject = object => {
   return object !== null && typeof object === 'object';
 };
 exports.hasOwn = Object.hasOwn || function (object, property) {
-  if (object == null) {
+  if (object === null || object === undefined) {
     throw new TypeError('Cannot convert undefined or null to object');
   }
-  return Object.prototype.hasOwnProperty.call(new Object(object), property);
+  return Object.prototype.hasOwnProperty.call(Object(object), property);
 };
 exports.mixin = (target, source) => {
   for (const key in source) {
@@ -3386,10 +3482,10 @@ exports.mixin = (target, source) => {
   }
 };
 exports.isGzipOrDeflateEncoding = res => {
-  return new RegExp(/^\s*(?:deflate|gzip)\s*$/).test(res.headers['content-encoding']);
+  return /^\s*(?:deflate|gzip)\s*$/.test(res.headers['content-encoding']);
 };
 exports.isBrotliEncoding = res => {
-  return new RegExp(/^\s*(?:br)\s*$/).test(res.headers['content-encoding']);
+  return /^\s*br\s*$/.test(res.headers['content-encoding']);
 };
 
 },{}]},{},[50])(50)