superagent 2.0.0 → 2.3.0

package/lib/node/index.js

@@ -352,10 +352,7 @@ Request.prototype.pipe = function(stream, options){
     }
 
     self.res = res;
-    var response = new Response(self);
-    self.response = response;
-    self.emit('response', response);
-    response.redirects = self._redirectList;
+    self._emitResponse();
     if (self._aborted) return;
 
     if (self._shouldUnzip(res)) {
@@ -379,9 +376,7 @@ Request.prototype.pipe = function(stream, options){
  */
 
 Request.prototype.buffer = function(val){
-  this._buffer = false === val
-    ? false
-    : true;
+  this._buffer = (false !== val);
   return this;
 };
 
@@ -494,6 +489,32 @@ Request.prototype.ca = function(cert){
   return this;
 };
 
+/**
+ * Set the client certificate key option for https request.
+ *
+ * @param {Buffer | String} cert
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.key = function(cert){
+  this._key = cert;
+  return this;
+};
+
+/**
+ * Set the client certificate option for https request.
+ *
+ * @param {Buffer | String} cert
+ * @return {Request} for chaining
+ * @api public
+ */
+
+Request.prototype.cert = function(cert){
+  this._cert = cert;
+  return this;
+};
+
 /**
  * Return an http[s] request.
  *
@@ -519,6 +540,8 @@ Request.prototype.request = function(){
   options.path = url.pathname;
   options.host = url.hostname;
   options.ca = this._ca;
+  options.key = this._key;
+  options.cert = this._cert;
   options.agent = this._agent;
 
   // initiate request
@@ -616,7 +639,7 @@ Request.prototype.callback = function(err, res){
  */
 
 Request.prototype._appendQueryString = function(req){
-  var querystring = qs.stringify(this.qs, { indices: false });
+  var querystring = qs.stringify(this.qs, { indices: false, strictNullHandling: true });
   querystring += ((querystring.length && this.qsRaw.length) ? '&' : '') + this.qsRaw.join('&');
   req.path += querystring.length
     ? (~req.path.indexOf('?') ? '&' : '?') + querystring
@@ -632,6 +655,18 @@ Request.prototype._appendQueryString = function(req){
  * @api public
  */
 
+Request.prototype._emitResponse = function(body, files){
+    var response = new Response(this);
+    this.response = response;
+    response.redirects = this._redirectList;
+    if (undefined !== body) {
+      response.body = body;
+    }
+    response.files = files;
+    this.emit('response', response);
+    return response;
+};
+
 Request.prototype.end = function(fn){
   var self = this;
   var data = this._data;
@@ -658,6 +693,7 @@ Request.prototype.end = function(fn){
       var err = new Error('timeout of ' + timeout + 'ms exceeded');
       err.timeout = timeout;
       err.code = 'ECONNABORTED';
+      self.timedout = true;
       self.abort();
       self.callback(err);
     }, timeout);
@@ -691,10 +727,7 @@ Request.prototype.end = function(fn){
 
     var max = self._maxRedirects;
     var mime = utils.type(res.headers['content-type'] || '') || 'text/plain';
-    var len = res.headers['content-length'];
-    var type = mime.split('/');
-    var subtype = type[1];
-    var type = type[0];
+    var type = mime.split('/')[0];
     var multipart = 'multipart' == type;
     var redirect = isRedirect(res.statusCode);
     var parser = self._parser;
@@ -707,12 +740,8 @@ Request.prototype.end = function(fn){
     }
 
     if ('HEAD' == self.method) {
-      var response = new Response(self);
-      self.response = response;
-      response.redirects = self._redirectList;
-      self.emit('response', response);
-      self.callback(null, response);
       self.emit('end');
+      self.callback(null, self._emitResponse());
       return;
     }
 
@@ -721,64 +750,50 @@ Request.prototype.end = function(fn){
       utils.unzip(req, res);
     }
 
-
-    // don't buffer multipart
-    if (multipart) buffer = false;
-
-    // TODO: make all parsers take callbacks
-    if (!parser && multipart) {
-      var form = new formidable.IncomingForm;
-
-      form.parse(res, function(err, fields, files){
-        if (err) return self.callback(err);
-        var response = new Response(self);
-        self.response = response;
-        response.body = fields;
-        response.files = files;
-        response.redirects = self._redirectList;
-        self.emit('end');
-        self.callback(null, response);
-      });
-      return;
-    }
-
-    // check for images, one more special treatment
-    if (!parser && isImage(mime)) {
-      exports.parse.image(res, function(err, obj){
-        if (err) return self.callback(err);
-        var response = new Response(self);
-        self.response = response;
-        response.body = obj;
-        response.redirects = self._redirectList;
-        self.emit('end');
-        self.callback(null, response);
-      });
-      return;
+    if (!parser) {
+      if (multipart) {
+        var form = new formidable.IncomingForm();
+        parser = form.parse.bind(form);
+        buffer = true;
+      } else if (isImage(mime)) {
+        parser = exports.parse.image;
+        buffer = true; // For backwards-compatibility buffering default is ad-hoc MIME-dependent
+      } else if ('text' == type) {
+        parser = exports.parse.text;
+        buffer = (buffer !== false);
+      } else if (exports.parse[mime]) {
+        parser = exports.parse[mime];
+
+        // everyone wants their own white-labeled json
+      } else if (isJSON(mime)) {
+        parser = exports.parse['application/json'];
+        buffer = (buffer !== false);
+      } else if (buffer) {
+        parser = exports.parse.text;
+      }
     }
 
     // by default only buffer text/*, json and messed up thing from hell
-    if (null == buffer && isText(mime) || isJSON(mime)) buffer = true;
-
-    // parser
-    var parse = 'text' == type
-      ? exports.parse.text
-      : exports.parse[mime];
+    if (undefined === buffer && isText(mime) || isJSON(mime)) buffer = true;
 
-    // everyone wants their own white-labeled json
-    if (!parse && isJSON(mime)) parse = exports.parse['application/json'];
+    var parserHandlesEnd = false;
+    if (parser) {
+      try {
+        // Unbuffered parsers are supposed to emit response early,
+        // which is weird BTW, because response.body won't be there.
+        parserHandlesEnd = buffer;
 
-    // buffered response
-    if (buffer) parse = parse || exports.parse.text;
+        parser(res, function(err, obj, files) {
+          if (err && !self._aborted) {
+            return self.callback(err);
+          }
 
-    // explicit parser
-    if (parser) parse = parser;
+          res.body = obj; // Deprecated. For backwards compat only. It's not the response object user sees.
 
-    // parse
-    if (parse) {
-      try {
-        parse(res, function(err, obj){
-          if (err && !self._aborted) self.callback(err);
-          res.body = obj;
+          if (parserHandlesEnd) {
+            self.emit('end');
+            self.callback(null, self._emitResponse(obj, files));
+          }
         });
       } catch (err) {
         self.callback(err);
@@ -786,15 +801,12 @@ Request.prototype.end = function(fn){
       }
     }
 
+    self.res = res;
+
     // unbuffered
     if (!buffer) {
       debug('unbuffered %s %s', self.method, self.url);
-      self.res = res;
-      var response = new Response(self);
-      self.response = response;
-      response.redirects = self._redirectList;
-      self.emit('response', response);
-      self.callback(null, response);
+      self.callback(null, self._emitResponse());
       if (multipart) return // allow multipart to handle end event
       res.on('end', function(){
         debug('end %s %s', self.method, self.url);
@@ -804,19 +816,14 @@ Request.prototype.end = function(fn){
     }
 
     // terminating events
-    self.res = res;
     res.on('error', function(err){
       self.callback(err, null);
     });
-    res.on('end', function(){
+    if (!parserHandlesEnd) res.on('end', function(){
       debug('end %s %s', self.method, self.url);
       // TODO: unless buffering emit earlier to stream
-      var response = new Response(self);
-      self.response = response;
-      response.redirects = self._redirectList;
-      self.emit('response', response);
-      self.callback(null, response);
       self.emit('end');
+      self.callback(null, self._emitResponse());
     });
   });
 

package/lib/node/utils.js

@@ -83,6 +83,10 @@ exports.unzip = function(req, res){
   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
+      stream.emit('end');
+      return;
+    }
     stream.emit('error', err);
   });
 
@@ -119,6 +123,7 @@ exports.unzip = function(req, res){
     } else {
       _on.call(res, type, fn);
     }
+    return this;
   };
 };
 

package/lib/request-base.js

@@ -77,6 +77,10 @@ exports.then = function then(resolve, reject) {
   return this._fullfilledPromise.then(resolve, reject);
 }
 
+exports.catch = function(cb) {
+  return this.then(undefined, cb);
+};
+
 /**
  * Allow for extension
  */
@@ -166,21 +170,42 @@ exports.unset = function(field){
 };
 
 /**
- * Write the field `name` and `val` for "multipart/form-data"
- * request bodies.
+ * Write the field `name` and `val`, or multiple fields with one object
+ * for "multipart/form-data" request bodies.
  *
  * ``` js
  * request.post('/upload')
  *   .field('foo', 'bar')
  *   .end(callback);
+ *
+ * request.post('/upload')
+ *   .field({ foo: 'bar', baz: 'qux' })
+ *   .end(callback);
  * ```
  *
- * @param {String} name
+ * @param {String|Object} name
  * @param {String|Blob|File|Buffer|fs.ReadStream} val
  * @return {Request} for chaining
  * @api public
  */
 exports.field = function(name, val) {
+
+  // name should be either a string or an object.
+  if (null === name ||  undefined === name) {
+    throw new Error('.field(name, val) name can not be empty');
+  }
+
+  if (isObject(name)) {
+    for (var key in name) {
+      this.field(key, name[key]);
+    }
+    return this;
+  }
+
+  // val should be defined now
+  if (null === val || undefined === val) {
+    throw new Error('.field(name, val) val can not be empty');
+  }
   this._getFormData().append(name, val);
   return this;
 };
@@ -246,7 +271,8 @@ exports.toJSON = function(){
   return {
     method: this.method,
     url: this.url,
-    data: this._data
+    data: this._data,
+    headers: this._header
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superagent",
-  "version": "2.0.0",
+  "version": "2.3.0",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "prepublish": "make all",
@@ -31,7 +31,6 @@
     "methods": "^1.1.1",
     "cookiejar": "^2.0.6",
     "debug": "^2.2.0",
-    "reduce-component": "^1.0.1",
     "extend": "^3.0.0",
     "form-data": "1.0.0-rc4",
     "readable-stream": "^2.0.5"
@@ -54,7 +53,6 @@
   "browser": {
     "./lib/node/index.js": "./lib/client.js",
     "emitter": "component-emitter",
-    "reduce": "reduce-component",
     "./test/support/server.js": "./test/support/blank.js"
   },
   "component": {