@php-wasm/web-service-worker 1.0.29 → 1.1.0

package/index.cjs

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

package/index.js

@@ -1,54 +1,54 @@
-import { isURLScoped as l, setURLScope as h, getURLScope as i } from "@php-wasm/scopes";
-const p = 25e3;
-let f = 0;
-function g(e, t, ...o) {
-  const n = d();
+import { isURLScoped as h, setURLScope as p, getURLScope as d } from "@php-wasm/scopes";
+const f = 25e3;
+let y = 0;
+function w(e, t, ...r) {
+  const s = u();
   return e.postMessage(
     {
       ...t,
-      requestId: n
+      requestId: s
     },
-    ...o
-  ), n;
+    ...r
+  ), s;
 }
-function d() {
-  return ++f;
+function u() {
+  return ++y;
 }
-function m(e, t, o = p) {
-  return new Promise((n, c) => {
-    const r = (a) => {
-      a.data.type === "response" && a.data.requestId === t && (e.removeEventListener("message", r), clearTimeout(s), n(a.data.response));
-    }, s = setTimeout(() => {
-      c(new Error("Request timed out")), e.removeEventListener("message", r);
-    }, o);
-    e.addEventListener("message", r);
+function m(e, t, r = f) {
+  return new Promise((s, c) => {
+    const o = (a) => {
+      a.data.type === "response" && a.data.requestId === t && (e.removeEventListener("message", o), clearTimeout(n), s(a.data.response));
+    }, n = setTimeout(() => {
+      c(new Error("Request timed out")), e.removeEventListener("message", o);
+    }, r);
+    e.addEventListener("message", o);
   });
 }
-function w(e, t) {
+function E(e, t) {
   return {
     type: "response",
     requestId: e,
     response: t
   };
 }
-async function E(e) {
+async function b(e) {
   let t = new URL(e.request.url);
-  if (!l(t))
+  if (!h(t))
     try {
-      const s = new URL(e.request.referrer);
-      t = h(t, i(s));
+      const n = new URL(e.request.referrer);
+      t = p(t, d(n));
     } catch {
     }
-  const o = e.request.headers.get("content-type"), n = e.request.method === "POST" ? new Uint8Array(await e.request.clone().arrayBuffer()) : void 0, c = {};
-  for (const s of e.request.headers.entries())
-    c[s[0]] = s[1];
-  let r;
+  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;
   try {
-    const s = {
+    const n = {
       method: "request",
       args: [
         {
-          body: n,
+          body: s,
           url: t.toString(),
           method: e.request.method,
           headers: {
@@ -57,38 +57,38 @@ async function E(e) {
             // 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": o
+            "Content-type": r
           }
         }
       ]
-    }, a = i(t);
+    }, a = d(t);
     if (a === null)
       throw new Error(
         `The URL ${t.toString()} is not scoped. This should not happen.`
       );
-    const u = await y(s, a);
-    r = await m(self, u), delete r.headers["x-frame-options"];
-  } catch (s) {
-    throw console.error(s, { url: t.toString() }), s;
+    const l = await R(n, a);
+    o = await m(self, l), delete o.headers["x-frame-options"];
+  } catch (n) {
+    throw console.error(n, { url: t.toString() }), n;
   }
-  return r.httpStatusCode >= 300 && r.httpStatusCode <= 399 && r.headers.location ? Response.redirect(
-    r.headers.location[0],
-    r.httpStatusCode
-  ) : new Response(r.bytes, {
-    headers: r.headers,
-    status: r.httpStatusCode
+  return o.httpStatusCode >= 300 && o.httpStatusCode <= 399 && o.headers.location ? Response.redirect(
+    o.headers.location[0],
+    o.httpStatusCode
+  ) : new Response(o.bytes, {
+    headers: o.headers,
+    status: o.httpStatusCode
   });
 }
-async function y(e, t) {
-  const o = d();
-  for (const n of await self.clients.matchAll({
+async function R(e, t) {
+  const r = u();
+  for (const s of await self.clients.matchAll({
     // Sometimes the client that triggered the current fetch()
     // event is considered uncontrolled in Google Chrome. This
     // only happens on the first few fetches() after the initial
     // registration of the service worker.
     includeUncontrolled: !0
   }))
-    n.postMessage({
+    s.postMessage({
       ...e,
       /**
        * Attach the scope with a URL starting with `/scope:` to this message.
@@ -98,14 +98,14 @@ async function y(e, t) {
        * helps WASM workers ignore requests meant for other WASM workers.
        */
       scope: t,
-      requestId: o
+      requestId: r
     });
-  return o;
+  return r;
 }
-async function S(e, t) {
-  const o = ["GET", "HEAD"].includes(e.method) || "body" in t ? void 0 : await e.blob();
+async function i(e, t) {
+  const r = ["GET", "HEAD"].includes(e.method) || "body" in t ? void 0 : await e.blob();
   return new Request(t.url || e.url, {
-    body: o,
+    body: r,
     method: e.method,
     headers: e.headers,
     referrer: e.referrer,
@@ -118,19 +118,29 @@ async function S(e, t) {
     ...t
   });
 }
+async function S(e) {
+  if (!e.body)
+    return [e, e];
+  const [t, r] = e.body.tee();
+  return [
+    await i(e, { body: t, duplex: "half" }),
+    await i(e, { body: r, duplex: "half" })
+  ];
+}
 function U(e) {
   const t = {};
-  return e.headers.forEach((o, n) => {
-    t[n] = o;
+  return e.headers.forEach((r, s) => {
+    t[s] = r;
   }), t;
 }
 export {
   m as awaitReply,
-  y as broadcastMessageExpectReply,
-  S as cloneRequest,
-  E as convertFetchEventToPHPRequest,
-  d as getNextRequestId,
+  R as broadcastMessageExpectReply,
+  i as cloneRequest,
+  b as convertFetchEventToPHPRequest,
+  u as getNextRequestId,
   U as getRequestHeaders,
-  g as postMessageExpectReply,
-  w as responseTo
+  w as postMessageExpectReply,
+  E as responseTo,
+  S as teeRequest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/web-service-worker",
-  "version": "1.0.29",
+  "version": "1.1.0",
   "description": "PHP.wasm – service worker utils",
   "repository": {
     "type": "git",
@@ -31,12 +31,19 @@
   "main": "./index.cjs",
   "module": "./index.js",
   "license": "GPL-2.0-or-later",
-  "gitHead": "173e69f62e1b43bd7353b875054bb1ef5e394de8",
+  "gitHead": "9dbbe2b22ccbacda9c0da4444c51d5739e784302",
   "engines": {
-    "node": ">=18.18.0",
-    "npm": ">=8.11.0"
+    "node": ">=20.18.3",
+    "npm": ">=10.1.0"
+  },
+  "overrides": {
+    "rollup": "^4.34.6",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "typescript": "5.4.5",
+    "ws": "^8.18.0"
   },
   "dependencies": {
-    "@php-wasm/scopes": "1.0.29"
+    "@php-wasm/scopes": "1.1.0"
   }
-}
+}

package/utils.d.ts

@@ -34,6 +34,14 @@ export declare function broadcastMessageExpectReply(message: any, scope: string)
  * @returns The new request.
  */
 export declare function cloneRequest(request: Request, overrides: Record<string, any>): Promise<Request>;
+/**
+ * Tee a request to ensure the body stream is not consumed
+ * when executing or cloning the request.
+ *
+ * @param request
+ * @returns
+ */
+export declare function teeRequest(request: Request): Promise<[Request, Request]>;
 /**
  * Extracts headers from a Request as a plain key->value JS object.
  *