superagent 3.7.0 → 3.8.2

package/lib/node/parsers/image.js

@@ -1,12 +1,12 @@
 'use strict';
 
-module.exports = function(res, fn){
-  var data = []; // Binary data needs binary storage
+module.exports = (res, fn) => {
+  const data = []; // Binary data needs binary storage
 
-  res.on('data', function(chunk){
-      data.push(chunk);
+  res.on('data', chunk => {
+    data.push(chunk);
   });
-  res.on('end', function () {
-      fn(null, Buffer.concat(data));
+  res.on('end', () => {
+    fn(null, Buffer.concat(data));
   });
 };

package/lib/node/parsers/index.js

@@ -4,7 +4,7 @@ exports['application/x-www-form-urlencoded'] = require('./urlencoded');
 exports['application/json'] = require('./json');
 exports.text = require('./text');
 
-var binary = require('./image');
+const binary = require('./image');
 exports['application/octet-stream'] = binary;
 exports['application/pdf'] = binary;
 exports.image = binary;

package/lib/node/parsers/json.js

@@ -3,8 +3,10 @@
 module.exports = function parseJSON(res, fn){
   res.text = '';
   res.setEncoding('utf8');
-  res.on('data', function(chunk){ res.text += chunk;});
-  res.on('end', function(){
+  res.on('data', chunk => {
+    res.text += chunk;
+  });
+  res.on('end', () => {
     try {
       var body = res.text && JSON.parse(res.text);
     } catch (e) {

package/lib/node/parsers/text.js

@@ -3,6 +3,8 @@
 module.exports = function(res, fn){
   res.text = '';
   res.setEncoding('utf8');
-  res.on('data', function(chunk){ res.text += chunk; });
+  res.on('data', chunk => {
+    res.text += chunk;
+  });
   res.on('end', fn);
 };

package/lib/node/parsers/urlencoded.js

@@ -4,13 +4,15 @@
  * Module dependencies.
  */
 
-var qs = require('qs');
+const qs = require('qs');
 
 module.exports = function(res, fn){
   res.text = '';
   res.setEncoding('ascii');
-  res.on('data', function(chunk){ res.text += chunk; });
-  res.on('end', function(){
+  res.on('data', chunk => {
+    res.text += chunk;
+  });
+  res.on('end', () => {
     try {
       fn(null, qs.parse(res.text));
     } catch (err) {

package/lib/node/response.js

@@ -4,9 +4,9 @@
  * Module dependencies.
  */
 
-var util = require('util');
-var Stream = require('stream');
-var ResponseBase = require('../response-base');
+const util = require('util');
+const Stream = require('stream');
+const ResponseBase = require('../response-base');
 
 /**
  * Expose `Response`.
@@ -30,7 +30,7 @@ module.exports = Response;
 
 function Response(req) {
   Stream.call(this);
-  var res = this.res = req.res;
+  const res = (this.res = req.res);
   this.request = req;
   this.req = req.req;
   this.text = res.text;
@@ -54,7 +54,6 @@ function Response(req) {
 util.inherits(Response, Stream);
 ResponseBase(Response.prototype);
 
-
 /**
  * Implements methods of a `ReadableStream`
  */
@@ -86,13 +85,13 @@ Response.prototype.resume = function(){
  * @api public
  */
 
-Response.prototype.toError = function(){
-  var req = this.req;
-  var method = req.method;
-  var path = req.path;
+Response.prototype.toError = function() {
+  const req = this.req;
+  const method = req.method;
+  const path = req.path;
 
-  var msg = 'cannot ' + method + ' ' + path + ' (' + this.status + ')';
-  var err = new Error(msg);
+  const msg = `cannot ${method} ${path} (${this.status})`;
+  const err = new Error(msg);
   err.status = this.status;
   err.text = this.text;
   err.method = method;
@@ -114,11 +113,11 @@ Response.prototype.setStatusProperties = function(status){
  * @api public
  */
 
-Response.prototype.toJSON = function(){
+Response.prototype.toJSON = function() {
   return {
     req: this.request.toJSON(),
     header: this.header,
     status: this.status,
-    text: this.text
+    text: this.text,
   };
 };

package/lib/node/unzip.js

@@ -4,9 +4,9 @@
  * Module dependencies.
  */
 
-var StringDecoder = require('string_decoder').StringDecoder;
-var Stream = require('stream');
-var zlib = require('zlib');
+const StringDecoder = require('string_decoder').StringDecoder;
+const Stream = require('stream');
+const zlib = require('zlib');
 
 /**
  * Buffers response data events and re-emits when they're unzipped.
@@ -16,16 +16,17 @@ var zlib = require('zlib');
  * @api private
  */
 
-exports.unzip = function(req, res){
-  var unzip = zlib.createUnzip();
-  var stream = new Stream;
-  var decoder;
+exports.unzip = (req, res) => {
+  const unzip = zlib.createUnzip();
+  const stream = new Stream();
+  let decoder;
 
   // make node responseOnEnd() happy
   stream.req = req;
 
-  unzip.on('error', function(err){
-    if (err && err.code === 'Z_BUF_ERROR') { // unexpected end of file is ignored by browsers and curl
+  unzip.on('error', err => {
+    if (err && err.code === 'Z_BUF_ERROR') {
+      // unexpected end of file is ignored by browsers and curl
       stream.emit('end');
       return;
     }
@@ -36,27 +37,27 @@ exports.unzip = function(req, res){
   res.pipe(unzip);
 
   // override `setEncoding` to capture encoding
-  res.setEncoding = function(type){
+  res.setEncoding = type => {
     decoder = new StringDecoder(type);
   };
 
   // decode upon decompressing with captured encoding
-  unzip.on('data', function(buf){
+  unzip.on('data', buf => {
     if (decoder) {
-      var str = decoder.write(buf);
+      const str = decoder.write(buf);
       if (str.length) stream.emit('data', str);
     } else {
       stream.emit('data', buf);
     }
   });
 
-  unzip.on('end', function(){
+  unzip.on('end', () => {
     stream.emit('end');
   });
 
   // override `on` to capture data listeners
-  var _on = res.on;
-  res.on = function(type, fn){
+  const _on = res.on;
+  res.on = function(type, fn) {
     if ('data' == type || 'end' == type) {
       stream.on(type, fn);
     } else if ('error' == type) {

package/lib/request-base.js

@@ -143,19 +143,60 @@ RequestBase.prototype.timeout = function timeout(options){
  * Failed requests will be retried 'count' times if timeout or err.code >= 500.
  *
  * @param {Number} count
+ * @param {Function} [fn]
  * @return {Request} for chaining
  * @api public
  */
 
-RequestBase.prototype.retry = function retry(count){
+RequestBase.prototype.retry = function retry(count, fn){
   // Default to 1 if no count passed or true
   if (arguments.length === 0 || count === true) count = 1;
   if (count <= 0) count = 0;
   this._maxRetries = count;
   this._retries = 0;
+  this._retryCallback = fn;
   return this;
 };
 
+var ERROR_CODES = [
+  'ECONNRESET',
+  'ETIMEDOUT',
+  'EADDRINFO',
+  'ESOCKETTIMEDOUT'
+];
+
+/**
+ * Determine if a request should be retried.
+ * (Borrowed from segmentio/superagent-retry)
+ *
+ * @param {Error} err
+ * @param {Response} [res]
+ * @returns {Boolean}
+ */
+RequestBase.prototype._shouldRetry = function(err, res) {
+  if (!this._maxRetries || this._retries++ >= this._maxRetries) {
+    return false;
+  }
+  if (this._retryCallback) {
+    try {
+      var override = this._retryCallback(err, res);
+      if (override === true) return true;
+      if (override === false) return false;
+      // undefined falls back to defaults
+    } catch(e) {
+      console.error(e);
+    }
+  }
+  if (res && res.status && res.status >= 500 && res.status != 501) return true;
+  if (err) {
+    if (err.code && ~ERROR_CODES.indexOf(err.code)) return true;
+    // Superagent timeout
+    if (err.timeout && err.code == 'ECONNABORTED') return true;
+    if (err.crossDomain) return true;
+  }
+  return false;
+};
+
 /**
  * Retry request
  *
@@ -164,6 +205,7 @@ RequestBase.prototype.retry = function retry(count){
  */
 
 RequestBase.prototype._retry = function() {
+
   this.clearTimeout();
 
   // node
@@ -192,14 +234,15 @@ RequestBase.prototype.then = function then(resolve, reject) {
     if (this._endCalled) {
       console.warn("Warning: superagent request was sent twice, because both .end() and .then() were called. Never call .end() if you use promises");
     }
-    this._fullfilledPromise = new Promise(function(innerResolve, innerReject){
-      self.end(function(err, res){
-        if (err) innerReject(err); else innerResolve(res);
+    this._fullfilledPromise = new Promise(function(innerResolve, innerReject) {
+      self.end(function(err, res) {
+        if (err) innerReject(err);
+        else innerResolve(res);
       });
     });
   }
   return this._fullfilledPromise.then(resolve, reject);
-}
+};
 
 RequestBase.prototype.catch = function(cb) {
   return this.then(undefined, cb);
@@ -212,7 +255,7 @@ RequestBase.prototype.catch = function(cb) {
 RequestBase.prototype.use = function use(fn) {
   fn(this);
   return this;
-}
+};
 
 RequestBase.prototype.ok = function(cb) {
   if ('function' !== typeof cb) throw Error("Callback required");
@@ -232,7 +275,6 @@ RequestBase.prototype._isResponseOK = function(res) {
   return res.status >= 200 && res.status < 300;
 };
 
-
 /**
  * Get request header `field`.
  * Case-insensitive.
@@ -331,9 +373,8 @@ RequestBase.prototype.unset = function(field){
  * @api public
  */
 RequestBase.prototype.field = function(name, val) {
-
   // name should be either a string or an object.
-  if (null === name ||  undefined === name) {
+  if (null === name || undefined === name) {
     throw new Error('.field(name, val) name can not be empty');
   }
 
@@ -384,6 +425,24 @@ RequestBase.prototype.abort = function(){
   return this;
 };
 
+RequestBase.prototype._auth = function(user, pass, options, base64Encoder) {
+  switch (options.type) {
+    case 'basic':
+      this.set('Authorization', 'Basic ' + base64Encoder(user + ':' + pass));
+      break;
+
+    case 'auto':
+      this.username = user;
+      this.password = pass;
+      break;
+
+    case 'bearer': // usage would be .auth(accessToken, { type: 'bearer' })
+      this.set('Authorization', 'Bearer ' + user);
+      break;
+  }
+  return this;
+};
+
 /**
  * Enable transmission of cookies with x-domain requests.
  *
@@ -395,9 +454,9 @@ RequestBase.prototype.abort = function(){
  * @api public
  */
 
-RequestBase.prototype.withCredentials = function(on){
+RequestBase.prototype.withCredentials = function(on) {
   // This is browser-only functionality. Node side is no-op.
-  if(on==undefined) on = true;
+  if (on == undefined) on = true;
   this._withCredentials = on;
   return this;
 };
@@ -439,16 +498,15 @@ RequestBase.prototype.maxResponseSize = function(n){
  * @api public
  */
 
-RequestBase.prototype.toJSON = function(){
+RequestBase.prototype.toJSON = function() {
   return {
     method: this.method,
     url: this.url,
     data: this._data,
-    headers: this._header
+    headers: this._header,
   };
 };
 
-
 /**
  * Send `data` as the request body, defaulting the `.type()` to "json" when
  * an object is given.
@@ -536,7 +594,6 @@ RequestBase.prototype.send = function(data){
   return this;
 };
 
-
 /**
  * Sort `querystring` by the sort function
  *
@@ -634,4 +691,4 @@ RequestBase.prototype._setTimeouts = function() {
       self._timeoutError('Response timeout of ', self._responseTimeout, 'ETIMEDOUT');
     }, this._responseTimeout);
   }
-}
+};

package/lib/response-base.js

@@ -45,8 +45,8 @@ function mixin(obj) {
  * @api public
  */
 
-ResponseBase.prototype.get = function(field){
-    return this.header[field.toLowerCase()];
+ResponseBase.prototype.get = function(field) {
+  return this.header[field.toLowerCase()];
 };
 
 /**

package/lib/utils.js

@@ -57,12 +57,14 @@ exports.parseLinks = function(str){
  * @api private
  */
 
-exports.cleanHeader = function(header, shouldStripCookie){
+exports.cleanHeader = function(header, changesOrigin){
   delete header['content-type'];
   delete header['content-length'];
   delete header['transfer-encoding'];
   delete header['host'];
-  if (shouldStripCookie) {
+  // secuirty
+  if (changesOrigin) {
+    delete header['authorization'];
     delete header['cookie'];
   }
   return header;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "superagent",
-  "version": "3.7.0",
+  "version": "3.8.2",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
-    "prepublish": "make all",
+    "prepare": "make all",
     "test": "make test"
   },
   "keywords": [