@php-wasm/web 0.6.16 → 0.7.0

package/index.js

@@ -1,13 +1,13 @@
-var K = (e, t, r) => {
+var Z = (e, t, r) => {
   if (!t.has(e))
     throw TypeError("Cannot " + r);
 };
-var u = (e, t, r) => (K(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => {
+var u = (e, t, r) => (Z(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (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) => (K(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
-var f = (e, t, r) => (K(e, t, "access private method"), 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);
 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(), 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();
+        ).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();
       }
     });
   });
@@ -226,18 +226,40 @@ function extractPHPFunctionsFromStack(e) {
     return [];
   }
 }
+const SleepFinished = Symbol("SleepFinished");
+function sleep(e) {
+  return new Promise((t) => {
+    setTimeout(() => t(SleepFinished), e);
+  });
+}
+class AcquireTimeoutError extends Error {
+  constructor() {
+    super("Acquiring lock timed out");
+  }
+}
 class Semaphore {
-  constructor({ concurrency: t }) {
-    this._running = 0, this.concurrency = t, this.queue = [];
+  constructor({ concurrency: t, timeout: r }) {
+    this._running = 0, this.concurrency = t, this.timeout = r, this.queue = [];
+  }
+  get remaining() {
+    return this.concurrency - this.running;
   }
   get running() {
     return this._running;
   }
   async acquire() {
     for (; ; )
-      if (this._running >= this.concurrency)
-        await new Promise((t) => this.queue.push(t));
-      else {
+      if (this._running >= this.concurrency) {
+        const t = new Promise((r) => {
+          this.queue.push(r);
+        });
+        this.timeout !== void 0 ? await Promise.race([t, sleep(this.timeout)]).then(
+          (r) => {
+            if (r === SleepFinished)
+              throw new AcquireTimeoutError();
+          }
+        ) : await t;
+      } else {
         this._running++;
         let t = !1;
         return () => {
@@ -287,8 +309,8 @@ function splitShellCommand(e) {
   const o = [];
   let i = "";
   for (let a = 0; a < e.length; a++) {
-    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);
+    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);
   }
   return i && o.push(i.trim()), o;
 }
@@ -421,96 +443,7 @@ const SupportedPHPVersions = [
   "7.2",
   "7.1",
   "7.0"
-], LatestSupportedPHPVersion = SupportedPHPVersions[0];
-var R, T;
-class PHPBrowser {
-  /**
-   * @param  server - The PHP server to browse.
-   * @param  config - The browser configuration.
-   */
-  constructor(t, r = {}) {
-    d(this, R, void 0);
-    d(this, T, void 0);
-    this.requestHandler = t, p(this, R, {}), p(this, T, {
-      handleRedirects: !1,
-      maxRedirects: 4,
-      ...r
-    });
-  }
-  /**
-   * Sends the request to the server.
-   *
-   * When cookies are present in the response, this method stores
-   * them and sends them with any subsequent requests.
-   *
-   * When a redirection is present in the response, this method
-   * follows it by discarding a response and sending a subsequent
-   * request.
-   *
-   * @param  request   - The request.
-   * @param  redirects - Internal. The number of redirects handled so far.
-   * @returns PHPRequestHandler response.
-   */
-  async request(t, r = 0) {
-    const s = await this.requestHandler.request({
-      ...t,
-      headers: {
-        ...t.headers,
-        cookie: this.serializeCookies()
-      }
-    });
-    if (s.headers["set-cookie"] && this.setCookies(s.headers["set-cookie"]), u(this, T).handleRedirects && s.headers.location && r < u(this, T).maxRedirects) {
-      const n = new URL(
-        s.headers.location[0],
-        this.requestHandler.absoluteUrl
-      );
-      return this.request(
-        {
-          url: n.toString(),
-          method: "GET",
-          headers: {}
-        },
-        r + 1
-      );
-    }
-    return s;
-  }
-  /** @inheritDoc */
-  pathToInternalUrl(t) {
-    return this.requestHandler.pathToInternalUrl(t);
-  }
-  /** @inheritDoc */
-  internalUrlToPath(t) {
-    return this.requestHandler.internalUrlToPath(t);
-  }
-  /** @inheritDoc */
-  get absoluteUrl() {
-    return this.requestHandler.absoluteUrl;
-  }
-  /** @inheritDoc */
-  get documentRoot() {
-    return this.requestHandler.documentRoot;
-  }
-  setCookies(t) {
-    for (const r of t)
-      try {
-        if (!r.includes("="))
-          continue;
-        const s = r.indexOf("="), n = r.substring(0, s), o = r.substring(s + 1).split(";")[0];
-        u(this, R)[n] = o;
-      } catch (s) {
-        console.error(s);
-      }
-  }
-  serializeCookies() {
-    const t = [];
-    for (const r in u(this, R))
-      t.push(`${r}=${u(this, R)[r]}`);
-    return t.join("; ");
-  }
-}
-R = new WeakMap(), T = new WeakMap();
-const DEFAULT_BASE_URL = "http://example.com";
+], LatestSupportedPHPVersion = SupportedPHPVersions[0], DEFAULT_BASE_URL = "http://example.com";
 function toRelativeUrl(e) {
   return e.toString().substring(e.origin.length);
 }
@@ -522,22 +455,22 @@ function ensurePathPrefix(e, t) {
 }
 async function encodeAsMultipart(e) {
   const t = `----${Math.random().toString(36).slice(2)}`, r = `multipart/form-data; boundary=${t}`, s = new TextEncoder(), n = [];
-  for (const [l, c] of Object.entries(e))
+  for (const [c, l] of Object.entries(e))
     n.push(`--${t}\r
-`), n.push(`Content-Disposition: form-data; name="${l}"`), c instanceof File && n.push(`; filename="${c.name}"`), n.push(`\r
-`), c instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\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
-`), c instanceof File ? n.push(await fileToUint8Array(c)) : n.push(c), 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((l, c) => l + c.length, 0), i = new Uint8Array(o);
+  const o = n.reduce((c, l) => c + l.length, 0), i = new Uint8Array(o);
   let a = 0;
-  for (const l of n)
+  for (const c of n)
     i.set(
-      typeof l == "string" ? s.encode(l) : l,
+      typeof c == "string" ? s.encode(c) : c,
       a
-    ), a += l.length;
+    ), a += c.length;
   return { bytes: i, contentType: r };
 }
 function fileToUint8Array(e) {
@@ -548,7 +481,30 @@ function fileToUint8Array(e) {
     }, r.readAsArrayBuffer(e);
   });
 }
-var g, H, N, b, k, y, C, S, L, Z, O, X, U, ee;
+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.
@@ -561,7 +517,7 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    d(this, L);
+    d(this, I);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -569,7 +525,7 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    d(this, O);
+    d(this, N);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -579,55 +535,120 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    d(this, U);
+    d(this, L);
     d(this, g, void 0);
-    d(this, H, void 0);
-    d(this, N, void 0);
-    d(this, b, void 0);
-    d(this, k, void 0);
-    d(this, y, void 0);
-    d(this, C, void 0);
+    d(this, x, void 0);
+    d(this, M, void 0);
+    d(this, v, void 0);
     d(this, S, void 0);
-    p(this, S, new Semaphore({ concurrency: 1 }));
+    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, g, s);
+    this.php = t, p(this, k, new HttpCookieStore()), p(this, g, s);
     const i = new URL(n);
-    p(this, N, i.hostname), p(this, b, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), p(this, H, (i.protocol || "").replace(":", ""));
-    const a = u(this, b) !== 443 && u(this, b) !== 80;
-    p(this, k, [
-      u(this, N),
-      a ? `:${u(this, b)}` : ""
-    ].join("")), p(this, y, i.pathname.replace(/\/+$/, "")), p(this, C, [
-      `${u(this, H)}://`,
-      u(this, k),
+    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;
   }
-  /** @inheritDoc */
+  /**
+   * 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}`;
   }
-  /** @inheritDoc */
+  /**
+   * 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, S).running > 0;
+    return u(this, R).running > 0;
   }
-  /** @inheritDoc */
+  /**
+   * The absolute URL of this PHPRequestHandler instance.
+   */
   get absoluteUrl() {
-    return u(this, C);
+    return u(this, T);
   }
-  /** @inheritDoc */
+  /**
+   * 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);
   }
-  /** @inheritDoc */
+  /**
+   * 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.
@@ -640,10 +661,10 @@ class PHPRequestHandler {
       ),
       this.rewriteRules
     ), o = joinPaths(u(this, g), n);
-    return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, O, X).call(this, t, s) : f(this, L, Z).call(this, o);
+    return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, N, ee).call(this, t, s) : f(this, I, X).call(this, o);
   }
 }
-g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k = new WeakMap(), y = new WeakMap(), C = new WeakMap(), S = new WeakMap(), L = new WeakSet(), Z = function(t) {
+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,
@@ -668,9 +689,9 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
     },
     r
   );
-}, O = new WeakSet(), X = async function(t, r) {
+}, N = new WeakSet(), ee = async function(t, r) {
   var n;
-  if (u(this, S).running > 0 && ((n = t.headers) == null ? void 0 : n["x-request-issuer"]) === "php")
+  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(
@@ -678,26 +699,23 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
       {},
       new TextEncoder().encode("502 Bad Gateway")
     );
-  const s = await u(this, S).acquire();
+  const s = await u(this, R).acquire();
   try {
-    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", u(this, g)), this.php.addServerGlobalEntry(
-      "HTTPS",
-      u(this, C).startsWith("https://") ? "on" : ""
-    );
     let o = "GET";
     const i = {
-      host: u(this, k),
-      ...normalizeHeaders(t.headers || {})
+      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: c, contentType: h } = await encodeAsMultipart(a);
-      a = c, i["content-type"] = h;
+      const { bytes: l, contentType: h } = await encodeAsMultipart(a);
+      a = l, i["content-type"] = h;
     }
-    let l;
+    let c;
     try {
-      l = f(this, U, ee).call(this, decodeURIComponent(r.pathname));
+      c = f(this, L, te).call(this, decodeURIComponent(r.pathname));
     } catch {
       return new PHPResponse(
         404,
@@ -706,27 +724,35 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
       );
     }
     try {
-      return await this.php.run({
+      const l = await this.php.run({
         relativeUri: ensurePathPrefix(
           toRelativeUrl(r),
           u(this, y)
         ),
-        protocol: u(this, H),
+        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: l,
+        scriptPath: c,
         headers: i
       });
-    } catch (c) {
-      const h = c;
+      return u(this, k).rememberCookiesFromResponseHeaders(
+        l.headers
+      ), l;
+    } catch (l) {
+      const h = l;
       if (h != null && h.response)
         return h.response;
-      throw c;
+      throw l;
     }
   } finally {
     s();
   }
-}, U = new WeakSet(), ee = function(t) {
+}, 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}`;
@@ -770,6 +796,38 @@ function inferMimeType(e) {
     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";
   }
@@ -880,10 +938,10 @@ function rethrowFileSystemError(e = "") {
       try {
         return o.apply(this, i);
       } catch (a) {
-        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}`, {
+        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}`, {
             cause: a
           });
         }
@@ -939,7 +997,7 @@ class PHPExecutionFailureError extends Error {
     super(t), this.response = r, this.source = s;
   }
 }
-var x, F, A, w, E, v, P, M, W, te, q, re, B, se, D, ne, $, ie, z, oe, j, ae, G, le, V, ce, J, ue, Q, de, Y, he;
+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;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -949,29 +1007,38 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
+    /**
+     * Prepares the $_SERVER entries for the PHP runtime.
+     *
+     * @param defaults Default entries to include in $_SERVER.
+     * @param headers HTTP headers to include in $_SERVER (as HTTP_ prefixed entries).
+     * @param port HTTP port, used to determine infer $_SERVER['HTTPS'] value if none
+     *             was provided.
+     * @returns Computed $_SERVER entries.
+     */
+    d(this, O);
+    d(this, U);
     d(this, W);
-    d(this, q);
     d(this, B);
     d(this, D);
     d(this, $);
+    d(this, q);
     d(this, z);
     d(this, j);
-    d(this, G);
     d(this, V);
+    d(this, G);
     d(this, J);
     d(this, Q);
     d(this, Y);
-    d(this, x, void 0);
-    d(this, F, void 0);
-    d(this, A, void 0);
+    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, v, void 0);
     d(this, P, void 0);
-    d(this, M, void 0);
-    p(this, x, []), p(this, w, !1), p(this, E, null), p(this, v, {}), p(this, P, /* @__PURE__ */ new Map()), p(this, M, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
-      new PHPRequestHandler(this, t)
-    ));
+    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));
   }
   addEventListener(e, t) {
     u(this, P).has(e) || u(this, P).set(e, /* @__PURE__ */ new Set()), u(this, P).get(e).add(t);
@@ -988,7 +1055,7 @@ class BasePHP {
   }
   /** @inheritDoc */
   async onMessage(e) {
-    u(this, M).push(e);
+    u(this, F).push(e);
   }
   /** @inheritDoc */
   async setSpawnHandler(handler) {
@@ -996,21 +1063,19 @@ class BasePHP {
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return this.requestHandler.requestHandler.absoluteUrl;
+    return this.requestHandler.absoluteUrl;
   }
   /** @inheritDoc */
   get documentRoot() {
-    return this.requestHandler.requestHandler.documentRoot;
+    return this.requestHandler.documentRoot;
   }
   /** @inheritDoc */
   pathToInternalUrl(e) {
-    return this.requestHandler.requestHandler.pathToInternalUrl(e);
+    return this.requestHandler.pathToInternalUrl(e);
   }
   /** @inheritDoc */
   internalUrlToPath(e) {
-    return this.requestHandler.requestHandler.internalUrlToPath(
-      e
-    );
+    return this.requestHandler.internalUrlToPath(e);
   }
   initializeRuntime(e) {
     if (this[__private__dont__use])
@@ -1019,7 +1084,7 @@ 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, M)) {
+      for (const s of u(this, F)) {
         const n = await s(r);
         if (n)
           return n;
@@ -1040,13 +1105,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, A, e);
+    p(this, H, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
     if (u(this, w))
       throw new Error("Cannot set PHP ini path after calling run().");
-    p(this, F, e), this[__private__dont__use].ccall(
+    p(this, C, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -1057,44 +1122,47 @@ class BasePHP {
   setPhpIniEntry(e, t) {
     if (u(this, w))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    u(this, x).push([e, t]);
+    u(this, b).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
     this[__private__dont__use].FS.chdir(e);
   }
   /** @inheritDoc */
-  async request(e, t) {
+  async request(e) {
     if (!this.requestHandler)
       throw new Error("No request handler available.");
-    return this.requestHandler.request(e, t);
+    return this.requestHandler.request(e);
   }
   /** @inheritDoc */
   async run(e) {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (u(this, w) || (f(this, W, te).call(this), p(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (u(this, w) || (f(this, U, se).call(this), p(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
-      f(this, G, le).call(this, e.scriptPath || ""), f(this, B, se).call(this, e.relativeUri || ""), f(this, $, ie).call(this, e.method || "GET");
-      const s = normalizeHeaders(e.headers || {}), n = s.host || "example.com:443";
-      f(this, D, ne).call(this, n, e.protocol || "http"), f(this, z, oe).call(this, s), e.body && (r = f(this, j, ae).call(this, e.body)), typeof e.code == "string" && f(this, Q, de).call(this, " ?>" + e.code), f(this, V, ce).call(this);
-      const o = e.env || {};
-      for (const a in o)
-        f(this, J, ue).call(this, a, o[a]);
-      const i = await f(this, Y, he).call(this);
-      if (i.exitCode !== 0) {
-        console.warn("PHP.run() output was:", i.text);
-        const a = new PHPExecutionFailureError(
-          `PHP.run() failed with exit code ${i.exitCode} and the following output: ` + i.errors,
-          i,
+      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]);
+      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,
           "request"
         );
-        throw console.error(a), a;
+        throw console.error(l), l;
       }
-      return i;
+      return c;
     } catch (s) {
       throw this.dispatchEvent({
         type: "request.error",
@@ -1112,9 +1180,6 @@ class BasePHP {
       }
     }
   }
-  addServerGlobalEntry(e, t) {
-    u(this, v)[e] = t;
-  }
   defineConstant(e, t) {
     let r = {};
     try {
@@ -1202,17 +1267,18 @@ class BasePHP {
    * interrupting the operations of this PHP instance.
    *
    * @param runtime
+   * @param cwd. Internal, the VFS path to recreate in the new runtime.
+   *             This arg is temporary and will be removed once BasePHP
+   *             is fully decoupled from the request handler and
+   *             accepts a constructor-level cwd argument.
    */
-  hotSwapPHPRuntime(e) {
-    const t = this[__private__dont__use].FS;
+  hotSwapPHPRuntime(e, t) {
+    const r = this[__private__dont__use].FS;
     try {
       this.exit();
     } catch {
     }
-    if (this.initializeRuntime(e), u(this, F) && this.setPhpIniPath(u(this, F)), u(this, A) && this.setSapiName(u(this, A)), this.requestHandler) {
-      const r = this.documentRoot;
-      copyFS(t, this[__private__dont__use].FS, r);
-    }
+    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);
   }
   exit(e = 0) {
     this.dispatchEvent({
@@ -1225,7 +1291,17 @@ class BasePHP {
     p(this, w, !1), p(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
-x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E = new WeakMap(), v = new WeakMap(), P = new WeakMap(), M = new WeakMap(), W = new WeakSet(), te = function() {
+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) {
+  const s = {
+    ...e || {}
+  };
+  s.HTTPS = s.HTTPS || r === 443 ? "on" : "off";
+  for (const n in t) {
+    let o = "HTTP_";
+    ["content-type", "content-length"].includes(n.toLowerCase()) && (o = ""), s[`${o}${n.toUpperCase().replace(/-/g, "_")}`] = t[n];
+  }
+  return s;
+}, U = new WeakSet(), se = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -1237,8 +1313,8 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
 						}
 					}
 				}`
-  ), u(this, x).length > 0) {
-    const e = u(this, x).map(([t, r]) => `${t}=${r}`).join(`
+  ), u(this, b).length > 0) {
+    const e = u(this, b).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -1250,7 +1326,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, q = new WeakSet(), re = function() {
+}, W = new WeakSet(), ne = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -1267,7 +1343,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     headers: r,
     httpStatusCode: t.status
   };
-}, B = new WeakSet(), se = function(e) {
+}, B = new WeakSet(), ie = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1282,32 +1358,35 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
       [t]
     );
   }
-}, D = new WeakSet(), ne = function(e, t) {
+}, D = new WeakSet(), oe = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
     [STRING],
     [e]
   );
+}, $ = new WeakSet(), ae = function(e) {
+  this[__private__dont__use].ccall(
+    "wasm_set_request_port",
+    null,
+    [NUMBER],
+    [e]
+  );
+}, q = new WeakSet(), le = function(e, t) {
   let r;
   try {
     r = parseInt(new URL(e).port, 10);
   } catch {
   }
-  (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), this[__private__dont__use].ccall(
-    "wasm_set_request_port",
-    null,
-    [NUMBER],
-    [r]
-  ), (t === "https" || !t && r === 443) && this.addServerGlobalEntry("HTTPS", "on");
-}, $ = new WeakSet(), ie = function(e) {
+  return (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), r;
+}, z = new WeakSet(), ce = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
     [STRING],
     [e]
   );
-}, z = new WeakSet(), oe = function(e) {
+}, j = new WeakSet(), ue = function(e) {
   e.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -1324,14 +1403,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     [NUMBER],
     [parseInt(e["content-length"], 10)]
   );
-  for (const t in e) {
-    let r = "HTTP_";
-    ["content-type", "content-length"].includes(t.toLowerCase()) && (r = ""), this.addServerGlobalEntry(
-      `${r}${t.toUpperCase().replace(/-/g, "_")}`,
-      e[t]
-    );
-  }
-}, j = new WeakSet(), ae = function(e) {
+}, V = new WeakSet(), de = function(e) {
   let t, r;
   typeof e == "string" ? (console.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"
@@ -1354,46 +1426,45 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     [NUMBER],
     [r]
   ), s;
-}, G = new WeakSet(), le = function(e) {
+}, G = new WeakSet(), he = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
     [STRING],
     [e]
   );
-}, V = new WeakSet(), ce = function() {
-  for (const e in u(this, v))
-    this[__private__dont__use].ccall(
-      "wasm_add_SERVER_entry",
-      null,
-      [STRING, STRING],
-      [e, u(this, v)[e]]
-    );
-}, J = new WeakSet(), ue = function(e, t) {
+}, J = new WeakSet(), pe = function(e, t) {
+  this[__private__dont__use].ccall(
+    "wasm_add_SERVER_entry",
+    null,
+    [STRING, STRING],
+    [e, t]
+  );
+}, Q = new WeakSet(), fe = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, Q = new WeakSet(), de = function(e) {
+}, Y = new WeakSet(), me = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_php_code",
     null,
     [STRING],
     [e]
   );
-}, Y = new WeakSet(), he = async function() {
+}, K = new WeakSet(), _e = async function() {
   var n;
   let e, t;
   try {
     e = await new Promise((o, i) => {
-      var l;
-      t = (c) => {
-        console.error(c), console.error(c.error);
+      var c;
+      t = (l) => {
+        console.error(l), console.error(l.error);
         const h = new Error("Rethrown");
-        h.cause = c.error, h.betterMessage = c.message, i(h);
-      }, (l = u(this, E)) == null || l.addEventListener(
+        h.cause = l.error, h.betterMessage = l.message, i(h);
+      }, (c = u(this, E)) == null || c.addEventListener(
         "error",
         t
       );
@@ -1407,19 +1478,19 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
       return a instanceof Promise ? a.then(o, i) : o(a);
     });
   } catch (o) {
-    for (const c in this)
-      typeof this[c] == "function" && (this[c] = () => {
+    for (const l in this)
+      typeof this[l] == "function" && (this[l] = () => {
         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, l = new Error(a);
-    throw l.cause = i, console.error(l), l;
+    const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, c = new Error(a);
+    throw c.cause = i, console.error(c), c;
   } finally {
-    (n = u(this, E)) == null || n.removeEventListener("error", t), p(this, v, {});
+    (n = u(this, E)) == null || n.removeEventListener("error", t);
   }
-  const { headers: r, httpStatusCode: s } = f(this, q, re).call(this);
+  const { headers: r, httpStatusCode: s } = f(this, W, ne).call(this);
   return new PHPResponse(
     e === 0 ? s : 500,
     r,
@@ -1530,42 +1601,42 @@ 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), l = (n.data.argumentList || []).map(fromWireValue);
-    let c;
+    const { id: o, type: i, path: a } = Object.assign({ path: [] }, n.data), c = (n.data.argumentList || []).map(fromWireValue);
+    let l;
     try {
-      const h = a.slice(0, -1).reduce((m, I) => m[I], e), _ = a.reduce((m, I) => m[I], e);
+      const h = a.slice(0, -1).reduce((m, A) => m[A], e), _ = a.reduce((m, A) => m[A], e);
       switch (i) {
         case "GET":
-          c = _;
+          l = _;
           break;
         case "SET":
-          h[a.slice(-1)[0]] = fromWireValue(n.data.value), c = !0;
+          h[a.slice(-1)[0]] = fromWireValue(n.data.value), l = !0;
           break;
         case "APPLY":
-          c = _.apply(h, l);
+          l = _.apply(h, c);
           break;
         case "CONSTRUCT":
           {
-            const m = new _(...l);
-            c = proxy(m);
+            const m = new _(...c);
+            l = proxy(m);
           }
           break;
         case "ENDPOINT":
           {
-            const { port1: m, port2: I } = new MessageChannel();
-            expose(e, I), c = transfer(m, [m]);
+            const { port1: m, port2: A } = new MessageChannel();
+            expose(e, A), l = transfer(m, [m]);
           }
           break;
         case "RELEASE":
-          c = void 0;
+          l = void 0;
           break;
         default:
           return;
       }
     } catch (h) {
-      c = { value: h, [throwMarker]: 0 };
+      l = { value: h, [throwMarker]: 0 };
     }
-    Promise.resolve(c).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
+    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]());
     }).catch((h) => {
@@ -1622,7 +1693,7 @@ function createProxy(e, t = [], r = function() {
           return { then: () => n };
         const a = requestResponseMessage(e, {
           type: "GET",
-          path: t.map((l) => l.toString())
+          path: t.map((c) => c.toString())
         }).then(fromWireValue);
         return a.then.bind(a);
       }
@@ -1630,37 +1701,37 @@ function createProxy(e, t = [], r = function() {
     },
     set(o, i, a) {
       throwIfProxyReleased(s);
-      const [l, c] = toWireValue(a);
+      const [c, l] = toWireValue(a);
       return requestResponseMessage(e, {
         type: "SET",
         path: [...t, i].map((h) => h.toString()),
-        value: l
-      }, c).then(fromWireValue);
+        value: c
+      }, l).then(fromWireValue);
     },
     apply(o, i, a) {
       throwIfProxyReleased(s);
-      const l = t[t.length - 1];
-      if (l === createEndpoint)
+      const c = t[t.length - 1];
+      if (c === createEndpoint)
         return requestResponseMessage(e, {
           type: "ENDPOINT"
         }).then(fromWireValue);
-      if (l === "bind")
+      if (c === "bind")
         return createProxy(e, t.slice(0, -1));
-      const [c, h] = processArguments(a);
+      const [l, h] = processArguments(a);
       return requestResponseMessage(e, {
         type: "APPLY",
         path: t.map((_) => _.toString()),
-        argumentList: c
+        argumentList: l
       }, h).then(fromWireValue);
     },
     construct(o, i) {
       throwIfProxyReleased(s);
-      const [a, l] = processArguments(i);
+      const [a, c] = processArguments(i);
       return requestResponseMessage(e, {
         type: "CONSTRUCT",
-        path: t.map((c) => c.toString()),
+        path: t.map((l) => l.toString()),
         argumentList: a
-      }, l).then(fromWireValue);
+      }, c).then(fromWireValue);
     }
   });
   return registerProxy(n, e), n;
@@ -1749,10 +1820,10 @@ function exposeAPI(e, t) {
   setupTransferHandlers();
   const r = Promise.resolve();
   let s, n;
-  const o = new Promise((l, c) => {
-    s = l, n = c;
+  const o = new Promise((c, l) => {
+    s = c, n = l;
   }), i = proxyClone(e), a = new Proxy(i, {
-    get: (l, c) => c === "isConnected" ? () => r : c === "isReady" ? () => o : c in l ? l[c] : t == null ? void 0 : t[c]
+    get: (c, l) => l === "isConnected" ? () => r : l === "isReady" ? () => o : l in c ? c[l] : t == null ? void 0 : t[l]
   });
   return expose(
     a,
@@ -1897,9 +1968,7 @@ class WebPHP extends BasePHP {
   static async loadRuntime(t, r = {}) {
     var o;
     const s = r.loadAllExtensions ? "kitchen-sink" : "light", n = await getPHPLoaderModule(t, s);
-    return (o = r.downloadMonitor) == null || o.expectAssets({
-      [n.dependencyFilename]: n.dependenciesTotalSize
-    }), await loadPHPRuntime(n, {
+    return (o = r.onPhpLoaderModuleLoaded) == null || o.call(r, n), await loadPHPRuntime(n, {
       ...r.emscriptenOptions || {},
       ...fakeWebsocket()
     });
@@ -1938,17 +2007,13 @@ class WebPHPEndpoint {
     return _private.get(this).php.rmdir(t, r);
   }
   /** @inheritDoc @php-wasm/universal!RequestHandler.request */
-  request(t, r) {
-    return _private.get(this).php.request(t, r);
+  request(t) {
+    return _private.get(this).php.request(t);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.run */
   async run(t) {
     return _private.get(this).php.run(t);
   }
-  /** @inheritDoc @php-wasm/web!WebPHP.setSpawnHandler */
-  setSpawnHandler(t) {
-    _private.get(this).php.setSpawnHandler(t);
-  }
   /** @inheritDoc @php-wasm/web!WebPHP.chdir */
   chdir(t) {
     return _private.get(this).php.chdir(t);
@@ -2042,8 +2107,8 @@ async function registerServiceWorker(e, t, r) {
     async function(i) {
       if (t && i.data.scope !== t)
         return;
-      const a = i.data.args || [], l = i.data.method, c = await e[l](...a);
-      i.source.postMessage(responseTo(i.data.requestId, c));
+      const a = i.data.args || [], c = i.data.method, l = await e[c](...a);
+      i.source.postMessage(responseTo(i.data.requestId, l));
     }
   ), s.startMessages();
 }