@php-wasm/fs-journal 0.7.0 → 0.7.3

package/index.js

@@ -1,13 +1,13 @@
-var Y = (e, t, r) => {
+var D = (e, t, r) => {
   if (!t.has(e))
     throw TypeError("Cannot " + r);
 };
-var l = (e, t, r) => (Y(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => {
+var h = (e, t, r) => (D(e, t, "read from private field"), r ? r.call(e) : t.get(e)), u = (e, t, r) => {
   if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(e) : t.set(e, r);
-}, p = (e, t, r, s) => (Y(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
-var f = (e, t, r) => (Y(e, t, "access private method"), r);
+}, f = (e, t, r, s) => (D(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
+var p = (e, t, r) => (D(e, t, "access private method"), r);
 const currentJsRuntime = function() {
   var e;
   return typeof process < "u" && ((e = process.release) == null ? void 0 : e.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : (
@@ -18,25 +18,25 @@ const currentJsRuntime = function() {
 }();
 if (currentJsRuntime === "NODE") {
   let e = function(r) {
-    return new Promise(function(s, n) {
-      r.onload = r.onerror = function(i) {
-        r.onload = r.onerror = null, i.type === "load" ? s(r.result) : n(new Error("Failed to read the blob/file"));
+    return new Promise(function(s, i) {
+      r.onload = r.onerror = function(n) {
+        r.onload = r.onerror = null, n.type === "load" ? s(r.result) : i(new Error("Failed to read the blob/file"));
       };
     });
   }, t = function() {
-    const r = new Uint8Array([1, 2, 3, 4]), n = new File([r], "test").stream();
+    const r = new Uint8Array([1, 2, 3, 4]), i = new File([r], "test").stream();
     try {
-      return n.getReader({ mode: "byob" }), !0;
+      return i.getReader({ mode: "byob" }), !0;
     } catch {
       return !1;
     }
   };
   if (typeof File > "u") {
     class r extends Blob {
-      constructor(n, i, o) {
-        super(n);
+      constructor(i, n, o) {
+        super(i);
         let a;
-        o != null && o.lastModified && (a = /* @__PURE__ */ new Date()), (!a || isNaN(a.getFullYear())) && (a = /* @__PURE__ */ new Date()), this.lastModifiedDate = a, this.lastModified = a.getMilliseconds(), this.name = i || "";
+        o != null && o.lastModified && (a = /* @__PURE__ */ new Date()), (!a || isNaN(a.getFullYear())) && (a = /* @__PURE__ */ new Date()), this.lastModifiedDate = a, this.lastModified = a.getMilliseconds(), this.name = n || "";
       }
     }
     global.File = r;
@@ -55,14 +55,14 @@ if (currentJsRuntime === "NODE") {
       // 0.5 MB seems like a reasonable chunk size, let's adjust
       // this if needed.
       autoAllocateChunkSize: 512 * 1024,
-      async pull(n) {
-        const i = n.byobRequest.view, a = await s.slice(
+      async pull(i) {
+        const n = i.byobRequest.view, a = await s.slice(
           r,
-          r + i.byteLength
-        ).arrayBuffer(), c = new Uint8Array(a);
-        new Uint8Array(i.buffer).set(c);
-        const u = c.byteLength;
-        n.byobRequest.respond(u), r += u, r >= s.size && n.close();
+          r + n.byteLength
+        ).arrayBuffer(), l = new Uint8Array(a);
+        new Uint8Array(n.buffer).set(l);
+        const c = l.byteLength;
+        i.byobRequest.respond(c), r += c, r >= s.size && i.close();
       }
     });
   });
@@ -102,6 +102,171 @@ const ErrorEvent = typeof globalThis.ErrorEvent == "function" ? globalThis.Error
 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;
 }
+const logToConsole = (e, ...t) => {
+  switch (e.severity) {
+    case "Debug":
+      console.debug(e.message, ...t);
+      break;
+    case "Info":
+      console.info(e.message, ...t);
+      break;
+    case "Warn":
+      console.warn(e.message, ...t);
+      break;
+    case "Error":
+      console.error(e.message, ...t);
+      break;
+    case "Fatal":
+      console.error(e.message, ...t);
+      break;
+    default:
+      console.log(e.message, ...t);
+  }
+}, prepareLogMessage = (e, ...t) => [
+  typeof e == "object" ? JSON.stringify(e) : e,
+  ...t.map((r) => JSON.stringify(r))
+].join(" "), logs = [], addToLogArray = (e) => {
+  logs.push(e);
+}, logToMemory = (e) => {
+  if (e.raw === !0)
+    addToLogArray(e.message);
+  else {
+    const t = formatLogEntry(
+      typeof e.message == "object" ? prepareLogMessage(e.message) : e.message,
+      e.severity ?? "Info",
+      e.prefix ?? "JavaScript"
+    );
+    addToLogArray(t);
+  }
+};
+class Logger extends EventTarget {
+  // constructor
+  constructor(t = []) {
+    super(), this.handlers = t, this.fatalErrorEvent = "playground-fatal-error";
+  }
+  /**
+   * Get all logs.
+   * @returns string[]
+   */
+  getLogs() {
+    return this.handlers.includes(logToMemory) ? [...logs] : (this.error(`Logs aren't stored because the logToMemory handler isn't registered.
+				If you're using a custom logger instance, make sure to register logToMemory handler.
+			`), []);
+  }
+  /**
+   * Log message with severity.
+   *
+   * @param message any
+   * @param severity LogSeverity
+   * @param raw boolean
+   * @param args any
+   */
+  logMessage(t, ...r) {
+    for (const s of this.handlers)
+      s(t, ...r);
+  }
+  /**
+   * Log message
+   *
+   * @param message any
+   * @param args any
+   */
+  log(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: void 0,
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log debug message
+   *
+   * @param message any
+   * @param args any
+   */
+  debug(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Debug",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log info message
+   *
+   * @param message any
+   * @param args any
+   */
+  info(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Info",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log warning message
+   *
+   * @param message any
+   * @param args any
+   */
+  warn(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Warn",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+  /**
+   * Log error message
+   *
+   * @param message any
+   * @param args any
+   */
+  error(t, ...r) {
+    this.logMessage(
+      {
+        message: t,
+        severity: "Error",
+        prefix: "JavaScript",
+        raw: !1
+      },
+      ...r
+    );
+  }
+}
+const logger = new Logger([logToMemory, logToConsole]), formatLogEntry = (e, t, r) => {
+  const s = /* @__PURE__ */ new Date(), i = new Intl.DateTimeFormat("en-GB", {
+    year: "numeric",
+    month: "short",
+    day: "2-digit",
+    timeZone: "UTC"
+  }).format(s).replace(/ /g, "-"), n = new Intl.DateTimeFormat("en-GB", {
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: !1,
+    timeZone: "UTC",
+    timeZoneName: "short"
+  }).format(s);
+  return `[${i + " " + n}] ${r} ${t}: ${e}`;
+};
 class UnhandledRejectionsTarget extends EventTarget {
   constructor() {
     super(...arguments), this.listenersCount = 0;
@@ -124,16 +289,16 @@ function improveWASMErrorReporting(e) {
   for (const r in e.asm)
     if (typeof e.asm[r] == "function") {
       const s = e.asm[r];
-      e.asm[r] = function(...n) {
-        var i;
+      e.asm[r] = function(...i) {
+        var n;
         try {
-          return s(...n);
+          return s(...i);
         } catch (o) {
           if (!(o instanceof Error))
             throw o;
           const a = clarifyErrorMessage(
             o,
-            (i = e.lastAsyncifyStackSource) == null ? void 0 : i.stack
+            (n = e.lastAsyncifyStackSource) == null ? void 0 : n.stack
           );
           if (e.lastAsyncifyStackSource && (o.cause = e.lastAsyncifyStackSource), t.hasListeners()) {
             t.dispatchEvent(
@@ -200,13 +365,13 @@ CLI option:
 let logged = !1;
 function showCriticalErrorBox(e) {
   if (!logged && (logged = !0, !(e != null && e.trim().startsWith("Program terminated with exit")))) {
-    console.log(`${redBg}
+    logger.log(`${redBg}
 ${eol}
 ${bold}  WASM ERROR${reset}${redBg}`);
     for (const t of e.split(`
 `))
-      console.log(`${eol}  ${t} `);
-    console.log(`${reset}`);
+      logger.log(`${eol}  ${t} `);
+    logger.log(`${reset}`);
   }
 }
 function extractPHPFunctionsFromStack(e) {
@@ -298,8 +463,8 @@ function normalizePath$1(e) {
 function normalizePathsArray(e, t) {
   let r = 0;
   for (let s = e.length - 1; s >= 0; s--) {
-    const n = e[s];
-    n === "." ? e.splice(s, 1) : n === ".." ? (e.splice(s, 1), r++) : r && (e.splice(s, 1), r--);
+    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--)
@@ -307,18 +472,18 @@ function normalizePathsArray(e, t) {
   return e;
 }
 function splitShellCommand(e) {
-  let s = 0, n = "";
-  const i = [];
+  let s = 0, i = "";
+  const n = [];
   let o = "";
   for (let a = 0; a < e.length; a++) {
-    const c = e[a];
-    c === "\\" ? ((e[a + 1] === '"' || e[a + 1] === "'") && a++, o += e[a]) : s === 0 ? c === '"' || c === "'" ? (s = 1, n = c) : c.match(/\s/) ? (o.trim().length && i.push(o.trim()), o = c) : i.length && !o ? o = i.pop() + c : o += c : s === 1 && (c === n ? (s = 0, n = "") : o += c);
+    const l = e[a];
+    l === "\\" ? ((e[a + 1] === '"' || e[a + 1] === "'") && a++, o += e[a]) : s === 0 ? l === '"' || l === "'" ? (s = 1, i = l) : l.match(/\s/) ? (o.trim().length && n.push(o.trim()), o = l) : n.length && !o ? o = n.pop() + l : o += l : s === 1 && (l === i ? (s = 0, i = "") : o += l);
   }
-  return o && i.push(o.trim()), i;
+  return o && n.push(o.trim()), n;
 }
 function createSpawnHandler(e) {
   return function(t, r = [], s = {}) {
-    const n = new ChildProcess(), i = new ProcessApi(n);
+    const i = new ChildProcess(), n = new ProcessApi(i);
     return setTimeout(async () => {
       let o = [];
       if (r.length)
@@ -329,8 +494,13 @@ function createSpawnHandler(e) {
         o = t;
       else
         throw new Error("Invalid command ", t);
-      await e(o, i, s), n.emit("spawn", !0);
-    }), n;
+      try {
+        await e(o, n, s);
+      } catch (a) {
+        i.emit("error", a), typeof a == "object" && a !== null && "message" in a && typeof a.message == "string" && n.stderr(a.message), n.exit(1);
+      }
+      i.emit("spawn", !0);
+    }), i;
   };
 }
 class EventEmitter {
@@ -400,9 +570,33 @@ ReadableStream.prototype[Symbol.asyncIterator] || (ReadableStream.prototype[Symb
   }
 }, ReadableStream.prototype.iterate = // @ts-ignore
 ReadableStream.prototype[Symbol.asyncIterator]);
+const responseTexts = {
+  500: "Internal Server Error",
+  502: "Bad Gateway",
+  404: "Not Found",
+  403: "Forbidden",
+  401: "Unauthorized",
+  400: "Bad Request",
+  301: "Moved Permanently",
+  302: "Found",
+  307: "Temporary Redirect",
+  308: "Permanent Redirect",
+  204: "No Content",
+  201: "Created",
+  200: "OK"
+};
 class PHPResponse {
-  constructor(t, r, s, n = "", i = 0) {
-    this.httpStatusCode = t, this.headers = r, this.bytes = s, this.exitCode = i, this.errors = n;
+  constructor(t, r, s, i = "", n = 0) {
+    this.httpStatusCode = t, this.headers = r, this.bytes = s, this.exitCode = n, this.errors = i;
+  }
+  static forHttpCode(t, r = "") {
+    return new PHPResponse(
+      t,
+      {},
+      new TextEncoder().encode(
+        r || responseTexts[t] || ""
+      )
+    );
   }
   static fromRawData(t) {
     return new PHPResponse(
@@ -435,410 +629,6 @@ class PHPResponse {
     return new TextDecoder().decode(this.bytes);
   }
 }
-const DEFAULT_BASE_URL = "http://example.com";
-function toRelativeUrl(e) {
-  return e.toString().substring(e.origin.length);
-}
-function removePathPrefix(e, t) {
-  return !t || !e.startsWith(t) ? e : e.substring(t.length);
-}
-function ensurePathPrefix(e, t) {
-  return !t || e.startsWith(t) ? e : t + e;
-}
-async function encodeAsMultipart(e) {
-  const t = `----${Math.random().toString(36).slice(2)}`, r = `multipart/form-data; boundary=${t}`, s = new TextEncoder(), n = [];
-  for (const [c, u] of Object.entries(e))
-    n.push(`--${t}\r
-`), n.push(`Content-Disposition: form-data; name="${c}"`), u instanceof File && n.push(`; filename="${u.name}"`), n.push(`\r
-`), u instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\r
-`)), n.push(`\r
-`), u instanceof File ? n.push(await fileToUint8Array(u)) : n.push(u), n.push(`\r
-`);
-  n.push(`--${t}--\r
-`);
-  const i = n.reduce((c, u) => c + u.length, 0), o = new Uint8Array(i);
-  let a = 0;
-  for (const c of n)
-    o.set(
-      typeof c == "string" ? s.encode(c) : c,
-      a
-    ), a += c.length;
-  return { bytes: o, contentType: r };
-}
-function fileToUint8Array(e) {
-  return new Promise((t) => {
-    const r = new FileReader();
-    r.onload = () => {
-      t(new Uint8Array(r.result));
-    }, r.readAsArrayBuffer(e);
-  });
-}
-class HttpCookieStore {
-  constructor() {
-    this.cookies = {};
-  }
-  rememberCookiesFromResponseHeaders(t) {
-    if (t != null && t["set-cookie"])
-      for (const r of t["set-cookie"])
-        try {
-          if (!r.includes("="))
-            continue;
-          const s = r.indexOf("="), n = r.substring(0, s), i = r.substring(s + 1).split(";")[0];
-          this.cookies[n] = i;
-        } catch (s) {
-          console.error(s);
-        }
-  }
-  getCookieRequestHeader() {
-    const t = [];
-    for (const r in this.cookies)
-      t.push(`${r}=${this.cookies[r]}`);
-    return t.join("; ");
-  }
-}
-var m, b, A, P, S, _, T, v, F, H, Z, N, X, O, ee;
-class PHPRequestHandler {
-  /**
-   * @param  php    - The PHP instance.
-   * @param  config - Request Handler configuration.
-   */
-  constructor(t, r = {}) {
-    /**
-     * Serves a static file from the PHP filesystem.
-     *
-     * @param  fsPath - Absolute path of the static file to serve.
-     * @returns The response.
-     */
-    d(this, H);
-    /**
-     * Runs the requested PHP file with all the request and $_SERVER
-     * superglobals populated.
-     *
-     * @param  request - The request.
-     * @returns The response.
-     */
-    d(this, N);
-    /**
-     * Resolve the requested path to the filesystem path of the requested PHP file.
-     *
-     * Fall back to index.php as if there was a url rewriting rule in place.
-     *
-     * @param  requestedPath - The requested pathname.
-     * @throws {Error} If the requested path doesn't exist.
-     * @returns The resolved filesystem path.
-     */
-    d(this, O);
-    d(this, m, void 0);
-    d(this, b, void 0);
-    d(this, A, void 0);
-    d(this, P, void 0);
-    d(this, S, void 0);
-    d(this, _, void 0);
-    d(this, T, void 0);
-    d(this, v, void 0);
-    d(this, F, void 0);
-    p(this, v, new Semaphore({ concurrency: 1 }));
-    const {
-      documentRoot: s = "/www/",
-      absoluteUrl: n = typeof location == "object" ? location == null ? void 0 : location.href : "",
-      rewriteRules: i = []
-    } = r;
-    this.php = t, p(this, F, new HttpCookieStore()), p(this, m, s);
-    const o = new URL(n);
-    p(this, A, o.hostname), p(this, P, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), p(this, b, (o.protocol || "").replace(":", ""));
-    const a = l(this, P) !== 443 && l(this, P) !== 80;
-    p(this, S, [
-      l(this, A),
-      a ? `:${l(this, P)}` : ""
-    ].join("")), p(this, _, o.pathname.replace(/\/+$/, "")), p(this, T, [
-      `${l(this, b)}://`,
-      l(this, S),
-      l(this, _)
-    ].join("")), this.rewriteRules = i;
-  }
-  /**
-   * Converts a path to an absolute URL based at the PHPRequestHandler
-   * root.
-   *
-   * @param  path The server path to convert to an absolute URL.
-   * @returns The absolute URL.
-   */
-  pathToInternalUrl(t) {
-    return `${this.absoluteUrl}${t}`;
-  }
-  /**
-   * Converts an absolute URL based at the PHPRequestHandler to a relative path
-   * without the server pathname and scope.
-   *
-   * @param  internalUrl An absolute URL based at the PHPRequestHandler root.
-   * @returns The relative path.
-   */
-  internalUrlToPath(t) {
-    const r = new URL(t);
-    return r.pathname.startsWith(l(this, _)) && (r.pathname = r.pathname.slice(l(this, _).length)), toRelativeUrl(r);
-  }
-  get isRequestRunning() {
-    return l(this, v).running > 0;
-  }
-  /**
-   * The absolute URL of this PHPRequestHandler instance.
-   */
-  get absoluteUrl() {
-    return l(this, T);
-  }
-  /**
-   * The directory in the PHP filesystem where the server will look
-   * for the files to serve. Default: `/var/www`.
-   */
-  get documentRoot() {
-    return l(this, m);
-  }
-  /**
-   * Serves the request – either by serving a static file, or by
-   * dispatching it to the PHP runtime.
-   *
-   * The request() method mode behaves like a web server and only works if
-   * the PHP was initialized with a `requestHandler` option (which the online version
-   * of WordPress Playground does by default).
-   *
-   * In the request mode, you pass an object containing the request information
-   * (method, headers, body, etc.) and the path to the PHP file to run:
-   *
-   * ```ts
-   * const php = PHP.load('7.4', {
-   * 	requestHandler: {
-   * 		documentRoot: "/www"
-   * 	}
-   * })
-   * php.writeFile("/www/index.php", `<?php echo file_get_contents("php://input");`);
-   * const result = await php.request({
-   * 	method: "GET",
-   * 	headers: {
-   * 		"Content-Type": "text/plain"
-   * 	},
-   * 	body: "Hello world!",
-   * 	path: "/www/index.php"
-   * });
-   * // result.text === "Hello world!"
-   * ```
-   *
-   * The `request()` method cannot be used in conjunction with `cli()`.
-   *
-   * @example
-   * ```js
-   * const output = await php.request({
-   * 	method: 'GET',
-   * 	url: '/index.php',
-   * 	headers: {
-   * 		'X-foo': 'bar',
-   * 	},
-   * 	body: {
-   * 		foo: 'bar',
-   * 	},
-   * });
-   * console.log(output.stdout); // "Hello world!"
-   * ```
-   *
-   * @param  request - PHP Request data.
-   */
-  async request(t) {
-    const r = t.url.startsWith("http://") || t.url.startsWith("https://"), s = new URL(
-      // Remove the hash part of the URL as it's not meant for the server.
-      t.url.split("#")[0],
-      r ? void 0 : DEFAULT_BASE_URL
-    ), n = applyRewriteRules(
-      removePathPrefix(
-        decodeURIComponent(s.pathname),
-        l(this, _)
-      ),
-      this.rewriteRules
-    ), i = joinPaths(l(this, m), n);
-    return seemsLikeAPHPRequestHandlerPath(i) ? await f(this, N, X).call(this, t, s) : f(this, H, Z).call(this, i);
-  }
-}
-m = new WeakMap(), b = new WeakMap(), A = new WeakMap(), P = new WeakMap(), S = new WeakMap(), _ = new WeakMap(), T = new WeakMap(), v = new WeakMap(), F = new WeakMap(), H = new WeakSet(), Z = 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.
-      {
-        "x-file-type": ["static"]
-      },
-      new TextEncoder().encode("404 File not found")
-    );
-  const r = this.php.readFileAsBuffer(t);
-  return new PHPResponse(
-    200,
-    {
-      "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": [inferMimeType(t)],
-      "accept-ranges": ["bytes"],
-      "cache-control": ["public, max-age=0"]
-    },
-    r
-  );
-}, N = new WeakSet(), X = async function(t, r) {
-  var n;
-  if (l(this, v).running > 0 && ((n = t.headers) == null ? void 0 : n["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 l(this, v).acquire();
-  try {
-    let i = "GET";
-    const o = {
-      host: l(this, S),
-      ...normalizeHeaders(t.headers || {}),
-      cookie: l(this, F).getCookieRequestHeader()
-    };
-    let a = t.body;
-    if (typeof a == "object" && !(a instanceof Uint8Array)) {
-      i = "POST";
-      const { bytes: u, contentType: h } = await encodeAsMultipart(a);
-      a = u, o["content-type"] = h;
-    }
-    let c;
-    try {
-      c = f(this, O, ee).call(this, decodeURIComponent(r.pathname));
-    } catch {
-      return new PHPResponse(
-        404,
-        {},
-        new TextEncoder().encode("404 File not found")
-      );
-    }
-    try {
-      const u = await this.php.run({
-        relativeUri: ensurePathPrefix(
-          toRelativeUrl(r),
-          l(this, _)
-        ),
-        protocol: l(this, b),
-        method: t.method || i,
-        $_SERVER: {
-          REMOTE_ADDR: "127.0.0.1",
-          DOCUMENT_ROOT: l(this, m),
-          HTTPS: l(this, T).startsWith("https://") ? "on" : ""
-        },
-        body: a,
-        scriptPath: c,
-        headers: o
-      });
-      return l(this, F).rememberCookiesFromResponseHeaders(
-        u.headers
-      ), u;
-    } catch (u) {
-      const h = u;
-      if (h != null && h.response)
-        return h.response;
-      throw u;
-    }
-  } finally {
-    s();
-  }
-}, O = new WeakSet(), ee = function(t) {
-  let r = removePathPrefix(t, l(this, _));
-  r = applyRewriteRules(r, this.rewriteRules), r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${l(this, m)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
-  const s = `${l(this, m)}${r}`;
-  if (this.php.fileExists(s))
-    return s;
-  throw new Error(`File not found: ${s}`);
-};
-function inferMimeType(e) {
-  switch (e.split(".").pop()) {
-    case "css":
-      return "text/css";
-    case "js":
-      return "application/javascript";
-    case "png":
-      return "image/png";
-    case "jpg":
-    case "jpeg":
-      return "image/jpeg";
-    case "gif":
-      return "image/gif";
-    case "svg":
-      return "image/svg+xml";
-    case "woff":
-      return "font/woff";
-    case "woff2":
-      return "font/woff2";
-    case "ttf":
-      return "font/ttf";
-    case "otf":
-      return "font/otf";
-    case "eot":
-      return "font/eot";
-    case "ico":
-      return "image/x-icon";
-    case "html":
-      return "text/html";
-    case "json":
-      return "application/json";
-    case "xml":
-      return "application/xml";
-    case "txt":
-    case "md":
-      return "text/plain";
-    case "pdf":
-      return "application/pdf";
-    case "webp":
-      return "image/webp";
-    case "mp3":
-      return "audio/mpeg";
-    case "mp4":
-      return "video/mp4";
-    case "csv":
-      return "text/csv";
-    case "xls":
-      return "application/vnd.ms-excel";
-    case "xlsx":
-      return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-    case "doc":
-      return "application/msword";
-    case "docx":
-      return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-    case "ppt":
-      return "application/vnd.ms-powerpoint";
-    case "pptx":
-      return "application/vnd.openxmlformats-officedocument.presentationml.presentation";
-    case "zip":
-      return "application/zip";
-    case "rar":
-      return "application/x-rar-compressed";
-    case "tar":
-      return "application/x-tar";
-    case "gz":
-      return "application/gzip";
-    case "7z":
-      return "application/x-7z-compressed";
-    default:
-      return "application-octet-stream";
-  }
-}
-function seemsLikeAPHPRequestHandlerPath(e) {
-  return seemsLikeAPHPFile(e) || seemsLikeADirectoryRoot(e);
-}
-function seemsLikeAPHPFile(e) {
-  return e.endsWith(".php") || e.includes(".php/");
-}
-function seemsLikeADirectoryRoot(e) {
-  return !e.split("/").pop().includes(".");
-}
-function applyRewriteRules(e, t) {
-  for (const r of t)
-    if (new RegExp(r.match).test(e))
-      return e.replace(r.match, r.replacement);
-  return e;
-}
 const FileErrorCodes = {
   0: "No error occurred. System call completed successfully.",
   1: "Argument list too long.",
@@ -924,16 +714,16 @@ function getEmscriptenFsError(e) {
     return FileErrorCodes[t];
 }
 function rethrowFileSystemError(e = "") {
-  return function(r, s, n) {
-    const i = n.value;
-    n.value = function(...o) {
+  return function(r, s, i) {
+    const n = i.value;
+    i.value = function(...o) {
       try {
-        return i.apply(this, o);
+        return n.apply(this, o);
       } catch (a) {
-        const c = typeof a == "object" ? a == null ? void 0 : a.errno : null;
-        if (c in FileErrorCodes) {
-          const u = FileErrorCodes[c], h = typeof o[0] == "string" ? o[0] : null, g = h !== null ? e.replaceAll("{path}", h) : e;
-          throw new Error(`${g}: ${u}`, {
+        const l = typeof a == "object" ? a == null ? void 0 : a.errno : null;
+        if (l in FileErrorCodes) {
+          const c = FileErrorCodes[l], d = typeof o[0] == "string" ? o[0] : null, g = d !== null ? e.replaceAll("{path}", d) : e;
+          throw new Error(`${g}: ${c}`, {
             cause: a
           });
         }
@@ -951,9 +741,9 @@ function getLoadedRuntime(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 __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = (e, t, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? __getOwnPropDesc(t, r) : t, i = e.length - 1, o; i >= 0; i--)
-    (o = e[i]) && (n = (s ? o(t, r, n) : o(n)) || n);
-  return s && n && __defProp(t, r, n), n;
+  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 STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
 class PHPExecutionFailureError extends Error {
@@ -961,16 +751,16 @@ class PHPExecutionFailureError extends Error {
     super(t), this.response = r, this.source = s;
   }
 }
-var R, x, k, y, w, E, C, I, te, M, re, U, se, B, ne, L, ie, D, oe, $, ae, q, le, W, ce, j, ue, z, de, G, he, J, pe, V, fe, Q, _e;
+var E, w, v, _, y, m, P, b, $, S, U, R, q, T, W, F, z, C, j, x, G, k, J, I, Q, N, V, A, Y, M, Z, O, K, H, X, B, ee;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
    *
    * @internal
    * @param  PHPRuntime - Optional. PHP Runtime ID as initialized by loadPHPRuntime.
-   * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
+   * @param  requestHandlerOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
-  constructor(e, t) {
+  constructor(e) {
     /**
      * Prepares the $_SERVER entries for the PHP runtime.
      *
@@ -980,46 +770,46 @@ class BasePHP {
      *             was provided.
      * @returns Computed $_SERVER entries.
      */
-    d(this, I);
-    d(this, M);
-    d(this, U);
-    d(this, B);
-    d(this, L);
-    d(this, D);
-    d(this, $);
-    d(this, q);
-    d(this, W);
-    d(this, j);
-    d(this, z);
-    d(this, G);
-    d(this, J);
-    d(this, V);
-    d(this, Q);
-    d(this, R, void 0);
-    d(this, x, void 0);
-    d(this, k, void 0);
-    d(this, y, void 0);
-    d(this, w, void 0);
-    d(this, E, void 0);
-    d(this, C, void 0);
-    p(this, R, []), p(this, y, !1), p(this, w, null), p(this, E, /* @__PURE__ */ new Map()), p(this, C, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPRequestHandler(this, t));
+    u(this, b);
+    u(this, S);
+    u(this, R);
+    u(this, T);
+    u(this, F);
+    u(this, C);
+    u(this, x);
+    u(this, k);
+    u(this, I);
+    u(this, N);
+    u(this, A);
+    u(this, M);
+    u(this, O);
+    u(this, H);
+    u(this, B);
+    u(this, E, void 0);
+    u(this, w, void 0);
+    u(this, v, void 0);
+    u(this, _, void 0);
+    u(this, y, void 0);
+    u(this, m, void 0);
+    u(this, P, void 0);
+    f(this, E, []), f(this, _, !1), f(this, y, null), f(this, m, /* @__PURE__ */ new Map()), f(this, P, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e);
   }
   addEventListener(e, t) {
-    l(this, E).has(e) || l(this, E).set(e, /* @__PURE__ */ new Set()), l(this, E).get(e).add(t);
+    h(this, m).has(e) || h(this, m).set(e, /* @__PURE__ */ new Set()), h(this, m).get(e).add(t);
   }
   removeEventListener(e, t) {
     var r;
-    (r = l(this, E).get(e)) == null || r.delete(t);
+    (r = h(this, m).get(e)) == null || r.delete(t);
   }
   dispatchEvent(e) {
-    const t = l(this, E).get(e.type);
+    const t = h(this, m).get(e.type);
     if (t)
       for (const r of t)
         r(e);
   }
   /** @inheritDoc */
   async onMessage(e) {
-    l(this, C).push(e);
+    h(this, P).push(e);
   }
   /** @inheritDoc */
   async setSpawnHandler(handler) {
@@ -1048,13 +838,13 @@ class BasePHP {
     if (!t)
       throw new Error("Invalid PHP runtime id.");
     this[__private__dont__use] = t, t.onMessage = async (r) => {
-      for (const s of l(this, C)) {
-        const n = await s(r);
-        if (n)
-          return n;
+      for (const s of h(this, P)) {
+        const i = await s(r);
+        if (i)
+          return i;
       }
       return "";
-    }, p(this, w, improveWASMErrorReporting(t)), this.dispatchEvent({
+    }, f(this, y, improveWASMErrorReporting(t)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1069,13 +859,13 @@ class BasePHP {
       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?"
       );
-    p(this, k, e);
+    f(this, v, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
-    if (l(this, y))
+    if (h(this, _))
       throw new Error("Cannot set PHP ini path after calling run().");
-    p(this, x, e), this[__private__dont__use].ccall(
+    f(this, w, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -1084,17 +874,22 @@ class BasePHP {
   }
   /** @inheritDoc */
   setPhpIniEntry(e, t) {
-    if (l(this, y))
+    if (h(this, _))
       throw new Error("Cannot set PHP ini entries after calling run().");
-    l(this, R).push([e, t]);
+    h(this, E).push([e, t]);
   }
   /** @inheritDoc */
   chdir(e) {
     this[__private__dont__use].FS.chdir(e);
   }
-  /** @inheritDoc */
+  /**
+   * Do not use. Use new PHPRequestHandler() instead.
+   * @deprecated
+   */
   async request(e) {
-    if (!this.requestHandler)
+    if (logger.warn(
+      "PHP.request() is deprecated. Please use new PHPRequestHandler() instead."
+    ), !this.requestHandler)
       throw new Error("No request handler available.");
     return this.requestHandler.request(e);
   }
@@ -1103,30 +898,30 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (l(this, y) || (f(this, M, re).call(this), p(this, y, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (h(this, _) || (p(this, S, U).call(this), f(this, _, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
-      f(this, z, de).call(this, e.scriptPath || ""), f(this, B, ne).call(this, e.relativeUri || ""), f(this, q, le).call(this, e.method || "GET");
-      const s = normalizeHeaders(e.headers || {}), n = s.host || "example.com:443", i = f(this, $, ae).call(this, n, e.protocol || "http");
-      f(this, L, ie).call(this, n), f(this, D, oe).call(this, i), f(this, W, ce).call(this, s), e.body && (r = f(this, j, ue).call(this, e.body)), typeof e.code == "string" && f(this, V, fe).call(this, " ?>" + e.code);
-      const o = f(this, I, te).call(this, e.$_SERVER, s, i);
-      for (const u in o)
-        f(this, G, he).call(this, u, o[u]);
+      p(this, A, Y).call(this, e.scriptPath || ""), p(this, T, W).call(this, e.relativeUri || ""), p(this, k, J).call(this, e.method || "GET");
+      const s = normalizeHeaders(e.headers || {}), i = s.host || "example.com:443", n = p(this, x, G).call(this, i, e.protocol || "http");
+      p(this, F, z).call(this, i), p(this, C, j).call(this, n), p(this, I, Q).call(this, s), e.body && (r = p(this, N, V).call(this, e.body)), typeof e.code == "string" && p(this, H, X).call(this, " ?>" + e.code);
+      const o = p(this, b, $).call(this, e.$_SERVER, s, n);
+      for (const c in o)
+        p(this, M, Z).call(this, c, o[c]);
       const a = e.env || {};
-      for (const u in a)
-        f(this, J, pe).call(this, u, a[u]);
-      const c = await f(this, Q, _e).call(this);
-      if (c.exitCode !== 0) {
-        console.warn("PHP.run() output was:", c.text);
-        const u = new PHPExecutionFailureError(
-          `PHP.run() failed with exit code ${c.exitCode} and the following output: ` + c.errors,
-          c,
+      for (const c in a)
+        p(this, O, K).call(this, c, a[c]);
+      const l = await p(this, B, ee).call(this);
+      if (l.exitCode !== 0) {
+        logger.warn("PHP.run() output was:", l.text);
+        const c = new PHPExecutionFailureError(
+          `PHP.run() failed with exit code ${l.exitCode} and the following output: ` + l.errors,
+          l,
           "request"
         );
-        throw console.error(u), u;
+        throw logger.error(c), c;
       }
-      return c;
+      return l;
     } catch (s) {
       throw this.dispatchEvent({
         type: "request.error",
@@ -1207,11 +1002,11 @@ class BasePHP {
       );
       if (t.prependPath) {
         const s = e.replace(/\/$/, "");
-        return r.map((n) => `${s}/${n}`);
+        return r.map((i) => `${s}/${i}`);
       }
       return r;
     } catch (r) {
-      return console.error(r, { path: e }), [];
+      return logger.error(r, { path: e }), [];
     }
   }
   isDir(e) {
@@ -1242,7 +1037,7 @@ class BasePHP {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(e), l(this, x) && this.setPhpIniPath(l(this, x)), l(this, k) && this.setSapiName(l(this, k)), t && copyFS(r, this[__private__dont__use].FS, t);
+    this.initializeRuntime(e), h(this, w) && this.setPhpIniPath(h(this, w)), h(this, v) && this.setSapiName(h(this, v)), t && copyFS(r, this[__private__dont__use].FS, t);
   }
   exit(e = 0) {
     this.dispatchEvent({
@@ -1252,20 +1047,23 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    p(this, y, !1), p(this, w, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    f(this, _, !1), f(this, y, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+  }
+  [Symbol.dispose]() {
+    h(this, _) && this.exit(0);
   }
 }
-R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w = new WeakMap(), E = new WeakMap(), C = new WeakMap(), I = new WeakSet(), te = function(e, t, r) {
+E = new WeakMap(), w = new WeakMap(), v = new WeakMap(), _ = new WeakMap(), y = new WeakMap(), m = new WeakMap(), P = new WeakMap(), b = new WeakSet(), $ = function(e, t, r) {
   const s = {
     ...e || {}
   };
   s.HTTPS = s.HTTPS || r === 443 ? "on" : "off";
-  for (const n in t) {
-    let i = "HTTP_";
-    ["content-type", "content-length"].includes(n.toLowerCase()) && (i = ""), s[`${i}${n.toUpperCase().replace(/-/g, "_")}`] = t[n];
+  for (const i in t) {
+    let n = "HTTP_";
+    ["content-type", "content-length"].includes(i.toLowerCase()) && (n = ""), s[`${n}${i.toUpperCase().replace(/-/g, "_")}`] = t[i];
   }
   return s;
-}, M = new WeakSet(), re = function() {
+}, S = new WeakSet(), U = function() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -1277,8 +1075,8 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
 						}
 					}
 				}`
-  ), l(this, R).length > 0) {
-    const e = l(this, R).map(([t, r]) => `${t}=${r}`).join(`
+  ), h(this, E).length > 0) {
+    const e = h(this, E).map(([t, r]) => `${t}=${r}`).join(`
 `) + `
 
 `;
@@ -1290,7 +1088,7 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, U = new WeakSet(), se = function() {
+}, R = new WeakSet(), q = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -1300,14 +1098,14 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
   for (const s of t.headers) {
     if (!s.includes(": "))
       continue;
-    const n = s.indexOf(": "), i = s.substring(0, n).toLowerCase(), o = s.substring(n + 2);
-    i in r || (r[i] = []), r[i].push(o);
+    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: r,
     httpStatusCode: t.status
   };
-}, B = new WeakSet(), ne = function(e) {
+}, T = new WeakSet(), W = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1322,35 +1120,35 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
       [t]
     );
   }
-}, L = new WeakSet(), ie = function(e) {
+}, F = new WeakSet(), z = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
     [STRING],
     [e]
   );
-}, D = new WeakSet(), oe = function(e) {
+}, C = new WeakSet(), j = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_port",
     null,
     [NUMBER],
     [e]
   );
-}, $ = new WeakSet(), ae = function(e, t) {
+}, x = new WeakSet(), G = function(e, t) {
   let r;
   try {
     r = parseInt(new URL(e).port, 10);
   } catch {
   }
   return (!r || isNaN(r) || r === 80) && (r = t === "https" ? 443 : 80), r;
-}, q = new WeakSet(), le = function(e) {
+}, k = new WeakSet(), J = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_request_method",
     null,
     [STRING],
     [e]
   );
-}, W = new WeakSet(), ce = function(e) {
+}, I = new WeakSet(), Q = function(e) {
   e.cookie && this[__private__dont__use].ccall(
     "wasm_set_cookies",
     null,
@@ -1367,9 +1165,9 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
     [NUMBER],
     [parseInt(e["content-length"], 10)]
   );
-}, j = new WeakSet(), ue = function(e) {
+}, N = new WeakSet(), V = function(e) {
   let t, r;
-  typeof e == "string" ? (console.warn(
+  typeof e == "string" ? (logger.warn(
     "Passing a string as the request body is deprecated. Please use a Uint8Array instead. See https://github.com/WordPress/wordpress-playground/issues/997 for more details"
   ), r = this[__private__dont__use].lengthBytesUTF8(e), t = r + 1) : (r = e.byteLength, t = e.byteLength);
   const s = this[__private__dont__use].malloc(t);
@@ -1390,45 +1188,45 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
     [NUMBER],
     [r]
   ), s;
-}, z = new WeakSet(), de = function(e) {
+}, A = new WeakSet(), Y = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_path_translated",
     null,
     [STRING],
     [e]
   );
-}, G = new WeakSet(), he = function(e, t) {
+}, M = new WeakSet(), Z = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_SERVER_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, J = new WeakSet(), pe = function(e, t) {
+}, O = new WeakSet(), K = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, V = new WeakSet(), fe = function(e) {
+}, H = new WeakSet(), X = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_php_code",
     null,
     [STRING],
     [e]
   );
-}, Q = new WeakSet(), _e = async function() {
-  var n;
+}, B = new WeakSet(), ee = async function() {
+  var i;
   let e, t;
   try {
-    e = await new Promise((i, o) => {
-      var c;
-      t = (u) => {
-        console.error(u), console.error(u.error);
-        const h = new Error("Rethrown");
-        h.cause = u.error, h.betterMessage = u.message, o(h);
-      }, (c = l(this, w)) == null || c.addEventListener(
+    e = await new Promise((n, o) => {
+      var l;
+      t = (c) => {
+        logger.error(c), logger.error(c.error);
+        const d = new Error("Rethrown");
+        d.cause = c.error, d.betterMessage = c.message, o(d);
+      }, (l = h(this, y)) == null || l.addEventListener(
         "error",
         t
       );
@@ -1439,22 +1237,22 @@ R = new WeakMap(), x = new WeakMap(), k = new WeakMap(), y = new WeakMap(), w =
         [],
         { async: !0 }
       );
-      return a instanceof Promise ? a.then(i, o) : i(a);
+      return a instanceof Promise ? a.then(n, o) : n(a);
     });
-  } catch (i) {
-    for (const u in this)
-      typeof this[u] == "function" && (this[u] = () => {
+  } catch (n) {
+    for (const c in this)
+      typeof this[c] == "function" && (this[c] = () => {
         throw new Error(
           "PHP runtime has crashed – see the earlier error for details."
         );
       });
     this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify();
-    const o = i, a = "betterMessage" in o ? o.betterMessage : o.message, c = new Error(a);
-    throw c.cause = o, console.error(c), c;
+    const o = n, a = "betterMessage" in o ? o.betterMessage : o.message, l = new Error(a);
+    throw l.cause = o, logger.error(l), l;
   } finally {
-    (n = l(this, w)) == null || n.removeEventListener("error", t);
+    (i = h(this, y)) == null || i.removeEventListener("error", t);
   }
-  const { headers: r, httpStatusCode: s } = f(this, U, se).call(this);
+  const { headers: r, httpStatusCode: s } = p(this, R, q).call(this);
   return new PHPResponse(
     e === 0 ? s : 500,
     r,
@@ -1513,48 +1311,48 @@ function copyFS(e, t, r) {
     return;
   }
   t.mkdirTree(r);
-  const n = e.readdir(r).filter((i) => i !== "." && i !== "..");
-  for (const i of n)
-    copyFS(e, t, joinPaths(r, i));
+  const i = e.readdir(r).filter((n) => n !== "." && n !== "..");
+  for (const n of i)
+    copyFS(e, t, joinPaths(r, n));
 }
 function journalFSEvents(e, t, r = () => {
 }) {
   function s() {
     t = normalizePath(t);
-    const i = e[__private__dont__use].FS, o = createFSHooks(i, (h) => {
-      if (h.path.startsWith(t))
-        r(h);
-      else if (h.operation === "RENAME" && h.toPath.startsWith(t))
+    const n = e[__private__dont__use].FS, o = createFSHooks(n, (d) => {
+      if (d.path.startsWith(t))
+        r(d);
+      else if (d.operation === "RENAME" && d.toPath.startsWith(t))
         for (const g of recordExistingPath(
           e,
-          h.path,
-          h.toPath
+          d.path,
+          d.toPath
         ))
           r(g);
     }), a = {};
-    for (const [h] of Object.entries(o))
-      a[h] = i[h];
-    function c() {
-      for (const [h, g] of Object.entries(o))
-        i[h] = function(...K) {
-          return g(...K), a[h].apply(this, K);
+    for (const [d] of Object.entries(o))
+      a[d] = n[d];
+    function l() {
+      for (const [d, g] of Object.entries(o))
+        n[d] = function(...L) {
+          return g(...L), a[d].apply(this, L);
         };
     }
-    function u() {
-      for (const [h, g] of Object.entries(a))
-        e[__private__dont__use].FS[h] = g;
+    function c() {
+      for (const [d, g] of Object.entries(a))
+        e[__private__dont__use].FS[d] = g;
     }
     e[__private__dont__use].journal = {
-      bind: c,
-      unbind: u
-    }, c();
+      bind: l,
+      unbind: c
+    }, l();
   }
   e.addEventListener("runtime.initialized", s), e[__private__dont__use] && s();
-  function n() {
+  function i() {
     e[__private__dont__use].journal.unbind(), delete e[__private__dont__use].journal;
   }
-  return e.addEventListener("runtime.beforedestroy", n), function() {
-    return e.removeEventListener("runtime.initialized", s), e.removeEventListener("runtime.beforedestroy", n), e[__private__dont__use].journal.unbind();
+  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 createFSHooks = (e, t = () => {
@@ -1606,16 +1404,16 @@ const createFSHooks = (e, t = () => {
   },
   rename(r, s) {
     try {
-      const n = e.lookupPath(r, {
+      const i = e.lookupPath(r, {
         follow: !0
-      }), i = e.lookupPath(s, {
+      }), n = e.lookupPath(s, {
         parent: !0
       }).path;
       t({
         operation: "RENAME",
-        nodeType: e.isDir(n.node.mode) ? "directory" : "file",
-        path: n.path,
-        toPath: joinPaths(i, basename(s))
+        nodeType: e.isDir(i.node.mode) ? "directory" : "file",
+        path: i.path,
+        toPath: joinPaths(n, basename(s))
       });
     } catch {
     }
@@ -1661,52 +1459,52 @@ function normalizeFilesystemOperations(e) {
   const t = {};
   for (let r = e.length - 1; r >= 0; r--) {
     for (let s = r - 1; s >= 0; s--) {
-      const n = checkRelationship(e[r], e[s]);
-      if (n === "none")
+      const i = checkRelationship(e[r], e[s]);
+      if (i === "none")
         continue;
-      const i = e[r], o = e[s];
-      if (i.operation === "RENAME" && o.operation === "RENAME") {
-        console.warn(
+      const n = e[r], o = e[s];
+      if (n.operation === "RENAME" && o.operation === "RENAME") {
+        logger.warn(
           "[FS Journal] Normalizing a double rename is not yet supported:",
           {
-            current: i,
+            current: n,
             last: o
           }
         );
         continue;
       }
-      (o.operation === "CREATE" || o.operation === "WRITE") && (i.operation === "RENAME" ? n === "same_node" ? (t[s] = [], t[r] = [
+      (o.operation === "CREATE" || o.operation === "WRITE") && (n.operation === "RENAME" ? i === "same_node" ? (t[s] = [], t[r] = [
         {
           ...o,
-          path: i.toPath
+          path: n.toPath
         },
         ...t[r] || []
-      ]) : n === "descendant" && (t[s] = [], t[r] = [
+      ]) : i === "descendant" && (t[s] = [], t[r] = [
         {
           ...o,
           path: joinPaths(
-            i.toPath,
-            o.path.substring(i.path.length)
+            n.toPath,
+            o.path.substring(n.path.length)
           )
         },
         ...t[r] || []
-      ]) : i.operation === "WRITE" && n === "same_node" ? t[s] = [] : i.operation === "DELETE" && n === "same_node" && (t[s] = [], t[r] = []));
+      ]) : n.operation === "WRITE" && i === "same_node" ? t[s] = [] : n.operation === "DELETE" && i === "same_node" && (t[s] = [], t[r] = []));
     }
     if (Object.entries(t).length > 0) {
-      const s = e.flatMap((n, i) => i in t ? t[i] : [n]);
+      const s = e.flatMap((i, n) => n in t ? t[n] : [i]);
       return normalizeFilesystemOperations(s);
     }
   }
   return e;
 }
 function checkRelationship(e, t) {
-  const r = e.path, s = e.operation !== "WRITE" && e.nodeType === "directory", n = t.operation !== "WRITE" && t.nodeType === "directory", i = t.operation === "RENAME" ? t.toPath : t.path;
-  return i === r ? "same_node" : n && r.startsWith(i + "/") ? "ancestor" : s && i.startsWith(r + "/") ? "descendant" : "none";
+  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 hydrateUpdateFileOps(e, t) {
   const s = t.filter(
-    (n) => n.operation === "WRITE"
-  ).map((n) => hydrateOp(e, n));
+    (i) => i.operation === "WRITE"
+  ).map((i) => hydrateOp(e, i));
   return await Promise.all(s), t;
 }
 const hydrateLock = new Semaphore({ concurrency: 15 });
@@ -1715,9 +1513,9 @@ async function hydrateOp(e, t) {
   try {
     t.data = await e.readFileAsBuffer(t.path);
   } catch (s) {
-    console.warn(
+    logger.warn(
       `Journal failed to hydrate a file on flush: the path ${t.path} no longer exists`
-    ), console.error(s);
+    ), logger.error(s);
   }
   r();
 }