@php-wasm/universal 3.0.4 → 3.0.6

package/index.js

@@ -1,8 +1,8 @@
-var B = (t) => {
+var z = (t) => {
   throw TypeError(t);
 };
-var O = (t, e, r) => e.has(t) || B("Cannot " + r);
-var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), m = (t, e, r) => e.has(t) ? B("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), w = (t, e, r, s) => (O(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), y = (t, e, r) => (O(t, e, "access private method"), r);
+var O = (t, e, r) => e.has(t) || z("Cannot " + r);
+var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), m = (t, e, r) => e.has(t) ? z("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), g = (t, e, r, s) => (O(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), y = (t, e, r) => (O(t, e, "access private method"), r);
 import "@php-wasm/node-polyfills";
 import { logger } from "@php-wasm/logger";
 import { dirname, joinPaths, Semaphore, createSpawnHandler, normalizePath, AcquireTimeoutError } from "@php-wasm/util";
@@ -368,7 +368,7 @@ class PHPWorker {
   /** @inheritDoc */
   constructor(e, r) {
     m(this, P);
-    this.absoluteUrl = "", this.documentRoot = "", w(this, P, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
+    this.absoluteUrl = "", this.documentRoot = "", g(this, P, /* @__PURE__ */ new Map()), this.onMessageListeners = [], _private.set(this, {
       monitor: r
     }), e && this.__internal_setRequestHandler(e);
   }
@@ -937,7 +937,7 @@ class PHPExecutionFailureError extends Error {
   }
 }
 const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php", OPCACHE_FILE_FOLDER = "/internal/shared/opcache";
-var C, b, T, E, F, M, _, h, z, $, V, G, J, Y, K, X, U, Q, j, q;
+var C, b, T, E, F, M, _, h, B, $, V, G, J, Y, K, X, U, Q, j, q;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1035,7 +1035,7 @@ class PHP {
    */
   onMessage(t) {
     return u(this, F).push(t), async () => {
-      w(this, F, u(this, F).filter(
+      g(this, F, u(this, F).filter(
         (e) => e !== t
       ));
     };
@@ -1135,7 +1135,7 @@ class PHP {
           return n;
       }
       return "";
-    }, w(this, T, improveWASMErrorReporting(e)), this.dispatchEvent({
+    }, g(this, T, improveWASMErrorReporting(e)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1150,7 +1150,7 @@ class PHP {
       throw new Error(
         "Could not set SAPI name. This can only be done before the PHP WASM module is initialized.Did you already dispatch any requests?"
       );
-    w(this, C, t);
+    g(this, C, t);
   }
   /**
    * Changes the current working directory in the PHP filesystem.
@@ -1375,7 +1375,7 @@ class PHP {
         {
           isAsync: !0
         }
-      ), w(this, b, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
+      ), g(this, b, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
@@ -1389,12 +1389,12 @@ class PHP {
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const c = y(this, h, z).call(this, t.$_SERVER, i, a);
-      for (const p in c)
-        y(this, h, Q).call(this, p, c[p]);
+      const c = y(this, h, B).call(this, t.$_SERVER, i, a);
+      for (const d in c)
+        y(this, h, Q).call(this, d, c[d]);
       const l = t.env || {};
-      for (const p in l)
-        y(this, h, j).call(this, p, l[p]);
+      for (const d in l)
+        y(this, h, j).call(this, d, l[d]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1600,7 +1600,7 @@ class PHP {
    * or an internal crash.
    */
   enableRuntimeRotation(t) {
-    w(this, _, {
+    g(this, _, {
       ...u(this, _),
       enabled: !0,
       recreateRuntime: t.recreateRuntime,
@@ -1711,7 +1711,7 @@ class PHP {
       this[__private__dont__use]._exit(t);
     } catch {
     }
-    w(this, b, !1), w(this, T, null), this[__private__dont__use] && (delete this[__private__dont__use].onMessage, delete this[__private__dont__use]);
+    g(this, b, !1), g(this, T, null), this[__private__dont__use] && (delete this[__private__dont__use].onMessage, delete this[__private__dont__use]);
   }
   [Symbol.dispose]() {
     this.exit(0);
@@ -1726,7 +1726,7 @@ C = new WeakMap(), b = new WeakMap(), T = new WeakMap(), E = new WeakMap(), F =
  *             was provided.
  * @returns Computed $_SERVER entries.
  */
-z = function(t, e, r) {
+B = function(t, e, r) {
   const s = {
     ...t || {}
   };
@@ -1842,27 +1842,27 @@ z = function(t, e, r) {
 }, q = async function(t) {
   u(this, _).enabled && u(this, _).needsRotating && await this.rotateRuntime(), ++u(this, _).requestsMade, u(this, _).requestsMade >= u(this, _).maxRequests && (u(this, _).needsRotating = !0);
   const e = this[__private__dont__use], r = await createInvertedReadableStream();
-  e.onHeaders = (d) => {
-    a || s || r.controller.enqueue(d.slice());
+  e.onHeaders = (p) => {
+    a || s || r.controller.enqueue(p.slice());
   };
   let s = !1;
   const n = () => {
     s || (s = !0, r.controller.close());
   }, i = await createInvertedReadableStream();
-  e.onStdout = (d) => {
-    n(), !a && i.controller.enqueue(d.slice());
+  e.onStdout = (p) => {
+    n(), !a && i.controller.enqueue(p.slice());
   };
   const o = await createInvertedReadableStream();
-  e.onStderr = (d) => {
-    a || o.controller.enqueue(d.slice());
+  e.onStderr = (p) => {
+    a || o.controller.enqueue(p.slice());
   };
   let a = !1, c;
-  const p = (async () => {
-    var d;
+  const d = (async () => {
+    var p;
     try {
       return await Promise.race([
         t(),
-        new Promise((g, H) => {
+        new Promise((w, H) => {
           var D;
           c = (W) => {
             isExitCode(W.error) || H(W.error);
@@ -1877,42 +1877,42 @@ z = function(t, e, r) {
       if (isExitCode(f))
         return f.status;
       i.controller.error(f), o.controller.error(f), r.controller.error(f), a = !0;
-      for (const g in this)
-        typeof this[g] == "function" && (this[g] = () => {
+      for (const w in this)
+        typeof this[w] == "function" && (this[w] = () => {
           throw new Error(
             "PHP runtime has crashed – see the earlier error for details."
           );
         });
       throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), f;
     } finally {
-      a || (i.controller.close(), o.controller.close(), n(), a = !0), (d = u(this, T)) == null || d.removeEventListener(
+      a || (i.controller.close(), o.controller.close(), n(), a = !0), (p = u(this, T)) == null || p.removeEventListener(
         "error",
         c
       );
     }
   })().then(
-    (d) => (d !== 0 && this.dispatchEvent({
+    (p) => (p !== 0 && this.dispatchEvent({
       type: "request.error",
       error: new Error(
-        `PHP.run() failed with exit code ${d}.`
+        `PHP.run() failed with exit code ${p}.`
       ),
       // Distinguish between PHP request and PHP-wasm errors
       source: "php-wasm"
-    }), d),
-    (d) => {
-      const f = d.source ?? "php-wasm";
+    }), p),
+    (p) => {
+      const f = p.source ?? "php-wasm";
       throw this.dispatchEvent({
         type: "request.error",
-        error: d,
+        error: p,
         source: f
-      }), d;
+      }), p;
     }
   );
   return new StreamedPHPResponse(
     r.stream,
     i.stream,
     o.stream,
-    p
+    d
   );
 };
 function normalizeHeaders(t) {
@@ -2407,14 +2407,14 @@ class PHPRequestHandler {
         return l.isDir(r) || l.mkdir(r), l.chdir(r), l.requestHandler = this, l;
       },
       maxPhpInstances: e.maxPhpInstances
-    }), w(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), w(this, S, r);
+    }), g(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), g(this, S, r);
     const o = new URL(s);
-    w(this, L, o.hostname), w(this, k, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), w(this, I, (o.protocol || "").replace(":", ""));
+    g(this, L, o.hostname), g(this, k, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), g(this, I, (o.protocol || "").replace(":", ""));
     const a = u(this, k) !== 443 && u(this, k) !== 80;
-    w(this, A, [
+    g(this, A, [
       u(this, L),
       a ? `:${u(this, k)}` : ""
-    ].join("")), w(this, x, o.pathname.replace(/\/+$/, "")), w(this, N, [
+    ].join("")), g(this, x, o.pathname.replace(/\/+$/, "")), g(this, N, [
       `${u(this, I)}://`,
       u(this, A),
       u(this, x)
@@ -2838,10 +2838,10 @@ class NodeSABSyncReceiveMessageTransport {
     ), Atomics.wait(i, 0, 0, 5e3) === "timed-out")
       throw new Error("Timeout waiting for response");
     for (; ; ) {
-      const p = NodeSABSyncReceiveMessageTransport.receiveMessageOnPort(e);
-      if (((l = p.message) == null ? void 0 : l.id) === o)
-        return p.message;
-      if (!p)
+      const d = NodeSABSyncReceiveMessageTransport.receiveMessageOnPort(e);
+      if (((l = d.message) == null ? void 0 : l.id) === o)
+        return d.message;
+      if (!d)
         throw new Error("No response received");
     }
   }
@@ -2919,51 +2919,51 @@ function expose(t, e = globalThis, r = ["*"], s) {
       path: [],
       ...i.data
     }, l = (i.data.argumentList || []).map(fromWireValue);
-    let p;
+    let d;
     try {
-      const d = c.slice(0, -1).reduce((g, H) => g[H], t), f = c.reduce((g, H) => g[H], t);
+      const p = c.slice(0, -1).reduce((w, H) => w[H], t), f = c.reduce((w, H) => w[H], t);
       switch (a) {
         case MessageType.GET:
-          p = f;
+          d = f;
           break;
         case MessageType.SET:
-          d[c.slice(-1)[0]] = fromWireValue(
+          p[c.slice(-1)[0]] = fromWireValue(
             i.data.value
-          ), p = !0;
+          ), d = !0;
           break;
         case MessageType.APPLY:
-          p = f.apply(d, l);
+          d = f.apply(p, l);
           break;
         case MessageType.CONSTRUCT:
           {
-            const g = new f(...l);
-            p = proxy(g);
+            const w = new f(...l);
+            d = proxy(w);
           }
           break;
         case MessageType.ENDPOINT:
           {
-            const { port1: g, port2: H } = new MessageChannel();
-            expose(t, H), p = transfer(g, [g]);
+            const { port1: w, port2: H } = new MessageChannel();
+            expose(t, H), d = transfer(w, [w]);
           }
           break;
         case MessageType.RELEASE:
-          p = void 0;
+          d = void 0;
           break;
         default:
           return;
       }
-    } catch (d) {
-      p = { value: d, [throwMarker]: 0 };
+    } catch (p) {
+      d = { value: p, [throwMarker]: 0 };
     }
-    Promise.resolve(p).catch((d) => ({ value: d, [throwMarker]: 0 })).then((d) => {
-      const [f, g] = toWireValue(d);
-      e.postMessage({ ...f, id: o }, g), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
+    Promise.resolve(d).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
+      const [f, w] = toWireValue(p);
+      e.postMessage({ ...f, id: o }, w), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
     }).catch(() => {
-      const [d, f] = toWireValue({
+      const [p, f] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      e.postMessage({ ...d, id: o }, f);
+      e.postMessage({ ...p, id: o }, f);
     }).finally(() => {
       s == null || s(i);
     });
@@ -3034,16 +3034,16 @@ function createProxy(t, e, r = [], s = function() {
     },
     set(o, a, c) {
       throwIfProxyReleased(n);
-      const [l, p] = toWireValue(c);
+      const [l, d] = toWireValue(c);
       return requestResponseMessage(
         t,
         e,
         {
           type: MessageType.SET,
-          path: [...r, a].map((d) => d.toString()),
+          path: [...r, a].map((p) => p.toString()),
           value: l
         },
-        p
+        d
       ).then(fromWireValue);
     },
     apply(o, a, c) {
@@ -3055,16 +3055,16 @@ function createProxy(t, e, r = [], s = function() {
         }).then(fromWireValue);
       if (l === "bind")
         return createProxy(t, e, r.slice(0, -1));
-      const [p, d] = processArguments(c);
+      const [d, p] = processArguments(c);
       return requestResponseMessage(
         t,
         e,
         {
           type: MessageType.APPLY,
           path: r.map((f) => f.toString()),
-          argumentList: p
+          argumentList: d
         },
-        d
+        p
       ).then(fromWireValue);
     },
     construct(o, a) {
@@ -3075,7 +3075,7 @@ function createProxy(t, e, r = [], s = function() {
         e,
         {
           type: MessageType.CONSTRUCT,
-          path: r.map((p) => p.toString()),
+          path: r.map((d) => d.toString()),
           argumentList: c
         },
         l
@@ -3246,19 +3246,19 @@ const errorProperties = [
     useToJSON: o,
     serialize: a
   });
-  for (const [l, p] of Object.entries(t)) {
-    if (p && p instanceof Uint8Array && p.constructor.name === "Buffer") {
+  for (const [l, d] of Object.entries(t)) {
+    if (d && d instanceof Uint8Array && d.constructor.name === "Buffer") {
       r[l] = "[object Buffer]";
       continue;
     }
-    if (p !== null && typeof p == "object" && typeof p.pipe == "function") {
+    if (d !== null && typeof d == "object" && typeof d.pipe == "function") {
       r[l] = "[object Stream]";
       continue;
     }
-    if (typeof p != "function") {
-      if (!p || typeof p != "object") {
+    if (typeof d != "function") {
+      if (!d || typeof d != "object") {
         try {
-          r[l] = p;
+          r[l] = d;
         } catch {
         }
         continue;
@@ -3271,10 +3271,10 @@ const errorProperties = [
     }
   }
   if (a || r instanceof Error)
-    for (const { property: l, enumerable: p } of errorProperties)
+    for (const { property: l, enumerable: d } 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,
+        enumerable: s ? !0 : d,
         configurable: !0,
         writable: !0
       });
@@ -3403,7 +3403,198 @@ function setupTransferHandlers() {
   t.serialize = ({ value: r }) => {
     const s = e({ value: r });
     return r.response && (s[0].value.response = r.response), r.source && (s[0].value.source = r.source), s;
-  };
+  }, transferHandlers.set("StreamedPHPResponse", {
+    canHandle: (r) => r instanceof StreamedPHPResponse,
+    serialize(r) {
+      const s = supportsTransferableStreams(), n = promiseToPort(r.exitCode);
+      if (s)
+        return [{
+          __type: "StreamedPHPResponse",
+          headers: r.headersStream,
+          stdout: r.stdout,
+          stderr: r.stderr,
+          exitCodePort: n
+        }, [n]];
+      const i = streamToPort(r.headersStream), o = streamToPort(r.stdout), a = streamToPort(r.stderr);
+      return [
+        {
+          __type: "StreamedPHPResponse",
+          headersPort: i,
+          stdoutPort: o,
+          stderrPort: a,
+          exitCodePort: n
+        },
+        [i, o, a, n]
+      ];
+    },
+    deserialize(r) {
+      if (r.headers && r.stdout && r.stderr) {
+        const a = portToPromise(
+          r.exitCodePort
+        );
+        return new StreamedPHPResponse(
+          r.headers,
+          r.stdout,
+          r.stderr,
+          a
+        );
+      }
+      const s = portToStream(r.headersPort), n = portToStream(r.stdoutPort), i = portToStream(r.stderrPort), o = portToPromise(r.exitCodePort);
+      return new StreamedPHPResponse(s, n, i, o);
+    }
+  });
+}
+function supportsTransferableStreams() {
+  try {
+    if (typeof ReadableStream > "u") return !1;
+    const { port1: t } = new MessageChannel(), e = new ReadableStream();
+    t.postMessage(e);
+    try {
+      t.close();
+    } catch {
+    }
+    return !0;
+  } catch {
+    return !1;
+  }
+}
+function streamToPort(t) {
+  const { port1: e, port2: r } = new MessageChannel();
+  return (async () => {
+    const s = t.getReader();
+    try {
+      for (; ; ) {
+        const { done: n, value: i } = await s.read();
+        if (n) {
+          try {
+            e.postMessage({ t: "close" });
+          } catch {
+          }
+          try {
+            e.close();
+          } catch {
+          }
+          break;
+        }
+        if (i) {
+          const o = i.byteOffset === 0 && i.byteLength === i.buffer.byteLength ? i : i.slice(), a = o.buffer;
+          try {
+            e.postMessage({ t: "chunk", b: a }, [
+              a
+            ]);
+          } catch {
+            e.postMessage({
+              t: "chunk",
+              b: o.buffer.slice(0)
+            });
+          }
+        }
+      }
+    } catch (n) {
+      try {
+        e.postMessage({ t: "error", m: (n == null ? void 0 : n.message) || String(n) });
+      } catch {
+      }
+    } finally {
+      try {
+        e.close();
+      } catch {
+      }
+    }
+  })(), r;
+}
+function portToStream(t) {
+  return new ReadableStream({
+    start(e) {
+      const r = (n) => {
+        const i = n.data;
+        if (i)
+          switch (i.t) {
+            case "chunk":
+              e.enqueue(new Uint8Array(i.b));
+              break;
+            case "close":
+              e.close(), s();
+              break;
+            case "error":
+              e.error(new Error(i.m || "Stream error")), s();
+              break;
+          }
+      }, s = () => {
+        var n;
+        try {
+          (n = t.removeEventListener) == null || n.call(t, "message", r);
+        } catch {
+        }
+        try {
+          t.onmessage = null;
+        } catch {
+        }
+        try {
+          t.close();
+        } catch {
+        }
+      };
+      t.addEventListener ? t.addEventListener("message", r) : t.on ? t.on(
+        "message",
+        (n) => r({ data: n })
+      ) : t.onmessage = r, typeof t.start == "function" && t.start();
+    },
+    cancel() {
+      try {
+        t.close();
+      } catch {
+      }
+    }
+  });
+}
+function promiseToPort(t) {
+  const { port1: e, port2: r } = new MessageChannel();
+  return t.then((s) => {
+    try {
+      e.postMessage({ t: "resolve", v: s });
+    } catch {
+    }
+  }).catch((s) => {
+    try {
+      e.postMessage({
+        t: "reject",
+        m: (s == null ? void 0 : s.message) || String(s)
+      });
+    } catch {
+    }
+  }).finally(() => {
+    try {
+      e.close();
+    } catch {
+    }
+  }), r;
+}
+function portToPromise(t) {
+  return new Promise((e, r) => {
+    const s = (i) => {
+      const o = i.data;
+      o && (o.t === "resolve" ? (n(), e(o.v)) : o.t === "reject" && (n(), r(new Error(o.m || ""))));
+    }, n = () => {
+      var i;
+      try {
+        (i = t.removeEventListener) == null || i.call(t, "message", s);
+      } catch {
+      }
+      try {
+        t.onmessage = null;
+      } catch {
+      }
+      try {
+        t.close();
+      } catch {
+      }
+    };
+    t.addEventListener ? t.addEventListener("message", s) : t.on ? t.on(
+      "message",
+      (i) => s({ data: i })
+    ) : t.onmessage = s, typeof t.start == "function" && t.start();
+  });
 }
 const throwTransferHandler = transferHandlers.get(
   "throw"