@php-wasm/web 0.6.5 → 0.6.7

package/index.d.ts

@@ -16,7 +16,7 @@ export type WithAPIState = {
 	isReady: () => Promise<void>;
 };
 export type RemoteAPI<T> = Comlink.Remote<T> & WithAPIState;
-export declare function consumeAPI<APIType>(remote: Worker | Window): RemoteAPI<APIType>;
+export declare function consumeAPI<APIType>(remote: Worker | Window, context?: undefined | EventTarget): RemoteAPI<APIType>;
 export type PublicAPI<Methods, PipedAPI = unknown> = RemoteAPI<Methods & PipedAPI>;
 export declare function exposeAPI<Methods, PipedAPI>(apiMethods?: Methods, pipedApi?: PipedAPI): [
 	() => void,

package/index.js

@@ -8,56 +8,66 @@ var c = (e, t, r) => (K(e, t, "read from private field"), r ? r.call(e) : t.get(
   t instanceof WeakSet ? t.add(e) : t.set(e, 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);
-if (typeof File > "u") {
-  class e extends Blob {
-    constructor(r, s, n) {
-      super(r);
-      let o;
-      n != null && n.lastModified && (o = /* @__PURE__ */ new Date()), (!o || isNaN(o.getFullYear())) && (o = /* @__PURE__ */ new Date()), this.lastModifiedDate = o, this.lastModified = o.getMilliseconds(), this.name = s || "";
+const currentJsRuntime$1 = function() {
+  var e;
+  return typeof process < "u" && ((e = process.release) == null ? void 0 : e.name) === "node" ? "NODE" : typeof window < "u" ? "WEB" : (
+    // @ts-ignore
+    typeof WorkerGlobalScope < "u" && // @ts-ignore
+    self instanceof WorkerGlobalScope ? "WORKER" : "NODE"
+  );
+}();
+if (currentJsRuntime$1 === "NODE") {
+  let e = function(r) {
+    return new Promise(function(s, n) {
+      r.onload = r.onerror = function(o) {
+        r.onload = r.onerror = null, o.type === "load" ? s(r.result) : n(new Error("Failed to read the blob/file"));
+      };
+    });
+  }, t = function() {
+    const r = new Uint8Array([1, 2, 3, 4]), n = new File([r], "test").stream();
+    try {
+      return n.getReader({ mode: "byob" }), !0;
+    } catch {
+      return !1;
     }
-  }
-  global.File = e;
-}
-function asPromise(e) {
-  return new Promise(function(t, r) {
-    e.onload = e.onerror = function(s) {
-      e.onload = e.onerror = null, s.type === "load" ? t(e.result) : r(new Error("Failed to read the blob/file"));
-    };
-  });
-}
-typeof Blob.prototype.arrayBuffer > "u" && (Blob.prototype.arrayBuffer = function() {
-  const t = new FileReader();
-  return t.readAsArrayBuffer(this), asPromise(t);
-});
-typeof Blob.prototype.text > "u" && (Blob.prototype.text = function() {
-  const t = new FileReader();
-  return t.readAsText(this), asPromise(t);
-});
-function isByobSupported() {
-  const e = new Uint8Array([1, 2, 3, 4]), r = new File([e], "test").stream();
-  try {
-    return r.getReader({ mode: "byob" }), !0;
-  } catch {
-    return !1;
-  }
-}
-(typeof Blob.prototype.stream > "u" || !isByobSupported()) && (Blob.prototype.stream = function() {
-  let e = 0;
-  const t = this;
-  return new ReadableStream({
-    type: "bytes",
-    // 0.5 MB seems like a reasonable chunk size, let's adjust
-    // this if needed.
-    autoAllocateChunkSize: 512 * 1024,
-    async pull(r) {
-      const s = r.byobRequest.view, o = await t.slice(e, e + s.byteLength).arrayBuffer(), i = new Uint8Array(o);
-      new Uint8Array(s.buffer).set(i);
-      const a = i.byteLength;
-      r.byobRequest.respond(a), e += a, e >= t.size && r.close();
+  };
+  if (typeof File > "u") {
+    class r extends Blob {
+      constructor(n, o, i) {
+        super(n);
+        let a;
+        i != null && i.lastModified && (a = /* @__PURE__ */ new Date()), (!a || isNaN(a.getFullYear())) && (a = /* @__PURE__ */ new Date()), this.lastModifiedDate = a, this.lastModified = a.getMilliseconds(), this.name = o || "";
+      }
     }
+    global.File = r;
+  }
+  typeof Blob.prototype.arrayBuffer > "u" && (Blob.prototype.arrayBuffer = function() {
+    const s = new FileReader();
+    return s.readAsArrayBuffer(this), e(s);
+  }), typeof Blob.prototype.text > "u" && (Blob.prototype.text = function() {
+    const s = new FileReader();
+    return s.readAsText(this), e(s);
+  }), (typeof Blob.prototype.stream > "u" || !t()) && (Blob.prototype.stream = function() {
+    let r = 0;
+    const s = this;
+    return new ReadableStream({
+      type: "bytes",
+      // 0.5 MB seems like a reasonable chunk size, let's adjust
+      // this if needed.
+      autoAllocateChunkSize: 512 * 1024,
+      async pull(n) {
+        const o = n.byobRequest.view, a = await s.slice(
+          r,
+          r + o.byteLength
+        ).arrayBuffer(), l = new Uint8Array(a);
+        new Uint8Array(o.buffer).set(l);
+        const u = l.byteLength;
+        n.byobRequest.respond(u), r += u, r >= s.size && n.close();
+      }
+    });
   });
-});
-if (typeof CustomEvent > "u") {
+}
+if (currentJsRuntime$1 === "NODE" && typeof CustomEvent > "u") {
   class e extends Event {
     constructor(r, s = {}) {
       super(r, s), this.detail = s.detail;
@@ -533,7 +543,7 @@ function fileToUint8Array(e) {
     }, r.readAsArrayBuffer(e);
   });
 }
-var g, H, L, R, k, y, C, S, N, Z, U, X, O, ee;
+var g, H, N, R, k, y, C, S, L, Z, O, X, U, ee;
 class PHPRequestHandler {
   /**
    * @param  php    - The PHP instance.
@@ -546,7 +556,7 @@ class PHPRequestHandler {
      * @param  fsPath - Absolute path of the static file to serve.
      * @returns The response.
      */
-    d(this, N);
+    d(this, L);
     /**
      * Runs the requested PHP file with all the request and $_SERVER
      * superglobals populated.
@@ -554,7 +564,7 @@ class PHPRequestHandler {
      * @param  request - The request.
      * @returns The response.
      */
-    d(this, U);
+    d(this, O);
     /**
      * Resolve the requested path to the filesystem path of the requested PHP file.
      *
@@ -564,10 +574,10 @@ class PHPRequestHandler {
      * @throws {Error} If the requested path doesn't exist.
      * @returns The resolved filesystem path.
      */
-    d(this, O);
+    d(this, U);
     d(this, g, void 0);
     d(this, H, void 0);
-    d(this, L, void 0);
+    d(this, N, void 0);
     d(this, R, void 0);
     d(this, k, void 0);
     d(this, y, void 0);
@@ -580,10 +590,10 @@ class PHPRequestHandler {
     } = r;
     this.php = t, p(this, g, s);
     const o = new URL(n);
-    p(this, L, o.hostname), p(this, R, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), p(this, H, (o.protocol || "").replace(":", ""));
+    p(this, N, o.hostname), p(this, R, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), p(this, H, (o.protocol || "").replace(":", ""));
     const i = c(this, R) !== 443 && c(this, R) !== 80;
     p(this, k, [
-      c(this, L),
+      c(this, N),
       i ? `:${c(this, R)}` : ""
     ].join("")), p(this, y, o.pathname.replace(/\/+$/, "")), p(this, C, [
       `${c(this, H)}://`,
@@ -620,10 +630,10 @@ class PHPRequestHandler {
       s.pathname,
       c(this, y)
     ), o = `${c(this, g)}${n}`;
-    return seemsLikeAPHPRequestHandlerPath(o) ? await f(this, U, X).call(this, t, s) : f(this, N, 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(), L = new WeakMap(), R = new WeakMap(), k = new WeakMap(), y = new WeakMap(), C = new WeakMap(), S = new WeakMap(), N = new WeakSet(), Z = function(t) {
+g = new WeakMap(), H = new WeakMap(), N = new WeakMap(), R = 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,
@@ -648,7 +658,7 @@ g = new WeakMap(), H = new WeakMap(), L = new WeakMap(), R = new WeakMap(), k =
     },
     r
   );
-}, U = new WeakSet(), X = async function(t, r) {
+}, O = new WeakSet(), X = async function(t, r) {
   var n, o;
   if (c(this, S).running > 0 && ((n = t.headers) == null ? void 0 : n["x-request-issuer"]) === "php")
     return console.warn(
@@ -685,7 +695,7 @@ g = new WeakMap(), H = new WeakMap(), L = new WeakMap(), R = new WeakMap(), k =
           ).pathname;
         } catch {
         }
-      u = f(this, O, ee).call(this, h);
+      u = f(this, U, ee).call(this, h);
     } catch {
       return new PHPResponse(
         404,
@@ -707,7 +717,7 @@ g = new WeakMap(), H = new WeakMap(), L = new WeakMap(), R = new WeakMap(), k =
   } finally {
     s();
   }
-}, O = new WeakSet(), ee = function(t) {
+}, U = new WeakSet(), ee = function(t) {
   let r = removePathPrefix(t, c(this, y));
   r.includes(".php") ? r = r.split(".php")[0] + ".php" : this.php.isDir(`${c(this, g)}${r}`) ? (r.endsWith("/") || (r = `${r}/`), r = `${r}index.php`) : r = "/index.php";
   const s = `${c(this, g)}${r}`;
@@ -909,7 +919,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, B, te, W, re, q, se, D, ne, $, ie, z, oe, j, ae, G, le, V, ce, Q, ue, Y, de, J, he;
+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;
 class BasePHP {
   /**
    * Initializes a PHP runtime.
@@ -919,8 +929,8 @@ class BasePHP {
    * @param  serverOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(e, t) {
-    d(this, B);
     d(this, W);
+    d(this, B);
     d(this, q);
     d(this, D);
     d(this, $);
@@ -928,9 +938,9 @@ class BasePHP {
     d(this, j);
     d(this, G);
     d(this, V);
+    d(this, J);
     d(this, Q);
     d(this, Y);
-    d(this, J);
     d(this, x, void 0);
     d(this, F, void 0);
     d(this, A, void 0);
@@ -1044,17 +1054,17 @@ class BasePHP {
     const t = await this.semaphore.acquire();
     let r;
     try {
-      if (c(this, w) || (f(this, B, te).call(this), p(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.`
         );
       f(this, G, le).call(this, e.scriptPath || ""), f(this, q, 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, Y, de).call(this, " ?>" + e.code), f(this, V, ce).call(this);
+      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, Q, ue).call(this, a, o[a]);
-      const i = await f(this, J, he).call(this);
+        f(this, J, ue).call(this, a, o[a]);
+      const i = await f(this, Y, he).call(this);
       if (e.throwOnError && i.exitCode !== 0) {
         const a = {
           stdout: i.text,
@@ -1190,7 +1200,7 @@ class BasePHP {
     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(), B = new WeakSet(), te = function() {
+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() {
   if (this.setPhpIniEntry("auto_prepend_file", "/internal/consts.php"), this.fileExists("/internal/consts.php") || this.writeFile(
     "/internal/consts.php",
     `<?php
@@ -1215,7 +1225,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
     );
   }
   this[__private__dont__use].ccall("php_wasm_init", null, [], []);
-}, W = new WeakSet(), re = function() {
+}, B = new WeakSet(), re = function() {
   const e = "/internal/headers.json";
   if (!this.fileExists(e))
     throw new Error(
@@ -1334,21 +1344,21 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
       [STRING, STRING],
       [e, c(this, v)[e]]
     );
-}, Q = new WeakSet(), ue = function(e, t) {
+}, J = new WeakSet(), ue = function(e, t) {
   this[__private__dont__use].ccall(
     "wasm_add_ENV_entry",
     null,
     [STRING, STRING],
     [e, t]
   );
-}, Y = new WeakSet(), de = function(e) {
+}, Q = new WeakSet(), de = function(e) {
   this[__private__dont__use].ccall(
     "wasm_set_php_code",
     null,
     [STRING],
     [e]
   );
-}, J = new WeakSet(), he = async function() {
+}, Y = new WeakSet(), he = async function() {
   var n;
   let e, t;
   try {
@@ -1384,7 +1394,7 @@ x = new WeakMap(), F = new WeakMap(), A = new WeakMap(), w = new WeakMap(), E =
   } finally {
     (n = c(this, E)) == null || n.removeEventListener("error", t), p(this, v, {});
   }
-  const { headers: r, httpStatusCode: s } = f(this, W, re).call(this);
+  const { headers: r, httpStatusCode: s } = f(this, B, re).call(this);
   return new PHPResponse(
     s,
     r,
@@ -1691,18 +1701,18 @@ function requestResponseMessage(e, t, r) {
 function generateUUID() {
   return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
 }
-function consumeAPI(e) {
+function consumeAPI(e, t = void 0) {
   setupTransferHandlers();
-  const t = e instanceof Worker ? e : windowEndpoint(e), r = wrap(t), s = proxyClone(r);
-  return new Proxy(s, {
-    get: (n, o) => o === "isConnected" ? async () => {
-      for (let i = 0; i < 10; i++)
+  const r = e instanceof Worker ? e : windowEndpoint(e, t), s = wrap(r), n = proxyClone(s);
+  return new Proxy(n, {
+    get: (o, i) => i === "isConnected" ? async () => {
+      for (; ; )
         try {
-          await runWithTimeout(r.isConnected(), 200);
+          await runWithTimeout(s.isConnected(), 200);
           break;
         } catch {
         }
-    } : r[o]
+    } : s[i]
   });
 }
 async function runWithTimeout(e, t) {

package/package.json

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