@volter/world-core 3.0.38 → 3.0.40

package/app-route.cjs

@@ -222,37 +222,39 @@ async function appFetch(value, init = {}) {
     if (refusal !== null) throw new TypeError(refusal);
     return fetch(value, init);
   }
-  const mode = init.redirect || 'follow';
-  const signal = init.signal || undefined;
-  let at = new URL(String(value));
-  let method = String(init.method || 'GET').toUpperCase();
   const headers = {};
   new Headers(init.headers || {}).forEach((v, k) => { headers[k] = v; });
-  let body = requestBody(init.body, headers);
-  for (let hops = 0; ; hops++) {
+  const body = requestBody(init.body, headers);
+  return followRedirects(value, { ...init, headers, body }, async (at, request) => {
+    const method = request.method, signal = request.signal;
+    const headers = Object.fromEntries(new Headers(request.headers));
     const route = appDestination(at);
-    let res;
     if (route) {
-      // the application's own origin is where the request goes: an application recorded outside the World (an app-url
-      // naming a deployment elsewhere) meets the World's egress rule as any other destination does
       const originRefusal = require('./network-policy.cjs').worldEgressRefusal(route.origin);
       if (originRefusal !== null) throw new TypeError(originRefusal);
-      // fetch's own bound (undici's 300 s headers and body timeouts), whatever signal the caller gives, so a hung
-      // application never holds a delivery, or the API request awaiting it, for good; a caller's signal may end it sooner
-      const answer = await deliverToApp(route, at, { method, headers, body, signal, timeoutMs: 300_000 });
+      const answer = await deliverToApp(route, at, { method, headers, body: request.body, signal, timeoutMs: 300_000 });
       const nullBody = NULL_BODY.includes(answer.status) || method === 'HEAD';
-      // a status fetch resolves with but Response refuses to construct (outside 200-599) is carried as fetch carries it
       const inRange = answer.status >= 200 && answer.status <= 599;
-      res = new Response(nullBody ? null : answer.body, { status: inRange ? answer.status : 200, headers: answer.headers });
+      const res = new Response(nullBody ? null : answer.body, { status: inRange ? answer.status : 200, headers: answer.headers });
       if (!inRange) Object.defineProperties(res, { status: { value: answer.status }, ok: { value: false } });
       Object.defineProperty(res, 'url', { value: at.toString() });
-    } else {
-      const refusal = require('./network-policy.cjs').worldEgressRefusal(at);
-      if (refusal !== null) throw new TypeError(refusal);
-      // off the application, the World's own headers never go with the request
-      for (const k of Object.keys(headers)) if (['x-twins-key', 'x-volter-twin-original-host'].includes(k.toLowerCase())) delete headers[k];
-      res = await fetch(at, { method, headers, ...(body != null && method !== 'GET' && method !== 'HEAD' ? { body } : {}), redirect: 'manual', signal });
+      return res;
     }
+    const refusal = require('./network-policy.cjs').worldEgressRefusal(at);
+    if (refusal !== null) throw new TypeError(refusal);
+    for (const k of Object.keys(headers)) if (['x-twins-key', 'x-volter-twin-original-host'].includes(k.toLowerCase())) { delete headers[k]; request.headers.delete(k); }
+    return fetch(at, { ...request, headers, body: method === 'GET' || method === 'HEAD' ? undefined : request.body });
+  });
+}
+
+/** Shared Fetch redirect semantics. send routes/refuses each hop; no destination is fetched here. */
+async function followRedirects(value, init, send, extraDropped = []) {
+  const mode = init.redirect || 'follow';
+  let at = new URL(String(value));
+  let method = String(init.method || 'GET').toUpperCase(), body = init.body;
+  const headers = new Headers(init.headers);
+  for (let hops = 0; ; hops++) {
+    const res = await send(at, { ...init, method, headers, body, redirect: 'manual' });
     if (hops > 0) Object.defineProperty(res, 'redirected', { value: true });
     const location = res.headers.get('location');
     if (!REDIRECTS.includes(res.status) || location === null || mode === 'manual') return res;
@@ -262,13 +264,12 @@ async function appFetch(value, init = {}) {
     const next = new URL(location, at);
     if (next.protocol !== 'http:' && next.protocol !== 'https:') throw new TypeError(`redirect to ${next.protocol} is not followed`);
     if ((res.status === 303 && method !== 'GET' && method !== 'HEAD') || ((res.status === 301 || res.status === 302) && method === 'POST')) {
-      method = 'GET';
-      body = null;
-      for (const k of Object.keys(headers)) if (/^content-/i.test(k)) delete headers[k];
+      method = 'GET'; body = undefined;
+      for (const k of [...headers.keys()]) if (/^content-/i.test(k)) headers.delete(k);
     }
-    if (next.origin !== at.origin) for (const k of Object.keys(headers)) if (CROSS_ORIGIN_DROPPED.includes(k.toLowerCase())) delete headers[k];
+    if (next.origin !== at.origin) for (const k of [...headers.keys()]) if ([...CROSS_ORIGIN_DROPPED, ...extraDropped].includes(k.toLowerCase())) headers.delete(k);
     at = next;
   }
 }
 
-module.exports = { appRouteFor, appHostMatch, appForwardHeaders, appDestination, appRequestOptions, deliverToApp, appFetch, sessionCa };
+module.exports = { appRouteFor, appHostMatch, appForwardHeaders, appDestination, appRequestOptions, deliverToApp, appFetch, followRedirects, sessionCa };

package/app-route.d.cts

@@ -6,3 +6,4 @@ export function appForwardHeaders(url: URL): Record<string, string>;
 export function appDestination(value: string | URL, env?: Readonly<Record<string, string | undefined>>): AppRoute | null;
 export function deliverToApp(route: AppRoute, value: string | URL, init?: { method?: string; headers?: Record<string, string>; body?: string | Uint8Array | null; /** Infinity: no deadline of its own */ timeoutMs?: number; signal?: AbortSignal }): Promise<AppAnswer>;
 export function appFetch(value: string | URL, init?: RequestInit): Promise<Response>;
+export function followRedirects(value: string | URL, init: RequestInit, send: (url: URL, init: RequestInit) => Promise<Response>, extraDropped?: string[]): Promise<Response>;

package/dist/app-route.cjs

@@ -222,37 +222,39 @@ async function appFetch(value, init = {}) {
     if (refusal !== null) throw new TypeError(refusal);
     return fetch(value, init);
   }
-  const mode = init.redirect || 'follow';
-  const signal = init.signal || undefined;
-  let at = new URL(String(value));
-  let method = String(init.method || 'GET').toUpperCase();
   const headers = {};
   new Headers(init.headers || {}).forEach((v, k) => { headers[k] = v; });
-  let body = requestBody(init.body, headers);
-  for (let hops = 0; ; hops++) {
+  const body = requestBody(init.body, headers);
+  return followRedirects(value, { ...init, headers, body }, async (at, request) => {
+    const method = request.method, signal = request.signal;
+    const headers = Object.fromEntries(new Headers(request.headers));
     const route = appDestination(at);
-    let res;
     if (route) {
-      // the application's own origin is where the request goes: an application recorded outside the World (an app-url
-      // naming a deployment elsewhere) meets the World's egress rule as any other destination does
       const originRefusal = require('./network-policy.cjs').worldEgressRefusal(route.origin);
       if (originRefusal !== null) throw new TypeError(originRefusal);
-      // fetch's own bound (undici's 300 s headers and body timeouts), whatever signal the caller gives, so a hung
-      // application never holds a delivery, or the API request awaiting it, for good; a caller's signal may end it sooner
-      const answer = await deliverToApp(route, at, { method, headers, body, signal, timeoutMs: 300_000 });
+      const answer = await deliverToApp(route, at, { method, headers, body: request.body, signal, timeoutMs: 300_000 });
       const nullBody = NULL_BODY.includes(answer.status) || method === 'HEAD';
-      // a status fetch resolves with but Response refuses to construct (outside 200-599) is carried as fetch carries it
       const inRange = answer.status >= 200 && answer.status <= 599;
-      res = new Response(nullBody ? null : answer.body, { status: inRange ? answer.status : 200, headers: answer.headers });
+      const res = new Response(nullBody ? null : answer.body, { status: inRange ? answer.status : 200, headers: answer.headers });
       if (!inRange) Object.defineProperties(res, { status: { value: answer.status }, ok: { value: false } });
       Object.defineProperty(res, 'url', { value: at.toString() });
-    } else {
-      const refusal = require('./network-policy.cjs').worldEgressRefusal(at);
-      if (refusal !== null) throw new TypeError(refusal);
-      // off the application, the World's own headers never go with the request
-      for (const k of Object.keys(headers)) if (['x-twins-key', 'x-volter-twin-original-host'].includes(k.toLowerCase())) delete headers[k];
-      res = await fetch(at, { method, headers, ...(body != null && method !== 'GET' && method !== 'HEAD' ? { body } : {}), redirect: 'manual', signal });
+      return res;
     }
+    const refusal = require('./network-policy.cjs').worldEgressRefusal(at);
+    if (refusal !== null) throw new TypeError(refusal);
+    for (const k of Object.keys(headers)) if (['x-twins-key', 'x-volter-twin-original-host'].includes(k.toLowerCase())) { delete headers[k]; request.headers.delete(k); }
+    return fetch(at, { ...request, headers, body: method === 'GET' || method === 'HEAD' ? undefined : request.body });
+  });
+}
+
+/** Shared Fetch redirect semantics. send routes/refuses each hop; no destination is fetched here. */
+async function followRedirects(value, init, send, extraDropped = []) {
+  const mode = init.redirect || 'follow';
+  let at = new URL(String(value));
+  let method = String(init.method || 'GET').toUpperCase(), body = init.body;
+  const headers = new Headers(init.headers);
+  for (let hops = 0; ; hops++) {
+    const res = await send(at, { ...init, method, headers, body, redirect: 'manual' });
     if (hops > 0) Object.defineProperty(res, 'redirected', { value: true });
     const location = res.headers.get('location');
     if (!REDIRECTS.includes(res.status) || location === null || mode === 'manual') return res;
@@ -262,13 +264,12 @@ async function appFetch(value, init = {}) {
     const next = new URL(location, at);
     if (next.protocol !== 'http:' && next.protocol !== 'https:') throw new TypeError(`redirect to ${next.protocol} is not followed`);
     if ((res.status === 303 && method !== 'GET' && method !== 'HEAD') || ((res.status === 301 || res.status === 302) && method === 'POST')) {
-      method = 'GET';
-      body = null;
-      for (const k of Object.keys(headers)) if (/^content-/i.test(k)) delete headers[k];
+      method = 'GET'; body = undefined;
+      for (const k of [...headers.keys()]) if (/^content-/i.test(k)) headers.delete(k);
     }
-    if (next.origin !== at.origin) for (const k of Object.keys(headers)) if (CROSS_ORIGIN_DROPPED.includes(k.toLowerCase())) delete headers[k];
+    if (next.origin !== at.origin) for (const k of [...headers.keys()]) if ([...CROSS_ORIGIN_DROPPED, ...extraDropped].includes(k.toLowerCase())) headers.delete(k);
     at = next;
   }
 }
 
-module.exports = { appRouteFor, appHostMatch, appForwardHeaders, appDestination, appRequestOptions, deliverToApp, appFetch, sessionCa };
+module.exports = { appRouteFor, appHostMatch, appForwardHeaders, appDestination, appRequestOptions, deliverToApp, appFetch, followRedirects, sessionCa };

package/dist/app-route.d.cts

@@ -6,3 +6,4 @@ export function appForwardHeaders(url: URL): Record<string, string>;
 export function appDestination(value: string | URL, env?: Readonly<Record<string, string | undefined>>): AppRoute | null;
 export function deliverToApp(route: AppRoute, value: string | URL, init?: { method?: string; headers?: Record<string, string>; body?: string | Uint8Array | null; /** Infinity: no deadline of its own */ timeoutMs?: number; signal?: AbortSignal }): Promise<AppAnswer>;
 export function appFetch(value: string | URL, init?: RequestInit): Promise<Response>;
+export function followRedirects(value: string | URL, init: RequestInit, send: (url: URL, init: RequestInit) => Promise<Response>, extraDropped?: string[]): Promise<Response>;