@pendo/agent 2.296.0 → 2.297.0

package/dist/dom.esm.js

@@ -6164,6 +6164,7 @@ var ConfigReader = (function () {
          */
         addOption('additionalApiKeys', [PENDO_CONFIG_SRC, SNIPPET_SRC]);
         addOption('allowedOriginServers');
+        addOption('allowedOriginServerHashes');
         addOption('allowMixedApiKeyFrames', [SNIPPET_SRC, PENDO_CONFIG_SRC], true);
         /**
          * A function that returns either an array of strings or an object to decorate the url for events.
@@ -7313,7 +7314,7 @@ function getScreenPosition(element) {
     };
 }
 
-var VERSION = '2.296.0_';
+var VERSION = '2.297.0_';
 
 var decodeURIComponent = _.isFunction(window.decodeURIComponent) ? window.decodeURIComponent : _.identity;
 

package/dist/pendo.module.js

@@ -488,51 +488,62 @@ function getAlternateAgentUrl(config, useStaging, debuggingEnabled) {
     }
     return agentUrl;
 }
-function isStagingServer(config, location) {
-    if (!config) {
-        config = getPendoConfig();
-    }
-    if (isStagingEnvironment(config)) {
-        return true;
-    }
-    if (!location) {
-        location = window.location;
-    }
-    // trying to not calculate Hash if not needed.
-    if (hasHashedStagingServers(config)) {
-        var hostHash = getHash(location.host);
-        for (var j = 0, jj = config[STAGING_SERVER_HASHES].length; j < jj; ++j) {
-            var h = config[STAGING_SERVER_HASHES][j];
-            if (h === hostHash) {
+function urlMatchesPatterns(url, patterns = [], hashes = []) {
+    if (!url)
+        return false;
+    if (hashes.length > 0) {
+        const urlHash = getHash(url);
+        for (let i = 0, x = hashes.length; i < x; ++i) {
+            if (hashes[i] === urlHash) {
                 return true;
             }
         }
     }
-    if (hasStagingServerConfig(config)) {
-        for (var i = 0, ii = config.stagingServers.length; i < ii; ++i) {
-            var stagingServer = config.stagingServers[i];
-            if (typeof stagingServer === 'string') {
-                stagingServer = new RegExp('^' + stagingServer + '$');
+    if (patterns.length > 0) {
+        for (let j = 0, y = patterns.length; j < y; ++j) {
+            let pattern = patterns[j];
+            if (typeof pattern === 'object' && pattern.value) {
+                if (pattern.regexp) {
+                    if (pattern.value.startsWith('/') && pattern.value.endsWith('/')) {
+                        pattern.value = pattern.value.substring(1, pattern.value.length - 1);
+                    }
+                    pattern = new RegExp(pattern.value);
+                }
+                else {
+                    pattern = pattern.value;
+                }
             }
-            if (stagingServer instanceof RegExp && stagingServer.test(location.host)) {
+            if (typeof pattern === 'string') {
+                pattern = new RegExp('^' + pattern + '$');
+            }
+            if (pattern instanceof RegExp && pattern.test(url)) {
                 return true;
             }
         }
     }
     return false;
 }
+function isStagingServer(config, location) {
+    if (!config) {
+        config = getPendoConfig();
+    }
+    if (!config) {
+        return false;
+    }
+    if (isStagingEnvironment(config)) {
+        return true;
+    }
+    if (!location) {
+        location = window.location;
+    }
+    return urlMatchesPatterns(location.host, config.stagingServers, config[STAGING_SERVER_HASHES]);
+}
 function getHash(str) {
     return b64.uint8ToBase64(sha1
         .create()
         .update(str)
         .digest());
 }
-function hasHashedStagingServers(config) {
-    return config && config.stagingAgentUrl && config[STAGING_SERVER_HASHES];
-}
-function hasStagingServerConfig(config) {
-    return config && config.stagingAgentUrl && config.stagingServers;
-}
 var METHODS_TO_CAPTURE = [
     'initialize',
     'identify',
@@ -2790,6 +2801,7 @@ var ConfigReader = (function () {
          */
         addOption('additionalApiKeys', [PENDO_CONFIG_SRC, SNIPPET_SRC]);
         addOption('allowedOriginServers');
+        addOption('allowedOriginServerHashes');
         addOption('allowMixedApiKeyFrames', [SNIPPET_SRC, PENDO_CONFIG_SRC], true);
         /**
          * A function that returns either an array of strings or an object to decorate the url for events.
@@ -3892,8 +3904,8 @@ let SERVER = '';
 let ASSET_HOST = '';
 let ASSET_PATH = '';
 let DESIGNER_SERVER = '';
-let VERSION = '2.296.0_';
-let PACKAGE_VERSION = '2.296.0';
+let VERSION = '2.297.0_';
+let PACKAGE_VERSION = '2.297.0';
 let LOADER = 'xhr';
 /* eslint-enable agent-eslint-rules/no-gulp-env-references */
 /**
@@ -3928,9 +3940,6 @@ function isProdAgent() {
 function isRCAgent() {
     return ENV.indexOf('rc') !== -1;
 }
-function isBetaAgent(config) {
-    return !isProdAgent() || isStagingServer(config);
-}
 
 var rtrim = /^\s+|\s+$/g;
 var trim = String.prototype.trim;
@@ -9533,12 +9542,15 @@ function exportDataHost(pendo) {
     pendo.HOST = HOST;
 }
 function getAssetHost() {
+    return ConfigReader.get('assetHost') || getContentHost();
+}
+function getContentHost() {
     var protocol = 'https://';
-    var assetHost = ConfigReader.get('contentHost') || ConfigReader.get('assetHost') || ASSET_HOST;
-    if (assetHost && assetHost.indexOf('://') === -1) {
-        assetHost = protocol + assetHost;
+    var contentHost = ConfigReader.get('contentHost') || ASSET_HOST;
+    if (contentHost && contentHost.indexOf('://') === -1) {
+        contentHost = protocol + contentHost;
     }
-    return assetHost;
+    return contentHost;
 }
 function isLocalAgent(assetHost) {
     return assetHost.indexOf('localhost') >= 0 || assetHost.indexOf('local.pendo.io') >= 0;
@@ -9779,11 +9791,9 @@ function writeErrorPOST(msg) {
  * @returns void
  */
 function writeMetricsPOST(payload) {
-    if (_.size(payload).length < 1)
-        return;
     try {
         const url = `${HOST}/data/agentmetrics?apiKey=${pendo$1.apiKey}`;
-        log.debug(`Will send ${payload} to ${url} using ${fetchKeepalive.supported() ? 'fetch' : 'xhr'} once the endpoint exists`);
+        log.debug(`Will send ${JSON.stringify(payload)} to ${url} using ${fetchKeepalive.supported() ? 'fetch' : 'xhr'} once the endpoint exists`);
         if (fetchKeepalive.supported()) {
             // fetch(url, {
             //     method: 'POST',
@@ -11435,11 +11445,13 @@ function isTrustedOrigin(host) {
     // for CNAME, trust the top-level origin
     if (host === window.location.origin)
         return true;
-    // Trust the data host
+    // Trust the configured hosts
     if (host === getDataHost())
         return true;
     if (host === getAssetHost())
         return true;
+    if (host === getContentHost())
+        return true;
     // Domains that Pendo owns, will be swapped in by build patches
     const patterns = [
         /^https:\/\/(adopt\.)?((us1)\.)?(app|via|adopt|cdn)(\.(au|eu|gov|hsbc|jpn))?\.pendo\.io$/,
@@ -11458,12 +11470,20 @@ function isTrustedOrigin(host) {
         if (host === fullHostname)
             return true;
     }
-    if (_.contains(ConfigReader.get('allowedOriginServers', []), host))
+    if (urlMatchesPatterns(host, ConfigReader.get('allowedOriginServers', []), ConfigReader.get('allowedOriginServerHashes', [])))
         return true;
     return _.any(patterns, function (pattern) {
         return pattern.test(host);
     });
 }
+function hasAllowedOriginServers() {
+    const allowedOriginServers = ConfigReader.get('allowedOriginServers', []);
+    return allowedOriginServers && allowedOriginServers.length > 0;
+}
+function hasHashedAllowedOriginServers() {
+    const allowedOriginServerHashes = ConfigReader.get('allowedOriginServerHashes', []);
+    return allowedOriginServerHashes && allowedOriginServerHashes.length > 0;
+}
 
 function parseUrl(url) {
     if (!_.isString(url))
@@ -11497,9 +11517,9 @@ function addIntegrityAttribute(element, url) {
     }
 }
 var trustedOriginForLoadResource = function (origin) {
-    var noAllowedOriginServers = ConfigReader.get('allowedOriginServers', []).length === 0;
+    var noAllowedOriginServers = !hasAllowedOriginServers() && !hasHashedAllowedOriginServers();
     var isAdoptPartner = treatAsAdoptPartner();
-    if (noAllowedOriginServers || isAdoptPartner || !isBetaAgent(getPendoConfig())) {
+    if (noAllowedOriginServers || isAdoptPartner) {
         return true;
     }
     return isTrustedOrigin(origin);
@@ -12261,13 +12281,19 @@ class PerformanceMonitor {
         });
     }
     send() {
-        const payload = _.reduce(_.keys(Metrics), (acc, name) => {
+        const metrics = _.reduce(_.keys(Metrics), (acc, name) => {
             const entries = performance.getEntriesByName(name);
-            const result = Metrics[name].instrument(entries);
-            acc[name] = result;
-        }, {});
+            const value = Metrics[name].instrument(entries);
+            acc.push({ name, value });
+            return acc;
+        }, []);
+        const payload = _.filter(metrics, (metric) => {
+            return metric.value > 0;
+        });
         this._clearMarksAndMeasures();
-        writeMetricsPOST(payload);
+        if (_.size(payload)) {
+            writeMetricsPOST(payload);
+        }
     }
     _checkPerformanceApi() {
         return ConfigReader.get('performanceMetricsEnabled') &&
@@ -12300,11 +12326,14 @@ class PerformanceMonitor {
         }
     }
     _clearMarksAndMeasures() {
-        _.each(this.marks.entries, (name) => {
+        // TODO: fix custom lint rule to handle sets
+        // eslint-disable-next-line agent-eslint-rules/no-array-foreach
+        this.marks.forEach(name => {
             performance.clearMarks(name);
         });
         this.marks.clear();
-        _.each(this.measures.entries, (name) => {
+        // eslint-disable-next-line agent-eslint-rules/no-array-foreach
+        this.measures.forEach(name => {
             performance.clearMeasures(name);
         });
         this.measures.clear();
@@ -13112,8 +13141,10 @@ var extractAttribute = function (element, attrName, type) {
     var tag = element.nodeName.toLowerCase();
     if ((tag == 'img' && attrName == 'src') ||
         (tag == 'a' && attrName == 'href')) {
-        var src = element.getAttribute(attrName);
-        return sanitizeUrl(handleEmbeddedData(src));
+        if (useLegacyGetHref()) {
+            var src = element.getAttribute(attrName);
+            return sanitizeUrl(handleEmbeddedData(src));
+        }
     }
     var attr = getAttributeValue(element, attrName);
     if (type && typeof attr !== type)
@@ -16301,8 +16332,19 @@ var BuildingBlockTooltips = (function () {
             offset: TOOLTIP_CONSTANTS.DEFAULT_CARET_OFFSET,
             borderWidth: 0
         };
-        if (containerDomJson.props.style.border) {
-            var guideBorderArray = containerDomJson.props.style.border.split(' ');
+        // Check for border in dark mode properties first, then fall back to regular properties
+        var borderSource = null;
+        var regularBorder = _.get(containerDomJson, 'props.style.border');
+        var darkModeBorder = _.get(containerDomJson, 'darkModeProps.style.border');
+        // Use dark mode properties if step.isDarkMode is true and dark mode properties exist
+        if (step && step.isDarkMode && darkModeBorder) {
+            borderSource = darkModeBorder;
+        }
+        else if (regularBorder) {
+            borderSource = regularBorder;
+        }
+        if (borderSource) {
+            var guideBorderArray = borderSource.split(' ');
             caretDimensions.borderColor = guideBorderArray[2];
             caretDimensions.borderWidth = parseInt(guideBorderArray[0], 10) || 0;
         }
@@ -21968,6 +22010,7 @@ function startPreviewMode(window) {
     if (isInDesignerPreviewMode()) {
         const pendoConfig = getPendoConfig();
         pendoConfig.allowedOriginServers = [];
+        pendoConfig.allowedOriginServerHashes = [];
     }
     Events.startPreview.trigger();
     Events.leaderChanged.on(function (e) {
@@ -24928,7 +24971,7 @@ var _addCredits = function (elem) {
         return;
     }
     var img = document.createElement('img');
-    img.setAttribute('src', getAssetHost() + '/img/tiny-logo.png');
+    img.setAttribute('src', getContentHost() + '/img/tiny-logo.png');
     var credits = dom(document.createElement('div')).addClass('_pendo-credits_')
         .css({
         bottom: 0,
@@ -26383,6 +26426,9 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 
 const PENDO_HEADERS_KEY = '_pendoHeaders';
+function getTransformedUrl(url) {
+    return store.getters['networkUrl/getTransformedUrl']()(url);
+}
 class NetworkRequestIntercept {
     entriesToObject(entries) {
         const obj = {};
@@ -26475,6 +26521,7 @@ class NetworkRequestIntercept {
         window.fetch = function (...args) {
             return __awaiter(this, void 0, void 0, function* () {
                 const [url, config = {}] = args;
+                const transformedUrl = getTransformedUrl(url);
                 const method = config.method || 'GET';
                 const requestId = networkInterceptor.generateRequestId();
                 // Capture request data
@@ -26483,7 +26530,7 @@ class NetworkRequestIntercept {
                     const body = networkInterceptor.safelySerializeBody(config.body);
                     _.each(networkInterceptor.callbackFns, ({ request }) => {
                         if (_.isFunction(request))
-                            request({ requestId, method, url, body, headers });
+                            request({ requestId, method, url: transformedUrl, body, headers });
                     });
                 }
                 catch (e) {
@@ -26510,7 +26557,7 @@ class NetworkRequestIntercept {
                                     statusText,
                                     body: responseBody,
                                     headers,
-                                    url,
+                                    url: transformedUrl,
                                     method
                                 });
                             }
@@ -26534,7 +26581,7 @@ class NetworkRequestIntercept {
                                 statusText: 'Network Error',
                                 headers: {},
                                 body: null,
-                                url,
+                                url: transformedUrl,
                                 method,
                                 error: error.message
                             });
@@ -26556,8 +26603,9 @@ class NetworkRequestIntercept {
             return networkInterceptor._originalSetRequestHeader.apply(this, arguments);
         };
         XMLHttpRequest.prototype.open = function (method, url) {
+            const transformedUrl = getTransformedUrl(url);
             this._method = method;
-            this._url = url;
+            this._url = transformedUrl;
             this._requestId = networkInterceptor.generateRequestId();
             return networkInterceptor._originalXHROpen.apply(this, arguments);
         };
@@ -29656,8 +29704,21 @@ var attrActionEnum = {
     href: ['Replace', 'ForceSecure'],
     protocol: ['ForceSecure']
 };
-const TARGETS = ['location', 'attribute', 'both'];
+const TARGETS = ['location', 'attribute', 'both', 'network', 'all'];
 const DEFAULT_TARGET = 'location';
+function normalizeTarget(target) {
+    if (_.isArray(target)) {
+        // Filter out invalid targets and fallback to DEFAULT_TARGET if empty
+        const validTargets = _.filter(target, function (t) {
+            return TARGETS.indexOf(t) >= 0;
+        });
+        return validTargets.length > 0 ? validTargets : [DEFAULT_TARGET];
+    }
+    if (TARGETS.indexOf(target) >= 0) {
+        return target;
+    }
+    return DEFAULT_TARGET;
+}
 function UrlTransform(attr, action, data, target) {
     if (_.isObject(attr)) {
         action = attr.action;
@@ -29673,14 +29734,11 @@ function UrlTransform(attr, action, data, target) {
         var validActions = attrActionEnum[attr].join(', ');
         throw new Error('Invalid transform action: "' + action + '" for attribute "' + attr + '". Valid actions for "' + attr + '" are: ' + validActions + '. Example: {attr: "' + attr + '", action: "' + attrActionEnum[attr][0] + '", data: ...}');
     }
-    // validate 'target'
-    if (TARGETS.indexOf(target) < 0) {
-        target = DEFAULT_TARGET;
-    }
     this.attr = attr;
     this.action = action;
     this.data = data;
-    this.target = target || DEFAULT_TARGET;
+    // validate and normalize target
+    this.target = normalizeTarget(target);
 }
 UrlTransform.prototype.applyTo = function (url) {
     var actionImpls = {
@@ -29878,12 +29936,16 @@ var LocationModule = (function (global) {
         addTransforms(context, transforms) {
             _.each(transforms, function (f) {
                 const t = UrlTransform.fromJSON(f);
-                if (t.target === 'location' || t.target === 'both') {
+                const targets = _.isArray(t.target) ? t.target : [t.target];
+                if (_.contains(targets, 'location') || _.contains(targets, 'both') || _.contains(targets, 'all')) {
                     context.commit('addTransform', t);
                 }
-                if (t.target === 'attribute' || t.target === 'both') {
+                if (_.contains(targets, 'attribute') || _.contains(targets, 'both') || _.contains(targets, 'all')) {
                     store.dispatch('nodeAttr/addAttrTransform', t);
                 }
+                if (_.contains(targets, 'network') || _.contains(targets, 'all')) {
+                    store.dispatch('networkUrl/addNetworkTransform', t);
+                }
             });
         },
         addInternalTransforms(context, transforms) {
@@ -29922,6 +29984,7 @@ var LocationModule = (function (global) {
         clearTransforms(state) {
             state.transforms = [];
             store.commit('nodeAttr/clearURLTransforms');
+            store.commit('networkUrl/clearURLTransforms');
         },
         clearInternalTransforms(state) {
             state.internalTransforms = [];
@@ -33795,6 +33858,7 @@ const DebuggerModule = (() => {
     };
 })();
 
+const URL_ATTR_NAMES = ['src', 'href'];
 const NodeAttrModule = (function (global) {
     const state = {
         transforms: []
@@ -33828,11 +33892,14 @@ const NodeAttrModule = (function (global) {
     };
     const getters = {
         getAttribute(state) {
-            return function (element, attrName) {
+            return function (element, attrName = '') {
                 let attrValue = element.getAttribute ? element.getAttribute(attrName) : element[attrName];
                 if (_.size(state.transforms) < 1) {
                     return attrValue;
                 }
+                if (URL_ATTR_NAMES.indexOf(attrName.toLowerCase()) === -1) {
+                    return attrValue;
+                }
                 try {
                     let url = resolveAttrValueAsURL(attrValue);
                     url = _.reduce([
@@ -33857,6 +33924,54 @@ const NodeAttrModule = (function (global) {
     };
 })();
 
+const NetworkUrlModule = (function (global) {
+    const state = {
+        transforms: []
+    };
+    const actions = {
+        addNetworkTransform(context, urlTransform) {
+            context.commit('addTransform', urlTransform);
+        }
+    };
+    const mutations = {
+        addTransform(state, transform) {
+            state.transforms.push(transform);
+        },
+        clearURLTransforms(state) {
+            state.transforms = [];
+        }
+    };
+    const applyTransforms = (transforms, url) => {
+        return _.reduce(transforms, function (tUrl, f) {
+            return f.applyTo(tUrl);
+        }, url);
+    };
+    const getters = {
+        getTransformedUrl(state) {
+            return function (url) {
+                if (_.size(state.transforms) < 1) {
+                    return url;
+                }
+                try {
+                    let urlObj = url instanceof URL ? url : new URL(url, window.location.origin);
+                    urlObj = applyTransforms(state.transforms, urlObj);
+                    return urlObj.href;
+                }
+                catch (e) {
+                    log.critical(e);
+                    return url;
+                }
+            };
+        }
+    };
+    return {
+        state,
+        actions,
+        mutations,
+        getters
+    };
+})();
+
 function registerModules(store) {
     store.registerModule('debugger', DebuggerModule);
     store.registerModule('errorLog', ErrorLogModule);
@@ -33868,6 +33983,7 @@ function registerModules(store) {
     store.registerModule('metadata', MetadataModule);
     store.registerModule('preview', PreviewModule);
     store.registerModule('nodeAttr', NodeAttrModule);
+    store.registerModule('networkUrl', NetworkUrlModule);
 }
 
 const IFrameMonitor = (function () {
@@ -36597,7 +36713,7 @@ var Branding = (function () {
         link.href = 'https://www.pendo.io/pendo-free/nps?utm_source=pendo_app&utm_medium=branded-nps&utm_campaign=free-branded-nps';
         link.target = '_blank';
         var img = document.createElement('img');
-        img.setAttribute('src', getAssetHost() + '/img/nps-branding.png');
+        img.setAttribute('src', getContentHost() + '/img/nps-branding.png');
         link.appendChild(img);
         link.style.display = 'inline-block';
         var div = document.createElement('div');
@@ -36845,6 +36961,7 @@ const EventProperties = (function () {
     let cepFailureCount;
     let collectionThreshold;
     const MAX_CONSECUTIVE_FAILURES = 3;
+    const EVENT_PROPERTY_TIMEOUT = 'eventPropertyTimeout';
     const collectClickEventProperties = makeSafe(createClickEventProperties);
     const collectPageEventProperties = makeSafe(createPageEventProperties);
     return {
@@ -36864,20 +36981,37 @@ const EventProperties = (function () {
         pageEventPropertiesTimeout = false;
         pepFailureCount = 0;
         cepFailureCount = 0;
-        collectionThreshold = PluginAPI.ConfigReader.get('eventPropertyTimeout', 50);
+        var configReader = PluginAPI.ConfigReader;
+        /**
+         * Maximum time in milliseconds that event property collection can take before it is considered a failure.
+         * If collection fails more than 3 times consecutively, event property collection will be disabled completely.
+         *
+         * @access public
+         * @category Config/Core
+         * @name eventPropertyTimeout
+         * @default 50
+         * @type {number}
+         */
+        configReader.addOption(EVENT_PROPERTY_TIMEOUT, [configReader.sources.SNIPPET_SRC, configReader.sources.PENDO_CONFIG_SRC], 50);
+        collectionThreshold = configReader.get(EVENT_PROPERTY_TIMEOUT);
         globalPendo.getEventPropertyTarget = getEventPropertyTarget;
         globalPendo.previewEventProperty = collectEventProperty;
         pluginAPI.Events.onClickCaptured.off(handleClickCaptured);
         pluginAPI.Events.onClickCaptured.on(handleClickCaptured);
         pluginAPI.Events.ready.on(addPageEventProperties);
+        pluginAPI.Events.deliverablesLoaded.on(resetCepFailureCount);
     }
     function teardown() {
         pluginAPI.Events.onClickCaptured.off(handleClickCaptured);
         pluginAPI.Events.ready.off(addPageEventProperties);
+        pluginAPI.Events.deliverablesLoaded.off(resetCepFailureCount);
         removePageEventProperties();
         pepFailureCount = 0;
         cepFailureCount = 0;
     }
+    function resetCepFailureCount() {
+        cepFailureCount = 0;
+    }
     function getRuleTesterImpl(matchParents, proxyFn) {
         if (matchParents) {
             return function (elem, rule) {
@@ -36946,7 +37080,8 @@ const EventProperties = (function () {
         // Check to see if the target matches any of the feature rules
         // or shortcircuit if too much time has elapsed
         var ep;
-        for (var epIndex = 0; epIndex < pageEventProperties.length && getNow() - startTime < eventPropertyCollectionThreshold; epIndex++) {
+        var epIndex;
+        for (epIndex = 0; epIndex < pageEventProperties.length && getNow() - startTime < eventPropertyCollectionThreshold; epIndex++) {
             ep = pageEventProperties[epIndex];
             if (!ep.name) {
                 return;
@@ -36958,14 +37093,20 @@ const EventProperties = (function () {
         }
         var collectionOverheadInMs = getNow() - startTime;
         if (collectionOverheadInMs > eventPropertyCollectionThreshold) {
-            logEventPropertyTimeoutMessage(eventPropertyCollectionThreshold, ep);
             pepFailureCount++;
+            logEventPropertyTimeoutMessage({
+                threshold: eventPropertyCollectionThreshold,
+                name: ep.name,
+                elapsedTime: collectionOverheadInMs,
+                failureCount: pepFailureCount,
+                index: epIndex,
+                length: pageEventProperties.length
+            });
         }
         else {
             pepFailureCount = 0;
         }
         if (pepFailureCount >= MAX_CONSECUTIVE_FAILURES) {
-            logEventPropertyDisabledMessage(eventPropertyCollectionThreshold);
             pageEventPropertiesTimeout = true;
         }
         return result;
@@ -36978,7 +37119,9 @@ const EventProperties = (function () {
         // Check to see if the target matches any of the feature rules
         // or shortcircuit if too much time has elapsed
         var ep;
-        for (var epIndex = 0; epIndex < globalPendo.eventProperties.length && getNow() - startTime < eventPropertyCollectionThreshold; epIndex++) {
+        var epIndex;
+        var len = globalPendo.eventProperties.length;
+        for (epIndex = 0; epIndex < len && getNow() - startTime < eventPropertyCollectionThreshold; epIndex++) {
             ep = globalPendo.eventProperties[epIndex];
             var match = globalPendo._.any(ep.featureRules, function (rule) {
                 try {
@@ -37005,7 +37148,6 @@ const EventProperties = (function () {
         // Naming matches event property name restrictions enforced by the backend.
         var collectionOverheadInMs = getNow() - startTime;
         if (collectionOverheadInMs > eventPropertyCollectionThreshold) {
-            cepFailureCount++;
             if (matchParents && elemProxyFn === globalPendo._.identity && globalPendo._.isFunction(globalPendo.getText)) {
                 globalPendo.log('switching event property collection to fast text implementation');
                 // Try again where textContent has been replaced with the faster (but limited) getText implementation
@@ -37017,10 +37159,17 @@ const EventProperties = (function () {
                 return createFeatureEventPropertyMap(target, eventPropertyCollectionThreshold);
             }
             else {
-                logEventPropertyTimeoutMessage(eventPropertyCollectionThreshold, ep);
+                cepFailureCount++;
+                logEventPropertyTimeoutMessage({
+                    threshold: eventPropertyCollectionThreshold,
+                    featureId: ep.featureId,
+                    elapsedTime: collectionOverheadInMs,
+                    failureCount: cepFailureCount,
+                    index: epIndex,
+                    length: len
+                });
             }
             if (cepFailureCount >= MAX_CONSECUTIVE_FAILURES) {
-                logEventPropertyDisabledMessage(eventPropertyCollectionThreshold);
                 globalPendo.eventProperties = [];
             }
         }
@@ -37029,18 +37178,11 @@ const EventProperties = (function () {
         }
         return result;
     }
-    function logEventPropertyDisabledMessage(eventPropertyCollectionThreshold) {
-        globalPendo.log('event property collection disabled; collection took greater than ' +
-            eventPropertyCollectionThreshold +
-            ' milliseconds.');
-    }
-    function logEventPropertyTimeoutMessage(eventPropertyCollectionThreshold, ep) {
-        var logMessage = 'ERROR event property collection exceeded time limit.';
-        if (ep.featureId) {
-            logMessage += '\n For feature with id: ' + ep.featureId;
-        }
-        else {
-            logMessage += '\n For page event with name: ' + ep.name;
+    function logEventPropertyTimeoutMessage({ threshold, featureId, name, elapsedTime, failureCount, index, length }) {
+        var logMessage = `ERROR ${featureId ? 'click' : 'page'} event property collection timeout (${featureId || name}).`;
+        logMessage += ` ${elapsedTime}ms/${threshold}ms, ${index}/${length} properties, ${failureCount}/${MAX_CONSECUTIVE_FAILURES} failures`;
+        if (failureCount >= MAX_CONSECUTIVE_FAILURES) {
+            logMessage += ', collection disabled.';
         }
         pluginAPI.log.critical(logMessage);
     }
@@ -55129,6 +55271,7 @@ var ConfigReader = (function () {
          */
         addOption('additionalApiKeys', [PENDO_CONFIG_SRC, SNIPPET_SRC]);
         addOption('allowedOriginServers');
+        addOption('allowedOriginServerHashes');
         addOption('allowMixedApiKeyFrames', [SNIPPET_SRC, PENDO_CONFIG_SRC], true);
         /**
          * A function that returns either an array of strings or an object to decorate the url for events.