@wp-playground/cli 3.0.6 → 3.0.12

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

@@ -1,5 +1,5 @@
-import { logger as p, LogSeverity as E, errorLogPath as U } from "@php-wasm/logger";
-import { consumeAPI as R, SupportedPHPVersions as X, printDebugDetails as Y, PHPResponse as C, exposeAPI as G, exposeSyncAPI as K } from "@php-wasm/universal";
+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 { 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";
@@ -11,8 +11,8 @@ 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 { NodeJsFilesystem as me, OverlayFilesystem as we, InMemoryFilesystem as ye, ZipFilesystem as ge } from "@wp-playground/storage";
-import { EmscriptenDownloadMonitor as be, ProgressTracker as Pe } from "@php-wasm/progress";
+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";
 import S from "fs-extra";
 import { startBridge as ke } from "@php-wasm/xdebug-bridge";
@@ -20,22 +20,27 @@ import { dir as Se, setGracefulCleanup as xe } from "tmp-promise";
 import We from "ps-man";
 async function Le(e) {
   const r = pe(), t = await new Promise((i, n) => {
-    const a = r.listen(e.port, () => {
-      const l = a.address();
-      l === null || typeof l == "string" ? n(new Error("Server address is not available")) : i(a);
+    const l = r.listen(e.port, () => {
+      const a = l.address();
+      a === null || typeof a == "string" ? n(new Error("Server address is not available")) : i(l);
     });
   });
   r.use("/", async (i, n) => {
-    const a = await e.handleRequest({
-      url: i.url,
-      headers: Be(i),
-      method: i.method,
-      body: await Re(i)
-    });
-    n.statusCode = a.httpStatusCode;
-    for (const l in a.headers)
-      n.setHeader(l, a.headers[l]);
-    n.end(a.bytes);
+    let l;
+    try {
+      l = await e.handleRequest({
+        url: i.url,
+        headers: Be(i),
+        method: i.method,
+        body: await Re(i)
+      });
+    } catch (a) {
+      p.error(a), l = $.forHttpCode(500);
+    }
+    n.statusCode = l.httpStatusCode;
+    for (const a in l.headers)
+      n.setHeader(a, l.headers[a]);
+    n.end(l.bytes);
   });
   const o = t.address().port;
   return await e.onBind(t, o);
@@ -98,7 +103,7 @@ async function Ee({
   const o = c.extname(t);
   switch (o) {
     case ".zip":
-      return ge.fromArrayBuffer(
+      return be.fromArrayBuffer(
         d.readFileSync(t).buffer
       );
     case ".json": {
@@ -110,7 +115,7 @@ async function Ee({
           `Blueprint file at ${t} is not a valid JSON file`
         );
       }
-      const n = c.dirname(t), a = new me(n);
+      const n = c.dirname(t), l = new me(n);
       return new we([
         new ye({
           "blueprint.json": i
@@ -120,14 +125,14 @@ async function Ee({
          * unless the user explicitly allowed it.
          */
         {
-          read(l) {
+          read(a) {
             if (!r)
               throw new Error(
-                `Error: Blueprint contained tried to read a local file at path "${l}" (via a resource of type "bundled"). Playground restricts access to local resources by default as a security measure. 
+                `Error: Blueprint contained tried to read a local file at path "${a}" (via a resource of type "bundled"). Playground restricts access to local resources by default as a security measure. 
 
 You can allow this Blueprint to read files from the same parent directory by explicitly adding the --blueprint-may-read-adjacent-files option to your command.`
               );
-            return a.read(l);
+            return l.read(a);
           }
         }
       ]);
@@ -187,7 +192,7 @@ class $e {
 `));
   }
 }
-const $ = c.join(q.homedir(), ".wordpress-playground");
+const T = c.join(q.homedir(), ".wordpress-playground");
 async function Te(e) {
   return await z(
     "https://github.com/WordPress/sqlite-database-integration/archive/refs/heads/develop.zip",
@@ -196,28 +201,28 @@ async function Te(e) {
   );
 }
 async function z(e, r, t) {
-  const s = c.join($, r);
-  return S.existsSync(s) || (S.ensureDirSync($), await Fe(e, s, t)), O(s);
+  const s = c.join(T, r);
+  return S.existsSync(s) || (S.ensureDirSync(T), await Fe(e, s, t)), O(s);
 }
 async function Fe(e, r, t) {
   const o = (await t.monitorFetch(fetch(e))).body.getReader(), i = `${r}.partial`, n = S.createWriteStream(i);
   for (; ; ) {
-    const { done: a, value: l } = await o.read();
-    if (l && n.write(l), a)
+    const { done: l, value: a } = await o.read();
+    if (a && n.write(a), l)
       break;
   }
-  n.close(), n.closed || await new Promise((a, l) => {
+  n.close(), n.closed || await new Promise((l, a) => {
     n.on("finish", () => {
-      S.renameSync(i, r), a(null);
+      S.renameSync(i, r), l(null);
     }), n.on("error", (u) => {
-      S.removeSync(i), l(u);
+      S.removeSync(i), a(u);
     });
   });
 }
 function O(e, r) {
   return new File([S.readFileSync(e)], he(e));
 }
-class Ae {
+class Ce {
   constructor(r, t) {
     this.lastProgressMessage = "", this.args = r, this.siteUrl = t.siteUrl, this.processIdSpaceLength = t.processIdSpaceLength;
   }
@@ -226,34 +231,34 @@ class Ae {
   }
   async bootPrimaryWorker(r, t, s) {
     let o;
-    const i = new be();
+    const i = new ge();
     if (!this.args.skipWordPressSetup) {
-      let g = !1;
+      let b = !1;
       i.addEventListener("progress", (B) => {
-        if (g)
+        if (b)
           return;
-        const { loaded: F, total: I } = B.detail, v = Math.floor(
-          Math.min(100, 100 * F / I)
+        const { loaded: C, total: I } = B.detail, P = Math.floor(
+          Math.min(100, 100 * C / I)
         );
-        g = v === 100, this.writeProgressUpdate(
+        b = P === 100, this.writeProgressUpdate(
           process.stdout,
-          `Downloading WordPress ${v}%...`,
-          g
+          `Downloading WordPress ${P}%...`,
+          b
         );
       }), o = await ve(this.args.wp), p.log(
         `Resolved WordPress release URL: ${o?.releaseUrl}`
       );
     }
     const n = o && c.join(
-      $,
+      T,
       `prebuilt-wp-content-for-wp-${o.version}.zip`
-    ), a = o ? d.existsSync(n) ? O(n) : await z(
+    ), l = o ? d.existsSync(n) ? O(n) : await z(
       o.releaseUrl,
       `${o.version}.zip`,
       i
     ) : void 0;
     p.log("Fetching SQLite integration plugin...");
-    const l = this.args.skipSqliteSetup ? void 0 : await Te(i), u = this.args.followSymlinks === !0, b = this.args.experimentalTrace === !0, W = this.args["mount-before-install"] || [], P = this.args.mount || [], m = R(r);
+    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);
     await m.isConnected(), p.log("Booting WordPress...");
     const x = await te(
       this.getEffectiveBlueprint()
@@ -263,13 +268,13 @@ class Ae {
       wpVersion: x.wpVersion,
       siteUrl: this.siteUrl,
       mountsBeforeWpInstall: W,
-      mountsAfterWpInstall: P,
-      wordPressZip: a && await a.arrayBuffer(),
-      sqliteIntegrationPluginZip: await l?.arrayBuffer(),
+      mountsAfterWpInstall: g,
+      wordPressZip: l && await l.arrayBuffer(),
+      sqliteIntegrationPluginZip: await a?.arrayBuffer(),
       firstProcessId: 0,
       processIdSpaceLength: this.processIdSpaceLength,
       followSymlinks: u,
-      trace: b,
+      trace: y,
       internalCookieStore: this.args.internalCookieStore,
       withXdebug: this.args.xdebug,
       nativeInternalDirPath: s
@@ -310,12 +315,12 @@ class Ae {
       if (i)
         return;
       i = n.detail.progress === 100;
-      const a = Math.floor(n.detail.progress);
+      const l = Math.floor(n.detail.progress);
       o = n.detail.caption || o || "Running the Blueprint";
-      const l = `${o.trim()} – ${a}%`;
+      const a = `${o.trim()} – ${l}%`;
       this.writeProgressUpdate(
         process.stdout,
-        l,
+        a,
         i
       );
     }), await re(t, {
@@ -336,7 +341,7 @@ class Ae {
     };
   }
   writeProgressUpdate(r, t, s) {
-    this.args.verbosity !== T.Quiet.name && t !== this.lastProgressMessage && (this.lastProgressMessage = t, r.isTTY ? (r.cursorTo(0), r.write(t), r.clearLine(1), s && r.write(`
+    this.args.verbosity !== F.Quiet.name && t !== this.lastProgressMessage && (this.lastProgressMessage = t, r.isTTY ? (r.cursorTo(0), r.write(t), r.clearLine(1), s && r.write(`
 `)) : r.write(`${t}
 `));
   }
@@ -356,17 +361,17 @@ async function Ue(e, r = !0) {
   })).path;
   return r && xe(), o;
 }
-async function Ce(e, r, t) {
+async function Ae(e, r, t) {
   const o = (await De(
     e,
     r,
     t
   )).map(
     (i) => new Promise((n) => {
-      d.rm(i, { recursive: !0 }, (a) => {
-        a ? p.warn(
+      d.rm(i, { recursive: !0 }, (l) => {
+        l ? p.warn(
           `Failed to delete stale Playground temp dir: ${i}`,
-          a
+          l
         ) : p.info(
           `Deleted stale Playground temp dir: ${i}`
         ), n();
@@ -406,8 +411,8 @@ async function He(e, r, t) {
   };
   if (await Ve(n.pid, n.executableName))
     return !1;
-  const a = Date.now() - r;
-  return d.statSync(t).mtime.getTime() < a;
+  const l = Date.now() - r;
+  return d.statSync(t).mtime.getTime() < l;
 }
 async function Ve(e, r) {
   const [t] = await new Promise(
@@ -427,7 +432,7 @@ async function Ve(e, r) {
   );
   return !!t && t.pid === e && t.command === r;
 }
-const T = {
+const F = {
   Quiet: { name: "quiet", severity: E.Fatal },
   Normal: { name: "normal", severity: E.Info },
   Debug: { name: "debug", severity: E.Debug }
@@ -507,7 +512,7 @@ async function dt() {
     }).option("verbosity", {
       describe: "Output logs and progress messages.",
       type: "string",
-      choices: Object.values(T).map(
+      choices: Object.values(F).map(
         (o) => o.name
       ),
       default: "normal"
@@ -649,35 +654,35 @@ async function je(e) {
   let r, t;
   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 l = Object.values(T).find(
+    const a = Object.values(F).find(
       (u) => u.name === e.verbosity
     ).severity;
-    p.setSeverityFilterLevel(l);
+    p.setSeverityFilterLevel(a);
   }
   const o = q.platform() === "win32" ? (
     // @TODO: Enable fs-ext here when it works with Windows.
     void 0
-  ) : await import("fs-ext").then((l) => l.flockSync).catch(() => {
+  ) : await import("fs-ext").then((a) => a.flockSync).catch(() => {
     p.warn(
       "The fs-ext package is not installed. Internal file locking will not be integrated with host OS file locking."
     );
   }), i = new ue(o);
-  let n = !1, a = !0;
+  let n = !1, l = !0;
   return p.log("Starting a PHP server..."), Le({
     port: e.port,
-    onBind: async (l, u) => {
-      const b = `http://127.0.0.1:${u}`, W = e["site-url"] || b, P = e.experimentalMultiWorker ?? 1, m = Math.floor(
-        Number.MAX_SAFE_INTEGER / P
-      ), x = "-playground-cli-site-", g = await Ue(
+    onBind: async (a, u) => {
+      const y = `http://127.0.0.1:${u}`, W = e["site-url"] || y, g = e.experimentalMultiWorker ?? 1, m = Math.floor(
+        Number.MAX_SAFE_INTEGER / g
+      ), x = "-playground-cli-site-", b = await Ue(
         x
-      ), B = c.dirname(g), I = 2 * 24 * 60 * 60 * 1e3;
-      Ce(
+      ), B = c.dirname(b), I = 2 * 24 * 60 * 60 * 1e3;
+      Ae(
         x,
         I,
         B
       );
-      const v = c.join(g, "internal");
-      D(v);
+      const P = c.join(b, "internal");
+      D(P);
       const N = [
         "wordpress",
         // Note: These dirs are from Emscripten's "default dirs" list:
@@ -693,7 +698,7 @@ async function je(e) {
         const w = (h) => h.vfsPath === `/${f}`;
         if (!(e["mount-before-install"]?.some(w) || e.mount?.some(w))) {
           const h = c.join(
-            g,
+            b,
             f
           );
           D(h), e["mount-before-install"] === void 0 && (e["mount-before-install"] = []), e["mount-before-install"].unshift({
@@ -702,11 +707,11 @@ async function je(e) {
           });
         }
       }
-      let k;
-      e["experimental-blueprints-v2-runner"] ? k = new $e(e, {
+      let v;
+      e["experimental-blueprints-v2-runner"] ? v = new $e(e, {
         siteUrl: W,
         processIdSpaceLength: m
-      }) : (k = new Ae(e, {
+      }) : (v = new Ce(e, {
         siteUrl: W,
         processIdSpaceLength: m
       }), typeof e.blueprint == "string" && (e.blueprint = await Ee({
@@ -714,8 +719,8 @@ async function je(e) {
         blueprintMayReadAdjacentFiles: e["blueprint-may-read-adjacent-files"] === !0
       })));
       const Z = _e(
-        P,
-        k.getWorkerType(),
+        g,
+        v.getWorkerType(),
         ({ exitCode: f, isMain: w, workerIndex: L }) => {
           f !== 0 && (p.error(
             `Worker ${L} exited with code ${f}
@@ -728,15 +733,15 @@ async function je(e) {
         const [f, ...w] = await Z, L = await j(
           i
         );
-        if (t = await k.bootPrimaryWorker(
+        if (t = await v.bootPrimaryWorker(
           f.phpPort,
           L,
-          v
+          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"]) {
-          const h = await k.compileInputBlueprint(
+          const h = await v.compileInputBlueprint(
             e["additional-blueprint-steps"] || []
           );
           h && (p.log("Running the Blueprint..."), await ie(
@@ -748,89 +753,91 @@ async function je(e) {
           p.log("Preparing additional workers...");
           const h = m;
           await Promise.all(
-            w.map(async (y, M) => {
-              const J = h + M * m, Q = await j(i), A = await k.bootSecondaryWorker({
-                worker: y,
+            w.map(async (k, M) => {
+              const J = h + M * m, Q = await j(i), U = await v.bootSecondaryWorker({
+                worker: k,
                 fileLockManagerPort: Q,
                 firstProcessId: J,
-                nativeInternalDirPath: v
+                nativeInternalDirPath: P
               });
               s.push({
-                playground: A,
-                worker: y.worker
-              }), r.addWorker(A);
+                playground: U,
+                worker: k.worker
+              }), r.addWorker(U);
             })
           );
         }
         return p.log(
-          `WordPress is running on ${b} with ${P} worker(s)`
+          `WordPress is running on ${y} with ${g} worker(s)`
         ), e.experimentalDevtools && e.xdebug && (await ke({
-          getPHPFile: async (y) => await t.readFileAsText(y)
+          phpInstance: t,
+          phpRoot: "/wordpress"
         })).start(), {
           playground: t,
-          server: l,
+          server: a,
+          serverUrl: y,
           [Symbol.asyncDispose]: async function() {
             await Promise.all(
               s.map(
-                async ({ playground: y, worker: M }) => {
-                  await y.dispose(), await M.terminate();
+                async ({ playground: k, worker: M }) => {
+                  await k.dispose(), await M.terminate();
                 }
               )
-            ), await new Promise((y) => l.close(y));
+            ), await new Promise((k) => a.close(k));
           },
-          workerThreadCount: P
+          workerThreadCount: g
         };
       } catch (f) {
         if (!e.debug)
           throw f;
         let w = "";
-        throw await t?.fileExists(U) && (w = await t.readFileAsText(U)), new Error(w, { cause: f });
+        throw await t?.fileExists(A) && (w = await t.readFileAsText(A)), new Error(w, { cause: f });
       }
     },
-    async handleRequest(l) {
+    async handleRequest(a) {
       if (!n)
-        return C.forHttpCode(
+        return $.forHttpCode(
           502,
           "WordPress is not ready yet"
         );
-      if (a) {
-        a = !1;
+      if (l) {
+        l = !1;
         const u = {
           "Content-Type": ["text/plain"],
           "Content-Length": ["0"],
-          Location: ["/"]
+          Location: [a.url]
         };
-        return l.headers?.cookie?.includes(
+        return a.headers?.cookie?.includes(
           "playground_auto_login_already_happened"
         ) && (u["Set-Cookie"] = [
           "playground_auto_login_already_happened=1; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/"
-        ]), new C(302, u, new Uint8Array());
+        ]), new $(302, u, new Uint8Array());
       }
-      return await r.handleRequest(l);
+      return await r.handleRequest(a);
     }
   });
 }
 async function _e(e, r, t) {
   const s = [];
   for (let o = 0; o < e; o++) {
-    const i = await qe(r), n = (a) => {
+    const i = await qe(r), n = (l) => {
       t({
-        exitCode: a,
+        exitCode: l,
         isMain: o === 0,
         workerIndex: o
       });
     };
     s.push(
       new Promise(
-        (a, l) => {
+        (l, a) => {
           i.once("message", function(u) {
-            u.command === "worker-script-initialized" && a({ worker: i, phpPort: u.phpPort });
+            u.command === "worker-script-initialized" && l({ worker: i, phpPort: u.phpPort });
           }), i.once("error", function(u) {
             console.error(u);
-            const b = new Error(
+            const y = new Error(
               `Worker failed to load worker. ${u.message ? `Original error: ${u.message}` : ""}`
             );
-            l(b);
+            a(y);
           }), i.once("exit", n);
         }
       )
@@ -870,8 +877,8 @@ async function ze(e, r) {
   d.writeFileSync(r, t);
 }
 export {
-  T as L,
+  F as L,
   dt as p,
   je as r
 };
-//# sourceMappingURL=run-cli-Md2TQOSk.js.map
+//# sourceMappingURL=run-cli-BRWTcRHa.js.map