Changeset 2852021

wpblast/tags/1.8.5/changelog.txt

-                      r2830275
+                      r2852021
 == Changelog ==
+= 1.8.5 =
+Release Date: December 13th, 2022
+- Improve performance on large websites
+- Improve advanced-cache updates for nitropack and wp rocket
+- Improve mu-plugins updates for nitropack
 = 1.8.4 =
 Release Date: December 7th, 2022

wpblast/tags/1.8.5/globals.php

-                      r2781302
+                      r2852021
 use Smartfire\Wordpress\WPBlast\Settings;
+if (!defined('WPBLAST_PLUGIN_DIR')) {
+    define('WPBLAST_PLUGIN_DIR', __DIR__ . '/../../..');
+// This is to allow to use require instead of require_once but still have the file loaded once
+// This happened because when the plugin is activated by wordpress, the variables scope is empty but still the file has been loaded
+// This happened when activating the plugin after loading was left in the advanced-cache file
+if (!isset($wpblast_globals_loaded)) {
+    if (!defined('WPBLAST_PLUGIN_DIR')) {
+        define('WPBLAST_PLUGIN_DIR', __DIR__ . '/../../..');
+    }
+    $autoloader = require('autoload.php');
+    $autoloader('Smartfire\\Wordpress\\WPBlast\\', __DIR__ . '/src/Smartfire/Wordpress/WPBlast/');
+    $smartfire_wpblast_config = new Config(['config_dir_path' => WP_CONTENT_DIR . '/wpblast-config']);
+    $smartfire_wpblast_settings = new Settings();
+    $wpblast_globals_loaded = true;
+}
-$autoloader = require('autoload.php');
-$autoloader('Smartfire\\Wordpress\\WPBlast\\', __DIR__ . '/src/Smartfire/Wordpress/WPBlast/');
-$smartfire_wpblast_config = new Config(['config_dir_path' => WP_CONTENT_DIR . '/wpblast-config']);
-$smartfire_wpblast_settings = new Settings();

wpblast/tags/1.8.5/inc/generate-config-functions.php

-                      r2807381
+                      r2852021
+}
 add_action('wpblast_activate', function () {
     add_action('admin_init', 'wpblast_generate_config_file');
+add_action('wpblast_plugin_updated', function () {
+    add_action('init', 'wpblast_generate_config_file');
 });
 add_action('wpblast_updated_crawler_list', 'wpblast_generate_config_file');
 add_action('wpblast_updated_options', 'wpblast_generate_config_file');
 add_action('wpblast_deactivate', function () {
+add_action('wpblast_deactivated', function () {
     global $smartfire_wpblast_config;
     $path = $smartfire_wpblast_config->get_config_file_path()['path'];

wpblast/tags/1.8.5/inc/mu-plugins-functions.php

-                      r2830275
+                      r2852021
 <?php
+defined('ABSPATH') || exit;
 function wpblast_display_error($message)
+{
     $class = 'notice notice-error';
+    printf('<div class="%1$s"><p>%2$s</p></div>', esc_attr($class), esc_html($message));
+}
+function wpblast_display_warning($message)
+{
+    $class = 'notice notice-warning';
     printf('<div class="%1$s"><p>%2$s</p></div>', esc_attr($class), esc_html($message));
+}
 …
 function wpblast_require_mu_plugin($data)
+{
     // Installer
     add_action('wpblast_activate', function () use ($data) {
+    // In case of update
+    add_action('wpblast_plugin_updated', function () use ($data) {
         wpblast_install_mu_plugin($data);
     });
     // Update checker
+    // In case a difference exist between installed version and current version or in case the mu-plugin triggered an error
     add_action('admin_init', function () use ($data) {
         if (isset($data['slug'])) {
             if (!defined('WPBLAST_MU_PLUGIN-' . $data['slug']) || !defined('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug']) || WPBLAST_PLUGIN_VERSION !== constant('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug'])) {
+            if (defined('WPBLAST_MU_PLUGIN_ERROR') || !defined('WPBLAST_MU_PLUGIN-' . $data['slug']) || !defined('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug']) || WPBLAST_PLUGIN_VERSION !== constant('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug'])) {
                 wpblast_install_mu_plugin($data);
+            }
 …
         $codeHeader = isset($data['code']) && isset($data['code']['header']) ? $data['code']['header'] : '';
         $codeBody = isset($data['code']) && isset($data['code']['body']) ? $data['code']['body'] : '';
+        $codeDeactivationCondition = '';
+        if (isset($data['code']) && isset($data['code']['deactivationCondition'])) {
+            $codeDeactivationCondition = '
+add_action(\'admin_init\', function () {
+    if(' . $data['code']['deactivationCondition'] . ') {
+        wpblast_uninstall_mu_plugin([
+            \'slug\' => \'' . $slug . '\'
+        ]);
+    }
+});';
+        }
         wpblast_require_mu_plugin_dir(); // create mu-plugins directory if needed
         $muPluginFile = realpath(WP_CONTENT_DIR) . '/mu-plugins/' . $slug . '.php';
         $code = '<?php
 /*
 Plugin Name:  ' . $name . '
 Plugin URI:   https://www.wp-blast.com
 Description:  ' . $description . '
 Version:      ' . $version . '
 Author: WP Blast
 License: Apache 2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
+' . 'Plugin Name' . ':  ' . $name . '
+' . 'Plugin URI' . ':   https://www.wp-blast.com
+' . 'Description' . ':  ' . $description . '
+' . 'Version' . ':      ' . $version . '
+' . 'Author' . ': WP Blast
+' . 'License' . ': Apache 2.0
+' . 'License URI' . ': http://www.apache.org/licenses/LICENSE-2.0
 */
 // THIS FILE HAS BEEN AUTO-GENERATED
 …
 defined( \'ABSPATH\' ) || exit;
+// WPBLAST-DEACTIVATION-HOOK-START
+' . $codeDeactivationCondition . '
+// WPBLAST-DEACTIVATION-HOOK-END
 if(!defined(\'WPBLAST_MU_PLUGIN-' . $slug . '\')) {

wpblast/tags/1.8.5/inc/rest-functions.php

-                      r2807381
+                      r2852021
 function wpblast_generate_cache_item_action()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce']) && isset($_GET['url']) && $_GET['url'] !== '') {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
             $url = urldecode(esc_url_raw(wp_unslash($_GET['url'])));
-            $settings = new Settings();
-            $settings->init();
             $response = wp_remote_get($url, [
                 'user-agent' => $settings->getCrawlerCacheGen(), // use WP Blast Crawler to force cache gen
+                'user-agent' => $smartfire_wpblast_settings->getCrawlerCacheGen(), // use WP Blast Crawler to force cache gen
                 'headers' => [
                     'WPBLAST-FORCE-GENERATION' => '1',
                     'WPBLAST-TOKEN' => base64_encode($settings->getUsername() . ':' . $settings->getPassword()),
+                    'WPBLAST-TOKEN' => base64_encode($smartfire_wpblast_settings->getUsername() . ':' . $smartfire_wpblast_settings->getPassword()),
                 ],
                 'timeout'     => $settings->getTimeout(),
+                'timeout'     => $smartfire_wpblast_settings->getTimeout(),
             ]);
             $httpCode = wp_remote_retrieve_response_code($response);
 …
 function wpblast_update_plugin_data()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce'])) {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
+            $settings = new Settings();
+            $settings->init();
+            $settings->getPluginData(true); // force update to wp blast
+            $smartfire_wpblast_settings->getPluginData(true); // force update to wp blast
             return new WP_REST_Response(
+                [
 …
 function wpblast_update_user_account()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce'])) {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
+            $settings = new Settings();
+            $settings->init();
+            $settings->getAccount(true); // force update of user account
+            $smartfire_wpblast_settings->getAccount(true); // force update of user account
             return new WP_REST_Response(
+                [
 …
 function wpblast_update_crawler_list()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce'])) {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
+            $settings = new Settings();
+            $settings->init();
+            $settings->getCrawlerAutoRegexp(true); // force update of crawler list
+            $smartfire_wpblast_settings->getCrawlerAutoRegexp(true); // force update of crawler list
             return new WP_REST_Response(
+                [
 …
 function wpblast_get_status()
+{
+    global $smartfire_wpblast_settings;
     header('Content-Type: application/javascript');
     // Call WP Blast server for status
+    $settings = new Settings();
+    $settings->init();
+    $response = wp_remote_get($settings->getWebsite() . '/?method=getWpBlastStatus&domain=' . urlencode($settings->getUsername()) . '&plugin_token=' . $settings->getPassword(), [
+    $response = wp_remote_get($smartfire_wpblast_settings->getWebsite() . '/?method=getWpBlastStatus&domain=' . urlencode($smartfire_wpblast_settings->getUsername()) . '&plugin_token=' . $smartfire_wpblast_settings->getPassword(), [
         'user-agent' => Settings::WPBLAST_UA_PLUGIN,
         'timeout' => 15,
 …
 function wpblast_get_sitemap($request)
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce']) && wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['wpblast_nonce'])), 'wp_rest')) {
-        $settings = new Settings();
-        $settings->init();
         if (isset($request['items'])) {
             $items = $request['items'];
             $settings->updateSitemapScores($items);
+        }
         $sitemap = $settings->getWebsiteSitemap('active');
         $settings->cleanExpiredCache(); // delete expired cache item
+            $smartfire_wpblast_settings->updateSitemapScores($items);
+        }
+        $sitemap = $smartfire_wpblast_settings->getWebsiteSitemap('active');
+        $smartfire_wpblast_settings->cleanExpiredCache(); // delete expired cache item
         $response = [
 …
 function wpblast_update_active_pages($request)
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce']) && wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['wpblast_nonce'])), 'wp_rest')) {
-        $settings = new Settings();
-        $settings->init();
         if (isset($request['activeUrls'])) {
             $activeUrls = $request['activeUrls'];
             $settings->updateActivePages($activeUrls);
+        }
         $sitemap = $settings->getWebsiteSitemap('active');
         $settings->cleanExpiredCache(); // delete expired cache item
+            $smartfire_wpblast_settings->updateActivePages($activeUrls);
+        }
+        $sitemap = $smartfire_wpblast_settings->getWebsiteSitemap('active');
+        $smartfire_wpblast_settings->cleanExpiredCache(); // delete expired cache item
         $response = [

wpblast/tags/1.8.5/inc/third-party/advanced-cache.php

-                      r2830275
+                      r2852021
 defined('ABSPATH') || exit;
+require_once __DIR__ . '/../../globals.php';
+if (!defined('WPBLAST_ADVANCED_CACHE')) {
+    define('WPBLAST_ADVANCED_CACHE', true);
+}
+require __DIR__ . '/../../globals.php';
 if (Bootstrap::should_blast()) {

wpblast/tags/1.8.5/inc/third-party/hummingbird-performance/hummingbird-performance-functions.php

-                      r2807419
+                      r2852021
+    }
+    add_action('wpblast_activate', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_plugin_updated', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_deactivated', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_purge_cache_third_party', 'wpblast_wphb_clear_cache');
     add_action('wpblast_updated_crawler_list', 'wpblast_wphb_clear_cache');
     add_action('wpblast_updated_options', 'wpblast_wphb_clear_cache');

wpblast/tags/1.8.5/inc/third-party/index.php

r2830275	r2852021
4	4
5	5	require_once 'hummingbird-performance/hummingbird-performance-functions.php';
	6	require_once 'litespeed-cache/litespeed-cache-functions.php';
6	7	require_once 'w3-total-cache/w3-total-cache-functions.php';
7	8	require_once 'wp-rocket/wp-rocket-functions.php';

wpblast/tags/1.8.5/inc/third-party/nitropack/nitropack-functions.php

-                      r2830275
+                      r2852021
         'name' => 'WP Blast Addon - Nitropack',
         'code' => [
+            'body' => "
+            'deactivationCondition' => "!is_plugin_active('nitropack/main.php')",
+            'body' => '
 // Even if advanced-cache is not used, nitropack needs this filter added prior its execution
 // This will be needed for both usecase: with or without advanced-cache with nitropack
+require_once '" . __DIR__ . "/../../../globals.php';
+function wpblast_nitropack_can_serve_cache() {
+    return !Smartfire\Wordpress\WPBlast\Bootstrap::should_blast();
+$wpblast_globals_file = "' . __DIR__ . '/../../../globals.php' . '";
+$wpblast_abspath = "' . ABSPATH . '";
+// Fail proof check that the WP installation hasnt been moved to another server or other folder
+// In case path is wrong, the addon will not be detected and therefore will be installed again
+if (file_exists($wpblast_globals_file) && ABSPATH == $wpblast_abspath) {
+    require $wpblast_globals_file;
+    function wpblast_nitropack_can_serve_cache() {
+        return !Smartfire\Wordpress\WPBlast\Bootstrap::should_blast();
+    }
+    add_filter("nitropack_can_serve_cache", "wpblast_nitropack_can_serve_cache");
+}
+add_filter('nitropack_can_serve_cache', 'wpblast_nitropack_can_serve_cache');",
+else {
+    // will recreate the mu-plugin addon in case of error
+    if(!defined("WPBLAST_MU_PLUGIN_ERROR")) {
+        define("WPBLAST_MU_PLUGIN_ERROR", true);
+        return;
+    }
+}',
         ],
     ]);
 …
+    }
-    function wpblast_nitropack_advanced_cache_file($content)
+    {
-        // Only insert addon in case there is a content and that addon is not existent, otherwise remove advanced cache to trigger re-generation
-        if ($content !== '' && strpos($content, 'WPBLAST_ADVANCED_CACHE_VERSION') === false) {
-            $content = explode('if (defined("NITROPACK_VERSION") && defined("NITROPACK_ADVANCED_CACHE_VERSION") && NITROPACK_VERSION == NITROPACK_ADVANCED_CACHE_VERSION && nitropack_is_dropin_cache_allowed()) {', $content);
-            $start = $content[0];
-            $nitropack = $content[1];
-            return $start . "
-// WP-BLAST ADDON START //
-if(!defined('WPBLAST_ADVANCED_CACHE_VERSION')) {
-    define( 'WPBLAST_ADVANCED_CACHE_VERSION', '" . WPBLAST_PLUGIN_VERSION . "');
+}
-include_once \"" . __DIR__ . '/../advanced-cache.php' . "\";
-if(defined('WPBLAST_SKIP_ADVANCED_CACHE') && WPBLAST_SKIP_ADVANCED_CACHE) {
-    return;
+}
-// WP-BLAST ADDON END //
-if (defined(\"NITROPACK_VERSION\") && defined(\"NITROPACK_ADVANCED_CACHE_VERSION\") && NITROPACK_VERSION == NITROPACK_ADVANCED_CACHE_VERSION && nitropack_is_dropin_cache_allowed()) {
-" . $nitropack . '
-';
-        } else {
-            // Removing advanced cache will trigger re-write by nitropack that will then allow for a rewrite of the wpblast addon
-            return '';
+        }
+    }
-    // As we are checking that a nitropack defined variable in advanced cache is present, no writing error should happen
-    // In case of upgrade of nitropack, our variable will miss and we'll update the advanced cache file again
-    // In case of upgrade of wpblast, a new version will be triggered that will force to remove the advanced cache file
-    // Nitropack will recreates it and we'll add again the addon
-    add_filter('wpblast_nitropack_advanced_cache_file', 'wpblast_nitropack_advanced_cache_file');
-    function wpblast_nitropack_write_advanced_cache_file()
+    {
-        $advancedCacheFile = realpath(WP_CONTENT_DIR) . '/advanced-cache.php';
-        $advancedCacheFileContent = @file_get_contents($advancedCacheFile);
-        $newContent = apply_filters('wpblast_nitropack_advanced_cache_file', $advancedCacheFileContent);
-        if (WP_DEBUG) {
-            return file_put_contents($advancedCacheFile, $newContent);
-        } else {
-            return @file_put_contents($advancedCacheFile, $newContent);
+        }
+    }
-    function wpblast_nitropack_remove_advanced_cache_file()
+    {
-        // Reset advanced-cache file so that plugin can generate a new clean one
-        $advancedCacheFile = realpath(WP_CONTENT_DIR) . '/advanced-cache.php';
-        if (WP_DEBUG) {
-            return file_put_contents($advancedCacheFile, '');
-        } else {
-            return @file_put_contents($advancedCacheFile, '');
+        }
+    }
     // we don't do anything if nitropack advanced cache is not active
     if (function_exists('nitropack_has_advanced_cache') && nitropack_has_advanced_cache()) {
         if (!defined('WPBLAST_ADVANCED_CACHE') || !defined('WPBLAST_ADVANCED_CACHE_VERSION') || WPBLAST_PLUGIN_VERSION !== WPBLAST_ADVANCED_CACHE_VERSION) {
             // We rewrite advanced cache in case we detect a NITROPACK_ADVANCED_CACHE (this means the advanced cache is active) and we don't have a WPBLAST_ADVANCED_CACHE_VERSION, this either mean it's a first install or that the plugin nitropack has been updated or as changed the advanced-cache file
             add_action('plugins_loaded', 'wpblast_nitropack_write_advanced_cache_file');
+        }
+        wpblast_require_advanced_cache([
+            'slug' => 'wpblast-nitropack-addon',
+            'delimiter' => 'if (defined("NITROPACK_VERSION") && defined("NITROPACK_ADVANCED_CACHE_VERSION") && NITROPACK_VERSION == NITROPACK_ADVANCED_CACHE_VERSION && nitropack_is_dropin_cache_allowed()) {',
+        ]);
     } else if (function_exists('nitropack_has_advanced_cache') && !nitropack_has_advanced_cache()) {
         // If we are installed but nitrocache has disabled the advanced_cache, we should uninstall our advanced-cache addon
         if (defined('WPBLAST_ADVANCED_CACHE') || defined('WPBLAST_ADVANCED_CACHE_VERSION')) {
             add_action('plugins_loaded', 'wpblast_nitropack_remove_advanced_cache_file');
+        }
+        // force uninstall of advanced-cache even if cache plugin is being let active
+        wpblast_uninstall_advanced_cache([
+            'slug' => 'wpblast-nitropack-addon',
+        ]);
+    }
 …
         do_action('nitropack_execute_purge_all');
+    }
     add_action('wpblast_purge_cache_third_party', 'wpblast_nitro_clear_cache');
+    add_action('wpblast_deactivate', function () {
+        wpblast_nitropack_remove_advanced_cache_file();
+    });
+    add_action('wpblast_plugin_updated', function($oldVersion, $newVersion) {
+        // Compatibility upgrader before we used markers to replace our addons
+        // This will remove advanced cache, so that nitropack can add it again and we'll add then our addon
+        try {
+            if ($oldVersion === false || $oldVersion === '1.8.4') {
+                wpblast_clear_advanced_cache_file();
+            }
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }, 10, 2);
+}

wpblast/tags/1.8.5/inc/third-party/w3-total-cache/w3-total-cache-functions.php

-                      r2807419
+                      r2852021
+    }
+    add_action('wpblast_activate', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_plugin_updated', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_purge_cache_third_party', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_deactivated', 'wpblast_w3tc_clear_cache');
     add_action('wpblast_updated_crawler_list', 'wpblast_w3tc_clear_cache');
     add_action('wpblast_updated_options', 'wpblast_w3tc_clear_cache');

wpblast/tags/1.8.5/inc/third-party/wp-fastest-cache/wp-fastest-cache-functions.php

-                      r2830275
+                      r2852021
 <?php
+use Smartfire\Wordpress\WPBlast\Utils as Utils;
 defined('ABSPATH') || exit;
 …
 if (is_plugin_active('wp-fastest-cache/wpFastestCache.php')) {
+    // We are forced to use template_redirect as the plugin would take precedence otherwise
+    add_action('template_redirect', 'wpblast_actions_before_start_wpfc');
+    function wpblast_actions_before_start_wpfc()
+    {
+        // Avoid WPSC to cache the page
+        if (!defined('DONOTCACHEPAGE')) {
+            define('DONOTCACHEPAGE', true);
+        }
+    wpblast_require_mu_plugin([
+        'slug' => 'wpblast-wpfc-addon',
+        'name' => 'WP Blast Addon - WP Fastest Cache',
+        'code' => [
+            'deactivationCondition' => "!is_plugin_active('wp-fastest-cache/wpFastestCache.php')",
+            'body' => '
+// Use this mu-plugin to inject a cookie in the request that will make wpfc ignore the request in case we blast the request
+$wpblast_globals_file = "' . __DIR__ . '/../../../globals.php' . '";
+$wpblast_abspath = "' . ABSPATH . '";
+// Fail proof check that the WP installation hasnt been moved to another server or other folder
+// In case path is wrong, the addon will not be detected and therefore will be installed again
+if (file_exists($wpblast_globals_file) && ABSPATH == $wpblast_abspath) {
+    require $wpblast_globals_file;
+    if (Smartfire\Wordpress\WPBlast\Bootstrap::should_blast()) {
+        $_SERVER[\'HTTP_COOKIE\'] = "wpblast=1; " . (isset($_SERVER[\'HTTP_COOKIE\']) ? $_SERVER[\'HTTP_COOKIE\'] : "");
+    }
+}
+else {
+    // will recreate the mu-plugin addon in case of error
+    if(!defined("WPBLAST_MU_PLUGIN_ERROR")) {
+        define("WPBLAST_MU_PLUGIN_ERROR", true);
+        return;
+    }
+}',
+        ],
+    ]);
+    function wpblast_wpfc_remove_exclude_rules()
+    {
+        remove_filter('pre_update_option_WpFastestCacheExclude', 'wpblast_wpfc_inject_option_WpFastestCacheExclude'); // remove filter so our plugin wouldn't add the rule again
+        remove_action('delete_option_WpFastestCacheExclude', 'wpblast_wpfc_add_exclude_rules'); // remove filter so our plugin wouldn't add the rule again
+        $rules_json = get_option('WpFastestCacheExclude');
+        if (isset($rules_json) && $rules_json !== false && $rules_json !== '') {
+            $parsedContent = json_decode($rules_json);
+            $uaIndex = [];
+            $cookieIndex = [];
+            foreach ($parsedContent as $key => $value) {
+                if (isset($value->type) && $value->type === 'useragent' && isset($value->content) && strpos($value->content, 'WP-BLAST') !== false) {
+                    array_push($uaIndex, $key);
+                }
+                if (isset($value->type) && $value->type === 'cookie' && isset($value->content) && strpos($value->content, 'wpblast') !== false) {
+                    array_push($cookieIndex, $key);
+                }
+            }
+            // Remove the keys
+            // This should only have one single key but in case an error happened, this will clean every rules
+            if (isset($uaIndex)) {
+                foreach ($uaIndex as $uaIdx) {
+                    array_splice($parsedContent, $uaIdx, 1);
+                }
+            }
+            if (isset($cookieIndex)) {
+                foreach ($cookieIndex as $cookieIdx) {
+                    array_splice($parsedContent, $cookieIdx, 1);
+                }
+            }
+            if (count($parsedContent) > 0) {
+                update_option('WpFastestCacheExclude', Utils::format_json_encode($parsedContent));
+            } else {
+                delete_option('WpFastestCacheExclude');
+            }
+        }
+        // Force update of htaccess on wpfc side
+        try {
+            include_once(__DIR__ . '/../../../../wp-fastest-cache/inc/admin.php');
+            if (class_exists('WpFastestCacheAdmin')) {
+                $wpfc = new WpFastestCacheAdmin();
+                // only way of retriggering it is to simulate activation
+                $options = get_option('WpFastestCache');
+                if (isset($options) && $options !== false) {
+                    $post = json_decode($options, true);
+                    $wpfc->modifyHtaccess($post);
+                }
+            }
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }
 …
         do_action('wpfc_clear_all_site_cache');
+    }
+    add_action('wpblast_activate', 'wpblast_wpfc_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_wpfc_clear_cache');
+    add_action('wpblast_updated_crawler_list', 'wpblast_wpfc_clear_cache');
+    add_action('wpblast_updated_options', 'wpblast_wpfc_clear_cache');
+}
+    add_action('wpblast_purge_cache_third_party', 'wpblast_wpfc_clear_cache');
+    function wpblast_wpfc_activate()
+    {
+        wpblast_wpfc_add_exclude_rules();
+    }
+    add_action('wpblast_plugin_updated', function($oldVersion, $newVersion) {
+        // Compatibility upgrader to reset possible cache with WP Blast content
+        try {
+            if ($oldVersion === false || $oldVersion === '1.8.4') {
+                wpblast_wpfc_clear_cache();
+            }
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            wpblast_wpfc_activate();
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }, 10, 2);
+    add_action('wpblast_updated_crawler_list', 'wpblast_wpfc_add_exclude_rules'); // should update exclude rules
+    add_action('wpblast_updated_options', 'wpblast_wpfc_add_exclude_rules');
+    function wpblast_wpfc_deactivated()
+    {
+        // should be executed with deactivated to have the plugin being deactivated and no more requests
+        wpblast_wpfc_remove_exclude_rules();
+    }
+    add_action('wpblast_deactivated', 'wpblast_wpfc_deactivated'); // should disable exclude rules and mu-plugin
+}
+// Should be added whether the plugin is active or not so that in case wpblast is already enabled and wpfc is activated, we can inject our rules
+// phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid -- WpFastestCacheExclude is the name of the option
+function wpblast_wpfc_inject_option_WpFastestCacheExclude($content)
+{
+    $parsedContent = [];
+    try {
+        if (isset($content) && $content !== '') {
+            $parsedContent = json_decode($content);
+        }
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+    if (!is_array($parsedContent)) {
+        $parsedContent = [];
+    }
+    $ruleUAExist = false;
+    $ruleCookieExist = false;
+    $crawlers = apply_filters('wpblast_crawlers_full', '');
+    foreach ($parsedContent as $key => $value) {
+        if (isset($value->type) && $value->type === 'useragent' && isset($value->content) && strpos($value->content, 'WP-BLAST') !== false) {
+            $ruleUAExist = true;
+            $parsedContent[$key]->content = '^(' . str_replace([' ', '\\\\ '], '\\ ', $crawlers) . ').*'; // force update with new value
+            $parsedContent[$key]->editable = false; // re-add editable false, otherwise, when the user save, this property gets stripped
+        }
+        if (isset($value->type) && $value->type === 'cookie' && isset($value->content) && strpos($value->content, 'wpblast') !== false) {
+            $ruleCookieExist = true;
+            $parsedContent[$key]->content = 'wpblast'; // force update with new value
+            $parsedContent[$key]->editable = false; // re-add editable false, otherwise, when the user save, this property gets stripped
+        }
+    }
+    if ($ruleUAExist === false) {
+        if ($crawlers !== '') {
+            $new_rule = new stdClass();
+            $new_rule->prefix = 'contain';
+            $new_rule->content = '^(' . str_replace([' ', '\\\\ '], '\\ ', $crawlers) . ').*';
+            $new_rule->type = 'useragent';
+            $new_rule->editable = false;
+            array_push($parsedContent, $new_rule);
+        }
+    }
+    if ($ruleCookieExist === false) {
+        $new_rule = new stdClass();
+        $new_rule->prefix = 'contain';
+        $new_rule->content = 'wpblast';
+        $new_rule->type = 'cookie';
+        $new_rule->editable = false;
+        array_push($parsedContent, $new_rule);
+    }
+    return Utils::format_json_encode($parsedContent);
+}
+add_filter('pre_update_option_WpFastestCacheExclude', 'wpblast_wpfc_inject_option_WpFastestCacheExclude');
+function wpblast_wpfc_add_exclude_rules()
+{
+    $rules_json = get_option('WpFastestCacheExclude');
+    if ($rules_json === false) {
+        add_option('WpFastestCacheExclude', wpblast_wpfc_inject_option_WpFastestCacheExclude('[]'), '', 'yes'); // add our rules if no option exists
+    } else {
+        update_option('WpFastestCacheExclude', $rules_json); // will then trigger hook that will inject our rule
+    }
+    // Force update of htaccess on wpfc side
+    try {
+        include_once(__DIR__ . '/../../../../wp-fastest-cache/inc/admin.php');
+        if (class_exists('WpFastestCacheAdmin')) {
+            $wpfc = new WpFastestCacheAdmin();
+            // only way of retriggering it is to simulate activation
+            $options = get_option('WpFastestCache');
+            if (isset($options) && $options !== false) {
+                $post = json_decode($options, true);
+                $wpfc->modifyHtaccess($post);
+            }
+        }
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+}
+add_action('delete_option_WpFastestCacheExclude', 'wpblast_wpfc_add_exclude_rules'); // in case the plugin tries to delete the option force it to stay
+// Should be check after check of activation of plugin
+function wpblast_wpfc_activation($plugin)
+{
+    if ($plugin == 'wp-fastest-cache/wpFastestCache.php') {
+        wpblast_wpfc_add_exclude_rules(); // add exclude rules in case of activation of wpfc when wpblast is already active
+    }
+}
+add_action('activated_plugin', 'wpblast_wpfc_activation');

wpblast/tags/1.8.5/inc/third-party/wp-rocket/wp-rocket-functions.php

-                      r2830275
+                      r2852021
     function wpblast_rocket_advanced_cache_file($content)
+    {
+        $content = explode("defined( 'ABSPATH' ) || exit;", $content);
+        $start = $content[0];
+        $wp_rocket = $content[1];
+        return $start . "defined( 'ABSPATH' ) || exit;
+include \"" . __DIR__ . '/../advanced-cache.php' . "\";
+if(defined('WPBLAST_SKIP_ADVANCED_CACHE') && WPBLAST_SKIP_ADVANCED_CACHE) {
+    return;
+}
+" . $wp_rocket . '
+';
+        return apply_filters('wpblast_advanced_cache_content', $content, "define( 'WP_ROCKET_ADVANCED_CACHE', true );", 'wpblast-wprocket-addon');
+    }
     // As we are hooked on wprocket advanced_cache content, wprocket will be in charge of checking for error in filesystem in case we cannot write the advanced-cache.php file
+    // in case of error in wprocket advanced cache, it will be recreated and our addon will be added again
     // in case of upgrade, they will recreate advanced-cache.php file and call again this function
     add_filter('rocket_advanced_cache_file', 'wpblast_rocket_advanced_cache_file');
+    function wpblast_advanced_cache_content_error()
+    {
+        return "
+        // Trigger constant of wprocket to indicate a problem with advanced-cache
+        if(!defined('WP_ROCKET_ADVANCED_CACHE_PROBLEM')) {
+            define( 'WP_ROCKET_ADVANCED_CACHE_PROBLEM', true );
+            return;
+        }";
+    }
+    add_filter('wpblast_advanced_cache_content_error', 'wpblast_advanced_cache_content_error');
     /**
 …
+    }
     add_action('wpblast_activate', function () {
         add_action('admin_init', 'wpblast_rocket_refresh');
+    add_action('wpblast_plugin_updated', function () {
+        add_action('init', 'wpblast_rocket_refresh');
     });
+    // advanced-cache should be remove at the start of the deactivation to prevent concurrent requests bugs
     add_action('wpblast_deactivate', function () {
+        remove_filter('rocket_advanced_cache_file', 'wpblast_rocket_advanced_cache_file');
+        remove_filter('rocket_cache_reject_ua', 'wpblast_rocket_user_agent_reject');
+        wpblast_rocket_refresh();
+    });
+    // should clean afterward to clean what could have been added during uninstallation process
+    add_action('wpblast_deactivated', function () {
         remove_filter('rocket_advanced_cache_file', 'wpblast_rocket_advanced_cache_file');
         remove_filter('rocket_cache_reject_ua', 'wpblast_rocket_user_agent_reject');

wpblast/tags/1.8.5/inc/third-party/wp-super-cache/wp-super-cache-functions.php

-                      r2807419
+                      r2852021
+    }
+    add_action('wpblast_activate', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_plugin_updated', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_deactivated', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_purge_cache_third_party', 'wpblast_wpsc_clear_cache');
     add_action('wpblast_updated_crawler_list', 'wpblast_wpsc_clear_cache');
     add_action('wpblast_updated_options', 'wpblast_wpsc_clear_cache');

wpblast/tags/1.8.5/js/wpblast-settings.js

-                      r2811232
+                      r2852021
         var wpBlastSitemapUpdatedItems = [];
         var wpBlastSitemapItemsToUpdateScore = [];
+        var wpBlastIsLoadingSitemap = false;
         var types = ['raw', 'blast'];
         var devices = ['mobile', 'desktop'];
 …
             if (shouldUpdateScores && wpBlastSitemapItemsToUpdateScore.length > 0) {
                 // speed up update of scores in case we didn't have updated it
-                // Todo: add a lock to avoid having multiple parallel calls to getSitemap while the request isn't finished
                 wpBlastGetSitemap();
+            }
 …
         function wpBlastGetSitemap() {
+            // Get sitemap stored in website database
+            var dataToSend = {};
+            if (wpBlastSitemapItemsToUpdateScore.length > 0) {
+                dataToSend['items'] = wpBlastSitemapItemsToUpdateScore;
+                for (var i = 0; i < wpBlastSitemapItemsToUpdateScore.length; i++) {
+                    // mark this hash has updated, this will prevent an update until next reload of the page
+                    wpBlastSitemapUpdatedItems.push(
+                        wpBlastSitemapItemsToUpdateScore[i].hash +
+                            '-' +
+                            wpBlastSitemapItemsToUpdateScore[i].type +
+                            '-' +
+                            wpBlastSitemapItemsToUpdateScore[i].device,
+                    );
+                }
+            }
+            var restUrl = '/wp-json/wpblast/v1/getSitemap?wpblast_nonce=' + wpblast_nonce; // fallback rest url
+            if (
+                typeof wpBlastSettings !== 'undefined' &&
+                wpBlastSettings.restUrls !== null &&
+                wpBlastSettings.restUrls !== undefined
+            ) {
+                if (typeof URLSearchParams !== 'undefined' && typeof URL !== 'undefined') {
+                    try {
+                        var url = new URL(wpBlastSettings.restUrls.getSiteMap);
+                        url.searchParams.append('wpblast_nonce', wpblast_nonce);
+                        restUrl = url.toString();
+                    } catch (e) {
+            // avoid a call in case a request is already loading. This is to prevent request from stacking
+            if (!wpBlastIsLoadingSitemap) {
+                // Get sitemap stored in website database
+                var dataToSend = {};
+                if (wpBlastSitemapItemsToUpdateScore.length > 0) {
+                    dataToSend['items'] = wpBlastSitemapItemsToUpdateScore;
+                    for (var i = 0; i < wpBlastSitemapItemsToUpdateScore.length; i++) {
+                        // mark this hash has updated, this will prevent an update until next reload of the page
+                        wpBlastSitemapUpdatedItems.push(
+                            wpBlastSitemapItemsToUpdateScore[i].hash +
+                                '-' +
+                                wpBlastSitemapItemsToUpdateScore[i].type +
+                                '-' +
+                                wpBlastSitemapItemsToUpdateScore[i].device,
+                        );
+                    }
+                }
+                var restUrl = '/wp-json/wpblast/v1/getSitemap?wpblast_nonce=' + wpblast_nonce; // fallback rest url
+                if (
+                    typeof wpBlastSettings !== 'undefined' &&
+                    wpBlastSettings.restUrls !== null &&
+                    wpBlastSettings.restUrls !== undefined
+                ) {
+                    if (typeof URLSearchParams !== 'undefined' && typeof URL !== 'undefined') {
+                        try {
+                            var url = new URL(wpBlastSettings.restUrls.getSiteMap);
+                            url.searchParams.append('wpblast_nonce', wpblast_nonce);
+                            restUrl = url.toString();
+                        } catch (e) {
+                            // Fallback url
+                            restUrl = wpBlastSettings.restUrls.getSiteMap + '?wpblast_nonce=' + wpblast_nonce;
+                        }
+                    } else {
                         // Fallback url
                         restUrl = wpBlastSettings.restUrls.getSiteMap + '?wpblast_nonce=' + wpblast_nonce;
+                    }
+                } else {
+                    // Fallback url
+                    restUrl = wpBlastSettings.restUrls.getSiteMap + '?wpblast_nonce=' + wpblast_nonce;
+                }
+            }
+            jQuery.ajax({
+                url: restUrl,
+                headers: {
+                    'X-WP-Nonce': wpblast_nonce,
+                    'content-type': 'application/json',
+                },
+                method: 'POST',
+                data: JSON.stringify(dataToSend),
+                success: function (data) {
+                    if (data && data.response && data.response.sitemap !== undefined && data.response.data !== null) {
+                        wpBlastGetSitemapData(data.response.sitemap);
+                    }
+                    // Should be update after possible update of wpBlastSitemap
+                    if ((isGeneratingCache || wpBlastSitemap.length === 0) && wpBlastGetSitemapFrequency !== 1000) {
+                        clearInterval(wpBlastGetSitemapInterval);
+                        wpBlastGetSitemapFrequency = 1000;
+                        if (window.location.search.indexOf('debug') === -1) {
+                            wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                        }
+                    } else if (
+                        !(isGeneratingCache || wpBlastSitemap.length === 0) &&
+                        wpBlastGetSitemapFrequency !== 5000
+                    ) {
+                        clearInterval(wpBlastGetSitemapInterval);
+                        wpBlastGetSitemapFrequency = 5000;
+                        if (window.location.search.indexOf('debug') === -1) {
+                            wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                        }
+                    }
+                },
+            });
+                }
+                wpBlastIsLoadingSitemap = true;
+                jQuery.ajax({
+                    url: restUrl,
+                    headers: {
+                        'X-WP-Nonce': wpblast_nonce,
+                        'content-type': 'application/json',
+                    },
+                    method: 'POST',
+                    data: JSON.stringify(dataToSend),
+                    success: function (data) {
+                        if (
+                            data &&
+                            data.response &&
+                            data.response.sitemap !== undefined &&
+                            data.response.data !== null
+                        ) {
+                            wpBlastGetSitemapData(data.response.sitemap);
+                        }
+                        // Should be update after possible update of wpBlastSitemap
+                        if ((isGeneratingCache || wpBlastSitemap.length === 0) && wpBlastGetSitemapFrequency !== 1000) {
+                            clearInterval(wpBlastGetSitemapInterval);
+                            wpBlastGetSitemapFrequency = 1000;
+                            if (window.location.search.indexOf('debug') === -1) {
+                                wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                            }
+                        } else if (
+                            !(isGeneratingCache || wpBlastSitemap.length === 0) &&
+                            wpBlastGetSitemapFrequency !== 5000
+                        ) {
+                            clearInterval(wpBlastGetSitemapInterval);
+                            wpBlastGetSitemapFrequency = 5000;
+                            if (window.location.search.indexOf('debug') === -1) {
+                                wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                            }
+                        }
+                    },
+                    complete: function () {
+                        wpBlastIsLoadingSitemap = false;
+                    },
+                });
+            }
+        }

wpblast/tags/1.8.5/languages/wpblast-fr_FR.po

-                      r2811232
+                      r2852021
 # wpml-name: 5062b4b59571ebec36f93781a550255b
 msgid "This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 6000."
 msgstr "C'est le maximum d'urls que vous souhaitez conserver. Si le nombre est trop faible, l'efficacité du cache diminuera. S'il est trop élevé, vous pourriez avoir besoin de plus de stockage pour votre base de données. Défaut : 6000."
+msgid "This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 20000."
+msgstr "C'est le maximum d'urls que vous souhaitez conserver. Si le nombre est trop faible, l'efficacité du cache diminuera. S'il est trop élevé, vous pourriez avoir besoin de plus de stockage pour votre base de données. Défaut : 20000."
 # wpml-name: e6463ff3a7cfe9b18d6994bbd09d82b0
 …
 # wpml-name: 733c2a0696e4e033ad552d5715fd8581
 msgid "This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 2000."
 msgstr "Nombre maximum de pages que vous souhaitez conserver en cache. Si ce nombre est trop faible, le cache sera moins efficace. Plus ce nombre est élevé, plus le cache prendra une taille importante dans votre base de données. Valeur par défaut : 2 000."
+msgid "This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 10000."
+msgstr "Nombre maximum de pages que vous souhaitez conserver en cache. Si ce nombre est trop faible, le cache sera moins efficace. Plus ce nombre est élevé, plus le cache prendra une taille importante dans votre base de données. Valeur par défaut : 10 000."
 # wpml-name: 268eebdc0ee24405bd723be444050b98

wpblast/tags/1.8.5/plugin.php

-                      r2830275
+                      r2852021
 /**
  * Plugin Name: WPBlast
+ * Plugin Name: WP Blast
  * Plugin URI: https://www.wp-blast.com
  * Description: Improve your Wordpress SEO and performance by using dynamic rendering. Prerender your website and generate an easy-to-crawl website.
  * Version: 1.8.4
+ * Version: 1.8.5
  * Requires at least: 4.9
  * Requires PHP: 5.6
 …
 use Smartfire\Wordpress\WPBlast\Settings;
 define('WPBLAST_DB_VERSION', '1.2.0');
 define('WPBLAST_PLUGIN_VERSION', '1.8.4');
 require_once 'globals.php';
+define('WPBLAST_DB_VERSION', '1.2.1'); // This is used to upgrade database scheme or force cleanup caches and new crawl
+define('WPBLAST_PLUGIN_VERSION', '1.8.5');
+require 'globals.php';
 require_once 'inc/generate-config-functions.php';
 …
 require_once 'inc/rest-functions.php';
 require_once 'inc/mu-plugins-functions.php';
+require_once 'inc/advanced-cache-functions.php';
 require_once 'inc/third-party/index.php';
 …
+}
+// Registration hook
+function wpblast_register_activation()
+{
+    // First install DB
+    wpblast_install();
+    // Then trigger update hook for third-party gen
+    try {
+        // also used to trigger regeneration of config or third party file updates
+        do_action('wpblast_plugin_updated', get_option('wpblast_plugin_version'), WPBLAST_PLUGIN_VERSION);
+        // only update option at the end so that it can be trigger again in case of error
+        update_option('wpblast_plugin_version', WPBLAST_PLUGIN_VERSION);
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+}
 // Update check
+function wpblast_update_db_check()
+{
+function wpblast_update_check()
+{
+    // Update DB check
     if (get_option('wpblast_db_version') !== WPBLAST_DB_VERSION) {
         wpblast_install();
+    }
+    // Update plugin code check
+    if (get_option('wpblast_plugin_version') !== WPBLAST_PLUGIN_VERSION) {
+        try {
+            // also used to trigger regeneration of config or third party file updates
+            do_action('wpblast_plugin_updated', get_option('wpblast_plugin_version'), WPBLAST_PLUGIN_VERSION);
+            // only update option at the end so that it can be trigger again in case of error
+            update_option('wpblast_plugin_version', WPBLAST_PLUGIN_VERSION);
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }
+}
 …
+}
 add_action('plugins_loaded', 'wpblast_update_db_check');
 register_activation_hook(__FILE__, 'wpblast_install');
+add_action('plugins_loaded', 'wpblast_update_check');
+register_activation_hook(__FILE__, 'wpblast_register_activation');
 function wpblast_install()
+{
 …
         // Setup transient for first activation
+        // This is also used to trigger again a crawl in case of upgrade
         set_transient(Settings::PLUGIN_CACHE_PREFIX . '_firstActivation', time(), apply_filters('wpblast_settings_first_activation_expiration', 60 * 60 * 24 * 30));
 …
+        }
+        $resultPages = $wpdb->get_row("SHOW INDEXES FROM {$wpdb->wpblast_sitemap} WHERE key_name = 'WPBlast_Sitemap_CacheExpiration'", ARRAY_A);
+        if (!isset($resultPages)) {
+            $wpdb->query("ALTER TABLE {$wpdb->wpblast_sitemap} ADD INDEX `WPBlast_Sitemap_CacheExpiration` (`cacheExpiration`)");
+        }
+        $resultPages = $wpdb->get_row("SHOW INDEXES FROM {$wpdb->wpblast_sitemap} WHERE key_name = 'WPBlast_Sitemap_Url'", ARRAY_A);
+        if (!isset($resultPages)) {
+            $wpdb->query("ALTER TABLE {$wpdb->wpblast_sitemap} ADD INDEX `WPBlast_Sitemap_Url` (`url`)");
+        }
+        $resultPages = $wpdb->get_row("SHOW INDEXES FROM {$wpdb->wpblast_sitemap} WHERE key_name = 'WPBlast_Sitemap_Active'", ARRAY_A);
+        if (!isset($resultPages)) {
+            $wpdb->query("ALTER TABLE {$wpdb->wpblast_sitemap} ADD INDEX `WPBlast_Sitemap_Active` (`active`)");
+        }
+        // also used to trigger regeneration of config or third party file updates
+        do_action('wpblast_activate', get_option('wpblast_db_version'), WPBLAST_DB_VERSION);
+        // only update option at the end so that it can be trigger again in case of error
         update_option('wpblast_db_version', WPBLAST_DB_VERSION);
-        // also used to trigger regeneration of config or third party file updates
-        do_action('wpblast_activate');
     } catch (\Throwable $e) {
         // hardcode url so that it's as pure as possible
 …
 add_action('activated_plugin', 'wpblast_activation_redirect');
+// This is done in two steps to prevent concurrent requests bugs
+// In case the uninstall method takes a few seconds to process and that requests are still coming, the plugin could create new data that will not be cleaned
+// This results in pluginData, file config or third party actions not cleaned (mainly with the action wpblast_updated_crawler_list)
 register_deactivation_hook(__FILE__, 'wpblast_uninstall');
 function wpblast_uninstall()
+{
+    global $smartfire_wpblast_settings;
+    // Ping wp-blast.com to be aware of deactivation and not trigger auto gen cache
+    try {
+        wp_remote_get($smartfire_wpblast_settings->getWebsite() . '/?method=deactivatePlugin&domain=' . urlencode($smartfire_wpblast_settings->getUsername()) . '&plugin_token=' . $smartfire_wpblast_settings->getPassword(), [
+            'user-agent' => Settings::WPBLAST_UA_PLUGIN,
+            'timeout' => 15,
+        ]);
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+    // should remove every advanced-cache addon or mu-plugins before cleaning everything to prevent concurrent requests bugs
+    // otherwise concurrent requests could trigger new cache that won't be cleaned
+    try {
+        do_action('wpblast_deactivate');
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+}
+function wpblast_uninstalled($plugin, $network_deactivating)
+{
     global $wpdb;
+    $wpdb->wpblast_sitemap = $wpdb->prefix . Settings::WPBLAST_SITEMAP_TABLE;
+    // Ping wp-blast.com to be aware of deactivation and not trigger auto gen cache
+    $wpblast_settings = new Settings();
+    $wpblast_settings->init();
+    wp_remote_get($wpblast_settings->getWebsite() . '/?method=deactivatePlugin&domain=' . urlencode($wpblast_settings->getUsername()) . '&plugin_token=' . $wpblast_settings->getPassword(), [
+        'user-agent' => Settings::WPBLAST_UA_PLUGIN,
+        'timeout' => 15,
+    ]);
+    // Don't clean db version and settings to keep it in case of renabling but purge every other cache
+    wpblast_remove_capability(); // clean capability
+    do_action('wpblast_purge_cache');
+    do_action('wpblast_purge_plugin_cache', false);
+    // Remove table for clean uninstallation
+    $wpdb->query("DROP TABLE IF EXISTS {$wpdb->wpblast_sitemap}");
+    do_action('wpblast_deactivate');
+}
+    if ($plugin === plugin_basename(__FILE__)) {
+        $wpdb->wpblast_sitemap = $wpdb->prefix . Settings::WPBLAST_SITEMAP_TABLE;
+        // Don't clean db version and settings to keep it in case of renabling but purge every other cache
+        try {
+            wpblast_remove_capability(); // clean capability
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            do_action('wpblast_purge_plugin_cache', false);
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            // Remove table for clean uninstallation
+            $wpdb->query("DROP TABLE IF EXISTS {$wpdb->wpblast_sitemap}");
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            do_action('wpblast_deactivated');
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }
+}
+add_action('deactivated_plugin', 'wpblast_uninstalled', 10, 2);
 function wpblast_action_links($links)

wpblast/tags/1.8.5/readme.txt

-                      r2830275
+                      r2852021
 Tested up to: 6.1
 Requires PHP: 5.6
 Stable tag: 1.8.4
+Stable tag: 1.8.5
 License: Apache 2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 …
 The plugin has been designed to allow you to get a very high technology with no headache and no-code knowledge.
 The default settings in the plugin should be enough for a large majority of installations. Nevertheless, you still can tweak it if needed.
 If you have a website with a very large number of pages (> 2000), just be sure that the maximum number of cache items and the maximum number of sitemap items are well set. If you have any doubt with your plugin configuration, just [contact us](https://www.wp-blast.com/contact/) and we'll be happy to help you configure it.
+If you have a website with a very large number of pages (> 10000), just be sure that the maximum number of cache items and the maximum number of sitemap items are well set. If you have any doubt with your plugin configuration, just [contact us](https://www.wp-blast.com/contact/) and we'll be happy to help you configure it.
 ### Install WP Blast from within WordPress
 …
 == Changelog ==
 = 1.8.4 =
 Release Date: December 7th, 2022
+= 1.8.5 =
+Release Date: December 13th, 2022
 - Improve WP Rocket crawler management
 - Improve Nitropack compatibility
 - Fix error that could happened in crawler detection
+- Improve performance on large websites
+- Improve advanced-cache updates for nitropack and wp rocket
+- Improve mu-plugins updates for nitropack

wpblast/tags/1.8.5/src/Smartfire/Wordpress/WPBlast/Config.php

-                      r2807381
+                      r2852021
+        }
+        include $config_file_path['path'];
+        // Add fail proof in case the file doesn't exist, this will fallback to default value
+        // This could happened in case advanced cache is not cleaned and request are coming
+        if (file_exists($config_file_path['path'])) {
+            include $config_file_path['path'];
+        }
         $config = [

wpblast/tags/1.8.5/src/Smartfire/Wordpress/WPBlast/PageRender.php

-                      r2807381
+                      r2852021
+        }
-        do_action('wpblast_actions_before_start');
         ob_start([$this, 'render']);
+    }
 …
+    }
+    /**
+     * This method will be executed after EVERY code php has finished
+     * This is executed after wp has shutdown
+     */
     public function renderFor($url, $body, $static, $withScroll, $withImages)
+    {
 …
                 return $body;
+            }
+            // Request can be blast
+            // Use third party contribution point so that they can take action
+            // This may avoid having cache plugins cache wpblast results
+            // This avoid having to stop caching in case the request won't be taken in charge by wpblast (case where it's disabled or if the page isn't allowed)
+            // This may create a bug in case of upgrade of plan with cache plugins had cached the request
+            do_action('wpblast_actions_before_start');
             if ($sitemapItem === null) {
                 // save in db new hash before launching blasting
 …
             $this->settings->purgeExceededItemsCache(); // remove transitient exceeding max_cache_items
             $this->settings->cleanExpiredCache(); // clean up expired cache items
+            do_action('wpblast_actions_before_render', $hash, $toUpdate);
             return $content;

wpblast/tags/1.8.5/src/Smartfire/Wordpress/WPBlast/Settings.php

-                      r2830275
+                      r2852021
     const PLUGIN_CACHE_PREFIX = 'wpblast_plugin';
     const WPBLAST_SITEMAP_TABLE = 'wpblast_sitemap';
     const WPBLAST_UA_PLUGIN = 'WP-BLAST-Bot-Plugin 1.8.4';
+    const WPBLAST_UA_PLUGIN = 'WP-BLAST-Bot-Plugin 1.8.5';
     private $menu_name = 'wpblast';
 …
     private $cacheExpirationCrawlers = 60 * 60 * 24;
     private $cacheGrace = 60 * 15; // 15 min
     private $maxCacheItemsCrawlers = 2000;
     private $maxSitemapItems = 6000;
+    private $maxCacheItemsCrawlers = 10000;
+    private $maxSitemapItems = 20000;
     private $cacheCrawlerList = 60 * 60 * 24;
     private $cacheUserAccount = 60 * 60 * 24;
     private $updatePluginDataFrequency = 60 * 60;
     private $cacheItemGarbageExpiration = 60 * 60 * 24 * 7; // a week
+    private $purgeExceededItemsCacheRateLimit = 60; // 1 min
+    private $cleanExpiredCacheRateLimit = 60; // 1 min
     private $withImages = true;
     private $withScroll = true;
 …
         add_filter('update_option_wpblast_crawler', [$this, 'onCrawlerOptionChange'], 10, 2);
+        add_filter('wpblast_crawlers_cachegen', function ($regexp) {
+            return $this->getCrawlerCacheGen();
+        });
+        add_filter('wpblast_crawlers_regexp', function ($regexp) {
+            return $this->getCrawlerRegexp();
+        });
+        add_filter('wpblast_crawlers_autoregexp', function ($regexp) {
+            return $this->getCrawlerAutoRegexp();
+        });
+        add_filter('wpblast_crawlers_full', function ($regexp) {
+            $crawlerCacheGen = $this->getCrawlerCacheGen();
+            $crawlerRegexp = $this->getCrawlerRegexp();
+            $crawlerAutoRegexp = $this->getCrawlerAutoRegexp();
+            $returnValue = ''; // Security in case the filter is called twice
+            if (isset($crawlerCacheGen) && $crawlerCacheGen !== '') {
+                $returnValue .= $crawlerCacheGen;
+            }
+            if (isset($crawlerRegexp) && $crawlerRegexp !== '') {
+                if ($returnValue !== '') {
+                    $returnValue .= '|';
+                }
+                $returnValue .= $crawlerRegexp;
+            }
+            if (isset($crawlerAutoRegexp) && $crawlerAutoRegexp !== '') {
+                if ($returnValue !== '') {
+                    $returnValue .= '|';
+                }
+                $returnValue .= $crawlerAutoRegexp;
+            }
+            return $returnValue;
+        });
         add_filter('wpblast_crawlers_list', function ($ua) {
             array_push($ua, [
 …
         $this->updatePluginDataFrequency = apply_filters('wpblast_settings_plugin_data_expiration', $this->updatePluginDataFrequency);
         $this->cacheItemGarbageExpiration = apply_filters('wpblast_settings_cache_garbage_expiration', $this->cacheItemGarbageExpiration);
+        $this->purgeExceededItemsCacheRateLimit = apply_filters('wpblast_settings_purge_exceeded_items_cache_rate_limit', $this->purgeExceededItemsCacheRateLimit);
+        $this->cleanExpiredCacheRateLimit = apply_filters('wpblast_settings_clean_expired_cache_rate_limit', $this->cleanExpiredCacheRateLimit);
         $this->server = $this->api->get_option('server', 'wpblast_home', $this->server);
 …
         $this->maxSitemapItems = intval($this->api->get_option('max_sitemap_items', 'wpblast_crawler', $this->maxSitemapItems));
-        // Protection against lock of requests when there is no plugin cache yet and we need to generate it
-        // This is a protection but this case shouldn't happen
-        if (!isset($_SERVER['HTTP_WPBLAST_SITEMAP_GENERATION'])) {
-            $this->getCrawlerAutoRegexp(); // update crawler list if expired
-            $this->getAccount(); // update user account if expired
-            $this->getPluginData(); // update plugin data to WP Blast at the given frequency
+        }
         add_action('wpblast_purge_cache', [$this, 'purgeCache']);
         add_action('wpblast_purge_plugin_cache', [$this, 'purgePluginCache']);
 …
         $this->has_been_init = true;
+        // Protection against lock of requests when there is no plugin cache yet and we need to generate it
+        // This is a protection but this case shouldn't happen
+        // This has been moved after the has_been_init flag because it would trigger a second init otherwise due to trigger of getCrawlerAutoRegexp that could then trigger a generation of config and then a new init
+        if (!isset($_SERVER['HTTP_WPBLAST_SITEMAP_GENERATION'])) {
+            $this->getCrawlerAutoRegexp(); // update crawler list if expired
+            $this->getAccount(); // update user account if expired
+            $this->getPluginData(); // update plugin data to WP Blast at the given frequency
+        }
+    }
+    // Force check that the plugin is still active
+    // This is used to avoid concurrent requests bugs
+    // Bug would be to not have a cleaned uninstall in case a request finish after the uninstallation
+    public function isPluginActive()
+    {
+        global $wpdb;
+        $pluginName = plugin_basename(realpath($this->rootPluginFile));
+        $suppress = $wpdb->suppress_errors();
+        $row      = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", 'active_plugins' ) );
+        $wpdb->suppress_errors( $suppress );
+        if ( is_object( $row ) ) {
+            $value = maybe_unserialize($row->option_value);
+        }
+        return in_array( $pluginName, $value, true ) || is_plugin_active_for_network( $pluginName );
+    }
 …
             if (isset($res)) {
                 $res = json_decode($res, true);
+                if ($res) {
+                // check that the plugin hasn't been deactivated while we were waiting for the result of the request
+                // otherwise, we could save in database and trigger an action while the plugin shouldn't be activated
+                if ($res && $this->isPluginActive()) {
                     $data = current_time('mysql', 1);
                     set_transient(self::PLUGIN_CACHE_PREFIX . '_plugindata', $data, $this->updatePluginDataFrequency);
 …
+            }
             $res = wp_remote_retrieve_body($response);
+            if (isset($res) && $res !== '') {
+            // check that the plugin hasn't been deactivated while we were waiting for the result of the request
+            // otherwise, we could save in database and trigger an action while the plugin shouldn't be activated
+            if (isset($res) && $res !== '' && $this->isPluginActive()) {
                 $res = json_decode($res, true);
                 if (isset($res['crawlers']) && $res['crawlers'] !== '') {
 …
+            }
             $res = wp_remote_retrieve_body($response);
+            if (isset($res) && $res !== '') {
+            // check that the plugin hasn't been deactivated while we were waiting for the result of the request
+            // otherwise, we could save in database and trigger an action while the plugin shouldn't be activated
+            if (isset($res) && $res !== '' && $this->isPluginActive()) {
                 $res = json_decode($res, true);
                 if (
 …
                         && $userAccount['features']['maxPages'] !== $maxPagesAllowed
                     ) {
+                        $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp ORDER BY maxActive DESC, maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                        $this->updateActivePages($urls);
+                        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                            $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp ORDER BY maxActive DESC, maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                            $this->updateActivePages($urls);
+                        }
+                    }
                     // Generate cache if it's a first connection
 …
         global $wpdb;
         if (count($items) > 0) {
+        if (count($items) > 0 && $this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
             // Send data about hash wanted to be sure it's sync with wp-blast.com server
 …
                             $toUpdate['scores'] = $item['scores'];
+                        }
+                        // query in foreach but is limited by the number of scores that can be retrieve through the request, it depends on the user navigating so should be only tens of scores
                         $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET scores = %s WHERE hash = %s", Utils::format_json_encode($toUpdate), $hash));
+                    }
 …
+        }
+        if (count($activeUrls) > 0) {
+            // Update every active state
+            // This is done in a single query to allow having a lot of update of pages without doing a lot of query
+            // First enable active page
+            $activation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+            // Then disable page not in the array
+            $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+            // Clean up in case too much url are active (shouldn't happened unless fraudulent call)
+            $userAccount = $this->getAccount();
+            if (isset($userAccount) && isset($userAccount['features']) && isset($userAccount['features']['maxPages'])) {
+                $maxPagesAllowed = $userAccount['features']['maxPages'];
+                $currentUse = $this->getNumberPagesUsed();
+                if (isset($currentUse) && $currentUse > $maxPagesAllowed) {
+                    // should never be called unless fraud attempt or bug
+                    // clean up active pages based on lastRequest, except for home url
+                    // get urls to keep active
+                    $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp WHERE maxActive >= 1 ORDER BY maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                    // First enable active page
+                    $activation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                    // Then disable page not in the array
+                    $deactivation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                    $activation = $activation !== false && $activation2 !== false;
+                    $deactivation = $deactivation !== false && $deactivation2 !== false;
+                }
+            }
+            if ($activation === false || $deactivation === false) {
+                $this->setFormView('error');
+            }
+        } else {
+            // no active pages wanted, disable every pages
+            // should never be called due to at least home url
+            $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0"));
+            if ($deactivation === false) {
+                $this->setFormView('error');
+        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+            if (count($activeUrls) > 0) {
+                // Update every active state
+                // This is done in a single query to allow having a lot of update of pages without doing a lot of query
+                // First enable active page
+                $activation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+                // Then disable page not in the array
+                $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+                // Clean up in case too much url are active (shouldn't happened unless fraudulent call)
+                $userAccount = $this->getAccount();
+                if (isset($userAccount) && isset($userAccount['features']) && isset($userAccount['features']['maxPages'])) {
+                    $maxPagesAllowed = $userAccount['features']['maxPages'];
+                    $currentUse = $this->getNumberPagesUsed();
+                    if (isset($currentUse) && $currentUse > $maxPagesAllowed) {
+                        // should never be called unless fraud attempt or bug
+                        // clean up active pages based on lastRequest, except for home url
+                        // get urls to keep active
+                        $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp WHERE maxActive >= 1 ORDER BY maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                        // First enable active page
+                        $activation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                        // Then disable page not in the array
+                        $deactivation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                        $activation = $activation !== false && $activation2 !== false;
+                        $deactivation = $deactivation !== false && $deactivation2 !== false;
+                    }
+                }
+                if ($activation === false || $deactivation === false) {
+                    $this->setFormView('error');
+                }
+            } else {
+                // no active pages wanted, disable every pages
+                // should never be called due to at least home url
+                $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0"));
+                if ($deactivation === false) {
+                    $this->setFormView('error');
+                }
+            }
+        }
 …
             // avoid getting cache value to avoid loading every cache of the website in ram
             // prioritize by newest url by default
+            if ($orderBy === 'url') {
+                $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration FROM {$wpdb->wpblast_sitemap} ORDER BY CHAR_LENGTH(url) ASC", ARRAY_A);
+            } else if ($orderBy === 'active') {
+                // hashVariables used for cache section in admin to have details on a row
+                // request used by admin settings page and have specific fields / ! \
+                $sitemap = $wpdb->get_results("SELECT active, hash, hashVariables, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY active DESC, nbRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+            } else {
+                // send scores to wp-blast.com so that the server can know the scores saved in database by the plugin
+                $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+            if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                if ($orderBy === 'url') {
+                    $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration FROM {$wpdb->wpblast_sitemap} ORDER BY CHAR_LENGTH(url) ASC", ARRAY_A);
+                } else if ($orderBy === 'active') {
+                    // hashVariables used for cache section in admin to have details on a row
+                    // request used by admin settings page and have specific fields / ! \
+                    $sitemap = $wpdb->get_results("SELECT active, hash, hashVariables, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY active DESC, nbRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+                } else {
+                    // send scores to wp-blast.com so that the server can know the scores saved in database by the plugin
+                    $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+                }
+            }
 …
+    {
         global $wpdb;
+        $urlUntrailingSlashed = untrailingslashit($url);
+        $nb = $wpdb->get_var($wpdb->prepare("SELECT MAX(active) AS active FROM {$wpdb->wpblast_sitemap} WHERE (url = %s OR url = CONCAT(%s, '/')) GROUP BY REPLACE(url, %s, '')", [$urlUntrailingSlashed, $urlUntrailingSlashed, '?' . PageRender::WPBLAST_CRAWLER]));
+        $nb = intval($nb);
+        if ($nb >= 1) {
+            return true;
+        } else {
+        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+            $urlUntrailingSlashed = untrailingslashit($url);
+            $nb = $wpdb->get_var($wpdb->prepare("SELECT MAX(active) AS active FROM {$wpdb->wpblast_sitemap} WHERE (url = %s OR url = CONCAT(%s, '/')) GROUP BY REPLACE(url, %s, '')", [$urlUntrailingSlashed, $urlUntrailingSlashed, '?' . PageRender::WPBLAST_CRAWLER]));
+            $nb = intval($nb);
+            if ($nb >= 1) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        else {
             return false;
+        }
 …
         if (isset($hash)) {
             if (!isset($this->sitemapItems[$hash])) {
+                $item = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->wpblast_sitemap} WHERE hash = %s", [$hash]), ARRAY_A);
+                if (isset($item)) {
+                    $this->sitemapItems[$hash] = $item;
+                } else {
+                if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                    $item = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->wpblast_sitemap} WHERE hash = %s", [$hash]), ARRAY_A);
+                    if (isset($item)) {
+                        $this->sitemapItems[$hash] = $item;
+                    } else {
+                        return null;
+                    }
+                }
+                else {
                     return null;
+                }
 …
+    {
         global $wpdb;
+        if (isset($hash)) {
+        if (isset($hash) && $this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
             $itemId = $wpdb->get_var($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} WHERE hash = %s", [$hash]));
 …
         if (isset($_GET[self::WPBLAST_PURGE_CACHE])) {
             unset($_GET[self::WPBLAST_PURGE_CACHE]);
             $this->purgeCache();
+            do_action('wpblast_purge_cache');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Cache has been cleared', 'wpblast') . '</div>
 …
         if (isset($_GET[self::WPBLAST_PURGE_PLUGIN_CACHE])) {
             unset($_GET[self::WPBLAST_PURGE_PLUGIN_CACHE]);
             $this->purgePluginCache(true);
+            do_action('wpblast_purge_plugin_cache');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Cache has been cleared', 'wpblast') . '</div>
 …
         if (isset($_GET[self::WPBLAST_PURGE_SITEMAP])) {
             unset($_GET[self::WPBLAST_PURGE_SITEMAP]);
             $this->purgeSitemap();
+            do_action('wpblast_purge_sitemap');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Sitemap has been cleared', 'wpblast') . '</div>
 …
         if (isset($_GET[self::WPBLAST_PURGE_PAGES_SCORES])) {
             unset($_GET[self::WPBLAST_PURGE_PAGES_SCORES]);
             $this->purgePagesScores();
+            do_action('wpblast_purge_pages_scores');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Pages scores has been cleared', 'wpblast') . '</div>
 …
                 'name' => 'max_cache_items',
                 'label' => __('Maximum cache items', 'wpblast'),
                 'desc' => __('This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 2000.', 'wpblast'),
+                'desc' => __('This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 10000.', 'wpblast'),
                 'type' => 'number',
                 'default' => $this->maxCacheItemsCrawlers,
 …
                 'name' => 'max_sitemap_items',
                 'label' => __('Maximum sitemap items', 'wpblast'),
                 'desc' => __('This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 6000.', 'wpblast'),
+                'desc' => __('This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 20000.', 'wpblast'),
                 'type' => 'number',
                 'default' => $this->maxSitemapItems,
 …
         global $wpdb;
+        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+            // Get cache items to delete: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+            // Limit range is bigint unsigned max value
+            $idsToDelete = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxSitemapItems()]));
+            // Get items to clear: use this in two steps to avoid using nested query that could create an incompatibility
+            if (count($idsToDelete) > 0) {
+                $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->wpblast_sitemap} WHERE id IN (" . implode(', ', array_fill(0, count($idsToDelete), '%s')) . ')', $idsToDelete));
+            }
+            // Get cache items to keep: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+            // Limit range is bigint unsigned max value
+            $idsToUpdate = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxCacheItemsCrawlers()]));
+            // Clean cache value
+            if (count($idsToUpdate) > 0) {
+                $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET cache = '', cacheExpiration = 0, lastGen = NULL WHERE id IN (" . implode(', ', array_fill(0, count($idsToUpdate), '%s')) . ')', $idsToUpdate));
+            }
+        $purgeExceededItemsCacheTimestamp = get_transient(self::PLUGIN_CACHE_PREFIX . '_purgeExceededItemsCacheTimestamp');
+        // Rate limit calls to this method to avoid overloading the server
+        if (!$purgeExceededItemsCacheTimestamp || ($purgeExceededItemsCacheTimestamp + $this->purgeExceededItemsCacheRateLimit < time())) {
+            if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                // Get cache items to delete: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+                // Limit range is bigint unsigned max value
+                $idsToDelete = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxSitemapItems()]));
+                // Get items to clear: use this in two steps to avoid using nested query that could create an incompatibility
+                if (count($idsToDelete) > 0) {
+                    $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->wpblast_sitemap} WHERE id IN (" . implode(', ', array_fill(0, count($idsToDelete), '%s')) . ')', $idsToDelete));
+                }
+                // Get cache items to keep: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+                // Limit range is bigint unsigned max value
+                $idsToUpdate = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxCacheItemsCrawlers()]));
+                // Clean cache value
+                if (count($idsToUpdate) > 0) {
+                    $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET cache = '', cacheExpiration = 0, lastGen = NULL WHERE id IN (" . implode(', ', array_fill(0, count($idsToUpdate), '%s')) . ')', $idsToUpdate));
+                }
+            }
+            $data = time();
+            set_transient(self::PLUGIN_CACHE_PREFIX . '_purgeExceededItemsCacheTimestamp', $data, 60 * 60 * 24 * 7); // transient is kept a week
+        }
+    }
 …
+    {
         global $wpdb;
+        $cleanExpiredCacheTimestamp = get_transient(self::PLUGIN_CACHE_PREFIX . '_cleanExpiredCacheTimestamp');
+        // Rate limit calls to this method to avoid overloading the server
+        if (!$cleanExpiredCacheTimestamp || ($cleanExpiredCacheTimestamp + $this->cleanExpiredCacheRateLimit < time())) {
         if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
 …
             // Remove items that have not been requested for a long time: this is a big clean up to avoid the table getting bigger and bigger with no legitimate content
             $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->wpblast_sitemap} WHERE (lastRequest IS NOT NULL AND UNIX_TIMESTAMP() - UNIX_TIMESTAMP(lastRequest) >= %d) OR (lastRequest IS NULL AND dateAdd IS NOT NULL AND UNIX_TIMESTAMP() - UNIX_TIMESTAMP(dateAdd) >= %d)", [$this->getCacheItemGarbageExpiration(), $this->getCacheItemGarbageExpiration()]));
+        }
+        $data = time();
+            set_transient(self::PLUGIN_CACHE_PREFIX . '_cleanExpiredCacheTimestamp', $data, 60 * 60 * 24 * 7); // transient is kept a week
+        }
+    }

wpblast/trunk/changelog.txt

-                      r2830275
+                      r2852021
 == Changelog ==
+= 1.8.5 =
+Release Date: December 13th, 2022
+- Improve performance on large websites
+- Improve advanced-cache updates for nitropack and wp rocket
+- Improve mu-plugins updates for nitropack
 = 1.8.4 =
 Release Date: December 7th, 2022

wpblast/trunk/globals.php

-                      r2781302
+                      r2852021
 use Smartfire\Wordpress\WPBlast\Settings;
+if (!defined('WPBLAST_PLUGIN_DIR')) {
+    define('WPBLAST_PLUGIN_DIR', __DIR__ . '/../../..');
+// This is to allow to use require instead of require_once but still have the file loaded once
+// This happened because when the plugin is activated by wordpress, the variables scope is empty but still the file has been loaded
+// This happened when activating the plugin after loading was left in the advanced-cache file
+if (!isset($wpblast_globals_loaded)) {
+    if (!defined('WPBLAST_PLUGIN_DIR')) {
+        define('WPBLAST_PLUGIN_DIR', __DIR__ . '/../../..');
+    }
+    $autoloader = require('autoload.php');
+    $autoloader('Smartfire\\Wordpress\\WPBlast\\', __DIR__ . '/src/Smartfire/Wordpress/WPBlast/');
+    $smartfire_wpblast_config = new Config(['config_dir_path' => WP_CONTENT_DIR . '/wpblast-config']);
+    $smartfire_wpblast_settings = new Settings();
+    $wpblast_globals_loaded = true;
+}
-$autoloader = require('autoload.php');
-$autoloader('Smartfire\\Wordpress\\WPBlast\\', __DIR__ . '/src/Smartfire/Wordpress/WPBlast/');
-$smartfire_wpblast_config = new Config(['config_dir_path' => WP_CONTENT_DIR . '/wpblast-config']);
-$smartfire_wpblast_settings = new Settings();

wpblast/trunk/inc/generate-config-functions.php

-                      r2807381
+                      r2852021
+}
 add_action('wpblast_activate', function () {
     add_action('admin_init', 'wpblast_generate_config_file');
+add_action('wpblast_plugin_updated', function () {
+    add_action('init', 'wpblast_generate_config_file');
 });
 add_action('wpblast_updated_crawler_list', 'wpblast_generate_config_file');
 add_action('wpblast_updated_options', 'wpblast_generate_config_file');
 add_action('wpblast_deactivate', function () {
+add_action('wpblast_deactivated', function () {
     global $smartfire_wpblast_config;
     $path = $smartfire_wpblast_config->get_config_file_path()['path'];

wpblast/trunk/inc/mu-plugins-functions.php

-                      r2830275
+                      r2852021
 <?php
+defined('ABSPATH') || exit;
 function wpblast_display_error($message)
+{
     $class = 'notice notice-error';
+    printf('<div class="%1$s"><p>%2$s</p></div>', esc_attr($class), esc_html($message));
+}
+function wpblast_display_warning($message)
+{
+    $class = 'notice notice-warning';
     printf('<div class="%1$s"><p>%2$s</p></div>', esc_attr($class), esc_html($message));
+}
 …
 function wpblast_require_mu_plugin($data)
+{
     // Installer
     add_action('wpblast_activate', function () use ($data) {
+    // In case of update
+    add_action('wpblast_plugin_updated', function () use ($data) {
         wpblast_install_mu_plugin($data);
     });
     // Update checker
+    // In case a difference exist between installed version and current version or in case the mu-plugin triggered an error
     add_action('admin_init', function () use ($data) {
         if (isset($data['slug'])) {
             if (!defined('WPBLAST_MU_PLUGIN-' . $data['slug']) || !defined('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug']) || WPBLAST_PLUGIN_VERSION !== constant('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug'])) {
+            if (defined('WPBLAST_MU_PLUGIN_ERROR') || !defined('WPBLAST_MU_PLUGIN-' . $data['slug']) || !defined('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug']) || WPBLAST_PLUGIN_VERSION !== constant('WPBLAST_MU_PLUGIN_VERSION-' . $data['slug'])) {
                 wpblast_install_mu_plugin($data);
+            }
 …
         $codeHeader = isset($data['code']) && isset($data['code']['header']) ? $data['code']['header'] : '';
         $codeBody = isset($data['code']) && isset($data['code']['body']) ? $data['code']['body'] : '';
+        $codeDeactivationCondition = '';
+        if (isset($data['code']) && isset($data['code']['deactivationCondition'])) {
+            $codeDeactivationCondition = '
+add_action(\'admin_init\', function () {
+    if(' . $data['code']['deactivationCondition'] . ') {
+        wpblast_uninstall_mu_plugin([
+            \'slug\' => \'' . $slug . '\'
+        ]);
+    }
+});';
+        }
         wpblast_require_mu_plugin_dir(); // create mu-plugins directory if needed
         $muPluginFile = realpath(WP_CONTENT_DIR) . '/mu-plugins/' . $slug . '.php';
         $code = '<?php
 /*
 Plugin Name:  ' . $name . '
 Plugin URI:   https://www.wp-blast.com
 Description:  ' . $description . '
 Version:      ' . $version . '
 Author: WP Blast
 License: Apache 2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
+' . 'Plugin Name' . ':  ' . $name . '
+' . 'Plugin URI' . ':   https://www.wp-blast.com
+' . 'Description' . ':  ' . $description . '
+' . 'Version' . ':      ' . $version . '
+' . 'Author' . ': WP Blast
+' . 'License' . ': Apache 2.0
+' . 'License URI' . ': http://www.apache.org/licenses/LICENSE-2.0
 */
 // THIS FILE HAS BEEN AUTO-GENERATED
 …
 defined( \'ABSPATH\' ) || exit;
+// WPBLAST-DEACTIVATION-HOOK-START
+' . $codeDeactivationCondition . '
+// WPBLAST-DEACTIVATION-HOOK-END
 if(!defined(\'WPBLAST_MU_PLUGIN-' . $slug . '\')) {

wpblast/trunk/inc/rest-functions.php

-                      r2807381
+                      r2852021
 function wpblast_generate_cache_item_action()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce']) && isset($_GET['url']) && $_GET['url'] !== '') {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
             $url = urldecode(esc_url_raw(wp_unslash($_GET['url'])));
-            $settings = new Settings();
-            $settings->init();
             $response = wp_remote_get($url, [
                 'user-agent' => $settings->getCrawlerCacheGen(), // use WP Blast Crawler to force cache gen
+                'user-agent' => $smartfire_wpblast_settings->getCrawlerCacheGen(), // use WP Blast Crawler to force cache gen
                 'headers' => [
                     'WPBLAST-FORCE-GENERATION' => '1',
                     'WPBLAST-TOKEN' => base64_encode($settings->getUsername() . ':' . $settings->getPassword()),
+                    'WPBLAST-TOKEN' => base64_encode($smartfire_wpblast_settings->getUsername() . ':' . $smartfire_wpblast_settings->getPassword()),
                 ],
                 'timeout'     => $settings->getTimeout(),
+                'timeout'     => $smartfire_wpblast_settings->getTimeout(),
             ]);
             $httpCode = wp_remote_retrieve_response_code($response);
 …
 function wpblast_update_plugin_data()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce'])) {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
+            $settings = new Settings();
+            $settings->init();
+            $settings->getPluginData(true); // force update to wp blast
+            $smartfire_wpblast_settings->getPluginData(true); // force update to wp blast
             return new WP_REST_Response(
+                [
 …
 function wpblast_update_user_account()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce'])) {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
+            $settings = new Settings();
+            $settings->init();
+            $settings->getAccount(true); // force update of user account
+            $smartfire_wpblast_settings->getAccount(true); // force update of user account
             return new WP_REST_Response(
+                [
 …
 function wpblast_update_crawler_list()
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce'])) {
         $nonce = sanitize_text_field(wp_unslash($_GET['wpblast_nonce']));
         if (wp_verify_nonce($nonce, 'wp_rest')) {
+            $settings = new Settings();
+            $settings->init();
+            $settings->getCrawlerAutoRegexp(true); // force update of crawler list
+            $smartfire_wpblast_settings->getCrawlerAutoRegexp(true); // force update of crawler list
             return new WP_REST_Response(
+                [
 …
 function wpblast_get_status()
+{
+    global $smartfire_wpblast_settings;
     header('Content-Type: application/javascript');
     // Call WP Blast server for status
+    $settings = new Settings();
+    $settings->init();
+    $response = wp_remote_get($settings->getWebsite() . '/?method=getWpBlastStatus&domain=' . urlencode($settings->getUsername()) . '&plugin_token=' . $settings->getPassword(), [
+    $response = wp_remote_get($smartfire_wpblast_settings->getWebsite() . '/?method=getWpBlastStatus&domain=' . urlencode($smartfire_wpblast_settings->getUsername()) . '&plugin_token=' . $smartfire_wpblast_settings->getPassword(), [
         'user-agent' => Settings::WPBLAST_UA_PLUGIN,
         'timeout' => 15,
 …
 function wpblast_get_sitemap($request)
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce']) && wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['wpblast_nonce'])), 'wp_rest')) {
-        $settings = new Settings();
-        $settings->init();
         if (isset($request['items'])) {
             $items = $request['items'];
             $settings->updateSitemapScores($items);
+        }
         $sitemap = $settings->getWebsiteSitemap('active');
         $settings->cleanExpiredCache(); // delete expired cache item
+            $smartfire_wpblast_settings->updateSitemapScores($items);
+        }
+        $sitemap = $smartfire_wpblast_settings->getWebsiteSitemap('active');
+        $smartfire_wpblast_settings->cleanExpiredCache(); // delete expired cache item
         $response = [
 …
 function wpblast_update_active_pages($request)
+{
+    global $smartfire_wpblast_settings;
     if (isset($_GET['wpblast_nonce']) && wp_verify_nonce(sanitize_text_field(wp_unslash($_GET['wpblast_nonce'])), 'wp_rest')) {
-        $settings = new Settings();
-        $settings->init();
         if (isset($request['activeUrls'])) {
             $activeUrls = $request['activeUrls'];
             $settings->updateActivePages($activeUrls);
+        }
         $sitemap = $settings->getWebsiteSitemap('active');
         $settings->cleanExpiredCache(); // delete expired cache item
+            $smartfire_wpblast_settings->updateActivePages($activeUrls);
+        }
+        $sitemap = $smartfire_wpblast_settings->getWebsiteSitemap('active');
+        $smartfire_wpblast_settings->cleanExpiredCache(); // delete expired cache item
         $response = [

wpblast/trunk/inc/third-party/advanced-cache.php

-                      r2830275
+                      r2852021
 defined('ABSPATH') || exit;
+require_once __DIR__ . '/../../globals.php';
+if (!defined('WPBLAST_ADVANCED_CACHE')) {
+    define('WPBLAST_ADVANCED_CACHE', true);
+}
+require __DIR__ . '/../../globals.php';
 if (Bootstrap::should_blast()) {

wpblast/trunk/inc/third-party/hummingbird-performance/hummingbird-performance-functions.php

-                      r2807419
+                      r2852021
+    }
+    add_action('wpblast_activate', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_plugin_updated', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_deactivated', 'wpblast_wphb_clear_cache');
+    add_action('wpblast_purge_cache_third_party', 'wpblast_wphb_clear_cache');
     add_action('wpblast_updated_crawler_list', 'wpblast_wphb_clear_cache');
     add_action('wpblast_updated_options', 'wpblast_wphb_clear_cache');

wpblast/trunk/inc/third-party/index.php

r2830275	r2852021
4	4
5	5	require_once 'hummingbird-performance/hummingbird-performance-functions.php';
	6	require_once 'litespeed-cache/litespeed-cache-functions.php';
6	7	require_once 'w3-total-cache/w3-total-cache-functions.php';
7	8	require_once 'wp-rocket/wp-rocket-functions.php';

wpblast/trunk/inc/third-party/nitropack/nitropack-functions.php

-                      r2830275
+                      r2852021
         'name' => 'WP Blast Addon - Nitropack',
         'code' => [
+            'body' => "
+            'deactivationCondition' => "!is_plugin_active('nitropack/main.php')",
+            'body' => '
 // Even if advanced-cache is not used, nitropack needs this filter added prior its execution
 // This will be needed for both usecase: with or without advanced-cache with nitropack
+require_once '" . __DIR__ . "/../../../globals.php';
+function wpblast_nitropack_can_serve_cache() {
+    return !Smartfire\Wordpress\WPBlast\Bootstrap::should_blast();
+$wpblast_globals_file = "' . __DIR__ . '/../../../globals.php' . '";
+$wpblast_abspath = "' . ABSPATH . '";
+// Fail proof check that the WP installation hasnt been moved to another server or other folder
+// In case path is wrong, the addon will not be detected and therefore will be installed again
+if (file_exists($wpblast_globals_file) && ABSPATH == $wpblast_abspath) {
+    require $wpblast_globals_file;
+    function wpblast_nitropack_can_serve_cache() {
+        return !Smartfire\Wordpress\WPBlast\Bootstrap::should_blast();
+    }
+    add_filter("nitropack_can_serve_cache", "wpblast_nitropack_can_serve_cache");
+}
+add_filter('nitropack_can_serve_cache', 'wpblast_nitropack_can_serve_cache');",
+else {
+    // will recreate the mu-plugin addon in case of error
+    if(!defined("WPBLAST_MU_PLUGIN_ERROR")) {
+        define("WPBLAST_MU_PLUGIN_ERROR", true);
+        return;
+    }
+}',
         ],
     ]);
 …
+    }
-    function wpblast_nitropack_advanced_cache_file($content)
+    {
-        // Only insert addon in case there is a content and that addon is not existent, otherwise remove advanced cache to trigger re-generation
-        if ($content !== '' && strpos($content, 'WPBLAST_ADVANCED_CACHE_VERSION') === false) {
-            $content = explode('if (defined("NITROPACK_VERSION") && defined("NITROPACK_ADVANCED_CACHE_VERSION") && NITROPACK_VERSION == NITROPACK_ADVANCED_CACHE_VERSION && nitropack_is_dropin_cache_allowed()) {', $content);
-            $start = $content[0];
-            $nitropack = $content[1];
-            return $start . "
-// WP-BLAST ADDON START //
-if(!defined('WPBLAST_ADVANCED_CACHE_VERSION')) {
-    define( 'WPBLAST_ADVANCED_CACHE_VERSION', '" . WPBLAST_PLUGIN_VERSION . "');
+}
-include_once \"" . __DIR__ . '/../advanced-cache.php' . "\";
-if(defined('WPBLAST_SKIP_ADVANCED_CACHE') && WPBLAST_SKIP_ADVANCED_CACHE) {
-    return;
+}
-// WP-BLAST ADDON END //
-if (defined(\"NITROPACK_VERSION\") && defined(\"NITROPACK_ADVANCED_CACHE_VERSION\") && NITROPACK_VERSION == NITROPACK_ADVANCED_CACHE_VERSION && nitropack_is_dropin_cache_allowed()) {
-" . $nitropack . '
-';
-        } else {
-            // Removing advanced cache will trigger re-write by nitropack that will then allow for a rewrite of the wpblast addon
-            return '';
+        }
+    }
-    // As we are checking that a nitropack defined variable in advanced cache is present, no writing error should happen
-    // In case of upgrade of nitropack, our variable will miss and we'll update the advanced cache file again
-    // In case of upgrade of wpblast, a new version will be triggered that will force to remove the advanced cache file
-    // Nitropack will recreates it and we'll add again the addon
-    add_filter('wpblast_nitropack_advanced_cache_file', 'wpblast_nitropack_advanced_cache_file');
-    function wpblast_nitropack_write_advanced_cache_file()
+    {
-        $advancedCacheFile = realpath(WP_CONTENT_DIR) . '/advanced-cache.php';
-        $advancedCacheFileContent = @file_get_contents($advancedCacheFile);
-        $newContent = apply_filters('wpblast_nitropack_advanced_cache_file', $advancedCacheFileContent);
-        if (WP_DEBUG) {
-            return file_put_contents($advancedCacheFile, $newContent);
-        } else {
-            return @file_put_contents($advancedCacheFile, $newContent);
+        }
+    }
-    function wpblast_nitropack_remove_advanced_cache_file()
+    {
-        // Reset advanced-cache file so that plugin can generate a new clean one
-        $advancedCacheFile = realpath(WP_CONTENT_DIR) . '/advanced-cache.php';
-        if (WP_DEBUG) {
-            return file_put_contents($advancedCacheFile, '');
-        } else {
-            return @file_put_contents($advancedCacheFile, '');
+        }
+    }
     // we don't do anything if nitropack advanced cache is not active
     if (function_exists('nitropack_has_advanced_cache') && nitropack_has_advanced_cache()) {
         if (!defined('WPBLAST_ADVANCED_CACHE') || !defined('WPBLAST_ADVANCED_CACHE_VERSION') || WPBLAST_PLUGIN_VERSION !== WPBLAST_ADVANCED_CACHE_VERSION) {
             // We rewrite advanced cache in case we detect a NITROPACK_ADVANCED_CACHE (this means the advanced cache is active) and we don't have a WPBLAST_ADVANCED_CACHE_VERSION, this either mean it's a first install or that the plugin nitropack has been updated or as changed the advanced-cache file
             add_action('plugins_loaded', 'wpblast_nitropack_write_advanced_cache_file');
+        }
+        wpblast_require_advanced_cache([
+            'slug' => 'wpblast-nitropack-addon',
+            'delimiter' => 'if (defined("NITROPACK_VERSION") && defined("NITROPACK_ADVANCED_CACHE_VERSION") && NITROPACK_VERSION == NITROPACK_ADVANCED_CACHE_VERSION && nitropack_is_dropin_cache_allowed()) {',
+        ]);
     } else if (function_exists('nitropack_has_advanced_cache') && !nitropack_has_advanced_cache()) {
         // If we are installed but nitrocache has disabled the advanced_cache, we should uninstall our advanced-cache addon
         if (defined('WPBLAST_ADVANCED_CACHE') || defined('WPBLAST_ADVANCED_CACHE_VERSION')) {
             add_action('plugins_loaded', 'wpblast_nitropack_remove_advanced_cache_file');
+        }
+        // force uninstall of advanced-cache even if cache plugin is being let active
+        wpblast_uninstall_advanced_cache([
+            'slug' => 'wpblast-nitropack-addon',
+        ]);
+    }
 …
         do_action('nitropack_execute_purge_all');
+    }
     add_action('wpblast_purge_cache_third_party', 'wpblast_nitro_clear_cache');
+    add_action('wpblast_deactivate', function () {
+        wpblast_nitropack_remove_advanced_cache_file();
+    });
+    add_action('wpblast_plugin_updated', function($oldVersion, $newVersion) {
+        // Compatibility upgrader before we used markers to replace our addons
+        // This will remove advanced cache, so that nitropack can add it again and we'll add then our addon
+        try {
+            if ($oldVersion === false || $oldVersion === '1.8.4') {
+                wpblast_clear_advanced_cache_file();
+            }
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }, 10, 2);
+}

wpblast/trunk/inc/third-party/w3-total-cache/w3-total-cache-functions.php

-                      r2807419
+                      r2852021
+    }
+    add_action('wpblast_activate', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_plugin_updated', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_purge_cache_third_party', 'wpblast_w3tc_clear_cache');
+    add_action('wpblast_deactivated', 'wpblast_w3tc_clear_cache');
     add_action('wpblast_updated_crawler_list', 'wpblast_w3tc_clear_cache');
     add_action('wpblast_updated_options', 'wpblast_w3tc_clear_cache');

wpblast/trunk/inc/third-party/wp-fastest-cache/wp-fastest-cache-functions.php

-                      r2830275
+                      r2852021
 <?php
+use Smartfire\Wordpress\WPBlast\Utils as Utils;
 defined('ABSPATH') || exit;
 …
 if (is_plugin_active('wp-fastest-cache/wpFastestCache.php')) {
+    // We are forced to use template_redirect as the plugin would take precedence otherwise
+    add_action('template_redirect', 'wpblast_actions_before_start_wpfc');
+    function wpblast_actions_before_start_wpfc()
+    {
+        // Avoid WPSC to cache the page
+        if (!defined('DONOTCACHEPAGE')) {
+            define('DONOTCACHEPAGE', true);
+        }
+    wpblast_require_mu_plugin([
+        'slug' => 'wpblast-wpfc-addon',
+        'name' => 'WP Blast Addon - WP Fastest Cache',
+        'code' => [
+            'deactivationCondition' => "!is_plugin_active('wp-fastest-cache/wpFastestCache.php')",
+            'body' => '
+// Use this mu-plugin to inject a cookie in the request that will make wpfc ignore the request in case we blast the request
+$wpblast_globals_file = "' . __DIR__ . '/../../../globals.php' . '";
+$wpblast_abspath = "' . ABSPATH . '";
+// Fail proof check that the WP installation hasnt been moved to another server or other folder
+// In case path is wrong, the addon will not be detected and therefore will be installed again
+if (file_exists($wpblast_globals_file) && ABSPATH == $wpblast_abspath) {
+    require $wpblast_globals_file;
+    if (Smartfire\Wordpress\WPBlast\Bootstrap::should_blast()) {
+        $_SERVER[\'HTTP_COOKIE\'] = "wpblast=1; " . (isset($_SERVER[\'HTTP_COOKIE\']) ? $_SERVER[\'HTTP_COOKIE\'] : "");
+    }
+}
+else {
+    // will recreate the mu-plugin addon in case of error
+    if(!defined("WPBLAST_MU_PLUGIN_ERROR")) {
+        define("WPBLAST_MU_PLUGIN_ERROR", true);
+        return;
+    }
+}',
+        ],
+    ]);
+    function wpblast_wpfc_remove_exclude_rules()
+    {
+        remove_filter('pre_update_option_WpFastestCacheExclude', 'wpblast_wpfc_inject_option_WpFastestCacheExclude'); // remove filter so our plugin wouldn't add the rule again
+        remove_action('delete_option_WpFastestCacheExclude', 'wpblast_wpfc_add_exclude_rules'); // remove filter so our plugin wouldn't add the rule again
+        $rules_json = get_option('WpFastestCacheExclude');
+        if (isset($rules_json) && $rules_json !== false && $rules_json !== '') {
+            $parsedContent = json_decode($rules_json);
+            $uaIndex = [];
+            $cookieIndex = [];
+            foreach ($parsedContent as $key => $value) {
+                if (isset($value->type) && $value->type === 'useragent' && isset($value->content) && strpos($value->content, 'WP-BLAST') !== false) {
+                    array_push($uaIndex, $key);
+                }
+                if (isset($value->type) && $value->type === 'cookie' && isset($value->content) && strpos($value->content, 'wpblast') !== false) {
+                    array_push($cookieIndex, $key);
+                }
+            }
+            // Remove the keys
+            // This should only have one single key but in case an error happened, this will clean every rules
+            if (isset($uaIndex)) {
+                foreach ($uaIndex as $uaIdx) {
+                    array_splice($parsedContent, $uaIdx, 1);
+                }
+            }
+            if (isset($cookieIndex)) {
+                foreach ($cookieIndex as $cookieIdx) {
+                    array_splice($parsedContent, $cookieIdx, 1);
+                }
+            }
+            if (count($parsedContent) > 0) {
+                update_option('WpFastestCacheExclude', Utils::format_json_encode($parsedContent));
+            } else {
+                delete_option('WpFastestCacheExclude');
+            }
+        }
+        // Force update of htaccess on wpfc side
+        try {
+            include_once(__DIR__ . '/../../../../wp-fastest-cache/inc/admin.php');
+            if (class_exists('WpFastestCacheAdmin')) {
+                $wpfc = new WpFastestCacheAdmin();
+                // only way of retriggering it is to simulate activation
+                $options = get_option('WpFastestCache');
+                if (isset($options) && $options !== false) {
+                    $post = json_decode($options, true);
+                    $wpfc->modifyHtaccess($post);
+                }
+            }
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }
 …
         do_action('wpfc_clear_all_site_cache');
+    }
+    add_action('wpblast_activate', 'wpblast_wpfc_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_wpfc_clear_cache');
+    add_action('wpblast_updated_crawler_list', 'wpblast_wpfc_clear_cache');
+    add_action('wpblast_updated_options', 'wpblast_wpfc_clear_cache');
+}
+    add_action('wpblast_purge_cache_third_party', 'wpblast_wpfc_clear_cache');
+    function wpblast_wpfc_activate()
+    {
+        wpblast_wpfc_add_exclude_rules();
+    }
+    add_action('wpblast_plugin_updated', function($oldVersion, $newVersion) {
+        // Compatibility upgrader to reset possible cache with WP Blast content
+        try {
+            if ($oldVersion === false || $oldVersion === '1.8.4') {
+                wpblast_wpfc_clear_cache();
+            }
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            wpblast_wpfc_activate();
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }, 10, 2);
+    add_action('wpblast_updated_crawler_list', 'wpblast_wpfc_add_exclude_rules'); // should update exclude rules
+    add_action('wpblast_updated_options', 'wpblast_wpfc_add_exclude_rules');
+    function wpblast_wpfc_deactivated()
+    {
+        // should be executed with deactivated to have the plugin being deactivated and no more requests
+        wpblast_wpfc_remove_exclude_rules();
+    }
+    add_action('wpblast_deactivated', 'wpblast_wpfc_deactivated'); // should disable exclude rules and mu-plugin
+}
+// Should be added whether the plugin is active or not so that in case wpblast is already enabled and wpfc is activated, we can inject our rules
+// phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid -- WpFastestCacheExclude is the name of the option
+function wpblast_wpfc_inject_option_WpFastestCacheExclude($content)
+{
+    $parsedContent = [];
+    try {
+        if (isset($content) && $content !== '') {
+            $parsedContent = json_decode($content);
+        }
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+    if (!is_array($parsedContent)) {
+        $parsedContent = [];
+    }
+    $ruleUAExist = false;
+    $ruleCookieExist = false;
+    $crawlers = apply_filters('wpblast_crawlers_full', '');
+    foreach ($parsedContent as $key => $value) {
+        if (isset($value->type) && $value->type === 'useragent' && isset($value->content) && strpos($value->content, 'WP-BLAST') !== false) {
+            $ruleUAExist = true;
+            $parsedContent[$key]->content = '^(' . str_replace([' ', '\\\\ '], '\\ ', $crawlers) . ').*'; // force update with new value
+            $parsedContent[$key]->editable = false; // re-add editable false, otherwise, when the user save, this property gets stripped
+        }
+        if (isset($value->type) && $value->type === 'cookie' && isset($value->content) && strpos($value->content, 'wpblast') !== false) {
+            $ruleCookieExist = true;
+            $parsedContent[$key]->content = 'wpblast'; // force update with new value
+            $parsedContent[$key]->editable = false; // re-add editable false, otherwise, when the user save, this property gets stripped
+        }
+    }
+    if ($ruleUAExist === false) {
+        if ($crawlers !== '') {
+            $new_rule = new stdClass();
+            $new_rule->prefix = 'contain';
+            $new_rule->content = '^(' . str_replace([' ', '\\\\ '], '\\ ', $crawlers) . ').*';
+            $new_rule->type = 'useragent';
+            $new_rule->editable = false;
+            array_push($parsedContent, $new_rule);
+        }
+    }
+    if ($ruleCookieExist === false) {
+        $new_rule = new stdClass();
+        $new_rule->prefix = 'contain';
+        $new_rule->content = 'wpblast';
+        $new_rule->type = 'cookie';
+        $new_rule->editable = false;
+        array_push($parsedContent, $new_rule);
+    }
+    return Utils::format_json_encode($parsedContent);
+}
+add_filter('pre_update_option_WpFastestCacheExclude', 'wpblast_wpfc_inject_option_WpFastestCacheExclude');
+function wpblast_wpfc_add_exclude_rules()
+{
+    $rules_json = get_option('WpFastestCacheExclude');
+    if ($rules_json === false) {
+        add_option('WpFastestCacheExclude', wpblast_wpfc_inject_option_WpFastestCacheExclude('[]'), '', 'yes'); // add our rules if no option exists
+    } else {
+        update_option('WpFastestCacheExclude', $rules_json); // will then trigger hook that will inject our rule
+    }
+    // Force update of htaccess on wpfc side
+    try {
+        include_once(__DIR__ . '/../../../../wp-fastest-cache/inc/admin.php');
+        if (class_exists('WpFastestCacheAdmin')) {
+            $wpfc = new WpFastestCacheAdmin();
+            // only way of retriggering it is to simulate activation
+            $options = get_option('WpFastestCache');
+            if (isset($options) && $options !== false) {
+                $post = json_decode($options, true);
+                $wpfc->modifyHtaccess($post);
+            }
+        }
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+}
+add_action('delete_option_WpFastestCacheExclude', 'wpblast_wpfc_add_exclude_rules'); // in case the plugin tries to delete the option force it to stay
+// Should be check after check of activation of plugin
+function wpblast_wpfc_activation($plugin)
+{
+    if ($plugin == 'wp-fastest-cache/wpFastestCache.php') {
+        wpblast_wpfc_add_exclude_rules(); // add exclude rules in case of activation of wpfc when wpblast is already active
+    }
+}
+add_action('activated_plugin', 'wpblast_wpfc_activation');

wpblast/trunk/inc/third-party/wp-rocket/wp-rocket-functions.php

-                      r2830275
+                      r2852021
     function wpblast_rocket_advanced_cache_file($content)
+    {
+        $content = explode("defined( 'ABSPATH' ) || exit;", $content);
+        $start = $content[0];
+        $wp_rocket = $content[1];
+        return $start . "defined( 'ABSPATH' ) || exit;
+include \"" . __DIR__ . '/../advanced-cache.php' . "\";
+if(defined('WPBLAST_SKIP_ADVANCED_CACHE') && WPBLAST_SKIP_ADVANCED_CACHE) {
+    return;
+}
+" . $wp_rocket . '
+';
+        return apply_filters('wpblast_advanced_cache_content', $content, "define( 'WP_ROCKET_ADVANCED_CACHE', true );", 'wpblast-wprocket-addon');
+    }
     // As we are hooked on wprocket advanced_cache content, wprocket will be in charge of checking for error in filesystem in case we cannot write the advanced-cache.php file
+    // in case of error in wprocket advanced cache, it will be recreated and our addon will be added again
     // in case of upgrade, they will recreate advanced-cache.php file and call again this function
     add_filter('rocket_advanced_cache_file', 'wpblast_rocket_advanced_cache_file');
+    function wpblast_advanced_cache_content_error()
+    {
+        return "
+        // Trigger constant of wprocket to indicate a problem with advanced-cache
+        if(!defined('WP_ROCKET_ADVANCED_CACHE_PROBLEM')) {
+            define( 'WP_ROCKET_ADVANCED_CACHE_PROBLEM', true );
+            return;
+        }";
+    }
+    add_filter('wpblast_advanced_cache_content_error', 'wpblast_advanced_cache_content_error');
     /**
 …
+    }
     add_action('wpblast_activate', function () {
         add_action('admin_init', 'wpblast_rocket_refresh');
+    add_action('wpblast_plugin_updated', function () {
+        add_action('init', 'wpblast_rocket_refresh');
     });
+    // advanced-cache should be remove at the start of the deactivation to prevent concurrent requests bugs
     add_action('wpblast_deactivate', function () {
+        remove_filter('rocket_advanced_cache_file', 'wpblast_rocket_advanced_cache_file');
+        remove_filter('rocket_cache_reject_ua', 'wpblast_rocket_user_agent_reject');
+        wpblast_rocket_refresh();
+    });
+    // should clean afterward to clean what could have been added during uninstallation process
+    add_action('wpblast_deactivated', function () {
         remove_filter('rocket_advanced_cache_file', 'wpblast_rocket_advanced_cache_file');
         remove_filter('rocket_cache_reject_ua', 'wpblast_rocket_user_agent_reject');

wpblast/trunk/inc/third-party/wp-super-cache/wp-super-cache-functions.php

-                      r2807419
+                      r2852021
+    }
+    add_action('wpblast_activate', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_deactivate', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_plugin_updated', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_deactivated', 'wpblast_wpsc_clear_cache');
+    add_action('wpblast_purge_cache_third_party', 'wpblast_wpsc_clear_cache');
     add_action('wpblast_updated_crawler_list', 'wpblast_wpsc_clear_cache');
     add_action('wpblast_updated_options', 'wpblast_wpsc_clear_cache');

wpblast/trunk/js/wpblast-settings.js

-                      r2811232
+                      r2852021
         var wpBlastSitemapUpdatedItems = [];
         var wpBlastSitemapItemsToUpdateScore = [];
+        var wpBlastIsLoadingSitemap = false;
         var types = ['raw', 'blast'];
         var devices = ['mobile', 'desktop'];
 …
             if (shouldUpdateScores && wpBlastSitemapItemsToUpdateScore.length > 0) {
                 // speed up update of scores in case we didn't have updated it
-                // Todo: add a lock to avoid having multiple parallel calls to getSitemap while the request isn't finished
                 wpBlastGetSitemap();
+            }
 …
         function wpBlastGetSitemap() {
+            // Get sitemap stored in website database
+            var dataToSend = {};
+            if (wpBlastSitemapItemsToUpdateScore.length > 0) {
+                dataToSend['items'] = wpBlastSitemapItemsToUpdateScore;
+                for (var i = 0; i < wpBlastSitemapItemsToUpdateScore.length; i++) {
+                    // mark this hash has updated, this will prevent an update until next reload of the page
+                    wpBlastSitemapUpdatedItems.push(
+                        wpBlastSitemapItemsToUpdateScore[i].hash +
+                            '-' +
+                            wpBlastSitemapItemsToUpdateScore[i].type +
+                            '-' +
+                            wpBlastSitemapItemsToUpdateScore[i].device,
+                    );
+                }
+            }
+            var restUrl = '/wp-json/wpblast/v1/getSitemap?wpblast_nonce=' + wpblast_nonce; // fallback rest url
+            if (
+                typeof wpBlastSettings !== 'undefined' &&
+                wpBlastSettings.restUrls !== null &&
+                wpBlastSettings.restUrls !== undefined
+            ) {
+                if (typeof URLSearchParams !== 'undefined' && typeof URL !== 'undefined') {
+                    try {
+                        var url = new URL(wpBlastSettings.restUrls.getSiteMap);
+                        url.searchParams.append('wpblast_nonce', wpblast_nonce);
+                        restUrl = url.toString();
+                    } catch (e) {
+            // avoid a call in case a request is already loading. This is to prevent request from stacking
+            if (!wpBlastIsLoadingSitemap) {
+                // Get sitemap stored in website database
+                var dataToSend = {};
+                if (wpBlastSitemapItemsToUpdateScore.length > 0) {
+                    dataToSend['items'] = wpBlastSitemapItemsToUpdateScore;
+                    for (var i = 0; i < wpBlastSitemapItemsToUpdateScore.length; i++) {
+                        // mark this hash has updated, this will prevent an update until next reload of the page
+                        wpBlastSitemapUpdatedItems.push(
+                            wpBlastSitemapItemsToUpdateScore[i].hash +
+                                '-' +
+                                wpBlastSitemapItemsToUpdateScore[i].type +
+                                '-' +
+                                wpBlastSitemapItemsToUpdateScore[i].device,
+                        );
+                    }
+                }
+                var restUrl = '/wp-json/wpblast/v1/getSitemap?wpblast_nonce=' + wpblast_nonce; // fallback rest url
+                if (
+                    typeof wpBlastSettings !== 'undefined' &&
+                    wpBlastSettings.restUrls !== null &&
+                    wpBlastSettings.restUrls !== undefined
+                ) {
+                    if (typeof URLSearchParams !== 'undefined' && typeof URL !== 'undefined') {
+                        try {
+                            var url = new URL(wpBlastSettings.restUrls.getSiteMap);
+                            url.searchParams.append('wpblast_nonce', wpblast_nonce);
+                            restUrl = url.toString();
+                        } catch (e) {
+                            // Fallback url
+                            restUrl = wpBlastSettings.restUrls.getSiteMap + '?wpblast_nonce=' + wpblast_nonce;
+                        }
+                    } else {
                         // Fallback url
                         restUrl = wpBlastSettings.restUrls.getSiteMap + '?wpblast_nonce=' + wpblast_nonce;
+                    }
+                } else {
+                    // Fallback url
+                    restUrl = wpBlastSettings.restUrls.getSiteMap + '?wpblast_nonce=' + wpblast_nonce;
+                }
+            }
+            jQuery.ajax({
+                url: restUrl,
+                headers: {
+                    'X-WP-Nonce': wpblast_nonce,
+                    'content-type': 'application/json',
+                },
+                method: 'POST',
+                data: JSON.stringify(dataToSend),
+                success: function (data) {
+                    if (data && data.response && data.response.sitemap !== undefined && data.response.data !== null) {
+                        wpBlastGetSitemapData(data.response.sitemap);
+                    }
+                    // Should be update after possible update of wpBlastSitemap
+                    if ((isGeneratingCache || wpBlastSitemap.length === 0) && wpBlastGetSitemapFrequency !== 1000) {
+                        clearInterval(wpBlastGetSitemapInterval);
+                        wpBlastGetSitemapFrequency = 1000;
+                        if (window.location.search.indexOf('debug') === -1) {
+                            wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                        }
+                    } else if (
+                        !(isGeneratingCache || wpBlastSitemap.length === 0) &&
+                        wpBlastGetSitemapFrequency !== 5000
+                    ) {
+                        clearInterval(wpBlastGetSitemapInterval);
+                        wpBlastGetSitemapFrequency = 5000;
+                        if (window.location.search.indexOf('debug') === -1) {
+                            wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                        }
+                    }
+                },
+            });
+                }
+                wpBlastIsLoadingSitemap = true;
+                jQuery.ajax({
+                    url: restUrl,
+                    headers: {
+                        'X-WP-Nonce': wpblast_nonce,
+                        'content-type': 'application/json',
+                    },
+                    method: 'POST',
+                    data: JSON.stringify(dataToSend),
+                    success: function (data) {
+                        if (
+                            data &&
+                            data.response &&
+                            data.response.sitemap !== undefined &&
+                            data.response.data !== null
+                        ) {
+                            wpBlastGetSitemapData(data.response.sitemap);
+                        }
+                        // Should be update after possible update of wpBlastSitemap
+                        if ((isGeneratingCache || wpBlastSitemap.length === 0) && wpBlastGetSitemapFrequency !== 1000) {
+                            clearInterval(wpBlastGetSitemapInterval);
+                            wpBlastGetSitemapFrequency = 1000;
+                            if (window.location.search.indexOf('debug') === -1) {
+                                wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                            }
+                        } else if (
+                            !(isGeneratingCache || wpBlastSitemap.length === 0) &&
+                            wpBlastGetSitemapFrequency !== 5000
+                        ) {
+                            clearInterval(wpBlastGetSitemapInterval);
+                            wpBlastGetSitemapFrequency = 5000;
+                            if (window.location.search.indexOf('debug') === -1) {
+                                wpBlastGetSitemapInterval = setInterval(wpBlastGetSitemap, wpBlastGetSitemapFrequency);
+                            }
+                        }
+                    },
+                    complete: function () {
+                        wpBlastIsLoadingSitemap = false;
+                    },
+                });
+            }
+        }

wpblast/trunk/languages/wpblast-fr_FR.po

-                      r2811232
+                      r2852021
 # wpml-name: 5062b4b59571ebec36f93781a550255b
 msgid "This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 6000."
 msgstr "C'est le maximum d'urls que vous souhaitez conserver. Si le nombre est trop faible, l'efficacité du cache diminuera. S'il est trop élevé, vous pourriez avoir besoin de plus de stockage pour votre base de données. Défaut : 6000."
+msgid "This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 20000."
+msgstr "C'est le maximum d'urls que vous souhaitez conserver. Si le nombre est trop faible, l'efficacité du cache diminuera. S'il est trop élevé, vous pourriez avoir besoin de plus de stockage pour votre base de données. Défaut : 20000."
 # wpml-name: e6463ff3a7cfe9b18d6994bbd09d82b0
 …
 # wpml-name: 733c2a0696e4e033ad552d5715fd8581
 msgid "This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 2000."
 msgstr "Nombre maximum de pages que vous souhaitez conserver en cache. Si ce nombre est trop faible, le cache sera moins efficace. Plus ce nombre est élevé, plus le cache prendra une taille importante dans votre base de données. Valeur par défaut : 2 000."
+msgid "This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 10000."
+msgstr "Nombre maximum de pages que vous souhaitez conserver en cache. Si ce nombre est trop faible, le cache sera moins efficace. Plus ce nombre est élevé, plus le cache prendra une taille importante dans votre base de données. Valeur par défaut : 10 000."
 # wpml-name: 268eebdc0ee24405bd723be444050b98

wpblast/trunk/plugin.php

-                      r2830275
+                      r2852021
 /**
  * Plugin Name: WPBlast
+ * Plugin Name: WP Blast
  * Plugin URI: https://www.wp-blast.com
  * Description: Improve your Wordpress SEO and performance by using dynamic rendering. Prerender your website and generate an easy-to-crawl website.
  * Version: 1.8.4
+ * Version: 1.8.5
  * Requires at least: 4.9
  * Requires PHP: 5.6
 …
 use Smartfire\Wordpress\WPBlast\Settings;
 define('WPBLAST_DB_VERSION', '1.2.0');
 define('WPBLAST_PLUGIN_VERSION', '1.8.4');
 require_once 'globals.php';
+define('WPBLAST_DB_VERSION', '1.2.1'); // This is used to upgrade database scheme or force cleanup caches and new crawl
+define('WPBLAST_PLUGIN_VERSION', '1.8.5');
+require 'globals.php';
 require_once 'inc/generate-config-functions.php';
 …
 require_once 'inc/rest-functions.php';
 require_once 'inc/mu-plugins-functions.php';
+require_once 'inc/advanced-cache-functions.php';
 require_once 'inc/third-party/index.php';
 …
+}
+// Registration hook
+function wpblast_register_activation()
+{
+    // First install DB
+    wpblast_install();
+    // Then trigger update hook for third-party gen
+    try {
+        // also used to trigger regeneration of config or third party file updates
+        do_action('wpblast_plugin_updated', get_option('wpblast_plugin_version'), WPBLAST_PLUGIN_VERSION);
+        // only update option at the end so that it can be trigger again in case of error
+        update_option('wpblast_plugin_version', WPBLAST_PLUGIN_VERSION);
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+}
 // Update check
+function wpblast_update_db_check()
+{
+function wpblast_update_check()
+{
+    // Update DB check
     if (get_option('wpblast_db_version') !== WPBLAST_DB_VERSION) {
         wpblast_install();
+    }
+    // Update plugin code check
+    if (get_option('wpblast_plugin_version') !== WPBLAST_PLUGIN_VERSION) {
+        try {
+            // also used to trigger regeneration of config or third party file updates
+            do_action('wpblast_plugin_updated', get_option('wpblast_plugin_version'), WPBLAST_PLUGIN_VERSION);
+            // only update option at the end so that it can be trigger again in case of error
+            update_option('wpblast_plugin_version', WPBLAST_PLUGIN_VERSION);
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }
+}
 …
+}
 add_action('plugins_loaded', 'wpblast_update_db_check');
 register_activation_hook(__FILE__, 'wpblast_install');
+add_action('plugins_loaded', 'wpblast_update_check');
+register_activation_hook(__FILE__, 'wpblast_register_activation');
 function wpblast_install()
+{
 …
         // Setup transient for first activation
+        // This is also used to trigger again a crawl in case of upgrade
         set_transient(Settings::PLUGIN_CACHE_PREFIX . '_firstActivation', time(), apply_filters('wpblast_settings_first_activation_expiration', 60 * 60 * 24 * 30));
 …
+        }
+        $resultPages = $wpdb->get_row("SHOW INDEXES FROM {$wpdb->wpblast_sitemap} WHERE key_name = 'WPBlast_Sitemap_CacheExpiration'", ARRAY_A);
+        if (!isset($resultPages)) {
+            $wpdb->query("ALTER TABLE {$wpdb->wpblast_sitemap} ADD INDEX `WPBlast_Sitemap_CacheExpiration` (`cacheExpiration`)");
+        }
+        $resultPages = $wpdb->get_row("SHOW INDEXES FROM {$wpdb->wpblast_sitemap} WHERE key_name = 'WPBlast_Sitemap_Url'", ARRAY_A);
+        if (!isset($resultPages)) {
+            $wpdb->query("ALTER TABLE {$wpdb->wpblast_sitemap} ADD INDEX `WPBlast_Sitemap_Url` (`url`)");
+        }
+        $resultPages = $wpdb->get_row("SHOW INDEXES FROM {$wpdb->wpblast_sitemap} WHERE key_name = 'WPBlast_Sitemap_Active'", ARRAY_A);
+        if (!isset($resultPages)) {
+            $wpdb->query("ALTER TABLE {$wpdb->wpblast_sitemap} ADD INDEX `WPBlast_Sitemap_Active` (`active`)");
+        }
+        // also used to trigger regeneration of config or third party file updates
+        do_action('wpblast_activate', get_option('wpblast_db_version'), WPBLAST_DB_VERSION);
+        // only update option at the end so that it can be trigger again in case of error
         update_option('wpblast_db_version', WPBLAST_DB_VERSION);
-        // also used to trigger regeneration of config or third party file updates
-        do_action('wpblast_activate');
     } catch (\Throwable $e) {
         // hardcode url so that it's as pure as possible
 …
 add_action('activated_plugin', 'wpblast_activation_redirect');
+// This is done in two steps to prevent concurrent requests bugs
+// In case the uninstall method takes a few seconds to process and that requests are still coming, the plugin could create new data that will not be cleaned
+// This results in pluginData, file config or third party actions not cleaned (mainly with the action wpblast_updated_crawler_list)
 register_deactivation_hook(__FILE__, 'wpblast_uninstall');
 function wpblast_uninstall()
+{
+    global $smartfire_wpblast_settings;
+    // Ping wp-blast.com to be aware of deactivation and not trigger auto gen cache
+    try {
+        wp_remote_get($smartfire_wpblast_settings->getWebsite() . '/?method=deactivatePlugin&domain=' . urlencode($smartfire_wpblast_settings->getUsername()) . '&plugin_token=' . $smartfire_wpblast_settings->getPassword(), [
+            'user-agent' => Settings::WPBLAST_UA_PLUGIN,
+            'timeout' => 15,
+        ]);
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+    // should remove every advanced-cache addon or mu-plugins before cleaning everything to prevent concurrent requests bugs
+    // otherwise concurrent requests could trigger new cache that won't be cleaned
+    try {
+        do_action('wpblast_deactivate');
+    }
+    catch (\Throwable $e) {} // fail proof
+    catch (\Exception $e) {} // fail proof
+}
+function wpblast_uninstalled($plugin, $network_deactivating)
+{
     global $wpdb;
+    $wpdb->wpblast_sitemap = $wpdb->prefix . Settings::WPBLAST_SITEMAP_TABLE;
+    // Ping wp-blast.com to be aware of deactivation and not trigger auto gen cache
+    $wpblast_settings = new Settings();
+    $wpblast_settings->init();
+    wp_remote_get($wpblast_settings->getWebsite() . '/?method=deactivatePlugin&domain=' . urlencode($wpblast_settings->getUsername()) . '&plugin_token=' . $wpblast_settings->getPassword(), [
+        'user-agent' => Settings::WPBLAST_UA_PLUGIN,
+        'timeout' => 15,
+    ]);
+    // Don't clean db version and settings to keep it in case of renabling but purge every other cache
+    wpblast_remove_capability(); // clean capability
+    do_action('wpblast_purge_cache');
+    do_action('wpblast_purge_plugin_cache', false);
+    // Remove table for clean uninstallation
+    $wpdb->query("DROP TABLE IF EXISTS {$wpdb->wpblast_sitemap}");
+    do_action('wpblast_deactivate');
+}
+    if ($plugin === plugin_basename(__FILE__)) {
+        $wpdb->wpblast_sitemap = $wpdb->prefix . Settings::WPBLAST_SITEMAP_TABLE;
+        // Don't clean db version and settings to keep it in case of renabling but purge every other cache
+        try {
+            wpblast_remove_capability(); // clean capability
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            do_action('wpblast_purge_plugin_cache', false);
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            // Remove table for clean uninstallation
+            $wpdb->query("DROP TABLE IF EXISTS {$wpdb->wpblast_sitemap}");
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+        try {
+            do_action('wpblast_deactivated');
+        }
+        catch (\Throwable $e) {} // fail proof
+        catch (\Exception $e) {} // fail proof
+    }
+}
+add_action('deactivated_plugin', 'wpblast_uninstalled', 10, 2);
 function wpblast_action_links($links)

wpblast/trunk/readme.txt

-                      r2830275
+                      r2852021
 Tested up to: 6.1
 Requires PHP: 5.6
 Stable tag: 1.8.4
+Stable tag: 1.8.5
 License: Apache 2.0
 License URI: http://www.apache.org/licenses/LICENSE-2.0
 …
 The plugin has been designed to allow you to get a very high technology with no headache and no-code knowledge.
 The default settings in the plugin should be enough for a large majority of installations. Nevertheless, you still can tweak it if needed.
 If you have a website with a very large number of pages (> 2000), just be sure that the maximum number of cache items and the maximum number of sitemap items are well set. If you have any doubt with your plugin configuration, just [contact us](https://www.wp-blast.com/contact/) and we'll be happy to help you configure it.
+If you have a website with a very large number of pages (> 10000), just be sure that the maximum number of cache items and the maximum number of sitemap items are well set. If you have any doubt with your plugin configuration, just [contact us](https://www.wp-blast.com/contact/) and we'll be happy to help you configure it.
 ### Install WP Blast from within WordPress
 …
 == Changelog ==
 = 1.8.4 =
 Release Date: December 7th, 2022
+= 1.8.5 =
+Release Date: December 13th, 2022
 - Improve WP Rocket crawler management
 - Improve Nitropack compatibility
 - Fix error that could happened in crawler detection
+- Improve performance on large websites
+- Improve advanced-cache updates for nitropack and wp rocket
+- Improve mu-plugins updates for nitropack

wpblast/trunk/src/Smartfire/Wordpress/WPBlast/Config.php

-                      r2807381
+                      r2852021
+        }
+        include $config_file_path['path'];
+        // Add fail proof in case the file doesn't exist, this will fallback to default value
+        // This could happened in case advanced cache is not cleaned and request are coming
+        if (file_exists($config_file_path['path'])) {
+            include $config_file_path['path'];
+        }
         $config = [

wpblast/trunk/src/Smartfire/Wordpress/WPBlast/PageRender.php

-                      r2807381
+                      r2852021
+        }
-        do_action('wpblast_actions_before_start');
         ob_start([$this, 'render']);
+    }
 …
+    }
+    /**
+     * This method will be executed after EVERY code php has finished
+     * This is executed after wp has shutdown
+     */
     public function renderFor($url, $body, $static, $withScroll, $withImages)
+    {
 …
                 return $body;
+            }
+            // Request can be blast
+            // Use third party contribution point so that they can take action
+            // This may avoid having cache plugins cache wpblast results
+            // This avoid having to stop caching in case the request won't be taken in charge by wpblast (case where it's disabled or if the page isn't allowed)
+            // This may create a bug in case of upgrade of plan with cache plugins had cached the request
+            do_action('wpblast_actions_before_start');
             if ($sitemapItem === null) {
                 // save in db new hash before launching blasting
 …
             $this->settings->purgeExceededItemsCache(); // remove transitient exceeding max_cache_items
             $this->settings->cleanExpiredCache(); // clean up expired cache items
+            do_action('wpblast_actions_before_render', $hash, $toUpdate);
             return $content;

wpblast/trunk/src/Smartfire/Wordpress/WPBlast/Settings.php

-                      r2830275
+                      r2852021
     const PLUGIN_CACHE_PREFIX = 'wpblast_plugin';
     const WPBLAST_SITEMAP_TABLE = 'wpblast_sitemap';
     const WPBLAST_UA_PLUGIN = 'WP-BLAST-Bot-Plugin 1.8.4';
+    const WPBLAST_UA_PLUGIN = 'WP-BLAST-Bot-Plugin 1.8.5';
     private $menu_name = 'wpblast';
 …
     private $cacheExpirationCrawlers = 60 * 60 * 24;
     private $cacheGrace = 60 * 15; // 15 min
     private $maxCacheItemsCrawlers = 2000;
     private $maxSitemapItems = 6000;
+    private $maxCacheItemsCrawlers = 10000;
+    private $maxSitemapItems = 20000;
     private $cacheCrawlerList = 60 * 60 * 24;
     private $cacheUserAccount = 60 * 60 * 24;
     private $updatePluginDataFrequency = 60 * 60;
     private $cacheItemGarbageExpiration = 60 * 60 * 24 * 7; // a week
+    private $purgeExceededItemsCacheRateLimit = 60; // 1 min
+    private $cleanExpiredCacheRateLimit = 60; // 1 min
     private $withImages = true;
     private $withScroll = true;
 …
         add_filter('update_option_wpblast_crawler', [$this, 'onCrawlerOptionChange'], 10, 2);
+        add_filter('wpblast_crawlers_cachegen', function ($regexp) {
+            return $this->getCrawlerCacheGen();
+        });
+        add_filter('wpblast_crawlers_regexp', function ($regexp) {
+            return $this->getCrawlerRegexp();
+        });
+        add_filter('wpblast_crawlers_autoregexp', function ($regexp) {
+            return $this->getCrawlerAutoRegexp();
+        });
+        add_filter('wpblast_crawlers_full', function ($regexp) {
+            $crawlerCacheGen = $this->getCrawlerCacheGen();
+            $crawlerRegexp = $this->getCrawlerRegexp();
+            $crawlerAutoRegexp = $this->getCrawlerAutoRegexp();
+            $returnValue = ''; // Security in case the filter is called twice
+            if (isset($crawlerCacheGen) && $crawlerCacheGen !== '') {
+                $returnValue .= $crawlerCacheGen;
+            }
+            if (isset($crawlerRegexp) && $crawlerRegexp !== '') {
+                if ($returnValue !== '') {
+                    $returnValue .= '|';
+                }
+                $returnValue .= $crawlerRegexp;
+            }
+            if (isset($crawlerAutoRegexp) && $crawlerAutoRegexp !== '') {
+                if ($returnValue !== '') {
+                    $returnValue .= '|';
+                }
+                $returnValue .= $crawlerAutoRegexp;
+            }
+            return $returnValue;
+        });
         add_filter('wpblast_crawlers_list', function ($ua) {
             array_push($ua, [
 …
         $this->updatePluginDataFrequency = apply_filters('wpblast_settings_plugin_data_expiration', $this->updatePluginDataFrequency);
         $this->cacheItemGarbageExpiration = apply_filters('wpblast_settings_cache_garbage_expiration', $this->cacheItemGarbageExpiration);
+        $this->purgeExceededItemsCacheRateLimit = apply_filters('wpblast_settings_purge_exceeded_items_cache_rate_limit', $this->purgeExceededItemsCacheRateLimit);
+        $this->cleanExpiredCacheRateLimit = apply_filters('wpblast_settings_clean_expired_cache_rate_limit', $this->cleanExpiredCacheRateLimit);
         $this->server = $this->api->get_option('server', 'wpblast_home', $this->server);
 …
         $this->maxSitemapItems = intval($this->api->get_option('max_sitemap_items', 'wpblast_crawler', $this->maxSitemapItems));
-        // Protection against lock of requests when there is no plugin cache yet and we need to generate it
-        // This is a protection but this case shouldn't happen
-        if (!isset($_SERVER['HTTP_WPBLAST_SITEMAP_GENERATION'])) {
-            $this->getCrawlerAutoRegexp(); // update crawler list if expired
-            $this->getAccount(); // update user account if expired
-            $this->getPluginData(); // update plugin data to WP Blast at the given frequency
+        }
         add_action('wpblast_purge_cache', [$this, 'purgeCache']);
         add_action('wpblast_purge_plugin_cache', [$this, 'purgePluginCache']);
 …
         $this->has_been_init = true;
+        // Protection against lock of requests when there is no plugin cache yet and we need to generate it
+        // This is a protection but this case shouldn't happen
+        // This has been moved after the has_been_init flag because it would trigger a second init otherwise due to trigger of getCrawlerAutoRegexp that could then trigger a generation of config and then a new init
+        if (!isset($_SERVER['HTTP_WPBLAST_SITEMAP_GENERATION'])) {
+            $this->getCrawlerAutoRegexp(); // update crawler list if expired
+            $this->getAccount(); // update user account if expired
+            $this->getPluginData(); // update plugin data to WP Blast at the given frequency
+        }
+    }
+    // Force check that the plugin is still active
+    // This is used to avoid concurrent requests bugs
+    // Bug would be to not have a cleaned uninstall in case a request finish after the uninstallation
+    public function isPluginActive()
+    {
+        global $wpdb;
+        $pluginName = plugin_basename(realpath($this->rootPluginFile));
+        $suppress = $wpdb->suppress_errors();
+        $row      = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", 'active_plugins' ) );
+        $wpdb->suppress_errors( $suppress );
+        if ( is_object( $row ) ) {
+            $value = maybe_unserialize($row->option_value);
+        }
+        return in_array( $pluginName, $value, true ) || is_plugin_active_for_network( $pluginName );
+    }
 …
             if (isset($res)) {
                 $res = json_decode($res, true);
+                if ($res) {
+                // check that the plugin hasn't been deactivated while we were waiting for the result of the request
+                // otherwise, we could save in database and trigger an action while the plugin shouldn't be activated
+                if ($res && $this->isPluginActive()) {
                     $data = current_time('mysql', 1);
                     set_transient(self::PLUGIN_CACHE_PREFIX . '_plugindata', $data, $this->updatePluginDataFrequency);
 …
+            }
             $res = wp_remote_retrieve_body($response);
+            if (isset($res) && $res !== '') {
+            // check that the plugin hasn't been deactivated while we were waiting for the result of the request
+            // otherwise, we could save in database and trigger an action while the plugin shouldn't be activated
+            if (isset($res) && $res !== '' && $this->isPluginActive()) {
                 $res = json_decode($res, true);
                 if (isset($res['crawlers']) && $res['crawlers'] !== '') {
 …
+            }
             $res = wp_remote_retrieve_body($response);
+            if (isset($res) && $res !== '') {
+            // check that the plugin hasn't been deactivated while we were waiting for the result of the request
+            // otherwise, we could save in database and trigger an action while the plugin shouldn't be activated
+            if (isset($res) && $res !== '' && $this->isPluginActive()) {
                 $res = json_decode($res, true);
                 if (
 …
                         && $userAccount['features']['maxPages'] !== $maxPagesAllowed
                     ) {
+                        $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp ORDER BY maxActive DESC, maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                        $this->updateActivePages($urls);
+                        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                            $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp ORDER BY maxActive DESC, maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                            $this->updateActivePages($urls);
+                        }
+                    }
                     // Generate cache if it's a first connection
 …
         global $wpdb;
         if (count($items) > 0) {
+        if (count($items) > 0 && $this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
             // Send data about hash wanted to be sure it's sync with wp-blast.com server
 …
                             $toUpdate['scores'] = $item['scores'];
+                        }
+                        // query in foreach but is limited by the number of scores that can be retrieve through the request, it depends on the user navigating so should be only tens of scores
                         $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET scores = %s WHERE hash = %s", Utils::format_json_encode($toUpdate), $hash));
+                    }
 …
+        }
+        if (count($activeUrls) > 0) {
+            // Update every active state
+            // This is done in a single query to allow having a lot of update of pages without doing a lot of query
+            // First enable active page
+            $activation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+            // Then disable page not in the array
+            $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+            // Clean up in case too much url are active (shouldn't happened unless fraudulent call)
+            $userAccount = $this->getAccount();
+            if (isset($userAccount) && isset($userAccount['features']) && isset($userAccount['features']['maxPages'])) {
+                $maxPagesAllowed = $userAccount['features']['maxPages'];
+                $currentUse = $this->getNumberPagesUsed();
+                if (isset($currentUse) && $currentUse > $maxPagesAllowed) {
+                    // should never be called unless fraud attempt or bug
+                    // clean up active pages based on lastRequest, except for home url
+                    // get urls to keep active
+                    $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp WHERE maxActive >= 1 ORDER BY maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                    // First enable active page
+                    $activation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                    // Then disable page not in the array
+                    $deactivation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                    $activation = $activation !== false && $activation2 !== false;
+                    $deactivation = $deactivation !== false && $deactivation2 !== false;
+                }
+            }
+            if ($activation === false || $deactivation === false) {
+                $this->setFormView('error');
+            }
+        } else {
+            // no active pages wanted, disable every pages
+            // should never be called due to at least home url
+            $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0"));
+            if ($deactivation === false) {
+                $this->setFormView('error');
+        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+            if (count($activeUrls) > 0) {
+                // Update every active state
+                // This is done in a single query to allow having a lot of update of pages without doing a lot of query
+                // First enable active page
+                $activation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+                // Then disable page not in the array
+                $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($activeUrls), '%s')) . ')', $activeUrls));
+                // Clean up in case too much url are active (shouldn't happened unless fraudulent call)
+                $userAccount = $this->getAccount();
+                if (isset($userAccount) && isset($userAccount['features']) && isset($userAccount['features']['maxPages'])) {
+                    $maxPagesAllowed = $userAccount['features']['maxPages'];
+                    $currentUse = $this->getNumberPagesUsed();
+                    if (isset($currentUse) && $currentUse > $maxPagesAllowed) {
+                        // should never be called unless fraud attempt or bug
+                        // clean up active pages based on lastRequest, except for home url
+                        // get urls to keep active
+                        $urls = $wpdb->get_col($wpdb->prepare("SELECT url FROM (SELECT MAX(active) AS maxActive, REPLACE(url, %s, '') as url, MAX(lastRequest) AS maxLastRequest FROM {$wpdb->wpblast_sitemap} GROUP BY REPLACE(url, %s, '')) AS tmp WHERE maxActive >= 1 ORDER BY maxLastRequest DESC LIMIT 0, %d", '?' . PageRender::WPBLAST_CRAWLER, '?' . PageRender::WPBLAST_CRAWLER, $maxPagesAllowed));
+                        // First enable active page
+                        $activation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 1 WHERE url IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                        // Then disable page not in the array
+                        $deactivation2 = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0 WHERE url NOT IN (" . implode(', ', array_fill(0, count($urls), '%s')) . ')', $urls));
+                        $activation = $activation !== false && $activation2 !== false;
+                        $deactivation = $deactivation !== false && $deactivation2 !== false;
+                    }
+                }
+                if ($activation === false || $deactivation === false) {
+                    $this->setFormView('error');
+                }
+            } else {
+                // no active pages wanted, disable every pages
+                // should never be called due to at least home url
+                $deactivation = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET active = 0"));
+                if ($deactivation === false) {
+                    $this->setFormView('error');
+                }
+            }
+        }
 …
             // avoid getting cache value to avoid loading every cache of the website in ram
             // prioritize by newest url by default
+            if ($orderBy === 'url') {
+                $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration FROM {$wpdb->wpblast_sitemap} ORDER BY CHAR_LENGTH(url) ASC", ARRAY_A);
+            } else if ($orderBy === 'active') {
+                // hashVariables used for cache section in admin to have details on a row
+                // request used by admin settings page and have specific fields / ! \
+                $sitemap = $wpdb->get_results("SELECT active, hash, hashVariables, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY active DESC, nbRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+            } else {
+                // send scores to wp-blast.com so that the server can know the scores saved in database by the plugin
+                $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+            if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                if ($orderBy === 'url') {
+                    $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration FROM {$wpdb->wpblast_sitemap} ORDER BY CHAR_LENGTH(url) ASC", ARRAY_A);
+                } else if ($orderBy === 'active') {
+                    // hashVariables used for cache section in admin to have details on a row
+                    // request used by admin settings page and have specific fields / ! \
+                    $sitemap = $wpdb->get_results("SELECT active, hash, hashVariables, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY active DESC, nbRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+                } else {
+                    // send scores to wp-blast.com so that the server can know the scores saved in database by the plugin
+                    $sitemap = $wpdb->get_results("SELECT active, hash, url, dateAdd, dateUpdate, lastRequest, nbRequest, lastGen, cacheExpiration, scores FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC, CHAR_LENGTH(url) ASC", ARRAY_A);
+                }
+            }
 …
+    {
         global $wpdb;
+        $urlUntrailingSlashed = untrailingslashit($url);
+        $nb = $wpdb->get_var($wpdb->prepare("SELECT MAX(active) AS active FROM {$wpdb->wpblast_sitemap} WHERE (url = %s OR url = CONCAT(%s, '/')) GROUP BY REPLACE(url, %s, '')", [$urlUntrailingSlashed, $urlUntrailingSlashed, '?' . PageRender::WPBLAST_CRAWLER]));
+        $nb = intval($nb);
+        if ($nb >= 1) {
+            return true;
+        } else {
+        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+            $urlUntrailingSlashed = untrailingslashit($url);
+            $nb = $wpdb->get_var($wpdb->prepare("SELECT MAX(active) AS active FROM {$wpdb->wpblast_sitemap} WHERE (url = %s OR url = CONCAT(%s, '/')) GROUP BY REPLACE(url, %s, '')", [$urlUntrailingSlashed, $urlUntrailingSlashed, '?' . PageRender::WPBLAST_CRAWLER]));
+            $nb = intval($nb);
+            if ($nb >= 1) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        else {
             return false;
+        }
 …
         if (isset($hash)) {
             if (!isset($this->sitemapItems[$hash])) {
+                $item = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->wpblast_sitemap} WHERE hash = %s", [$hash]), ARRAY_A);
+                if (isset($item)) {
+                    $this->sitemapItems[$hash] = $item;
+                } else {
+                if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                    $item = $wpdb->get_row($wpdb->prepare("SELECT * FROM {$wpdb->wpblast_sitemap} WHERE hash = %s", [$hash]), ARRAY_A);
+                    if (isset($item)) {
+                        $this->sitemapItems[$hash] = $item;
+                    } else {
+                        return null;
+                    }
+                }
+                else {
                     return null;
+                }
 …
+    {
         global $wpdb;
+        if (isset($hash)) {
+        if (isset($hash) && $this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
             $itemId = $wpdb->get_var($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} WHERE hash = %s", [$hash]));
 …
         if (isset($_GET[self::WPBLAST_PURGE_CACHE])) {
             unset($_GET[self::WPBLAST_PURGE_CACHE]);
             $this->purgeCache();
+            do_action('wpblast_purge_cache');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Cache has been cleared', 'wpblast') . '</div>
 …
         if (isset($_GET[self::WPBLAST_PURGE_PLUGIN_CACHE])) {
             unset($_GET[self::WPBLAST_PURGE_PLUGIN_CACHE]);
             $this->purgePluginCache(true);
+            do_action('wpblast_purge_plugin_cache');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Cache has been cleared', 'wpblast') . '</div>
 …
         if (isset($_GET[self::WPBLAST_PURGE_SITEMAP])) {
             unset($_GET[self::WPBLAST_PURGE_SITEMAP]);
             $this->purgeSitemap();
+            do_action('wpblast_purge_sitemap');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Sitemap has been cleared', 'wpblast') . '</div>
 …
         if (isset($_GET[self::WPBLAST_PURGE_PAGES_SCORES])) {
             unset($_GET[self::WPBLAST_PURGE_PAGES_SCORES]);
             $this->purgePagesScores();
+            do_action('wpblast_purge_pages_scores');
             echo '<div>
   <div class="notice notice-success is-dismissible inline" style="line-height: 1.4; padding: 11px 15px; font-size: 14px; margin: 25px 20px 0 2px;">' . esc_html__('Pages scores has been cleared', 'wpblast') . '</div>
 …
                 'name' => 'max_cache_items',
                 'label' => __('Maximum cache items', 'wpblast'),
                 'desc' => __('This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 2000.', 'wpblast'),
+                'desc' => __('This is the maximum number of cache items you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 10000.', 'wpblast'),
                 'type' => 'number',
                 'default' => $this->maxCacheItemsCrawlers,
 …
                 'name' => 'max_sitemap_items',
                 'label' => __('Maximum sitemap items', 'wpblast'),
                 'desc' => __('This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 6000.', 'wpblast'),
+                'desc' => __('This is the maximum number of urls you want to keep. If the number is too low, cache efficiency would decrease. If the number is too high, you could end up having a very huge database. Default: 20000.', 'wpblast'),
                 'type' => 'number',
                 'default' => $this->maxSitemapItems,
 …
         global $wpdb;
+        if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+            // Get cache items to delete: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+            // Limit range is bigint unsigned max value
+            $idsToDelete = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxSitemapItems()]));
+            // Get items to clear: use this in two steps to avoid using nested query that could create an incompatibility
+            if (count($idsToDelete) > 0) {
+                $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->wpblast_sitemap} WHERE id IN (" . implode(', ', array_fill(0, count($idsToDelete), '%s')) . ')', $idsToDelete));
+            }
+            // Get cache items to keep: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+            // Limit range is bigint unsigned max value
+            $idsToUpdate = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxCacheItemsCrawlers()]));
+            // Clean cache value
+            if (count($idsToUpdate) > 0) {
+                $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET cache = '', cacheExpiration = 0, lastGen = NULL WHERE id IN (" . implode(', ', array_fill(0, count($idsToUpdate), '%s')) . ')', $idsToUpdate));
+            }
+        $purgeExceededItemsCacheTimestamp = get_transient(self::PLUGIN_CACHE_PREFIX . '_purgeExceededItemsCacheTimestamp');
+        // Rate limit calls to this method to avoid overloading the server
+        if (!$purgeExceededItemsCacheTimestamp || ($purgeExceededItemsCacheTimestamp + $this->purgeExceededItemsCacheRateLimit < time())) {
+            if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
+                // Get cache items to delete: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+                // Limit range is bigint unsigned max value
+                $idsToDelete = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxSitemapItems()]));
+                // Get items to clear: use this in two steps to avoid using nested query that could create an incompatibility
+                if (count($idsToDelete) > 0) {
+                    $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->wpblast_sitemap} WHERE id IN (" . implode(', ', array_fill(0, count($idsToDelete), '%s')) . ')', $idsToDelete));
+                }
+                // Get cache items to keep: use this in two steps to avoid using nested query that could create an incompatibility, avoid using DELETE FROM not in to avoid concurrent requests bugs
+                // Limit range is bigint unsigned max value
+                $idsToUpdate = $wpdb->get_col($wpdb->prepare("SELECT id FROM {$wpdb->wpblast_sitemap} ORDER BY lastRequest DESC LIMIT %d, 18446744073709551615", [$this->getMaxCacheItemsCrawlers()]));
+                // Clean cache value
+                if (count($idsToUpdate) > 0) {
+                    $wpdb->query($wpdb->prepare("UPDATE {$wpdb->wpblast_sitemap} SET cache = '', cacheExpiration = 0, lastGen = NULL WHERE id IN (" . implode(', ', array_fill(0, count($idsToUpdate), '%s')) . ')', $idsToUpdate));
+                }
+            }
+            $data = time();
+            set_transient(self::PLUGIN_CACHE_PREFIX . '_purgeExceededItemsCacheTimestamp', $data, 60 * 60 * 24 * 7); // transient is kept a week
+        }
+    }
 …
+    {
         global $wpdb;
+        $cleanExpiredCacheTimestamp = get_transient(self::PLUGIN_CACHE_PREFIX . '_cleanExpiredCacheTimestamp');
+        // Rate limit calls to this method to avoid overloading the server
+        if (!$cleanExpiredCacheTimestamp || ($cleanExpiredCacheTimestamp + $this->cleanExpiredCacheRateLimit < time())) {
         if ($this->tableExists(self::WPBLAST_SITEMAP_TABLE)) {
 …
             // Remove items that have not been requested for a long time: this is a big clean up to avoid the table getting bigger and bigger with no legitimate content
             $wpdb->query($wpdb->prepare("DELETE FROM {$wpdb->wpblast_sitemap} WHERE (lastRequest IS NOT NULL AND UNIX_TIMESTAMP() - UNIX_TIMESTAMP(lastRequest) >= %d) OR (lastRequest IS NULL AND dateAdd IS NOT NULL AND UNIX_TIMESTAMP() - UNIX_TIMESTAMP(dateAdd) >= %d)", [$this->getCacheItemGarbageExpiration(), $this->getCacheItemGarbageExpiration()]));
+        }
+        $data = time();
+            set_transient(self::PLUGIN_CACHE_PREFIX . '_cleanExpiredCacheTimestamp', $data, 60 * 60 * 24 * 7); // transient is kept a week
+        }
+    }

Context Navigation

Legend:

Download in other formats: