@php-wasm/web 0.6.0 → 0.6.2

package/index.d.ts

@@ -239,7 +239,7 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 * @param key - The name of the constant.
 	 * @param value - The value of the constant.
 	 */
-	defineConstant(key: string, value: string | number | null): void;
+	defineConstant(key: string, value: boolean | string | number | null): void;
 	/**
 	 * Adds an event listener for a PHP event.
 	 * @param eventType - The type of event to listen for.

package/index.js

@@ -2,12 +2,12 @@ var Q = (e, t, r) => {
   if (!t.has(e))
     throw TypeError("Cannot " + r);
 };
-var l = (e, t, r) => (Q(e, t, "read from private field"), r ? r.call(e) : t.get(e)), u = (e, t, r) => {
+var l = (e, t, r) => (Q(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);
 }, p = (e, t, r, s) => (Q(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
-var _ = (e, t, r) => (Q(e, t, "access private method"), r);
+var m = (e, t, r) => (Q(e, t, "access private method"), r);
 if (typeof File > "u") {
   class e extends Blob {
     constructor(r, s, i) {
@@ -382,16 +382,16 @@ const SupportedPHPVersions = [
   "7.1",
   "7.0"
 ], LatestSupportedPHPVersion = SupportedPHPVersions[0];
-var b, x;
+var R, H;
 class PHPBrowser {
   /**
    * @param  server - The PHP server to browse.
    * @param  config - The browser configuration.
    */
   constructor(t, r = {}) {
-    u(this, b, void 0);
-    u(this, x, void 0);
-    this.requestHandler = t, p(this, b, {}), p(this, x, {
+    d(this, R, void 0);
+    d(this, H, void 0);
+    this.requestHandler = t, p(this, R, {}), p(this, H, {
       handleRedirects: !1,
       maxRedirects: 4,
       ...r
@@ -419,7 +419,7 @@ class PHPBrowser {
         cookie: this.serializeCookies()
       }
     });
-    if (s.headers["set-cookie"] && this.setCookies(s.headers["set-cookie"]), l(this, x).handleRedirects && s.headers.location && r < l(this, x).maxRedirects) {
+    if (s.headers["set-cookie"] && this.setCookies(s.headers["set-cookie"]), l(this, H).handleRedirects && s.headers.location && r < l(this, H).maxRedirects) {
       const i = new URL(
         s.headers.location[0],
         this.requestHandler.absoluteUrl
@@ -457,19 +457,19 @@ class PHPBrowser {
         if (!r.includes("="))
           continue;
         const s = r.indexOf("="), i = r.substring(0, s), n = r.substring(s + 1).split(";")[0];
-        l(this, b)[i] = n;
+        l(this, R)[i] = n;
       } catch (s) {
         console.error(s);
       }
   }
   serializeCookies() {
     const t = [];
-    for (const r in l(this, b))
-      t.push(`${r}=${l(this, b)[r]}`);
+    for (const r in l(this, R))
+      t.push(`${r}=${l(this, R)[r]}`);
     return t.join("; ");
   }
 }
-b = new WeakMap(), x = new WeakMap();
+R = new WeakMap(), H = new WeakMap();
 const DEFAULT_BASE_URL = "http://example.com";
 function toRelativeUrl(e) {
   return e.toString().substring(e.origin.length);
@@ -480,7 +480,7 @@ function removePathPrefix(e, t) {
 function ensurePathPrefix(e, t) {
   return !t || e.startsWith(t) ? e : t + e;
 }
-var P, T, L, R, k, y, H, C, N, Z, U, X, O, ee;
+var E, k, L, S, C, g, F, x, N, Z, U, X, B, ee;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -493,7 +493,7 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    u(this, N);
+    d(this, N);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -501,7 +501,7 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    u(this, U);
+    d(this, U);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -511,31 +511,31 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    u(this, O);
-    u(this, P, void 0);
-    u(this, T, void 0);
-    u(this, L, void 0);
-    u(this, R, void 0);
-    u(this, k, void 0);
-    u(this, y, void 0);
-    u(this, H, void 0);
-    u(this, C, void 0);
-    p(this, C, new Semaphore({ concurrency: 1 }));
+    d(this, B);
+    d(this, E, void 0);
+    d(this, k, void 0);
+    d(this, L, void 0);
+    d(this, S, void 0);
+    d(this, C, void 0);
+    d(this, g, void 0);
+    d(this, F, void 0);
+    d(this, x, void 0);
+    p(this, x, new Semaphore({ concurrency: 1 }));
     const {
       documentRoot: s = "/www/",
       absoluteUrl: i = typeof location == "object" ? location == null ? void 0 : location.href : ""
     } = r;
-    this.php = t, p(this, P, s);
+    this.php = t, p(this, E, s);
     const n = new URL(i);
-    p(this, L, n.hostname), p(this, R, n.port ? Number(n.port) : n.protocol === "https:" ? 443 : 80), p(this, T, (n.protocol || "").replace(":", ""));
-    const o = l(this, R) !== 443 && l(this, R) !== 80;
-    p(this, k, [
+    p(this, L, n.hostname), p(this, S, n.port ? Number(n.port) : n.protocol === "https:" ? 443 : 80), p(this, k, (n.protocol || "").replace(":", ""));
+    const o = l(this, S) !== 443 && l(this, S) !== 80;
+    p(this, C, [
       l(this, L),
-      o ? `:${l(this, R)}` : ""
-    ].join("")), p(this, y, n.pathname.replace(/\/+$/, "")), p(this, H, [
-      `${l(this, T)}://`,
-      l(this, k),
-      l(this, y)
+      o ? `:${l(this, S)}` : ""
+    ].join("")), p(this, g, n.pathname.replace(/\/+$/, "")), p(this, F, [
+      `${l(this, k)}://`,
+      l(this, C),
+      l(this, g)
     ].join(""));
   }
   /** @inheritDoc */
@@ -545,18 +545,18 @@ class PHPRequestHandler {
   /** @inheritDoc */
   internalUrlToPath(t) {
     const r = new URL(t);
-    return r.pathname.startsWith(l(this, y)) && (r.pathname = r.pathname.slice(l(this, y).length)), toRelativeUrl(r);
+    return r.pathname.startsWith(l(this, g)) && (r.pathname = r.pathname.slice(l(this, g).length)), toRelativeUrl(r);
   }
   get isRequestRunning() {
-    return l(this, C).running > 0;
+    return l(this, x).running > 0;
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return l(this, H);
+    return l(this, F);
   }
   /** @inheritDoc */
   get documentRoot() {
-    return l(this, P);
+    return l(this, E);
   }
   /** @inheritDoc */
   async request(t) {
@@ -565,12 +565,12 @@ class PHPRequestHandler {
       r ? void 0 : DEFAULT_BASE_URL
     ), i = removePathPrefix(
       s.pathname,
-      l(this, y)
-    ), n = `${l(this, P)}${i}`;
-    return seemsLikeAPHPRequestHandlerPath(n) ? await _(this, U, X).call(this, t, s) : _(this, N, Z).call(this, n);
+      l(this, g)
+    ), n = `${l(this, E)}${i}`;
+    return seemsLikeAPHPRequestHandlerPath(n) ? await m(this, U, X).call(this, t, s) : m(this, N, Z).call(this, n);
   }
 }
-P = new WeakMap(), T = new WeakMap(), L = new WeakMap(), R = new WeakMap(), k = new WeakMap(), y = new WeakMap(), H = new WeakMap(), C = new WeakMap(), N = new WeakSet(), Z = function(t) {
+E = new WeakMap(), k = new WeakMap(), L = new WeakMap(), S = new WeakMap(), C = new WeakMap(), g = new WeakMap(), F = new WeakMap(), x = new WeakMap(), N = new WeakSet(), Z = function(t) {
   if (!this.php.fileExists(t))
     return new PHPResponse(
       404,
@@ -596,48 +596,56 @@ P = new WeakMap(), T = new WeakMap(), L = new WeakMap(), R = new WeakMap(), k =
     r
   );
 }, U = new WeakSet(), X = async function(t, r) {
-  var i, n;
-  const s = await l(this, C).acquire();
+  var i, n, o;
+  if (l(this, x).running > 0 && ((i = t.headers) == null ? void 0 : i["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(
+      502,
+      {},
+      new TextEncoder().encode("502 Bad Gateway")
+    );
+  const s = await l(this, x).acquire();
   try {
-    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", l(this, P)), this.php.addServerGlobalEntry(
+    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", l(this, E)), this.php.addServerGlobalEntry(
       "HTTPS",
-      l(this, H).startsWith("https://") ? "on" : ""
+      l(this, F).startsWith("https://") ? "on" : ""
     );
-    let o = "GET";
-    const a = {
-      host: l(this, k),
+    let a = "GET";
+    const u = {
+      host: l(this, C),
       ...normalizeHeaders(t.headers || {})
-    }, d = [];
+    }, c = [];
     if (t.files && Object.keys(t.files).length) {
-      o = "POST";
+      a = "POST";
       for (const f in t.files) {
-        const m = t.files[f];
-        d.push({
+        const y = t.files[f];
+        c.push({
           key: f,
-          name: m.name,
-          type: m.type,
-          data: new Uint8Array(await m.arrayBuffer())
+          name: y.name,
+          type: y.type,
+          data: new Uint8Array(await y.arrayBuffer())
         });
       }
-      (i = a["content-type"]) != null && i.startsWith("multipart/form-data") && (t.formData = parseMultipartFormDataString(
+      (n = u["content-type"]) != null && n.startsWith("multipart/form-data") && (t.formData = parseMultipartFormDataString(
         t.body || ""
-      ), a["content-type"] = "application/x-www-form-urlencoded", delete t.body);
+      ), u["content-type"] = "application/x-www-form-urlencoded", delete t.body);
     }
-    let c;
-    t.formData !== void 0 ? (o = "POST", a["content-type"] = a["content-type"] || "application/x-www-form-urlencoded", c = new URLSearchParams(
-      t.formData
-    ).toString()) : c = t.body;
     let h;
+    t.formData !== void 0 ? (a = "POST", u["content-type"] = u["content-type"] || "application/x-www-form-urlencoded", h = new URLSearchParams(
+      t.formData
+    ).toString()) : h = t.body;
+    let _;
     try {
       let f = r.pathname;
-      if ((n = t.headers) != null && n["x-rewrite-url"])
+      if ((o = t.headers) != null && o["x-rewrite-url"])
         try {
           f = new URL(
             t.headers["x-rewrite-url"]
           ).pathname;
         } catch {
         }
-      h = _(this, O, ee).call(this, f);
+      _ = m(this, B, ee).call(this, f);
     } catch {
       return new PHPResponse(
         404,
@@ -648,22 +656,22 @@ P = new WeakMap(), T = new WeakMap(), L = new WeakMap(), R = new WeakMap(), k =
     return await this.php.run({
       relativeUri: ensurePathPrefix(
         toRelativeUrl(r),
-        l(this, y)
+        l(this, g)
       ),
-      protocol: l(this, T),
-      method: t.method || o,
-      body: c,
-      fileInfos: d,
-      scriptPath: h,
-      headers: a
+      protocol: l(this, k),
+      method: t.method || a,
+      body: h,
+      fileInfos: c,
+      scriptPath: _,
+      headers: u
     });
   } finally {
     s();
   }
-}, O = new WeakSet(), ee = function(t) {
-  let r = removePathPrefix(t, l(this, y));
+}, B = new WeakSet(), ee = function(t) {
+  let r = removePathPrefix(t, l(this, g));
   r.includes(".php") ? r = r.split(".php")[0] + ".php" : (r.endsWith("/") || (r += "/"), r.endsWith("index.php") || (r += "index.php"));
-  const s = `${l(this, P)}${r}`;
+  const s = `${l(this, E)}${r}`;
   if (this.php.fileExists(s))
     return s;
   throw new Error(`File not found: ${s}`);
@@ -676,10 +684,10 @@ function parseMultipartFormDataString(e) {
   return i.shift(), i.pop(), i.forEach((n) => {
     const o = n.indexOf(`\r
 \r
-`), a = n.substring(0, o).trim(), d = n.substring(o + 4).trim(), c = a.match(/name="([^"]+)"/);
+`), a = n.substring(0, o).trim(), u = n.substring(o + 4).trim(), c = a.match(/name="([^"]+)"/);
     if (c) {
       const h = c[1];
-      t[h] = d;
+      t[h] = u;
     }
   }), t;
 }
@@ -823,10 +831,10 @@ function rethrowFileSystemError(e = "") {
       try {
         return n.apply(this, o);
       } catch (a) {
-        const d = typeof a == "object" ? a == null ? void 0 : a.errno : null;
-        if (d in FileErrorCodes) {
-          const c = FileErrorCodes[d], h = typeof o[0] == "string" ? o[0] : null, f = h !== null ? e.replaceAll("{path}", h) : e;
-          throw new Error(`${f}: ${c}`, {
+        const u = typeof a == "object" ? a == null ? void 0 : a.errno : null;
+        if (u in FileErrorCodes) {
+          const c = FileErrorCodes[u], h = typeof o[0] == "string" ? o[0] : null, _ = h !== null ? e.replaceAll("{path}", h) : e;
+          throw new Error(`${_}: ${c}`, {
             cause: a
           });
         }
@@ -877,7 +885,7 @@ var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyD
   return s && i && __defProp(t, r, i), i;
 };
 const STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
-var S, F, M, g, E, v, w, I, B, te, W, re, z, se, D, ne, q, ie, $, oe, j, ae, G, le, V, ce, Y, ue, J, de, K, he;
+var T, M, I, w, v, b, P, A, O, te, W, re, q, se, z, ne, D, ie, $, oe, j, ae, G, le, V, ce, Y, ue, J, de, K, he;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -887,15 +895,15 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    u(this, B);
-    u(this, W);
-    u(this, z);
-    u(this, D);
-    u(this, q);
-    u(this, $);
-    u(this, j);
-    u(this, G);
-    u(this, V);
+    d(this, O);
+    d(this, W);
+    d(this, q);
+    d(this, z);
+    d(this, D);
+    d(this, $);
+    d(this, j);
+    d(this, G);
+    d(this, V);
     /**
      * Adds file information to $_FILES superglobal in PHP.
      *
@@ -905,37 +913,37 @@ class BasePHP {
      *
      * @param  fileInfo - File details
      */
-    u(this, Y);
-    u(this, J);
-    u(this, K);
-    u(this, S, void 0);
-    u(this, F, void 0);
-    u(this, M, void 0);
-    u(this, g, void 0);
-    u(this, E, void 0);
-    u(this, v, void 0);
-    u(this, w, void 0);
-    u(this, I, void 0);
-    p(this, S, []), p(this, g, !1), p(this, E, null), p(this, v, {}), p(this, w, /* @__PURE__ */ new Map()), p(this, I, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
+    d(this, Y);
+    d(this, J);
+    d(this, K);
+    d(this, T, void 0);
+    d(this, M, void 0);
+    d(this, I, void 0);
+    d(this, w, void 0);
+    d(this, v, void 0);
+    d(this, b, void 0);
+    d(this, P, void 0);
+    d(this, A, void 0);
+    p(this, T, []), p(this, w, !1), p(this, v, null), p(this, b, {}), p(this, P, /* @__PURE__ */ new Map()), p(this, A, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
       new PHPRequestHandler(this, t)
     ));
   }
   addEventListener(e, t) {
-    l(this, w).has(e) || l(this, w).set(e, /* @__PURE__ */ new Set()), l(this, w).get(e).add(t);
+    l(this, P).has(e) || l(this, P).set(e, /* @__PURE__ */ new Set()), l(this, P).get(e).add(t);
   }
   removeEventListener(e, t) {
     var r;
-    (r = l(this, w).get(e)) == null || r.delete(t);
+    (r = l(this, P).get(e)) == null || r.delete(t);
   }
   dispatchEvent(e) {
-    const t = l(this, w).get(e.type);
+    const t = l(this, P).get(e.type);
     if (t)
       for (const r of t)
         r(e);
   }
   /** @inheritDoc */
   async onMessage(e) {
-    l(this, I).push(e);
+    l(this, A).push(e);
   }
   /** @inheritDoc */
   async setSpawnHandler(handler) {
@@ -966,13 +974,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 l(this, I)) {
+      for (const s of l(this, A)) {
         const i = await s(r);
         if (i)
           return i;
       }
       return "";
-    }, p(this, E, improveWASMErrorReporting(t)), this.dispatchEvent({
+    }, p(this, v, improveWASMErrorReporting(t)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -987,13 +995,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?"
       );
-    p(this, M, e);
+    p(this, I, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
-    if (l(this, g))
+    if (l(this, w))
       throw new Error("Cannot set PHP ini path after calling run().");
-    p(this, F, e), this[__private__dont__use].ccall(
+    p(this, M, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -1002,9 +1010,9 @@ class BasePHP {
   }
   /** @inheritDoc */
   setPhpIniEntry(e, t) {
-    if (l(this, g))
+    if (l(this, w))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    l(this, S).push([e, t]);
+    l(this, T).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
@@ -1021,13 +1029,13 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      l(this, g) || (_(this, B, te).call(this), p(this, g, !0)), _(this, G, le).call(this, e.scriptPath || ""), _(this, z, se).call(this, e.relativeUri || ""), _(this, q, ie).call(this, e.method || "GET");
+      l(this, w) || (m(this, O, te).call(this), p(this, w, !0)), m(this, G, le).call(this, e.scriptPath || ""), m(this, q, se).call(this, e.relativeUri || ""), m(this, D, ie).call(this, e.method || "GET");
       const s = normalizeHeaders(e.headers || {}), i = s.host || "example.com:443";
-      if (_(this, D, ne).call(this, i, e.protocol || "http"), _(this, $, oe).call(this, s), e.body && (r = _(this, j, ae).call(this, e.body)), e.fileInfos)
+      if (m(this, z, ne).call(this, i, e.protocol || "http"), m(this, $, oe).call(this, s), e.body && (r = m(this, j, ae).call(this, e.body)), e.fileInfos)
         for (const o of e.fileInfos)
-          _(this, Y, ue).call(this, o);
-      typeof e.code == "string" && _(this, J, de).call(this, " ?>" + e.code), _(this, V, ce).call(this);
-      const n = await _(this, K, he).call(this);
+          m(this, Y, ue).call(this, o);
+      typeof e.code == "string" && m(this, J, de).call(this, " ?>" + e.code), m(this, V, ce).call(this);
+      const n = await m(this, K, he).call(this);
       if (e.throwOnError && n.exitCode !== 0) {
         const o = {
           stdout: n.text,
@@ -1051,7 +1059,7 @@ class BasePHP {
     }
   }
   addServerGlobalEntry(e, t) {
-    l(this, v)[e] = t;
+    l(this, b)[e] = t;
   }
   defineConstant(e, t) {
     let r = {};
@@ -1147,7 +1155,7 @@ class BasePHP {
       this.exit();
     } catch {
     }
-    if (this.initializeRuntime(e), l(this, F) && this.setPhpIniPath(l(this, F)), l(this, M) && this.setSapiName(l(this, M)), this.requestHandler) {
+    if (this.initializeRuntime(e), l(this, M) && this.setPhpIniPath(l(this, M)), l(this, I) && this.setSapiName(l(this, I)), this.requestHandler) {
       const r = this.documentRoot;
       recreateMemFS(this[__private__dont__use].FS, t, r);
     }
@@ -1160,10 +1168,10 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    p(this, g, !1), p(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    p(this, w, !1), p(this, v, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
-S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E = new WeakMap(), v = new WeakMap(), w = new WeakMap(), I = new WeakMap(), B = new WeakSet(), te = function() {
+T = new WeakMap(), M = new WeakMap(), I = new WeakMap(), w = new WeakMap(), v = new WeakMap(), b = new WeakMap(), P = new WeakMap(), A = new WeakMap(), O = new WeakSet(), te = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/tmp/consts.php"), this.fileExists("/tmp/consts.php") || this.writeFile(
     "/tmp/consts.php",
     `<?php
@@ -1175,8 +1183,8 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
 						}
 					}
 				}`
-  ), l(this, S).length > 0) {
-    const e = l(this, S).map(([t, r]) => `${t}=${r}`).join(`
+  ), l(this, T).length > 0) {
+    const e = l(this, T).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -1205,7 +1213,7 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
     headers: r,
     httpStatusCode: t.status
   };
-}, z = new WeakSet(), se = function(e) {
+}, q = new WeakSet(), se = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1220,7 +1228,7 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
       [t]
     );
   }
-}, D = new WeakSet(), ne = function(e, t) {
+}, z = new WeakSet(), ne = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
@@ -1238,7 +1246,7 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
     [NUMBER],
     [r]
   ), (t === "https" || !t && r === 443) && this.addServerGlobalEntry("HTTPS", "on");
-}, q = new WeakSet(), ie = function(e) {
+}, D = new WeakSet(), ie = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
@@ -1296,12 +1304,12 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
     [e]
   );
 }, V = new WeakSet(), ce = function() {
-  for (const e in l(this, v))
+  for (const e in l(this, b))
     this[__private__dont__use].ccall(
       "wasm_add_SERVER_entry",
       null,
       [STRING, STRING],
-      [e, l(this, v)[e]]
+      [e, l(this, b)[e]]
     );
 }, Y = new WeakSet(), ue = function(e) {
   const { key: t, name: r, type: s, data: i } = e, n = `/tmp/${Math.random().toFixed(20)}`;
@@ -1325,11 +1333,11 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
   let e, t;
   try {
     e = await new Promise((n, o) => {
-      var d;
+      var u;
       t = (c) => {
         const h = new Error("Rethrown");
         h.cause = c.error, h.betterMessage = c.message, o(h);
-      }, (d = l(this, E)) == null || d.addEventListener(
+      }, (u = l(this, v)) == null || u.addEventListener(
         "error",
         t
       );
@@ -1350,12 +1358,12 @@ S = new WeakMap(), F = new WeakMap(), M = new WeakMap(), g = new WeakMap(), E =
         );
       });
     this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify();
-    const o = n, a = "betterMessage" in o ? o.betterMessage : o.message, d = new Error(a);
-    throw d.cause = o, d;
+    const o = n, a = "betterMessage" in o ? o.betterMessage : o.message, u = new Error(a);
+    throw u.cause = o, u;
   } finally {
-    (i = l(this, E)) == null || i.removeEventListener("error", t), p(this, v, {});
+    (i = l(this, v)) == null || i.removeEventListener("error", t), p(this, b, {});
   }
-  const { headers: r, httpStatusCode: s } = _(this, W, re).call(this);
+  const { headers: r, httpStatusCode: s } = m(this, W, re).call(this);
   return new PHPResponse(
     s,
     r,
@@ -1471,30 +1479,30 @@ function expose(e, t = globalThis, r = ["*"]) {
       console.warn(`Invalid origin '${i.origin}' for comlink proxy`);
       return;
     }
-    const { id: n, type: o, path: a } = Object.assign({ path: [] }, i.data), d = (i.data.argumentList || []).map(fromWireValue);
+    const { id: n, type: o, path: a } = Object.assign({ path: [] }, i.data), u = (i.data.argumentList || []).map(fromWireValue);
     let c;
     try {
-      const h = a.slice(0, -1).reduce((m, A) => m[A], e), f = a.reduce((m, A) => m[A], e);
+      const h = a.slice(0, -1).reduce((f, y) => f[y], e), _ = a.reduce((f, y) => f[y], e);
       switch (o) {
         case "GET":
-          c = f;
+          c = _;
           break;
         case "SET":
           h[a.slice(-1)[0]] = fromWireValue(i.data.value), c = !0;
           break;
         case "APPLY":
-          c = f.apply(h, d);
+          c = _.apply(h, u);
           break;
         case "CONSTRUCT":
           {
-            const m = new f(...d);
-            c = proxy(m);
+            const f = new _(...u);
+            c = proxy(f);
           }
           break;
         case "ENDPOINT":
           {
-            const { port1: m, port2: A } = new MessageChannel();
-            expose(e, A), c = transfer(m, [m]);
+            const { port1: f, port2: y } = new MessageChannel();
+            expose(e, y), c = transfer(f, [f]);
           }
           break;
         case "RELEASE":
@@ -1507,14 +1515,14 @@ function expose(e, t = globalThis, r = ["*"]) {
       c = { value: h, [throwMarker]: 0 };
     }
     Promise.resolve(c).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
-      const [f, m] = toWireValue(h);
-      t.postMessage(Object.assign(Object.assign({}, f), { id: n }), m), o === "RELEASE" && (t.removeEventListener("message", s), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
+      const [_, f] = toWireValue(h);
+      t.postMessage(Object.assign(Object.assign({}, _), { id: n }), f), o === "RELEASE" && (t.removeEventListener("message", s), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
     }).catch((h) => {
-      const [f, m] = toWireValue({
+      const [_, f] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      t.postMessage(Object.assign(Object.assign({}, f), { id: n }), m);
+      t.postMessage(Object.assign(Object.assign({}, _), { id: n }), f);
     });
   }), t.start && t.start();
 }
@@ -1563,7 +1571,7 @@ function createProxy(e, t = [], r = function() {
           return { then: () => i };
         const a = requestResponseMessage(e, {
           type: "GET",
-          path: t.map((d) => d.toString())
+          path: t.map((u) => u.toString())
         }).then(fromWireValue);
         return a.then.bind(a);
       }
@@ -1571,37 +1579,37 @@ function createProxy(e, t = [], r = function() {
     },
     set(n, o, a) {
       throwIfProxyReleased(s);
-      const [d, c] = toWireValue(a);
+      const [u, c] = toWireValue(a);
       return requestResponseMessage(e, {
         type: "SET",
         path: [...t, o].map((h) => h.toString()),
-        value: d
+        value: u
       }, c).then(fromWireValue);
     },
     apply(n, o, a) {
       throwIfProxyReleased(s);
-      const d = t[t.length - 1];
-      if (d === createEndpoint)
+      const u = t[t.length - 1];
+      if (u === createEndpoint)
         return requestResponseMessage(e, {
           type: "ENDPOINT"
         }).then(fromWireValue);
-      if (d === "bind")
+      if (u === "bind")
         return createProxy(e, t.slice(0, -1));
       const [c, h] = processArguments(a);
       return requestResponseMessage(e, {
         type: "APPLY",
-        path: t.map((f) => f.toString()),
+        path: t.map((_) => _.toString()),
         argumentList: c
       }, h).then(fromWireValue);
     },
     construct(n, o) {
       throwIfProxyReleased(s);
-      const [a, d] = processArguments(o);
+      const [a, u] = processArguments(o);
       return requestResponseMessage(e, {
         type: "CONSTRUCT",
         path: t.map((c) => c.toString()),
         argumentList: a
-      }, d).then(fromWireValue);
+      }, u).then(fromWireValue);
     }
   });
   return registerProxy(i, e), i;
@@ -1690,10 +1698,10 @@ function exposeAPI(e, t) {
   setupTransferHandlers();
   const r = Promise.resolve();
   let s, i;
-  const n = new Promise((d, c) => {
-    s = d, i = c;
+  const n = new Promise((u, c) => {
+    s = u, i = c;
   }), o = proxyClone(e), a = new Proxy(o, {
-    get: (d, c) => c === "isConnected" ? () => r : c === "isReady" ? () => n : c in d ? d[c] : t == null ? void 0 : t[c]
+    get: (u, c) => c === "isConnected" ? () => r : c === "isReady" ? () => n : c in u ? u[c] : t == null ? void 0 : t[c]
   });
   return expose(
     a,
@@ -1976,7 +1984,7 @@ async function registerServiceWorker(e, t, r) {
     async function(o) {
       if (console.debug("[window][sw] Message from ServiceWorker", o), t && o.data.scope !== t)
         return;
-      const a = o.data.args || [], d = o.data.method, c = await e[d](...a);
+      const a = o.data.args || [], u = o.data.method, c = await e[u](...a);
       o.source.postMessage(responseTo(o.data.requestId, c));
     }
   ), s.startMessages();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "PHP.wasm for the web",
   "repository": {
     "type": "git",
@@ -29,15 +29,15 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "3f137306ec8e3b10ec0674a1fe69ee43349edb4a",
+  "gitHead": "3c0de0d0847c3550a75a026bef9724eac421afbf",
   "engines": {
     "node": ">=16.15.1",
     "npm": ">=8.11.0"
   },
   "dependencies": {
     "comlink": "^4.4.1",
-    "@php-wasm/universal": "0.6.0",
-    "@php-wasm/web-service-worker": "0.6.0",
-    "@php-wasm/progress": "0.6.0"
+    "@php-wasm/universal": "0.6.2",
+    "@php-wasm/web-service-worker": "0.6.2",
+    "@php-wasm/progress": "0.6.2"
   }
 }