Add canonical Cloudflare state restore

Author: chubes4

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

@@ -4,6 +4,7 @@ export type WorkerRequestRoute =
   | { kind: "r2-state" }
   | { kind: "r2-mutate" }
   | { kind: "operator-reset" }
+  | { kind: "operator-restore" }
   | { kind: "probe"; phase: string }
 
 export function routeWorkerRequest(request: Request): WorkerRequestRoute {
@@ -13,5 +14,6 @@ export function routeWorkerRequest(request: Request): WorkerRequestRoute {
   if (phase === "r2-state") return { kind: "r2-state" }
   if (phase === "r2-mutate") return { kind: "r2-mutate" }
   if (phase === "operator-reset") return { kind: "operator-reset" }
+  if (phase === "operator-restore") return { kind: "operator-restore" }
   return { kind: "probe", phase }
 }

packages/runtime-cloudflare/src/worker.ts

@@ -86,6 +86,7 @@ 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 === "operator-restore") return restoreCanonicalWordPress(request, env, coordinator)
     if (route.kind === "probe") {
       return runBootProbe(route.phase, env.WORDPRESS_STATE_BUCKET)
     }
@@ -148,6 +149,46 @@ async function resetCanonicalWordPress(request: Request, env: Env, coordinator:
   return response
 }
 
+async function restoreCanonicalWordPress(request: Request, env: Env, coordinator: DurableObjectStub): Promise<Response> {
+  if (request.method !== "POST") return new Response("Canonical restore requires POST.", { status: 405 })
+  const authorization = request.headers.get("authorization")
+  if (!env.WORDPRESS_OPERATOR_TOKEN || !authorization || !await secretsMatch(authorization, `Bearer ${env.WORDPRESS_OPERATOR_TOKEN}`)) {
+    return new Response("Canonical restore authorization failed.", { status: 401 })
+  }
+  let pointer: MarkdownPointer
+  try {
+    pointer = await request.json<MarkdownPointer>()
+  } catch {
+    return new Response("Canonical restore requires a JSON pointer.", { status: 400 })
+  }
+  if (!isCanonicalRestorePointer(pointer)) return new Response("Canonical restore pointer is invalid.", { status: 400 })
+  const manifest = await readMarkdownManifest(env.WORDPRESS_STATE_BUCKET, pointer)
+  if (!manifest || manifest.revision !== pointer.revision || manifest.manifestKey !== pointer.manifestKey || manifest.persistedAt !== pointer.persistedAt || !Array.isArray(manifest.files)) {
+    return new Response("Canonical restore manifest is unavailable or inconsistent.", { status: 409 })
+  }
+  const lease = await acquireLease(coordinator, request.url)
+  try {
+    if (lease.pointer) {
+      await abortLease(coordinator, request.url, lease)
+      return new Response("Canonical restore requires an empty current pointer.", { status: 409 })
+    }
+    const restored = await commitLease(coordinator, request.url, lease, pointer)
+    await discardCachedRuntime()
+    return Response.json({ restored: true, ...restored })
+  } catch (error) {
+    await abortLease(coordinator, request.url, lease)
+    throw error
+  }
+}
+
+function isCanonicalRestorePointer(pointer: unknown): pointer is MarkdownPointer {
+  if (!pointer || typeof pointer !== "object") return false
+  const candidate = pointer as Partial<MarkdownPointer>
+  return typeof candidate.revision === "string" && /^[a-f0-9-]{36}$/.test(candidate.revision)
+    && candidate.manifestKey === `sites/default/markdown/revisions/${candidate.revision}.json`
+    && typeof candidate.persistedAt === "string" && Number.isFinite(Date.parse(candidate.persistedAt))
+}
+
 async function secretsMatch(left: string, right: string): Promise<boolean> {
   const encoder = new TextEncoder()
   const [leftHash, rightHash] = await Promise.all([crypto.subtle.digest("SHA-256", encoder.encode(left)), crypto.subtle.digest("SHA-256", encoder.encode(right))])

tests/cloudflare-runtime.test.ts

@@ -42,6 +42,7 @@ test("Cloudflare routing reserves phases while the phase-less route serves WordP
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=r2-state")), { kind: "r2-state" })
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=r2-mutate")), { kind: "r2-mutate" })
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=operator-reset")), { kind: "operator-reset" })
+  assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=operator-restore")), { kind: "operator-restore" })
   assert.deepEqual(routeWorkerRequest(new Request("https://worker.example/?phase=seeded-wordpress")), { kind: "probe", phase: "seeded-wordpress" })
 })
 
@@ -235,6 +236,9 @@ test("Cloudflare keeps PHP-WASM in the entry Worker and uses the Durable Object
   assert.match(worker, /cookieStore: false/)
   assert.match(worker, /maxPhpInstances: 1/)
   assert.match(worker, /WORDPRESS_AUTH_SECRET/)
+  assert.match(worker, /Canonical restore requires an empty current pointer/)
+  assert.match(worker, /readMarkdownManifest\(env\.WORDPRESS_STATE_BUCKET, pointer\)/)
+  assert.match(worker, /sites\/default\/markdown\/revisions\/\$\{candidate\.revision\}\.json/)
   assert.match(worker, /canonicalWordPressAuthConstants\(env\)/)
   assert.match(worker, /authConstants/)
   assert.match(worker, /const staticResponse = await serveWordPressStaticAsset\(request\)/)