@php-wasm/web 0.9.44 → 0.9.46

package/index.js

@@ -1,47 +1,47 @@
-import { PHPResponse as C, LatestSupportedPHPVersion as R, loadPHPRuntime as L, FSHelpers as w, __private__dont__use as g } from "@php-wasm/universal";
-import * as d from "comlink";
-import { PhpWasmError as h, Semaphore as O, joinPaths as T } from "@php-wasm/util";
-import { responseTo as S } from "@php-wasm/web-service-worker";
-import { logger as m } from "@php-wasm/logger";
-import { journalFSEvents as z } from "@php-wasm/fs-journal";
-function N(r, t = void 0) {
-  W();
-  const e = r instanceof Worker ? r : d.windowEndpoint(r, t), a = d.wrap(e), n = y(a);
-  return new Proxy(n, {
+import { PHPResponse as D, LatestSupportedPHPVersion as R, loadPHPRuntime as L, FSHelpers as p, __private__dont__use as P } from "@php-wasm/universal";
+import * as f from "comlink";
+import { PhpWasmError as y, Semaphore as z, joinPaths as T } from "@php-wasm/util";
+import { responseTo as M } from "@php-wasm/web-service-worker";
+import { logger as h } from "@php-wasm/logger";
+import { journalFSEvents as O } from "@php-wasm/fs-journal";
+function Q(r, t = void 0) {
+  v();
+  const e = r instanceof Worker ? r : f.windowEndpoint(r, t), n = f.wrap(e), a = g(n);
+  return new Proxy(a, {
     get: (i, s) => s === "isConnected" ? async () => {
       for (; ; )
         try {
-          await D(a.isConnected(), 200);
+          await A(n.isConnected(), 200);
           break;
         } catch {
         }
-    } : a[s]
+    } : n[s]
   });
 }
-async function D(r, t) {
-  return new Promise((e, a) => {
-    setTimeout(a, t), r.then(e);
+async function A(r, t) {
+  return new Promise((e, n) => {
+    setTimeout(n, t), r.then(e);
   });
 }
-function G(r, t) {
-  W();
+function X(r, t) {
+  v();
   const e = Promise.resolve();
-  let a, n;
-  const i = new Promise((o, u) => {
-    a = o, n = u;
-  }), s = y(r), c = new Proxy(s, {
-    get: (o, u) => u === "isConnected" ? () => e : u === "isReady" ? () => i : u in o ? o[u] : t == null ? void 0 : t[u]
+  let n, a;
+  const i = new Promise((c, u) => {
+    n = c, a = u;
+  }), s = g(r), o = new Proxy(s, {
+    get: (c, u) => u === "isConnected" ? () => e : u === "isReady" ? () => i : u in c ? c[u] : t == null ? void 0 : t[u]
   });
-  return d.expose(
-    c,
-    typeof window < "u" ? d.windowEndpoint(self.parent) : void 0
-  ), [a, n, c];
+  return f.expose(
+    o,
+    typeof window < "u" ? f.windowEndpoint(self.parent) : void 0
+  ), [n, a, o];
 }
-let P = !1;
-function W() {
-  if (P)
+let E = !1;
+function v() {
+  if (E)
     return;
-  P = !0, d.transferHandlers.set("EVENT", {
+  E = !0, f.transferHandlers.set("EVENT", {
     canHandle: (e) => e instanceof CustomEvent,
     serialize: (e) => [
       {
@@ -50,49 +50,49 @@ function W() {
       []
     ],
     deserialize: (e) => e
-  }), d.transferHandlers.set("FUNCTION", {
+  }), f.transferHandlers.set("FUNCTION", {
     canHandle: (e) => typeof e == "function",
     serialize(e) {
-      const { port1: a, port2: n } = new MessageChannel();
-      return d.expose(e, a), [n, [n]];
+      const { port1: n, port2: a } = new MessageChannel();
+      return f.expose(e, n), [a, [a]];
     },
     deserialize(e) {
-      return e.start(), d.wrap(e);
+      return e.start(), f.wrap(e);
     }
-  }), d.transferHandlers.set("PHPResponse", {
+  }), f.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(), []];
     },
     deserialize(e) {
-      return C.fromRawData(e);
+      return D.fromRawData(e);
     }
   });
-  const r = d.transferHandlers.get("throw"), t = r == null ? void 0 : r.serialize;
+  const r = f.transferHandlers.get("throw"), t = r == null ? void 0 : r.serialize;
   r.serialize = ({ value: e }) => {
-    const a = t({ value: e });
-    return e.response && (a[0].value.response = e.response), e.source && (a[0].value.source = e.source), a;
+    const n = t({ value: e });
+    return e.response && (n[0].value.response = e.response), e.source && (n[0].value.source = e.source), n;
   };
 }
-function y(r) {
+function g(r) {
   return new Proxy(r, {
     get(t, e) {
       switch (typeof t[e]) {
         case "function":
-          return (...a) => t[e](...a);
+          return (...n) => t[e](...n);
         case "object":
-          return t[e] === null ? t[e] : y(t[e]);
+          return t[e] === null ? t[e] : g(t[e]);
         case "undefined":
         case "number":
         case "string":
           return t[e];
         default:
-          return d.proxy(t[e]);
+          return f.proxy(t[e]);
       }
     }
   });
 }
-async function M(r = R, t = "light") {
+async function I(r = R, t = "light") {
   if (t === "kitchen-sink")
     switch (r) {
       case "8.3":
@@ -137,7 +137,7 @@ async function M(r = R, t = "light") {
     }
   throw new Error(`Unsupported PHP version ${r}`);
 }
-const A = () => ({
+const _ = () => ({
   websocket: {
     decorator: (r) => class extends r {
       constructor() {
@@ -152,168 +152,199 @@ const A = () => ({
     }
   }
 });
-async function Q(r, t = {}) {
-  var n;
-  const e = t.loadAllExtensions ? "kitchen-sink" : "light", a = await M(r, e);
-  return (n = t.onPhpLoaderModuleLoaded) == null || n.call(t, a), await L(a, {
+async function Z(r, t = {}) {
+  var a;
+  const e = t.loadAllExtensions ? "kitchen-sink" : "light", n = await I(r, e);
+  return (a = t.onPhpLoaderModuleLoaded) == null || a.call(t, n), await L(n, {
     ...t.emscriptenOptions || {},
-    ...A()
+    ..._()
   });
 }
 let b;
-const I = new Promise((r) => {
+const $ = new Promise((r) => {
   b = r;
 });
-function X(r) {
+function ee(r) {
   if (!r)
-    throw new h("PHP API client must be a valid client object.");
+    throw new y("PHP API client must be a valid client object.");
   b(r);
 }
-async function Y(r, t) {
-  const e = navigator.serviceWorker;
-  if (!e)
-    throw window.isSecureContext ? new h(
+async function te(r) {
+  const t = navigator.serviceWorker;
+  if (!t)
+    throw window.isSecureContext ? new y(
       "Service workers are not supported in your browser."
-    ) : new h(
+    ) : new y(
       "WordPress Playground uses service workers and may only work on HTTPS and http://localhost/ sites, but the current site is neither."
     );
-  const a = await e.register(t, {
+  const e = await t.register(r, {
     type: "module",
     // Always bypass HTTP cache when fetching the new Service Worker script:
     updateViaCache: "none"
   });
   try {
-    await a.update();
+    await e.update();
   } catch (n) {
-    m.error("Failed to update service worker.", n);
+    h.error("Failed to update service worker.", n);
   }
-  navigator.serviceWorker.addEventListener(
-    "message",
-    async function(i) {
-      if (r && i.data.scope !== r)
-        return;
-      const s = await I, c = i.data.args || [], o = i.data.method, u = await s[o](...c);
-      i.source.postMessage(S(i.data.requestId, u));
+  return {
+    /**
+     * Establishes the communication bridge between the service worker and the web worker
+     * where the current site is running.
+     *
+     * @param scope The string prefix used in the site URL served by the currently
+     *              running remote.html. E.g. for a prefix like `/scope:playground/`,
+     * 			    the scope would be `playground`. See the `@php-wasm/scopes` package
+     *              for more details.
+     */
+    startServiceWorkerCommunicationBridge({ scope: n }) {
+      navigator.serviceWorker.addEventListener(
+        "message",
+        async function(i) {
+          if (n && i.data.scope !== n)
+            return;
+          const s = await $, o = i.data.args || [], c = i.data.method, u = await s[c](...o);
+          i.source.postMessage(
+            M(i.data.requestId, u)
+          );
+        }
+      ), t.startMessages();
     }
-  ), e.startMessages();
+  };
 }
-function Z(r, t) {
+function re(r, t) {
   window.addEventListener("message", (e) => {
     e.source === r.contentWindow && (t && e.origin !== t || typeof e.data != "object" || e.data.type !== "relay" || window.parent.postMessage(e.data, "*"));
   }), window.addEventListener("message", (e) => {
-    var a;
-    e.source === window.parent && (typeof e.data != "object" || e.data.type !== "relay" || (a = r == null ? void 0 : r.contentWindow) == null || a.postMessage(e.data));
+    var n;
+    e.source === window.parent && (typeof e.data != "object" || e.data.type !== "relay" || (n = r == null ? void 0 : r.contentWindow) == null || n.postMessage(e.data));
   });
 }
-async function ee(r) {
+async function ne(r) {
   const t = new Worker(r, { type: "module" });
-  return new Promise((e, a) => {
+  return new Promise((e, n) => {
     t.onerror = (i) => {
       const s = new Error(
         `WebWorker failed to load at ${r}. ${i.message ? `Original error: ${i.message}` : ""}`
       );
-      s.filename = i.filename, a(s);
+      s.filename = i.filename, n(s);
     };
-    function n(i) {
-      i.data === "worker-script-started" && (e(t), t.removeEventListener("message", n));
+    function a(i) {
+      i.data === "worker-script-started" && (e(t), t.removeEventListener("message", a));
     }
-    t.addEventListener("message", n);
+    t.addEventListener("message", a);
   });
 }
-function te(r, t = { initialSync: {} }) {
+function ae(r, t = { initialSync: {} }) {
   return t = {
     ...t,
     initialSync: {
       ...t.initialSync,
       direction: t.initialSync.direction ?? "opfs-to-memfs"
     }
-  }, async function(e, a, n) {
-    return t.initialSync.direction === "opfs-to-memfs" ? (w.fileExists(a, n) && w.rmdir(a, n), w.mkdir(a, n), await _(a, r, n)) : await v(
-      a,
-      r,
+  }, async function(e, n, a) {
+    return t.initialSync.direction === "opfs-to-memfs" ? (p.fileExists(n, a) && p.rmdir(n, a), p.mkdir(n, a), await q(n, r, a)) : await x(
       n,
+      r,
+      a,
       t.initialSync.onProgress
-    ), q(e, r, n);
+    ), J(e, r, a);
   };
 }
-async function _(r, t, e) {
-  w.mkdir(r, e);
-  const a = new O({
+async function q(r, t, e) {
+  p.mkdir(r, e);
+  const n = new z({
     concurrency: 40
-  }), n = [], i = [
+  }), a = [], i = [
     [t, e]
   ];
   for (; i.length > 0; ) {
-    const [s, c] = i.pop();
-    for await (const o of s.values()) {
-      const u = a.run(async () => {
-        const l = T(
-          c,
-          o.name
+    const [s, o] = i.pop();
+    for await (const c of s.values()) {
+      const u = n.run(async () => {
+        const w = T(
+          o,
+          c.name
         );
-        if (o.kind === "directory") {
+        if (c.kind === "directory") {
           try {
-            r.mkdir(l);
-          } catch (f) {
-            if ((f == null ? void 0 : f.errno) !== 20)
-              throw m.error(f), f;
+            r.mkdir(w);
+          } catch (l) {
+            if ((l == null ? void 0 : l.errno) !== 20)
+              throw h.error(l), l;
           }
-          i.push([o, l]);
-        } else if (o.kind === "file") {
-          const f = await o.getFile(), p = new Uint8Array(await f.arrayBuffer());
+          i.push([c, w]);
+        } else if (c.kind === "file") {
+          const l = await c.getFile(), d = new Uint8Array(await l.arrayBuffer());
           r.createDataFile(
-            c,
-            o.name,
-            p,
+            o,
+            c.name,
+            d,
             !0,
             !0,
             !0
           );
         }
-        n.splice(n.indexOf(u), 1);
+        a.splice(a.indexOf(u), 1);
       });
-      n.push(u);
+      a.push(u);
     }
-    for (; i.length === 0 && n.length > 0; )
-      await Promise.any(n);
+    for (; i.length === 0 && a.length > 0; )
+      await Promise.any(a);
   }
 }
-async function v(r, t, e, a) {
+async function x(r, t, e, n) {
   r.mkdirTree(e);
-  const n = [];
-  async function i(o, u) {
+  const a = [];
+  async function i(w, l) {
     await Promise.all(
-      r.readdir(o).filter(
-        (l) => l !== "." && l !== ".."
-      ).map(async (l) => {
-        const f = T(o, l);
-        if (!$(r, f)) {
-          n.push([u, f, l]);
+      r.readdir(w).filter(
+        (d) => d !== "." && d !== ".."
+      ).map(async (d) => {
+        const m = T(w, d);
+        if (!F(r, m)) {
+          a.push([l, m, d]);
           return;
         }
-        const p = await u.getDirectoryHandle(l, {
+        const S = await l.getDirectoryHandle(d, {
           create: !0
         });
-        return await i(f, p);
+        return await i(m, S);
       })
     );
   }
   await i(e, t);
   let s = 0;
-  const c = n.map(
-    ([o, u, l]) => x(o, l, r, u).then(() => {
-      a == null || a({ files: ++s, total: n.length });
-    })
-  );
-  await Promise.all(c);
+  const o = n && B(n, 100), c = 100, u = /* @__PURE__ */ new Set();
+  try {
+    for (const [w, l, d] of a) {
+      const m = C(
+        w,
+        d,
+        r,
+        l
+      ).then(() => {
+        s++, u.delete(m), o == null || o({
+          files: s,
+          total: a.length
+        });
+      });
+      u.add(m), u.size >= c && (await Promise.race(u), o == null || o({
+        files: s,
+        total: a.length
+      }));
+    }
+  } finally {
+    await Promise.allSettled(u);
+  }
 }
-function $(r, t) {
+function F(r, t) {
   return r.isDir(r.lookupPath(t, { follow: !0 }).node.mode);
 }
-async function x(r, t, e, a) {
-  let n;
+async function C(r, t, e, n) {
+  let a;
   try {
-    n = e.readFile(a, {
+    a = e.readFile(n, {
       encoding: "binary"
     });
   } catch {
@@ -327,31 +358,31 @@ async function x(r, t, e, a) {
     await i.createSyncAccessHandle()
   );
   try {
-    await s.truncate(0), await s.write(n);
+    await s.truncate(0), await s.write(a);
   } finally {
     await s.close();
   }
 }
-function q(r, t, e) {
-  const a = [], n = z(r, e, (c) => {
-    a.push(c);
-  }), i = new J(r, t, e);
+function J(r, t, e) {
+  const n = [], a = O(r, e, (o) => {
+    n.push(o);
+  }), i = new j(r, t, e);
   async function s() {
-    const c = await r.semaphore.acquire();
+    const o = await r.semaphore.acquire();
     try {
-      for (; a.length; )
-        await i.processEntry(a.shift());
+      for (; n.length; )
+        await i.processEntry(n.shift());
     } finally {
-      c();
+      o();
     }
   }
   return r.addEventListener("request.end", s), function() {
-    n(), r.removeEventListener("request.end", s);
+    a(), r.removeEventListener("request.end", s);
   };
 }
-class J {
-  constructor(t, e, a) {
-    this.php = t, this.opfs = e, this.memfsRoot = k(a);
+class j {
+  constructor(t, e, n) {
+    this.php = t, this.opfs = e, this.memfsRoot = k(n);
   }
   toOpfsPath(t) {
     return k(t.substring(this.memfsRoot.length));
@@ -359,82 +390,95 @@ class J {
   async processEntry(t) {
     if (!t.path.startsWith(this.memfsRoot) || t.path === this.memfsRoot)
       return;
-    const e = this.toOpfsPath(t.path), a = await H(this.opfs, e), n = E(e);
-    if (n)
+    const e = this.toOpfsPath(t.path), n = await W(this.opfs, e), a = H(e);
+    if (a)
       try {
         if (t.operation === "DELETE")
           try {
-            await a.removeEntry(n, {
+            await n.removeEntry(a, {
               recursive: !0
             });
           } catch {
           }
         else if (t.operation === "CREATE")
-          t.nodeType === "directory" ? await a.getDirectoryHandle(n, {
+          t.nodeType === "directory" ? await n.getDirectoryHandle(a, {
             create: !0
-          }) : await a.getFileHandle(n, {
+          }) : await n.getFileHandle(a, {
             create: !0
           });
         else if (t.operation === "WRITE")
-          await x(
-            a,
+          await C(
             n,
-            this.php[g].FS,
+            a,
+            this.php[P].FS,
             t.path
           );
         else if (t.operation === "RENAME" && t.toPath.startsWith(this.memfsRoot)) {
-          const i = this.toOpfsPath(t.toPath), s = await H(
+          const i = this.toOpfsPath(t.toPath), s = await W(
             this.opfs,
             i
-          ), c = E(i);
+          ), o = H(i);
           if (t.nodeType === "directory") {
-            const o = await s.getDirectoryHandle(
-              n,
+            const c = await s.getDirectoryHandle(
+              a,
               {
                 create: !0
               }
             );
-            await v(
-              this.php[g].FS,
-              o,
+            await x(
+              this.php[P].FS,
+              c,
               t.toPath
-            ), await a.removeEntry(n, {
+            ), await n.removeEntry(a, {
               recursive: !0
             });
           } else
-            (await a.getFileHandle(n)).move(s, c);
+            (await n.getFileHandle(a)).move(s, o);
         }
       } catch (i) {
-        throw m.log({ entry: t, name: n }), m.error(i), i;
+        throw h.log({ entry: t, name: a }), h.error(i), i;
       }
   }
 }
 function k(r) {
   return r.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
-function E(r) {
+function H(r) {
   return r.substring(r.lastIndexOf("/") + 1);
 }
-async function H(r, t) {
+async function W(r, t) {
   const e = t.replace(/^\/+|\/+$/g, "").replace(/\/+/, "/");
   if (!e)
     return r;
-  const a = e.split("/");
-  let n = r;
-  for (let i = 0; i < a.length - 1; i++) {
-    const s = a[i];
-    n = await n.getDirectoryHandle(s, { create: !0 });
+  const n = e.split("/");
+  let a = r;
+  for (let i = 0; i < n.length - 1; i++) {
+    const s = n[i];
+    a = await a.getDirectoryHandle(s, { create: !0 });
   }
-  return n;
+  return a;
+}
+function B(r, t) {
+  let e = 0, n, a;
+  return function(...s) {
+    a = s;
+    const o = Date.now() - e;
+    if (n === void 0) {
+      const c = Math.max(0, t - o);
+      n = setTimeout(() => {
+        n = void 0, e = Date.now(), r(...a);
+      }, c);
+    }
+  };
 }
 export {
-  N as consumeAPI,
-  te as createDirectoryHandleMountHandler,
-  G as exposeAPI,
-  M as getPHPLoaderModule,
-  Q as loadWebRuntime,
-  Y as registerServiceWorker,
-  X as setPhpInstanceUsedByServiceWorker,
-  Z as setupPostMessageRelay,
-  ee as spawnPHPWorkerThread
+  Q as consumeAPI,
+  ae as createDirectoryHandleMountHandler,
+  X as exposeAPI,
+  I as getPHPLoaderModule,
+  Z as loadWebRuntime,
+  te as registerServiceWorker,
+  ee as setPhpInstanceUsedByServiceWorker,
+  re as setupPostMessageRelay,
+  ne as spawnPHPWorkerThread
 };

package/lib/register-service-worker.d.ts

@@ -15,10 +15,19 @@ export declare function setPhpInstanceUsedByServiceWorker(api: Client): void;
  * reload the registered worker if the app expects a different version
  * than the currently registered one.
  *
- * @param scope       The numeric value used in the path prefix of the site
- *                    this service worker is meant to serve. E.g. for a prefix
- *                    like `/scope:793/`, the scope would be `793`. See the
- *                    `@php-wasm/scopes` package for more details.
  * @param scriptUrl   The URL of the service worker script.
  */
-export declare function registerServiceWorker(scope: string, scriptUrl: string): Promise<void>;
+export declare function registerServiceWorker(scriptUrl: string): Promise<{
+    /**
+     * Establishes the communication bridge between the service worker and the web worker
+     * where the current site is running.
+     *
+     * @param scope The string prefix used in the site URL served by the currently
+     *              running remote.html. E.g. for a prefix like `/scope:playground/`,
+     * 			    the scope would be `playground`. See the `@php-wasm/scopes` package
+     *              for more details.
+     */
+    startServiceWorkerCommunicationBridge({ scope }: {
+        scope: string;
+    }): void;
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web",
-  "version": "0.9.44",
+  "version": "0.9.46",
   "description": "PHP.wasm for the web",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "9e9943cca00e850e6ce60f1aac4313831fc4a65c",
+  "gitHead": "fa393bcf69536e421246aa8e321e3e9af4b61c7b",
   "engines": {
     "node": ">=16.15.1",
     "npm": ">=8.11.0"
@@ -40,10 +40,10 @@
     "ini": "4.1.2",
     "ws": "8.18.0",
     "yargs": "17.7.2",
-    "@php-wasm/universal": "0.9.44",
-    "@php-wasm/util": "0.9.44",
-    "@php-wasm/logger": "0.9.44",
-    "@php-wasm/fs-journal": "0.9.44",
-    "@php-wasm/web-service-worker": "0.9.44"
+    "@php-wasm/universal": "0.9.46",
+    "@php-wasm/util": "0.9.46",
+    "@php-wasm/logger": "0.9.46",
+    "@php-wasm/fs-journal": "0.9.46",
+    "@php-wasm/web-service-worker": "0.9.46"
   }
 }