Merge pull request #14 from wneessen/dev

Dev

Author: Winni Neessen

dist/lib/websiteBenchConfig.d.ts.map

@@ -5,7 +5,7 @@ const process_1 = require("process");
 class WebsiteBenchConfig {
     constructor(confFiles, logObj) {
         this._configObj = {};
-        this._versionNum = '2.0.3b';
+        this._versionNum = '2.0.4';
         this._allowCaching = false;
         this._ignoreSslErrors = false;
         this._logResourceErrors = false;

dist/lib/websiteBenchConfig.js

@@ -81,12 +81,22 @@ class WebsiteBenchEvents extends events_1.EventEmitter {
                 });
                 const startTime = Date.now();
                 const perfObj = await this._browserObj.processPageWithBrowser(websiteEntry);
-                perfJson = perfObj.perfData;
-                this.sendDataToInflux(websiteEntry, perfJson, additionalTags);
-                perfResourceJson = perfObj.resourcePerfData;
-                perfResourceJson.forEach(perfResource => {
-                    this.sendDataToInflux(websiteEntry, perfResource, additionalTags);
-                });
+                if ('perfData' in perfObj && typeof perfObj.perfData !== 'undefined' && perfObj.perfData !== null) {
+                    perfJson = perfObj.perfData;
+                    this.sendDataToInflux(websiteEntry, perfJson, additionalTags);
+                }
+                else {
+                    this.logObj.warn('Request did not return any performance data. Not sending to InfluxDB');
+                }
+                if ('resourcePerfData' in perfObj && typeof perfObj.resourcePerfData !== 'undefined' && perfObj.resourcePerfData !== null) {
+                    perfResourceJson = perfObj.resourcePerfData;
+                    perfResourceJson.forEach(perfResource => {
+                        this.sendDataToInflux(websiteEntry, perfResource, additionalTags);
+                    });
+                }
+                else {
+                    this.logObj.warn('Request did not return any resource performance data. Not sending to InfluxDB');
+                }
                 const processingTime = Date.now() - startTime;
                 this.logObj.debug(`Performance check completed in ${processingTime / 1000} seconds`);
             }

dist/lib/websiteBenchEvents.d.ts.map

@@ -8,7 +8,7 @@ export default class WebsiteBenchConfig {
     private _configObj: IWebsiteBenchConfig = {};
 
     // Defaults config settings
-    private _versionNum = '2.0.3b';
+    private _versionNum = '2.0.4';
     private _allowCaching = false;
     private _ignoreSslErrors = false;
     private _logResourceErrors = false;

dist/lib/websiteBenchEvents.js

@@ -140,14 +140,24 @@ export default class WebsiteBenchEvents extends EventEmitter {
                 const perfObj = await this._browserObj.processPageWithBrowser(websiteEntry);
 
                 // Navigation page first
-                perfJson = perfObj.perfData;
-                this.sendDataToInflux(websiteEntry, perfJson, additionalTags);
+                if('perfData' in perfObj && typeof perfObj.perfData !== 'undefined' && perfObj.perfData !== null) {
+                    perfJson = perfObj.perfData;
+                    this.sendDataToInflux(websiteEntry, perfJson, additionalTags);
+                }
+                else {
+                    this.logObj.warn('Request did not return any performance data. Not sending to InfluxDB');
+                }
 
                 // Resource data next
-                perfResourceJson = perfObj.resourcePerfData;
-                perfResourceJson.forEach(perfResource => {
-                    this.sendDataToInflux(websiteEntry, perfResource, additionalTags);
-                })
+                if('resourcePerfData' in perfObj && typeof perfObj.resourcePerfData !== 'undefined' && perfObj.resourcePerfData !== null) {
+                    perfResourceJson = perfObj.resourcePerfData;
+                    perfResourceJson.forEach(perfResource => {
+                        this.sendDataToInflux(websiteEntry, perfResource, additionalTags);
+                    });
+                }
+                else {
+                    this.logObj.warn('Request did not return any resource performance data. Not sending to InfluxDB');
+                }
 
                 const processingTime = Date.now() - startTime;
                 this.logObj.debug(`Performance check completed in ${processingTime / 1000} seconds`);