@php-wasm/universal 3.0.6 → 3.0.8

package/index.js

@@ -2,10 +2,10 @@ var z = (t) => {
   throw TypeError(t);
 };
 var O = (t, e, r) => e.has(t) || z("Cannot " + r);
-var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), m = (t, e, r) => e.has(t) ? z("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), g = (t, e, r, s) => (O(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), y = (t, e, r) => (O(t, e, "access private method"), r);
+var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), m = (t, e, r) => e.has(t) ? z("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), w = (t, e, r, s) => (O(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), y = (t, e, r) => (O(t, e, "access private method"), r);
 import "@php-wasm/node-polyfills";
 import { logger } from "@php-wasm/logger";
-import { dirname, joinPaths, Semaphore, createSpawnHandler, normalizePath, AcquireTimeoutError } from "@php-wasm/util";
+import { dirname, joinPaths, Semaphore, createSpawnHandler, basename, normalizePath, AcquireTimeoutError } from "@php-wasm/util";
 import { parse, stringify } from "ini";
 import { StreamedFile } from "@php-wasm/stream-compression";
 class ErrnoError extends Error {
@@ -368,12 +368,12 @@ class PHPWorker {
   /** @inheritDoc */
   constructor(e, r) {
     m(this, P);
-    this.absoluteUrl = "", this.documentRoot = "", g(this, P, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
+    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, w(this, P, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
       monitor: r
     }), e && this.__internal_setRequestHandler(e);
   }
   __internal_setRequestHandler(e) {
-    this.absoluteUrl = e.absoluteUrl, this.documentRoot = e.documentRoot, _private.set(this, {
+    this.absoluteUrl = e.absoluteUrl, this.documentRoot = e.documentRoot, this.chroot = this.documentRoot, _private.set(this, {
       ..._private.get(this),
       requestHandler: e
     });
@@ -433,7 +433,7 @@ class PHPWorker {
   }
   /** @inheritDoc @php-wasm/universal!/PHP.run */
   async run(e) {
-    const { php: r, reap: s } = await _private.get(this).requestHandler.processManager.acquirePHPInstance();
+    const { php: r, reap: s } = await this.acquirePHPInstance();
     try {
       return await r.run(e);
     } finally {
@@ -442,16 +442,29 @@ class PHPWorker {
   }
   /** @inheritDoc @php-wasm/universal!/PHP.cli */
   async cli(e, r) {
-    const { php: s, reap: n } = await _private.get(this).requestHandler.processManager.acquirePHPInstance();
+    const { php: s, reap: n } = await this.acquirePHPInstance();
+    let i;
     try {
-      return await s.cli(e, r);
-    } finally {
-      n();
+      i = await s.cli(e, r);
+    } catch (o) {
+      throw n(), o;
     }
+    return i.finished.finally(n), i;
   }
   /** @inheritDoc @php-wasm/universal!/PHP.chdir */
   chdir(e) {
-    return _private.get(this).php.chdir(e);
+    return this.chroot = e, _private.get(this).php.chdir(e);
+  }
+  /** @inheritDoc @php-wasm/universal!/PHP.chdir */
+  cwd() {
+    return _private.get(this).php.cwd();
+  }
+  /**
+   * @returns A PHP instance with a consistent chroot.
+   */
+  async acquirePHPInstance() {
+    const { php: e, reap: r } = await _private.get(this).requestHandler.processManager.acquirePHPInstance();
+    return this.chroot !== null && e.chdir(this.chroot), this.registerWorkerListeners(e), { php: e, reap: r };
   }
   /** @inheritDoc @php-wasm/universal!/PHP.setSapiName */
   setSapiName(e) {
@@ -937,7 +950,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 C, b, T, E, F, M, _, h, B, $, V, G, J, Y, K, X, U, Q, j, q;
+var C, H, T, E, F, M, _, h, B, $, V, G, J, Y, K, X, U, Q, q, D;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -949,7 +962,7 @@ class PHP {
   constructor(t) {
     m(this, h);
     m(this, C);
-    m(this, b, !1);
+    m(this, H, !1);
     m(this, T, null);
     m(this, E, /* @__PURE__ */ new Map([
       // Listen to all events
@@ -1035,7 +1048,7 @@ class PHP {
    */
   onMessage(t) {
     return u(this, F).push(t), async () => {
-      g(this, F, u(this, F).filter(
+      w(this, F, u(this, F).filter(
         (e) => e !== t
       ));
     };
@@ -1135,7 +1148,7 @@ class PHP {
           return n;
       }
       return "";
-    }, g(this, T, improveWASMErrorReporting(e)), this.dispatchEvent({
+    }, w(this, T, improveWASMErrorReporting(e)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1150,7 +1163,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, C, t);
+    w(this, C, t);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -1163,6 +1176,14 @@ class PHP {
   chdir(t) {
     this[__private__dont__use].FS.chdir(t);
   }
+  /**
+   * Gets the current working directory in the PHP filesystem.
+   *
+   * @returns The current working directory.
+   */
+  cwd() {
+    return this[__private__dont__use].FS.cwd();
+  }
   /**
    * Changes the permissions of a file or directory.
    * @param path - The path to the file or directory.
@@ -1366,8 +1387,8 @@ class PHP {
   async runStream(t) {
     const e = await this.semaphore.acquire();
     let r;
-    const s = y(this, h, q).call(this, async () => {
-      if (u(this, b) || (await this[__private__dont__use].ccall(
+    const s = y(this, h, D).call(this, async () => {
+      if (u(this, H) || (await this[__private__dont__use].ccall(
         "php_wasm_init",
         null,
         [],
@@ -1375,7 +1396,7 @@ class PHP {
         {
           isAsync: !0
         }
-      ), g(this, b, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
+      ), w(this, H, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
@@ -1394,7 +1415,7 @@ class PHP {
         y(this, h, Q).call(this, d, c[d]);
       const l = t.env || {};
       for (const d in l)
-        y(this, h, j).call(this, d, l[d]);
+        y(this, h, q).call(this, d, l[d]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1600,12 +1621,11 @@ class PHP {
    * or an internal crash.
    */
   enableRuntimeRotation(t) {
-    g(this, _, {
+    w(this, _, {
       ...u(this, _),
       enabled: !0,
       recreateRuntime: t.recreateRuntime,
-      maxRequests: t.maxRequests ?? 400,
-      cwd: t.cwd
+      maxRequests: t.maxRequests ?? 400
     });
   }
   async rotateRuntime() {
@@ -1624,19 +1644,31 @@ class PHP {
    * @param runtime
    */
   async hotSwapPHPRuntime(t) {
-    const e = this[__private__dont__use].FS, r = this.listFiles("/").map((o) => `/${o}`), s = this[__private__dont__use].spawnProcess, n = [];
-    for (const [o, a] of Object.entries(u(this, M)))
-      n.push({ mountHandler: a.mountHandler, vfsPath: o }), await a.unmount();
+    const e = this[__private__dont__use].FS, r = this.listFiles("/").map((a) => `/${a}`), s = this[__private__dont__use].spawnProcess, n = e.cwd();
+    e.chdir("/");
+    const i = [];
+    for (const [a, c] of Object.entries(u(this, M)))
+      i.push({ mountHandler: c.mountHandler, vfsPath: a }), await c.unmount();
     try {
       this.exit();
     } catch {
     }
     this.initializeRuntime(t), s && (this[__private__dont__use].spawnProcess = s), u(this, C) && this.setSapiName(u(this, C));
-    const i = this[__private__dont__use].FS;
-    for (const o of r)
-      o && o !== "/request" && copyMEMFSNodes(e, i, o);
-    for (const { mountHandler: o, vfsPath: a } of n)
-      this.mkdir(a), await this.mount(a, o);
+    const o = this[__private__dont__use].FS;
+    for (const a of r)
+      a && a !== "/request" && copyMEMFSNodes(e, o, a);
+    for (const { mountHandler: a, vfsPath: c } of i)
+      this.mkdir(c), await this.mount(c, a);
+    try {
+      o.chdir(n);
+    } catch (a) {
+      throw new Error(
+        `Failed to restore CWD to ${n} after PHP runtime rotation.`,
+        {
+          cause: a
+        }
+      );
+    }
   }
   /**
    * Mounts a filesystem to a given path in the PHP filesystem.
@@ -1674,12 +1706,14 @@ class PHP {
    * @returns The exit code of the CLI session.
    */
   async cli(t, e = {}) {
-    u(this, b) && (u(this, _).needsRotating = !0);
+    if (basename(t[0] ?? "") !== "php")
+      return this.subProcess(t, e);
+    u(this, H) && (u(this, _).needsRotating = !0);
     const r = await this.semaphore.acquire();
-    return await y(this, h, q).call(this, () => {
+    return await y(this, h, D).call(this, () => {
       const s = e.env || {};
       for (const [n, i] of Object.entries(s))
-        y(this, h, j).call(this, n, i);
+        y(this, h, q).call(this, n, i);
       t = [t[0], "-c", PHP_INI_PATH, ...t.slice(1)];
       for (const n of t)
         this[__private__dont__use].ccall(
@@ -1695,6 +1729,59 @@ class PHP {
       u(this, _).needsRotating = !0;
     });
   }
+  /**
+   * Runs an arbitrary CLI command using the spawn handler associated
+   * with this PHP instance.
+   *
+   * @param argv
+   * @param options
+   * @returns StreamedPHPResponse.
+   */
+  async subProcess(t, e = {}) {
+    const r = this[__private__dont__use].spawnProcess(
+      t[0],
+      t.slice(1),
+      {
+        env: e.env,
+        cwd: e.cwd ?? this.cwd()
+      }
+    ), s = await createInvertedReadableStream();
+    r.on("error", (i) => {
+      s.controller.error(i);
+    }), r.stderr.on("data", (i) => {
+      s.controller.enqueue(i);
+    });
+    const n = await createInvertedReadableStream();
+    return r.stdout.on("data", (i) => {
+      n.controller.enqueue(i);
+    }), r.on("exit", () => {
+      setTimeout(() => {
+        try {
+          s.controller.close();
+        } catch {
+        }
+        try {
+          n.controller.close();
+        } catch {
+        }
+      }, 0);
+    }), new StreamedPHPResponse(
+      // Headers stream
+      new ReadableStream({
+        start(i) {
+          i.close();
+        }
+      }),
+      n.stream,
+      s.stream,
+      // Exit code
+      new Promise((i) => {
+        r.on("exit", (o) => {
+          i(o);
+        });
+      })
+    );
+  }
   setSkipShebang(t) {
     this[__private__dont__use].ccall(
       "wasm_set_skip_shebang",
@@ -1711,13 +1798,13 @@ class PHP {
       this[__private__dont__use]._exit(t);
     } catch {
     }
-    g(this, b, !1), g(this, T, null), this[__private__dont__use] && (delete this[__private__dont__use].onMessage, delete this[__private__dont__use]);
+    w(this, H, !1), w(this, T, null), this[__private__dont__use] && (delete this[__private__dont__use].onMessage, delete this[__private__dont__use]);
   }
   [Symbol.dispose]() {
     this.exit(0);
   }
 }
-C = new WeakMap(), b = new WeakMap(), T = new WeakMap(), E = new WeakMap(), F = new WeakMap(), M = new WeakMap(), _ = new WeakMap(), h = new WeakSet(), /**
+C = new WeakMap(), H = new WeakMap(), T = new WeakMap(), E = new WeakMap(), F = new WeakMap(), M = new WeakMap(), _ = new WeakMap(), h = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -1832,14 +1919,14 @@ B = function(t, e, r) {
     [STRING, STRING],
     [t, e]
   );
-}, j = function(t, e) {
+}, q = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, q = async function(t) {
+}, D = async function(t) {
   u(this, _).enabled && u(this, _).needsRotating && await this.rotateRuntime(), ++u(this, _).requestsMade, u(this, _).requestsMade >= u(this, _).maxRequests && (u(this, _).needsRotating = !0);
   const e = this[__private__dont__use], r = await createInvertedReadableStream();
   e.onHeaders = (p) => {
@@ -1862,11 +1949,11 @@ B = function(t, e, r) {
     try {
       return await Promise.race([
         t(),
-        new Promise((w, H) => {
-          var D;
+        new Promise((g, b) => {
+          var j;
           c = (W) => {
-            isExitCode(W.error) || H(W.error);
-          }, (D = u(this, T)) == null || D.addEventListener(
+            isExitCode(W.error) || b(W.error);
+          }, (j = u(this, T)) == null || j.addEventListener(
             "error",
             c,
             { once: !0 }
@@ -1877,8 +1964,8 @@ B = function(t, e, r) {
       if (isExitCode(f))
         return f.status;
       i.controller.error(f), o.controller.error(f), r.controller.error(f), a = !0;
-      for (const w in this)
-        typeof this[w] == "function" && (this[w] = () => {
+      for (const g in this)
+        typeof this[g] == "function" && (this[g] = () => {
           throw new Error(
             "PHP runtime has crashed – see the earlier error for details."
           );
@@ -2407,14 +2494,14 @@ class PHPRequestHandler {
         return l.isDir(r) || l.mkdir(r), l.chdir(r), l.requestHandler = this, l;
       },
       maxPhpInstances: e.maxPhpInstances
-    }), g(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), g(this, S, r);
+    }), w(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), w(this, S, r);
     const o = new URL(s);
-    g(this, L, o.hostname), g(this, k, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), g(this, I, (o.protocol || "").replace(":", ""));
+    w(this, L, o.hostname), w(this, k, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), w(this, I, (o.protocol || "").replace(":", ""));
     const a = u(this, k) !== 443 && u(this, k) !== 80;
-    g(this, A, [
+    w(this, A, [
       u(this, L),
       a ? `:${u(this, k)}` : ""
-    ].join("")), g(this, x, o.pathname.replace(/\/+$/, "")), g(this, N, [
+    ].join("")), w(this, x, o.pathname.replace(/\/+$/, "")), w(this, N, [
       `${u(this, I)}://`,
       u(this, A),
       u(this, x)
@@ -2661,14 +2748,12 @@ function applyRewriteRules(t, e) {
 }
 function rotatePHPRuntime({
   php: t,
-  cwd: e,
-  recreateRuntime: r,
-  maxRequests: s = 400
+  recreateRuntime: e,
+  maxRequests: r = 400
 }) {
   return t.enableRuntimeRotation({
-    recreateRuntime: r,
-    maxRequests: s,
-    cwd: e
+    recreateRuntime: e,
+    maxRequests: r
   });
 }
 async function writeFiles(t, e, r, { rmRoot: s = !1 } = {}) {
@@ -2706,50 +2791,71 @@ function sandboxedSpawnHandlerFactory(t) {
     else if (n === "tput" && e[1] === "cols")
       r.stdout("140"), r.exit(0);
     else if (n === "less") {
-      r.on("stdin", (i) => {
-        r.stdout(i);
-      }), await new Promise((i) => {
+      r.on("stdin", (a) => {
+        r.stdout(a);
+      }), await new Promise((a) => {
         r.childProcess.stdin.on("finish", () => {
-          i(!0);
+          a(!0);
         });
       }), r.exit(0);
       return;
-    } else if (n === "php") {
-      const { php: i, reap: o } = await t.acquirePHPInstance({
-        considerPrimary: !1
-      });
-      i.chdir(s.cwd);
-      try {
-        const a = await i.cli(e, {
-          env: {
-            ...s.env,
-            SCRIPT_PATH: e[1],
-            // Set SHELL_PIPE to 0 to ensure WP-CLI formats
-            // the output as ASCII tables.
-            // @see https://github.com/wp-cli/wp-cli/issues/1102
-            SHELL_PIPE: "0"
-          }
-        });
-        a.stdout.pipeTo(
-          new WritableStream({
-            write(c) {
-              r.stdout(c);
-            }
-          })
-        ), a.stderr.pipeTo(
-          new WritableStream({
-            write(c) {
-              r.stderr(c);
+    }
+    if (!["php", "ls", "pwd"].includes(n ?? "")) {
+      r.exit(127);
+      return;
+    }
+    const { php: i, reap: o } = await t.acquirePHPInstance({
+      considerPrimary: !1
+    });
+    try {
+      s.cwd && i.chdir(s.cwd);
+      const a = i.cwd();
+      switch (n) {
+        case "php": {
+          const c = await i.cli(e, {
+            env: {
+              ...s.env,
+              SCRIPT_PATH: e[1],
+              // Set SHELL_PIPE to 0 to ensure WP-CLI formats
+              // the output as ASCII tables.
+              // @see https://github.com/wp-cli/wp-cli/issues/1102
+              SHELL_PIPE: "0"
             }
-          })
-        ), r.exit(await a.exitCode);
-      } catch (a) {
-        throw r.exit(1), a;
-      } finally {
-        o();
+          });
+          c.stdout.pipeTo(
+            new WritableStream({
+              write(l) {
+                r.stdout(l);
+              }
+            })
+          ), c.stderr.pipeTo(
+            new WritableStream({
+              write(l) {
+                r.stderr(l);
+              }
+            })
+          ), r.exit(await c.exitCode);
+          break;
+        }
+        case "ls": {
+          const c = i.listFiles(e[1] ?? a);
+          for (const l of c)
+            r.stdout(l + `
+`);
+          await new Promise((l) => setTimeout(l, 10)), r.exit(0);
+          break;
+        }
+        case "pwd": {
+          r.stdout(a + `
+`), await new Promise((c) => setTimeout(c, 10)), r.exit(0);
+          break;
+        }
       }
-    } else
-      r.exit(1);
+    } catch (a) {
+      throw r.exit(1), a;
+    } finally {
+      o();
+    }
   });
 }
 function exposeSync(t, e, r, s = ["*"]) {
@@ -2921,7 +3027,7 @@ function expose(t, e = globalThis, r = ["*"], s) {
     }, l = (i.data.argumentList || []).map(fromWireValue);
     let d;
     try {
-      const p = c.slice(0, -1).reduce((w, H) => w[H], t), f = c.reduce((w, H) => w[H], t);
+      const p = c.slice(0, -1).reduce((g, b) => g[b], t), f = c.reduce((g, b) => g[b], t);
       switch (a) {
         case MessageType.GET:
           d = f;
@@ -2936,14 +3042,14 @@ function expose(t, e = globalThis, r = ["*"], s) {
           break;
         case MessageType.CONSTRUCT:
           {
-            const w = new f(...l);
-            d = proxy(w);
+            const g = new f(...l);
+            d = proxy(g);
           }
           break;
         case MessageType.ENDPOINT:
           {
-            const { port1: w, port2: H } = new MessageChannel();
-            expose(t, H), d = transfer(w, [w]);
+            const { port1: g, port2: b } = new MessageChannel();
+            expose(t, b), d = transfer(g, [g]);
           }
           break;
         case MessageType.RELEASE:
@@ -2956,8 +3062,8 @@ function expose(t, e = globalThis, r = ["*"], s) {
       d = { value: p, [throwMarker]: 0 };
     }
     Promise.resolve(d).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
-      const [f, w] = toWireValue(p);
-      e.postMessage({ ...f, id: o }, w), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
+      const [f, g] = toWireValue(p);
+      e.postMessage({ ...f, id: o }, g), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
     }).catch(() => {
       const [p, f] = toWireValue({
         value: new TypeError("Unserializable return value"),