From 5e262b06ed24183de7c34e4641bf45cda7877a88 Mon Sep 17 00:00:00 2001
From: Max Rozenoer <max@cloudinary.com>
Date: Thu, 6 Jun 2019 18:34:58 +0300
Subject: [PATCH 1/2] Handle WPT response data whether its JSON-encoded or not
 (apparently both can happen)

---
 package.json            |  2 +-
 wtp/wtpResultsParser.js | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 7f0a2b5..82474ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pagespeed-server",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "private": true,
   "scripts": {
     "start": "node app.js",
diff --git a/wtp/wtpResultsParser.js b/wtp/wtpResultsParser.js
index 19b7219..af5f467 100644
--- a/wtp/wtpResultsParser.js
+++ b/wtp/wtpResultsParser.js
@@ -11,6 +11,15 @@ const logger = require('../logger').logger;
 const url = require('url');
 const path = require('path');
 
+const conditionalJsonParse = (data, passes = 1) => {
+    for (var i = 0; i <= passes; i++) {
+      if (typeof data === 'string') {
+        data = JSON.parse(data);
+      }
+    }
+    return data;
+}
+
 const parseTestResults = (testJson) => {
   let rollBarMsg = {testId: testJson.data.id, analyzedUrl: testJson.data.testUrl, thirdPartyErrorCode: "", file: path.basename((__filename))};
   try {
@@ -20,12 +29,9 @@ const parseTestResults = (testJson) => {
       return {status: 'error', message: 'firefox'};
     }
     let imageList = _.get(testJson, config.get('wtp.paths.imageList'), _.get(testJson, config.get('wtp.paths.imageListFallback'), null));
-    for (var i = 0; i <= 1; i++) {
-      if (typeof imageList === 'string') {
-        imageList = JSON.parse(imageList);
-      }
-    }
-    let requestsData = _.get(testJson, config.get('wtp.paths.rawData'), null);
+    imageList = conditionalJsonParse(imageList, 2);
+
+    let requestsData = conditionalJsonParse(_.get(testJson, config.get('wtp.paths.rawData'), null));
     if (!imageList || !requestsData) {
       logger.error("WPT test data is missing information", rollBarMsg);
       return {status: 'error', message: 'wpt_failure'}
@@ -44,8 +50,8 @@ const parseTestResults = (testJson) => {
       return (head.toLowerCase().startsWith('user-agent: ') || head.toLowerCase().startsWith('accept: '));
     });
     let url = _.get(testJson, config.get('wtp.paths.url'));
-    let dpi = JSON.parse(_.get(testJson, config.get('wtp.paths.dpi')));
-    let resolution = JSON.parse(_.get(testJson, config.get('wtp.paths.resolution'), _.get(testJson, config.get('wtp.paths.resolutionFallback'))));
+    let dpi = conditionalJsonParse(_.get(testJson, config.get('wtp.paths.dpi')));
+    let resolution = conditionalJsonParse(_.get(testJson, config.get('wtp.paths.resolution'), _.get(testJson, config.get('wtp.paths.resolutionFallback'))));
     let viewportSize = resolution.viewport ? resolution.viewport : resolution.available;
     let screenShot = _.get(testJson, config.get('wtp.paths.screenShot'));
     let location = _.get(testJson, config.get('wtp.paths.location'));

From 1d797d9fa98b4d23aef761d56b54692429b3fd6d Mon Sep 17 00:00:00 2001
From: Max Rozenoer <max@cloudinary.com>
Date: Thu, 6 Jun 2019 21:06:41 +0300
Subject: [PATCH 2/2] off by one

---
 wtp/wtpResultsParser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wtp/wtpResultsParser.js b/wtp/wtpResultsParser.js
index af5f467..6dd2a8a 100644
--- a/wtp/wtpResultsParser.js
+++ b/wtp/wtpResultsParser.js
@@ -12,7 +12,7 @@ const url = require('url');
 const path = require('path');
 
 const conditionalJsonParse = (data, passes = 1) => {
-    for (var i = 0; i <= passes; i++) {
+    for (var i = 0; i < passes; i++) {
       if (typeof data === 'string') {
         data = JSON.parse(data);
       }