@php-wasm/web 0.9.30 → 0.9.31

package/index.js

@@ -1,12 +1,12 @@
 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 M, joinPaths as T } from "@php-wasm/util";
-import { responseTo as O } from "@php-wasm/web-service-worker";
-import { logger as p } from "@php-wasm/logger";
+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 B(t, r = void 0) {
+function N(r, t = void 0) {
   W();
-  const e = t instanceof Worker ? t : d.windowEndpoint(t, r), a = d.wrap(e), n = y(a);
+  const e = r instanceof Worker ? r : d.windowEndpoint(r, t), a = d.wrap(e), n = y(a);
   return new Proxy(n, {
     get: (i, s) => s === "isConnected" ? async () => {
       for (; ; )
@@ -18,19 +18,19 @@ function B(t, r = void 0) {
     } : a[s]
   });
 }
-async function D(t, r) {
+async function D(r, t) {
   return new Promise((e, a) => {
-    setTimeout(a, r), t.then(e);
+    setTimeout(a, t), r.then(e);
   });
 }
-function G(t, r) {
+function G(r, t) {
   W();
   const e = Promise.resolve();
   let a, n;
   const i = new Promise((o, u) => {
     a = o, n = u;
-  }), s = y(t), c = new Proxy(s, {
-    get: (o, u) => u === "isConnected" ? () => e : u === "isReady" ? () => i : u in o ? o[u] : r == null ? void 0 : r[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]
   });
   return d.expose(
     c,
@@ -68,33 +68,33 @@ function W() {
       return C.fromRawData(e);
     }
   });
-  const t = d.transferHandlers.get("throw"), r = t == null ? void 0 : t.serialize;
-  t.serialize = ({ value: e }) => {
-    const a = r({ value: e });
+  const r = d.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;
   };
 }
-function y(t) {
-  return new Proxy(t, {
-    get(r, e) {
-      switch (typeof r[e]) {
+function y(r) {
+  return new Proxy(r, {
+    get(t, e) {
+      switch (typeof t[e]) {
         case "function":
-          return (...a) => r[e](...a);
+          return (...a) => t[e](...a);
         case "object":
-          return r[e] === null ? r[e] : y(r[e]);
+          return t[e] === null ? t[e] : y(t[e]);
         case "undefined":
         case "number":
         case "string":
-          return r[e];
+          return t[e];
         default:
-          return d.proxy(r[e]);
+          return d.proxy(t[e]);
       }
     }
   });
 }
-async function S(t = R, r = "light") {
-  if (r === "kitchen-sink")
-    switch (t) {
+async function M(r = R, t = "light") {
+  if (t === "kitchen-sink")
+    switch (r) {
       case "8.3":
         return await import("./kitchen-sink/php_8_3.js");
       case "8.2":
@@ -115,7 +115,7 @@ async function S(t = R, r = "light") {
         return await import("./kitchen-sink/php_7_0.js");
     }
   else
-    switch (t) {
+    switch (r) {
       case "8.3":
         return await import("./light/php_8_3.js");
       case "8.2":
@@ -135,11 +135,11 @@ async function S(t = R, r = "light") {
       case "7.0":
         return await import("./light/php_7_0.js");
     }
-  throw new Error(`Unsupported PHP version ${t}`);
+  throw new Error(`Unsupported PHP version ${r}`);
 }
 const A = () => ({
   websocket: {
-    decorator: (t) => class extends t {
+    decorator: (r) => class extends r {
       constructor() {
         try {
           super();
@@ -152,24 +152,24 @@ const A = () => ({
     }
   }
 });
-async function Q(t, r = {}) {
+async function Q(r, t = {}) {
   var n;
-  const e = r.loadAllExtensions ? "kitchen-sink" : "light", a = await S(t, e);
-  return (n = r.onPhpLoaderModuleLoaded) == null || n.call(r, a), await L(a, {
-    ...r.emscriptenOptions || {},
+  const e = t.loadAllExtensions ? "kitchen-sink" : "light", a = await M(r, e);
+  return (n = t.onPhpLoaderModuleLoaded) == null || n.call(t, a), await L(a, {
+    ...t.emscriptenOptions || {},
     ...A()
   });
 }
 let b;
-const I = new Promise((t) => {
-  b = t;
+const I = new Promise((r) => {
+  b = r;
 });
-function X(t) {
-  if (!t)
+function X(r) {
+  if (!r)
     throw new h("PHP API client must be a valid client object.");
-  b(t);
+  b(r);
 }
-async function Y(t, r) {
+async function Y(r, t) {
   const e = navigator.serviceWorker;
   if (!e)
     throw window.isSecureContext ? new h(
@@ -177,7 +177,7 @@ async function Y(t, r) {
     ) : new h(
       "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(r, {
+  const a = await e.register(t, {
     type: "module",
     // Always bypass HTTP cache when fetching the new Service Worker script:
     updateViaCache: "none"
@@ -185,66 +185,63 @@ async function Y(t, r) {
   try {
     await a.update();
   } catch (n) {
-    p.error("Failed to update service worker.", n);
+    m.error("Failed to update service worker.", n);
   }
   navigator.serviceWorker.addEventListener(
     "message",
     async function(i) {
-      if (t && i.data.scope !== t)
+      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(O(i.data.requestId, u));
+      i.source.postMessage(S(i.data.requestId, u));
     }
   ), e.startMessages();
 }
-function Z(t, r) {
+function Z(r, t) {
   window.addEventListener("message", (e) => {
-    e.source === t.contentWindow && (r && e.origin !== r || typeof e.data != "object" || e.data.type !== "relay" || window.parent.postMessage(e.data, "*"));
+    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 = t == null ? void 0 : t.contentWindow) == null || a.postMessage(e.data));
+    e.source === window.parent && (typeof e.data != "object" || e.data.type !== "relay" || (a = r == null ? void 0 : r.contentWindow) == null || a.postMessage(e.data));
   });
 }
-async function ee(t, r = {}) {
-  const e = new Worker(t, { type: "module" });
-  return new Promise((a, n) => {
-    e.onerror = (s) => {
-      const c = new Error(
-        `WebWorker failed to load at ${t}. ${s.message ? `Original error: ${s.message}` : ""}`
+async function ee(r) {
+  const t = new Worker(r, { type: "module" });
+  return new Promise((e, a) => {
+    t.onerror = (i) => {
+      const s = new Error(
+        `WebWorker failed to load at ${r}. ${i.message ? `Original error: ${i.message}` : ""}`
       );
-      c.filename = s.filename, n(c);
-    }, e.postMessage({
-      type: "startup-options",
-      startupOptions: r
-    });
-    function i(s) {
-      s.data === "worker-script-started" && (a(e), e.removeEventListener("message", i));
+      s.filename = i.filename, a(s);
+    };
+    function n(i) {
+      i.data === "worker-script-started" && (e(t), t.removeEventListener("message", n));
     }
-    e.addEventListener("message", i);
+    t.addEventListener("message", n);
   });
 }
-function te(t, r = { initialSync: {} }) {
-  return r = {
-    ...r,
+function te(r, t = { initialSync: {} }) {
+  return t = {
+    ...t,
     initialSync: {
-      ...r.initialSync,
-      direction: r.initialSync.direction ?? "opfs-to-memfs"
+      ...t.initialSync,
+      direction: t.initialSync.direction ?? "opfs-to-memfs"
     }
   }, async function(e, a, n) {
-    return r.initialSync.direction === "opfs-to-memfs" ? (w.fileExists(a, n) && w.rmdir(a, n), w.mkdir(a, n), await _(a, t, n)) : await v(
+    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,
-      t,
+      r,
       n,
-      r.initialSync.onProgress
-    ), q(e, t, n);
+      t.initialSync.onProgress
+    ), q(e, r, n);
   };
 }
-async function _(t, r, e) {
-  w.mkdir(t, e);
-  const a = new M({
+async function _(r, t, e) {
+  w.mkdir(r, e);
+  const a = new O({
     concurrency: 40
   }), n = [], i = [
-    [r, e]
+    [t, e]
   ];
   for (; i.length > 0; ) {
     const [s, c] = i.pop();
@@ -256,18 +253,18 @@ async function _(t, r, e) {
         );
         if (o.kind === "directory") {
           try {
-            t.mkdir(l);
+            r.mkdir(l);
           } catch (f) {
             if ((f == null ? void 0 : f.errno) !== 20)
-              throw p.error(f), f;
+              throw m.error(f), f;
           }
           i.push([o, l]);
         } else if (o.kind === "file") {
-          const f = await o.getFile(), m = new Uint8Array(await f.arrayBuffer());
-          t.createDataFile(
+          const f = await o.getFile(), p = new Uint8Array(await f.arrayBuffer());
+          r.createDataFile(
             c,
             o.name,
-            m,
+            p,
             !0,
             !0,
             !0
@@ -281,39 +278,39 @@ async function _(t, r, e) {
       await Promise.any(n);
   }
 }
-async function v(t, r, e, a) {
-  t.mkdirTree(e);
+async function v(r, t, e, a) {
+  r.mkdirTree(e);
   const n = [];
   async function i(o, u) {
     await Promise.all(
-      t.readdir(o).filter(
+      r.readdir(o).filter(
         (l) => l !== "." && l !== ".."
       ).map(async (l) => {
         const f = T(o, l);
-        if (!$(t, f)) {
+        if (!$(r, f)) {
           n.push([u, f, l]);
           return;
         }
-        const m = await u.getDirectoryHandle(l, {
+        const p = await u.getDirectoryHandle(l, {
           create: !0
         });
-        return await i(f, m);
+        return await i(f, p);
       })
     );
   }
-  await i(e, r);
+  await i(e, t);
   let s = 0;
   const c = n.map(
-    ([o, u, l]) => x(o, l, t, u).then(() => {
+    ([o, u, l]) => x(o, l, r, u).then(() => {
       a == null || a({ files: ++s, total: n.length });
     })
   );
   await Promise.all(c);
 }
-function $(t, r) {
-  return t.isDir(t.lookupPath(r, { follow: !0 }).node.mode);
+function $(r, t) {
+  return r.isDir(r.lookupPath(t, { follow: !0 }).node.mode);
 }
-async function x(t, r, e, a) {
+async function x(r, t, e, a) {
   let n;
   try {
     n = e.readFile(a, {
@@ -322,7 +319,7 @@ async function x(t, r, e, a) {
   } catch {
     return;
   }
-  const i = await t.getFileHandle(r, { create: !0 }), s = i.createWritable !== void 0 ? (
+  const i = await r.getFileHandle(t, { create: !0 }), s = i.createWritable !== void 0 ? (
     // Google Chrome, Firefox, probably more browsers
     await i.createWritable()
   ) : (
@@ -335,12 +332,12 @@ async function x(t, r, e, a) {
     await s.close();
   }
 }
-function q(t, r, e) {
-  const a = [], n = z(t, e, (c) => {
+function q(r, t, e) {
+  const a = [], n = z(r, e, (c) => {
     a.push(c);
-  }), i = new J(t, r, e);
+  }), i = new J(r, t, e);
   async function s() {
-    const c = await t.semaphore.acquire();
+    const c = await r.semaphore.acquire();
     try {
       for (; a.length; )
         await i.processEntry(a.shift());
@@ -348,49 +345,49 @@ function q(t, r, e) {
       c();
     }
   }
-  return t.addEventListener("request.end", s), function() {
-    n(), t.removeEventListener("request.end", s);
+  return r.addEventListener("request.end", s), function() {
+    n(), r.removeEventListener("request.end", s);
   };
 }
 class J {
-  constructor(r, e, a) {
-    this.php = r, this.opfs = e, this.memfsRoot = E(a);
+  constructor(t, e, a) {
+    this.php = t, this.opfs = e, this.memfsRoot = k(a);
   }
-  toOpfsPath(r) {
-    return E(r.substring(this.memfsRoot.length));
+  toOpfsPath(t) {
+    return k(t.substring(this.memfsRoot.length));
   }
-  async processEntry(r) {
-    if (!r.path.startsWith(this.memfsRoot) || r.path === this.memfsRoot)
+  async processEntry(t) {
+    if (!t.path.startsWith(this.memfsRoot) || t.path === this.memfsRoot)
       return;
-    const e = this.toOpfsPath(r.path), a = await H(this.opfs, e), n = k(e);
+    const e = this.toOpfsPath(t.path), a = await H(this.opfs, e), n = E(e);
     if (n)
       try {
-        if (r.operation === "DELETE")
+        if (t.operation === "DELETE")
           try {
             await a.removeEntry(n, {
               recursive: !0
             });
           } catch {
           }
-        else if (r.operation === "CREATE")
-          r.nodeType === "directory" ? await a.getDirectoryHandle(n, {
+        else if (t.operation === "CREATE")
+          t.nodeType === "directory" ? await a.getDirectoryHandle(n, {
             create: !0
           }) : await a.getFileHandle(n, {
             create: !0
           });
-        else if (r.operation === "WRITE")
+        else if (t.operation === "WRITE")
           await x(
             a,
             n,
             this.php[g].FS,
-            r.path
+            t.path
           );
-        else if (r.operation === "RENAME" && r.toPath.startsWith(this.memfsRoot)) {
-          const i = this.toOpfsPath(r.toPath), s = await H(
+        else if (t.operation === "RENAME" && t.toPath.startsWith(this.memfsRoot)) {
+          const i = this.toOpfsPath(t.toPath), s = await H(
             this.opfs,
             i
-          ), c = k(i);
-          if (r.nodeType === "directory") {
+          ), c = E(i);
+          if (t.nodeType === "directory") {
             const o = await s.getDirectoryHandle(
               n,
               {
@@ -400,7 +397,7 @@ class J {
             await v(
               this.php[g].FS,
               o,
-              r.toPath
+              t.toPath
             ), await a.removeEntry(n, {
               recursive: !0
             });
@@ -408,22 +405,22 @@ class J {
             (await a.getFileHandle(n)).move(s, c);
         }
       } catch (i) {
-        throw p.log({ entry: r, name: n }), p.error(i), i;
+        throw m.log({ entry: t, name: n }), m.error(i), i;
       }
   }
 }
-function E(t) {
-  return t.replace(/\/$/, "").replace(/\/\/+/g, "/");
+function k(r) {
+  return r.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
-function k(t) {
-  return t.substring(t.lastIndexOf("/") + 1);
+function E(r) {
+  return r.substring(r.lastIndexOf("/") + 1);
 }
-async function H(t, r) {
-  const e = r.replace(/^\/+|\/+$/g, "").replace(/\/+/, "/");
+async function H(r, t) {
+  const e = t.replace(/^\/+|\/+$/g, "").replace(/\/+/, "/");
   if (!e)
-    return t;
+    return r;
   const a = e.split("/");
-  let n = t;
+  let n = r;
   for (let i = 0; i < a.length - 1; i++) {
     const s = a[i];
     n = await n.getDirectoryHandle(s, { create: !0 });
@@ -431,13 +428,13 @@ async function H(t, r) {
   return n;
 }
 export {
-  B as consumeAPI,
+  N as consumeAPI,
   te as createDirectoryHandleMountHandler,
   G as exposeAPI,
-  S as getPHPLoaderModule,
+  M as getPHPLoaderModule,
   Q as loadWebRuntime,
   Y as registerServiceWorker,
-  X as setPhpApi,
+  X as setPhpInstanceUsedByServiceWorker,
   Z as setupPostMessageRelay,
   ee as spawnPHPWorkerThread
 };

package/lib/directory-handle-mount.d.ts

@@ -13,6 +13,13 @@ declare global {
         truncate(newSize: number): Promise<void>;
     }
 }
+export type MountDevice = {
+    type: 'opfs';
+    path: string;
+} | {
+    type: 'local-fs';
+    handle: FileSystemDirectoryHandle;
+};
 export interface MountOptions {
     initialSync: {
         direction?: 'opfs-to-memfs' | 'memfs-to-opfs';

package/lib/index.d.ts

@@ -3,8 +3,8 @@ 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, setPhpApi } from './register-service-worker';
+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';
-export type { MountOptions, SyncProgress, SyncProgressCallback, } from './directory-handle-mount';
+export type { MountDevice, MountOptions, SyncProgress, SyncProgressCallback, } from './directory-handle-mount';

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

@@ -9,7 +9,7 @@ export declare const phpApiPromise: Promise<Client>;
  * @param {Client} api The PHP API client.
  *
  */
-export declare function setPhpApi(api: Client): void;
+export declare function setPhpInstanceUsedByServiceWorker(api: Client): void;
 /**
  * Run this in the main application to register the service worker or
  * reload the registered worker if the app expects a different version

package/lib/worker-thread/spawn-php-worker-thread.d.ts

@@ -2,7 +2,6 @@
  * Spawns a new Worker Thread.
  *
  * @param  workerUrl The absolute URL of the worker script.
- * @param  config
  * @returns The spawned Worker Thread.
  */
-export declare function spawnPHPWorkerThread(workerUrl: string, startupOptions?: Record<string, string | string[]>): Promise<Worker>;
+export declare function spawnPHPWorkerThread(workerUrl: string): Promise<Worker>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web",
-  "version": "0.9.30",
+  "version": "0.9.31",
   "description": "PHP.wasm for the web",
   "repository": {
     "type": "git",
@@ -29,7 +29,7 @@
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
-  "gitHead": "8c1286b89eb1793445681bf801f64cbf12e15cf2",
+  "gitHead": "296845449383439f6304f0559eaacf14cef68989",
   "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.30",
-    "@php-wasm/util": "0.9.30",
-    "@php-wasm/logger": "0.9.30",
-    "@php-wasm/fs-journal": "0.9.30",
-    "@php-wasm/web-service-worker": "0.9.30"
+    "@php-wasm/universal": "0.9.31",
+    "@php-wasm/util": "0.9.31",
+    "@php-wasm/logger": "0.9.31",
+    "@php-wasm/fs-journal": "0.9.31",
+    "@php-wasm/web-service-worker": "0.9.31"
   }
 }