@php-wasm/universal 1.2.3 → 2.0.1

package/index.js

@@ -105,10 +105,10 @@ function rethrowFileSystemError(t = "") {
       } catch (n) {
         const i = typeof n == "object" ? n == null ? void 0 : n.errno : null;
         if (i in FileErrorCodes) {
-          const o = FileErrorCodes[i], a = typeof s[1] == "string" ? s[1] : null, l = a !== null ? t.replaceAll("{path}", a) : t;
+          const o = FileErrorCodes[i], a = typeof s[1] == "string" ? s[1] : null, c = a !== null ? t.replaceAll("{path}", a) : t;
           throw new ErrnoError(
             i,
-            `${l}: ${o}`,
+            `${c}: ${o}`,
             {
               cause: n
             }
@@ -386,6 +386,16 @@ class PHPWorker {
   __internal_getPHP() {
     return _private.get(this).php;
   }
+  /**
+   * @internal
+   * @deprecated
+   * Do not use this method directly in the code consuming
+   * the web API. It will change or even be removed without
+   * a warning.
+   */
+  __internal_getRequestHandler() {
+    return _private.get(this).requestHandler;
+  }
   async setPrimaryPHP(e) {
     _private.set(this, {
       ..._private.get(this),
@@ -660,14 +670,14 @@ const RuntimeId = Symbol("RuntimeId"), loadedRuntimes = /* @__PURE__ */ new Map(
 let lastRuntimeId = 0;
 async function loadPHPRuntime(t, ...e) {
   const r = Object.assign({}, ...e), [s, n, i] = makePromise(), o = t.init(currentJsRuntime, {
-    onAbort(l) {
-      i(l), logger.error(l);
+    onAbort(c) {
+      i(c), logger.error(c);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
     // breaks vite dev mode. An identity `locateFile` function
     // fixes it.
-    locateFile: (l) => l,
+    locateFile: (c) => c,
     ...r,
     noInitialRun: !0,
     onRuntimeInitialized() {
@@ -676,8 +686,8 @@ async function loadPHPRuntime(t, ...e) {
   });
   await s;
   const a = ++lastRuntimeId;
-  return o.FS, o.id = a, o.originalExit = o._exit, o._exit = function(l) {
-    return o.outboundNetworkProxyServer && (o.outboundNetworkProxyServer.close(), o.outboundNetworkProxyServer.closeAllConnections()), loadedRuntimes.delete(a), o.originalExit(l);
+  return o.FS, o.id = a, o.originalExit = o._exit, o._exit = function(c) {
+    return o.outboundNetworkProxyServer && (o.outboundNetworkProxyServer.close(), o.outboundNetworkProxyServer.closeAllConnections()), loadedRuntimes.delete(a), o.originalExit(c);
   }, o[RuntimeId] = a, loadedRuntimes.set(a, o), a;
 }
 function getLoadedRuntime(t) {
@@ -759,8 +769,8 @@ function improveWASMErrorReporting(t) {
           );
           if (e.hasListeners()) {
             o.message = a;
-            const l = new ErrorEvent("error", { error: o });
-            throw e.dispatchEvent(l), o;
+            const c = new ErrorEvent("error", { error: o });
+            throw e.dispatchEvent(c), o;
           }
           throw (!isExitCode(o) || o.status !== 0) && showCriticalErrorBox(a), o;
         }
@@ -861,8 +871,8 @@ class PHPExecutionFailureError extends Error {
     super(e), this.response = r, this.source = s;
   }
 }
-const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php";
-var k, E, x, g, v, T, d, z, W, B, $, V, G, J, Y, K, L, X, U, O;
+const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php", OPCACHE_FILE_FOLDER = "/internal/shared/opcache";
+var k, E, x, g, v, T, d, z, W, B, $, V, G, J, Y, K, L, X, O, U;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -975,35 +985,53 @@ class PHP {
     const e = getLoadedRuntime(t);
     if (!e)
       throw new Error("Invalid PHP runtime id.");
-    this[__private__dont__use] = e, this[__private__dont__use].ccall(
+    if (this[__private__dont__use] = e, this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
       [PHP_INI_PATH]
-    ), this.fileExists(PHP_INI_PATH) || this.writeFile(
-      PHP_INI_PATH,
-      [
-        "auto_prepend_file=" + AUTO_PREPEND_SCRIPT,
-        "memory_limit=256M",
-        "ignore_repeated_errors = 1",
-        "error_reporting = E_ALL",
-        "display_errors = 1",
-        "html_errors = 1",
-        "display_startup_errors = On",
-        "log_errors = 1",
-        "always_populate_raw_post_data = -1",
-        "upload_max_filesize = 2000M",
-        "post_max_size = 2000M",
-        "allow_url_fopen = On",
-        "allow_url_include = Off",
-        "session.save_path = /home/web_user",
-        "implicit_flush = 1",
-        "output_buffering = 0",
-        "max_execution_time = 0",
-        "max_input_time = -1"
-      ].join(`
+    ), !this.fileExists(PHP_INI_PATH)) {
+      const r = [
+        // OPCache
+        "opcache.enable = 1",
+        "opcache.enable_cli = 1",
+        "opcache.jit = 0",
+        "opcache.interned_strings_buffer = 8",
+        "opcache.max_accelerated_files = 1000",
+        "opcache.memory_consumption = 64",
+        "opcache.max_wasted_percentage = 5",
+        "opcache.file_cache = " + OPCACHE_FILE_FOLDER,
+        // Always enable the file cache.
+        "opcache.file_cache_only = 1",
+        "opcache.file_cache_consistency_checks = 1"
+      ];
+      this.fileExists(OPCACHE_FILE_FOLDER) || this.mkdir(OPCACHE_FILE_FOLDER), this.writeFile(
+        PHP_INI_PATH,
+        [
+          "auto_prepend_file=" + AUTO_PREPEND_SCRIPT,
+          "memory_limit=256M",
+          "ignore_repeated_errors = 1",
+          "error_reporting = E_ALL",
+          "display_errors = 1",
+          "html_errors = 1",
+          "display_startup_errors = On",
+          "log_errors = 1",
+          "always_populate_raw_post_data = -1",
+          "upload_max_filesize = 2000M",
+          "post_max_size = 2000M",
+          "allow_url_fopen = On",
+          "allow_url_include = Off",
+          "session.save_path = /home/web_user",
+          "implicit_flush = 1",
+          "output_buffering = 0",
+          "max_execution_time = 0",
+          "max_input_time = -1",
+          ...r
+        ].join(`
 `)
-    ), this.fileExists(AUTO_PREPEND_SCRIPT) || this.writeFile(
+      );
+    }
+    this.fileExists(AUTO_PREPEND_SCRIPT) || this.writeFile(
       AUTO_PREPEND_SCRIPT,
       `<?php
 				// Define constants set via defineConstant() calls
@@ -1263,7 +1291,7 @@ class PHP {
     this.runStreamCalled = !0;
     const e = await this.semaphore.acquire();
     let r;
-    const s = m(this, d, O).call(this, async () => {
+    const s = m(this, d, U).call(this, async () => {
       if (u(this, E) || (await m(this, d, W).call(this), f(this, E, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
@@ -1279,11 +1307,11 @@ class PHP {
           "The request object must have either a `code` or a `scriptPath` property."
         );
       const a = m(this, d, z).call(this, t.$_SERVER, n, o);
-      for (const c in a)
-        m(this, d, X).call(this, c, a[c]);
-      const l = t.env || {};
-      for (const c in l)
-        m(this, d, U).call(this, c, l[c]);
+      for (const l in a)
+        m(this, d, X).call(this, l, a[l]);
+      const c = t.env || {};
+      for (const l in c)
+        m(this, d, O).call(this, l, c[l]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1546,7 +1574,7 @@ class PHP {
     this.cliCalled = !0;
     const r = await this.semaphore.acquire(), s = e.env || {};
     for (const [n, i] of Object.entries(s))
-      m(this, d, U).call(this, n, i);
+      m(this, d, O).call(this, n, i);
     t = [t[0], "-c", PHP_INI_PATH, ...t.slice(1)];
     for (const n of t)
       this[__private__dont__use].ccall(
@@ -1555,7 +1583,7 @@ class PHP {
         [STRING],
         [n]
       );
-    return await m(this, d, O).call(this, () => this[__private__dont__use].ccall("run_cli", null, [], [], {
+    return await m(this, d, U).call(this, () => this[__private__dont__use].ccall("run_cli", null, [], [], {
       async: !0
     })).then((n) => (n.exitCode.finally(r), n));
   }
@@ -1700,14 +1728,14 @@ z = function(t, e, r) {
     [STRING, STRING],
     [t, e]
   );
-}, U = function(t, e) {
+}, O = function(t, e) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [t, e]
   );
-}, O = async function(t) {
+}, U = async function(t) {
   const e = this[__private__dont__use], r = await createInvertedReadableStream();
   e.onHeaders = (h) => {
     a || s || r.controller.enqueue(h.slice());
@@ -1723,7 +1751,7 @@ z = function(t, e, r) {
   e.onStderr = (h) => {
     a || o.controller.enqueue(h.slice());
   };
-  let a = !1, l;
+  let a = !1, c;
   const p = (async () => {
     var h;
     try {
@@ -1731,11 +1759,11 @@ z = function(t, e, r) {
         t(),
         new Promise((w, b) => {
           var j;
-          l = (D) => {
+          c = (D) => {
             isExitCode(D.error) || b(D.error);
           }, (j = u(this, x)) == null || j.addEventListener(
             "error",
-            l,
+            c,
             { once: !0 }
           );
         })
@@ -1754,7 +1782,7 @@ z = function(t, e, r) {
     } finally {
       a || (i.controller.close(), o.controller.close(), n(), a = !0), (h = u(this, x)) == null || h.removeEventListener(
         "error",
-        l
+        c
       );
     }
   })();
@@ -1925,16 +1953,16 @@ async function* iteratePhpFiles(t, e, {
     if (!o)
       return;
     const a = await t.listFiles(o);
-    for (const l of a) {
-      const c = `${o}/${l}`;
-      if (n.includes(c.substring(e.length + 1)))
+    for (const c of a) {
+      const l = `${o}/${c}`;
+      if (n.includes(l.substring(e.length + 1)))
         continue;
-      await t.isDir(c) ? i.push(c) : yield new StreamedFile(
-        streamReadFileFromPHP(t, c),
+      await t.isDir(l) ? i.push(l) : yield new StreamedFile(
+        streamReadFileFromPHP(t, l),
         r ? joinPaths(
           s || "",
-          c.substring(e.length + 1)
-        ) : c
+          l.substring(e.length + 1)
+        ) : l
       );
     }
   }
@@ -2095,22 +2123,22 @@ function ensurePathPrefix(t, e) {
 }
 async function encodeAsMultipart(t) {
   const e = `----${Math.random().toString(36).slice(2)}`, r = `multipart/form-data; boundary=${e}`, s = new TextEncoder(), n = [];
-  for (const [l, c] of Object.entries(t))
+  for (const [c, l] of Object.entries(t))
     n.push(`--${e}\r
-`), n.push(`Content-Disposition: form-data; name="${l}"`), c instanceof File && n.push(`; filename="${c.name}"`), n.push(`\r
-`), c instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\r
+`), n.push(`Content-Disposition: form-data; name="${c}"`), l instanceof File && n.push(`; filename="${l.name}"`), n.push(`\r
+`), l instanceof File && (n.push("Content-Type: application/octet-stream"), n.push(`\r
 `)), n.push(`\r
-`), c instanceof File ? n.push(await fileToUint8Array(c)) : n.push(c), n.push(`\r
+`), l instanceof File ? n.push(await fileToUint8Array(l)) : n.push(l), n.push(`\r
 `);
   n.push(`--${e}--\r
 `);
-  const i = n.reduce((l, c) => l + c.length, 0), o = new Uint8Array(i);
+  const i = n.reduce((c, l) => c + l.length, 0), o = new Uint8Array(i);
   let a = 0;
-  for (const l of n)
+  for (const c of n)
     o.set(
-      typeof l == "string" ? s.encode(l) : l,
+      typeof c == "string" ? s.encode(c) : c,
       a
-    ), a += l.length;
+    ), a += c.length;
   return { bytes: o, contentType: r };
 }
 function fileToUint8Array(t) {
@@ -2212,7 +2240,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var S, C, A, F, I, P, M, R, H, Q, Z, ee;
+var S, C, M, F, I, P, A, R, H, Q, Z, ee;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2229,11 +2257,11 @@ class PHPRequestHandler {
     _(this, H);
     _(this, S);
     _(this, C);
-    _(this, A);
+    _(this, M);
     _(this, F);
     _(this, I);
     _(this, P);
-    _(this, M);
+    _(this, A);
     _(this, R);
     const {
       documentRoot: r = "/www/",
@@ -2242,22 +2270,22 @@ class PHPRequestHandler {
       getFileNotFoundAction: i = () => ({ type: "404" })
     } = e;
     "processManager" in e ? this.processManager = e.processManager : this.processManager = new PHPProcessManager({
-      phpFactory: async (l) => {
-        const c = await e.phpFactory({
-          ...l,
+      phpFactory: async (c) => {
+        const l = await e.phpFactory({
+          ...c,
           requestHandler: this
         });
-        return c.isDir(r) || c.mkdir(r), c.chdir(r), c.requestHandler = this, c;
+        return l.isDir(r) || l.mkdir(r), l.chdir(r), l.requestHandler = this, l;
       },
       maxPhpInstances: e.maxPhpInstances
     }), f(this, R, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), f(this, S, r);
     const o = new URL(s);
-    f(this, A, o.hostname), f(this, F, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), f(this, C, (o.protocol || "").replace(":", ""));
+    f(this, M, o.hostname), f(this, F, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), f(this, C, (o.protocol || "").replace(":", ""));
     const a = u(this, F) !== 443 && u(this, F) !== 80;
     f(this, I, [
-      u(this, A),
+      u(this, M),
       a ? `:${u(this, F)}` : ""
-    ].join("")), f(this, P, o.pathname.replace(/\/+$/, "")), f(this, M, [
+    ].join("")), f(this, P, o.pathname.replace(/\/+$/, "")), f(this, A, [
       `${u(this, C)}://`,
       u(this, I),
       u(this, P)
@@ -2291,7 +2319,7 @@ class PHPRequestHandler {
    * The absolute URL of this PHPRequestHandler instance.
    */
   get absoluteUrl() {
-    return u(this, M);
+    return u(this, A);
   }
   /**
    * The directory in the PHP filesystem where the server will look
@@ -2369,9 +2397,9 @@ class PHPRequestHandler {
           new Uint8Array(0)
         );
       for (const a of ["index.php", "index.html"]) {
-        const l = joinPaths(o, a);
-        if (i.isFile(l)) {
-          o = l;
+        const c = joinPaths(o, a);
+        if (i.isFile(c)) {
+          o = c;
           break;
         }
       }
@@ -2411,7 +2439,7 @@ class PHPRequestHandler {
     await this.processManager[Symbol.asyncDispose]();
   }
 }
-S = new WeakMap(), C = new WeakMap(), A = new WeakMap(), F = new WeakMap(), I = new WeakMap(), P = new WeakMap(), M = new WeakMap(), R = new WeakMap(), H = new WeakSet(), /**
+S = new WeakMap(), C = new WeakMap(), M = new WeakMap(), F = new WeakMap(), I = new WeakMap(), P = new WeakMap(), A = new WeakMap(), R = new WeakMap(), H = new WeakSet(), /**
  * Serves a static file from the PHP filesystem.
  *
  * @param  fsPath - Absolute path of the static file to serve.
@@ -2456,8 +2484,8 @@ Q = function(e, r) {
   let o = r.body;
   if (typeof o == "object" && !(o instanceof Uint8Array)) {
     n = "POST";
-    const { bytes: a, contentType: l } = await encodeAsMultipart(o);
-    o = a, i["content-type"] = l;
+    const { bytes: a, contentType: c } = await encodeAsMultipart(o);
+    o = a, i["content-type"] = c;
   }
   try {
     const a = await e.run({
@@ -2470,7 +2498,7 @@ Q = function(e, r) {
       $_SERVER: {
         REMOTE_ADDR: "127.0.0.1",
         DOCUMENT_ROOT: u(this, S),
-        HTTPS: u(this, M).startsWith("https://") ? "on" : ""
+        HTTPS: u(this, A).startsWith("https://") ? "on" : ""
       },
       body: o,
       scriptPath: s,
@@ -2480,9 +2508,9 @@ Q = function(e, r) {
       a.headers
     ), a;
   } catch (a) {
-    const l = a;
-    if (l != null && l.response)
-      return l.response;
+    const c = a;
+    if (c != null && c.response)
+      return c.response;
     throw a;
   }
 };
@@ -2512,18 +2540,18 @@ function rotatePHPRuntime({
 }) {
   let n = 0;
   async function i() {
-    const l = await t.semaphore.acquire();
+    const c = await t.semaphore.acquire();
     try {
       await t.hotSwapPHPRuntime(await r(), e), n = 0;
     } finally {
-      l();
+      c();
     }
   }
   async function o() {
     ++n < s || await i();
   }
-  async function a(l) {
-    l.type === "request.error" && l.source === "php-wasm" && await i();
+  async function a(c) {
+    c.type === "request.error" && c.source === "php-wasm" && await i();
   }
   return t.addEventListener("request.error", a), t.addEventListener("request.end", o), function() {
     t.removeEventListener("request.error", a), t.removeEventListener("request.end", o);
@@ -2580,14 +2608,14 @@ function sandboxedSpawnHandlerFactory(t) {
         });
         a.stdout.pipeTo(
           new WritableStream({
-            write(l) {
-              r.stdout(l);
+            write(c) {
+              r.stdout(c);
             }
           })
         ), a.stderr.pipeTo(
           new WritableStream({
-            write(l) {
-              r.stderr(l);
+            write(c) {
+              r.stderr(c);
             }
           })
         ), r.exit(await a.exitCode);
@@ -2626,16 +2654,16 @@ function createSyncProxy(t, e = [], r) {
     apply(s, n, i) {
       if (e.at(-1) === "bind")
         return createSyncProxy(t, e.slice(0, -1), r);
-      const [a, l] = processArguments(i), c = r.send(
+      const [a, c] = processArguments(i), l = r.send(
         t,
         {
           type: MessageType.APPLY,
           path: e.map(String),
           argumentList: a
         },
-        l
+        c
       );
-      return fromWireValue(c);
+      return fromWireValue(l);
     },
     construct(s, n) {
       const [i, o] = processArguments(n), a = r.send(
@@ -2676,7 +2704,7 @@ class NodeSABSyncReceiveMessageTransport {
     }
   }
   send(e, r, s) {
-    var c;
+    var l;
     const n = new SharedArrayBuffer(4), i = new Int32Array(n);
     i[0] = 0;
     const o = generateUUID();
@@ -2687,7 +2715,7 @@ class NodeSABSyncReceiveMessageTransport {
       throw new Error("Timeout waiting for response");
     for (; ; ) {
       const p = NodeSABSyncReceiveMessageTransport.receiveMessageOnPort(e);
-      if (((c = p.message) == null ? void 0 : c.id) === o)
+      if (((l = p.message) == null ? void 0 : l.id) === o)
         return p.message;
       if (!p)
         throw new Error("No response received");
@@ -2763,28 +2791,28 @@ function expose(t, e = globalThis, r = ["*"], s) {
       console.warn(`Invalid origin '${i.origin}' for comlink proxy`);
       return;
     }
-    const { id: o, type: a, path: l } = {
+    const { id: o, type: a, path: c } = {
       path: [],
       ...i.data
-    }, c = (i.data.argumentList || []).map(fromWireValue);
+    }, l = (i.data.argumentList || []).map(fromWireValue);
     let p;
     try {
-      const h = l.slice(0, -1).reduce((w, b) => w[b], t), y = l.reduce((w, b) => w[b], t);
+      const h = c.slice(0, -1).reduce((w, b) => w[b], t), y = c.reduce((w, b) => w[b], t);
       switch (a) {
         case MessageType.GET:
           p = y;
           break;
         case MessageType.SET:
-          h[l.slice(-1)[0]] = fromWireValue(
+          h[c.slice(-1)[0]] = fromWireValue(
             i.data.value
           ), p = !0;
           break;
         case MessageType.APPLY:
-          p = y.apply(h, c);
+          p = y.apply(h, l);
           break;
         case MessageType.CONSTRUCT:
           {
-            const w = new y(...c);
+            const w = new y(...l);
             p = proxy(w);
           }
           break;
@@ -2872,38 +2900,38 @@ function createProxy(t, e, r = [], s = function() {
       if (a === "then") {
         if (r.length === 0)
           return { then: () => i };
-        const l = requestResponseMessage(t, e, {
+        const c = requestResponseMessage(t, e, {
           type: MessageType.GET,
-          path: r.map((c) => c.toString())
+          path: r.map((l) => l.toString())
         }).then(fromWireValue);
-        return l.then.bind(l);
+        return c.then.bind(c);
       }
       return createProxy(t, e, [...r, a]);
     },
-    set(o, a, l) {
+    set(o, a, c) {
       throwIfProxyReleased(n);
-      const [c, p] = toWireValue(l);
+      const [l, p] = toWireValue(c);
       return requestResponseMessage(
         t,
         e,
         {
           type: MessageType.SET,
           path: [...r, a].map((h) => h.toString()),
-          value: c
+          value: l
         },
         p
       ).then(fromWireValue);
     },
-    apply(o, a, l) {
+    apply(o, a, c) {
       throwIfProxyReleased(n);
-      const c = r[r.length - 1];
-      if (c === createEndpoint)
+      const l = r[r.length - 1];
+      if (l === createEndpoint)
         return requestResponseMessage(t, e, {
           type: MessageType.ENDPOINT
         }).then(fromWireValue);
-      if (c === "bind")
+      if (l === "bind")
         return createProxy(t, e, r.slice(0, -1));
-      const [p, h] = processArguments(l);
+      const [p, h] = processArguments(c);
       return requestResponseMessage(
         t,
         e,
@@ -2917,16 +2945,16 @@ function createProxy(t, e, r = [], s = function() {
     },
     construct(o, a) {
       throwIfProxyReleased(n);
-      const [l, c] = processArguments(a);
+      const [c, l] = processArguments(a);
       return requestResponseMessage(
         t,
         e,
         {
           type: MessageType.CONSTRUCT,
           path: r.map((p) => p.toString()),
-          argumentList: l
+          argumentList: c
         },
-        c
+        l
       ).then(fromWireValue);
     }
   });
@@ -3085,8 +3113,8 @@ const errorProperties = [
     return r;
   if (o && typeof t.toJSON == "function" && !toJsonWasCalled.has(t))
     return toJSON(t);
-  const l = (c) => destroyCircular({
-    from: c,
+  const c = (l) => destroyCircular({
+    from: l,
     seen: [...e],
     forceEnumerable: s,
     maxDepth: n,
@@ -3094,34 +3122,34 @@ const errorProperties = [
     useToJSON: o,
     serialize: a
   });
-  for (const [c, p] of Object.entries(t)) {
+  for (const [l, p] of Object.entries(t)) {
     if (p && p instanceof Uint8Array && p.constructor.name === "Buffer") {
-      r[c] = "[object Buffer]";
+      r[l] = "[object Buffer]";
       continue;
     }
     if (p !== null && typeof p == "object" && typeof p.pipe == "function") {
-      r[c] = "[object Stream]";
+      r[l] = "[object Stream]";
       continue;
     }
     if (typeof p != "function") {
       if (!p || typeof p != "object") {
         try {
-          r[c] = p;
+          r[l] = p;
         } catch {
         }
         continue;
       }
-      if (!e.includes(t[c])) {
-        i++, r[c] = l(t[c]);
+      if (!e.includes(t[l])) {
+        i++, r[l] = c(t[l]);
         continue;
       }
-      r[c] = "[Circular]";
+      r[l] = "[Circular]";
     }
   }
   if (a || r instanceof Error)
-    for (const { property: c, enumerable: p } of errorProperties)
-      t[c] !== void 0 && t[c] !== null && Object.defineProperty(r, c, {
-        value: isErrorLike(t[c]) || Array.isArray(t[c]) ? l(t[c]) : t[c],
+    for (const { property: l, enumerable: p } of errorProperties)
+      t[l] !== void 0 && t[l] !== null && Object.defineProperty(r, l, {
+        value: isErrorLike(t[l]) || Array.isArray(t[l]) ? c(t[l]) : t[l],
         enumerable: s ? !0 : p,
         configurable: !0,
         writable: !0
@@ -3199,10 +3227,10 @@ function prepareForExpose(t, e) {
   setupTransferHandlers();
   const r = Promise.resolve();
   let s, n;
-  const i = new Promise((l, c) => {
-    s = l, n = c;
+  const i = new Promise((c, l) => {
+    s = c, n = l;
   }), o = proxyClone(t), a = new Proxy(o, {
-    get: (l, c) => c === "isConnected" ? () => r : c === "isReady" ? () => i : c in l ? l[c] : e == null ? void 0 : e[c]
+    get: (c, l) => l === "isConnected" ? () => r : l === "isReady" ? () => i : l in c ? c[l] : e == null ? void 0 : e[l]
   });
   return { setReady: s, setFailed: n, exposedApi: a };
 }