@php-wasm/universal 2.0.15 → 2.0.18

package/index.js

@@ -1,8 +1,8 @@
-var q = (t) => {
+var W = (t) => {
   throw TypeError(t);
 };
-var N = (t, e, r) => e.has(t) || q("Cannot " + r);
-var u = (t, e, r) => (N(t, e, "read from private field"), r ? r.call(t) : e.get(t)), _ = (t, e, r) => e.has(t) ? q("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), f = (t, e, r, s) => (N(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), m = (t, e, r) => (N(t, e, "access private method"), r);
+var O = (t, e, r) => e.has(t) || W("Cannot " + r);
+var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), _ = (t, e, r) => e.has(t) ? W("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), m = (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";
@@ -438,6 +438,15 @@ class PHPWorker {
       s();
     }
   }
+  /** @inheritDoc @php-wasm/universal!/PHP.cli */
+  async cli(e, r) {
+    const { php: s, reap: n } = await _private.get(this).requestHandler.processManager.acquirePHPInstance();
+    try {
+      return await s.cli(e, r);
+    } finally {
+      n();
+    }
+  }
   /** @inheritDoc @php-wasm/universal!/PHP.chdir */
   chdir(e) {
     return _private.get(this).php.chdir(e);
@@ -507,7 +516,45 @@ class PHPWorker {
     await ((e = _private.get(this).requestHandler) == null ? void 0 : e[Symbol.asyncDispose]());
   }
 }
-const responseTexts = {
+function isExitCode(t) {
+  return t instanceof Error ? (t == null ? void 0 : t.name) === "ExitStatus" && "status" in t : !1;
+}
+const RuntimeId = Symbol("RuntimeId"), loadedRuntimes = /* @__PURE__ */ new Map();
+let lastRuntimeId = 0;
+async function loadPHPRuntime(t, ...e) {
+  const r = Object.assign({}, ...e), [s, n, i] = makePromise(), o = t.init(currentJsRuntime, {
+    onAbort(c) {
+      i(c), logger.error(c);
+    },
+    ENV: {},
+    // Emscripten sometimes prepends a '/' to the path, which
+    // breaks vite dev mode. An identity `locateFile` function
+    // fixes it.
+    locateFile: (c) => c,
+    ...r,
+    noInitialRun: !0,
+    onRuntimeInitialized() {
+      r.onRuntimeInitialized && r.onRuntimeInitialized(o), n();
+    }
+  });
+  await s;
+  const a = ++lastRuntimeId;
+  return o.FS, o.id = a, o.originalExit = o._exit, o._exit = function(c) {
+    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);
+}
+const currentJsRuntime = function() {
+  var t;
+  return typeof process < "u" && ((t = process.release) == null ? void 0 : t.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
+}(), makePromise = () => {
+  const t = [], e = new Promise((r, s) => {
+    t.push(r, s);
+  });
+  return t.unshift(e), t;
+}, responseTexts = {
   500: "Internal Server Error",
   502: "Bad Gateway",
   404: "Not Found",
@@ -693,42 +740,6 @@ class PHPResponse {
     return new TextDecoder().decode(this.bytes);
   }
 }
-const RuntimeId = Symbol("RuntimeId"), loadedRuntimes = /* @__PURE__ */ new Map();
-let lastRuntimeId = 0;
-async function loadPHPRuntime(t, ...e) {
-  const r = Object.assign({}, ...e), [s, n, i] = makePromise(), o = t.init(currentJsRuntime, {
-    onAbort(c) {
-      i(c), logger.error(c);
-    },
-    ENV: {},
-    // Emscripten sometimes prepends a '/' to the path, which
-    // breaks vite dev mode. An identity `locateFile` function
-    // fixes it.
-    locateFile: (c) => c,
-    ...r,
-    noInitialRun: !0,
-    onRuntimeInitialized() {
-      r.onRuntimeInitialized && r.onRuntimeInitialized(o), n();
-    }
-  });
-  await s;
-  const a = ++lastRuntimeId;
-  return o.FS, o.id = a, o.originalExit = o._exit, o._exit = function(c) {
-    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);
-}
-const currentJsRuntime = function() {
-  var t;
-  return typeof process < "u" && ((t = process.release) == null ? void 0 : t.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
-}(), makePromise = () => {
-  const t = [], e = new Promise((r, s) => {
-    t.push(r, s);
-  });
-  return t.unshift(e), t;
-};
 var _a;
 const kError = Symbol("error"), kMessage = Symbol("message");
 class ErrorEvent2 extends (_a = Event, _a) {
@@ -752,9 +763,6 @@ class ErrorEvent2 extends (_a = Event, _a) {
 Object.defineProperty(ErrorEvent2.prototype, "error", { enumerable: !0 });
 Object.defineProperty(ErrorEvent2.prototype, "message", { enumerable: !0 });
 const ErrorEvent = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : ErrorEvent2;
-function isExitCode(t) {
-  return t instanceof Error ? (t == null ? void 0 : t.name) === "ExitStatus" && "status" in t : !1;
-}
 class UnhandledRejectionsTarget extends EventTarget {
   constructor() {
     super(...arguments), this.listenersCount = 0;
@@ -899,7 +907,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 k, E, x, g, v, T, h, z, B, W, $, V, G, J, Y, K, L, X, O, U;
+var k, H, b, E, T, C, y, h, B, z, $, V, G, J, Y, K, L, X, U, j;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -911,12 +919,21 @@ class PHP {
   constructor(t) {
     _(this, h);
     _(this, k);
-    _(this, E);
-    _(this, x);
-    _(this, g);
-    _(this, v);
-    _(this, T);
-    f(this, E, !1), f(this, x, null), f(this, g, /* @__PURE__ */ new Map()), f(this, v, []), f(this, T, {}), this.cliCalled = !1, this.runStreamCalled = !1, this.semaphore = new Semaphore({ concurrency: 1 }), t !== void 0 && this.initializeRuntime(t);
+    _(this, H, !1);
+    _(this, b, null);
+    _(this, E, /* @__PURE__ */ new Map());
+    _(this, T, []);
+    _(this, C, {});
+    _(this, y, {
+      enabled: !1,
+      recreateRuntime: () => 0,
+      needsRotating: !1,
+      maxRequests: 400,
+      requestsMade: 0
+    });
+    this.semaphore = new Semaphore({ concurrency: 1 }), t !== void 0 && this.initializeRuntime(t), this.addEventListener("request.error", (e) => {
+      e.source === "php-wasm" && (u(this, y).needsRotating = !0);
+    });
   }
   /**
    * Adds an event listener for a PHP event.
@@ -924,7 +941,7 @@ class PHP {
    * @param listener - The listener function to be called when the event is triggered.
    */
   addEventListener(t, e) {
-    u(this, g).has(t) || u(this, g).set(t, /* @__PURE__ */ new Set()), u(this, g).get(t).add(e);
+    u(this, E).has(t) || u(this, E).set(t, /* @__PURE__ */ new Set()), u(this, E).get(t).add(e);
   }
   /**
    * Removes an event listener for a PHP event.
@@ -933,10 +950,10 @@ class PHP {
    */
   removeEventListener(t, e) {
     var r;
-    (r = u(this, g).get(t)) == null || r.delete(e);
+    (r = u(this, E).get(t)) == null || r.delete(e);
   }
   dispatchEvent(t) {
-    const e = u(this, g).get(t.type);
+    const e = u(this, E).get(t.type);
     if (e)
       for (const r of e)
         r(t);
@@ -981,8 +998,8 @@ class PHP {
    * @param listener Callback function to handle the message.
    */
   onMessage(t) {
-    return u(this, v).push(t), async () => {
-      f(this, v, u(this, v).filter(
+    return u(this, T).push(t), async () => {
+      w(this, T, u(this, T).filter(
         (e) => e !== t
       ));
     };
@@ -1076,13 +1093,13 @@ class PHP {
 				}
 				`
     ), e.onMessage = async (r) => {
-      for (const s of u(this, v)) {
+      for (const s of u(this, T)) {
         const n = await s(r);
         if (n)
           return n;
       }
       return "";
-    }, f(this, x, improveWASMErrorReporting(e)), this.dispatchEvent({
+    }, w(this, b, improveWASMErrorReporting(e)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1097,7 +1114,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?"
       );
-    f(this, k, t);
+    w(this, k, t);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -1311,19 +1328,22 @@ class PHP {
    * @returns A StreamedPHPResponse object.
    */
   async runStream(t) {
-    if (this.cliCalled)
-      throw new Error(
-        "php.runStream() can only be called if php.cli() was not called before. The two methods set a conflicting C-level global state."
-      );
-    this.runStreamCalled = !0;
     const e = await this.semaphore.acquire();
     let r;
-    const s = m(this, h, U).call(this, async () => {
-      if (u(this, E) || (await m(this, h, B).call(this), f(this, E, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
+    const s = m(this, h, j).call(this, async () => {
+      if (u(this, H) || (await this[__private__dont__use].ccall(
+        "php_wasm_init",
+        null,
+        [],
+        [],
+        {
+          isAsync: !0
+        }
+      ), w(this, H, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
-      m(this, h, W).call(this, t.relativeUri || ""), m(this, h, J).call(this, t.method || "GET");
+      m(this, h, z).call(this, t.relativeUri || ""), m(this, h, J).call(this, t.method || "GET");
       const i = normalizeHeaders(t.headers || {}), o = i.host || "example.com:443", a = m(this, h, G).call(this, o, t.protocol || "http");
       if (m(this, h, $).call(this, o), m(this, h, V).call(this, a), m(this, h, Y).call(this, i), t.body && (r = m(this, h, K).call(this, t.body)), typeof t.code == "string")
         this.writeFile("/internal/eval.php", t.code), m(this, h, L).call(this, "/internal/eval.php");
@@ -1333,12 +1353,12 @@ class PHP {
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const c = m(this, h, z).call(this, t.$_SERVER, i, a);
+      const c = m(this, h, B).call(this, t.$_SERVER, i, a);
       for (const p in c)
         m(this, h, X).call(this, p, c[p]);
       const l = t.env || {};
       for (const p in l)
-        m(this, h, O).call(this, p, l[p]);
+        m(this, h, U).call(this, p, l[p]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1360,7 +1380,12 @@ class PHP {
     return s.then(
       (i) => (i.finished.finally(n), i),
       (i) => {
-        throw n(), i;
+        try {
+          n();
+        } catch {
+        } finally {
+          throw i;
+        }
       }
     );
   }
@@ -1534,6 +1559,29 @@ class PHP {
   fileExists(t) {
     return FSHelpers.fileExists(this[__private__dont__use].FS, t);
   }
+  /**
+   * Enables inline PHP runtime rotation after a certain number of requests
+   * or an internal crash.
+   */
+  enableRuntimeRotation(t) {
+    w(this, y, {
+      ...u(this, y),
+      enabled: !0,
+      recreateRuntime: t.recreateRuntime,
+      maxRequests: t.maxRequests ?? 400,
+      cwd: t.cwd
+    });
+  }
+  async rotateRuntime() {
+    if (!u(this, y).enabled)
+      throw new Error(
+        "Runtime rotation is not enabled. Call enableRuntimeRotation() first."
+      );
+    await this.hotSwapPHPRuntime(
+      await u(this, y).recreateRuntime(),
+      u(this, y).cwd
+    ), u(this, y).requestsMade = 0, u(this, y).needsRotating = !1;
+  }
   /**
    * Hot-swaps the PHP runtime for a new one without
    * interrupting the operations of this PHP instance.
@@ -1545,16 +1593,16 @@ class PHP {
    *             accepts a constructor-level cwd argument.
    */
   async hotSwapPHPRuntime(t, e) {
-    const r = this[__private__dont__use].FS, s = [];
-    for (const [n, i] of Object.entries(u(this, T)))
-      s.push({ mountHandler: i.mountHandler, vfsPath: n }), await i.unmount();
+    const r = this[__private__dont__use].FS, s = this[__private__dont__use].spawnProcess, n = [];
+    for (const [i, o] of Object.entries(u(this, C)))
+      n.push({ mountHandler: o.mountHandler, vfsPath: i }), await o.unmount();
     try {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(t), u(this, k) && this.setSapiName(u(this, k)), copyFS(r, this[__private__dont__use].FS, "/internal"), e && copyFS(r, this[__private__dont__use].FS, e);
-    for (const { mountHandler: n, vfsPath: i } of s)
-      this.mkdir(i), await this.mount(i, n);
+    this.initializeRuntime(t), s && (this[__private__dont__use].spawnProcess = s), u(this, k) && this.setSapiName(u(this, k)), copyFS(r, this[__private__dont__use].FS, "/internal"), e && copyFS(r, this[__private__dont__use].FS, e);
+    for (const { mountHandler: i, vfsPath: o } of n)
+      this.mkdir(o), await this.mount(o, i);
   }
   /**
    * Mounts a filesystem to a given path in the PHP filesystem.
@@ -1571,10 +1619,10 @@ class PHP {
     ), s = {
       mountHandler: e,
       unmount: async () => {
-        await r(), delete u(this, T)[t];
+        await r(), delete u(this, C)[t];
       }
     };
-    return u(this, T)[t] = s, () => {
+    return u(this, C)[t] = s, () => {
       s.unmount();
     };
   }
@@ -1592,29 +1640,26 @@ class PHP {
    * @returns The exit code of the CLI session.
    */
   async cli(t, e = {}) {
-    if (this.cliCalled)
-      throw new Error(
-        "php.cli() can only be called once. The method sets a C-level global state that does not allow repeated calls."
-      );
-    if (this.runStreamCalled)
-      throw new Error(
-        "php.cli() can only be called if php.runStream() was not called before. The two methods set a conflicting C-level global state."
-      );
-    this.cliCalled = !0;
-    const r = await this.semaphore.acquire(), s = e.env || {};
-    for (const [n, i] of Object.entries(s))
-      m(this, h, O).call(this, n, i);
-    t = [t[0], "-c", PHP_INI_PATH, ...t.slice(1)];
-    for (const n of t)
-      this[__private__dont__use].ccall(
-        "wasm_add_cli_arg",
-        null,
-        [STRING],
-        [n]
-      );
-    return await m(this, h, U).call(this, () => this[__private__dont__use].ccall("run_cli", null, [], [], {
-      async: !0
-    })).then((n) => (n.exitCode.finally(r), n));
+    u(this, H) && (u(this, y).needsRotating = !0);
+    const r = await this.semaphore.acquire();
+    return await m(this, h, j).call(this, () => {
+      const s = e.env || {};
+      for (const [n, i] of Object.entries(s))
+        m(this, h, U).call(this, n, i);
+      t = [t[0], "-c", PHP_INI_PATH, ...t.slice(1)];
+      for (const n of t)
+        this[__private__dont__use].ccall(
+          "wasm_add_cli_arg",
+          null,
+          [STRING],
+          [n]
+        );
+      return this[__private__dont__use].ccall("run_cli", null, [], [], {
+        async: !0
+      });
+    }).then((s) => (s.exitCode.finally(r), s)).finally(() => {
+      u(this, y).needsRotating = !0;
+    });
   }
   setSkipShebang(t) {
     this[__private__dont__use].ccall(
@@ -1626,19 +1671,19 @@ class PHP {
   }
   exit(t = 0) {
     this.dispatchEvent({
-      type: "runtime.beforedestroy"
+      type: "runtime.beforeExit"
     });
     try {
       this[__private__dont__use]._exit(t);
     } catch {
     }
-    f(this, E, !1), f(this, x, null), this[__private__dont__use] && (delete this[__private__dont__use].onMessage, delete this[__private__dont__use]);
+    w(this, H, !1), w(this, b, null), this[__private__dont__use] && (delete this[__private__dont__use].onMessage, delete this[__private__dont__use]);
   }
   [Symbol.dispose]() {
-    u(this, E) && this.exit(0);
+    this.exit(0);
   }
 }
-k = new WeakMap(), E = new WeakMap(), x = new WeakMap(), g = new WeakMap(), v = new WeakMap(), T = new WeakMap(), h = new WeakSet(), /**
+k = new WeakMap(), H = new WeakMap(), b = new WeakMap(), E = new WeakMap(), T = new WeakMap(), C = new WeakMap(), y = new WeakMap(), h = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -1647,7 +1692,7 @@ k = new WeakMap(), E = new WeakMap(), x = new WeakMap(), g = new WeakMap(), v =
  *             was provided.
  * @returns Computed $_SERVER entries.
  */
-z = function(t, e, r) {
+B = function(t, e, r) {
   const s = {
     ...t || {}
   };
@@ -1657,11 +1702,7 @@ z = function(t, e, r) {
     ["content-type", "content-length"].includes(n.toLowerCase()) && (i = ""), s[`${i}${n.toUpperCase().replace(/-/g, "_")}`] = e[n];
   }
   return s;
-}, B = function() {
-  return this[__private__dont__use].ccall("php_wasm_init", null, [], [], {
-    isAsync: !0
-  });
-}, W = function(t) {
+}, z = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1757,14 +1798,15 @@ z = function(t, e, r) {
     [STRING, STRING],
     [t, e]
   );
-}, O = function(t, e) {
+}, U = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, U = async function(t) {
+}, j = async function(t) {
+  u(this, y).enabled && u(this, y).needsRotating && await this.rotateRuntime(), ++u(this, y).requestsMade, u(this, y).requestsMade >= u(this, y).maxRequests && (u(this, y).needsRotating = !0);
   const e = this[__private__dont__use], r = await createInvertedReadableStream();
   e.onHeaders = (d) => {
     a || s || r.controller.enqueue(d.slice());
@@ -1786,30 +1828,30 @@ z = function(t, e, r) {
     try {
       return await Promise.race([
         t(),
-        new Promise((w, b) => {
-          var j;
+        new Promise((g, R) => {
+          var q;
           c = (D) => {
-            isExitCode(D.error) || b(D.error);
-          }, (j = u(this, x)) == null || j.addEventListener(
+            isExitCode(D.error) || R(D.error);
+          }, (q = u(this, b)) == null || q.addEventListener(
             "error",
             c,
             { once: !0 }
           );
         })
       ]);
-    } catch (y) {
-      if (isExitCode(y))
-        return y.status;
-      i.controller.error(y), o.controller.error(y), r.controller.error(y), a = !0;
-      for (const w in this)
-        typeof this[w] == "function" && (this[w] = () => {
+    } catch (f) {
+      if (isExitCode(f))
+        return f.status;
+      i.controller.error(f), o.controller.error(f), r.controller.error(f), a = !0;
+      for (const g in this)
+        typeof this[g] == "function" && (this[g] = () => {
           throw new Error(
             "PHP runtime has crashed – see the earlier error for details."
           );
         });
-      throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), y;
+      throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), f;
     } finally {
-      a || (i.controller.close(), o.controller.close(), n(), a = !0), (d = u(this, x)) == null || d.removeEventListener(
+      a || (i.controller.close(), o.controller.close(), n(), a = !0), (d = u(this, b)) == null || d.removeEventListener(
         "error",
         c
       );
@@ -1824,11 +1866,11 @@ z = function(t, e, r) {
       source: "php-wasm"
     }), d),
     (d) => {
+      const f = d.source ?? "php-wasm";
       throw this.dispatchEvent({
         type: "request.error",
         error: d,
-        // Distinguish between PHP request and PHP-wasm errors
-        source: d.source ?? "php-wasm"
+        source: f
       }), d;
     }
   );
@@ -2286,7 +2328,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var S, C, M, F, I, P, A, R, H, Q, Z, ee;
+var x, I, N, F, M, P, A, v, S, Q, Z, ee;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2300,15 +2342,15 @@ class PHPRequestHandler {
    * @param  config - Request Handler configuration.
    */
   constructor(e) {
-    _(this, H);
     _(this, S);
-    _(this, C);
-    _(this, M);
-    _(this, F);
+    _(this, x);
     _(this, I);
+    _(this, N);
+    _(this, F);
+    _(this, M);
     _(this, P);
     _(this, A);
-    _(this, R);
+    _(this, v);
     const {
       documentRoot: r = "/www/",
       absoluteUrl: s = typeof location == "object" ? location.href : DEFAULT_BASE_URL,
@@ -2324,16 +2366,16 @@ class PHPRequestHandler {
         return l.isDir(r) || l.mkdir(r), l.chdir(r), l.requestHandler = this, l;
       },
       maxPhpInstances: e.maxPhpInstances
-    }), f(this, R, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), f(this, S, r);
+    }), w(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), w(this, x, r);
     const o = new URL(s);
-    f(this, M, o.hostname), f(this, F, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), f(this, C, (o.protocol || "").replace(":", ""));
+    w(this, N, o.hostname), w(this, F, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), w(this, I, (o.protocol || "").replace(":", ""));
     const a = u(this, F) !== 443 && u(this, F) !== 80;
-    f(this, I, [
-      u(this, M),
+    w(this, M, [
+      u(this, N),
       a ? `:${u(this, F)}` : ""
-    ].join("")), f(this, P, o.pathname.replace(/\/+$/, "")), f(this, A, [
-      `${u(this, C)}://`,
-      u(this, I),
+    ].join("")), w(this, P, o.pathname.replace(/\/+$/, "")), w(this, A, [
+      `${u(this, I)}://`,
+      u(this, M),
       u(this, P)
     ].join("")), this.rewriteRules = n, this.getFileNotFoundAction = i;
   }
@@ -2372,7 +2414,7 @@ class PHPRequestHandler {
    * for the files to serve. Default: `/var/www`.
    */
   get documentRoot() {
-    return u(this, S);
+    return u(this, x);
   }
   /**
    * Serves the request – either by serving a static file, or by
@@ -2434,7 +2476,7 @@ class PHPRequestHandler {
       ),
       this.rewriteRules
     ), i = await this.getPrimaryPhp();
-    let o = joinPaths(u(this, S), n);
+    let o = joinPaths(u(this, x), n);
     if (i.isDir(o)) {
       if (!o.endsWith("/"))
         return new PHPResponse(
@@ -2458,7 +2500,7 @@ class PHPRequestHandler {
         case "response":
           return a.response;
         case "internal-redirect":
-          o = joinPaths(u(this, S), a.uri);
+          o = joinPaths(u(this, x), a.uri);
           break;
         case "404":
           return PHPResponse.forHttpCode(404);
@@ -2474,7 +2516,7 @@ class PHPRequestHandler {
           ...e,
           // Pass along URL with the #fragment filtered out
           url: s.toString()
-        }, c = await m(this, H, Z).call(this, a, o);
+        }, c = await m(this, S, Z).call(this, a, o);
         return c.ok() && c.exitCode !== 0 ? new PHPResponse(
           500,
           c.headers,
@@ -2483,7 +2525,7 @@ class PHPRequestHandler {
           c.exitCode
         ) : c;
       } else
-        return m(this, H, Q).call(this, i, o);
+        return m(this, S, Q).call(this, i, o);
     else
       return PHPResponse.forHttpCode(404);
   }
@@ -2491,7 +2533,7 @@ class PHPRequestHandler {
     await this.processManager[Symbol.asyncDispose]();
   }
 }
-S = new WeakMap(), C = new WeakMap(), M = new WeakMap(), F = new WeakMap(), I = new WeakMap(), P = new WeakMap(), A = new WeakMap(), R = new WeakMap(), H = new WeakSet(), /**
+x = new WeakMap(), I = new WeakMap(), N = new WeakMap(), F = new WeakMap(), M = new WeakMap(), P = new WeakMap(), A = new WeakMap(), v = new WeakMap(), S = new WeakSet(), /**
  * Serves a static file from the PHP filesystem.
  *
  * @param  fsPath - Absolute path of the static file to serve.
@@ -2522,17 +2564,17 @@ Q = function(e, r) {
     return n instanceof MaxPhpInstancesError ? PHPResponse.forHttpCode(502) : PHPResponse.forHttpCode(500);
   }
   try {
-    return await m(this, H, ee).call(this, s.php, e, r);
+    return await m(this, S, ee).call(this, s.php, e, r);
   } finally {
     s.reap();
   }
 }, ee = async function(e, r, s) {
   let n = "GET";
   const i = {
-    host: u(this, I),
+    host: u(this, M),
     ...normalizeHeaders(r.headers || {})
   };
-  u(this, R) && (i.cookie = u(this, R).getCookieRequestHeader());
+  u(this, v) && (i.cookie = u(this, v).getCookieRequestHeader());
   let o = r.body;
   if (typeof o == "object" && !(o instanceof Uint8Array)) {
     n = "POST";
@@ -2545,18 +2587,18 @@ Q = function(e, r) {
         toRelativeUrl(new URL(r.url)),
         u(this, P)
       ),
-      protocol: u(this, C),
+      protocol: u(this, I),
       method: r.method || n,
       $_SERVER: {
         REMOTE_ADDR: "127.0.0.1",
-        DOCUMENT_ROOT: u(this, S),
+        DOCUMENT_ROOT: u(this, x),
         HTTPS: u(this, A).startsWith("https://") ? "on" : ""
       },
       body: o,
       scriptPath: s,
       headers: i
     });
-    return u(this, R) && u(this, R).rememberCookiesFromResponseHeaders(
+    return u(this, v) && u(this, v).rememberCookiesFromResponseHeaders(
       a.headers
     ), a;
   } catch (a) {
@@ -2580,34 +2622,13 @@ function rotatePHPRuntime({
   php: t,
   cwd: e,
   recreateRuntime: r,
-  /*
-   * 400 is an arbitrary number that should trigger a rotation
-   * way before the memory gets too fragmented. If it doesn't,
-   * let's explore:
-   * * Rotating based on an actual memory usage and
-   *   fragmentation.
-   * * Resetting HEAP to its initial value.
-   */
   maxRequests: s = 400
 }) {
-  let n = 0;
-  async function i() {
-    const c = await t.semaphore.acquire();
-    try {
-      await t.hotSwapPHPRuntime(await r(), e), n = 0;
-    } finally {
-      c();
-    }
-  }
-  async function o() {
-    ++n < s || await i();
-  }
-  async function a(c) {
-    c.type === "request.error" && c.source === "php-wasm" && await i();
-  }
-  return t.addEventListener("request.error", a), t.addEventListener("request.end", o), function() {
-    t.removeEventListener("request.error", a), t.removeEventListener("request.end", o);
-  };
+  return t.enableRuntimeRotation({
+    recreateRuntime: r,
+    maxRequests: s,
+    cwd: e
+  });
 }
 async function writeFiles(t, e, r, { rmRoot: s = !1 } = {}) {
   s && await t.isDir(e) && await t.rmdir(e, { recursive: !0 });
@@ -2854,10 +2875,10 @@ function expose(t, e = globalThis, r = ["*"], s) {
     }, l = (i.data.argumentList || []).map(fromWireValue);
     let p;
     try {
-      const d = c.slice(0, -1).reduce((w, b) => w[b], t), y = c.reduce((w, b) => w[b], t);
+      const d = c.slice(0, -1).reduce((g, R) => g[R], t), f = c.reduce((g, R) => g[R], t);
       switch (a) {
         case MessageType.GET:
-          p = y;
+          p = f;
           break;
         case MessageType.SET:
           d[c.slice(-1)[0]] = fromWireValue(
@@ -2865,18 +2886,18 @@ function expose(t, e = globalThis, r = ["*"], s) {
           ), p = !0;
           break;
         case MessageType.APPLY:
-          p = y.apply(d, l);
+          p = f.apply(d, l);
           break;
         case MessageType.CONSTRUCT:
           {
-            const w = new y(...l);
-            p = proxy(w);
+            const g = new f(...l);
+            p = proxy(g);
           }
           break;
         case MessageType.ENDPOINT:
           {
-            const { port1: w, port2: b } = new MessageChannel();
-            expose(t, b), p = transfer(w, [w]);
+            const { port1: g, port2: R } = new MessageChannel();
+            expose(t, R), p = transfer(g, [g]);
           }
           break;
         case MessageType.RELEASE:
@@ -2889,14 +2910,14 @@ function expose(t, e = globalThis, r = ["*"], s) {
       p = { value: d, [throwMarker]: 0 };
     }
     Promise.resolve(p).catch((d) => ({ value: d, [throwMarker]: 0 })).then((d) => {
-      const [y, w] = toWireValue(d);
-      e.postMessage({ ...y, 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(d);
+      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 [d, y] = toWireValue({
+      const [d, f] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      e.postMessage({ ...d, id: o }, y);
+      e.postMessage({ ...d, id: o }, f);
     }).finally(() => {
       s == null || s(i);
     });
@@ -2994,7 +3015,7 @@ function createProxy(t, e, r = [], s = function() {
         e,
         {
           type: MessageType.APPLY,
-          path: r.map((y) => y.toString()),
+          path: r.map((f) => f.toString()),
           argumentList: p
         },
         d