@php-wasm/web 0.1.60 → 0.2.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,11 +37,11 @@ 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];
@@ -48,48 +51,48 @@ function ae(t) {
         } catch (o) {
           if (!(o instanceof Error))
             throw o;
-          if ("exitCode" in o && o?.exitCode === 0)
-            return;
-          const i = ce(
+          const i = he(
             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
-            })
-          );
+          if (t.lastAsyncifyStackSource && (o.cause = t.lastAsyncifyStackSource), e.hasListeners()) {
+            e.dispatchEvent(
+              new oe("error", {
+                error: o,
+                message: i
+              })
+            );
+            return;
+          }
+          throw ae(o) || pe(i), o;
         }
       };
     }
   return e;
 }
-let A = [];
-function le() {
-  return A;
+let O = [];
+function ue() {
+  return O;
 }
-function ce(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 }).
 
-`), A = fe(
+`), O = me(
       e || t.stack || ""
     );
-    for (const n of A)
+    for (const n of O)
       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) => {
@@ -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;
   /**
@@ -275,7 +278,7 @@ class ge {
     return e.join("; ");
   }
 }
-class ye {
+class Pe {
   constructor({ concurrency: e }) {
     this._running = 0, this.concurrency = e, this.queue = [];
   }
@@ -286,10 +289,13 @@ class ye {
     for (; ; )
       if (this._running >= this.concurrency)
         await new Promise((e) => this.queue.push(e));
-      else
-        return this._running++, () => {
-          this._running--, this.queue.length > 0 && this.queue.shift()();
+      else {
+        this._running++;
+        let e = !1;
+        return () => {
+          e || (e = !0, this._running--, this.queue.length > 0 && this.queue.shift()());
         };
+      }
   }
   async run(e) {
     const r = await this.acquire();
@@ -300,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 Re {
   #e;
   #t;
   #n;
@@ -319,25 +325,25 @@ class be {
   #s;
   #o;
   #a;
-  #l;
+  #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
     } = r;
-    this.php = e, this.#e = n, this.#l = o;
+    this.php = e, this.#e = n, this.#c = o;
     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 c = this.#r !== 443 && this.#r !== 80;
     this.#i = [
       this.#n,
-      a ? `:${this.#r}` : ""
+      c ? `:${this.#r}` : ""
     ].join(""), this.#s = i.pathname.replace(/\/+$/, ""), this.#o = [
       `${this.#t}://`,
       this.#i,
@@ -368,12 +374,12 @@ 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.#l(s) ? this.#c(s) : await this.#u(e, n);
+    return this.#c(s) ? this.#l(s) : await this.#u(e, n);
   }
   /**
    * Serves a static file from the PHP filesystem.
@@ -381,7 +387,7 @@ class be {
    * @param  path - The requested static file path.
    * @returns The response.
    */
-  #c(e) {
+  #l(e) {
     const r = `${this.#e}${e}`;
     if (!this.php.fileExists(r))
       return new b(
@@ -421,27 +427,27 @@ class be {
       let s = "GET";
       const o = {
         host: this.#i,
-        ...K(e.headers || {})
+        ...Q(e.headers || {})
       }, i = [];
       if (e.files && Object.keys(e.files).length) {
         s = "POST";
-        for (const c in e.files) {
-          const h = e.files[c];
+        for (const a in e.files) {
+          const h = e.files[a];
           i.push({
-            key: c,
+            key: a,
             name: h.name,
             type: h.type,
             data: new Uint8Array(await h.arrayBuffer())
           });
         }
-        o["content-type"]?.startsWith("multipart/form-data") && (e.formData = Ee(
+        o["content-type"]?.startsWith("multipart/form-data") && (e.formData = ke(
           e.body || ""
         ), o["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(
+      let c;
+      e.formData !== void 0 ? (s = "POST", o["content-type"] = o["content-type"] || "application/x-www-form-urlencoded", c = new URLSearchParams(
         e.formData
-      ).toString()) : a = e.body;
+      ).toString()) : c = e.body;
       let l;
       try {
         l = this.#h(r.pathname);
@@ -453,13 +459,13 @@ class be {
         );
       }
       return await this.php.run({
-        relativeUri: Pe(
+        relativeUri: Ee(
           j(r),
           this.#s
         ),
         protocol: this.#t,
         method: e.method || s,
-        body: a,
+        body: c,
         fileInfos: i,
         scriptPath: l,
         headers: o
@@ -488,7 +494,7 @@ class be {
     return `${this.#e}/index.php`;
   }
 }
-function Ee(t) {
+function ke(t) {
   const e = {}, r = t.match(/--(.*)\r\n/);
   if (!r)
     return e;
@@ -496,9 +502,9 @@ function Ee(t) {
   return s.shift(), s.pop(), s.forEach((o) => {
     const i = o.indexOf(`\r
 \r
-`), a = o.substring(0, i).trim(), l = o.substring(i + 4).trim(), c = a.match(/name="([^"]+)"/);
-    if (c) {
-      const h = c[1];
+`), c = o.substring(0, i).trim(), l = o.substring(i + 4).trim(), a = c.match(/name="([^"]+)"/);
+    if (a) {
+      const h = a[1];
       e[h] = l;
     }
   }), e;
@@ -628,58 +634,60 @@ function y(t = "") {
     s.value = function(...i) {
       try {
         return o.apply(this, i);
-      } catch (a) {
-        const l = typeof a == "object" ? a?.errno : null;
+      } catch (c) {
+        const l = typeof c == "object" ? c?.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
+          const a = V[l], h = typeof i[0] == "string" ? i[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((l) => {
-    s = l;
-  }), i = new Promise((l) => {
-    n = l;
-  }), a = t.init(ke, {
-    onAbort(l) {
-      console.error("WASM aborted: "), console.error(l);
+async function xe(t, e = {}, r = []) {
+  const [n, s, o] = Y(), [i, c] = Y(), l = t.init(Te, {
+    onAbort(a) {
+      o(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: (l) => l,
+    locateFile: (a) => a,
     ...e,
     noInitialRun: !0,
     onRuntimeInitialized() {
-      e.onRuntimeInitialized && e.onRuntimeInitialized(), n();
+      e.onRuntimeInitialized && e.onRuntimeInitialized(), s();
     },
-    monitorRunDependencies(l) {
-      l === 0 && (delete a.monitorRunDependencies, s());
+    monitorRunDependencies(a) {
+      a === 0 && (delete l.monitorRunDependencies, c());
     }
   });
-  for (const { default: l } of r)
-    l(a);
-  return r.length || s(), await o, await i, M.push(a), M.length - 1;
+  return await Promise.all(
+    r.map(
+      ({ default: a }) => a(l)
+    )
+  ), r.length || c(), await i, await n, M.push(l), M.length - 1;
 }
 const M = [];
 function Se(t) {
   return M[t];
 }
-const ke = function() {
+const Te = 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--)
+}(), Y = () => {
+  const t = [], e = new Promise((r, n) => {
+    t.push(r, n);
+  });
+  return t.unshift(e), t;
+};
+var _e = Object.defineProperty, Ce = Object.getOwnPropertyDescriptor, w = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Ce(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;
+  return n && s && _e(e, r, s), s;
 };
 const f = "string", E = "number", u = Symbol("__private__dont__use");
 class m {
@@ -691,14 +699,19 @@ 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 = {}, 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 Re(this, r)
     ));
   }
   #e;
   #t;
   #n;
   #r;
+  #i;
+  /** @inheritDoc */
+  async onMessage(e) {
+    this.#i.push(e);
+  }
   /** @inheritDoc */
   get absoluteUrl() {
     return this.requestHandler.requestHandler.absoluteUrl;
@@ -723,7 +736,10 @@ class m {
     const r = Se(e);
     if (!r)
       throw new Error("Invalid PHP runtime id.");
-    this[u] = r, this.#n = ae(r);
+    this[u] = r, r.onMessage = (n) => {
+      for (const s of this.#i)
+        s(n);
+    }, this.#n = le(r);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
@@ -754,17 +770,17 @@ class m {
   }
   /** @inheritDoc */
   async run(e) {
-    this.#t || (this.#i(), this.#t = !0), this.#h(e.scriptPath || ""), this.#o(e.relativeUri || ""), this.#l(e.method || "GET");
+    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.#a(r, e.protocol || "http"), this.#c(n), e.body && this.#u(e.body), e.fileInfos)
+    if (this.#c(r, e.protocol || "http"), this.#u(n), e.body && this.#h(e.body), e.fileInfos)
       for (const s of e.fileInfos)
-        this.#f(s);
-    return e.code && this.#p(" ?>" + e.code), this.#d(), await this.#m();
+        this.#p(s);
+    return e.code && this.#m(" ?>" + e.code), this.#f(), await this.#g();
   }
-  #i() {
+  #s() {
     if (this.#e.length > 0) {
       const e = this.#e.map(([r, n]) => `${r}=${n}`).join(`
 `) + `
@@ -779,7 +795,7 @@ class m {
     }
     this[u].ccall("php_wasm_init", null, [], []);
   }
-  #s() {
+  #o() {
     const e = "/tmp/headers.json";
     if (!this.fileExists(e))
       throw new Error(
@@ -789,15 +805,15 @@ 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 o = s.indexOf(": "), i = s.substring(0, o).toLowerCase(), c = s.substring(o + 2);
+      i in n || (n[i] = []), n[i].push(c);
     }
     return {
       headers: n,
       httpStatusCode: r.status
     };
   }
-  #o(e) {
+  #a(e) {
     if (this[u].ccall(
       "wasm_set_request_uri",
       null,
@@ -813,7 +829,7 @@ class m {
       );
     }
   }
-  #a(e, r) {
+  #c(e, r) {
     this[u].ccall(
       "wasm_set_request_host",
       null,
@@ -840,7 +856,7 @@ class m {
       [e]
     );
   }
-  #c(e) {
+  #u(e) {
     e.cookie && this[u].ccall(
       "wasm_set_cookies",
       null,
@@ -865,7 +881,7 @@ class m {
       );
     }
   }
-  #u(e) {
+  #h(e) {
     this[u].ccall(
       "wasm_set_request_body",
       null,
@@ -878,7 +894,7 @@ class m {
       [new TextEncoder().encode(e).length]
     );
   }
-  #h(e) {
+  #d(e) {
     this[u].ccall(
       "wasm_set_path_translated",
       null,
@@ -889,7 +905,7 @@ class m {
   addServerGlobalEntry(e, r) {
     this.#r[e] = r;
   }
-  #d() {
+  #f() {
     for (const e in this.#r)
       this[u].ccall(
         "wasm_add_SERVER_entry",
@@ -907,18 +923,18 @@ class m {
    *
    * @param  fileInfo - File details
    */
-  #f(e) {
+  #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 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, i, c, o.byteLength]
     );
   }
-  #p(e) {
+  #m(e) {
     this[u].ccall(
       "wasm_set_php_code",
       null,
@@ -926,39 +942,39 @@ class m {
       [e]
     );
   }
-  async #m() {
+  async #g() {
     let e, r;
     try {
       e = await new Promise((o, i) => {
         r = (l) => {
-          const c = new Error("Rethrown");
-          c.cause = l.error, c.betterMessage = l.message, i(c);
+          const a = new Error("Rethrown");
+          a.cause = l.error, a.betterMessage = l.message, i(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(o, i) : o(c);
       });
     } catch (o) {
-      for (const c in this)
-        typeof this[c] == "function" && (this[c] = () => {
+      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 = le();
-      const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, l = new Error(a);
+      this.functionsMaybeMissingFromAsyncify = ue();
+      const i = o, c = "betterMessage" in i ? i.betterMessage : i.message, l = new Error(c);
       throw l.cause = i, l;
     } finally {
       this.#n?.removeEventListener("error", r), this.#r = {};
     }
-    const { headers: n, httpStatusCode: s } = this.#s();
+    const { headers: n, httpStatusCode: s } = this.#o();
     return new b(
       s,
       n,
@@ -1056,7 +1072,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];
@@ -1067,8 +1083,8 @@ 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"), Fe = Symbol("Comlink.endpoint"), He = Symbol("Comlink.releaseProxy"), H = 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]];
@@ -1076,8 +1092,8 @@ const Q = Symbol("Comlink.proxy"), _e = Symbol("Comlink.endpoint"), Ce = Symbol(
   deserialize(t) {
     return t.start(), U(t);
   }
-}, He = {
-  canHandle: (t) => X(t) && x in t,
+}, Me = {
+  canHandle: (t) => Z(t) && S in t,
   serialize({ value: t }) {
     let e;
     return t instanceof Error ? e = {
@@ -1092,9 +1108,9 @@ 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;
   }
-}, S = /* @__PURE__ */ new Map([
-  ["proxy", Fe],
-  ["throw", He]
+}, v = /* @__PURE__ */ new Map([
+  ["proxy", Oe],
+  ["throw", Me]
 ]);
 function Ae(t, e) {
   for (const r of t)
@@ -1110,156 +1126,156 @@ 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), l = (s.data.argumentList || []).map(P);
-    let c;
+    const { id: o, type: i, 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);
+      const h = c.slice(0, -1).reduce((p, k) => p[k], t), g = c.reduce((p, k) => p[k], t);
       switch (i) {
         case "GET":
-          c = g;
+          a = g;
           break;
         case "SET":
-          h[a.slice(-1)[0]] = P(s.data.value), c = !0;
+          h[c.slice(-1)[0]] = P(s.data.value), a = !0;
           break;
         case "APPLY":
-          c = g.apply(h, l);
+          a = g.apply(h, l);
           break;
         case "CONSTRUCT":
           {
             const p = new g(...l);
-            c = re(p);
+            a = ne(p);
           }
           break;
         case "ENDPOINT":
           {
-            const { port1: p, port2: R } = new MessageChannel();
-            F(t, R), c = Ue(p, [p]);
+            const { port1: p, port2: k } = new MessageChannel();
+            F(t, k), a = We(p, [p]);
           }
           break;
         case "RELEASE":
-          c = void 0;
+          a = void 0;
           break;
         default:
           return;
       }
     } catch (h) {
-      c = { value: h, [x]: 0 };
+      a = { value: h, [S]: 0 };
     }
-    Promise.resolve(c).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: o }), p), i === "RELEASE" && (e.removeEventListener("message", n), ee(e), H in t && typeof t[H] == "function" && t[H]());
     }).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.start && e.start();
 }
-function Me(t) {
+function Le(t) {
   return t.constructor.name === "MessagePort";
 }
-function Z(t) {
-  Me(t) && t.close();
+function ee(t) {
+  Le(t) && t.close();
 }
 function U(t, e) {
-  return O(t, [], e);
+  return A(t, [], e);
 }
-function k(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 R(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 Ie(t, e) {
   const r = (T.get(e) || 0) + 1;
   T.set(e, r), _ && _.register(t, e, t);
 }
-function Le(t) {
+function Ue(t) {
   _ && _.unregister(t);
 }
-function O(t, e = [], r = function() {
+function A(t, e = [], r = function() {
 }) {
   let n = !1;
   const s = new Proxy(r, {
     get(o, i) {
-      if (k(n), i === Ce)
+      if (x(n), i === He)
         return () => {
-          Le(s), ee(t), n = !0;
+          Ue(s), te(t), n = !0;
         };
       if (i === "then") {
         if (e.length === 0)
           return { then: () => s };
-        const a = v(t, {
+        const c = R(t, {
           type: "GET",
           path: e.map((l) => l.toString())
         }).then(P);
-        return a.then.bind(a);
+        return c.then.bind(c);
       }
-      return O(t, [...e, i]);
+      return A(t, [...e, i]);
     },
-    set(o, i, a) {
-      k(n);
-      const [l, c] = C(a);
-      return v(t, {
+    set(o, i, c) {
+      x(n);
+      const [l, a] = C(c);
+      return R(t, {
         type: "SET",
         path: [...e, i].map((h) => h.toString()),
         value: l
-      }, c).then(P);
+      }, a).then(P);
     },
-    apply(o, i, a) {
-      k(n);
+    apply(o, i, c) {
+      x(n);
       const l = e[e.length - 1];
-      if (l === _e)
-        return v(t, {
+      if (l === Fe)
+        return R(t, {
           type: "ENDPOINT"
         }).then(P);
       if (l === "bind")
-        return O(t, e.slice(0, -1));
-      const [c, h] = Y(a);
-      return v(t, {
+        return A(t, e.slice(0, -1));
+      const [a, h] = J(c);
+      return R(t, {
         type: "APPLY",
         path: e.map((g) => g.toString()),
-        argumentList: c
+        argumentList: a
       }, h).then(P);
     },
     construct(o, i) {
-      k(n);
-      const [a, l] = Y(i);
-      return v(t, {
+      x(n);
+      const [c, l] = J(i);
+      return R(t, {
         type: "CONSTRUCT",
-        path: e.map((c) => c.toString()),
-        argumentList: a
+        path: e.map((a) => a.toString()),
+        argumentList: c
       }, l).then(P);
     }
   });
-  return Oe(s, t), s;
+  return Ie(s, t), s;
 }
-function Ie(t) {
+function Ne(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]), Ne(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 We(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),
@@ -1267,7 +1283,7 @@ function ne(t, e = globalThis, r = "*") {
   };
 }
 function C(t) {
-  for (const [e, r] of S)
+  for (const [e, r] of v)
     if (r.canHandle(t)) {
       const [n, s] = r.serialize(t);
       return [
@@ -1284,52 +1300,64 @@ function C(t) {
       type: "RAW",
       value: t
     },
-    te.get(t) || []
+    re.get(t) || []
   ];
 }
 function P(t) {
   switch (t.type) {
     case "HANDLER":
-      return S.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 R(t, e, r) {
   return new Promise((n) => {
-    const s = Ne();
+    const s = $e();
     t.addEventListener("message", function o(i) {
       !i.data || !i.data.id || i.data.id !== s || (t.removeEventListener("message", o), n(i.data));
     }), t.start && t.start(), t.postMessage(Object.assign({ id: s }, e), r);
   });
 }
-function Ne() {
+function $e() {
   return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
 }
-function Be(t) {
-  se();
-  const e = t instanceof Worker ? t : ne(t), r = U(e), n = N(r);
+function Ge(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" ? () => r.isConnected() : r[o]
+    get: (s, o) => o === "isConnected" ? async () => {
+      for (let i = 0; i < 10; i++)
+        try {
+          await De(r.isConnected(), 200);
+          break;
+        } catch {
+        }
+    } : r[o]
   });
 }
-function je(t, e) {
-  se();
+async function De(t, e) {
+  return new Promise((r, n) => {
+    setTimeout(n, e), t.then(r);
+  });
+}
+function Ve(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, l) => l === "isConnected" ? () => r : l === "isReady" ? () => s : l in a ? a[l] : e?.[l]
+  let n, s;
+  const o = new Promise((l, a) => {
+    n = l, s = a;
+  }), i = N(t), c = new Proxy(i, {
+    get: (l, a) => a === "isConnected" ? () => r : a === "isReady" ? () => o : a in l ? l[a] : e?.[a]
   });
   return F(
-    i,
-    typeof window < "u" ? ne(self.parent) : void 0
-  ), [n, i];
+    c,
+    typeof window < "u" ? se(self.parent) : void 0
+  ), [n, s, c];
 }
-let J = !1;
-function se() {
-  J || (J = !0, S.set("EVENT", {
+let K = !1;
+function ie() {
+  K || (K = !0, v.set("EVENT", {
     canHandle: (t) => t instanceof CustomEvent,
     serialize: (t) => [
       {
@@ -1338,7 +1366,7 @@ function se() {
       []
     ],
     deserialize: (t) => t
-  }), S.set("FUNCTION", {
+  }), v.set("FUNCTION", {
     canHandle: (t) => typeof t == "function",
     serialize(t) {
       console.debug("[Comlink][Performance] Proxying a function");
@@ -1348,7 +1376,7 @@ function se() {
     deserialize(t) {
       return t.start(), U(t);
     }
-  }), S.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(), []];
@@ -1371,12 +1399,12 @@ function N(t) {
         case "string":
           return e[r];
         default:
-          return re(e[r]);
+          return ne(e[r]);
       }
     }
   });
 }
-async function We(t = me) {
+async function qe(t = ye) {
   switch (t) {
     case "8.2":
       return await import("./php_8_2.js");
@@ -1399,6 +1427,21 @@ async function We(t = me) {
   }
   throw new Error(`Unsupported PHP version ${t}`);
 }
+const ze = () => ({
+  websocket: {
+    decorator: (t) => class extends t {
+      constructor() {
+        try {
+          super();
+        } catch {
+        }
+      }
+      send() {
+        return null;
+      }
+    }
+  }
+});
 class L extends m {
   /**
    * Creates a new PHP instance.
@@ -1425,29 +1468,29 @@ class L extends m {
   static loadSync(e, r = {}) {
     const n = new L(void 0, r.requestHandler), o = (async () => {
       const i = await Promise.all([
-        We(e),
+        qe(e),
         ...r.dataModules || []
-      ]), [a, ...l] = i;
+      ]), [c, ...l] = i;
       r.downloadMonitor?.setModules(i);
-      const c = await Re(
-        a,
+      const a = await xe(
+        c,
         {
           ...r.emscriptenOptions || {},
-          ...r.downloadMonitor?.getEmscriptenOptions() || {}
+          ...r.downloadMonitor?.getEmscriptenOptions() || {},
+          ...ze()
         },
         l
       );
-      return n.initializeRuntime(c), { dataModules: l };
+      n.initializeRuntime(a);
     })();
     return {
       php: n,
-      phpReady: o.then(() => n),
-      dataModules: o.then((i) => i.dataModules)
+      phpReady: o.then(() => n)
     };
   }
 }
 const d = /* @__PURE__ */ new WeakMap();
-class Ge {
+class Je {
   /** @inheritDoc */
   constructor(e, r) {
     d.set(this, {
@@ -1533,76 +1576,59 @@ class Ge {
   fileExists(e) {
     return d.get(this).php.fileExists(e);
   }
+  /** @inheritDoc @php-wasm/web!WebPHP.onMessage */
+  onMessage(e) {
+    d.get(this).php.onMessage(e);
+  }
 }
-function $e(t, e) {
+function Be(t, e) {
   return {
     type: "response",
     requestId: t,
     response: e
   };
 }
-async function Ve(t, e, r, n) {
-  const s = navigator.serviceWorker;
-  if (!s)
+async function Ke(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 De();
-    if (n !== i) {
-      console.debug(
-        `[window] Reloading the currently registered Service Worker (expected version: ${n}, registered version: ${i})`
-      );
-      for (const a of o) {
-        let l = !1;
-        try {
-          await a.update();
-        } catch {
-          l = !0;
-        }
-        const c = a.waiting || a.installing;
-        c && !l && (i !== null ? c.postMessage("skip-waiting") : l = !0), l && (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(i) {
+      if (console.debug("[window][sw] Message from ServiceWorker", i), e && i.data.scope !== e)
         return;
-      const l = a.data.args || [], c = a.data.method, h = await t[c](...l);
-      a.source.postMessage($e(a.data.requestId, h));
+      const c = i.data.args || [], l = i.data.method, a = await t[l](...c);
+      i.source.postMessage(Be(i.data.requestId, a));
     }
-  ), s.startMessages();
-}
-async function De() {
-  try {
-    return (await (await fetch("/version")).json()).version;
-  } catch {
-    return null;
-  }
+  ), n.startMessages();
 }
-function Ye() {
+function Qe() {
   const t = {};
   return typeof self?.location?.href < "u" && new URL(self.location.href).searchParams.forEach((r, n) => {
     t[n] = r;
   }), t;
 }
-const Je = function() {
-  return typeof navigator < "u" && navigator?.userAgent?.toLowerCase().indexOf("firefox") > -1 ? "iframe" : "webworker";
-}();
-async function Ke(t, e = "webworker", r = {}) {
-  if (t = qe(t, r), e === "webworker")
-    return new Worker(t, { type: "module" });
-  if (e === "iframe")
-    return (await ze(t)).contentWindow;
-  throw new Error(`Unknown backendName: ${e}`);
+async function Xe(t, e = {}) {
+  t = je(t, e);
+  const r = new Worker(t, { type: "module" });
+  return new Promise((n, s) => {
+    r.onerror = (i) => {
+      const c = new Error(
+        `WebWorker failed to load at ${t}. ${i.message ? `Original error: ${i.message}` : ""}`
+      );
+      c.filename = i.filename, s(c);
+    };
+    function o(i) {
+      i.data === "worker-script-started" && (n(r), r.removeEventListener("message", o));
+    }
+    r.addEventListener("message", o);
+  });
 }
-function qe(t, e) {
+function je(t, e) {
   if (!Object.entries(e).length)
     return t + "";
   const r = new URL(t);
@@ -1610,20 +1636,13 @@ function qe(t, e) {
     r.searchParams.set(n, s);
   return r.toString();
 }
-async function ze(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,
-  Ge as WebPHPEndpoint,
-  Be as consumeAPI,
-  je as exposeAPI,
-  We as getPHPLoaderModule,
-  Ye as parseWorkerStartupOptions,
-  Je as recommendedWorkerBackend,
-  Ve as registerServiceWorker,
-  Ke as spawnPHPWorkerThread
+  Je as WebPHPEndpoint,
+  Ge as consumeAPI,
+  Ve as exposeAPI,
+  qe as getPHPLoaderModule,
+  Qe as parseWorkerStartupOptions,
+  Ke as registerServiceWorker,
+  Xe as spawnPHPWorkerThread
 };