@php-wasm/web 1.1.4 → 1.1.5

package/index.js

@@ -606,8 +606,8 @@ async function q(i, e, t, r) {
   const a = [];
   for (; B(a).byteLength < r; ) {
     _ = await Q(s, _);
-    const S = B([_, n]), A = await Q(s, S);
-    a.push(A);
+    const S = B([_, n]), h = await Q(s, S);
+    a.push(h);
   }
   return B(a).slice(0, r);
 }
@@ -649,12 +649,12 @@ const ve = {
   UserCanceled: 90,
   NoRenegotiation: 100,
   UnsupportedExtension: 110
-}, Ae = f(Ne), C = {
+}, he = f(Ne), C = {
   ChangeCipherSpec: 20,
   Alert: 21,
   Handshake: 22,
   ApplicationData: 23
-}, d = {
+}, T = {
   HelloRequest: 0,
   ClientHello: 1,
   ServerHello: 2,
@@ -762,7 +762,7 @@ class Oe {
    */
   async TLSHandshake(e, t) {
     const r = await this.readNextHandshakeMessage(
-      d.ClientHello
+      T.ClientHello
     );
     if (!r.body.cipher_suites.length)
       throw new Error(
@@ -791,7 +791,7 @@ class Oe {
       g.serverHelloDone()
     );
     const c = await this.readNextHandshakeMessage(
-      d.ClientKeyExchange
+      T.ClientKeyExchange
     );
     await this.readNextMessage(C.ChangeCipherSpec), this.sessionKeys = await this.deriveSessionKeys({
       clientRandom: _,
@@ -804,7 +804,7 @@ class Oe {
         !1,
         []
       )
-    }), await this.readNextHandshakeMessage(d.Finished), await this.writeTLSRecord(
+    }), await this.readNextHandshakeMessage(T.Finished), await this.writeTLSRecord(
       C.ChangeCipherSpec,
       g.changeCipherSpec()
     ), await this.writeTLSRecord(
@@ -846,7 +846,7 @@ class Oe {
       u([t, e]),
       // Client key, server key, client IV, server IV
       40
-    ), c = new y(a), S = c.readUint8Array(16), A = c.readUint8Array(16), h = c.readUint8Array(4), l = c.readUint8Array(4);
+    ), c = new y(a), S = c.readUint8Array(16), h = c.readUint8Array(16), A = c.readUint8Array(4), l = c.readUint8Array(4);
     return {
       masterSecret: _,
       clientWriteKey: await crypto.subtle.importKey(
@@ -858,12 +858,12 @@ class Oe {
       ),
       serverWriteKey: await crypto.subtle.importKey(
         "raw",
-        A,
+        h,
         { name: "AES-GCM" },
         !1,
         ["encrypt", "decrypt"]
       ),
-      clientIV: h,
+      clientIV: A,
       serverIV: l
     };
   }
@@ -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 = Ce[_.fragment[0]], c = he[_.fragment[1]];
         throw new Error(
           `TLS non-warning alert received: ${a} ${c}`
         );
@@ -1105,23 +1105,23 @@ class E {
     return {
       type: C.Alert,
       level: Ce[e[0]],
-      description: Ae[e[1]]
+      description: he[e[1]]
     };
   }
   static clientHandshake(e) {
     const t = e[0], r = e[1] << 16 | e[2] << 8 | e[3], n = e.slice(4);
     let s;
     switch (t) {
-      case d.HelloRequest:
+      case T.HelloRequest:
         s = E.clientHelloRequestPayload();
         break;
-      case d.ClientHello:
+      case T.ClientHello:
         s = E.clientHelloPayload(n);
         break;
-      case d.ClientKeyExchange:
+      case T.ClientKeyExchange:
         s = E.clientKeyExchangePayload(n);
         break;
-      case d.Finished:
+      case T.Finished:
         s = E.clientFinishedPayload(n);
         break;
       default:
@@ -1240,7 +1240,7 @@ class g {
       ...r
     ]);
     return new Uint8Array([
-      d.Certificate,
+      T.Certificate,
       ...w(n.length),
       ...n
     ]);
@@ -1300,16 +1300,16 @@ class g {
     ), c = new Uint8Array(a), S = new Uint8Array([
       j.sha256,
       F.rsa
-    ]), A = new Uint8Array([
+    ]), h = new Uint8Array([
       ..._,
       ...S,
       ...K(c.length),
       ...c
     ]);
     return new Uint8Array([
-      d.ServerKeyExchange,
-      ...w(A.length),
-      ...A
+      T.ServerKeyExchange,
+      ...w(h.length),
+      ...h
     ]);
   }
   /**
@@ -1369,13 +1369,13 @@ class g {
       ...s
     ]);
     return new Uint8Array([
-      d.ServerHello,
+      T.ServerHello,
       ...w(_.length),
       ..._
     ]);
   }
   static serverHelloDone() {
-    return new Uint8Array([d.ServerHelloDone, ...w(0)]);
+    return new Uint8Array([T.ServerHelloDone, ...w(0)]);
   }
   /**
    * Server finished message.
@@ -1409,7 +1409,7 @@ class g {
       )
     );
     return new Uint8Array([
-      d.Finished,
+      T.Finished,
       ...w(n.length),
       ...n
     ]);
@@ -1424,7 +1424,7 @@ function je(i, e) {
 function Ht(i) {
   return `-----BEGIN CERTIFICATE-----
 ${le(
-    he(i.buffer)
+    Ae(i.buffer)
   )}
 -----END CERTIFICATE-----`;
 }
@@ -1432,7 +1432,7 @@ async function dt(i) {
   const e = await crypto.subtle.exportKey("pkcs8", i);
   return `-----BEGIN PRIVATE KEY-----
 ${le(
-    he(e)
+    Ae(e)
   )}
 -----END PRIVATE KEY-----`;
 }
@@ -1533,13 +1533,13 @@ 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())
         )
       ),
       o.ASN1(
-        H.UTCTime,
+        d.UTCTime,
         new TextEncoder().encode(
           re(
             (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, H = {
+const te = 32, d = {
   Boolean: 1,
   Integer: 2,
   BitString: 3,
@@ -1764,17 +1764,17 @@ class o {
       const t = new Uint8Array(e.length + 1);
       t[0] = 0, t.set(e, 1), e = t;
     }
-    return o.ASN1(H.Integer, e);
+    return o.ASN1(d.Integer, e);
   }
   static bitString(e) {
     const t = new Uint8Array([0]), r = new Uint8Array(t.length + e.length);
-    return r.set(t), r.set(e, t.length), o.ASN1(H.BitString, r);
+    return r.set(t), r.set(e, t.length), o.ASN1(d.BitString, r);
   }
   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), n = [t[0] * 40 + t[1]];
@@ -1788,25 +1788,25 @@ class o {
         a[c] |= 128;
       n.push(...a);
     }
-    return o.ASN1(H.OID, new Uint8Array(n));
+    return o.ASN1(d.OID, new Uint8Array(n));
   }
   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, u(e));
   }
   static set(e) {
-    return o.ASN1(H.Set, u(e));
+    return o.ASN1(d.Set, u(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, r = !1) {
     const n = (r ? 160 : 128) | e;
@@ -1814,12 +1814,12 @@ class o {
   }
   static boolean(e) {
     return o.ASN1(
-      H.Boolean,
+      d.Boolean,
       new Uint8Array([e ? 255 : 0])
     );
   }
 }
-function he(i) {
+function Ae(i) {
   return btoa(String.fromCodePoint(...new Uint8Array(i)));
 }
 function le(i) {
@@ -1838,20 +1838,26 @@ function Ve(i, e) {
   const t = new Date(i);
   return t.setUTCFullYear(t.getUTCFullYear() + e), t;
 }
-async function ze(i, e, t) {
-  var _;
-  const r = typeof i == "string" ? new Request(i, e) : i;
+async function ze(i, e, t, r) {
+  var S;
+  const n = typeof i == "string" ? new Request(i, e) : i;
   if (!t)
-    return await fetch(r);
-  const [n, s] = await me(r);
-  try {
     return await fetch(n);
+  const s = r ? new URL(r) : null, _ = new URL(
+    n.url,
+    s || void 0
+  );
+  if (s && _.protocol === s.protocol && _.hostname === s.hostname && _.port === s.port && _.pathname.startsWith(s.pathname))
+    return await fetch(n);
+  const [a, c] = await me(n);
+  try {
+    return await fetch(a);
   } catch {
-    const c = ((_ = new Headers(s.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : _.split(",")) || [], S = c.includes("authorization") || c.includes("cookie"), A = await ge(s, {
-      url: `${t}${r.url}`,
-      ...S && { credentials: "include" }
+    const A = ((S = new Headers(c.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : S.split(",")) || [], l = A.includes("authorization") || A.includes("cookie"), H = await ge(c, {
+      url: `${t}${n.url}`,
+      ...l && { credentials: "include" }
     });
-    return await fetch(A, e);
+    return await fetch(H, e);
   }
 }
 class Ye extends TransformStream {
@@ -2168,18 +2174,18 @@ Content-Length: 0\r
       );
     }
     a.releaseLock();
-    const c = n.slice(0, _), S = L.parseRequestHeaders(c), A = 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, l = n.slice(
+    const c = n.slice(0, _), S = L.parseRequestHeaders(c), h = S.headers.get("Transfer-Encoding") !== null ? "chunked" : "content-length", A = S.headers.get("Content-Length") !== null ? parseInt(S.headers.get("Content-Length"), 10) : void 0, l = n.slice(
       _ + 4
       /* Skip \r\n\r\n */
     );
-    let T;
+    let H;
     if (S.method !== "GET") {
       const N = e.getReader();
       let R = l.length, x = l.slice(-6);
       const He = new TextEncoder().encode(`0\r
 \r
 `);
-      T = new ReadableStream({
+      H = new ReadableStream({
         async start(I) {
           l.length > 0 && I.enqueue(l), s && I.close();
         },
@@ -2188,14 +2194,14 @@ Content-Length: 0\r
           if (R += (m == null ? void 0 : m.length) || 0, m && (I.enqueue(m), x = u([
             x,
             m || new Uint8Array()
-          ]).slice(-5)), de || A === "content-length" && h !== void 0 && R >= h || A === "chunked" && x.every(
+          ]).slice(-5)), de || h === "content-length" && A !== void 0 && R >= A || h === "chunked" && x.every(
             (Te, Ee) => Te === He[Ee]
           )) {
             I.close();
             return;
           }
         }
-      }), A === "chunked" && (T = T.pipeThrough(
+      }), h === "chunked" && (H = H.pipeThrough(
         new Ye()
       ));
     }
@@ -2203,7 +2209,7 @@ Content-Length: 0\r
     return G.pathname = S.path, new Request(G.toString(), {
       method: S.method,
       headers: S.headers,
-      body: T,
+      body: H,
       // In Node.js, duplex: 'half' is required when
       // the body stream is provided.
       // @ts-expect-error
@@ -2337,20 +2343,20 @@ 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 h = ie(
           a,
           c.name
         );
         if (c.kind === "directory") {
           try {
-            i.mkdir(A);
-          } catch (h) {
-            if ((h == null ? void 0 : h.errno) !== 20)
-              throw U.error(h), h;
+            i.mkdir(h);
+          } catch (A) {
+            if ((A == null ? void 0 : A.errno) !== 20)
+              throw U.error(A), A;
           }
-          s.push([c, A]);
+          s.push([c, h]);
         } else if (c.kind === "file") {
-          const h = await c.getFile(), l = new Uint8Array(await h.arrayBuffer());
+          const A = await c.getFile(), l = new Uint8Array(await A.arrayBuffer());
           i.createDataFile(
             a,
             c.name,
@@ -2371,20 +2377,20 @@ async function nt(i, e, t) {
 async function ue(i, e, t, r) {
   i.mkdirTree(t);
   const n = [];
-  async function s(A, h) {
+  async function s(h, A) {
     await Promise.all(
-      i.readdir(A).filter(
+      i.readdir(h).filter(
         (l) => l !== "." && l !== ".."
       ).map(async (l) => {
-        const T = ie(A, l);
-        if (!st(i, T)) {
-          n.push([h, T, l]);
+        const H = ie(h, l);
+        if (!st(i, H)) {
+          n.push([A, H, l]);
           return;
         }
-        const M = await h.getDirectoryHandle(l, {
+        const M = await A.getDirectoryHandle(l, {
           create: !0
         });
-        return await s(T, M);
+        return await s(H, M);
       })
     );
   }
@@ -2392,19 +2398,19 @@ async function ue(i, e, t, r) {
   let _ = 0;
   const a = r && ot(r, 100), c = 100, S = /* @__PURE__ */ new Set();
   try {
-    for (const [A, h, l] of n) {
-      const T = O(
-        A,
+    for (const [h, A, l] of n) {
+      const H = O(
+        h,
         l,
         i,
-        h
+        A
       ).then(() => {
-        _++, S.delete(T), a == null || a({
+        _++, S.delete(H), a == null || a({
           files: _,
           total: n.length
         });
       });
-      S.add(T), S.size >= c && (await Promise.race(S), a == null || a({
+      S.add(H), S.size >= c && (await Promise.race(S), a == null || a({
         files: _,
         total: n.length
       }));
@@ -2449,8 +2455,8 @@ function it(i, e, t) {
     r.splice(0, c.length);
     const S = Ie(c);
     try {
-      for (const A of S)
-        await s.processEntry(A);
+      for (const h of S)
+        await s.processEntry(h);
     } finally {
       a();
     }