Complete provisioned site publication lifecycle

Author: chubes4

packages/runtime-cloudflare/src/published-reader.ts

@@ -49,7 +49,7 @@ export function validatePublishedRevision(value: unknown, site: SiteContext = DE
   if (![PUBLISHED_REVISION_SCHEMA, PREVIOUS_PUBLISHED_REVISION_SCHEMA, LEGACY_PUBLISHED_REVISION_SCHEMA].includes(revision.schema as string) || !isRevision(revision.revision) || !isRevision(revision.canonicalRevision)
     || typeof revision.publishedAt !== "string" || !Number.isFinite(Date.parse(revision.publishedAt)) || !Array.isArray(revision.routes)
     || (current && (typeof revision.canonicalVersion !== "number" || !Number.isSafeInteger(revision.canonicalVersion) || revision.canonicalVersion < 0))
-    || revision.routes.length === 0 || revision.routes.length > MAX_PUBLISHED_ROUTES) throw new Error("Published revision is invalid.")
+    || revision.routes.length > MAX_PUBLISHED_ROUTES) throw new Error("Published revision is invalid.")
   let previous = ""
   const normalizedRoutes: PublishedRoute[] = []
   for (const route of revision.routes) {

packages/runtime-cloudflare/src/worker.ts

@@ -738,6 +738,27 @@ async function readCurrentPublication(bucket: R2Bucket, site: SiteContext): Prom
   return { publication: validatePublishedRevision(JSON.parse(await object.text()), site), etag: object.etag }
 }
 
+async function initializeProvisioningPublication(bucket: R2Bucket, lease: Lease, site: SiteContext): Promise<CurrentPublication> {
+  const existing = await readCurrentPublication(bucket, site)
+  if (existing) return existing
+  if (!lease.pointer) throw new Error("Provisioning publication requires a committed canonical revision.")
+  const publication: PublishedRevision = {
+    schema: PUBLISHED_REVISION_SCHEMA,
+    revision: crypto.randomUUID(),
+    canonicalRevision: lease.pointer.revision,
+    canonicalVersion: lease.version,
+    publishedAt: new Date().toISOString(),
+    routes: [],
+  }
+  const serialized = JSON.stringify(publication)
+  await putImmutableJson(bucket, publishedRevisionObjectKey(publication.revision, site), serialized)
+  const created = await bucket.put(siteStorageKeys(site).publishedCurrent, serialized, { onlyIf: { etagDoesNotMatch: "*" }, httpMetadata: { contentType: "application/json" } })
+  if (created) return { publication, etag: created.etag }
+  const winner = await readCurrentPublication(bucket, site)
+  if (!winner) throw new Error("Provisioning publication did not produce a current revision.")
+  return winner
+}
+
 function initializePublicationChanges(php: PHP): void {
   php.writeFile(PUBLICATION_CHANGES_PATH, new TextEncoder().encode(JSON.stringify({ all: false, upsert: [], remove: [] })))
 }
@@ -1075,7 +1096,7 @@ async function runCoordinatedWordPressRequest(request: Request, env: RuntimeEnv,
     const mutatesCanonicalState = isMutation(request, route)
     const diagnosticsStartedAt = Date.now()
     const retained = new MutationRetainedBytes()
-    const currentPublication = mutatesCanonicalState ? await readCurrentPublication(env.WORDPRESS_STATE_BUCKET, site) : null
+    let currentPublication = mutatesCanonicalState ? await readCurrentPublication(env.WORDPRESS_STATE_BUCKET, site) : null
     let response: Response | undefined
     let phpResponse: PHPResponseData | undefined
     let responseBodyBytes = 0
@@ -1136,6 +1157,7 @@ async function runCoordinatedWordPressRequest(request: Request, env: RuntimeEnv,
       await discardRuntime(runtime, site)
       runtime = undefined
       if (phpResponse) retained.release(responseBodyBytes)
+      if (route === "static-artifact-import" && !currentPublication) currentPublication = await initializeProvisioningPublication(env.WORDPRESS_STATE_BUCKET, lease, site)
       const publicationJob = await enqueuePublicationJob(env.WORDPRESS_STATE_BUCKET, lease, next, currentPublication, publicationChanges, site)
       response.headers.set("x-wp-codebox-publication", publicationJob ? "queued" : "unchanged")
       if (publicationJob) response.headers.set("x-wp-codebox-publication-job", publicationJob.key)

scripts/cloudflare-local-gate.mjs

@@ -35,7 +35,7 @@ try {
   await startWorker()
   if (publicProvisioning) {
     await assertPublicProvisioning(staticArtifactImport)
-    console.log("Cloudflare public provisioning gate passed: authenticated artifact staging, idempotent site allocation, scheduled import, cold-restart site read, administrator claim, login, and editable native blocks.")
+    console.log("Cloudflare public provisioning gate passed: authenticated artifact staging, idempotent site allocation, initial publication, cold-restart site read, administrator claim, native-block edit, automatic republication, and post-restart persistence.")
   } else {
   await assertFullBootProbe()
   await assertWordPressCronDisabled()
@@ -219,7 +219,7 @@ async function assertPublicProvisioning(input) {
   const imported = operation?.receipt?.ssiResult
   if (operation?.state !== "succeeded" || imported?.status !== "imported" || imported.staticSiteImporterVersion !== "1.3.4" || !imported.themeSlug
     || !imported.pages || Object.keys(imported.pages).length !== expectedPageCount || Object.values(imported.quality ?? {}).some((count) => count !== 0)
-    || operation.receipt?.publication?.status !== "none") {
+    || operation.receipt?.publication?.status !== "promoted") {
     throw new Error(`Public provisioning did not produce a terminal import receipt: ${JSON.stringify(operation)}.`)
   }
 
@@ -236,7 +236,18 @@ async function assertPublicProvisioning(input) {
   const claim = JSON.parse(claimBody)
   if (!claimResponse.ok || claim.credential?.username !== "admin" || claim.credential?.password !== password) throw new Error(`Administrator claim failed: ${claimResponse.status} ${claimBody}.`)
   const adminHtml = await login(claim.credential.password)
-  await assertImportedArtifactPages(adminHtml, imported)
+  const importedPages = await assertImportedArtifactPages(adminHtml, imported)
+  const edited = await updateImportedPage(adminHtml, importedPages.secondary)
+  const published = await runScheduledPublicationUntil(new URL(edited.route, origin), edited.marker, "provisioned site edit publication", 12)
+  assertIncludes(published, edited.marker, "provisioned site edit publication")
+  await stopWorker()
+  await startWorker()
+  const persisted = await assertPublishedWordPressPage(new URL(edited.route, origin), "provisioned site edit after restart", ["publication-r2", "publication-edge"])
+  assertIncludes(persisted, edited.marker, "provisioned site edit after restart")
+  const restartedAdmin = await assertAuthenticatedDashboard(new URL("/wp-admin/", origin))
+  const persistedPages = await assertImportedArtifactPages(restartedAdmin, imported)
+  const persistedEdit = [persistedPages.primary, persistedPages.secondary].find((page) => page.id === edited.id)
+  if (!persistedEdit?.raw.includes(edited.marker)) throw new Error(`Provisioned site edit was not retained as editable block content after restart: ${JSON.stringify(persistedPages)}.`)
 }
 
 async function assertTwoSiteIsolation() {
@@ -420,6 +431,26 @@ async function assertImportedArtifactPages(adminHtml, imported) {
   return { primary, secondary: secondary ?? primary }
 }
 
+async function updateImportedPage(adminHtml, page) {
+  const marker = `Provisioned site edit ${Date.now()}`
+  const content = `<!-- wp:paragraph --><p>${marker}</p><!-- /wp:paragraph -->`
+  const response = await request(`${origin}/wp-json/wp/v2/pages/${page.id}`, {
+    method: "POST",
+    headers: { "content-type": "application/json", "x-wp-nonce": restNonce(adminHtml) },
+    body: JSON.stringify({ content, status: "publish" }),
+  })
+  const body = await response.text()
+  assertNoPhpDiagnostics(body, "provisioned site page edit")
+  if (response.status !== 200 || response.headers.get("x-wp-codebox-publication") !== "queued" || !response.headers.get("x-wp-codebox-publication-job")) {
+    throw new Error(`Provisioned site page edit did not queue publication: status=${response.status} publication=${response.headers.get("x-wp-codebox-publication")} body=${body}.`)
+  }
+  const updated = JSON.parse(body)
+  const raw = updated.content?.raw
+  if (typeof raw !== "string" || !raw.includes(marker) || /<!-- wp:(?:html|freeform)\b/.test(raw)) throw new Error(`Provisioned site page edit was not retained as native block content: ${body}.`)
+  const link = new URL(updated.link)
+  return { id: page.id, marker, route: `${link.pathname}${link.search}` }
+}
+
 async function updatePost(adminHtml, post, previousPublicationRevision) {
   const title = `Automatically published ${Date.now()}`
   const response = await request(`${origin}/wp-json/wp/v2/posts/${post.id}`, {

tests/cloudflare-runtime.test.ts

@@ -134,6 +134,8 @@ test("Cloudflare publication contracts are host-independent, immutable, and boun
   assert.equal(R2_PUBLISHED_CURRENT_KEY, "sites/default/publications/current.json")
   assert.equal(validatePublishedRevision({ ...publication, schema: "wp-codebox/published-revision/v1", routes: [{ route: "/", objectKey }] }).routes[0].canonicalRevision, canonicalRevision)
   assert.equal(validatePublishedRevision({ ...publication, schema: "wp-codebox/published-revision/v2", canonicalVersion: undefined }).canonicalVersion, 0)
+  assert.deepEqual(validatePublishedRevision({ ...publication, routes: [] }).routes, [])
+  assert.throws(() => normalizePublishedRoutes([]), /bounded routes array/)
   assert.throws(() => validatePublishedRevision({ ...publication, routes: [{ route: "/", objectKey: "sites/default/pages/foreign.json" }] }), /route is invalid/)
 })
 
@@ -349,7 +351,7 @@ test("Cloudflare runtime injects composable coordinators without moving PHP out
   assert.match(worker, /const cachedRuntimes = new Map/)
   assert.match(worker, /cachedRuntimes\.get\(site\.id\)/)
   assert.match(worker, /promise\.catch\(\(\) =>/)
-  assert.match(coordinatedRequest, /await discardRuntime\(runtime, site\)\n      runtime = undefined[\s\S]{0,100}const publicationJob/)
+  assert.match(coordinatedRequest, /await discardRuntime\(runtime, site\)\n      runtime = undefined[\s\S]*initializeProvisioningPublication[\s\S]*const publicationJob/)
   assert.match(worker, /if \(runtime\) await discardRuntime\(runtime, site\)/)
   assert.doesNotMatch(worker, /runtime\.pointer = next/)
   assert.match(worker, /await abortLease\(coordinator, request\.url, lease\)/)