Moving to module instead of cutomer buffer concatenation.

package.json

@@ -22,6 +22,7 @@
   ],
   "main": "index.js",
   "dependencies": {
+    "bl": "~0.9.0",
     "caseless": "~0.6.0",
     "forever-agent": "~0.5.0",
     "qs": "~1.2.0",
@@ -41,5 +42,8 @@
   },
   "scripts": {
     "test": "node tests/run.js"
+  },
+  "devDependencies": {
+    "rimraf": "~2.2.8"
   }
 }

request.js

@@ -10,6 +10,7 @@ var optional = require('./lib/optional')
   , crypto = require('crypto')
   , zlib = require('zlib')
 
+  , bl = require('bl')
   , oauth = optional('oauth-sign')
   , hawk = optional('hawk')
   , aws = optional('aws-sign2')
@@ -1002,11 +1003,12 @@ Request.prototype.onResponse = function (response) {
     dataStream.on("close", function () {self.emit("close")})
 
     if (self.callback) {
-      var buffer = []
-      var bodyLen = 0
+      var buffer = bl()
+        , strings = []
+        ;
       self.on("data", function (chunk) {
-        buffer.push(chunk)
-        bodyLen += chunk.length
+        if (Buffer.isBuffer(chunk)) buffer.append(chunk)
+        else strings.push(chunk)
       })
       self.on("end", function () {
         debug('end event', self.uri.href)
@@ -1015,26 +1017,22 @@ Request.prototype.onResponse = function (response) {
           return
         }
 
-        if (buffer.length && Buffer.isBuffer(buffer[0])) {
-          debug('has body', self.uri.href, bodyLen)
-          var body = new Buffer(bodyLen)
-          var i = 0
-          buffer.forEach(function (chunk) {
-            chunk.copy(body, i, 0, chunk.length)
-            i += chunk.length
-          })
+        if (buffer.length) {
+          debug('has body', self.uri.href)
           if (self.encoding === null) {
-            response.body = body
+            // response.body = buffer
+            // can't move to this until https://github.com/rvagg/bl/issues/13
+            response.body = buffer.slice()
           } else {
-            response.body = body.toString(self.encoding)
+            response.body = buffer.toString(self.encoding)
           }
-        } else if (buffer.length) {
+        } else if (strings.length) {
           // The UTF8 BOM [0xEF,0xBB,0xBF] is converted to [0xFE,0xFF] in the JS UTC16/UCS2 representation.
           // Strip this value out when the encoding is set to 'utf8', as upstream consumers won't expect it and it breaks JSON.parse().
-          if (self.encoding === 'utf8' && buffer[0].length > 0 && buffer[0][0] === "\uFEFF") {
-            buffer[0] = buffer[0].substring(1)
+          if (self.encoding === 'utf8' && strings[0].length > 0 && strings[0][0] === "\uFEFF") {
+            strings[0] = strings[0].substring(1)
           }
-          response.body = buffer.join('')
+          response.body = strings.join('')
         }
 
         if (self._json) {

tests/test-body.js

@@ -107,7 +107,7 @@ s.listen(s.port, function () {
       request(test, function (err, resp, body) {
         if (err) throw err
         if (test.expectBody) {
-          assert.deepEqual(test.expectBody, body)
+          if (Buffer.isBuffer(test.expectBody)) assert.deepEqual(test.expectBody.toString(), body.toString())
         }
         counter = counter - 1;
         if (counter === 0) {
@@ -119,4 +119,3 @@ s.listen(s.port, function () {
     })()
   }
 })
-

tests/test-params.js

@@ -78,7 +78,7 @@ s.listen(s.port, function () {
       request(s.url + '/' + i, test, function (err, resp, body) {
         if (err) throw err
         if (test.expectBody) {
-          assert.deepEqual(test.expectBody, body)
+          if (Buffer.isBuffer(test.expectBody))assert.deepEqual(test.expectBody.toString(), body.toString())
         }
         counter = counter - 1;
         if (counter === 0) {

tests/test-unix.js

@@ -2,13 +2,16 @@ var assert = require('assert')
   , request = require('../index')
   , http = require('http')
   , fs = require('fs')
+  , rimraf = require('rimraf')
   ;
-  
+
 var path = [null, 'test', 'path'].join('/');
 var socket = [__dirname, 'tmp-socket'].join('/');
 var body = 'connected';
 var statusCode = 200;
 
+rimraf.sync(socket)
+
 var s = http.createServer(function(req, res) {
   // Assert requested path is sent to server
   assert.equal(req.url, path);
@@ -19,13 +22,13 @@ var s = http.createServer(function(req, res) {
   request(['unix://', socket, path].join(''), function (error, response, response_body) {
     // Assert no error in connection
     assert.equal(error, null);
-    // Assert http success status code 
+    // Assert http success status code
     assert.equal(response.statusCode, statusCode);
     // Assert expected response body is recieved
     assert.equal(response_body, body);
     // clean up
     s.close();
     fs.unlink(socket, function(){});
   })
-  
-})
+
+})