@php-wasm/web-service-worker 3.1.5 → 3.1.8

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("@php-wasm/scopes"),U=25e3;let P=0;function T(e,t,...r){const s=R();return e.postMessage({...t,requestId:s},...r),s}function R(){return++P}function m(e,t,r=U){return new Promise((s,n)=>{const o=i=>{i.data.type==="response"&&i.data.requestId===t&&(e.removeEventListener("message",o),clearTimeout(a),s(i.data.response))},a=setTimeout(()=>{n(new Error("Request timed out")),e.removeEventListener("message",o)},r);e.addEventListener("message",o)})}function x(e,t){return{type:"response",requestId:e,response:t}}async function q(e){let t=new URL(e.request.url);if(!w.isURLScoped(t))try{const c=new URL(e.request.referrer);t=w.setURLScope(t,w.getURLScope(c))}catch{}const r=e.request.headers.get("content-type"),s=e.request.method==="POST"?new Uint8Array(await e.request.clone().arrayBuffer()):void 0,n={};for(const c of e.request.headers.entries())n[c[0]]=c[1];let o;try{const c={method:"request",args:[{body:s,url:t.toString(),method:e.request.method,headers:{...n,Host:t.host,"User-agent":self.navigator.userAgent,"Content-type":r}}]},h=w.getURLScope(t);if(h===null)throw new Error(`The URL ${t.toString()} is not scoped. This should not happen.`);const f=await g(c,h);if(o=await m(self,f),delete o.headers["x-frame-options"],o.headers["content-security-policy"]){const l=o.headers["content-security-policy"].map(u=>E("frame-ancestors",u)).filter(u=>u.trim().length>0);l.length>0?o.headers["content-security-policy"]=l:delete o.headers["content-security-policy"]}}catch(c){throw console.error(c,{url:t.toString()}),c}if(o.httpStatusCode>=300&&o.httpStatusCode<=399&&o.headers.location)return Response.redirect(new URL(o.headers.location[0],t.toString()),o.httpStatusCode);const i=[101,103,204,205,304].includes(o.httpStatusCode)?null:o.bytes;return new Response(i,{headers:o.headers,status:o.httpStatusCode})}async function g(e,t){const r=R();for(const s of await self.clients.matchAll({includeUncontrolled:!0}))s.postMessage({...e,scope:t,requestId:r});return r}async function d(e,t){let r;return["GET","HEAD"].includes(e.method)||"body"in t?r=void 0:!e.bodyUsed&&e.body?r=e.body:r=await e.arrayBuffer(),new Request(t.url||e.url,{body:r,method:e.method,headers:e.headers,referrer:e.referrer,referrerPolicy:e.referrerPolicy,mode:e.mode==="navigate"?"same-origin":e.mode,credentials:e.credentials,cache:e.cache,redirect:e.redirect,integrity:e.integrity,...r instanceof ReadableStream&&{duplex:"half"},...t})}async function b(e){if(!e.body)return[e,e];const[t,r]=e.body.tee();return[await d(e,{body:t,duplex:"half"}),await d(e,{body:r,duplex:"half"})]}function H(e){const t={};return e.headers.forEach((r,s)=>{t[s]=r}),t}function E(e,t){const r=/^[\u{9}\u{A}\u{C}\u{D}\u{20}]+/u,s=/[\u{9}\u{A}\u{C}\u{D}\u{20}]+$/u,n=/[\u{9}\u{A}\u{C}\u{D}\u{20}]/u;return t.split(";").filter(o=>{const a=o.replace(r,"").replace(s,""),[i]=a.split(n,1);return i.toLowerCase()!==e.toLowerCase()}).join(";")}class S extends Error{constructor(t,r,s){super(`Could not fetch ${t} – your network appears to be blocking this request (HTTP ${r}). This often happens on school, university, or corporate networks. Try switching to a different network or using a VPN.`),this.name="FirewallInterferenceError",this.url=t,this.status=r,this.statusText=s}}const v="X-Playground-Cors-Proxy";async function A(e,t,r,s){var f;let n=typeof e=="string"?new Request(e,t):e;const o=s?new URL(s):null;let a=o?new URL(n.url,o):new URL(n.url);if(a.hostname==="localhost"||a.hostname==="127.0.0.1"||a.hostname==="[::1]"||a.hostname==="::1")return await p(n);if(a.protocol==="http:"){a.protocol="https:";const l=a.toString();n=await d(n,{url:l}),a=new URL(l)}if(!r)return await p(n);if(o&&a.protocol===o.protocol&&a.hostname===o.hostname&&a.port===o.port&&a.pathname.startsWith(o.pathname))return await p(n);const[c,h]=await b(n);try{return await p(c)}catch{const u=((f=new Headers(h.headers).get("x-cors-proxy-allowed-request-headers"))==null?void 0:f.split(","))||[],C=u.includes("authorization")||u.includes("cookie"),L=await d(h,{url:`${r}${n.url}`,...C&&{credentials:"include"}}),y=await p(L,t);if(!y.headers.has(v))throw new S(n.url,y.status,y.statusText);return y}}async function p(e,t){let r=t?new Request(e,t):e;if(new URL(r.url).protocol==="http:"&&r.body){const s=await new Response(r.body).arrayBuffer();r=await d(r,{body:s})}return fetch(r)}exports.FirewallInterferenceError=S;exports.awaitReply=m;exports.broadcastMessageExpectReply=g;exports.cloneRequest=d;exports.convertFetchEventToPHPRequest=q;exports.fetchWithCorsProxy=A;exports.getNextRequestId=R;exports.getRequestHeaders=H;exports.postMessageExpectReply=T;exports.removeContentSecurityPolicyDirective=E;exports.responseTo=x;exports.teeRequest=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("@php-wasm/scopes"),P=require("@php-wasm/universal"),T=25e3;let C=0;function x(e,t,...r){const s=R();return e.postMessage({...t,requestId:s},...r),s}function R(){return++C}function m(e,t,r=T){return new Promise((s,a)=>{const o=i=>{i.data.type==="response"&&i.data.requestId===t&&(e.removeEventListener("message",o),clearTimeout(n),s(i.data.response))},n=setTimeout(()=>{a(new Error("Request timed out")),e.removeEventListener("message",o)},r);e.addEventListener("message",o)})}function q(e,t){return{type:"response",requestId:e,response:t}}async function v(e){let t=new URL(e.request.url);if(!u.isURLScoped(t))try{const c=new URL(e.request.referrer);t=u.setURLScope(t,u.getURLScope(c))}catch{}const r=e.request.headers.get("content-type"),s=e.request.method==="POST"?new Uint8Array(await e.request.clone().arrayBuffer()):void 0,a={};for(const c of e.request.headers.entries())a[c[0]]=c[1];let o;try{const c={method:"request",args:[{body:s,url:t.toString(),method:e.request.method,headers:{...a,Host:t.host,"User-agent":self.navigator.userAgent,"Content-type":r}}]},l=u.getURLScope(t);if(l===null)throw new Error(`The URL ${t.toString()} is not scoped. This should not happen.`);const y=await g(c,l);if(o=await m(self,y),delete o.headers["x-frame-options"],o.headers["content-security-policy"]){const d=o.headers["content-security-policy"].map(h=>b("frame-ancestors",h)).filter(h=>h.trim().length>0);d.length>0?o.headers["content-security-policy"]=d:delete o.headers["content-security-policy"]}}catch(c){throw console.error(c,{url:t.toString()}),c}if(o.httpStatusCode>=300&&o.httpStatusCode<=399&&o.headers.location){const c=u.getURLScope(t);let l=new URL(o.headers.location[0],t.toString());return c&&!u.isURLScoped(l)&&(l=u.setURLScope(l,c)),Response.redirect(l.toString(),o.httpStatusCode)}const n=[101,103,204,205,304].includes(o.httpStatusCode);let i=null;return n||(o.bodyPort?i=P.portToStream(o.bodyPort):i=o.bytes),new Response(i,{headers:o.headers,status:o.httpStatusCode})}async function g(e,t){const r=R();for(const s of await self.clients.matchAll({includeUncontrolled:!0}))s.postMessage({...e,scope:t,requestId:r});return r}async function p(e,t){let r;return["GET","HEAD"].includes(e.method)||"body"in t?r=void 0:!e.bodyUsed&&e.body?r=e.body:r=await e.arrayBuffer(),new Request(t.url||e.url,{body:r,method:e.method,headers:e.headers,referrer:e.referrer,referrerPolicy:e.referrerPolicy,mode:e.mode==="navigate"?"same-origin":e.mode,credentials:e.credentials,cache:e.cache,redirect:e.redirect,integrity:e.integrity,...r instanceof ReadableStream&&{duplex:"half"},...t})}async function S(e){if(!e.body)return[e,e];const[t,r]=e.body.tee();return[await p(e,{body:t,duplex:"half"}),await p(e,{body:r,duplex:"half"})]}function H(e){const t={};return e.headers.forEach((r,s)=>{t[s]=r}),t}function b(e,t){const r=/^[\u{9}\u{A}\u{C}\u{D}\u{20}]+/u,s=/[\u{9}\u{A}\u{C}\u{D}\u{20}]+$/u,a=/[\u{9}\u{A}\u{C}\u{D}\u{20}]/u;return t.split(";").filter(o=>{const n=o.replace(r,"").replace(s,""),[i]=n.split(a,1);return i.toLowerCase()!==e.toLowerCase()}).join(";")}class E extends Error{constructor(t,r,s){super(`Could not fetch ${t} – your network appears to be blocking this request (HTTP ${r}). This often happens on school, university, or corporate networks. Try switching to a different network or using a VPN.`),this.name="FirewallInterferenceError",this.url=t,this.status=r,this.statusText=s}}const A="X-Playground-Cors-Proxy";async function I(e,t,r,s){var y;let a=typeof e=="string"?new Request(e,t):e;const o=s?new URL(s):null;let n=o?new URL(a.url,o):new URL(a.url);if(n.hostname==="localhost"||n.hostname==="127.0.0.1"||n.hostname==="[::1]"||n.hostname==="::1")return await f(a);if(n.protocol==="http:"){n.protocol="https:";const d=n.toString();a=await p(a,{url:d}),n=new URL(d)}if(!r)return await f(a);if(o&&n.protocol===o.protocol&&n.hostname===o.hostname&&n.port===o.port&&n.pathname.startsWith(o.pathname))return await f(a);const[c,l]=await S(a);try{return await f(c)}catch{const h=((y=new Headers(l.headers).get("x-cors-proxy-allowed-request-headers"))==null?void 0:y.split(","))||[],L=h.includes("authorization")||h.includes("cookie"),U=await p(l,{url:`${r}${a.url}`,...L&&{credentials:"include"}}),w=await f(U,t);if(!w.headers.has(A))throw new E(a.url,w.status,w.statusText);return w}}async function f(e,t){let r=t?new Request(e,t):e;if(new URL(r.url).protocol==="http:"&&r.body){const s=await new Response(r.body).arrayBuffer();r=await p(r,{body:s})}return fetch(r)}exports.FirewallInterferenceError=E;exports.awaitReply=m;exports.broadcastMessageExpectReply=g;exports.cloneRequest=p;exports.convertFetchEventToPHPRequest=v;exports.fetchWithCorsProxy=I;exports.getNextRequestId=R;exports.getRequestHeaders=H;exports.postMessageExpectReply=x;exports.removeContentSecurityPolicyDirective=b;exports.responseTo=q;exports.teeRequest=S;

package/index.js

@@ -1,8 +1,9 @@
-import { isURLScoped as b, setURLScope as C, getURLScope as w } from "@php-wasm/scopes";
-const E = 25e3;
-let L = 0;
-function H(e, t, ...r) {
-  const s = m();
+import { isURLScoped as m, setURLScope as R, getURLScope as w } from "@php-wasm/scopes";
+import { portToStream as E } from "@php-wasm/universal";
+const L = 25e3;
+let U = 0;
+function O(e, t, ...r) {
+  const s = g();
   return e.postMessage(
     {
       ...t,
@@ -11,37 +12,37 @@ function H(e, t, ...r) {
     ...r
   ), s;
 }
-function m() {
-  return ++L;
+function g() {
+  return ++U;
 }
-function S(e, t, r = E) {
-  return new Promise((s, n) => {
+function C(e, t, r = L) {
+  return new Promise((s, a) => {
     const o = (c) => {
-      c.data.type === "response" && c.data.requestId === t && (e.removeEventListener("message", o), clearTimeout(a), s(c.data.response));
-    }, a = setTimeout(() => {
-      n(new Error("Request timed out")), e.removeEventListener("message", o);
+      c.data.type === "response" && c.data.requestId === t && (e.removeEventListener("message", o), clearTimeout(n), s(c.data.response));
+    }, n = setTimeout(() => {
+      a(new Error("Request timed out")), e.removeEventListener("message", o);
     }, r);
     e.addEventListener("message", o);
   });
 }
-function I(e, t) {
+function D(e, t) {
   return {
     type: "response",
     requestId: e,
     response: t
   };
 }
-async function O(e) {
+async function v(e) {
   let t = new URL(e.request.url);
-  if (!b(t))
+  if (!m(t))
     try {
       const i = new URL(e.request.referrer);
-      t = C(t, w(i));
+      t = R(t, w(i));
     } catch {
     }
-  const r = e.request.headers.get("content-type"), s = e.request.method === "POST" ? new Uint8Array(await e.request.clone().arrayBuffer()) : void 0, n = {};
+  const r = e.request.headers.get("content-type"), s = e.request.method === "POST" ? new Uint8Array(await e.request.clone().arrayBuffer()) : void 0, a = {};
   for (const i of e.request.headers.entries())
-    n[i[0]] = i[1];
+    a[i[0]] = i[1];
   let o;
   try {
     const i = {
@@ -52,7 +53,7 @@ async function O(e) {
           url: t.toString(),
           method: e.request.method,
           headers: {
-            ...n,
+            ...a,
             Host: t.host,
             // Safari and Firefox don't make the User-Agent header
             // available in the fetch event. Let's add it manually:
@@ -61,39 +62,46 @@ async function O(e) {
           }
         }
       ]
-    }, d = w(t);
-    if (d === null)
+    }, l = w(t);
+    if (l === null)
       throw new Error(
         `The URL ${t.toString()} is not scoped. This should not happen.`
       );
-    const f = await U(i, d);
-    if (o = await S(self, f), delete o.headers["x-frame-options"], o.headers["content-security-policy"]) {
-      const l = o.headers["content-security-policy"].map(
-        (u) => x(
+    const f = await T(i, l);
+    if (o = await C(self, f), delete o.headers["x-frame-options"], o.headers["content-security-policy"]) {
+      const u = o.headers["content-security-policy"].map(
+        (d) => x(
           "frame-ancestors",
-          u
+          d
         )
-      ).filter((u) => u.trim().length > 0);
-      l.length > 0 ? o.headers["content-security-policy"] = l : delete o.headers["content-security-policy"];
+      ).filter((d) => d.trim().length > 0);
+      u.length > 0 ? o.headers["content-security-policy"] = u : delete o.headers["content-security-policy"];
     }
   } catch (i) {
     throw console.error(i, { url: t.toString() }), i;
   }
-  if (o.httpStatusCode >= 300 && o.httpStatusCode <= 399 && o.headers.location)
-    return Response.redirect(
-      new URL(o.headers.location[0], t.toString()),
+  if (o.httpStatusCode >= 300 && o.httpStatusCode <= 399 && o.headers.location) {
+    const i = w(t);
+    let l = new URL(
+      o.headers.location[0],
+      t.toString()
+    );
+    return i && !m(l) && (l = R(l, i)), Response.redirect(
+      l.toString(),
       o.httpStatusCode
     );
-  const c = [101, 103, 204, 205, 304].includes(
+  }
+  const n = [101, 103, 204, 205, 304].includes(
     o.httpStatusCode
-  ) ? null : o.bytes;
-  return new Response(c, {
+  );
+  let c = null;
+  return n || (o.bodyPort ? c = E(o.bodyPort) : c = o.bytes), new Response(c, {
     headers: o.headers,
     status: o.httpStatusCode
   });
 }
-async function U(e, t) {
-  const r = m();
+async function T(e, t) {
+  const r = g();
   for (const s of await self.clients.matchAll({
     // Sometimes the client that triggered the current fetch()
     // event is considered uncontrolled in Google Chrome. This
@@ -132,7 +140,7 @@ async function p(e, t) {
     ...t
   });
 }
-async function T(e) {
+async function P(e) {
   if (!e.body)
     return [e, e];
   const [t, r] = e.body.tee();
@@ -141,58 +149,58 @@ async function T(e) {
     await p(e, { body: r, duplex: "half" })
   ];
 }
-function D(e) {
+function $(e) {
   const t = {};
   return e.headers.forEach((r, s) => {
     t[s] = r;
   }), t;
 }
 function x(e, t) {
-  const r = /^[\u{9}\u{A}\u{C}\u{D}\u{20}]+/u, s = /[\u{9}\u{A}\u{C}\u{D}\u{20}]+$/u, n = /[\u{9}\u{A}\u{C}\u{D}\u{20}]/u;
+  const r = /^[\u{9}\u{A}\u{C}\u{D}\u{20}]+/u, s = /[\u{9}\u{A}\u{C}\u{D}\u{20}]+$/u, a = /[\u{9}\u{A}\u{C}\u{D}\u{20}]/u;
   return t.split(";").filter((o) => {
-    const a = o.replace(r, "").replace(s, ""), [c] = a.split(
-      n,
+    const n = o.replace(r, "").replace(s, ""), [c] = n.split(
+      a,
       // The directive name is the first token.
       1
     );
     return c.toLowerCase() !== e.toLowerCase();
   }).join(";");
 }
-class P extends Error {
+class A extends Error {
   constructor(t, r, s) {
     super(
       `Could not fetch ${t} – your network appears to be blocking this request (HTTP ${r}). This often happens on school, university, or corporate networks. Try switching to a different network or using a VPN.`
     ), this.name = "FirewallInterferenceError", this.url = t, this.status = r, this.statusText = s;
   }
 }
-const A = "X-Playground-Cors-Proxy";
-async function v(e, t, r, s) {
+const q = "X-Playground-Cors-Proxy";
+async function k(e, t, r, s) {
   var f;
-  let n = typeof e == "string" ? new Request(e, t) : e;
+  let a = typeof e == "string" ? new Request(e, t) : e;
   const o = s ? new URL(s) : null;
-  let a = o ? new URL(n.url, o) : new URL(n.url);
-  if (a.hostname === "localhost" || a.hostname === "127.0.0.1" || a.hostname === "[::1]" || a.hostname === "::1")
-    return await h(n);
-  if (a.protocol === "http:") {
-    a.protocol = "https:";
-    const l = a.toString();
-    n = await p(n, { url: l }), a = new URL(l);
+  let n = o ? new URL(a.url, o) : new URL(a.url);
+  if (n.hostname === "localhost" || n.hostname === "127.0.0.1" || n.hostname === "[::1]" || n.hostname === "::1")
+    return await h(a);
+  if (n.protocol === "http:") {
+    n.protocol = "https:";
+    const u = n.toString();
+    a = await p(a, { url: u }), n = new URL(u);
   }
   if (!r)
-    return await h(n);
-  if (o && a.protocol === o.protocol && a.hostname === o.hostname && a.port === o.port && a.pathname.startsWith(o.pathname))
-    return await h(n);
-  const [i, d] = await T(n);
+    return await h(a);
+  if (o && n.protocol === o.protocol && n.hostname === o.hostname && n.port === o.port && n.pathname.startsWith(o.pathname))
+    return await h(a);
+  const [i, l] = await P(a);
   try {
     return await h(i);
   } catch {
-    const u = ((f = new Headers(d.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : f.split(",")) || [], R = u.includes("authorization") || u.includes("cookie"), g = await p(d, {
-      url: `${r}${n.url}`,
-      ...R && { credentials: "include" }
-    }), y = await h(g, t);
-    if (!y.headers.has(A))
-      throw new P(
-        n.url,
+    const d = ((f = new Headers(l.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : f.split(",")) || [], b = d.includes("authorization") || d.includes("cookie"), S = await p(l, {
+      url: `${r}${a.url}`,
+      ...b && { credentials: "include" }
+    }), y = await h(S, t);
+    if (!y.headers.has(q))
+      throw new A(
+        a.url,
         y.status,
         y.statusText
       );
@@ -210,16 +218,16 @@ async function h(e, t) {
   return fetch(r);
 }
 export {
-  P as FirewallInterferenceError,
-  S as awaitReply,
-  U as broadcastMessageExpectReply,
+  A as FirewallInterferenceError,
+  C as awaitReply,
+  T as broadcastMessageExpectReply,
   p as cloneRequest,
-  O as convertFetchEventToPHPRequest,
-  v as fetchWithCorsProxy,
-  m as getNextRequestId,
-  D as getRequestHeaders,
-  H as postMessageExpectReply,
+  v as convertFetchEventToPHPRequest,
+  k as fetchWithCorsProxy,
+  g as getNextRequestId,
+  $ as getRequestHeaders,
+  O as postMessageExpectReply,
   x as removeContentSecurityPolicyDirective,
-  I as responseTo,
-  T as teeRequest
+  D as responseTo,
+  P as teeRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web-service-worker",
-  "version": "3.1.5",
+  "version": "3.1.8",
   "description": "PHP.wasm – service worker utils",
   "repository": {
     "type": "git",
@@ -31,11 +31,16 @@
   "main": "./index.cjs",
   "module": "./index.js",
   "license": "GPL-2.0-or-later",
-  "gitHead": "e10df5885055e97c87ce88fe5e9d8d4ac3e700da",
+  "gitHead": "ba6a9509c9db4e0b7af6f155cf31162a6b659b5f",
   "engines": {
     "node": ">=20.10.0",
     "npm": ">=10.2.3"
   },
+  "dependencies": {
+    "ini": "4.1.2",
+    "@php-wasm/scopes": "3.1.8",
+    "@php-wasm/universal": "3.1.8"
+  },
   "packageManager": "npm@10.9.2",
   "overrides": {
     "rollup": "^4.34.6",
@@ -43,13 +48,9 @@
     "react-dom": "18.3.1",
     "typescript": "5.4.5",
     "@playwright/test": "1.55.1",
-    "ws": "8.18.3",
     "tmp": "0.2.5",
     "form-data": "^4.0.4",
     "lodash": "^4.17.23",
     "glob": "^9.3.0"
-  },
-  "dependencies": {
-    "@php-wasm/scopes": "3.1.5"
   }
 }