@constructor-io/constructorio-client-javascript 2.61.0 → 2.62.0

package/lib/utils/humanity-check.js

@@ -13,11 +13,12 @@ var HumanityCheck = /*#__PURE__*/function () {
   function HumanityCheck() {
     var _this = this;
     (0, _classCallCheck2["default"])(this, HumanityCheck);
-    this.isHumanBoolean = this.getIsHumanFromSessionStorage();
+    // Check if a human event has been performed in the past
+    this.hasPerformedHumanEvent = !!store.session.get(storageKey) || false;
 
-    // Humanity proved, remove handlers to prove humanity
+    // Humanity proved, remove handlers
     var remove = function remove() {
-      _this.isHumanBoolean = true;
+      _this.hasPerformedHumanEvent = true;
       store.session.set(storageKey, true);
       humanEvents.forEach(function (eventType) {
         helpers.removeEventListener(eventType, remove, true);
@@ -25,37 +26,37 @@ var HumanityCheck = /*#__PURE__*/function () {
     };
 
     // Add handlers to prove humanity
-    if (!this.isHumanBoolean) {
+    if (!this.hasPerformedHumanEvent) {
       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
-  }, {
-    key: "isHuman",
-    value: function isHuman() {
-      return this.isHumanBoolean || !!store.session.get(storageKey);
-    }
 
-    // Return boolean indicating if useragent matches botlist
-  }, {
+  // Return boolean indicating if user is a bot
+  // ...if it has a bot-like useragent
+  // ...or uses webdriver
+  // ...or has not performed a human event
+  (0, _createClass2["default"])(HumanityCheck, [{
     key: "isBot",
     value: function isBot() {
-      if (this.getIsHumanFromSessionStorage()) {
-        return false;
-      }
       var _helpers$getNavigator = helpers.getNavigator(),
         userAgent = _helpers$getNavigator.userAgent,
         webdriver = _helpers$getNavigator.webdriver;
       var botRegex = new RegExp("(".concat(botList.join('|'), ")"));
-      return Boolean(userAgent.match(botRegex)) || Boolean(webdriver);
+
+      // Always check the user agent and webdriver fields first to determine if the user is a bot
+      if (Boolean(userAgent.match(botRegex)) || Boolean(webdriver)) {
+        return true;
+      }
+
+      // If the user hasn't performed a human event, it indicates it is a bot
+      if (!this.hasPerformedHumanEvent) {
+        return true;
+      }
+
+      // Otherwise, it is a human
+      return false;
     }
   }]);
   return HumanityCheck;

package/lib/utils/request-queue.js

@@ -62,7 +62,7 @@ var RequestQueue = /*#__PURE__*/function () {
       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) {
+      (!helpers.canUseDOM() || !this.humanity.isBot()) && !this.requestPending && !this.pageUnloading && queue.length) {
         var request;
         var nextInQueue = queue.shift();
         var _nextInQueue = nextInQueue,

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _default = '2.61.0';
+var _default = '2.62.0';
 exports["default"] = _default;

package/package.json

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