@php-wasm/web 0.1.40 → 0.1.46

package/{index-c73527e6.js → index-61d766d5.js}

@@ -1,9 +1,154 @@
-class v {
+const W = Symbol("error"), D = Symbol("message");
+class I extends Event {
+  /**
+   * Create a new `ErrorEvent`.
+   *
+   * @param type The name of the event
+   * @param options A dictionary object that allows for setting
+   *                  attributes via object members of the same name.
+   */
+  constructor(e, r = {}) {
+    super(e), this[W] = r.error === void 0 ? null : r.error, this[D] = r.message === void 0 ? "" : r.message;
+  }
+  get error() {
+    return this[W];
+  }
+  get message() {
+    return this[D];
+  }
+}
+Object.defineProperty(I.prototype, "error", { enumerable: !0 });
+Object.defineProperty(I.prototype, "message", { enumerable: !0 });
+const ie = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : I;
+class oe extends EventTarget {
+  constructor() {
+    super(...arguments), this.listenersCount = 0;
+  }
+  addEventListener(e, r) {
+    ++this.listenersCount, super.addEventListener(e, r);
+  }
+  removeEventListener(e, r) {
+    --this.listenersCount, super.removeEventListener(e, r);
+  }
+  hasListeners() {
+    return this.listenersCount > 0;
+  }
+}
+function ae(t) {
+  t.asm = {
+    ...t.asm
+  };
+  const e = new oe();
+  for (const r in t.asm)
+    if (typeof t.asm[r] == "function") {
+      const n = t.asm[r];
+      t.asm[r] = function(...s) {
+        try {
+          return n(...s);
+        } catch (o) {
+          if (!(o instanceof Error))
+            throw o;
+          if ("exitCode" in o && o?.exitCode === 0)
+            return;
+          const i = ce(
+            o,
+            t.lastAsyncifyStackSource?.stack
+          );
+          if (t.lastAsyncifyStackSource && (o.cause = t.lastAsyncifyStackSource), !e.hasListeners())
+            throw de(i), o;
+          e.dispatchEvent(
+            new ie("error", {
+              error: o,
+              message: i
+            })
+          );
+        }
+      };
+    }
+  return e;
+}
+let A = [];
+function le() {
+  return A;
+}
+function ce(t, e) {
+  if (t.message === "unreachable") {
+    let r = ue;
+    e || (r += `
+
+This stack trace is lacking. For a better one initialize 
+the PHP runtime with { debug: true }, e.g. PHPNode.load('8.1', { debug: true }).
+
+`), A = fe(
+      e || t.stack || ""
+    );
+    for (const n of A)
+      r += `    * ${n}
+`;
+    return r;
+  }
+  return t.message;
+}
+const ue = `
+"unreachable" WASM instruction executed.
+
+The typical reason is a PHP function missing from the ASYNCIFY_ONLY
+list when building PHP.wasm.
+
+You will need to file a new issue in the WordPress Playground repository
+and paste this error message there:
+
+https://github.com/WordPress/wordpress-playground/issues/new
+
+If you're a core developer, the typical fix is to:
+
+* Isolate a minimal reproduction of the error
+* Add a reproduction of the error to php-asyncify.spec.ts in the WordPress Playground repository
+* Run 'npm run fix-asyncify'
+* Commit the changes, push to the repo, release updated NPM packages
+
+Below is a list of all the PHP functions found in the stack trace to
+help with the minimal reproduction. If they're all already listed in
+the Dockerfile, you'll need to trigger this error again with long stack
+traces enabled. In node.js, you can do it using the --stack-trace-limit=100
+CLI option: 
+
+`, $ = "\x1B[41m", he = "\x1B[1m", q = "\x1B[0m", z = "\x1B[K";
+let B = !1;
+function de(t) {
+  if (!B) {
+    B = !0, console.log(`${$}
+${z}
+${he}  WASM ERROR${q}${$}`);
+    for (const e of t.split(`
+`))
+      console.log(`${z}  ${e} `);
+    console.log(`${q}`);
+  }
+}
+function fe(t) {
+  try {
+    const e = t.split(`
+`).slice(1).map((r) => {
+      const n = r.trim().substring(3).split(" ");
+      return {
+        fn: n.length >= 2 ? n[0] : "<unknown>",
+        isWasm: r.includes("wasm://")
+      };
+    }).filter(
+      ({ fn: r, isWasm: n }) => n && !r.startsWith("dynCall_") && !r.startsWith("invoke_")
+    ).map(({ fn: r }) => r);
+    return Array.from(new Set(e));
+  } catch {
+    return [];
+  }
+}
+class b {
   constructor(e, r, n, s = "", o = 0) {
     this.httpStatusCode = e, this.headers = r, this.bytes = n, this.exitCode = o, this.errors = s;
   }
   static fromRawData(e) {
-    return new v(
+    return new b(
       e.httpStatusCode,
       e.headers,
       e.bytes,
@@ -33,7 +178,7 @@ class v {
     return new TextDecoder().decode(this.bytes);
   }
 }
-const ie = [
+const pe = [
   "8.2",
   "8.1",
   "8.0",
@@ -43,8 +188,8 @@ const ie = [
   "7.1",
   "7.0",
   "5.6"
-], oe = ie[0];
-class ae {
+], me = pe[0];
+class ge {
   #e;
   #t;
   /**
@@ -77,10 +222,10 @@ class ae {
       ...e,
       headers: {
         ...e.headers,
-        cookie: this.#s()
+        cookie: this.#r()
       }
     });
-    if (n.headers["set-cookie"] && this.#r(n.headers["set-cookie"]), this.#t.handleRedirects && n.headers.location && r < this.#t.maxRedirects) {
+    if (n.headers["set-cookie"] && this.#n(n.headers["set-cookie"]), this.#t.handleRedirects && n.headers.location && r < this.#t.maxRedirects) {
       const s = new URL(
         n.headers.location[0],
         this.requestHandler.absoluteUrl
@@ -112,7 +257,7 @@ class ae {
   get documentRoot() {
     return this.requestHandler.documentRoot;
   }
-  #r(e) {
+  #n(e) {
     for (const r of e)
       try {
         if (!r.includes("="))
@@ -123,14 +268,14 @@ class ae {
         console.error(n);
       }
   }
-  #s() {
+  #r() {
     const e = [];
     for (const r in this.#e)
       e.push(`${r}=${this.#e[r]}`);
     return e.join("; ");
   }
 }
-class ce {
+class ye {
   constructor({ concurrency: e }) {
     this._running = 0, this.concurrency = e, this.queue = [];
   }
@@ -155,48 +300,48 @@ class ce {
     }
   }
 }
-const le = "http://example.com";
-function W(t) {
+const we = "http://example.com";
+function j(t) {
   return t.toString().substring(t.origin.length);
 }
-function D(t, e) {
+function G(t, e) {
   return !e || !t.startsWith(e) ? t : t.substring(e.length);
 }
-function ue(t, e) {
+function Pe(t, e) {
   return !e || t.startsWith(e) ? t : e + t;
 }
-class he {
+class be {
   #e;
   #t;
+  #n;
   #r;
-  #s;
   #i;
-  #n;
+  #s;
   #o;
   #a;
-  #c;
+  #l;
   /**
    * @param  php    - The PHP instance.
    * @param  config - Request Handler configuration.
    */
   constructor(e, r = {}) {
-    this.#a = new ce({ concurrency: 1 });
+    this.#a = new ye({ concurrency: 1 });
     const {
       documentRoot: n = "/www/",
       absoluteUrl: s = typeof location == "object" ? location?.href : "",
       isStaticFilePath: o = () => !1
     } = r;
-    this.php = e, this.#e = n, this.#c = o;
+    this.php = e, this.#e = n, this.#l = o;
     const i = new URL(s);
-    this.#r = i.hostname, this.#s = i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80, this.#t = (i.protocol || "").replace(":", "");
-    const a = this.#s !== 443 && this.#s !== 80;
+    this.#n = i.hostname, this.#r = i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80, this.#t = (i.protocol || "").replace(":", "");
+    const a = this.#r !== 443 && this.#r !== 80;
     this.#i = [
-      this.#r,
-      a ? `:${this.#s}` : ""
-    ].join(""), this.#n = i.pathname.replace(/\/+$/, ""), this.#o = [
+      this.#n,
+      a ? `:${this.#r}` : ""
+    ].join(""), this.#s = i.pathname.replace(/\/+$/, ""), this.#o = [
       `${this.#t}://`,
       this.#i,
-      this.#n
+      this.#s
     ].join("");
   }
   /** @inheritDoc */
@@ -206,7 +351,7 @@ class he {
   /** @inheritDoc */
   internalUrlToPath(e) {
     const r = new URL(e);
-    return r.pathname.startsWith(this.#n) && (r.pathname = r.pathname.slice(this.#n.length)), W(r);
+    return r.pathname.startsWith(this.#s) && (r.pathname = r.pathname.slice(this.#s.length)), j(r);
   }
   get isRequestRunning() {
     return this.#a.running > 0;
@@ -223,12 +368,12 @@ class he {
   async request(e) {
     const r = e.url.startsWith("http://") || e.url.startsWith("https://"), n = new URL(
       e.url,
-      r ? void 0 : le
-    ), s = D(
+      r ? void 0 : we
+    ), s = G(
       n.pathname,
-      this.#n
+      this.#s
     );
-    return this.#c(s) ? this.#l(s) : await this.#u(e, n);
+    return this.#l(s) ? this.#c(s) : await this.#u(e, n);
   }
   /**
    * Serves a static file from the PHP filesystem.
@@ -236,23 +381,23 @@ class he {
    * @param  path - The requested static file path.
    * @returns The response.
    */
-  #l(e) {
+  #c(e) {
     const r = `${this.#e}${e}`;
     if (!this.php.fileExists(r))
-      return new v(
+      return new b(
         404,
         {},
         new TextEncoder().encode("404 File not found")
       );
     const n = this.php.readFileAsBuffer(r);
-    return new v(
+    return new b(
       200,
       {
         "content-length": [`${n.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": [fe(r)],
+        "content-type": [ve(r)],
         "accept-ranges": ["bytes"],
         "cache-control": ["public, max-age=0"]
       },
@@ -281,31 +426,42 @@ class he {
       if (e.files && Object.keys(e.files).length) {
         s = "POST";
         for (const c in e.files) {
-          const l = e.files[c];
+          const h = e.files[c];
           i.push({
             key: c,
-            name: l.name,
-            type: l.type,
-            data: new Uint8Array(await l.arrayBuffer())
+            name: h.name,
+            type: h.type,
+            data: new Uint8Array(await h.arrayBuffer())
           });
         }
-        o["content-type"]?.startsWith("multipart/form-data") && (e.formData = de(
+        o["content-type"]?.startsWith("multipart/form-data") && (e.formData = Ee(
           e.body || ""
         ), o["content-type"] = "application/x-www-form-urlencoded", delete e.body);
       }
       let a;
-      return e.formData !== void 0 ? (s = "POST", o["content-type"] = o["content-type"] || "application/x-www-form-urlencoded", a = new URLSearchParams(
+      e.formData !== void 0 ? (s = "POST", o["content-type"] = o["content-type"] || "application/x-www-form-urlencoded", a = new URLSearchParams(
         e.formData
-      ).toString()) : a = e.body, await this.php.run({
-        relativeUri: ue(
-          W(r),
-          this.#n
+      ).toString()) : a = e.body;
+      let l;
+      try {
+        l = this.#h(r.pathname);
+      } catch {
+        return new b(
+          404,
+          {},
+          new TextEncoder().encode("404 File not found")
+        );
+      }
+      return await this.php.run({
+        relativeUri: Pe(
+          j(r),
+          this.#s
         ),
         protocol: this.#t,
         method: e.method || s,
         body: a,
         fileInfos: i,
-        scriptPath: this.#h(r.pathname),
+        scriptPath: l,
         headers: o
       });
     } finally {
@@ -318,16 +474,21 @@ class he {
    * 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.
    */
   #h(e) {
-    let r = D(e, this.#n);
+    let r = G(e, this.#s);
     r.includes(".php") ? r = r.split(".php")[0] + ".php" : (r.endsWith("/") || (r += "/"), r.endsWith("index.php") || (r += "index.php"));
     const n = `${this.#e}${r}`;
-    return this.php.fileExists(n) ? n : `${this.#e}/index.php`;
+    if (this.php.fileExists(n))
+      return n;
+    if (!this.php.fileExists(`${this.#e}/index.php`))
+      throw new Error(`File not found: ${n}`);
+    return `${this.#e}/index.php`;
   }
 }
-function de(t) {
+function Ee(t) {
   const e = {}, r = t.match(/--(.*)\r\n/);
   if (!r)
     return e;
@@ -335,14 +496,14 @@ function de(t) {
   return s.shift(), s.pop(), s.forEach((o) => {
     const i = o.indexOf(`\r
 \r
-`), a = o.substring(0, i).trim(), c = o.substring(i + 4).trim(), l = a.match(/name="([^"]+)"/);
-    if (l) {
-      const h = l[1];
-      e[h] = c;
+`), a = o.substring(0, i).trim(), l = o.substring(i + 4).trim(), c = a.match(/name="([^"]+)"/);
+    if (c) {
+      const h = c[1];
+      e[h] = l;
     }
   }), e;
 }
-function fe(t) {
+function ve(t) {
   switch (t.split(".").pop()) {
     case "css":
       return "text/css";
@@ -382,7 +543,7 @@ function fe(t) {
       return "application-octet-stream";
   }
 }
-const $ = {
+const V = {
   0: "No error occurred. System call completed successfully.",
   1: "Argument list too long.",
   2: "Permission denied.",
@@ -468,10 +629,10 @@ function y(t = "") {
       try {
         return o.apply(this, i);
       } catch (a) {
-        const c = typeof a == "object" ? a?.errno : null;
-        if (c in $) {
-          const l = $[c], h = typeof i[0] == "string" ? i[0] : null, g = h !== null ? t.replaceAll("{path}", h) : t;
-          throw new Error(`${g}: ${l}`, {
+        const l = typeof a == "object" ? a?.errno : null;
+        if (l in V) {
+          const c = V[l], h = typeof i[0] == "string" ? i[0] : null, g = h !== null ? t.replaceAll("{path}", h) : t;
+          throw new Error(`${g}: ${c}`, {
             cause: a
           });
         }
@@ -480,191 +641,47 @@ function y(t = "") {
     };
   };
 }
-async function pe(t, e = {}, r = []) {
+async function Re(t, e = {}, r = []) {
   let n, s;
-  const o = new Promise((c) => {
-    s = c;
-  }), i = new Promise((c) => {
-    n = c;
-  }), a = t.init(ge, {
-    onAbort(c) {
-      console.error("WASM aborted: "), console.error(c);
+  const o = new Promise((l) => {
+    s = l;
+  }), i = new Promise((l) => {
+    n = l;
+  }), a = t.init(ke, {
+    onAbort(l) {
+      console.error("WASM aborted: "), console.error(l);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
     // breaks vite dev mode. An identity `locateFile` function
     // fixes it.
-    locateFile: (c) => c,
+    locateFile: (l) => l,
     ...e,
     noInitialRun: !0,
     onRuntimeInitialized() {
       e.onRuntimeInitialized && e.onRuntimeInitialized(), n();
     },
-    monitorRunDependencies(c) {
-      c === 0 && (delete a.monitorRunDependencies, s());
+    monitorRunDependencies(l) {
+      l === 0 && (delete a.monitorRunDependencies, s());
     }
   });
-  for (const { default: c } of r)
-    c(a);
-  return r.length || s(), await o, await i, A.push(a), A.length - 1;
+  for (const { default: l } of r)
+    l(a);
+  return r.length || s(), await o, await i, M.push(a), M.length - 1;
 }
-const A = [];
-function me(t) {
-  return A[t];
-}
-const ge = function() {
-  return typeof process < "u" && process.release?.name === "node" ? "NODE" : typeof window < "u" ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
-}(), q = Symbol("error"), z = Symbol("message");
-class I extends Event {
-  /**
-   * Create a new `ErrorEvent`.
-   *
-   * @param type The name of the event
-   * @param options A dictionary object that allows for setting
-   *                  attributes via object members of the same name.
-   */
-  constructor(e, r = {}) {
-    super(e), this[q] = r.error === void 0 ? null : r.error, this[z] = r.message === void 0 ? "" : r.message;
-  }
-  get error() {
-    return this[q];
-  }
-  get message() {
-    return this[z];
-  }
-}
-Object.defineProperty(I.prototype, "error", { enumerable: !0 });
-Object.defineProperty(I.prototype, "message", { enumerable: !0 });
-const ye = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : I;
-class we extends EventTarget {
-  constructor() {
-    super(...arguments), this.listenersCount = 0;
-  }
-  addEventListener(e, r) {
-    ++this.listenersCount, super.addEventListener(e, r);
-  }
-  removeEventListener(e, r) {
-    --this.listenersCount, super.removeEventListener(e, r);
-  }
-  hasListeners() {
-    return this.listenersCount > 0;
-  }
-}
-function Pe(t) {
-  t.asm = {
-    ...t.asm
-  };
-  const e = new we();
-  for (const r in t.asm)
-    if (typeof t.asm[r] == "function") {
-      const n = t.asm[r];
-      t.asm[r] = function(...s) {
-        try {
-          return n(...s);
-        } catch (o) {
-          if (!(o instanceof Error))
-            throw o;
-          if ("exitCode" in o && o?.exitCode === 0)
-            return;
-          const i = Ee(
-            o,
-            t.lastAsyncifyStackSource?.stack
-          );
-          if (t.lastAsyncifyStackSource && (o.cause = t.lastAsyncifyStackSource), !e.hasListeners())
-            throw Se(i), o;
-          e.dispatchEvent(
-            new ye("error", {
-              error: o,
-              message: i
-            })
-          );
-        }
-      };
-    }
-  return e;
-}
-let M = [];
-function be() {
-  return M;
-}
-function Ee(t, e) {
-  if (t.message === "unreachable") {
-    let r = ve;
-    e || (r += `
-
-This stack trace is lacking. For a better one initialize 
-the PHP runtime with { debug: true }, e.g. PHPNode.load('8.1', { debug: true }).
-
-`), M = ke(
-      e || t.stack || ""
-    );
-    for (const n of M)
-      r += `    * ${n}
-`;
-    return r;
-  }
-  return t.message;
-}
-const ve = `
-"unreachable" WASM instruction executed.
-
-The typical reason is a PHP function missing from the ASYNCIFY_ONLY
-list when building PHP.wasm.
-
-You will need to file a new issue in the WordPress Playground repository
-and paste this error message there:
-
-https://github.com/WordPress/wordpress-playground/issues/new
-
-If you're a core developer, the typical fix is to:
-
-* Isolate a minimal reproduction of the error
-* Add a reproduction of the error to php-asyncify.spec.ts in the WordPress Playground repository
-* Run 'npm run fix-asyncify'
-* Commit the changes, push to the repo, release updated NPM packages
-
-Below is a list of all the PHP functions found in the stack trace to
-help with the minimal reproduction. If they're all already listed in
-the Dockerfile, you'll need to trigger this error again with long stack
-traces enabled. In node.js, you can do it using the --stack-trace-limit=100
-CLI option: 
-
-`, B = "\x1B[41m", Re = "\x1B[1m", j = "\x1B[0m", G = "\x1B[K";
-let V = !1;
+const M = [];
 function Se(t) {
-  if (!V) {
-    V = !0, console.log(`${B}
-${G}
-${Re}  WASM ERROR${j}${B}`);
-    for (const e of t.split(`
-`))
-      console.log(`${G}  ${e} `);
-    console.log(`${j}`);
-  }
-}
-function ke(t) {
-  try {
-    const e = t.split(`
-`).slice(1).map((r) => {
-      const n = r.trim().substring(3).split(" ");
-      return {
-        fn: n.length >= 2 ? n[0] : "<unknown>",
-        isWasm: r.includes("wasm://")
-      };
-    }).filter(
-      ({ fn: r, isWasm: n }) => n && !r.startsWith("dynCall_") && !r.startsWith("invoke_")
-    ).map(({ fn: r }) => r);
-    return Array.from(new Set(e));
-  } catch {
-    return [];
-  }
+  return M[t];
 }
+const ke = function() {
+  return typeof process < "u" && process.release?.name === "node" ? "NODE" : typeof window < "u" ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
+}();
 var xe = Object.defineProperty, Te = Object.getOwnPropertyDescriptor, w = (t, e, r, n) => {
   for (var s = n > 1 ? void 0 : n ? Te(e, r) : e, o = t.length - 1, i; o >= 0; o--)
     (i = t[o]) && (s = (n ? i(e, r, s) : i(s)) || s);
   return n && s && xe(e, r, s), s;
 };
-const f = "string", b = "number", u = Symbol("__private__dont__use");
+const f = "string", E = "number", u = Symbol("__private__dont__use");
 class m {
   /**
    * Initializes a PHP runtime.
@@ -674,12 +691,13 @@ class m {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, r) {
-    this.#e = [], this.#t = !1, this.#r = null, e !== void 0 && this.initializeRuntime(e), r && (this.requestHandler = new ae(
-      new he(this, r)
+    this.#e = [], this.#t = !1, this.#n = null, this.#r = {}, e !== void 0 && this.initializeRuntime(e), r && (this.requestHandler = new ge(
+      new be(this, r)
     ));
   }
   #e;
   #t;
+  #n;
   #r;
   /** @inheritDoc */
   get absoluteUrl() {
@@ -702,10 +720,10 @@ class m {
   initializeRuntime(e) {
     if (this[u])
       throw new Error("PHP runtime already initialized.");
-    const r = me(e);
+    const r = Se(e);
     if (!r)
       throw new Error("Invalid PHP runtime id.");
-    this[u] = r, this.#r = Pe(r);
+    this[u] = r, this.#n = ae(r);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
@@ -736,17 +754,17 @@ class m {
   }
   /** @inheritDoc */
   async run(e) {
-    this.#t || (this.#s(), this.#t = !0), this.#u(e.scriptPath || ""), this.#n(e.relativeUri || ""), this.#a(e.method || "GET");
+    this.#t || (this.#i(), this.#t = !0), this.#h(e.scriptPath || ""), this.#o(e.relativeUri || ""), this.#l(e.method || "GET");
     const { host: r, ...n } = {
       host: "example.com:443",
       ...K(e.headers || {})
     };
-    if (this.#o(r, e.protocol || "http"), this.#c(n), e.body && this.#l(e.body), e.fileInfos)
+    if (this.#a(r, e.protocol || "http"), this.#c(n), e.body && this.#u(e.body), e.fileInfos)
       for (const s of e.fileInfos)
-        this.#h(s);
-    return e.code && this.#d(" ?>" + e.code), await this.#f();
+        this.#f(s);
+    return e.code && this.#p(" ?>" + e.code), this.#d(), await this.#m();
   }
-  #s() {
+  #i() {
     if (this.#e.length > 0) {
       const e = this.#e.map(([r, n]) => `${r}=${n}`).join(`
 `) + `
@@ -761,7 +779,7 @@ class m {
     }
     this[u].ccall("php_wasm_init", null, [], []);
   }
-  #i() {
+  #s() {
     const e = "/tmp/headers.json";
     if (!this.fileExists(e))
       throw new Error(
@@ -779,7 +797,7 @@ class m {
       httpStatusCode: r.status
     };
   }
-  #n(e) {
+  #o(e) {
     if (this[u].ccall(
       "wasm_set_request_uri",
       null,
@@ -795,7 +813,7 @@ class m {
       );
     }
   }
-  #o(e, r) {
+  #a(e, r) {
     this[u].ccall(
       "wasm_set_request_host",
       null,
@@ -810,11 +828,11 @@ class m {
     (!n || isNaN(n) || n === 80) && (n = r === "https" ? 443 : 80), this[u].ccall(
       "wasm_set_request_port",
       null,
-      [b],
+      [E],
       [n]
     ), (r === "https" || !r && n === 443) && this.addServerGlobalEntry("HTTPS", "on");
   }
-  #a(e) {
+  #l(e) {
     this[u].ccall(
       "wasm_set_request_method",
       null,
@@ -836,7 +854,7 @@ class m {
     ), e["content-length"] && this[u].ccall(
       "wasm_set_content_length",
       null,
-      [b],
+      [E],
       [parseInt(e["content-length"], 10)]
     );
     for (const r in e)
@@ -845,7 +863,7 @@ class m {
         e[r]
       );
   }
-  #l(e) {
+  #u(e) {
     this[u].ccall(
       "wasm_set_request_body",
       null,
@@ -854,11 +872,11 @@ class m {
     ), this[u].ccall(
       "wasm_set_content_length",
       null,
-      [b],
+      [E],
       [new TextEncoder().encode(e).length]
     );
   }
-  #u(e) {
+  #h(e) {
     this[u].ccall(
       "wasm_set_path_translated",
       null,
@@ -867,12 +885,16 @@ class m {
     );
   }
   addServerGlobalEntry(e, r) {
-    this[u].ccall(
-      "wasm_add_SERVER_entry",
-      null,
-      [f, f],
-      [e, r]
-    );
+    this.#r[e] = r;
+  }
+  #d() {
+    for (const e in this.#r)
+      this[u].ccall(
+        "wasm_add_SERVER_entry",
+        null,
+        [f, f],
+        [e, this.#r[e]]
+      );
   }
   /**
    * Adds file information to $_FILES superglobal in PHP.
@@ -883,18 +905,18 @@ class m {
    *
    * @param  fileInfo - File details
    */
-  #h(e) {
+  #f(e) {
     const { key: r, name: n, type: s, data: o } = e, i = `/tmp/${Math.random().toFixed(20)}`;
     this.writeFile(i, o);
     const a = 0;
     this[u].ccall(
       "wasm_add_uploaded_file",
       null,
-      [f, f, f, f, b, b],
+      [f, f, f, f, E, E],
       [r, n, s, i, a, o.byteLength]
     );
   }
-  #d(e) {
+  #p(e) {
     this[u].ccall(
       "wasm_set_php_code",
       null,
@@ -902,51 +924,40 @@ class m {
       [e]
     );
   }
-  async #f() {
+  async #m() {
     let e, r;
     try {
-      e = await new Promise(async (o, i) => {
-        r = (a) => {
+      e = await new Promise((o, i) => {
+        r = (l) => {
           const c = new Error("Rethrown");
-          c.cause = a.error, c.betterMessage = a.message, i(c);
-        }, this.#r?.addEventListener(
+          c.cause = l.error, c.betterMessage = l.message, i(c);
+        }, this.#n?.addEventListener(
           "error",
           r
         );
-        try {
-          o(
-            /**
-             * This is awkward, but Asyncify makes wasm_sapi_handle_request return
-             * Promise<Promise<number>>.
-             *
-             * @TODO: Determine whether this is a bug in emscripten or in our code.
-             */
-            await await this[u].ccall(
-              "wasm_sapi_handle_request",
-              b,
-              [],
-              []
-            )
-          );
-        } catch (a) {
-          i(a);
-        }
+        const a = this[u].ccall(
+          "wasm_sapi_handle_request",
+          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 = be();
-      const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, c = new Error(a);
-      throw c.cause = i, c;
+      this.functionsMaybeMissingFromAsyncify = le();
+      const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, l = new Error(a);
+      throw l.cause = i, l;
     } finally {
-      this.#r?.removeEventListener("error", r);
+      this.#n?.removeEventListener("error", r), this.#r = {};
     }
-    const { headers: n, httpStatusCode: s } = this.#i();
-    return new v(
+    const { headers: n, httpStatusCode: s } = this.#s();
+    return new b(
       s,
       n,
       this.readFileAsBuffer("/tmp/stdout"),
@@ -1092,42 +1103,42 @@ function F(t, e = globalThis, r = ["*"]) {
       console.warn(`Invalid origin '${s.origin}' for comlink proxy`);
       return;
     }
-    const { id: o, type: i, path: a } = Object.assign({ path: [] }, s.data), c = (s.data.argumentList || []).map(P);
-    let l;
+    const { id: o, type: i, path: a } = Object.assign({ path: [] }, s.data), l = (s.data.argumentList || []).map(P);
+    let c;
     try {
       const h = a.slice(0, -1).reduce((p, R) => p[R], t), g = a.reduce((p, R) => p[R], t);
       switch (i) {
         case "GET":
-          l = g;
+          c = g;
           break;
         case "SET":
-          h[a.slice(-1)[0]] = P(s.data.value), l = !0;
+          h[a.slice(-1)[0]] = P(s.data.value), c = !0;
           break;
         case "APPLY":
-          l = g.apply(h, c);
+          c = g.apply(h, l);
           break;
         case "CONSTRUCT":
           {
-            const p = new g(...c);
-            l = re(p);
+            const p = new g(...l);
+            c = re(p);
           }
           break;
         case "ENDPOINT":
           {
             const { port1: p, port2: R } = new MessageChannel();
-            F(t, R), l = Ue(p, [p]);
+            F(t, R), c = Ue(p, [p]);
           }
           break;
         case "RELEASE":
-          l = void 0;
+          c = void 0;
           break;
         default:
           return;
       }
     } catch (h) {
-      l = { value: h, [x]: 0 };
+      c = { value: h, [x]: 0 };
     }
-    Promise.resolve(l).catch((h) => ({ value: h, [x]: 0 })).then((h) => {
+    Promise.resolve(c).catch((h) => ({ value: h, [x]: 0 })).then((h) => {
       const [g, p] = C(h);
       e.postMessage(Object.assign(Object.assign({}, g), { id: o }), p), i === "RELEASE" && (e.removeEventListener("message", n), Z(e), H in t && typeof t[H] == "function" && t[H]());
     }).catch((h) => {
@@ -1153,7 +1164,7 @@ function k(t) {
     throw new Error("Proxy has been released and is not useable");
 }
 function ee(t) {
-  return E(t, {
+  return v(t, {
     type: "RELEASE"
   }).then(() => {
     Z(t);
@@ -1182,9 +1193,9 @@ function O(t, e = [], r = function() {
       if (i === "then") {
         if (e.length === 0)
           return { then: () => s };
-        const a = E(t, {
+        const a = v(t, {
           type: "GET",
-          path: e.map((c) => c.toString())
+          path: e.map((l) => l.toString())
         }).then(P);
         return a.then.bind(a);
       }
@@ -1192,37 +1203,37 @@ function O(t, e = [], r = function() {
     },
     set(o, i, a) {
       k(n);
-      const [c, l] = C(a);
-      return E(t, {
+      const [l, c] = C(a);
+      return v(t, {
         type: "SET",
         path: [...e, i].map((h) => h.toString()),
-        value: c
-      }, l).then(P);
+        value: l
+      }, c).then(P);
     },
     apply(o, i, a) {
       k(n);
-      const c = e[e.length - 1];
-      if (c === _e)
-        return E(t, {
+      const l = e[e.length - 1];
+      if (l === _e)
+        return v(t, {
           type: "ENDPOINT"
         }).then(P);
-      if (c === "bind")
+      if (l === "bind")
         return O(t, e.slice(0, -1));
-      const [l, h] = Y(a);
-      return E(t, {
+      const [c, h] = Y(a);
+      return v(t, {
         type: "APPLY",
         path: e.map((g) => g.toString()),
-        argumentList: l
+        argumentList: c
       }, h).then(P);
     },
     construct(o, i) {
       k(n);
-      const [a, c] = Y(i);
-      return E(t, {
+      const [a, l] = Y(i);
+      return v(t, {
         type: "CONSTRUCT",
-        path: e.map((l) => l.toString()),
+        path: e.map((c) => c.toString()),
         argumentList: a
-      }, c).then(P);
+      }, l).then(P);
     }
   });
   return Oe(s, t), s;
@@ -1277,7 +1288,7 @@ function P(t) {
       return t.value;
   }
 }
-function E(t, e, r) {
+function v(t, e, r) {
   return new Promise((n) => {
     const s = Ne();
     t.addEventListener("message", function o(i) {
@@ -1302,7 +1313,7 @@ function je(t, e) {
   const s = new Promise((a) => {
     n = a;
   }), o = N(t), i = new Proxy(o, {
-    get: (a, c) => c === "isConnected" ? () => r : c === "isReady" ? () => s : c in a ? a[c] : e?.[c]
+    get: (a, l) => l === "isConnected" ? () => r : l === "isReady" ? () => s : l in a ? a[l] : e?.[l]
   });
   return F(
     i,
@@ -1336,7 +1347,7 @@ function se() {
       return [t.toRawData(), []];
     },
     deserialize(t) {
-      return v.fromRawData(t);
+      return b.fromRawData(t);
     }
   }));
 }
@@ -1358,7 +1369,7 @@ function N(t) {
     }
   });
 }
-async function We(t = oe) {
+async function We(t = me) {
   switch (t) {
     case "8.2":
       return await import("php_8_2.js");
@@ -1409,17 +1420,17 @@ class L extends m {
       const i = await Promise.all([
         We(e),
         ...r.dataModules || []
-      ]), [a, ...c] = i;
+      ]), [a, ...l] = i;
       r.downloadMonitor?.setModules(i);
-      const l = await pe(
+      const c = await Re(
         a,
         {
           ...r.emscriptenOptions || {},
           ...r.downloadMonitor?.getEmscriptenOptions() || {}
         },
-        c
+        l
       );
-      return n.initializeRuntime(l), { dataModules: c };
+      return n.initializeRuntime(c), { dataModules: l };
     })();
     return {
       php: n,
@@ -1532,14 +1543,14 @@ async function Ve(t, e, r, n) {
         `[window] Reloading the currently registered Service Worker (expected version: ${n}, registered version: ${i})`
       );
       for (const a of o) {
-        let c = !1;
+        let l = !1;
         try {
           await a.update();
         } catch {
-          c = !0;
+          l = !0;
         }
-        const l = a.waiting || a.installing;
-        l && !c && (i !== null ? l.postMessage("skip-waiting") : c = !0), c && (await a.unregister(), window.location.reload());
+        const c = a.waiting || a.installing;
+        c && !l && (i !== null ? c.postMessage("skip-waiting") : l = !0), l && (await a.unregister(), window.location.reload());
       }
     }
   } else
@@ -1553,7 +1564,7 @@ async function Ve(t, e, r, n) {
     async function(a) {
       if (console.debug("Message from ServiceWorker", a), e && a.data.scope !== e)
         return;
-      const c = a.data.args || [], l = a.data.method, h = await t[l](...c);
+      const l = a.data.args || [], c = a.data.method, h = await t[c](...l);
       a.source.postMessage(De(a.data.requestId, h));
     }
   ), s.startMessages();