@php-wasm/web 0.1.61 → 0.3.0

package/index.js

@@ -19,8 +19,11 @@ class I extends Event {
 }
 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 {
+const oe = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : I;
+function ae(t) {
+  return t instanceof Error ? "exitCode" in t && t?.exitCode === 0 || t?.name === "ExitStatus" && "status" in t && t.status === 0 : !1;
+}
+class ce extends EventTarget {
   constructor() {
     super(...arguments), this.listenersCount = 0;
   }
@@ -34,62 +37,62 @@ class oe extends EventTarget {
     return this.listenersCount > 0;
   }
 }
-function ae(t) {
+function le(t) {
   t.asm = {
     ...t.asm
   };
-  const e = new oe();
+  const e = new ce();
   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 = le(
-            o,
+        } catch (i) {
+          if (!(i instanceof Error))
+            throw i;
+          const o = he(
+            i,
             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
-            })
-          );
+          if (t.lastAsyncifyStackSource && (i.cause = t.lastAsyncifyStackSource), e.hasListeners()) {
+            e.dispatchEvent(
+              new oe("error", {
+                error: i,
+                message: o
+              })
+            );
+            return;
+          }
+          throw ae(i) || pe(o), i;
         }
       };
     }
   return e;
 }
-let M = [];
-function ce() {
-  return M;
+let A = [];
+function ue() {
+  return A;
 }
-function le(t, e) {
+function he(t, e) {
   if (t.message === "unreachable") {
-    let r = ue;
+    let r = de;
     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 = fe(
+`), A = me(
       e || t.stack || ""
     );
-    for (const n of M)
+    for (const n of A)
       r += `    * ${n}
 `;
     return r;
   }
   return t.message;
 }
-const ue = `
+const de = `
 "unreachable" WASM instruction executed.
 
 The typical reason is a PHP function missing from the ASYNCIFY_ONLY
@@ -113,20 +116,20 @@ 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: 
 
-`, D = "\x1B[41m", he = "\x1B[1m", q = "\x1B[0m", z = "\x1B[K";
+`, D = "\x1B[41m", fe = "\x1B[1m", q = "\x1B[0m", z = "\x1B[K";
 let B = !1;
-function de(t) {
+function pe(t) {
   if (!B) {
     B = !0, console.log(`${D}
 ${z}
-${he}  WASM ERROR${q}${D}`);
+${fe}  WASM ERROR${q}${D}`);
     for (const e of t.split(`
 `))
       console.log(`${z}  ${e} `);
     console.log(`${q}`);
   }
 }
-function fe(t) {
+function me(t) {
   try {
     const e = t.split(`
 `).slice(1).map((r) => {
@@ -144,8 +147,8 @@ function fe(t) {
   }
 }
 class b {
-  constructor(e, r, n, s = "", o = 0) {
-    this.httpStatusCode = e, this.headers = r, this.bytes = n, this.exitCode = o, this.errors = s;
+  constructor(e, r, n, s = "", i = 0) {
+    this.httpStatusCode = e, this.headers = r, this.bytes = n, this.exitCode = i, this.errors = s;
   }
   static fromRawData(e) {
     return new b(
@@ -178,7 +181,7 @@ class b {
     return new TextDecoder().decode(this.bytes);
   }
 }
-const pe = [
+const ge = [
   "8.2",
   "8.1",
   "8.0",
@@ -188,8 +191,8 @@ const pe = [
   "7.1",
   "7.0",
   "5.6"
-], me = pe[0];
-class ge {
+], ye = ge[0];
+class we {
   #e;
   #t;
   /**
@@ -262,8 +265,8 @@ class ge {
       try {
         if (!r.includes("="))
           continue;
-        const n = r.indexOf("="), s = r.substring(0, n), o = r.substring(n + 1).split(";")[0];
-        this.#e[s] = o;
+        const n = r.indexOf("="), s = r.substring(0, n), i = r.substring(n + 1).split(";")[0];
+        this.#e[s] = i;
       } catch (n) {
         console.error(n);
       }
@@ -275,7 +278,7 @@ class ge {
     return e.join("; ");
   }
 }
-class ye {
+class Pe {
   constructor({ concurrency: e }) {
     this._running = 0, this.concurrency = e, this.queue = [];
   }
@@ -303,17 +306,17 @@ class ye {
     }
   }
 }
-const we = "http://example.com";
+const be = "http://example.com";
 function j(t) {
   return t.toString().substring(t.origin.length);
 }
 function G(t, e) {
   return !e || !t.startsWith(e) ? t : t.substring(e.length);
 }
-function Pe(t, e) {
+function Ee(t, e) {
   return !e || t.startsWith(e) ? t : e + t;
 }
-class be {
+class ke {
   #e;
   #t;
   #n;
@@ -322,25 +325,23 @@ class be {
   #s;
   #o;
   #a;
-  #c;
   /**
    * @param  php    - The PHP instance.
    * @param  config - Request Handler configuration.
    */
   constructor(e, r = {}) {
-    this.#a = new ye({ concurrency: 1 });
+    this.#a = new Pe({ concurrency: 1 });
     const {
       documentRoot: n = "/www/",
-      absoluteUrl: s = typeof location == "object" ? location?.href : "",
-      isStaticFilePath: o = () => !1
+      absoluteUrl: s = typeof location == "object" ? location?.href : ""
     } = r;
-    this.php = e, this.#e = n, this.#c = o;
+    this.php = e, this.#e = n;
     const i = new URL(s);
     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;
+    const o = this.#r !== 443 && this.#r !== 80;
     this.#i = [
       this.#n,
-      a ? `:${this.#r}` : ""
+      o ? `:${this.#r}` : ""
     ].join(""), this.#s = i.pathname.replace(/\/+$/, ""), this.#o = [
       `${this.#t}://`,
       this.#i,
@@ -371,40 +372,43 @@ class be {
   async request(e) {
     const r = e.url.startsWith("http://") || e.url.startsWith("https://"), n = new URL(
       e.url,
-      r ? void 0 : we
+      r ? void 0 : be
     ), s = G(
       n.pathname,
       this.#s
-    );
-    return this.#c(s) ? this.#l(s) : await this.#u(e, n);
+    ), i = `${this.#e}${s}`;
+    return xe(i) ? await this.#l(e, n) : this.#c(i);
   }
   /**
    * Serves a static file from the PHP filesystem.
    *
-   * @param  path - The requested static file path.
+   * @param  fsPath - Absolute path of the static file to serve.
    * @returns The response.
    */
-  #l(e) {
-    const r = `${this.#e}${e}`;
-    if (!this.php.fileExists(r))
+  #c(e) {
+    if (!this.php.fileExists(e))
       return new b(
         404,
-        {},
+        // Let the service worker know that no static file was found
+        // and that it's okay to issue a real fetch() to the server.
+        {
+          "x-file-type": ["static"]
+        },
         new TextEncoder().encode("404 File not found")
       );
-    const n = this.php.readFileAsBuffer(r);
+    const r = this.php.readFileAsBuffer(e);
     return new b(
       200,
       {
-        "content-length": [`${n.byteLength}`],
+        "content-length": [`${r.byteLength}`],
         // @TODO: Infer the content-type from the arrayBuffer instead of the file path.
         //        The code below won't return the correct mime-type if the extension
         //        was tampered with.
-        "content-type": [ve(r)],
+        "content-type": [ve(e)],
         "accept-ranges": ["bytes"],
         "cache-control": ["public, max-age=0"]
       },
-      n
+      r
     );
   }
   /**
@@ -414,7 +418,7 @@ class be {
    * @param  request - The request.
    * @returns The response.
    */
-  async #u(e, r) {
+  async #l(e, r) {
     const n = await this.#a.acquire();
     try {
       this.php.addServerGlobalEntry("DOCUMENT_ROOT", this.#e), this.php.addServerGlobalEntry(
@@ -422,32 +426,32 @@ class be {
         this.#o.startsWith("https://") ? "on" : ""
       );
       let s = "GET";
-      const o = {
+      const i = {
         host: this.#i,
-        ...K(e.headers || {})
-      }, i = [];
+        ...Q(e.headers || {})
+      }, o = [];
       if (e.files && Object.keys(e.files).length) {
         s = "POST";
-        for (const l in e.files) {
-          const h = e.files[l];
-          i.push({
-            key: l,
+        for (const a in e.files) {
+          const h = e.files[a];
+          o.push({
+            key: a,
             name: h.name,
             type: h.type,
             data: new Uint8Array(await h.arrayBuffer())
           });
         }
-        o["content-type"]?.startsWith("multipart/form-data") && (e.formData = Ee(
+        i["content-type"]?.startsWith("multipart/form-data") && (e.formData = Re(
           e.body || ""
-        ), o["content-type"] = "application/x-www-form-urlencoded", delete e.body);
+        ), i["content-type"] = "application/x-www-form-urlencoded", delete e.body);
       }
-      let a;
-      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;
       let c;
+      e.formData !== void 0 ? (s = "POST", i["content-type"] = i["content-type"] || "application/x-www-form-urlencoded", c = new URLSearchParams(
+        e.formData
+      ).toString()) : c = e.body;
+      let l;
       try {
-        c = this.#h(r.pathname);
+        l = this.#u(r.pathname);
       } catch {
         return new b(
           404,
@@ -456,16 +460,16 @@ class be {
         );
       }
       return await this.php.run({
-        relativeUri: Pe(
+        relativeUri: Ee(
           j(r),
           this.#s
         ),
         protocol: this.#t,
         method: e.method || s,
-        body: a,
-        fileInfos: i,
-        scriptPath: c,
-        headers: o
+        body: c,
+        fileInfos: o,
+        scriptPath: l,
+        headers: i
       });
     } finally {
       n();
@@ -480,7 +484,7 @@ class be {
    * @throws {Error} If the requested path doesn't exist.
    * @returns The resolved filesystem path.
    */
-  #h(e) {
+  #u(e) {
     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}`;
@@ -491,18 +495,18 @@ class be {
     return `${this.#e}/index.php`;
   }
 }
-function Ee(t) {
+function Re(t) {
   const e = {}, r = t.match(/--(.*)\r\n/);
   if (!r)
     return e;
   const n = r[1], s = t.split(`--${n}`);
-  return s.shift(), s.pop(), s.forEach((o) => {
-    const i = o.indexOf(`\r
+  return s.shift(), s.pop(), s.forEach((i) => {
+    const o = i.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;
+`), c = i.substring(0, o).trim(), l = i.substring(o + 4).trim(), a = c.match(/name="([^"]+)"/);
+    if (a) {
+      const h = a[1];
+      e[h] = l;
     }
   }), e;
 }
@@ -546,6 +550,15 @@ function ve(t) {
       return "application-octet-stream";
   }
 }
+function xe(t) {
+  return Se(t) || Te(t);
+}
+function Se(t) {
+  return t.endsWith(".php") || t.includes(".php/");
+}
+function Te(t) {
+  return !t.split("/").pop().includes(".");
+}
 const V = {
   0: "No error occurred. System call completed successfully.",
   1: "Argument list too long.",
@@ -627,62 +640,64 @@ const V = {
 };
 function y(t = "") {
   return function(r, n, s) {
-    const o = s.value;
-    s.value = function(...i) {
+    const i = s.value;
+    s.value = function(...o) {
       try {
-        return o.apply(this, i);
-      } catch (a) {
-        const c = typeof a == "object" ? a?.errno : null;
-        if (c in V) {
-          const l = V[c], h = typeof i[0] == "string" ? i[0] : null, g = h !== null ? t.replaceAll("{path}", h) : t;
-          throw new Error(`${g}: ${l}`, {
-            cause: a
+        return i.apply(this, o);
+      } catch (c) {
+        const l = typeof c == "object" ? c?.errno : null;
+        if (l in V) {
+          const a = V[l], h = typeof o[0] == "string" ? o[0] : null, g = h !== null ? t.replaceAll("{path}", h) : t;
+          throw new Error(`${g}: ${a}`, {
+            cause: c
           });
         }
-        throw a;
+        throw c;
       }
     };
   };
 }
-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(Se, {
-    onAbort(c) {
-      console.error("WASM aborted: "), console.error(c);
+async function _e(t, e = {}, r = []) {
+  const [n, s, i] = Y(), [o, c] = Y(), l = t.init(He, {
+    onAbort(a) {
+      i(a), c(), console.error(a);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
     // breaks vite dev mode. An identity `locateFile` function
     // fixes it.
-    locateFile: (c) => c,
+    locateFile: (a) => a,
     ...e,
     noInitialRun: !0,
     onRuntimeInitialized() {
-      e.onRuntimeInitialized && e.onRuntimeInitialized(), n();
+      e.onRuntimeInitialized && e.onRuntimeInitialized(), s();
     },
-    monitorRunDependencies(c) {
-      c === 0 && (delete a.monitorRunDependencies, s());
+    monitorRunDependencies(a) {
+      a === 0 && (delete l.monitorRunDependencies, c());
     }
   });
-  for (const { default: c } of r)
-    c(a);
-  return r.length || s(), await o, await i, A.push(a), A.length - 1;
+  return await Promise.all(
+    r.map(
+      ({ default: a }) => a(l)
+    )
+  ), r.length || c(), await o, await n, M.push(l), M.length - 1;
 }
-const A = [];
-function ke(t) {
-  return A[t];
+const M = [];
+function Ce(t) {
+  return M[t];
 }
-const Se = function() {
+const He = 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;
+}(), Y = () => {
+  const t = [], e = new Promise((r, n) => {
+    t.push(r, n);
+  });
+  return t.unshift(e), t;
+};
+var Fe = Object.defineProperty, Ae = Object.getOwnPropertyDescriptor, w = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Ae(e, r) : e, i = t.length - 1, o; i >= 0; i--)
+    (o = t[i]) && (s = (n ? o(e, r, s) : o(s)) || s);
+  return n && s && Fe(e, r, s), s;
 };
 const f = "string", E = "number", u = Symbol("__private__dont__use");
 class m {
@@ -694,8 +709,8 @@ 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.#n = null, this.#r = {}, this.#i = [], e !== void 0 && this.initializeRuntime(e), r && (this.requestHandler = new ge(
-      new be(this, r)
+    this.#e = [], this.#t = !1, this.#n = null, this.#r = {}, this.#i = [], e !== void 0 && this.initializeRuntime(e), r && (this.requestHandler = new we(
+      new ke(this, r)
     ));
   }
   #e;
@@ -728,13 +743,13 @@ class m {
   initializeRuntime(e) {
     if (this[u])
       throw new Error("PHP runtime already initialized.");
-    const r = ke(e);
+    const r = Ce(e);
     if (!r)
       throw new Error("Invalid PHP runtime id.");
     this[u] = r, r.onMessage = (n) => {
       for (const s of this.#i)
         s(n);
-    }, this.#n = ae(r);
+    }, this.#n = le(r);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
@@ -768,7 +783,7 @@ class m {
     this.#t || (this.#s(), this.#t = !0), this.#d(e.scriptPath || ""), this.#a(e.relativeUri || ""), this.#l(e.method || "GET");
     const { host: r, ...n } = {
       host: "example.com:443",
-      ...K(e.headers || {})
+      ...Q(e.headers || {})
     };
     if (this.#c(r, e.protocol || "http"), this.#u(n), e.body && this.#h(e.body), e.fileInfos)
       for (const s of e.fileInfos)
@@ -800,8 +815,8 @@ class m {
     for (const s of r.headers) {
       if (!s.includes(": "))
         continue;
-      const o = s.indexOf(": "), i = s.substring(0, o).toLowerCase(), a = s.substring(o + 2);
-      i in n || (n[i] = []), n[i].push(a);
+      const i = s.indexOf(": "), o = s.substring(0, i).toLowerCase(), c = s.substring(i + 2);
+      o in n || (n[o] = []), n[o].push(c);
     }
     return {
       headers: n,
@@ -919,14 +934,14 @@ class m {
    * @param  fileInfo - File details
    */
   #p(e) {
-    const { key: r, name: n, type: s, data: o } = e, i = `/tmp/${Math.random().toFixed(20)}`;
-    this.writeFile(i, o);
-    const a = 0;
+    const { key: r, name: n, type: s, data: i } = e, o = `/tmp/${Math.random().toFixed(20)}`;
+    this.writeFile(o, i);
+    const c = 0;
     this[u].ccall(
       "wasm_add_uploaded_file",
       null,
       [f, f, f, f, E, E],
-      [r, n, s, i, a, o.byteLength]
+      [r, n, s, o, c, i.byteLength]
     );
   }
   #m(e) {
@@ -940,32 +955,32 @@ class m {
   async #g() {
     let e, r;
     try {
-      e = await new Promise((o, i) => {
-        r = (c) => {
-          const l = new Error("Rethrown");
-          l.cause = c.error, l.betterMessage = c.message, i(l);
+      e = await new Promise((i, o) => {
+        r = (l) => {
+          const a = new Error("Rethrown");
+          a.cause = l.error, a.betterMessage = l.message, o(a);
         }, this.#n?.addEventListener(
           "error",
           r
         );
-        const a = this[u].ccall(
+        const c = this[u].ccall(
           "wasm_sapi_handle_request",
           E,
           [],
           []
         );
-        return a instanceof Promise ? a.then(o, i) : o(a);
+        return c instanceof Promise ? c.then(i, o) : i(c);
       });
-    } catch (o) {
-      for (const l in this)
-        typeof this[l] == "function" && (this[l] = () => {
+    } catch (i) {
+      for (const a in this)
+        typeof this[a] == "function" && (this[a] = () => {
           throw new Error(
             "PHP runtime has crashed – see the earlier error for details."
           );
         });
-      this.functionsMaybeMissingFromAsyncify = ce();
-      const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, c = new Error(a);
-      throw c.cause = i, c;
+      this.functionsMaybeMissingFromAsyncify = ue();
+      const o = i, c = "betterMessage" in o ? o.betterMessage : o.message, l = new Error(c);
+      throw l.cause = o, l;
     } finally {
       this.#n?.removeEventListener("error", r), this.#r = {};
     }
@@ -1014,7 +1029,7 @@ class m {
       );
       if (r.prependPath) {
         const s = e.replace(/\/$/, "");
-        return n.map((o) => `${s}/${o}`);
+        return n.map((i) => `${s}/${i}`);
       }
       return n;
     } catch (n) {
@@ -1067,7 +1082,7 @@ w([
 w([
   y('Could not stat "{path}"')
 ], m.prototype, "fileExists", 1);
-function K(t) {
+function Q(t) {
   const e = {};
   for (const r in t)
     e[r.toLowerCase()] = t[r];
@@ -1078,17 +1093,17 @@ function K(t) {
  * Copyright 2019 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const Q = Symbol("Comlink.proxy"), _e = Symbol("Comlink.endpoint"), Ce = Symbol("Comlink.releaseProxy"), H = Symbol("Comlink.finalizer"), x = Symbol("Comlink.thrown"), X = (t) => typeof t == "object" && t !== null || typeof t == "function", Fe = {
-  canHandle: (t) => X(t) && t[Q],
+const X = Symbol("Comlink.proxy"), Me = Symbol("Comlink.endpoint"), Le = Symbol("Comlink.releaseProxy"), F = Symbol("Comlink.finalizer"), S = Symbol("Comlink.thrown"), Z = (t) => typeof t == "object" && t !== null || typeof t == "function", Oe = {
+  canHandle: (t) => Z(t) && t[X],
   serialize(t) {
     const { port1: e, port2: r } = new MessageChannel();
-    return F(t, e), [r, [r]];
+    return H(t, e), [r, [r]];
   },
   deserialize(t) {
     return t.start(), U(t);
   }
-}, He = {
-  canHandle: (t) => X(t) && x in t,
+}, Ie = {
+  canHandle: (t) => Z(t) && S in t,
   serialize({ value: t }) {
     let e;
     return t instanceof Error ? e = {
@@ -1103,174 +1118,174 @@ const Q = Symbol("Comlink.proxy"), _e = Symbol("Comlink.endpoint"), Ce = Symbol(
   deserialize(t) {
     throw t.isError ? Object.assign(new Error(t.value.message), t.value) : t.value;
   }
-}, k = /* @__PURE__ */ new Map([
-  ["proxy", Fe],
-  ["throw", He]
+}, v = /* @__PURE__ */ new Map([
+  ["proxy", Oe],
+  ["throw", Ie]
 ]);
-function Me(t, e) {
+function Ue(t, e) {
   for (const r of t)
     if (e === r || r === "*" || r instanceof RegExp && r.test(e))
       return !0;
   return !1;
 }
-function F(t, e = globalThis, r = ["*"]) {
+function H(t, e = globalThis, r = ["*"]) {
   e.addEventListener("message", function n(s) {
     if (!s || !s.data)
       return;
-    if (!Me(r, s.origin)) {
+    if (!Ue(r, s.origin)) {
       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: i, type: o, path: c } = Object.assign({ path: [] }, s.data), l = (s.data.argumentList || []).map(P);
+    let a;
     try {
-      const h = a.slice(0, -1).reduce((p, R) => p[R], t), g = a.reduce((p, R) => p[R], t);
-      switch (i) {
+      const h = c.slice(0, -1).reduce((p, R) => p[R], t), g = c.reduce((p, R) => p[R], t);
+      switch (o) {
         case "GET":
-          l = g;
+          a = g;
           break;
         case "SET":
-          h[a.slice(-1)[0]] = P(s.data.value), l = !0;
+          h[c.slice(-1)[0]] = P(s.data.value), a = !0;
           break;
         case "APPLY":
-          l = g.apply(h, c);
+          a = g.apply(h, l);
           break;
         case "CONSTRUCT":
           {
-            const p = new g(...c);
-            l = re(p);
+            const p = new g(...l);
+            a = ne(p);
           }
           break;
         case "ENDPOINT":
           {
             const { port1: p, port2: R } = new MessageChannel();
-            F(t, R), l = Ue(p, [p]);
+            H(t, R), a = qe(p, [p]);
           }
           break;
         case "RELEASE":
-          l = void 0;
+          a = void 0;
           break;
         default:
           return;
       }
     } catch (h) {
-      l = { value: h, [x]: 0 };
+      a = { value: h, [S]: 0 };
     }
-    Promise.resolve(l).catch((h) => ({ value: h, [x]: 0 })).then((h) => {
+    Promise.resolve(a).catch((h) => ({ value: h, [S]: 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]());
+      e.postMessage(Object.assign(Object.assign({}, g), { id: i }), p), o === "RELEASE" && (e.removeEventListener("message", n), ee(e), F in t && typeof t[F] == "function" && t[F]());
     }).catch((h) => {
       const [g, p] = C({
         value: new TypeError("Unserializable return value"),
-        [x]: 0
+        [S]: 0
       });
-      e.postMessage(Object.assign(Object.assign({}, g), { id: o }), p);
+      e.postMessage(Object.assign(Object.assign({}, g), { id: i }), p);
     });
   }), e.start && e.start();
 }
-function Ae(t) {
+function Ne(t) {
   return t.constructor.name === "MessagePort";
 }
-function Z(t) {
-  Ae(t) && t.close();
+function ee(t) {
+  Ne(t) && t.close();
 }
 function U(t, e) {
-  return O(t, [], e);
+  return L(t, [], e);
 }
-function S(t) {
+function x(t) {
   if (t)
     throw new Error("Proxy has been released and is not useable");
 }
-function ee(t) {
-  return v(t, {
+function te(t) {
+  return k(t, {
     type: "RELEASE"
   }).then(() => {
-    Z(t);
+    ee(t);
   });
 }
 const T = /* @__PURE__ */ new WeakMap(), _ = "FinalizationRegistry" in globalThis && new FinalizationRegistry((t) => {
   const e = (T.get(t) || 0) - 1;
-  T.set(t, e), e === 0 && ee(t);
+  T.set(t, e), e === 0 && te(t);
 });
-function Oe(t, e) {
+function We(t, e) {
   const r = (T.get(e) || 0) + 1;
   T.set(e, r), _ && _.register(t, e, t);
 }
-function Le(t) {
+function $e(t) {
   _ && _.unregister(t);
 }
-function O(t, e = [], r = function() {
+function L(t, e = [], r = function() {
 }) {
   let n = !1;
   const s = new Proxy(r, {
-    get(o, i) {
-      if (S(n), i === Ce)
+    get(i, o) {
+      if (x(n), o === Le)
         return () => {
-          Le(s), ee(t), n = !0;
+          $e(s), te(t), n = !0;
         };
-      if (i === "then") {
+      if (o === "then") {
         if (e.length === 0)
           return { then: () => s };
-        const a = v(t, {
+        const c = k(t, {
           type: "GET",
-          path: e.map((c) => c.toString())
+          path: e.map((l) => l.toString())
         }).then(P);
-        return a.then.bind(a);
+        return c.then.bind(c);
       }
-      return O(t, [...e, i]);
+      return L(t, [...e, o]);
     },
-    set(o, i, a) {
-      S(n);
-      const [c, l] = C(a);
-      return v(t, {
+    set(i, o, c) {
+      x(n);
+      const [l, a] = C(c);
+      return k(t, {
         type: "SET",
-        path: [...e, i].map((h) => h.toString()),
-        value: c
-      }, l).then(P);
+        path: [...e, o].map((h) => h.toString()),
+        value: l
+      }, a).then(P);
     },
-    apply(o, i, a) {
-      S(n);
-      const c = e[e.length - 1];
-      if (c === _e)
-        return v(t, {
+    apply(i, o, c) {
+      x(n);
+      const l = e[e.length - 1];
+      if (l === Me)
+        return k(t, {
           type: "ENDPOINT"
         }).then(P);
-      if (c === "bind")
-        return O(t, e.slice(0, -1));
-      const [l, h] = Y(a);
-      return v(t, {
+      if (l === "bind")
+        return L(t, e.slice(0, -1));
+      const [a, h] = J(c);
+      return k(t, {
         type: "APPLY",
         path: e.map((g) => g.toString()),
-        argumentList: l
+        argumentList: a
       }, h).then(P);
     },
-    construct(o, i) {
-      S(n);
-      const [a, c] = Y(i);
-      return v(t, {
+    construct(i, o) {
+      x(n);
+      const [c, l] = J(o);
+      return k(t, {
         type: "CONSTRUCT",
-        path: e.map((l) => l.toString()),
-        argumentList: a
-      }, c).then(P);
+        path: e.map((a) => a.toString()),
+        argumentList: c
+      }, l).then(P);
     }
   });
-  return Oe(s, t), s;
+  return We(s, t), s;
 }
-function Ie(t) {
+function De(t) {
   return Array.prototype.concat.apply([], t);
 }
-function Y(t) {
+function J(t) {
   const e = t.map(C);
-  return [e.map((r) => r[0]), Ie(e.map((r) => r[1]))];
+  return [e.map((r) => r[0]), De(e.map((r) => r[1]))];
 }
-const te = /* @__PURE__ */ new WeakMap();
-function Ue(t, e) {
-  return te.set(t, e), t;
+const re = /* @__PURE__ */ new WeakMap();
+function qe(t, e) {
+  return re.set(t, e), t;
 }
-function re(t) {
-  return Object.assign(t, { [Q]: !0 });
+function ne(t) {
+  return Object.assign(t, { [X]: !0 });
 }
-function ne(t, e = globalThis, r = "*") {
+function se(t, e = globalThis, r = "*") {
   return {
     postMessage: (n, s) => t.postMessage(n, r, s),
     addEventListener: e.addEventListener.bind(e),
@@ -1278,7 +1293,7 @@ function ne(t, e = globalThis, r = "*") {
   };
 }
 function C(t) {
-  for (const [e, r] of k)
+  for (const [e, r] of v)
     if (r.canHandle(t)) {
       const [n, s] = r.serialize(t);
       return [
@@ -1295,64 +1310,64 @@ function C(t) {
       type: "RAW",
       value: t
     },
-    te.get(t) || []
+    re.get(t) || []
   ];
 }
 function P(t) {
   switch (t.type) {
     case "HANDLER":
-      return k.get(t.name).deserialize(t.value);
+      return v.get(t.name).deserialize(t.value);
     case "RAW":
       return t.value;
   }
 }
-function v(t, e, r) {
+function k(t, e, r) {
   return new Promise((n) => {
-    const s = Ne();
-    t.addEventListener("message", function o(i) {
-      !i.data || !i.data.id || i.data.id !== s || (t.removeEventListener("message", o), n(i.data));
+    const s = ze();
+    t.addEventListener("message", function i(o) {
+      !o.data || !o.data.id || o.data.id !== s || (t.removeEventListener("message", i), n(o.data));
     }), t.start && t.start(), t.postMessage(Object.assign({ id: s }, e), r);
   });
 }
-function Ne() {
+function ze() {
   return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
 }
-function je(t) {
-  se();
-  const e = t instanceof Worker ? t : ne(t), r = U(e), n = N(r);
+function Je(t) {
+  ie();
+  const e = t instanceof Worker ? t : se(t), r = U(e), n = N(r);
   return new Proxy(n, {
-    get: (s, o) => o === "isConnected" ? async () => {
-      for (let i = 0; i < 10; i++)
+    get: (s, i) => i === "isConnected" ? async () => {
+      for (let o = 0; o < 10; o++)
         try {
-          await We(r.isConnected(), 200);
+          await Be(r.isConnected(), 200);
           break;
         } catch {
         }
-    } : r[o]
+    } : r[i]
   });
 }
-async function We(t, e) {
+async function Be(t, e) {
   return new Promise((r, n) => {
     setTimeout(n, e), t.then(r);
   });
 }
-function Ge(t, e) {
-  se();
+function Ke(t, e) {
+  ie();
   const r = Promise.resolve();
-  let n;
-  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]
+  let n, s;
+  const i = new Promise((l, a) => {
+    n = l, s = a;
+  }), o = N(t), c = new Proxy(o, {
+    get: (l, a) => a === "isConnected" ? () => r : a === "isReady" ? () => i : a in l ? l[a] : e?.[a]
   });
-  return F(
-    i,
-    typeof window < "u" ? ne(self.parent) : void 0
-  ), [n, i];
+  return H(
+    c,
+    typeof window < "u" ? se(self.parent) : void 0
+  ), [n, s, c];
 }
-let J = !1;
-function se() {
-  J || (J = !0, k.set("EVENT", {
+let K = !1;
+function ie() {
+  K || (K = !0, v.set("EVENT", {
     canHandle: (t) => t instanceof CustomEvent,
     serialize: (t) => [
       {
@@ -1361,17 +1376,17 @@ function se() {
       []
     ],
     deserialize: (t) => t
-  }), k.set("FUNCTION", {
+  }), v.set("FUNCTION", {
     canHandle: (t) => typeof t == "function",
     serialize(t) {
       console.debug("[Comlink][Performance] Proxying a function");
       const { port1: e, port2: r } = new MessageChannel();
-      return F(t, e), [r, [r]];
+      return H(t, e), [r, [r]];
     },
     deserialize(t) {
       return t.start(), U(t);
     }
-  }), k.set("PHPResponse", {
+  }), v.set("PHPResponse", {
     canHandle: (t) => typeof t == "object" && t !== null && "headers" in t && "bytes" in t && "errors" in t && "exitCode" in t && "httpStatusCode" in t,
     serialize(t) {
       return [t.toRawData(), []];
@@ -1394,35 +1409,72 @@ function N(t) {
         case "string":
           return e[r];
         default:
-          return re(e[r]);
+          return ne(e[r]);
       }
     }
   });
 }
-async function $e(t = me) {
-  switch (t) {
-    case "8.2":
-      return await import("./php_8_2.js");
-    case "8.1":
-      return await import("./php_8_1.js");
-    case "8.0":
-      return await import("./php_8_0.js");
-    case "7.4":
-      return await import("./php_7_4.js");
-    case "7.3":
-      return await import("./php_7_3.js");
-    case "7.2":
-      return await import("./php_7_2.js");
-    case "7.1":
-      return await import("./php_7_1.js");
-    case "7.0":
-      return await import("./php_7_0.js");
-    case "5.6":
-      return await import("./php_5_6.js");
-  }
+async function je(t = ye, e = "light") {
+  if (e === "kitchen-sink")
+    switch (t) {
+      case "8.2":
+        return await import("./php_8_2.js");
+      case "8.1":
+        return await import("./php_8_1.js");
+      case "8.0":
+        return await import("./php_8_0.js");
+      case "7.4":
+        return await import("./php_7_4.js");
+      case "7.3":
+        return await import("./php_7_3.js");
+      case "7.2":
+        return await import("./php_7_2.js");
+      case "7.1":
+        return await import("./php_7_1.js");
+      case "7.0":
+        return await import("./php_7_0.js");
+      case "5.6":
+        return await import("./php_5_6.js");
+    }
+  else
+    switch (t) {
+      case "8.2":
+        return await import("./php_8_2.js");
+      case "8.1":
+        return await import("./php_8_1.js");
+      case "8.0":
+        return await import("./php_8_0.js");
+      case "7.4":
+        return await import("./php_7_4.js");
+      case "7.3":
+        return await import("./php_7_3.js");
+      case "7.2":
+        return await import("./php_7_2.js");
+      case "7.1":
+        return await import("./php_7_1.js");
+      case "7.0":
+        return await import("./php_7_0.js");
+      case "5.6":
+        return await import("./php_5_6.js");
+    }
   throw new Error(`Unsupported PHP version ${t}`);
 }
-class L extends m {
+const Ge = () => ({
+  websocket: {
+    decorator: (t) => class extends t {
+      constructor() {
+        try {
+          super();
+        } catch {
+        }
+      }
+      send() {
+        return null;
+      }
+    }
+  }
+});
+class O extends m {
   /**
    * Creates a new PHP instance.
    *
@@ -1436,7 +1488,7 @@ class L extends m {
    * @returns A new PHP instance
    */
   static async load(e, r = {}) {
-    return await L.loadSync(e, r).phpReady;
+    return await O.loadSync(e, r).phpReady;
   }
   /**
    * Does what load() does, but synchronously returns
@@ -1446,21 +1498,22 @@ class L extends m {
    * @see load
    */
   static loadSync(e, r = {}) {
-    const n = new L(void 0, r.requestHandler), o = (async () => {
-      const i = await Promise.all([
-        $e(e),
+    const n = new O(void 0, r.requestHandler), s = r.loadAllExtensions ? "kitchen-sink" : "light", o = (async () => {
+      const c = await Promise.all([
+        je(e, s),
         ...r.dataModules || []
-      ]), [a, ...c] = i;
-      r.downloadMonitor?.setModules(i);
-      const l = await Re(
-        a,
+      ]), [l, ...a] = c;
+      r.downloadMonitor?.setModules(c);
+      const h = await _e(
+        l,
         {
           ...r.emscriptenOptions || {},
-          ...r.downloadMonitor?.getEmscriptenOptions() || {}
+          ...r.downloadMonitor?.getEmscriptenOptions() || {},
+          ...Ge()
         },
-        c
+        a
       );
-      n.initializeRuntime(l);
+      n.initializeRuntime(h);
     })();
     return {
       php: n,
@@ -1469,7 +1522,7 @@ class L extends m {
   }
 }
 const d = /* @__PURE__ */ new WeakMap();
-class Ve {
+class Xe {
   /** @inheritDoc */
   constructor(e, r) {
     d.set(this, {
@@ -1560,96 +1613,65 @@ class Ve {
     d.get(this).php.onMessage(e);
   }
 }
-function De(t, e) {
+function Ve(t, e) {
   return {
     type: "response",
     requestId: t,
     response: e
   };
 }
-async function Ye(t, e, r, n) {
-  const s = navigator.serviceWorker;
-  if (!s)
+async function Ze(t, e, r) {
+  const n = navigator.serviceWorker;
+  if (!n)
     throw new Error("Service workers are not supported in this browser.");
-  const o = await s.getRegistrations();
-  if (o.length > 0) {
-    const i = await qe();
-    if (n !== i) {
-      console.debug(
-        `[window] Reloading the currently registered Service Worker (expected version: ${n}, registered version: ${i})`
-      );
-      for (const a of o) {
-        let c = !1;
-        try {
-          await a.update();
-        } catch {
-          c = !0;
-        }
-        const l = a.waiting || a.installing;
-        l && !c && (i !== null ? l.postMessage("skip-waiting") : c = !0), c && (await a.unregister(), window.location.reload());
-      }
-    }
-  } else
-    console.debug(
-      `[window] Creating a Service Worker registration (version: ${n})`
-    ), await s.register(r, {
-      type: "module"
-    });
-  navigator.serviceWorker.addEventListener(
+  console.debug("[window][sw] Registering a Service Worker"), await (await n.register(r, {
+    type: "module",
+    // Always bypass HTTP cache when fetching the new Service Worker script:
+    updateViaCache: "none"
+  })).update(), navigator.serviceWorker.addEventListener(
     "message",
-    async function(a) {
-      if (console.debug("Message from ServiceWorker", a), e && a.data.scope !== e)
+    async function(o) {
+      if (console.debug("[window][sw] Message from ServiceWorker", o), e && o.data.scope !== e)
         return;
-      const c = a.data.args || [], l = a.data.method, h = await t[l](...c);
-      a.source.postMessage(De(a.data.requestId, h));
+      const c = o.data.args || [], l = o.data.method, a = await t[l](...c);
+      o.source.postMessage(Ve(o.data.requestId, a));
     }
-  ), s.startMessages();
-}
-async function qe() {
-  try {
-    return (await (await fetch("/version")).json()).version;
-  } catch {
-    return null;
-  }
+  ), n.startMessages();
 }
-function Je() {
-  const t = {};
-  return typeof self?.location?.href < "u" && new URL(self.location.href).searchParams.forEach((r, n) => {
-    t[n] = r;
-  }), t;
-}
-const Ke = function() {
-  return typeof navigator < "u" && navigator?.userAgent?.toLowerCase().indexOf("firefox") > -1 ? "iframe" : "webworker";
-}();
-async function Qe(t, e = "webworker", r = {}) {
-  if (t = ze(t, r), e === "webworker")
-    return new Worker(t, { type: "module" });
-  if (e === "iframe")
-    return (await Be(t)).contentWindow;
-  throw new Error(`Unknown backendName: ${e}`);
+async function et(t, e = {}) {
+  t = Ye(t, e);
+  const r = new Worker(t, { type: "module" });
+  return new Promise((n, s) => {
+    r.onerror = (o) => {
+      const c = new Error(
+        `WebWorker failed to load at ${t}. ${o.message ? `Original error: ${o.message}` : ""}`
+      );
+      c.filename = o.filename, s(c);
+    };
+    function i(o) {
+      o.data === "worker-script-started" && (n(r), r.removeEventListener("message", i));
+    }
+    r.addEventListener("message", i);
+  });
 }
-function ze(t, e) {
+function Ye(t, e) {
   if (!Object.entries(e).length)
     return t + "";
   const r = new URL(t);
   for (const [n, s] of Object.entries(e))
-    r.searchParams.set(n, s);
+    if (Array.isArray(s))
+      for (const i of s)
+        r.searchParams.append(n, i);
+    else
+      r.searchParams.set(n, s);
   return r.toString();
 }
-async function Be(t) {
-  const e = document.createElement("iframe"), r = "/" + t.split("/").slice(-1)[0];
-  return e.src = r, e.style.display = "none", document.body.appendChild(e), await new Promise((n) => {
-    e.addEventListener("load", n);
-  }), e;
-}
 export {
-  L as WebPHP,
-  Ve as WebPHPEndpoint,
-  je as consumeAPI,
-  Ge as exposeAPI,
-  $e as getPHPLoaderModule,
-  Je as parseWorkerStartupOptions,
-  Ke as recommendedWorkerBackend,
-  Ye as registerServiceWorker,
-  Qe as spawnPHPWorkerThread
+  O as WebPHP,
+  Xe as WebPHPEndpoint,
+  Je as consumeAPI,
+  Ke as exposeAPI,
+  je as getPHPLoaderModule,
+  Ze as registerServiceWorker,
+  et as spawnPHPWorkerThread
 };