@php-wasm/fs-journal 0.5.6 → 0.6.1

package/index.js

@@ -1,74 +1,77 @@
-var ne = (r, e, t) => {
-  if (!e.has(r))
-    throw TypeError("Cannot " + t);
+var Z = (e, t, r) => {
+  if (!t.has(e))
+    throw TypeError("Cannot " + r);
 };
-var a = (r, e, t) => (ne(r, e, "read from private field"), t ? t.call(r) : e.get(r)), c = (r, e, t) => {
-  if (e.has(r))
+var a = (e, t, r) => (Z(e, t, "read from private field"), r ? r.call(e) : t.get(e)), l = (e, t, r) => {
+  if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
-  e instanceof WeakSet ? e.add(r) : e.set(r, t);
-}, d = (r, e, t, n) => (ne(r, e, "write to private field"), n ? n.call(r, t) : e.set(r, t), t);
-var m = (r, e, t) => (ne(r, e, "access private method"), t);
+  t instanceof WeakSet ? t.add(e) : t.set(e, r);
+}, d = (e, t, r, s) => (Z(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
+var p = (e, t, r) => (Z(e, t, "access private method"), r);
 if (typeof File > "u") {
-  class r extends Blob {
-    constructor(t, n, s) {
-      super(t);
-      let o;
-      s != null && s.lastModified && (o = /* @__PURE__ */ new Date()), (!o || isNaN(o.getFullYear())) && (o = /* @__PURE__ */ new Date()), this.lastModifiedDate = o, this.lastModified = o.getMilliseconds(), this.name = n || "";
+  class e extends Blob {
+    constructor(r, s, i) {
+      super(r);
+      let n;
+      i != null && i.lastModified && (n = /* @__PURE__ */ new Date()), (!n || isNaN(n.getFullYear())) && (n = /* @__PURE__ */ new Date()), this.lastModifiedDate = n, this.lastModified = n.getMilliseconds(), this.name = s || "";
     }
   }
-  global.File = r;
+  global.File = e;
 }
-function me(r) {
-  return new Promise(function(e, t) {
-    r.onload = r.onerror = function(n) {
-      r.onload = r.onerror = null, n.type === "load" ? e(r.result) : t(new Error("Failed to read the blob/file"));
+function asPromise(e) {
+  return new Promise(function(t, r) {
+    e.onload = e.onerror = function(s) {
+      e.onload = e.onerror = null, s.type === "load" ? t(e.result) : r(new Error("Failed to read the blob/file"));
     };
   });
 }
 typeof Blob.prototype.arrayBuffer > "u" && (Blob.prototype.arrayBuffer = function() {
-  const e = new FileReader();
-  return e.readAsArrayBuffer(this), me(e);
+  const t = new FileReader();
+  return t.readAsArrayBuffer(this), asPromise(t);
 });
 typeof Blob.prototype.text > "u" && (Blob.prototype.text = function() {
-  const e = new FileReader();
-  return e.readAsText(this), me(e);
+  const t = new FileReader();
+  return t.readAsText(this), asPromise(t);
 });
-function $e() {
-  const r = new Uint8Array([1, 2, 3, 4]), t = new File([r], "test").stream();
+function isByobSupported() {
+  const e = new Uint8Array([1, 2, 3, 4]), r = new File([e], "test").stream();
   try {
-    return t.getReader({ mode: "byob" }), !0;
+    return r.getReader({ mode: "byob" }), !0;
   } catch {
     return !1;
   }
 }
-(typeof Blob.prototype.stream > "u" || !$e()) && (Blob.prototype.stream = function() {
-  let r = 0;
-  const e = this;
+(typeof Blob.prototype.stream > "u" || !isByobSupported()) && (Blob.prototype.stream = function() {
+  let e = 0;
+  const t = this;
   return new ReadableStream({
     type: "bytes",
     // 0.5 MB seems like a reasonable chunk size, let's adjust
     // this if needed.
     autoAllocateChunkSize: 512 * 1024,
-    async pull(t) {
-      const n = t.byobRequest.view, o = await e.slice(r, r + n.byteLength).arrayBuffer(), i = new Uint8Array(o);
-      new Uint8Array(n.buffer).set(i);
-      const u = i.byteLength;
-      t.byobRequest.respond(u), r += u, r >= e.size && t.close();
+    async pull(r) {
+      const s = r.byobRequest.view, n = await t.slice(e, e + s.byteLength).arrayBuffer(), o = new Uint8Array(n);
+      new Uint8Array(s.buffer).set(o);
+      const c = o.byteLength;
+      r.byobRequest.respond(c), e += c, e >= t.size && r.close();
     }
   });
 });
 if (typeof CustomEvent > "u") {
-  class r extends Event {
-    constructor(t, n = {}) {
-      super(t, n), this.detail = n.detail;
+  class e extends Event {
+    constructor(r, s = {}) {
+      super(r, s), this.detail = s.detail;
     }
     initCustomEvent() {
     }
   }
-  globalThis.CustomEvent = r;
+  globalThis.CustomEvent = e;
 }
-const ae = Symbol("error"), le = Symbol("message");
-class oe extends Event {
+typeof crypto > "u" && import("./__vite-browser-external-2447137e.js").then((e) => {
+  global.crypto = e;
+});
+const kError = Symbol("error"), kMessage = Symbol("message");
+class ErrorEvent2 extends Event {
   /**
    * Create a new `ErrorEvent`.
    *
@@ -76,93 +79,93 @@ class oe extends Event {
    * @param options A dictionary object that allows for setting
    *                  attributes via object members of the same name.
    */
-  constructor(e, t = {}) {
-    super(e), this[ae] = t.error === void 0 ? null : t.error, this[le] = t.message === void 0 ? "" : t.message;
+  constructor(t, r = {}) {
+    super(t), this[kError] = r.error === void 0 ? null : r.error, this[kMessage] = r.message === void 0 ? "" : r.message;
   }
   get error() {
-    return this[ae];
+    return this[kError];
   }
   get message() {
-    return this[le];
+    return this[kMessage];
   }
 }
-Object.defineProperty(oe.prototype, "error", { enumerable: !0 });
-Object.defineProperty(oe.prototype, "message", { enumerable: !0 });
-const Ie = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : oe;
-function Ne(r) {
-  return r instanceof Error ? "exitCode" in r && (r == null ? void 0 : r.exitCode) === 0 || (r == null ? void 0 : r.name) === "ExitStatus" && "status" in r && r.status === 0 : !1;
+Object.defineProperty(ErrorEvent2.prototype, "error", { enumerable: !0 });
+Object.defineProperty(ErrorEvent2.prototype, "message", { enumerable: !0 });
+const ErrorEvent = typeof globalThis.ErrorEvent == "function" ? globalThis.ErrorEvent : ErrorEvent2;
+function isExitCodeZero(e) {
+  return e instanceof Error ? "exitCode" in e && (e == null ? void 0 : e.exitCode) === 0 || (e == null ? void 0 : e.name) === "ExitStatus" && "status" in e && e.status === 0 : !1;
 }
-class Me extends EventTarget {
+class UnhandledRejectionsTarget extends EventTarget {
   constructor() {
     super(...arguments), this.listenersCount = 0;
   }
-  addEventListener(e, t) {
-    ++this.listenersCount, super.addEventListener(e, t);
+  addEventListener(t, r) {
+    ++this.listenersCount, super.addEventListener(t, r);
   }
-  removeEventListener(e, t) {
-    --this.listenersCount, super.removeEventListener(e, t);
+  removeEventListener(t, r) {
+    --this.listenersCount, super.removeEventListener(t, r);
   }
   hasListeners() {
     return this.listenersCount > 0;
   }
 }
-function Le(r) {
-  r.asm = {
-    ...r.asm
+function improveWASMErrorReporting(e) {
+  e.asm = {
+    ...e.asm
   };
-  const e = new Me();
-  for (const t in r.asm)
-    if (typeof r.asm[t] == "function") {
-      const n = r.asm[t];
-      r.asm[t] = function(...s) {
-        var o;
+  const t = new UnhandledRejectionsTarget();
+  for (const r in e.asm)
+    if (typeof e.asm[r] == "function") {
+      const s = e.asm[r];
+      e.asm[r] = function(...i) {
+        var n;
         try {
-          return n(...s);
-        } catch (i) {
-          if (!(i instanceof Error))
-            throw i;
-          const u = Be(
-            i,
-            (o = r.lastAsyncifyStackSource) == null ? void 0 : o.stack
+          return s(...i);
+        } catch (o) {
+          if (!(o instanceof Error))
+            throw o;
+          const c = clarifyErrorMessage(
+            o,
+            (n = e.lastAsyncifyStackSource) == null ? void 0 : n.stack
           );
-          if (r.lastAsyncifyStackSource && (i.cause = r.lastAsyncifyStackSource), e.hasListeners()) {
-            e.dispatchEvent(
-              new Ie("error", {
-                error: i,
-                message: u
+          if (e.lastAsyncifyStackSource && (o.cause = e.lastAsyncifyStackSource), t.hasListeners()) {
+            t.dispatchEvent(
+              new ErrorEvent("error", {
+                error: o,
+                message: c
               })
             );
             return;
           }
-          throw Ne(i) || qe(u), i;
+          throw isExitCodeZero(o) || showCriticalErrorBox(c), o;
         }
       };
     }
-  return e;
+  return t;
 }
-let se = [];
-function Ue() {
-  return se;
+let functionsMaybeMissingFromAsyncify = [];
+function getFunctionsMaybeMissingFromAsyncify() {
+  return functionsMaybeMissingFromAsyncify;
 }
-function Be(r, e) {
-  if (r.message === "unreachable") {
-    let t = We;
-    e || (t += `
+function clarifyErrorMessage(e, t) {
+  if (e.message === "unreachable") {
+    let r = UNREACHABLE_ERROR;
+    t || (r += `
 
 This stack trace is lacking. For a better one initialize 
 the PHP runtime with { debug: true }, e.g. PHPNode.load('8.1', { debug: true }).
 
-`), se = je(
-      e || r.stack || ""
+`), functionsMaybeMissingFromAsyncify = extractPHPFunctionsFromStack(
+      t || e.stack || ""
     );
-    for (const n of se)
-      t += `    * ${n}
+    for (const s of functionsMaybeMissingFromAsyncify)
+      r += `    * ${s}
 `;
-    return t;
+    return r;
   }
-  return r.message;
+  return e.message;
 }
-const We = `
+const UNREACHABLE_ERROR = `
 "unreachable" WASM instruction executed.
 
 The typical reason is a PHP function missing from the ASYNCIFY_ONLY
@@ -186,39 +189,39 @@ the Dockerfile, you'll need to trigger this error again with long stack
 traces enabled. In node.js, you can do it using the --stack-trace-limit=100
 CLI option: 
 
-`, ce = "\x1B[41m", De = "\x1B[1m", ue = "\x1B[0m", he = "\x1B[K";
-let de = !1;
-function qe(r) {
-  if (!de && (de = !0, !(r != null && r.trim().startsWith("Program terminated with exit")))) {
-    console.log(`${ce}
-${he}
-${De}  WASM ERROR${ue}${ce}`);
-    for (const e of r.split(`
+`, redBg = "\x1B[41m", bold = "\x1B[1m", reset = "\x1B[0m", eol = "\x1B[K";
+let logged = !1;
+function showCriticalErrorBox(e) {
+  if (!logged && (logged = !0, !(e != null && e.trim().startsWith("Program terminated with exit")))) {
+    console.log(`${redBg}
+${eol}
+${bold}  WASM ERROR${reset}${redBg}`);
+    for (const t of e.split(`
 `))
-      console.log(`${he}  ${e} `);
-    console.log(`${ue}`);
+      console.log(`${eol}  ${t} `);
+    console.log(`${reset}`);
   }
 }
-function je(r) {
+function extractPHPFunctionsFromStack(e) {
   try {
-    const e = r.split(`
-`).slice(1).map((t) => {
-      const n = t.trim().substring(3).split(" ");
+    const t = e.split(`
+`).slice(1).map((r) => {
+      const s = r.trim().substring(3).split(" ");
       return {
-        fn: n.length >= 2 ? n[0] : "<unknown>",
-        isWasm: t.includes("wasm://")
+        fn: s.length >= 2 ? s[0] : "<unknown>",
+        isWasm: r.includes("wasm://")
       };
     }).filter(
-      ({ fn: t, isWasm: n }) => n && !t.startsWith("dynCall_") && !t.startsWith("invoke_")
-    ).map(({ fn: t }) => t);
-    return Array.from(new Set(e));
+      ({ fn: r, isWasm: s }) => s && !r.startsWith("dynCall_") && !r.startsWith("invoke_")
+    ).map(({ fn: r }) => r);
+    return Array.from(new Set(t));
   } catch {
     return [];
   }
 }
-class ie {
-  constructor({ concurrency: e }) {
-    this._running = 0, this.concurrency = e, this.queue = [];
+class Semaphore {
+  constructor({ concurrency: t }) {
+    this._running = 0, this.concurrency = t, this.queue = [];
   }
   get running() {
     return this._running;
@@ -226,79 +229,134 @@ class ie {
   async acquire() {
     for (; ; )
       if (this._running >= this.concurrency)
-        await new Promise((e) => this.queue.push(e));
+        await new Promise((t) => this.queue.push(t));
       else {
         this._running++;
-        let e = !1;
+        let t = !1;
         return () => {
-          e || (e = !0, this._running--, this.queue.length > 0 && this.queue.shift()());
+          t || (t = !0, this._running--, this.queue.length > 0 && this.queue.shift()());
         };
       }
   }
-  async run(e) {
-    const t = await this.acquire();
+  async run(t) {
+    const r = await this.acquire();
     try {
-      return await e();
+      return await t();
     } finally {
-      t();
+      r();
     }
   }
 }
-function B(...r) {
-  let e = r.join("/");
-  const t = e[0] === "/", n = e.substring(e.length - 1) === "/";
-  return e = ye(e), !e && !t && (e = "."), e && n && (e += "/"), e;
+function joinPaths(...e) {
+  let t = e.join("/");
+  const r = t[0] === "/", s = t.substring(t.length - 1) === "/";
+  return t = normalizePath$1(t), !t && !r && (t = "."), t && s && (t += "/"), t;
 }
-function ze(r) {
-  if (r === "/")
+function basename(e) {
+  if (e === "/")
     return "/";
-  r = ye(r);
-  const e = r.lastIndexOf("/");
-  return e === -1 ? r : r.substr(e + 1);
+  e = normalizePath$1(e);
+  const t = e.lastIndexOf("/");
+  return t === -1 ? e : e.substr(t + 1);
+}
+function normalizePath$1(e) {
+  const t = e[0] === "/";
+  return e = normalizePathsArray(
+    e.split("/").filter((r) => !!r),
+    !t
+  ).join("/"), (t ? "/" : "") + e.replace(/\/$/, "");
 }
-function ye(r) {
-  const e = r[0] === "/";
-  return r = Ge(
-    r.split("/").filter((t) => !!t),
-    !e
-  ).join("/"), (e ? "/" : "") + r.replace(/\/$/, "");
+function normalizePathsArray(e, t) {
+  let r = 0;
+  for (let s = e.length - 1; s >= 0; s--) {
+    const i = e[s];
+    i === "." ? e.splice(s, 1) : i === ".." ? (e.splice(s, 1), r++) : r && (e.splice(s, 1), r--);
+  }
+  if (t)
+    for (; r; r--)
+      e.unshift("..");
+  return e;
+}
+function createSpawnHandler(e) {
+  return function(t) {
+    const r = new ChildProcess(), s = new ProcessApi(r);
+    return setTimeout(async () => {
+      await e(t, s), r.emit("spawn", !0);
+    }), r;
+  };
+}
+class EventEmitter {
+  constructor() {
+    this.listeners = {};
+  }
+  emit(t, r) {
+    this.listeners[t] && this.listeners[t].forEach(function(s) {
+      s(r);
+    });
+  }
+  on(t, r) {
+    this.listeners[t] || (this.listeners[t] = []), this.listeners[t].push(r);
+  }
+}
+class ProcessApi extends EventEmitter {
+  constructor(t) {
+    super(), this.childProcess = t, this.exited = !1, this.stdinData = [], t.on("stdin", (r) => {
+      this.stdinData ? this.stdinData.push(r.slice()) : this.emit("stdin", r);
+    });
+  }
+  stdout(t) {
+    typeof t == "string" && (t = new TextEncoder().encode(t)), this.childProcess.stdout.emit("data", t);
+  }
+  stderr(t) {
+    typeof t == "string" && (t = new TextEncoder().encode(t)), this.childProcess.stderr.emit("data", t);
+  }
+  exit(t) {
+    this.exited || (this.exited = !0, this.childProcess.emit("exit", t));
+  }
+  flushStdin() {
+    if (this.stdinData)
+      for (let t = 0; t < this.stdinData.length; t++)
+        this.emit("stdin", this.stdinData[t]);
+    this.stdinData = null;
+  }
 }
-function Ge(r, e) {
-  let t = 0;
-  for (let n = r.length - 1; n >= 0; n--) {
-    const s = r[n];
-    s === "." ? r.splice(n, 1) : s === ".." ? (r.splice(n, 1), t++) : t && (r.splice(n, 1), t--);
-  }
-  if (e)
-    for (; t; t--)
-      r.unshift("..");
-  return r;
+let lastPid = 9743;
+class ChildProcess extends EventEmitter {
+  constructor(t = lastPid++) {
+    super(), this.pid = t, this.stdout = new EventEmitter(), this.stderr = new EventEmitter();
+    const r = this;
+    this.stdin = {
+      write: (s) => {
+        r.emit("stdin", s);
+      }
+    };
+  }
 }
 ReadableStream.prototype[Symbol.asyncIterator] || (ReadableStream.prototype[Symbol.asyncIterator] = async function* () {
-  const r = this.getReader();
+  const e = this.getReader();
   try {
     for (; ; ) {
-      const { done: e, value: t } = await r.read();
-      if (e)
+      const { done: t, value: r } = await e.read();
+      if (t)
         return;
-      yield t;
+      yield r;
     }
   } finally {
-    r.releaseLock();
+    e.releaseLock();
   }
 }, ReadableStream.prototype.iterate = // @ts-ignore
 ReadableStream.prototype[Symbol.asyncIterator]);
-class A {
-  constructor(e, t, n, s = "", o = 0) {
-    this.httpStatusCode = e, this.headers = t, this.bytes = n, this.exitCode = o, this.errors = s;
-  }
-  static fromRawData(e) {
-    return new A(
-      e.httpStatusCode,
-      e.headers,
-      e.bytes,
-      e.errors,
-      e.exitCode
+class PHPResponse {
+  constructor(t, r, s, i = "", n = 0) {
+    this.httpStatusCode = t, this.headers = r, this.bytes = s, this.exitCode = n, this.errors = i;
+  }
+  static fromRawData(t) {
+    return new PHPResponse(
+      t.httpStatusCode,
+      t.headers,
+      t.bytes,
+      t.errors,
+      t.exitCode
     );
   }
   toRawData() {
@@ -323,19 +381,19 @@ class A {
     return new TextDecoder().decode(this.bytes);
   }
 }
-var S, H;
-class Je {
+var b, F;
+class PHPBrowser {
   /**
    * @param  server - The PHP server to browse.
    * @param  config - The browser configuration.
    */
-  constructor(e, t = {}) {
-    c(this, S, void 0);
-    c(this, H, void 0);
-    this.requestHandler = e, d(this, S, {}), d(this, H, {
+  constructor(t, r = {}) {
+    l(this, b, void 0);
+    l(this, F, void 0);
+    this.requestHandler = t, d(this, b, {}), d(this, F, {
       handleRedirects: !1,
       maxRedirects: 4,
-      ...t
+      ...r
     });
   }
   /**
@@ -352,37 +410,37 @@ class Je {
    * @param  redirects - Internal. The number of redirects handled so far.
    * @returns PHPRequestHandler response.
    */
-  async request(e, t = 0) {
-    const n = await this.requestHandler.request({
-      ...e,
+  async request(t, r = 0) {
+    const s = await this.requestHandler.request({
+      ...t,
       headers: {
-        ...e.headers,
+        ...t.headers,
         cookie: this.serializeCookies()
       }
     });
-    if (n.headers["set-cookie"] && this.setCookies(n.headers["set-cookie"]), a(this, H).handleRedirects && n.headers.location && t < a(this, H).maxRedirects) {
-      const s = new URL(
-        n.headers.location[0],
+    if (s.headers["set-cookie"] && this.setCookies(s.headers["set-cookie"]), a(this, F).handleRedirects && s.headers.location && r < a(this, F).maxRedirects) {
+      const i = new URL(
+        s.headers.location[0],
         this.requestHandler.absoluteUrl
       );
       return this.request(
         {
-          url: s.toString(),
+          url: i.toString(),
           method: "GET",
           headers: {}
         },
-        t + 1
+        r + 1
       );
     }
-    return n;
+    return s;
   }
   /** @inheritDoc */
-  pathToInternalUrl(e) {
-    return this.requestHandler.pathToInternalUrl(e);
+  pathToInternalUrl(t) {
+    return this.requestHandler.pathToInternalUrl(t);
   }
   /** @inheritDoc */
-  internalUrlToPath(e) {
-    return this.requestHandler.internalUrlToPath(e);
+  internalUrlToPath(t) {
+    return this.requestHandler.internalUrlToPath(t);
   }
   /** @inheritDoc */
   get absoluteUrl() {
@@ -392,49 +450,49 @@ class Je {
   get documentRoot() {
     return this.requestHandler.documentRoot;
   }
-  setCookies(e) {
-    for (const t of e)
+  setCookies(t) {
+    for (const r of t)
       try {
-        if (!t.includes("="))
+        if (!r.includes("="))
           continue;
-        const n = t.indexOf("="), s = t.substring(0, n), o = t.substring(n + 1).split(";")[0];
-        a(this, S)[s] = o;
-      } catch (n) {
-        console.error(n);
+        const s = r.indexOf("="), i = r.substring(0, s), n = r.substring(s + 1).split(";")[0];
+        a(this, b)[i] = n;
+      } catch (s) {
+        console.error(s);
       }
   }
   serializeCookies() {
-    const e = [];
-    for (const t in a(this, S))
-      e.push(`${t}=${a(this, S)[t]}`);
-    return e.join("; ");
+    const t = [];
+    for (const r in a(this, b))
+      t.push(`${r}=${a(this, b)[r]}`);
+    return t.join("; ");
   }
 }
-S = new WeakMap(), H = new WeakMap();
-const Ye = "http://example.com";
-function fe(r) {
-  return r.toString().substring(r.origin.length);
+b = new WeakMap(), F = new WeakMap();
+const DEFAULT_BASE_URL = "http://example.com";
+function toRelativeUrl(e) {
+  return e.toString().substring(e.origin.length);
 }
-function pe(r, e) {
-  return !e || !r.startsWith(e) ? r : r.substring(e.length);
+function removePathPrefix(e, t) {
+  return !t || !e.startsWith(t) ? e : e.substring(t.length);
 }
-function Ve(r, e) {
-  return !e || r.startsWith(e) ? r : e + r;
+function ensurePathPrefix(e, t) {
+  return !t || e.startsWith(t) ? e : t + e;
 }
-var g, O, L, x, $, w, I, N, D, ge, q, we, j, be;
-class Ke {
+var E, x, N, R, k, m, C, S, B, Q, L, X, O, ee;
+class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
    * @param  config - Request Handler configuration.
    */
-  constructor(e, t = {}) {
+  constructor(t, r = {}) {
     /**
      * Serves a static file from the PHP filesystem.
      *
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    c(this, D);
+    l(this, B);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -442,7 +500,7 @@ class Ke {
      * @param  request - The request.
      * @returns The response.
      */
-    c(this, q);
+    l(this, L);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -452,68 +510,68 @@ class Ke {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    c(this, j);
-    c(this, g, void 0);
-    c(this, O, void 0);
-    c(this, L, void 0);
-    c(this, x, void 0);
-    c(this, $, void 0);
-    c(this, w, void 0);
-    c(this, I, void 0);
-    c(this, N, void 0);
-    d(this, N, new ie({ concurrency: 1 }));
+    l(this, O);
+    l(this, E, void 0);
+    l(this, x, void 0);
+    l(this, N, void 0);
+    l(this, R, void 0);
+    l(this, k, void 0);
+    l(this, m, void 0);
+    l(this, C, void 0);
+    l(this, S, void 0);
+    d(this, S, new Semaphore({ concurrency: 1 }));
     const {
-      documentRoot: n = "/www/",
-      absoluteUrl: s = typeof location == "object" ? location == null ? void 0 : location.href : ""
-    } = t;
-    this.php = e, d(this, g, n);
-    const o = new URL(s);
-    d(this, L, o.hostname), d(this, x, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), d(this, O, (o.protocol || "").replace(":", ""));
-    const i = a(this, x) !== 443 && a(this, x) !== 80;
-    d(this, $, [
-      a(this, L),
-      i ? `:${a(this, x)}` : ""
-    ].join("")), d(this, w, o.pathname.replace(/\/+$/, "")), d(this, I, [
-      `${a(this, O)}://`,
-      a(this, $),
-      a(this, w)
+      documentRoot: s = "/www/",
+      absoluteUrl: i = typeof location == "object" ? location == null ? void 0 : location.href : ""
+    } = r;
+    this.php = t, d(this, E, s);
+    const n = new URL(i);
+    d(this, N, n.hostname), d(this, R, n.port ? Number(n.port) : n.protocol === "https:" ? 443 : 80), d(this, x, (n.protocol || "").replace(":", ""));
+    const o = a(this, R) !== 443 && a(this, R) !== 80;
+    d(this, k, [
+      a(this, N),
+      o ? `:${a(this, R)}` : ""
+    ].join("")), d(this, m, n.pathname.replace(/\/+$/, "")), d(this, C, [
+      `${a(this, x)}://`,
+      a(this, k),
+      a(this, m)
     ].join(""));
   }
   /** @inheritDoc */
-  pathToInternalUrl(e) {
-    return `${this.absoluteUrl}${e}`;
+  pathToInternalUrl(t) {
+    return `${this.absoluteUrl}${t}`;
   }
   /** @inheritDoc */
-  internalUrlToPath(e) {
-    const t = new URL(e);
-    return t.pathname.startsWith(a(this, w)) && (t.pathname = t.pathname.slice(a(this, w).length)), fe(t);
+  internalUrlToPath(t) {
+    const r = new URL(t);
+    return r.pathname.startsWith(a(this, m)) && (r.pathname = r.pathname.slice(a(this, m).length)), toRelativeUrl(r);
   }
   get isRequestRunning() {
-    return a(this, N).running > 0;
+    return a(this, S).running > 0;
   }
   /** @inheritDoc */
   get absoluteUrl() {
-    return a(this, I);
+    return a(this, C);
   }
   /** @inheritDoc */
   get documentRoot() {
-    return a(this, g);
+    return a(this, E);
   }
   /** @inheritDoc */
-  async request(e) {
-    const t = e.url.startsWith("http://") || e.url.startsWith("https://"), n = new URL(
-      e.url,
-      t ? void 0 : Ye
-    ), s = pe(
-      n.pathname,
-      a(this, w)
-    ), o = `${a(this, g)}${s}`;
-    return Xe(o) ? await m(this, q, we).call(this, e, n) : m(this, D, ge).call(this, o);
+  async request(t) {
+    const r = t.url.startsWith("http://") || t.url.startsWith("https://"), s = new URL(
+      t.url,
+      r ? void 0 : DEFAULT_BASE_URL
+    ), i = removePathPrefix(
+      s.pathname,
+      a(this, m)
+    ), n = `${a(this, E)}${i}`;
+    return seemsLikeAPHPRequestHandlerPath(n) ? await p(this, L, X).call(this, t, s) : p(this, B, Q).call(this, n);
   }
 }
-g = new WeakMap(), O = new WeakMap(), L = new WeakMap(), x = new WeakMap(), $ = new WeakMap(), w = new WeakMap(), I = new WeakMap(), N = new WeakMap(), D = new WeakSet(), ge = function(e) {
-  if (!this.php.fileExists(e))
-    return new A(
+E = new WeakMap(), x = new WeakMap(), N = new WeakMap(), R = new WeakMap(), k = new WeakMap(), m = new WeakMap(), C = new WeakMap(), S = new WeakMap(), B = new WeakSet(), Q = function(t) {
+  if (!this.php.fileExists(t))
+    return new PHPResponse(
       404,
       // Let the service worker know that no static file was found
       // and that it's okay to issue a real fetch() to the server.
@@ -522,104 +580,118 @@ g = new WeakMap(), O = new WeakMap(), L = new WeakMap(), x = new WeakMap(), $ =
       },
       new TextEncoder().encode("404 File not found")
     );
-  const t = this.php.readFileAsBuffer(e);
-  return new A(
+  const r = this.php.readFileAsBuffer(t);
+  return new PHPResponse(
     200,
     {
-      "content-length": [`${t.byteLength}`],
+      "content-length": [`${r.byteLength}`],
       // @TODO: Infer the content-type from the arrayBuffer instead of the file path.
       //        The code below won't return the correct mime-type if the extension
       //        was tampered with.
-      "content-type": [Qe(e)],
+      "content-type": [inferMimeType(t)],
       "accept-ranges": ["bytes"],
       "cache-control": ["public, max-age=0"]
     },
-    t
+    r
   );
-}, q = new WeakSet(), we = async function(e, t) {
-  var s;
-  const n = await a(this, N).acquire();
+}, L = new WeakSet(), X = async function(t, r) {
+  var i, n, o;
+  if (a(this, S).running > 0 && ((i = t.headers) == null ? void 0 : i["x-request-issuer"]) === "php")
+    return console.warn(
+      "Possible deadlock: Called request() before the previous request() have finished. PHP likely issued an HTTP call to itself. Normally this would lead to infinite waiting as Request 1 holds the lock that the Request 2 is waiting to acquire. That's not useful, so PHPRequestHandler will return error 502 instead."
+    ), new PHPResponse(
+      502,
+      {},
+      new TextEncoder().encode("502 Bad Gateway")
+    );
+  const s = await a(this, S).acquire();
   try {
-    this.php.addServerGlobalEntry("DOCUMENT_ROOT", a(this, g)), this.php.addServerGlobalEntry(
+    this.php.addServerGlobalEntry("REMOTE_ADDR", "127.0.0.1"), this.php.addServerGlobalEntry("DOCUMENT_ROOT", a(this, E)), this.php.addServerGlobalEntry(
       "HTTPS",
-      a(this, I).startsWith("https://") ? "on" : ""
+      a(this, C).startsWith("https://") ? "on" : ""
     );
-    let o = "GET";
-    const i = {
-      host: a(this, $),
-      ...He(e.headers || {})
-    }, u = [];
-    if (e.files && Object.keys(e.files).length) {
-      o = "POST";
-      for (const p in e.files) {
-        const R = e.files[p];
-        u.push({
-          key: p,
-          name: R.name,
-          type: R.type,
-          data: new Uint8Array(await R.arrayBuffer())
+    let c = "GET";
+    const h = {
+      host: a(this, k),
+      ...normalizeHeaders(t.headers || {})
+    }, f = [];
+    if (t.files && Object.keys(t.files).length) {
+      c = "POST";
+      for (const y in t.files) {
+        const M = t.files[y];
+        f.push({
+          key: y,
+          name: M.name,
+          type: M.type,
+          data: new Uint8Array(await M.arrayBuffer())
         });
       }
-      (s = i["content-type"]) != null && s.startsWith("multipart/form-data") && (e.formData = Ze(
-        e.body || ""
-      ), i["content-type"] = "application/x-www-form-urlencoded", delete e.body);
+      (n = h["content-type"]) != null && n.startsWith("multipart/form-data") && (t.formData = parseMultipartFormDataString(
+        t.body || ""
+      ), h["content-type"] = "application/x-www-form-urlencoded", delete t.body);
     }
-    let h;
-    e.formData !== void 0 ? (o = "POST", i["content-type"] = i["content-type"] || "application/x-www-form-urlencoded", h = new URLSearchParams(
-      e.formData
-    ).toString()) : h = e.body;
-    let f;
+    let u;
+    t.formData !== void 0 ? (c = "POST", h["content-type"] = h["content-type"] || "application/x-www-form-urlencoded", u = new URLSearchParams(
+      t.formData
+    ).toString()) : u = t.body;
+    let _;
     try {
-      f = m(this, j, be).call(this, t.pathname);
+      let y = r.pathname;
+      if ((o = t.headers) != null && o["x-rewrite-url"])
+        try {
+          y = new URL(
+            t.headers["x-rewrite-url"]
+          ).pathname;
+        } catch {
+        }
+      _ = p(this, O, ee).call(this, y);
     } catch {
-      return new A(
+      return new PHPResponse(
         404,
         {},
         new TextEncoder().encode("404 File not found")
       );
     }
     return await this.php.run({
-      relativeUri: Ve(
-        fe(t),
-        a(this, w)
+      relativeUri: ensurePathPrefix(
+        toRelativeUrl(r),
+        a(this, m)
       ),
-      protocol: a(this, O),
-      method: e.method || o,
-      body: h,
-      fileInfos: u,
-      scriptPath: f,
-      headers: i
+      protocol: a(this, x),
+      method: t.method || c,
+      body: u,
+      fileInfos: f,
+      scriptPath: _,
+      headers: h
     });
   } finally {
-    n();
-  }
-}, j = new WeakSet(), be = function(e) {
-  let t = pe(e, a(this, w));
-  t.includes(".php") ? t = t.split(".php")[0] + ".php" : (t.endsWith("/") || (t += "/"), t.endsWith("index.php") || (t += "index.php"));
-  const n = `${a(this, g)}${t}`;
-  if (this.php.fileExists(n))
-    return n;
-  if (!this.php.fileExists(`${a(this, g)}/index.php`))
-    throw new Error(`File not found: ${n}`);
-  return `${a(this, g)}/index.php`;
+    s();
+  }
+}, O = new WeakSet(), ee = function(t) {
+  let r = removePathPrefix(t, a(this, m));
+  r.includes(".php") ? r = r.split(".php")[0] + ".php" : (r.endsWith("/") || (r += "/"), r.endsWith("index.php") || (r += "index.php"));
+  const s = `${a(this, E)}${r}`;
+  if (this.php.fileExists(s))
+    return s;
+  throw new Error(`File not found: ${s}`);
 };
-function Ze(r) {
-  const e = {}, t = r.match(/--(.*)\r\n/);
-  if (!t)
-    return e;
-  const n = t[1], s = r.split(`--${n}`);
-  return s.shift(), s.pop(), s.forEach((o) => {
-    const i = o.indexOf(`\r
+function parseMultipartFormDataString(e) {
+  const t = {}, r = e.match(/--(.*)\r\n/);
+  if (!r)
+    return t;
+  const s = r[1], i = e.split(`--${s}`);
+  return i.shift(), i.pop(), i.forEach((n) => {
+    const o = n.indexOf(`\r
 \r
-`), u = o.substring(0, i).trim(), h = o.substring(i + 4).trim(), f = u.match(/name="([^"]+)"/);
+`), c = n.substring(0, o).trim(), h = n.substring(o + 4).trim(), f = c.match(/name="([^"]+)"/);
     if (f) {
-      const p = f[1];
-      e[p] = h;
+      const u = f[1];
+      t[u] = h;
     }
-  }), e;
+  }), t;
 }
-function Qe(r) {
-  switch (r.split(".").pop()) {
+function inferMimeType(e) {
+  switch (e.split(".").pop()) {
     case "css":
       return "text/css";
     case "js":
@@ -658,16 +730,16 @@ function Qe(r) {
       return "application-octet-stream";
   }
 }
-function Xe(r) {
-  return et(r) || tt(r);
+function seemsLikeAPHPRequestHandlerPath(e) {
+  return seemsLikeAPHPFile(e) || seemsLikeADirectoryRoot(e);
 }
-function et(r) {
-  return r.endsWith(".php") || r.includes(".php/");
+function seemsLikeAPHPFile(e) {
+  return e.endsWith(".php") || e.includes(".php/");
 }
-function tt(r) {
-  return !r.split("/").pop().includes(".");
+function seemsLikeADirectoryRoot(e) {
+  return !e.split("/").pop().includes(".");
 }
-const W = {
+const FileErrorCodes = {
   0: "No error occurred. System call completed successfully.",
   1: "Argument list too long.",
   2: "Permission denied.",
@@ -746,46 +818,46 @@ const W = {
   75: "Cross-device link.",
   76: "Extension: Capabilities insufficient."
 };
-function rt(r) {
-  const e = typeof r == "object" ? r == null ? void 0 : r.errno : null;
-  if (e in W)
-    return W[e];
+function getEmscriptenFsError(e) {
+  const t = typeof e == "object" ? e == null ? void 0 : e.errno : null;
+  if (t in FileErrorCodes)
+    return FileErrorCodes[t];
 }
-function b(r = "") {
-  return function(t, n, s) {
-    const o = s.value;
-    s.value = function(...i) {
+function rethrowFileSystemError(e = "") {
+  return function(r, s, i) {
+    const n = i.value;
+    i.value = function(...o) {
       try {
-        return o.apply(this, i);
-      } catch (u) {
-        const h = typeof u == "object" ? u == null ? void 0 : u.errno : null;
-        if (h in W) {
-          const f = W[h], p = typeof i[0] == "string" ? i[0] : null, R = p !== null ? r.replaceAll("{path}", p) : r;
-          throw new Error(`${R}: ${f}`, {
-            cause: u
+        return n.apply(this, o);
+      } catch (c) {
+        const h = typeof c == "object" ? c == null ? void 0 : c.errno : null;
+        if (h in FileErrorCodes) {
+          const f = FileErrorCodes[h], u = typeof o[0] == "string" ? o[0] : null, _ = u !== null ? e.replaceAll("{path}", u) : e;
+          throw new Error(`${_}: ${f}`, {
+            cause: c
           });
         }
-        throw u;
+        throw c;
       }
     };
   };
 }
-const nt = /* @__PURE__ */ new Map();
-function st(r) {
-  return nt.get(r);
+const loadedRuntimes = /* @__PURE__ */ new Map();
+function getLoadedRuntime(e) {
+  return loadedRuntimes.get(e);
 }
 (function() {
-  var r;
-  return typeof process < "u" && ((r = process.release) == null ? void 0 : r.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
+  var e;
+  return typeof process < "u" && ((e = process.release) == null ? void 0 : e.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
 })();
-var ot = Object.defineProperty, it = Object.getOwnPropertyDescriptor, E = (r, e, t, n) => {
-  for (var s = n > 1 ? void 0 : n ? it(e, t) : e, o = r.length - 1, i; o >= 0; o--)
-    (i = r[o]) && (s = (n ? i(e, t, s) : i(s)) || s);
-  return n && s && ot(e, t, s), s;
+var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = (e, t, r, s) => {
+  for (var i = s > 1 ? void 0 : s ? __getOwnPropDesc(t, r) : t, n = e.length - 1, o; n >= 0; n--)
+    (o = e[n]) && (i = (s ? o(t, r, i) : o(i)) || i);
+  return s && i && __defProp(t, r, i), i;
 };
-const y = "string", C = "number", l = Symbol("__private__dont__use");
-var k, T, F, _, v, M, U, z, Ee, G, Pe, J, Re, Y, ve, V, Te, K, _e, Z, Se, Q, xe, X, ke, ee, Fe, te, Ce, re, Ae;
-class P {
+const STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
+var T, H, A, w, P, v, g, I, U, te, D, re, $, se, q, ne, W, ie, j, oe, z, ae, G, le, J, ce, Y, ue, V, de, K, he;
+class BasePHP {
   /**
    * Initializes a PHP runtime.
    *
@@ -794,15 +866,15 @@ class P {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    c(this, z);
-    c(this, G);
-    c(this, J);
-    c(this, Y);
-    c(this, V);
-    c(this, K);
-    c(this, Z);
-    c(this, Q);
-    c(this, X);
+    l(this, U);
+    l(this, D);
+    l(this, $);
+    l(this, q);
+    l(this, W);
+    l(this, j);
+    l(this, z);
+    l(this, G);
+    l(this, J);
     /**
      * Adds file information to $_FILES superglobal in PHP.
      *
@@ -812,40 +884,41 @@ class P {
      *
      * @param  fileInfo - File details
      */
-    c(this, ee);
-    c(this, te);
-    c(this, re);
-    c(this, k, void 0);
-    c(this, T, void 0);
-    c(this, F, void 0);
-    c(this, _, void 0);
-    c(this, v, void 0);
-    c(this, M, void 0);
-    c(this, U, void 0);
-    d(this, k, []), d(this, T, !1), d(this, F, null), d(this, _, {}), d(this, v, /* @__PURE__ */ new Map()), d(this, M, []), d(this, U, new ie({ concurrency: 1 })), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new Je(
-      new Ke(this, t)
+    l(this, Y);
+    l(this, V);
+    l(this, K);
+    l(this, T, void 0);
+    l(this, H, void 0);
+    l(this, A, void 0);
+    l(this, w, void 0);
+    l(this, P, void 0);
+    l(this, v, void 0);
+    l(this, g, void 0);
+    l(this, I, void 0);
+    d(this, T, []), d(this, w, !1), d(this, P, null), d(this, v, {}), d(this, g, /* @__PURE__ */ new Map()), d(this, I, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
+      new PHPRequestHandler(this, t)
     ));
   }
   addEventListener(e, t) {
-    a(this, v).has(e) || a(this, v).set(e, /* @__PURE__ */ new Set()), a(this, v).get(e).add(t);
+    a(this, g).has(e) || a(this, g).set(e, /* @__PURE__ */ new Set()), a(this, g).get(e).add(t);
   }
   removeEventListener(e, t) {
-    var n;
-    (n = a(this, v).get(e)) == null || n.delete(t);
+    var r;
+    (r = a(this, g).get(e)) == null || r.delete(t);
   }
   dispatchEvent(e) {
-    const t = a(this, v).get(e.type);
+    const t = a(this, g).get(e.type);
     if (t)
-      for (const n of t)
-        n(e);
+      for (const r of t)
+        r(e);
   }
   /** @inheritDoc */
   async onMessage(e) {
-    a(this, M).push(e);
+    a(this, I).push(e);
   }
   /** @inheritDoc */
-  async setSpawnHandler(e) {
-    this[l].spawnProcess = e;
+  async setSpawnHandler(handler) {
+    typeof handler == "string" && (handler = createSpawnHandler(eval(handler))), this[__private__dont__use].spawnProcess = handler;
   }
   /** @inheritDoc */
   get absoluteUrl() {
@@ -866,25 +939,40 @@ class P {
     );
   }
   initializeRuntime(e) {
-    if (this[l])
+    if (this[__private__dont__use])
       throw new Error("PHP runtime already initialized.");
-    const t = st(e);
+    const t = getLoadedRuntime(e);
     if (!t)
       throw new Error("Invalid PHP runtime id.");
-    this[l] = t, t.onMessage = async (n) => {
-      for (const s of a(this, M)) {
-        const o = await s(n);
-        if (o)
-          return o;
+    this[__private__dont__use] = t, t.onMessage = async (r) => {
+      for (const s of a(this, I)) {
+        const i = await s(r);
+        if (i)
+          return i;
       }
       return "";
-    }, d(this, F, Le(t));
+    }, d(this, P, improveWASMErrorReporting(t)), this.dispatchEvent({
+      type: "runtime.initialized"
+    });
+  }
+  /** @inheritDoc */
+  async setSapiName(e) {
+    if (this[__private__dont__use].ccall(
+      "wasm_set_sapi_name",
+      NUMBER,
+      [STRING],
+      [e]
+    ) !== 0)
+      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?"
+      );
+    d(this, A, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
-    if (a(this, T))
+    if (a(this, w))
       throw new Error("Cannot set PHP ini path after calling run().");
-    this[l].ccall(
+    d(this, H, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -893,13 +981,13 @@ class P {
   }
   /** @inheritDoc */
   setPhpIniEntry(e, t) {
-    if (a(this, T))
+    if (a(this, w))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    a(this, k).push([e, t]);
+    a(this, T).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
-    this[l].FS.chdir(e);
+    this[__private__dont__use].FS.chdir(e);
   }
   /** @inheritDoc */
   async request(e, t) {
@@ -909,27 +997,45 @@ class P {
   }
   /** @inheritDoc */
   async run(e) {
-    const t = await a(this, U).acquire();
+    const t = await this.semaphore.acquire();
+    let r;
     try {
-      a(this, T) || (m(this, z, Ee).call(this), d(this, T, !0)), m(this, Q, xe).call(this, e.scriptPath || ""), m(this, J, Re).call(this, e.relativeUri || ""), m(this, V, Te).call(this, e.method || "GET");
-      const n = He(e.headers || {}), s = n.host || "example.com:443";
-      if (m(this, Y, ve).call(this, s, e.protocol || "http"), m(this, K, _e).call(this, n), e.body && m(this, Z, Se).call(this, e.body), e.fileInfos)
+      a(this, w) || (p(this, U, te).call(this), d(this, w, !0)), p(this, G, le).call(this, e.scriptPath || ""), p(this, $, se).call(this, e.relativeUri || ""), p(this, W, ie).call(this, e.method || "GET");
+      const s = normalizeHeaders(e.headers || {}), i = s.host || "example.com:443";
+      if (p(this, q, ne).call(this, i, e.protocol || "http"), p(this, j, oe).call(this, s), e.body && (r = p(this, z, ae).call(this, e.body)), e.fileInfos)
         for (const o of e.fileInfos)
-          m(this, ee, Fe).call(this, o);
-      return e.code && m(this, te, Ce).call(this, " ?>" + e.code), m(this, X, ke).call(this), await m(this, re, Ae).call(this);
+          p(this, Y, ue).call(this, o);
+      typeof e.code == "string" && p(this, V, de).call(this, " ?>" + e.code), p(this, J, ce).call(this);
+      const n = await p(this, K, he).call(this);
+      if (e.throwOnError && n.exitCode !== 0) {
+        const o = {
+          stdout: n.text,
+          stderr: n.errors
+        };
+        console.warn("PHP.run() output was:", o);
+        const c = new Error(
+          `PHP.run() failed with exit code ${n.exitCode} and the following output`
+        );
+        throw c.output = o, c;
+      }
+      return n;
     } finally {
-      t(), this.dispatchEvent({
-        type: "request.end"
-      });
+      try {
+        r && this[__private__dont__use].free(r);
+      } finally {
+        t(), this.dispatchEvent({
+          type: "request.end"
+        });
+      }
     }
   }
   addServerGlobalEntry(e, t) {
-    a(this, _)[e] = t;
+    a(this, v)[e] = t;
   }
   defineConstant(e, t) {
-    let n = {};
+    let r = {};
     try {
-      n = JSON.parse(
+      r = JSON.parse(
         this.fileExists("/tmp/consts.json") && this.readFileAsText("/tmp/consts.json") || "{}"
       );
     } catch {
@@ -937,13 +1043,13 @@ class P {
     this.writeFile(
       "/tmp/consts.json",
       JSON.stringify({
-        ...n,
+        ...r,
         [e]: t
       })
     );
   }
   mkdir(e) {
-    this[l].FS.mkdirTree(e);
+    this[__private__dont__use].FS.mkdirTree(e);
   }
   mkdirTree(e) {
     this.mkdir(e);
@@ -952,67 +1058,91 @@ class P {
     return new TextDecoder().decode(this.readFileAsBuffer(e));
   }
   readFileAsBuffer(e) {
-    return this[l].FS.readFile(e);
+    return this[__private__dont__use].FS.readFile(e);
   }
   writeFile(e, t) {
-    this[l].FS.writeFile(e, t);
+    this[__private__dont__use].FS.writeFile(e, t);
   }
   unlink(e) {
-    this[l].FS.unlink(e);
+    this[__private__dont__use].FS.unlink(e);
   }
   /** @inheritDoc */
   mv(e, t) {
     try {
-      this[l].FS.rename(e, t);
-    } catch (n) {
-      const s = rt(n);
+      this[__private__dont__use].FS.rename(e, t);
+    } catch (r) {
+      const s = getEmscriptenFsError(r);
       throw s ? new Error(
         `Could not move ${e} to ${t}: ${s}`,
         {
-          cause: n
+          cause: r
         }
-      ) : n;
+      ) : r;
     }
   }
   rmdir(e, t = { recursive: !0 }) {
-    t != null && t.recursive && this.listFiles(e).forEach((n) => {
-      const s = `${e}/${n}`;
+    t != null && t.recursive && this.listFiles(e).forEach((r) => {
+      const s = `${e}/${r}`;
       this.isDir(s) ? this.rmdir(s, t) : this.unlink(s);
-    }), this[l].FS.rmdir(e);
+    }), this[__private__dont__use].FS.rmdir(e);
   }
   listFiles(e, t = { prependPath: !1 }) {
     if (!this.fileExists(e))
       return [];
     try {
-      const n = this[l].FS.readdir(e).filter(
+      const r = this[__private__dont__use].FS.readdir(e).filter(
         (s) => s !== "." && s !== ".."
       );
       if (t.prependPath) {
         const s = e.replace(/\/$/, "");
-        return n.map((o) => `${s}/${o}`);
+        return r.map((i) => `${s}/${i}`);
       }
-      return n;
-    } catch (n) {
-      return console.error(n, { path: e }), [];
+      return r;
+    } catch (r) {
+      return console.error(r, { path: e }), [];
     }
   }
   isDir(e) {
-    return this.fileExists(e) ? this[l].FS.isDir(
-      this[l].FS.lookupPath(e).node.mode
+    return this.fileExists(e) ? this[__private__dont__use].FS.isDir(
+      this[__private__dont__use].FS.lookupPath(e).node.mode
     ) : !1;
   }
   fileExists(e) {
     try {
-      return this[l].FS.lookupPath(e), !0;
+      return this[__private__dont__use].FS.lookupPath(e), !0;
     } catch {
       return !1;
     }
   }
+  /**
+   * Hot-swaps the PHP runtime for a new one without
+   * interrupting the operations of this PHP instance.
+   *
+   * @param runtime
+   */
+  hotSwapPHPRuntime(e) {
+    const t = this[__private__dont__use].FS;
+    try {
+      this.exit();
+    } catch {
+    }
+    if (this.initializeRuntime(e), a(this, H) && this.setPhpIniPath(a(this, H)), a(this, A) && this.setSapiName(a(this, A)), this.requestHandler) {
+      const r = this.documentRoot;
+      recreateMemFS(this[__private__dont__use].FS, t, r);
+    }
+  }
   exit(e = 0) {
-    return this[l]._exit(e);
+    this.dispatchEvent({
+      type: "runtime.beforedestroy"
+    });
+    try {
+      this[__private__dont__use]._exit(e);
+    } catch {
+    }
+    d(this, w, !1), d(this, P, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
-k = new WeakMap(), T = new WeakMap(), F = new WeakMap(), _ = new WeakMap(), v = new WeakMap(), M = new WeakMap(), U = new WeakMap(), z = new WeakSet(), Ee = function() {
+T = new WeakMap(), H = new WeakMap(), A = new WeakMap(), w = new WeakMap(), P = new WeakMap(), v = new WeakMap(), g = new WeakMap(), I = new WeakMap(), U = new WeakSet(), te = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/tmp/consts.php"), this.fileExists("/tmp/consts.php") || this.writeFile(
     "/tmp/consts.php",
     `<?php
@@ -1024,422 +1154,461 @@ k = new WeakMap(), T = new WeakMap(), F = new WeakMap(), _ = new WeakMap(), v =
 						}
 					}
 				}`
-  ), a(this, k).length > 0) {
-    const e = a(this, k).map(([t, n]) => `${t}=${n}`).join(`
+  ), a(this, T).length > 0) {
+    const e = a(this, T).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
-    this[l].ccall(
+    this[__private__dont__use].ccall(
       "wasm_set_phpini_entries",
       null,
-      [y],
+      [STRING],
       [e]
     );
   }
-  this[l].ccall("php_wasm_init", null, [], []);
-}, G = new WeakSet(), Pe = function() {
+  this[__private__dont__use].ccall("php_wasm_init", null, [], []);
+}, D = new WeakSet(), re = function() {
   const e = "/tmp/headers.json";
   if (!this.fileExists(e))
     throw new Error(
       "SAPI Error: Could not find response headers file."
     );
-  const t = JSON.parse(this.readFileAsText(e)), n = {};
+  const t = JSON.parse(this.readFileAsText(e)), r = {};
   for (const s of t.headers) {
     if (!s.includes(": "))
       continue;
-    const o = s.indexOf(": "), i = s.substring(0, o).toLowerCase(), u = s.substring(o + 2);
-    i in n || (n[i] = []), n[i].push(u);
+    const i = s.indexOf(": "), n = s.substring(0, i).toLowerCase(), o = s.substring(i + 2);
+    n in r || (r[n] = []), r[n].push(o);
   }
   return {
-    headers: n,
+    headers: r,
     httpStatusCode: t.status
   };
-}, J = new WeakSet(), Re = function(e) {
-  if (this[l].ccall(
+}, $ = new WeakSet(), se = function(e) {
+  if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
-    [y],
+    [STRING],
     [e]
   ), e.includes("?")) {
     const t = e.substring(e.indexOf("?") + 1);
-    this[l].ccall(
+    this[__private__dont__use].ccall(
       "wasm_set_query_string",
       null,
-      [y],
+      [STRING],
       [t]
     );
   }
-}, Y = new WeakSet(), ve = function(e, t) {
-  this[l].ccall(
+}, q = new WeakSet(), ne = function(e, t) {
+  this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
-    [y],
+    [STRING],
     [e]
   );
-  let n;
+  let r;
   try {
-    n = parseInt(new URL(e).port, 10);
+    r = parseInt(new URL(e).port, 10);
   } catch {
   }
-  (!n || isNaN(n) || n === 80) && (n = t === "https" ? 443 : 80), this[l].ccall(
+  (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), this[__private__dont__use].ccall(
     "wasm_set_request_port",
     null,
-    [C],
-    [n]
-  ), (t === "https" || !t && n === 443) && this.addServerGlobalEntry("HTTPS", "on");
-}, V = new WeakSet(), Te = function(e) {
-  this[l].ccall(
+    [NUMBER],
+    [r]
+  ), (t === "https" || !t && r === 443) && this.addServerGlobalEntry("HTTPS", "on");
+}, W = new WeakSet(), ie = function(e) {
+  this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
-    [y],
+    [STRING],
     [e]
   );
-}, K = new WeakSet(), _e = function(e) {
-  e.cookie && this[l].ccall(
+}, j = new WeakSet(), oe = function(e) {
+  e.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
-    [y],
+    [STRING],
     [e.cookie]
-  ), e["content-type"] && this[l].ccall(
+  ), e["content-type"] && this[__private__dont__use].ccall(
     "wasm_set_content_type",
     null,
-    [y],
+    [STRING],
     [e["content-type"]]
-  ), e["content-length"] && this[l].ccall(
+  ), e["content-length"] && this[__private__dont__use].ccall(
     "wasm_set_content_length",
     null,
-    [C],
+    [NUMBER],
     [parseInt(e["content-length"], 10)]
   );
   for (const t in e) {
-    let n = "HTTP_";
-    ["content-type", "content-length"].includes(t.toLowerCase()) && (n = ""), this.addServerGlobalEntry(
-      `${n}${t.toUpperCase().replace(/-/g, "_")}`,
+    let r = "HTTP_";
+    ["content-type", "content-length"].includes(t.toLowerCase()) && (r = ""), this.addServerGlobalEntry(
+      `${r}${t.toUpperCase().replace(/-/g, "_")}`,
       e[t]
     );
   }
-}, Z = new WeakSet(), Se = function(e) {
-  this[l].ccall(
+}, z = new WeakSet(), ae = function(e) {
+  const t = this[__private__dont__use].lengthBytesUTF8(e), r = this[__private__dont__use].malloc(t + 1);
+  if (!r)
+    throw new Error("Could not allocate memory for the request body.");
+  return this[__private__dont__use].stringToUTF8(
+    e,
+    r,
+    t + 1
+  ), this[__private__dont__use].ccall(
     "wasm_set_request_body",
     null,
-    [y],
-    [e]
-  ), this[l].ccall(
+    [NUMBER],
+    [r]
+  ), this[__private__dont__use].ccall(
     "wasm_set_content_length",
     null,
-    [C],
+    [NUMBER],
     [new TextEncoder().encode(e).length]
-  );
-}, Q = new WeakSet(), xe = function(e) {
-  this[l].ccall(
+  ), r;
+}, G = new WeakSet(), le = function(e) {
+  this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
-    [y],
+    [STRING],
     [e]
   );
-}, X = new WeakSet(), ke = function() {
-  for (const e in a(this, _))
-    this[l].ccall(
+}, J = new WeakSet(), ce = function() {
+  for (const e in a(this, v))
+    this[__private__dont__use].ccall(
       "wasm_add_SERVER_entry",
       null,
-      [y, y],
-      [e, a(this, _)[e]]
+      [STRING, STRING],
+      [e, a(this, v)[e]]
     );
-}, ee = new WeakSet(), Fe = function(e) {
-  const { key: t, name: n, type: s, data: o } = e, i = `/tmp/${Math.random().toFixed(20)}`;
-  this.writeFile(i, o);
-  const u = 0;
-  this[l].ccall(
+}, Y = new WeakSet(), ue = function(e) {
+  const { key: t, name: r, type: s, data: i } = e, n = `/tmp/${Math.random().toFixed(20)}`;
+  this.writeFile(n, i);
+  const o = 0;
+  this[__private__dont__use].ccall(
     "wasm_add_uploaded_file",
     null,
-    [y, y, y, y, C, C],
-    [t, n, s, i, u, o.byteLength]
+    [STRING, STRING, STRING, STRING, NUMBER, NUMBER],
+    [t, r, s, n, o, i.byteLength]
   );
-}, te = new WeakSet(), Ce = function(e) {
-  this[l].ccall(
+}, V = new WeakSet(), de = function(e) {
+  this[__private__dont__use].ccall(
     "wasm_set_php_code",
     null,
-    [y],
+    [STRING],
     [e]
   );
-}, re = new WeakSet(), Ae = async function() {
-  var o;
+}, K = new WeakSet(), he = async function() {
+  var i;
   let e, t;
   try {
-    e = await new Promise((i, u) => {
-      var f;
-      t = (p) => {
-        const R = new Error("Rethrown");
-        R.cause = p.error, R.betterMessage = p.message, u(R);
-      }, (f = a(this, F)) == null || f.addEventListener(
+    e = await new Promise((n, o) => {
+      var h;
+      t = (f) => {
+        const u = new Error("Rethrown");
+        u.cause = f.error, u.betterMessage = f.message, o(u);
+      }, (h = a(this, P)) == null || h.addEventListener(
         "error",
         t
       );
-      const h = this[l].ccall(
+      const c = this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
-        C,
+        NUMBER,
         [],
         [],
         { async: !0 }
       );
-      return h instanceof Promise ? h.then(i, u) : i(h);
+      return c instanceof Promise ? c.then(n, o) : n(c);
     });
-  } catch (i) {
-    for (const p in this)
-      typeof this[p] == "function" && (this[p] = () => {
+  } catch (n) {
+    for (const f in this)
+      typeof this[f] == "function" && (this[f] = () => {
         throw new Error(
           "PHP runtime has crashed – see the earlier error for details."
         );
       });
-    this.functionsMaybeMissingFromAsyncify = Ue();
-    const u = i, h = "betterMessage" in u ? u.betterMessage : u.message, f = new Error(h);
-    throw f.cause = u, f;
+    this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify();
+    const o = n, c = "betterMessage" in o ? o.betterMessage : o.message, h = new Error(c);
+    throw h.cause = o, h;
   } finally {
-    (o = a(this, F)) == null || o.removeEventListener("error", t), d(this, _, {});
+    (i = a(this, P)) == null || i.removeEventListener("error", t), d(this, v, {});
   }
-  const { headers: n, httpStatusCode: s } = m(this, G, Pe).call(this);
-  return new A(
+  const { headers: r, httpStatusCode: s } = p(this, D, re).call(this);
+  return new PHPResponse(
     s,
-    n,
+    r,
     this.readFileAsBuffer("/tmp/stdout"),
     this.readFileAsText("/tmp/stderr"),
     e
   );
 };
-E([
-  b('Could not create directory "{path}"')
-], P.prototype, "mkdir", 1);
-E([
-  b('Could not create directory "{path}"')
-], P.prototype, "mkdirTree", 1);
-E([
-  b('Could not read "{path}"')
-], P.prototype, "readFileAsText", 1);
-E([
-  b('Could not read "{path}"')
-], P.prototype, "readFileAsBuffer", 1);
-E([
-  b('Could not write to "{path}"')
-], P.prototype, "writeFile", 1);
-E([
-  b('Could not unlink "{path}"')
-], P.prototype, "unlink", 1);
-E([
-  b('Could not remove directory "{path}"')
-], P.prototype, "rmdir", 1);
-E([
-  b('Could not list files in "{path}"')
-], P.prototype, "listFiles", 1);
-E([
-  b('Could not stat "{path}"')
-], P.prototype, "isDir", 1);
-E([
-  b('Could not stat "{path}"')
-], P.prototype, "fileExists", 1);
-function He(r) {
-  const e = {};
-  for (const t in r)
-    e[t.toLowerCase()] = r[t];
-  return e;
+__decorateClass([
+  rethrowFileSystemError('Could not create directory "{path}"')
+], BasePHP.prototype, "mkdir", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not create directory "{path}"')
+], BasePHP.prototype, "mkdirTree", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not read "{path}"')
+], BasePHP.prototype, "readFileAsText", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not read "{path}"')
+], BasePHP.prototype, "readFileAsBuffer", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not write to "{path}"')
+], BasePHP.prototype, "writeFile", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not unlink "{path}"')
+], BasePHP.prototype, "unlink", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not remove directory "{path}"')
+], BasePHP.prototype, "rmdir", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not list files in "{path}"')
+], BasePHP.prototype, "listFiles", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not stat "{path}"')
+], BasePHP.prototype, "isDir", 1);
+__decorateClass([
+  rethrowFileSystemError('Could not stat "{path}"')
+], BasePHP.prototype, "fileExists", 1);
+function normalizeHeaders(e) {
+  const t = {};
+  for (const r in e)
+    t[r.toLowerCase()] = e[r];
+  return t;
 }
-function pt(r, e, t = () => {
+function recreateMemFS(e, t, r) {
+  let s;
+  try {
+    s = t.lookupPath(r);
+  } catch {
+    return;
+  }
+  if (!("contents" in s.node))
+    return;
+  try {
+    e = e.lookupPath(r);
+    return;
+  } catch {
+  }
+  if (!t.isDir(s.node.mode)) {
+    e.writeFile(r, t.readFile(r));
+    return;
+  }
+  e.mkdirTree(r);
+  const i = t.readdir(r).filter((n) => n !== "." && n !== "..");
+  for (const n of i)
+    recreateMemFS(e, t, joinPaths(r, n));
+}
+function journalFSEvents(e, t, r = () => {
 }) {
-  e = lt(e);
-  const n = r[l].FS, s = at(n, (h) => {
-    if (h.path.startsWith(e))
-      t(h);
-    else if (h.operation === "RENAME" && h.toPath.startsWith(e))
-      for (const f of Oe(
-        r,
-        h.path,
-        h.toPath
-      ))
-        t(f);
-  }), o = {};
-  for (const [h] of Object.entries(s))
-    o[h] = n[h];
-  function i() {
-    for (const [h, f] of Object.entries(s))
-      n[h] = function(...p) {
-        return f(...p), o[h].apply(this, p);
-      };
+  function s() {
+    t = normalizePath(t);
+    const n = e[__private__dont__use].FS, o = createFSHooks(n, (u) => {
+      if (u.path.startsWith(t))
+        r(u);
+      else if (u.operation === "RENAME" && u.toPath.startsWith(t))
+        for (const _ of recordExistingPath(
+          e,
+          u.path,
+          u.toPath
+        ))
+          r(_);
+    }), c = {};
+    for (const [u] of Object.entries(o))
+      c[u] = n[u];
+    function h() {
+      for (const [u, _] of Object.entries(o))
+        n[u] = function(...y) {
+          return _(...y), c[u].apply(this, y);
+        };
+    }
+    function f() {
+      for (const [u, _] of Object.entries(c))
+        e[__private__dont__use].FS[u] = _;
+    }
+    e[__private__dont__use].journal = {
+      bind: h,
+      unbind: f
+    }, h();
   }
-  function u() {
-    for (const [h, f] of Object.entries(o))
-      r[l].FS[h] = f;
+  e.addEventListener("runtime.initialized", s), e[__private__dont__use] && s();
+  function i() {
+    e[__private__dont__use].journal.unbind(), delete e[__private__dont__use].journal;
   }
-  return r[l].journal = {
-    bind: i,
-    unbind: u
-  }, i(), u;
+  return e.addEventListener("runtime.beforedestroy", i), function() {
+    return e.removeEventListener("runtime.initialized", s), e.removeEventListener("runtime.beforedestroy", i), e[__private__dont__use].journal.unbind();
+  };
 }
-const at = (r, e = () => {
+const createFSHooks = (e, t = () => {
 }) => ({
-  write(t) {
-    e({
+  write(r) {
+    t({
       operation: "WRITE",
-      path: t.path,
+      path: r.path,
       nodeType: "file"
     });
   },
-  truncate(t) {
-    let n;
-    typeof t == "string" ? n = r.lookupPath(t, {
+  truncate(r) {
+    let s;
+    typeof r == "string" ? s = e.lookupPath(r, {
       follow: !0
-    }).node : n = t, e({
+    }).node : s = r, t({
       operation: "WRITE",
-      path: r.getPath(n),
+      path: e.getPath(s),
       nodeType: "file"
     });
   },
-  unlink(t) {
-    e({
+  unlink(r) {
+    t({
       operation: "DELETE",
-      path: t,
+      path: r,
       nodeType: "file"
     });
   },
-  mknod(t, n) {
-    r.isFile(n) && e({
+  mknod(r, s) {
+    e.isFile(s) && t({
       operation: "CREATE",
-      path: t,
+      path: r,
       nodeType: "file"
     });
   },
-  mkdir(t) {
-    e({
+  mkdir(r) {
+    t({
       operation: "CREATE",
-      path: t,
+      path: r,
       nodeType: "directory"
     });
   },
-  rmdir(t) {
-    e({
+  rmdir(r) {
+    t({
       operation: "DELETE",
-      path: t,
+      path: r,
       nodeType: "directory"
     });
   },
-  rename(t, n) {
+  rename(r, s) {
     try {
-      const s = r.lookupPath(t, {
+      const i = e.lookupPath(r, {
         follow: !0
-      }), o = r.lookupPath(n, {
+      }), n = e.lookupPath(s, {
         parent: !0
       }).path;
-      e({
+      t({
         operation: "RENAME",
-        nodeType: r.isDir(s.node.mode) ? "directory" : "file",
-        path: s.path,
-        toPath: B(o, ze(n))
+        nodeType: e.isDir(i.node.mode) ? "directory" : "file",
+        path: i.path,
+        toPath: joinPaths(n, basename(s))
       });
     } catch {
     }
   }
 });
-function mt(r, e) {
-  r[l].journal.unbind();
+function replayFSJournal(e, t) {
+  e[__private__dont__use].journal.unbind();
   try {
-    for (const t of e)
-      t.operation === "CREATE" ? t.nodeType === "file" ? r.writeFile(t.path, " ") : r.mkdir(t.path) : t.operation === "DELETE" ? t.nodeType === "file" ? r.unlink(t.path) : r.rmdir(t.path) : t.operation === "WRITE" ? r.writeFile(t.path, t.data) : t.operation === "RENAME" && r.mv(t.path, t.toPath);
+    for (const r of t)
+      r.operation === "CREATE" ? r.nodeType === "file" ? e.writeFile(r.path, " ") : e.mkdir(r.path) : r.operation === "DELETE" ? r.nodeType === "file" ? e.unlink(r.path) : e.rmdir(r.path) : r.operation === "WRITE" ? e.writeFile(r.path, r.data) : r.operation === "RENAME" && e.mv(r.path, r.toPath);
   } finally {
-    r[l].journal.bind();
+    e[__private__dont__use].journal.bind();
   }
 }
-function* Oe(r, e, t) {
-  if (r.isDir(e)) {
+function* recordExistingPath(e, t, r) {
+  if (e.isDir(t)) {
     yield {
       operation: "CREATE",
-      path: t,
+      path: r,
       nodeType: "directory"
     };
-    for (const n of r.listFiles(e))
-      yield* Oe(
-        r,
-        B(e, n),
-        B(t, n)
+    for (const s of e.listFiles(t))
+      yield* recordExistingPath(
+        e,
+        joinPaths(t, s),
+        joinPaths(r, s)
       );
   } else
     yield {
       operation: "CREATE",
-      path: t,
+      path: r,
       nodeType: "file"
     }, yield {
       operation: "WRITE",
       nodeType: "file",
-      path: t
+      path: r
     };
 }
-function lt(r) {
-  return r.replace(/\/$/, "").replace(/\/\/+/g, "/");
+function normalizePath(e) {
+  return e.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
-function ct(r) {
-  const e = {};
-  for (let t = r.length - 1; t >= 0; t--) {
-    for (let n = t - 1; n >= 0; n--) {
-      const s = ut(r[t], r[n]);
-      if (s === "none")
+function normalizeFilesystemOperations(e) {
+  const t = {};
+  for (let r = e.length - 1; r >= 0; r--) {
+    for (let s = r - 1; s >= 0; s--) {
+      const i = checkRelationship(e[r], e[s]);
+      if (i === "none")
         continue;
-      const o = r[t], i = r[n];
-      if (o.operation === "RENAME" && i.operation === "RENAME") {
+      const n = e[r], o = e[s];
+      if (n.operation === "RENAME" && o.operation === "RENAME") {
         console.warn(
           "[FS Journal] Normalizing a double rename is not yet supported:",
           {
-            current: o,
-            last: i
+            current: n,
+            last: o
           }
         );
         continue;
       }
-      (i.operation === "CREATE" || i.operation === "WRITE") && (o.operation === "RENAME" ? s === "same_node" ? (e[n] = [], e[t] = [
+      (o.operation === "CREATE" || o.operation === "WRITE") && (n.operation === "RENAME" ? i === "same_node" ? (t[s] = [], t[r] = [
         {
-          ...i,
-          path: o.toPath
+          ...o,
+          path: n.toPath
         },
-        ...e[t] || []
-      ]) : s === "descendant" && (e[n] = [], e[t] = [
+        ...t[r] || []
+      ]) : i === "descendant" && (t[s] = [], t[r] = [
         {
-          ...i,
-          path: B(
-            o.toPath,
-            i.path.substring(o.path.length)
+          ...o,
+          path: joinPaths(
+            n.toPath,
+            o.path.substring(n.path.length)
           )
         },
-        ...e[t] || []
-      ]) : o.operation === "WRITE" && s === "same_node" ? e[n] = [] : o.operation === "DELETE" && s === "same_node" && (e[n] = [], e[t] = []));
+        ...t[r] || []
+      ]) : n.operation === "WRITE" && i === "same_node" ? t[s] = [] : n.operation === "DELETE" && i === "same_node" && (t[s] = [], t[r] = []));
     }
-    if (Object.entries(e).length > 0) {
-      const n = r.flatMap((s, o) => o in e ? e[o] : [s]);
-      return ct(n);
+    if (Object.entries(t).length > 0) {
+      const s = e.flatMap((i, n) => n in t ? t[n] : [i]);
+      return normalizeFilesystemOperations(s);
     }
   }
-  return r;
+  return e;
 }
-function ut(r, e) {
-  const t = r.path, n = r.operation !== "WRITE" && r.nodeType === "directory", s = e.operation !== "WRITE" && e.nodeType === "directory", o = e.operation === "RENAME" ? e.toPath : e.path;
-  return o === t ? "same_node" : s && t.startsWith(o + "/") ? "ancestor" : n && o.startsWith(t + "/") ? "descendant" : "none";
+function checkRelationship(e, t) {
+  const r = e.path, s = e.operation !== "WRITE" && e.nodeType === "directory", i = t.operation !== "WRITE" && t.nodeType === "directory", n = t.operation === "RENAME" ? t.toPath : t.path;
+  return n === r ? "same_node" : i && r.startsWith(n + "/") ? "ancestor" : s && n.startsWith(r + "/") ? "descendant" : "none";
 }
-async function yt(r, e) {
-  const n = e.filter(
-    (s) => s.operation === "WRITE"
-  ).map((s) => dt(r, s));
-  return await Promise.all(n), e;
+async function hydrateUpdateFileOps(e, t) {
+  const s = t.filter(
+    (i) => i.operation === "WRITE"
+  ).map((i) => hydrateOp(e, i));
+  return await Promise.all(s), t;
 }
-const ht = new ie({ concurrency: 15 });
-async function dt(r, e) {
-  const t = await ht.acquire();
+const hydrateLock = new Semaphore({ concurrency: 15 });
+async function hydrateOp(e, t) {
+  const r = await hydrateLock.acquire();
   try {
-    e.data = await r.readFileAsBuffer(e.path);
-  } catch (n) {
+    t.data = await e.readFileAsBuffer(t.path);
+  } catch (s) {
     console.warn(
-      `Journal failed to hydrate a file on flush: the path ${e.path} no longer exists`
-    ), console.error(n);
+      `Journal failed to hydrate a file on flush: the path ${t.path} no longer exists`
+    ), console.error(s);
   }
-  t();
+  r();
 }
 export {
-  yt as hydrateUpdateFileOps,
-  pt as journalFSEvents,
-  ct as normalizeFilesystemOperations,
-  mt as replayFSJournal
+  hydrateUpdateFileOps,
+  journalFSEvents,
+  normalizeFilesystemOperations,
+  replayFSJournal
 };