Upd. JS parameters. Gathering dynamic lod implemented.

gulpfile.js

@@ -35,6 +35,7 @@ function minify_all_js_files_except_already_bundled() {
             '!js/src/cleantalk-admin.js',
             '!js/src/common-decoder.js',
             'js/src/public-3-trp.js',
+            'js/src/public-2-gathering-data.js',
         ])
         .pipe(sourcemaps.init())
         .pipe(uglify())

inc/cleantalk-common.php

@@ -684,6 +684,7 @@ function apbct_get_sender_info()
         'bot_detector_prepared_form_exclusions' => apbct__bot_detector_get_prepared_exclusion(),
         'bot_detector_frontend_data_log' => apbct__bot_detector_get_fd_log(),
         'submit_time_calculation_enabled' => SubmitTimeHandler::isCalculationDisabled() ? 0 : 1,
+        'ct_gathering_loaded' => Cookie::getBool('ct_gathering_loaded'),
     );
 
     // Unset cookies_enabled from sender_info if cookies_type === none

js/prebuild/apbct-public-bundle.js

@@ -1988,7 +1988,7 @@ class ApbctShadowRootProtection {
  * Set init params
  */
 // eslint-disable-next-line no-unused-vars,require-jsdoc
-function initParams() {
+function initParams(gatheringLoaded) {
     const ctDate = new Date();
     const headless = navigator.webdriver;
     const screenInfo = (
@@ -2067,6 +2067,10 @@ function initParams() {
         initCookies.push(['ct_checkjs', 0]);
     }
 
+    if (gatheringLoaded) {
+        initCookies.push(['ct_gathering_loaded', gatheringLoaded]);
+    }
+
     ctSetCookie(initCookies);
 }
 
@@ -2605,13 +2609,14 @@ class ApbctEventTokenTransport {
 class ApbctAttachData {
     /**
      * Attach hidden fields to forms
+     * @param {bool} gatheringLoaded
      * @return {void}
      */
-    attachHiddenFieldsToForms() {
+    attachHiddenFieldsToForms(gatheringLoaded) {
         if (typeof ctPublic.force_alt_cookies == 'undefined' ||
             (ctPublic.force_alt_cookies !== 'undefined' && !ctPublic.force_alt_cookies)
         ) {
-            if (!+ctPublic.settings__data__bot_detector_enabled) {
+            if (!+ctPublic.settings__data__bot_detector_enabled || gatheringLoaded) {
                 ctNoCookieAttachHiddenFieldsToForms();
                 document.addEventListener('gform_page_loaded', ctNoCookieAttachHiddenFieldsToForms);
             }
@@ -3074,7 +3079,7 @@ class ApbctHandler {
                 if (isNeedToAddCleantalkDataCheckString) {
                     let addidionalCleantalkData = '';
 
-                    if (!+ctPublic.settings__data__bot_detector_enabled) {
+                    if (!(+ctPublic.settings__data__bot_detector_enabled && apbctLocalStorage.get('bot_detector_event_token'))) {
                         let noCookieData = getNoCookieData();
                         addidionalCleantalkData += '&' + 'data%5Bct_no_cookie_hidden_field%5D=' + noCookieData;
                     } else {
@@ -3088,7 +3093,7 @@ class ApbctHandler {
                 }
 
                 if (isNeedToAddCleantalkDataCheckFormData) {
-                    if (!+ctPublic.settings__data__bot_detector_enabled) {
+                    if (!(+ctPublic.settings__data__bot_detector_enabled && apbctLocalStorage.get('bot_detector_event_token'))) {
                         let noCookieData = getNoCookieData();
                         body.append('ct_no_cookie_hidden_field', noCookieData);
                     } else {
@@ -3143,7 +3148,7 @@ class ApbctHandler {
                             if (
                                 args[1].body instanceof FormData || (typeof args[1].body.append === 'function')
                             ) {
-                                if (+ctPublic.settings__data__bot_detector_enabled) {
+                                if (+ctPublic.settings__data__bot_detector_enabled && apbctLocalStorage.get('bot_detector_event_token')) {
                                     args[1].body.append(
                                         'ct_bot_detector_event_token',
                                         apbctLocalStorage.get('bot_detector_event_token'),
@@ -3441,7 +3446,7 @@ class ApbctHandler {
                         let eventToken = '';
                         let noCookieData = '';
                         let visibleFieldsString = '';
-                        if (+ctPublic.settings__data__bot_detector_enabled) {
+                        if (+ctPublic.settings__data__bot_detector_enabled && apbctLocalStorage.get('bot_detector_event_token')) {
                             const token = new ApbctHandler().toolGetEventToken();
                             if (token) {
                                 if (sourceSign.keepUnwrapped) {
@@ -3508,7 +3513,7 @@ class ApbctHandler {
                 options.data.requests[0].hasOwnProperty('path') &&
                 options.data.requests[0].path === '/wc/store/v1/cart/add-item'
             ) {
-                if (+ctPublic.settings__data__bot_detector_enabled) {
+                if (+ctPublic.settings__data__bot_detector_enabled && apbctLocalStorage.get('bot_detector_event_token')) {
                     let token = localStorage.getItem('bot_detector_event_token');
                     options.data.requests[0].data.ct_bot_detector_event_token = token;
                 } else {
@@ -3520,7 +3525,7 @@ class ApbctHandler {
 
             // checkout
             if (options.path.includes('/wc/store/v1/checkout')) {
-                if (+ctPublic.settings__data__bot_detector_enabled) {
+                if (+ctPublic.settings__data__bot_detector_enabled && apbctLocalStorage.get('bot_detector_event_token')) {
                     options.data.ct_bot_detector_event_token = localStorage.getItem('bot_detector_event_token');
                 } else {
                     if (ctPublic.data__cookies_type === 'none') {
@@ -3968,18 +3973,100 @@ class ApbctMailpoetVisibleFields extends ApbctVisibleFieldsExtractor {
     }
 }
 
+/**
+ * Additional function to calculate realpath of cleantalk's scripts
+ * @return {*|null}
+ */
+function getApbctBasePath() {
+    // Find apbct-public-bundle in scripts names
+    const scripts = document.getElementsByTagName('script');
+
+    for (let script of scripts) {
+        if (script.src && script.src.includes('apbct-public-bundle')) {
+            // Get path from `src` js
+            const match = script.src.match(/^(.*\/js\/)/);
+            if (match && match[1]) {
+                return match[1]; // Path exists, return this
+            }
+        }
+    }
+
+    return null; // cleantalk's scripts not found :(
+}
+
+/**
+ * Load any script into the DOM (i.e. `import()`)
+ * @param {string} scriptAbsolutePath
+ * @return {Promise<*|boolean>}
+ */
+async function apbctImportScript(scriptAbsolutePath) {
+    // Check it this scripti already is in DOM
+    const normalizedPath = scriptAbsolutePath.replace(/\/$/, ''); // Replace ending slashes
+    const scripts = document.querySelectorAll('script[src]');
+    for (const script of scripts) {
+        const scriptSrc = script.src.replace(/\/$/, '');
+        if (scriptSrc === normalizedPath) {
+            // Script already loaded, skipping
+            return true;
+        }
+    }
+    return new Promise((resolve, reject) => {
+        const script = document.createElement('script');
+
+        script.src = scriptAbsolutePath;
+        script.async = true;
+
+        script.onload = function() {
+            // Gathering data script loaded successfully
+            resolve(true);
+        };
+
+        script.onerror = function() {
+            // Failed to load Gathering data script from `scriptAbsolutePath`
+            reject(new Error('Script loading failed: ' + scriptAbsolutePath));
+        };
+
+        document.head.appendChild(script);
+    }).catch((error) => {
+        // Gathering data script loading failed, continuing without it
+        return false;
+    });
+}
+
 /**
  * Ready function
  */
 // eslint-disable-next-line camelcase,require-jsdoc
-function apbct_ready() {
+async function apbct_ready() {
     new ApbctShowForbidden().prepareBlockForAjaxForms();
 
+    // Try to get gathering if no worked bot-detector
+    let gatheringLoaded = false;
+
+    if (
+        apbctLocalStorage.get('apbct_existing_visitor') && // Not for the first hit
+        +ctPublic.settings__data__bot_detector_enabled && // If Bot-Detector is active
+        !apbctLocalStorage.get('bot_detector_event_token') && // and no `event_token` generated
+        typeof ApbctGatheringData === 'undefined' // and no `gathering` loaded yet
+    ) {
+        const basePath = getApbctBasePath();
+        if ( ! basePath ) {
+            // We are here because NO any cleantalk bundle script are in frontend: Todo nothing
+        } else {
+            const gatheringScriptName = 'public-2-gathering-data.min.js';
+            const gatheringFullPath = basePath + gatheringScriptName;
+            gatheringLoaded = await apbctImportScript(gatheringFullPath);
+        }
+    }
+
     const handler = new ApbctHandler();
     handler.detectForcedAltCookiesForms();
 
     // Gathering data when bot detector is disabled
-    if (!+ctPublic.settings__data__bot_detector_enabled && typeof ApbctGatheringData !== 'undefined') {
+    if (
+        ( ! +ctPublic.settings__data__bot_detector_enabled || gatheringLoaded ) &&
+        typeof ApbctGatheringData !== 'undefined'
+    ) {
         const gatheringData = new ApbctGatheringData();
         gatheringData.setSessionId();
         gatheringData.writeReferrersToSessionStorage();
@@ -3991,7 +4078,7 @@ function apbct_ready() {
     // Always call initParams to set cookies and parameters
     if (typeof initParams === 'function') {
         try {
-            initParams();
+            initParams(gatheringLoaded);
         } catch (e) {
             console.log('initParams error:', e);
         }
@@ -4007,9 +4094,9 @@ function apbct_ready() {
 
         const attachData = new ApbctAttachData();
 
-        // Attach data when bot detector is disabled
-        if (!+ctPublic.settings__data__bot_detector_enabled) {
-            attachData.attachHiddenFieldsToForms();
+        // Attach data when bot detector is disabled or blocked
+        if (!+ctPublic.settings__data__bot_detector_enabled || gatheringLoaded) {
+            attachData.attachHiddenFieldsToForms(gatheringLoaded);
         }
 
         for (let i = 0; i < document.forms.length; i++) {
@@ -4039,7 +4126,7 @@ function apbct_ready() {
         let botDetectorEventTokenStored = false;
         window.addEventListener('botDetectorEventTokenUpdated', (event) => {
             const botDetectorEventToken = event.detail?.eventToken;
-            if ( botDetectorEventToken && ! botDetectorEventTokenStored ) {
+            if (botDetectorEventToken && !botDetectorEventTokenStored) {
                 ctSetCookie([
                     ['ct_bot_detector_event_token', botDetectorEventToken],
                 ]);
@@ -4058,6 +4145,8 @@ function apbct_ready() {
     if (ctPublic.settings__sfw__anti_crawler && +ctPublic.settings__data__bot_detector_enabled) {
         handler.toolForAntiCrawlerCheckDuringBotDetector();
     }
+
+    apbctLocalStorage.set('apbct_existing_visitor', 1);
 }
 
 if (ctPublic.data__key_is_ok) {