@constructor-io/constructorio-client-javascript 2.25.3 → 2.26.1

package/lib/utils/request-queue.js

@@ -18,6 +18,7 @@ var HumanityCheck = require('../utils/humanity-check');
 var helpers = require('../utils/helpers');
 
 var storageKey = '_constructorio_requests';
+var requestTTL = 1800000; // 30 minutes in milliseconds
 
 var RequestQueue = /*#__PURE__*/function () {
   function RequestQueue(options, eventemitter) {
@@ -78,21 +79,37 @@ var RequestQueue = /*#__PURE__*/function () {
         var _nextInQueue = nextInQueue,
             networkParameters = _nextInQueue.networkParameters;
         var signal;
+        var instance = this;
+        RequestQueue.set(queue);
 
         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
+        } // 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
+        // - Prevents issue where stale items are sent in perputity
+        // - 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 = dtMatch && dtMatch[1];
+          var now = +new Date();
+
+          if (requestOriginTime && now - requestOriginTime > requestTTL) {
+            RequestQueue.remove();
+            return;
+          }
         }
 
         if (nextInQueue.method === 'GET') {
@@ -115,37 +132,44 @@ var RequestQueue = /*#__PURE__*/function () {
 
         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,
-                message: 'ok'
-              });
-            } // Request was successful, but returned a non-2XX status code
-            else {
-              response.json().then(function (json) {
-                instance.eventemitter.emit('error', {
+              if (instance.eventemitter) {
+                instance.eventemitter.emit('success', {
                   url: nextInQueue.url,
                   method: nextInQueue.method,
-                  message: json && json.message
+                  message: 'ok'
                 });
+              }
+            } // Request was successful, but returned a non-2XX status code
+            else {
+              response.json().then(function (json) {
+                if (instance.eventemitter) {
+                  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
-                });
+                if (instance.eventemitter) {
+                  instance.eventemitter.emit('error', {
+                    url: nextInQueue.url,
+                    method: nextInQueue.method,
+                    message: error.type
+                  });
+                }
               });
             }
           })["catch"](function (error) {
-            instance.eventemitter.emit('error', {
-              url: nextInQueue.url,
-              method: nextInQueue.method,
-              message: error.toString()
-            });
+            if (instance.eventemitter) {
+              instance.eventemitter.emit('error', {
+                url: nextInQueue.url,
+                method: nextInQueue.method,
+                message: error.toString()
+              });
+            }
           })["finally"](function () {
             _this2.requestPending = false;
 
@@ -177,7 +201,26 @@ var RequestQueue = /*#__PURE__*/function () {
   }, {
     key: "set",
     value: function set(queue) {
-      store.local.set(storageKey, queue);
+      // If queue length is zero, remove entry entirely
+      if (!queue || Array.isArray(queue) && queue.length === 0) {
+        RequestQueue.remove();
+      } else {
+        store.local.set(storageKey, queue);
+      }
+
+      var localStorageQueue = RequestQueue.get(); // 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) {
+        RequestQueue.remove();
+      }
+    } // Remove current request queue key
+
+  }, {
+    key: "remove",
+    value: function remove() {
+      store.local.remove(storageKey);
     }
   }]);
   return RequestQueue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-client-javascript",
-  "version": "2.25.3",
+  "version": "2.26.1",
   "description": "Constructor.io JavaScript client",
   "main": "lib/constructorio.js",
   "scripts": {