@php-wasm/web 0.7.1 → 0.7.3

package/index.js

@@ -1,13 +1,13 @@
-var Z = (e, t, r) => {
+var D = (e, t, r) => {
   if (!t.has(e))
     throw TypeError("Cannot " + r);
 };
-var u = (e, t, r) => (Z(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => {
+var d = (e, t, r) => (D(e, t, "read from private field"), r ? r.call(e) : t.get(e)), u = (e, t, r) => {
   if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(e) : t.set(e, r);
-}, p = (e, t, r, s) => (Z(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
-var f = (e, t, r) => (Z(e, t, "access private method"), r);
+}, m = (e, t, r, s) => (D(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
+var p = (e, t, r) => (D(e, t, "access private method"), r);
 const currentJsRuntime$1 = function() {
   var e;
   return typeof process < "u" && ((e = process.release) == null ? void 0 : e.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : (
@@ -59,10 +59,10 @@ if (currentJsRuntime$1 === "NODE") {
         const o = n.byobRequest.view, a = await s.slice(
           r,
           r + o.byteLength
-        ).arrayBuffer(), c = new Uint8Array(a);
-        new Uint8Array(o.buffer).set(c);
-        const l = c.byteLength;
-        n.byobRequest.respond(l), r += l, r >= s.size && n.close();
+        ).arrayBuffer(), l = new Uint8Array(a);
+        new Uint8Array(o.buffer).set(l);
+        const c = l.byteLength;
+        n.byobRequest.respond(c), r += c, r >= s.size && n.close();
       }
     });
   });
@@ -102,6 +102,171 @@ const ErrorEvent = typeof globalThis.ErrorEvent == "function" ? globalThis.Error
 function isExitCodeZero(e) {
   return e instanceof Error ? "exitCode" in e && (e == null ? void 0 : e.exitCode) === 0 || (e == null ? void 0 : e.name) === "ExitStatus" && "status" in e && e.status === 0 : !1;
 }
+const logToConsole = (e, ...t) => {
+  switch (e.severity) {
+    case "Debug":
+      console.debug(e.message, ...t);
+      break;
+    case "Info":
+      console.info(e.message, ...t);
+      break;
+    case "Warn":
+      console.warn(e.message, ...t);
+      break;
+    case "Error":
+      console.error(e.message, ...t);
+      break;
+    case "Fatal":
+      console.error(e.message, ...t);
+      break;
+    default:
+      console.log(e.message, ...t);
+  }
+}, prepareLogMessage = (e, ...t) => [
+  typeof e == "object" ? JSON.stringify(e) : e,
+  ...t.map((r) => JSON.stringify(r))
+].join(" "), logs = [], addToLogArray = (e) => {
+  logs.push(e);
+}, logToMemory = (e) => {
+  if (e.raw === !0)
+    addToLogArray(e.message);
+  else {
+    const t = formatLogEntry(
+      typeof e.message == "object" ? prepareLogMessage(e.message) : e.message,
+      e.severity ?? "Info",
+      e.prefix ?? "JavaScript"
+    );
+    addToLogArray(t);
+  }
+};
+class Logger extends EventTarget {
+  // constructor
+  constructor(t = []) {
+    super(), this.handlers = t, this.fatalErrorEvent = "playground-fatal-error";
+  }
+  /**
+   * Get all logs.
+   * @returns string[]
+   */
+  getLogs() {
+    return this.handlers.includes(logToMemory) ? [...logs] : (this.error(`Logs aren't stored because the logToMemory handler isn't registered.
+				If you're using a custom logger instance, make sure to register logToMemory handler.
+			`), []);
+  }
+  /**
+   * Log message with severity.
+   *
+   * @param message any
+   * @param severity LogSeverity
+   * @param raw boolean
+   * @param args any
+   */
+  logMessage(t, ...r) {
+    for (const s of this.handlers)
+      s(t, ...r);
+  }
+  /**
+   * Log message
+   *
+   * @param message any
+   * @param args any
+   */
+  log(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: void 0,
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log debug message
+   *
+   * @param message any
+   * @param args any
+   */
+  debug(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Debug",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log info message
+   *
+   * @param message any
+   * @param args any
+   */
+  info(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Info",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log warning message
+   *
+   * @param message any
+   * @param args any
+   */
+  warn(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Warn",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log error message
+   *
+   * @param message any
+   * @param args any
+   */
+  error(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Error",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+}
+const logger = new Logger([logToMemory, logToConsole]), formatLogEntry = (e, t, r) => {
+  const s = /* @__PURE__ */ new Date(), n = new Intl.DateTimeFormat("en-GB", {
+    year: "numeric",
+    month: "short",
+    day: "2-digit",
+    timeZone: "UTC"
+  }).format(s).replace(/ /g, "-"), o = new Intl.DateTimeFormat("en-GB", {
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: !1,
+    timeZone: "UTC",
+    timeZoneName: "short"
+  }).format(s);
+  return `[${n + " " + o}] ${r} ${t}: ${e}`;
+};
 class UnhandledRejectionsTarget extends EventTarget {
   constructor() {
     super(...arguments), this.listenersCount = 0;
@@ -200,13 +365,13 @@ CLI option:
 let logged = !1;
 function showCriticalErrorBox(e) {
   if (!logged && (logged = !0, !(e != null && e.trim().startsWith("Program terminated with exit")))) {
-    console.log(`${redBg}
+    logger.log(`${redBg}
 ${eol}
 ${bold}  WASM ERROR${reset}${redBg}`);
     for (const t of e.split(`
 `))
-      console.log(`${eol}  ${t} `);
-    console.log(`${reset}`);
+      logger.log(`${eol}  ${t} `);
+    logger.log(`${reset}`);
   }
 }
 function extractPHPFunctionsFromStack(e) {
@@ -309,8 +474,8 @@ function splitShellCommand(e) {
   const o = [];
   let i = "";
   for (let a = 0; a < e.length; a++) {
-    const c = e[a];
-    c === "\\" ? ((e[a + 1] === '"' || e[a + 1] === "'") && a++, i += e[a]) : s === 0 ? c === '"' || c === "'" ? (s = 1, n = c) : c.match(/\s/) ? (i.trim().length && o.push(i.trim()), i = c) : o.length && !i ? i = o.pop() + c : i += c : s === 1 && (c === n ? (s = 0, n = "") : i += c);
+    const l = e[a];
+    l === "\\" ? ((e[a + 1] === '"' || e[a + 1] === "'") && a++, i += e[a]) : s === 0 ? l === '"' || l === "'" ? (s = 1, n = l) : l.match(/\s/) ? (i.trim().length && o.push(i.trim()), i = l) : o.length && !i ? i = o.pop() + l : i += l : s === 1 && (l === n ? (s = 0, n = "") : i += l);
   }
   return i && o.push(i.trim()), o;
 }
@@ -327,7 +492,12 @@ function createSpawnHandler(e) {
         i = t;
       else
         throw new Error("Invalid command ", t);
-      await e(i, o, s), n.emit("spawn", !0);
+      try {
+        await e(i, o, s);
+      } catch (a) {
+        n.emit("error", a), typeof a == "object" && a !== null && "message" in a && typeof a.message == "string" && o.stderr(a.message), o.exit(1);
+      }
+      n.emit("spawn", !0);
     }), n;
   };
 }
@@ -398,10 +568,34 @@ ReadableStream.prototype[Symbol.asyncIterator] || (ReadableStream.prototype[Symb
   }
 }, ReadableStream.prototype.iterate = // @ts-ignore
 ReadableStream.prototype[Symbol.asyncIterator]);
+const responseTexts = {
+  500: "Internal Server Error",
+  502: "Bad Gateway",
+  404: "Not Found",
+  403: "Forbidden",
+  401: "Unauthorized",
+  400: "Bad Request",
+  301: "Moved Permanently",
+  302: "Found",
+  307: "Temporary Redirect",
+  308: "Permanent Redirect",
+  204: "No Content",
+  201: "Created",
+  200: "OK"
+};
 class PHPResponse {
   constructor(t, r, s, n = "", o = 0) {
     this.httpStatusCode = t, this.headers = r, this.bytes = s, this.exitCode = o, this.errors = n;
   }
+  static forHttpCode(t, r = "") {
+    return new PHPResponse(
+      t,
+      {},
+      new TextEncoder().encode(
+        r || responseTexts[t] || ""
+      )
+    );
+  }
   static fromRawData(t) {
     return new PHPResponse(
       t.httpStatusCode,
@@ -443,411 +637,7 @@ const SupportedPHPVersions = [
   "7.2",
   "7.1",
   "7.0"
-], LatestSupportedPHPVersion = SupportedPHPVersions[0], DEFAULT_BASE_URL = "http://example.com";
-function toRelativeUrl(e) {
-  return e.toString().substring(e.origin.length);
-}
-function removePathPrefix(e, t) {
-  return !t || !e.startsWith(t) ? e : e.substring(t.length);
-}
-function ensurePathPrefix(e, t) {
-  return !t || e.startsWith(t) ? e : t + e;
-}
-async function encodeAsMultipart(e) {
-  const t = `----${Math.random().toString(36).slice(2)}`, r = `multipart/form-data; boundary=${t}`, s = new TextEncoder(), n = [];
-  for (const [c, l] of Object.entries(e))
-    n.push(`--${t}\r
-`), n.push(`Content-Disposition: form-data; name="${c}"`), l instanceof File && n.push(`; filename="${l.name}"`), n.push(`\r
-`), l instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\r
-`)), n.push(`\r
-`), l instanceof File ? n.push(await fileToUint8Array(l)) : n.push(l), n.push(`\r
-`);
-  n.push(`--${t}--\r
-`);
-  const o = n.reduce((c, l) => c + l.length, 0), i = new Uint8Array(o);
-  let a = 0;
-  for (const c of n)
-    i.set(
-      typeof c == "string" ? s.encode(c) : c,
-      a
-    ), a += c.length;
-  return { bytes: i, contentType: r };
-}
-function fileToUint8Array(e) {
-  return new Promise((t) => {
-    const r = new FileReader();
-    r.onload = () => {
-      t(new Uint8Array(r.result));
-    }, r.readAsArrayBuffer(e);
-  });
-}
-class HttpCookieStore {
-  constructor() {
-    this.cookies = {};
-  }
-  rememberCookiesFromResponseHeaders(t) {
-    if (t != null && t["set-cookie"])
-      for (const r of t["set-cookie"])
-        try {
-          if (!r.includes("="))
-            continue;
-          const s = r.indexOf("="), n = r.substring(0, s), o = r.substring(s + 1).split(";")[0];
-          this.cookies[n] = o;
-        } catch (s) {
-          console.error(s);
-        }
-  }
-  getCookieRequestHeader() {
-    const t = [];
-    for (const r in this.cookies)
-      t.push(`${r}=${this.cookies[r]}`);
-    return t.join("; ");
-  }
-}
-var g, x, M, v, S, y, T, R, k, I, X, N, ee, L, te;
-class PHPRequestHandler {
-  /**
-   * @param  php    - The PHP instance.
-   * @param  config - Request Handler configuration.
-   */
-  constructor(t, r = {}) {
-    /**
-     * Serves a static file from the PHP filesystem.
-     *
-     * @param  fsPath - Absolute path of the static file to serve.
-     * @returns The response.
-     */
-    d(this, I);
-    /**
-     * Runs the requested PHP file with all the request and $_SERVER
-     * superglobals populated.
-     *
-     * @param  request - The request.
-     * @returns The response.
-     */
-    d(this, N);
-    /**
-     * Resolve the requested path to the filesystem path of the requested PHP file.
-     *
-     * Fall back to index.php as if there was a url rewriting rule in place.
-     *
-     * @param  requestedPath - The requested pathname.
-     * @throws {Error} If the requested path doesn't exist.
-     * @returns The resolved filesystem path.
-     */
-    d(this, L);
-    d(this, g, void 0);
-    d(this, x, void 0);
-    d(this, M, void 0);
-    d(this, v, void 0);
-    d(this, S, void 0);
-    d(this, y, void 0);
-    d(this, T, void 0);
-    d(this, R, void 0);
-    d(this, k, void 0);
-    p(this, R, new Semaphore({ concurrency: 1 }));
-    const {
-      documentRoot: s = "/www/",
-      absoluteUrl: n = typeof location == "object" ? location == null ? void 0 : location.href : "",
-      rewriteRules: o = []
-    } = r;
-    this.php = t, p(this, k, new HttpCookieStore()), p(this, g, s);
-    const i = new URL(n);
-    p(this, M, i.hostname), p(this, v, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), p(this, x, (i.protocol || "").replace(":", ""));
-    const a = u(this, v) !== 443 && u(this, v) !== 80;
-    p(this, S, [
-      u(this, M),
-      a ? `:${u(this, v)}` : ""
-    ].join("")), p(this, y, i.pathname.replace(/\/+$/, "")), p(this, T, [
-      `${u(this, x)}://`,
-      u(this, S),
-      u(this, y)
-    ].join("")), this.rewriteRules = o;
-  }
-  /**
-   * Converts a path to an absolute URL based at the PHPRequestHandler
-   * root.
-   *
-   * @param  path The server path to convert to an absolute URL.
-   * @returns The absolute URL.
-   */
-  pathToInternalUrl(t) {
-    return `${this.absoluteUrl}${t}`;
-  }
-  /**
-   * Converts an absolute URL based at the PHPRequestHandler to a relative path
-   * without the server pathname and scope.
-   *
-   * @param  internalUrl An absolute URL based at the PHPRequestHandler root.
-   * @returns The relative path.
-   */
-  internalUrlToPath(t) {
-    const r = new URL(t);
-    return r.pathname.startsWith(u(this, y)) && (r.pathname = r.pathname.slice(u(this, y).length)), toRelativeUrl(r);
-  }
-  get isRequestRunning() {
-    return u(this, R).running > 0;
-  }
-  /**
-   * The absolute URL of this PHPRequestHandler instance.
-   */
-  get absoluteUrl() {
-    return u(this, T);
-  }
-  /**
-   * The directory in the PHP filesystem where the server will look
-   * for the files to serve. Default: `/var/www`.
-   */
-  get documentRoot() {
-    return u(this, g);
-  }
-  /**
-   * Serves the request – either by serving a static file, or by
-   * dispatching it to the PHP runtime.
-   *
-   * The request() method mode behaves like a web server and only works if
-   * the PHP was initialized with a `requestHandler` option (which the online version
-   * of WordPress Playground does by default).
-   *
-   * In the request mode, you pass an object containing the request information
-   * (method, headers, body, etc.) and the path to the PHP file to run:
-   *
-   * ```ts
-   * const php = PHP.load('7.4', {
-   * 	requestHandler: {
-   * 		documentRoot: "/www"
-   * 	}
-   * })
-   * php.writeFile("/www/index.php", `<?php echo file_get_contents("php://input");`);
-   * const result = await php.request({
-   * 	method: "GET",
-   * 	headers: {
-   * 		"Content-Type": "text/plain"
-   * 	},
-   * 	body: "Hello world!",
-   * 	path: "/www/index.php"
-   * });
-   * // result.text === "Hello world!"
-   * ```
-   *
-   * The `request()` method cannot be used in conjunction with `cli()`.
-   *
-   * @example
-   * ```js
-   * const output = await php.request({
-   * 	method: 'GET',
-   * 	url: '/index.php',
-   * 	headers: {
-   * 		'X-foo': 'bar',
-   * 	},
-   * 	body: {
-   * 		foo: 'bar',
-   * 	},
-   * });
-   * console.log(output.stdout); // "Hello world!"
-   * ```
-   *
-   * @param  request - PHP Request data.
-   */
-  async request(t) {
-    const r = t.url.startsWith("http://") || t.url.startsWith("https://"), s = new URL(
-      // Remove the hash part of the URL as it's not meant for the server.
-      t.url.split("#")[0],
-      r ? void 0 : DEFAULT_BASE_URL
-    ), n = applyRewriteRules(
-      removePathPrefix(
-        decodeURIComponent(s.pathname),
-        u(this, y)
-      ),
-      this.rewriteRules
-    ), o = joinPaths(u(this, g), n);
-    return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, N, ee).call(this, t, s) : f(this, I, X).call(this, o);
-  }
-}
-g = new WeakMap(), x = new WeakMap(), M = new WeakMap(), v = new WeakMap(), S = new WeakMap(), y = new WeakMap(), T = new WeakMap(), R = new WeakMap(), k = new WeakMap(), I = new WeakSet(), X = function(t) {
-  if (!this.php.fileExists(t))
-    return new PHPResponse(
-      404,
-      // Let the service worker know that no static file was found
-      // and that it's okay to issue a real fetch() to the server.
-      {
-        "x-file-type": ["static"]
-      },
-      new TextEncoder().encode("404 File not found")
-    );
-  const r = this.php.readFileAsBuffer(t);
-  return new PHPResponse(
-    200,
-    {
-      "content-length": [`${r.byteLength}`],
-      // @TODO: Infer the content-type from the arrayBuffer instead of the file path.
-      //        The code below won't return the correct mime-type if the extension
-      //        was tampered with.
-      "content-type": [inferMimeType(t)],
-      "accept-ranges": ["bytes"],
-      "cache-control": ["public, max-age=0"]
-    },
-    r
-  );
-}, N = new WeakSet(), ee = async function(t, r) {
-  var n;
-  if (u(this, R).running > 0 && ((n = t.headers) == null ? void 0 : n["x-request-issuer"]) === "php")
-    return console.warn(
-      "Possible deadlock: Called request() before the previous request() have finished. PHP likely issued an HTTP call to itself. Normally this would lead to infinite waiting as Request 1 holds the lock that the Request 2 is waiting to acquire. That's not useful, so PHPRequestHandler will return error 502 instead."
-    ), new PHPResponse(
-      502,
-      {},
-      new TextEncoder().encode("502 Bad Gateway")
-    );
-  const s = await u(this, R).acquire();
-  try {
-    let o = "GET";
-    const i = {
-      host: u(this, S),
-      ...normalizeHeaders(t.headers || {}),
-      cookie: u(this, k).getCookieRequestHeader()
-    };
-    let a = t.body;
-    if (typeof a == "object" && !(a instanceof Uint8Array)) {
-      o = "POST";
-      const { bytes: l, contentType: h } = await encodeAsMultipart(a);
-      a = l, i["content-type"] = h;
-    }
-    let c;
-    try {
-      c = f(this, L, te).call(this, decodeURIComponent(r.pathname));
-    } catch {
-      return new PHPResponse(
-        404,
-        {},
-        new TextEncoder().encode("404 File not found")
-      );
-    }
-    try {
-      const l = await this.php.run({
-        relativeUri: ensurePathPrefix(
-          toRelativeUrl(r),
-          u(this, y)
-        ),
-        protocol: u(this, x),
-        method: t.method || o,
-        $_SERVER: {
-          REMOTE_ADDR: "127.0.0.1",
-          DOCUMENT_ROOT: u(this, g),
-          HTTPS: u(this, T).startsWith("https://") ? "on" : ""
-        },
-        body: a,
-        scriptPath: c,
-        headers: i
-      });
-      return u(this, k).rememberCookiesFromResponseHeaders(
-        l.headers
-      ), l;
-    } catch (l) {
-      const h = l;
-      if (h != null && h.response)
-        return h.response;
-      throw l;
-    }
-  } finally {
-    s();
-  }
-}, L = new WeakSet(), te = function(t) {
-  let r = removePathPrefix(t, u(this, y));
-  r = applyRewriteRules(r, this.rewriteRules), r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${u(this, g)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
-  const s = `${u(this, g)}${r}`;
-  if (this.php.fileExists(s))
-    return s;
-  throw new Error(`File not found: ${s}`);
-};
-function inferMimeType(e) {
-  switch (e.split(".").pop()) {
-    case "css":
-      return "text/css";
-    case "js":
-      return "application/javascript";
-    case "png":
-      return "image/png";
-    case "jpg":
-    case "jpeg":
-      return "image/jpeg";
-    case "gif":
-      return "image/gif";
-    case "svg":
-      return "image/svg+xml";
-    case "woff":
-      return "font/woff";
-    case "woff2":
-      return "font/woff2";
-    case "ttf":
-      return "font/ttf";
-    case "otf":
-      return "font/otf";
-    case "eot":
-      return "font/eot";
-    case "ico":
-      return "image/x-icon";
-    case "html":
-      return "text/html";
-    case "json":
-      return "application/json";
-    case "xml":
-      return "application/xml";
-    case "txt":
-    case "md":
-      return "text/plain";
-    case "pdf":
-      return "application/pdf";
-    case "webp":
-      return "image/webp";
-    case "mp3":
-      return "audio/mpeg";
-    case "mp4":
-      return "video/mp4";
-    case "csv":
-      return "text/csv";
-    case "xls":
-      return "application/vnd.ms-excel";
-    case "xlsx":
-      return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-    case "doc":
-      return "application/msword";
-    case "docx":
-      return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-    case "ppt":
-      return "application/vnd.ms-powerpoint";
-    case "pptx":
-      return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
-    case "zip":
-      return "application/zip";
-    case "rar":
-      return "application/x-rar-compressed";
-    case "tar":
-      return "application/x-tar";
-    case "gz":
-      return "application/gzip";
-    case "7z":
-      return "application/x-7z-compressed";
-    default:
-      return "application-octet-stream";
-  }
-}
-function seemsLikeAPHPRequestHandlerPath(e) {
-  return seemsLikeAPHPFile(e) || seemsLikeADirectoryRoot(e);
-}
-function seemsLikeAPHPFile(e) {
-  return e.endsWith(".php") || e.includes(".php/");
-}
-function seemsLikeADirectoryRoot(e) {
-  return !e.split("/").pop().includes(".");
-}
-function applyRewriteRules(e, t) {
-  for (const r of t)
-    if (new RegExp(r.match).test(e))
-      return e.replace(r.match, r.replacement);
-  return e;
-}
-const FileErrorCodes = {
+], LatestSupportedPHPVersion = SupportedPHPVersions[0], FileErrorCodes = {
   0: "No error occurred. System call completed successfully.",
   1: "Argument list too long.",
   2: "Permission denied.",
@@ -938,10 +728,10 @@ function rethrowFileSystemError(e = "") {
       try {
         return o.apply(this, i);
       } catch (a) {
-        const c = typeof a == "object" ? a == null ? void 0 : a.errno : null;
-        if (c in FileErrorCodes) {
-          const l = FileErrorCodes[c], h = typeof i[0] == "string" ? i[0] : null, _ = h !== null ? e.replaceAll("{path}", h) : e;
-          throw new Error(`${_}: ${l}`, {
+        const l = typeof a == "object" ? a == null ? void 0 : a.errno : null;
+        if (l in FileErrorCodes) {
+          const c = FileErrorCodes[l], h = typeof i[0] == "string" ? i[0] : null, _ = h !== null ? e.replaceAll("{path}", h) : e;
+          throw new Error(`${_}: ${c}`, {
             cause: a
           });
         }
@@ -955,7 +745,7 @@ let lastRuntimeId = 0;
 async function loadPHPRuntime(e, t = {}) {
   const [r, s, n] = makePromise(), o = e.init(currentJsRuntime, {
     onAbort(a) {
-      n(a), console.error(a);
+      n(a), logger.error(a);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
@@ -997,16 +787,16 @@ class PHPExecutionFailureError extends Error {
     super(t), this.response = r, this.source = s;
   }
 }
-var b, C, H, w, E, P, F, O, re, U, se, W, ne, B, ie, D, oe, $, ae, q, le, z, ce, j, ue, V, de, G, he, J, pe, Q, fe, Y, me, K, _e;
+var P, E, v, y, w, g, b, R, q, x, z, T, U, k, $, C, V, F, G, H, j, M, J, I, Q, N, Y, A, Z, L, K, O, X, W, ee, B, te;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
    *
    * @internal
    * @param  PHPRuntime - Optional. PHP Runtime ID as initialized by loadPHPRuntime.
-   * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
+   * @param  requestHandlerOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
-  constructor(e, t) {
+  constructor(e) {
     /**
      * Prepares the $_SERVER entries for the PHP runtime.
      *
@@ -1016,46 +806,46 @@ class BasePHP {
      *             was provided.
      * @returns Computed $_SERVER entries.
      */
-    d(this, O);
-    d(this, U);
-    d(this, W);
-    d(this, B);
-    d(this, D);
-    d(this, $);
-    d(this, q);
-    d(this, z);
-    d(this, j);
-    d(this, V);
-    d(this, G);
-    d(this, J);
-    d(this, Q);
-    d(this, Y);
-    d(this, K);
-    d(this, b, void 0);
-    d(this, C, void 0);
-    d(this, H, void 0);
-    d(this, w, void 0);
-    d(this, E, void 0);
-    d(this, P, void 0);
-    d(this, F, void 0);
-    p(this, b, []), p(this, w, !1), p(this, E, null), p(this, P, /* @__PURE__ */ new Map()), p(this, F, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPRequestHandler(this, t));
+    u(this, R);
+    u(this, x);
+    u(this, T);
+    u(this, k);
+    u(this, C);
+    u(this, F);
+    u(this, H);
+    u(this, M);
+    u(this, I);
+    u(this, N);
+    u(this, A);
+    u(this, L);
+    u(this, O);
+    u(this, W);
+    u(this, B);
+    u(this, P, void 0);
+    u(this, E, void 0);
+    u(this, v, void 0);
+    u(this, y, void 0);
+    u(this, w, void 0);
+    u(this, g, void 0);
+    u(this, b, void 0);
+    m(this, P, []), m(this, y, !1), m(this, w, null), m(this, g, /* @__PURE__ */ new Map()), m(this, b, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e);
   }
   addEventListener(e, t) {
-    u(this, P).has(e) || u(this, P).set(e, /* @__PURE__ */ new Set()), u(this, P).get(e).add(t);
+    d(this, g).has(e) || d(this, g).set(e, /* @__PURE__ */ new Set()), d(this, g).get(e).add(t);
   }
   removeEventListener(e, t) {
     var r;
-    (r = u(this, P).get(e)) == null || r.delete(t);
+    (r = d(this, g).get(e)) == null || r.delete(t);
   }
   dispatchEvent(e) {
-    const t = u(this, P).get(e.type);
+    const t = d(this, g).get(e.type);
     if (t)
       for (const r of t)
         r(e);
   }
   /** @inheritDoc */
   async onMessage(e) {
-    u(this, F).push(e);
+    d(this, b).push(e);
   }
   /** @inheritDoc */
   async setSpawnHandler(handler) {
@@ -1084,13 +874,13 @@ class BasePHP {
     if (!t)
       throw new Error("Invalid PHP runtime id.");
     this[__private__dont__use] = t, t.onMessage = async (r) => {
-      for (const s of u(this, F)) {
+      for (const s of d(this, b)) {
         const n = await s(r);
         if (n)
           return n;
       }
       return "";
-    }, p(this, E, improveWASMErrorReporting(t)), this.dispatchEvent({
+    }, m(this, w, improveWASMErrorReporting(t)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1105,13 +895,13 @@ class BasePHP {
       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?"
       );
-    p(this, H, e);
+    m(this, v, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
-    if (u(this, w))
+    if (d(this, y))
       throw new Error("Cannot set PHP ini path after calling run().");
-    p(this, C, e), this[__private__dont__use].ccall(
+    m(this, E, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -1120,17 +910,22 @@ class BasePHP {
   }
   /** @inheritDoc */
   setPhpIniEntry(e, t) {
-    if (u(this, w))
+    if (d(this, y))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    u(this, b).push([e, t]);
+    d(this, P).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
     this[__private__dont__use].FS.chdir(e);
   }
-  /** @inheritDoc */
+  /**
+   * Do not use. Use new PHPRequestHandler() instead.
+   * @deprecated
+   */
   async request(e) {
-    if (!this.requestHandler)
+    if (logger.warn(
+      "PHP.request() is deprecated. Please use new PHPRequestHandler() instead."
+    ), !this.requestHandler)
       throw new Error("No request handler available.");
     return this.requestHandler.request(e);
   }
@@ -1139,30 +934,30 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (u(this, w) || (f(this, U, se).call(this), p(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (d(this, y) || (p(this, x, z).call(this), m(this, y, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
-      f(this, G, he).call(this, e.scriptPath || ""), f(this, B, ie).call(this, e.relativeUri || ""), f(this, z, ce).call(this, e.method || "GET");
-      const s = normalizeHeaders(e.headers || {}), n = s.host || "example.com:443", o = f(this, q, le).call(this, n, e.protocol || "http");
-      f(this, D, oe).call(this, n), f(this, $, ae).call(this, o), f(this, j, ue).call(this, s), e.body && (r = f(this, V, de).call(this, e.body)), typeof e.code == "string" && f(this, Y, me).call(this, " ?>" + e.code);
-      const i = f(this, O, re).call(this, e.$_SERVER, s, o);
-      for (const l in i)
-        f(this, J, pe).call(this, l, i[l]);
+      p(this, A, Z).call(this, e.scriptPath || ""), p(this, k, $).call(this, e.relativeUri || ""), p(this, M, J).call(this, e.method || "GET");
+      const s = normalizeHeaders(e.headers || {}), n = s.host || "example.com:443", o = p(this, H, j).call(this, n, e.protocol || "http");
+      p(this, C, V).call(this, n), p(this, F, G).call(this, o), p(this, I, Q).call(this, s), e.body && (r = p(this, N, Y).call(this, e.body)), typeof e.code == "string" && p(this, W, ee).call(this, " ?>" + e.code);
+      const i = p(this, R, q).call(this, e.$_SERVER, s, o);
+      for (const c in i)
+        p(this, L, K).call(this, c, i[c]);
       const a = e.env || {};
-      for (const l in a)
-        f(this, Q, fe).call(this, l, a[l]);
-      const c = await f(this, K, _e).call(this);
-      if (c.exitCode !== 0) {
-        console.warn("PHP.run() output was:", c.text);
-        const l = new PHPExecutionFailureError(
-          `PHP.run() failed with exit code ${c.exitCode} and the following output: ` + c.errors,
-          c,
+      for (const c in a)
+        p(this, O, X).call(this, c, a[c]);
+      const l = await p(this, B, te).call(this);
+      if (l.exitCode !== 0) {
+        logger.warn("PHP.run() output was:", l.text);
+        const c = new PHPExecutionFailureError(
+          `PHP.run() failed with exit code ${l.exitCode} and the following output: ` + l.errors,
+          l,
           "request"
         );
-        throw console.error(l), l;
+        throw logger.error(c), c;
       }
-      return c;
+      return l;
     } catch (s) {
       throw this.dispatchEvent({
         type: "request.error",
@@ -1247,7 +1042,7 @@ class BasePHP {
       }
       return r;
     } catch (r) {
-      return console.error(r, { path: e }), [];
+      return logger.error(r, { path: e }), [];
     }
   }
   isDir(e) {
@@ -1278,7 +1073,7 @@ class BasePHP {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(e), u(this, C) && this.setPhpIniPath(u(this, C)), u(this, H) && this.setSapiName(u(this, H)), t && copyFS(r, this[__private__dont__use].FS, t);
+    this.initializeRuntime(e), d(this, E) && this.setPhpIniPath(d(this, E)), d(this, v) && this.setSapiName(d(this, v)), t && copyFS(r, this[__private__dont__use].FS, t);
   }
   exit(e = 0) {
     this.dispatchEvent({
@@ -1288,10 +1083,13 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    p(this, w, !1), p(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    m(this, y, !1), m(this, w, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+  }
+  [Symbol.dispose]() {
+    d(this, y) && this.exit(0);
   }
 }
-b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E = new WeakMap(), P = new WeakMap(), F = new WeakMap(), O = new WeakSet(), re = function(e, t, r) {
+P = new WeakMap(), E = new WeakMap(), v = new WeakMap(), y = new WeakMap(), w = new WeakMap(), g = new WeakMap(), b = new WeakMap(), R = new WeakSet(), q = function(e, t, r) {
   const s = {
     ...e || {}
   };
@@ -1301,7 +1099,7 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
     ["content-type", "content-length"].includes(n.toLowerCase()) && (o = ""), s[`${o}${n.toUpperCase().replace(/-/g, "_")}`] = t[n];
   }
   return s;
-}, U = new WeakSet(), se = function() {
+}, x = new WeakSet(), z = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -1313,8 +1111,8 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
 						}
 					}
 				}`
-  ), u(this, b).length > 0) {
-    const e = u(this, b).map(([t, r]) => `${t}=${r}`).join(`
+  ), d(this, P).length > 0) {
+    const e = d(this, P).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -1326,7 +1124,7 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, W = new WeakSet(), ne = function() {
+}, T = new WeakSet(), U = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -1343,7 +1141,7 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
     headers: r,
     httpStatusCode: t.status
   };
-}, B = new WeakSet(), ie = function(e) {
+}, k = new WeakSet(), $ = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1358,35 +1156,35 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
       [t]
     );
   }
-}, D = new WeakSet(), oe = function(e) {
+}, C = new WeakSet(), V = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
     [STRING],
     [e]
   );
-}, $ = new WeakSet(), ae = function(e) {
+}, F = new WeakSet(), G = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_port",
     null,
     [NUMBER],
     [e]
   );
-}, q = new WeakSet(), le = function(e, t) {
+}, H = new WeakSet(), j = function(e, t) {
   let r;
   try {
     r = parseInt(new URL(e).port, 10);
   } catch {
   }
   return (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), r;
-}, z = new WeakSet(), ce = function(e) {
+}, M = new WeakSet(), J = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
     [STRING],
     [e]
   );
-}, j = new WeakSet(), ue = function(e) {
+}, I = new WeakSet(), Q = function(e) {
   e.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -1403,9 +1201,9 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
     [NUMBER],
     [parseInt(e["content-length"], 10)]
   );
-}, V = new WeakSet(), de = function(e) {
+}, N = new WeakSet(), Y = function(e) {
   let t, r;
-  typeof e == "string" ? (console.warn(
+  typeof e == "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"
   ), r = this[__private__dont__use].lengthBytesUTF8(e), t = r + 1) : (r = e.byteLength, t = e.byteLength);
   const s = this[__private__dont__use].malloc(t);
@@ -1426,45 +1224,45 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
     [NUMBER],
     [r]
   ), s;
-}, G = new WeakSet(), he = function(e) {
+}, A = new WeakSet(), Z = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
     [STRING],
     [e]
   );
-}, J = new WeakSet(), pe = function(e, t) {
+}, L = new WeakSet(), K = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_SERVER_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, Q = new WeakSet(), fe = function(e, t) {
+}, O = new WeakSet(), X = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, Y = new WeakSet(), me = function(e) {
+}, W = new WeakSet(), ee = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_php_code",
     null,
     [STRING],
     [e]
   );
-}, K = new WeakSet(), _e = async function() {
+}, B = new WeakSet(), te = async function() {
   var n;
   let e, t;
   try {
     e = await new Promise((o, i) => {
-      var c;
-      t = (l) => {
-        console.error(l), console.error(l.error);
+      var l;
+      t = (c) => {
+        logger.error(c), logger.error(c.error);
         const h = new Error("Rethrown");
-        h.cause = l.error, h.betterMessage = l.message, i(h);
-      }, (c = u(this, E)) == null || c.addEventListener(
+        h.cause = c.error, h.betterMessage = c.message, i(h);
+      }, (l = d(this, w)) == null || l.addEventListener(
         "error",
         t
       );
@@ -1478,19 +1276,19 @@ b = new WeakMap(), C = new WeakMap(), H = new WeakMap(), w = new WeakMap(), E =
       return a instanceof Promise ? a.then(o, i) : o(a);
     });
   } catch (o) {
-    for (const l in this)
-      typeof this[l] == "function" && (this[l] = () => {
+    for (const c in this)
+      typeof this[c] == "function" && (this[c] = () => {
         throw new Error(
           "PHP runtime has crashed – see the earlier error for details."
         );
       });
     this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify();
-    const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, c = new Error(a);
-    throw c.cause = i, console.error(c), c;
+    const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, l = new Error(a);
+    throw l.cause = i, logger.error(l), l;
   } finally {
-    (n = u(this, E)) == null || n.removeEventListener("error", t);
+    (n = d(this, w)) == null || n.removeEventListener("error", t);
   }
-  const { headers: r, httpStatusCode: s } = f(this, W, ne).call(this);
+  const { headers: r, httpStatusCode: s } = p(this, T, U).call(this);
   return new PHPResponse(
     e === 0 ? s : 500,
     r,
@@ -1601,50 +1399,50 @@ function expose(e, t = globalThis, r = ["*"]) {
       console.warn(`Invalid origin '${n.origin}' for comlink proxy`);
       return;
     }
-    const { id: o, type: i, path: a } = Object.assign({ path: [] }, n.data), c = (n.data.argumentList || []).map(fromWireValue);
-    let l;
+    const { id: o, type: i, path: a } = Object.assign({ path: [] }, n.data), l = (n.data.argumentList || []).map(fromWireValue);
+    let c;
     try {
-      const h = a.slice(0, -1).reduce((m, A) => m[A], e), _ = a.reduce((m, A) => m[A], e);
+      const h = a.slice(0, -1).reduce((f, S) => f[S], e), _ = a.reduce((f, S) => f[S], e);
       switch (i) {
         case "GET":
-          l = _;
+          c = _;
           break;
         case "SET":
-          h[a.slice(-1)[0]] = fromWireValue(n.data.value), l = !0;
+          h[a.slice(-1)[0]] = fromWireValue(n.data.value), c = !0;
           break;
         case "APPLY":
-          l = _.apply(h, c);
+          c = _.apply(h, l);
           break;
         case "CONSTRUCT":
           {
-            const m = new _(...c);
-            l = proxy(m);
+            const f = new _(...l);
+            c = proxy(f);
           }
           break;
         case "ENDPOINT":
           {
-            const { port1: m, port2: A } = new MessageChannel();
-            expose(e, A), l = transfer(m, [m]);
+            const { port1: f, port2: S } = new MessageChannel();
+            expose(e, S), c = transfer(f, [f]);
           }
           break;
         case "RELEASE":
-          l = void 0;
+          c = void 0;
           break;
         default:
           return;
       }
     } catch (h) {
-      l = { value: h, [throwMarker]: 0 };
+      c = { value: h, [throwMarker]: 0 };
     }
-    Promise.resolve(l).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
-      const [_, m] = toWireValue(h);
-      t.postMessage(Object.assign(Object.assign({}, _), { id: o }), m), i === "RELEASE" && (t.removeEventListener("message", s), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
+    Promise.resolve(c).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
+      const [_, f] = toWireValue(h);
+      t.postMessage(Object.assign(Object.assign({}, _), { id: o }), f), i === "RELEASE" && (t.removeEventListener("message", s), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
     }).catch((h) => {
-      const [_, m] = toWireValue({
+      const [_, f] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      t.postMessage(Object.assign(Object.assign({}, _), { id: o }), m);
+      t.postMessage(Object.assign(Object.assign({}, _), { id: o }), f);
     });
   }), t.start && t.start();
 }
@@ -1693,7 +1491,7 @@ function createProxy(e, t = [], r = function() {
           return { then: () => n };
         const a = requestResponseMessage(e, {
           type: "GET",
-          path: t.map((c) => c.toString())
+          path: t.map((l) => l.toString())
         }).then(fromWireValue);
         return a.then.bind(a);
       }
@@ -1701,37 +1499,37 @@ function createProxy(e, t = [], r = function() {
     },
     set(o, i, a) {
       throwIfProxyReleased(s);
-      const [c, l] = toWireValue(a);
+      const [l, c] = toWireValue(a);
       return requestResponseMessage(e, {
         type: "SET",
         path: [...t, i].map((h) => h.toString()),
-        value: c
-      }, l).then(fromWireValue);
+        value: l
+      }, c).then(fromWireValue);
     },
     apply(o, i, a) {
       throwIfProxyReleased(s);
-      const c = t[t.length - 1];
-      if (c === createEndpoint)
+      const l = t[t.length - 1];
+      if (l === createEndpoint)
         return requestResponseMessage(e, {
           type: "ENDPOINT"
         }).then(fromWireValue);
-      if (c === "bind")
+      if (l === "bind")
         return createProxy(e, t.slice(0, -1));
-      const [l, h] = processArguments(a);
+      const [c, h] = processArguments(a);
       return requestResponseMessage(e, {
         type: "APPLY",
         path: t.map((_) => _.toString()),
-        argumentList: l
+        argumentList: c
       }, h).then(fromWireValue);
     },
     construct(o, i) {
       throwIfProxyReleased(s);
-      const [a, c] = processArguments(i);
+      const [a, l] = processArguments(i);
       return requestResponseMessage(e, {
         type: "CONSTRUCT",
-        path: t.map((l) => l.toString()),
+        path: t.map((c) => c.toString()),
         argumentList: a
-      }, c).then(fromWireValue);
+      }, l).then(fromWireValue);
     }
   });
   return registerProxy(n, e), n;
@@ -1820,10 +1618,10 @@ function exposeAPI(e, t) {
   setupTransferHandlers();
   const r = Promise.resolve();
   let s, n;
-  const o = new Promise((c, l) => {
-    s = c, n = l;
+  const o = new Promise((l, c) => {
+    s = l, n = c;
   }), i = proxyClone(e), a = new Proxy(i, {
-    get: (c, l) => l === "isConnected" ? () => r : l === "isReady" ? () => o : l in c ? c[l] : t == null ? void 0 : t[l]
+    get: (l, c) => c === "isConnected" ? () => r : c === "isReady" ? () => o : c in l ? l[c] : t == null ? void 0 : t[c]
   });
   return expose(
     a,
@@ -1846,7 +1644,7 @@ function setupTransferHandlers() {
   }), transferHandlers.set("FUNCTION", {
     canHandle: (r) => typeof r == "function",
     serialize(r) {
-      console.debug("[Comlink][Performance] Proxying a function");
+      logger.debug("[Comlink][Performance] Proxying a function");
       const { port1: s, port2: n } = new MessageChannel();
       return expose(r, s), [n, [n]];
     },
@@ -1960,10 +1758,7 @@ class WebPHP extends BasePHP {
    * @returns A new PHP instance
    */
   static async load(t, r = {}) {
-    return new WebPHP(
-      await WebPHP.loadRuntime(t, r),
-      r.requestHandler
-    );
+    return new WebPHP(await WebPHP.loadRuntime(t, r));
   }
   static async loadRuntime(t, r = {}) {
     var o;
@@ -1979,17 +1774,33 @@ class WebPHPEndpoint {
   /** @inheritDoc */
   constructor(t, r) {
     _private.set(this, {
-      php: t,
-      monitor: r
+      monitor: r,
+      requestHandler: t
     }), this.absoluteUrl = t.absoluteUrl, this.documentRoot = t.documentRoot;
   }
-  /** @inheritDoc @php-wasm/universal!RequestHandler.pathToInternalUrl  */
+  /**
+   * @internal
+   * @deprecated
+   * Do not use this method directly in the code consuming
+   * the web API. It will change or even be removed without
+   * a warning.
+   */
+  __internal_getPHP() {
+    return _private.get(this).php;
+  }
+  async setPrimaryPHP(t) {
+    _private.set(this, {
+      ..._private.get(this),
+      php: t
+    });
+  }
+  /** @inheritDoc @php-wasm/universal!PHPRequestHandler.pathToInternalUrl  */
   pathToInternalUrl(t) {
-    return _private.get(this).php.pathToInternalUrl(t);
+    return _private.get(this).requestHandler.pathToInternalUrl(t);
   }
-  /** @inheritDoc @php-wasm/universal!RequestHandler.internalUrlToPath  */
+  /** @inheritDoc @php-wasm/universal!PHPRequestHandler.internalUrlToPath  */
   internalUrlToPath(t) {
-    return _private.get(this).php.internalUrlToPath(t);
+    return _private.get(this).requestHandler.internalUrlToPath(t);
   }
   /**
    * The onDownloadProgress event listener.
@@ -1999,20 +1810,25 @@ class WebPHPEndpoint {
     return (r = _private.get(this).monitor) == null ? void 0 : r.addEventListener("progress", t);
   }
   /** @inheritDoc @php-wasm/universal!IsomorphicLocalPHP.mv  */
-  mv(t, r) {
+  async mv(t, r) {
     return _private.get(this).php.mv(t, r);
   }
   /** @inheritDoc @php-wasm/universal!IsomorphicLocalPHP.rmdir  */
-  rmdir(t, r) {
+  async rmdir(t, r) {
     return _private.get(this).php.rmdir(t, r);
   }
-  /** @inheritDoc @php-wasm/universal!RequestHandler.request */
-  request(t) {
-    return _private.get(this).php.request(t);
+  /** @inheritDoc @php-wasm/universal!PHPRequestHandler.request */
+  async request(t) {
+    return await _private.get(this).requestHandler.request(t);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.run */
   async run(t) {
-    return _private.get(this).php.run(t);
+    const { php: r, reap: s } = await _private.get(this).requestHandler.processManager.acquirePHPInstance();
+    try {
+      return await r.run(t);
+    } finally {
+      s();
+    }
   }
   /** @inheritDoc @php-wasm/web!WebPHP.chdir */
   chdir(t) {
@@ -2098,7 +1914,7 @@ async function registerServiceWorker(e, t, r) {
     ) : new PhpWasmError(
       "WordPress Playground uses service workers and may only work on HTTPS and http://localhost/ sites, but the current site is neither."
     );
-  console.debug("[window][sw] Registering a Service Worker"), await (await s.register(r, {
+  logger.debug("[window][sw] Registering a Service Worker"), await (await s.register(r, {
     type: "module",
     // Always bypass HTTP cache when fetching the new Service Worker script:
     updateViaCache: "none"
@@ -2107,8 +1923,8 @@ async function registerServiceWorker(e, t, r) {
     async function(i) {
       if (t && i.data.scope !== t)
         return;
-      const a = i.data.args || [], c = i.data.method, l = await e[c](...a);
-      i.source.postMessage(responseTo(i.data.requestId, l));
+      const a = i.data.args || [], l = i.data.method, c = await e[l](...a);
+      i.source.postMessage(responseTo(i.data.requestId, c));
     }
   ), s.startMessages();
 }