Merge pull request #1965 from Automattic/fix/1964-cloudflare-publication-cpu

Bound Cloudflare publication scheduler CPU

Author: chubes4

packages/runtime-cloudflare/src/worker.ts

@@ -586,7 +586,7 @@ async function drainNextPublicationJob(env: RuntimeEnv, coordinator: RevisionCoo
     if (progress.next < plan.upsert.length) {
       const route = plan.upsert[progress.next]
       runtime = await bootRuntime(env.WORDPRESS_STATE_BUCKET, job.canonical, SITE_URL, await canonicalWordPressAuthConstants(env))
-      const compiled = await compilePublicationRoutes(runtime, [route], await runtimeSiteOrigin(runtime))
+      const compiled = await compilePublicationRoutes(runtime, [route], SITE_URL)
       const page = compiled[0]
       const objectKey = await publishedPageObjectKey(job.canonical.revision, page.route)
       const snapshot: WordPressPageSnapshot = { schema: PUBLISHED_PAGE_SCHEMA, canonicalRevision: job.canonical.revision, route: page.route, status: page.status, statusText: page.statusText, headers: page.headers, body: page.body }
@@ -1091,12 +1091,6 @@ async function runNextCronEvent(runtime: Runtime): Promise<{ executed: false } |
   return { executed: true, hook: event.hook, timestamp: event.timestamp!, canonicalChanges: readCanonicalChanges(runtime.php), publicationChanges: readPublicationChanges(runtime.php) }
 }
 
-async function runtimeSiteOrigin(runtime: Runtime): Promise<string> {
-  const output = (await runtime.php.run({ code: "<?php require '/wordpress/wp-load.php'; echo get_option('home');" })).text.trim()
-  const url = new URL(output)
-  return url.origin
-}
-
 async function health(runtime: Runtime): Promise<Response> {
   const phpVersion = (await runtime.php.run({ code: "<?php echo PHP_VERSION;" })).text.trim()
   return cloudflareRuntimeHealthResponse({ schema: CLOUDFLARE_RUNTIME_HEALTH_SCHEMA, marker: CLOUDFLARE_RUNTIME_HEALTH_MARKER, wordpressVersion: runtime.wordpressVersion, phpVersion, runtime: { backend: "wordpress-playground", environment: "wordpress" }, evidence: { initialization: "completed", execution: "completed", initializationScope: "isolate" } })

tests/cloudflare-runtime.test.ts

@@ -402,7 +402,10 @@ test("Cloudflare runtime injects composable coordinators without moving PHP out
   assert.match(worker, /coordinator\.committed\(candidate\.coordinatorVersion\)/)
   assert.match(worker, /\.list\(\{ prefix: `\$\{R2_PUBLICATION_JOB_PREFIX\}\/`, limit: 16 \}\)/)
   assert.match(worker, /canonicalVersion: job\.coordinatorVersion/)
-  assert.match(worker, /await runtimeSiteOrigin\(runtime\)/)
+  const publicationDrain = worker.slice(worker.indexOf("async function drainNextPublicationJob"), worker.indexOf("async function compilePublicationRoutes"))
+  assert.match(publicationDrain, /bootRuntime\(env\.WORDPRESS_STATE_BUCKET, job\.canonical, SITE_URL/)
+  assert.match(publicationDrain, /compilePublicationRoutes\(runtime, \[route\], SITE_URL\)/)
+  assert.doesNotMatch(worker, /runtimeSiteOrigin|require '\/wordpress\/wp-load\.php'; echo get_option\('home'\)/)
   assert.match(worker, /await enqueuePublicationJob\(env\.WORDPRESS_STATE_BUCKET, lease, next, currentPublication, publicationChanges\)/)
   assert.ok(coordinatedRequest.indexOf("enqueuePublicationJob") < coordinatedRequest.indexOf("commitLease"))
   assert.doesNotMatch(coordinatedRequest, /compilePublicationRoutes\(runtime/)