@php-wasm/universal 3.1.2 → 3.1.3

package/index.js

@@ -311,19 +311,31 @@ class FSHelpers {
     e.mkdirTree(t);
   }
   static copyRecursive(e, t, s) {
-    const n = e.lookupPath(t).node;
-    if (e.isDir(n.mode)) {
-      e.mkdirTree(s);
-      const i = e.readdir(t).filter(
-        (o) => o !== "." && o !== ".."
-      );
-      for (const o of i)
-        FSHelpers.copyRecursive(
-          e,
-          joinPaths(t, o),
-          joinPaths(s, o)
+    try {
+      const n = e.lookupPath(t).node;
+      if (e.isDir(n.mode)) {
+        if (t === s || s.startsWith(`${t}/`))
+          throw new ErrnoError(28);
+        e.mkdirTree(s);
+        const i = e.readdir(t).filter(
+          (o) => o !== "." && o !== ".."
         );
-    } else e.isLink(n.mode) ? e.symlink(e.readlink(t), s) : e.writeFile(s, e.readFile(t));
+        for (const o of i)
+          FSHelpers.copyRecursive(
+            e,
+            joinPaths(t, o),
+            joinPaths(s, o)
+          );
+      } else e.isLink(n.mode) ? e.symlink(e.readlink(t), s) : e.writeFile(s, e.readFile(t));
+    } catch (n) {
+      const i = getEmscriptenFsError(n);
+      throw i ? new Error(
+        `Could not copy ${t} to ${s}: ${i}`,
+        {
+          cause: n
+        }
+      ) : n;
+    }
   }
 }
 FSHelpers.readFileAsText = rethrowFileSystemError('Could not read "{path}"')(
@@ -359,9 +371,6 @@ FSHelpers.fileExists = rethrowFileSystemError('Could not stat "{path}"')(
 FSHelpers.mkdir = rethrowFileSystemError('Could not create directory "{path}"')(
   FSHelpers.mkdir
 );
-FSHelpers.copyRecursive = rethrowFileSystemError(
-  'Could not copy files from "{path}"'
-)(FSHelpers.copyRecursive);
 const _private = /* @__PURE__ */ new WeakMap();
 var x;
 class PHPWorker {
@@ -651,23 +660,36 @@ const D = class D {
    */
   static fromPHPResponse(e) {
     const t = new ReadableStream({
-      start(i) {
-        i.enqueue(e.bytes), i.close();
+      start(c) {
+        c.enqueue(e.bytes), c.close();
+      }
+    }), s = [];
+    for (const [c, l] of Object.entries(e.headers))
+      for (const d of l)
+        s.push(`${c}: ${d}`);
+    const n = JSON.stringify({
+      status: e.httpStatusCode,
+      headers: s
+    }), i = new ReadableStream({
+      start(c) {
+        c.enqueue(new TextEncoder().encode(n)), c.close();
       }
-    }), s = () => new ReadableStream({
-      start(i) {
-        i.close();
+    }), o = new ReadableStream({
+      start(c) {
+        e.errors.length > 0 && c.enqueue(
+          new TextEncoder().encode(e.errors)
+        ), c.close();
       }
-    }), n = new D(
-      s(),
+    }), a = new D(
+      i,
       t,
-      s(),
+      o,
       Promise.resolve(e.exitCode)
     );
-    return n.parsedHeaders = Promise.resolve({
+    return a.parsedHeaders = Promise.resolve({
       headers: e.headers,
       httpStatusCode: e.httpStatusCode
-    }), n;
+    }), a;
   }
   /**
    * Creates a StreamedPHPResponse for a given HTTP status code.
@@ -1021,7 +1043,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 M, R, b, S, H, T, w, h, J, Y, X, Q, K, Z, ee, te, j, re, q, z;
+var M, R, b, S, H, T, w, p, J, Y, X, Q, K, Z, ee, te, j, re, q, $;
 class PHP {
   /**
    * Initializes a PHP runtime.
@@ -1031,7 +1053,7 @@ class PHP {
    * @param  requestHandlerOptions - Optional. Options for the PHPRequestHandler. If undefined, no request handler will be initialized.
    */
   constructor(r) {
-    y(this, h);
+    y(this, p);
     y(this, M);
     y(this, R, !1);
     y(this, b, null);
@@ -1456,7 +1478,7 @@ class PHP {
   async runStream(r) {
     const e = await this.semaphore.acquire();
     let t;
-    const s = m(this, h, z).call(this, async () => {
+    const s = m(this, p, $).call(this, async () => {
       if (u(this, R) || (await this[__private__dont__use].ccall(
         "php_wasm_init",
         null,
@@ -1469,22 +1491,22 @@ class PHP {
         throw new Error(
           `The script path "${r.scriptPath}" does not exist.`
         );
-      m(this, h, Y).call(this, r.relativeUri || ""), m(this, h, Z).call(this, r.method || "GET");
-      const i = normalizeHeaders(r.headers || {}), o = i.host || "example.com:443", a = m(this, h, K).call(this, o, r.protocol || "http");
-      if (m(this, h, X).call(this, o), m(this, h, Q).call(this, a), m(this, h, ee).call(this, i), r.body && (t = m(this, h, te).call(this, r.body)), typeof r.code == "string")
-        this.writeFile("/internal/eval.php", r.code), m(this, h, j).call(this, "/internal/eval.php");
+      m(this, p, Y).call(this, r.relativeUri || ""), m(this, p, Z).call(this, r.method || "GET");
+      const i = normalizeHeaders(r.headers || {}), o = i.host || "example.com:443", a = m(this, p, K).call(this, o, r.protocol || "http");
+      if (m(this, p, X).call(this, o), m(this, p, Q).call(this, a), m(this, p, ee).call(this, i), r.body && (t = m(this, p, te).call(this, r.body)), typeof r.code == "string")
+        this.writeFile("/internal/eval.php", r.code), m(this, p, j).call(this, "/internal/eval.php");
       else if (typeof r.scriptPath == "string")
-        m(this, h, j).call(this, r.scriptPath || "");
+        m(this, p, j).call(this, r.scriptPath || "");
       else
         throw new TypeError(
           "The request object must have either a `code` or a `scriptPath` property."
         );
-      const c = m(this, h, J).call(this, r.$_SERVER, i, a);
+      const c = m(this, p, J).call(this, r.$_SERVER, i, a);
       for (const d in c)
-        m(this, h, re).call(this, d, c[d]);
+        m(this, p, re).call(this, d, c[d]);
       const l = r.env || {};
       for (const d in l)
-        m(this, h, q).call(this, d, l[d]);
+        m(this, p, q).call(this, d, l[d]);
       return await this[__private__dont__use].ccall(
         "wasm_sapi_handle_request",
         NUMBER,
@@ -1602,8 +1624,8 @@ class PHP {
    * Moves a file or directory in the PHP filesystem to a
    * new location.
    *
-   * @param oldPath The path to rename.
-   * @param newPath The new path.
+   * @param fromPath The path to rename.
+   * @param toPath The new path.
    */
   mv(r, e) {
     const t = FSHelpers.mv(
@@ -1613,6 +1635,21 @@ class PHP {
     );
     return this.dispatchEvent({ type: "filesystem.write" }), t;
   }
+  /**
+   * Copies a file or directory in the PHP filesystem to a
+   * new location.
+   *
+   * @param fromPath The source path.
+   * @param toPath The target path.
+   */
+  cp(r, e) {
+    const t = FSHelpers.copyRecursive(
+      this[__private__dont__use].FS,
+      r,
+      e
+    );
+    return this.dispatchEvent({ type: "filesystem.write" }), t;
+  }
   /**
    * Removes a directory from the PHP filesystem.
    *
@@ -1803,10 +1840,10 @@ class PHP {
       return this.subProcess(r, e);
     u(this, R) && (u(this, w).needsRotating = !0);
     const t = await this.semaphore.acquire();
-    return await m(this, h, z).call(this, () => {
+    return await m(this, p, $).call(this, () => {
       const s = e.env || {};
       for (const [n, i] of Object.entries(s))
-        m(this, h, q).call(this, n, i);
+        m(this, p, q).call(this, n, i);
       r = [r[0], "-c", PHP_INI_PATH, ...r.slice(1)];
       for (const n of r)
         this[__private__dont__use].ccall(
@@ -1897,7 +1934,7 @@ class PHP {
     this.exit(0);
   }
 }
-M = new WeakMap(), R = new WeakMap(), b = new WeakMap(), S = new WeakMap(), H = new WeakMap(), T = new WeakMap(), w = new WeakMap(), h = new WeakSet(), /**
+M = new WeakMap(), R = new WeakMap(), b = new WeakMap(), S = new WeakMap(), H = new WeakMap(), T = new WeakMap(), w = new WeakMap(), p = new WeakSet(), /**
  * Prepares the $_SERVER entries for the PHP runtime.
  *
  * @param defaults Default entries to include in $_SERVER.
@@ -2019,34 +2056,34 @@ J = function(r, e, t) {
     [STRING, STRING],
     [r, e]
   );
-}, z = async function(r) {
+}, $ = async function(r) {
   u(this, w).enabled && u(this, w).needsRotating && await this.rotateRuntime(), ++u(this, w).requestsMade, u(this, w).requestsMade >= u(this, w).maxRequests && (u(this, w).needsRotating = !0);
   const e = this[__private__dont__use], t = await createInvertedReadableStream();
-  e.onHeaders = (p) => {
-    a || s || t.controller.enqueue(p.slice());
+  e.onHeaders = (h) => {
+    a || s || t.controller.enqueue(h.slice());
   };
   let s = !1;
   const n = () => {
     s || (s = !0, t.controller.close());
   }, i = await createInvertedReadableStream();
-  e.onStdout = (p) => {
-    n(), !a && i.controller.enqueue(p.slice());
+  e.onStdout = (h) => {
+    n(), !a && i.controller.enqueue(h.slice());
   };
   const o = await createInvertedReadableStream();
-  e.onStderr = (p) => {
-    a || o.controller.enqueue(p.slice());
+  e.onStderr = (h) => {
+    a || o.controller.enqueue(h.slice());
   };
   let a = !1, c;
   const d = (async () => {
-    var p;
+    var h;
     try {
       return await Promise.race([
         r(),
         new Promise((_, F) => {
-          var $;
+          var z;
           c = (V) => {
             isExitCode(V.error) || F(V.error);
-          }, ($ = u(this, b)) == null || $.addEventListener(
+          }, (z = u(this, b)) == null || z.addEventListener(
             "error",
             c,
             { once: !0 }
@@ -2065,27 +2102,27 @@ J = function(r, e, t) {
         });
       throw this.functionsMaybeMissingFromAsyncify = getFunctionsMaybeMissingFromAsyncify(), f;
     } finally {
-      a || (i.controller.close(), o.controller.close(), n(), a = !0), (p = u(this, b)) == null || p.removeEventListener(
+      a || (i.controller.close(), o.controller.close(), n(), a = !0), (h = u(this, b)) == null || h.removeEventListener(
         "error",
         c
       );
     }
   })().then(
-    (p) => (p !== 0 && this.dispatchEvent({
+    (h) => (h !== 0 && this.dispatchEvent({
       type: "request.error",
       error: new Error(
-        `PHP.run() failed with exit code ${p}.`
+        `PHP.run() failed with exit code ${h}.`
       ),
       // Distinguish between PHP request and PHP-wasm errors
       source: "php-wasm"
-    }), p),
-    (p) => {
-      const f = p.source ?? "php-wasm";
+    }), h),
+    (h) => {
+      const f = h.source ?? "php-wasm";
       throw this.dispatchEvent({
         type: "request.error",
-        error: p,
+        error: h,
         source: f
-      }), p;
+      }), h;
     }
   );
   return new StreamedPHPResponse(
@@ -2568,11 +2605,11 @@ class PHPRequestHandler {
     else if (e.phpFactory)
       this.instanceManager = new PHPProcessManager({
         phpFactory: async (d) => {
-          const p = await e.phpFactory({
+          const h = await e.phpFactory({
             ...d,
             requestHandler: this
           });
-          return a(p), p;
+          return a(h), h;
         },
         maxPhpInstances: e.maxPhpInstances
       });
@@ -2959,8 +2996,8 @@ ne = function(e, t) {
   let c = t.body;
   if (typeof c == "object" && !(c instanceof Uint8Array)) {
     o = "POST";
-    const { bytes: d, contentType: p } = await encodeAsMultipart(c);
-    c = d, a["content-type"] = p;
+    const { bytes: d, contentType: h } = await encodeAsMultipart(c);
+    c = d, a["content-type"] = h;
   }
   const l = await e.runStream({
     relativeUri: ensurePathPrefix(
@@ -2980,8 +3017,8 @@ ne = function(e, t) {
   });
   if (u(this, k)) {
     const d = u(this, k);
-    l.headers.then((p) => {
-      d.rememberCookiesFromResponseHeaders(p);
+    l.headers.then((h) => {
+      d.rememberCookiesFromResponseHeaders(h);
     });
   }
   return l;
@@ -3032,12 +3069,12 @@ function ensureProxyFSHasMmapSupport(r) {
     const d = t.malloc(o);
     if (!d)
       throw new n.ErrnoError(48);
-    const p = t.HEAPU8.subarray(d, d + o);
+    const h = t.HEAPU8.subarray(d, d + o);
     let f = 0;
     for (; f < o; ) {
       const _ = i.stream_ops.read(
         i,
-        p,
+        h,
         f,
         o - f,
         f
@@ -3328,18 +3365,18 @@ function expose(r, e = globalThis, t = ["*"], s) {
     }, l = (i.data.argumentList || []).map(fromWireValue);
     let d;
     try {
-      const p = c.slice(0, -1).reduce((_, F) => _[F], r), f = c.reduce((_, F) => _[F], r);
+      const h = c.slice(0, -1).reduce((_, F) => _[F], r), f = c.reduce((_, F) => _[F], r);
       switch (a) {
         case MessageType.GET:
           d = f;
           break;
         case MessageType.SET:
-          p[c.slice(-1)[0]] = fromWireValue(
+          h[c.slice(-1)[0]] = fromWireValue(
             i.data.value
           ), d = !0;
           break;
         case MessageType.APPLY:
-          d = f.apply(p, l);
+          d = f.apply(h, l);
           break;
         case MessageType.CONSTRUCT:
           {
@@ -3359,18 +3396,18 @@ function expose(r, e = globalThis, t = ["*"], s) {
         default:
           return;
       }
-    } catch (p) {
-      d = { value: p, [throwMarker]: 0 };
+    } catch (h) {
+      d = { value: h, [throwMarker]: 0 };
     }
-    Promise.resolve(d).catch((p) => ({ value: p, [throwMarker]: 0 })).then((p) => {
-      const [f, _] = toWireValue(p);
+    Promise.resolve(d).catch((h) => ({ value: h, [throwMarker]: 0 })).then((h) => {
+      const [f, _] = toWireValue(h);
       e.postMessage({ ...f, id: o }, _), a === MessageType.RELEASE && (e.removeEventListener("message", n), closeEndPoint(e), finalizer in r && typeof r[finalizer] == "function" && r[finalizer]());
     }).catch(() => {
-      const [p, f] = toWireValue({
+      const [h, f] = toWireValue({
         value: new TypeError("Unserializable return value"),
         [throwMarker]: 0
       });
-      e.postMessage({ ...p, id: o }, f);
+      e.postMessage({ ...h, id: o }, f);
     }).finally(() => {
       s == null || s(i);
     });
@@ -3447,7 +3484,7 @@ function createProxy(r, e, t = [], s = function() {
         e,
         {
           type: MessageType.SET,
-          path: [...t, a].map((p) => p.toString()),
+          path: [...t, a].map((h) => h.toString()),
           value: l
         },
         d
@@ -3462,7 +3499,7 @@ function createProxy(r, e, t = [], s = function() {
         }).then(fromWireValue);
       if (l === "bind")
         return createProxy(r, e, t.slice(0, -1));
-      const [d, p] = processArguments(c);
+      const [d, h] = processArguments(c);
       return requestResponseMessage(
         r,
         e,
@@ -3471,7 +3508,7 @@ function createProxy(r, e, t = [], s = function() {
           path: t.map((f) => f.toString()),
           argumentList: d
         },
-        p
+        h
       ).then(fromWireValue);
     },
     construct(o, a) {
@@ -4656,19 +4693,39 @@ function createObjectPoolProxy(r) {
         return new Proxy(function() {
         }, {
           apply(c, l, d) {
-            return i((p) => p[a](...d));
+            return i((h) => h[a](...d));
           },
           get(c, l) {
             if (l === "then")
-              return (d, p) => i((f) => f[a]).then(
+              return (d, h) => i((f) => f[a]).then(
                 d,
-                p
+                h
               );
           }
         });
     }
   });
 }
+const maxValueForSigned32BitInteger = 2 ** 31 - 1;
+class ProcessIdAllocator {
+  constructor(e = 1, t = maxValueForSigned32BitInteger) {
+    this.claimed = /* @__PURE__ */ new Set(), this.initialId = e, this.maxId = t, this.nextId = e;
+  }
+  claim() {
+    const e = this.maxId - this.initialId + 1;
+    for (let t = 0; t < e; t++)
+      if (this.claimed.has(this.nextId))
+        this.nextId++, this.nextId > this.maxId && (this.nextId = this.initialId);
+      else
+        return this.claimed.add(this.nextId), this.nextId;
+    throw new Error(
+      `Unable to find free process ID after ${e} tries.`
+    );
+  }
+  release(e) {
+    return this.claimed.has(e) ? (this.claimed.delete(e), !0) : !1;
+  }
+}
 export {
   DEFAULT_BASE_URL,
   FSHelpers,
@@ -4685,6 +4742,7 @@ export {
   PHPRequestHandler,
   PHPResponse,
   PHPWorker,
+  ProcessIdAllocator,
   SinglePHPInstanceManager,
   StreamedPHPResponse,
   SupportedPHPVersions,