@php-wasm/web 0.1.32 → 0.1.34

package/{index-a3b4b54b.js → index-5569499f.js}

@@ -1,6 +1,6 @@
 class R {
-  constructor(e, r, n, s = "", a = 0) {
-    this.httpStatusCode = e, this.headers = r, this.bytes = n, this.exitCode = a, this.errors = s;
+  constructor(e, r, n, s = "", l = 0) {
+    this.httpStatusCode = e, this.headers = r, this.bytes = n, this.exitCode = l, this.errors = s;
   }
   static fromRawData(e) {
     return new R(
@@ -117,8 +117,8 @@ class X {
       try {
         if (!r.includes("="))
           continue;
-        const n = r.indexOf("="), s = r.substring(0, n), a = r.substring(n + 1).split(";")[0];
-        this.#e[s] = a;
+        const n = r.indexOf("="), s = r.substring(0, n), l = r.substring(n + 1).split(";")[0];
+        this.#e[s] = l;
       } catch (n) {
         console.error(n);
       }
@@ -184,9 +184,9 @@ class re {
     const {
       documentRoot: n = "/www/",
       absoluteUrl: s = typeof location == "object" ? location?.href : "",
-      isStaticFilePath: a = () => !1
+      isStaticFilePath: l = () => !1
     } = r;
-    this.php = e, this.#e = n, this.#l = a;
+    this.php = e, this.#e = n, this.#l = l;
     const i = new URL(s);
     this.#s = i.hostname, this.#n = i.port ? Number(i.port) : i.protocol === "https:" ? 443 : 80, this.#t = (i.protocol || "").replace(":", "");
     const o = this.#n !== 443 && this.#n !== 80;
@@ -274,27 +274,27 @@ class re {
         this.#o.startsWith("https://") ? "on" : ""
       );
       let s = "GET";
-      const a = {
+      const l = {
         host: this.#i,
         ...W(e.headers || {})
       }, i = [];
       if (e.files && Object.keys(e.files).length) {
         s = "POST";
-        for (const l in e.files) {
-          const u = e.files[l];
+        for (const a in e.files) {
+          const u = e.files[a];
           i.push({
-            key: l,
+            key: a,
             name: u.name,
             type: u.type,
             data: new Uint8Array(await u.arrayBuffer())
           });
         }
-        a["content-type"]?.startsWith("multipart/form-data") && (e.formData = ne(
+        l["content-type"]?.startsWith("multipart/form-data") && (e.formData = ne(
           e.body || ""
-        ), a["content-type"] = "application/x-www-form-urlencoded", delete e.body);
+        ), l["content-type"] = "application/x-www-form-urlencoded", delete e.body);
       }
       let o;
-      return e.formData !== void 0 ? (s = "POST", a["content-type"] = a["content-type"] || "application/x-www-form-urlencoded", o = new URLSearchParams(
+      return e.formData !== void 0 ? (s = "POST", l["content-type"] = l["content-type"] || "application/x-www-form-urlencoded", o = new URLSearchParams(
         e.formData
       ).toString()) : o = e.body, await this.php.run({
         relativeUri: te(
@@ -306,7 +306,7 @@ class re {
         body: o,
         fileInfos: i,
         scriptPath: this.#d(r.pathname),
-        headers: a
+        headers: l
       });
     } finally {
       n();
@@ -332,13 +332,13 @@ function ne(t) {
   if (!r)
     return e;
   const n = r[1], s = t.split(`--${n}`);
-  return s.shift(), s.pop(), s.forEach((a) => {
-    const i = a.indexOf(`\r
+  return s.shift(), s.pop(), s.forEach((l) => {
+    const i = l.indexOf(`\r
 \r
-`), o = a.substring(0, i).trim(), l = a.substring(i + 4).trim(), u = o.match(/name="([^"]+)"/);
+`), o = l.substring(0, i).trim(), a = l.substring(i + 4).trim(), u = o.match(/name="([^"]+)"/);
     if (u) {
       const d = u[1];
-      e[d] = l;
+      e[d] = a;
     }
   }), e;
 }
@@ -463,14 +463,14 @@ const N = {
 };
 function y(t = "") {
   return function(r, n, s) {
-    const a = s.value;
+    const l = s.value;
     s.value = function(...i) {
       try {
-        return a.apply(this, i);
+        return l.apply(this, i);
       } catch (o) {
-        const l = typeof o == "object" ? o?.errno : null;
-        if (l in N) {
-          const u = N[l], d = typeof i[0] == "string" ? i[0] : null, g = d !== null ? t.replaceAll("{path}", d) : t;
+        const a = typeof o == "object" ? o?.errno : null;
+        if (a in N) {
+          const u = N[a], d = typeof i[0] == "string" ? i[0] : null, g = d !== null ? t.replaceAll("{path}", d) : t;
           throw new Error(`${g}: ${u}`, {
             cause: o
           });
@@ -482,31 +482,31 @@ function y(t = "") {
 }
 async function ie(t, e = {}, r = []) {
   let n, s;
-  const a = new Promise((l) => {
-    s = l;
-  }), i = new Promise((l) => {
-    n = l;
+  const l = new Promise((a) => {
+    s = a;
+  }), i = new Promise((a) => {
+    n = a;
   }), o = t.init(ae, {
-    onAbort(l) {
-      console.error("WASM aborted: "), console.error(l);
+    onAbort(a) {
+      console.error("WASM aborted: "), console.error(a);
     },
     ENV: {},
     // Emscripten sometimes prepends a '/' to the path, which
     // breaks vite dev mode. An identity `locateFile` function
     // fixes it.
-    locateFile: (l) => l,
+    locateFile: (a) => a,
     ...e,
     noInitialRun: !0,
     onRuntimeInitialized() {
       e.onRuntimeInitialized && e.onRuntimeInitialized(), n();
     },
-    monitorRunDependencies(l) {
-      l === 0 && (delete o.monitorRunDependencies, s());
+    monitorRunDependencies(a) {
+      a === 0 && (delete o.monitorRunDependencies, s());
     }
   });
-  for (const { default: l } of r)
-    l(o);
-  return r.length || s(), await a, await i, O.push(o), O.length - 1;
+  for (const { default: a } of r)
+    a(o);
+  return r.length || s(), await l, await i, O.push(o), O.length - 1;
 }
 const O = [];
 function oe(t) {
@@ -516,8 +516,8 @@ const ae = function() {
   return typeof window < "u" && !{}.TEST ? "WEB" : typeof WorkerGlobalScope < "u" && self instanceof WorkerGlobalScope ? "WORKER" : "NODE";
 }();
 var le = Object.defineProperty, ce = Object.getOwnPropertyDescriptor, w = (t, e, r, n) => {
-  for (var s = n > 1 ? void 0 : n ? ce(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (s = (n ? i(e, r, s) : i(s)) || s);
+  for (var s = n > 1 ? void 0 : n ? ce(e, r) : e, l = t.length - 1, i; l >= 0; l--)
+    (i = t[l]) && (s = (n ? i(e, r, s) : i(s)) || s);
   return n && s && le(e, r, s), s;
 };
 const f = "string", b = "number", c = Symbol("__private__dont__use");
@@ -626,7 +626,7 @@ class m {
     for (const s of r.headers) {
       if (!s.includes(": "))
         continue;
-      const a = s.indexOf(": "), i = s.substring(0, a).toLowerCase(), o = s.substring(a + 2);
+      const l = s.indexOf(": "), i = s.substring(0, l).toLowerCase(), o = s.substring(l + 2);
       i in n || (n[i] = []), n[i].push(o);
     }
     return {
@@ -739,14 +739,14 @@ class m {
    * @param  fileInfo - File details
    */
   #u(e) {
-    const { key: r, name: n, type: s, data: a } = e, i = `/tmp/${Math.random().toFixed(20)}`;
-    this.writeFile(i, a);
+    const { key: r, name: n, type: s, data: l } = e, i = `/tmp/${Math.random().toFixed(20)}`;
+    this.writeFile(i, l);
     const o = 0;
     this[c].ccall(
       "wasm_add_uploaded_file",
       null,
       [f, f, f, f, b, b],
-      [r, n, s, i, o, a.byteLength]
+      [r, n, s, i, o, l.byteLength]
     );
   }
   #d(e) {
@@ -910,7 +910,7 @@ function F(t, e = globalThis, r = ["*"]) {
       console.warn(`Invalid origin '${s.origin}' for comlink proxy`);
       return;
     }
-    const { id: a, type: i, path: o } = Object.assign({ path: [] }, s.data), l = (s.data.argumentList || []).map(P);
+    const { id: l, type: i, path: o } = Object.assign({ path: [] }, s.data), a = (s.data.argumentList || []).map(P);
     let u;
     try {
       const d = o.slice(0, -1).reduce((p, v) => p[v], t), g = o.reduce((p, v) => p[v], t);
@@ -922,11 +922,11 @@ function F(t, e = globalThis, r = ["*"]) {
           d[o.slice(-1)[0]] = P(s.data.value), u = !0;
           break;
         case "APPLY":
-          u = g.apply(d, l);
+          u = g.apply(d, a);
           break;
         case "CONSTRUCT":
           {
-            const p = new g(...l);
+            const p = new g(...a);
             u = G(p);
           }
           break;
@@ -947,13 +947,13 @@ function F(t, e = globalThis, r = ["*"]) {
     }
     Promise.resolve(u).catch((d) => ({ value: d, [k]: 0 })).then((d) => {
       const [g, p] = C(d);
-      e.postMessage(Object.assign(Object.assign({}, g), { id: a }), p), i === "RELEASE" && (e.removeEventListener("message", n), $(e), H in t && typeof t[H] == "function" && t[H]());
+      e.postMessage(Object.assign(Object.assign({}, g), { id: l }), p), i === "RELEASE" && (e.removeEventListener("message", n), $(e), H in t && typeof t[H] == "function" && t[H]());
     }).catch((d) => {
       const [g, p] = C({
         value: new TypeError("Unserializable return value"),
         [k]: 0
       });
-      e.postMessage(Object.assign(Object.assign({}, g), { id: a }), p);
+      e.postMessage(Object.assign(Object.assign({}, g), { id: l }), p);
     });
   }), e.start && e.start();
 }
@@ -992,7 +992,7 @@ function U(t, e = [], r = function() {
 }) {
   let n = !1;
   const s = new Proxy(r, {
-    get(a, i) {
+    get(l, i) {
       if (_(n), i === de)
         return () => {
           ye(s), j(t), n = !0;
@@ -1002,29 +1002,29 @@ function U(t, e = [], r = function() {
           return { then: () => s };
         const o = E(t, {
           type: "GET",
-          path: e.map((l) => l.toString())
+          path: e.map((a) => a.toString())
         }).then(P);
         return o.then.bind(o);
       }
       return U(t, [...e, i]);
     },
-    set(a, i, o) {
+    set(l, i, o) {
       _(n);
-      const [l, u] = C(o);
+      const [a, u] = C(o);
       return E(t, {
         type: "SET",
         path: [...e, i].map((d) => d.toString()),
-        value: l
+        value: a
       }, u).then(P);
     },
-    apply(a, i, o) {
+    apply(l, i, o) {
       _(n);
-      const l = e[e.length - 1];
-      if (l === ue)
+      const a = e[e.length - 1];
+      if (a === ue)
         return E(t, {
           type: "ENDPOINT"
         }).then(P);
-      if (l === "bind")
+      if (a === "bind")
         return U(t, e.slice(0, -1));
       const [u, d] = D(o);
       return E(t, {
@@ -1033,14 +1033,14 @@ function U(t, e = [], r = function() {
         argumentList: u
       }, d).then(P);
     },
-    construct(a, i) {
+    construct(l, i) {
       _(n);
-      const [o, l] = D(i);
+      const [o, a] = D(i);
       return E(t, {
         type: "CONSTRUCT",
         path: e.map((u) => u.toString()),
         argumentList: o
-      }, l).then(P);
+      }, a).then(P);
     }
   });
   return ge(s, t), s;
@@ -1098,8 +1098,8 @@ function P(t) {
 function E(t, e, r) {
   return new Promise((n) => {
     const s = be();
-    t.addEventListener("message", function a(i) {
-      !i.data || !i.data.id || i.data.id !== s || (t.removeEventListener("message", a), n(i.data));
+    t.addEventListener("message", function l(i) {
+      !i.data || !i.data.id || i.data.id !== s || (t.removeEventListener("message", l), n(i.data));
     }), t.start && t.start(), t.postMessage(Object.assign({ id: s }, e), r);
   });
 }
@@ -1113,16 +1113,17 @@ function ke(t) {
 }
 function xe(t, e) {
   J();
-  let r;
-  const n = new Promise((i) => {
-    r = i;
-  }), s = Y(t), a = new Proxy(s, {
-    get: (i, o) => o === "isReady" ? () => n : o in i ? i[o] : e?.[o]
+  const r = Promise.resolve();
+  let n;
+  const s = new Promise((o) => {
+    n = o;
+  }), l = Y(t), i = new Proxy(l, {
+    get: (o, a) => a === "isConnected" ? () => r : a === "isReady" ? () => s : a in o ? o[a] : e?.[a]
   });
   return F(
-    a,
+    i,
     typeof window < "u" ? V(self.parent) : void 0
-  ), [r, a];
+  ), [n, i];
 }
 function J() {
   S.set("EVENT", {
@@ -1219,11 +1220,11 @@ class A extends m {
    * @see load
    */
   static loadSync(e, r = {}) {
-    const n = new A(void 0, r.requestHandler), a = (async () => {
+    const n = new A(void 0, r.requestHandler), l = (async () => {
       const i = await Promise.all([
         Ee(e),
         ...r.dataModules || []
-      ]), [o, ...l] = i;
+      ]), [o, ...a] = i;
       r.downloadMonitor?.setModules(i);
       const u = await ie(
         o,
@@ -1231,14 +1232,14 @@ class A extends m {
           ...r.emscriptenOptions || {},
           ...r.downloadMonitor?.getEmscriptenOptions() || {}
         },
-        l
+        a
       );
-      return n.initializeRuntime(u), { dataModules: l };
+      return n.initializeRuntime(u), { dataModules: a };
     })();
     return {
       php: n,
-      phpReady: a.then(() => n),
-      dataModules: a.then((i) => i.dataModules)
+      phpReady: l.then(() => n),
+      dataModules: l.then((i) => i.dataModules)
     };
   }
 }
@@ -1246,7 +1247,7 @@ const h = /* @__PURE__ */ new WeakMap();
 class Te {
   /** @inheritDoc */
   constructor(e, r) {
-    this.connected = Promise.resolve(), h.set(this, {
+    h.set(this, {
       php: e,
       monitor: r
     }), this.absoluteUrl = e.absoluteUrl, this.documentRoot = e.documentRoot;
@@ -1260,7 +1261,7 @@ class Te {
     return h.get(this).php.internalUrlToPath(e);
   }
   async onDownloadProgress(e) {
-    h.get(this).monitor?.addEventListener("progress", e);
+    return h.get(this).monitor?.addEventListener("progress", e);
   }
   /** @inheritDoc */
   mv(e, r) {
@@ -1288,15 +1289,15 @@ class Te {
   }
   /** @inheritDoc @php-wasm/web!WebPHP.setPhpIniEntry */
   setPhpIniEntry(e, r) {
-    h.get(this).php.setPhpIniEntry(e, r);
+    return h.get(this).php.setPhpIniEntry(e, r);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.mkdir */
   mkdir(e) {
-    h.get(this).php.mkdir(e);
+    return h.get(this).php.mkdir(e);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.mkdirTree */
   mkdirTree(e) {
-    h.get(this).php.mkdirTree(e);
+    return h.get(this).php.mkdirTree(e);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.readFileAsText */
   readFileAsText(e) {
@@ -1308,11 +1309,11 @@ class Te {
   }
   /** @inheritDoc @php-wasm/web!WebPHP.writeFile */
   writeFile(e, r) {
-    h.get(this).php.writeFile(e, r);
+    return h.get(this).php.writeFile(e, r);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.unlink */
   unlink(e) {
-    h.get(this).php.unlink(e);
+    return h.get(this).php.unlink(e);
   }
   /** @inheritDoc @php-wasm/web!WebPHP.listFiles */
   listFiles(e) {
@@ -1338,22 +1339,22 @@ async function Ce(t, e, r, n) {
   const s = navigator.serviceWorker;
   if (!s)
     throw new Error("Service workers are not supported in this browser.");
-  const a = await s.getRegistrations();
-  if (a.length > 0) {
+  const l = await s.getRegistrations();
+  if (l.length > 0) {
     const i = await ve();
     if (n !== i) {
       console.debug(
         `[window] Reloading the currently registered Service Worker (expected version: ${n}, registered version: ${i})`
       );
-      for (const o of a) {
-        let l = !1;
+      for (const o of l) {
+        let a = !1;
         try {
           await o.update();
         } catch {
-          l = !0;
+          a = !0;
         }
         const u = o.waiting || o.installing;
-        u && !l && (i !== null ? u.postMessage("skip-waiting") : l = !0), l && (await o.unregister(), window.location.reload());
+        u && !a && (i !== null ? u.postMessage("skip-waiting") : a = !0), a && (await o.unregister(), window.location.reload());
       }
     }
   } else
@@ -1367,7 +1368,7 @@ async function Ce(t, e, r, n) {
     async function(o) {
       if (console.debug("Message from ServiceWorker", o), e && o.data.scope !== e)
         return;
-      const l = o.data.args || [], u = o.data.method, d = await t[u](...l);
+      const a = o.data.args || [], u = o.data.method, d = await t[u](...a);
       o.source.postMessage(Re(o.data.requestId, d));
     }
   ), s.startMessages();

package/index.d.ts

@@ -3,11 +3,19 @@
 import * as Comlink from 'comlink';
 import { Remote } from 'comlink';
 
-export type WithIsReady = {
-	/** Resolves to true when the remote API is ready to be used */
+export type WithAPIState = {
+	/**
+	 * Resolves to true when the remote API is ready for
+	 * Comlink communication, but not necessarily fully initialized yet.
+	 */
+	isConnected: () => Promise<void>;
+	/**
+	 * Resolves to true when the remote API is declares it's
+	 * fully loaded and ready to be used.
+	 */
 	isReady: () => Promise<void>;
 };
-export type RemoteAPI<T> = Comlink.Remote<T & WithIsReady>;
+export type RemoteAPI<T> = Comlink.Remote<T & WithAPIState>;
 export declare function consumeAPI<APIType>(remote: Worker | Window): RemoteAPI<APIType>;
 export type PublicAPI<Methods, PipedAPI = unknown> = RemoteAPI<Methods & PipedAPI>;
 export declare function exposeAPI<Methods, PipedAPI>(apiMethods?: Methods, pipedApi?: PipedAPI): [
@@ -576,11 +584,6 @@ export declare class WebPHP extends BasePHP {
  * A PHP client that can be used to run PHP code in the browser.
  */
 export declare class WebPHPEndpoint implements IsomorphicLocalPHP {
-	/**
-	 * A dummy promise that resolves immediately.
-	 * Used to assert that the PHPClient is ready for communication.
-	 */
-	connected: Promise<void>;
 	/** @inheritDoc */
 	absoluteUrl: string;
 	/** @inheritDoc */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/web",
-	"version": "0.1.32",
+	"version": "0.1.34",
 	"description": "PHP.wasm for the web",
 	"repository": {
 		"type": "git",
@@ -29,5 +29,5 @@
 	"type": "module",
 	"main": "index.js",
 	"types": "index.d.ts",
-	"gitHead": "868bafca7e77ad31e30c1500a0d4da8b1c2314cc"
+	"gitHead": "8c0a6a74f00bbf4bead78d49845dcdd79b02edd6"
 }