Keep rewrite cache out of canonical state

Author: chubes4

packages/runtime-cloudflare/src/worker.ts

@@ -1130,7 +1130,7 @@ async function bootWordPressRuntime(
   siteUrl = SITE_URL,
   authConstants: Partial<Record<WordPressAuthConstant, string>> = {},
   runtimeBucket?: R2Bucket,
-  shouldPatchCanonicalDisabledCronSchedulingPolicyAtInit = false,
+  shouldPatchCanonicalRuntimePoliciesAtInit = false,
 ): Promise<{ php: PHP; requestHandler: PHPRequestHandler; wordpressVersion: string }> {
   const requestHandler = await bootWordPressAndRequestHandler({
     createPhpRuntime,
@@ -1162,7 +1162,7 @@ async function bootWordPressRuntime(
           materializeRuntimeFiles(php, MARKDOWN_ROOT, markdownFiles)
           if (markdownIndexSeed) php.writeFile(MARKDOWN_RESOLVED_INDEX_PATH, markdownIndexSeed)
         }
-        if (shouldPatchCanonicalDisabledCronSchedulingPolicyAtInit) patchCanonicalDisabledCronSchedulingPolicyAtInit(php)
+        if (shouldPatchCanonicalRuntimePoliciesAtInit) patchCanonicalRuntimePoliciesAtInit(php)
       } : undefined,
       beforeDatabaseSetup: databaseSeed ? (php: PHP) => {
         php.mkdir("/wordpress/wp-content/database")
@@ -1190,19 +1190,23 @@ function materializeRuntimeFiles(php: PHP, root: string, files: RuntimeFile[]):
   }
 }
 
-function patchCanonicalDisabledCronSchedulingPolicyAtInit(php: PHP): void {
+function patchCanonicalRuntimePoliciesAtInit(php: PHP): void {
   const settingsPath = "/wordpress/wp-settings.php"
   const needle = "do_action( 'init' );"
   const settings = new TextDecoder().decode(php.readFileAsBuffer(settingsPath))
   const firstNeedle = settings.indexOf(needle)
   if (firstNeedle === -1 || firstNeedle !== settings.lastIndexOf(needle)) {
-    throw new Error("WordPress canonical disabled-cron scheduling policy patch needle was not uniquely found.")
+    throw new Error("WordPress canonical runtime policy patch needle was not uniquely found.")
   }
   const replacement = `if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) {
 	remove_action( 'init', 'wp_cron' );
 	remove_action( 'init', 'wp_schedule_delete_old_privacy_export_files' );
 	remove_action( 'init', 'wp_schedule_update_checks' );
 }
+// Rewrite rules are derived for each runtime; keep them out of canonical MDI state.
+add_filter( 'pre_update_option_rewrite_rules', static function ( $value, $old_value ) {
+	return $old_value;
+}, PHP_INT_MAX, 2 );
 ${needle}`
   php.writeFile(settingsPath, new TextEncoder().encode(`${settings.slice(0, firstNeedle)}${replacement}${settings.slice(firstNeedle + needle.length)}`))
 }

tests/cloudflare-runtime.test.ts

@@ -367,24 +367,26 @@ test("Cloudflare canonical lifecycle diagnostics compose the disabled-cron patch
   assert.match(lifecycle, /: "\$stop/)
 })
 
-test("Cloudflare canonical runtime patches the unique init call with the disabled-cron scheduling policy", async () => {
+test("Cloudflare canonical runtime patches the unique init call with runtime persistence policies", async () => {
   const worker = await readFile(new URL("../packages/runtime-cloudflare/src/worker.ts", import.meta.url), "utf8")
-  const patcher = worker.slice(worker.indexOf("function patchCanonicalDisabledCronSchedulingPolicyAtInit"), worker.indexOf("\nfunction collectRuntimeFiles"))
+  const patcher = worker.slice(worker.indexOf("function patchCanonicalRuntimePoliciesAtInit"), worker.indexOf("\nfunction collectRuntimeFiles"))
 
-  assert.ok(patcher.startsWith("function patchCanonicalDisabledCronSchedulingPolicyAtInit"), "The canonical disabled-cron scheduling policy patcher is present.")
+  assert.ok(patcher.startsWith("function patchCanonicalRuntimePoliciesAtInit"), "The canonical runtime policy patcher is present.")
   assert.match(patcher, /const settingsPath = "\/wordpress\/wp-settings\.php"/)
   assert.match(patcher, /php\.readFileAsBuffer\(settingsPath\)/)
   assert.match(patcher, /firstNeedle === -1 \|\| firstNeedle !== settings\.lastIndexOf\(needle\)/)
-  assert.match(patcher, /throw new Error\("WordPress canonical disabled-cron scheduling policy patch needle was not uniquely found\."\)/)
+  assert.match(patcher, /throw new Error\("WordPress canonical runtime policy patch needle was not uniquely found\."\)/)
   assert.match(patcher, /defined\( 'DISABLE_WP_CRON' \) && DISABLE_WP_CRON/)
   assert.match(patcher, /remove_action\( 'init', 'wp_cron' \)/)
   assert.match(patcher, /remove_action\( 'init', 'wp_schedule_delete_old_privacy_export_files' \)/)
   assert.match(patcher, /remove_action\( 'init', 'wp_schedule_update_checks' \)/)
+  assert.match(patcher, /add_filter\( 'pre_update_option_rewrite_rules'/)
+  assert.match(patcher, /return \$old_value/)
   assert.equal((patcher.match(/do_action\( 'init' \);/g) ?? []).length, 1)
   assert.match(patcher, /php\.writeFile\(settingsPath/)
   assert.doesNotMatch(patcher, /mu-plugins|add_action\(|WP_Site_Health|wp_schedule_site_health_cron|\$GLOBALS\['wp_filter'\]/)
   assert.doesNotMatch(worker, /materializeCanonicalCronAdapter|wp-codebox-canonical-cron-policy/)
-  assert.match(worker, /runtimeBucket\?: R2Bucket,\n  shouldPatchCanonicalDisabledCronSchedulingPolicyAtInit = false,/)
+  assert.match(worker, /runtimeBucket\?: R2Bucket,\n  shouldPatchCanonicalRuntimePoliciesAtInit = false,/)
   assert.match(worker, /authConstants, bucket, true\), pointer/)
   assert.match(worker, /env\.WORDPRESS_STATE_BUCKET, true\)/)
   assert.match(worker, /canonical-probe\.invalid", \{\}, bucket, true\)/)