@php-wasm/web 0.6.8 → 0.6.10

package/index.d.ts

@@ -82,6 +82,7 @@ export interface PHPRequestEndEvent {
 export interface PHPRequestErrorEvent {
 	type: "request.error";
 	error: Error;
+	source?: "request" | "php-wasm";
 }
 /**
  * Represents a PHP runtime initialization event.
@@ -545,11 +546,6 @@ export interface PHPRunOptions {
 	 * The code snippet to eval instead of a php file.
 	 */
 	code?: string;
-	/**
-	 * Whether to throw an error if the PHP process exits with a non-zero code
-	 * or outputs to stderr.
-	 */
-	throwOnError?: boolean;
 }
 export interface RmDirOptions {
 	/**

package/index.js

@@ -548,7 +548,7 @@ function fileToUint8Array(e) {
     }, r.readAsArrayBuffer(e);
   });
 }
-var g, H, N, b, k, y, C, S, O, Z, L, X, U, ee;
+var g, H, N, b, k, y, C, S, L, Z, O, X, U, ee;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -561,7 +561,7 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    d(this, O);
+    d(this, L);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -569,7 +569,7 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    d(this, L);
+    d(this, O);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -630,16 +630,17 @@ class PHPRequestHandler {
   /** @inheritDoc */
   async request(t) {
     const r = t.url.startsWith("http://") || t.url.startsWith("https://"), s = new URL(
-      t.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(s.pathname, c(this, y)),
       this.rewriteRules
     ), o = `${c(this, g)}${n}`;
-    return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, L, X).call(this, t, s) : f(this, O, Z).call(this, o);
+    return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, O, X).call(this, t, s) : f(this, L, Z).call(this, o);
   }
 }
-g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k = new WeakMap(), y = new WeakMap(), C = new WeakMap(), S = new WeakMap(), O = new WeakSet(), Z = function(t) {
+g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k = new WeakMap(), y = new WeakMap(), C = new WeakMap(), S = new WeakMap(), L = new WeakSet(), Z = function(t) {
   if (!this.php.fileExists(t))
     return new PHPResponse(
       404,
@@ -664,7 +665,7 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
     },
     r
   );
-}, L = new WeakSet(), X = async function(t, r) {
+}, O = new WeakSet(), X = async function(t, r) {
   var n;
   if (c(this, S).running > 0 && ((n = t.headers) == null ? void 0 : n["x-request-issuer"]) === "php")
     return console.warn(
@@ -923,7 +924,7 @@ var __defProp = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyD
   return s && n && __defProp(t, r, n), n;
 };
 const STRING = "string", NUMBER = "number", __private__dont__use = Symbol("__private__dont__use");
-var x, F, A, w, E, v, P, M, W, te, B, re, q, se, D, ne, $, ie, z, oe, j, ae, G, le, V, ce, J, ue, Q, de, Y, he;
+var x, F, A, w, E, v, P, M, W, te, q, re, B, se, D, ne, $, ie, z, oe, j, ae, G, le, V, ce, J, ue, Q, de, Y, he;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -934,8 +935,8 @@ class BasePHP {
    */
   constructor(e, t) {
     d(this, W);
-    d(this, B);
     d(this, q);
+    d(this, B);
     d(this, D);
     d(this, $);
     d(this, z);
@@ -1062,14 +1063,14 @@ class BasePHP {
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
-      f(this, G, le).call(this, e.scriptPath || ""), f(this, q, se).call(this, e.relativeUri || ""), f(this, $, ie).call(this, e.method || "GET");
+      f(this, G, le).call(this, e.scriptPath || ""), f(this, B, se).call(this, e.relativeUri || ""), f(this, $, ie).call(this, e.method || "GET");
       const s = normalizeHeaders(e.headers || {}), n = s.host || "example.com:443";
       f(this, D, ne).call(this, n, e.protocol || "http"), f(this, z, oe).call(this, s), e.body && (r = f(this, j, ae).call(this, e.body)), typeof e.code == "string" && f(this, Q, de).call(this, " ?>" + e.code), f(this, V, ce).call(this);
       const o = e.env || {};
       for (const a in o)
         f(this, J, ue).call(this, a, o[a]);
       const i = await f(this, Y, he).call(this);
-      if (e.throwOnError && i.exitCode !== 0) {
+      if (i.exitCode !== 0) {
         const a = {
           stdout: i.text,
           stderr: i.errors
@@ -1078,13 +1079,15 @@ class BasePHP {
         const l = new Error(
           `PHP.run() failed with exit code ${i.exitCode} and the following output: ` + i.errors
         );
-        throw l.output = a, console.error(l), l;
+        throw l.output = a, l.source = "request", console.error(l), l;
       }
       return i;
     } catch (s) {
       throw this.dispatchEvent({
         type: "request.error",
-        error: s
+        error: s,
+        // Distinguish between PHP request and PHP-wasm errors
+        source: s.source ?? "php-wasm"
       }), s;
     } finally {
       try {
@@ -1234,7 +1237,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, B = new WeakSet(), re = function() {
+}, q = new WeakSet(), re = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -1251,7 +1254,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     headers: r,
     httpStatusCode: t.status
   };
-}, q = new WeakSet(), se = function(e) {
+}, B = new WeakSet(), se = function(e) {
   if (this[__private__dont__use].ccall(
     "wasm_set_request_uri",
     null,
@@ -1403,7 +1406,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
   } finally {
     (n = c(this, E)) == null || n.removeEventListener("error", t), h(this, v, {});
   }
-  const { headers: r, httpStatusCode: s } = f(this, B, re).call(this);
+  const { headers: r, httpStatusCode: s } = f(this, q, re).call(this);
   return new PHPResponse(
     s,
     r,