Skip to content

Commit 09a9bff

Browse files
committed
Add direct wp-loaded probe aliases
1 parent f284345 commit 09a9bff

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

packages/runtime-cloudflare/src/worker.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ async function runBootProbe(phase: string, bucket: R2Bucket): Promise<Response>
566566
}
567567
}
568568

569-
if (canonicalLifecyclePhaseAliases[phase] || ["canonical-current-user", "canonical-init", "canonical-site-status", "canonical-wp-loaded", "canonical-wp-loaded-callbacks", "canonical-wp-loaded-exclude-rewrite-flush", "canonical-wp-loaded-exclude-core-template-header", "canonical-wp-loaded-exclude-playground", "canonical-wp-loaded-exclude-wp-cron", "canonical-wp-loaded-exclude-all"].includes(phase)) {
569+
if (phase === "cwr" || phase === "cwc" || phase === "cwp" || phase === "cwcron" || canonicalLifecyclePhaseAliases[phase] || ["canonical-current-user", "canonical-init", "canonical-site-status", "canonical-wp-loaded", "canonical-wp-loaded-callbacks", "canonical-wp-loaded-exclude-rewrite-flush", "canonical-wp-loaded-exclude-core-template-header", "canonical-wp-loaded-exclude-playground", "canonical-wp-loaded-exclude-wp-cron", "canonical-wp-loaded-exclude-all"].includes(phase)) {
570570
const runtime = await bootWordPressRuntime("do-not-attempt-installing", true, true, undefined, await packagedCanonicalMarkdownSeed(), new Uint8Array(markdownPrimaryBootstrapIndex), "https://canonical-probe.invalid", {}, bucket, true)
571571
try {
572572
const evidence = (await runtime.php.run({ code: canonicalLifecycleProbeCode(phase) })).text.trim()
@@ -1004,6 +1004,10 @@ require '/wordpress/wp-load.php';`
10041004
}
10051005

10061006
const canonicalLifecyclePhaseAliases: Record<string, string> = {
1007+
cwr: "canonical-wp-loaded-exclude-rewrite-flush",
1008+
cwc: "canonical-wp-loaded-exclude-core-template-header",
1009+
cwp: "canonical-wp-loaded-exclude-playground",
1010+
cwcron: "canonical-wp-loaded-exclude-wp-cron",
10071011
"canon-wpl-no-rewrite": "canonical-wp-loaded-exclude-rewrite-flush",
10081012
"canon-wpl-no-core": "canonical-wp-loaded-exclude-core-template-header",
10091013
"canon-wpl-no-playground": "canonical-wp-loaded-exclude-playground",

tests/cloudflare-runtime.test.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@ test("Cloudflare canonical lifecycle diagnostics compose the disabled-cron patch
318318
const probes = worker.slice(worker.indexOf("async function runBootProbe"), worker.indexOf("if (phase?.startsWith(\"seeded-\"))"))
319319
const lifecycle = worker.slice(worker.indexOf("function canonicalLifecycleProbeCode"), worker.indexOf("\nasync function bootWordPressRuntime"))
320320
const aliases = {
321+
cwr: "canonical-wp-loaded-exclude-rewrite-flush",
322+
cwc: "canonical-wp-loaded-exclude-core-template-header",
323+
cwp: "canonical-wp-loaded-exclude-playground",
324+
cwcron: "canonical-wp-loaded-exclude-wp-cron",
321325
"canon-wpl-no-rewrite": "canonical-wp-loaded-exclude-rewrite-flush",
322326
"canon-wpl-no-core": "canonical-wp-loaded-exclude-core-template-header",
323327
"canon-wpl-no-playground": "canonical-wp-loaded-exclude-playground",
@@ -332,7 +336,7 @@ test("Cloudflare canonical lifecycle diagnostics compose the disabled-cron patch
332336
for (const [alias, phase] of Object.entries(aliases)) {
333337
assert.ok(alias.length <= 24)
334338
assert.match(worker, new RegExp(`"${alias}"`))
335-
assert.match(worker, new RegExp(`"${alias}": "${phase}"`))
339+
assert.match(worker, new RegExp(`(?:"${alias}"|${alias}): "${phase}"`))
336340
assert.deepEqual(routeWorkerRequest(new Request(`https://worker.example/?phase=${alias}`)), { kind: "probe", phase: alias })
337341
}
338342
assert.match(lifecycle, /const canonicalPhase = canonicalLifecyclePhaseAliases\[phase\] \?\? phase/)

0 commit comments

Comments
 (0)