Merge pull request #76 from adobe-rnd/feat-redirect-support

feat: honour redirects from edge

Author: dylandepass

src/global.d.ts

@@ -44,6 +44,10 @@ declare global {
 
   export interface PipelineState extends ImportedPipelineState {
     type: 'json' | 'html' | 'media' | 'index' | 'merchant-feed' | 'sitemap';
+    redirect?: {
+      status: number;
+      location: string;
+    };
     config: PipelineSiteConfig;
     info: PathInfo;
     content: PipelineContent;

src/product-html-pipe.js

@@ -55,7 +55,17 @@ export async function productHTMLPipe(state, req) {
     await initConfig(state, req, res);
 
     state.timer?.update('content-fetch');
-    await fetchProductBusContent(state, req, res);
+    await Promise.all([
+      fetchProductBusContent(state, req, res),
+      fetchEdgeContent(state, req, res),
+    ]);
+
+    if (state.redirect) {
+      res.status = state.redirect.status;
+      res.headers.set('location', state.redirect.location);
+      return res;
+    }
+
     if (res.status === 404) {
       await fetch404(state, req, res);
     }
@@ -75,8 +85,6 @@ export async function productHTMLPipe(state, req) {
     transformImages(state);
     state.timer?.update('render');
     await html(state);
-
-    await fetchEdgeContent(state, req, res);
     await extractAuthoredMetadata(state);
 
     await renderHead(state);

src/steps/fetch-edge-product.js

@@ -34,10 +34,20 @@ export default async function fetchEdgeContent(state, req, res) {
     if (authorization) {
       headers.authorization = authorization;
     }
-    const contentRes = await fetch(contentUrl, { headers });
+    const contentRes = await fetch(contentUrl, { headers, redirect: 'manual' });
     if (contentRes.status === 401) {
       throw new PipelineStatusError(401, 'unauthorized');
     }
+
+    // Handle redirects
+    if (contentRes.status === 301) {
+      const location = contentRes.headers.get('location');
+      if (location) {
+        state.redirect = { status: 301, location };
+      }
+      return;
+    }
+
     if (contentRes.status === 200) {
       state.content.edge = await contentRes.text();
 

test/product-html-pipe.test.js

@@ -911,6 +911,132 @@ describe('Product HTML Pipe Test', () => {
     fetchMock.unmockGlobal();
   });
 
+  it('returns 301 when edge content returns a redirect', async () => {
+    fetchMock.unmockGlobal();
+    fetchMock.removeRoutes();
+    const fetchMockGlobal = fetchMock.mockGlobal();
+
+    fetchMockGlobal.get('https://main--site--org.aem.live/products/old-product-url', {
+      status: 301,
+      headers: { location: '/products/new-product-url' },
+    });
+
+    const s3Loader = new FileS3Loader();
+    const state = DEFAULT_STATE(DEFAULT_CONFIG, {
+      log: console,
+      s3Loader,
+      ref: 'main',
+      path: '/products/old-product-url',
+      partition: 'live',
+      timer: { update: () => {} },
+    });
+    state.info = getPathInfo('/products/old-product-url');
+
+    const resp = await productHTMLPipe(
+      state,
+      new PipelineRequest(new URL('https://acme.com/products/old-product-url')),
+    );
+
+    assert.strictEqual(resp.status, 301);
+    assert.strictEqual(resp.headers.get('location'), '/products/new-product-url');
+    assert.strictEqual(resp.body, '');
+    fetchMock.unmockGlobal();
+  });
+
+  it('returns 301 redirect even when product data also exists in R2', async () => {
+    fetchMock.unmockGlobal();
+    fetchMock.removeRoutes();
+    const fetchMockGlobal = fetchMock.mockGlobal();
+
+    fetchMockGlobal.get('https://main--site--org.aem.live/products/product-simple', {
+      status: 301,
+      headers: { location: '/products/new-url' },
+    });
+
+    const s3Loader = new FileS3Loader();
+    const state = DEFAULT_STATE(DEFAULT_CONFIG, {
+      log: console,
+      s3Loader,
+      ref: 'main',
+      path: '/products/product-simple',
+      partition: 'live',
+      timer: { update: () => {} },
+    });
+    state.info = getPathInfo('/products/product-simple');
+
+    const resp = await productHTMLPipe(
+      state,
+      new PipelineRequest(new URL('https://acme.com/products/product-simple')),
+    );
+
+    assert.strictEqual(resp.status, 301);
+    assert.strictEqual(resp.headers.get('location'), '/products/new-url');
+    fetchMock.unmockGlobal();
+  });
+
+  it('returns 301 redirect when product is also a 404 in R2', async () => {
+    fetchMock.unmockGlobal();
+    fetchMock.removeRoutes();
+    const fetchMockGlobal = fetchMock.mockGlobal();
+
+    fetchMockGlobal.get('https://main--site--org.aem.live/products/product-404', {
+      status: 301,
+      headers: { location: '/products/replacement' },
+    });
+
+    const s3Loader = new FileS3Loader();
+    const state = DEFAULT_STATE(DEFAULT_CONFIG, {
+      log: console,
+      s3Loader,
+      ref: 'main',
+      path: '/products/product-404',
+      partition: 'live',
+      timer: { update: () => {} },
+    });
+    state.info = getPathInfo('/products/product-404');
+
+    const resp = await productHTMLPipe(
+      state,
+      new PipelineRequest(new URL('https://acme.com/products/product-404')),
+    );
+
+    assert.strictEqual(resp.status, 301);
+    assert.strictEqual(resp.headers.get('location'), '/products/replacement');
+    fetchMock.unmockGlobal();
+  });
+
+  it('ignores 301 from edge content when location header is missing', async () => {
+    fetchMock.unmockGlobal();
+    fetchMock.removeRoutes();
+    const fetchMockGlobal = fetchMock.mockGlobal();
+
+    fetchMockGlobal.get('https://main--site--org.aem.live/products/product-simple', {
+      status: 301,
+      headers: {},
+    });
+
+    const s3Loader = new FileS3Loader();
+    const state = DEFAULT_STATE(DEFAULT_CONFIG, {
+      log: console,
+      s3Loader,
+      ref: 'main',
+      path: '/products/product-simple',
+      partition: 'live',
+      timer: { update: () => {} },
+    });
+    state.info = getPathInfo('/products/product-simple');
+
+    const resp = await productHTMLPipe(
+      state,
+      new PipelineRequest(new URL('https://acme.com/products/product-simple')),
+    );
+
+    // No location → redirect is ignored, product renders normally
+    assert.strictEqual(resp.status, 200);
+    assert.ok(resp.body.includes('<h1 id="blitzmax-5000">BlitzMax 5000</h1>'));
+    fetchMock.unmockGlobal();
+  });
+
   it('handles authored content with meta tags without name value', async () => {
     // Clear any existing mocks and set up fresh
     fetchMock.unmockGlobal();