Bundle upstream auto-draft persistence fix

Author: chubes4

packages/runtime-cloudflare/assets/markdown-database-integration-canonical-seed.json

@@ -1,6 +1,6 @@
 {
     "schema": "wp-codebox/cloudflare-canonical-mdi-seed/v1",
-    "markdownDatabaseIntegrationRevision": "6244f244f47f99af3261ba0948262cebe79e5a73",
+    "markdownDatabaseIntegrationRevision": "7cf025f2d64aa933d937f1a18a129e278c231783",
     "wordpressInstallSeedSha256": "7212b89f1c01f98a23b89e9a2dd2b214306a85c10adb0355b9c7a6005b4fe822",
     "archiveSha256": "d69b700c671ebee7f9eb01fa80d58c66072cf3966560d01cc188bd26b4818895",
     "files": [

packages/runtime-cloudflare/assets/markdown-database-integration-runtime.zip

@@ -5,11 +5,8 @@ export type WorkerRequestRoute =
   | { kind: "r2-mutate" }
   | { kind: "canonical-auth" }
   | { kind: "operator-reset" }
-  | { kind: "editor-probe"; phase: EditorProbePhase }
   | { kind: "probe"; phase: string }
 
-export type EditorProbePhase = "admin" | "auto-draft" | "auto-draft-no-persist" | "block-editor"
-
 export function routeWorkerRequest(request: Request): WorkerRequestRoute {
   const phase = new URL(request.url).searchParams.get("phase")
   if (phase === null) return { kind: "wordpress" }
@@ -18,9 +15,5 @@ export function routeWorkerRequest(request: Request): WorkerRequestRoute {
   if (phase === "r2-mutate") return { kind: "r2-mutate" }
   if (phase === "canonical-auth") return { kind: "canonical-auth" }
   if (phase === "operator-reset") return { kind: "operator-reset" }
-  if (phase === "editor-probe-admin") return { kind: "editor-probe", phase: "admin" }
-  if (phase === "editor-probe-auto-draft") return { kind: "editor-probe", phase: "auto-draft" }
-  if (phase === "editor-probe-auto-draft-no-persist") return { kind: "editor-probe", phase: "auto-draft-no-persist" }
-  if (phase === "editor-probe-block-editor") return { kind: "editor-probe", phase: "block-editor" }
   return { kind: "probe", phase }
 }

packages/runtime-cloudflare/src/request-routing.ts

@@ -7,7 +7,7 @@ import { dependenciesTotalSize, init } from "../../../node_modules/@php-wasm/web
 import phpWasmModule from "../../../node_modules/@php-wasm/web-8-5/asyncify/8_5_8/php_8_5.wasm"
 import { CLOUDFLARE_RUNTIME_HEALTH_MARKER, CLOUDFLARE_RUNTIME_HEALTH_SCHEMA, cloudflareRuntimeHealthResponse } from "./health-envelope.js"
 import { leaseRetryDelayMs } from "./lease-retry.js"
-import { routeWorkerRequest, type EditorProbePhase } from "./request-routing.js"
+import { routeWorkerRequest } from "./request-routing.js"
 import { toFetchResponse, toPHPRequest } from "./request-translation.js"
 import { deriveWordPressAuthConstants, type WordPressAuthConstant } from "./wordpress-auth.js"
 import { isWordPressRuntimeFile, wordpressStaticArchivePath, wordpressStaticContentType } from "./wordpress-runtime-corpus.js"
@@ -25,7 +25,7 @@ const PHP_VERSION = "8.5.8"
 // Browser assets must come from the same immutable WordPress release as the server corpus.
 const WORDPRESS_ARCHIVE_URL = (wordpressRuntimeArtifactManifest as WordPressRuntimeArtifactManifest).source.url
 const SQLITE_INTEGRATION_ARCHIVE_URL = "https://github.com/WordPress/sqlite-database-integration/releases/download/v2.2.23/plugin-sqlite-database-integration.zip"
-const MARKDOWN_DATABASE_INTEGRATION_REVISION = "6244f244f47f99af3261ba0948262cebe79e5a73"
+const MARKDOWN_DATABASE_INTEGRATION_REVISION = "7cf025f2d64aa933d937f1a18a129e278c231783"
 const SITE_URL = "https://wp-codebox-runtime.invalid"
 const DATABASE_PATH = "/wordpress/wp-content/database/.ht.sqlite"
 const MARKDOWN_ROOT = "/wordpress/wp-content/markdown"
@@ -86,7 +86,6 @@ export default {
     const route = routeWorkerRequest(request)
     const coordinator = env.WORDPRESS_STATE.getByName("default")
     if (route.kind === "operator-reset") return resetCanonicalWordPress(request, env, coordinator)
-    if (route.kind === "editor-probe") return runCoordinatedEditorProbe(request, env, coordinator, route.phase)
     if (route.kind === "probe") {
       if (route.phase === "canonical-session") return canonicalSessionProbe(env.WORDPRESS_STATE_BUCKET, await coordinatorCall<{ pointer: MarkdownPointer | null }>(coordinator, request.url, "state"))
       return runBootProbe(route.phase, env.WORDPRESS_STATE_BUCKET)
@@ -100,60 +99,6 @@ export default {
   },
 }
 
-async function runCoordinatedEditorProbe(request: Request, env: Env, coordinator: DurableObjectStub, phase: EditorProbePhase): Promise<Response> {
-  const lease = await acquireLease(coordinator, request.url)
-  let finalized = false
-  try {
-    if (!lease.pointer) throw new Error("Canonical WordPress must be initialized before running an editor probe.")
-    const runtime = await getRuntime(env, lease.pointer, new URL(request.url).origin)
-    if (phase === "auto-draft-no-persist") patchAutoDraftPersistenceProbe(runtime.php)
-    patchEditorProbe(runtime.php, phase)
-    const response = toFetchResponse(request, await runtime.requestHandler.request(await toPHPRequest(request)))
-    await releaseLease(coordinator, request.url, lease)
-    finalized = true
-    await discardCachedRuntime()
-    return response
-  } catch (error) {
-    if (!finalized) await abortLease(coordinator, request.url, lease)
-    await discardCachedRuntime()
-    throw error
-  }
-}
-
-function patchEditorProbe(php: PHP, phase: EditorProbePhase): void {
-  const path = "/wordpress/wp-admin/post-new.php"
-  const source = new TextDecoder().decode(php.readFileAsBuffer(path))
-  const markers: Record<EditorProbePhase, string> = {
-    admin: "require_once __DIR__ . '/admin.php';",
-    "auto-draft": "$post_ID = $post->ID;",
-    "auto-draft-no-persist": "$post_ID = $post->ID;",
-    "block-editor": "require_once ABSPATH . 'wp-admin/admin-footer.php';",
-  }
-  const marker = markers[phase]
-  const index = source.indexOf(marker)
-  if (index === -1 || index !== source.lastIndexOf(marker)) throw new Error(`WordPress editor probe marker is not unique: ${phase}`)
-  const stop = `\necho wp_json_encode( array( 'schema' => 'wp-codebox/cloudflare-editor-probe/v1', 'phase' => '${phase}', 'memoryBytes' => memory_get_usage( true ), 'peakMemoryBytes' => memory_get_peak_usage( true ) ) );\nreturn;`
-  const insertion = phase === "block-editor" ? index : index + marker.length
-  php.writeFile(path, new TextEncoder().encode(`${source.slice(0, insertion)}${stop}${source.slice(insertion)}`))
-}
-
-function patchAutoDraftPersistenceProbe(php: PHP): void {
-  const path = "/wordpress/wp-content/plugins/markdown-database-integration/inc/class-wp-markdown-write-engine.php"
-  const source = new TextDecoder().decode(php.readFileAsBuffer(path))
-  const needle = `if ( $id ) {
-				$this->mark_post_dirty( (int) $id );
-			}`
-  const replacement = `if ( $id ) {
-				$rows = $this->driver->query( "SELECT post_status FROM \`{$this->prefix()}posts\` WHERE ID = " . (int) $id );
-				if ( ! is_array( $rows ) || empty( $rows ) || 'auto-draft' !== ( $rows[0]->post_status ?? '' ) ) {
-					$this->mark_post_dirty( (int) $id );
-				}
-			}`
-  const index = source.indexOf(needle)
-  if (index === -1 || index !== source.lastIndexOf(needle)) throw new Error("MDI auto-draft persistence probe marker is not unique.")
-  php.writeFile(path, new TextEncoder().encode(`${source.slice(0, index)}${replacement}${source.slice(index + needle.length)}`))
-}
-
 interface MarkdownManifestFile {
   path: string
   objectKey: string

packages/runtime-cloudflare/src/worker.ts

@@ -1,7 +1,7 @@
 <?php
 declare( strict_types=1 );
 
-const MDI_REVISION = '6244f244f47f99af3261ba0948262cebe79e5a73';
+const MDI_REVISION = '7cf025f2d64aa933d937f1a18a129e278c231783';
 const REQUIRED_PATHS = array(
 	'_options/siteurl.json', '_options/home.json', '_tables/users.json', '_tables/usermeta.json',
 	'_tables/terms.json', '_tables/term_taxonomy.json', '_tables/termmeta.json', '_tables/postmeta.json',

scripts/build-cloudflare-canonical-mdi-seed.php

@@ -1,7 +1,7 @@
 import { readFile, writeFile } from "node:fs/promises"
 import { decodeZip, encodeZip } from "@php-wasm/stream-compression"
 
-const revision = "6244f244f47f99af3261ba0948262cebe79e5a73"
+const revision = "7cf025f2d64aa933d937f1a18a129e278c231783"
 const archiveUrl = `https://codeload.github.com/Automattic/markdown-database-integration/zip/${revision}`
 const sourceDirectory = process.env.MDI_RUNTIME_SOURCE
 const output = new URL("../packages/runtime-cloudflare/assets/markdown-database-integration-runtime.zip", import.meta.url)

scripts/build-cloudflare-mdi-runtime-bundle.mjs

@@ -43,10 +43,6 @@ test("Cloudflare routing reserves phases while the phase-less route serves WordP
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=r2-mutate")), { kind: "r2-mutate" })
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=canonical-auth")), { kind: "canonical-auth" })
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=operator-reset")), { kind: "operator-reset" })
-  assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/wp-admin/post-new.php?phase=editor-probe-admin")), { kind: "editor-probe", phase: "admin" })
-  assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/wp-admin/post-new.php?phase=editor-probe-auto-draft")), { kind: "editor-probe", phase: "auto-draft" })
-  assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/wp-admin/post-new.php?phase=editor-probe-auto-draft-no-persist")), { kind: "editor-probe", phase: "auto-draft-no-persist" })
-  assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/wp-admin/post-new.php?phase=editor-probe-block-editor")), { kind: "editor-probe", phase: "block-editor" })
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=seeded-wordpress")), { kind: "probe", phase: "seeded-wordpress" })
 })
 
@@ -118,18 +114,6 @@ test("Cloudflare lease contention honors Retry-After without exceeding the acqui
   assert.equal(leaseRetryDelayMs(Number.NaN, 500), 500)
 })
 
-test("Cloudflare editor probes bound the authenticated editor lifecycle and discard their runtime", async () => {
-  const worker = await readFile(new URL("../packages/runtime-cloudflare/src/worker.ts", import.meta.url), "utf8")
-  const probe = worker.slice(worker.indexOf("async function runCoordinatedEditorProbe"), worker.indexOf("async function resetCanonicalWordPress"))
-
-  assert.match(probe, /await runtime\.requestHandler\.request/)
-  assert.match(probe, /await releaseLease/)
-  assert.equal((probe.match(/await discardCachedRuntime\(\)/g) ?? []).length, 2)
-  assert.match(probe, /\/wordpress\/wp-admin\/post-new\.php/)
-  assert.match(probe, /memory_get_peak_usage/)
-  assert.match(probe, /'auto-draft' !== \( \$rows\[0\]->post_status/)
-})
-
 test("Cloudflare runtime packages a provenanced canonical MDI seed", async () => {
   const config = JSON.parse((await readFile(new URL("../packages/runtime-cloudflare/wrangler.jsonc", import.meta.url), "utf8")).replace(/^\s*\/\/.*\n/, "")) as {
     rules?: Array<{ type?: string; globs?: string[] }>
@@ -146,7 +130,7 @@ test("Cloudflare runtime packages a provenanced canonical MDI seed", async () =>
   assert.equal(markdownIndex.subarray(0, 16).toString(), "SQLite format 3\0")
   assert.equal(markdownRuntime.subarray(0, 4).toString("hex"), "504b0304")
   assert.equal(canonicalSeed.subarray(0, 4).toString("hex"), "504b0304")
-  assert.equal(canonicalManifest.markdownDatabaseIntegrationRevision, "6244f244f47f99af3261ba0948262cebe79e5a73")
+  assert.equal(canonicalManifest.markdownDatabaseIntegrationRevision, "7cf025f2d64aa933d937f1a18a129e278c231783")
   assert.equal(canonicalManifest.wordpressInstallSeedSha256, createHash("sha256").update(sqliteInput).digest("hex"))
   assert.equal(canonicalManifest.archiveSha256, createHash("sha256").update(canonicalSeed).digest("hex"))
   assert.ok(canonicalManifest.files.some((file) => file.path.endsWith(".md")))
@@ -158,15 +142,20 @@ test("Cloudflare runtime packages a provenanced canonical MDI seed", async () =>
 })
 
 test("Cloudflare runtime pins and bundles the public constrained MDI runtime", async () => {
-  const revision = "6244f244f47f99af3261ba0948262cebe79e5a73"
+  const revision = "7cf025f2d64aa933d937f1a18a129e278c231783"
   const generator = await readFile(new URL("../scripts/build-cloudflare-mdi-runtime-bundle.mjs", import.meta.url), "utf8")
   const worker = await readFile(new URL("../packages/runtime-cloudflare/src/worker.ts", import.meta.url), "utf8")
   const runtime = await readFile(new URL("../packages/runtime-cloudflare/assets/markdown-database-integration-runtime.zip", import.meta.url))
   const names: string[] = []
-  for await (const entry of decodeZip(new Blob([runtime]).stream())) names.push(entry.name)
+  let writeEngine = ""
+  for await (const entry of decodeZip(new Blob([runtime]).stream())) {
+    names.push(entry.name)
+    if (entry.name === "inc/class-wp-markdown-write-engine.php") writeEngine = await entry.text()
+  }
 
   assert.match(generator, new RegExp(`const revision = "${revision}"`))
   assert.match(worker, new RegExp(`MARKDOWN_DATABASE_INTEGRATION_REVISION = "${revision}"`))
+  assert.match(writeEngine, /! \$this->is_auto_draft\( \(int\) \$id \)/)
   assert.deepEqual(names.sort(), [
     "db.php",
     "inc/class-wp-markdown-db.php",