From 997d89bb9d26db9dc641a69cf8fa1c4f08e0a1b3 Mon Sep 17 00:00:00 2001
From: Piotr Popieluch <piotr1212@gmail.com>
Date: Wed, 2 Sep 2015 21:06:35 +0200
Subject: [PATCH] update stream-to-buffer to raw-body, stream-to-buffer is
 deprecated

---
 index.js     |  6 +++---
 package.json |  2 +-
 test/test.js | 26 +++++++++++++-------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/index.js b/index.js
index 1eb62fe..7b12101 100644
--- a/index.js
+++ b/index.js
@@ -31,7 +31,7 @@ var HttpProxyAgent = require('http-proxy-agent');
 var HttpsProxyAgent = require('https-proxy-agent');
 var SocksProxyAgent = require('socks-proxy-agent');
 var PacResolver = require('pac-resolver');
-var toBuffer = require('stream-to-buffer');
+var getRawBody = require('raw-body');
 var inherits = require('util').inherits;
 var debug = require('debug')('pac-proxy-agent');
 
@@ -158,13 +158,13 @@ PacProxyAgent.prototype.loadPacFile = function (fn) {
     if (err) return fn(err);
     debug('got stream.Readable instance for URI');
     self.cache = rs;
-    toBuffer(rs, onbuffer);
+    getRawBody(rs, 'utf8', onbuffer);
   }
 
   function onbuffer (err, buf) {
     if (err) return fn(err);
     debug('read %o byte PAC file from URI', buf.length);
-    fn(null, buf.toString('utf8'));
+    fn(null, buf);
   }
 };
 
diff --git a/package.json b/package.json
index f1dbff7..4345a82 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "https-proxy-agent": "1",
     "pac-resolver": "~1.2.1",
     "socks-proxy-agent": "2",
-    "stream-to-buffer": "0.1.0"
+    "raw-body": "2"
   },
   "devDependencies": {
     "mocha": "2",
diff --git a/test/test.js b/test/test.js
index a58fcff..0fe5f52 100644
--- a/test/test.js
+++ b/test/test.js
@@ -8,7 +8,7 @@ var url = require('url');
 var http = require('http');
 var https = require('https');
 var assert = require('assert');
-var toBuffer = require('stream-to-buffer');
+var getRawBody = require('raw-body');
 var Proxy = require('proxy');
 var socks = require('socksv5');
 var PacProxyAgent = require('../');
@@ -144,9 +144,9 @@ describe('PacProxyAgent', function () {
       opts.agent = agent;
 
       var req = http.get(opts, function (res) {
-        toBuffer(res, function (err, buf) {
+        getRawBody(res, 'utf8', function (err, buf) {
           if (err) return done(err);
-          var data = JSON.parse(buf.toString('utf8'));
+          var data = JSON.parse(buf);
           assert.equal('127.0.0.1:' + httpPort, data.host);
           assert('via' in data);
           done();
@@ -173,9 +173,9 @@ describe('PacProxyAgent', function () {
       opts.agent = agent;
 
       var req = http.get(opts, function (res) {
-        toBuffer(res, function (err, buf) {
+        getRawBody(res, 'utf8', function (err, buf) {
           if (err) return done(err);
-          var data = JSON.parse(buf.toString('utf8'));
+          var data = JSON.parse(buf);
           assert.equal('127.0.0.1:' + httpPort, data.host);
           assert('via' in data);
           done();
@@ -200,9 +200,9 @@ describe('PacProxyAgent', function () {
       opts.agent = agent;
 
       var req = http.get(opts, function (res) {
-        toBuffer(res, function (err, buf) {
+        getRawBody(res, 'utf8', function (err, buf) {
           if (err) return done(err);
-          var data = JSON.parse(buf.toString('utf8'));
+          var data = JSON.parse(buf);
           assert.equal('127.0.0.1:' + httpPort, data.host);
           done();
         });
@@ -231,9 +231,9 @@ describe('PacProxyAgent', function () {
       opts.rejectUnauthorized = false;
 
       var req = https.get(opts, function (res) {
-        toBuffer(res, function (err, buf) {
+        getRawBody(res, 'utf8', function (err, buf) {
           if (err) return done(err);
-          var data = JSON.parse(buf.toString('utf8'));
+          var data = JSON.parse(buf);
           assert.equal('127.0.0.1:' + httpsPort, data.host);
           done();
         });
@@ -262,9 +262,9 @@ describe('PacProxyAgent', function () {
       opts.rejectUnauthorized = false;
 
       var req = https.get(opts, function (res) {
-        toBuffer(res, function (err, buf) {
+        getRawBody(res, 'utf8', function (err, buf) {
           if (err) return done(err);
-          var data = JSON.parse(buf.toString('utf8'));
+          var data = JSON.parse(buf);
           assert.equal('127.0.0.1:' + httpsPort, data.host);
           assert(gotReq);
           done();
@@ -292,9 +292,9 @@ describe('PacProxyAgent', function () {
       opts.rejectUnauthorized = false;
 
       var req = https.get(opts, function (res) {
-        toBuffer(res, function (err, buf) {
+        getRawBody(res, 'utf8', function (err, buf) {
           if (err) return done(err);
-          var data = JSON.parse(buf.toString('utf8'));
+          var data = JSON.parse(buf);
           assert.equal('127.0.0.1:' + httpsPort, data.host);
           assert(gotReq);
           done();
-- 
2.4.3