@php-wasm/universal 3.1.14 → 3.1.15

package/index.js

@@ -372,12 +372,12 @@ FSHelpers.mkdir = rethrowFileSystemError('Could not create directory "{path}"')(
   FSHelpers.mkdir
 );
 const _private = /* @__PURE__ */ new WeakMap();
-var S;
+var v;
 class PHPWorker {
   /** @inheritDoc */
   constructor(e, t) {
-    y(this, S);
-    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, g(this, S, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
+    y(this, v);
+    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, g(this, v, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
       monitor: t
     }), e && this.__internal_setRequestHandler(e);
   }
@@ -546,7 +546,7 @@ class PHPWorker {
   }
   /** @inheritDoc @php-wasm/universal!/PHP.addEventListener */
   addEventListener(e, t) {
-    u(this, S).has(e) || u(this, S).set(e, /* @__PURE__ */ new Set()), u(this, S).get(e).add(t);
+    u(this, v).has(e) || u(this, v).set(e, /* @__PURE__ */ new Set()), u(this, v).get(e).add(t);
   }
   /**
    * Removes an event listener for a PHP event.
@@ -555,10 +555,10 @@ class PHPWorker {
    */
   removeEventListener(e, t) {
     var s;
-    (s = u(this, S).get(e)) == null || s.delete(t);
+    (s = u(this, v).get(e)) == null || s.delete(t);
   }
   dispatchEvent(e) {
-    const t = u(this, S).get(e.type);
+    const t = u(this, v).get(e.type);
     if (t)
       for (const s of t)
         s(e);
@@ -580,7 +580,7 @@ class PHPWorker {
     await ((e = _private.get(this).requestHandler) == null ? void 0 : e[Symbol.asyncDispose]());
   }
 }
-S = new WeakMap();
+v = new WeakMap();
 function isExitCode(r) {
   return r instanceof Error ? (r == null ? void 0 : r.name) === "ExitStatus" && "status" in r : !1;
 }
@@ -1052,7 +1052,7 @@ class PHPExecutionFailureError extends Error {
   }
 }
 const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php", OPCACHE_FILE_FOLDER = "/internal/shared/opcache";
-var M, R, b, x, T, H, w, p, Y, X, Q, K, Z, ee, te, re, q, se, $, z;
+var C, R, b, x, T, H, w, p, Y, X, Q, K, Z, ee, te, re, $, se, q, z;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1063,7 +1063,7 @@ class PHP {
    */
   constructor(r) {
     y(this, p);
-    y(this, M);
+    y(this, C);
     y(this, R, !1);
     y(this, b, null);
     y(this, x, /* @__PURE__ */ new Map([
@@ -1265,7 +1265,7 @@ class PHP {
       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?"
       );
-    g(this, M, r);
+    g(this, C, r);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -1503,9 +1503,9 @@ class PHP {
       m(this, p, X).call(this, r.relativeUri || ""), m(this, p, ee).call(this, r.method || "GET");
       const i = normalizeHeaders(r.headers || {}), o = i.host || "example.com:443", a = m(this, p, Z).call(this, o, r.protocol || "http");
       if (m(this, p, Q).call(this, o), m(this, p, K).call(this, a), m(this, p, te).call(this, i), r.body && (t = m(this, p, re).call(this, r.body)), typeof r.code == "string")
-        this.writeFile("/internal/eval.php", r.code), m(this, p, q).call(this, "/internal/eval.php");
+        this.writeFile("/internal/eval.php", r.code), m(this, p, $).call(this, "/internal/eval.php");
       else if (typeof r.scriptPath == "string")
-        m(this, p, q).call(this, r.scriptPath || "");
+        m(this, p, $).call(this, r.scriptPath || "");
       else
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
@@ -1515,7 +1515,7 @@ class PHP {
         m(this, p, se).call(this, d, c[d]);
       const l = r.env || {};
       for (const d in l)
-        m(this, p, $).call(this, d, l[d]);
+        m(this, p, q).call(this, d, l[d]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1792,7 +1792,7 @@ class PHP {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(r), s && (this[__private__dont__use].spawnProcess = s), u(this, M) && this.setSapiName(u(this, M));
+    this.initializeRuntime(r), s && (this[__private__dont__use].spawnProcess = s), u(this, C) && this.setSapiName(u(this, C));
     const a = this[__private__dont__use].FS;
     for (const c of t)
       c && c !== "/request" && copyMEMFSNodes(e, a, c);
@@ -1852,7 +1852,7 @@ class PHP {
     return await m(this, p, z).call(this, () => {
       const s = e.env || {};
       for (const [n, i] of Object.entries(s))
-        m(this, p, $).call(this, n, i);
+        m(this, p, q).call(this, n, i);
       r = [r[0], "-c", PHP_INI_PATH, ...r.slice(1)];
       for (const n of r)
         this[__private__dont__use].ccall(
@@ -1885,38 +1885,48 @@ class PHP {
         cwd: e.cwd ?? this.cwd()
       }
     ), s = await createInvertedReadableStream();
-    t.on("error", (i) => {
-      s.controller.error(i);
-    }), t.stderr.on("data", (i) => {
-      s.controller.enqueue(i);
+    t.on("error", (a) => {
+      safeStreamError$1(s.controller, a);
     });
-    const n = await createInvertedReadableStream();
-    return t.stdout.on("data", (i) => {
-      n.controller.enqueue(i);
-    }), t.on("exit", () => {
+    const n = (a) => {
+      try {
+        s.controller.enqueue(a);
+      } catch {
+        t.stderr.off("data", n);
+      }
+    };
+    t.stderr.on("data", n);
+    const i = await createInvertedReadableStream(), o = (a) => {
+      try {
+        i.controller.enqueue(a);
+      } catch {
+        t.stdout.off("data", o);
+      }
+    };
+    return t.stdout.on("data", o), t.on("exit", () => {
       setTimeout(() => {
         try {
           s.controller.close();
         } catch {
         }
         try {
-          n.controller.close();
+          i.controller.close();
         } catch {
         }
       }, 0);
     }), new StreamedPHPResponse(
       // Headers stream
       new ReadableStream({
-        start(i) {
-          i.close();
+        start(a) {
+          a.close();
         }
       }),
-      n.stream,
+      i.stream,
       s.stream,
       // Exit code
-      new Promise((i) => {
-        t.on("exit", (o) => {
-          i(o);
+      new Promise((a) => {
+        t.on("exit", (c) => {
+          a(c);
         });
       })
     );
@@ -1943,7 +1953,7 @@ class PHP {
     this.exit(0);
   }
 }
-M = new WeakMap(), R = new WeakMap(), b = new WeakMap(), x = new WeakMap(), T = new WeakMap(), H = new WeakMap(), w = new WeakMap(), p = new WeakSet(), /**
+C = new WeakMap(), R = new WeakMap(), b = new WeakMap(), x = new WeakMap(), T = new WeakMap(), H = new WeakMap(), w = new WeakMap(), p = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -2044,7 +2054,7 @@ Y = function(r, e, t) {
     [NUMBER],
     [t]
   ), s;
-}, q = function(r) {
+}, $ = function(r) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
@@ -2058,7 +2068,7 @@ Y = function(r, e, t) {
     [STRING, STRING],
     [r, e]
   );
-}, $ = function(r, e) {
+}, q = function(r, e) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
@@ -2102,7 +2112,7 @@ Y = function(r, e, t) {
     } catch (f) {
       if (isExitCode(f))
         return f.status;
-      i.controller.error(f), o.controller.error(f), t.controller.error(f), a = !0;
+      safeStreamError$1(i.controller, f), safeStreamError$1(o.controller, f), safeStreamError$1(t.controller, f), a = !0;
       for (const _ in this)
         typeof this[_] == "function" && (this[_] = () => {
           throw new Error(
@@ -2111,7 +2121,7 @@ Y = function(r, e, t) {
         });
       throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), f;
     } finally {
-      a || (i.controller.close(), o.controller.close(), n(), a = !0), (h = u(this, b)) == null || h.removeEventListener(
+      a || (safeStreamClose$1(i.controller), safeStreamClose$1(o.controller), n(), a = !0), (h = u(this, b)) == null || h.removeEventListener(
         "error",
         c
       );
@@ -2178,6 +2188,18 @@ async function createInvertedReadableStream(r = {}) {
     controller: n
   };
 }
+function safeStreamError$1(r, e) {
+  try {
+    r.error(e);
+  } catch {
+  }
+}
+function safeStreamClose$1(r) {
+  try {
+    r.close();
+  } catch {
+  }
+}
 const getNodeType = (r, e) => {
   try {
     return "contents" in r.lookupPath(e, { follow: !0 }).node ? "memfs" : (
@@ -2576,7 +2598,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var v, C, U, L, I, E, A, k, B, P, ne, j, ie, oe, ae;
+var S, M, U, L, I, E, A, k, B, P, ne, j, ie, oe, ae;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2591,8 +2613,8 @@ class PHPRequestHandler {
    */
   constructor(e) {
     y(this, P);
-    y(this, v);
-    y(this, C);
+    y(this, S);
+    y(this, M);
     y(this, U);
     y(this, L);
     y(this, I);
@@ -2628,15 +2650,15 @@ class PHPRequestHandler {
       throw new Error(
         "Either php or phpFactory must be provided in the configuration."
       );
-    g(this, k, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), g(this, v, t);
+    g(this, k, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), g(this, S, t);
     const c = new URL(s);
-    g(this, U, c.hostname), g(this, L, c.port ? Number(c.port) : c.protocol === "https:" ? 443 : 80), g(this, C, (c.protocol || "").replace(":", ""));
+    g(this, U, c.hostname), g(this, L, c.port ? Number(c.port) : c.protocol === "https:" ? 443 : 80), g(this, M, (c.protocol || "").replace(":", ""));
     const l = u(this, L) !== 443 && u(this, L) !== 80;
     g(this, I, [
       u(this, U),
       l ? `:${u(this, L)}` : ""
     ].join("")), g(this, E, c.pathname.replace(/\/+$/, "")), g(this, A, [
-      `${u(this, C)}://`,
+      `${u(this, M)}://`,
       u(this, I),
       u(this, E)
     ].join("")), this.rewriteRules = n, g(this, B, i), this.getFileNotFoundAction = o;
@@ -2676,7 +2698,7 @@ class PHPRequestHandler {
    * for the files to serve. Default: `/var/www`.
    */
   get documentRoot() {
-    return u(this, v);
+    return u(this, S);
   }
   /**
    * Serves the request – either by serving a static file, or by
@@ -2803,7 +2825,7 @@ class PHPRequestHandler {
             c.response
           );
         case "internal-redirect":
-          a = joinPaths(u(this, v), c.uri);
+          a = joinPaths(u(this, S), c.uri);
           break;
         case "404":
           return StreamedPHPResponse.forHttpCode(404);
@@ -2908,11 +2930,11 @@ class PHPRequestHandler {
   prepare_$_SERVER_superglobal(e, t, s) {
     const n = {
       REMOTE_ADDR: "127.0.0.1",
-      DOCUMENT_ROOT: u(this, v),
+      DOCUMENT_ROOT: u(this, S),
       HTTPS: u(this, A).startsWith("https://") ? "on" : ""
     };
-    return n.REQUEST_URI = e.pathname + e.search, s.startsWith(u(this, v)) && (n.SCRIPT_NAME = s.substring(
-      u(this, v).length
+    return n.REQUEST_URI = e.pathname + e.search, s.startsWith(u(this, S)) && (n.SCRIPT_NAME = s.substring(
+      u(this, S).length
     ), n.PHP_SELF = t.pathname, n.REQUEST_URI.startsWith(n.SCRIPT_NAME) && (n.PATH_INFO = n.REQUEST_URI.substring(
       n.SCRIPT_NAME.length
     ), n.PATH_INFO.includes("?") && (n.PATH_INFO = n.PATH_INFO.substring(
@@ -2924,7 +2946,7 @@ class PHPRequestHandler {
     await this.instanceManager[Symbol.asyncDispose]();
   }
 }
-v = new WeakMap(), C = new WeakMap(), U = new WeakMap(), L = new WeakMap(), I = new WeakMap(), E = new WeakMap(), A = new WeakMap(), k = new WeakMap(), B = new WeakMap(), P = new WeakSet(), /**
+S = new WeakMap(), M = new WeakMap(), U = new WeakMap(), L = new WeakMap(), I = new WeakMap(), E = new WeakMap(), A = new WeakMap(), k = new WeakMap(), B = new WeakMap(), P = new WeakSet(), /**
  * Apply the rewrite rules to the original request URL.
  *
  * @param originalRequestUrl - The original request URL.
@@ -2959,7 +2981,7 @@ j = function(e) {
       const s = e.slice(t.urlPrefix.length);
       return joinPaths(t.fsPath, s);
     }
-  return joinPaths(u(this, v), e);
+  return joinPaths(u(this, S), e);
 }, /**
  * Serves a static file from the PHP filesystem.
  *
@@ -3015,7 +3037,7 @@ ie = function(e, t) {
       toRelativeUrl(new URL(n.toString())),
       u(this, E)
     ),
-    protocol: u(this, C),
+    protocol: u(this, M),
     method: t.method || o,
     $_SERVER: this.prepare_$_SERVER_superglobal(
       s,
@@ -4040,13 +4062,20 @@ function portToStream(r) {
         if (i)
           switch (i.t) {
             case "chunk":
-              e.enqueue(new Uint8Array(i.b));
+              try {
+                e.enqueue(new Uint8Array(i.b));
+              } catch {
+                s();
+              }
               break;
             case "close":
-              e.close(), s();
+              safeStreamClose(e), s();
               break;
             case "error":
-              e.error(new Error(i.m || "Stream error")), s();
+              safeStreamError(
+                e,
+                new Error(i.m || "Stream error")
+              ), s();
               break;
           }
       }, s = () => {
@@ -4166,6 +4195,18 @@ function proxyClone(r) {
     }
   });
 }
+function safeStreamError(r, e) {
+  try {
+    r.error(e);
+  } catch {
+  }
+}
+function safeStreamClose(r) {
+  try {
+    r.close();
+  } catch {
+  }
+}
 const MAX_ADDRESSABLE_FILE_OFFSET = BigInt(Number.MAX_SAFE_INTEGER);
 class IntervalNode {
   constructor(e) {