superagent 3.5.1 → 3.6.0

package/lib/node/index.js

@@ -24,7 +24,6 @@ var zlib = require('zlib');
 var util = require('util');
 var pkg = require('../../package.json');
 var RequestBase = require('../request-base');
-var isFunction = require('../is-function');
 var shouldRetry = require('../should-retry');
 
 var request = exports = module.exports = function(method, url) {
@@ -144,7 +143,8 @@ function Request(method, url) {
   this.redirects(method === 'HEAD' ? 0 : 5);
   this.cookies = '';
   this.qs = {};
-  this.qsRaw = [];
+  this._query = [];
+  this.qsRaw = this._query; // Unused, for backwards compatibility only
   this._redirectList = [];
   this._streamRequest = false;
   this.once('end', this.clearTimeout.bind(this));
@@ -306,11 +306,10 @@ Request.prototype.accept = function(type){
 
 Request.prototype.query = function(val){
   if ('string' == typeof val) {
-    this.qsRaw.push(val);
-    return this;
+    this._query.push(val);
+  } else {
+    extend(this.qs, val);
   }
-
-  extend(this.qs, val);
   return this;
 };
 
@@ -452,7 +451,7 @@ Request.prototype._redirect = function(res){
   this._endCalled = false;
   this.url = url;
   this.qs = {};
-  this.qsRaw = [];
+  this._query.length = 0;
   this.set(headers);
   this.emit('redirect', res);
   this._redirectList.push(this.url);
@@ -485,12 +484,12 @@ Request.prototype.auth = function(user, pass, options){
   }
   switch (options.type) {
     case 'bearer':
-      return this.set('Authorization', 'Bearer ' + user);    
-      
+      return this.set('Authorization', 'Bearer ' + user);
+
     default: // 'basic'
       if (!~user.indexOf(':')) user = user + ':';
       var str = new Buffer(user + pass).toString('base64');
-      return this.set('Authorization', 'Basic ' + str);    
+      return this.set('Authorization', 'Basic ' + str);
   }
 };
 
@@ -529,7 +528,12 @@ Request.prototype.key = function(cert){
  */
 
 Request.prototype.pfx = function(cert){
-  this._pfx = cert;
+  if(typeof cert === 'object' && !Buffer.isBuffer(cert)){
+    this._pfx = cert.pfx;
+    this._passphrase = cert.passphrase;
+  } else {
+    this._pfx = cert;
+  }
   return this;
 };
 
@@ -558,6 +562,18 @@ Request.prototype.request = function(){
 
   var self = this;
   var options = {};
+
+  try {
+    var query = qs.stringify(this.qs, { indices: false, strictNullHandling: true });
+    if (query) {
+      this.qs = {};
+      this._query.push(query);
+    }
+    this._finalizeQueryString();
+  } catch (e) {
+    return this.emit('error', e);
+  }
+
   var url = this.url;
   var retries = this._retries;
 
@@ -573,18 +589,19 @@ Request.prototype.request = function(){
     // get the socket, path
     var unixParts = url.path.match(/^([^/]+)(.+)$/);
     options.socketPath = unixParts[1].replace(/%2F/g, '/');
-    url.pathname = unixParts[2];
+    url.path = unixParts[2];
   }
 
   // options
   options.method = this.method;
   options.port = url.port;
-  options.path = url.pathname;
+  options.path = url.path;
   options.host = url.hostname;
   options.ca = this._ca;
   options.key = this._key;
   options.pfx = this._pfx;
   options.cert = this._cert;
+  options.passphrase = this._passphrase;
   options.agent = this._agent;
 
   // initiate request
@@ -592,6 +609,10 @@ Request.prototype.request = function(){
 
   // request
   var req = this.req = mod.request(options);
+
+  // set tcp no delay
+  req.setNoDelay(true);
+
   if ('HEAD' != options.method) {
     req.setHeader('Accept-Encoding', 'gzip, deflate');
   }
@@ -621,10 +642,6 @@ Request.prototype.request = function(){
     this.auth(auth[0], auth[1]);
   }
 
-  // query
-  if (url.search)
-    this.query(url.search.substr(1));
-
   // add cookies
   if (this.cookies) req.setHeader('Cookie', this.cookies);
 
@@ -633,12 +650,6 @@ Request.prototype.request = function(){
       req.setHeader(key, this.header[key]);
   }
 
-  try {
-    this._appendQueryString(req);
-  } catch (e) {
-    return this.emit('error', e);
-  }
-
   return req;
 };
 
@@ -688,32 +699,6 @@ Request.prototype.callback = function(err, res){
   fn(err, res);
 };
 
-/**
- * Compose querystring to append to req.path
- *
- * @return {String} querystring
- * @api private
- */
-
-Request.prototype._appendQueryString = function(req){
-  var query = qs.stringify(this.qs, { indices: false, strictNullHandling: true });
-  query += ((query.length && this.qsRaw.length) ? '&' : '') + this.qsRaw.join('&');
-  req.path += query.length ? (~req.path.indexOf('?') ? '&' : '?') + query : '';
-
-  if (this._sort) {
-    var index = req.path.indexOf('?');
-    if (index >= 0) {
-      var queryArr = req.path.substring(index + 1).split('&');
-      if (isFunction(this._sort)) {
-        queryArr.sort(this._sort);
-      } else {
-        queryArr.sort();
-      }
-      req.path = req.path.substring(0, index) + '?' + queryArr.join('&');
-    }
-  }
-};
-
 /**
  * Check if `obj` is a host object,
  *
@@ -999,7 +984,13 @@ methods.forEach(function(method){
   request[name] = function(url, data, fn){
     var req = request(method, url);
     if ('function' == typeof data) fn = data, data = null;
-    if (data) req.send(data);
+    if (data) {
+      if (method === 'GET' || method === 'HEAD') {
+        req.query(data);
+      } else {
+        req.send(data);
+      }
+    }
     fn && req.end(fn);
     return req;
   };

package/lib/request-base.js

@@ -108,7 +108,7 @@ RequestBase.prototype.serialize = function serialize(fn){
  *
  * Value of 0 or false means no timeout.
  *
- * @param {Number|Object} ms or {response, read, deadline}
+ * @param {Number|Object} ms or {response, deadline}
  * @return {Request} for chaining
  * @api public
  */
@@ -554,6 +554,35 @@ RequestBase.prototype.sortQuery = function(sort) {
   return this;
 };
 
+/**
+ * Compose querystring to append to req.url
+ *
+ * @api private
+ */
+RequestBase.prototype._finalizeQueryString = function(){
+  var 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('?');
+    if (index >= 0) {
+      var queryArr = this.url.substring(index + 1).split('&');
+      if ('function' === typeof this._sort) {
+        queryArr.sort(this._sort);
+      } else {
+        queryArr.sort();
+      }
+      this.url = this.url.substring(0, index) + '?' + queryArr.join('&');
+    }
+  }
+};
+
+// For backwards compat only
+RequestBase.prototype._appendQueryString = function() {console.trace("Unsupported");}
+
 /**
  * Invoke callback with timeout error.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superagent",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "elegant & feature rich browser / node HTTP with a fluent API",
   "scripts": {
     "prepublish": "make all",
@@ -25,29 +25,29 @@
   },
   "dependencies": {
     "component-emitter": "^1.2.0",
-    "cookiejar": "^2.0.6",
-    "debug": "^2.2.0",
+    "cookiejar": "^2.1.0",
+    "debug": "^2.6.0",
     "extend": "^3.0.0",
     "form-data": "^2.1.1",
     "formidable": "^1.1.1",
     "methods": "^1.1.1",
-    "mime": "^1.3.4",
-    "qs": "^6.1.0",
+    "mime": "^1.3.6",
+    "qs": "^6.4.0",
     "readable-stream": "^2.0.5"
   },
   "devDependencies": {
-    "Base64": "^1.0.0",
+    "Base64": "^1.0.1",
     "basic-auth-connect": "^1.0.0",
-    "body-parser": "^1.15.0",
-    "browserify": "^14.0.0",
-    "cookie-parser": "^1.4.1",
-    "express": "^4.13.4",
-    "express-session": "^1.13.0",
-    "marked": "^0.3.5",
+    "body-parser": "^1.17.0",
+    "browserify": "^14.1.0",
+    "cookie-parser": "^1.4.3",
+    "express": "^4.15.2",
+    "express-session": "^1.15.0",
+    "marked": "^0.3.6",
     "mocha": "^3.1.2",
-    "multer": "^1.2.0",
-    "should": "^11.1.1",
-    "should-http": "^0.0.4",
+    "multer": "^1.3.0",
+    "should": "^11.2.0",
+    "should-http": "^0.1.1",
     "zuul": "^3.11.1"
   },
   "browser": {
@@ -61,6 +61,6 @@
   },
   "main": "./lib/node/index.js",
   "engines": {
-    "node": ">= 0.12"
+    "node": ">= 4.0"
   }
 }

package/superagent.js

@@ -1,21 +1,4 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.superagent = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-/**
- * Check if `fn` is a function.
- *
- * @param {Function} fn
- * @return {Boolean}
- * @api private
- */
-var isObject = require('./is-object');
-
-function isFunction(fn) {
-  var tag = isObject(fn) ? Object.prototype.toString.call(fn) : '';
-  return tag === '[object Function]';
-}
-
-module.exports = isFunction;
-
-},{"./is-object":2}],2:[function(require,module,exports){
 /**
  * Check if `obj` is an object.
  *
@@ -30,7 +13,7 @@ function isObject(obj) {
 
 module.exports = isObject;
 
-},{}],3:[function(require,module,exports){
+},{}],2:[function(require,module,exports){
 /**
  * Module of mixed-in functions shared between node and client code
  */
@@ -141,7 +124,7 @@ RequestBase.prototype.serialize = function serialize(fn){
  *
  * Value of 0 or false means no timeout.
  *
- * @param {Number|Object} ms or {response, read, deadline}
+ * @param {Number|Object} ms or {response, deadline}
  * @return {Request} for chaining
  * @api public
  */
@@ -587,6 +570,35 @@ RequestBase.prototype.sortQuery = function(sort) {
   return this;
 };
 
+/**
+ * Compose querystring to append to req.url
+ *
+ * @api private
+ */
+RequestBase.prototype._finalizeQueryString = function(){
+  var 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('?');
+    if (index >= 0) {
+      var queryArr = this.url.substring(index + 1).split('&');
+      if ('function' === typeof this._sort) {
+        queryArr.sort(this._sort);
+      } else {
+        queryArr.sort();
+      }
+      this.url = this.url.substring(0, index) + '?' + queryArr.join('&');
+    }
+  }
+};
+
+// For backwards compat only
+RequestBase.prototype._appendQueryString = function() {console.trace("Unsupported");}
+
 /**
  * Invoke callback with timeout error.
  *
@@ -623,7 +635,7 @@ RequestBase.prototype._setTimeouts = function() {
   }
 }
 
-},{"./is-object":2}],4:[function(require,module,exports){
+},{"./is-object":1}],3:[function(require,module,exports){
 
 /**
  * Module dependencies.
@@ -758,7 +770,7 @@ ResponseBase.prototype._setStatusProperties = function(status){
     this.notFound = 404 == status;
 };
 
-},{"./utils":6}],5:[function(require,module,exports){
+},{"./utils":5}],4:[function(require,module,exports){
 var ERROR_CODES = [
   'ECONNRESET',
   'ETIMEDOUT',
@@ -783,7 +795,7 @@ module.exports = function shouldRetry(err, res) {
   return false;
 };
 
-},{}],6:[function(require,module,exports){
+},{}],5:[function(require,module,exports){
 
 /**
  * Return the mime type for the given `str`.
@@ -852,7 +864,7 @@ exports.cleanHeader = function(header, shouldStripCookie){
   }
   return header;
 };
-},{}],7:[function(require,module,exports){
+},{}],6:[function(require,module,exports){
 
 /**
  * Expose `Emitter`.
@@ -1017,7 +1029,7 @@ Emitter.prototype.hasListeners = function(event){
   return !! this.listeners(event).length;
 };
 
-},{}],8:[function(require,module,exports){
+},{}],7:[function(require,module,exports){
 /**
  * Root reference for iframes.
  */
@@ -1035,7 +1047,6 @@ if (typeof window !== 'undefined') { // Browser window
 var Emitter = require('component-emitter');
 var RequestBase = require('./request-base');
 var isObject = require('./is-object');
-var isFunction = require('./is-function');
 var ResponseBase = require('./response-base');
 var shouldRetry = require('./should-retry');
 
@@ -1080,7 +1091,7 @@ request.getXHR = function () {
     try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}
     try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
   }
-  throw Error("Browser-only verison of superagent could not find XHR");
+  throw Error("Browser-only version of superagent could not find XHR");
 };
 
 /**
@@ -1190,7 +1201,7 @@ request.parseString = parseString;
 request.types = {
   html: 'text/html',
   json: 'application/json',
-  xml: 'application/xml',
+  xml: 'text/xml',
   urlencoded: 'application/x-www-form-urlencoded',
   'form': 'application/x-www-form-urlencoded',
   'form-data': 'application/x-www-form-urlencoded'
@@ -1546,10 +1557,10 @@ Request.prototype.auth = function(user, pass, options){
       this.username = user;
       this.password = pass;
     break;
-      
+
     case 'bearer': // usage would be .auth(accessToken, { type: 'bearer' })
       this.set('Authorization', 'Bearer ' + user);
-    break;  
+    break;
   }
   return this;
 };
@@ -1663,32 +1674,6 @@ Request.prototype.pipe = Request.prototype.write = function(){
   throw Error("Streaming is not supported in browser version of superagent");
 };
 
-/**
- * Compose querystring to append to req.url
- *
- * @api private
- */
-
-Request.prototype._appendQueryString = function(){
-  var query = this._query.join('&');
-  if (query) {
-    this.url += (this.url.indexOf('?') >= 0 ? '&' : '?') + query;
-  }
-
-  if (this._sort) {
-    var index = this.url.indexOf('?');
-    if (index >= 0) {
-      var queryArr = this.url.substring(index + 1).split('&');
-      if (isFunction(this._sort)) {
-        queryArr.sort(this._sort);
-      } else {
-        queryArr.sort();
-      }
-      this.url = this.url.substring(0, index) + '?' + queryArr.join('&');
-    }
-  }
-};
-
 /**
  * Check if `obj` is a host object,
  * we don't want to serialize these :)
@@ -1721,7 +1706,7 @@ Request.prototype.end = function(fn){
   this._callback = fn || noop;
 
   // querystring
-  this._appendQueryString();
+  this._finalizeQueryString();
 
   return this._end();
 };
@@ -1854,7 +1839,7 @@ request.get = function(url, data, fn){
 request.head = function(url, data, fn){
   var req = request('HEAD', url);
   if ('function' == typeof data) fn = data, data = null;
-  if (data) req.send(data);
+  if (data) req.query(data);
   if (fn) req.end(fn);
   return req;
 };
@@ -1952,5 +1937,5 @@ request.put = function(url, data, fn){
   return req;
 };
 
-},{"./is-function":1,"./is-object":2,"./request-base":3,"./response-base":4,"./should-retry":5,"component-emitter":7}]},{},[8])(8)
+},{"./is-object":1,"./request-base":2,"./response-base":3,"./should-retry":4,"component-emitter":6}]},{},[7])(7)
 });