@php-wasm/web 3.1.20 → 3.1.22

package/index.js

@@ -1,12 +1,13 @@
-import { LatestSupportedPHPVersion as G, FSHelpers as w, loadPHPRuntime as me, __private__dont__use as F } from "@php-wasm/universal";
-import { consumeAPI as gt, exposeAPI as It } from "@php-wasm/universal";
-import { concatArrayBuffers as R, concatUint8Arrays as u, Semaphore as ge, joinPaths as ae, basename as Ie } from "@php-wasm/util";
-import { logger as U } from "@php-wasm/logger";
-import { fetchWithCorsProxy as Ke } from "@php-wasm/web-service-worker";
-import { FirewallInterferenceError as Dt, fetchWithCorsProxy as Wt } from "@php-wasm/web-service-worker";
-import { createMemoizedFetch as De } from "@wp-playground/common";
-import { journalFSEvents as We, normalizeFilesystemOperations as be } from "@php-wasm/fs-journal";
-async function Pe(i = G) {
+import { LatestSupportedPHPVersion as oe, withResolvedPHPExtensions as Ie, resolvePHPExtension as Y, isLegacyPHPVersion as Ke, createLegacyPhpIniPreRunStep as De, loadPHPRuntime as We, FSHelpers as M, __private__dont__use as O } from "@php-wasm/universal";
+import { consumeAPI as Ut, exposeAPI as vt } from "@php-wasm/universal";
+import { concatArrayBuffers as v, concatUint8Arrays as H, Semaphore as Pe, joinPaths as ce, basename as be } from "@php-wasm/util";
+import { logger as B } from "@php-wasm/logger";
+import { fetchWithCorsProxy as Re } from "@php-wasm/web-service-worker";
+import { FirewallInterferenceError as xt, fetchWithCorsProxy as Nt } from "@php-wasm/web-service-worker";
+import { createMemoizedFetch as Be } from "@wp-playground/common";
+import { jspi as Ue } from "wasm-feature-detect";
+import { journalFSEvents as ve, normalizeFilesystemOperations as Me } from "@php-wasm/fs-journal";
+async function xe(i = oe) {
   switch (i) {
     case "8.5":
       return (await import("@php-wasm/web-8-5")).getPHPLoaderModule();
@@ -22,27 +23,29 @@ async function Pe(i = G) {
       return (await import("@php-wasm/web-8-0")).getPHPLoaderModule();
     case "7.4":
       return (await import("@php-wasm/web-7-4")).getPHPLoaderModule();
+    case "5.2":
+      return (await import("@php-wasm/web-5-2")).getPHPLoaderModule();
   }
   throw new Error(`Unsupported PHP version ${i}`);
 }
-function f(i) {
+function p(i) {
   return Object.fromEntries(Object.entries(i).map(([e, t]) => [t, e]));
 }
-function K(i) {
+function D(i) {
   return new Uint8Array([i >> 8 & 255, i & 255]);
 }
-function L(i) {
+function m(i) {
   return new Uint8Array([
     i >> 16 & 255,
     i >> 8 & 255,
     i & 255
   ]);
 }
-function z(i) {
+function Z(i) {
   const e = new ArrayBuffer(8);
   return new DataView(e).setBigUint64(0, BigInt(i), !1), new Uint8Array(e);
 }
-class m {
+class g {
   constructor(e) {
     this.offset = 0, this.buffer = e, this.view = new DataView(e);
   }
@@ -66,7 +69,7 @@ class m {
     return this.offset >= this.buffer.byteLength;
   }
 }
-class x {
+class N {
   constructor(e) {
     this.offset = 0, this.buffer = new ArrayBuffer(e), this.uint8Array = new Uint8Array(this.buffer), this.view = new DataView(this.buffer);
   }
@@ -83,7 +86,7 @@ class x {
     this.uint8Array.set(e, this.offset), this.offset += e.length;
   }
 }
-const D = {
+const W = {
   server_name: 0,
   max_fragment_length: 1,
   client_certificate_url: 2,
@@ -138,10 +141,10 @@ const D = {
   transparency_info: 52,
   connection_id: 54,
   renegotiation_info: 65281
-}, Re = f(D), _e = {
+}, Ne = p(W), Se = {
   host_name: 0
-}, Be = f(_e);
-class oe {
+}, ke = p(Se);
+class Ce {
   static decodeFromClient(e) {
     const t = new DataView(e.buffer);
     let n = 0;
@@ -153,13 +156,13 @@ class oe {
       n += 1;
       const _ = t.getUint16(n);
       n += 2;
-      const S = e.slice(n, n + _);
+      const c = e.slice(n, n + _);
       switch (n += _, a) {
-        case _e.host_name:
+        case Se.host_name:
           s.push({
-            name_type: Be[a],
+            name_type: ke[a],
             name: {
-              host_name: new TextDecoder().decode(S)
+              host_name: new TextDecoder().decode(c)
             }
           });
           break;
@@ -185,16 +188,16 @@ class oe {
       throw new Error(
         "Encoding non-empty lists for ClientHello is not supported yet. Only empty lists meant for ServerHello are supported today."
       );
-    const t = new x(4);
-    return t.writeUint16(D.server_name), t.writeUint16(0), t.uint8Array;
+    const t = new N(4);
+    return t.writeUint16(W.server_name), t.writeUint16(0), t.uint8Array;
   }
 }
-const ce = {
+const le = {
   uncompressed: 0,
   ansiX962_compressed_prime: 1,
   ansiX962_compressed_char2: 2
-}, Y = f(ce);
-class Se {
+}, X = p(le);
+class he {
   /**
    * +--------------------------------------------------+
    * | Payload Length                            [2B]   |
@@ -211,10 +214,10 @@ class Se {
    * +--------------------------------------------------+
    */
   static decodeFromClient(e) {
-    const t = new m(e.buffer), n = t.readUint8(), r = [];
+    const t = new g(e.buffer), n = t.readUint8(), r = [];
     for (let s = 0; s < n; s++) {
       const a = t.readUint8();
-      a in Y && r.push(Y[a]);
+      a in X && r.push(X[a]);
     }
     return r;
   }
@@ -233,11 +236,11 @@ class Se {
    * +--------------------------------------------------+
    */
   static encodeForClient(e) {
-    const t = new x(6);
-    return t.writeUint16(D.ec_point_formats), t.writeUint16(2), t.writeUint8(1), t.writeUint8(ce[e]), t.uint8Array;
+    const t = new N(6);
+    return t.writeUint16(W.ec_point_formats), t.writeUint16(2), t.writeUint8(1), t.writeUint8(le[e]), t.uint8Array;
   }
 }
-const Ce = {
+const Ae = {
   decodeFromClient(i) {
     const e = i[0] ?? 0;
     return {
@@ -249,7 +252,7 @@ const Ce = {
    * with an empty renegotiated_connection field.
    */
   encodeForClient() {
-    const i = D.renegotiation_info, e = new Uint8Array([0]);
+    const i = W.renegotiation_info, e = new Uint8Array([0]);
     return new Uint8Array([
       i >> 8 & 255,
       i & 255,
@@ -258,7 +261,7 @@ const Ce = {
       ...e
     ]);
   }
-}, le = {
+}, ue = {
   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,
@@ -461,14 +464,14 @@ const Ce = {
   TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305: 52396,
   TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305: 52397,
   TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305: 52398
-}, Z = f(le), he = {
+}, J = p(ue), He = {
   secp256r1: 23,
   secp384r1: 24,
   secp521r1: 25,
   x25519: 29,
   x448: 30
-}, J = f(he);
-class Ue {
+}, Q = p(He);
+class Fe {
   /**
    * +--------------------------------------------------+
    * | Payload Length                            [2B]   |
@@ -485,12 +488,12 @@ class Ue {
    * +--------------------------------------------------+
    */
   static decodeFromClient(e) {
-    const t = new m(e.buffer);
+    const t = new g(e.buffer);
     t.readUint16();
     const n = [];
     for (; !t.isFinished(); ) {
       const r = t.readUint16();
-      r in J && n.push(J[r]);
+      r in Q && n.push(Q[r]);
     }
     return n;
   }
@@ -505,16 +508,16 @@ class Ue {
    * +--------------------------------------------------+
    */
   static encodeForClient(e) {
-    const t = new x(6);
-    return t.writeUint16(D.supported_groups), t.writeUint16(2), t.writeUint16(he[e]), t.uint8Array;
+    const t = new N(6);
+    return t.writeUint16(W.supported_groups), t.writeUint16(2), t.writeUint16(He[e]), t.uint8Array;
   }
 }
-const $ = {
+const V = {
   anonymous: 0,
   rsa: 1,
   dsa: 2,
   ecdsa: 3
-}, X = f($), V = {
+}, ee = p(V), z = {
   none: 0,
   md5: 1,
   sha1: 2,
@@ -522,8 +525,8 @@ const $ = {
   sha256: 4,
   sha384: 5,
   sha512: 6
-}, Q = f(V);
-class xe {
+}, te = p(z);
+class qe {
   /**
    * Binary layout:
    *
@@ -540,19 +543,19 @@ class xe {
    * +------------------------------------+
    */
   static decodeFromClient(e) {
-    const t = new m(e.buffer);
+    const t = new g(e.buffer);
     t.readUint16();
     const n = [];
     for (; !t.isFinished(); ) {
       const r = t.readUint8(), s = t.readUint8();
-      if (X[s]) {
-        if (!Q[r]) {
-          U.warn(`Unknown hash algorithm: ${r}`);
+      if (ee[s]) {
+        if (!te[r]) {
+          B.warn(`Unknown hash algorithm: ${r}`);
           continue;
         }
         n.push({
-          algorithm: X[s],
-          hash: Q[r]
+          algorithm: ee[s],
+          hash: te[r]
         });
       }
     }
@@ -570,34 +573,34 @@ class xe {
    * +--------------------------------------------------+
    */
   static encodeforClient(e, t) {
-    const n = new x(6);
-    return n.writeUint16(D.signature_algorithms), n.writeUint16(2), n.writeUint8(V[e]), n.writeUint8($[t]), n.uint8Array;
+    const n = new N(6);
+    return n.writeUint16(W.signature_algorithms), n.writeUint16(2), n.writeUint8(z[e]), n.writeUint8(V[t]), n.uint8Array;
   }
 }
-const ee = {
-  server_name: oe,
-  signature_algorithms: xe,
-  supported_groups: Ue,
-  ec_point_formats: Se,
-  renegotiation_info: Ce
+const ne = {
+  server_name: Ce,
+  signature_algorithms: qe,
+  supported_groups: Fe,
+  ec_point_formats: he,
+  renegotiation_info: Ae
 };
-function Me(i) {
-  const e = new m(i.buffer), t = [];
+function Oe(i) {
+  const e = new g(i.buffer), t = [];
   for (; !e.isFinished(); ) {
-    const n = e.offset, r = e.readUint16(), s = Re[r], a = e.readUint16(), _ = e.readUint8Array(a);
-    if (!(s in ee))
+    const n = e.offset, r = e.readUint16(), s = Ne[r], a = e.readUint16(), _ = e.readUint8Array(a);
+    if (!(s in ne))
       continue;
-    const S = ee[s];
+    const c = ne[s];
     t.push({
       type: s,
-      data: S.decodeFromClient(_),
+      data: c.decodeFromClient(_),
       raw: i.slice(n, n + 4 + a)
     });
   }
   return t;
 }
-async function O(i, e, t, n) {
-  const r = R([e, t]), s = await crypto.subtle.importKey(
+async function G(i, e, t, n) {
+  const r = v([e, t]), s = await crypto.subtle.importKey(
     "raw",
     i,
     { name: "HMAC", hash: { name: "SHA-256" } },
@@ -606,26 +609,26 @@ async function O(i, e, t, n) {
   );
   let a = r;
   const _ = [];
-  for (; R(_).byteLength < n; ) {
-    a = await te(s, a);
-    const c = R([a, r]), C = await te(s, c);
+  for (; v(_).byteLength < n; ) {
+    a = await re(s, a);
+    const S = v([a, r]), C = await re(s, S);
     _.push(C);
   }
-  return R(_).slice(0, n);
+  return v(_).slice(0, n);
 }
-async function te(i, e) {
+async function re(i, e) {
   return await crypto.subtle.sign(
     { name: "HMAC", hash: "SHA-256" },
     i,
     e
   );
 }
-const ve = {
+const je = {
   Null: 0
-}, Ae = {
+}, de = {
   Warning: 1,
   Fatal: 2
-}, ue = f(Ae), He = {
+}, fe = p(de), Ee = {
   CloseNotify: 0,
   UnexpectedMessage: 10,
   BadRecordMac: 20,
@@ -651,12 +654,12 @@ const ve = {
   UserCanceled: 90,
   NoRenegotiation: 100,
   UnsupportedExtension: 110
-}, de = f(He), l = {
+}, Te = p(Ee), l = {
   ChangeCipherSpec: 20,
   Alert: 21,
   Handshake: 22,
   ApplicationData: 23
-}, E = {
+}, f = {
   HelloRequest: 0,
   ClientHello: 1,
   ServerHello: 2,
@@ -665,7 +668,7 @@ const ve = {
   ServerHelloDone: 14,
   ClientKeyExchange: 16,
   Finished: 20
-}, Ne = {
+}, Ge = {
   /**
    * Indicates that a named curve is used.  This option
    * SHOULD be used when applicable.
@@ -674,12 +677,12 @@ const ve = {
   /**
    * Values 248 through 255 are reserved for private use.
    */
-}, ke = {
+}, $e = {
   secp256r1: 23
 };
-class q extends Error {
+class j extends Error {
 }
-const B = new Uint8Array([3, 3]), Fe = crypto.subtle.generateKey(
+const x = new Uint8Array([3, 3]), Ve = crypto.subtle.generateKey(
   {
     name: "ECDH",
     namedCurve: "P-256"
@@ -690,7 +693,7 @@ const B = new Uint8Array([3, 3]), Fe = crypto.subtle.generateKey(
   ["deriveKey", "deriveBits"]
   // Key usage
 );
-class qe {
+class ze {
   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.
@@ -707,7 +710,7 @@ class qe {
        * This will spread some messages across multiple records,
        * but TLS supports it so that's fine.
        */
-      downstream: Oe(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(
@@ -764,7 +767,7 @@ class qe {
    */
   async TLSHandshake(e, t) {
     const n = await this.readNextHandshakeMessage(
-      E.ClientHello
+      f.ClientHello
     );
     if (!n.body.cipher_suites.length)
       throw new Error(
@@ -773,16 +776,16 @@ class qe {
     const r = crypto.getRandomValues(new Uint8Array(32));
     await this.writeTLSRecord(
       l.Handshake,
-      I.serverHello(
+      K.serverHello(
         n.body,
         r,
-        ve.Null
+        je.Null
       )
     ), await this.writeTLSRecord(
       l.Handshake,
-      I.certificate(t)
+      K.certificate(t)
     );
-    const s = await Fe, a = n.body.random, _ = await I.ECDHEServerKeyExchange(
+    const s = await Ve, a = n.body.random, _ = await K.ECDHEServerKeyExchange(
       a,
       r,
       s,
@@ -790,10 +793,10 @@ class qe {
     );
     await this.writeTLSRecord(l.Handshake, _), await this.writeTLSRecord(
       l.Handshake,
-      I.serverHelloDone()
+      K.serverHelloDone()
     );
-    const S = await this.readNextHandshakeMessage(
-      E.ClientKeyExchange
+    const c = await this.readNextHandshakeMessage(
+      f.ClientKeyExchange
     );
     await this.readNextMessage(l.ChangeCipherSpec), this.sessionKeys = await this.deriveSessionKeys({
       clientRandom: a,
@@ -801,17 +804,17 @@ class qe {
       serverPrivateKey: s.privateKey,
       clientPublicKey: await crypto.subtle.importKey(
         "raw",
-        S.body.exchange_keys,
+        c.body.exchange_keys,
         { name: "ECDH", namedCurve: "P-256" },
         !1,
         []
       )
-    }), await this.readNextHandshakeMessage(E.Finished), await this.writeTLSRecord(
+    }), await this.readNextHandshakeMessage(f.Finished), await this.writeTLSRecord(
       l.ChangeCipherSpec,
-      I.changeCipherSpec()
+      K.changeCipherSpec()
     ), await this.writeTLSRecord(
       l.Handshake,
-      await I.createFinishedMessage(
+      await K.createFinishedMessage(
         this.handshakeMessages,
         this.sessionKeys.masterSecret
       )
@@ -836,24 +839,24 @@ class qe {
       256
       // Length of the derived secret (256 bits for P-256)
     ), a = new Uint8Array(
-      await O(
+      await G(
         s,
         new TextEncoder().encode("master secret"),
-        u([e, t]),
+        H([e, t]),
         48
       )
-    ), _ = await O(
+    ), _ = await G(
       a,
       new TextEncoder().encode("key expansion"),
-      u([t, e]),
+      H([t, e]),
       // Client key, server key, client IV, server IV
       40
-    ), S = new m(_), c = S.readUint8Array(16), C = S.readUint8Array(16), h = S.readUint8Array(4), A = S.readUint8Array(4);
+    ), c = new g(_), S = c.readUint8Array(16), C = c.readUint8Array(16), h = c.readUint8Array(4), A = c.readUint8Array(4);
     return {
       masterSecret: a,
       clientWriteKey: await crypto.subtle.importKey(
         "raw",
-        c,
+        S,
         { name: "AES-GCM" },
         !1,
         ["encrypt", "decrypt"]
@@ -880,7 +883,7 @@ class qe {
     do
       t = await this.readNextTLSRecord(e), n = await this.accumulateUntilMessageIsComplete(t);
     while (n === !1);
-    const r = T.TLSMessage(
+    const r = E.TLSMessage(
       t.type,
       n
     );
@@ -889,9 +892,9 @@ class qe {
   async readNextTLSRecord(e) {
     for (; ; ) {
       for (let _ = 0; _ < this.receivedTLSRecords.length; _++) {
-        const S = this.receivedTLSRecords[_];
-        if (S.type === e)
-          return this.receivedTLSRecords.splice(_, 1), S;
+        const c = this.receivedTLSRecords[_];
+        if (c.type === e)
+          return this.receivedTLSRecords.splice(_, 1), c;
       }
       const t = await this.pollBytes(5), n = t[3] << 8 | t[4], r = t[0], s = await this.pollBytes(n), a = {
         type: r,
@@ -903,11 +906,11 @@ class qe {
         fragment: this.sessionKeys && r !== l.ChangeCipherSpec ? await this.decryptData(r, s) : s
       };
       if (a.type === l.Alert) {
-        const _ = a.fragment[0], S = a.fragment[1], c = ue[_], C = de[S];
-        throw _ === Ae.Warning && S === He.CloseNotify ? new q(
+        const _ = a.fragment[0], c = a.fragment[1], S = fe[_], C = Te[c];
+        throw _ === de.Warning && c === Ee.CloseNotify ? new j(
           "TLS connection closed by peer (CloseNotify)"
         ) : new Error(
-          `TLS alert received: ${c} ${C}`
+          `TLS alert received: ${S} ${C}`
         );
       }
       this.receivedTLSRecords.push(a);
@@ -921,8 +924,8 @@ class qe {
     for (; this.receivedBytesBuffer.length < e; ) {
       const { value: n, done: r } = await this.clientUpstreamReader.read();
       if (r)
-        throw await this.close(), new q("TLS connection closed");
-      if (this.receivedBytesBuffer = u([
+        throw await this.close(), new j("TLS connection closed");
+      if (this.receivedBytesBuffer = H([
         this.receivedBytesBuffer,
         n
       ]), this.receivedBytesBuffer.length >= e)
@@ -945,7 +948,7 @@ class qe {
         this.serverUpstreamWriter.write(e.body);
       }
     } catch (e) {
-      if (e instanceof q)
+      if (e instanceof j)
         return;
       throw e;
     }
@@ -960,11 +963,11 @@ class qe {
         name: "AES-GCM",
         iv: s,
         additionalData: new Uint8Array([
-          ...z(this.receivedRecordSequenceNumber),
+          ...Z(this.receivedRecordSequenceNumber),
           e,
-          ...B,
+          ...x,
           // Payload length without IV and tag
-          ...K(t.length - 8 - 16)
+          ...D(t.length - 8 - 16)
         ]),
         tagLength: 128
       },
@@ -975,7 +978,7 @@ class qe {
     return ++this.receivedRecordSequenceNumber, new Uint8Array(a);
   }
   async accumulateUntilMessageIsComplete(e) {
-    this.partialTLSMessages[e.type] = u([
+    this.partialTLSMessages[e.type] = H([
       this.partialTLSMessages[e.type] || new Uint8Array(),
       e.fragment
     ]);
@@ -1011,9 +1014,9 @@ class qe {
    */
   async writeTLSRecord(e, t) {
     e === l.Handshake && this.handshakeMessages.push(t), this.sessionKeys && e !== l.ChangeCipherSpec && (t = await this.encryptData(e, t));
-    const n = B, r = t.length, s = new Uint8Array(5);
+    const n = x, r = t.length, s = new Uint8Array(5);
     s[0] = e, s[1] = n[0], s[2] = n[1], s[3] = r >> 8 & 255, s[4] = r & 255;
-    const a = u([s, t]);
+    const a = H([s, t]);
     this.clientDownstreamWriter.write(a);
   }
   /**
@@ -1022,11 +1025,11 @@ class qe {
    */
   async encryptData(e, t) {
     const n = this.sessionKeys.serverIV, r = crypto.getRandomValues(new Uint8Array(8)), s = new Uint8Array([...n, ...r]), a = new Uint8Array([
-      ...z(this.sentRecordSequenceNumber),
+      ...Z(this.sentRecordSequenceNumber),
       e,
-      ...B,
+      ...x,
       // Payload length without IV and tag
-      ...K(t.length)
+      ...D(t.length)
     ]), _ = await crypto.subtle.encrypt(
       {
         name: "AES-GCM",
@@ -1037,23 +1040,23 @@ class qe {
       this.sessionKeys.serverWriteKey,
       t
     );
-    return ++this.sentRecordSequenceNumber, u([
+    return ++this.sentRecordSequenceNumber, H([
       r,
       new Uint8Array(_)
     ]);
   }
 }
-class T {
+class E {
   static TLSMessage(e, t) {
     switch (e) {
       case l.Handshake:
-        return T.clientHandshake(t);
+        return E.clientHandshake(t);
       case l.Alert:
-        return T.alert(t);
+        return E.alert(t);
       case l.ChangeCipherSpec:
-        return T.changeCipherSpec();
+        return E.changeCipherSpec();
       case l.ApplicationData:
-        return T.applicationData(t);
+        return E.applicationData(t);
       default:
         throw new Error(`TLS: Unsupported TLS record type ${e}`);
     }
@@ -1082,12 +1085,12 @@ class T {
    * https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4
    */
   static parseCipherSuites(e) {
-    const t = new m(e);
+    const t = new g(e);
     t.readUint16();
     const n = [];
     for (; !t.isFinished(); ) {
       const r = t.readUint16();
-      r in Z && n.push(Z[r]);
+      r in J && n.push(J[r]);
     }
     return n;
   }
@@ -1106,25 +1109,25 @@ class T {
   static alert(e) {
     return {
       type: l.Alert,
-      level: ue[e[0]],
-      description: de[e[1]]
+      level: fe[e[0]],
+      description: Te[e[1]]
     };
   }
   static clientHandshake(e) {
     const t = e[0], n = e[1] << 16 | e[2] << 8 | e[3], r = e.slice(4);
     let s;
     switch (t) {
-      case E.HelloRequest:
-        s = T.clientHelloRequestPayload();
+      case f.HelloRequest:
+        s = E.clientHelloRequestPayload();
         break;
-      case E.ClientHello:
-        s = T.clientHelloPayload(r);
+      case f.ClientHello:
+        s = E.clientHelloPayload(r);
         break;
-      case E.ClientKeyExchange:
-        s = T.clientKeyExchangePayload(r);
+      case f.ClientKeyExchange:
+        s = E.clientKeyExchangePayload(r);
         break;
-      case E.Finished:
-        s = T.clientFinishedPayload(r);
+      case f.Finished:
+        s = E.clientFinishedPayload(r);
         break;
       default:
         throw new Error(`Invalid handshake type ${t}`);
@@ -1180,7 +1183,7 @@ class T {
    *	+------+------+---------------------------+
    */
   static clientHelloPayload(e) {
-    const t = new m(e.buffer), n = {
+    const t = new g(e.buffer), n = {
       client_version: t.readUint8Array(2),
       /**
        * Technically this consists of a GMT timestamp
@@ -1191,7 +1194,7 @@ class T {
     }, r = t.readUint8();
     n.session_id = t.readUint8Array(r);
     const s = t.readUint16();
-    n.cipher_suites = T.parseCipherSuites(
+    n.cipher_suites = E.parseCipherSuites(
       t.readUint8Array(s).buffer
     );
     const a = t.readUint8();
@@ -1199,7 +1202,7 @@ class T {
       a
     );
     const _ = t.readUint16();
-    return n.extensions = Me(
+    return n.extensions = Oe(
       t.readUint8Array(_)
     ), n;
   }
@@ -1224,7 +1227,7 @@ class T {
     };
   }
 }
-function Oe(i) {
+function Ye(i) {
   return new TransformStream({
     transform(e, t) {
       for (; e.length > 0; )
@@ -1232,18 +1235,18 @@ function Oe(i) {
     }
   });
 }
-class I {
+class K {
   static certificate(e) {
     const t = [];
     for (const s of e)
-      t.push(L(s.byteLength)), t.push(new Uint8Array(s));
-    const n = u(t), r = new Uint8Array([
-      ...L(n.byteLength),
+      t.push(m(s.byteLength)), t.push(new Uint8Array(s));
+    const n = H(t), r = new Uint8Array([
+      ...m(n.byteLength),
       ...n
     ]);
     return new Uint8Array([
-      E.Certificate,
-      ...L(r.length),
+      f.Certificate,
+      ...m(r.length),
       ...r
     ]);
   }
@@ -1285,9 +1288,9 @@ class I {
       await crypto.subtle.exportKey("raw", n.publicKey)
     ), a = new Uint8Array([
       // Curve type (1 byte)
-      Ne.NamedCurve,
+      Ge.NamedCurve,
       // Curve name (2 bytes)
-      ...K(ke.secp256r1),
+      ...D($e.secp256r1),
       // Public key length (1 byte)
       s.byteLength,
       // Public key (65 bytes, uncompressed format)
@@ -1299,18 +1302,18 @@ class I {
       },
       r,
       new Uint8Array([...e, ...t, ...a])
-    ), S = new Uint8Array(_), c = new Uint8Array([
-      V.sha256,
-      $.rsa
+    ), c = new Uint8Array(_), S = new Uint8Array([
+      z.sha256,
+      V.rsa
     ]), C = new Uint8Array([
       ...a,
-      ...c,
-      ...K(S.length),
-      ...S
+      ...S,
+      ...D(c.length),
+      ...c
     ]);
     return new Uint8Array([
-      E.ServerKeyExchange,
-      ...L(C.length),
+      f.ServerKeyExchange,
+      ...m(C.length),
       ...C
     ]);
   }
@@ -1356,34 +1359,34 @@ class I {
     const r = e.extensions.map((_) => {
       switch (_.type) {
         case "server_name":
-          return oe.encodeForClient();
+          return Ce.encodeForClient();
         case "ec_point_formats":
-          return Se.encodeForClient(
+          return he.encodeForClient(
             "uncompressed"
           );
         case "renegotiation_info":
-          return Ce.encodeForClient();
+          return Ae.encodeForClient();
       }
-    }).filter((_) => _ !== void 0), s = u(r), a = new Uint8Array([
+    }).filter((_) => _ !== void 0), s = H(r), a = new Uint8Array([
       // Version field – 0x03, 0x03 means TLS 1.2
-      ...B,
+      ...x,
       ...t,
       e.session_id.length,
       ...e.session_id,
-      ...K(le.TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256),
+      ...D(ue.TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256),
       n,
       // Extensions length (2 bytes)
-      ...K(s.length),
+      ...D(s.length),
       ...s
     ]);
     return new Uint8Array([
-      E.ServerHello,
-      ...L(a.length),
+      f.ServerHello,
+      ...m(a.length),
       ...a
     ]);
   }
   static serverHelloDone() {
-    return new Uint8Array([E.ServerHelloDone, ...L(0)]);
+    return new Uint8Array([f.ServerHelloDone, ...m(0)]);
   }
   /**
    * Server finished message.
@@ -1406,9 +1409,9 @@ class I {
   static async createFinishedMessage(e, t) {
     const n = await crypto.subtle.digest(
       "SHA-256",
-      u(e)
+      H(e)
     ), r = new Uint8Array(
-      await O(
+      await G(
         t,
         new TextEncoder().encode("server finished"),
         n,
@@ -1417,8 +1420,8 @@ class I {
       )
     );
     return new Uint8Array([
-      E.Finished,
-      ...L(r.length),
+      f.Finished,
+      ...m(r.length),
       ...r
     ]);
   }
@@ -1426,25 +1429,25 @@ class I {
     return new Uint8Array([1]);
   }
 }
-function je(i, e) {
-  return Ge.generateCertificate(i, e);
+function Ze(i, e) {
+  return Xe.generateCertificate(i, e);
 }
-function dt(i) {
+function gt(i) {
   return `-----BEGIN CERTIFICATE-----
-${Te(
-    Ee(i.buffer)
+${we(
+    pe(i.buffer)
   )}
 -----END CERTIFICATE-----`;
 }
-async function Et(i) {
+async function It(i) {
   const e = await crypto.subtle.exportKey("pkcs8", i);
   return `-----BEGIN PRIVATE KEY-----
-${Te(
-    Ee(e)
+${we(
+    pe(e)
   )}
 -----END PRIVATE KEY-----`;
 }
-class Ge {
+class Xe {
   static async generateCertificate(e, t) {
     const n = await crypto.subtle.generateKey(
       {
@@ -1511,7 +1514,7 @@ class Ge {
   }
   static signatureAlgorithm(e = "sha256WithRSAEncryption") {
     return o.sequence([
-      o.objectIdentifier(p(e)),
+      o.objectIdentifier(w(e)),
       o.null()
     ]);
   }
@@ -1525,7 +1528,7 @@ class Ge {
     const t = [];
     for (const [n, r] of Object.entries(e)) {
       const s = [
-        o.objectIdentifier(p(n))
+        o.objectIdentifier(w(n))
       ];
       switch (n) {
         case "countryName":
@@ -1541,16 +1544,16 @@ class Ge {
   static validity(e) {
     return o.sequence([
       o.ASN1(
-        H.UTCTime,
+        d.UTCTime,
         new TextEncoder().encode(
-          re((e == null ? void 0 : e.notBefore) ?? /* @__PURE__ */ new Date())
+          ie((e == null ? void 0 : e.notBefore) ?? /* @__PURE__ */ new Date())
         )
       ),
       o.ASN1(
-        H.UTCTime,
+        d.UTCTime,
         new TextEncoder().encode(
-          re(
-            (e == null ? void 0 : e.notAfter) ?? Ve(/* @__PURE__ */ new Date(), 10)
+          ie(
+            (e == null ? void 0 : e.notAfter) ?? Qe(/* @__PURE__ */ new Date(), 10)
           )
         )
       )
@@ -1564,14 +1567,14 @@ class Ge {
     return t !== void 0 && n.push(
       o.integer(new Uint8Array([t]))
     ), o.sequence([
-      o.objectIdentifier(p("basicConstraints")),
+      o.objectIdentifier(w("basicConstraints")),
       o.octetString(o.sequence(n))
     ]);
   }
   static keyUsage(e) {
     const t = new Uint8Array([0]);
     return e != null && e.digitalSignature && (t[0] |= 1), e != null && e.nonRepudiation && (t[0] |= 2), e != null && e.keyEncipherment && (t[0] |= 4), e != null && e.dataEncipherment && (t[0] |= 8), e != null && e.keyAgreement && (t[0] |= 16), e != null && e.keyCertSign && (t[0] |= 32), e != null && e.cRLSign && (t[0] |= 64), e != null && e.encipherOnly && (t[0] |= 128), e != null && e.decipherOnly && (t[0] |= 64), o.sequence([
-      o.objectIdentifier(p("keyUsage")),
+      o.objectIdentifier(w("keyUsage")),
       o.boolean(!0),
       // Critical
       o.octetString(o.bitString(t))
@@ -1579,13 +1582,13 @@ class Ge {
   }
   static extKeyUsage(e = {}) {
     return o.sequence([
-      o.objectIdentifier(p("extKeyUsage")),
+      o.objectIdentifier(w("extKeyUsage")),
       o.boolean(!0),
       // Critical
       o.octetString(
         o.sequence(
           Object.entries(e).map(([t, n]) => n ? o.objectIdentifier(
-            p(t)
+            w(t)
           ) : o.null())
         )
       )
@@ -1594,29 +1597,29 @@ class Ge {
   static nsCertType(e) {
     const t = new Uint8Array([0]);
     return e.client && (t[0] |= 1), e.server && (t[0] |= 2), e.email && (t[0] |= 4), e.objsign && (t[0] |= 8), e.sslCA && (t[0] |= 16), e.emailCA && (t[0] |= 32), e.objCA && (t[0] |= 64), o.sequence([
-      o.objectIdentifier(p("nsCertType")),
+      o.objectIdentifier(w("nsCertType")),
       o.octetString(t)
     ]);
   }
   static subjectAltName(e) {
     var s, a;
     const t = ((s = e.dnsNames) == null ? void 0 : s.map((_) => {
-      const S = o.ia5String(_);
-      return o.contextSpecific(2, S);
+      const c = o.ia5String(_);
+      return o.contextSpecific(2, c);
     })) || [], n = ((a = e.ipAddresses) == null ? void 0 : a.map((_) => {
-      const S = o.ia5String(_);
-      return o.contextSpecific(7, S);
+      const c = o.ia5String(_);
+      return o.contextSpecific(7, c);
     })) || [], r = o.octetString(
       o.sequence([...t, ...n])
     );
     return o.sequence([
-      o.objectIdentifier(p("subjectAltName")),
+      o.objectIdentifier(w("subjectAltName")),
       o.boolean(!0),
       r
     ]);
   }
 }
-const $e = {
+const Je = {
   // Algorithm OIDs
   "1.2.840.113549.1.1.1": "rsaEncryption",
   "1.2.840.113549.1.1.4": "md5WithRSAEncryption",
@@ -1726,13 +1729,13 @@ const $e = {
   "1.3.6.1.5.5.7.3.4": "emailProtection",
   "1.3.6.1.5.5.7.3.8": "timeStamping"
 };
-function p(i) {
-  for (const [e, t] of Object.entries($e))
+function w(i) {
+  for (const [e, t] of Object.entries(Je))
     if (t === i)
       return e;
   throw new Error(`OID not found for name: ${i}`);
 }
-const ne = 32, H = {
+const se = 32, d = {
   Boolean: 1,
   Integer: 2,
   BitString: 3,
@@ -1740,8 +1743,8 @@ const ne = 32, H = {
   Null: 5,
   OID: 6,
   Utf8String: 12,
-  Sequence: 16 | ne,
-  Set: 17 | ne,
+  Sequence: 16 | se,
+  Set: 17 | se,
   PrintableString: 19,
   IA5String: 22,
   UTCTime: 23
@@ -1768,21 +1771,24 @@ class o {
     return r[0] = e, r.set(n, 1), r.set(t, 1 + n.length), r;
   }
   static integer(e) {
-    if (e[0] > 127) {
-      const t = new Uint8Array(e.length + 1);
-      t[0] = 0, t.set(e, 1), e = t;
+    let t = 0;
+    for (; t < e.length - 1 && e[t] === 0 && e[t + 1] < 128; )
+      t++;
+    if (t > 0 && (e = e.subarray(t)), e[0] > 127) {
+      const n = new Uint8Array(e.length + 1);
+      n[0] = 0, n.set(e, 1), e = n;
     }
-    return o.ASN1(H.Integer, e);
+    return o.ASN1(d.Integer, e);
   }
   static bitString(e) {
     const t = new Uint8Array([0]), n = new Uint8Array(t.length + e.length);
-    return n.set(t), n.set(e, t.length), o.ASN1(H.BitString, n);
+    return n.set(t), n.set(e, t.length), o.ASN1(d.BitString, n);
   }
   static octetString(e) {
-    return o.ASN1(H.OctetString, e);
+    return o.ASN1(d.OctetString, e);
   }
   static null() {
-    return o.ASN1(H.Null, new Uint8Array(0));
+    return o.ASN1(d.Null, new Uint8Array(0));
   }
   static objectIdentifier(e) {
     const t = e.split(".").map(Number), r = [t[0] * 40 + t[1]];
@@ -1792,29 +1798,29 @@ class o {
       do
         _.unshift(a & 127), a >>= 7;
       while (a > 0);
-      for (let S = 0; S < _.length - 1; S++)
-        _[S] |= 128;
+      for (let c = 0; c < _.length - 1; c++)
+        _[c] |= 128;
       r.push(..._);
     }
-    return o.ASN1(H.OID, new Uint8Array(r));
+    return o.ASN1(d.OID, new Uint8Array(r));
   }
   static utf8String(e) {
     const t = new TextEncoder().encode(e);
-    return o.ASN1(H.Utf8String, t);
+    return o.ASN1(d.Utf8String, t);
   }
   static printableString(e) {
     const t = new TextEncoder().encode(e);
-    return o.ASN1(H.PrintableString, t);
+    return o.ASN1(d.PrintableString, t);
   }
   static sequence(e) {
-    return o.ASN1(H.Sequence, u(e));
+    return o.ASN1(d.Sequence, H(e));
   }
   static set(e) {
-    return o.ASN1(H.Set, u(e));
+    return o.ASN1(d.Set, H(e));
   }
   static ia5String(e) {
     const t = new TextEncoder().encode(e);
-    return o.ASN1(H.IA5String, t);
+    return o.ASN1(d.IA5String, t);
   }
   static contextSpecific(e, t, n = !1) {
     const r = (n ? 160 : 128) | e;
@@ -1822,45 +1828,45 @@ class o {
   }
   static boolean(e) {
     return o.ASN1(
-      H.Boolean,
+      d.Boolean,
       new Uint8Array([e ? 255 : 0])
     );
   }
 }
-function Ee(i) {
+function pe(i) {
   return btoa(String.fromCodePoint(...new Uint8Array(i)));
 }
-function Te(i) {
+function we(i) {
   var e;
   return ((e = i.match(/.{1,64}/g)) == null ? void 0 : e.join(`
 `)) || i;
 }
-function re(i) {
-  const e = i.getUTCFullYear().toString().substr(2), t = P(i.getUTCMonth() + 1), n = P(i.getUTCDate()), r = P(i.getUTCHours()), s = P(i.getUTCMinutes()), a = P(i.getUTCSeconds());
+function ie(i) {
+  const e = i.getUTCFullYear().toString().substr(2), t = R(i.getUTCMonth() + 1), n = R(i.getUTCDate()), r = R(i.getUTCHours()), s = R(i.getUTCMinutes()), a = R(i.getUTCSeconds());
   return `${e}${t}${n}${r}${s}${a}Z`;
 }
-function P(i) {
+function R(i) {
   return i.toString().padStart(2, "0");
 }
-function Ve(i, e) {
+function Qe(i, e) {
   const t = new Date(i);
   return t.setUTCFullYear(t.getUTCFullYear() + e), t;
 }
-class ze extends TransformStream {
+class et extends TransformStream {
   constructor() {
     let e = new Uint8Array(0), t = "SCAN_CHUNK_SIZE", n = 0;
     super({
       transform(r, s) {
-        for (e = u([e, r]); e.length > 0; )
+        for (e = H([e, r]); e.length > 0; )
           if (t === "SCAN_CHUNK_SIZE") {
             if (e.length < 3)
               return;
             let a = 0;
             for (; a < e.length; ) {
-              const c = e[a];
-              if (!(c >= 48 && c <= 57 || // 0-9
-              c >= 97 && c <= 102 || // a-f
-              c >= 65 && c <= 70)) break;
+              const S = e[a];
+              if (!(S >= 48 && S <= 57 || // 0-9
+              S >= 97 && S <= 102 || // a-f
+              S >= 65 && S <= 70)) break;
               a++;
             }
             if (a === 0)
@@ -1874,12 +1880,12 @@ class ze extends TransformStream {
               );
             const _ = new TextDecoder().decode(
               e.slice(0, a)
-            ), S = parseInt(_, 16);
-            if (e = e.slice(a + 2), S === 0) {
+            ), c = parseInt(_, 16);
+            if (e = e.slice(a + 2), c === 0) {
               t = "SCAN_FINAL_CHUNK", s.terminate();
               return;
             }
-            n = S, t = "SCAN_CHUNK_DATA";
+            n = c, t = "SCAN_CHUNK_DATA";
           } else if (t === "SCAN_CHUNK_DATA") {
             const a = Math.min(
               n,
@@ -1899,7 +1905,7 @@ class ze extends TransformStream {
     });
   }
 }
-const Ye = (i, e) => ({
+const tt = (i, e) => ({
   ...i,
   websocket: {
     url: (t, n, r) => `ws://playground.internal/?${new URLSearchParams({
@@ -1907,7 +1913,7 @@ const Ye = (i, e) => ({
       port: r
     }).toString()}`,
     subprotocol: "binary",
-    decorator: () => class extends Ze {
+    decorator: () => class extends nt {
       constructor(t, n) {
         super(t, n, {
           CAroot: e.CAroot,
@@ -1917,7 +1923,7 @@ const Ye = (i, e) => ({
     }
   }
 });
-class Ze {
+class nt {
   constructor(e, t, {
     CAroot: n,
     corsProxyUrl: r,
@@ -1985,10 +1991,10 @@ class Ze {
    */
   send(e) {
     if (!(this.readyState === this.CLOSING || this.readyState === this.CLOSED) && (this.clientUpstreamWriter.write(new Uint8Array(e)), !this.fetchInitiated))
-      switch (this.bufferedBytesFromClient = u([
+      switch (this.bufferedBytesFromClient = H([
         this.bufferedBytesFromClient,
         new Uint8Array(e)
-      ]), Xe(this.port, this.bufferedBytesFromClient)) {
+      ]), st(this.port, this.bufferedBytesFromClient)) {
         case !1:
           return;
         case "other":
@@ -2007,7 +2013,7 @@ class Ze {
       throw new Error(
         "TLS protocol is only supported when the TCPOverFetchWebsocket is instantiated with a CAroot"
       );
-    const e = await je(
+    const e = await Ze(
       {
         subject: {
           commonName: this.host,
@@ -2017,14 +2023,14 @@ class Ze {
         issuer: this.CAroot.tbsDescription.subject
       },
       this.CAroot.keyPair
-    ), t = new qe();
+    ), t = new ze();
     this.clientUpstream.readable.pipeTo(t.clientEnd.upstream.writable).catch(() => {
     }), t.clientEnd.downstream.readable.pipeTo(this.clientDownstream.writable).catch(() => {
     }), await t.TLSHandshake(e.keyPair.privateKey, [
       e.certificate,
       this.CAroot.certificate
     ]);
-    const { request: n, expectsContinue: r } = await y.parseHttpRequest(
+    const { request: n, expectsContinue: r } = await L.parseHttpRequest(
       t.serverEnd.upstream.readable,
       this.host,
       "https"
@@ -2038,7 +2044,7 @@ class Ze {
       ), s.releaseLock();
     }
     try {
-      await y.fetchRawResponseBytes(
+      await L.fetchRawResponseBytes(
         n,
         this.corsProxyUrl
       ).pipeTo(t.serverEnd.downstream.writable);
@@ -2046,7 +2052,7 @@ class Ze {
     }
   }
   async fetchOverHTTP() {
-    const { request: e, expectsContinue: t } = await y.parseHttpRequest(
+    const { request: e, expectsContinue: t } = await L.parseHttpRequest(
       this.clientUpstream.readable,
       this.host,
       "http"
@@ -2060,7 +2066,7 @@ class Ze {
       ), n.releaseLock();
     }
     try {
-      await y.fetchRawResponseBytes(
+      await L.fetchRawResponseBytes(
         e,
         this.corsProxyUrl
       ).pipeTo(this.clientDownstream.writable);
@@ -2071,7 +2077,7 @@ class Ze {
     this.emit("message", { data: new Uint8Array(0) }), this.readyState = this.CLOSING, this.emit("close"), this.readyState = this.CLOSED;
   }
 }
-const Je = [
+const rt = [
   "GET",
   "POST",
   "HEAD",
@@ -2081,7 +2087,7 @@ const Je = [
   "PUT",
   "TRACE"
 ];
-function Xe(i, e) {
+function st(i, e) {
   if (e.length < 8)
     return !1;
   if (i === 443 && e[0] === l.Handshake && // TLS versions between 1.0 and 1.2
@@ -2090,11 +2096,11 @@ function Xe(i, e) {
   const n = new TextDecoder("latin1", {
     fatal: !0
   }).decode(e);
-  return Je.some(
+  return rt.some(
     (s) => n.startsWith(s + " ")
   ) ? "http" : "other";
 }
-class y {
+class L {
   /**
    * Streams a HTTP response including the status line and headers.
    */
@@ -2104,12 +2110,12 @@ class y {
         var _;
         let r;
         try {
-          r = await Ke(
+          r = await Re(
             e,
             void 0,
             t
           );
-        } catch (S) {
+        } catch (c) {
           n.enqueue(
             new TextEncoder().encode(
               `HTTP/1.1 400 Bad Request\r
@@ -2117,10 +2123,10 @@ Content-Length: 0\r
 \r
 `
             )
-          ), n.error(S);
+          ), n.error(c);
           return;
         }
-        n.enqueue(y.headersAsBytes(r));
+        n.enqueue(L.headersAsBytes(r));
         const s = (_ = r.body) == null ? void 0 : _.getReader();
         if (!s) {
           n.close();
@@ -2128,12 +2134,12 @@ Content-Length: 0\r
         }
         const a = new TextEncoder();
         for (; ; ) {
-          const { done: S, value: c } = await s.read();
-          if (c && (n.enqueue(
-            a.encode(`${c.length.toString(16)}\r
+          const { done: c, value: S } = await s.read();
+          if (S && (n.enqueue(
+            a.encode(`${S.length.toString(16)}\r
 `)
-          ), n.enqueue(c), n.enqueue(a.encode(`\r
-`))), S) {
+          ), n.enqueue(S), n.enqueue(a.encode(`\r
+`))), c) {
             n.enqueue(a.encode(`0\r
 \r
 `)), n.close();
@@ -2165,81 +2171,81 @@ Content-Length: 0\r
     let r = new Uint8Array(0), s = !1, a = -1;
     const _ = e.getReader();
     for (; a === -1; ) {
-      const { done: v, value: W } = await _.read();
-      if (v) {
+      const { done: k, value: P } = await _.read();
+      if (k) {
         s = !0;
         break;
       }
-      r = u([r, W]), a = Qe(
+      r = H([r, P]), a = it(
         r,
         new Uint8Array([13, 10, 13, 10])
       );
     }
     _.releaseLock();
-    const S = r.slice(0, a), c = y.parseRequestHeaders(S), C = c.headers.get("Transfer-Encoding") !== null ? "chunked" : "content-length", h = c.headers.get("Content-Length") !== null ? parseInt(c.headers.get("Content-Length"), 10) : void 0, A = r.slice(
+    const c = r.slice(0, a), S = L.parseRequestHeaders(c), C = S.headers.get("Transfer-Encoding") !== null ? "chunked" : "content-length", h = S.headers.get("Content-Length") !== null ? parseInt(S.headers.get("Content-Length"), 10) : void 0, A = r.slice(
       a + 4
       /* Skip \r\n\r\n */
     );
-    let d;
-    if (c.method !== "GET") {
-      const v = e.getReader();
-      let W = A.length, N = A.slice(-6);
-      const we = new TextEncoder().encode(`0\r
+    let u;
+    if (S.method !== "GET") {
+      const k = e.getReader();
+      let P = A.length, F = A.slice(-6);
+      const me = new TextEncoder().encode(`0\r
 \r
 `);
-      d = new ReadableStream({
+      u = new ReadableStream({
         async start(b) {
           A.length > 0 && b.enqueue(A);
-          const k = C === "content-length" && h !== void 0 && W >= h;
-          (s || k) && b.close();
+          const q = C === "content-length" && h !== void 0 && P >= h;
+          (s || q) && b.close();
         },
         async pull(b) {
-          const { done: k, value: g } = await v.read();
-          if (W += (g == null ? void 0 : g.length) || 0, g && (b.enqueue(g), N = u([
-            N,
-            g || new Uint8Array()
-          ]).slice(-5)), k || C === "content-length" && h !== void 0 && W >= h || C === "chunked" && N.every(
-            (Le, ye) => Le === we[ye]
+          const { done: q, value: I } = await k.read();
+          if (P += (I == null ? void 0 : I.length) || 0, I && (b.enqueue(I), F = H([
+            F,
+            I || new Uint8Array()
+          ]).slice(-5)), q || C === "content-length" && h !== void 0 && P >= h || C === "chunked" && F.every(
+            (Le, ge) => Le === me[ge]
           )) {
             b.close();
             return;
           }
         }
-      }), C === "chunked" && (d = d.pipeThrough(
-        new ze()
+      }), C === "chunked" && (u = u.pipeThrough(
+        new et()
       ));
     }
-    const M = c.headers.get("Host") ?? t, pe = new URL(c.path, n + "://" + M);
+    const T = S.headers.get("Host") ?? t, y = new URL(S.path, n + "://" + T);
     return {
-      request: new Request(pe.toString(), {
-        method: c.method,
-        headers: c.headers,
-        body: d,
+      request: new Request(y.toString(), {
+        method: S.method,
+        headers: S.headers,
+        body: u,
         // @ts-expect-error duplex is required for streaming request bodies
-        duplex: d ? "half" : void 0
+        duplex: u ? "half" : void 0
       }),
-      expectsContinue: c.expectsContinue
+      expectsContinue: S.expectsContinue
     };
   }
   static parseRequestHeaders(e) {
-    var S;
+    var c;
     const t = new TextDecoder().decode(e), n = t.split(`
 `)[0], [r, s] = n.split(" "), a = new Headers();
-    for (const c of t.split(`\r
+    for (const S of t.split(`\r
 `).slice(1)) {
-      if (c === "")
+      if (S === "")
         break;
-      const C = c.indexOf(":");
+      const C = S.indexOf(":");
       if (C === -1)
         continue;
-      const h = c.slice(0, C).trim(), A = c.slice(C + 1).trimStart();
+      const h = S.slice(0, C).trim(), A = S.slice(C + 1).trimStart();
       h !== "" && a.set(h, A);
     }
-    const _ = ((S = a.get("Expect")) == null ? void 0 : S.toLowerCase()) === "100-continue";
+    const _ = ((c = a.get("Expect")) == null ? void 0 : c.toLowerCase()) === "100-continue";
     return a.delete("Expect"), { method: r, path: s, headers: a, expectsContinue: _ };
   }
 }
-function Qe(i, e) {
+function it(i, e) {
   const t = i.length, n = e.length, r = t - n;
   for (let s = 0; s <= r; s++) {
     let a = !0;
@@ -2253,7 +2259,7 @@ function Qe(i, e) {
   }
   return -1;
 }
-async function et(i = G) {
+async function at(i = oe) {
   switch (i) {
     case "8.5":
       return (await import("@php-wasm/web-8-5")).getIntlExtensionPath();
@@ -2272,48 +2278,57 @@ async function et(i = G) {
   }
   throw new Error(`Unsupported PHP version ${i}`);
 }
-async function tt(i = G, e) {
-  const t = De(fetch), n = "intl.so", r = "icu.dat", s = await et(i), a = (await import("./shared/icu.dat")).default, [_, S] = await Promise.all([
-    t(s).then((c) => c.arrayBuffer()),
-    t(a).then((c) => c.arrayBuffer())
-  ]);
-  return {
-    ...e,
-    ENV: {
-      ...e.ENV,
-      PHP_INI_SCAN_DIR: "/internal/shared/extensions",
+async function _t(i, e, t, n = []) {
+  if (!n.length)
+    return t;
+  const r = await Promise.all(
+    n.map(
+      (s) => ot(i, e, s)
+    )
+  );
+  return Ie(t, r);
+}
+async function ot(i, e, t) {
+  if (typeof t == "object" && "source" in t)
+    return await Y({
+      ...t,
+      phpVersion: i,
+      asyncMode: e
+    });
+  const n = typeof t == "string" ? t : t.name;
+  if (n !== "intl")
+    throw new Error(`Unknown bundled PHP web extension: ${String(n)}.`);
+  const r = Be(fetch), s = await at(i), a = (await import("../intl/shared/icu.dat")).default, [_, c] = await Promise.all(
+    [s, a].map(async (S) => {
+      const C = await r(S);
+      if (!C.ok)
+        throw new Error(
+          `Failed to fetch bundled PHP web extension asset: ${C.url || S} (${C.status} ${C.statusText}).`
+        );
+      return await C.arrayBuffer();
+    })
+  );
+  return await Y({
+    source: {
+      format: "so",
+      name: "intl",
+      bytes: new Uint8Array(_)
+    },
+    phpVersion: i,
+    asyncMode: e,
+    env: {
       ICU_DATA: "/internal/shared"
     },
-    onRuntimeInitialized: (c) => {
-      e.onRuntimeInitialized && e.onRuntimeInitialized(c), w.fileExists(
-        c.FS,
-        "/internal/shared/extensions"
-      ) || c.FS.mkdirTree("/internal/shared/extensions"), w.fileExists(
-        c.FS,
-        `/internal/shared/extensions/${n}`
-      ) || c.FS.writeFile(
-        `/internal/shared/extensions/${n}`,
-        new Uint8Array(_)
-      ), w.fileExists(
-        c.FS,
-        "/internal/shared/extensions/intl.ini"
-      ) || c.FS.writeFile(
-        "/internal/shared/extensions/intl.ini",
-        [
-          `extension=/internal/shared/extensions/${n}`
-        ].join(`
-`)
-      ), w.fileExists(
-        c.FS,
-        `${c.ENV.ICU_DATA}/${r}`
-      ) || (c.FS.mkdirTree(c.ENV.ICU_DATA), c.FS.writeFile(
-        `${c.ENV.ICU_DATA}/icudt74l.dat`,
-        new Uint8Array(S)
-      ));
+    extraFiles: {
+      targetPath: "/internal/shared",
+      files: {
+        // The Intl extension looks for the hard-coded ICU data name.
+        "icudt74l.dat": new Uint8Array(c)
+      }
     }
-  };
+  });
 }
-const nt = () => ({
+const ct = () => ({
   websocket: {
     decorator: (i) => class extends i {
       constructor() {
@@ -2328,24 +2343,47 @@ const nt = () => ({
     }
   }
 });
-async function ft(i, e = {}) {
-  var s;
-  "setImmediate" in globalThis || (globalThis.setImmediate = (a) => setTimeout(a, 0));
-  let t = {
-    ...nt(),
-    ...e.emscriptenOptions || {}
+async function Dt(i, e = {}) {
+  var c;
+  "setImmediate" in globalThis || (globalThis.setImmediate = (S) => setTimeout(S, 0));
+  const t = await Ue() ? "jspi" : "asyncify";
+  let n = {
+    ...ct(),
+    ...e.emscriptenOptions || {},
+    phpWasmAsyncMode: t
   };
-  e.tcpOverFetch && (t = Ye(
-    t,
+  e.tcpOverFetch && (n = tt(
+    n,
     e.tcpOverFetch
-  )), e.withIntl && (t = tt(i, t));
-  const [n, r] = await Promise.all([
-    Pe(i),
-    t
+  ));
+  const r = Ke(i), s = [...e.extensions ?? []];
+  if (e.withIntl && !St(s, "intl") && s.push("intl"), r) {
+    const S = await n, C = S.preRun || [];
+    n = {
+      ...S,
+      preRun: [...C, De()]
+    };
+  }
+  if (r && s.length)
+    throw new Error(
+      `Extensions are not available for legacy PHP ${i}.`
+    );
+  r || (n = _t(
+    i,
+    t,
+    await n,
+    s
+  ));
+  const [a, _] = await Promise.all([
+    xe(i),
+    n
   ]);
-  return (s = e.onPhpLoaderModuleLoaded) == null || s.call(e, n), await me(n, r);
+  return (c = e.onPhpLoaderModuleLoaded) == null || c.call(e, a), await We(a, _);
+}
+function St(i, e) {
+  return i.some((t) => typeof t == "string" ? t === e : !("source" in t) && t.name === e);
 }
-function pt(i, e) {
+function Wt(i, e) {
   window.addEventListener("message", (t) => {
     t.source === i.contentWindow && (e && t.origin !== e || typeof t.data != "object" || t.data.type !== "relay" || window.parent.postMessage(t.data, "*"));
   }), window.addEventListener("message", (t) => {
@@ -2353,7 +2391,7 @@ function pt(i, e) {
     t.source === window.parent && (typeof t.data != "object" || t.data.type !== "relay" || (n = i == null ? void 0 : i.contentWindow) == null || n.postMessage(t.data));
   });
 }
-async function wt(i) {
+async function Pt(i) {
   const e = new Worker(i, { type: "module" });
   return new Promise((t, n) => {
     e.onerror = (s) => {
@@ -2368,7 +2406,8 @@ async function wt(i) {
     e.addEventListener("message", r);
   });
 }
-function Lt(i, e = { initialSync: {} }) {
+const Ct = 1e3;
+function bt(i, e = { initialSync: {} }) {
   return e = {
     ...e,
     initialSync: {
@@ -2376,57 +2415,60 @@ function Lt(i, e = { initialSync: {} }) {
       direction: e.initialSync.direction ?? "opfs-to-memfs"
     }
   }, async function(t, n, r) {
-    return e.initialSync.direction === "opfs-to-memfs" ? (w.fileExists(n, r) && w.rmdir(n, r), w.mkdir(n, r), await rt(n, i, r)) : await fe(
+    var a;
+    e.initialSync.direction === "opfs-to-memfs" ? (M.fileExists(n, r) && M.rmdir(n, r), M.mkdir(n, r), await lt(n, i, r)) : await ye(
       n,
       i,
       r,
       e.initialSync.onProgress
-    ), it(t, i, r);
+    );
+    const s = At(t, i, r);
+    return (a = e.onMount) == null || a.call(e, s), s.unmount;
   };
 }
-async function rt(i, e, t) {
-  w.mkdir(i, t);
-  const n = new ge({
+async function lt(i, e, t) {
+  M.mkdir(i, t);
+  const n = new Pe({
     concurrency: 40
   }), r = [], s = [
     [e, t]
   ];
   for (; s.length > 0; ) {
     const [a, _] = s.pop();
-    for await (const S of a.values()) {
-      const c = n.run(async () => {
-        const C = ae(
+    for await (const c of a.values()) {
+      const S = n.run(async () => {
+        const C = ce(
           _,
-          S.name
+          c.name
         );
-        if (S.kind === "directory") {
+        if (c.kind === "directory") {
           try {
             i.mkdir(C);
           } catch (h) {
             if ((h == null ? void 0 : h.errno) !== 20)
-              throw U.error(h), h;
+              throw B.error(h), h;
           }
-          s.push([S, C]);
-        } else if (S.kind === "file") {
-          const h = await S.getFile(), A = new Uint8Array(await h.arrayBuffer());
+          s.push([c, C]);
+        } else if (c.kind === "file") {
+          const h = await c.getFile(), A = new Uint8Array(await h.arrayBuffer());
           i.createDataFile(
             _,
-            S.name,
+            c.name,
             A,
             !0,
             !0,
             !0
           );
         }
-        r.splice(r.indexOf(c), 1);
+        r.splice(r.indexOf(S), 1);
       });
-      r.push(c);
+      r.push(S);
     }
     for (; s.length === 0 && r.length > 0; )
       await Promise.any(r);
   }
 }
-async function fe(i, e, t, n) {
+async function ye(i, e, t, n) {
   i.mkdirTree(t);
   const r = [];
   async function s(C, h) {
@@ -2434,47 +2476,47 @@ async function fe(i, e, t, n) {
       i.readdir(C).filter(
         (A) => A !== "." && A !== ".."
       ).map(async (A) => {
-        const d = ae(C, A);
-        if (!st(i, d)) {
-          r.push([h, d, A]);
+        const u = ce(C, A);
+        if (!ht(i, u)) {
+          r.push([h, u, A]);
           return;
         }
-        const M = await h.getDirectoryHandle(A, {
+        const T = await h.getDirectoryHandle(A, {
           create: !0
         });
-        return await s(d, M);
+        return await s(u, T);
       })
     );
   }
   await s(t, e);
   let a = 0;
-  const _ = n && ot(n, 100), S = 100, c = /* @__PURE__ */ new Set();
+  const _ = n && dt(n, 100), c = 100, S = /* @__PURE__ */ new Set();
   try {
     for (const [C, h, A] of r) {
-      const d = j(
+      const u = $(
         C,
         A,
         i,
         h
       ).then(() => {
-        a++, c.delete(d), _ == null || _({
+        a++, S.delete(u), _ == null || _({
           files: a,
           total: r.length
         });
       });
-      c.add(d), c.size >= S && (await Promise.race(c), _ == null || _({
+      S.add(u), S.size >= c && (await Promise.race(S), _ == null || _({
         files: a,
         total: r.length
       }));
     }
   } finally {
-    await Promise.allSettled(c);
+    await Promise.allSettled(S);
   }
 }
-function st(i, e) {
+function ht(i, e) {
   return i.isDir(i.lookupPath(e, { follow: !0 }).node.mode);
 }
-async function j(i, e, t, n) {
+async function $(i, e, t, n) {
   let r;
   try {
     r = t.readFile(n, {
@@ -2496,38 +2538,69 @@ async function j(i, e, t, n) {
     await a.close();
   }
 }
-function it(i, e, t) {
-  const n = [], r = We(i, t, (_) => {
-    n.push(_);
-  }), s = new at(i, e, t);
-  async function a() {
-    if (n.length === 0)
+function At(i, e, t, n = {}) {
+  const r = [], s = ve(i, t, (u) => {
+    r.push(u);
+  }), a = new ut(i, e, t);
+  let _;
+  function c() {
+    return _ === void 0 && (_ = h().finally(() => {
+      _ = void 0;
+    })), _;
+  }
+  async function S() {
+    try {
+      await c();
+    } finally {
+      s(), i.removeEventListener("request.end", C), i.removeEventListener("filesystem.write", C);
+    }
+  }
+  function C() {
+    c().catch((u) => {
+      B.error(u);
+    });
+  }
+  async function h() {
+    const u = n.maxFlushPasses ?? Ct;
+    for (let T = 0; r.length > 0; T++) {
+      if (T >= u) {
+        const y = r.length, U = y === 1 ? `${y} journal entry remains` : `${y} journal entries remain`;
+        throw new Error(
+          `OPFS flush for "${t}" did not settle after ${u} journal batches; ${U}. This can happen when filesystem writes are continuously enqueued while flushing.`
+        );
+      }
+      await A();
+    }
+  }
+  async function A() {
+    if (r.length === 0)
       return;
-    const _ = await i.semaphore.acquire(), S = [...n];
-    n.splice(0, S.length);
-    const c = be(S);
+    const u = await i.semaphore.acquire(), T = [...r];
+    r.splice(0, T.length);
+    const y = Me(T);
     try {
-      for (const C of c)
-        await s.processEntry(C);
+      for (const U of y)
+        await a.processEntry(U);
     } finally {
-      _();
+      u();
     }
   }
-  return i.addEventListener("request.end", a), i.addEventListener("filesystem.write", a), function() {
-    r(), i.removeEventListener("request.end", a), i.removeEventListener("filesystem.write", a);
+  return i.addEventListener("request.end", C), i.addEventListener("filesystem.write", C), {
+    flush: c,
+    unmount: S
   };
 }
-class at {
+class ut {
   constructor(e, t, n) {
-    this.php = e, this.opfs = t, this.memfsRoot = se(n);
+    this.php = e, this.opfs = t, this.memfsRoot = ae(n);
   }
   toOpfsPath(e) {
-    return se(e.substring(this.memfsRoot.length));
+    return ae(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), n = await ie(this.opfs, t), r = _t(t);
+    const t = this.toOpfsPath(e.path), n = await _e(this.opfs, t), r = Ht(t);
     if (r)
       try {
         if (e.operation === "DELETE")
@@ -2544,14 +2617,14 @@ class at {
             create: !0
           });
         else if (e.operation === "WRITE")
-          await j(
+          await $(
             n,
             r,
-            this.php[F].FS,
+            this.php[O].FS,
             e.path
           );
         else if (e.operation === "RENAME" && e.toPath.startsWith(this.memfsRoot)) {
-          const s = this.toOpfsPath(e.toPath), a = await ie(
+          const s = this.toOpfsPath(e.toPath), a = await _e(
             this.opfs,
             s
           );
@@ -2562,8 +2635,8 @@ class at {
                 create: !0
               }
             );
-            await fe(
-              this.php[F].FS,
+            await ye(
+              this.php[O].FS,
               _,
               e.toPath
             ), await n.removeEntry(r, {
@@ -2574,26 +2647,26 @@ class at {
               await n.removeEntry(r);
             } catch {
             }
-            await j(
+            await $(
               a,
-              Ie(s),
-              this.php[F].FS,
+              be(s),
+              this.php[O].FS,
               e.toPath
             );
           }
         }
       } catch (s) {
-        throw U.log({ entry: e, name: r }), U.error(s), s;
+        throw B.log({ entry: e, name: r }), B.error(s), s;
       }
   }
 }
-function se(i) {
+function ae(i) {
   return i.replace(/\/$/, "").replace(/\/\/+/g, "/");
 }
-function _t(i) {
+function Ht(i) {
   return i.substring(i.lastIndexOf("/") + 1);
 }
-async function ie(i, e) {
+async function _e(i, e) {
   const t = e.replace(/^\/+|\/+$/g, "").replace(/\/+/, "/");
   if (!t)
     return i;
@@ -2605,31 +2678,31 @@ async function ie(i, e) {
   }
   return r;
 }
-function ot(i, e) {
+function dt(i, e) {
   let t = 0, n, r;
   return function(...a) {
     r = a;
     const _ = Date.now() - t;
     if (n === void 0) {
-      const S = Math.max(0, e - _);
+      const c = Math.max(0, e - _);
       n = setTimeout(() => {
         n = void 0, t = Date.now(), i(...r);
-      }, S);
+      }, c);
     }
   };
 }
 export {
-  Dt as FirewallInterferenceError,
-  dt as certificateToPEM,
-  gt as consumeAPI,
-  Lt as createDirectoryHandleMountHandler,
-  It as exposeAPI,
-  Wt as fetchWithCorsProxy,
-  je as generateCertificate,
-  Pe as getPHPLoaderModule,
-  ft as loadWebRuntime,
-  Et as privateKeyToPEM,
-  pt as setupPostMessageRelay,
-  wt as spawnPHPWorkerThread
+  xt as FirewallInterferenceError,
+  gt as certificateToPEM,
+  Ut as consumeAPI,
+  bt as createDirectoryHandleMountHandler,
+  vt as exposeAPI,
+  Nt as fetchWithCorsProxy,
+  Ze as generateCertificate,
+  xe as getPHPLoaderModule,
+  Dt as loadWebRuntime,
+  It as privateKeyToPEM,
+  Wt as setupPostMessageRelay,
+  Pt as spawnPHPWorkerThread
 };
 //# sourceMappingURL=index.js.map