@constructor-io/constructorio-client-javascript 2.21.0 → 2.25.2

package/lib/utils/humanity-check.js

@@ -1,10 +1,10 @@
 "use strict";
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
 /* eslint-disable class-methods-use-this */
 var store = require('../utils/store');
@@ -20,9 +20,8 @@ var HumanityCheck = /*#__PURE__*/function () {
   function HumanityCheck() {
     var _this = this;
 
-    _classCallCheck(this, HumanityCheck);
-
-    this.isHumanBoolean = !!store.session.get(storageKey) || false; // Humanity proved, remove handlers to prove humanity
+    (0, _classCallCheck2["default"])(this, HumanityCheck);
+    this.isHumanBoolean = this.getIsHumanFromSessionStorage(); // Humanity proved, remove handlers to prove humanity
 
     var remove = function remove() {
       _this.isHumanBoolean = true;
@@ -38,10 +37,15 @@ var HumanityCheck = /*#__PURE__*/function () {
         helpers.addEventListener(eventType, remove, true);
       });
     }
-  } // Return boolean indicating if is human
+  }
 
+  (0, _createClass2["default"])(HumanityCheck, [{
+    key: "getIsHumanFromSessionStorage",
+    value: function getIsHumanFromSessionStorage() {
+      return !!store.session.get(storageKey) || false;
+    } // Return boolean indicating if is human
 
-  _createClass(HumanityCheck, [{
+  }, {
     key: "isHuman",
     value: function isHuman() {
       return this.isHumanBoolean || !!store.session.get(storageKey);
@@ -50,6 +54,10 @@ var HumanityCheck = /*#__PURE__*/function () {
   }, {
     key: "isBot",
     value: function isBot() {
+      if (this.getIsHumanFromSessionStorage()) {
+        return false;
+      }
+
       var _helpers$getNavigator = helpers.getNavigator(),
           userAgent = _helpers$getNavigator.userAgent,
           webdriver = _helpers$getNavigator.webdriver;
@@ -58,7 +66,6 @@ var HumanityCheck = /*#__PURE__*/function () {
       return Boolean(userAgent.match(botRegex)) || Boolean(webdriver);
     }
   }]);
-
   return HumanityCheck;
 }();
 

package/lib/utils/request-queue.js

@@ -1,10 +1,10 @@
 "use strict";
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
 /* eslint-disable brace-style, no-unneeded-ternary */
 var fetchPonyfill = require('fetch-ponyfill');
@@ -23,8 +23,7 @@ var RequestQueue = /*#__PURE__*/function () {
   function RequestQueue(options, eventemitter) {
     var _this = this;
 
-    _classCallCheck(this, RequestQueue);
-
+    (0, _classCallCheck2["default"])(this, RequestQueue);
     this.options = options;
     this.eventemitter = eventemitter;
     this.humanity = new HumanityCheck();
@@ -43,7 +42,7 @@ var RequestQueue = /*#__PURE__*/function () {
   } // Add request to queue to be dispatched
 
 
-  _createClass(RequestQueue, [{
+  (0, _createClass2["default"])(RequestQueue, [{
     key: "queue",
     value: function queue(url) {
       var method = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'GET';
@@ -60,104 +59,112 @@ var RequestQueue = /*#__PURE__*/function () {
         });
         RequestQueue.set(queue);
       }
-    } // Read from queue and send requests to server
+    } // Read from queue and send events to server
 
   }, {
-    key: "send",
-    value: function send() {
+    key: "sendEvents",
+    value: function sendEvents() {
       var _this2 = this;
 
-      if (this.sendTrackingEvents) {
-        // Defer sending of events to give beforeunload time to register (avoids race condition)
-        setTimeout(function () {
-          var fetch = _this2.options && _this2.options.fetch || fetchPonyfill({
-            Promise: Promise
-          }).fetch;
-          var queue = RequestQueue.get();
-
-          if ( // Consider user "human" if no DOM context is available
-          (!helpers.canUseDOM() || _this2.humanity.isHuman()) && !_this2.requestPending && !_this2.pageUnloading && queue.length) {
-            var request;
-            var nextInQueue = queue.shift();
-            var _nextInQueue = nextInQueue,
-                networkParameters = _nextInQueue.networkParameters;
-            var signal;
-
-            if (networkParameters) {
-              var controller = new AbortController();
-              signal = controller.signal;
-              helpers.applyNetworkTimeout(_this2.options, networkParameters, controller);
-            }
-
-            RequestQueue.set(queue); // 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 (nextInQueue.method === 'GET') {
-              request = fetch(nextInQueue.url, {
-                signal: signal
-              });
-            }
-
-            if (nextInQueue.method === 'POST') {
-              request = fetch(nextInQueue.url, {
+      var fetch = this.options && this.options.fetch || fetchPonyfill({
+        Promise: Promise
+      }).fetch;
+      var queue = RequestQueue.get();
+
+      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;
+        var signal;
+
+        if (networkParameters) {
+          var controller = new AbortController();
+          signal = controller.signal;
+          helpers.applyNetworkTimeout(this.options, networkParameters, controller);
+        }
+
+        RequestQueue.set(queue); // 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 (nextInQueue.method === 'GET') {
+          request = fetch(nextInQueue.url, {
+            signal: signal
+          });
+        }
+
+        if (nextInQueue.method === 'POST') {
+          request = fetch(nextInQueue.url, {
+            method: nextInQueue.method,
+            body: JSON.stringify(nextInQueue.body),
+            mode: 'cors',
+            headers: {
+              'Content-Type': 'text/plain'
+            },
+            signal: signal
+          });
+        }
+
+        if (request) {
+          this.requestPending = true;
+          var instance = this;
+          request.then(function (response) {
+            // Request was successful, and returned a 2XX status code
+            if (response.ok) {
+              instance.eventemitter.emit('success', {
+                url: nextInQueue.url,
                 method: nextInQueue.method,
-                body: JSON.stringify(nextInQueue.body),
-                mode: 'cors',
-                headers: {
-                  'Content-Type': 'text/plain'
-                },
-                signal: signal
+                message: 'ok'
               });
-            }
-
-            if (request) {
-              _this2.requestPending = true;
-              var instance = _this2;
-              request.then(function (response) {
-                // Request was successful, and returned a 2XX status code
-                if (response.ok) {
-                  instance.eventemitter.emit('success', {
-                    url: nextInQueue.url,
-                    method: nextInQueue.method,
-                    message: 'ok'
-                  });
-                } // Request was successful, but returned a non-2XX status code
-                else {
-                  response.json().then(function (json) {
-                    instance.eventemitter.emit('error', {
-                      url: nextInQueue.url,
-                      method: nextInQueue.method,
-                      message: json && json.message
-                    });
-                  })["catch"](function (error) {
-                    instance.eventemitter.emit('error', {
-                      url: nextInQueue.url,
-                      method: nextInQueue.method,
-                      message: error.type
-                    });
-                  });
-                }
+            } // Request was successful, but returned a non-2XX status code
+            else {
+              response.json().then(function (json) {
+                instance.eventemitter.emit('error', {
+                  url: nextInQueue.url,
+                  method: nextInQueue.method,
+                  message: json && json.message
+                });
               })["catch"](function (error) {
                 instance.eventemitter.emit('error', {
                   url: nextInQueue.url,
                   method: nextInQueue.method,
-                  message: error.toString()
+                  message: error.type
                 });
-              })["finally"](function () {
-                _this2.requestPending = false;
-
-                _this2.send();
               });
             }
-          }
-        }, this.options && this.options.trackingSendDelay || 250);
+          })["catch"](function (error) {
+            instance.eventemitter.emit('error', {
+              url: nextInQueue.url,
+              method: nextInQueue.method,
+              message: error.toString()
+            });
+          })["finally"](function () {
+            _this2.requestPending = false;
+
+            _this2.send();
+          });
+        }
+      }
+    } // Read from queue and send requests to server
+
+  }, {
+    key: "send",
+    value: function send() {
+      if (this.sendTrackingEvents) {
+        if (this.options && this.options.trackingSendDelay === 0) {
+          this.sendEvents();
+        } else {
+          // Defer sending of events to give beforeunload time to register (avoids race condition)
+          setTimeout(this.sendEvents.bind(this), this.options && this.options.trackingSendDelay || 250);
+        }
       }
     } // Return current request queue
 
@@ -173,7 +180,6 @@ var RequestQueue = /*#__PURE__*/function () {
       store.local.set(storageKey, queue);
     }
   }]);
-
   return RequestQueue;
 }();
 

package/package.json

@@ -1,21 +1,24 @@
 {
   "name": "@constructor-io/constructorio-client-javascript",
-  "version": "2.21.0",
+  "version": "2.25.2",
   "description": "Constructor.io JavaScript client",
   "main": "lib/constructorio.js",
   "scripts": {
     "clean": "sudo rm -rf node_modules package-lock.json",
-    "version": "chmod +x ./scripts/verify-node-version.sh && ./scripts/verify-node-version.sh && npm run docs && git add ./docs/*",
+    "version": "chmod +x ./scripts/verify-node-version.sh && ./scripts/verify-node-version.sh && npm run docs && git add ./docs/* && npm run bundle && git add -A ./dist",
     "check-lisc": "license-checker --production --onlyAllow 'Apache-2.0;BSD-3-Clause;MIT'",
     "lint": "eslint 'src/**/*.js' 'spec/**/*.js'",
-    "test": "npm run compile && mkdir -p test && cp -rf lib/* test && mocha ./spec/* --opts ./mocha.opts --recursive",
-    "test:src": "mkdir -p test && cp -rf src/* test && mocha ./spec/* --opts ./mocha.opts --recursive",
+    "test": "npm run compile && mkdir -p test && cp -rf lib/* test && mocha ./spec/*",
+    "test:src": "mkdir -p test && cp -rf src/* test && mocha ./spec/*",
+    "test:bundled": "npm run bundle && BUNDLED=true PACKAGE_VERSION=$(echo $npm_package_version) mocha ./spec/*",
+    "test:all": "npm run test && npm run test:bundled",
     "precoverage": "rm -rf ./coverage && rm -rf ./.nyc_output",
     "coverage": "nyc --all --reporter=html npm run test:src",
     "postcoverage": "serve --listen 8080 --config ./serve.json && rm -rf test",
     "docs": "jsdoc --configure ./.jsdoc.json ./README.md --recurse ./src --destination ./docs",
-    "compile": "babel -d lib/ src/",
-    "prepublish": "npm run compile"
+    "compile": "babel src/ -d lib/",
+    "prepublish": "npm run compile",
+    "bundle": "rm -rf ./dist/* && npm run compile && node bundle.js"
   },
   "repository": {
     "type": "git",
@@ -34,26 +37,28 @@
     "lib/**/*"
   ],
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.14.8",
-    "@babel/preset-env": "^7.14.8",
-    "@babel/register": "^7.14.5",
+    "@babel/cli": "^7.15.7",
+    "@babel/core": "^7.15.8",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.15.8",
+    "@babel/register": "^7.15.3",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "dotenv": "^8.6.0",
-    "eslint": "^5.12.1",
+    "esbuild": "^0.12.28",
+    "eslint": "^8.0.1",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-import": "^2.25.2",
     "jsdoc": "^3.6.7",
     "jsdom": "^15.1.1",
     "license-checker": "^25.0.1",
     "lodash.clonedeep": "^4.5.0",
     "minami": "^1.2.3",
-    "mocha": "^6.2.0",
+    "mocha": "^9.1.3",
     "mocha-jsdom": "^2.0.0",
-    "nyc": "^14.1.1",
+    "nyc": "^15.1.0",
     "pre-push": "^0.1.1",
-    "serve": "^11.3.2",
+    "serve": "^13.0.2",
     "sinon": "^7.5.0",
     "sinon-chai": "^3.7.0"
   },