@php-wasm/universal 3.0.21 → 3.0.29

package/index.js

@@ -5,7 +5,7 @@ var O = (t, e, r) => e.has(t) || B("Cannot " + r);
 var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), y = (t, e, r) => e.has(t) ? B("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), f = (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, basename, normalizePath, AcquireTimeoutError } from "@php-wasm/util";
+import { dirname, joinPaths, Semaphore, createSpawnHandler, basename, normalizePath, AcquireTimeoutError, splitShellCommand } from "@php-wasm/util";
 import { parse, stringify } from "ini";
 import { StreamedFile } from "@php-wasm/stream-compression";
 class ErrnoError extends Error {
@@ -363,12 +363,12 @@ FSHelpers.copyRecursive = rethrowFileSystemError(
   'Could not copy files from "{path}"'
 )(FSHelpers.copyRecursive);
 const _private = /* @__PURE__ */ new WeakMap();
-var S;
+var x;
 class PHPWorker {
   /** @inheritDoc */
   constructor(e, r) {
-    y(this, S);
-    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, w(this, S, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
+    y(this, x);
+    this.absoluteUrl = "", this.documentRoot = "", this.chroot = null, w(this, x, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
       monitor: r
     }), e && this.__internal_setRequestHandler(e);
   }
@@ -463,7 +463,7 @@ class PHPWorker {
    * @returns A PHP instance with a consistent chroot.
    */
   async acquirePHPInstance() {
-    const { php: e, reap: r } = await _private.get(this).requestHandler.processManager.acquirePHPInstance();
+    const { php: e, reap: r } = await _private.get(this).requestHandler.instanceManager.acquirePHPInstance();
     return this.chroot !== null && e.chdir(this.chroot), this.registerWorkerListeners(e), { php: e, reap: r };
   }
   /** @inheritDoc @php-wasm/universal!/PHP.setSapiName */
@@ -524,7 +524,7 @@ class PHPWorker {
   }
   /** @inheritDoc @php-wasm/universal!/PHP.addEventListener */
   addEventListener(e, r) {
-    u(this, S).has(e) || u(this, S).set(e, /* @__PURE__ */ new Set()), u(this, S).get(e).add(r);
+    u(this, x).has(e) || u(this, x).set(e, /* @__PURE__ */ new Set()), u(this, x).get(e).add(r);
   }
   /**
    * Removes an event listener for a PHP event.
@@ -533,10 +533,10 @@ class PHPWorker {
    */
   removeEventListener(e, r) {
     var s;
-    (s = u(this, S).get(e)) == null || s.delete(r);
+    (s = u(this, x).get(e)) == null || s.delete(r);
   }
   dispatchEvent(e) {
-    const r = u(this, S).get(e.type);
+    const r = u(this, x).get(e.type);
     if (r)
       for (const s of r)
         s(e);
@@ -558,7 +558,7 @@ class PHPWorker {
     await ((e = _private.get(this).requestHandler) == null ? void 0 : e[Symbol.asyncDispose]());
   }
 }
-S = new WeakMap();
+x = new WeakMap();
 function isExitCode(t) {
   return t instanceof Error ? (t == null ? void 0 : t.name) === "ExitStatus" && "status" in t : !1;
 }
@@ -586,8 +586,19 @@ async function loadPHPRuntime(t, ...e) {
     return o.outboundNetworkProxyServer && (o.outboundNetworkProxyServer.close(), o.outboundNetworkProxyServer.closeAllConnections()), loadedRuntimes.delete(a), o.originalExit(c);
   }, o[RuntimeId] = a, loadedRuntimes.set(a, o), a;
 }
-function getLoadedRuntime(t) {
-  return loadedRuntimes.get(t);
+function popLoadedRuntime(t, {
+  dangerouslyKeepTheRuntimeInTheMap: e = !1
+} = {}) {
+  var s;
+  const r = loadedRuntimes.get(t);
+  if (!r)
+    throw new Error(`Runtime with id ${t} not found`);
+  if (e) {
+    if (!((s = process == null ? void 0 : process.env) != null && s.TEST))
+      throw new Error("Cannot pop runtime in non-test environment");
+    return r;
+  }
+  return loadedRuntimes.delete(t), r;
 }
 const currentJsRuntime = function() {
   var t;
@@ -950,7 +961,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 M, H, T, v, F, k, _, h, z, $, V, G, J, Y, Q, K, U, X, j, D;
+var M, H, T, v, F, k, _, h, z, $, V, G, J, Y, Q, K, U, X, q, j;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1075,7 +1086,7 @@ class PHP {
   initializeRuntime(t) {
     if (this[__private__dont__use])
       throw new Error("PHP runtime already initialized.");
-    const e = getLoadedRuntime(t);
+    const e = popLoadedRuntime(t);
     if (!e)
       throw new Error("Invalid PHP runtime id.");
     if (this[__private__dont__use] = e, this[__private__dont__use].ccall(
@@ -1276,9 +1287,7 @@ class PHP {
    * @param  request - PHP runtime options.
    */
   async run(t) {
-    const e = await this.runStream(t), r = await PHPResponse.fromStreamedResponse(
-      e
-    );
+    const e = await this.runStream(t), r = await PHPResponse.fromStreamedResponse(e);
     if (r.exitCode !== 0)
       throw new PHPExecutionFailureError(
         `PHP.run() failed with exit code ${r.exitCode}. 
@@ -1387,7 +1396,7 @@ class PHP {
   async runStream(t) {
     const e = await this.semaphore.acquire();
     let r;
-    const s = f(this, h, D).call(this, async () => {
+    const s = f(this, h, j).call(this, async () => {
       if (u(this, H) || (await this[__private__dont__use].ccall(
         "php_wasm_init",
         null,
@@ -1411,11 +1420,11 @@ class PHP {
           "The request object must have either a `code` or a `scriptPath` property."
         );
       const c = f(this, h, z).call(this, t.$_SERVER, i, a);
-      for (const d in c)
-        f(this, h, X).call(this, d, c[d]);
+      for (const p in c)
+        f(this, h, X).call(this, p, c[p]);
       const l = t.env || {};
-      for (const d in l)
-        f(this, h, j).call(this, d, l[d]);
+      for (const p in l)
+        f(this, h, q).call(this, p, l[p]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1734,10 +1743,10 @@ class PHP {
       return this.subProcess(t, e);
     u(this, H) && (u(this, _).needsRotating = !0);
     const r = await this.semaphore.acquire();
-    return await f(this, h, D).call(this, () => {
+    return await f(this, h, j).call(this, () => {
       const s = e.env || {};
       for (const [n, i] of Object.entries(s))
-        f(this, h, j).call(this, n, i);
+        f(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(
@@ -1943,41 +1952,41 @@ z = 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]
   );
-}, D = async function(t) {
+}, j = 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) => {
-    a || s || r.controller.enqueue(p.slice());
+  e.onHeaders = (d) => {
+    a || s || r.controller.enqueue(d.slice());
   };
   let s = !1;
   const n = () => {
     s || (s = !0, r.controller.close());
   }, i = await createInvertedReadableStream();
-  e.onStdout = (p) => {
-    n(), !a && i.controller.enqueue(p.slice());
+  e.onStdout = (d) => {
+    n(), !a && i.controller.enqueue(d.slice());
   };
   const o = await createInvertedReadableStream();
-  e.onStderr = (p) => {
-    a || o.controller.enqueue(p.slice());
+  e.onStderr = (d) => {
+    a || o.controller.enqueue(d.slice());
   };
   let a = !1, c;
-  const d = (async () => {
-    var p;
+  const p = (async () => {
+    var d;
     try {
       return await Promise.race([
         t(),
-        new Promise((g, b) => {
-          var q;
+        new Promise((P, b) => {
+          var D;
           c = (W) => {
             isExitCode(W.error) || b(W.error);
-          }, (q = u(this, T)) == null || q.addEventListener(
+          }, (D = u(this, T)) == null || D.addEventListener(
             "error",
             c,
             { once: !0 }
@@ -1988,42 +1997,42 @@ z = function(t, e, r) {
       if (isExitCode(m))
         return m.status;
       i.controller.error(m), o.controller.error(m), r.controller.error(m), a = !0;
-      for (const g in this)
-        typeof this[g] == "function" && (this[g] = () => {
+      for (const P in this)
+        typeof this[P] == "function" && (this[P] = () => {
           throw new Error(
             "PHP runtime has crashed – see the earlier error for details."
           );
         });
       throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), m;
     } finally {
-      a || (i.controller.close(), o.controller.close(), n(), a = !0), (p = u(this, T)) == null || p.removeEventListener(
+      a || (i.controller.close(), o.controller.close(), n(), a = !0), (d = u(this, T)) == null || d.removeEventListener(
         "error",
         c
       );
     }
   })().then(
-    (p) => (p !== 0 && this.dispatchEvent({
+    (d) => (d !== 0 && this.dispatchEvent({
       type: "request.error",
       error: new Error(
-        `PHP.run() failed with exit code ${p}.`
+        `PHP.run() failed with exit code ${d}.`
       ),
       // Distinguish between PHP request and PHP-wasm errors
       source: "php-wasm"
-    }), p),
-    (p) => {
-      const m = p.source ?? "php-wasm";
+    }), d),
+    (d) => {
+      const m = d.source ?? "php-wasm";
       throw this.dispatchEvent({
         type: "request.error",
-        error: p,
+        error: d,
         source: m
-      }), p;
+      }), d;
     }
   );
   return new StreamedPHPResponse(
     r.stream,
     i.stream,
     o.stream,
-    d
+    p
   );
 };
 function normalizeHeaders(t) {
@@ -2067,8 +2076,8 @@ const getNodeType = (t, e) => {
   try {
     return "contents" in t.lookupPath(e, { follow: !0 }).node ? "memfs" : (
       /**
-       * Could be NODEFS, PROXYFS, etc.
-       */
+      * Could be NODEFS, PROXYFS, etc.
+      */
       "not-memfs"
     );
   } catch {
@@ -2218,6 +2227,34 @@ function writeFilesStreamToPhp(t, e) {
     }
   });
 }
+class SinglePHPInstanceManager {
+  constructor(e) {
+    if (this.isAcquired = !1, !e.php && !e.phpFactory)
+      throw new Error(
+        "SinglePHPInstanceManager requires either php or phpFactory"
+      );
+    this.php = e.php, this.phpFactory = e.phpFactory;
+  }
+  async getPrimaryPhp() {
+    return this.php ? this.php : (this.phpPromise || (this.phpPromise = this.phpFactory().then((e) => (this.php = e, this.phpPromise = void 0, e))), this.phpPromise);
+  }
+  async acquirePHPInstance() {
+    if (this.isAcquired)
+      throw new Error(
+        "The PHP instance already acquired. SinglePHPInstanceManager cannot spawn another PHP instance since, by definition, it only manages a single PHP instance."
+      );
+    const e = await this.getPrimaryPhp();
+    return this.isAcquired = !0, {
+      php: e,
+      reap: () => {
+        this.isAcquired = !1;
+      }
+    };
+  }
+  async [Symbol.asyncDispose]() {
+    this.php && this.php.exit();
+  }
+}
 class MaxPhpInstancesError extends Error {
   constructor(e) {
     super(
@@ -2343,6 +2380,7 @@ class PHPProcessManager {
   }
 }
 const SupportedPHPVersions = [
+  "8.5",
   "8.4",
   "8.3",
   "8.2",
@@ -2480,7 +2518,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var P, I, L, C, A, E, N, R, x, Z, ee, te, re;
+var g, I, L, C, A, E, N, R, S, Z, ee, te, re;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2494,8 +2532,8 @@ class PHPRequestHandler {
    * @param  config - Request Handler configuration.
    */
   constructor(e) {
-    y(this, x);
-    y(this, P);
+    y(this, S);
+    y(this, g);
     y(this, I);
     y(this, L);
     y(this, C);
@@ -2508,31 +2546,43 @@ class PHPRequestHandler {
       absoluteUrl: s = typeof location == "object" ? location.href : DEFAULT_BASE_URL,
       rewriteRules: n = [],
       getFileNotFoundAction: i = () => ({ type: "404" })
-    } = e;
-    "processManager" in e ? this.processManager = e.processManager : this.processManager = new PHPProcessManager({
-      phpFactory: async (c) => {
-        const l = await e.phpFactory({
-          ...c,
-          requestHandler: this
-        });
-        return l.isDir(r) || l.mkdir(r), l.chdir(r), l.requestHandler = this, l;
-      },
-      maxPhpInstances: e.maxPhpInstances
-    }), w(this, R, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), w(this, P, r);
-    const o = new URL(s);
-    w(this, L, o.hostname), w(this, C, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), w(this, I, (o.protocol || "").replace(":", ""));
-    const a = u(this, C) !== 443 && u(this, C) !== 80;
+    } = e, o = (l) => {
+      l.isDir(r) || l.mkdir(r), l.chdir(r), l.requestHandler = this;
+    };
+    if (e.php)
+      o(e.php), this.instanceManager = new SinglePHPInstanceManager({
+        php: e.php
+      });
+    else if (e.phpFactory)
+      this.instanceManager = new PHPProcessManager({
+        phpFactory: async (l) => {
+          const p = await e.phpFactory({
+            ...l,
+            requestHandler: this
+          });
+          return o(p), p;
+        },
+        maxPhpInstances: e.maxPhpInstances
+      });
+    else
+      throw new Error(
+        "Either php or phpFactory must be provided in the configuration."
+      );
+    w(this, R, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), w(this, g, r);
+    const a = new URL(s);
+    w(this, L, a.hostname), w(this, C, a.port ? Number(a.port) : a.protocol === "https:" ? 443 : 80), w(this, I, (a.protocol || "").replace(":", ""));
+    const c = u(this, C) !== 443 && u(this, C) !== 80;
     w(this, A, [
       u(this, L),
-      a ? `:${u(this, C)}` : ""
-    ].join("")), w(this, E, o.pathname.replace(/\/+$/, "")), w(this, N, [
+      c ? `:${u(this, C)}` : ""
+    ].join("")), w(this, E, a.pathname.replace(/\/+$/, "")), w(this, N, [
       `${u(this, I)}://`,
       u(this, A),
       u(this, E)
     ].join("")), this.rewriteRules = n, this.getFileNotFoundAction = i;
   }
   async getPrimaryPhp() {
-    return await this.processManager.getPrimaryPhp();
+    return await this.instanceManager.getPrimaryPhp();
   }
   /**
    * Converts a path to an absolute URL based at the PHPRequestHandler
@@ -2566,7 +2616,7 @@ class PHPRequestHandler {
    * for the files to serve. Default: `/var/www`.
    */
   get documentRoot() {
-    return u(this, P);
+    return u(this, g);
   }
   /**
    * Serves the request – either by serving a static file, or by
@@ -2617,13 +2667,13 @@ class PHPRequestHandler {
    * @param  request - PHP Request data.
    */
   async request(e) {
-    const r = URL.canParse(e.url), s = new URL(
+    const r = looksLikeAbsoluteUrl(e.url), s = new URL(
       // Remove the hash part of the URL as it's not meant for the server.
       e.url.split("#")[0],
       r ? void 0 : DEFAULT_BASE_URL
-    ), n = f(this, x, Z).call(this, s), i = await this.getPrimaryPhp();
+    ), n = f(this, S, Z).call(this, s), i = await this.getPrimaryPhp();
     let o = joinPaths(
-      u(this, P),
+      u(this, g),
       /**
        * Turn a URL such as `https://playground/scope:my-site/wp-admin/index.php`
        * into a site-relative path, such as `/wp-admin/index.php`.
@@ -2659,10 +2709,10 @@ class PHPRequestHandler {
       let a = n.pathname;
       for (; a.startsWith("/") && a !== dirname(a); ) {
         a = dirname(a);
-        const c = joinPaths(u(this, P), a);
+        const c = joinPaths(u(this, g), a);
         if (i.isFile(c) && // Only run partial path resolution for PHP files.
         c.endsWith(".php")) {
-          o = joinPaths(u(this, P), a);
+          o = joinPaths(u(this, g), a);
           break;
         }
       }
@@ -2675,7 +2725,7 @@ class PHPRequestHandler {
         case "response":
           return a.response;
         case "internal-redirect":
-          o = joinPaths(u(this, P), a.uri);
+          o = joinPaths(u(this, g), a.uri);
           break;
         case "404":
           return PHPResponse.forHttpCode(404);
@@ -2687,7 +2737,7 @@ class PHPRequestHandler {
     }
     if (i.isFile(o))
       if (o.endsWith(".php")) {
-        const a = await f(this, x, te).call(this, e, s, n, o);
+        const a = await f(this, S, te).call(this, e, s, n, o);
         return a.ok() && a.exitCode !== 0 ? new PHPResponse(
           500,
           a.headers,
@@ -2696,7 +2746,7 @@ class PHPRequestHandler {
           a.exitCode
         ) : a;
       } else
-        return f(this, x, ee).call(this, i, o);
+        return f(this, S, ee).call(this, i, o);
     else
       return PHPResponse.forHttpCode(404);
   }
@@ -2791,11 +2841,11 @@ class PHPRequestHandler {
   prepare_$_SERVER_superglobal(e, r, s) {
     const n = {
       REMOTE_ADDR: "127.0.0.1",
-      DOCUMENT_ROOT: u(this, P),
+      DOCUMENT_ROOT: u(this, g),
       HTTPS: u(this, N).startsWith("https://") ? "on" : ""
     };
-    return n.REQUEST_URI = e.pathname + e.search, s.startsWith(u(this, P)) && (n.SCRIPT_NAME = s.substring(
-      u(this, P).length
+    return n.REQUEST_URI = e.pathname + e.search, s.startsWith(u(this, g)) && (n.SCRIPT_NAME = s.substring(
+      u(this, g).length
     ), n.PHP_SELF = r.pathname, n.REQUEST_URI.startsWith(n.SCRIPT_NAME) && (n.PATH_INFO = n.REQUEST_URI.substring(
       n.SCRIPT_NAME.length
     ), n.PATH_INFO.includes("?") && (n.PATH_INFO = n.PATH_INFO.substring(
@@ -2804,10 +2854,10 @@ class PHPRequestHandler {
     )))), n.QUERY_STRING = r.search.substring(1), n;
   }
   async [Symbol.asyncDispose]() {
-    await this.processManager[Symbol.asyncDispose]();
+    await this.instanceManager[Symbol.asyncDispose]();
   }
 }
-P = new WeakMap(), I = new WeakMap(), L = new WeakMap(), C = new WeakMap(), A = new WeakMap(), E = new WeakMap(), N = new WeakMap(), R = new WeakMap(), x = new WeakSet(), /**
+g = new WeakMap(), I = new WeakMap(), L = new WeakMap(), C = new WeakMap(), A = new WeakMap(), E = new WeakMap(), N = new WeakMap(), R = new WeakMap(), S = new WeakSet(), /**
  * Apply the rewrite rules to the original request URL.
  *
  * @param originalRequestUrl - The original request URL.
@@ -2851,14 +2901,14 @@ ee = function(e, r) {
 }, te = async function(e, r, s, n) {
   let i;
   try {
-    i = await this.processManager.acquirePHPInstance({
+    i = await this.instanceManager.acquirePHPInstance({
       considerPrimary: !0
     });
   } catch (o) {
     return o instanceof MaxPhpInstancesError ? PHPResponse.forHttpCode(502) : PHPResponse.forHttpCode(500);
   }
   try {
-    return await f(this, x, re).call(this, i.php, e, r, s, n);
+    return await f(this, S, re).call(this, i.php, e, r, s, n);
   } finally {
     i.reap();
   }
@@ -2872,8 +2922,8 @@ ee = function(e, r) {
   let c = r.body;
   if (typeof c == "object" && !(c instanceof Uint8Array)) {
     o = "POST";
-    const { bytes: l, contentType: d } = await encodeAsMultipart(c);
-    c = l, a["content-type"] = d;
+    const { bytes: l, contentType: p } = await encodeAsMultipart(c);
+    c = l, a["content-type"] = p;
   }
   try {
     const l = await e.run({
@@ -2896,9 +2946,9 @@ ee = function(e, r) {
       l.headers
     ), l;
   } catch (l) {
-    const d = l;
-    if (d != null && d.response)
-      return d.response;
+    const p = l;
+    if (p != null && p.response)
+      return p.response;
     throw l;
   }
 };
@@ -2914,6 +2964,13 @@ function applyRewriteRules(t, e) {
     }
   return t;
 }
+function looksLikeAbsoluteUrl(t) {
+  try {
+    return new URL(t), !0;
+  } catch {
+    return !1;
+  }
+}
 function rotatePHPRuntime({
   php: t,
   recreateRuntime: e,
@@ -2952,7 +3009,7 @@ function isPathToSharedFS(t, e) {
 }
 function sandboxedSpawnHandlerFactory(t) {
   return createSpawnHandler(async function(e, r, s) {
-    r.notifySpawn(), e[0] === "exec" && e.shift(), (e[0].endsWith(".php") || e[0].endsWith(".phar")) && e.unshift("php");
+    r.notifySpawn(), (e == null ? void 0 : e[0]) === "/bin/sh" && (e == null ? void 0 : e[1]) === "-c" && typeof e[2] == "string" && (e = splitShellCommand(e[2])), e[0] === "exec" && e.shift(), (e[0].endsWith(".php") || e[0].endsWith(".phar")) && e.unshift("php");
     const n = e[0].split("/").pop();
     if (e[0] === "/usr/bin/env" && e[1] === "stty" && e[2] === "size")
       r.stdout("18 140"), r.exit(0);
@@ -2972,12 +3029,16 @@ function sandboxedSpawnHandlerFactory(t) {
       r.exit(127);
       return;
     }
-    const { php: i, reap: o } = await t.acquirePHPInstance({
-      considerPrimary: !1
-    });
+    if (!t) {
+      logger.warn(
+        "Tried to spawn a PHP subprocess, but the sandboxed spawn handler was created without a getPHPInstance function."
+      ), r.exit(127);
+      return;
+    }
+    const { php: i, reap: o } = await t();
     try {
-      s.cwd && i.chdir(s.cwd);
-      const a = i.cwd();
+      s.cwd && await i.chdir(s.cwd);
+      const a = await i.cwd();
       switch (n) {
         case "php": {
           const c = await i.cli(e, {
@@ -3006,7 +3067,7 @@ function sandboxedSpawnHandlerFactory(t) {
           break;
         }
         case "ls": {
-          const c = i.listFiles(e[1] ?? a);
+          const c = await i.listFiles(e[1] ?? a);
           for (const l of c)
             r.stdout(l + `
 `);
@@ -3112,10 +3173,10 @@ class NodeSABSyncReceiveMessageTransport {
     ), Atomics.wait(i, 0, 0, 5e3) === "timed-out")
       throw new Error("Timeout waiting for response");
     for (; ; ) {
-      const d = NodeSABSyncReceiveMessageTransport.receiveMessageOnPort(e);
-      if (((l = d.message) == null ? void 0 : l.id) === o)
-        return d.message;
-      if (!d)
+      const p = NodeSABSyncReceiveMessageTransport.receiveMessageOnPort(e);
+      if (((l = p.message) == null ? void 0 : l.id) === o)
+        return p.message;
+      if (!p)
         throw new Error("No response received");
     }
   }
@@ -3193,51 +3254,51 @@ function expose(t, e = globalThis, r = ["*"], s) {
       path: [],
       ...i.data
     }, l = (i.data.argumentList || []).map(fromWireValue);
-    let d;
+    let p;
     try {
-      const p = c.slice(0, -1).reduce((g, b) => g[b], t), m = c.reduce((g, b) => g[b], t);
+      const d = c.slice(0, -1).reduce((P, b) => P[b], t), m = c.reduce((P, b) => P[b], t);
       switch (a) {
         case MessageType.GET:
-          d = m;
+          p = m;
           break;
         case MessageType.SET:
-          p[c.slice(-1)[0]] = fromWireValue(
+          d[c.slice(-1)[0]] = fromWireValue(
             i.data.value
-          ), d = !0;
+          ), p = !0;
           break;
         case MessageType.APPLY:
-          d = m.apply(p, l);
+          p = m.apply(d, l);
           break;
         case MessageType.CONSTRUCT:
           {
-            const g = new m(...l);
-            d = proxy(g);
+            const P = new m(...l);
+            p = proxy(P);
           }
           break;
         case MessageType.ENDPOINT:
           {
-            const { port1: g, port2: b } = new MessageChannel();
-            expose(t, b), d = transfer(g, [g]);
+            const { port1: P, port2: b } = new MessageChannel();
+            expose(t, b), p = transfer(P, [P]);
           }
           break;
         case MessageType.RELEASE:
-          d = void 0;
+          p = void 0;
           break;
         default:
           return;
       }
-    } catch (p) {
-      d = { value: p, [throwMarker]: 0 };
+    } catch (d) {
+      p = { value: d, [throwMarker]: 0 };
     }
-    Promise.resolve(d).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
-      const [m, g] = toWireValue(p);
-      e.postMessage({ ...m, id: o }, g), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
+    Promise.resolve(p).catch((d) => ({ value: d, [throwMarker]: 0 })).then((d) => {
+      const [m, P] = toWireValue(d);
+      e.postMessage({ ...m, id: o }, P), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
     }).catch(() => {
-      const [p, m] = toWireValue({
+      const [d, m] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      e.postMessage({ ...p, id: o }, m);
+      e.postMessage({ ...d, id: o }, m);
     }).finally(() => {
       s == null || s(i);
     });
@@ -3308,16 +3369,16 @@ function createProxy(t, e, r = [], s = function() {
     },
     set(o, a, c) {
       throwIfProxyReleased(n);
-      const [l, d] = toWireValue(c);
+      const [l, p] = toWireValue(c);
       return requestResponseMessage(
         t,
         e,
         {
           type: MessageType.SET,
-          path: [...r, a].map((p) => p.toString()),
+          path: [...r, a].map((d) => d.toString()),
           value: l
         },
-        d
+        p
       ).then(fromWireValue);
     },
     apply(o, a, c) {
@@ -3329,16 +3390,16 @@ function createProxy(t, e, r = [], s = function() {
         }).then(fromWireValue);
       if (l === "bind")
         return createProxy(t, e, r.slice(0, -1));
-      const [d, p] = processArguments(c);
+      const [p, d] = processArguments(c);
       return requestResponseMessage(
         t,
         e,
         {
           type: MessageType.APPLY,
           path: r.map((m) => m.toString()),
-          argumentList: d
+          argumentList: p
         },
-        p
+        d
       ).then(fromWireValue);
     },
     construct(o, a) {
@@ -3349,7 +3410,7 @@ function createProxy(t, e, r = [], s = function() {
         e,
         {
           type: MessageType.CONSTRUCT,
-          path: r.map((d) => d.toString()),
+          path: r.map((p) => p.toString()),
           argumentList: c
         },
         l
@@ -3520,19 +3581,19 @@ const errorProperties = [
     useToJSON: o,
     serialize: a
   });
-  for (const [l, d] of Object.entries(t)) {
-    if (d && d instanceof Uint8Array && d.constructor.name === "Buffer") {
+  for (const [l, p] of Object.entries(t)) {
+    if (p && p instanceof Uint8Array && p.constructor.name === "Buffer") {
       r[l] = "[object Buffer]";
       continue;
     }
-    if (d !== null && typeof d == "object" && typeof d.pipe == "function") {
+    if (p !== null && typeof p == "object" && typeof p.pipe == "function") {
       r[l] = "[object Stream]";
       continue;
     }
-    if (typeof d != "function") {
-      if (!d || typeof d != "object") {
+    if (typeof p != "function") {
+      if (!p || typeof p != "object") {
         try {
-          r[l] = d;
+          r[l] = p;
         } catch {
         }
         continue;
@@ -3545,10 +3606,10 @@ const errorProperties = [
     }
   }
   if (a || r instanceof Error)
-    for (const { property: l, enumerable: d } of errorProperties)
+    for (const { property: l, enumerable: p } of errorProperties)
       t[l] !== void 0 && t[l] !== null && Object.defineProperty(r, l, {
         value: isErrorLike(t[l]) || Array.isArray(t[l]) ? c(t[l]) : t[l],
-        enumerable: s ? !0 : d,
+        enumerable: s ? !0 : p,
         configurable: !0,
         writable: !0
       });
@@ -3667,7 +3728,8 @@ function setupTransferHandlers() {
   }), transferHandlers.set("PHPResponse", {
     canHandle: (r) => typeof r == "object" && r !== null && "headers" in r && "bytes" in r && "errors" in r && "exitCode" in r && "httpStatusCode" in r,
     serialize(r) {
-      return [r.toRawData(), []];
+      const s = r.toRawData(), n = [];
+      return s.bytes.buffer.byteLength > 0 && n.push(s.bytes.buffer), [s, n];
     },
     deserialize(r) {
       return PHPResponse.fromRawData(r);
@@ -3922,6 +3984,7 @@ export {
   PHPRequestHandler,
   PHPResponse,
   PHPWorker,
+  SinglePHPInstanceManager,
   StreamedPHPResponse,
   SupportedPHPVersions,
   SupportedPHPVersionsList,
@@ -3933,13 +3996,13 @@ export {
   ensurePathPrefix,
   exposeAPI,
   exposeSyncAPI,
-  getLoadedRuntime,
   getPhpIniEntries,
   inferMimeType,
   isExitCode,
   isPathToSharedFS,
   iteratePhpFiles as iterateFiles,
   loadPHPRuntime,
+  popLoadedRuntime,
   prettyPrintFullStackTrace,
   printDebugDetails,
   printResponseDebugDetails,