@php-wasm/web 0.6.14 → 0.6.16

package/index.js

@@ -2,11 +2,11 @@ var K = (e, t, r) => {
   if (!t.has(e))
     throw TypeError("Cannot " + r);
 };
-var c = (e, t, r) => (K(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => {
+var u = (e, t, r) => (K(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => {
   if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(e) : t.set(e, r);
-}, h = (e, t, r, s) => (K(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
+}, p = (e, t, r, s) => (K(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
 var f = (e, t, r) => (K(e, t, "access private method"), r);
 const currentJsRuntime$1 = function() {
   var e;
@@ -61,8 +61,8 @@ if (currentJsRuntime$1 === "NODE") {
           r + o.byteLength
         ).arrayBuffer(), l = new Uint8Array(a);
         new Uint8Array(o.buffer).set(l);
-        const u = l.byteLength;
-        n.byobRequest.respond(u), r += u, r >= s.size && n.close();
+        const c = l.byteLength;
+        n.byobRequest.respond(c), r += c, r >= s.size && n.close();
       }
     });
   });
@@ -431,7 +431,7 @@ class PHPBrowser {
   constructor(t, r = {}) {
     d(this, R, void 0);
     d(this, T, void 0);
-    this.requestHandler = t, h(this, R, {}), h(this, T, {
+    this.requestHandler = t, p(this, R, {}), p(this, T, {
       handleRedirects: !1,
       maxRedirects: 4,
       ...r
@@ -459,7 +459,7 @@ class PHPBrowser {
         cookie: this.serializeCookies()
       }
     });
-    if (s.headers["set-cookie"] && this.setCookies(s.headers["set-cookie"]), c(this, T).handleRedirects && s.headers.location && r < c(this, T).maxRedirects) {
+    if (s.headers["set-cookie"] && this.setCookies(s.headers["set-cookie"]), u(this, T).handleRedirects && s.headers.location && r < u(this, T).maxRedirects) {
       const n = new URL(
         s.headers.location[0],
         this.requestHandler.absoluteUrl
@@ -497,15 +497,15 @@ class PHPBrowser {
         if (!r.includes("="))
           continue;
         const s = r.indexOf("="), n = r.substring(0, s), o = r.substring(s + 1).split(";")[0];
-        c(this, R)[n] = o;
+        u(this, R)[n] = o;
       } catch (s) {
         console.error(s);
       }
   }
   serializeCookies() {
     const t = [];
-    for (const r in c(this, R))
-      t.push(`${r}=${c(this, R)[r]}`);
+    for (const r in u(this, R))
+      t.push(`${r}=${u(this, R)[r]}`);
     return t.join("; ");
   }
 }
@@ -522,16 +522,16 @@ function ensurePathPrefix(e, t) {
 }
 async function encodeAsMultipart(e) {
   const t = `----${Math.random().toString(36).slice(2)}`, r = `multipart/form-data; boundary=${t}`, s = new TextEncoder(), n = [];
-  for (const [l, u] of Object.entries(e))
+  for (const [l, c] of Object.entries(e))
     n.push(`--${t}\r
-`), n.push(`Content-Disposition: form-data; name="${l}"`), u instanceof File && n.push(`; filename="${u.name}"`), n.push(`\r
-`), u instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\r
+`), n.push(`Content-Disposition: form-data; name="${l}"`), c instanceof File && n.push(`; filename="${c.name}"`), n.push(`\r
+`), c instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\r
 `)), n.push(`\r
-`), u instanceof File ? n.push(await fileToUint8Array(u)) : n.push(u), n.push(`\r
+`), c instanceof File ? n.push(await fileToUint8Array(c)) : n.push(c), n.push(`\r
 `);
   n.push(`--${t}--\r
 `);
-  const o = n.reduce((l, u) => l + u.length, 0), i = new Uint8Array(o);
+  const o = n.reduce((l, c) => l + c.length, 0), i = new Uint8Array(o);
   let a = 0;
   for (const l of n)
     i.set(
@@ -588,23 +588,23 @@ class PHPRequestHandler {
     d(this, y, void 0);
     d(this, C, void 0);
     d(this, S, void 0);
-    h(this, S, new Semaphore({ concurrency: 1 }));
+    p(this, S, new Semaphore({ concurrency: 1 }));
     const {
       documentRoot: s = "/www/",
       absoluteUrl: n = typeof location == "object" ? location == null ? void 0 : location.href : "",
       rewriteRules: o = []
     } = r;
-    this.php = t, h(this, g, s);
+    this.php = t, p(this, g, s);
     const i = new URL(n);
-    h(this, N, i.hostname), h(this, b, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), h(this, H, (i.protocol || "").replace(":", ""));
-    const a = c(this, b) !== 443 && c(this, b) !== 80;
-    h(this, k, [
-      c(this, N),
-      a ? `:${c(this, b)}` : ""
-    ].join("")), h(this, y, i.pathname.replace(/\/+$/, "")), h(this, C, [
-      `${c(this, H)}://`,
-      c(this, k),
-      c(this, y)
+    p(this, N, i.hostname), p(this, b, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), p(this, H, (i.protocol || "").replace(":", ""));
+    const a = u(this, b) !== 443 && u(this, b) !== 80;
+    p(this, k, [
+      u(this, N),
+      a ? `:${u(this, b)}` : ""
+    ].join("")), p(this, y, i.pathname.replace(/\/+$/, "")), p(this, C, [
+      `${u(this, H)}://`,
+      u(this, k),
+      u(this, y)
     ].join("")), this.rewriteRules = o;
   }
   /** @inheritDoc */
@@ -614,18 +614,18 @@ class PHPRequestHandler {
   /** @inheritDoc */
   internalUrlToPath(t) {
     const r = new URL(t);
-    return r.pathname.startsWith(c(this, y)) && (r.pathname = r.pathname.slice(c(this, y).length)), toRelativeUrl(r);
+    return r.pathname.startsWith(u(this, y)) && (r.pathname = r.pathname.slice(u(this, y).length)), toRelativeUrl(r);
   }
   get isRequestRunning() {
-    return c(this, S).running > 0;
+    return u(this, S).running > 0;
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return c(this, C);
+    return u(this, C);
   }
   /** @inheritDoc */
   get documentRoot() {
-    return c(this, g);
+    return u(this, g);
   }
   /** @inheritDoc */
   async request(t) {
@@ -634,9 +634,12 @@ class PHPRequestHandler {
       t.url.split("#")[0],
       r ? void 0 : DEFAULT_BASE_URL
     ), n = applyRewriteRules(
-      removePathPrefix(s.pathname, c(this, y)),
+      removePathPrefix(
+        decodeURIComponent(s.pathname),
+        u(this, y)
+      ),
       this.rewriteRules
-    ), o = `${c(this, g)}${n}`;
+    ), o = joinPaths(u(this, g), n);
     return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, O, X).call(this, t, s) : f(this, L, Z).call(this, o);
   }
 }
@@ -667,7 +670,7 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
   );
 }, O = new WeakSet(), X = async function(t, r) {
   var n;
-  if (c(this, S).running > 0 && ((n = t.headers) == null ? void 0 : n["x-request-issuer"]) === "php")
+  if (u(this, S).running > 0 && ((n = t.headers) == null ? void 0 : n["x-request-issuer"]) === "php")
     return console.warn(
       "Possible deadlock: Called request() before the previous request() have finished. PHP likely issued an HTTP call to itself. Normally this would lead to infinite waiting as Request 1 holds the lock that the Request 2 is waiting to acquire. That's not useful, so PHPRequestHandler will return error 502 instead."
     ), new PHPResponse(
@@ -675,26 +678,26 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
       {},
       new TextEncoder().encode("502 Bad Gateway")
     );
-  const s = await c(this, S).acquire();
+  const s = await u(this, S).acquire();
   try {
-    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", c(this, g)), this.php.addServerGlobalEntry(
+    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", u(this, g)), this.php.addServerGlobalEntry(
       "HTTPS",
-      c(this, C).startsWith("https://") ? "on" : ""
+      u(this, C).startsWith("https://") ? "on" : ""
     );
     let o = "GET";
     const i = {
-      host: c(this, k),
+      host: u(this, k),
       ...normalizeHeaders(t.headers || {})
     };
     let a = t.body;
     if (typeof a == "object" && !(a instanceof Uint8Array)) {
       o = "POST";
-      const { bytes: u, contentType: p } = await encodeAsMultipart(a);
-      a = u, i["content-type"] = p;
+      const { bytes: c, contentType: h } = await encodeAsMultipart(a);
+      a = c, i["content-type"] = h;
     }
     let l;
     try {
-      l = f(this, U, ee).call(this, r.pathname);
+      l = f(this, U, ee).call(this, decodeURIComponent(r.pathname));
     } catch {
       return new PHPResponse(
         404,
@@ -702,24 +705,31 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
         new TextEncoder().encode("404 File not found")
       );
     }
-    return await this.php.run({
-      relativeUri: ensurePathPrefix(
-        toRelativeUrl(r),
-        c(this, y)
-      ),
-      protocol: c(this, H),
-      method: t.method || o,
-      body: a,
-      scriptPath: l,
-      headers: i
-    });
+    try {
+      return await this.php.run({
+        relativeUri: ensurePathPrefix(
+          toRelativeUrl(r),
+          u(this, y)
+        ),
+        protocol: u(this, H),
+        method: t.method || o,
+        body: a,
+        scriptPath: l,
+        headers: i
+      });
+    } catch (c) {
+      const h = c;
+      if (h != null && h.response)
+        return h.response;
+      throw c;
+    }
   } finally {
     s();
   }
 }, U = new WeakSet(), ee = function(t) {
-  let r = removePathPrefix(t, c(this, y));
-  r = applyRewriteRules(r, this.rewriteRules), r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${c(this, g)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
-  const s = `${c(this, g)}${r}`;
+  let r = removePathPrefix(t, u(this, y));
+  r = applyRewriteRules(r, this.rewriteRules), r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${u(this, g)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
+  const s = `${u(this, g)}${r}`;
   if (this.php.fileExists(s))
     return s;
   throw new Error(`File not found: ${s}`);
@@ -872,8 +882,8 @@ function rethrowFileSystemError(e = "") {
       } catch (a) {
         const l = typeof a == "object" ? a == null ? void 0 : a.errno : null;
         if (l in FileErrorCodes) {
-          const u = FileErrorCodes[l], p = typeof i[0] == "string" ? i[0] : null, _ = p !== null ? e.replaceAll("{path}", p) : e;
-          throw new Error(`${_}: ${u}`, {
+          const c = FileErrorCodes[l], h = typeof i[0] == "string" ? i[0] : null, _ = h !== null ? e.replaceAll("{path}", h) : e;
+          throw new Error(`${_}: ${c}`, {
             cause: a
           });
         }
@@ -924,6 +934,11 @@ var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyD
   return s && n && __defProp(t, r, n), n;
 };
 const STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
+class PHPExecutionFailureError extends Error {
+  constructor(t, r, s) {
+    super(t), this.response = r, this.source = s;
+  }
+}
 var x, F, A, w, E, v, P, M, W, te, q, re, B, se, D, ne, $, ie, z, oe, j, ae, G, le, V, ce, J, ue, Q, de, Y, he;
 class BasePHP {
   /**
@@ -954,26 +969,26 @@ class BasePHP {
     d(this, v, void 0);
     d(this, P, void 0);
     d(this, M, void 0);
-    h(this, x, []), h(this, w, !1), h(this, E, null), h(this, v, {}), h(this, P, /* @__PURE__ */ new Map()), h(this, M, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
+    p(this, x, []), p(this, w, !1), p(this, E, null), p(this, v, {}), p(this, P, /* @__PURE__ */ new Map()), p(this, M, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
       new PHPRequestHandler(this, t)
     ));
   }
   addEventListener(e, t) {
-    c(this, P).has(e) || c(this, P).set(e, /* @__PURE__ */ new Set()), c(this, P).get(e).add(t);
+    u(this, P).has(e) || u(this, P).set(e, /* @__PURE__ */ new Set()), u(this, P).get(e).add(t);
   }
   removeEventListener(e, t) {
     var r;
-    (r = c(this, P).get(e)) == null || r.delete(t);
+    (r = u(this, P).get(e)) == null || r.delete(t);
   }
   dispatchEvent(e) {
-    const t = c(this, P).get(e.type);
+    const t = u(this, P).get(e.type);
     if (t)
       for (const r of t)
         r(e);
   }
   /** @inheritDoc */
   async onMessage(e) {
-    c(this, M).push(e);
+    u(this, M).push(e);
   }
   /** @inheritDoc */
   async setSpawnHandler(handler) {
@@ -1004,13 +1019,13 @@ class BasePHP {
     if (!t)
       throw new Error("Invalid PHP runtime id.");
     this[__private__dont__use] = t, t.onMessage = async (r) => {
-      for (const s of c(this, M)) {
+      for (const s of u(this, M)) {
         const n = await s(r);
         if (n)
           return n;
       }
       return "";
-    }, h(this, E, improveWASMErrorReporting(t)), this.dispatchEvent({
+    }, p(this, E, improveWASMErrorReporting(t)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1025,13 +1040,13 @@ class BasePHP {
       throw new Error(
         "Could not set SAPI name. This can only be done before the PHP WASM module is initialized.Did you already dispatch any requests?"
       );
-    h(this, A, e);
+    p(this, A, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
-    if (c(this, w))
+    if (u(this, w))
       throw new Error("Cannot set PHP ini path after calling run().");
-    h(this, F, e), this[__private__dont__use].ccall(
+    p(this, F, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -1040,9 +1055,9 @@ class BasePHP {
   }
   /** @inheritDoc */
   setPhpIniEntry(e, t) {
-    if (c(this, w))
+    if (u(this, w))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    c(this, x).push([e, t]);
+    u(this, x).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
@@ -1059,7 +1074,7 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (c(this, w) || (f(this, W, te).call(this), h(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (u(this, w) || (f(this, W, te).call(this), p(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
@@ -1071,15 +1086,13 @@ class BasePHP {
         f(this, J, ue).call(this, a, o[a]);
       const i = await f(this, Y, he).call(this);
       if (i.exitCode !== 0) {
-        const a = {
-          stdout: i.text,
-          stderr: i.errors
-        };
-        console.warn("PHP.run() output was:", a);
-        const l = new Error(
-          `PHP.run() failed with exit code ${i.exitCode} and the following output: ` + i.errors
+        console.warn("PHP.run() output was:", i.text);
+        const a = new PHPExecutionFailureError(
+          `PHP.run() failed with exit code ${i.exitCode} and the following output: ` + i.errors,
+          i,
+          "request"
         );
-        throw l.output = a, l.source = "request", console.error(l), l;
+        throw console.error(a), a;
       }
       return i;
     } catch (s) {
@@ -1100,7 +1113,7 @@ class BasePHP {
     }
   }
   addServerGlobalEntry(e, t) {
-    c(this, v)[e] = t;
+    u(this, v)[e] = t;
   }
   defineConstant(e, t) {
     let r = {};
@@ -1196,7 +1209,7 @@ class BasePHP {
       this.exit();
     } catch {
     }
-    if (this.initializeRuntime(e), c(this, F) && this.setPhpIniPath(c(this, F)), c(this, A) && this.setSapiName(c(this, A)), this.requestHandler) {
+    if (this.initializeRuntime(e), u(this, F) && this.setPhpIniPath(u(this, F)), u(this, A) && this.setSapiName(u(this, A)), this.requestHandler) {
       const r = this.documentRoot;
       copyFS(t, this[__private__dont__use].FS, r);
     }
@@ -1209,7 +1222,7 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    h(this, w, !1), h(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    p(this, w, !1), p(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
 x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E = new WeakMap(), v = new WeakMap(), P = new WeakMap(), M = new WeakMap(), W = new WeakSet(), te = function() {
@@ -1224,8 +1237,8 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
 						}
 					}
 				}`
-  ), c(this, x).length > 0) {
-    const e = c(this, x).map(([t, r]) => `${t}=${r}`).join(`
+  ), u(this, x).length > 0) {
+    const e = u(this, x).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -1349,12 +1362,12 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     [e]
   );
 }, V = new WeakSet(), ce = function() {
-  for (const e in c(this, v))
+  for (const e in u(this, v))
     this[__private__dont__use].ccall(
       "wasm_add_SERVER_entry",
       null,
       [STRING, STRING],
-      [e, c(this, v)[e]]
+      [e, u(this, v)[e]]
     );
 }, J = new WeakSet(), ue = function(e, t) {
   this[__private__dont__use].ccall(
@@ -1376,11 +1389,11 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
   try {
     e = await new Promise((o, i) => {
       var l;
-      t = (u) => {
-        console.error(u), console.error(u.error);
-        const p = new Error("Rethrown");
-        p.cause = u.error, p.betterMessage = u.message, i(p);
-      }, (l = c(this, E)) == null || l.addEventListener(
+      t = (c) => {
+        console.error(c), console.error(c.error);
+        const h = new Error("Rethrown");
+        h.cause = c.error, h.betterMessage = c.message, i(h);
+      }, (l = u(this, E)) == null || l.addEventListener(
         "error",
         t
       );
@@ -1394,8 +1407,8 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
       return a instanceof Promise ? a.then(o, i) : o(a);
     });
   } catch (o) {
-    for (const u in this)
-      typeof this[u] == "function" && (this[u] = () => {
+    for (const c in this)
+      typeof this[c] == "function" && (this[c] = () => {
         throw new Error(
           "PHP runtime has crashed – see the earlier error for details."
         );
@@ -1404,11 +1417,11 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, l = new Error(a);
     throw l.cause = i, console.error(l), l;
   } finally {
-    (n = c(this, E)) == null || n.removeEventListener("error", t), h(this, v, {});
+    (n = u(this, E)) == null || n.removeEventListener("error", t), p(this, v, {});
   }
   const { headers: r, httpStatusCode: s } = f(this, q, re).call(this);
   return new PHPResponse(
-    s,
+    e === 0 ? s : 500,
     r,
     this.readFileAsBuffer("/internal/stdout"),
     this.readFileAsText("/internal/stderr"),
@@ -1518,44 +1531,44 @@ function expose(e, t = globalThis, r = ["*"]) {
       return;
     }
     const { id: o, type: i, path: a } = Object.assign({ path: [] }, n.data), l = (n.data.argumentList || []).map(fromWireValue);
-    let u;
+    let c;
     try {
-      const p = a.slice(0, -1).reduce((m, I) => m[I], e), _ = a.reduce((m, I) => m[I], e);
+      const h = a.slice(0, -1).reduce((m, I) => m[I], e), _ = a.reduce((m, I) => m[I], e);
       switch (i) {
         case "GET":
-          u = _;
+          c = _;
           break;
         case "SET":
-          p[a.slice(-1)[0]] = fromWireValue(n.data.value), u = !0;
+          h[a.slice(-1)[0]] = fromWireValue(n.data.value), c = !0;
           break;
         case "APPLY":
-          u = _.apply(p, l);
+          c = _.apply(h, l);
           break;
         case "CONSTRUCT":
           {
             const m = new _(...l);
-            u = proxy(m);
+            c = proxy(m);
           }
           break;
         case "ENDPOINT":
           {
             const { port1: m, port2: I } = new MessageChannel();
-            expose(e, I), u = transfer(m, [m]);
+            expose(e, I), c = transfer(m, [m]);
           }
           break;
         case "RELEASE":
-          u = void 0;
+          c = void 0;
           break;
         default:
           return;
       }
-    } catch (p) {
-      u = { value: p, [throwMarker]: 0 };
+    } catch (h) {
+      c = { value: h, [throwMarker]: 0 };
     }
-    Promise.resolve(u).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
-      const [_, m] = toWireValue(p);
+    Promise.resolve(c).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
+      const [_, m] = toWireValue(h);
       t.postMessage(Object.assign(Object.assign({}, _), { id: o }), m), i === "RELEASE" && (t.removeEventListener("message", s), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
-    }).catch((p) => {
+    }).catch((h) => {
       const [_, m] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
@@ -1617,12 +1630,12 @@ function createProxy(e, t = [], r = function() {
     },
     set(o, i, a) {
       throwIfProxyReleased(s);
-      const [l, u] = toWireValue(a);
+      const [l, c] = toWireValue(a);
       return requestResponseMessage(e, {
         type: "SET",
-        path: [...t, i].map((p) => p.toString()),
+        path: [...t, i].map((h) => h.toString()),
         value: l
-      }, u).then(fromWireValue);
+      }, c).then(fromWireValue);
     },
     apply(o, i, a) {
       throwIfProxyReleased(s);
@@ -1633,19 +1646,19 @@ function createProxy(e, t = [], r = function() {
         }).then(fromWireValue);
       if (l === "bind")
         return createProxy(e, t.slice(0, -1));
-      const [u, p] = processArguments(a);
+      const [c, h] = processArguments(a);
       return requestResponseMessage(e, {
         type: "APPLY",
         path: t.map((_) => _.toString()),
-        argumentList: u
-      }, p).then(fromWireValue);
+        argumentList: c
+      }, h).then(fromWireValue);
     },
     construct(o, i) {
       throwIfProxyReleased(s);
       const [a, l] = processArguments(i);
       return requestResponseMessage(e, {
         type: "CONSTRUCT",
-        path: t.map((u) => u.toString()),
+        path: t.map((c) => c.toString()),
         argumentList: a
       }, l).then(fromWireValue);
     }
@@ -1736,10 +1749,10 @@ function exposeAPI(e, t) {
   setupTransferHandlers();
   const r = Promise.resolve();
   let s, n;
-  const o = new Promise((l, u) => {
-    s = l, n = u;
+  const o = new Promise((l, c) => {
+    s = l, n = c;
   }), i = proxyClone(e), a = new Proxy(i, {
-    get: (l, u) => u === "isConnected" ? () => r : u === "isReady" ? () => o : u in l ? l[u] : t == null ? void 0 : t[u]
+    get: (l, c) => c === "isConnected" ? () => r : c === "isReady" ? () => o : c in l ? l[c] : t == null ? void 0 : t[c]
   });
   return expose(
     a,
@@ -1748,34 +1761,41 @@ function exposeAPI(e, t) {
 }
 let isTransferHandlersSetup = !1;
 function setupTransferHandlers() {
-  isTransferHandlersSetup || (isTransferHandlersSetup = !0, transferHandlers.set("EVENT", {
-    canHandle: (e) => e instanceof CustomEvent,
-    serialize: (e) => [
+  if (isTransferHandlersSetup)
+    return;
+  isTransferHandlersSetup = !0, transferHandlers.set("EVENT", {
+    canHandle: (r) => r instanceof CustomEvent,
+    serialize: (r) => [
       {
-        detail: e.detail
+        detail: r.detail
       },
       []
     ],
-    deserialize: (e) => e
+    deserialize: (r) => r
   }), transferHandlers.set("FUNCTION", {
-    canHandle: (e) => typeof e == "function",
-    serialize(e) {
+    canHandle: (r) => typeof r == "function",
+    serialize(r) {
       console.debug("[Comlink][Performance] Proxying a function");
-      const { port1: t, port2: r } = new MessageChannel();
-      return expose(e, t), [r, [r]];
+      const { port1: s, port2: n } = new MessageChannel();
+      return expose(r, s), [n, [n]];
     },
-    deserialize(e) {
-      return e.start(), wrap(e);
+    deserialize(r) {
+      return r.start(), wrap(r);
     }
   }), transferHandlers.set("PHPResponse", {
-    canHandle: (e) => typeof e == "object" && e !== null && "headers" in e && "bytes" in e && "errors" in e && "exitCode" in e && "httpStatusCode" in e,
-    serialize(e) {
-      return [e.toRawData(), []];
+    canHandle: (r) => typeof r == "object" && r !== null && "headers" in r && "bytes" in r && "errors" in r && "exitCode" in r && "httpStatusCode" in r,
+    serialize(r) {
+      return [r.toRawData(), []];
     },
-    deserialize(e) {
-      return PHPResponse.fromRawData(e);
+    deserialize(r) {
+      return PHPResponse.fromRawData(r);
     }
-  }));
+  });
+  const e = transferHandlers.get("throw"), t = e == null ? void 0 : e.serialize;
+  e.serialize = ({ value: r }) => {
+    const s = t({ value: r });
+    return r.response && (s[0].value.response = r.response), r.source && (s[0].value.source = r.source), s;
+  };
 }
 function proxyClone(e) {
   return new Proxy(e, {
@@ -2022,8 +2042,8 @@ async function registerServiceWorker(e, t, r) {
     async function(i) {
       if (t && i.data.scope !== t)
         return;
-      const a = i.data.args || [], l = i.data.method, u = await e[l](...a);
-      i.source.postMessage(responseTo(i.data.requestId, u));
+      const a = i.data.args || [], l = i.data.method, c = await e[l](...a);
+      i.source.postMessage(responseTo(i.data.requestId, c));
     }
   ), s.startMessages();
 }

package/kitchen-sink/php_7_0.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_0_33/php_7_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 10638342; 
+export const dependenciesTotalSize = 10638709; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_7_1.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_1_30/php_7_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11078540; 
+export const dependenciesTotalSize = 11078277; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_7_2.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_2_34/php_7_2.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11712677; 
+export const dependenciesTotalSize = 11712687; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_7_3.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_3_33/php_7_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11775223; 
+export const dependenciesTotalSize = 11775233; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_7_4.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_4_33/php_7_4.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11945559; 
+export const dependenciesTotalSize = 11945564; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_8_0.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_0_30/php_8_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11611332; 
+export const dependenciesTotalSize = 11611342; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_8_1.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_1_23/php_8_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11541668; 
+export const dependenciesTotalSize = 11541678; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_8_2.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_2_10/php_8_2.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 11787163; 
+export const dependenciesTotalSize = 11787173; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/kitchen-sink/php_8_3.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_3_0/php_8_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 12043963; 
+export const dependenciesTotalSize = 12043974; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_7_0.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_0_33/php_7_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5285560; 
+export const dependenciesTotalSize = 5285931; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_7_1.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_1_30/php_7_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5429825; 
+export const dependenciesTotalSize = 5429562; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_7_2.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_2_34/php_7_2.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5772770; 
+export const dependenciesTotalSize = 5772780; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_7_3.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_3_33/php_7_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5700746; 
+export const dependenciesTotalSize = 5700756; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_7_4.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './7_4_33/php_7_4.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5783238; 
+export const dependenciesTotalSize = 5783248; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_8_0.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_0_30/php_8_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5579505; 
+export const dependenciesTotalSize = 5579515; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_8_1.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_1_23/php_8_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5382805; 
+export const dependenciesTotalSize = 5382815; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_8_2.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_2_10/php_8_2.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5496649; 
+export const dependenciesTotalSize = 5496659; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/light/php_8_3.js

@@ -1,6 +1,6 @@
 import dependencyFilename from './8_3_0/php_8_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 5587869; 
+export const dependenciesTotalSize = 5587879; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web",
-  "version": "0.6.14",
+  "version": "0.6.16",
   "description": "PHP.wasm for the web",
   "repository": {
     "type": "git",
@@ -29,16 +29,16 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "83b6f8542937a9bea9ee6562887a511c20ac9442",
+  "gitHead": "1981567e7eacecbc4a18c870267c20bf489afd8f",
   "engines": {
     "node": ">=16.15.1",
     "npm": ">=8.11.0"
   },
   "dependencies": {
     "comlink": "^4.4.1",
-    "@php-wasm/universal": "0.6.14",
-    "@php-wasm/util": "0.6.14",
-    "@php-wasm/web-service-worker": "0.6.14",
-    "@php-wasm/progress": "0.6.14"
+    "@php-wasm/universal": "0.6.16",
+    "@php-wasm/util": "0.6.16",
+    "@php-wasm/web-service-worker": "0.6.16",
+    "@php-wasm/progress": "0.6.16"
   }
 }