@php-wasm/universal 3.1.40 → 3.1.42

package/index.js

@@ -371,12 +371,12 @@ FSHelpers.mkdir = rethrowFileSystemError('Could not create directory "{path}"')(
   FSHelpers.mkdir
 );
 const _private = /* @__PURE__ */ new WeakMap();
-var j;
+var U;
 class PHPWorker {
   /** @inheritDoc */
   constructor(e, t) {
-    E(this, j);
-    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, x(this, j, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
+    E(this, U);
+    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, x(this, U, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
       monitor: t
     }), e && this.__internal_setRequestHandler(e);
   }
@@ -551,7 +551,7 @@ class PHPWorker {
   }
   /** @inheritDoc @php-wasm/universal!/PHP.addEventListener */
   addEventListener(e, t) {
-    p(this, j).has(e) || p(this, j).set(e, /* @__PURE__ */ new Set()), p(this, j).get(e).add(t);
+    p(this, U).has(e) || p(this, U).set(e, /* @__PURE__ */ new Set()), p(this, U).get(e).add(t);
   }
   /**
    * Removes an event listener for a PHP event.
@@ -560,10 +560,10 @@ class PHPWorker {
    */
   removeEventListener(e, t) {
     var s;
-    (s = p(this, j).get(e)) == null || s.delete(t);
+    (s = p(this, U).get(e)) == null || s.delete(t);
   }
   dispatchEvent(e) {
-    const t = p(this, j).get(e.type);
+    const t = p(this, U).get(e.type);
     if (t)
       for (const s of t)
         s(e);
@@ -595,7 +595,7 @@ class PHPWorker {
       throw new Error("PHPWorker is not connected to a request handler.");
   }
 }
-j = new WeakMap();
+U = new WeakMap();
 function isExitCode(r) {
   return r instanceof Error ? (r == null ? void 0 : r.name) === "ExitStatus" && "status" in r : !1;
 }
@@ -1069,7 +1069,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 J, V, z, D, G, X, k, g, Pe, we, _e, ve, Ee, xe, Se, ke, fe, Fe, he, me;
+var Y, V, z, D, G, J, k, g, Pe, we, _e, ve, Ee, xe, Se, ke, fe, Fe, he, me;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1080,7 +1080,7 @@ class PHP {
    */
   constructor(r) {
     E(this, g);
-    E(this, J);
+    E(this, Y);
     E(this, V, !1);
     E(this, z, null);
     E(this, D, /* @__PURE__ */ new Map([
@@ -1088,7 +1088,7 @@ class PHP {
       ["*", /* @__PURE__ */ new Set()]
     ]));
     E(this, G, []);
-    E(this, X, {});
+    E(this, J, {});
     E(this, k, {
       enabled: !1,
       recreateRuntime: () => 0,
@@ -1282,7 +1282,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?"
       );
-    x(this, J, r);
+    x(this, Y, r);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -1795,14 +1795,14 @@ class PHP {
   async hotSwapPHPRuntime(r) {
     const e = this[__private__dont__use].FS, t = this.listFiles("/").map((c) => `/${c}`), s = this[__private__dont__use].spawnProcess, n = e.cwd();
     e.chdir("/");
-    const o = Object.entries(p(this, X)).map(
+    const o = Object.entries(p(this, J)).map(
       ([c, l]) => ({
         mountHandler: l.mountHandler,
         mountPointSnapshot: snapshotMountPoint(e, c),
         vfsPath: c
       })
     ), i = Object.values(
-      p(this, X)
+      p(this, J)
     ).reverse();
     for (const c of i)
       await c.unmount();
@@ -1810,7 +1810,7 @@ class PHP {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(r), s && (this[__private__dont__use].spawnProcess = s), p(this, J) && this.setSapiName(p(this, J));
+    this.initializeRuntime(r), s && (this[__private__dont__use].spawnProcess = s), p(this, Y) && this.setSapiName(p(this, Y));
     const a = this[__private__dont__use].FS;
     for (const c of t)
       c && c !== "/request" && copyMEMFSNodes(e, a, c);
@@ -1863,11 +1863,11 @@ class PHP {
         try {
           await t();
         } finally {
-          delete p(this, X)[r];
+          delete p(this, J)[r];
         }
       }
     };
-    return p(this, X)[r] = s, () => s.unmount();
+    return p(this, J)[r] = s, () => s.unmount();
   }
   /**
    * Starts a PHP CLI session with given arguments.
@@ -1991,7 +1991,7 @@ class PHP {
     this.exit(0);
   }
 }
-J = new WeakMap(), V = new WeakMap(), z = new WeakMap(), D = new WeakMap(), G = new WeakMap(), X = new WeakMap(), k = new WeakMap(), g = new WeakSet(), /**
+Y = new WeakMap(), V = new WeakMap(), z = new WeakMap(), D = new WeakMap(), G = new WeakMap(), J = new WeakMap(), k = new WeakMap(), g = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -2326,6 +2326,34 @@ Caused by:
   process.stderr.write(`
 `);
 }
+function describeError(r, e = /* @__PURE__ */ new WeakSet(), t = 0, s = {}) {
+  return t > 10 ? "[Max error cause depth exceeded]" : r instanceof Error ? r.message ? r.message : describeErrorObject(r, e, t, {
+    ...s,
+    suppressGenericErrorName: !0
+  }) : r && typeof r == "object" ? describeErrorObject(r, e, t, s) : String(r);
+}
+function describeErrorObject(r, e, t, s = {}) {
+  if (e.has(r))
+    return "[Circular error cause]";
+  e.add(r);
+  const n = [];
+  if (r.name && !(s.suppressGenericErrorName && r.name === "Error") && n.push(String(r.name)), r.message && n.push(String(r.message)), r.errno !== void 0 && n.push(`errno: ${r.errno}`), r.code !== void 0 && n.push(`code: ${r.code}`), r.cause && n.push(
+    `caused by: ${describeError(
+      r.cause,
+      e,
+      t + 1,
+      s
+    )}`
+  ), n.length > 0)
+    return n.join(" — ");
+  if (typeof r.stack == "string")
+    return r.stack;
+  try {
+    return JSON.stringify(r);
+  } catch {
+    return String(r);
+  }
+}
 function printResponseDebugDetails(r) {
   process.stderr.write(
     `
@@ -2704,7 +2732,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var A, Q, re, Y, K, I, Z, $, se, b, Re, oe, be, He, Te;
+var A, Q, re, X, K, I, Z, $, se, R, be, oe, Re, He, Te;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2718,11 +2746,11 @@ class PHPRequestHandler {
    * @param  config - Request Handler configuration.
    */
   constructor(e) {
-    E(this, b);
+    E(this, R);
     E(this, A);
     E(this, Q);
     E(this, re);
-    E(this, Y);
+    E(this, X);
     E(this, K);
     E(this, I);
     E(this, Z);
@@ -2758,11 +2786,11 @@ class PHPRequestHandler {
       );
     x(this, $, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), x(this, A, t);
     const c = new URL(s);
-    x(this, re, c.hostname), x(this, Y, c.port ? Number(c.port) : c.protocol === "https:" ? 443 : 80), x(this, Q, (c.protocol || "").replace(":", ""));
-    const l = p(this, Y) !== 443 && p(this, Y) !== 80;
+    x(this, re, c.hostname), x(this, X, c.port ? Number(c.port) : c.protocol === "https:" ? 443 : 80), x(this, Q, (c.protocol || "").replace(":", ""));
+    const l = p(this, X) !== 443 && p(this, X) !== 80;
     x(this, K, [
       p(this, re),
-      l ? `:${p(this, Y)}` : ""
+      l ? `:${p(this, X)}` : ""
     ].join("")), x(this, I, c.pathname.replace(/\/+$/, "")), x(this, Z, [
       `${p(this, Q)}://`,
       p(this, K),
@@ -2880,7 +2908,7 @@ class PHPRequestHandler {
       // Remove the hash part of the URL as it's not meant for the server.
       e.url.split("#")[0],
       t ? void 0 : DEFAULT_BASE_URL
-    ), n = _(this, b, Re).call(this, s), o = await this.getPrimaryPhp(), i = removePathPrefix(
+    ), n = _(this, R, be).call(this, s), o = await this.getPrimaryPhp(), i = removePathPrefix(
       /**
        * URL.pathname returns a URL-encoded path. We need to decode it
        * before using it as a filesystem path.
@@ -2888,7 +2916,7 @@ class PHPRequestHandler {
       decodeURIComponent(n.pathname),
       p(this, I)
     );
-    let a = _(this, b, oe).call(this, i);
+    let a = _(this, R, oe).call(this, i);
     if (o.isDir(a)) {
       if (!i.endsWith("/"))
         return StreamedPHPResponse.fromPHPResponse(
@@ -2913,10 +2941,10 @@ class PHPRequestHandler {
       let c = i;
       for (; c.startsWith("/") && c !== dirname(c); ) {
         c = dirname(c);
-        const l = _(this, b, oe).call(this, c);
+        const l = _(this, R, oe).call(this, c);
         if (o.isFile(l) && // Only run partial path resolution for PHP files.
         l.endsWith(".php")) {
-          a = _(this, b, oe).call(this, c);
+          a = _(this, R, oe).call(this, c);
           break;
         }
       }
@@ -2941,8 +2969,8 @@ class PHPRequestHandler {
           );
       }
     }
-    return o.isFile(a) ? a.endsWith(".php") ? await _(this, b, He).call(this, e, s, n, a) : StreamedPHPResponse.fromPHPResponse(
-      _(this, b, be).call(this, o, a)
+    return o.isFile(a) ? a.endsWith(".php") ? await _(this, R, He).call(this, e, s, n, a) : StreamedPHPResponse.fromPHPResponse(
+      _(this, R, Re).call(this, o, a)
     ) : StreamedPHPResponse.forHttpCode(404);
   }
   /**
@@ -3052,13 +3080,13 @@ class PHPRequestHandler {
     await this.instanceManager[Symbol.asyncDispose]();
   }
 }
-A = new WeakMap(), Q = new WeakMap(), re = new WeakMap(), Y = new WeakMap(), K = new WeakMap(), I = new WeakMap(), Z = new WeakMap(), $ = new WeakMap(), se = new WeakMap(), b = new WeakSet(), /**
+A = new WeakMap(), Q = new WeakMap(), re = new WeakMap(), X = new WeakMap(), K = new WeakMap(), I = new WeakMap(), Z = new WeakMap(), $ = new WeakMap(), se = new WeakMap(), R = new WeakSet(), /**
  * Apply the rewrite rules to the original request URL.
  *
  * @param originalRequestUrl - The original request URL.
  * @returns The rewritten request URL.
  */
-Re = function(e) {
+be = function(e) {
   const t = removePathPrefix(
     decodeURIComponent(e.pathname),
     p(this, I)
@@ -3094,7 +3122,7 @@ oe = function(e) {
  * @param  fsPath - Absolute path of the static file to serve.
  * @returns The response.
  */
-be = function(e, t) {
+Re = function(e, t) {
   const s = e.readFileAsBuffer(t);
   return new PHPResponse(
     200,
@@ -3118,7 +3146,7 @@ be = function(e, t) {
   }
   let i;
   try {
-    i = await _(this, b, Te).call(this, o.php, e, t, s, n);
+    i = await _(this, R, Te).call(this, o.php, e, t, s, n);
   } catch (a) {
     throw o.reap(), a;
   }
@@ -3391,7 +3419,7 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
             if (a) {
               if (r.mode !== void 0) {
                 let f = r.mode;
-                const R = i;
+                const b = i;
                 if (typeof f != "string")
                   return validate11.errors = [
                     {
@@ -3414,7 +3442,7 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                       message: "must be equal to constant"
                     }
                   ], !1;
-                var a = R === i;
+                var a = b === i;
               } else
                 var a = !0;
               if (a) {
@@ -3434,15 +3462,15 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                 if (a) {
                   if (r.iniEntries !== void 0) {
                     let f = r.iniEntries;
-                    const R = i;
-                    if (i === R)
+                    const b = i;
+                    if (i === b)
                       if (f && typeof f == "object" && !Array.isArray(f))
-                        for (const U in f) {
+                        for (const j in f) {
                           const m = i;
-                          if (typeof f[U] != "string")
+                          if (typeof f[j] != "string")
                             return validate11.errors = [
                               {
-                                instancePath: e + "/iniEntries/" + U.replace(
+                                instancePath: e + "/iniEntries/" + j.replace(
                                   /~/g,
                                   "~0"
                                 ).replace(
@@ -3473,21 +3501,21 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                             message: "must be object"
                           }
                         ], !1;
-                    var a = R === i;
+                    var a = b === i;
                   } else
                     var a = !0;
                   if (a) {
                     if (r.env !== void 0) {
                       let f = r.env;
-                      const R = i;
-                      if (i === R)
+                      const b = i;
+                      if (i === b)
                         if (f && typeof f == "object" && !Array.isArray(f))
-                          for (const U in f) {
+                          for (const j in f) {
                             const m = i;
-                            if (typeof f[U] != "string")
+                            if (typeof f[j] != "string")
                               return validate11.errors = [
                                 {
-                                  instancePath: e + "/env/" + U.replace(
+                                  instancePath: e + "/env/" + j.replace(
                                     /~/g,
                                     "~0"
                                   ).replace(
@@ -3518,7 +3546,7 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                               message: "must be object"
                             }
                           ], !1;
-                      var a = R === i;
+                      var a = b === i;
                     } else
                       var a = !0;
                     if (a) {
@@ -3542,12 +3570,12 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                       if (a) {
                         if (r.artifacts !== void 0) {
                           let f = r.artifacts;
-                          const R = i;
-                          if (i === R)
+                          const b = i;
+                          if (i === b)
                             if (Array.isArray(f)) {
                               var d = !0;
-                              const U = f.length;
-                              for (let m = 0; m < U; m++) {
+                              const j = f.length;
+                              for (let m = 0; m < j; m++) {
                                 let w = f[m];
                                 const W = i;
                                 if (i === W)
@@ -3851,13 +3879,13 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                   message: "must be array"
                                 }
                               ], !1;
-                          var a = R === i;
+                          var a = b === i;
                         } else
                           var a = !0;
                         if (a)
                           if (r.extraFiles !== void 0) {
                             let f = r.extraFiles;
-                            const R = i;
+                            const b = i;
                             if (i === i)
                               if (f && typeof f == "object" && !Array.isArray(
                                 f
@@ -4053,7 +4081,7 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                     message: "must be object"
                                   }
                                 ], !1;
-                            var a = R === i;
+                            var a = b === i;
                           } else
                             var a = !0;
                       }
@@ -4135,7 +4163,7 @@ async function resolvePHPExtension(r) {
         `No extension artifact found for PHP ${r.phpVersion}.`
       );
     s ?? (s = O.name), a = O.loadWithIniDirective, c = O.iniEntries, l = O.env, d = O.extensionDir;
-    const R = new Semaphore({
+    const b = new Semaphore({
       concurrency: MAX_EXTENSION_SIDECAR_FILE_REQUESTS
     }), ce = [];
     for (const m of [O.extraFiles, f.extraFiles])
@@ -4148,16 +4176,16 @@ async function resolvePHPExtension(r) {
         if (!w.sourcePath) continue;
         const Me = new URL(w.sourcePath, M);
         ce.push(
-          R.run(() => fetchBytes(e, Me)).then((q) => {
+          b.run(() => fetchBytes(e, Me)).then((q) => {
             o[W] = q;
           })
         );
       }
-    const [U] = await Promise.all([
+    const [j] = await Promise.all([
       fetchBytes(e, new URL(f.sourcePath, M)),
       ...ce
     ]);
-    n = U;
+    n = j;
   }
   const u = normalizePath(
     r.extensionDir ?? d ?? PHP_EXTENSIONS_DIR
@@ -6013,6 +6041,7 @@ export {
   consumeAPISync,
   createLegacyPhpIniPreRunStep,
   createObjectPoolProxy,
+  describeError,
   ensurePathPrefix,
   exposeAPI,
   exposeSyncAPI,