@php-wasm/universal 1.0.20 → 1.0.22

package/index.js

@@ -1,13 +1,13 @@
-var G = (t, e, r) => {
+var V = (t, e, r) => {
   if (!e.has(t))
     throw TypeError("Cannot " + r);
 };
-var p = (t, e, r) => (G(t, e, "read from private field"), r ? r.call(t) : e.get(t)), u = (t, e, r) => {
+var c = (t, e, r) => (V(t, e, "read from private field"), r ? r.call(t) : e.get(t)), u = (t, e, r) => {
   if (e.has(t))
     throw TypeError("Cannot add the same private member more than once");
   e instanceof WeakSet ? e.add(t) : e.set(t, r);
-}, d = (t, e, r, s) => (G(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r);
-var h = (t, e, r) => (G(t, e, "access private method"), r);
+}, d = (t, e, r, s) => (V(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r);
+var h = (t, e, r) => (V(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";
@@ -106,8 +106,8 @@ function rethrowFileSystemError(t = "") {
       } catch (a) {
         const l = typeof a == "object" ? a == null ? void 0 : a.errno : null;
         if (l in FileErrorCodes) {
-          const c = FileErrorCodes[l], v = typeof o[1] == "string" ? o[1] : null, pe = v !== null ? t.replaceAll("{path}", v) : t;
-          throw new Error(`${pe}: ${c}`, {
+          const p = FileErrorCodes[l], v = typeof o[1] == "string" ? o[1] : null, ue = v !== null ? t.replaceAll("{path}", v) : t;
+          throw new Error(`${ue}: ${p}`, {
             cause: a
           });
         }
@@ -659,7 +659,7 @@ class PHPExecutionFailureError extends Error {
   }
 }
 const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php";
-var E, g, w, _, y, T, J, I, Y, C, Z, A, K, N, X, M, Q, j, ee, U, te, L, re, q, se, b, V, $, ie, O, ne, B, oe;
+var R, g, w, _, y, x, I, Y, C, Z, A, K, N, X, j, Q, M, ee, U, te, L, re, q, se, $, ie, k, J, O, ne, B, oe, D, ae;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -678,26 +678,27 @@ class PHP {
      *             was provided.
      * @returns Computed $_SERVER entries.
      */
-    u(this, T);
     u(this, I);
     u(this, C);
     u(this, A);
     u(this, N);
-    u(this, M);
     u(this, j);
+    u(this, M);
     u(this, U);
     u(this, L);
     u(this, q);
-    u(this, b);
     u(this, $);
+    u(this, k);
     u(this, O);
     u(this, B);
-    u(this, E, void 0);
+    u(this, D);
+    u(this, R, void 0);
     u(this, g, void 0);
     u(this, w, void 0);
     u(this, _, void 0);
     u(this, y, void 0);
-    d(this, g, !1), d(this, w, null), d(this, _, /* @__PURE__ */ new Map()), d(this, y, []), this.semaphore = new Semaphore({ concurrency: 1 }), t !== void 0 && this.initializeRuntime(t);
+    u(this, x, void 0);
+    d(this, g, !1), d(this, w, null), d(this, _, /* @__PURE__ */ new Map()), d(this, y, []), d(this, x, {}), this.semaphore = new Semaphore({ concurrency: 1 }), t !== void 0 && this.initializeRuntime(t);
   }
   /**
    * Adds an event listener for a PHP event.
@@ -705,7 +706,7 @@ class PHP {
    * @param listener - The listener function to be called when the event is triggered.
    */
   addEventListener(t, e) {
-    p(this, _).has(t) || p(this, _).set(t, /* @__PURE__ */ new Set()), p(this, _).get(t).add(e);
+    c(this, _).has(t) || c(this, _).set(t, /* @__PURE__ */ new Set()), c(this, _).get(t).add(e);
   }
   /**
    * Removes an event listener for a PHP event.
@@ -714,10 +715,10 @@ class PHP {
    */
   removeEventListener(t, e) {
     var r;
-    (r = p(this, _).get(t)) == null || r.delete(e);
+    (r = c(this, _).get(t)) == null || r.delete(e);
   }
   dispatchEvent(t) {
-    const e = p(this, _).get(t.type);
+    const e = c(this, _).get(t.type);
     if (e)
       for (const r of e)
         r(t);
@@ -762,8 +763,8 @@ class PHP {
    * @param listener Callback function to handle the message.
    */
   onMessage(t) {
-    return p(this, y).push(t), async () => {
-      d(this, y, p(this, y).filter(
+    return c(this, y).push(t), async () => {
+      d(this, y, c(this, y).filter(
         (e) => e !== t
       ));
     };
@@ -839,7 +840,7 @@ class PHP {
 				}
 				`
     ), e.onMessage = async (r) => {
-      for (const s of p(this, y)) {
+      for (const s of c(this, y)) {
         const i = await s(r);
         if (i)
           return i;
@@ -860,7 +861,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?"
       );
-    d(this, E, t);
+    d(this, R, t);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -957,35 +958,35 @@ class PHP {
     const e = await this.semaphore.acquire();
     let r;
     try {
-      if (p(this, g) || (h(this, I, Y).call(this), d(this, g, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
+      if (c(this, g) || (h(this, C, Z).call(this), d(this, g, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
-      h(this, A, K).call(this, t.relativeUri || ""), h(this, U, te).call(this, t.method || "GET");
-      const s = normalizeHeaders(t.headers || {}), i = s.host || "example.com:443", n = h(this, j, ee).call(this, i, t.protocol || "http");
-      if (h(this, N, X).call(this, i), h(this, M, Q).call(this, n), h(this, L, re).call(this, s), t.body && (r = h(this, q, se).call(this, t.body)), typeof t.code == "string")
-        this.writeFile("/internal/eval.php", t.code), h(this, b, V).call(this, "/internal/eval.php");
+      h(this, N, X).call(this, t.relativeUri || ""), h(this, L, re).call(this, t.method || "GET");
+      const s = normalizeHeaders(t.headers || {}), i = s.host || "example.com:443", n = h(this, U, te).call(this, i, t.protocol || "http");
+      if (h(this, j, Q).call(this, i), h(this, M, ee).call(this, n), h(this, q, se).call(this, s), t.body && (r = h(this, $, ie).call(this, t.body)), typeof t.code == "string")
+        this.writeFile("/internal/eval.php", t.code), h(this, k, J).call(this, "/internal/eval.php");
       else if (typeof t.scriptPath == "string")
-        h(this, b, V).call(this, t.scriptPath || "");
+        h(this, k, J).call(this, t.scriptPath || "");
       else
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const o = h(this, T, J).call(this, t.$_SERVER, s, n);
-      for (const c in o)
-        h(this, $, ie).call(this, c, o[c]);
+      const o = h(this, I, Y).call(this, t.$_SERVER, s, n);
+      for (const p in o)
+        h(this, O, ne).call(this, p, o[p]);
       const a = t.env || {};
-      for (const c in a)
-        h(this, O, ne).call(this, c, a[c]);
-      const l = await h(this, B, oe).call(this);
+      for (const p in a)
+        h(this, B, oe).call(this, p, a[p]);
+      const l = await h(this, D, ae).call(this);
       if (l.exitCode !== 0) {
         logger.warn("PHP.run() output was:", l.text);
-        const c = new PHPExecutionFailureError(
+        const p = new PHPExecutionFailureError(
           `PHP.run() failed with exit code ${l.exitCode} and the following output: ` + l.errors,
           l,
           "request"
         );
-        throw logger.error(c), c;
+        throw logger.error(p), p;
       }
       return l;
     } catch (s) {
@@ -1185,13 +1186,17 @@ class PHP {
    *             is fully decoupled from the request handler and
    *             accepts a constructor-level cwd argument.
    */
-  hotSwapPHPRuntime(t, e) {
-    const r = this[__private__dont__use].FS;
+  async hotSwapPHPRuntime(t, e) {
+    const r = this[__private__dont__use].FS, s = [];
+    for (const [i, n] of Object.entries(c(this, x)))
+      s.push({ mountHandler: n.mountHandler, vfsPath: i }), await n.unmount();
     try {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(t), p(this, E) && this.setSapiName(p(this, E)), e && copyFS(r, this[__private__dont__use].FS, e);
+    this.initializeRuntime(t), c(this, R) && this.setSapiName(c(this, R)), 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.
@@ -1201,11 +1206,19 @@ class PHP {
    * @return Unmount function to unmount the filesystem.
    */
   async mount(t, e) {
-    return await e(
+    const r = await e(
       this,
       this[__private__dont__use].FS,
       t
-    );
+    ), s = {
+      mountHandler: e,
+      unmount: async () => {
+        await r(), delete c(this, x)[t];
+      }
+    };
+    return c(this, x)[t] = s, () => {
+      s.unmount();
+    };
   }
   /**
    * Starts a PHP CLI session with given arguments.
@@ -1263,10 +1276,10 @@ class PHP {
     d(this, g, !1), d(this, w, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
   [Symbol.dispose]() {
-    p(this, g) && this.exit(0);
+    c(this, g) && this.exit(0);
   }
 }
-E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y = new WeakMap(), T = new WeakSet(), J = function(t, e, r) {
+R = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y = new WeakMap(), x = new WeakMap(), I = new WeakSet(), Y = function(t, e, r) {
   const s = {
     ...t || {}
   };
@@ -1276,9 +1289,9 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
     ["content-type", "content-length"].includes(i.toLowerCase()) && (n = ""), s[`${n}${i.toUpperCase().replace(/-/g, "_")}`] = e[i];
   }
   return s;
-}, I = new WeakSet(), Y = function() {
-  this[__private__dont__use].ccall("php_wasm_init", null, [], []);
 }, C = new WeakSet(), Z = function() {
+  this[__private__dont__use].ccall("php_wasm_init", null, [], []);
+}, A = new WeakSet(), K = function() {
   const t = "/internal/headers.json";
   if (!this.fileExists(t))
     throw new Error(
@@ -1295,7 +1308,7 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
     headers: r,
     httpStatusCode: e.status
   };
-}, A = new WeakSet(), K = function(t) {
+}, N = new WeakSet(), X = function(t) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1310,35 +1323,35 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
       [e]
     );
   }
-}, N = new WeakSet(), X = function(t) {
+}, j = new WeakSet(), Q = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
     [STRING],
     [t]
   );
-}, M = new WeakSet(), Q = function(t) {
+}, M = new WeakSet(), ee = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_port",
     null,
     [NUMBER],
     [t]
   );
-}, j = new WeakSet(), ee = function(t, e) {
+}, U = new WeakSet(), te = 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;
-}, U = new WeakSet(), te = function(t) {
+}, L = new WeakSet(), re = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
     [STRING],
     [t]
   );
-}, L = new WeakSet(), re = function(t) {
+}, q = new WeakSet(), se = function(t) {
   t.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -1355,7 +1368,7 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
     [NUMBER],
     [parseInt(t["content-length"], 10)]
   );
-}, q = new WeakSet(), se = function(t) {
+}, $ = new WeakSet(), ie = 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"
@@ -1378,38 +1391,38 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
     [NUMBER],
     [r]
   ), s;
-}, b = new WeakSet(), V = function(t) {
+}, k = new WeakSet(), J = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
     [STRING],
     [t]
   );
-}, $ = new WeakSet(), ie = function(t, e) {
+}, O = new WeakSet(), ne = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_SERVER_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, O = new WeakSet(), ne = function(t, e) {
+}, B = new WeakSet(), oe = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, B = new WeakSet(), oe = async function() {
+}, D = new WeakSet(), ae = async function() {
   var i;
   let t, e;
   try {
     t = await new Promise((n, o) => {
       var l;
-      e = (c) => {
-        logger.error(c), logger.error(c.error);
+      e = (p) => {
+        logger.error(p), logger.error(p.error);
         const v = new Error("Rethrown");
-        v.cause = c.error, v.betterMessage = c.message, o(v);
-      }, (l = p(this, w)) == null || l.addEventListener(
+        v.cause = p.error, v.betterMessage = p.message, o(v);
+      }, (l = c(this, w)) == null || l.addEventListener(
         "error",
         e
       );
@@ -1423,8 +1436,8 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
       return a instanceof Promise ? a.then(n, o) : n(a);
     });
   } catch (n) {
-    for (const c in this)
-      typeof this[c] == "function" && (this[c] = () => {
+    for (const p in this)
+      typeof this[p] == "function" && (this[p] = () => {
         throw new Error(
           "PHP runtime has crashed – see the earlier error for details."
         );
@@ -1433,9 +1446,9 @@ E = new WeakMap(), g = new WeakMap(), w = new WeakMap(), _ = new WeakMap(), y =
     const o = n, a = "betterMessage" in o ? o.betterMessage : o.message, l = new Error(a);
     throw l.cause = o, logger.error(l), l;
   } finally {
-    (i = p(this, w)) == null || i.removeEventListener("error", e);
+    (i = c(this, w)) == null || i.removeEventListener("error", e);
   }
-  const { headers: r, httpStatusCode: s } = h(this, C, Z).call(this);
+  const { headers: r, httpStatusCode: s } = h(this, A, K).call(this);
   return new PHPResponse(
     t === 0 ? s : 500,
     r,
@@ -1535,15 +1548,15 @@ async function* iteratePhpFiles(t, e, {
       return;
     const a = await t.listFiles(o);
     for (const l of a) {
-      const c = `${o}/${l}`;
-      if (i.includes(c.substring(e.length + 1)))
+      const p = `${o}/${l}`;
+      if (i.includes(p.substring(e.length + 1)))
         continue;
-      await t.isDir(c) ? n.push(c) : yield new StreamedFile(
-        streamReadFileFromPHP(t, c),
+      await t.isDir(p) ? n.push(p) : yield new StreamedFile(
+        streamReadFileFromPHP(t, p),
         r ? joinPaths(
           s || "",
-          c.substring(e.length + 1)
-        ) : c
+          p.substring(e.length + 1)
+        ) : p
       );
     }
   }
@@ -1673,6 +1686,7 @@ class PHPProcessManager {
   }
 }
 const SupportedPHPVersions = [
+  "8.4",
   "8.3",
   "8.2",
   "8.1",
@@ -1694,16 +1708,16 @@ 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 [l, c] of Object.entries(t))
+  for (const [l, p] of Object.entries(t))
     i.push(`--${e}\r
-`), i.push(`Content-Disposition: form-data; name="${l}"`), c instanceof File && i.push(`; filename="${c.name}"`), i.push(`\r
-`), c instanceof File && (i.push("Content-Type: application/octet-stream"), i.push(`\r
+`), i.push(`Content-Disposition: form-data; name="${l}"`), 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(`\r
-`), c instanceof File ? i.push(await fileToUint8Array(c)) : i.push(c), i.push(`\r
+`), p instanceof File ? i.push(await fileToUint8Array(p)) : i.push(p), i.push(`\r
 `);
   i.push(`--${e}--\r
 `);
-  const n = i.reduce((l, c) => l + c.length, 0), o = new Uint8Array(n);
+  const n = i.reduce((l, p) => l + p.length, 0), o = new Uint8Array(n);
   let a = 0;
   for (const l of i)
     o.set(
@@ -1713,12 +1727,7 @@ async function encodeAsMultipart(t) {
   return { bytes: o, contentType: r };
 }
 function fileToUint8Array(t) {
-  return new Promise((e) => {
-    const r = new FileReader();
-    r.onload = () => {
-      e(new Uint8Array(r.result));
-    }, r.readAsArrayBuffer(t);
-  });
+  return t.arrayBuffer().then((e) => new Uint8Array(e));
 }
 const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "application/atom+xml", avi = "video/x-msvideo", avif = "image/avif", bin = "application/octet-stream", bmp = "image/x-ms-bmp", cco = "application/x-cocoa", css = "text/css", data = "application/octet-stream", deb = "application/octet-stream", der = "application/x-x509-ca-cert", dmg = "application/octet-stream", doc = "application/msword", docx = "application/vnd.openxmlformats-officedocument.wordprocessingml.document", eot = "application/vnd.ms-fontobject", flv = "video/x-flv", gif = "image/gif", gz = "application/gzip", hqx = "application/mac-binhex40", htc = "text/x-component", html = "text/html", ico = "image/x-icon", iso = "application/octet-stream", jad = "text/vnd.sun.j2me.app-descriptor", jar = "application/java-archive", jardiff = "application/x-java-archive-diff", jng = "image/x-jng", jnlp = "application/x-java-jnlp-file", jpg = "image/jpeg", jpeg = "image/jpeg", js = "application/javascript", json = "application/json", kml = "application/vnd.google-earth.kml+xml", kmz = "application/vnd.google-earth.kmz", m3u8 = "application/vnd.apple.mpegurl", m4a = "audio/x-m4a", m4v = "video/x-m4v", md = "text/plain", mid = "audio/midi", mml = "text/mathml", mng = "video/x-mng", mov = "video/quicktime", mp3 = "audio/mpeg", mp4 = "video/mp4", mpeg = "video/mpeg", msi = "application/octet-stream", odg = "application/vnd.oasis.opendocument.graphics", odp = "application/vnd.oasis.opendocument.presentation", ods = "application/vnd.oasis.opendocument.spreadsheet", odt = "application/vnd.oasis.opendocument.text", ogg = "audio/ogg", otf = "font/otf", pdf = "application/pdf", pl = "application/x-perl", png = "image/png", ppt = "application/vnd.ms-powerpoint", pptx = "application/vnd.openxmlformats-officedocument.presentationml.presentation", prc = "application/x-pilot", ps = "application/postscript", ra = "audio/x-realaudio", rar = "application/x-rar-compressed", rpm = "application/x-redhat-package-manager", rss = "application/rss+xml", rtf = "application/rtf", run = "application/x-makeself", sea = "application/x-sea", sit = "application/x-stuffit", svg = "image/svg+xml", swf = "application/x-shockwave-flash", tcl = "application/x-tcl", tar = "application/x-tar", tif = "image/tiff", ts = "video/mp2t", ttf = "font/ttf", txt = "text/plain", wasm = "application/wasm", wbmp = "image/vnd.wap.wbmp", webm = "video/webm", webp = "image/webp", wml = "text/vnd.wap.wml", wmlc = "application/vnd.wap.wmlc", wmv = "video/x-ms-wmv", woff = "font/woff", woff2 = "font/woff2", xhtml = "application/xhtml+xml", xls = "application/vnd.ms-excel", xlsx = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", xml = "text/xml", xpi = "application/x-xpinstall", xspf = "application/xspf+xml", zip = "application/zip", mimeTypes = {
   _default,
@@ -1816,7 +1825,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var P, R, k, x, F, f, S, H, D, ae, z, le, W, ce;
+var P, F, T, E, S, f, H, b, z, le, W, ce, G, pe;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -1836,11 +1845,11 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    u(this, D);
+    u(this, z);
     /**
      * Spawns a new PHP instance and dispatches a request to it.
      */
-    u(this, z);
+    u(this, W);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -1848,15 +1857,15 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    u(this, W);
+    u(this, G);
     u(this, P, void 0);
-    u(this, R, void 0);
-    u(this, k, void 0);
-    u(this, x, void 0);
     u(this, F, void 0);
-    u(this, f, void 0);
+    u(this, T, void 0);
+    u(this, E, void 0);
     u(this, S, void 0);
+    u(this, f, void 0);
     u(this, H, void 0);
+    u(this, b, void 0);
     const {
       documentRoot: r = "/www/",
       absoluteUrl: s = typeof location == "object" ? location == null ? void 0 : location.href : "",
@@ -1865,24 +1874,24 @@ class PHPRequestHandler {
     } = e;
     "processManager" in e ? this.processManager = e.processManager : this.processManager = new PHPProcessManager({
       phpFactory: async (l) => {
-        const c = await e.phpFactory({
+        const p = await e.phpFactory({
           ...l,
           requestHandler: this
         });
-        return c.requestHandler = this, c;
+        return p.requestHandler = this, p;
       },
       maxPhpInstances: e.maxPhpInstances
-    }), d(this, H, new HttpCookieStore()), d(this, P, r);
+    }), d(this, b, new HttpCookieStore()), d(this, P, r);
     const o = new URL(s);
-    d(this, k, o.hostname), d(this, x, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), d(this, R, (o.protocol || "").replace(":", ""));
-    const a = p(this, x) !== 443 && p(this, x) !== 80;
-    d(this, F, [
-      p(this, k),
-      a ? `:${p(this, x)}` : ""
-    ].join("")), d(this, f, o.pathname.replace(/\/+$/, "")), d(this, S, [
-      `${p(this, R)}://`,
-      p(this, F),
-      p(this, f)
+    d(this, T, o.hostname), d(this, E, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), d(this, F, (o.protocol || "").replace(":", ""));
+    const a = c(this, E) !== 443 && c(this, E) !== 80;
+    d(this, S, [
+      c(this, T),
+      a ? `:${c(this, E)}` : ""
+    ].join("")), d(this, f, o.pathname.replace(/\/+$/, "")), d(this, H, [
+      `${c(this, F)}://`,
+      c(this, S),
+      c(this, f)
     ].join("")), this.rewriteRules = i, this.getFileNotFoundAction = n;
   }
   async getPrimaryPhp() {
@@ -1907,20 +1916,20 @@ class PHPRequestHandler {
    */
   internalUrlToPath(e) {
     const r = new URL(e);
-    return r.pathname.startsWith(p(this, f)) && (r.pathname = r.pathname.slice(p(this, f).length)), toRelativeUrl(r);
+    return r.pathname.startsWith(c(this, f)) && (r.pathname = r.pathname.slice(c(this, f).length)), toRelativeUrl(r);
   }
   /**
    * The absolute URL of this PHPRequestHandler instance.
    */
   get absoluteUrl() {
-    return p(this, S);
+    return c(this, H);
   }
   /**
    * The directory in the PHP filesystem where the server will look
    * for the files to serve. Default: `/var/www`.
    */
   get documentRoot() {
-    return p(this, P);
+    return c(this, P);
   }
   /**
    * Serves the request – either by serving a static file, or by
@@ -1978,11 +1987,11 @@ class PHPRequestHandler {
     ), i = applyRewriteRules(
       removePathPrefix(
         decodeURIComponent(s.pathname),
-        p(this, f)
+        c(this, f)
       ),
       this.rewriteRules
     ), n = await this.getPrimaryPhp();
-    let o = joinPaths(p(this, P), i);
+    let o = joinPaths(c(this, P), i);
     if (n.isDir(o)) {
       if (!o.endsWith("/"))
         return new PHPResponse(
@@ -2006,7 +2015,7 @@ class PHPRequestHandler {
         case "response":
           return a.response;
         case "internal-redirect":
-          o = joinPaths(p(this, P), a.uri);
+          o = joinPaths(c(this, P), a.uri);
           break;
         case "404":
           return PHPResponse.forHttpCode(404);
@@ -2023,14 +2032,14 @@ class PHPRequestHandler {
           // Pass along URL with the #fragment filtered out
           url: s.toString()
         };
-        return h(this, z, le).call(this, a, o);
+        return h(this, W, ce).call(this, a, o);
       } else
-        return h(this, D, ae).call(this, n, o);
+        return h(this, z, le).call(this, n, o);
     else
       return PHPResponse.forHttpCode(404);
   }
 }
-P = new WeakMap(), R = new WeakMap(), k = new WeakMap(), x = new WeakMap(), F = new WeakMap(), f = new WeakMap(), S = new WeakMap(), H = new WeakMap(), D = new WeakSet(), ae = function(e, r) {
+P = new WeakMap(), F = new WeakMap(), T = new WeakMap(), E = new WeakMap(), S = new WeakMap(), f = new WeakMap(), H = new WeakMap(), b = new WeakMap(), z = new WeakSet(), le = function(e, r) {
   const s = e.readFileAsBuffer(r);
   return new PHPResponse(
     200,
@@ -2045,7 +2054,7 @@ P = new WeakMap(), R = new WeakMap(), k = new WeakMap(), x = new WeakMap(), F =
     },
     s
   );
-}, z = new WeakSet(), le = async function(e, r) {
+}, W = new WeakSet(), ce = async function(e, r) {
   let s;
   try {
     s = await this.processManager.acquirePHPInstance();
@@ -2053,16 +2062,16 @@ P = new WeakMap(), R = new WeakMap(), k = new WeakMap(), x = new WeakMap(), F =
     return i instanceof MaxPhpInstancesError ? PHPResponse.forHttpCode(502) : PHPResponse.forHttpCode(500);
   }
   try {
-    return await h(this, W, ce).call(this, s.php, e, r);
+    return await h(this, G, pe).call(this, s.php, e, r);
   } finally {
     s.reap();
   }
-}, W = new WeakSet(), ce = async function(e, r, s) {
+}, G = new WeakSet(), pe = async function(e, r, s) {
   let i = "GET";
   const n = {
-    host: p(this, F),
+    host: c(this, S),
     ...normalizeHeaders(r.headers || {}),
-    cookie: p(this, H).getCookieRequestHeader()
+    cookie: c(this, b).getCookieRequestHeader()
   };
   let o = r.body;
   if (typeof o == "object" && !(o instanceof Uint8Array)) {
@@ -2074,20 +2083,20 @@ P = new WeakMap(), R = new WeakMap(), k = new WeakMap(), x = new WeakMap(), F =
     const a = await e.run({
       relativeUri: ensurePathPrefix(
         toRelativeUrl(new URL(r.url)),
-        p(this, f)
+        c(this, f)
       ),
-      protocol: p(this, R),
+      protocol: c(this, F),
       method: r.method || i,
       $_SERVER: {
         REMOTE_ADDR: "127.0.0.1",
-        DOCUMENT_ROOT: p(this, P),
-        HTTPS: p(this, S).startsWith("https://") ? "on" : ""
+        DOCUMENT_ROOT: c(this, P),
+        HTTPS: c(this, H).startsWith("https://") ? "on" : ""
       },
       body: o,
       scriptPath: s,
       headers: n
     });
-    return p(this, H).rememberCookiesFromResponseHeaders(
+    return c(this, b).rememberCookiesFromResponseHeaders(
       a.headers
     ), a;
   } catch (a) {
@@ -2125,7 +2134,7 @@ function rotatePHPRuntime({
   async function n() {
     const l = await t.semaphore.acquire();
     try {
-      t.hotSwapPHPRuntime(await r(), e), i = 0;
+      await t.hotSwapPHPRuntime(await r(), e), i = 0;
     } finally {
       l();
     }