@php-wasm/universal 1.1.2 → 1.1.3

package/index.js

@@ -1,8 +1,8 @@
-var C = (t) => {
+var D = (t) => {
   throw TypeError(t);
 };
-var I = (t, e, r) => e.has(t) || C("Cannot " + r);
-var c = (t, e, r) => (I(t, e, "read from private field"), r ? r.call(t) : e.get(t)), h = (t, e, r) => e.has(t) ? C("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), m = (t, e, r, s) => (I(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), d = (t, e, r) => (I(t, e, "access private method"), r);
+var U = (t, e, r) => e.has(t) || D("Cannot " + r);
+var c = (t, e, r) => (U(t, e, "read from private field"), r ? r.call(t) : e.get(t)), h = (t, e, r) => e.has(t) ? D("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), m = (t, e, r, s) => (U(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), d = (t, e, r) => (U(t, e, "access private method"), r);
 import "@php-wasm/node-polyfills";
 import { logger } from "@php-wasm/logger";
 import { dirname, joinPaths, Semaphore, createSpawnHandler, normalizePath, AcquireTimeoutError } from "@php-wasm/util";
@@ -98,10 +98,10 @@ function rethrowFileSystemError(t = "") {
       try {
         return r.apply(this, s);
       } catch (i) {
-        const o = typeof i == "object" ? i == null ? void 0 : i.errno : null;
-        if (o in FileErrorCodes) {
-          const n = FileErrorCodes[o], l = typeof s[1] == "string" ? s[1] : null, a = l !== null ? t.replaceAll("{path}", l) : t;
-          throw new Error(`${a}: ${n}`, {
+        const n = typeof i == "object" ? i == null ? void 0 : i.errno : null;
+        if (n in FileErrorCodes) {
+          const o = FileErrorCodes[n], a = typeof s[1] == "string" ? s[1] : null, l = a !== null ? t.replaceAll("{path}", a) : t;
+          throw new Error(`${l}: ${o}`, {
             cause: i
           });
         }
@@ -164,12 +164,12 @@ class FSHelpers {
    */
   static mv(e, r, s) {
     try {
-      const i = e.lookupPath(r).node.mount, o = FSHelpers.fileExists(e, s) ? e.lookupPath(s).node.mount : e.lookupPath(dirname(s)).node.mount;
-      i.mountpoint !== o.mountpoint ? (FSHelpers.copyRecursive(e, r, s), FSHelpers.isDir(e, r) ? FSHelpers.rmdir(e, r, { recursive: !0 }) : e.unlink(r)) : e.rename(r, s);
+      const i = e.lookupPath(r).node.mount, n = FSHelpers.fileExists(e, s) ? e.lookupPath(s).node.mount : e.lookupPath(dirname(s)).node.mount;
+      i.mountpoint !== n.mountpoint ? (FSHelpers.copyRecursive(e, r, s), FSHelpers.isDir(e, r) ? FSHelpers.rmdir(e, r, { recursive: !0 }) : e.unlink(r)) : e.rename(r, s);
     } catch (i) {
-      const o = getEmscriptenFsError(i);
-      throw o ? new Error(
-        `Could not move ${r} to ${s}: ${o}`,
+      const n = getEmscriptenFsError(i);
+      throw n ? new Error(
+        `Could not move ${r} to ${s}: ${n}`,
         {
           cause: i
         }
@@ -185,9 +185,9 @@ class FSHelpers {
    */
   static rmdir(e, r, s = { recursive: !0 }) {
     s != null && s.recursive && FSHelpers.listFiles(e, r).forEach((i) => {
-      const o = `${r}/${i}`;
-      FSHelpers.isDir(e, o) ? FSHelpers.rmdir(e, o, s) : FSHelpers.unlink(e, o);
-    }), e.rmdir(r);
+      const n = `${r}/${i}`;
+      FSHelpers.isDir(e, n) ? FSHelpers.rmdir(e, n, s) : FSHelpers.unlink(e, n);
+    }), e.getPath(e.lookupPath(r).node) === e.cwd() && e.chdir(joinPaths(e.cwd(), "..")), e.rmdir(r);
   }
   /**
    * Lists the files and directories in the given directory.
@@ -202,11 +202,11 @@ class FSHelpers {
       return [];
     try {
       const i = e.readdir(r).filter(
-        (o) => o !== "." && o !== ".."
+        (n) => n !== "." && n !== ".."
       );
       if (s.prependPath) {
-        const o = r.replace(/\/$/, "");
-        return i.map((n) => `${o}/${n}`);
+        const n = r.replace(/\/$/, "");
+        return i.map((o) => `${n}/${o}`);
       }
       return i;
     } catch (i) {
@@ -302,14 +302,14 @@ class FSHelpers {
     const i = e.lookupPath(r).node;
     if (e.isDir(i.mode)) {
       e.mkdirTree(s);
-      const o = e.readdir(r).filter(
-        (n) => n !== "." && n !== ".."
+      const n = e.readdir(r).filter(
+        (o) => o !== "." && o !== ".."
       );
-      for (const n of o)
+      for (const o of n)
         FSHelpers.copyRecursive(
           e,
-          joinPaths(r, n),
-          joinPaths(s, n)
+          joinPaths(r, o),
+          joinPaths(s, o)
         );
     } else
       e.writeFile(s, e.readFile(r));
@@ -497,9 +497,100 @@ const responseTexts = {
   201: "Created",
   200: "OK"
 };
+class StreamedPHPResponse {
+  constructor(e, r, s, i) {
+    this.parsedHeaders = null, this.cachedStdoutText = null, this.cachedStderrText = null, this.headersStream = e, this.stdout = r, this.stderr = s, this.exitCode = i;
+  }
+  /**
+   * True if the response is successful (HTTP status code 200-399),
+   * false otherwise.
+   */
+  async ok() {
+    try {
+      const e = await this.httpStatusCode;
+      return e >= 200 && e < 400;
+    } catch {
+      return !1;
+    }
+  }
+  /**
+   * Resolves when the response has finished processing – either successfully or not.
+   */
+  get finished() {
+    return Promise.allSettled([this.exitCode.finally(() => {
+    })]).then(
+      () => {
+      }
+    );
+  }
+  /**
+   * Resolves once HTTP headers are available.
+   */
+  get headers() {
+    return this.getParsedHeaders().then((e) => e.headers);
+  }
+  /**
+   * Resolves once HTTP status code is available.
+   */
+  get httpStatusCode() {
+    return Promise.race([
+      this.getParsedHeaders().then((e) => e.httpStatusCode),
+      this.exitCode.then(
+        (e) => e !== 0 ? 500 : void 0
+      )
+    ]).then((e) => e !== void 0 ? e : this.getParsedHeaders().then(
+      (r) => r.httpStatusCode,
+      () => 200
+    )).catch(() => 500);
+  }
+  /**
+   * Exposes the stdout bytes as they're produced by the PHP instance
+   */
+  get stdoutText() {
+    return this.cachedStdoutText || (this.cachedStdoutText = streamToText(this.stdout)), this.cachedStdoutText;
+  }
+  /**
+   * Exposes the stderr bytes as they're produced by the PHP instance
+   */
+  get stderrText() {
+    return this.cachedStderrText || (this.cachedStderrText = streamToText(this.stderr)), this.cachedStderrText;
+  }
+  async getParsedHeaders() {
+    return this.parsedHeaders || (this.parsedHeaders = parseHeadersStream(this.headersStream)), await this.parsedHeaders;
+  }
+}
+async function parseHeadersStream(t) {
+  const e = await streamToText(t);
+  let r;
+  try {
+    r = JSON.parse(e);
+  } catch {
+    return { headers: {}, httpStatusCode: 200 };
+  }
+  const s = {};
+  for (const i of r.headers) {
+    if (!i.includes(": "))
+      continue;
+    const n = i.indexOf(": "), o = i.substring(0, n).toLowerCase(), a = i.substring(n + 2);
+    o in s || (s[o] = []), s[o].push(a);
+  }
+  return {
+    headers: s,
+    httpStatusCode: r.status
+  };
+}
+async function streamToText(t) {
+  const e = t.pipeThrough(new TextDecoderStream()).getReader(), r = [];
+  for (; ; ) {
+    const { done: s, value: i } = await e.read();
+    if (s)
+      return r.join("");
+    i && r.push(i);
+  }
+}
 class PHPResponse {
-  constructor(e, r, s, i = "", o = 0) {
-    this.httpStatusCode = e, this.headers = r, this.bytes = s, this.exitCode = o, this.errors = i;
+  constructor(e, r, s, i = "", n = 0) {
+    this.httpStatusCode = e, this.headers = r, this.bytes = s, this.exitCode = n, this.errors = i;
   }
   static forHttpCode(e, r = "") {
     return new PHPResponse(
@@ -519,6 +610,15 @@ class PHPResponse {
       e.exitCode
     );
   }
+  static async fromStreamedResponse(e) {
+    return await e.finished, new PHPResponse(
+      await e.httpStatusCode,
+      await e.headers,
+      new TextEncoder().encode(await e.stdoutText),
+      await e.stderrText,
+      await e.exitCode
+    );
+  }
   toRawData() {
     return {
       headers: this.headers,
@@ -544,26 +644,26 @@ class PHPResponse {
 const RuntimeId = Symbol("RuntimeId"), loadedRuntimes = /* @__PURE__ */ new Map();
 let lastRuntimeId = 0;
 async function loadPHPRuntime(t, ...e) {
-  const r = Object.assign({}, ...e), [s, i, o] = makePromise(), n = t.init(currentJsRuntime, {
-    onAbort(a) {
-      o(a), logger.error(a);
+  const r = Object.assign({}, ...e), [s, i, n] = makePromise(), o = t.init(currentJsRuntime, {
+    onAbort(l) {
+      n(l), logger.error(l);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
     // breaks vite dev mode. An identity `locateFile` function
     // fixes it.
-    locateFile: (a) => a,
+    locateFile: (l) => l,
     ...r,
     noInitialRun: !0,
     onRuntimeInitialized() {
-      r.onRuntimeInitialized && r.onRuntimeInitialized(n), i();
+      r.onRuntimeInitialized && r.onRuntimeInitialized(o), i();
     }
   });
   await s;
-  const l = ++lastRuntimeId;
-  return n.FS, n.id = l, n.originalExit = n._exit, n._exit = function(a) {
-    return n.outboundNetworkProxyServer && (n.outboundNetworkProxyServer.close(), n.outboundNetworkProxyServer.closeAllConnections()), loadedRuntimes.delete(l), n.originalExit(a);
-  }, n[RuntimeId] = l, loadedRuntimes.set(l, n), l;
+  const a = ++lastRuntimeId;
+  return o.FS, o.id = a, o.originalExit = o._exit, o._exit = function(l) {
+    return o.outboundNetworkProxyServer && (o.outboundNetworkProxyServer.close(), o.outboundNetworkProxyServer.closeAllConnections()), loadedRuntimes.delete(a), o.originalExit(l);
+  }, o[RuntimeId] = a, loadedRuntimes.set(a, o), a;
 }
 function getLoadedRuntime(t) {
   return loadedRuntimes.get(t);
@@ -600,18 +700,26 @@ class ErrorEvent2 extends (_a = Event, _a) {
 Object.defineProperty(ErrorEvent2.prototype, "error", { enumerable: !0 });
 Object.defineProperty(ErrorEvent2.prototype, "message", { enumerable: !0 });
 const ErrorEvent = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : ErrorEvent2;
-function isExitCodeZero(t) {
-  return t instanceof Error ? "exitCode" in t && (t == null ? void 0 : t.exitCode) === 0 || (t == null ? void 0 : t.name) === "ExitStatus" && "status" in t && t.status === 0 : !1;
+function isExitCode(t) {
+  return t instanceof Error ? "exitCode" in t || (t == null ? void 0 : t.name) === "ExitStatus" && "status" in t : !1;
 }
 class UnhandledRejectionsTarget extends EventTarget {
   constructor() {
     super(...arguments), this.listenersCount = 0;
   }
-  addEventListener(e, r) {
-    ++this.listenersCount, super.addEventListener(e, r);
+  addEventListener(e, r, s) {
+    ++this.listenersCount, super.addEventListener(
+      e,
+      r,
+      s
+    );
   }
-  removeEventListener(e, r) {
-    --this.listenersCount, super.removeEventListener(e, r);
+  removeEventListener(e, r, s) {
+    --this.listenersCount, super.removeEventListener(
+      e,
+      r,
+      s
+    );
   }
   hasListeners() {
     return this.listenersCount > 0;
@@ -623,26 +731,24 @@ function improveWASMErrorReporting(t) {
     if (typeof t.wasmExports[r] == "function") {
       const s = t.wasmExports[r];
       t.wasmExports[r] = function(...i) {
-        var o;
+        var n;
         try {
           return s(...i);
-        } catch (n) {
-          if (!(n instanceof Error))
-            throw n;
-          const l = clarifyErrorMessage(
-            n,
-            (o = t.lastAsyncifyStackSource) == null ? void 0 : o.stack
+        } catch (o) {
+          if (!(o instanceof Error))
+            throw o;
+          const a = clarifyErrorMessage(
+            o,
+            (n = t.lastAsyncifyStackSource) == null ? void 0 : n.stack
           );
-          if (t.lastAsyncifyStackSource && (n.cause = t.lastAsyncifyStackSource), e.hasListeners()) {
-            e.dispatchEvent(
-              new ErrorEvent("error", {
-                error: n,
-                message: l
-              })
-            );
-            return;
+          if (t.lastAsyncifyStackSource && (o.cause = t.lastAsyncifyStackSource), e.hasListeners()) {
+            const l = new ErrorEvent("error", {
+              error: o,
+              message: a
+            });
+            throw e.dispatchEvent(l), o;
           }
-          throw isExitCodeZero(n) || showCriticalErrorBox(l), n;
+          throw (!isExitCode(o) || o.exitCode !== 0) && showCriticalErrorBox(a), o;
         }
       };
     }
@@ -731,7 +837,7 @@ class PHPExecutionFailureError extends Error {
   }
 }
 const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php";
-var F, P, v, _, x, R, u, N, M, j, U, L, q, $, B, O, D, A, z, W, G;
+var b, f, E, P, R, T, p, z, q, W, G, V, J, Y, K, X, L, Q, $, B;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -741,13 +847,13 @@ class PHP {
    * @param  requestHandlerOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(t) {
-    h(this, u);
-    h(this, F);
-    h(this, P, !1);
-    h(this, v, null);
-    h(this, _, /* @__PURE__ */ new Map());
-    h(this, x, []);
-    h(this, R, {});
+    h(this, p);
+    h(this, b);
+    h(this, f, !1);
+    h(this, E, null);
+    h(this, P, /* @__PURE__ */ new Map());
+    h(this, R, []);
+    h(this, T, {});
     this.semaphore = new Semaphore({ concurrency: 1 }), t !== void 0 && this.initializeRuntime(t);
   }
   /**
@@ -756,7 +862,7 @@ class PHP {
    * @param listener - The listener function to be called when the event is triggered.
    */
   addEventListener(t, e) {
-    c(this, _).has(t) || c(this, _).set(t, /* @__PURE__ */ new Set()), c(this, _).get(t).add(e);
+    c(this, P).has(t) || c(this, P).set(t, /* @__PURE__ */ new Set()), c(this, P).get(t).add(e);
   }
   /**
    * Removes an event listener for a PHP event.
@@ -765,10 +871,10 @@ class PHP {
    */
   removeEventListener(t, e) {
     var r;
-    (r = c(this, _).get(t)) == null || r.delete(e);
+    (r = c(this, P).get(t)) == null || r.delete(e);
   }
   dispatchEvent(t) {
-    const e = c(this, _).get(t.type);
+    const e = c(this, P).get(t.type);
     if (e)
       for (const r of e)
         r(t);
@@ -813,8 +919,8 @@ class PHP {
    * @param listener Callback function to handle the message.
    */
   onMessage(t) {
-    return c(this, x).push(t), async () => {
-      m(this, x, c(this, x).filter(
+    return c(this, R).push(t), async () => {
+      m(this, R, c(this, R).filter(
         (e) => e !== t
       ));
     };
@@ -890,13 +996,13 @@ class PHP {
 				}
 				`
     ), e.onMessage = async (r) => {
-      for (const s of c(this, x)) {
+      for (const s of c(this, R)) {
         const i = await s(r);
         if (i)
           return i;
       }
       return "";
-    }, m(this, v, improveWASMErrorReporting(e)), this.dispatchEvent({
+    }, m(this, E, improveWASMErrorReporting(e)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -911,7 +1017,7 @@ class PHP {
       throw new Error(
         "Could not set SAPI name. This can only be done before the PHP WASM module is initialized.Did you already dispatch any requests?"
       );
-    m(this, F, t);
+    m(this, b, t);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -995,66 +1101,179 @@ class PHP {
    *
    * @example
    * ```js
-   * const result = await php.run(`<?php
-   *  $fp = fopen('php://stderr', 'w');
-   *  fwrite($fp, "Hello, world!");
-   * `);
+   * const result = await php.run({
+   * 	code: `<?php
+   * 		$fp = fopen('php://stderr', 'w');
+   * 		fwrite($fp, "Hello, world!");
+   * 	`
+   * });
    * // result.errors === "Hello, world!"
    * ```
    *
-   * @param  options - PHP runtime options.
+   * @deprecated Use stream() instead.
+   * @param  request - PHP runtime options.
    */
   async run(t) {
+    const e = await this.runStream(t), r = await PHPResponse.fromStreamedResponse(
+      e
+    );
+    if (r.exitCode !== 0) {
+      logger.warn("PHP.run() output was:", r.text);
+      const s = new PHPExecutionFailureError(
+        `PHP.run() failed with exit code ${r.exitCode} and the following output: ` + r.errors + `
+
+` + r.text,
+        r,
+        "request"
+      );
+      throw logger.error(s), this.dispatchEvent({
+        type: "request.error",
+        error: new Error(
+          "PHP.run() failed with exit code " + r.exitCode
+        ),
+        // Distinguish between PHP request and PHP-wasm errors
+        source: "request"
+      }), s;
+    }
+    return r;
+  }
+  /**
+   * Runs PHP code and returns a StreamedPHPResponse object that can be used to
+   * process the output incrementally.
+   *
+   * This low-level method directly interacts with the WebAssembly
+   * PHP interpreter and provides streaming capabilities for processing
+   * PHP output as it becomes available.
+   *
+   * Every time you call stream(), it prepares the PHP
+   * environment and:
+   *
+   * * Resets the internal PHP state
+   * * Populates superglobals ($_SERVER, $_GET, etc.)
+   * * Handles file uploads
+   * * Populates input streams (stdin, argv, etc.)
+   * * Sets the current working directory
+   *
+   * You can use stream() in two primary modes:
+   *
+   * ### Code snippet mode
+   *
+   * In this mode, you pass a string containing PHP code to run.
+   *
+   * ```ts
+   * const streamedResponse = await php.stream({
+   * 	code: `<?php echo "Hello world!";`
+   * });
+   * // Process output incrementally
+   * for await (const chunk of streamedResponse.text) {
+   * 	console.log(chunk);
+   * }
+   * ```
+   *
+   * In this mode, information like __DIR__ or __FILE__ isn't very
+   * useful because the code is not associated with any file.
+   *
+   * Under the hood, the PHP snippet is passed to the `zend_eval_string`
+   * C function.
+   *
+   * ### File mode
+   *
+   * In the file mode, you pass a scriptPath and PHP executes a file
+   * found at that path:
+   *
+   * ```ts
+   * php.writeFile(
+   * 	"/www/index.php",
+   * 	`<?php echo "Hello world!";"`
+   * );
+   * const streamedResponse = await php.stream({
+   * 	scriptPath: "/www/index.php"
+   * });
+   * // Process output incrementally
+   * for await (const chunk of streamedResponse.text) {
+   * 	console.log(chunk);
+   * }
+   * ```
+   *
+   * In this mode, you can rely on path-related information like __DIR__
+   * or __FILE__.
+   *
+   * Under the hood, the PHP file is executed with the `php_execute_script`
+   * C function.
+   *
+   * The `stream()` method cannot be used in conjunction with `cli()`.
+   *
+   * @example
+   * ```js
+   * const streamedResponse = await php.stream({
+   * 	code: `<?php
+   * 		for ($i = 0; $i < 5; $i++) {
+   * 			echo "Line $i\n";
+   * 			flush();
+   * 		}
+   * 	`
+   * });
+   *
+   * // Process output as it becomes available
+   * for await (const chunk of streamedResponse.text) {
+   * 	console.log('Received:', chunk);
+   * }
+   *
+   * // Get the final exit code
+   * const exitCode = await streamedResponse.exitCode;
+   * console.log('Exit code:', exitCode);
+   * ```
+   *
+   * @see run() – a synchronous version of this method.
+   * @param request - PHP runtime options.
+   * @returns A StreamedPHPResponse object.
+   */
+  async runStream(t) {
     const e = await this.semaphore.acquire();
     let r;
-    try {
-      if (c(this, P) || (d(this, u, M).call(this), m(this, P, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
+    const s = d(this, p, B).call(this, () => {
+      if (c(this, f) || (d(this, p, q).call(this), m(this, f, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
-      d(this, u, U).call(this, t.relativeUri || ""), d(this, u, B).call(this, t.method || "GET");
-      const s = normalizeHeaders(t.headers || {}), i = s.host || "example.com:443", o = d(this, u, $).call(this, i, t.protocol || "http");
-      if (d(this, u, L).call(this, i), d(this, u, q).call(this, o), d(this, u, O).call(this, s), t.body && (r = d(this, u, D).call(this, t.body)), typeof t.code == "string")
-        this.writeFile("/internal/eval.php", t.code), d(this, u, A).call(this, "/internal/eval.php");
+      d(this, p, W).call(this, t.relativeUri || ""), d(this, p, Y).call(this, t.method || "GET");
+      const i = normalizeHeaders(t.headers || {}), n = i.host || "example.com:443", o = d(this, p, J).call(this, n, t.protocol || "http");
+      if (d(this, p, G).call(this, n), d(this, p, V).call(this, o), d(this, p, K).call(this, i), t.body && (r = d(this, p, X).call(this, t.body)), typeof t.code == "string")
+        this.writeFile("/internal/eval.php", t.code), d(this, p, L).call(this, "/internal/eval.php");
       else if (typeof t.scriptPath == "string")
-        d(this, u, A).call(this, t.scriptPath || "");
+        d(this, p, L).call(this, t.scriptPath || "");
       else
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const n = d(this, u, N).call(this, t.$_SERVER, s, o);
-      for (const p in n)
-        d(this, u, z).call(this, p, n[p]);
+      const a = d(this, p, z).call(this, t.$_SERVER, i, o);
+      for (const u in a)
+        d(this, p, Q).call(this, u, a[u]);
       const l = t.env || {};
-      for (const p in l)
-        d(this, u, W).call(this, p, l[p]);
-      const a = await d(this, u, G).call(this);
-      if (a.exitCode !== 0) {
-        logger.warn("PHP.run() output was:", a.text);
-        const p = new PHPExecutionFailureError(
-          `PHP.run() failed with exit code ${a.exitCode} and the following output: ` + a.errors,
-          a,
-          "request"
-        );
-        throw logger.error(p), p;
-      }
-      return a;
-    } catch (s) {
-      throw this.dispatchEvent({
+      for (const u in l)
+        d(this, p, $).call(this, u, l[u]);
+      return c(this, f) || (d(this, p, q).call(this), m(this, f, !0)), this[__private__dont__use].ccall(
+        "wasm_sapi_handle_request",
+        NUMBER,
+        [],
+        [],
+        { async: !0 }
+      );
+    });
+    return await s.catch((i) => {
+      this.dispatchEvent({
         type: "request.error",
-        error: s,
+        error: i,
         // Distinguish between PHP request and PHP-wasm errors
-        source: s.source ?? "php-wasm"
-      }), s;
-    } finally {
-      try {
-        r && this[__private__dont__use].free(r);
-      } finally {
-        e(), this.dispatchEvent({
-          type: "request.end"
-        });
-      }
-    }
+        source: i.source ?? "php-wasm"
+      });
+    }).finally(() => {
+      r && this[__private__dont__use].free(r);
+    }).finally(() => {
+      e(), this.dispatchEvent({
+        type: "request.end"
+      });
+    }), s;
   }
   /**
    * Defines a constant in the PHP runtime.
@@ -1238,15 +1457,15 @@ class PHP {
    */
   async hotSwapPHPRuntime(t, e) {
     const r = this[__private__dont__use].FS, s = [];
-    for (const [i, o] of Object.entries(c(this, R)))
-      s.push({ mountHandler: o.mountHandler, vfsPath: i }), await o.unmount();
+    for (const [i, n] of Object.entries(c(this, T)))
+      s.push({ mountHandler: n.mountHandler, vfsPath: i }), await n.unmount();
     try {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(t), c(this, F) && this.setSapiName(c(this, F)), copyFS(r, this[__private__dont__use].FS, "/internal"), e && copyFS(r, this[__private__dont__use].FS, e);
-    for (const { mountHandler: i, vfsPath: o } of s)
-      this.mkdir(o), await this.mount(o, i);
+    this.initializeRuntime(t), c(this, b) && this.setSapiName(c(this, b)), copyFS(r, this[__private__dont__use].FS, "/internal"), e && copyFS(r, this[__private__dont__use].FS, e);
+    for (const { mountHandler: i, vfsPath: n } of s)
+      this.mkdir(n), await this.mount(n, i);
   }
   /**
    * Mounts a filesystem to a given path in the PHP filesystem.
@@ -1263,10 +1482,10 @@ class PHP {
     ), s = {
       mountHandler: e,
       unmount: async () => {
-        await r(), delete c(this, R)[t];
+        await r(), delete c(this, T)[t];
       }
     };
-    return c(this, R)[t] = s, () => {
+    return c(this, T)[t] = s, () => {
       s.unmount();
     };
   }
@@ -1283,29 +1502,21 @@ class PHP {
    * @param  argv - The arguments to pass to the CLI.
    * @returns The exit code of the CLI session.
    */
-  async cli(t) {
-    for (const e of t)
+  async cli(t, e = {}) {
+    const r = await this.semaphore.acquire(), s = e.env || {};
+    for (const [i, n] of Object.entries(s))
+      d(this, p, $).call(this, i, n);
+    t = [t[0], "-c", PHP_INI_PATH, ...t.slice(1)];
+    for (const i of t)
       this[__private__dont__use].ccall(
         "wasm_add_cli_arg",
         null,
         [STRING],
-        [e]
-      );
-    try {
-      return await this[__private__dont__use].ccall(
-        "run_cli",
-        null,
-        [],
-        [],
-        {
-          async: !0
-        }
+        [i]
       );
-    } catch (e) {
-      if (isExitCodeZero(e))
-        return 0;
-      throw e;
-    }
+    return await d(this, p, B).call(this, () => this[__private__dont__use].ccall("run_cli", null, [], [], {
+      async: !0
+    })).then((i) => (i.exitCode.finally(r), i));
   }
   setSkipShebang(t) {
     this[__private__dont__use].ccall(
@@ -1323,13 +1534,13 @@ class PHP {
       this[__private__dont__use]._exit(t);
     } catch {
     }
-    m(this, P, !1), m(this, v, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    m(this, f, !1), m(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
   [Symbol.dispose]() {
-    c(this, P) && this.exit(0);
+    c(this, f) && this.exit(0);
   }
 }
-F = new WeakMap(), P = new WeakMap(), v = new WeakMap(), _ = new WeakMap(), x = new WeakMap(), R = new WeakMap(), u = new WeakSet(), /**
+b = new WeakMap(), f = new WeakMap(), E = new WeakMap(), P = new WeakMap(), R = new WeakMap(), T = new WeakMap(), p = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -1338,36 +1549,19 @@ F = new WeakMap(), P = new WeakMap(), v = new WeakMap(), _ = new WeakMap(), x =
  *             was provided.
  * @returns Computed $_SERVER entries.
  */
-N = function(t, e, r) {
+z = function(t, e, r) {
   const s = {
     ...t || {}
   };
   s.HTTPS = s.HTTPS || r === 443 ? "on" : "off";
   for (const i in e) {
-    let o = "HTTP_";
-    ["content-type", "content-length"].includes(i.toLowerCase()) && (o = ""), s[`${o}${i.toUpperCase().replace(/-/g, "_")}`] = e[i];
+    let n = "HTTP_";
+    ["content-type", "content-length"].includes(i.toLowerCase()) && (n = ""), s[`${n}${i.toUpperCase().replace(/-/g, "_")}`] = e[i];
   }
   return s;
-}, M = function() {
+}, q = function() {
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, j = function() {
-  const t = "/internal/headers.json";
-  if (!this.fileExists(t))
-    throw new Error(
-      "SAPI Error: Could not find response headers file."
-    );
-  const e = JSON.parse(this.readFileAsText(t)), r = {};
-  for (const s of e.headers) {
-    if (!s.includes(": "))
-      continue;
-    const i = s.indexOf(": "), o = s.substring(0, i).toLowerCase(), n = s.substring(i + 2);
-    o in r || (r[o] = []), r[o].push(n);
-  }
-  return {
-    headers: r,
-    httpStatusCode: e.status
-  };
-}, U = function(t) {
+}, W = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1381,35 +1575,35 @@ N = function(t, e, r) {
     [STRING],
     [e]
   );
-}, L = function(t) {
+}, G = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
     [STRING],
     [t]
   );
-}, q = function(t) {
+}, V = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_port",
     null,
     [NUMBER],
     [t]
   );
-}, $ = function(t, e) {
+}, J = function(t, e) {
   let r;
   try {
     r = parseInt(new URL(t).port, 10);
   } catch {
   }
   return (!r || isNaN(r) || r === 80) && (r = e === "https" ? 443 : 80), r;
-}, B = function(t) {
+}, Y = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
     [STRING],
     [t]
   );
-}, O = function(t) {
+}, K = function(t) {
   t.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -1426,7 +1620,7 @@ N = function(t, e, r) {
     [NUMBER],
     [parseInt(t["content-length"], 10)]
   );
-}, D = function(t) {
+}, X = function(t) {
   let e, r;
   typeof t == "string" ? (logger.warn(
     "Passing a string as the request body is deprecated. Please use a Uint8Array instead. See https://github.com/WordPress/wordpress-playground/issues/997 for more details"
@@ -1449,70 +1643,88 @@ N = function(t, e, r) {
     [NUMBER],
     [r]
   ), s;
-}, A = function(t) {
+}, L = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
     [STRING],
     [t]
   );
-}, z = function(t, e) {
+}, Q = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_SERVER_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, W = function(t, e) {
+}, $ = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, G = async function() {
-  var i;
-  let t, e;
-  try {
-    t = await new Promise((o, n) => {
-      var a;
-      e = (p) => {
-        logger.error(p), logger.error(p.error);
-        const T = new Error("Rethrown");
-        T.cause = p.error, T.betterMessage = p.message, n(T);
-      }, (a = c(this, v)) == null || a.addEventListener(
+}, B = async function(t) {
+  const e = this[__private__dont__use], r = await createInvertedReadableStream();
+  e.onHeaders = (w) => {
+    a || s || r.controller.enqueue(w.slice());
+  };
+  let s = !1;
+  const i = () => {
+    s || (s = !0, r.controller.close());
+  }, n = await createInvertedReadableStream();
+  e.onStdout = (w) => {
+    i(), !a && n.controller.enqueue(w.slice());
+  };
+  const o = await createInvertedReadableStream();
+  e.onStderr = (w) => {
+    a || o.controller.enqueue(w.slice());
+  };
+  let a = !1, l;
+  const O = (async () => {
+    var w;
+    try {
+      return await Promise.race([
+        t(),
+        new Promise((A, M) => {
+          var F;
+          l = (y) => {
+            if (logger.error(y), logger.error(y.error), !isExitCode(y.error)) {
+              const j = new Error("Rethrown");
+              j.cause = y.error, j.betterMessage = y.message, M(j);
+            }
+          }, (F = c(this, E)) == null || F.addEventListener(
+            "error",
+            l,
+            { once: !0 }
+          );
+        })
+      ]);
+    } catch (S) {
+      if (isExitCode(S))
+        return S.exitCode;
+      n.controller.error(S), o.controller.error(S), r.controller.error(S), a = !0;
+      for (const y in this)
+        typeof this[y] == "function" && (this[y] = () => {
+          throw new Error(
+            "PHP runtime has crashed – see the earlier error for details."
+          );
+        });
+      this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify();
+      const A = S, M = "betterMessage" in A ? A.betterMessage : A.message, F = new Error(M);
+      throw F.cause = A, logger.error(F), F;
+    } finally {
+      a || (n.controller.close(), o.controller.close(), i(), a = !0), (w = c(this, E)) == null || w.removeEventListener(
         "error",
-        e
-      );
-      const l = this[__private__dont__use].ccall(
-        "wasm_sapi_handle_request",
-        NUMBER,
-        [],
-        [],
-        { async: !0 }
+        l
       );
-      return l instanceof Promise ? l.then(o, n) : o(l);
-    });
-  } catch (o) {
-    for (const p in this)
-      typeof this[p] == "function" && (this[p] = () => {
-        throw new Error(
-          "PHP runtime has crashed – see the earlier error for details."
-        );
-      });
-    this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify();
-    const n = o, l = "betterMessage" in n ? n.betterMessage : n.message, a = new Error(l);
-    throw a.cause = n, logger.error(a), a;
-  } finally {
-    (i = c(this, v)) == null || i.removeEventListener("error", e);
-  }
-  const { headers: r, httpStatusCode: s } = d(this, u, j).call(this);
-  return new PHPResponse(
-    t === 0 ? s : 500,
-    r,
-    this.readFileAsBuffer("/internal/stdout"),
-    this.readFileAsText("/internal/stderr"),
-    t
+    }
+  })();
+  return new StreamedPHPResponse(
+    r.stream,
+    n.stream,
+    o.stream,
+    O
   );
 };
 function normalizeHeaders(t) {
@@ -1535,9 +1747,27 @@ function copyFS(t, e, r) {
     return;
   }
   e.mkdirTree(r);
-  const i = t.readdir(r).filter((o) => o !== "." && o !== "..");
-  for (const o of i)
-    copyFS(t, e, joinPaths(r, o));
+  const i = t.readdir(r).filter((n) => n !== "." && n !== "..");
+  for (const n of i)
+    copyFS(t, e, joinPaths(r, n));
+}
+async function createInvertedReadableStream(t = {}) {
+  let e;
+  const r = new Promise(
+    (n) => {
+      e = n;
+    }
+  ), s = new ReadableStream({
+    ...t,
+    start(n) {
+      if (e(n), t.start)
+        return t.start(n);
+    }
+  }), i = await r;
+  return {
+    stream: s,
+    controller: i
+  };
 }
 async function getPhpIniEntries(t, e) {
   const r = parse(await t.readFileAsText(PHP_INI_PATH));
@@ -1572,8 +1802,8 @@ class HttpCookieStore {
         try {
           if (!r.includes("="))
             continue;
-          const s = r.indexOf("="), i = r.substring(0, s), o = r.substring(s + 1).split(";")[0];
-          this.cookies[i] = o;
+          const s = r.indexOf("="), i = r.substring(0, s), n = r.substring(s + 1).split(";")[0];
+          this.cookies[i] = n;
         } catch (s) {
           logger.error(s);
         }
@@ -1599,22 +1829,22 @@ async function* iteratePhpFiles(t, e, {
   exceptPaths: i = []
 } = {}) {
   e = normalizePath(e);
-  const o = [e];
-  for (; o.length; ) {
-    const n = o.pop();
-    if (!n)
+  const n = [e];
+  for (; n.length; ) {
+    const o = n.pop();
+    if (!o)
       return;
-    const l = await t.listFiles(n);
-    for (const a of l) {
-      const p = `${n}/${a}`;
-      if (i.includes(p.substring(e.length + 1)))
+    const a = await t.listFiles(o);
+    for (const l of a) {
+      const u = `${o}/${l}`;
+      if (i.includes(u.substring(e.length + 1)))
         continue;
-      await t.isDir(p) ? o.push(p) : yield new StreamedFile(
-        streamReadFileFromPHP(t, p),
+      await t.isDir(u) ? n.push(u) : yield new StreamedFile(
+        streamReadFileFromPHP(t, u),
         r ? joinPaths(
           s || "",
-          p.substring(e.length + 1)
-        ) : p
+          u.substring(e.length + 1)
+        ) : u
       );
     }
   }
@@ -1661,11 +1891,7 @@ class PHPProcessManager {
       throw new Error(
         "phpFactory or primaryPhp must be set before calling getPrimaryPhp()."
       );
-    if (!this.primaryPhp) {
-      const e = await this.spawn({ isPrimary: !0 });
-      this.primaryPhp = e.php;
-    }
-    return this.primaryPhp;
+    return this.primaryPhp || (this.primaryPhpPromise || (this.primaryPhpPromise = this.spawn({ isPrimary: !0 })), this.primaryPhp = (await this.primaryPhpPromise).php, this.primaryPhpPromise = void 0), this.primaryPhp;
   }
   /**
    * Get a PHP instance.
@@ -1674,17 +1900,32 @@ class PHPProcessManager {
    * instance, or a newly spawned PHP instance – depending on the resource
    * availability.
    *
+   * @param considerPrimary - Whether to consider the primary PHP instance.
+   *                          It matters because PHP.cli() sets the SAPI to CLI and
+   *                          kills the entire process after it finishes running,
+   *                          making the primary PHP instance non-reusable for
+   *                          subsequent .run() calls. This is fine for one-off
+   *                          child PHP instances, but not for the primary PHP
+   *                          that's meant to continue working for the entire duration
+   *                          of the ProcessManager lifetime. Therefore, we don't
+   *                          consider the primary PHP instance by default unless
+   *                          the caller explicitly requests it.
+   *
    * @throws {MaxPhpInstancesError} when the maximum number of PHP instances is reached
    *                                and the waiting timeout is exceeded.
    */
-  async acquirePHPInstance() {
-    if (this.primaryIdle)
+  async acquirePHPInstance({
+    considerPrimary: e = !0
+  } = {}) {
+    if (this.primaryPhp || await this.getPrimaryPhp(), this.primaryIdle && e)
       return this.primaryIdle = !1, {
         php: await this.getPrimaryPhp(),
-        reap: () => this.primaryIdle = !0
+        reap: () => {
+          this.primaryIdle = !0;
+        }
       };
-    const e = this.nextInstance || this.spawn({ isPrimary: !1 });
-    return this.semaphore.remaining > 0 ? this.nextInstance = this.spawn({ isPrimary: !1 }) : this.nextInstance = null, await e;
+    const r = this.nextInstance || this.spawn({ isPrimary: !1 });
+    return this.semaphore.remaining > 0 ? this.nextInstance = this.spawn({ isPrimary: !1 }) : this.nextInstance = null, await r;
   }
   /**
    * Initiated spawning of a new PHP instance.
@@ -1693,7 +1934,7 @@ class PHPProcessManager {
    * for PHP to spawn.
    */
   spawn(e) {
-    if (e.isPrimary && this.allInstances.length > 0)
+    if (e.isPrimary && this.primaryPhpPromise && !this.primaryPhp)
       throw new Error(
         "Requested spawning a primary PHP instance when another primary instance already started spawning."
       );
@@ -1764,23 +2005,23 @@ function ensurePathPrefix(t, e) {
 }
 async function encodeAsMultipart(t) {
   const e = `----${Math.random().toString(36).slice(2)}`, r = `multipart/form-data; boundary=${e}`, s = new TextEncoder(), i = [];
-  for (const [a, p] of Object.entries(t))
+  for (const [l, u] of Object.entries(t))
     i.push(`--${e}\r
-`), i.push(`Content-Disposition: form-data; name="${a}"`), p instanceof File && i.push(`; filename="${p.name}"`), i.push(`\r
-`), p instanceof File && (i.push("Content-Type: application/octet-stream"), i.push(`\r
+`), i.push(`Content-Disposition: form-data; name="${l}"`), u instanceof File && i.push(`; filename="${u.name}"`), i.push(`\r
+`), u instanceof File && (i.push("Content-Type: application/octet-stream"), i.push(`\r
 `)), i.push(`\r
-`), p instanceof File ? i.push(await fileToUint8Array(p)) : i.push(p), i.push(`\r
+`), u instanceof File ? i.push(await fileToUint8Array(u)) : i.push(u), i.push(`\r
 `);
   i.push(`--${e}--\r
 `);
-  const o = i.reduce((a, p) => a + p.length, 0), n = new Uint8Array(o);
-  let l = 0;
-  for (const a of i)
-    n.set(
-      typeof a == "string" ? s.encode(a) : a,
-      l
-    ), l += a.length;
-  return { bytes: n, contentType: r };
+  const n = i.reduce((l, u) => l + u.length, 0), o = new Uint8Array(n);
+  let a = 0;
+  for (const l of i)
+    o.set(
+      typeof l == "string" ? s.encode(l) : l,
+      a
+    ), a += l.length;
+  return { bytes: o, contentType: r };
 }
 function fileToUint8Array(t) {
   return t.arrayBuffer().then((e) => new Uint8Array(e));
@@ -1881,7 +2122,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var g, S, k, E, H, f, b, y, w, V, J, Y;
+var g, k, N, H, I, _, C, v, x, Z, ee, te;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -1895,42 +2136,42 @@ class PHPRequestHandler {
    * @param  config - Request Handler configuration.
    */
   constructor(e) {
-    h(this, w);
+    h(this, x);
     h(this, g);
-    h(this, S);
     h(this, k);
-    h(this, E);
+    h(this, N);
     h(this, H);
-    h(this, f);
-    h(this, b);
-    h(this, y);
+    h(this, I);
+    h(this, _);
+    h(this, C);
+    h(this, v);
     const {
       documentRoot: r = "/www/",
       absoluteUrl: s = typeof location == "object" ? location.href : DEFAULT_BASE_URL,
       rewriteRules: i = [],
-      getFileNotFoundAction: o = () => ({ type: "404" })
+      getFileNotFoundAction: n = () => ({ type: "404" })
     } = e;
     "processManager" in e ? this.processManager = e.processManager : this.processManager = new PHPProcessManager({
-      phpFactory: async (a) => {
-        const p = await e.phpFactory({
-          ...a,
+      phpFactory: async (l) => {
+        const u = await e.phpFactory({
+          ...l,
           requestHandler: this
         });
-        return p.requestHandler = this, p;
+        return u.isDir(r) || u.mkdir(r), u.chdir(r), u.requestHandler = this, u;
       },
       maxPhpInstances: e.maxPhpInstances
-    }), m(this, y, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), m(this, g, r);
-    const n = new URL(s);
-    m(this, k, n.hostname), m(this, E, n.port ? Number(n.port) : n.protocol === "https:" ? 443 : 80), m(this, S, (n.protocol || "").replace(":", ""));
-    const l = c(this, E) !== 443 && c(this, E) !== 80;
-    m(this, H, [
-      c(this, k),
-      l ? `:${c(this, E)}` : ""
-    ].join("")), m(this, f, n.pathname.replace(/\/+$/, "")), m(this, b, [
-      `${c(this, S)}://`,
-      c(this, H),
-      c(this, f)
-    ].join("")), this.rewriteRules = i, this.getFileNotFoundAction = o;
+    }), m(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), m(this, g, r);
+    const o = new URL(s);
+    m(this, N, o.hostname), m(this, H, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), m(this, k, (o.protocol || "").replace(":", ""));
+    const a = c(this, H) !== 443 && c(this, H) !== 80;
+    m(this, I, [
+      c(this, N),
+      a ? `:${c(this, H)}` : ""
+    ].join("")), m(this, _, o.pathname.replace(/\/+$/, "")), m(this, C, [
+      `${c(this, k)}://`,
+      c(this, I),
+      c(this, _)
+    ].join("")), this.rewriteRules = i, this.getFileNotFoundAction = n;
   }
   async getPrimaryPhp() {
     return await this.processManager.getPrimaryPhp();
@@ -1954,13 +2195,13 @@ class PHPRequestHandler {
    */
   internalUrlToPath(e) {
     const r = new URL(e);
-    return r.pathname.startsWith(c(this, f)) && (r.pathname = r.pathname.slice(c(this, f).length)), toRelativeUrl(r);
+    return r.pathname.startsWith(c(this, _)) && (r.pathname = r.pathname.slice(c(this, _).length)), toRelativeUrl(r);
   }
   /**
    * The absolute URL of this PHPRequestHandler instance.
    */
   get absoluteUrl() {
-    return c(this, b);
+    return c(this, C);
   }
   /**
    * The directory in the PHP filesystem where the server will look
@@ -2025,65 +2266,65 @@ class PHPRequestHandler {
     ), i = applyRewriteRules(
       removePathPrefix(
         decodeURIComponent(s.pathname),
-        c(this, f)
+        c(this, _)
       ),
       this.rewriteRules
-    ), o = await this.getPrimaryPhp();
-    let n = joinPaths(c(this, g), i);
-    if (o.isDir(n)) {
-      if (!n.endsWith("/"))
+    ), n = await this.getPrimaryPhp();
+    let o = joinPaths(c(this, g), i);
+    if (n.isDir(o)) {
+      if (!o.endsWith("/"))
         return new PHPResponse(
           301,
           { Location: [`${s.pathname}/`] },
           new Uint8Array(0)
         );
-      for (const l of ["index.php", "index.html"]) {
-        const a = joinPaths(n, l);
-        if (o.isFile(a)) {
-          n = a;
+      for (const a of ["index.php", "index.html"]) {
+        const l = joinPaths(o, a);
+        if (n.isFile(l)) {
+          o = l;
           break;
         }
       }
     }
-    if (!o.isFile(n)) {
-      const l = this.getFileNotFoundAction(
+    if (!n.isFile(o)) {
+      const a = this.getFileNotFoundAction(
         i
       );
-      switch (l.type) {
+      switch (a.type) {
         case "response":
-          return l.response;
+          return a.response;
         case "internal-redirect":
-          n = joinPaths(c(this, g), l.uri);
+          o = joinPaths(c(this, g), a.uri);
           break;
         case "404":
           return PHPResponse.forHttpCode(404);
         default:
           throw new Error(
-            `Unsupported file-not-found action type: '${l.type}'`
+            `Unsupported file-not-found action type: '${a.type}'`
           );
       }
     }
-    if (o.isFile(n))
-      if (n.endsWith(".php")) {
-        const l = {
+    if (n.isFile(o))
+      if (o.endsWith(".php")) {
+        const a = {
           ...e,
           // Pass along URL with the #fragment filtered out
           url: s.toString()
         };
-        return d(this, w, J).call(this, l, n);
+        return d(this, x, ee).call(this, a, o);
       } else
-        return d(this, w, V).call(this, o, n);
+        return d(this, x, Z).call(this, n, o);
     else
       return PHPResponse.forHttpCode(404);
   }
 }
-g = new WeakMap(), S = new WeakMap(), k = new WeakMap(), E = new WeakMap(), H = new WeakMap(), f = new WeakMap(), b = new WeakMap(), y = new WeakMap(), w = new WeakSet(), /**
+g = new WeakMap(), k = new WeakMap(), N = new WeakMap(), H = new WeakMap(), I = new WeakMap(), _ = new WeakMap(), C = new WeakMap(), v = new WeakMap(), x = new WeakSet(), /**
  * Serves a static file from the PHP filesystem.
  *
  * @param  fsPath - Absolute path of the static file to serve.
  * @returns The response.
  */
-V = function(e, r) {
+Z = function(e, r) {
   const s = e.readFileAsBuffer(r);
   return new PHPResponse(
     200,
@@ -2098,56 +2339,58 @@ V = function(e, r) {
     },
     s
   );
-}, J = async function(e, r) {
+}, ee = async function(e, r) {
   let s;
   try {
-    s = await this.processManager.acquirePHPInstance();
+    s = await this.processManager.acquirePHPInstance({
+      considerPrimary: !0
+    });
   } catch (i) {
     return i instanceof MaxPhpInstancesError ? PHPResponse.forHttpCode(502) : PHPResponse.forHttpCode(500);
   }
   try {
-    return await d(this, w, Y).call(this, s.php, e, r);
+    return await d(this, x, te).call(this, s.php, e, r);
   } finally {
     s.reap();
   }
-}, Y = async function(e, r, s) {
+}, te = async function(e, r, s) {
   let i = "GET";
-  const o = {
-    host: c(this, H),
+  const n = {
+    host: c(this, I),
     ...normalizeHeaders(r.headers || {})
   };
-  c(this, y) && (o.cookie = c(this, y).getCookieRequestHeader());
-  let n = r.body;
-  if (typeof n == "object" && !(n instanceof Uint8Array)) {
+  c(this, v) && (n.cookie = c(this, v).getCookieRequestHeader());
+  let o = r.body;
+  if (typeof o == "object" && !(o instanceof Uint8Array)) {
     i = "POST";
-    const { bytes: l, contentType: a } = await encodeAsMultipart(n);
-    n = l, o["content-type"] = a;
+    const { bytes: a, contentType: l } = await encodeAsMultipart(o);
+    o = a, n["content-type"] = l;
   }
   try {
-    const l = await e.run({
+    const a = await e.run({
       relativeUri: ensurePathPrefix(
         toRelativeUrl(new URL(r.url)),
-        c(this, f)
+        c(this, _)
       ),
-      protocol: c(this, S),
+      protocol: c(this, k),
       method: r.method || i,
       $_SERVER: {
         REMOTE_ADDR: "127.0.0.1",
         DOCUMENT_ROOT: c(this, g),
-        HTTPS: c(this, b).startsWith("https://") ? "on" : ""
+        HTTPS: c(this, C).startsWith("https://") ? "on" : ""
       },
-      body: n,
+      body: o,
       scriptPath: s,
-      headers: o
+      headers: n
     });
-    return c(this, y) && c(this, y).rememberCookiesFromResponseHeaders(
-      l.headers
-    ), l;
-  } catch (l) {
-    const a = l;
-    if (a != null && a.response)
-      return a.response;
-    throw l;
+    return c(this, v) && c(this, v).rememberCookiesFromResponseHeaders(
+      a.headers
+    ), a;
+  } catch (a) {
+    const l = a;
+    if (l != null && l.response)
+      return l.response;
+    throw a;
   }
 };
 function inferMimeType(t) {
@@ -2175,29 +2418,29 @@ function rotatePHPRuntime({
   maxRequests: s = 400
 }) {
   let i = 0;
-  async function o() {
-    const a = await t.semaphore.acquire();
+  async function n() {
+    const l = await t.semaphore.acquire();
     try {
       await t.hotSwapPHPRuntime(await r(), e), i = 0;
     } finally {
-      a();
+      l();
     }
   }
-  async function n() {
-    ++i < s || await o();
+  async function o() {
+    ++i < s || await n();
   }
-  async function l(a) {
-    a.type === "request.error" && a.source === "php-wasm" && await o();
+  async function a(l) {
+    l.type === "request.error" && l.source === "php-wasm" && await n();
   }
-  return t.addEventListener("request.error", l), t.addEventListener("request.end", n), function() {
-    t.removeEventListener("request.error", l), t.removeEventListener("request.end", n);
+  return t.addEventListener("request.error", a), t.addEventListener("request.end", o), function() {
+    t.removeEventListener("request.error", a), t.removeEventListener("request.end", o);
   };
 }
 async function writeFiles(t, e, r, { rmRoot: s = !1 } = {}) {
   s && await t.isDir(e) && await t.rmdir(e, { recursive: !0 });
-  for (const [i, o] of Object.entries(r)) {
-    const n = joinPaths(e, i);
-    await t.fileExists(dirname(n)) || await t.mkdir(dirname(n)), o instanceof Uint8Array || typeof o == "string" ? await t.writeFile(n, o) : await writeFiles(t, n, o);
+  for (const [i, n] of Object.entries(r)) {
+    const o = joinPaths(e, i);
+    await t.fileExists(dirname(o)) || await t.mkdir(dirname(o)), n instanceof Uint8Array || typeof n == "string" ? await t.writeFile(o, n) : await writeFiles(t, o, n);
   }
 }
 function proxyFileSystem(t, e, r) {
@@ -2220,10 +2463,12 @@ export {
   HttpCookieStore,
   LatestSupportedPHPVersion,
   PHP,
+  PHPExecutionFailureError,
   PHPProcessManager,
   PHPRequestHandler,
   PHPResponse,
   PHPWorker,
+  StreamedPHPResponse,
   SupportedPHPVersions,
   SupportedPHPVersionsList,
   UnhandledRejectionsTarget,
@@ -2232,7 +2477,7 @@ export {
   ensurePathPrefix,
   getLoadedRuntime,
   getPhpIniEntries,
-  isExitCodeZero,
+  isExitCode,
   iteratePhpFiles as iterateFiles,
   loadPHPRuntime,
   proxyFileSystem,