| @@ -14,9 +14,9 @@ | ||
| 14 | 14 | /** |
| 15 | 15 | * Data-schema version for one-time migrations, independent of the |
| 16 | 16 | * plugin version header. Bump when adding a step to maybe_upgrade(). |
| 17 | 17 | */ |
| 18 | - public const DATA_VERSION = '1.1.2'; | |
| 18 | + public const DATA_VERSION = '1.1.6'; | |
| 19 | 19 | |
| 20 | 20 | private static $instance = null; |
| 21 | 21 | |
| 22 | 22 | /** @var Usage_Tracker|null */ |
| @@ -59,8 +59,11 @@ | ||
| 59 | 59 | // this is a consistency check, not a new install path. First |
| 60 | 60 | // admin page load after a plugin upgrade restores the state; |
| 61 | 61 | // front-end then serves from cache on the next request. |
| 62 | 62 | add_action( 'admin_init', array( Cache::class, 'auto_heal' ) ); |
| 63 | + // Cheap: returns immediately unless the stored schema version is | |
| 64 | + // behind. Covers updates and multisite, where activate() never runs. | |
| 65 | + add_action( 'admin_init', array( Score_Store::class, 'maybe_install' ) ); | |
| 63 | 66 | |
| 64 | 67 | // Secondary net: restore as soon as an update completes, for the |
| 65 | 68 | // cases where activate() does not re-run (bulk updates, auto-updates, |
| 66 | 69 | // some host updaters). Best-effort by nature — this callback is only |
| @@ -73,13 +76,35 @@ | ||
| 73 | 76 | // Per-post cache rules (Phase 3.4) — registers postmeta with |
| 74 | 77 | // REST + meta box on edit screens. |
| 75 | 78 | Cache_Meta_Box::boot(); |
| 76 | 79 | |
| 80 | + // Single-URL purge entry points — row actions, the edit-screen | |
| 81 | + // button and the admin-post handler the admin-bar item also uses. | |
| 82 | + Purge_Ui::boot(); | |
| 83 | + | |
| 77 | 84 | // Phase 0 architecture — managers + Free modules. v1 services |
| 78 | 85 | // (Cache/Minifier/Gzip) are NOT yet Modules; they'll be refactored |
| 79 | 86 | // in a follow-up PR with parity tests. |
| 80 | 87 | Conflict_Registry::boot(); |
| 81 | 88 | |
| 89 | + // Read-only page-cache ownership evidence, behind the same | |
| 90 | + // activation/deactivation invalidation as the conflict matrix. | |
| 91 | + Page_Cache_Detector::boot(); | |
| 92 | + | |
| 93 | + // Integrations that clear OTHER plugins' caches of rendered output | |
| 94 | + // (Elementor's element cache + generated CSS). Registers a listener | |
| 95 | + // only; nothing runs until Cache::purge_render_caches() asks. | |
| 96 | + Render_Caches::boot(); | |
| 97 | + // Forwarding needs no boot(): Cache::dispatch_purge_event() calls | |
| 98 | + // Server_Caches::forward() directly so a throwing third-party listener | |
| 99 | + // cannot skip it. Both built-in server-cache adapters live behind it — | |
| 100 | + // LiteSpeed, and the nginx FastCGI cache reached through the host's | |
| 101 | + // Nginx Helper install (Host_Page_Caches), which is why neither is | |
| 102 | + // booted here. This boot() registers one listener only: the single | |
| 103 | + // purge that runs after an import, which the nginx adapter's import | |
| 104 | + // gate stands down in favour of. | |
| 105 | + Server_Caches::boot(); | |
| 106 | + | |
| 82 | 107 | // Register Free modules via the same action xspeed-pro uses, so |
| 83 | 108 | // the bootstrap path is symmetric across tiers. |
| 84 | 109 | add_action( 'xspeed_register_modules', array( $this, 'register_free_modules' ) ); |
| 85 | 110 | |
| @@ -119,8 +144,24 @@ | ||
| 119 | 144 | // 1.1.2 — strip credential values recorded by earlier versions' |
| 120 | 145 | // settings change annotations (they're served by the trend endpoints). |
| 121 | 146 | Activity_Log::redact_legacy_secrets(); |
| 122 | 147 | |
| 148 | + // 1.1.4 — earlier versions cached a failed loopback as "gzip is not | |
| 149 | + // active" for an hour, which showed up as a bogus server-config | |
| 150 | + // warning. Drop the stale answer so the fixed probe re-runs instead | |
| 151 | + // of the wrong verdict living on past the update (issue #18). | |
| 152 | + delete_transient( 'xspeed_gzip_active' ); | |
| 153 | + | |
| 154 | + // 1.1.6 — a `/?s=<term>` request used to write its results page into | |
| 155 | + // the static tree under the *searched-from* path, which for the usual | |
| 156 | + // query-form search is `/`. The web server then served that results | |
| 157 | + // page as the homepage to every visitor. The write is fixed in | |
| 158 | + // Cache::store_static(), but an entry poisoned before the update | |
| 159 | + // outlives it: nothing purges on upgrade, and the static serve path | |
| 160 | + // never revalidates. Clear the tree once. The flat cache is keyed | |
| 161 | + // correctly and is deliberately left alone. (issue #191) | |
| 162 | + Cache::purge_static_tree(); | |
| 163 | + | |
| 123 | 164 | update_option( 'xspeed_data_version', self::DATA_VERSION, false ); |
| 124 | 165 | } |
| 125 | 166 | |
| 126 | 167 | /** |
| @@ -131,8 +172,63 @@ | ||
| 131 | 172 | * Runs at plugins_loaded(20) so every add-on that hooks at any |
| 132 | 173 | * priority < 20 has time to register first. |
| 133 | 174 | */ |
| 134 | 175 | public function fire_module_lifecycle(): void { |
| 176 | + $this->ensure_modules_registered(); | |
| 177 | + | |
| 178 | + Module_Registry::boot_all(); | |
| 179 | + } | |
| 180 | + | |
| 181 | + /** | |
| 182 | + * Fire `xspeed_register_modules` if this request has not yet, hooking | |
| 183 | + * Free's own registration first when init() never got the chance. | |
| 184 | + * | |
| 185 | + * The activation request is the case that matters. activate_plugin() | |
| 186 | + * includes the plugin file long after `plugins_loaded` has fired, so the | |
| 187 | + * `plugins_loaded` callback init() would have added never runs, and | |
| 188 | + * neither does the add_action() inside it that puts register_free_modules | |
| 189 | + * on the action. Firing the action from activate() then registered | |
| 190 | + * nothing: Settings::conflict_safe_profile() composed from an empty | |
| 191 | + * registry, and a site with WP Super Cache came up with lazy-load, | |
| 192 | + * resource hints, font swapping and preloading switched on — only the | |
| 193 | + * four settings the registry-independent fallback names were held down | |
| 194 | + * (PR #295 review). Module_Registry::activate_all() has been a no-op on | |
| 195 | + * the same request for the same reason. | |
| 196 | + * | |
| 197 | + * On the activation request that means Free only: an add-on cannot have | |
| 198 | + * hooked yet, because xspeed-pro bails when Free's classes are absent and | |
| 199 | + * only hooks the action (at priority 20, from plugins_loaded(15)) once | |
| 200 | + * Free is active. On an ordinary request fire_module_lifecycle() reaches | |
| 201 | + * this at plugins_loaded(20) with every add-on already hooked. Do not | |
| 202 | + * call this from anything that can run in between: the action fires | |
| 203 | + * once, and an add-on that has not hooked yet stays unregistered for the | |
| 204 | + * whole request. | |
| 205 | + * did_action() keeps the action to one firing per request, so an | |
| 206 | + * activation that ran first does not make plugins_loaded(20) register | |
| 207 | + * every module a second time. | |
| 208 | + */ | |
| 209 | + public function ensure_modules_registered(): void { | |
| 210 | + if ( did_action( 'xspeed_register_modules' ) ) { | |
| 211 | + return; | |
| 212 | + } | |
| 213 | + | |
| 214 | + /* | |
| 215 | + * register_free_modules() does an unconditional `new` on every module | |
| 216 | + * class. On an ordinary request xspeed.php's integrity check refuses | |
| 217 | + * to boot before that can fatal and explains itself in an admin | |
| 218 | + * notice; the activation hook is registered outside that check, so | |
| 219 | + * an install missing a module file (truncated zip, a security | |
| 220 | + * plugin's quarantine, a half-applied update) would fatal here with | |
| 221 | + * no notice and no active plugin. Same answer as boot: do nothing. | |
| 222 | + */ | |
| 223 | + if ( function_exists( 'xspeed_missing_core_classes' ) && ! empty( xspeed_missing_core_classes() ) ) { | |
| 224 | + return; | |
| 225 | + } | |
| 226 | + | |
| 227 | + if ( ! has_action( 'xspeed_register_modules', array( $this, 'register_free_modules' ) ) ) { | |
| 228 | + add_action( 'xspeed_register_modules', array( $this, 'register_free_modules' ) ); | |
| 229 | + } | |
| 230 | + | |
| 135 | 231 | /** |
| 136 | 232 | * Action: xspeed_register_modules |
| 137 | 233 | * |
| 138 | 234 | * Free modules register at priority 10; xspeed-pro at priority |
| @@ -139,10 +235,8 @@ | ||
| 139 | 235 | * 20; site code can hook in between to inject custom modules. |
| 140 | 236 | * Fires exactly once per request. |
| 141 | 237 | */ |
| 142 | 238 | do_action( 'xspeed_register_modules' ); |
| 143 | - | |
| 144 | - Module_Registry::boot_all(); | |
| 145 | 239 | } |
| 146 | 240 | |
| 147 | 241 | /** |
| 148 | 242 | * Register the Free Modules shipped in this plugin. Add new module |
| @@ -150,8 +244,13 @@ | ||
| 150 | 244 | */ |
| 151 | 245 | public function register_free_modules(): void { |
| 152 | 246 | Module_Registry::register( new \XSpeed\Modules\Cache\CacheModule() ); |
| 153 | 247 | Module_Registry::register( new \XSpeed\Modules\Health\HealthModule() ); |
| 248 | + // Settings — owns no settings itself; it's the CLI/MCP surface over | |
| 249 | + // Settings_Manager. Registering it is what makes `xspeed settings` | |
| 250 | + // exist, which is what keeps the curated get_settings/update_settings | |
| 251 | + // tools in the MCP catalog. (#149/#153) | |
| 252 | + Module_Registry::register( new \XSpeed\Modules\Settings\SettingsModule() ); | |
| 154 | 253 | // External performance scores (PSI / GTmetrix) — Free, off by |
| 155 | 254 | // default. Rendered inside the Health host page's PageSpeed tab, so |
| 156 | 255 | // it has no sidebar row of its own. |
| 157 | 256 | Module_Registry::register( new \XSpeed\Modules\Score\ScoreModule() ); |
| @@ -170,8 +269,9 @@ | ||
| 170 | 269 | // cache-coverage features (404 / search / feed / REST / rules / |
| 171 | 270 | // maintenance) into one sidebar sub-item (FBS-83633). |
| 172 | 271 | Module_Registry::register( new \XSpeed\Modules\CacheCoverage\CacheCoverageModule() ); |
| 173 | 272 | Module_Registry::register( new \XSpeed\Modules\Fonts\FontsModule() ); |
| 273 | + Module_Registry::register( new \XSpeed\Modules\TurboRender\TurboRenderModule() ); | |
| 174 | 274 | Module_Registry::register( new \XSpeed\Modules\ResourceHints\ResourceHintsModule() ); |
| 175 | 275 | // AI Privacy (GDPR off-switch) ships in Free even though every AI |
| 176 | 276 | // *feature* is Pro — privacy is a right, not a paid tier. FEATURES.md |
| 177 | 277 | // §AI row 6 mandates it. Without this registration the module was dead |
| @@ -188,8 +288,12 @@ | ||
| 188 | 288 | // snapshot is onboarding/diagnostics, not a paid value-add, so every |
| 189 | 289 | // user gets it. The snapshot degrades gracefully without Pro (Pro |
| 190 | 290 | // version/license fields fall back to defaults via defined()/get_option). |
| 191 | 291 | Module_Registry::register( new \XSpeed\Modules\Support\SupportModule() ); |
| 292 | + // The dashboard control for usage-analytics consent. Consent used to | |
| 293 | + // be collectable only in the wizard and withdrawable nowhere, while | |
| 294 | + // the wizard and readme both promised a dashboard switch. (#437) | |
| 295 | + Module_Registry::register( new \XSpeed\Modules\Privacy\PrivacyModule() ); | |
| 192 | 296 | // MCP remote control (AI assistants) — Free. The plugin serves the |
| 193 | 297 | // MCP protocol at the site's own /xspeed/mcp URL; the only gate is |
| 194 | 298 | // the per-site connection token an admin mints via Connect. No |
| 195 | 299 | // license, no hosted infra. See IMPLEMENTATION.md §17. |
| @@ -204,10 +308,11 @@ | ||
| 204 | 308 | public function start_plugin_tracking(): void { |
| 205 | 309 | $this->usage_tracker = Usage_Tracker::get_instance( |
| 206 | 310 | XSPEED_FILE, |
| 207 | 311 | array( |
| 208 | - 'opt_in' => true, | |
| 209 | - 'item_id' => defined( 'XSPEED_INSIGHTS_ITEM_ID' ) ? XSPEED_INSIGHTS_ITEM_ID : false, | |
| 312 | + 'opt_in' => true, | |
| 313 | + 'email_marketing' => true, | |
| 314 | + 'item_id' => defined( 'XSPEED_INSIGHTS_ITEM_ID' ) ? XSPEED_INSIGHTS_ITEM_ID : false, | |
| 210 | 315 | ) |
| 211 | 316 | ); |
| 212 | 317 | $this->usage_tracker->init(); |
| 213 | 318 | } |
| @@ -220,19 +325,80 @@ | ||
| 220 | 325 | return $this->usage_tracker; |
| 221 | 326 | } |
| 222 | 327 | |
| 223 | 328 | public static function activate() { |
| 224 | - Settings::set_defaults(); | |
| 329 | + // Nothing below can see a module the registry does not hold — the | |
| 330 | + // conflict-safe profile Settings::set_defaults() may pick is composed | |
| 331 | + // from it, and activate_all() walks it. See ensure_modules_registered() | |
| 332 | + // for why the registry is empty on this request without this call. | |
| 333 | + self::instance()->ensure_modules_registered(); | |
| 225 | 334 | |
| 335 | + $profile = Settings::set_defaults(); | |
| 336 | + | |
| 337 | + // Score history table. Also called on admin_init (see init()) because | |
| 338 | + // activation does not fire for a site added to a multisite network | |
| 339 | + // later, nor after an update that ships a new schema version. | |
| 340 | + Score_Store::maybe_install(); | |
| 341 | + | |
| 226 | 342 | if ( ! file_exists( XSPEED_CACHE_DIR ) ) { |
| 227 | 343 | wp_mkdir_p( XSPEED_CACHE_DIR ); |
| 228 | 344 | } |
| 229 | 345 | Cache::write_silence( XSPEED_CACHE_DIR ); |
| 230 | 346 | |
| 231 | - // Caching is only ever ENABLED from the admin UI — see Cache::toggle() | |
| 232 | - // and Rest_Api::toggle_cache(). A fresh install therefore gets no | |
| 233 | - // drop-in and no wp-config.php edit here: cache_enabled is unset, so | |
| 234 | - // the call below is a no-op. | |
| 347 | + /* | |
| 348 | + * One exception to "caching is only ever enabled from the admin UI": | |
| 349 | + * a fresh install another plugin performed on the user's behalf. | |
| 350 | + * | |
| 351 | + * That plugin asked the user for site performance and installed us to | |
| 352 | + * provide it; making them go and find a second switch afterwards is | |
| 353 | + * a step nobody wants. It is also what the copy-vendored Setup::finish() | |
| 354 | + * did, so hosts migrating off it keep the behaviour they have. | |
| 355 | + * | |
| 356 | + * PROFILE_HOST_PAGE_CACHE is the whole condition, and it means three | |
| 357 | + * things at once: the install was genuinely fresh, nothing else owns | |
| 358 | + * the page cache, and another plugin claimed the install. Every other | |
| 359 | + * fresh install — including a user's own on a clear site — waits for | |
| 360 | + * the wizard. Every OTHER feature is off in this profile; the cache is | |
| 361 | + * the one thing a host may assume, because it is what it installed us | |
| 362 | + * for. And toggle() runs its own ownership transaction, so a | |
| 363 | + * competitor appearing between the two checks loses the race rather | |
| 364 | + * than being overwritten. | |
| 365 | + */ | |
| 366 | + if ( Settings::PROFILE_HOST_PAGE_CACHE === $profile ) { | |
| 367 | + $state = Cache::toggle( true ); | |
| 368 | + if ( ! empty( $state['blocked'] ) ) { | |
| 369 | + /* | |
| 370 | + * Refused after all — a competitor that appeared between the | |
| 371 | + * profile decision and the write, or a drop-in we could not | |
| 372 | + * install. The settings are identical either way (everything | |
| 373 | + * off), so the honest record is the one that does not claim a | |
| 374 | + * cache: conflict-safe is what the site actually got. | |
| 375 | + */ | |
| 376 | + $profile = Settings::PROFILE_CONFLICT_SAFE; | |
| 377 | + update_option( 'xspeed_install_profile', $profile, false ); | |
| 378 | + } | |
| 379 | + } | |
| 380 | + | |
| 381 | + /* | |
| 382 | + * Read the claim BEFORE spending it. consume_installed_by() records | |
| 383 | + * the installer only for a FRESH install — on a re-activation over | |
| 384 | + * settings that are already there it deletes the arming option and | |
| 385 | + * keeps nothing — so asking again afterwards answered "the user did | |
| 386 | + * it" about an install a host had just claimed, and the wizard opened | |
| 387 | + * over the host's own flow. The claim decides who to tell and whether | |
| 388 | + * to open the wizard; whether it is worth RECORDING is a separate | |
| 389 | + * question, and only the recording depends on the install being fresh. | |
| 390 | + */ | |
| 391 | + $installed_by = Settings::installed_by(); | |
| 392 | + | |
| 393 | + // Spend the arming option now the profile is settled. It changes what | |
| 394 | + // activation does, so it may not survive into the next one. | |
| 395 | + Settings::consume_installed_by( $profile ); | |
| 396 | + | |
| 397 | + // Caching is otherwise only ENABLED from the admin UI — see | |
| 398 | + // Cache::toggle() and Rest_Api::toggle_cache(). A fresh install | |
| 399 | + // therefore gets no drop-in and no wp-config.php edit here: | |
| 400 | + // cache_enabled is unset, so the call below is a no-op. | |
| 235 | 401 | // |
| 236 | 402 | // It is NOT a no-op during an upgrade. WordPress runs an update as |
| 237 | 403 | // deactivate → wipe files → install → activate, which deletes |
| 238 | 404 | // advanced-cache.php while cache_enabled stays true. Restoring it |
| @@ -239,16 +405,41 @@ | ||
| 239 | 405 | // here closes the window in which the site silently serves uncached |
| 240 | 406 | // (auto_heal() alone only fires on the next wp-admin page load). |
| 241 | 407 | Cache::restore_dropin_if_enabled(); |
| 242 | 408 | |
| 243 | - // First-run wizard: flag a one-time redirect for the activating user. | |
| 244 | - // Suppressed for bulk activations / already-completed sites in | |
| 245 | - // Onboarding::maybe_redirect(). | |
| 246 | - Onboarding::flag_redirect(); | |
| 409 | + /* | |
| 410 | + * First-run wizard: flag a one-time redirect for the activating user. | |
| 411 | + * Suppressed for bulk activations / already-completed sites in | |
| 412 | + * Onboarding::maybe_redirect() — and here for an install another plugin | |
| 413 | + * performed, which has an onboarding flow of its own. The install runs | |
| 414 | + * over AJAX, so our redirect would fire on that admin's NEXT page load | |
| 415 | + * and pull them out of the middle of the host's wizard; finishing ours | |
| 416 | + * would then overwrite the deliberately all-off profile they never | |
| 417 | + * asked to change. | |
| 418 | + */ | |
| 419 | + if ( '' === $installed_by ) { | |
| 420 | + Onboarding::flag_redirect(); | |
| 421 | + } | |
| 247 | 422 | |
| 248 | - // Propagate activation to every registered Module. Activation | |
| 249 | - // happens after plugins_loaded → modules are already registered. | |
| 423 | + // Propagate activation to every registered Module — registered by | |
| 424 | + // ensure_modules_registered() at the top, not by plugins_loaded, | |
| 425 | + // which fired before this file was even included. | |
| 250 | 426 | Module_Registry::activate_all(); |
| 427 | + | |
| 428 | + /** | |
| 429 | + * Fires at the end of activation, once the settings profile is decided. | |
| 430 | + * | |
| 431 | + * The other half of the host-plugin contract: a plugin that installed | |
| 432 | + * xSpeed for the user writes `xspeed_installed_by` before activating | |
| 433 | + * and listens here to find out how it came up. It carries no return | |
| 434 | + * value and nothing branches on it — a host that ignores it changes | |
| 435 | + * nothing about the install. | |
| 436 | + * | |
| 437 | + * @param string $installed_by Host slug, or '' when the user did it. | |
| 438 | + * @param string $profile Settings::PROFILE_* — which profile a fresh | |
| 439 | + * install came up with, '' if not fresh. | |
| 440 | + */ | |
| 441 | + do_action( 'xspeed_activated', $installed_by, $profile ); | |
| 251 | 442 | } |
| 252 | 443 | |
| 253 | 444 | /** |
| 254 | 445 | * Restore the cache drop-in right after THIS plugin is updated. |
