Merge pull request #192 from punitx/support_content_encoding

Added support for content-encoding
browserstack · Dec 5, 2017 · 2e28f70 · 2e28f70
2 parents db935b0 + 4d87673
commit 2e28f70
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 20 deletions.
diff --git a/lib/proxy.js b/lib/proxy.js
@@ -13,13 +13,13 @@ var ProxyServer = {
     };
 
     var proxy = http.request(options, function (res) {
-      var data = '';
+      var chunks = [];
       res.on('data', function(chunk) {
-        data += chunk;
+        chunks.push(chunk);
       });
       res.on('end', function() {
         //Replace
-        callback(res, data);
+        callback(res, Buffer.concat(chunks));
       });
     }).on('error', function(e) {
       client_res.writeHead(500);

diff --git a/lib/server.js b/lib/server.js
@@ -13,7 +13,8 @@ var Log = require('./logger'),
   send = require('send'),
   vm = require('vm'),
   CircularJSON = require('circular-json'),
-  resolve = require('resolve');
+  resolve = require('resolve'),
+  zlib = require('zlib');
 
 exports.Server = function Server(bsClient, workers, config, callback) {
   var testFilePaths = (Array.isArray(config.test_path) ? config.test_path : [ config.test_path ])
@@ -205,25 +206,61 @@ exports.Server = function Server(bsClient, workers, config, callback) {
       response.end();
     };
 
+    var patchResponse = function (data, headers, callback) {
+      var mimeType = mime.lookup(filename);
+      var finalData = data;
+      if (mimeType === 'text/html') {
+        var matcher = /(.*)<\/head>/;
+        var patch = getReporterPatch();
+        finalData = data.replace(matcher, patch);
+        headers['content-length'] = finalData.length;
+      }
+      callback && callback(finalData, headers);
+    };
+
+    var checkForEncodingAndPatch = function (responseData, headers, callback) {
+      var encoding = headers['content-encoding'];
+      if (encoding === 'gzip') {
+        zlib.gunzip(responseData, function (err, decoded) {
+          if (!err) {
+            patchResponse(decoded && decoded.toString(), headers, function (data, headers) {
+              zlib.gzip(data, function (err, encoded) {
+                if (!err) {
+                  callback && callback(encoded, headers);
+                }
+              });
+            });
+          }
+        });
+      } else if (encoding === 'deflate') {
+        zlib.inflate(responseData, function (err, decoded) {
+          if (!err) {
+            patchResponse(decoded && decoded.toString(), headers, function (data, headers) {
+              zlib.deflate(data, function (err, encoded) {
+                if (!err) {
+                  callback && callback(encoded, headers);
+                }
+              });
+            });
+          }
+        });
+      } else {
+        patchResponse(responseData, headers, function (data, headers) {
+          callback && callback(data, headers);
+        });
+      }
+    };
+
     if (!doNotUseProxy && config.test_server) {
-      proxyServer.onRequest(request, response, config.test_server, function(remote_response, response_data) {
-        var mimeType = mime.lookup(filename);
-        var final_data = response_data;
+      proxyServer.onRequest(request, response, config.test_server, function (remote_response, response_data) {
         var headers = remote_response.headers;
-        if (mimeType === 'text/html') {
-          var matcher = /(.*)<\/head>/;
-          var patch = getReporterPatch();
-          final_data = response_data.replace(matcher, patch);
-          headers['content-length'] = final_data.length;
-        }
-        response.writeHead(remote_response.statusCode, headers);
-        response.write(final_data);
-        response.end();
-        return;
+        checkForEncodingAndPatch(response_data, headers, function (data, headers) {
+          response.writeHead(remote_response.statusCode, headers);
+          response.write(data);
+          response.end();
+        });
       });
-
     } else {
-
       fs.exists(filename, function(exists) {
         if (!exists) {
           sendError(response,'file not found', 404);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "browserstack-runner",
   "description": "A command line interface to run browser tests over BrowserStack",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "homepage": "https://github.com/browserstack/browserstack-runner",
   "repository": {
     "type": "git",