Narrow Playground worker terminalization

Author: chubes4

patches/@wp-playground+cli+3.1.46.patch

@@ -1,24 +1,26 @@
 diff --git a/node_modules/@wp-playground/cli/worker-thread-v1.js b/node_modules/@wp-playground/cli/worker-thread-v1.js
-index 93b7099..63e96bc 100644
+index 93b7099..65f76be 100644
 --- a/node_modules/@wp-playground/cli/worker-thread-v1.js
 +++ b/node_modules/@wp-playground/cli/worker-thread-v1.js
-@@ -157,6 +157,7 @@ async function C(r, e) {
+@@ -157,6 +157,8 @@ async function C(r, e) {
  }
  process.on("unhandledRejection", (r) => {
    S.error("Unhandled rejection:", r);
-+  throw r;
++  if (r instanceof WebAssembly.RuntimeError && String(r.stack).includes("php.wasm"))
++    throw r;
  });
  const i = new _(), [c, p] = y(
    new F(new f()),
 diff --git a/node_modules/@wp-playground/cli/worker-thread-v2.js b/node_modules/@wp-playground/cli/worker-thread-v2.js
-index fb79a59..5d09b1f 100644
+index fb79a59..77ddb67 100644
 --- a/node_modules/@wp-playground/cli/worker-thread-v2.js
 +++ b/node_modules/@wp-playground/cli/worker-thread-v2.js
-@@ -168,6 +168,7 @@ async function j(r, e) {
+@@ -168,6 +168,8 @@ async function j(r, e) {
  }
  process.on("unhandledRejection", (r) => {
    E.error("Unhandled rejection:", r);
-+  throw r;
++  if (r instanceof WebAssembly.RuntimeError && String(r.stack).includes("php.wasm"))
++    throw r;
  });
  const i = new m(), [h, u] = k(
    new L(new b()),

patches/README.md

@@ -9,8 +9,9 @@ and browser asset path before that upstream change can be merged and released.
 Remove this patch and the package override after a published Playground package
 contains the same change.
 
-`@wp-playground+cli+3.1.46.patch` makes blueprint worker threads rethrow
-unhandled runtime rejections after logging them. The released CLI otherwise
-keeps a poisoned PHP-WASM worker alive and leaves the parent request pending
-until the recipe timeout. Remove the patch after the Playground CLI ships the
-same worker terminalization behavior.
+`@wp-playground+cli+3.1.46.patch` makes blueprint worker threads rethrow fatal
+`WebAssembly.RuntimeError` rejections originating from `php.wasm` after logging
+them. Other unhandled rejections retain the released CLI's log-only behavior.
+Without this narrow terminalization, a poisoned PHP-WASM worker remains alive
+and leaves the parent request pending until the recipe timeout. Remove the patch
+after the Playground CLI ships the same worker terminalization behavior.

tests/playground-worker-runtime-rejection.test.ts

@@ -11,10 +11,15 @@ const preloadPath = join(root, "reject-on-command.mjs")
 await writeFile(preloadPath, `
 import { parentPort } from "node:worker_threads"
 parentPort?.on("message", (message) => {
-  if (message !== "wp-codebox-trigger-runtime-rejection") return
-  const error = new WebAssembly.RuntimeError("null function or function signature mismatch")
-  error.stack = "RuntimeError: null function or function signature mismatch\\n    at php.wasm.zif_mysqli_poll (wasm://wasm/php.wasm-05996276:wasm-function[12986]:0x9949a8)"
-  Promise.reject(error)
+  if (message === "wp-codebox-trigger-non-wasm-rejection") {
+    Promise.reject(new Error("ordinary worker rejection"))
+    setTimeout(() => parentPort?.postMessage("wp-codebox-worker-survived"), 25)
+  }
+  if (message === "wp-codebox-trigger-php-wasm-rejection") {
+    const error = new WebAssembly.RuntimeError("null function or function signature mismatch")
+    error.stack = "RuntimeError: null function or function signature mismatch\\n    at php.wasm.zif_mysqli_poll (wasm://wasm/php.wasm-05996276:wasm-function[12986]:0x9949a8)"
+    Promise.reject(error)
+  }
 })
 `, "utf8")
 
@@ -33,26 +38,36 @@ async function assertWorkerTerminates(version: string): Promise<void> {
   })
 
   let workerError: Error | undefined
+  let initialized = false
+  let survivedOrdinaryRejection = false
   const exitCode = await Promise.race([
     new Promise<number>((resolveExit) => {
       worker.once("message", (message: { command?: unknown; phpPort?: { close?: () => void } }) => {
         if (message?.command !== "worker-script-initialized") return
+        initialized = true
         message.phpPort?.close?.()
-        worker.postMessage("wp-codebox-trigger-runtime-rejection")
+        worker.postMessage("wp-codebox-trigger-non-wasm-rejection")
+      })
+      worker.on("message", (message: unknown) => {
+        if (message !== "wp-codebox-worker-survived") return
+        survivedOrdinaryRejection = true
+        worker.postMessage("wp-codebox-trigger-php-wasm-rejection")
       })
       worker.once("error", (error) => {
         workerError = error
       })
       worker.once("exit", resolveExit)
     }),
     new Promise<never>((_resolve, reject) => {
-      setTimeout(() => reject(new Error(`Playground ${version} worker remained alive after an unhandled runtime rejection`)), 3_000).unref()
+      setTimeout(() => reject(new Error(`Playground ${version} worker remained alive after a fatal PHP-WASM rejection`)), 3_000).unref()
     }),
   ]).finally(() => worker.terminate())
 
-  assert.notEqual(exitCode, 0, `Playground ${version} worker must exit nonzero after an unhandled runtime rejection`)
-  assert.ok(workerError, `Playground ${version} worker must propagate its unhandled runtime rejection`)
+  assert.ok(initialized, `Playground ${version} worker must initialize before the rejection checks`)
+  assert.ok(survivedOrdinaryRejection, `Playground ${version} worker must preserve ordinary unhandled rejection behavior`)
+  assert.notEqual(exitCode, 0, `Playground ${version} worker must exit nonzero after a fatal PHP-WASM rejection`)
+  assert.ok(workerError, `Playground ${version} worker must propagate its fatal PHP-WASM rejection`)
   assert.match(workerError.message, /null function or function signature mismatch/)
 }
 
-console.log("playground worker runtime rejection terminalization ok")
+console.log("playground PHP-WASM worker rejection terminalization ok")