@php-wasm/universal 2.0.3 → 2.0.5

package/index.js

@@ -872,7 +872,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, d, z, W, B, $, V, G, J, Y, K, L, X, O, U;
+var k, E, x, g, v, T, h, z, W, $, B, V, G, J, Y, K, L, X, O, U;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -882,7 +882,7 @@ class PHP {
    * @param  requestHandlerOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(t) {
-    _(this, d);
+    _(this, h);
     _(this, k);
     _(this, E);
     _(this, x);
@@ -1291,27 +1291,27 @@ class PHP {
     this.runStreamCalled = !0;
     const e = await this.semaphore.acquire();
     let r;
-    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))
+    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))
         throw new Error(
           `The script path "${t.scriptPath}" does not exist.`
         );
-      m(this, d, B).call(this, t.relativeUri || ""), m(this, d, J).call(this, t.method || "GET");
-      const n = normalizeHeaders(t.headers || {}), i = n.host || "example.com:443", o = m(this, d, G).call(this, i, t.protocol || "http");
-      if (m(this, d, $).call(this, i), m(this, d, V).call(this, o), m(this, d, Y).call(this, n), t.body && (r = m(this, d, K).call(this, t.body)), typeof t.code == "string")
-        this.writeFile("/internal/eval.php", t.code), m(this, d, L).call(this, "/internal/eval.php");
+      m(this, h, $).call(this, t.relativeUri || ""), m(this, h, J).call(this, t.method || "GET");
+      const n = normalizeHeaders(t.headers || {}), i = n.host || "example.com:443", o = m(this, h, G).call(this, i, t.protocol || "http");
+      if (m(this, h, B).call(this, i), m(this, h, V).call(this, o), m(this, h, Y).call(this, n), 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, d, L).call(this, t.scriptPath || "");
+        m(this, h, L).call(this, t.scriptPath || "");
       else
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const a = m(this, d, z).call(this, t.$_SERVER, n, o);
+      const a = m(this, h, z).call(this, t.$_SERVER, n, o);
       for (const l in a)
-        m(this, d, X).call(this, l, a[l]);
+        m(this, h, X).call(this, l, a[l]);
       const c = t.env || {};
       for (const l in c)
-        m(this, d, O).call(this, l, c[l]);
+        m(this, h, O).call(this, l, c[l]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1320,14 +1320,7 @@ class PHP {
         { async: !0 }
       );
     });
-    return await s.catch((n) => {
-      throw this.dispatchEvent({
-        type: "request.error",
-        error: n,
-        // Distinguish between PHP request and PHP-wasm errors
-        source: n.source ?? "php-wasm"
-      }), n;
-    }).finally(() => {
+    return await s.finally(() => {
       r && this[__private__dont__use].free(r);
     }).finally(() => {
       e(), this.dispatchEvent({
@@ -1574,7 +1567,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, O).call(this, n, i);
+      m(this, h, 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(
@@ -1583,7 +1576,7 @@ class PHP {
         [STRING],
         [n]
       );
-    return await m(this, d, U).call(this, () => this[__private__dont__use].ccall("run_cli", null, [], [], {
+    return await m(this, h, U).call(this, () => this[__private__dont__use].ccall("run_cli", null, [], [], {
       async: !0
     })).then((n) => (n.exitCode.finally(r), n));
   }
@@ -1609,7 +1602,7 @@ class PHP {
     u(this, E) && this.exit(0);
   }
 }
-k = new WeakMap(), E = new WeakMap(), x = new WeakMap(), g = new WeakMap(), v = new WeakMap(), T = new WeakMap(), d = new WeakSet(), /**
+k = new WeakMap(), E = new WeakMap(), x = new WeakMap(), g = new WeakMap(), v = new WeakMap(), T = new WeakMap(), h = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -1632,7 +1625,7 @@ z = function(t, e, r) {
   return this[__private__dont__use].ccall("php_wasm_init", null, [], [], {
     isAsync: !0
   });
-}, B = function(t) {
+}, $ = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1646,7 +1639,7 @@ z = function(t, e, r) {
     [STRING],
     [e]
   );
-}, $ = function(t) {
+}, B = function(t) {
   this[__private__dont__use].ccall(
     "wasm_set_request_host",
     null,
@@ -1737,23 +1730,23 @@ z = function(t, e, r) {
   );
 }, U = async function(t) {
   const e = this[__private__dont__use], r = await createInvertedReadableStream();
-  e.onHeaders = (h) => {
-    a || s || r.controller.enqueue(h.slice());
+  e.onHeaders = (d) => {
+    a || s || r.controller.enqueue(d.slice());
   };
   let s = !1;
   const n = () => {
     s || (s = !0, r.controller.close());
   }, i = await createInvertedReadableStream();
-  e.onStdout = (h) => {
-    n(), !a && i.controller.enqueue(h.slice());
+  e.onStdout = (d) => {
+    n(), !a && i.controller.enqueue(d.slice());
   };
   const o = await createInvertedReadableStream();
-  e.onStderr = (h) => {
-    a || o.controller.enqueue(h.slice());
+  e.onStderr = (d) => {
+    a || o.controller.enqueue(d.slice());
   };
   let a = !1, c;
   const p = (async () => {
-    var h;
+    var d;
     try {
       return await Promise.race([
         t(),
@@ -1780,12 +1773,29 @@ z = function(t, e, r) {
         });
       throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), y;
     } finally {
-      a || (i.controller.close(), o.controller.close(), n(), a = !0), (h = u(this, x)) == null || h.removeEventListener(
+      a || (i.controller.close(), o.controller.close(), n(), a = !0), (d = u(this, x)) == null || d.removeEventListener(
         "error",
         c
       );
     }
-  })();
+  })().then(
+    (d) => (d !== 0 && this.dispatchEvent({
+      type: "request.error",
+      error: new Error(
+        `PHP.run() failed with exit code ${d}.`
+      ),
+      // Distinguish between PHP request and PHP-wasm errors
+      source: "php-wasm"
+    }), d),
+    (d) => {
+      throw this.dispatchEvent({
+        type: "request.error",
+        error: d,
+        // Distinguish between PHP request and PHP-wasm errors
+        source: d.source ?? "php-wasm"
+      }), d;
+    }
+  );
   return new StreamedPHPResponse(
     r.stream,
     i.stream,
@@ -2797,18 +2807,18 @@ function expose(t, e = globalThis, r = ["*"], s) {
     }, l = (i.data.argumentList || []).map(fromWireValue);
     let p;
     try {
-      const h = c.slice(0, -1).reduce((w, b) => w[b], t), y = c.reduce((w, b) => w[b], t);
+      const d = 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[c.slice(-1)[0]] = fromWireValue(
+          d[c.slice(-1)[0]] = fromWireValue(
             i.data.value
           ), p = !0;
           break;
         case MessageType.APPLY:
-          p = y.apply(h, l);
+          p = y.apply(d, l);
           break;
         case MessageType.CONSTRUCT:
           {
@@ -2828,18 +2838,18 @@ function expose(t, e = globalThis, r = ["*"], s) {
         default:
           return;
       }
-    } catch (h) {
-      p = { value: h, [throwMarker]: 0 };
+    } catch (d) {
+      p = { value: d, [throwMarker]: 0 };
     }
-    Promise.resolve(p).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
-      const [y, w] = toWireValue(h);
+    Promise.resolve(p).catch((d) => ({ value: d, [throwMarker]: 0 })).then((d) => {
+      const [y, w] = toWireValue(d);
       e.postMessage({ ...y, id: o }, w), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in t && typeof t[finalizer] == "function" && t[finalizer]());
     }).catch(() => {
-      const [h, y] = toWireValue({
+      const [d, y] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      e.postMessage({ ...h, id: o }, y);
+      e.postMessage({ ...d, id: o }, y);
     }).finally(() => {
       s == null || s(i);
     });
@@ -2916,7 +2926,7 @@ function createProxy(t, e, r = [], s = function() {
         e,
         {
           type: MessageType.SET,
-          path: [...r, a].map((h) => h.toString()),
+          path: [...r, a].map((d) => d.toString()),
           value: l
         },
         p
@@ -2931,7 +2941,7 @@ function createProxy(t, e, r = [], s = function() {
         }).then(fromWireValue);
       if (l === "bind")
         return createProxy(t, e, r.slice(0, -1));
-      const [p, h] = processArguments(c);
+      const [p, d] = processArguments(c);
       return requestResponseMessage(
         t,
         e,
@@ -2940,7 +2950,7 @@ function createProxy(t, e, r = [], s = function() {
           path: r.map((y) => y.toString()),
           argumentList: p
         },
-        h
+        d
       ).then(fromWireValue);
     },
     construct(o, a) {