@php-wasm/web-service-worker 3.0.46 → 3.0.52

package/fetch-with-cors-proxy.d.ts

@@ -0,0 +1 @@
+export declare function fetchWithCorsProxy(input: RequestInfo, init?: RequestInit, corsProxyUrl?: string, playgroundUrl?: string): Promise<Response>;

package/firewall-interference-error.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Error thrown when a CORS proxy response appears to have been
+ * intercepted by a network firewall or corporate proxy.
+ *
+ * This is detected when a response from the CORS proxy is missing
+ * the X-Playground-Cors-Proxy header that legitimate responses include.
+ */
+export declare class FirewallInterferenceError extends Error {
+    readonly url: string;
+    readonly status: number;
+    readonly statusText: string;
+    constructor(url: string, status: number, statusText: string);
+}

package/index.cjs

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

package/index.d.ts

@@ -1,2 +1,4 @@
 export * from './utils';
 export * from './messaging';
+export { fetchWithCorsProxy } from './fetch-with-cors-proxy';
+export { FirewallInterferenceError } from './firewall-interference-error';

package/index.js

@@ -1,50 +1,50 @@
-import { isURLScoped as m, setURLScope as g, getURLScope as p } from "@php-wasm/scopes";
-const R = 25e3;
-let w = 0;
-function U(e, t, ...r) {
-  const s = y();
+import { isURLScoped as R, setURLScope as C, getURLScope as y } from "@php-wasm/scopes";
+const E = 25e3;
+let b = 0;
+function H(e, t, ...o) {
+  const s = w();
   return e.postMessage(
     {
       ...t,
       requestId: s
     },
-    ...r
+    ...o
   ), s;
 }
-function y() {
-  return ++w;
+function w() {
+  return ++b;
 }
-function b(e, t, r = R) {
-  return new Promise((s, c) => {
-    const o = (i) => {
-      i.data.type === "response" && i.data.requestId === t && (e.removeEventListener("message", o), clearTimeout(a), s(i.data.response));
+function L(e, t, o = E) {
+  return new Promise((s, n) => {
+    const r = (i) => {
+      i.data.type === "response" && i.data.requestId === t && (e.removeEventListener("message", r), clearTimeout(a), s(i.data.response));
     }, a = setTimeout(() => {
-      c(new Error("Request timed out")), e.removeEventListener("message", o);
-    }, r);
-    e.addEventListener("message", o);
+      n(new Error("Request timed out")), e.removeEventListener("message", r);
+    }, o);
+    e.addEventListener("message", r);
   });
 }
-function L(e, t) {
+function q(e, t) {
   return {
     type: "response",
     requestId: e,
     response: t
   };
 }
-async function A(e) {
+async function I(e) {
   let t = new URL(e.request.url);
-  if (!m(t))
+  if (!R(t))
     try {
-      const n = new URL(e.request.referrer);
-      t = g(t, p(n));
+      const c = new URL(e.request.referrer);
+      t = C(t, y(c));
     } catch {
     }
-  const r = e.request.headers.get("content-type"), s = e.request.method === "POST" ? new Uint8Array(await e.request.clone().arrayBuffer()) : void 0, c = {};
-  for (const n of e.request.headers.entries())
-    c[n[0]] = n[1];
-  let o;
+  const o = 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 r;
   try {
-    const n = {
+    const c = {
       method: "request",
       args: [
         {
@@ -52,48 +52,48 @@ async function A(e) {
           url: t.toString(),
           method: e.request.method,
           headers: {
-            ...c,
+            ...n,
             Host: t.host,
             // Safari and Firefox don't make the User-Agent header
             // available in the fetch event. Let's add it manually:
             "User-agent": self.navigator.userAgent,
-            "Content-type": r
+            "Content-type": o
           }
         }
       ]
-    }, u = p(t);
-    if (u === null)
+    }, d = y(t);
+    if (d === null)
       throw new Error(
         `The URL ${t.toString()} is not scoped. This should not happen.`
       );
-    const f = await S(n, u);
-    if (o = await b(self, f), delete o.headers["x-frame-options"], o.headers["content-security-policy"]) {
-      const l = o.headers["content-security-policy"].map(
-        (d) => C(
+    const h = await U(c, d);
+    if (r = await L(self, h), delete r.headers["x-frame-options"], r.headers["content-security-policy"]) {
+      const l = r.headers["content-security-policy"].map(
+        (u) => T(
           "frame-ancestors",
-          d
+          u
         )
-      ).filter((d) => d.trim().length > 0);
-      l.length > 0 ? o.headers["content-security-policy"] = l : delete o.headers["content-security-policy"];
+      ).filter((u) => u.trim().length > 0);
+      l.length > 0 ? r.headers["content-security-policy"] = l : delete r.headers["content-security-policy"];
     }
-  } catch (n) {
-    throw console.error(n, { url: t.toString() }), n;
+  } catch (c) {
+    throw console.error(c, { url: t.toString() }), c;
   }
-  if (o.httpStatusCode >= 300 && o.httpStatusCode <= 399 && o.headers.location)
+  if (r.httpStatusCode >= 300 && r.httpStatusCode <= 399 && r.headers.location)
     return Response.redirect(
-      new URL(o.headers.location[0], t.toString()),
-      o.httpStatusCode
+      new URL(r.headers.location[0], t.toString()),
+      r.httpStatusCode
     );
   const i = [101, 103, 204, 205, 304].includes(
-    o.httpStatusCode
-  ) ? null : o.bytes;
+    r.httpStatusCode
+  ) ? null : r.bytes;
   return new Response(i, {
-    headers: o.headers,
-    status: o.httpStatusCode
+    headers: r.headers,
+    status: r.httpStatusCode
   });
 }
-async function S(e, t) {
-  const r = y();
+async function U(e, t) {
+  const o = w();
   for (const s of await self.clients.matchAll({
     // Sometimes the client that triggered the current fetch()
     // event is considered uncontrolled in Google Chrome. This
@@ -111,14 +111,14 @@ async function S(e, t) {
        * helps WASM workers ignore requests meant for other WASM workers.
        */
       scope: t,
-      requestId: r
+      requestId: o
     });
-  return r;
+  return o;
 }
-async function h(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.blob(), new Request(t.url || e.url, {
-    body: r,
+async function f(e, t) {
+  let o;
+  return ["GET", "HEAD"].includes(e.method) || "body" in t ? o = void 0 : !e.bodyUsed && e.body ? o = e.body : o = await e.arrayBuffer(), new Request(t.url || e.url, {
+    body: o,
     method: e.method,
     headers: e.headers,
     referrer: e.referrer,
@@ -128,45 +128,88 @@ async function h(e, t) {
     cache: e.cache,
     redirect: e.redirect,
     integrity: e.integrity,
-    ...r && { duplex: "half" },
+    ...o && { duplex: "half" },
     ...t
   });
 }
-async function T(e) {
+async function S(e) {
   if (!e.body)
     return [e, e];
-  const [t, r] = e.body.tee();
+  const [t, o] = e.body.tee();
   return [
-    await h(e, { body: t, duplex: "half" }),
-    await h(e, { body: r, duplex: "half" })
+    await f(e, { body: t, duplex: "half" }),
+    await f(e, { body: o, duplex: "half" })
   ];
 }
-function x(e) {
+function O(e) {
   const t = {};
-  return e.headers.forEach((r, s) => {
-    t[s] = r;
+  return e.headers.forEach((o, s) => {
+    t[s] = o;
   }), t;
 }
-function C(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, c = /[\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(
-      c,
+function T(e, t) {
+  const o = /^[\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((r) => {
+    const a = r.replace(o, "").replace(s, ""), [i] = a.split(
+      n,
       // The directive name is the first token.
       1
     );
     return i.toLowerCase() !== e.toLowerCase();
   }).join(";");
 }
+class x extends Error {
+  constructor(t, o, s) {
+    super(
+      `Could not fetch ${t} – your network appears to be blocking this request (HTTP ${o}). 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 = o, this.statusText = s;
+  }
+}
+const P = "X-Playground-Cors-Proxy";
+async function D(e, t, o, s) {
+  var h;
+  let n = typeof e == "string" ? new Request(e, t) : e;
+  const r = s ? new URL(s) : null;
+  let a = r ? new URL(n.url, r) : new URL(n.url);
+  if (a.hostname === "localhost" || a.hostname === "127.0.0.1" || a.hostname === "[::1]" || a.hostname === "::1")
+    return await fetch(n);
+  if (a.protocol === "http:") {
+    a.protocol = "https:";
+    const l = a.toString();
+    n = await f(n, { url: l }), a = new URL(l);
+  }
+  if (!o)
+    return await fetch(n);
+  if (r && a.protocol === r.protocol && a.hostname === r.hostname && a.port === r.port && a.pathname.startsWith(r.pathname))
+    return await fetch(n);
+  const [c, d] = await S(n);
+  try {
+    return await fetch(c);
+  } catch {
+    const u = ((h = new Headers(d.headers).get("x-cors-proxy-allowed-request-headers")) == null ? void 0 : h.split(",")) || [], m = u.includes("authorization") || u.includes("cookie"), g = await f(d, {
+      url: `${o}${n.url}`,
+      ...m && { credentials: "include" }
+    }), p = await fetch(g, t);
+    if (!p.headers.has(P))
+      throw new x(
+        n.url,
+        p.status,
+        p.statusText
+      );
+    return p;
+  }
+}
 export {
-  b as awaitReply,
-  S as broadcastMessageExpectReply,
-  h as cloneRequest,
-  A as convertFetchEventToPHPRequest,
-  y as getNextRequestId,
-  x as getRequestHeaders,
-  U as postMessageExpectReply,
-  C as removeContentSecurityPolicyDirective,
-  L as responseTo,
-  T as teeRequest
+  x as FirewallInterferenceError,
+  L as awaitReply,
+  U as broadcastMessageExpectReply,
+  f as cloneRequest,
+  I as convertFetchEventToPHPRequest,
+  D as fetchWithCorsProxy,
+  w as getNextRequestId,
+  O as getRequestHeaders,
+  H as postMessageExpectReply,
+  T as removeContentSecurityPolicyDirective,
+  q as responseTo,
+  S as teeRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web-service-worker",
-  "version": "3.0.46",
+  "version": "3.0.52",
   "description": "PHP.wasm – service worker utils",
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
   "main": "./index.cjs",
   "module": "./index.js",
   "license": "GPL-2.0-or-later",
-  "gitHead": "845cbc01dba047db8bf0b4ae2670b924e3517087",
+  "gitHead": "fd79b4d41ec8858ecacde7a814818fac95c40246",
   "engines": {
     "node": ">=20.18.3",
     "npm": ">=10.1.0"
@@ -45,10 +45,12 @@
     "@playwright/test": "1.55.1",
     "ws": "8.18.3",
     "tmp": "0.2.5",
-    "form-data": "^4.0.4"
+    "form-data": "^4.0.4",
+    "lodash": "^4.17.23",
+    "glob": "^9.3.0"
   },
   "dependencies": {
-    "@php-wasm/scopes": "3.0.46"
+    "@php-wasm/scopes": "3.0.52"
   },
   "optionalDependencies": {
     "fs-ext": "2.1.1"