@php-wasm/web 0.6.14 → 0.6.15

package/index.js

@@ -6,7 +6,7 @@ var c = (e, t, r) => (K(e, t, "read from private field"), r ? r.call(e) : t.get(
   if (t.has(e))
     throw TypeError("Cannot add the same private member more than once");
   t instanceof WeakSet ? t.add(e) : t.set(e, r);
-}, h = (e, t, r, s) => (K(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
+}, p = (e, t, r, s) => (K(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
 var f = (e, t, r) => (K(e, t, "access private method"), r);
 const currentJsRuntime$1 = function() {
   var e;
@@ -431,7 +431,7 @@ class PHPBrowser {
   constructor(t, r = {}) {
     d(this, R, void 0);
     d(this, T, void 0);
-    this.requestHandler = t, h(this, R, {}), h(this, T, {
+    this.requestHandler = t, p(this, R, {}), p(this, T, {
       handleRedirects: !1,
       maxRedirects: 4,
       ...r
@@ -588,20 +588,20 @@ class PHPRequestHandler {
     d(this, y, void 0);
     d(this, C, void 0);
     d(this, S, void 0);
-    h(this, S, new Semaphore({ concurrency: 1 }));
+    p(this, S, new Semaphore({ concurrency: 1 }));
     const {
       documentRoot: s = "/www/",
       absoluteUrl: n = typeof location == "object" ? location == null ? void 0 : location.href : "",
       rewriteRules: o = []
     } = r;
-    this.php = t, h(this, g, s);
+    this.php = t, p(this, g, s);
     const i = new URL(n);
-    h(this, N, i.hostname), h(this, b, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), h(this, H, (i.protocol || "").replace(":", ""));
+    p(this, N, i.hostname), p(this, b, i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80), p(this, H, (i.protocol || "").replace(":", ""));
     const a = c(this, b) !== 443 && c(this, b) !== 80;
-    h(this, k, [
+    p(this, k, [
       c(this, N),
       a ? `:${c(this, b)}` : ""
-    ].join("")), h(this, y, i.pathname.replace(/\/+$/, "")), h(this, C, [
+    ].join("")), p(this, y, i.pathname.replace(/\/+$/, "")), p(this, C, [
       `${c(this, H)}://`,
       c(this, k),
       c(this, y)
@@ -634,9 +634,12 @@ class PHPRequestHandler {
       t.url.split("#")[0],
       r ? void 0 : DEFAULT_BASE_URL
     ), n = applyRewriteRules(
-      removePathPrefix(s.pathname, c(this, y)),
+      removePathPrefix(
+        decodeURIComponent(s.pathname),
+        c(this, y)
+      ),
       this.rewriteRules
-    ), o = `${c(this, g)}${n}`;
+    ), o = joinPaths(c(this, g), n);
     return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, O, X).call(this, t, s) : f(this, L, Z).call(this, o);
   }
 }
@@ -689,12 +692,12 @@ g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), b = new WeakMap(), k =
     let a = t.body;
     if (typeof a == "object" && !(a instanceof Uint8Array)) {
       o = "POST";
-      const { bytes: u, contentType: p } = await encodeAsMultipart(a);
-      a = u, i["content-type"] = p;
+      const { bytes: u, contentType: h } = await encodeAsMultipart(a);
+      a = u, i["content-type"] = h;
     }
     let l;
     try {
-      l = f(this, U, ee).call(this, r.pathname);
+      l = f(this, U, ee).call(this, decodeURIComponent(r.pathname));
     } catch {
       return new PHPResponse(
         404,
@@ -872,7 +875,7 @@ function rethrowFileSystemError(e = "") {
       } catch (a) {
         const l = typeof a == "object" ? a == null ? void 0 : a.errno : null;
         if (l in FileErrorCodes) {
-          const u = FileErrorCodes[l], p = typeof i[0] == "string" ? i[0] : null, _ = p !== null ? e.replaceAll("{path}", p) : e;
+          const u = FileErrorCodes[l], h = typeof i[0] == "string" ? i[0] : null, _ = h !== null ? e.replaceAll("{path}", h) : e;
           throw new Error(`${_}: ${u}`, {
             cause: a
           });
@@ -954,7 +957,7 @@ class BasePHP {
     d(this, v, void 0);
     d(this, P, void 0);
     d(this, M, void 0);
-    h(this, x, []), h(this, w, !1), h(this, E, null), h(this, v, {}), h(this, P, /* @__PURE__ */ new Map()), h(this, M, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
+    p(this, x, []), p(this, w, !1), p(this, E, null), p(this, v, {}), p(this, P, /* @__PURE__ */ new Map()), p(this, M, []), this.semaphore = new Semaphore({ concurrency: 1 }), e !== void 0 && this.initializeRuntime(e), t && (this.requestHandler = new PHPBrowser(
       new PHPRequestHandler(this, t)
     ));
   }
@@ -1010,7 +1013,7 @@ class BasePHP {
           return n;
       }
       return "";
-    }, h(this, E, improveWASMErrorReporting(t)), this.dispatchEvent({
+    }, p(this, E, improveWASMErrorReporting(t)), this.dispatchEvent({
       type: "runtime.initialized"
     });
   }
@@ -1025,13 +1028,13 @@ class BasePHP {
       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?"
       );
-    h(this, A, e);
+    p(this, A, e);
   }
   /** @inheritDoc */
   setPhpIniPath(e) {
     if (c(this, w))
       throw new Error("Cannot set PHP ini path after calling run().");
-    h(this, F, e), this[__private__dont__use].ccall(
+    p(this, F, e), this[__private__dont__use].ccall(
       "wasm_set_phpini_path",
       null,
       ["string"],
@@ -1059,7 +1062,7 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (c(this, w) || (f(this, W, te).call(this), h(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
+      if (c(this, w) || (f(this, W, te).call(this), p(this, w, !0)), e.scriptPath && !this.fileExists(e.scriptPath))
         throw new Error(
           `The script path "${e.scriptPath}" does not exist.`
         );
@@ -1071,15 +1074,11 @@ class BasePHP {
         f(this, J, ue).call(this, a, o[a]);
       const i = await f(this, Y, he).call(this);
       if (i.exitCode !== 0) {
-        const a = {
-          stdout: i.text,
-          stderr: i.errors
-        };
-        console.warn("PHP.run() output was:", a);
-        const l = new Error(
+        console.warn("PHP.run() output was:", i.text);
+        const a = new Error(
           `PHP.run() failed with exit code ${i.exitCode} and the following output: ` + i.errors
         );
-        throw l.output = a, l.source = "request", console.error(l), l;
+        throw a.response = i, a.source = "request", console.error(a), a;
       }
       return i;
     } catch (s) {
@@ -1209,7 +1208,7 @@ class BasePHP {
       this[__private__dont__use]._exit(e);
     } catch {
     }
-    h(this, w, !1), h(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
+    p(this, w, !1), p(this, E, null), delete this[__private__dont__use].onMessage, delete this[__private__dont__use];
   }
 }
 x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E = new WeakMap(), v = new WeakMap(), P = new WeakMap(), M = new WeakMap(), W = new WeakSet(), te = function() {
@@ -1378,8 +1377,8 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
       var l;
       t = (u) => {
         console.error(u), console.error(u.error);
-        const p = new Error("Rethrown");
-        p.cause = u.error, p.betterMessage = u.message, i(p);
+        const h = new Error("Rethrown");
+        h.cause = u.error, h.betterMessage = u.message, i(h);
       }, (l = c(this, E)) == null || l.addEventListener(
         "error",
         t
@@ -1404,7 +1403,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     const i = o, a = "betterMessage" in i ? i.betterMessage : i.message, l = new Error(a);
     throw l.cause = i, console.error(l), l;
   } finally {
-    (n = c(this, E)) == null || n.removeEventListener("error", t), h(this, v, {});
+    (n = c(this, E)) == null || n.removeEventListener("error", t), p(this, v, {});
   }
   const { headers: r, httpStatusCode: s } = f(this, q, re).call(this);
   return new PHPResponse(
@@ -1520,16 +1519,16 @@ function expose(e, t = globalThis, r = ["*"]) {
     const { id: o, type: i, path: a } = Object.assign({ path: [] }, n.data), l = (n.data.argumentList || []).map(fromWireValue);
     let u;
     try {
-      const p = a.slice(0, -1).reduce((m, I) => m[I], e), _ = a.reduce((m, I) => m[I], e);
+      const h = a.slice(0, -1).reduce((m, I) => m[I], e), _ = a.reduce((m, I) => m[I], e);
       switch (i) {
         case "GET":
           u = _;
           break;
         case "SET":
-          p[a.slice(-1)[0]] = fromWireValue(n.data.value), u = !0;
+          h[a.slice(-1)[0]] = fromWireValue(n.data.value), u = !0;
           break;
         case "APPLY":
-          u = _.apply(p, l);
+          u = _.apply(h, l);
           break;
         case "CONSTRUCT":
           {
@@ -1549,13 +1548,13 @@ function expose(e, t = globalThis, r = ["*"]) {
         default:
           return;
       }
-    } catch (p) {
-      u = { value: p, [throwMarker]: 0 };
+    } catch (h) {
+      u = { value: h, [throwMarker]: 0 };
     }
-    Promise.resolve(u).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
-      const [_, m] = toWireValue(p);
+    Promise.resolve(u).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
+      const [_, m] = toWireValue(h);
       t.postMessage(Object.assign(Object.assign({}, _), { id: o }), m), i === "RELEASE" && (t.removeEventListener("message", s), closeEndPoint(t), finalizer in e && typeof e[finalizer] == "function" && e[finalizer]());
-    }).catch((p) => {
+    }).catch((h) => {
       const [_, m] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
@@ -1620,7 +1619,7 @@ function createProxy(e, t = [], r = function() {
       const [l, u] = toWireValue(a);
       return requestResponseMessage(e, {
         type: "SET",
-        path: [...t, i].map((p) => p.toString()),
+        path: [...t, i].map((h) => h.toString()),
         value: l
       }, u).then(fromWireValue);
     },
@@ -1633,12 +1632,12 @@ function createProxy(e, t = [], r = function() {
         }).then(fromWireValue);
       if (l === "bind")
         return createProxy(e, t.slice(0, -1));
-      const [u, p] = processArguments(a);
+      const [u, h] = processArguments(a);
       return requestResponseMessage(e, {
         type: "APPLY",
         path: t.map((_) => _.toString()),
         argumentList: u
-      }, p).then(fromWireValue);
+      }, h).then(fromWireValue);
     },
     construct(o, i) {
       throwIfProxyReleased(s);
@@ -1748,34 +1747,41 @@ function exposeAPI(e, t) {
 }
 let isTransferHandlersSetup = !1;
 function setupTransferHandlers() {
-  isTransferHandlersSetup || (isTransferHandlersSetup = !0, transferHandlers.set("EVENT", {
-    canHandle: (e) => e instanceof CustomEvent,
-    serialize: (e) => [
+  if (isTransferHandlersSetup)
+    return;
+  isTransferHandlersSetup = !0, transferHandlers.set("EVENT", {
+    canHandle: (r) => r instanceof CustomEvent,
+    serialize: (r) => [
       {
-        detail: e.detail
+        detail: r.detail
       },
       []
     ],
-    deserialize: (e) => e
+    deserialize: (r) => r
   }), transferHandlers.set("FUNCTION", {
-    canHandle: (e) => typeof e == "function",
-    serialize(e) {
+    canHandle: (r) => typeof r == "function",
+    serialize(r) {
       console.debug("[Comlink][Performance] Proxying a function");
-      const { port1: t, port2: r } = new MessageChannel();
-      return expose(e, t), [r, [r]];
+      const { port1: s, port2: n } = new MessageChannel();
+      return expose(r, s), [n, [n]];
     },
-    deserialize(e) {
-      return e.start(), wrap(e);
+    deserialize(r) {
+      return r.start(), wrap(r);
     }
   }), transferHandlers.set("PHPResponse", {
-    canHandle: (e) => typeof e == "object" && e !== null && "headers" in e && "bytes" in e && "errors" in e && "exitCode" in e && "httpStatusCode" in e,
-    serialize(e) {
-      return [e.toRawData(), []];
+    canHandle: (r) => typeof r == "object" && r !== null && "headers" in r && "bytes" in r && "errors" in r && "exitCode" in r && "httpStatusCode" in r,
+    serialize(r) {
+      return [r.toRawData(), []];
     },
-    deserialize(e) {
-      return PHPResponse.fromRawData(e);
+    deserialize(r) {
+      return PHPResponse.fromRawData(r);
     }
-  }));
+  });
+  const e = transferHandlers.get("throw"), t = e == null ? void 0 : e.serialize;
+  e.serialize = ({ value: r }) => {
+    const s = t({ value: r });
+    return r.response && (s[0].value.response = r.response), r.source && (s[0].value.source = r.source), s;
+  };
 }
 function proxyClone(e) {
   return new Proxy(e, {
@@ -2022,7 +2028,16 @@ async function registerServiceWorker(e, t, r) {
     async function(i) {
       if (t && i.data.scope !== t)
         return;
-      const a = i.data.args || [], l = i.data.method, u = await e[l](...a);
+      const a = i.data.args || [], l = i.data.method;
+      let u;
+      try {
+        u = await e[l](...a);
+      } catch (h) {
+        if (l === "request" && h && typeof h == "object" && "response" in h)
+          u = h.response;
+        else
+          throw h;
+      }
       i.source.postMessage(responseTo(i.data.requestId, u));
     }
   ), s.startMessages();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "description": "PHP.wasm for the web",
   "repository": {
     "type": "git",
@@ -29,16 +29,16 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "83b6f8542937a9bea9ee6562887a511c20ac9442",
+  "gitHead": "e05126da329a26535905b0ab65415d20118f0197",
   "engines": {
     "node": ">=16.15.1",
     "npm": ">=8.11.0"
   },
   "dependencies": {
     "comlink": "^4.4.1",
-    "@php-wasm/universal": "0.6.14",
-    "@php-wasm/util": "0.6.14",
-    "@php-wasm/web-service-worker": "0.6.14",
-    "@php-wasm/progress": "0.6.14"
+    "@php-wasm/universal": "0.6.15",
+    "@php-wasm/util": "0.6.15",
+    "@php-wasm/web-service-worker": "0.6.15",
+    "@php-wasm/progress": "0.6.15"
   }
 }