@php-wasm/universal 2.0.22 → 3.0.1

package/index.js

@@ -2,7 +2,7 @@ var W = (t) => {
   throw TypeError(t);
 };
 var O = (t, e, r) => e.has(t) || W("Cannot " + r);
-var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), _ = (t, e, r) => e.has(t) ? W("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), w = (t, e, r, s) => (O(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), m = (t, e, r) => (O(t, e, "access private method"), r);
+var u = (t, e, r) => (O(t, e, "read from private field"), r ? r.call(t) : e.get(t)), y = (t, e, r) => e.has(t) ? W("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(t) : e.set(t, r), w = (t, e, r, s) => (O(t, e, "write to private field"), s ? s.call(t, r) : e.set(t, r), r), m = (t, e, r) => (O(t, e, "access private method"), r);
 import "@php-wasm/node-polyfills";
 import { logger } from "@php-wasm/logger";
 import { dirname, joinPaths, Semaphore, createSpawnHandler, normalizePath, AcquireTimeoutError } from "@php-wasm/util";
@@ -907,7 +907,7 @@ class PHPExecutionFailureError extends Error {
   }
 }
 const PHP_INI_PATH = "/internal/shared/php.ini", AUTO_PREPEND_SCRIPT = "/internal/shared/auto_prepend_file.php", OPCACHE_FILE_FOLDER = "/internal/shared/opcache";
-var k, H, b, E, T, C, y, h, B, z, $, V, G, J, Y, K, L, X, U, j;
+var k, H, b, E, T, C, _, h, B, z, $, V, G, J, Y, K, L, X, U, j;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -917,14 +917,14 @@ class PHP {
    * @param  requestHandlerOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(t) {
-    _(this, h);
-    _(this, k);
-    _(this, H, !1);
-    _(this, b, null);
-    _(this, E, /* @__PURE__ */ new Map());
-    _(this, T, []);
-    _(this, C, {});
-    _(this, y, {
+    y(this, h);
+    y(this, k);
+    y(this, H, !1);
+    y(this, b, null);
+    y(this, E, /* @__PURE__ */ new Map());
+    y(this, T, []);
+    y(this, C, {});
+    y(this, _, {
       enabled: !1,
       recreateRuntime: () => 0,
       needsRotating: !1,
@@ -932,7 +932,7 @@ class PHP {
       requestsMade: 0
     });
     this.semaphore = new Semaphore({ concurrency: 1 }), t !== void 0 && this.initializeRuntime(t), this.addEventListener("request.error", (e) => {
-      e.source === "php-wasm" && (u(this, y).needsRotating = !0);
+      e.source === "php-wasm" && (u(this, _).needsRotating = !0);
     });
   }
   /**
@@ -1564,8 +1564,8 @@ class PHP {
    * or an internal crash.
    */
   enableRuntimeRotation(t) {
-    w(this, y, {
-      ...u(this, y),
+    w(this, _, {
+      ...u(this, _),
       enabled: !0,
       recreateRuntime: t.recreateRuntime,
       maxRequests: t.maxRequests ?? 400,
@@ -1573,36 +1573,34 @@ class PHP {
     });
   }
   async rotateRuntime() {
-    if (!u(this, y).enabled)
+    if (!u(this, _).enabled)
       throw new Error(
         "Runtime rotation is not enabled. Call enableRuntimeRotation() first."
       );
     await this.hotSwapPHPRuntime(
-      await u(this, y).recreateRuntime(),
-      u(this, y).cwd
-    ), u(this, y).requestsMade = 0, u(this, y).needsRotating = !1;
+      await u(this, _).recreateRuntime()
+    ), u(this, _).requestsMade = 0, u(this, _).needsRotating = !1;
   }
   /**
    * Hot-swaps the PHP runtime for a new one without
    * interrupting the operations of this PHP instance.
    *
    * @param runtime
-   * @param cwd. Internal, the VFS path to recreate in the new runtime.
-   *             This arg is temporary and will be removed once BasePHP
-   *             is fully decoupled from the request handler and
-   *             accepts a constructor-level cwd argument.
-   */
-  async hotSwapPHPRuntime(t, e) {
-    const r = this[__private__dont__use].FS, s = this[__private__dont__use].spawnProcess, n = [];
-    for (const [i, o] of Object.entries(u(this, C)))
-      n.push({ mountHandler: o.mountHandler, vfsPath: i }), await o.unmount();
+   */
+  async hotSwapPHPRuntime(t) {
+    const e = this[__private__dont__use].FS, r = this.listFiles("/").map((o) => `/${o}`), s = this[__private__dont__use].spawnProcess, n = [];
+    for (const [o, a] of Object.entries(u(this, C)))
+      n.push({ mountHandler: a.mountHandler, vfsPath: o }), await a.unmount();
     try {
       this.exit();
     } catch {
     }
-    this.initializeRuntime(t), s && (this[__private__dont__use].spawnProcess = s), u(this, k) && this.setSapiName(u(this, k)), copyFS(r, this[__private__dont__use].FS, "/internal"), e && copyFS(r, this[__private__dont__use].FS, e);
-    for (const { mountHandler: i, vfsPath: o } of n)
-      this.mkdir(o), await this.mount(o, i);
+    this.initializeRuntime(t), s && (this[__private__dont__use].spawnProcess = s), u(this, k) && this.setSapiName(u(this, k));
+    const i = this[__private__dont__use].FS;
+    for (const o of r)
+      o && o !== "/request" && copyMEMFSNodes(e, i, o);
+    for (const { mountHandler: o, vfsPath: a } of n)
+      this.mkdir(a), await this.mount(a, o);
   }
   /**
    * Mounts a filesystem to a given path in the PHP filesystem.
@@ -1640,7 +1638,7 @@ class PHP {
    * @returns The exit code of the CLI session.
    */
   async cli(t, e = {}) {
-    u(this, H) && (u(this, y).needsRotating = !0);
+    u(this, H) && (u(this, _).needsRotating = !0);
     const r = await this.semaphore.acquire();
     return await m(this, h, j).call(this, () => {
       const s = e.env || {};
@@ -1658,7 +1656,7 @@ class PHP {
         async: !0
       });
     }).then((s) => (s.exitCode.finally(r), s)).finally(() => {
-      u(this, y).needsRotating = !0;
+      u(this, _).needsRotating = !0;
     });
   }
   setSkipShebang(t) {
@@ -1683,7 +1681,7 @@ class PHP {
     this.exit(0);
   }
 }
-k = new WeakMap(), H = new WeakMap(), b = new WeakMap(), E = new WeakMap(), T = new WeakMap(), C = new WeakMap(), y = new WeakMap(), h = new WeakSet(), /**
+k = new WeakMap(), H = new WeakMap(), b = new WeakMap(), E = new WeakMap(), T = new WeakMap(), C = new WeakMap(), _ = new WeakMap(), h = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -1806,7 +1804,7 @@ B = function(t, e, r) {
     [t, e]
   );
 }, j = async function(t) {
-  u(this, y).enabled && u(this, y).needsRotating && await this.rotateRuntime(), ++u(this, y).requestsMade, u(this, y).requestsMade >= u(this, y).maxRequests && (u(this, y).needsRotating = !0);
+  u(this, _).enabled && u(this, _).needsRotating && await this.rotateRuntime(), ++u(this, _).requestsMade, u(this, _).requestsMade >= u(this, _).maxRequests && (u(this, _).needsRotating = !0);
   const e = this[__private__dont__use], r = await createInvertedReadableStream();
   e.onHeaders = (d) => {
     a || s || r.controller.enqueue(d.slice());
@@ -1887,15 +1885,10 @@ function normalizeHeaders(t) {
     e[r.toLowerCase()] = t[r];
   return e;
 }
-function copyFS(t, e, r) {
-  let s;
-  try {
-    s = t.lookupPath(r);
-  } catch {
-    return;
-  }
-  if (!("contents" in s.node))
+function copyMEMFSNodes(t, e, r) {
+  if (getNodeType(t, r) !== "memfs" || !["memfs", "missing"].includes(getNodeType(e, r)))
     return;
+  const s = t.lookupPath(r);
   if (!t.isDir(s.node.mode)) {
     e.writeFile(r, t.readFile(r));
     return;
@@ -1903,7 +1896,7 @@ function copyFS(t, e, r) {
   e.mkdirTree(r);
   const n = t.readdir(r).filter((i) => i !== "." && i !== "..");
   for (const i of n)
-    copyFS(t, e, joinPaths(r, i));
+    copyMEMFSNodes(t, e, joinPaths(r, i));
 }
 async function createInvertedReadableStream(t = {}) {
   let e;
@@ -1923,6 +1916,18 @@ async function createInvertedReadableStream(t = {}) {
     controller: n
   };
 }
+const getNodeType = (t, e) => {
+  try {
+    return "contents" in t.lookupPath(e, { follow: !0 }).node ? "memfs" : (
+      /**
+       * Could be NODEFS, PROXYFS, etc.
+       */
+      "not-memfs"
+    );
+  } catch {
+    return "missing";
+  }
+};
 async function getPhpIniEntries(t, e) {
   const r = parse(await t.readFileAsText(PHP_INI_PATH));
   if (e === void 0)
@@ -2328,7 +2333,7 @@ const _default = "application/octet-stream", asx = "video/x-ms-asf", atom = "app
   xspf,
   zip
 };
-var x, I, N, F, M, P, A, v, S, Q, Z, ee;
+var x, M, N, F, I, P, A, v, S, Q, Z, ee;
 class PHPRequestHandler {
   /**
    * The request handler needs to decide whether to serve a static asset or
@@ -2342,15 +2347,15 @@ class PHPRequestHandler {
    * @param  config - Request Handler configuration.
    */
   constructor(e) {
-    _(this, S);
-    _(this, x);
-    _(this, I);
-    _(this, N);
-    _(this, F);
-    _(this, M);
-    _(this, P);
-    _(this, A);
-    _(this, v);
+    y(this, S);
+    y(this, x);
+    y(this, M);
+    y(this, N);
+    y(this, F);
+    y(this, I);
+    y(this, P);
+    y(this, A);
+    y(this, v);
     const {
       documentRoot: r = "/www/",
       absoluteUrl: s = typeof location == "object" ? location.href : DEFAULT_BASE_URL,
@@ -2368,14 +2373,14 @@ class PHPRequestHandler {
       maxPhpInstances: e.maxPhpInstances
     }), w(this, v, e.cookieStore === void 0 ? new HttpCookieStore() : e.cookieStore), w(this, x, r);
     const o = new URL(s);
-    w(this, N, o.hostname), w(this, F, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), w(this, I, (o.protocol || "").replace(":", ""));
+    w(this, N, o.hostname), w(this, F, o.port ? Number(o.port) : o.protocol === "https:" ? 443 : 80), w(this, M, (o.protocol || "").replace(":", ""));
     const a = u(this, F) !== 443 && u(this, F) !== 80;
-    w(this, M, [
+    w(this, I, [
       u(this, N),
       a ? `:${u(this, F)}` : ""
     ].join("")), w(this, P, o.pathname.replace(/\/+$/, "")), w(this, A, [
-      `${u(this, I)}://`,
-      u(this, M),
+      `${u(this, M)}://`,
+      u(this, I),
       u(this, P)
     ].join("")), this.rewriteRules = n, this.getFileNotFoundAction = i;
   }
@@ -2533,7 +2538,7 @@ class PHPRequestHandler {
     await this.processManager[Symbol.asyncDispose]();
   }
 }
-x = new WeakMap(), I = new WeakMap(), N = new WeakMap(), F = new WeakMap(), M = new WeakMap(), P = new WeakMap(), A = new WeakMap(), v = new WeakMap(), S = new WeakSet(), /**
+x = new WeakMap(), M = new WeakMap(), N = new WeakMap(), F = new WeakMap(), I = new WeakMap(), P = new WeakMap(), A = new WeakMap(), v = new WeakMap(), S = new WeakSet(), /**
  * Serves a static file from the PHP filesystem.
  *
  * @param  fsPath - Absolute path of the static file to serve.
@@ -2571,7 +2576,7 @@ Q = function(e, r) {
 }, ee = async function(e, r, s) {
   let n = "GET";
   const i = {
-    host: u(this, M),
+    host: u(this, I),
     ...normalizeHeaders(r.headers || {})
   };
   u(this, v) && (i.cookie = u(this, v).getCookieRequestHeader());
@@ -2587,7 +2592,7 @@ Q = function(e, r) {
         toRelativeUrl(new URL(r.url)),
         u(this, P)
       ),
-      protocol: u(this, I),
+      protocol: u(this, M),
       method: r.method || n,
       $_SERVER: {
         REMOTE_ADDR: "127.0.0.1",
@@ -2651,6 +2656,11 @@ function proxyFileSystem(t, e, r) {
       n
     );
 }
+function isPathToSharedFS(t, e) {
+  var i;
+  const r = Object.getOwnPropertySymbols(t)[0], n = t[r].FS.lookupPath(e, { noent_okay: !0 });
+  return ((i = n == null ? void 0 : n.node) == null ? void 0 : i.isSharedFS) ?? !1;
+}
 function sandboxedSpawnHandlerFactory(t) {
   return createSpawnHandler(async function(e, r, s) {
     r.notifySpawn(), e[0] === "exec" && e.shift(), (e[0].endsWith(".php") || e[0].endsWith(".phar")) && e.unshift("php");
@@ -3425,6 +3435,7 @@ export {
   getLoadedRuntime,
   getPhpIniEntries,
   isExitCode,
+  isPathToSharedFS,
   iteratePhpFiles as iterateFiles,
   loadPHPRuntime,
   prettyPrintFullStackTrace,