@constructor-io/constructorio-client-javascript 2.36.4 → 2.37.1

package/lib/utils/humanity-check.js

@@ -1,72 +1,63 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 /* eslint-disable class-methods-use-this */
 var store = require('./store');
-
 var botList = require('./botlist');
-
 var helpers = require('./helpers');
-
 var storageKey = '_constructorio_is_human';
 var humanEvents = ['scroll', 'resize', 'touchmove', 'mouseover', 'mousemove', 'keydown', 'keypress', 'keyup', 'focus'];
-
 var HumanityCheck = /*#__PURE__*/function () {
   function HumanityCheck() {
     var _this = this;
-
     (0, _classCallCheck2["default"])(this, HumanityCheck);
-    this.isHumanBoolean = this.getIsHumanFromSessionStorage(); // Humanity proved, remove handlers to prove humanity
+    this.isHumanBoolean = this.getIsHumanFromSessionStorage();
 
+    // Humanity proved, remove handlers to prove humanity
     var remove = function remove() {
       _this.isHumanBoolean = true;
       store.session.set(storageKey, true);
       humanEvents.forEach(function (eventType) {
         helpers.removeEventListener(eventType, remove, true);
       });
-    }; // Add handlers to prove humanity
-
+    };
 
+    // Add handlers to prove humanity
     if (!this.isHumanBoolean) {
       humanEvents.forEach(function (eventType) {
         helpers.addEventListener(eventType, remove, true);
       });
     }
   }
-
   (0, _createClass2["default"])(HumanityCheck, [{
     key: "getIsHumanFromSessionStorage",
     value: function getIsHumanFromSessionStorage() {
       return !!store.session.get(storageKey) || false;
-    } // Return boolean indicating if is human
+    }
 
+    // Return boolean indicating if is human
   }, {
     key: "isHuman",
     value: function isHuman() {
       return this.isHumanBoolean || !!store.session.get(storageKey);
-    } // Return boolean indicating if useragent matches botlist
+    }
 
+    // Return boolean indicating if useragent matches botlist
   }, {
     key: "isBot",
     value: function isBot() {
       if (this.getIsHumanFromSessionStorage()) {
         return false;
       }
-
       var _helpers$getNavigator = helpers.getNavigator(),
-          userAgent = _helpers$getNavigator.userAgent,
-          webdriver = _helpers$getNavigator.webdriver;
-
+        userAgent = _helpers$getNavigator.userAgent,
+        webdriver = _helpers$getNavigator.webdriver;
       var botRegex = new RegExp("(".concat(botList.join('|'), ")"));
       return Boolean(userAgent.match(botRegex)) || Boolean(webdriver);
     }
   }]);
   return HumanityCheck;
 }();
-
 module.exports = HumanityCheck;

package/lib/utils/request-queue.js

@@ -1,25 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 /* eslint-disable brace-style, no-unneeded-ternary */
 var store = require('./store');
-
 var HumanityCheck = require('./humanity-check');
-
 var helpers = require('./helpers');
-
+var _require = require('./helpers'),
+  requestContainsPii = _require.requestContainsPii;
 var storageKey = '_constructorio_requests';
 var requestTTL = 180000; // 3 minutes in milliseconds
-
 var RequestQueue = /*#__PURE__*/function () {
   function RequestQueue(options, eventemitter) {
     var _this = this;
-
     (0, _classCallCheck2["default"])(this, RequestQueue);
     this.options = options;
     this.eventemitter = eventemitter;
@@ -27,26 +21,27 @@ var RequestQueue = /*#__PURE__*/function () {
     this.requestPending = false;
     this.pageUnloading = false;
     this.sendTrackingEvents = options && options.sendTrackingEvents === true ? true : false; // Defaults to 'false'
-    // Mark if page environment is unloading
 
+    // Mark if page environment is unloading
     helpers.addEventListener('beforeunload', function () {
       _this.pageUnloading = true;
     });
-
     if (this.sendTrackingEvents) {
       this.send();
     }
-  } // Add request to queue to be dispatched
-
+  }
 
+  // Add request to queue to be dispatched
   (0, _createClass2["default"])(RequestQueue, [{
     key: "queue",
     value: function queue(url) {
       var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'GET';
       var body = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var networkParameters = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
       if (this.sendTrackingEvents && !this.humanity.isBot()) {
+        if (requestContainsPii(url, body)) {
+          return;
+        }
         var queue = RequestQueue.get();
         queue.push({
           url: url,
@@ -56,63 +51,59 @@ var RequestQueue = /*#__PURE__*/function () {
         });
         RequestQueue.set(queue);
       }
-    } // Read from queue and send events to server
+    }
 
+    // Read from queue and send events to server
   }, {
     key: "sendEvents",
     value: function sendEvents() {
       var _this2 = this;
-
       var fetch = this.options.fetch;
       var queue = RequestQueue.get();
-
-      if ( // Consider user "human" if no DOM context is available
+      if (
+      // Consider user "human" if no DOM context is available
       (!helpers.canUseDOM() || this.humanity.isHuman()) && !this.requestPending && !this.pageUnloading && queue.length) {
         var request;
         var nextInQueue = queue.shift();
         var _nextInQueue = nextInQueue,
-            networkParameters = _nextInQueue.networkParameters;
+          networkParameters = _nextInQueue.networkParameters;
         var signal;
         var instance = this;
         RequestQueue.set(queue);
-
         if (networkParameters && typeof AbortController === 'function') {
           var controller = new AbortController();
           signal = controller.signal;
           helpers.applyNetworkTimeout(this.options, networkParameters, controller);
-        } // Backwards compatibility with versions <= 2.0.0, can be removed in future
-        // - Request queue entries used to be strings with 'GET' method assumed
-
+        }
 
+        // Backwards compatibility with versions <= 2.0.0, can be removed in future
+        // - Request queue entries used to be strings with 'GET' method assumed
         if (typeof nextInQueue === 'string') {
           nextInQueue = {
             url: nextInQueue,
             method: 'GET'
           };
-        } // If events older than `requestTTL` exist in queue, clear request queue
+        }
+
+        // If events older than `requestTTL` exist in queue, clear request queue
         // - Prevents issue where stale items are sent in perpetuity
         // - No request should go unsent for longer than `requestTTL`
-
-
         if (nextInQueue.url) {
           // Pull `dt` parameter from URL, indicating origin time of request
           var dtMatch = nextInQueue.url.match(/\?.*_dt=([^&]+)/);
           var requestOriginTime = parseInt(dtMatch && dtMatch[1], 10);
           var now = +new Date();
-
           if (requestOriginTime && Number.isInteger(requestOriginTime) && now - requestOriginTime > requestTTL) {
             this.sendTrackingEvents = false;
             RequestQueue.remove();
             return;
           }
         }
-
         if (nextInQueue.method === 'GET') {
           request = fetch(nextInQueue.url, {
             signal: signal
           });
         }
-
         if (nextInQueue.method === 'POST') {
           request = fetch(nextInQueue.url, {
             method: nextInQueue.method,
@@ -124,7 +115,6 @@ var RequestQueue = /*#__PURE__*/function () {
             signal: signal
           });
         }
-
         if (request) {
           this.requestPending = true;
           request.then(function (response) {
@@ -137,11 +127,11 @@ var RequestQueue = /*#__PURE__*/function () {
                   message: 'ok'
                 });
               }
-
               _this2.requestPending = false;
-
               _this2.send();
-            } // Request was successful, but returned a non-2XX status code
+            }
+
+            // Request was successful, but returned a non-2XX status code
             else {
               response.json().then(function (json) {
                 if (instance.eventemitter) {
@@ -151,9 +141,7 @@ var RequestQueue = /*#__PURE__*/function () {
                     message: json && json.message
                   });
                 }
-
                 _this2.requestPending = false;
-
                 _this2.send();
               })["catch"](function (error) {
                 if (instance.eventemitter) {
@@ -163,9 +151,7 @@ var RequestQueue = /*#__PURE__*/function () {
                     message: error.type
                   });
                 }
-
                 _this2.requestPending = false;
-
                 _this2.send();
               });
             }
@@ -177,15 +163,14 @@ var RequestQueue = /*#__PURE__*/function () {
                 message: error && error.toString && error.toString()
               });
             }
-
             _this2.requestPending = false;
-
             _this2.send();
           });
         }
       }
-    } // Read from queue and send requests to server
+    }
 
+    // Read from queue and send requests to server
   }, {
     key: "send",
     value: function send() {
@@ -197,14 +182,16 @@ var RequestQueue = /*#__PURE__*/function () {
           setTimeout(this.sendEvents.bind(this), this.options && this.options.trackingSendDelay || 250);
         }
       }
-    } // Return current request queue
+    }
 
+    // Return current request queue
   }], [{
     key: "get",
     value: function get() {
       return store.local.get(storageKey) || [];
-    } // Update current request queue
+    }
 
+    // Update current request queue
   }, {
     key: "set",
     value: function set(queue) {
@@ -214,17 +201,18 @@ var RequestQueue = /*#__PURE__*/function () {
       } else {
         store.local.set(storageKey, queue);
       }
+      var localStorageQueue = RequestQueue.get();
 
-      var localStorageQueue = RequestQueue.get(); // Ensure storage queue was set correctly in storage by checking length
+      // Ensure storage queue was set correctly in storage by checking length
       // - Otherwise remove all pending requests as preventative measure
       // - Firefox seeing identical events being transmitted multiple times
-
       if (Array.isArray(localStorageQueue) && localStorageQueue.length !== queue.length) {
         this.sendTrackingEvents = false;
         RequestQueue.remove();
       }
-    } // Remove current request queue key
+    }
 
+    // Remove current request queue key
   }, {
     key: "remove",
     value: function remove() {
@@ -233,5 +221,4 @@ var RequestQueue = /*#__PURE__*/function () {
   }]);
   return RequestQueue;
 }();
-
 module.exports = RequestQueue;

package/lib/utils/store.js

@@ -1,10 +1,9 @@
 "use strict";
 
 var store = require('store2');
+var overflow = require('./store.overflow');
 
-var overflow = require('./store.overflow'); // Inject overflow into store
+// Inject overflow into store
 // https://raw.githubusercontent.com/nbubna/store/master/src/store.overflow.js
-
-
 overflow(store, store._);
 module.exports = store;

package/lib/utils/store.overflow.js

@@ -1,7 +1,6 @@
 "use strict";
 
 /* eslint-disable */
-
 /**
  * Copyright (c) 2013 ESHA Research
  * Dual licensed under the MIT and GPL licenses:
@@ -19,29 +18,24 @@
  */
 module.exports = function (store, _) {
   var _set = _.set,
-      _get = _.get,
-      _remove = _.remove,
-      _key = _.key,
-      _length = _.length,
-      _clear = _.clear;
-
+    _get = _.get,
+    _remove = _.remove,
+    _key = _.key,
+    _length = _.length,
+    _clear = _.clear;
   _.overflow = function (area, create) {
     var name = area === _.areas.local ? '+local+' : area === _.areas.session ? '+session+' : false;
-
     if (name) {
       var overflow = _.areas[name];
-
       if (create && !overflow) {
         overflow = store.area(name)._area; // area() copies to _.areas
       } else if (create === false) {
         delete _.areas[name];
         delete store[name];
       }
-
       return overflow;
     }
   };
-
   _.set = function (area, key, string) {
     try {
       _set.apply(this, arguments);
@@ -50,36 +44,26 @@ module.exports = function (store, _) {
         // the e.toString is needed for IE9 / IE10, cos name is empty there
         return _.set(_.overflow(area, true), key, string);
       }
-
       throw e;
     }
   };
-
   _.get = function (area, key) {
     var overflow = _.overflow(area);
-
     return overflow && _get.call(this, overflow, key) || _get.apply(this, arguments);
   };
-
   _.remove = function (area, key) {
     var overflow = _.overflow(area);
-
     if (overflow) {
       _remove.call(this, overflow, key);
     }
-
     _remove.apply(this, arguments);
   };
-
   _.key = function (area, i) {
     var overflow = _.overflow(area);
-
     if (overflow) {
       var l = _length.call(this, area);
-
       if (i >= l) {
         i = i - l; // make i overflow-relative
-
         for (var j = 0, m = _length.call(this, overflow); j < m; j++) {
           if (j === i) {
             // j is overflow index
@@ -88,20 +72,15 @@ module.exports = function (store, _) {
         }
       }
     }
-
     return _key.apply(this, arguments);
   };
-
   _.length = function (area) {
     var length = _length(area),
-        overflow = _.overflow(area);
-
+      overflow = _.overflow(area);
     return overflow ? length + _length(overflow) : length;
   };
-
   _.clear = function (area) {
     _.overflow(area, false);
-
     _clear.apply(this, arguments);
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-client-javascript",
-  "version": "2.36.4",
+  "version": "2.37.1",
   "description": "Constructor.io JavaScript client",
   "main": "lib/constructorio.js",
   "types": "lib/types/index.d.ts",