@php-wasm/web 0.9.46 → 1.0.1

package/index.js

@@ -1,35 +1,35 @@
-import { PHPResponse as D, LatestSupportedPHPVersion as R, loadPHPRuntime as L, FSHelpers as p, __private__dont__use as P } from "@php-wasm/universal";
+import { PHPResponse as R, LatestSupportedPHPVersion as b, loadPHPRuntime as z, FSHelpers as p, __private__dont__use as g } 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 { jspi as L } from "wasm-feature-detect";
+import { Semaphore as O, joinPaths as k } from "@php-wasm/util";
 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);
+import { journalFSEvents as v } from "@php-wasm/fs-journal";
+function B(r, t = void 0) {
+  W();
+  const e = r instanceof Worker ? r : f.windowEndpoint(r, t), n = f.wrap(e), a = y(n);
   return new Proxy(a, {
     get: (i, s) => s === "isConnected" ? async () => {
       for (; ; )
         try {
-          await A(n.isConnected(), 200);
+          await S(n.isConnected(), 200);
           break;
         } catch {
         }
     } : n[s]
   });
 }
-async function A(r, t) {
+async function S(r, t) {
   return new Promise((e, n) => {
     setTimeout(n, t), r.then(e);
   });
 }
-function X(r, t) {
-  v();
+function G(r, t) {
+  W();
   const e = Promise.resolve();
   let n, a;
   const i = new Promise((c, u) => {
     n = c, a = u;
-  }), s = g(r), o = new Proxy(s, {
+  }), s = y(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 f.expose(
@@ -37,11 +37,11 @@ function X(r, t) {
     typeof window < "u" ? f.windowEndpoint(self.parent) : void 0
   ), [n, a, o];
 }
-let E = !1;
-function v() {
-  if (E)
+let P = !1;
+function W() {
+  if (P)
     return;
-  E = !0, f.transferHandlers.set("EVENT", {
+  P = !0, f.transferHandlers.set("EVENT", {
     canHandle: (e) => e instanceof CustomEvent,
     serialize: (e) => [
       {
@@ -65,7 +65,7 @@ function v() {
       return [e.toRawData(), []];
     },
     deserialize(e) {
-      return D.fromRawData(e);
+      return R.fromRawData(e);
     }
   });
   const r = f.transferHandlers.get("throw"), t = r == null ? void 0 : r.serialize;
@@ -74,14 +74,14 @@ function v() {
     return e.response && (n[0].value.response = e.response), e.source && (n[0].value.source = e.source), n;
   };
 }
-function g(r) {
+function y(r) {
   return new Proxy(r, {
     get(t, e) {
       switch (typeof t[e]) {
         case "function":
           return (...n) => t[e](...n);
         case "object":
-          return t[e] === null ? t[e] : g(t[e]);
+          return t[e] === null ? t[e] : y(t[e]);
         case "undefined":
         case "number":
         case "string":
@@ -92,52 +92,52 @@ function g(r) {
     }
   });
 }
-async function I(r = R, t = "light") {
-  if (t === "kitchen-sink")
+async function M(r = b) {
+  if (await L())
     switch (r) {
       case "8.3":
-        return await import("./kitchen-sink/php_8_3.js");
+        return await import("./jspi/php_8_3.js");
       case "8.2":
-        return await import("./kitchen-sink/php_8_2.js");
+        return await import("./jspi/php_8_2.js");
       case "8.1":
-        return await import("./kitchen-sink/php_8_1.js");
+        return await import("./jspi/php_8_1.js");
       case "8.0":
-        return await import("./kitchen-sink/php_8_0.js");
+        return await import("./jspi/php_8_0.js");
       case "7.4":
-        return await import("./kitchen-sink/php_7_4.js");
+        return await import("./jspi/php_7_4.js");
       case "7.3":
-        return await import("./kitchen-sink/php_7_3.js");
+        return await import("./jspi/php_7_3.js");
       case "7.2":
-        return await import("./kitchen-sink/php_7_2.js");
+        return await import("./jspi/php_7_2.js");
       case "7.1":
-        return await import("./kitchen-sink/php_7_1.js");
+        return await import("./jspi/php_7_1.js");
       case "7.0":
-        return await import("./kitchen-sink/php_7_0.js");
+        return await import("./jspi/php_7_0.js");
     }
   else
     switch (r) {
       case "8.3":
-        return await import("./light/php_8_3.js");
+        return await import("./asyncify/php_8_3.js");
       case "8.2":
-        return await import("./light/php_8_2.js");
+        return await import("./asyncify/php_8_2.js");
       case "8.1":
-        return await import("./light/php_8_1.js");
+        return await import("./asyncify/php_8_1.js");
       case "8.0":
-        return await import("./light/php_8_0.js");
+        return await import("./asyncify/php_8_0.js");
       case "7.4":
-        return await import("./light/php_7_4.js");
+        return await import("./asyncify/php_7_4.js");
       case "7.3":
-        return await import("./light/php_7_3.js");
+        return await import("./asyncify/php_7_3.js");
       case "7.2":
-        return await import("./light/php_7_2.js");
+        return await import("./asyncify/php_7_2.js");
       case "7.1":
-        return await import("./light/php_7_1.js");
+        return await import("./asyncify/php_7_1.js");
       case "7.0":
-        return await import("./light/php_7_0.js");
+        return await import("./asyncify/php_7_0.js");
     }
   throw new Error(`Unsupported PHP version ${r}`);
 }
-const _ = () => ({
+const I = () => ({
   websocket: {
     decorator: (r) => class extends r {
       constructor() {
@@ -152,67 +152,15 @@ const _ = () => ({
     }
   }
 });
-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, {
+async function Q(r, t = {}) {
+  var n;
+  const e = await M(r);
+  return (n = t.onPhpLoaderModuleLoaded) == null || n.call(t, e), await z(e, {
     ...t.emscriptenOptions || {},
-    ..._()
+    ...I()
   });
 }
-let b;
-const $ = new Promise((r) => {
-  b = r;
-});
-function ee(r) {
-  if (!r)
-    throw new y("PHP API client must be a valid client object.");
-  b(r);
-}
-async function te(r) {
-  const t = navigator.serviceWorker;
-  if (!t)
-    throw window.isSecureContext ? new y(
-      "Service workers are not supported in your browser."
-    ) : new y(
-      "WordPress Playground uses service workers and may only work on HTTPS and http://localhost/ sites, but the current site is neither."
-    );
-  const e = await t.register(r, {
-    type: "module",
-    // Always bypass HTTP cache when fetching the new Service Worker script:
-    updateViaCache: "none"
-  });
-  try {
-    await e.update();
-  } catch (n) {
-    h.error("Failed to update service worker.", n);
-  }
-  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();
-    }
-  };
-}
-function re(r, t) {
+function X(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) => {
@@ -220,7 +168,7 @@ function re(r, t) {
     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 ne(r) {
+async function Y(r) {
   const t = new Worker(r, { type: "module" });
   return new Promise((e, n) => {
     t.onerror = (i) => {
@@ -235,7 +183,7 @@ async function ne(r) {
     t.addEventListener("message", a);
   });
 }
-function ae(r, t = { initialSync: {} }) {
+function Z(r, t = { initialSync: {} }) {
   return t = {
     ...t,
     initialSync: {
@@ -243,17 +191,17 @@ function ae(r, t = { initialSync: {} }) {
       direction: t.initialSync.direction ?? "opfs-to-memfs"
     }
   }, 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(
+    return t.initialSync.direction === "opfs-to-memfs" ? (p.fileExists(n, a) && p.rmdir(n, a), p.mkdir(n, a), await _(n, r, a)) : await x(
       n,
       r,
       a,
       t.initialSync.onProgress
-    ), J(e, r, a);
+    ), A(e, r, a);
   };
 }
-async function q(r, t, e) {
+async function _(r, t, e) {
   p.mkdir(r, e);
-  const n = new z({
+  const n = new O({
     concurrency: 40
   }), a = [], i = [
     [t, e]
@@ -262,7 +210,7 @@ async function q(r, t, e) {
     const [s, o] = i.pop();
     for await (const c of s.values()) {
       const u = n.run(async () => {
-        const w = T(
+        const w = k(
           o,
           c.name
         );
@@ -301,21 +249,21 @@ async function x(r, t, e, n) {
       r.readdir(w).filter(
         (d) => d !== "." && d !== ".."
       ).map(async (d) => {
-        const m = T(w, d);
-        if (!F(r, m)) {
+        const m = k(w, d);
+        if (!$(r, m)) {
           a.push([l, m, d]);
           return;
         }
-        const S = await l.getDirectoryHandle(d, {
+        const D = await l.getDirectoryHandle(d, {
           create: !0
         });
-        return await i(m, S);
+        return await i(m, D);
       })
     );
   }
   await i(e, t);
   let s = 0;
-  const o = n && B(n, 100), c = 100, u = /* @__PURE__ */ new Set();
+  const o = n && j(n, 100), c = 100, u = /* @__PURE__ */ new Set();
   try {
     for (const [w, l, d] of a) {
       const m = C(
@@ -338,7 +286,7 @@ async function x(r, t, e, n) {
     await Promise.allSettled(u);
   }
 }
-function F(r, t) {
+function $(r, t) {
   return r.isDir(r.lookupPath(t, { follow: !0 }).node.mode);
 }
 async function C(r, t, e, n) {
@@ -363,10 +311,10 @@ async function C(r, t, e, n) {
     await s.close();
   }
 }
-function J(r, t, e) {
-  const n = [], a = O(r, e, (o) => {
+function A(r, t, e) {
+  const n = [], a = v(r, e, (o) => {
     n.push(o);
-  }), i = new j(r, t, e);
+  }), i = new J(r, t, e);
   async function s() {
     const o = await r.semaphore.acquire();
     try {
@@ -380,17 +328,17 @@ function J(r, t, e) {
     a(), r.removeEventListener("request.end", s);
   };
 }
-class j {
+class J {
   constructor(t, e, n) {
-    this.php = t, this.opfs = e, this.memfsRoot = k(n);
+    this.php = t, this.opfs = e, this.memfsRoot = E(n);
   }
   toOpfsPath(t) {
-    return k(t.substring(this.memfsRoot.length));
+    return E(t.substring(this.memfsRoot.length));
   }
   async processEntry(t) {
     if (!t.path.startsWith(this.memfsRoot) || t.path === this.memfsRoot)
       return;
-    const e = this.toOpfsPath(t.path), n = await W(this.opfs, e), a = H(e);
+    const e = this.toOpfsPath(t.path), n = await T(this.opfs, e), a = H(e);
     if (a)
       try {
         if (t.operation === "DELETE")
@@ -410,11 +358,11 @@ class j {
           await C(
             n,
             a,
-            this.php[P].FS,
+            this.php[g].FS,
             t.path
           );
         else if (t.operation === "RENAME" && t.toPath.startsWith(this.memfsRoot)) {
-          const i = this.toOpfsPath(t.toPath), s = await W(
+          const i = this.toOpfsPath(t.toPath), s = await T(
             this.opfs,
             i
           ), o = H(i);
@@ -426,7 +374,7 @@ class j {
               }
             );
             await x(
-              this.php[P].FS,
+              this.php[g].FS,
               c,
               t.toPath
             ), await n.removeEntry(a, {
@@ -440,13 +388,13 @@ class j {
       }
   }
 }
-function k(r) {
+function E(r) {
   return r.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
 function H(r) {
   return r.substring(r.lastIndexOf("/") + 1);
 }
-async function W(r, t) {
+async function T(r, t) {
   const e = t.replace(/^\/+|\/+$/g, "").replace(/\/+/, "/");
   if (!e)
     return r;
@@ -458,7 +406,7 @@ async function W(r, t) {
   }
   return a;
 }
-function B(r, t) {
+function j(r, t) {
   let e = 0, n, a;
   return function(...s) {
     a = s;
@@ -472,13 +420,11 @@ function B(r, t) {
   };
 }
 export {
-  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
+  B as consumeAPI,
+  Z as createDirectoryHandleMountHandler,
+  G as exposeAPI,
+  M as getPHPLoaderModule,
+  Q as loadWebRuntime,
+  X as setupPostMessageRelay,
+  Y as spawnPHPWorkerThread
 };

package/lib/get-php-loader-module.d.ts

@@ -6,4 +6,4 @@ import { PHPLoaderModule, SupportedPHPVersion } from '@php-wasm/universal';
  * @param variant Internal. Do not use.
  * @returns The PHP loader module.
  */
-export declare function getPHPLoaderModule(version?: SupportedPHPVersion, variant?: 'light' | 'kitchen-sink'): Promise<PHPLoaderModule>;
+export declare function getPHPLoaderModule(version?: SupportedPHPVersion): Promise<PHPLoaderModule>;

package/lib/index.d.ts

@@ -3,7 +3,6 @@ export type { WithAPIState as WithIsReady } from './api';
 export type { LoaderOptions as PHPWebLoaderOptions } from './load-runtime';
 export { loadWebRuntime } from './load-runtime';
 export { getPHPLoaderModule } from './get-php-loader-module';
-export { registerServiceWorker, setPhpInstanceUsedByServiceWorker, } from './register-service-worker';
 export { setupPostMessageRelay } from './setup-post-message-relay';
 export { spawnPHPWorkerThread } from './worker-thread/spawn-php-worker-thread';
 export { createDirectoryHandleMountHandler } from './directory-handle-mount';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web",
-  "version": "0.9.46",
+  "version": "1.0.1",
   "description": "PHP.wasm for the web",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "fa393bcf69536e421246aa8e321e3e9af4b61c7b",
+  "gitHead": "55aa00a7ccb5b1b0996aa49d8b37a6ce67b055d4",
   "engines": {
     "node": ">=16.15.1",
     "npm": ">=8.11.0"
@@ -38,12 +38,12 @@
     "comlink": "^4.4.1",
     "express": "4.19.2",
     "ini": "4.1.2",
+    "wasm-feature-detect": "1.8.0",
     "ws": "8.18.0",
     "yargs": "17.7.2",
-    "@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"
+    "@php-wasm/universal": "1.0.1",
+    "@php-wasm/util": "1.0.1",
+    "@php-wasm/logger": "1.0.1",
+    "@php-wasm/fs-journal": "1.0.1"
   }
 }