@megabudino/stack-utils 1.1.0 → 1.2.0

package/dist/proxy/handle.js

@@ -11,85 +11,92 @@ export function createProxyHandle(config) {
     const sitemapCache = `public, max-age=${config.sitemapCacheSeconds ?? 3600}`;
     const proxyAssets = config.proxyAssets ?? false;
     const additionalOrigins = config.additionalOrigins ?? [];
+    const maxRedirects = config.maxInternalRedirects ?? 5;
     const textReplacements = config.textReplacements ?? {};
+    const siteHost = new URL(siteUrl).hostname;
+    const originHosts = new Set([
+        new URL(originUrl).hostname,
+        ...additionalOrigins.map((url) => new URL(url).hostname)
+    ]);
     return async ({ event, resolve }) => {
         const { pathname, search } = event.url;
         if (event.route.id) {
             return resolve(event);
         }
-        const upstream = new URL(pathname + search, originUrl);
         const headers = new Headers(event.request.headers);
         headers.delete('accept-encoding');
-        headers.delete('host');
+        headers.set('host', siteHost);
         headers.delete('content-length');
-        let upstreamResponse;
-        try {
-            upstreamResponse = await fetch(upstream, {
-                method: event.request.method,
-                headers,
-                redirect: 'manual',
-                body: event.request.method === 'GET' || event.request.method === 'HEAD'
-                    ? undefined
-                    : event.request.body
-            });
-        }
-        catch {
-            return new Response('Bad Gateway', { status: 502 });
-        }
-        if (upstreamResponse.status >= 300 && upstreamResponse.status < 400) {
-            const location = upstreamResponse.headers.get('location');
-            if (location) {
-                try {
-                    const nextUrl = new URL(location);
+        let currentPath = pathname + search;
+        for (let hops = 0;; hops++) {
+            const upstream = new URL(currentPath, originUrl);
+            let upstreamResponse;
+            try {
+                upstreamResponse = await fetch(upstream, {
+                    method: event.request.method,
+                    headers,
+                    redirect: 'manual',
+                    body: event.request.method === 'GET' || event.request.method === 'HEAD'
+                        ? undefined
+                        : event.request.body
+                });
+            }
+            catch {
+                return new Response('Bad Gateway', { status: 502 });
+            }
+            if (upstreamResponse.status >= 300 && upstreamResponse.status < 400) {
+                const location = upstreamResponse.headers.get('location');
+                if (location) {
+                    const nextUrl = new URL(location, upstream);
+                    const isOrigin = originHosts.has(nextUrl.hostname);
+                    const isSite = nextUrl.hostname === siteHost;
+                    if ((isOrigin || isSite) && hops < maxRedirects) {
+                        currentPath = nextUrl.pathname + nextUrl.search;
+                        continue;
+                    }
                     return new Response(null, {
                         status: upstreamResponse.status,
                         headers: {
-                            location: `${siteUrl}${nextUrl.pathname}${nextUrl.search}`
+                            location: isOrigin ? `${siteUrl}${nextUrl.pathname}${nextUrl.search}` : location
                         }
                     });
                 }
-                catch {
-                    return new Response(null, {
-                        status: upstreamResponse.status,
-                        headers: { location }
-                    });
-                }
             }
-        }
-        const cleanHeaders = new Headers(upstreamResponse.headers);
-        cleanHeaders.delete('content-encoding');
-        cleanHeaders.delete('content-length');
-        cleanHeaders.delete('transfer-encoding');
-        const contentType = upstreamResponse.headers.get('content-type') ?? '';
-        if (contentType.includes('text/xml') || contentType.includes('application/xml')) {
-            let xml = await upstreamResponse.text();
-            xml = xml.replace(/<\?xml-stylesheet[^?]*\?>\s*/g, '');
-            if (sitemaps.length > 0 && xml.includes('</sitemapindex>')) {
-                xml = injectIntoSitemapIndex(xml, siteUrl, sitemaps);
+            const cleanHeaders = new Headers(upstreamResponse.headers);
+            cleanHeaders.delete('content-encoding');
+            cleanHeaders.delete('content-length');
+            cleanHeaders.delete('transfer-encoding');
+            const contentType = upstreamResponse.headers.get('content-type') ?? '';
+            if (contentType.includes('text/xml') || contentType.includes('application/xml')) {
+                let xml = await upstreamResponse.text();
+                xml = xml.replace(/<\?xml-stylesheet[^?]*\?>\s*/g, '');
+                if (sitemaps.length > 0 && xml.includes('</sitemapindex>')) {
+                    xml = injectIntoSitemapIndex(xml, siteUrl, sitemaps);
+                }
+                cleanHeaders.set('cache-control', sitemapCache);
+                return new Response(xml, {
+                    status: upstreamResponse.status,
+                    statusText: upstreamResponse.statusText,
+                    headers: cleanHeaders
+                });
             }
-            cleanHeaders.set('cache-control', sitemapCache);
-            return new Response(xml, {
-                status: upstreamResponse.status,
-                statusText: upstreamResponse.statusText,
-                headers: cleanHeaders
-            });
-        }
-        if (contentType.includes('text/html')) {
-            const html = await upstreamResponse.text();
-            let result = rewriteHtml(html, originUrl, siteUrl, proxyAssets, additionalOrigins);
-            for (const [search, replace] of Object.entries(textReplacements)) {
-                result = result.replaceAll(search, replace);
+            if (contentType.includes('text/html')) {
+                const html = await upstreamResponse.text();
+                let result = rewriteHtml(html, originUrl, siteUrl, proxyAssets, additionalOrigins);
+                for (const [search, replace] of Object.entries(textReplacements)) {
+                    result = result.replaceAll(search, replace);
+                }
+                return new Response(result, {
+                    status: upstreamResponse.status,
+                    statusText: upstreamResponse.statusText,
+                    headers: cleanHeaders
+                });
             }
-            return new Response(result, {
+            return new Response(upstreamResponse.body, {
                 status: upstreamResponse.status,
                 statusText: upstreamResponse.statusText,
                 headers: cleanHeaders
             });
         }
-        return new Response(upstreamResponse.body, {
-            status: upstreamResponse.status,
-            statusText: upstreamResponse.statusText,
-            headers: cleanHeaders
-        });
     };
 }

package/dist/proxy/types.d.ts

@@ -25,6 +25,12 @@ export interface ProxyConfig {
      * rewritten the same way as `originUrl` (e.g. legacy/migration domains).
      */
     additionalOrigins?: string[];
+    /**
+     * Maximum number of internal redirects to follow when the origin responds
+     * with a location pointing back to the origin or public site host.
+     * Defaults to 5.
+     */
+    maxInternalRedirects?: number;
     /**
      * Key-value map of text replacements applied to HTML responses
      * after all standard URL rewrites. Each key is replaced with its value

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@megabudino/stack-utils",
-	"version": "1.1.0",
+	"version": "1.2.0",
 	"description": "Reusable utilities for a SvelteKit stack, including a reverse proxy and static image pipeline",
 	"type": "module",
 	"exports": {