@php-wasm/universal 2.0.9 → 2.0.11

package/index.js

@@ -524,7 +524,7 @@ const responseTexts = {
 };
 class StreamedPHPResponse {
   constructor(e, r, s, n) {
-    this.parsedHeaders = null, this.cachedStdoutText = null, this.cachedStderrText = null, this.headersStream = e, this.stdout = r, this.stderr = s, this.exitCode = n;
+    this.parsedHeaders = null, this.cachedStdoutBytes = null, this.cachedStderrText = null, this.headersStream = e, this.stdout = r, this.stderr = s, this.exitCode = n;
   }
   /**
    * True if the response is successful (HTTP status code 200-399),
@@ -567,7 +567,15 @@ class StreamedPHPResponse {
    * Exposes the stdout bytes as they're produced by the PHP instance
    */
   get stdoutText() {
-    return this.cachedStdoutText || (this.cachedStdoutText = streamToText(this.stdout)), this.cachedStdoutText;
+    return this.stdoutBytes.then(
+      (e) => new TextDecoder().decode(e)
+    );
+  }
+  /**
+   * Exposes the stdout bytes as they're produced by the PHP instance
+   */
+  get stdoutBytes() {
+    return this.cachedStdoutBytes || (this.cachedStdoutBytes = streamToBytes(this.stdout)), this.cachedStdoutBytes;
   }
   /**
    * Exposes the stderr bytes as they're produced by the PHP instance
@@ -608,6 +616,23 @@ async function streamToText(t) {
     n && r.push(n);
   }
 }
+async function streamToBytes(t) {
+  const e = t.getReader(), r = [];
+  for (; ; ) {
+    const { done: s, value: n } = await e.read();
+    if (s) {
+      const i = r.reduce(
+        (c, l) => c + l.byteLength,
+        0
+      ), o = new Uint8Array(i);
+      let a = 0;
+      for (const c of r)
+        o.set(c, a), a += c.byteLength;
+      return o;
+    }
+    n && r.push(n);
+  }
+}
 class PHPResponse {
   constructor(e, r, s, n = "", i = 0) {
     this.httpStatusCode = e, this.headers = r, this.bytes = s, this.exitCode = i, this.errors = n;
@@ -634,7 +659,7 @@ class PHPResponse {
     return await e.finished, new PHPResponse(
       await e.httpStatusCode,
       await e.headers,
-      new TextEncoder().encode(await e.stdoutText),
+      await e.stdoutBytes,
       await e.stderrText,
       await e.exitCode
     );
@@ -874,7 +899,7 @@ class PHPExecutionFailureError extends Error {
   }
 }
 const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php", OPCACHE_FILE_FOLDER = "/internal/shared/opcache";
-var k, E, x, g, v, T, h, z, W, $, B, V, G, J, Y, K, L, X, O, U;
+var k, E, x, g, v, T, h, z, B, W, $, V, G, J, Y, K, L, X, O, U;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1294,13 +1319,13 @@ class PHP {
     const e = await this.semaphore.acquire();
     let r;
     const s = m(this, h, U).call(this, async () => {
-      if (u(this, E) || (await m(this, h, W).call(this), f(this, E, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
+      if (u(this, E) || (await m(this, h, B).call(this), f(this, E, !0)), t.scriptPath && !this.fileExists(t.scriptPath))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
-      m(this, h, $).call(this, t.relativeUri || ""), m(this, h, J).call(this, t.method || "GET");
+      m(this, h, W).call(this, t.relativeUri || ""), m(this, h, J).call(this, t.method || "GET");
       const i = normalizeHeaders(t.headers || {}), o = i.host || "example.com:443", a = m(this, h, G).call(this, o, t.protocol || "http");
-      if (m(this, h, B).call(this, o), m(this, h, V).call(this, a), m(this, h, Y).call(this, i), t.body && (r = m(this, h, K).call(this, t.body)), typeof t.code == "string")
+      if (m(this, h, $).call(this, o), m(this, h, V).call(this, a), m(this, h, Y).call(this, i), t.body && (r = m(this, h, K).call(this, t.body)), typeof t.code == "string")
         this.writeFile("/internal/eval.php", t.code), m(this, h, L).call(this, "/internal/eval.php");
       else if (typeof t.scriptPath == "string")
         m(this, h, L).call(this, t.scriptPath || "");
@@ -1632,11 +1657,11 @@ z = function(t, e, r) {
     ["content-type", "content-length"].includes(n.toLowerCase()) && (i = ""), s[`${i}${n.toUpperCase().replace(/-/g, "_")}`] = e[n];
   }
   return s;
-}, W = function() {
+}, B = function() {
   return this[__private__dont__use].ccall("php_wasm_init", null, [], [], {
     isAsync: !0
   });
-}, $ = function(t) {
+}, W = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1650,7 +1675,7 @@ z = function(t, e, r) {
     [STRING],
     [e]
   );
-}, B = function(t) {
+}, $ = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,