@php-wasm/web 1.1.2 → 1.1.3

package/index.js

@@ -1,30 +1,30 @@
 import { PHPResponse as Le, LatestSupportedPHPVersion as me, FSHelpers as R, loadPHPRuntime as ge, __private__dont__use as q } from "@php-wasm/universal";
 import * as E from "comlink";
 import { jspi as Ke } from "wasm-feature-detect";
+import { concatArrayBuffers as B, concatUint8Arrays as u, Semaphore as Ie, joinPaths as oe, basename as De } from "@php-wasm/util";
 import { logger as v } from "@php-wasm/logger";
-import { teeRequest as Ie, cloneRequest as De } from "@php-wasm/web-service-worker";
-import { Semaphore as We, joinPaths as oe, basename as Re } from "@php-wasm/util";
-import { journalFSEvents as be } from "@php-wasm/fs-journal";
-function pt(s, e = void 0) {
+import { teeRequest as We, cloneRequest as Re } from "@php-wasm/web-service-worker";
+import { journalFSEvents as be, normalizeFilesystemOperations as Pe } from "@php-wasm/fs-journal";
+function wt(s, e = void 0) {
   ce();
   const t = s instanceof Worker ? s : E.windowEndpoint(s, e), r = E.wrap(t), n = j(r);
   return new Proxy(n, {
     get: (i, a) => a === "isConnected" ? async () => {
       for (; ; )
         try {
-          await Pe(r.isConnected(), 200);
+          await Be(r.isConnected(), 200);
           break;
         } catch {
         }
     } : r[a]
   });
 }
-async function Pe(s, e) {
+async function Be(s, e) {
   return new Promise((t, r) => {
     setTimeout(r, e), s.then(t);
   });
 }
-function wt(s, e) {
+function yt(s, e) {
   ce();
   const t = Promise.resolve();
   let r, n;
@@ -95,7 +95,7 @@ function j(s) {
     }
   });
 }
-async function Be(s = me) {
+async function Ue(s = me) {
   if (await Ke())
     switch (s) {
       case "8.4":
@@ -139,18 +139,6 @@ async function Be(s = me) {
 function p(s) {
   return Object.fromEntries(Object.entries(s).map(([e, t]) => [t, e]));
 }
-function u(s) {
-  let e = 0;
-  s.forEach((n) => e += n.length);
-  const t = new Uint8Array(e);
-  let r = 0;
-  return s.forEach((n) => {
-    t.set(n, r), r += n.length;
-  }), t;
-}
-function B(s) {
-  return u(s.map((e) => new Uint8Array(e))).buffer;
-}
 function I(s) {
   return new Uint8Array([s >> 8 & 255, s & 255]);
 }
@@ -260,9 +248,9 @@ const b = {
   key_share: 51,
   transparency_info: 52,
   connection_id: 54
-}, Ue = p(b), Se = {
+}, ve = p(b), Se = {
   host_name: 0
-}, ve = p(Se);
+}, Me = p(Se);
 class Ce {
   static decodeFromClient(e) {
     const t = new DataView(e.buffer);
@@ -279,7 +267,7 @@ class Ce {
       switch (r += _, a) {
         case Se.host_name:
           i.push({
-            name_type: ve[a],
+            name_type: Me[a],
             name: {
               host_name: new TextDecoder().decode(c)
             }
@@ -521,7 +509,7 @@ const he = {
   x25519: 29,
   x448: 30
 }, J = p(le);
-class Me {
+class Ne {
   /**
    * +--------------------------------------------------+
    * | Payload Length                            [2B]   |
@@ -567,7 +555,7 @@ const Ae = {
   ansiX962_compressed_prime: 1,
   ansiX962_compressed_char2: 2
 }, X = p(Ae);
-class Ne {
+class xe {
   /**
    * +--------------------------------------------------+
    * | Payload Length                            [2B]   |
@@ -624,7 +612,7 @@ const G = {
   sha384: 5,
   sha512: 6
 }, ee = p($);
-class xe {
+class ke {
   /**
    * Binary layout:
    *
@@ -677,14 +665,14 @@ class xe {
 }
 const te = {
   server_name: Ce,
-  signature_algorithms: xe,
-  supported_groups: Me,
-  ec_point_formats: Ne
+  signature_algorithms: ke,
+  supported_groups: Ne,
+  ec_point_formats: xe
 };
-function ke(s) {
+function qe(s) {
   const e = new m(s.buffer), t = [];
   for (; !e.isFinished(); ) {
-    const r = e.offset, n = e.readUint16(), i = Ue[n], a = e.readUint16(), _ = e.readUint8Array(a);
+    const r = e.offset, n = e.readUint16(), i = ve[n], a = e.readUint16(), _ = e.readUint8Array(a);
     if (!(i in te))
       continue;
     const c = te[i];
@@ -720,12 +708,12 @@ async function re(s, e) {
     e
   );
 }
-const qe = {
+const Oe = {
   Null: 0
-}, Oe = {
+}, Fe = {
   Warning: 1,
   Fatal: 2
-}, ue = p(Oe), Fe = {
+}, ue = p(Fe), je = {
   CloseNotify: 0,
   UnexpectedMessage: 10,
   BadRecordMac: 20,
@@ -751,7 +739,7 @@ const qe = {
   UserCanceled: 90,
   NoRenegotiation: 100,
   UnsupportedExtension: 110
-}, He = p(Fe), C = {
+}, He = p(je), C = {
   ChangeCipherSpec: 20,
   Alert: 21,
   Handshake: 22,
@@ -765,7 +753,7 @@ const qe = {
   ServerHelloDone: 14,
   ClientKeyExchange: 16,
   Finished: 20
-}, je = {
+}, Ge = {
   /**
    * Indicates that a named curve is used.  This option
    * SHOULD be used when applicable.
@@ -774,12 +762,12 @@ const qe = {
   /**
    * Values 248 through 255 are reserved for private use.
    */
-}, Ge = {
+}, $e = {
   secp256r1: 23
 };
 class ne extends Error {
 }
-const U = new Uint8Array([3, 3]), $e = crypto.subtle.generateKey(
+const U = new Uint8Array([3, 3]), ze = crypto.subtle.generateKey(
   {
     name: "ECDH",
     namedCurve: "P-256"
@@ -790,7 +778,7 @@ const U = new Uint8Array([3, 3]), $e = crypto.subtle.generateKey(
   ["deriveKey", "deriveBits"]
   // Key usage
 );
-class ze {
+class Ve {
   constructor() {
     this.receivedRecordSequenceNumber = 0, this.sentRecordSequenceNumber = 0, this.closed = !1, this.receivedBytesBuffer = new Uint8Array(), this.receivedTLSRecords = [], this.partialTLSMessages = {}, this.handshakeMessages = [], this.MAX_CHUNK_SIZE = 1024 * 16, this.clientEnd = {
       // We don't need to chunk the encrypted data.
@@ -807,7 +795,7 @@ class ze {
        * This will spread some messages across multiple records,
        * but TLS supports it so that's fine.
        */
-      downstream: Ve(this.MAX_CHUNK_SIZE)
+      downstream: Ye(this.MAX_CHUNK_SIZE)
     }, this.serverUpstreamWriter = this.serverEnd.upstream.writable.getWriter();
     const e = this;
     this.serverEnd.downstream.readable.pipeTo(
@@ -876,13 +864,13 @@ class ze {
       K.serverHello(
         r.body,
         n,
-        qe.Null
+        Oe.Null
       )
     ), await this.writeTLSRecord(
       C.Handshake,
       K.certificate(t)
     );
-    const i = await $e, a = r.body.random, _ = await K.ECDHEServerKeyExchange(
+    const i = await ze, a = r.body.random, _ = await K.ECDHEServerKeyExchange(
       a,
       n,
       i,
@@ -1299,7 +1287,7 @@ class T {
       a
     );
     const _ = t.readUint16();
-    return r.extensions = ke(
+    return r.extensions = qe(
       t.readUint8Array(_)
     ), r;
   }
@@ -1324,7 +1312,7 @@ class T {
     };
   }
 }
-function Ve(s) {
+function Ye(s) {
   return new TransformStream({
     transform(e, t) {
       for (; e.length > 0; )
@@ -1385,9 +1373,9 @@ class K {
       await crypto.subtle.exportKey("raw", r.publicKey)
     ), a = new Uint8Array([
       // Curve type (1 byte)
-      je.NamedCurve,
+      Ge.NamedCurve,
       // Curve name (2 bytes)
-      ...I(Ge.secp256r1),
+      ...I($e.secp256r1),
       // Public key length (1 byte)
       i.byteLength,
       // Public key (65 bytes, uncompressed format)
@@ -1520,17 +1508,17 @@ class K {
     return new Uint8Array([1]);
   }
 }
-function Ye(s, e) {
-  return Ze.generateCertificate(s, e);
+function Ze(s, e) {
+  return Je.generateCertificate(s, e);
 }
-function yt(s) {
+function Lt(s) {
   return `-----BEGIN CERTIFICATE-----
 ${fe(
     de(s.buffer)
   )}
 -----END CERTIFICATE-----`;
 }
-async function Lt(s) {
+async function mt(s) {
   const e = await crypto.subtle.exportKey("pkcs8", s);
   return `-----BEGIN PRIVATE KEY-----
 ${fe(
@@ -1538,7 +1526,7 @@ ${fe(
   )}
 -----END PRIVATE KEY-----`;
 }
-class Ze {
+class Je {
   static async generateCertificate(e, t) {
     const r = await crypto.subtle.generateKey(
       {
@@ -1644,7 +1632,7 @@ class Ze {
         H.UTCTime,
         new TextEncoder().encode(
           ie(
-            (e == null ? void 0 : e.notAfter) ?? Xe(/* @__PURE__ */ new Date(), 10)
+            (e == null ? void 0 : e.notAfter) ?? Qe(/* @__PURE__ */ new Date(), 10)
           )
         )
       )
@@ -1710,7 +1698,7 @@ class Ze {
     ]);
   }
 }
-const Je = {
+const Xe = {
   // Algorithm OIDs
   "1.2.840.113549.1.1.1": "rsaEncryption",
   "1.2.840.113549.1.1.4": "md5WithRSAEncryption",
@@ -1821,7 +1809,7 @@ const Je = {
   "1.3.6.1.5.5.7.3.8": "timeStamping"
 };
 function w(s) {
-  for (const [e, t] of Object.entries(Je))
+  for (const [e, t] of Object.entries(Xe))
     if (t === s)
       return e;
   throw new Error(`OID not found for name: ${s}`);
@@ -1936,27 +1924,27 @@ function ie(s) {
 function W(s) {
   return s.toString().padStart(2, "0");
 }
-function Xe(s, e) {
+function Qe(s, e) {
   const t = new Date(s);
   return t.setUTCFullYear(t.getUTCFullYear() + e), t;
 }
-async function Qe(s, e, t) {
+async function et(s, e, t) {
   var a;
   const r = typeof s == "string" ? new Request(s, e) : s;
   if (!t)
     return await fetch(r);
-  const [n, i] = await Ie(r);
+  const [n, i] = await We(r);
   try {
     return await fetch(n);
   } catch {
-    const c = ((a = new Headers(i.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : a.split(",")) || [], S = c.includes("authorization") || c.includes("cookie"), h = await De(i, {
+    const c = ((a = new Headers(i.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : a.split(",")) || [], S = c.includes("authorization") || c.includes("cookie"), h = await Re(i, {
       url: `${t}${r.url}`,
       ...S && { credentials: "include" }
     });
     return await fetch(h, e);
   }
 }
-class et extends TransformStream {
+class tt extends TransformStream {
   constructor() {
     let e = new Uint8Array(0), t = "SCAN_CHUNK_SIZE", r = 0;
     super({
@@ -2009,7 +1997,7 @@ class et extends TransformStream {
     });
   }
 }
-const tt = (s, e) => ({
+const rt = (s, e) => ({
   ...s,
   websocket: {
     url: (t, r, n) => `ws://playground.internal/?${new URLSearchParams({
@@ -2017,7 +2005,7 @@ const tt = (s, e) => ({
       port: n
     }).toString()}`,
     subprotocol: "binary",
-    decorator: () => class extends rt {
+    decorator: () => class extends nt {
       constructor(t, r) {
         super(t, r, {
           CAroot: e.CAroot,
@@ -2027,7 +2015,7 @@ const tt = (s, e) => ({
     }
   }
 });
-class rt {
+class nt {
   constructor(e, t, {
     CAroot: r,
     corsProxyUrl: n,
@@ -2098,7 +2086,7 @@ class rt {
       switch (this.bufferedBytesFromClient = u([
         this.bufferedBytesFromClient,
         new Uint8Array(e)
-      ]), st(this.port, this.bufferedBytesFromClient)) {
+      ]), it(this.port, this.bufferedBytesFromClient)) {
         case !1:
           return;
         case "other":
@@ -2117,7 +2105,7 @@ class rt {
       throw new Error(
         "TLS protocol is only supported when the TCPOverFetchWebsocket is instantiated with a CAroot"
       );
-    const e = await Ye(
+    const e = await Ze(
       {
         subject: {
           commonName: this.host,
@@ -2127,7 +2115,7 @@ class rt {
         issuer: this.CAroot.tbsDescription.subject
       },
       this.CAroot.keyPair
-    ), t = new ze();
+    ), t = new Ve();
     this.clientUpstream.readable.pipeTo(t.clientEnd.upstream.writable).catch(() => {
     }), t.clientEnd.downstream.readable.pipeTo(this.clientDownstream.writable).catch(() => {
     }), await t.TLSHandshake(e.keyPair.privateKey, [
@@ -2165,7 +2153,7 @@ class rt {
     this.emit("message", { data: new Uint8Array(0) }), this.readyState = this.CLOSING, this.emit("close"), this.readyState = this.CLOSED;
   }
 }
-const nt = [
+const st = [
   "GET",
   "POST",
   "HEAD",
@@ -2175,7 +2163,7 @@ const nt = [
   "PUT",
   "TRACE"
 ];
-function st(s, e) {
+function it(s, e) {
   if (e.length < 8)
     return !1;
   if (s === 443 && e[0] === C.Handshake && // TLS versions between 1.0 and 1.2
@@ -2184,7 +2172,7 @@ function st(s, e) {
   const r = new TextDecoder("latin1", {
     fatal: !0
   }).decode(e);
-  return nt.some(
+  return st.some(
     (i) => r.startsWith(i + " ")
   ) ? "http" : "other";
 }
@@ -2198,7 +2186,7 @@ class L {
         var _;
         let n;
         try {
-          n = await Qe(
+          n = await et(
             e,
             void 0,
             t
@@ -2264,7 +2252,7 @@ Content-Length: 0\r
         i = !0;
         break;
       }
-      n = u([n, P]), a = it(
+      n = u([n, P]), a = at(
         n,
         new Uint8Array([13, 10, 13, 10])
       );
@@ -2298,7 +2286,7 @@ Content-Length: 0\r
           }
         }
       }), h === "chunked" && (f = f.pipeThrough(
-        new et()
+        new tt()
       ));
     }
     const N = S.headers.get("Host") ?? t, z = new URL(S.path, r + "://" + N);
@@ -2325,7 +2313,7 @@ Content-Length: 0\r
     return { method: n, path: i, headers: a };
   }
 }
-function it(s, e) {
+function at(s, e) {
   const t = s.length, r = e.length, n = t - r;
   for (let i = 0; i <= n; i++) {
     let a = !0;
@@ -2339,7 +2327,7 @@ function it(s, e) {
   }
   return -1;
 }
-async function at(s) {
+async function _t(s) {
   const e = "icudt74l.dat", t = (await import("./shared/icudt74l.js")).dataFilename, r = await (await fetch(t)).arrayBuffer();
   return {
     ...s,
@@ -2358,7 +2346,7 @@ async function at(s) {
     }
   };
 }
-const _t = () => ({
+const ot = () => ({
   websocket: {
     decorator: (s) => class extends s {
       constructor() {
@@ -2373,23 +2361,23 @@ const _t = () => ({
     }
   }
 });
-async function gt(s, e = {}) {
+async function Kt(s, e = {}) {
   var i;
   let t = {
-    ..._t(),
+    ...ot(),
     ...e.emscriptenOptions || {}
   };
-  e.tcpOverFetch && (t = tt(
+  e.tcpOverFetch && (t = rt(
     t,
     e.tcpOverFetch
-  )), e.withICU && (t = at(t));
+  )), e.withICU && (t = _t(t));
   const [r, n] = await Promise.all([
-    Be(s),
+    Ue(s),
     t
   ]);
   return (i = e.onPhpLoaderModuleLoaded) == null || i.call(e, r), await ge(r, n);
 }
-function Kt(s, e) {
+function It(s, e) {
   window.addEventListener("message", (t) => {
     t.source === s.contentWindow && (e && t.origin !== e || typeof t.data != "object" || t.data.type !== "relay" || window.parent.postMessage(t.data, "*"));
   }), window.addEventListener("message", (t) => {
@@ -2397,7 +2385,7 @@ function Kt(s, e) {
     t.source === window.parent && (typeof t.data != "object" || t.data.type !== "relay" || (r = s == null ? void 0 : s.contentWindow) == null || r.postMessage(t.data));
   });
 }
-async function It(s) {
+async function Dt(s) {
   const e = new Worker(s, { type: "module" });
   return new Promise((t, r) => {
     e.onerror = (i) => {
@@ -2412,7 +2400,7 @@ async function It(s) {
     e.addEventListener("message", n);
   });
 }
-function Dt(s, e = { initialSync: {} }) {
+function Wt(s, e = { initialSync: {} }) {
   return e = {
     ...e,
     initialSync: {
@@ -2420,17 +2408,17 @@ function Dt(s, e = { initialSync: {} }) {
       direction: e.initialSync.direction ?? "opfs-to-memfs"
     }
   }, async function(t, r, n) {
-    return e.initialSync.direction === "opfs-to-memfs" ? (R.fileExists(r, n) && R.rmdir(r, n), R.mkdir(r, n), await ot(r, s, n)) : await Te(
+    return e.initialSync.direction === "opfs-to-memfs" ? (R.fileExists(r, n) && R.rmdir(r, n), R.mkdir(r, n), await ct(r, s, n)) : await Te(
       r,
       s,
       n,
       e.initialSync.onProgress
-    ), St(t, s, n);
+    ), Ct(t, s, n);
   };
 }
-async function ot(s, e, t) {
+async function ct(s, e, t) {
   R.mkdir(s, t);
-  const r = new We({
+  const r = new Ie({
     concurrency: 40
   }), n = [], i = [
     [e, t]
@@ -2479,7 +2467,7 @@ async function Te(s, e, t, r) {
         (A) => A !== "." && A !== ".."
       ).map(async (A) => {
         const f = oe(h, A);
-        if (!ct(s, f)) {
+        if (!St(s, f)) {
           n.push([l, f, A]);
           return;
         }
@@ -2492,7 +2480,7 @@ async function Te(s, e, t, r) {
   }
   await i(t, e);
   let a = 0;
-  const _ = r && lt(r, 100), c = 100, S = /* @__PURE__ */ new Set();
+  const _ = r && At(r, 100), c = 100, S = /* @__PURE__ */ new Set();
   try {
     for (const [h, l, A] of n) {
       const f = F(
@@ -2515,7 +2503,7 @@ async function Te(s, e, t, r) {
     await Promise.allSettled(S);
   }
 }
-function ct(s, e) {
+function St(s, e) {
   return s.isDir(s.lookupPath(e, { follow: !0 }).node.mode);
 }
 async function F(s, e, t, r) {
@@ -2540,15 +2528,19 @@ async function F(s, e, t, r) {
     await a.close();
   }
 }
-function St(s, e, t) {
+function Ct(s, e, t) {
   const r = [], n = be(s, t, (_) => {
     r.push(_);
-  }), i = new Ct(s, e, t);
+  }), i = new ht(s, e, t);
   async function a() {
-    const _ = await s.semaphore.acquire();
+    if (r.length === 0)
+      return;
+    const _ = await s.semaphore.acquire(), c = [...r];
+    r.splice(0, c.length);
+    const S = Pe(c);
     try {
-      for (; r.length; )
-        await i.processEntry(r.shift());
+      for (const h of S)
+        await i.processEntry(h);
     } finally {
       _();
     }
@@ -2557,7 +2549,7 @@ function St(s, e, t) {
     n(), s.removeEventListener("request.end", a);
   };
 }
-class Ct {
+class ht {
   constructor(e, t, r) {
     this.php = e, this.opfs = t, this.memfsRoot = ae(r);
   }
@@ -2567,7 +2559,7 @@ class Ct {
   async processEntry(e) {
     if (!e.path.startsWith(this.memfsRoot) || e.path === this.memfsRoot)
       return;
-    const t = this.toOpfsPath(e.path), r = await _e(this.opfs, t), n = ht(t);
+    const t = this.toOpfsPath(e.path), r = await _e(this.opfs, t), n = lt(t);
     if (n)
       try {
         if (e.operation === "DELETE")
@@ -2616,7 +2608,7 @@ class Ct {
             }
             await F(
               a,
-              Re(i),
+              De(i),
               this.php[q].FS,
               e.toPath
             );
@@ -2630,7 +2622,7 @@ class Ct {
 function ae(s) {
   return s.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
-function ht(s) {
+function lt(s) {
   return s.substring(s.lastIndexOf("/") + 1);
 }
 async function _e(s, e) {
@@ -2645,7 +2637,7 @@ async function _e(s, e) {
   }
   return n;
 }
-function lt(s, e) {
+function At(s, e) {
   let t = 0, r, n;
   return function(...a) {
     n = a;
@@ -2659,16 +2651,16 @@ function lt(s, e) {
   };
 }
 export {
-  yt as certificateToPEM,
-  pt as consumeAPI,
-  Dt as createDirectoryHandleMountHandler,
-  wt as exposeAPI,
-  Qe as fetchWithCorsProxy,
-  Ye as generateCertificate,
-  Be as getPHPLoaderModule,
-  gt as loadWebRuntime,
-  Lt as privateKeyToPEM,
-  Kt as setupPostMessageRelay,
-  It as spawnPHPWorkerThread
+  Lt as certificateToPEM,
+  wt as consumeAPI,
+  Wt as createDirectoryHandleMountHandler,
+  yt as exposeAPI,
+  et as fetchWithCorsProxy,
+  Ze as generateCertificate,
+  Ue as getPHPLoaderModule,
+  Kt as loadWebRuntime,
+  mt as privateKeyToPEM,
+  It as setupPostMessageRelay,
+  Dt as spawnPHPWorkerThread
 };
 //# sourceMappingURL=index.js.map