From 0e4a3ce113cc78afe25e7f7ea74d92d3c2fabfa4 Mon Sep 17 00:00:00 2001
From: Jacob Ransom <jacob@innocraft.com>
Date: Fri, 17 Nov 2023 17:16:54 +1300
Subject: [PATCH 1/6] Re-applying PRs 594 and 599 adjusting for recent changes

---
 Template/Tag/MatomoTag.web.js           | 375 +++++++++++++++++++++---
 javascripts/tagmanager.js               |  20 ++
 javascripts/tagmanager.min.js           |  11 +-
 tests/resources/trackerTestExample.html |  49 ++++
 4 files changed, 408 insertions(+), 47 deletions(-)
 create mode 100644 tests/resources/trackerTestExample.html

diff --git a/Template/Tag/MatomoTag.web.js b/Template/Tag/MatomoTag.web.js
index 15d0a548f..a5803aab2 100644
--- a/Template/Tag/MatomoTag.web.js
+++ b/Template/Tag/MatomoTag.web.js
@@ -13,7 +13,21 @@
         }
     };
 
-    window._paq = window._paq || [];
+    // Make sure that window._paq always exists
+    if (!window._paq) {
+      window._paq = [];
+    }
+    // Store the initial state of window._paq so that we can apply it to all the configs
+    // We use the stringify and parse to make sure that we have a copy and not a reference
+    var initialPaq = window._paq && window._paq.length ? JSON.parse(JSON.stringify(window._paq)) : initialPaq || [];
+    var remainingPaq = [];
+    var indexesToRemove = [];
+    // Clear window._paq to prevent things from being tracked too early
+    while (window._paq.length > 0) {
+        window._paq.pop();
+    }
+
+    var hasProcessedRemainingTrackings = false;
 
     if ('object' !== typeof window.matomoPluginAsyncInit) {
         window.matomoPluginAsyncInit = [];
@@ -69,6 +83,15 @@
         }
     }
 
+    function removeIndexIfExists(index)
+    {
+        if (index < 0) {
+           return;
+        }
+
+        indexesToRemove.push(index);
+    }
+
     var configuredTrackers = {};
 
     return function (parameters, TagManager) {
@@ -90,11 +113,15 @@
                 if (!parameters.matomoConfig || !parameters.matomoConfig.name) {
                     return;
                 }
-                
+
                 // this is the matomoConfig variable name and the only way to differentiate two different tracker
                 // configurations
                 var variableName = parameters.matomoConfig.name;
 
+                var setCustomDimensionIndexes = [];
+                indexesToRemove = [];
+                var localPaq = JSON.parse(JSON.stringify(initialPaq));
+
                 // we need to fetch matomoConfig again in case some parameters changed meanwhile that are variables...
                 // eg userId might be a variable and it's value might be different now
                 var matomoConfig = parameters.get('matomoConfig', {});
@@ -118,43 +145,230 @@
                     }
                     configuredTrackers[variableName] = tracker;
 
-                    if (matomoConfig.requireCookieConsent) {
-                      	tracker.requireCookieConsent();
+                    // NOTE: When a new config is created, it should probably be added to this list
+                    // There might already be some configs missing from this list
+                    var setUserIdIndex = setSiteIdIndex = setTrackerUrlIndex
+                        = requireCookieConsentIndex = disableBrowserFeatureDetectionIndex
+                        = disableCookiesIndex = enableCrossDomainLinkingIndex = cookieSameSiteIndex
+                        = setVisitorCookieTimeoutIndex = setReferralCookieTimeoutIndex
+                        = setSessionCookieTimeoutIndex = setSecureCookieIndex = cookiePathIndex
+                        = cookieNamePrefixIndex = cookieDomainIndex = setDomainsIndex
+                        = alwaysUseSendBeaconIndex = disableAlwaysUseSendBeaconIndex
+                        = setRequestMethodIndex = enableLinkTrackingIndex = enableFileTrackingIndex
+                        = requireConsentIndex = enableDoNotTrackIndex
+                        = disablePerformanceTrackingIndex = appendToTrackingUrlIndex
+                        = setRequestContentTypeIndex = setCustomRequestProcessingIndex
+                        = enableJSErrorTrackingIndex = enableHeartBeatTimerIndex
+                        = trackAllContentImpressionsIndex = trackVisibleContentImpressionsIndex
+                        = disableFormAnalyticsIndex = disableMediaAnalyticsIndex = -1;
+                    for (k = 0; k < localPaq.length; k++) {
+                        // This should only be an array. Skip if it's not
+                        if (!TagManager.utils.isArray(localPaq[k])) {
+                          continue;
+                        }
+                        var name = localPaq[k][0];
+                        switch (name) {
+                            case 'setUserId':
+                                setUserIdIndex = k;
+                                // Mark this one for removal right away since we don't want it to override the container
+                                removeIndexIfExists(k);
+                                break;
+                            case 'setSiteId':
+                                setSiteIdIndex = k;
+                                // Mark this one for removal right away since we don't want it to override the container
+                                removeIndexIfExists(k);
+                                break;
+                            case 'setTrackerUrl':
+                                setTrackerUrlIndex = k;
+                                // Mark this one for removal right away since we don't want it to override the container
+                                removeIndexIfExists(k);
+                                break;
+                            case 'requireCookieConsent':
+                                requireCookieConsentIndex = k;
+                                break;
+                            case 'disableBrowserFeatureDetection':
+                                disableBrowserFeatureDetectionIndex = k;
+                                break;
+                            case 'disableCookies':
+                                disableCookiesIndex = k;
+                                break;
+                            case 'enableCrossDomainLinking':
+                                enableCrossDomainLinkingIndex = k;
+                                break;
+                            case 'cookieSameSite':
+                                cookieSameSiteIndex = k;
+                                break;
+                            case 'setVisitorCookieTimeout':
+                                setVisitorCookieTimeoutIndex = k;
+                                break;
+                            case 'setReferralCookieTimeout':
+                                setReferralCookieTimeoutIndex = k;
+                                break;
+                            case 'setSessionCookieTimeout':
+                                setSessionCookieTimeoutIndex = k;
+                                break;
+                            case 'setSecureCookie':
+                                setSecureCookieIndex = k;
+                                break;
+                            case 'cookiePath':
+                                cookiePathIndex = k;
+                                break;
+                            case 'cookieNamePrefix':
+                                cookieNamePrefixIndex = k;
+                                break;
+                            case 'cookieDomain':
+                                cookieDomainIndex = k;
+                                break;
+                            case 'setDomains':
+                                setDomainsIndex = k;
+                                break;
+                            case 'alwaysUseSendBeacon':
+                                alwaysUseSendBeaconIndex = k;
+                                break;
+                            case 'disableAlwaysUseSendBeacon':
+                                disableAlwaysUseSendBeaconIndex = k;
+                                break;
+                            case 'enableLinkTracking':
+                                enableLinkTrackingIndex = k;
+                                break;
+                            case 'enableFileTracking':
+                                enableFileTrackingIndex = k;
+                                break;
+                            case 'requireConsent':
+                                requireConsentIndex = k;
+                                break;
+                            case 'enableDoNotTrack':
+                                enableDoNotTrackIndex = k;
+                                break;
+                            case 'disablePerformanceTracking':
+                                disablePerformanceTrackingIndex = k;
+                                break;
+                            case 'appendToTrackingUrl':
+                                appendToTrackingUrlIndex = k;
+                                break;
+                            case 'setRequestContentType':
+                                setRequestContentTypeIndex = k;
+                                break;
+                            case 'setCustomRequestProcessing':
+                                setCustomRequestProcessingIndex = k;
+                                break;
+                            case 'enableJSErrorTracking':
+                                enableJSErrorTrackingIndex = k;
+                                break;
+                            case 'enableHeartBeatTimer':
+                                enableHeartBeatTimerIndex = k;
+                                break;
+                            case 'trackAllContentImpressions':
+                                trackAllContentImpressionsIndex = k;
+                                break;
+                            case 'trackVisibleContentImpressions':
+                                trackVisibleContentImpressionsIndex = k;
+                                break;
+                            case 'FormAnalytics::disable':
+                            case 'FormAnalytics::disableFormAnalytics':
+                            case 'FormAnalytics.disableFormAnalytics':
+                            case 'disableFormAnalytics':
+                                disableFormAnalyticsIndex = k;
+                                break;
+                            case 'MediaAnalytics::disable':
+                            case 'MediaAnalytics::disableMediaAnalytics':
+                            case 'MediaAnalytics.disableMediaAnalytics':
+                            case 'disableMediaAnalytics':
+                                disableMediaAnalyticsIndex = k;
+                                break;
+                            case 'setCustomDimension':
+                                // There could be multiple, so let's push the indexes onto an array
+                                setCustomDimensionIndexes.push(k);
+                                break;
+                        }
                     }
 
-                    if (matomoConfig.disableBrowserFeatureDetection && typeof tracker.disableBrowserFeatureDetection === 'function') {
+                    if (matomoConfig.requireCookieConsent || requireCookieConsentIndex !== -1) {
+                        tracker.requireCookieConsent();
+                        removeIndexIfExists(requireCookieConsentIndex);
+                    }
+
+                    if ((matomoConfig.disableBrowserFeatureDetection || disableBrowserFeatureDetectionIndex !== -1) && typeof tracker.disableBrowserFeatureDetection === 'function') {
                         tracker.disableBrowserFeatureDetection();
+                        removeIndexIfExists(disableBrowserFeatureDetectionIndex);
                     }
 
-                    if (matomoConfig.disableCookies) {
+                    if (matomoConfig.disableCookies || disableCookiesIndex !== -1) {
                         tracker.disableCookies();
+                        removeIndexIfExists(disableCookiesIndex);
                     }
 
-                    if (matomoConfig.enableCrossDomainLinking) {
+                    if (matomoConfig.enableCrossDomainLinking || enableCrossDomainLinkingIndex !== -1) {
                         tracker.enableCrossDomainLinking();
-                        tracker.setCrossDomainLinkingTimeout(matomoConfig.crossDomainLinkingTimeout);
+                        removeIndexIfExists(enableCrossDomainLinkingIndex);
                     }
 
-                    if (matomoConfig.cookieSameSite) {
+                    if (cookieSameSiteIndex !== -1 && localPaq[cookieSameSiteIndex].length === 2) {
+                       tracker.setCookieSameSite(localPaq[cookieSameSiteIndex][1]);
+                       removeIndexIfExists(cookieSameSiteIndex);
+                    } else if (matomoConfig.cookieSameSite) {
                         tracker.setCookieSameSite(matomoConfig.cookieSameSite);
                     }
 
-                    if (matomoConfig.setSecureCookie) {
+                    if (setVisitorCookieTimeoutIndex !== -1 && localPaq[setVisitorCookieTimeoutIndex].length === 2) {
+                        tracker.setVisitorCookieTimeout(localPaq[setVisitorCookieTimeoutIndex][1]);
+                        removeIndexIfExists(setVisitorCookieTimeoutIndex);
+                    } else if (matomoConfig.customCookieTimeOutEnable) {
+                        tracker.setVisitorCookieTimeout(matomoConfig.customCookieTimeOut * 86400);
+                    }
+
+                    if (setReferralCookieTimeoutIndex !== -1 && localPaq[setReferralCookieTimeoutIndex].length === 2) {
+                        tracker.setReferralCookieTimeout(localPaq[setReferralCookieTimeoutIndex][1]);
+                        removeIndexIfExists(setReferralCookieTimeoutIndex);
+                    } else if (matomoConfig.customCookieTimeOutEnable) {
+                        tracker.setReferralCookieTimeout(matomoConfig.referralCookieTimeOut * 86400);
+                    }
+
+                    if (setSessionCookieTimeoutIndex !== -1 && localPaq[setSessionCookieTimeoutIndex].length === 2) {
+                        tracker.setSessionCookieTimeout(localPaq[setSessionCookieTimeoutIndex][1]);
+                        removeIndexIfExists(setSessionCookieTimeoutIndex);
+                    } else if (matomoConfig.customCookieTimeOutEnable) {
+                        tracker.setSessionCookieTimeout(matomoConfig.sessionCookieTimeOut * 60);
+                    }
+
+                    if (matomoConfig.setSecureCookie || setSecureCookieIndex !== -1) {
                         tracker.setSecureCookie(true);
+                        removeIndexIfExists(setSecureCookieIndex);
                     }
 
-                    if (matomoConfig.cookiePath) {
+                    if (cookiePathIndex !== -1 && localPaq[cookiePathIndex].length === 2) {
+                        tracker.setCookiePath(localPaq[cookiePathIndex][1]);
+                        removeIndexIfExists(cookiePathIndex);
+                    } else if (matomoConfig.cookiePath) {
                         tracker.setCookiePath(matomoConfig.cookiePath);
                     }
 
-                    if (matomoConfig.cookieNamePrefix) {
-                        tracker.setCookieNamePrefix(matomoConfig.cookieNamePrefix);
+                    if (cookieNamePrefixIndex !== -1 && localPaq[cookieNamePrefixIndex].length === 2) {
+                        tracker.setCookiePath(localPaq[cookieNamePrefixIndex][1]);
+                        removeIndexIfExists(cookieNamePrefixIndex);
+                    } else if (matomoConfig.cookieNamePrefix) {
+                        tracker.setCookiePath(matomoConfig.cookieNamePrefix);
                     }
 
-                    if (matomoConfig.cookieDomain) {
+                    if (cookieDomainIndex !== -1 && localPaq[cookieDomainIndex].length === 2) {
+                        tracker.setCookieDomain(localPaq[cookieDomainIndex][1]);
+                        removeIndexIfExists(cookieDomainIndex);
+                    } else if (matomoConfig.cookieDomain) {
                         tracker.setCookieDomain(matomoConfig.cookieDomain);
                     }
 
+                    // If paq.push(['setDomains' has been called, override the Matomo config domains
+                    if (setDomainsIndex !== -1 && localPaq[setDomainsIndex].length === 2) {
+                        var domainsArray = localPaq[setDomainsIndex][1];
+                        // It's valid to provide a string if there's only one domain
+                        if (typeof localPaq[setDomainsIndex][1] === 'string') {
+                            domainsArray = [localPaq[setDomainsIndex][1]];
+                        }
+                        if (TagManager.utils.isArray(domainsArray)) {
+                            matomoConfig.domains = domainsArray;
+                        }
+                        removeIndexIfExists(setDomainsIndex);
+                    }
                     if (matomoConfig.domains
                         && TagManager.utils.isArray(matomoConfig.domains)
                         && matomoConfig.domains.length) {
@@ -173,67 +387,110 @@
                         tracker.setDomains(domains);
                     }
 
-                    if (matomoConfig.alwaysUseSendBeacon) {
+                    if (matomoConfig.alwaysUseSendBeacon || alwaysUseSendBeaconIndex !== -1) {
                         tracker.alwaysUseSendBeacon();
+                        removeIndexIfExists(alwaysUseSendBeaconIndex);
                     }
 
-                    if (matomoConfig.disableAlwaysUseSendBeacon) {
+                    if (matomoConfig.disableAlwaysUseSendBeacon || disableAlwaysUseSendBeaconIndex !== -1) {
                         tracker.disableAlwaysUseSendBeacon();
+                        removeIndexIfExists(disableAlwaysUseSendBeaconIndex);
                     }
-                    
-                    if (matomoConfig.forceRequestMethod) {
+
+                    if (appendToTrackingUrlIndex !== -1 && localPaq[appendToTrackingUrlIndex].length === 2
+                        && typeof localPaq[appendToTrackingUrlIndex][1] === 'string'
+                        && ['POST', 'GET'].includes(localPaq[appendToTrackingUrlIndex][1].toUpperCase())) {
+                        tracker.setRequestMethod(localPaq[appendToTrackingUrlIndex][1]);
+                        if (localPaq[appendToTrackingUrlIndex][1].toUpperCase() === 'POST'
+                            && setRequestContentTypeIndex !== -1 && localPaq[setRequestContentTypeIndex].length === 2
+                            && typeof localPaq[setRequestContentTypeIndex][1] === 'string' && localPaq[setRequestContentTypeIndex][1].length > 0) {
+                            tracker.setRequestContentType(localPaq[setRequestContentTypeIndex][1]);
+                            removeIndexIfExists(setRequestContentTypeIndex);
+                        }
+                        removeIndexIfExists(appendToTrackingUrlIndex);
+                    } else if (matomoConfig.forceRequestMethod && typeof matomoConfig.requestMethod === 'string'
+                        && ['POST', 'GET'].includes(matomoConfig.requestMethod.toUpperCase())) {
                         tracker.setRequestMethod(matomoConfig.requestMethod);
-                        if(matomoConfig.requestMethod == 'POST'){
+                        if(matomoConfig.requestMethod.toUpperCase() === 'POST'){
                             tracker.setRequestContentType(matomoConfig.requestContentType);
                         }
                     }
 
-                    if (matomoConfig.enableLinkTracking) {
+                    if (matomoConfig.enableLinkTracking || enableLinkTrackingIndex !== -1) {
                         tracker.enableLinkTracking();
+                        removeIndexIfExists(enableLinkTrackingIndex);
                     }
 
-                    if (matomoConfig.enableFileTracking) {
+                    if (matomoConfig.enableFileTracking || enableFileTrackingIndex !== -1) {
                         tracker.enableFileTracking();
+                        removeIndexIfExists(enableFileTrackingIndex);
                     }
 
-                    if (matomoConfig.requireConsent) {
+                    if (matomoConfig.requireConsent || requireConsentIndex !== -1) {
                         tracker.requireConsent();
+                        removeIndexIfExists(requireConsentIndex);
                     }
 
-                    if (matomoConfig.enableDoNotTrack) {
+                    if (matomoConfig.enableDoNotTrack || enableDoNotTrackIndex !== -1) {
                         tracker.setDoNotTrack(1);
+                        removeIndexIfExists(enableDoNotTrackIndex);
                     }
 
-                    if (matomoConfig.disablePerformanceTracking) {
+                    if (matomoConfig.disablePerformanceTracking || disablePerformanceTrackingIndex !== -1) {
                         tracker.disablePerformanceTracking();
+                        removeIndexIfExists(disablePerformanceTrackingIndex);
                     }
-                    
-                    if (typeof matomoConfig.appendToTrackingUrl === 'string' && matomoConfig.appendToTrackingUrl.length > 0) {
+
+                    if (appendToTrackingUrlIndex !== -1 && localPaq[appendToTrackingUrlIndex].length === 2
+                        && typeof localPaq[appendToTrackingUrlIndex][1] === 'string' && localPaq[appendToTrackingUrlIndex][1].length > 0) {
+                        tracker.appendToTrackingUrl(localPaq[appendToTrackingUrlIndex][1]);
+                       removeIndexIfExists(appendToTrackingUrlIndex);
+                    } else if (typeof matomoConfig.appendToTrackingUrl === 'string' && matomoConfig.appendToTrackingUrl.length > 0) {
                         tracker.appendToTrackingUrl(matomoConfig.appendToTrackingUrl);
                     }
-                    
-                    if(typeof matomoConfig.customRequestProcessing === 'function'
-                        && matomoConfig.customRequestProcessing.length >= 1 ) {
+
+                    if (setCustomRequestProcessingIndex !== -1 && localPaq[setCustomRequestProcessingIndex].length === 2
+                        && typeof localPaq[setCustomRequestProcessingIndex][1] === 'function' && localPaq[setCustomRequestProcessingIndex][1].length >= 1) {
+                        tracker.setCustomRequestProcessing(localPaq[setCustomRequestProcessingIndex][1]);
+                        removeIndexIfExists(setCustomRequestProcessingIndex);
+                    } else if(typeof matomoConfig.customRequestProcessing === 'function' && matomoConfig.customRequestProcessing.length >= 1) {
                         tracker.setCustomRequestProcessing(matomoConfig.customRequestProcessing);
                     }
 
-                    if (matomoConfig.enableJSErrorTracking) {
+                    if (matomoConfig.enableJSErrorTracking || enableJSErrorTrackingIndex !== -1) {
                         tracker.enableJSErrorTracking();
+                        removeIndexIfExists(enableJSErrorTrackingIndex);
                     }
-                    if (matomoConfig.enableHeartBeatTimer) {
-                        tracker.enableHeartBeatTimer(matomoConfig.heartBeatTime);
+
+                    if (matomoConfig.enableHeartBeatTimer || enableHeartBeatTimerIndex !== -1) {
+                        if (enableHeartBeatTimerIndex !== -1 && localPaq[enableHeartBeatTimerIndex].length === 2) {
+                            tracker.enableHeartBeatTimer(localPaq[enableHeartBeatTimerIndex][1]);
+                        } else if (matomoConfig.heartBeatTime) {
+                            tracker.enableHeartBeatTimer(matomoConfig.heartBeatTime);
+                        } else {
+                            tracker.enableHeartBeatTimer();
+                        }
+                        removeIndexIfExists(enableHeartBeatTimerIndex);
                     }
-                    if (matomoConfig.trackAllContentImpressions) {
+
+                    if (matomoConfig.trackAllContentImpressions || trackAllContentImpressionsIndex !== -1) {
                         tracker.trackAllContentImpressions();
+                        removeIndexIfExists(trackAllContentImpressionsIndex);
                     }
-                    if (matomoConfig.trackVisibleContentImpressions) {
+
+                    if (matomoConfig.trackVisibleContentImpressions || trackVisibleContentImpressionsIndex !== -1) {
                         tracker.trackVisibleContentImpressions();
+                        removeIndexIfExists(trackVisibleContentImpressionsIndex);
                     }
-                    if (matomoConfig.hasOwnProperty('enableFormAnalytics') && !matomoConfig.enableFormAnalytics && window.Matomo && window.Matomo.FormAnalytics && typeof window.Matomo.FormAnalytics.disableFormAnalytics === 'function') {
+
+                    if (((matomoConfig.hasOwnProperty('enableFormAnalytics') && !matomoConfig.enableFormAnalytics) || disableFormAnalyticsIndex !== -1) && window.Matomo && window.Matomo.FormAnalytics && typeof window.Matomo.FormAnalytics.disableFormAnalytics === 'function') {
                         window.Matomo.FormAnalytics.disableFormAnalytics();
+                        removeIndexIfExists(disableFormAnalyticsIndex);
                     }
-                    if (matomoConfig.hasOwnProperty('enableMediaAnalytics') && !matomoConfig.enableMediaAnalytics && window.Matomo && window.Matomo.MediaAnalytics && typeof window.Matomo.MediaAnalytics.disableMediaAnalytics === 'function') {
+
+                    if (((matomoConfig.hasOwnProperty('enableMediaAnalytics') && !matomoConfig.enableMediaAnalytics) || disableMediaAnalyticsIndex !== -1) && window.Matomo && window.Matomo.MediaAnalytics && typeof window.Matomo.MediaAnalytics.disableMediaAnalytics === 'function') {
                         window.Matomo.MediaAnalytics.disableMediaAnalytics();
+                        removeIndexIfExists(disableMediaAnalyticsIndex);
                     }
                 }
 
@@ -257,6 +514,23 @@
                     lastIdSite = possiblyUpdatedMatomoUrl;
                 }
 
+                // Add any custom dimensions added to _paq to the collection
+                if (setCustomDimensionIndexes.length) {
+                    if (!matomoConfig.customDimensions
+                        || !TagManager.utils.isArray(matomoConfig.customDimensions)) {
+                        matomoConfig.customDimensions = [];
+                    }
+                    for (indexIndex = 0; indexIndex < setCustomDimensionIndexes.length; indexIndex++) {
+                        var customDim = localPaq[setCustomDimensionIndexes[indexIndex]];
+                        if (TagManager.utils.isArray(customDim) && customDim.length === 3) {
+                            matomoConfig.customDimensions.push({
+                                index: customDim[1],
+                                value: customDim[2],
+                            });
+                        }
+                        removeIndexIfExists(setCustomDimensionIndexes[indexIndex]);
+                    }
+                }
                 if (matomoConfig.customDimensions
                     && TagManager.utils.isArray(matomoConfig.customDimensions)
                     && matomoConfig.customDimensions.length) {
@@ -269,6 +543,28 @@
                     }
                 }
 
+                // Sort the indexes greatest to least so that removing one won't affect the others
+                indexesToRemove.sort().reverse();
+                var arrayLength = indexesToRemove.length;
+                for (indexRemove = 0; indexRemove < arrayLength; indexRemove++) {
+                    localPaq.splice(indexesToRemove[indexRemove], 1);
+                }
+
+                // Keep a list of all of the non-config requests to process later
+                if (localPaq.length && !remainingPaq.length) {
+                   remainingPaq = localPaq;
+                }
+
+                // If the remaining _paq values haven't been processed yet, process them
+                // We wait till now so that all configs are applied first
+                var applyRemainingPaqEntries = parameters.get('applyRemainingPaqEntries', false);
+                if (!hasProcessedRemainingTrackings && remainingPaq.length && applyRemainingPaqEntries) {
+                    hasProcessedRemainingTrackings = true;
+                    for (trackingIndex = 0; trackingIndex < remainingPaq.length; trackingIndex++) {
+                        window._paq.push(remainingPaq[trackingIndex]);
+                    }
+                }
+
                 if (tracker) {
                     var trackingType = parameters.get('trackingType');
 
@@ -280,16 +576,11 @@
                         var customUrl = parameters.get('customUrl');
                         if (customUrl) {
                             tracker.setCustomUrl(customUrl);
-                        }                        
-                        if (matomoConfig.customCookieTimeOutEnable) {  
-                            tracker.setVisitorCookieTimeout(matomoConfig.customCookieTimeOut * 86400);
-                            tracker.setReferralCookieTimeout(matomoConfig.referralCookieTimeOut * 86400);
-                            tracker.setSessionCookieTimeout(matomoConfig.sessionCookieTimeOut * 60);
                         }
 
                         if (parameters.get('isEcommerceView')) {
                             tracker.setEcommerceView(parameters.get('productSKU'), parameters.get('productName'), parameters.get('categoryName'), parameters.get('price'));
-                        }                            
+                        }
 
                         tracker.trackPageView();
                     } else if (trackingType === 'event') {
diff --git a/javascripts/tagmanager.js b/javascripts/tagmanager.js
index 3fb12c661..b051fb43a 100644
--- a/javascripts/tagmanager.js
+++ b/javascripts/tagmanager.js
@@ -1675,8 +1675,28 @@
                 }
 
                 if (container.tags && utils.isArray(container.tags)) {
+                    // Build a collection of the names of all the Matomo configs
+                    var hasMatomoTag = false;
+                    var matomoConfigNames = [];
                     for (i = 0; i < container.tags.length; i++) {
                         tagDefinition = container.tags[i];
+                        if (tagDefinition.type === 'Matomo' && matomoConfigNames.indexOf(tagDefinition.parameters.matomoConfig.name) === -1) {
+                            hasMatomoTag = true;
+                            matomoConfigNames.push(tagDefinition.parameters.matomoConfig.name);
+                        }
+                    }
+                    for (i = 0; i < container.tags.length; i++) {
+                        tagDefinition = container.tags[i];
+                        // If the Matomo config name is in the list, remove it
+                        if (hasMatomoTag && tagDefinition.parameters.matomoConfig && matomoConfigNames.indexOf(tagDefinition.parameters.matomoConfig.name) !== -1) {
+                           matomoConfigNames.splice(tagDefinition.parameters.matomoConfig.name, 1);
+                        }
+                        // If all  the names have been removed, that means all configs are found
+                        // If configs are ready, set tag ready to apply all postponed _paq entries
+                        // This is because we postpone _paq entries to apply them on all trackers
+                        if (hasMatomoTag && matomoConfigNames.length === 0) {
+                            tagDefinition.parameters.applyRemainingPaqEntries = true;
+                        }
                         tag = new Tag(tagDefinition, this);
                         this.tags.push(tag);
 
diff --git a/javascripts/tagmanager.min.js b/javascripts/tagmanager.min.js
index 34236963c..a7e4d6eb5 100644
--- a/javascripts/tagmanager.min.js
+++ b/javascripts/tagmanager.min.js
@@ -33,10 +33,11 @@ L=undefined}if((!B.isDefined(L)||L===null||L===false)&&B.isDefined(this.defaultV
 }}})}};this.addReferencedTag=function(i){this.referencedTags.push(i)};this.getReferencedTags=function(){return this.referencedTags};this.meetsConditions=function(){var L,M;for(L=0;L<this.conditions.length;L++){M=new z(this.conditions[L],G);if(!M.isValid()){return false}}return true};if(I.conditions&&B.isArray(I.conditions)){this.conditions=I.conditions}var J,K=new w({trigger:this,container:G});if(B.isObject(I.parameters)){for(J in I.parameters){if(B.hasProperty(I.parameters,J)){K.set(J,o(I.parameters[J],G))}}}if(!B.isDefined(I.Trigger)||!I.Trigger){y.error("no template defined for trigger ",I);return}if(B.isFunction(I.Trigger)){this.theTrigger=new I.Trigger(K,l)}else{if(B.isObject(I.Trigger)){this.theTrigger=I.Trigger}else{if(I.Trigger in G.templates){this.theTrigger=new G.templates[I.Trigger](K,l)}else{C("No matching trigger template found")}}}K=null}function h(G,H){this.type=G.type;this.name=G.name;this.fireTriggerIds=G.fireTriggerIds?G.fireTriggerIds:[];this.blockTriggerIds=G.blockTriggerIds?G.blockTriggerIds:[];
 this.fireLimit=G.fireLimit?G.fireLimit:h.FIRE_LIMIT_UNLIMITED;this.fireDelay=G.fireDelay?parseInt(G.fireDelay,10):0;this.startDate=G.startDate?G.startDate:null;this.endDate=G.endDate?G.endDate:null;this.numExecuted=0;this.blocked=false;this.parameters=G.parameters||{};var I=this;this.addDebugValues=function(i,L){i.push({action:L,type:this.type,name:this.name,numExecuted:this.numExecuted})};this._doFire=function(){if(this.blocked){y.log("not firing as this tag is blocked",this);return"tag is blocked"}if(this.fireLimit!==h.FIRE_LIMIT_UNLIMITED&&this.numExecuted){y.log("not firing as this tag has limit reached",this);return"fire limit is restricted"}var L="tag";if(H.id){L+="_"+H.id}if(this.fireLimit===h.FIRE_LIMIT_ONCE_24HOURS&&!window.mtmPreviewWindow){if(x.get(L,this.name)){y.log("not firing as this tag has 24hours limit reached",this);return"fire limit 24hours is restricted"}}if(this.fireLimit===h.FIRE_LIMIT_ONCE_LIFETIME&&!window.mtmPreviewWindow){if(x.get(L,this.name)){y.log("not firing as this tag has limit reached",this);
 return"fire limit lifetime is restricted"}}if(!E.matchesDateRange(new Date(),this.startDate,this.endDate)){y.log("not firing as this tag does not match date",this);return"date range does not match"}if(!this.theTag||!this.theTag.fire){y.log("not firing as tag does not exist anymore",this);return"tag not found"}y.log("firing this tag",this);this.numExecuted++;if(this.fireLimit===h.FIRE_LIMIT_ONCE_24HOURS){var i=24*60*60;x.set(L,this.name,"1",i)}if(this.fireLimit===h.FIRE_LIMIT_ONCE_LIFETIME){x.set(L,this.name,"1")}this.theTag.fire();y.log("fired this tag",this)};this.fire=function(){if(this.fireDelay){setTimeout(function(){I._doFire()},this.fireDelay)}else{return this._doFire()}};this.block=function(){this.blocked=true};this.hasFireTrigger=function(i){if(!this.fireTriggerIds||!this.fireTriggerIds.length){return false}if(!i){return false}var L=i.getId();return B.indexOfArray(this.fireTriggerIds,L)!==-1};this.hasBlockTrigger=function(i){if(!this.blockTriggerIds||!this.blockTriggerIds.length){return false
-}if(!i){return false}var L=i.getId();return B.indexOfArray(this.blockTriggerIds,L)!==-1};if(!B.isDefined(G.Tag)||!G.Tag){y.error("no template defined for tag ",G);return}var J,K=new w({tag:this,container:H});if(B.isObject(G.parameters)){for(J in G.parameters){if(B.hasProperty(G.parameters,J)){K.set(J,o(G.parameters[J],H))}}}if(B.isFunction(G.Tag)){this.theTag=new G.Tag(K,l)}else{if(B.isObject(G.Tag)){this.theTag=G.Tag}else{if(G.Tag in H.templates){this.theTag=new H.templates[G.Tag](K,l)}else{C("No matching tag template found")}}}}h.FIRE_LIMIT_ONCE_PAGE="once_page";h.FIRE_LIMIT_ONCE_24HOURS="once_24hours";h.FIRE_LIMIT_ONCE_LIFETIME="once_lifetime";h.FIRE_LIMIT_UNLIMITED="unlimited";function n(H,M){var I=this;this.id=H.id;this.idsite=H.idsite||null;this.versionName=H.versionName||null;this.revision=H.revision||null;this.environment=H.environment||null;this.templates=M||{};this.dataLayer=new t();this.variables=[];this.triggers=[];this.tags=[];this.onNewGlobalDataLayerValue=function(i){this.dataLayer.push(i)
-};p.on(function(i){I.onNewGlobalDataLayerValue(i)});this.addDebugValues=function(O){O.variables=[];var P;for(P=0;P<this.variables.length;P++){this.variables[P].addDebugValues(O.variables)}O.tags=[];for(P=0;P<this.tags.length;P++){this.tags[P].addDebugValues(O.tags,"Not Fired Yet")}O.id=this.id;O.versionName=this.versionName;O.dataLayer=JSON.parse(JSON.stringify(this.dataLayer.values,function(i,Q){if(typeof Q==="object"&&Q instanceof Node){return Q.nodeName}else{return Q}}))};this.getTriggerById=function(O){if(!O){return}var P;for(P=0;P<this.triggers.length;P++){if(this.triggers[P].getId()===O){return this.triggers[P]}}};this.addTrigger=function(i){if(!i){return}var O=this.getTriggerById(i.id);if(!O){O=new f(i,this);this.triggers.push(O)}return O};var L,K,G,N,J;if(H.variables&&B.isArray(H.variables)){for(L=0;L<H.variables.length;L++){this.variables.push(o(H.variables[L],this))}}if(H.triggers&&B.isArray(H.triggers)){if(H.tags&&B.isArray(H.tags)){H.triggers.sort(function(P,O){var Q=false,S=false,i,R;
-for(R=0;R<H.tags.length;R++){i=H.tags[R];if(i&&i.blockTriggerIds&&B.isArray(i.blockTriggerIds)){Q=Q||B.indexOfArray(i.blockTriggerIds,P.id)!==-1;S=S||B.indexOfArray(i.blockTriggerIds,O.id)!==-1}}if(Q&&!S){return -1}else{if(S&&!Q){return 1}}if(P.id<O.id){return -1}return 1})}for(L=0;L<H.triggers.length;L++){this.addTrigger(H.triggers[L])}}if(H.tags&&B.isArray(H.tags)){for(L=0;L<H.tags.length;L++){N=H.tags[L];G=new h(N,this);this.tags.push(G);if(N.blockTriggerIds&&B.isArray(N.blockTriggerIds)){for(K=0;K<N.blockTriggerIds.length;K++){J=this.getTriggerById(N.blockTriggerIds[K]);if(J){J.addReferencedTag(G)}}}if(N.fireTriggerIds&&B.isArray(N.fireTriggerIds)){for(K=0;K<N.fireTriggerIds.length;K++){J=this.getTriggerById(N.fireTriggerIds[K]);if(J){J.addReferencedTag(G)}}}}}this.run=function(){var P=p.getAllEvents();var O;for(O=0;O<P.length;O++){this.onNewGlobalDataLayerValue(P[O])}for(O=0;O<this.triggers.length;O++){this.triggers[O].setUp()}}}var l={THROW_ERRORS:true,dataLayer:p,containers:[],url:r,date:E,utils:B,debug:y,dom:A,window:D,Variable:s,storage:{local:x,session:e},_buildVariable:o,Condition:z,TemplateParameters:w,Trigger:f,Tag:h,throwError:C,Container:n,addContainer:function(M,J){var K=r.getQueryParameter("mtmSetDebugFlag");
-if(K){var H=encodeURIComponent(M.idsite);var i=encodeURIComponent(M.id);if(K==1){var I=new Date();I.setTime(I.getTime()+(7*24*60*60*1000));document.cookie="mtmPreviewMode=mtmPreview"+H+"_"+i+"%3D1;expires="+I.toUTCString()+";SameSite=Lax"}else{document.cookie="mtmPreviewMode=mtmPreview"+H+"_"+i+"%3D1;expires=Thu, 01 Jan 1970 00:00:00 UTC;SameSite=Lax";window.close()}}if(!window.mtmPreviewWindow){var L=b.getElementById("mtmDebugFrame");if(L&&L.contentWindow){window.mtmPreviewWindow=L.contentWindow}}y.log("creating container");var G=new n(M,J);this.containers.push(G);G.dataLayer.push({"mtm.containerId":G.id});y.log("running container");G.run();return G},enableDebugMode:function(){y.enabled=true}};if("matomoTagManagerAsyncInit" in a&&B.isFunction(a.matomoTagManagerAsyncInit)){a.matomoTagManagerAsyncInit(l)}function g(){var K,I,H,M,N;for(K=0;K<arguments.length;K+=1){N=null;if(arguments[K]&&arguments[K].slice){N=arguments[K].slice()}M=arguments[K];if(B.isObject(M)&&!B.isArray(M)){p.push(M);continue
-}H=M.shift();var L=B.isString(H)&&H.indexOf("::")>0;if(L){var G,J;G=H.split("::");J=G[0];H=G[1];if("object"===typeof l[J]&&B.isFunction(l[J][H])){l[J][H].apply(l[J],M)}}else{if(H&&H in l&&B.isFunction(l[H])){l[H].apply(l,M)}else{y.error("method "+H+" is not valid")}}}}B.setMethodWrapIfNeeded(a._mtm,"push",g);var v;for(v=0;v<a._mtm.length;v++){g(a._mtm[v])}p.push({"mtm.mtmScriptLoadedTime":k});if(("undefined"===typeof ignoreGtmDataLayer||!ignoreGtmDataLayer)&&"undefined"!==typeof a.dataLayer&&B.isArray(a.dataLayer)){for(v=0;v<a.dataLayer.length;v++){if(B.isObject(a.dataLayer[v])){p.push(a.dataLayer[v])}}}return l})()}
+}if(!i){return false}var L=i.getId();return B.indexOfArray(this.blockTriggerIds,L)!==-1};if(!B.isDefined(G.Tag)||!G.Tag){y.error("no template defined for tag ",G);return}var J,K=new w({tag:this,container:H});if(B.isObject(G.parameters)){for(J in G.parameters){if(B.hasProperty(G.parameters,J)){K.set(J,o(G.parameters[J],H))}}}if(B.isFunction(G.Tag)){this.theTag=new G.Tag(K,l)}else{if(B.isObject(G.Tag)){this.theTag=G.Tag}else{if(G.Tag in H.templates){this.theTag=new H.templates[G.Tag](K,l)}else{C("No matching tag template found")}}}}h.FIRE_LIMIT_ONCE_PAGE="once_page";h.FIRE_LIMIT_ONCE_24HOURS="once_24hours";h.FIRE_LIMIT_ONCE_LIFETIME="once_lifetime";h.FIRE_LIMIT_UNLIMITED="unlimited";function n(G,N){var O=this;this.id=G.id;this.idsite=G.idsite||null;this.versionName=G.versionName||null;this.revision=G.revision||null;this.environment=G.environment||null;this.templates=N||{};this.dataLayer=new t();this.variables=[];this.triggers=[];this.tags=[];this.onNewGlobalDataLayerValue=function(i){this.dataLayer.push(i)
+};p.on(function(i){O.onNewGlobalDataLayerValue(i)});this.addDebugValues=function(Q){Q.variables=[];var R;for(R=0;R<this.variables.length;R++){this.variables[R].addDebugValues(Q.variables)}Q.tags=[];for(R=0;R<this.tags.length;R++){this.tags[R].addDebugValues(Q.tags,"Not Fired Yet")}Q.id=this.id;Q.versionName=this.versionName;Q.dataLayer=JSON.parse(JSON.stringify(this.dataLayer.values,function(i,S){if(typeof S==="object"&&S instanceof Node){return S.nodeName}else{return S}}))};this.getTriggerById=function(Q){if(!Q){return}var R;for(R=0;R<this.triggers.length;R++){if(this.triggers[R].getId()===Q){return this.triggers[R]}}};this.addTrigger=function(i){if(!i){return}var Q=this.getTriggerById(i.id);if(!Q){Q=new f(i,this);this.triggers.push(Q)}return Q};var M,L,P,K,I;if(G.variables&&B.isArray(G.variables)){for(M=0;M<G.variables.length;M++){this.variables.push(o(G.variables[M],this))}}if(G.triggers&&B.isArray(G.triggers)){if(G.tags&&B.isArray(G.tags)){G.triggers.sort(function(R,Q){var S=false,U=false,i,T;
+for(T=0;T<G.tags.length;T++){i=G.tags[T];if(i&&i.blockTriggerIds&&B.isArray(i.blockTriggerIds)){S=S||B.indexOfArray(i.blockTriggerIds,R.id)!==-1;U=U||B.indexOfArray(i.blockTriggerIds,Q.id)!==-1}}if(S&&!U){return -1}else{if(U&&!S){return 1}}if(R.id<Q.id){return -1}return 1})}for(M=0;M<G.triggers.length;M++){this.addTrigger(G.triggers[M])}}if(G.tags&&B.isArray(G.tags)){var J=false;var H=[];for(M=0;M<G.tags.length;M++){K=G.tags[M];if(K.type==="Matomo"&&H.indexOf(K.parameters.matomoConfig.name)===-1){J=true;H.push(K.parameters.matomoConfig.name)}}for(M=0;M<G.tags.length;M++){K=G.tags[M];if(J&&K.parameters.matomoConfig&&H.indexOf(K.parameters.matomoConfig.name)!==-1){H.splice(K.parameters.matomoConfig.name,1)}if(J&&H.length===0){K.parameters.applyRemainingPaqEntries=true}P=new h(K,this);this.tags.push(P);if(K.blockTriggerIds&&B.isArray(K.blockTriggerIds)){for(L=0;L<K.blockTriggerIds.length;L++){I=this.getTriggerById(K.blockTriggerIds[L]);if(I){I.addReferencedTag(P)}}}if(K.fireTriggerIds&&B.isArray(K.fireTriggerIds)){for(L=0;
+L<K.fireTriggerIds.length;L++){I=this.getTriggerById(K.fireTriggerIds[L]);if(I){I.addReferencedTag(P)}}}}}this.run=function(){var R=p.getAllEvents();var Q;for(Q=0;Q<R.length;Q++){this.onNewGlobalDataLayerValue(R[Q])}for(Q=0;Q<this.triggers.length;Q++){this.triggers[Q].setUp()}}}var l={THROW_ERRORS:true,dataLayer:p,containers:[],url:r,date:E,utils:B,debug:y,dom:A,window:D,Variable:s,storage:{local:x,session:e},_buildVariable:o,Condition:z,TemplateParameters:w,Trigger:f,Tag:h,throwError:C,Container:n,addContainer:function(M,J){var K=r.getQueryParameter("mtmSetDebugFlag");if(K){var H=encodeURIComponent(M.idsite);var i=encodeURIComponent(M.id);if(K==1){var I=new Date();I.setTime(I.getTime()+(7*24*60*60*1000));document.cookie="mtmPreviewMode=mtmPreview"+H+"_"+i+"%3D1;expires="+I.toUTCString()+";SameSite=Lax"}else{document.cookie="mtmPreviewMode=mtmPreview"+H+"_"+i+"%3D1;expires=Thu, 01 Jan 1970 00:00:00 UTC;SameSite=Lax";window.close()}}if(!window.mtmPreviewWindow){var L=b.getElementById("mtmDebugFrame");
+if(L&&L.contentWindow){window.mtmPreviewWindow=L.contentWindow}}y.log("creating container");var G=new n(M,J);this.containers.push(G);G.dataLayer.push({"mtm.containerId":G.id});y.log("running container");G.run();return G},enableDebugMode:function(){y.enabled=true}};if("matomoTagManagerAsyncInit" in a&&B.isFunction(a.matomoTagManagerAsyncInit)){a.matomoTagManagerAsyncInit(l)}function g(){var K,I,H,M,N;for(K=0;K<arguments.length;K+=1){N=null;if(arguments[K]&&arguments[K].slice){N=arguments[K].slice()}M=arguments[K];if(B.isObject(M)&&!B.isArray(M)){p.push(M);continue}H=M.shift();var L=B.isString(H)&&H.indexOf("::")>0;if(L){var G,J;G=H.split("::");J=G[0];H=G[1];if("object"===typeof l[J]&&B.isFunction(l[J][H])){l[J][H].apply(l[J],M)}}else{if(H&&H in l&&B.isFunction(l[H])){l[H].apply(l,M)}else{y.error("method "+H+" is not valid")}}}}B.setMethodWrapIfNeeded(a._mtm,"push",g);var v;for(v=0;v<a._mtm.length;v++){g(a._mtm[v])}p.push({"mtm.mtmScriptLoadedTime":k});if(("undefined"===typeof ignoreGtmDataLayer||!ignoreGtmDataLayer)&&"undefined"!==typeof a.dataLayer&&B.isArray(a.dataLayer)){for(v=0;
+v<a.dataLayer.length;v++){if(B.isObject(a.dataLayer[v])){p.push(a.dataLayer[v])}}}return l})()}
 /*!!! initContainerHook */
 })();
\ No newline at end of file
diff --git a/tests/resources/trackerTestExample.html b/tests/resources/trackerTestExample.html
new file mode 100644
index 000000000..b5688c04e
--- /dev/null
+++ b/tests/resources/trackerTestExample.html
@@ -0,0 +1,49 @@
+<html>
+<head>
+    <script type="text/javascript">
+        var _paq = window._paq = window._paq || [];
+        _paq.push(['enableLinkTracking']);
+        _paq.push(['FormAnalytics::disable']);
+        // Custom dimension...
+        _paq.push(['setCustomDimension', 2, 'dimensionValue']);
+        _paq.push(['FormAnalytics::enableDebugMode']);
+
+        // Manually track a goal
+        _paq.push(['trackGoal', 1, 123.32]);
+    </script>
+    <!-- Matomo Tag Manager TODO - Replace this with your own MTM container snippet -->
+    <script type="text/javascript">
+        var _mtm = window._mtm = window._mtm || [];
+        _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.async=true; g.src='https://matomo.com/js/container_VJMsHw78.js'; s.parentNode.insertBefore(g,s);
+    </script>
+    <!-- End Matomo Tag Manager -->
+    <!-- Some of the stuff below is specific to the tags I have configured in my test container -->
+    <!-- If the new changes are working, all _paq entries should be applied to all trackers, but not until all configs have been processed -->
+    <script type="text/javascript">
+        var _paq = window._paq = window._paq || [];
+        document.addEventListener("DOMContentLoaded", function(){
+            var titleElement = document.getElementsByClassName('site-title')[0];
+            titleElement.addEventListener('mouseover', function () {
+                window._mtm = window._mtm || [];
+                window._mtm.push({'event': 'testDataLayerEvent', 'testDataLayerValue': 'Meep!'});
+                _paq.push(['trackGoal', 1, 111.22]);
+            });
+            _paq.push(['enableCrossDomainLinking']);
+            _paq.push(['disableCookies']);
+            _paq.push(['trackGoal', 1, 88.99]);
+        });
+
+        // Manually track a goal
+        _paq.push(['trackGoal', 1, 543.21]);
+        _paq.push(['setCustomDimension', 3, 'dimensionValue']);
+    </script>
+</head>
+<body>
+<div>
+    <h1 class="site-title">Hello World!</h1>
+    <span class="secret-element" data-secret="This is my super secret data in the DOM." data-dollar="127.01"></span>
+</div>
+</body>
+</html>
\ No newline at end of file

From 0e799d7a55978428e104efd4ea90d2535b083514 Mon Sep 17 00:00:00 2001
From: Jacob Ransom <jacob@innocraft.com>
Date: Wed, 22 Nov 2023 16:03:32 +1300
Subject: [PATCH 2/6] Adding test HTML I've been trying

---
 .../resources/anotherTrackerTestExample.html  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 tests/resources/anotherTrackerTestExample.html

diff --git a/tests/resources/anotherTrackerTestExample.html b/tests/resources/anotherTrackerTestExample.html
new file mode 100644
index 000000000..91a171fea
--- /dev/null
+++ b/tests/resources/anotherTrackerTestExample.html
@@ -0,0 +1,58 @@
+<html>
+<head>
+    <script type="text/javascript">
+        var _paq = window._paq = window._paq || [];
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PreMtmLoaded', 1]);
+        _paq.push(['trackGoal', 1, 43.21]);
+    </script>
+    <!-- Matomo Tag Manager  TODO - Replace this with your own MTM container snippet -->
+    <script>
+        var _mtm = window._mtm = window._mtm || [];
+        _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+        (function() {
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src='https://matomo.com/js/container_vVLHATh6.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Tag Manager -->
+    <script type="text/javascript">
+        // Manually track a goal
+        var _paq = window._paq = window._paq || [];
+        _paq.push(['trackGoal', 1, 543.21]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PostMtmLoaded', 2]);
+        _paq.push(['setCustomDimension', 1, 'first']);
+        // This is to simulate the matomo.js file loading a while after MTM
+        setTimeout(function () {
+            <!-- Matomo  TODO - Replace this with your own domain and site ID -->
+            var _paq = window._paq = window._paq || [];
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['setCustomDimension', 2, 'second']);
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            _paq.push(['trackGoal', 1, 22.22]);
+            (function() {
+                var u="https://matomo.com/";
+                _paq.push(['setTrackerUrl', u+'matomo.php']);
+                _paq.push(['setSiteId', '20']);
+                var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+                g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            })();
+            <!-- End Matomo Code -->
+            _paq.push(['trackGoal', 1, 33.33]);
+            _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PostMatomoJsLoaded', 4]);
+
+            document.getElementById('loadingMessage').textContent = 'Done loading JS!';
+        }, 5000);
+    </script>
+    <script>
+        _paq.push(['trackGoal', 1, 11.11]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PreMatomoJsLoaded', 3]);
+    </script>
+</head>
+<body>
+<div class="main-div">
+    <h1 class="site-title">Hello World!</h1>
+</div>
+<h2 id="loadingMessage">Loading JS...</h2>
+</body>
+</html>

From 7c74cfd96458fd7e89d6b4d7b29798abf1028b1e Mon Sep 17 00:00:00 2001
From: Jacob Ransom <jacob@innocraft.com>
Date: Thu, 23 Nov 2023 12:40:48 +1300
Subject: [PATCH 3/6] Updating example to how I reproduced some intermittent
 tracking loss

---
 .../resources/anotherTrackerTestExample.html  | 68 ++++++++++++-------
 1 file changed, 45 insertions(+), 23 deletions(-)

diff --git a/tests/resources/anotherTrackerTestExample.html b/tests/resources/anotherTrackerTestExample.html
index 91a171fea..c343ca61c 100644
--- a/tests/resources/anotherTrackerTestExample.html
+++ b/tests/resources/anotherTrackerTestExample.html
@@ -1,5 +1,12 @@
 <html>
 <head>
+    <!-- Google Tag Manager -->
+    <script nonce="2726c7f26c">(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-TG7HTVR');</script>
+    <!-- End Google Tag Manager -->
     <script type="text/javascript">
         var _paq = window._paq = window._paq || [];
         _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PreMtmLoaded', 1]);
@@ -21,38 +28,53 @@
         _paq.push(['trackGoal', 1, 543.21]);
         _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PostMtmLoaded', 2]);
         _paq.push(['setCustomDimension', 1, 'first']);
-        // This is to simulate the matomo.js file loading a while after MTM
-        setTimeout(function () {
-            <!-- Matomo  TODO - Replace this with your own domain and site ID -->
-            var _paq = window._paq = window._paq || [];
-            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-            _paq.push(['setCustomDimension', 2, 'second']);
-            _paq.push(['trackPageView']);
-            _paq.push(['enableLinkTracking']);
-            _paq.push(['trackGoal', 1, 22.22]);
-            (function() {
-                var u="https://matomo.com/";
-                _paq.push(['setTrackerUrl', u+'matomo.php']);
-                _paq.push(['setSiteId', '20']);
-                var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-                g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-            })();
-            <!-- End Matomo Code -->
-            _paq.push(['trackGoal', 1, 33.33]);
-            _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PostMatomoJsLoaded', 4]);
-
-            document.getElementById('loadingMessage').textContent = 'Done loading JS!';
-        }, 5000);
     </script>
+    <!-- Hotjar Tracking Code for my site -->
     <script>
+        (function(h,o,t,j,a,r){
+            h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+            h._hjSettings={hjid:3745842,hjsv:6};
+            a=o.getElementsByTagName('head')[0];
+            r=o.createElement('script');r.async=1;
+            r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+            a.appendChild(r);
+        })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+    </script>
+    <script type="text/javascript">
         _paq.push(['trackGoal', 1, 11.11]);
         _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PreMatomoJsLoaded', 3]);
     </script>
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['setCustomDimension', 2, 'second']);
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        _paq.push(['trackGoal', 1, 22.22]);
+        (function() {
+            var u="https://matomo.com/";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '20']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
+    <script type="text/javascript">
+        _paq.push(['trackGoal', 1, 33.33]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PostMatomoJsLoaded', 4]);
+        _paq.push(['setCustomDimension', 3, 'third']);
+    </script>
 </head>
 <body>
 <div class="main-div">
     <h1 class="site-title">Hello World!</h1>
 </div>
-<h2 id="loadingMessage">Loading JS...</h2>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button1', 1]);">Test Button 1</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button2', 2]);">Test Button 2</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button3', 3]);">Test Button 3</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button4', 4]);">Test Button 4</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button5', 5]);">Test Button 5</button></div>
 </body>
 </html>

From a71fb684de7d311bd3f228d41fe4f77a3b345bd3 Mon Sep 17 00:00:00 2001
From: Jacob Ransom <jacob@innocraft.com>
Date: Tue, 5 Dec 2023 12:47:33 +1300
Subject: [PATCH 4/6] Fixed issue with array management and cleaned up

---
 Template/Tag/MatomoTag.web.js | 103 ++++++++++++++++------------------
 1 file changed, 47 insertions(+), 56 deletions(-)

diff --git a/Template/Tag/MatomoTag.web.js b/Template/Tag/MatomoTag.web.js
index a5803aab2..8f06361c2 100644
--- a/Template/Tag/MatomoTag.web.js
+++ b/Template/Tag/MatomoTag.web.js
@@ -19,9 +19,8 @@
     }
     // Store the initial state of window._paq so that we can apply it to all the configs
     // We use the stringify and parse to make sure that we have a copy and not a reference
-    var initialPaq = window._paq && window._paq.length ? JSON.parse(JSON.stringify(window._paq)) : initialPaq || [];
-    var remainingPaq = [];
-    var indexesToRemove = [];
+    var localPaq = window._paq && window._paq.length ? JSON.parse(JSON.stringify(window._paq)) : localPaq || [];
+    var indexesOfConfigs = [];
     // Clear window._paq to prevent things from being tracked too early
     while (window._paq.length > 0) {
         window._paq.pop();
@@ -83,13 +82,13 @@
         }
     }
 
-    function removeIndexIfExists(index)
+    function markIndexAsConfig(index)
     {
         if (index < 0) {
            return;
         }
 
-        indexesToRemove.push(index);
+        indexesOfConfigs.push(index);
     }
 
     var configuredTrackers = {};
@@ -119,8 +118,7 @@
                 var variableName = parameters.matomoConfig.name;
 
                 var setCustomDimensionIndexes = [];
-                indexesToRemove = [];
-                var localPaq = JSON.parse(JSON.stringify(initialPaq));
+                indexesOfConfigs = [];
 
                 // we need to fetch matomoConfig again in case some parameters changed meanwhile that are variables...
                 // eg userId might be a variable and it's value might be different now
@@ -171,17 +169,17 @@
                             case 'setUserId':
                                 setUserIdIndex = k;
                                 // Mark this one for removal right away since we don't want it to override the container
-                                removeIndexIfExists(k);
+                                markIndexAsConfig(k);
                                 break;
                             case 'setSiteId':
                                 setSiteIdIndex = k;
                                 // Mark this one for removal right away since we don't want it to override the container
-                                removeIndexIfExists(k);
+                                markIndexAsConfig(k);
                                 break;
                             case 'setTrackerUrl':
                                 setTrackerUrlIndex = k;
                                 // Mark this one for removal right away since we don't want it to override the container
-                                removeIndexIfExists(k);
+                                markIndexAsConfig(k);
                                 break;
                             case 'requireCookieConsent':
                                 requireCookieConsentIndex = k;
@@ -285,74 +283,74 @@
 
                     if (matomoConfig.requireCookieConsent || requireCookieConsentIndex !== -1) {
                         tracker.requireCookieConsent();
-                        removeIndexIfExists(requireCookieConsentIndex);
+                        markIndexAsConfig(requireCookieConsentIndex);
                     }
 
                     if ((matomoConfig.disableBrowserFeatureDetection || disableBrowserFeatureDetectionIndex !== -1) && typeof tracker.disableBrowserFeatureDetection === 'function') {
                         tracker.disableBrowserFeatureDetection();
-                        removeIndexIfExists(disableBrowserFeatureDetectionIndex);
+                        markIndexAsConfig(disableBrowserFeatureDetectionIndex);
                     }
 
                     if (matomoConfig.disableCookies || disableCookiesIndex !== -1) {
                         tracker.disableCookies();
-                        removeIndexIfExists(disableCookiesIndex);
+                        markIndexAsConfig(disableCookiesIndex);
                     }
 
                     if (matomoConfig.enableCrossDomainLinking || enableCrossDomainLinkingIndex !== -1) {
                         tracker.enableCrossDomainLinking();
-                        removeIndexIfExists(enableCrossDomainLinkingIndex);
+                        markIndexAsConfig(enableCrossDomainLinkingIndex);
                     }
 
                     if (cookieSameSiteIndex !== -1 && localPaq[cookieSameSiteIndex].length === 2) {
                        tracker.setCookieSameSite(localPaq[cookieSameSiteIndex][1]);
-                       removeIndexIfExists(cookieSameSiteIndex);
+                       markIndexAsConfig(cookieSameSiteIndex);
                     } else if (matomoConfig.cookieSameSite) {
                         tracker.setCookieSameSite(matomoConfig.cookieSameSite);
                     }
 
                     if (setVisitorCookieTimeoutIndex !== -1 && localPaq[setVisitorCookieTimeoutIndex].length === 2) {
                         tracker.setVisitorCookieTimeout(localPaq[setVisitorCookieTimeoutIndex][1]);
-                        removeIndexIfExists(setVisitorCookieTimeoutIndex);
+                        markIndexAsConfig(setVisitorCookieTimeoutIndex);
                     } else if (matomoConfig.customCookieTimeOutEnable) {
                         tracker.setVisitorCookieTimeout(matomoConfig.customCookieTimeOut * 86400);
                     }
 
                     if (setReferralCookieTimeoutIndex !== -1 && localPaq[setReferralCookieTimeoutIndex].length === 2) {
                         tracker.setReferralCookieTimeout(localPaq[setReferralCookieTimeoutIndex][1]);
-                        removeIndexIfExists(setReferralCookieTimeoutIndex);
+                        markIndexAsConfig(setReferralCookieTimeoutIndex);
                     } else if (matomoConfig.customCookieTimeOutEnable) {
                         tracker.setReferralCookieTimeout(matomoConfig.referralCookieTimeOut * 86400);
                     }
 
                     if (setSessionCookieTimeoutIndex !== -1 && localPaq[setSessionCookieTimeoutIndex].length === 2) {
                         tracker.setSessionCookieTimeout(localPaq[setSessionCookieTimeoutIndex][1]);
-                        removeIndexIfExists(setSessionCookieTimeoutIndex);
+                        markIndexAsConfig(setSessionCookieTimeoutIndex);
                     } else if (matomoConfig.customCookieTimeOutEnable) {
                         tracker.setSessionCookieTimeout(matomoConfig.sessionCookieTimeOut * 60);
                     }
 
                     if (matomoConfig.setSecureCookie || setSecureCookieIndex !== -1) {
                         tracker.setSecureCookie(true);
-                        removeIndexIfExists(setSecureCookieIndex);
+                        markIndexAsConfig(setSecureCookieIndex);
                     }
 
                     if (cookiePathIndex !== -1 && localPaq[cookiePathIndex].length === 2) {
                         tracker.setCookiePath(localPaq[cookiePathIndex][1]);
-                        removeIndexIfExists(cookiePathIndex);
+                        markIndexAsConfig(cookiePathIndex);
                     } else if (matomoConfig.cookiePath) {
                         tracker.setCookiePath(matomoConfig.cookiePath);
                     }
 
                     if (cookieNamePrefixIndex !== -1 && localPaq[cookieNamePrefixIndex].length === 2) {
                         tracker.setCookiePath(localPaq[cookieNamePrefixIndex][1]);
-                        removeIndexIfExists(cookieNamePrefixIndex);
+                        markIndexAsConfig(cookieNamePrefixIndex);
                     } else if (matomoConfig.cookieNamePrefix) {
                         tracker.setCookiePath(matomoConfig.cookieNamePrefix);
                     }
 
                     if (cookieDomainIndex !== -1 && localPaq[cookieDomainIndex].length === 2) {
                         tracker.setCookieDomain(localPaq[cookieDomainIndex][1]);
-                        removeIndexIfExists(cookieDomainIndex);
+                        markIndexAsConfig(cookieDomainIndex);
                     } else if (matomoConfig.cookieDomain) {
                         tracker.setCookieDomain(matomoConfig.cookieDomain);
                     }
@@ -367,7 +365,7 @@
                         if (TagManager.utils.isArray(domainsArray)) {
                             matomoConfig.domains = domainsArray;
                         }
-                        removeIndexIfExists(setDomainsIndex);
+                        markIndexAsConfig(setDomainsIndex);
                     }
                     if (matomoConfig.domains
                         && TagManager.utils.isArray(matomoConfig.domains)
@@ -389,12 +387,12 @@
 
                     if (matomoConfig.alwaysUseSendBeacon || alwaysUseSendBeaconIndex !== -1) {
                         tracker.alwaysUseSendBeacon();
-                        removeIndexIfExists(alwaysUseSendBeaconIndex);
+                        markIndexAsConfig(alwaysUseSendBeaconIndex);
                     }
 
                     if (matomoConfig.disableAlwaysUseSendBeacon || disableAlwaysUseSendBeaconIndex !== -1) {
                         tracker.disableAlwaysUseSendBeacon();
-                        removeIndexIfExists(disableAlwaysUseSendBeaconIndex);
+                        markIndexAsConfig(disableAlwaysUseSendBeaconIndex);
                     }
 
                     if (appendToTrackingUrlIndex !== -1 && localPaq[appendToTrackingUrlIndex].length === 2
@@ -405,9 +403,9 @@
                             && setRequestContentTypeIndex !== -1 && localPaq[setRequestContentTypeIndex].length === 2
                             && typeof localPaq[setRequestContentTypeIndex][1] === 'string' && localPaq[setRequestContentTypeIndex][1].length > 0) {
                             tracker.setRequestContentType(localPaq[setRequestContentTypeIndex][1]);
-                            removeIndexIfExists(setRequestContentTypeIndex);
+                            markIndexAsConfig(setRequestContentTypeIndex);
                         }
-                        removeIndexIfExists(appendToTrackingUrlIndex);
+                        markIndexAsConfig(appendToTrackingUrlIndex);
                     } else if (matomoConfig.forceRequestMethod && typeof matomoConfig.requestMethod === 'string'
                         && ['POST', 'GET'].includes(matomoConfig.requestMethod.toUpperCase())) {
                         tracker.setRequestMethod(matomoConfig.requestMethod);
@@ -418,33 +416,33 @@
 
                     if (matomoConfig.enableLinkTracking || enableLinkTrackingIndex !== -1) {
                         tracker.enableLinkTracking();
-                        removeIndexIfExists(enableLinkTrackingIndex);
+                        markIndexAsConfig(enableLinkTrackingIndex);
                     }
 
                     if (matomoConfig.enableFileTracking || enableFileTrackingIndex !== -1) {
                         tracker.enableFileTracking();
-                        removeIndexIfExists(enableFileTrackingIndex);
+                        markIndexAsConfig(enableFileTrackingIndex);
                     }
 
                     if (matomoConfig.requireConsent || requireConsentIndex !== -1) {
                         tracker.requireConsent();
-                        removeIndexIfExists(requireConsentIndex);
+                        markIndexAsConfig(requireConsentIndex);
                     }
 
                     if (matomoConfig.enableDoNotTrack || enableDoNotTrackIndex !== -1) {
                         tracker.setDoNotTrack(1);
-                        removeIndexIfExists(enableDoNotTrackIndex);
+                        markIndexAsConfig(enableDoNotTrackIndex);
                     }
 
                     if (matomoConfig.disablePerformanceTracking || disablePerformanceTrackingIndex !== -1) {
                         tracker.disablePerformanceTracking();
-                        removeIndexIfExists(disablePerformanceTrackingIndex);
+                        markIndexAsConfig(disablePerformanceTrackingIndex);
                     }
 
                     if (appendToTrackingUrlIndex !== -1 && localPaq[appendToTrackingUrlIndex].length === 2
                         && typeof localPaq[appendToTrackingUrlIndex][1] === 'string' && localPaq[appendToTrackingUrlIndex][1].length > 0) {
                         tracker.appendToTrackingUrl(localPaq[appendToTrackingUrlIndex][1]);
-                       removeIndexIfExists(appendToTrackingUrlIndex);
+                       markIndexAsConfig(appendToTrackingUrlIndex);
                     } else if (typeof matomoConfig.appendToTrackingUrl === 'string' && matomoConfig.appendToTrackingUrl.length > 0) {
                         tracker.appendToTrackingUrl(matomoConfig.appendToTrackingUrl);
                     }
@@ -452,14 +450,14 @@
                     if (setCustomRequestProcessingIndex !== -1 && localPaq[setCustomRequestProcessingIndex].length === 2
                         && typeof localPaq[setCustomRequestProcessingIndex][1] === 'function' && localPaq[setCustomRequestProcessingIndex][1].length >= 1) {
                         tracker.setCustomRequestProcessing(localPaq[setCustomRequestProcessingIndex][1]);
-                        removeIndexIfExists(setCustomRequestProcessingIndex);
+                        markIndexAsConfig(setCustomRequestProcessingIndex);
                     } else if(typeof matomoConfig.customRequestProcessing === 'function' && matomoConfig.customRequestProcessing.length >= 1) {
                         tracker.setCustomRequestProcessing(matomoConfig.customRequestProcessing);
                     }
 
                     if (matomoConfig.enableJSErrorTracking || enableJSErrorTrackingIndex !== -1) {
                         tracker.enableJSErrorTracking();
-                        removeIndexIfExists(enableJSErrorTrackingIndex);
+                        markIndexAsConfig(enableJSErrorTrackingIndex);
                     }
 
                     if (matomoConfig.enableHeartBeatTimer || enableHeartBeatTimerIndex !== -1) {
@@ -470,27 +468,27 @@
                         } else {
                             tracker.enableHeartBeatTimer();
                         }
-                        removeIndexIfExists(enableHeartBeatTimerIndex);
+                        markIndexAsConfig(enableHeartBeatTimerIndex);
                     }
 
                     if (matomoConfig.trackAllContentImpressions || trackAllContentImpressionsIndex !== -1) {
                         tracker.trackAllContentImpressions();
-                        removeIndexIfExists(trackAllContentImpressionsIndex);
+                        markIndexAsConfig(trackAllContentImpressionsIndex);
                     }
 
                     if (matomoConfig.trackVisibleContentImpressions || trackVisibleContentImpressionsIndex !== -1) {
                         tracker.trackVisibleContentImpressions();
-                        removeIndexIfExists(trackVisibleContentImpressionsIndex);
+                        markIndexAsConfig(trackVisibleContentImpressionsIndex);
                     }
 
                     if (((matomoConfig.hasOwnProperty('enableFormAnalytics') && !matomoConfig.enableFormAnalytics) || disableFormAnalyticsIndex !== -1) && window.Matomo && window.Matomo.FormAnalytics && typeof window.Matomo.FormAnalytics.disableFormAnalytics === 'function') {
                         window.Matomo.FormAnalytics.disableFormAnalytics();
-                        removeIndexIfExists(disableFormAnalyticsIndex);
+                        markIndexAsConfig(disableFormAnalyticsIndex);
                     }
 
                     if (((matomoConfig.hasOwnProperty('enableMediaAnalytics') && !matomoConfig.enableMediaAnalytics) || disableMediaAnalyticsIndex !== -1) && window.Matomo && window.Matomo.MediaAnalytics && typeof window.Matomo.MediaAnalytics.disableMediaAnalytics === 'function') {
                         window.Matomo.MediaAnalytics.disableMediaAnalytics();
-                        removeIndexIfExists(disableMediaAnalyticsIndex);
+                        markIndexAsConfig(disableMediaAnalyticsIndex);
                     }
                 }
 
@@ -528,7 +526,7 @@
                                 value: customDim[2],
                             });
                         }
-                        removeIndexIfExists(setCustomDimensionIndexes[indexIndex]);
+                        markIndexAsConfig(setCustomDimensionIndexes[indexIndex]);
                     }
                 }
                 if (matomoConfig.customDimensions
@@ -543,25 +541,18 @@
                     }
                 }
 
-                // Sort the indexes greatest to least so that removing one won't affect the others
-                indexesToRemove.sort().reverse();
-                var arrayLength = indexesToRemove.length;
-                for (indexRemove = 0; indexRemove < arrayLength; indexRemove++) {
-                    localPaq.splice(indexesToRemove[indexRemove], 1);
-                }
-
-                // Keep a list of all of the non-config requests to process later
-                if (localPaq.length && !remainingPaq.length) {
-                   remainingPaq = localPaq;
-                }
-
                 // If the remaining _paq values haven't been processed yet, process them
                 // We wait till now so that all configs are applied first
                 var applyRemainingPaqEntries = parameters.get('applyRemainingPaqEntries', false);
-                if (!hasProcessedRemainingTrackings && remainingPaq.length && applyRemainingPaqEntries) {
+                if (!hasProcessedRemainingTrackings && localPaq.length > indexesOfConfigs.length && applyRemainingPaqEntries) {
                     hasProcessedRemainingTrackings = true;
-                    for (trackingIndex = 0; trackingIndex < remainingPaq.length; trackingIndex++) {
-                        window._paq.push(remainingPaq[trackingIndex]);
+                    for (trackingIndex = 0; trackingIndex < localPaq.length; trackingIndex++) {
+                        // Skip config items since they've already been processed
+                        if (indexesOfConfigs.indexOf(trackingIndex) >= 0) {
+                            continue;
+                        }
+
+                        window._paq.push(localPaq[trackingIndex]);
                     }
                 }
 

From ffbf8a9b34dba3a2d939970e7f28cfa3a9f38950 Mon Sep 17 00:00:00 2001
From: Jacob Ransom <jacob@innocraft.com>
Date: Tue, 5 Dec 2023 12:50:50 +1300
Subject: [PATCH 5/6] Adding another test file

---
 .../resources/complexTrackerTestExample.html  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 tests/resources/complexTrackerTestExample.html

diff --git a/tests/resources/complexTrackerTestExample.html b/tests/resources/complexTrackerTestExample.html
new file mode 100644
index 000000000..3a531651f
--- /dev/null
+++ b/tests/resources/complexTrackerTestExample.html
@@ -0,0 +1,62 @@
+<html>
+<head>
+    <script type="text/javascript">
+        var _paq = window._paq = window._paq || [];
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PreMtmLoaded', 1]);
+        _paq.push(['trackGoal', 1, 11.11]);
+    </script>
+    <!-- Matomo Tag Manager  TODO - Replace this with your own MTM container snippet -->
+    <script>
+        var _mtm = window._mtm = window._mtm || [];
+        _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+        (function() {
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src='https://matomo.com/js/container_vVLHATh6.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Tag Manager -->
+    <script type="text/javascript">
+        // Manually track a goal
+        var _paq = window._paq = window._paq || [];
+        _paq.push(['trackGoal', 1, 22.22]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'PostMtmLoaded', 2]);
+        _paq.push(['setCustomDimension', 1, 'first']);
+    </script>
+    <script type="text/javascript">
+        _paq.push(['trackGoal', 1, 33.33]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'CustomEvent3', 3]);
+    </script>
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['setCustomDimension', 2, 'second']);
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        _paq.push(['trackGoal', 1, 44.44]);
+    </script>
+    <!-- End Matomo Code -->
+    <script type="text/javascript">
+        _paq.push(['setCustomDimension', 3, 'third']);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'CustomEvent4', 4]);
+        _paq.push(['trackGoal', 1, 55.55]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'CustomEvent5', 5]);
+        _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'CustomEvent6', 6]);
+        _paq.push(['trackGoal', 1, 66.66]);
+        setTimeout(function () {
+            _paq.push(['trackEvent', 'MyCategory', 'MyAction', 'CustomEvent7', 7]);
+            _paq.push(['trackGoal', 1, 77.77]);
+        }, 1000);
+    </script>
+</head>
+<body>
+<div class="main-div">
+    <h1 class="site-title">Hello World!</h1>
+</div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button1', 1]);">Test Button 1</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button2', 2]);">Test Button 2</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button3', 3]);">Test Button 3</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button4', 4]);">Test Button 4</button></div>
+<div><button type="button" onclick="_paq.push(['trackEvent', 'MyButtonCategory', 'MyButtonAction', 'Button5', 5]);">Test Button 5</button></div>
+</body>
+</html>

From d03bd7af06fb8d8fadc016ac5df36288ebc8ce2d Mon Sep 17 00:00:00 2001
From: Jacob Ransom <jacob@innocraft.com>
Date: Wed, 6 Dec 2023 15:56:59 +1300
Subject: [PATCH 6/6] Adding config back in that was accidentally removed

---
 Template/Tag/MatomoTag.web.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Template/Tag/MatomoTag.web.js b/Template/Tag/MatomoTag.web.js
index 8f06361c2..5782283ba 100644
--- a/Template/Tag/MatomoTag.web.js
+++ b/Template/Tag/MatomoTag.web.js
@@ -147,7 +147,8 @@
                     // There might already be some configs missing from this list
                     var setUserIdIndex = setSiteIdIndex = setTrackerUrlIndex
                         = requireCookieConsentIndex = disableBrowserFeatureDetectionIndex
-                        = disableCookiesIndex = enableCrossDomainLinkingIndex = cookieSameSiteIndex
+                        = disableCookiesIndex = enableCrossDomainLinkingIndex
+                        = setCrossDomainLinkingTimeoutIndex = cookieSameSiteIndex
                         = setVisitorCookieTimeoutIndex = setReferralCookieTimeoutIndex
                         = setSessionCookieTimeoutIndex = setSecureCookieIndex = cookiePathIndex
                         = cookieNamePrefixIndex = cookieDomainIndex = setDomainsIndex
@@ -193,6 +194,9 @@
                             case 'enableCrossDomainLinking':
                                 enableCrossDomainLinkingIndex = k;
                                 break;
+                            case 'setCrossDomainLinkingTimeout':
+                                setCrossDomainLinkingTimeoutIndex = k;
+                                break;
                             case 'cookieSameSite':
                                 cookieSameSiteIndex = k;
                                 break;
@@ -301,6 +305,13 @@
                         markIndexAsConfig(enableCrossDomainLinkingIndex);
                     }
 
+                    if (setCrossDomainLinkingTimeoutIndex !== -1 && localPaq[setCrossDomainLinkingTimeoutIndex].length === 2) {
+                        tracker.setCrossDomainLinkingTimeout(localPaq[setCrossDomainLinkingTimeoutIndex][1]);
+                        markIndexAsConfig(setCrossDomainLinkingTimeoutIndex);
+                    } else if (matomoConfig.enableCrossDomainLinking && matomoConfig.crossDomainLinkingTimeout) {
+                        tracker.setCrossDomainLinkingTimeout(matomoConfig.crossDomainLinkingTimeout);
+                    }
+
                     if (cookieSameSiteIndex !== -1 && localPaq[cookieSameSiteIndex].length === 2) {
                        tracker.setCookieSameSite(localPaq[cookieSameSiteIndex][1]);
                        markIndexAsConfig(cookieSameSiteIndex);