@php-wasm/web 3.0.18 → 3.0.20

package/index.js

@@ -1,7 +1,7 @@
 import { LatestSupportedPHPVersion as fe, FSHelpers as W, loadPHPRuntime as pe, __private__dont__use as k } from "@php-wasm/universal";
 import { consumeAPI as mt, exposeAPI as gt } from "@php-wasm/universal";
 import { jspi as we } from "wasm-feature-detect";
-import { concatArrayBuffers as B, concatUint8Arrays as u, Semaphore as Le, joinPaths as ie, basename as ye } from "@php-wasm/util";
+import { concatArrayBuffers as B, concatUint8Arrays as u, Semaphore as Le, joinPaths as se, basename as ye } from "@php-wasm/util";
 import { logger as U } from "@php-wasm/logger";
 import { teeRequest as me, cloneRequest as ge } from "@php-wasm/web-service-worker";
 import { journalFSEvents as Ke, normalizeFilesystemOperations as Ie } from "@php-wasm/fs-journal";
@@ -59,7 +59,7 @@ function w(i) {
     i & 255
   ]);
 }
-function $(i) {
+function G(i) {
   const e = new ArrayBuffer(8);
   return new DataView(e).setBigUint64(0, BigInt(i), !1), new Uint8Array(e);
 }
@@ -158,10 +158,10 @@ const b = {
   key_share: 51,
   transparency_info: 52,
   connection_id: 54
-}, We = f(b), _e = {
+}, We = f(b), ie = {
   host_name: 0
-}, be = f(_e);
-class ae {
+}, be = f(ie);
+class _e {
   static decodeFromClient(e) {
     const t = new DataView(e.buffer);
     let r = 0;
@@ -175,7 +175,7 @@ class ae {
       r += 2;
       const c = e.slice(r, r + a);
       switch (r += a, _) {
-        case _e.host_name:
+        case ie.host_name:
           s.push({
             name_type: be[_],
             name: {
@@ -209,7 +209,7 @@ class ae {
     return t.writeUint16(b.server_name), t.writeUint16(0), t.uint8Array;
   }
 }
-const oe = {
+const ae = {
   TLS1_CK_PSK_WITH_RC4_128_SHA: 138,
   TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA: 139,
   TLS1_CK_PSK_WITH_AES_128_CBC_SHA: 140,
@@ -412,13 +412,13 @@ const oe = {
   TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305: 52396,
   TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305: 52397,
   TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305: 52398
-}, V = f(oe), ce = {
+}, $ = f(ae), oe = {
   secp256r1: 23,
   secp384r1: 24,
   secp521r1: 25,
   x25519: 29,
   x448: 30
-}, z = f(ce);
+}, V = f(oe);
 class Re {
   /**
    * +--------------------------------------------------+
@@ -441,7 +441,7 @@ class Re {
     const r = [];
     for (; !t.isFinished(); ) {
       const n = t.readUint16();
-      n in z && r.push(z[n]);
+      n in V && r.push(V[n]);
     }
     return r;
   }
@@ -457,14 +457,14 @@ class Re {
    */
   static encodeForClient(e) {
     const t = new v(6);
-    return t.writeUint16(b.supported_groups), t.writeUint16(2), t.writeUint16(ce[e]), t.uint8Array;
+    return t.writeUint16(b.supported_groups), t.writeUint16(2), t.writeUint16(oe[e]), t.uint8Array;
   }
 }
-const Se = {
+const ce = {
   uncompressed: 0,
   ansiX962_compressed_prime: 1,
   ansiX962_compressed_char2: 2
-}, Y = f(Se);
+}, z = f(ce);
 class Be {
   /**
    * +--------------------------------------------------+
@@ -485,7 +485,7 @@ class Be {
     const t = new y(e.buffer), r = t.readUint8(), n = [];
     for (let s = 0; s < r; s++) {
       const _ = t.readUint8();
-      _ in Y && n.push(Y[_]);
+      _ in z && n.push(z[_]);
     }
     return n;
   }
@@ -505,7 +505,7 @@ class Be {
    */
   static encodeForClient(e) {
     const t = new v(6);
-    return t.writeUint16(b.ec_point_formats), t.writeUint16(2), t.writeUint8(1), t.writeUint8(Se[e]), t.uint8Array;
+    return t.writeUint16(b.ec_point_formats), t.writeUint16(2), t.writeUint8(1), t.writeUint8(ce[e]), t.uint8Array;
   }
 }
 const F = {
@@ -513,7 +513,7 @@ const F = {
   rsa: 1,
   dsa: 2,
   ecdsa: 3
-}, Z = f(F), j = {
+}, Y = f(F), j = {
   none: 0,
   md5: 1,
   sha1: 2,
@@ -521,7 +521,7 @@ const F = {
   sha256: 4,
   sha384: 5,
   sha512: 6
-}, J = f(j);
+}, Z = f(j);
 class Pe {
   /**
    * Binary layout:
@@ -544,14 +544,14 @@ class Pe {
     const r = [];
     for (; !t.isFinished(); ) {
       const n = t.readUint8(), s = t.readUint8();
-      if (Z[s]) {
-        if (!J[n]) {
+      if (Y[s]) {
+        if (!Z[n]) {
           U.warn(`Unknown hash algorithm: ${n}`);
           continue;
         }
         r.push({
-          algorithm: Z[s],
-          hash: J[n]
+          algorithm: Y[s],
+          hash: Z[n]
         });
       }
     }
@@ -573,8 +573,8 @@ class Pe {
     return r.writeUint16(b.signature_algorithms), r.writeUint16(2), r.writeUint8(j[e]), r.writeUint8(F[t]), r.uint8Array;
   }
 }
-const X = {
-  server_name: ae,
+const J = {
+  server_name: _e,
   signature_algorithms: Pe,
   supported_groups: Re,
   ec_point_formats: Be
@@ -583,9 +583,9 @@ function Ue(i) {
   const e = new y(i.buffer), t = [];
   for (; !e.isFinished(); ) {
     const r = e.offset, n = e.readUint16(), s = We[n], _ = e.readUint16(), a = e.readUint8Array(_);
-    if (!(s in X))
+    if (!(s in J))
       continue;
-    const c = X[s];
+    const c = J[s];
     t.push({
       type: s,
       data: c.decodeFromClient(a),
@@ -605,13 +605,13 @@ async function q(i, e, t, r) {
   let _ = n;
   const a = [];
   for (; B(a).byteLength < r; ) {
-    _ = await Q(s, _);
-    const S = B([_, n]), A = await Q(s, S);
+    _ = await X(s, _);
+    const S = B([_, n]), A = await X(s, S);
     a.push(A);
   }
   return B(a).slice(0, r);
 }
-async function Q(i, e) {
+async function X(i, e) {
   return await crypto.subtle.sign(
     { name: "HMAC", hash: "SHA-256" },
     i,
@@ -623,7 +623,7 @@ const ve = {
 }, Me = {
   Warning: 1,
   Fatal: 2
-}, Ce = f(Me), Ne = {
+}, Se = f(Me), Ne = {
   CloseNotify: 0,
   UnexpectedMessage: 10,
   BadRecordMac: 20,
@@ -649,7 +649,7 @@ const ve = {
   UserCanceled: 90,
   NoRenegotiation: 100,
   UnsupportedExtension: 110
-}, Ae = f(Ne), C = {
+}, Ce = f(Ne), C = {
   ChangeCipherSpec: 20,
   Alert: 21,
   Handshake: 22,
@@ -675,7 +675,7 @@ const ve = {
 }, ke = {
   secp256r1: 23
 };
-class ee extends Error {
+class Q extends Error {
 }
 const P = new Uint8Array([3, 3]), qe = crypto.subtle.generateKey(
   {
@@ -903,7 +903,7 @@ class Oe {
         fragment: this.sessionKeys && n !== C.ChangeCipherSpec ? await this.decryptData(n, s) : s
       };
       if (_.type === C.Alert) {
-        const a = Ce[_.fragment[0]], c = Ae[_.fragment[1]];
+        const a = Se[_.fragment[0]], c = Ce[_.fragment[1]];
         throw new Error(
           `TLS non-warning alert received: ${a} ${c}`
         );
@@ -919,7 +919,7 @@ class Oe {
     for (; this.receivedBytesBuffer.length < e; ) {
       const { value: r, done: n } = await this.clientUpstreamReader.read();
       if (n)
-        throw await this.close(), new ee("TLS connection closed");
+        throw await this.close(), new Q("TLS connection closed");
       if (this.receivedBytesBuffer = u([
         this.receivedBytesBuffer,
         r
@@ -943,7 +943,7 @@ class Oe {
         this.serverUpstreamWriter.write(e.body);
       }
     } catch (e) {
-      if (e instanceof ee)
+      if (e instanceof Q)
         return;
       throw e;
     }
@@ -958,7 +958,7 @@ class Oe {
         name: "AES-GCM",
         iv: s,
         additionalData: new Uint8Array([
-          ...$(this.receivedRecordSequenceNumber),
+          ...G(this.receivedRecordSequenceNumber),
           e,
           ...P,
           // Payload length without IV and tag
@@ -1020,7 +1020,7 @@ class Oe {
    */
   async encryptData(e, t) {
     const r = this.sessionKeys.serverIV, n = crypto.getRandomValues(new Uint8Array(8)), s = new Uint8Array([...r, ...n]), _ = new Uint8Array([
-      ...$(this.sentRecordSequenceNumber),
+      ...G(this.sentRecordSequenceNumber),
       e,
       ...P,
       // Payload length without IV and tag
@@ -1085,7 +1085,7 @@ class E {
     const r = [];
     for (; !t.isFinished(); ) {
       const n = t.readUint16();
-      n in V && r.push(V[n]);
+      n in $ && r.push($[n]);
     }
     return r;
   }
@@ -1104,8 +1104,8 @@ class E {
   static alert(e) {
     return {
       type: C.Alert,
-      level: Ce[e[0]],
-      description: Ae[e[1]]
+      level: Se[e[0]],
+      description: Ce[e[1]]
     };
   }
   static clientHandshake(e) {
@@ -1354,7 +1354,7 @@ class g {
     const n = e.extensions.map((a) => {
       switch (a.type) {
         case "server_name":
-          return ae.encodeForClient();
+          return _e.encodeForClient();
       }
     }).filter((a) => a !== void 0), s = u(n), _ = new Uint8Array([
       // Version field – 0x03, 0x03 means TLS 1.2
@@ -1362,7 +1362,7 @@ class g {
       ...t,
       e.session_id.length,
       ...e.session_id,
-      ...K(oe.TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256),
+      ...K(ae.TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256),
       r,
       // Extensions length (2 bytes)
       ...K(s.length),
@@ -1423,16 +1423,16 @@ function je(i, e) {
 }
 function Ht(i) {
   return `-----BEGIN CERTIFICATE-----
-${le(
-    he(i.buffer)
+${he(
+    Ae(i.buffer)
   )}
 -----END CERTIFICATE-----`;
 }
 async function dt(i) {
   const e = await crypto.subtle.exportKey("pkcs8", i);
   return `-----BEGIN PRIVATE KEY-----
-${le(
-    he(e)
+${he(
+    Ae(e)
   )}
 -----END PRIVATE KEY-----`;
 }
@@ -1535,13 +1535,13 @@ class Ge {
       o.ASN1(
         d.UTCTime,
         new TextEncoder().encode(
-          re((e == null ? void 0 : e.notBefore) ?? /* @__PURE__ */ new Date())
+          te((e == null ? void 0 : e.notBefore) ?? /* @__PURE__ */ new Date())
         )
       ),
       o.ASN1(
         d.UTCTime,
         new TextEncoder().encode(
-          re(
+          te(
             (e == null ? void 0 : e.notAfter) ?? Ve(/* @__PURE__ */ new Date(), 10)
           )
         )
@@ -1724,7 +1724,7 @@ function p(i) {
       return e;
   throw new Error(`OID not found for name: ${i}`);
 }
-const te = 32, d = {
+const ee = 32, d = {
   Boolean: 1,
   Integer: 2,
   BitString: 3,
@@ -1732,8 +1732,8 @@ const te = 32, d = {
   Null: 5,
   OID: 6,
   Utf8String: 12,
-  Sequence: 16 | te,
-  Set: 17 | te,
+  Sequence: 16 | ee,
+  Set: 17 | ee,
   PrintableString: 19,
   IA5String: 22,
   UTCTime: 23
@@ -1819,15 +1819,15 @@ class o {
     );
   }
 }
-function he(i) {
+function Ae(i) {
   return btoa(String.fromCodePoint(...new Uint8Array(i)));
 }
-function le(i) {
+function he(i) {
   var e;
   return ((e = i.match(/.{1,64}/g)) == null ? void 0 : e.join(`
 `)) || i;
 }
-function re(i) {
+function te(i) {
   const e = i.getUTCFullYear().toString().substr(2), t = D(i.getUTCMonth() + 1), r = D(i.getUTCDate()), n = D(i.getUTCHours()), s = D(i.getUTCMinutes()), _ = D(i.getUTCSeconds());
   return `${e}${t}${r}${n}${s}${_}Z`;
 }
@@ -2205,8 +2205,8 @@ Content-Length: 0\r
         new Ye()
       ));
     }
-    const M = S.headers.get("Host") ?? t, G = new URL(S.path, r + "://" + M);
-    return G.pathname = S.path, new Request(G.toString(), {
+    const M = S.headers.get("Host") ?? t, ue = new URL(S.path, r + "://" + M);
+    return new Request(ue.toString(), {
       method: S.method,
       headers: S.headers,
       body: H,
@@ -2324,7 +2324,7 @@ function wt(i, e = { initialSync: {} }) {
       direction: e.initialSync.direction ?? "opfs-to-memfs"
     }
   }, async function(t, r, n) {
-    return e.initialSync.direction === "opfs-to-memfs" ? (W.fileExists(r, n) && W.rmdir(r, n), W.mkdir(r, n), await nt(r, i, n)) : await ue(
+    return e.initialSync.direction === "opfs-to-memfs" ? (W.fileExists(r, n) && W.rmdir(r, n), W.mkdir(r, n), await nt(r, i, n)) : await le(
       r,
       i,
       n,
@@ -2343,7 +2343,7 @@ async function nt(i, e, t) {
     const [_, a] = s.pop();
     for await (const c of _.values()) {
       const S = r.run(async () => {
-        const A = ie(
+        const A = se(
           a,
           c.name
         );
@@ -2374,7 +2374,7 @@ async function nt(i, e, t) {
       await Promise.any(n);
   }
 }
-async function ue(i, e, t, r) {
+async function le(i, e, t, r) {
   i.mkdirTree(t);
   const n = [];
   async function s(A, h) {
@@ -2382,7 +2382,7 @@ async function ue(i, e, t, r) {
       i.readdir(A).filter(
         (l) => l !== "." && l !== ".."
       ).map(async (l) => {
-        const H = ie(A, l);
+        const H = se(A, l);
         if (!st(i, H)) {
           n.push([h, H, l]);
           return;
@@ -2467,15 +2467,15 @@ function it(i, e, t) {
 }
 class _t {
   constructor(e, t, r) {
-    this.php = e, this.opfs = t, this.memfsRoot = ne(r);
+    this.php = e, this.opfs = t, this.memfsRoot = re(r);
   }
   toOpfsPath(e) {
-    return ne(e.substring(this.memfsRoot.length));
+    return re(e.substring(this.memfsRoot.length));
   }
   async processEntry(e) {
     if (!e.path.startsWith(this.memfsRoot) || e.path === this.memfsRoot)
       return;
-    const t = this.toOpfsPath(e.path), r = await se(this.opfs, t), n = at(t);
+    const t = this.toOpfsPath(e.path), r = await ne(this.opfs, t), n = at(t);
     if (n)
       try {
         if (e.operation === "DELETE")
@@ -2499,7 +2499,7 @@ class _t {
             e.path
           );
         else if (e.operation === "RENAME" && e.toPath.startsWith(this.memfsRoot)) {
-          const s = this.toOpfsPath(e.toPath), _ = await se(
+          const s = this.toOpfsPath(e.toPath), _ = await ne(
             this.opfs,
             s
           );
@@ -2510,7 +2510,7 @@ class _t {
                 create: !0
               }
             );
-            await ue(
+            await le(
               this.php[k].FS,
               a,
               e.toPath
@@ -2535,13 +2535,13 @@ class _t {
       }
   }
 }
-function ne(i) {
+function re(i) {
   return i.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
 function at(i) {
   return i.substring(i.lastIndexOf("/") + 1);
 }
-async function se(i, e) {
+async function ne(i, e) {
   const t = e.replace(/^\/+|\/+$/g, "").replace(/\/+/, "/");
   if (!t)
     return i;