superagent 3.8.1 → 4.0.0-beta.5

package/lib/request-base.js

@@ -3,7 +3,7 @@
 /**
  * Module of mixed-in functions shared between node and client code
  */
-var isObject = require('./is-object');
+const isObject = require('./is-object');
 
 /**
  * Expose `RequestBase`.
@@ -30,7 +30,7 @@ function RequestBase(obj) {
  */
 
 function mixin(obj) {
-  for (var key in RequestBase.prototype) {
+  for (const key in RequestBase.prototype) {
     obj[key] = RequestBase.prototype[key];
   }
   return obj;
@@ -122,7 +122,7 @@ RequestBase.prototype.timeout = function timeout(options){
     return this;
   }
 
-  for(var option in options) {
+  for(const option in options) {
     switch(option) {
       case 'deadline':
         this._timeout = options.deadline;
@@ -158,7 +158,7 @@ RequestBase.prototype.retry = function retry(count, fn){
   return this;
 };
 
-var ERROR_CODES = [
+const ERROR_CODES = [
   'ECONNRESET',
   'ETIMEDOUT',
   'EADDRINFO',
@@ -179,7 +179,7 @@ RequestBase.prototype._shouldRetry = function(err, res) {
   }
   if (this._retryCallback) {
     try {
-      var override = this._retryCallback(err, res);
+      const override = this._retryCallback(err, res);
       if (override === true) return true;
       if (override === false) return false;
       // undefined falls back to defaults
@@ -230,12 +230,13 @@ RequestBase.prototype._retry = function() {
 
 RequestBase.prototype.then = function then(resolve, reject) {
   if (!this._fullfilledPromise) {
-    var self = this;
+    const self = this;
     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) {
+    this._fullfilledPromise = new Promise((innerResolve, innerReject) => {
+      self.on('error', innerReject);
+      self.end((err, res) => {
         if (err) innerReject(err);
         else innerResolve(res);
       });
@@ -244,7 +245,7 @@ RequestBase.prototype.then = function then(resolve, reject) {
   return this._fullfilledPromise.then(resolve, reject);
 };
 
-RequestBase.prototype.catch = function(cb) {
+RequestBase.prototype['catch'] = function(cb) {
   return this.then(undefined, cb);
 };
 
@@ -325,7 +326,7 @@ RequestBase.prototype.getHeader = RequestBase.prototype.get;
 
 RequestBase.prototype.set = function(field, val){
   if (isObject(field)) {
-    for (var key in field) {
+    for (const key in field) {
       this.set(key, field[key]);
     }
     return this;
@@ -379,18 +380,18 @@ RequestBase.prototype.field = function(name, val) {
   }
 
   if (this._data) {
-    console.error(".field() can't be used if .send() is used. Please use only .send() or only .field() & .attach()");
+    throw new Error(".field() can't be used if .send() is used. Please use only .send() or only .field() & .attach()");
   }
 
   if (isObject(name)) {
-    for (var key in name) {
+    for (const key in name) {
       this.field(key, name[key]);
     }
     return this;
   }
 
   if (Array.isArray(val)) {
-    for (var i in val) {
+    for (const i in val) {
       this.field(name, val[i]);
     }
     return this;
@@ -428,7 +429,7 @@ RequestBase.prototype.abort = function(){
 RequestBase.prototype._auth = function(user, pass, options, base64Encoder) {
   switch (options.type) {
     case 'basic':
-      this.set('Authorization', 'Basic ' + base64Encoder(user + ':' + pass));
+      this.set('Authorization', `Basic ${base64Encoder(`${user}:${pass}`)}`);
       break;
 
     case 'auto':
@@ -437,7 +438,7 @@ RequestBase.prototype._auth = function(user, pass, options, base64Encoder) {
       break;
 
     case 'bearer': // usage would be .auth(accessToken, { type: 'bearer' })
-      this.set('Authorization', 'Bearer ' + user);
+      this.set('Authorization', `Bearer ${user}`);
       break;
   }
   return this;
@@ -548,11 +549,11 @@ RequestBase.prototype.toJSON = function() {
  */
 
 RequestBase.prototype.send = function(data){
-  var isObj = isObject(data);
-  var type = this._header['content-type'];
+  const isObj = isObject(data);
+  let type = this._header['content-type'];
 
   if (this._formData) {
-    console.error(".send() can't be used if .attach() or .field() is used. Please use only .send() or only .field() & .attach()");
+    throw new Error(".send() can't be used if .attach() or .field() is used. Please use only .send() or only .field() & .attach()");
   }
 
   if (isObj && !this._data) {
@@ -567,7 +568,7 @@ RequestBase.prototype.send = function(data){
 
   // merge
   if (isObj && isObject(this._data)) {
-    for (var key in data) {
+    for (const key in data) {
       this._data[key] = data[key];
     }
   } else if ('string' == typeof data) {
@@ -576,7 +577,7 @@ RequestBase.prototype.send = function(data){
     type = this._header['content-type'];
     if ('application/x-www-form-urlencoded' == type) {
       this._data = this._data
-        ? this._data + '&' + data
+        ? `${this._data}&${data}`
         : data;
     } else {
       this._data = (this._data || '') + data;
@@ -634,16 +635,16 @@ RequestBase.prototype.sortQuery = function(sort) {
  * @api private
  */
 RequestBase.prototype._finalizeQueryString = function(){
-  var query = this._query.join('&');
+  const query = this._query.join('&');
   if (query) {
     this.url += (this.url.indexOf('?') >= 0 ? '&' : '?') + query;
   }
   this._query.length = 0; // Makes the call idempotent
 
   if (this._sort) {
-    var index = this.url.indexOf('?');
+    const index = this.url.indexOf('?');
     if (index >= 0) {
-      var queryArr = this.url.substring(index + 1).split('&');
+      const queryArr = this.url.substring(index + 1).split('&');
       if ('function' === typeof this._sort) {
         queryArr.sort(this._sort);
       } else {
@@ -655,7 +656,7 @@ RequestBase.prototype._finalizeQueryString = function(){
 };
 
 // For backwards compat only
-RequestBase.prototype._appendQueryString = function() {console.trace("Unsupported");}
+RequestBase.prototype._appendQueryString = () => {console.trace("Unsupported");}
 
 /**
  * Invoke callback with timeout error.
@@ -667,7 +668,7 @@ RequestBase.prototype._timeoutError = function(reason, timeout, errno){
   if (this._aborted) {
     return;
   }
-  var err = new Error(reason + timeout + 'ms exceeded');
+  const err = new Error(`${reason + timeout}ms exceeded`);
   err.timeout = timeout;
   err.code = 'ECONNABORTED';
   err.errno = errno;
@@ -677,17 +678,17 @@ RequestBase.prototype._timeoutError = function(reason, timeout, errno){
 };
 
 RequestBase.prototype._setTimeouts = function() {
-  var self = this;
+  const self = this;
 
   // deadline
   if (this._timeout && !this._timer) {
-    this._timer = setTimeout(function(){
+    this._timer = setTimeout(() => {
       self._timeoutError('Timeout of ', self._timeout, 'ETIME');
     }, this._timeout);
   }
   // response timeout
   if (this._responseTimeout && !this._responseTimeoutTimer) {
-    this._responseTimeoutTimer = setTimeout(function(){
+    this._responseTimeoutTimer = setTimeout(() => {
       self._timeoutError('Response timeout of ', self._responseTimeout, 'ETIMEDOUT');
     }, this._responseTimeout);
   }

package/lib/response-base.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-var utils = require('./utils');
+const utils = require('./utils');
 
 /**
  * Expose `ResponseBase`.
@@ -31,7 +31,7 @@ function ResponseBase(obj) {
  */
 
 function mixin(obj) {
-  for (var key in ResponseBase.prototype) {
+  for (const key in ResponseBase.prototype) {
     obj[key] = ResponseBase.prototype[key];
   }
   return obj;
@@ -66,12 +66,12 @@ ResponseBase.prototype._setHeaderProperties = function(header){
     // TODO: make this a util
 
     // content-type
-    var ct = header['content-type'] || '';
+    const ct = header['content-type'] || '';
     this.type = utils.type(ct);
 
     // params
-    var params = utils.params(ct);
-    for (var key in params) this[key] = params[key];
+    const params = utils.params(ct);
+    for (const key in params) this[key] = params[key];
 
     this.links = {};
 
@@ -107,7 +107,7 @@ ResponseBase.prototype._setHeaderProperties = function(header){
  */
 
 ResponseBase.prototype._setStatusProperties = function(status){
-    var type = status / 100 | 0;
+    const type = status / 100 | 0;
 
     // status / class
     this.status = this.statusCode = status;
@@ -124,6 +124,7 @@ ResponseBase.prototype._setStatusProperties = function(status){
         : false;
 
     // sugar
+    this.created = 201 == status;
     this.accepted = 202 == status;
     this.noContent = 204 == status;
     this.badRequest = 400 == status;
@@ -131,4 +132,5 @@ ResponseBase.prototype._setStatusProperties = function(status){
     this.notAcceptable = 406 == status;
     this.forbidden = 403 == status;
     this.notFound = 404 == status;
+    this.unprocessableEntity = 422 == status;
 };

package/lib/utils.js

@@ -8,9 +8,7 @@
  * @api private
  */
 
-exports.type = function(str){
-  return str.split(/ *; */).shift();
-};
+exports.type = str => str.split(/ *; */).shift();
 
 /**
  * Return header field parameters.
@@ -20,16 +18,14 @@ exports.type = function(str){
  * @api private
  */
 
-exports.params = function(str){
-  return str.split(/ *; */).reduce(function(obj, str){
-    var parts = str.split(/ *= */);
-    var key = parts.shift();
-    var val = parts.shift();
+exports.params = str => str.split(/ *; */).reduce((obj, str) => {
+  const parts = str.split(/ *= */);
+  const key = parts.shift();
+  const val = parts.shift();
 
-    if (key && val) obj[key] = val;
-    return obj;
-  }, {});
-};
+  if (key && val) obj[key] = val;
+  return obj;
+}, {});
 
 /**
  * Parse Link header fields.
@@ -39,15 +35,13 @@ exports.params = function(str){
  * @api private
  */
 
-exports.parseLinks = function(str){
-  return str.split(/ *, */).reduce(function(obj, str){
-    var parts = str.split(/ *; */);
-    var url = parts[0].slice(1, -1);
-    var rel = parts[1].split(/ *= */)[1].slice(1, -1);
-    obj[rel] = url;
-    return obj;
-  }, {});
-};
+exports.parseLinks = str => str.split(/ *, */).reduce((obj, str) => {
+  const parts = str.split(/ *; */);
+  const url = parts[0].slice(1, -1);
+  const rel = parts[1].split(/ *= */)[1].slice(1, -1);
+  obj[rel] = url;
+  return obj;
+}, {});
 
 /**
  * Strip content related fields from `header`.
@@ -57,7 +51,7 @@ exports.parseLinks = function(str){
  * @api private
  */
 
-exports.cleanHeader = function(header, changesOrigin){
+exports.cleanHeader = (header, changesOrigin) => {
   delete header['content-type'];
   delete header['content-length'];
   delete header['transfer-encoding'];

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "superagent",
-  "version": "3.8.1",
+  "version": "4.0.0-beta.5",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "prepare": "make all",
-    "test": "make test"
+    "test": "make test",
+    "test-http2": "make test-node-http2"
   },
   "keywords": [
     "http",
@@ -25,30 +26,32 @@
   },
   "dependencies": {
     "component-emitter": "^1.2.0",
-    "cookiejar": "^2.1.0",
-    "debug": "^3.1.0",
-    "extend": "^3.0.0",
-    "form-data": "^2.3.1",
-    "formidable": "^1.1.1",
+    "cookiejar": "^2.1.2",
+    "debug": "^4.0.0",
+    "form-data": "^2.3.2",
+    "formidable": "^1.2.0",
     "methods": "^1.1.1",
-    "mime": "^1.4.1",
+    "mime": "^2.0.3",
     "qs": "^6.5.1",
-    "readable-stream": "^2.0.5"
+    "readable-stream": "^3.0.3"
   },
   "devDependencies": {
     "Base64": "^1.0.1",
+    "babel-core": "^6.26.3",
+    "babel-preset-es2015": "^6.24.1",
+    "babelify": "^8.0.0",
     "basic-auth-connect": "^1.0.0",
     "body-parser": "^1.18.2",
-    "browserify": "^14.1.0",
+    "browserify": "^16.2.0",
     "cookie-parser": "^1.4.3",
-    "express": "^4.16.0",
+    "express": "^4.16.3",
     "express-session": "^1.15.6",
-    "marked": "^0.3.6",
+    "marked": "^0.5.0",
     "mocha": "^3.5.3",
     "multer": "^1.3.0",
-    "should": "^11.2.0",
+    "should": "^13.2.0",
     "should-http": "^0.1.1",
-    "zuul": "^3.11.1"
+    "zuul": "^3.12.0"
   },
   "browser": {
     "./lib/node/index.js": "./lib/client.js",
@@ -61,6 +64,6 @@
   },
   "main": "./lib/node/index.js",
   "engines": {
-    "node": ">= 4.0"
+    "node": ">= 6.0"
   }
 }