@wp-playground/cli 3.0.12 → 3.0.14

package/{run-cli-BRWTcRHa.js → run-cli-C0WqHEVM.js}

@@ -1,8 +1,8 @@
-import { logger as p, LogSeverity as E, errorLogPath as A } from "@php-wasm/logger";
-import { PHPResponse as $, consumeAPI as R, SupportedPHPVersions as X, printDebugDetails as Y, exposeAPI as G, exposeSyncAPI as K } from "@php-wasm/universal";
+import { logger as p, LogSeverity as I, errorLogPath as A } from "@php-wasm/logger";
+import { PHPResponse as E, consumeAPI as R, SupportedPHPVersions as X, printDebugDetails as Y, exposeAPI as G, exposeSyncAPI as K } from "@php-wasm/universal";
 import { resolveRemoteBlueprint as ee, resolveRuntimeConfiguration as te, compileBlueprintV1 as re, isBlueprintBundle as oe, runBlueprintV1Steps as ie } from "@wp-playground/blueprints";
 import { zipDirectory as se, RecommendedPHPVersion as _ } from "@wp-playground/common";
-import d, { mkdirSync as D } from "fs";
+import c, { mkdirSync as D } from "fs";
 import { Worker as H, MessageChannel as ne } from "worker_threads";
 import { p as V, a as ae, e as le } from "./mounts-D1_eXSTw.js";
 import pe from "express";
@@ -10,7 +10,7 @@ import { FileLockManagerForNode as ue } from "@php-wasm/node";
 import q, { cpus as de } from "os";
 import { jspi as ce } from "wasm-feature-detect";
 import fe from "yargs";
-import c, { basename as he } from "path";
+import f, { basename as he } from "path";
 import { NodeJsFilesystem as me, OverlayFilesystem as we, InMemoryFilesystem as ye, ZipFilesystem as be } from "@wp-playground/storage";
 import { EmscriptenDownloadMonitor as ge, ProgressTracker as Pe } from "@php-wasm/progress";
 import { resolveWordPressRelease as ve } from "@wp-playground/wordpress";
@@ -30,12 +30,12 @@ async function Le(e) {
     try {
       l = await e.handleRequest({
         url: i.url,
-        headers: Be(i),
+        headers: $e(i),
         method: i.method,
         body: await Re(i)
       });
     } catch (a) {
-      p.error(a), l = $.forHttpCode(500);
+      p.error(a), l = E.forHttpCode(500);
     }
     n.statusCode = l.httpStatusCode;
     for (const a in l.headers)
@@ -52,14 +52,14 @@ const Re = async (e) => await new Promise((r) => {
   }), e.on("end", () => {
     r(new Uint8Array(Buffer.concat(t)));
   });
-}), Be = (e) => {
+}), $e = (e) => {
   const r = {};
   if (e.rawHeaders && e.rawHeaders.length)
     for (let t = 0; t < e.rawHeaders.length; t += 2)
       r[e.rawHeaders[t].toLowerCase()] = e.rawHeaders[t + 1];
   return r;
 };
-class Ie {
+class Be {
   constructor(r) {
     this.workerLoads = [], this.addWorker(r);
   }
@@ -84,7 +84,7 @@ class Ie {
 function Me(e) {
   return /^latest$|^trunk$|^nightly$|^(?:(\d+)\.(\d+)(?:\.(\d+))?)((?:-beta(?:\d+)?)|(?:-RC(?:\d+)?))?$/.test(e);
 }
-async function Ee({
+async function Ie({
   sourceString: e,
   blueprintMayReadAdjacentFiles: r
 }) {
@@ -92,22 +92,22 @@ async function Ee({
     return;
   if (e.startsWith("http://") || e.startsWith("https://"))
     return await ee(e);
-  let t = c.resolve(process.cwd(), e);
-  if (!d.existsSync(t))
+  let t = f.resolve(process.cwd(), e);
+  if (!c.existsSync(t))
     throw new Error(`Blueprint file does not exist: ${t}`);
-  const s = d.statSync(t);
-  if (s.isDirectory() && (t = c.join(t, "blueprint.json")), !s.isFile() && s.isSymbolicLink())
+  const s = c.statSync(t);
+  if (s.isDirectory() && (t = f.join(t, "blueprint.json")), !s.isFile() && s.isSymbolicLink())
     throw new Error(
       `Blueprint path is neither a file nor a directory: ${t}`
     );
-  const o = c.extname(t);
+  const o = f.extname(t);
   switch (o) {
     case ".zip":
       return be.fromArrayBuffer(
-        d.readFileSync(t).buffer
+        c.readFileSync(t).buffer
       );
     case ".json": {
-      const i = d.readFileSync(t, "utf-8");
+      const i = c.readFileSync(t, "utf-8");
       try {
         JSON.parse(i);
       } catch {
@@ -115,7 +115,7 @@ async function Ee({
           `Blueprint file at ${t} is not a valid JSON file`
         );
       }
-      const n = c.dirname(t), l = new me(n);
+      const n = f.dirname(t), l = new me(n);
       return new we([
         new ye({
           "blueprint.json": i
@@ -143,7 +143,7 @@ You can allow this Blueprint to read files from the same parent directory by exp
       );
   }
 }
-class $e {
+class Ee {
   constructor(r, t) {
     this.lastProgressMessage = "", this.args = r, this.siteUrl = t.siteUrl, this.processIdSpaceLength = t.processIdSpaceLength, this.phpVersion = r.php;
   }
@@ -192,7 +192,7 @@ class $e {
 `));
   }
 }
-const T = c.join(q.homedir(), ".wordpress-playground");
+const T = f.join(q.homedir(), ".wordpress-playground");
 async function Te(e) {
   return await z(
     "https://github.com/WordPress/sqlite-database-integration/archive/refs/heads/develop.zip",
@@ -201,7 +201,7 @@ async function Te(e) {
   );
 }
 async function z(e, r, t) {
-  const s = c.join(T, r);
+  const s = f.join(T, r);
   return S.existsSync(s) || (S.ensureDirSync(T), await Fe(e, s, t)), O(s);
 }
 async function Fe(e, r, t) {
@@ -214,8 +214,8 @@ async function Fe(e, r, t) {
   n.close(), n.closed || await new Promise((l, a) => {
     n.on("finish", () => {
       S.renameSync(i, r), l(null);
-    }), n.on("error", (u) => {
-      S.removeSync(i), a(u);
+    }), n.on("error", (d) => {
+      S.removeSync(i), a(d);
     });
   });
 }
@@ -233,32 +233,32 @@ class Ce {
     let o;
     const i = new ge();
     if (!this.args.skipWordPressSetup) {
-      let b = !1;
-      i.addEventListener("progress", (B) => {
-        if (b)
+      let y = !1;
+      i.addEventListener("progress", ($) => {
+        if (y)
           return;
-        const { loaded: C, total: I } = B.detail, P = Math.floor(
-          Math.min(100, 100 * C / I)
+        const { loaded: C, total: B } = $.detail, P = Math.floor(
+          Math.min(100, 100 * C / B)
         );
-        b = P === 100, this.writeProgressUpdate(
+        y = P === 100, this.writeProgressUpdate(
           process.stdout,
           `Downloading WordPress ${P}%...`,
-          b
+          y
         );
       }), o = await ve(this.args.wp), p.log(
         `Resolved WordPress release URL: ${o?.releaseUrl}`
       );
     }
-    const n = o && c.join(
+    const n = o && f.join(
       T,
       `prebuilt-wp-content-for-wp-${o.version}.zip`
-    ), l = o ? d.existsSync(n) ? O(n) : await z(
+    ), l = o ? c.existsSync(n) ? O(n) : await z(
       o.releaseUrl,
       `${o.version}.zip`,
       i
     ) : void 0;
     p.log("Fetching SQLite integration plugin...");
-    const a = this.args.skipSqliteSetup ? void 0 : await Te(i), u = this.args.followSymlinks === !0, y = this.args.experimentalTrace === !0, W = this.args["mount-before-install"] || [], g = this.args.mount || [], m = R(r);
+    const a = this.args.skipSqliteSetup ? void 0 : await Te(i), d = this.args.followSymlinks === !0, b = this.args.experimentalTrace === !0, W = this.args["mount-before-install"] || [], g = this.args.mount || [], m = R(r);
     await m.isConnected(), p.log("Booting WordPress...");
     const x = await te(
       this.getEffectiveBlueprint()
@@ -273,12 +273,12 @@ class Ce {
       sqliteIntegrationPluginZip: await a?.arrayBuffer(),
       firstProcessId: 0,
       processIdSpaceLength: this.processIdSpaceLength,
-      followSymlinks: u,
-      trace: y,
+      followSymlinks: d,
+      trace: b,
       internalCookieStore: this.args.internalCookieStore,
       withXdebug: this.args.xdebug,
       nativeInternalDirPath: s
-    }), o && !this.args["mount-before-install"] && !d.existsSync(n) && (p.log("Caching preinstalled WordPress for the next boot..."), d.writeFileSync(
+    }), o && !this.args["mount-before-install"] && !c.existsSync(n) && (p.log("Caching preinstalled WordPress for the next boot..."), c.writeFileSync(
       n,
       await se(m, "/wordpress")
     ), p.log("Cached!")), m;
@@ -347,7 +347,7 @@ class Ce {
   }
 }
 async function Ue(e, r = !0) {
-  const s = `${c.basename(process.argv0)}${e}${process.pid}-`, o = (await Se({
+  const s = `${f.basename(process.argv0)}${e}${process.pid}-`, o = (await Se({
     prefix: s,
     /*
      * Allow recursive cleanup on process exit.
@@ -368,7 +368,7 @@ async function Ae(e, r, t) {
     t
   )).map(
     (i) => new Promise((n) => {
-      d.rm(i, { recursive: !0 }, (l) => {
+      c.rm(i, { recursive: !0 }, (l) => {
         l ? p.warn(
           `Failed to delete stale Playground temp dir: ${i}`,
           l
@@ -382,7 +382,7 @@ async function Ae(e, r, t) {
 }
 async function De(e, r, t) {
   try {
-    const s = d.readdirSync(t).map((i) => c.join(t, i)), o = [];
+    const s = c.readdirSync(t).map((i) => f.join(t, i)), o = [];
     for (const i of s)
       await He(
         e,
@@ -395,9 +395,9 @@ async function De(e, r, t) {
   }
 }
 async function He(e, r, t) {
-  if (!d.lstatSync(t).isDirectory())
+  if (!c.lstatSync(t).isDirectory())
     return !1;
-  const o = c.basename(t);
+  const o = f.basename(t);
   if (!o.includes(e))
     return !1;
   const i = o.match(
@@ -412,7 +412,7 @@ async function He(e, r, t) {
   if (await Ve(n.pid, n.executableName))
     return !1;
   const l = Date.now() - r;
-  return d.statSync(t).mtime.getTime() < l;
+  return c.statSync(t).mtime.getTime() < l;
 }
 async function Ve(e, r) {
   const [t] = await new Promise(
@@ -433,9 +433,9 @@ async function Ve(e, r) {
   return !!t && t.pid === e && t.command === r;
 }
 const F = {
-  Quiet: { name: "quiet", severity: E.Fatal },
-  Normal: { name: "normal", severity: E.Info },
-  Debug: { name: "debug", severity: E.Debug }
+  Quiet: { name: "quiet", severity: I.Fatal },
+  Normal: { name: "normal", severity: I.Info },
+  Debug: { name: "debug", severity: I.Debug }
 };
 async function dt() {
   try {
@@ -582,7 +582,7 @@ Warning: Following symlinks will expose files outside mounted directories to Pla
       if (o["auto-mount"]) {
         let i = !1;
         try {
-          i = d.statSync(o["auto-mount"]).isDirectory();
+          i = c.statSync(o["auto-mount"]).isDirectory();
         } catch {
           i = !1;
         }
@@ -655,7 +655,7 @@ async function je(e) {
   const s = [];
   if (e.autoMount !== void 0 && (e.autoMount === "" && (e = { ...e, autoMount: process.cwd() }), e = le(e)), e.quiet && (e.verbosity = "quiet", delete e.quiet), e.debug ? e.verbosity = "debug" : e.verbosity === "debug" && (e.debug = !0), e.verbosity) {
     const a = Object.values(F).find(
-      (u) => u.name === e.verbosity
+      (d) => d.name === e.verbosity
     ).severity;
     p.setSeverityFilterLevel(a);
   }
@@ -670,18 +670,20 @@ async function je(e) {
   let n = !1, l = !0;
   return p.log("Starting a PHP server..."), Le({
     port: e.port,
-    onBind: async (a, u) => {
-      const y = `http://127.0.0.1:${u}`, W = e["site-url"] || y, g = e.experimentalMultiWorker ?? 1, m = Math.floor(
+    onBind: async (a, d) => {
+      const b = `http://127.0.0.1:${d}`, W = e["site-url"] || b, g = e.experimentalMultiWorker ?? 1, m = Math.floor(
         Number.MAX_SAFE_INTEGER / g
-      ), x = "-playground-cli-site-", b = await Ue(
+      ), x = "-playground-cli-site-", y = await Ue(
         x
-      ), B = c.dirname(b), I = 2 * 24 * 60 * 60 * 1e3;
+      );
+      p.debug(`Native temp dir for VFS root: ${y}`);
+      const $ = f.dirname(y), B = 2 * 24 * 60 * 60 * 1e3;
       Ae(
         x,
-        I,
-        B
+        B,
+        $
       );
-      const P = c.join(b, "internal");
+      const P = f.join(y, "internal");
       D(P);
       const N = [
         "wordpress",
@@ -694,53 +696,63 @@ async function je(e) {
         "tmp",
         "home"
       ];
-      for (const f of N) {
-        const w = (h) => h.vfsPath === `/${f}`;
+      for (const u of N) {
+        const w = (h) => h.vfsPath === `/${u}`;
         if (!(e["mount-before-install"]?.some(w) || e.mount?.some(w))) {
-          const h = c.join(
-            b,
-            f
+          const h = f.join(
+            y,
+            u
           );
           D(h), e["mount-before-install"] === void 0 && (e["mount-before-install"] = []), e["mount-before-install"].unshift({
-            vfsPath: `/${f}`,
+            vfsPath: `/${u}`,
             hostPath: h
           });
         }
       }
+      if (e["mount-before-install"])
+        for (const u of e["mount-before-install"])
+          p.debug(
+            `Mount before WP install: ${u.vfsPath} -> ${u.hostPath}`
+          );
+      if (e.mount)
+        for (const u of e.mount)
+          p.debug(
+            `Mount after WP install: ${u.vfsPath} -> ${u.hostPath}`
+          );
       let v;
-      e["experimental-blueprints-v2-runner"] ? v = new $e(e, {
+      e["experimental-blueprints-v2-runner"] ? v = new Ee(e, {
         siteUrl: W,
         processIdSpaceLength: m
       }) : (v = new Ce(e, {
         siteUrl: W,
         processIdSpaceLength: m
-      }), typeof e.blueprint == "string" && (e.blueprint = await Ee({
+      }), typeof e.blueprint == "string" && (e.blueprint = await Ie({
         sourceString: e.blueprint,
         blueprintMayReadAdjacentFiles: e["blueprint-may-read-adjacent-files"] === !0
       })));
       const Z = _e(
         g,
         v.getWorkerType(),
-        ({ exitCode: f, isMain: w, workerIndex: L }) => {
-          f !== 0 && (p.error(
-            `Worker ${L} exited with code ${f}
+        ({ exitCode: u, isMain: w, workerIndex: L }) => {
+          u !== 0 && (p.error(
+            `Worker ${L} exited with code ${u}
 `
           ), w && e.exitOnPrimaryWorkerCrash && process.exit(1));
         }
       );
       p.log(`Setting up WordPress ${e.wp}`);
       try {
-        const [f, ...w] = await Z, L = await j(
+        const [u, ...w] = await Z, L = await j(
           i
         );
         if (t = await v.bootPrimaryWorker(
-          f.phpPort,
+          u.phpPort,
           L,
           P
         ), s.push({
           playground: t,
-          worker: f.worker
-        }), await t.isReady(), n = !0, p.log("Booted!"), r = new Ie(t), !e["experimental-blueprints-v2-runner"]) {
+          worker: u.worker
+        }), await t.isReady(), n = !0, p.log("Booted!"), r = new Be(t), !e["experimental-blueprints-v2-runner"]) {
           const h = await v.compileInputBlueprint(
             e["additional-blueprint-steps"] || []
           );
@@ -768,14 +780,14 @@ async function je(e) {
           );
         }
         return p.log(
-          `WordPress is running on ${y} with ${g} worker(s)`
+          `WordPress is running on ${b} with ${g} worker(s)`
         ), e.experimentalDevtools && e.xdebug && (await ke({
           phpInstance: t,
           phpRoot: "/wordpress"
         })).start(), {
           playground: t,
           server: a,
-          serverUrl: y,
+          serverUrl: b,
           [Symbol.asyncDispose]: async function() {
             await Promise.all(
               s.map(
@@ -787,31 +799,31 @@ async function je(e) {
           },
           workerThreadCount: g
         };
-      } catch (f) {
+      } catch (u) {
         if (!e.debug)
-          throw f;
+          throw u;
         let w = "";
-        throw await t?.fileExists(A) && (w = await t.readFileAsText(A)), new Error(w, { cause: f });
+        throw await t?.fileExists(A) && (w = await t.readFileAsText(A)), new Error(w, { cause: u });
       }
     },
     async handleRequest(a) {
       if (!n)
-        return $.forHttpCode(
+        return E.forHttpCode(
           502,
           "WordPress is not ready yet"
         );
       if (l) {
         l = !1;
-        const u = {
+        const d = {
           "Content-Type": ["text/plain"],
           "Content-Length": ["0"],
           Location: [a.url]
         };
         return a.headers?.cookie?.includes(
           "playground_auto_login_already_happened"
-        ) && (u["Set-Cookie"] = [
+        ) && (d["Set-Cookie"] = [
           "playground_auto_login_already_happened=1; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/"
-        ]), new $(302, u, new Uint8Array());
+        ]), new E(302, d, new Uint8Array());
       }
       return await r.handleRequest(a);
     }
@@ -830,14 +842,14 @@ async function _e(e, r, t) {
     s.push(
       new Promise(
         (l, a) => {
-          i.once("message", function(u) {
-            u.command === "worker-script-initialized" && l({ worker: i, phpPort: u.phpPort });
-          }), i.once("error", function(u) {
-            console.error(u);
-            const y = new Error(
-              `Worker failed to load worker. ${u.message ? `Original error: ${u.message}` : ""}`
+          i.once("message", function(d) {
+            d.command === "worker-script-initialized" && l({ worker: i, phpPort: d.phpPort });
+          }), i.once("error", function(d) {
+            console.error(d);
+            const b = new Error(
+              `Worker failed to load worker. ${d.message ? `Original error: ${d.message}` : ""}`
             );
-            a(y);
+            a(b);
           }), i.once("exit", n);
         }
       )
@@ -874,11 +886,11 @@ async function ze(e, r) {
 	`
   });
   const t = await e.readFileAsBuffer("/tmp/build.zip");
-  d.writeFileSync(r, t);
+  c.writeFileSync(r, t);
 }
 export {
   F as L,
   dt as p,
   je as r
 };
-//# sourceMappingURL=run-cli-BRWTcRHa.js.map
+//# sourceMappingURL=run-cli-C0WqHEVM.js.map