@php-wasm/universal 3.1.39 → 3.1.40

package/index.js

@@ -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, F, g, Pe, we, _e, ve, Ee, xe, Se, Fe, fe, ke, he, me;
+var J, V, z, D, G, X, k, g, Pe, we, _e, ve, Ee, xe, Se, ke, fe, Fe, he, me;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1089,7 +1089,7 @@ class PHP {
     ]));
     E(this, G, []);
     E(this, X, {});
-    E(this, F, {
+    E(this, k, {
       enabled: !1,
       recreateRuntime: () => 0,
       needsRotating: !1,
@@ -1097,7 +1097,7 @@ class PHP {
       requestsMade: 0
     });
     this.semaphore = new Semaphore({ concurrency: 1 }), r !== void 0 && this.initializeRuntime(r), this.addEventListener("request.error", (e) => {
-      e.source === "php-wasm" && (p(this, F).needsRotating = !0);
+      e.source === "php-wasm" && (p(this, k).needsRotating = !0);
     });
   }
   /**
@@ -1519,7 +1519,7 @@ class PHP {
         );
       _(this, g, we).call(this, r.relativeUri || ""), _(this, g, xe).call(this, r.method || "GET");
       const o = normalizeHeaders(r.headers || {}), i = o.host || "example.com:443", a = _(this, g, Ee).call(this, i, r.protocol || "http");
-      if (_(this, g, _e).call(this, i), _(this, g, ve).call(this, a), _(this, g, Se).call(this, o), r.body && (t = _(this, g, Fe).call(this, r.body)), typeof r.code == "string")
+      if (_(this, g, _e).call(this, i), _(this, g, ve).call(this, a), _(this, g, Se).call(this, o), r.body && (t = _(this, g, ke).call(this, r.body)), typeof r.code == "string")
         this.writeFile("/internal/eval.php", r.code), _(this, g, fe).call(this, "/internal/eval.php");
       else if (typeof r.scriptPath == "string")
         _(this, g, fe).call(this, r.scriptPath || "");
@@ -1529,7 +1529,7 @@ class PHP {
         );
       const c = _(this, g, Pe).call(this, r.$_SERVER, o, a);
       for (const d in c)
-        _(this, g, ke).call(this, d, c[d]);
+        _(this, g, Fe).call(this, d, c[d]);
       const l = r.env || {};
       for (const d in l)
         _(this, g, he).call(this, d, l[d]);
@@ -1770,21 +1770,21 @@ class PHP {
    * or an internal crash.
    */
   enableRuntimeRotation(r) {
-    x(this, F, {
-      ...p(this, F),
+    x(this, k, {
+      ...p(this, k),
       enabled: !0,
       recreateRuntime: r.recreateRuntime,
       maxRequests: r.maxRequests ?? 400
     });
   }
   async rotateRuntime() {
-    if (!p(this, F).enabled)
+    if (!p(this, k).enabled)
       throw new Error(
         "Runtime rotation is not enabled. Call enableRuntimeRotation() first."
       );
     await this.hotSwapPHPRuntime(
-      await p(this, F).recreateRuntime()
-    ), p(this, F).requestsMade = 0, p(this, F).needsRotating = !1;
+      await p(this, k).recreateRuntime()
+    ), p(this, k).requestsMade = 0, p(this, k).needsRotating = !1;
   }
   /**
    * Hot-swaps the PHP runtime for a new one without
@@ -1798,6 +1798,7 @@ class PHP {
     const o = Object.entries(p(this, X)).map(
       ([c, l]) => ({
         mountHandler: l.mountHandler,
+        mountPointSnapshot: snapshotMountPoint(e, c),
         vfsPath: c
       })
     ), i = Object.values(
@@ -1813,8 +1814,26 @@ class PHP {
     const a = this[__private__dont__use].FS;
     for (const c of t)
       c && c !== "/request" && copyMEMFSNodes(e, a, c);
-    for (const { mountHandler: c, vfsPath: l } of o)
-      this.mkdir(l), await this.mount(l, c);
+    for (const {
+      mountHandler: c,
+      mountPointSnapshot: l,
+      vfsPath: d
+    } of o)
+      try {
+        await this.mount(d, c);
+      } catch (u) {
+        if (isMissingMountSourceError(u)) {
+          restoreMountPointSnapshot(
+            a,
+            d,
+            l
+          );
+          continue;
+        }
+        if (!isMissingMountTargetPathError(u))
+          throw u;
+        this.mkdir(d), await this.mount(d, c);
+      }
     try {
       a.chdir(n);
     } catch (c) {
@@ -1866,7 +1885,7 @@ class PHP {
   async cli(r, e = {}) {
     if (basename(r[0] ?? "") !== "php")
       return this.subProcess(r, e);
-    p(this, V) && (p(this, F).needsRotating = !0);
+    p(this, V) && (p(this, k).needsRotating = !0);
     const t = await this.semaphore.acquire();
     return await _(this, g, me).call(this, () => {
       const s = e.env || {};
@@ -1884,7 +1903,7 @@ class PHP {
         async: !0
       });
     }).then((s) => (s.exitCode.finally(t), s)).finally(() => {
-      p(this, F).needsRotating = !0;
+      p(this, k).needsRotating = !0;
     });
   }
   /**
@@ -1972,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(), F = new WeakMap(), g = new WeakSet(), /**
+J = new WeakMap(), V = new WeakMap(), z = new WeakMap(), D = new WeakMap(), G = new WeakMap(), X = new WeakMap(), k = new WeakMap(), g = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -2050,7 +2069,7 @@ Pe = function(r, e, t) {
     [NUMBER],
     [parseInt(r["content-length"], 10)]
   );
-}, Fe = function(r) {
+}, ke = function(r) {
   let e, t;
   typeof r == "string" ? (logger.warn(
     "Passing a string as the request body is deprecated. Please use a Uint8Array instead. See https://github.com/WordPress/wordpress-playground/issues/997 for more details"
@@ -2080,7 +2099,7 @@ Pe = function(r, e, t) {
     [STRING],
     [r]
   );
-}, ke = function(r, e) {
+}, Fe = function(r, e) {
   this[__private__dont__use].ccall(
     "wasm_add_SERVER_entry",
     null,
@@ -2095,7 +2114,7 @@ Pe = function(r, e, t) {
     [r, e]
   );
 }, me = async function(r) {
-  p(this, F).enabled && p(this, F).needsRotating && await this.rotateRuntime(), ++p(this, F).requestsMade, p(this, F).requestsMade >= p(this, F).maxRequests && (p(this, F).needsRotating = !0);
+  p(this, k).enabled && p(this, k).needsRotating && await this.rotateRuntime(), ++p(this, k).requestsMade, p(this, k).requestsMade >= p(this, k).maxRequests && (p(this, k).needsRotating = !0);
   const e = this[__private__dont__use], t = await createInvertedReadableStream();
   e.onHeaders = (u) => {
     a || s || t.controller.enqueue(u.slice());
@@ -2194,6 +2213,29 @@ function copyMEMFSNodes(r, e, t) {
   for (const o of n)
     copyMEMFSNodes(r, e, joinPaths(t, o));
 }
+function snapshotMountPoint(r, e) {
+  try {
+    const t = r.lookupPath(e, { follow: !1 });
+    return r.isLink(t.node.mode) ? { kind: "symlink", target: r.readlink(e) } : r.isDir(t.node.mode) ? { kind: "directory" } : { kind: "file" };
+  } catch {
+    return;
+  }
+}
+function restoreMountPointSnapshot(r, e, t) {
+  if (!(!t || getNodeType(r, e) !== "missing")) {
+    if (t.kind === "directory") {
+      r.mkdirTree(e);
+      return;
+    }
+    r.mkdirTree(dirname(e)), t.kind === "symlink" ? r.symlink(t.target, e) : r.writeFile(e, new Uint8Array());
+  }
+}
+function isMissingMountSourceError(r) {
+  return r.phpWasmMountSourceMissing === !0;
+}
+function isMissingMountTargetPathError(r) {
+  return r.errno === 44;
+}
 async function createInvertedReadableStream(r = {}) {
   let e;
   const t = new Promise(
@@ -2662,7 +2704,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var A, Q, re, Y, K, M, Z, $, se, b, Re, oe, be, He, Te;
+var A, Q, re, Y, K, I, Z, $, se, b, Re, oe, be, He, Te;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2682,7 +2724,7 @@ class PHPRequestHandler {
     E(this, re);
     E(this, Y);
     E(this, K);
-    E(this, M);
+    E(this, I);
     E(this, Z);
     E(this, $);
     E(this, se);
@@ -2721,10 +2763,10 @@ class PHPRequestHandler {
     x(this, K, [
       p(this, re),
       l ? `:${p(this, Y)}` : ""
-    ].join("")), x(this, M, c.pathname.replace(/\/+$/, "")), x(this, Z, [
+    ].join("")), x(this, I, c.pathname.replace(/\/+$/, "")), x(this, Z, [
       `${p(this, Q)}://`,
       p(this, K),
-      p(this, M)
+      p(this, I)
     ].join("")), this.rewriteRules = n, x(this, se, o), this.getFileNotFoundAction = i;
   }
   async getPrimaryPhp() {
@@ -2749,7 +2791,7 @@ class PHPRequestHandler {
    */
   internalUrlToPath(e) {
     const t = new URL(e, "https://playground.internal");
-    return t.pathname.startsWith(p(this, M)) && (t.pathname = t.pathname.slice(p(this, M).length)), toRelativeUrl(t);
+    return t.pathname.startsWith(p(this, I)) && (t.pathname = t.pathname.slice(p(this, I).length)), toRelativeUrl(t);
   }
   /**
    * The absolute URL of this PHPRequestHandler instance.
@@ -2844,7 +2886,7 @@ class PHPRequestHandler {
        * before using it as a filesystem path.
        */
       decodeURIComponent(n.pathname),
-      p(this, M)
+      p(this, I)
     );
     let a = _(this, b, oe).call(this, i);
     if (o.isDir(a)) {
@@ -3010,7 +3052,7 @@ class PHPRequestHandler {
     await this.instanceManager[Symbol.asyncDispose]();
   }
 }
-A = new WeakMap(), Q = new WeakMap(), re = new WeakMap(), Y = new WeakMap(), K = new WeakMap(), M = new WeakMap(), Z = new WeakMap(), $ = new WeakMap(), se = new WeakMap(), b = new WeakSet(), /**
+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(), /**
  * Apply the rewrite rules to the original request URL.
  *
  * @param originalRequestUrl - The original request URL.
@@ -3019,12 +3061,12 @@ A = new WeakMap(), Q = new WeakMap(), re = new WeakMap(), Y = new WeakMap(), K =
 Re = function(e) {
   const t = removePathPrefix(
     decodeURIComponent(e.pathname),
-    p(this, M)
+    p(this, I)
   ), s = applyRewriteRules(
     t,
     this.rewriteRules
   ), n = new URL(
-    joinPaths(p(this, M), s),
+    joinPaths(p(this, I), s),
     e.toString()
   );
   for (const [o, i] of e.searchParams.entries())
@@ -3099,7 +3141,7 @@ be = function(e, t) {
   const l = await e.runStream({
     relativeUri: ensurePathPrefix(
       toRelativeUrl(new URL(n.toString())),
-      p(this, M)
+      p(this, I)
     ),
     protocol: p(this, Q),
     method: t.method || i,
@@ -3290,15 +3332,15 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
   let o = null, i = 0;
   if (i === 0)
     if (r && typeof r == "object" && !Array.isArray(r)) {
-      let L;
-      if (r.name === void 0 && (L = "name") || r.artifacts === void 0 && (L = "artifacts"))
+      let M;
+      if (r.name === void 0 && (M = "name") || r.artifacts === void 0 && (M = "artifacts"))
         return validate11.errors = [
           {
             instancePath: e,
             schemaPath: "#/required",
             keyword: "required",
-            params: { missingProperty: L },
-            message: "must have required property '" + L + "'"
+            params: { missingProperty: M },
+            message: "must have required property '" + M + "'"
           }
         ], !1;
       {
@@ -3507,22 +3549,22 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                               const U = f.length;
                               for (let m = 0; m < U; m++) {
                                 let w = f[m];
-                                const q = i;
-                                if (i === q)
+                                const W = i;
+                                if (i === W)
                                   if (w && typeof w == "object" && !Array.isArray(
                                     w
                                   )) {
-                                    let W;
-                                    if (w.phpVersion === void 0 && (W = "phpVersion") || w.sourcePath === void 0 && (W = "sourcePath"))
+                                    let q;
+                                    if (w.phpVersion === void 0 && (q = "phpVersion") || w.sourcePath === void 0 && (q = "sourcePath"))
                                       return validate11.errors = [
                                         {
                                           instancePath: e + "/artifacts/" + m,
                                           schemaPath: "#/properties/artifacts/items/required",
                                           keyword: "required",
                                           params: {
-                                            missingProperty: W
+                                            missingProperty: q
                                           },
-                                          message: "must have required property '" + W + "'"
+                                          message: "must have required property '" + q + "'"
                                         }
                                       ], !1;
                                     {
@@ -3625,16 +3667,16 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                             v
                                                           )) {
                                                             var P = !0;
-                                                            const Ie = v.length;
-                                                            for (let C = 0; C < Ie; C++) {
-                                                              let I = v[C];
+                                                            const Le = v.length;
+                                                            for (let C = 0; C < Le; C++) {
+                                                              let L = v[C];
                                                               const ye = i;
                                                               if (i === ye)
-                                                                if (I && typeof I == "object" && !Array.isArray(
-                                                                  I
+                                                                if (L && typeof L == "object" && !Array.isArray(
+                                                                  L
                                                                 )) {
                                                                   let ue;
-                                                                  if (I.vfsPath === void 0 && (ue = "vfsPath"))
+                                                                  if (L.vfsPath === void 0 && (ue = "vfsPath"))
                                                                     return validate11.errors = [
                                                                       {
                                                                         instancePath: e + "/artifacts/" + m + "/extraFiles/nodes/" + C,
@@ -3647,8 +3689,8 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                                       }
                                                                     ], !1;
                                                                   {
-                                                                    const Me = i;
-                                                                    for (const T in I)
+                                                                    const Ie = i;
+                                                                    for (const T in L)
                                                                       if (!(T === "vfsPath" || T === "type" || T === "sourcePath"))
                                                                         return validate11.errors = [
                                                                           {
@@ -3661,10 +3703,10 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                                             message: "must NOT have additional properties"
                                                                           }
                                                                         ], !1;
-                                                                    if (Me === i) {
-                                                                      if (I.vfsPath !== void 0) {
+                                                                    if (Ie === i) {
+                                                                      if (L.vfsPath !== void 0) {
                                                                         const T = i;
-                                                                        if (typeof I.vfsPath != "string")
+                                                                        if (typeof L.vfsPath != "string")
                                                                           return validate11.errors = [
                                                                             {
                                                                               instancePath: e + "/artifacts/" + m + "/extraFiles/nodes/" + C + "/vfsPath",
@@ -3680,8 +3722,8 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                                       } else
                                                                         var S = !0;
                                                                       if (S) {
-                                                                        if (I.type !== void 0) {
-                                                                          let T = I.type;
+                                                                        if (L.type !== void 0) {
+                                                                          let T = L.type;
                                                                           const Ce = i;
                                                                           if (typeof T != "string")
                                                                             return validate11.errors = [
@@ -3711,9 +3753,9 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                                         } else
                                                                           var S = !0;
                                                                         if (S)
-                                                                          if (I.sourcePath !== void 0) {
+                                                                          if (L.sourcePath !== void 0) {
                                                                             const T = i;
-                                                                            if (typeof I.sourcePath != "string")
+                                                                            if (typeof L.sourcePath != "string")
                                                                               return validate11.errors = [
                                                                                 {
                                                                                   instancePath: e + "/artifacts/" + m + "/extraFiles/nodes/" + C + "/sourcePath",
@@ -3793,7 +3835,7 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                         message: "must be object"
                                       }
                                     ], !1;
-                                var d = q === i;
+                                var d = W === i;
                                 if (!d)
                                   break;
                               }
@@ -3855,14 +3897,14 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                   if (N)
                                     if (f.nodes !== void 0) {
                                       let w = f.nodes;
-                                      const q = i;
-                                      if (i === q)
+                                      const W = i;
+                                      if (i === W)
                                         if (Array.isArray(
                                           w
                                         )) {
                                           var B = !0;
-                                          const W = w.length;
-                                          for (let H = 0; H < W; H++) {
+                                          const q = w.length;
+                                          for (let H = 0; H < q; H++) {
                                             let y = w[H];
                                             const ne = i;
                                             if (i === ne)
@@ -3912,10 +3954,10 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                             message: "must be string"
                                                           }
                                                         ], !1;
-                                                      var k = v === i;
+                                                      var F = v === i;
                                                     } else
-                                                      var k = !0;
-                                                    if (k) {
+                                                      var F = !0;
+                                                    if (F) {
                                                       if (y.type !== void 0) {
                                                         let v = y.type;
                                                         const ie = i;
@@ -3943,10 +3985,10 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                               message: "must be equal to one of the allowed values"
                                                             }
                                                           ], !1;
-                                                        var k = ie === i;
+                                                        var F = ie === i;
                                                       } else
-                                                        var k = !0;
-                                                      if (k)
+                                                        var F = !0;
+                                                      if (F)
                                                         if (y.sourcePath !== void 0) {
                                                           const v = i;
                                                           if (typeof y.sourcePath != "string")
@@ -3961,9 +4003,9 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                                                 message: "must be string"
                                                               }
                                                             ], !1;
-                                                          var k = v === i;
+                                                          var F = v === i;
                                                         } else
-                                                          var k = !0;
+                                                          var F = !0;
                                                     }
                                                   }
                                                 }
@@ -3995,7 +4037,7 @@ function validate11(r, { instancePath: e = "", parentData: t, parentDataProperty
                                               message: "must be array"
                                             }
                                           ], !1;
-                                      var N = q === i;
+                                      var N = W === i;
                                     } else
                                       var N = !0;
                                 }
@@ -4057,9 +4099,9 @@ async function resolvePHPExtension(r) {
       );
     n = toUint8Array(t.bytes);
   } else if (t.format === "url") {
-    let k;
+    let F;
     try {
-      k = new URL(String(t.url));
+      F = new URL(String(t.url));
     } catch {
       throw new Error(
         `source.url must be an absolute URL when loading a PHP extension from a direct URL. Received: ${String(
@@ -4067,21 +4109,21 @@ async function resolvePHPExtension(r) {
         )}`
       );
     }
-    if (s || (s = t.name), !s && k.pathname.endsWith(".so") && (s = basename(k.pathname).slice(0, -3)), !s)
+    if (s || (s = t.name), !s && F.pathname.endsWith(".so") && (s = basename(F.pathname).slice(0, -3)), !s)
       throw new Error(
         "name is required when loading an extension from a direct URL."
       );
-    n = await fetchBytes(e, k);
+    n = await fetchBytes(e, F);
   } else {
-    let k, L;
-    if ("manifest" in t ? (k = t.manifest, t.baseUrl && (L = new URL(String(t.baseUrl)))) : (L = new URL(String(t.manifestUrl)), k = await (await e(L)).json()), !validate10(k))
+    let F, M;
+    if ("manifest" in t ? (F = t.manifest, t.baseUrl && (M = new URL(String(t.baseUrl)))) : (M = new URL(String(t.manifestUrl)), F = await (await e(M)).json()), !validate10(F))
       throw new Error(
         `Invalid PHP extension manifest: ${JSON.stringify(
           validate10.errors
         )}`
       );
-    const O = k;
-    if (!L)
+    const O = F;
+    if (!M)
       throw new Error(
         "Manifest artifacts require a manifest URL or baseUrl so relative files can be resolved."
       );
@@ -4098,21 +4140,21 @@ async function resolvePHPExtension(r) {
     }), ce = [];
     for (const m of [O.extraFiles, f.extraFiles])
       for (const w of (m == null ? void 0 : m.nodes) ?? []) {
-        const q = joinPaths(m.vfsRoot ?? "", w.vfsPath);
+        const W = joinPaths(m.vfsRoot ?? "", w.vfsPath);
         if (w.type === "directory") {
-          i.push(q);
+          i.push(W);
           continue;
         }
         if (!w.sourcePath) continue;
-        const Le = new URL(w.sourcePath, L);
+        const Me = new URL(w.sourcePath, M);
         ce.push(
-          R.run(() => fetchBytes(e, Le)).then((W) => {
-            o[q] = W;
+          R.run(() => fetchBytes(e, Me)).then((q) => {
+            o[W] = q;
           })
         );
       }
     const [U] = await Promise.all([
-      fetchBytes(e, new URL(f.sourcePath, L)),
+      fetchBytes(e, new URL(f.sourcePath, M)),
       ...ce
     ]);
     n = U;