Merge pull request #1 from speedtracker/v1.0.1

Improve error handling

Author: eduardoboucas

lib/SpeedTracker.js

@@ -66,7 +66,9 @@ SpeedTracker.prototype._getRemoteFile = function (file) {
 }
 
 SpeedTracker.prototype._processBudgets = function (profileData, result) {
-  if (!profileData.budgets) return Promise.resolve(true)
+  if (!profileData.budgets || !(profileData.budgets instanceof Array)) {
+    return Promise.resolve(true)
+  }
 
   let infractorsByAlert = {}
 
@@ -128,27 +130,47 @@ SpeedTracker.prototype._processSchedule = function (profile, schedule) {
   return Promise.resolve(null)
 }
 
-SpeedTracker.prototype._runWptTest = function (url, parameters) {
+SpeedTracker.prototype._runWptTest = function (url, parameters, callback) {
   return new Promise((resolve, reject) => {
-    this.wpt.runTest(url, parameters, (err, response) => {
+    const wptResult = this.wpt.runTest(url, parameters, (err, response) => {
     //require('fs').readFile('result.json', (err, data) => {
     //    const response = JSON.parse(data)
       if (err) return reject(err)
 
-      resolve(response)
+      if (!response.statusCode || (response.statusCode !== 200)) {
+        return reject(response)
+      }
+
+      const interval = setInterval(() => {
+        this.wpt.getTestResults(response.data.testId, (err, results) => {
+          // Check for errors
+          if (err || (results.statusCode >= 300)) {
+            return clearInterval(interval)
+          }
+
+          // Check for completion
+          if ((results.statusCode >= 200) && (results.statusCode < 300)) {
+            clearInterval(interval)
+
+            return callback(results)
+          }
+        })
+      }, 5000)
+
+      return resolve(response)
     })
   })
 }
 
 SpeedTracker.prototype._saveTest = function (profile, content, isScheduled) {
-  let date = new Date(content.date * 1000)
-  let year = date.getFullYear()
-  let month = Utils.padWithZeros(date.getMonth() + 1, 2)
-  let day = Utils.padWithZeros(date.getDate(), 2)
+  const date = new Date(content.date * 1000)
+  const year = date.getFullYear()
+  const month = Utils.padWithZeros(date.getMonth() + 1, 2)
+  const day = Utils.padWithZeros(date.getDate(), 2)
 
-  let path = `results/${profile}/${year}/${month}.json`
+  const path = `results/${profile}/${year}/${month}.json`
 
-  let message = isScheduled ? 'Scheduled SpeedTracker test' : 'Add SpeedTracker test'
+  const message = `Add SpeedTracker test (${isScheduled ? 'scheduled' : 'manual'})`
 
   return this._getRemoteFile(path).then(data => {
     try {
@@ -262,10 +284,11 @@ SpeedTracker.prototype.init = function () {
 }
 
 SpeedTracker.prototype.initWpt = function () {
-  let wptUrl = this.config.wptUrl || config.get('wpt.url')
+  let wptUrl = this.config.wptUrl ? Utils.decrypt(this.config.wptUrl, this.options.key) : config.get('wpt.url')
   let wptKey = this.config.wptKey ? Utils.decrypt(this.config.wptKey, this.options.key) : config.get('wpt.key')
 
   this.wpt = new WebPageTest(wptUrl, wptKey)
+  this.wptUrl = wptUrl
 }
 
 SpeedTracker.prototype.runTest = function (profile, isScheduled) {
@@ -276,8 +299,7 @@ SpeedTracker.prototype.runTest = function (profile, isScheduled) {
 
   let overrides = {
     firstViewOnly: true,
-    pollResults: 5,
-    video: true,
+    video: true
   }
 
   return this.init().then(() => {
@@ -293,26 +315,23 @@ SpeedTracker.prototype.runTest = function (profile, isScheduled) {
 
     if (!parameters.url) return Promise.reject('NO_URL')
 
-    // Override WPT URL
-    if (this.config.wptUrl) {
-      parameters.server = this.config.wptUrl
-    }    
-
     let url = parameters.url
     delete parameters.url
 
     return this.options.scheduler.find(profileData._nwo, profileData._id).then(schedule => {
       const runTest = !isScheduled || (profileData.interval && (profileData.interval === schedule.interval))
 
+      let queue = Promise.resolve(true)
+
       if (runTest) {
-        this._runWptTest(url, parameters).then(response => {
+        queue = this._runWptTest(url, parameters, response => {
           this._buildResult(response.data).then(result => {
             // Save test
             this._saveTest(profile, result, isScheduled)
 
             // Process budgets
             this._processBudgets(profileData, result)
-          })        
+          })
         })
 
         // Track event
@@ -324,13 +343,21 @@ SpeedTracker.prototype.runTest = function (profile, isScheduled) {
         })
       }
 
-      return this._processSchedule(profileData, schedule).then(nextRun => {
-        const response = {
-          success: runTest,
-          nextRun
-        }
+      return queue.then(testResult => {
+        return this._processSchedule(profileData, schedule).then(nextRun => {
+          let response = {
+            success: runTest,
+            nextRun
+          }
+
+          if (testResult.data && testResult.data.testId) {
+            response.testId = testResult.data.testId
+          }
 
-        return response
+          return response
+        })
+      }).catch(err => {
+        return Promise.reject(Utils.buildError('WPT_ERROR', err.statusText))
       })
     })
   })

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "speedtracker-app",
-  "version": "1.0.0",
+  "name": "speedtracker-api",
+  "version": "1.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {