@php-wasm/web-service-worker 3.0.22 → 3.0.31

package/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("@php-wasm/scopes"),R=25e3;let g=0;function m(e,t,...s){const r=u();return e.postMessage({...t,requestId:r},...s),r}function u(){return++g}function h(e,t,s=R){return new Promise((r,c)=>{const o=a=>{a.data.type==="response"&&a.data.requestId===t&&(e.removeEventListener("message",o),clearTimeout(l),r(a.data.response))},l=setTimeout(()=>{c(new Error("Request timed out")),e.removeEventListener("message",o)},s);e.addEventListener("message",o)})}function w(e,t){return{type:"response",requestId:e,response:t}}async function E(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,c={};for(const n of e.request.headers.entries())c[n[0]]=n[1];let o;try{const n={method:"request",args:[{body:r,url:t.toString(),method:e.request.method,headers:{...c,Host:t.host,"User-agent":self.navigator.userAgent,"Content-type":s}}]},p=d.getURLScope(t);if(p===null)throw new Error(`The URL ${t.toString()} is not scoped. This should not happen.`);const f=await y(n,p);o=await h(self,f),delete o.headers["x-frame-options"]}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 a=[101,103,204,205,304].includes(o.httpStatusCode)?null:o.bytes;return new Response(a,{headers:o.headers,status:o.httpStatusCode})}async function y(e,t){const s=u();for(const r of await self.clients.matchAll({includeUncontrolled:!0}))r.postMessage({...e,scope:t,requestId:s});return s}async function i(e,t){const s=["GET","HEAD"].includes(e.method)||"body"in t?void 0:await e.blob();return 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,...t})}async function S(e){if(!e.body)return[e,e];const[t,s]=e.body.tee();return[await i(e,{body:t,duplex:"half"}),await i(e,{body:s,duplex:"half"})]}function b(e){const t={};return e.headers.forEach((s,r)=>{t[r]=s}),t}exports.awaitReply=h;exports.broadcastMessageExpectReply=y;exports.cloneRequest=i;exports.convertFetchEventToPHPRequest=E;exports.getNextRequestId=u;exports.getRequestHeaders=b;exports.postMessageExpectReply=m;exports.responseTo=w;exports.teeRequest=S;
+"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;

package/index.js

@@ -1,8 +1,8 @@
-import { isURLScoped as f, setURLScope as y, getURLScope as l } from "@php-wasm/scopes";
-const m = 25e3;
-let R = 0;
-function S(e, t, ...r) {
-  const s = p();
+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();
   return e.postMessage(
     {
       ...t,
@@ -11,32 +11,32 @@ function S(e, t, ...r) {
     ...r
   ), s;
 }
-function p() {
-  return ++R;
+function y() {
+  return ++w;
 }
-function g(e, t, r = m) {
+function b(e, t, r = R) {
   return new Promise((s, c) => {
-    const o = (a) => {
-      a.data.type === "response" && a.data.requestId === t && (e.removeEventListener("message", o), clearTimeout(d), s(a.data.response));
-    }, d = setTimeout(() => {
+    const o = (i) => {
+      i.data.type === "response" && i.data.requestId === t && (e.removeEventListener("message", o), clearTimeout(a), s(i.data.response));
+    }, a = setTimeout(() => {
       c(new Error("Request timed out")), e.removeEventListener("message", o);
     }, r);
     e.addEventListener("message", o);
   });
 }
-function b(e, t) {
+function L(e, t) {
   return {
     type: "response",
     requestId: e,
     response: t
   };
 }
-async function U(e) {
+async function A(e) {
   let t = new URL(e.request.url);
-  if (!f(t))
+  if (!m(t))
     try {
       const n = new URL(e.request.referrer);
-      t = y(t, l(n));
+      t = g(t, p(n));
     } catch {
     }
   const r = e.request.headers.get("content-type"), s = e.request.method === "POST" ? new Uint8Array(await e.request.clone().arrayBuffer()) : void 0, c = {};
@@ -61,13 +61,21 @@ async function U(e) {
           }
         }
       ]
-    }, i = l(t);
-    if (i === null)
+    }, u = p(t);
+    if (u === null)
       throw new Error(
         `The URL ${t.toString()} is not scoped. This should not happen.`
       );
-    const h = await w(n, i);
-    o = await g(self, h), delete o.headers["x-frame-options"];
+    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(
+          "frame-ancestors",
+          d
+        )
+      ).filter((d) => d.trim().length > 0);
+      l.length > 0 ? o.headers["content-security-policy"] = l : delete o.headers["content-security-policy"];
+    }
   } catch (n) {
     throw console.error(n, { url: t.toString() }), n;
   }
@@ -76,16 +84,16 @@ async function U(e) {
       new URL(o.headers.location[0], t.toString()),
       o.httpStatusCode
     );
-  const a = [101, 103, 204, 205, 304].includes(
+  const i = [101, 103, 204, 205, 304].includes(
     o.httpStatusCode
   ) ? null : o.bytes;
-  return new Response(a, {
+  return new Response(i, {
     headers: o.headers,
     status: o.httpStatusCode
   });
 }
-async function w(e, t) {
-  const r = p();
+async function S(e, t) {
+  const r = y();
   for (const s of await self.clients.matchAll({
     // Sometimes the client that triggered the current fetch()
     // event is considered uncontrolled in Google Chrome. This
@@ -107,9 +115,9 @@ async function w(e, t) {
     });
   return r;
 }
-async function u(e, t) {
-  const r = ["GET", "HEAD"].includes(e.method) || "body" in t ? void 0 : await e.blob();
-  return new Request(t.url || e.url, {
+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,
     method: e.method,
     headers: e.headers,
@@ -120,32 +128,45 @@ async function u(e, t) {
     cache: e.cache,
     redirect: e.redirect,
     integrity: e.integrity,
+    ...r && { duplex: "half" },
     ...t
   });
 }
-async function L(e) {
+async function T(e) {
   if (!e.body)
     return [e, e];
   const [t, r] = e.body.tee();
   return [
-    await u(e, { body: t, duplex: "half" }),
-    await u(e, { body: r, duplex: "half" })
+    await h(e, { body: t, duplex: "half" }),
+    await h(e, { body: r, duplex: "half" })
   ];
 }
-function T(e) {
+function x(e) {
   const t = {};
   return e.headers.forEach((r, s) => {
     t[s] = r;
   }), 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,
+      // The directive name is the first token.
+      1
+    );
+    return i.toLowerCase() !== e.toLowerCase();
+  }).join(";");
+}
 export {
-  g as awaitReply,
-  w as broadcastMessageExpectReply,
-  u as cloneRequest,
-  U as convertFetchEventToPHPRequest,
-  p as getNextRequestId,
-  T as getRequestHeaders,
-  S as postMessageExpectReply,
-  b as responseTo,
-  L as teeRequest
+  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
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web-service-worker",
-  "version": "3.0.22",
+  "version": "3.0.31",
   "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": "a624d1a97dc639e152d335e6a801b2fad7f6b594",
+  "gitHead": "e28b6d2a2e663abc3cbb8fce9a3c5cc8abaa5bbe",
   "engines": {
     "node": ">=20.18.3",
     "npm": ">=10.1.0"
@@ -42,13 +42,13 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "typescript": "5.4.5",
-    "@playwright/test": "1.47.1",
-    "ws": "^8.18.0",
+    "@playwright/test": "1.55.1",
+    "ws": "8.18.3",
     "tmp": "0.2.5",
     "form-data": "^4.0.4"
   },
   "dependencies": {
-    "@php-wasm/scopes": "3.0.22"
+    "@php-wasm/scopes": "3.0.31"
   },
   "optionalDependencies": {
     "fs-ext": "2.1.1"

package/utils.d.ts

@@ -49,3 +49,11 @@ export declare function teeRequest(request: Request): Promise<[Request, Request]
  * @returns
  */
 export declare function getRequestHeaders(request: Request): Record<string, string>;
+/**
+ * Removes the specified directive from the Content-Security-Policy header value.
+ *
+ * @param directiveToRemove The directive name to remove.
+ * @param cspHeader The Content-Security-Policy header value to filter.
+ * @returns The filtered Content-Security-Policy header value.
+ */
+export declare function removeContentSecurityPolicyDirective(directiveToRemove: string, cspHeader: string): string;