change set header function, not call this.request() until call this.end()

Author: vicanso

lib/node/index.js

@@ -124,7 +124,9 @@ function Request(method, url) {
   this._formData = null;
   this.method = method;
   this.url = url;
-  this.header = {};
+  this.header = {
+    'User-Agent': 'node-superagent/' + pkg.version
+  };
   this.writable = true;
   this._redirects = 0;
   this.redirects(5);
@@ -271,7 +273,7 @@ Request.prototype.set = function(field, val){
   }
 
   debug('set %s "%s"', field, val);
-  this.request().setHeader(field, val);
+  this.header[field] = val;
   return this;
 };
 
@@ -291,7 +293,8 @@ Request.prototype.set = function(field, val){
 
 Request.prototype.unset = function(field){
   debug('unset %s', field);
-  this.request().removeHeader(field);
+
+  delete this.header[field];
   return this;
 };
 
@@ -304,7 +307,7 @@ Request.prototype.unset = function(field){
  */
 
 Request.prototype.get = function(field){
-  return this.request().getHeader(field);
+  return this.header[field];
 };
 
 /**
@@ -431,9 +434,7 @@ Request.prototype.query = function(val){
 
 Request.prototype.send = function(data){
   var obj = isObject(data);
-  var req = this.request();
-  var type = req.getHeader('Content-Type');
-
+  var type = this.get('Content-Type');
   // merge
   if (obj && isObject(this._data)) {
     for (var key in data) {
@@ -443,7 +444,7 @@ Request.prototype.send = function(data){
   } else if ('string' == typeof data) {
     // default to x-www-form-urlencoded
     if (!type) this.type('form');
-    type = req.getHeader('Content-Type');
+    type = this.get('Content-Type');
 
     // concat &
     if ('application/x-www-form-urlencoded' == type) {
@@ -637,6 +638,13 @@ Request.prototype.redirect = function(res){
 
   delete this.req;
 
+  // remove all add header except User-Agent
+  for (var key in this.header) {
+    if (key !== 'User-Agent') {
+      delete this.header[key]
+    }
+  }
+
   // redirect
   this.url = url;
   this._redirectList.push(url);
@@ -753,8 +761,9 @@ Request.prototype.request = function(){
   // add cookies
   if (this.cookies) req.setHeader('Cookie', this.cookies);
 
-  // set default UA
-  req.setHeader('User-Agent', 'node-superagent/' + pkg.version);
+  for (var key in this.header) {
+    req.setHeader(key, this.header[key]);
+  }
 
   return req;
 };
@@ -861,7 +870,7 @@ Request.prototype.end = function(fn){
 
     // content-length
     if (data && !req.getHeader('Content-Length')) {
-      this.set('Content-Length', Buffer.isBuffer(data) ? data.length : Buffer.byteLength(data));
+      req.setHeader('Content-Length', Buffer.isBuffer(data) ? data.length : Buffer.byteLength(data));
     }
   }
 

test/use.js

@@ -0,0 +1,32 @@
+var setup = require('./support/setup');
+var NODE = setup.NODE;
+var uri = setup.uri;
+
+var assert = require('assert');
+var request = require('../');
+
+describe('request', function(){
+  this.timeout(10000);
+  describe('use', function(){
+    it('should use plugin success', function(done){
+      var now = '' + Date.now();
+      function uuid(req){
+        req.set('X-UUID', now);
+        return req;
+      }
+      function prefix(req){
+        req.url = uri + req.url
+        return req;
+      }
+      request
+        .get('/echo')
+        .use(uuid)
+        .use(prefix)
+        .end(function(err, res){
+          assert(res.statusCode === 200);
+          assert.equal(res.get('X-UUID'), now);
+          done();
+        })
+    })
+  })
+})