Merge pull request #18 from sideroad/master

Be able to use proxy

Author: marcelduran

lib/webpagetest.js

@@ -55,16 +55,25 @@ var filenames = {
 };
 
 // GET helper function
-function get(config, pathname, callback, encoding) {
+function get(config, pathname, proxy, callback, encoding) {
   var protocol = (config.protocol === 'https:' ? https : http),
-      options = {
+      options = proxy ? {
+        host: proxy.split(':')[0],
+        port: proxy.split(':')[1],
+        path: config.protocol+ '//' +config.hostname+':' + config.port+pathname,
+        headers: {
+          Host: config.hostname
+        }
+      } : 
+      {
         path: pathname,
         host: config.hostname,
-        port: config.port
+        port: config.port,
+        headers: {}
       };
 
   if (encoding !== 'binary') {
-    options.headers = {'accept-encoding': 'gzip,deflate'};
+    options.headers['accept-encoding'] = 'gzip,deflate';
   }
 
   return protocol.get(options, function getResponse(res) {
@@ -164,7 +173,7 @@ function api(pathname, callback, query, options) {
   } else {
 
     // make the real API call
-    get.call(this, config, pathname, function apiCallback(err, data, info) {
+    get.call(this, config, pathname, options.proxy, function apiCallback(err, data, info) {
       if (!err) {
         try {
           if (options.parser) {

package.json

@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "commander": "~2.1.0",
-    "mocha": "~1.17.0",
-    "xml2js": "~0.4.1",
     "csv": "~0.3.6",
-    "entities": "~0.3.0"
+    "entities": "~0.3.0",
+    "mocha": "~1.17.0",
+    "xml2js": "~0.4.1"
   },
   "devDependencies": {
     "nock": "~0.27.1"

test/proxy-test.js

@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2013, Twitter Inc.
+ * Copyright (c) 2014, Google Inc.
+ * Copyright (c) 2014, Marcel Duran and other contributors
+ * Released under the MIT License
+ */
+
+var assert = require('assert'),
+	http = require('http'),
+	url = require('url'),
+  WebPageTest = require('../lib/webpagetest'),
+  wpt = new WebPageTest();
+
+// proxy for test on 5432 port
+http.createServer(function(req, res) {
+  var requestUrl = url.parse(req.url);
+  var body = [];
+
+  req.on('data', function(data) {
+    body.push(data);
+  });
+  req.on('end', function() {
+    var orgreq = http.request({
+      host:    req.headers.host,
+      port:    requestUrl.port || 80,
+      path:    requestUrl.path,
+      method:  req.method,
+      headers: req.headers
+    },
+    function(orgres) {
+      res.writeHead(orgres.statusCode, orgres.headers);
+      orgres.on('data', function(chunk) {
+        res.write(chunk);
+      });
+      orgres.on('end', function() {
+        res.end();
+      });
+    });
+    if(body.length > 0) {
+      orgreq.write(body.join(''));
+    }
+    orgreq.end();
+  });
+}).listen(5432);
+
+describe('Run via proxy', function() {
+  describe('An Example WebPageTest Server', function() {
+
+    it('gets a test status request', function(done) {
+      wpt.getTestStatus('120816_V2_2', {
+      	proxy: 'localhost:5432'
+      }, function (err, data) {
+        if (err) return done(err);
+        assert.equal(data.data.id, '120816_V2_2');
+        done();
+      });
+    });
+  });
+});