fix: issue

Author: tripodsan

src/html-pipe.js

@@ -131,7 +131,7 @@ export async function htmlPipe(state, req) {
     state.timer?.update('metadata-fetch');
     await Promise.all([
       contentPromise,
-      fetchMappedMetadata(state),
+      fetchMappedMetadata(state, res),
     ]);
 
     if (res.error) {

src/steps/fetch-mapped-metadata.js

@@ -12,6 +12,7 @@
 
 import { PipelineStatusError } from '../PipelineStatusError.js';
 import { Modifiers } from '../utils/modifiers.js';
+import { extractLastModified, updateLastModified } from '../utils/last-modified.js';
 
 /**
  * Loads metadata for a mapped path and puts it into `state.mappedMetadata`. If path is not
@@ -20,9 +21,10 @@ import { Modifiers } from '../utils/modifiers.js';
  *
  * @type PipelineStep
  * @param {PipelineState} state
+ * @param {PipelineResponse} res
  * @returns {Promise<void>}
  */
-export default async function fetchMappedMetadata(state) {
+export default async function fetchMappedMetadata(state, res) {
   state.mappedMetadata = Modifiers.EMPTY;
   if (!state.mapped) {
     return;
@@ -51,6 +53,7 @@ export default async function fetchMappedMetadata(state) {
     state.mappedMetadata = Modifiers.fromModifierSheet(
       data,
     );
+    updateLastModified(state, res, extractLastModified(ret.headers));
     return;
   }
   if (ret.status !== 404) {

test/rendering.test.js

@@ -670,6 +670,7 @@ describe('Rendering', () => {
       assert.deepStrictEqual(Object.fromEntries(resp.headers.entries()), {
         'access-control-allow-origin': '*',
         'content-type': 'text/html; charset=utf-8',
+        'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
         'x-surrogate-key': 'AkcHu8fRFT7HarTR foo-id_metadata super-test--helix-pages--adobe_head foo-id AkcHu8fRFT7HarTR_metadata z8NGXvKB0X5Fzcnd',
         link: '</scripts/scripts.js>; rel=modulepreload; as=script; crossorigin=use-credentials',
       });
@@ -716,6 +717,9 @@ describe('Rendering', () => {
     });
 
     it('respect metadata with folder mapping: self and descendents', async () => {
+      loader
+        .headers('generic-product/metadata.json', 'last-modified', 'Thu Nov 07 2024 00:00:00 GMT+0000');
+
       let resp = await render(new URL('https://helix-pipeline.com/products'));
       assert.strictEqual(resp.status, 200);
       assert.match(resp.body, /<meta name="short-title" content="E">/);
@@ -730,7 +734,7 @@ describe('Rendering', () => {
       assert.deepStrictEqual(Object.fromEntries(resp.headers.entries()), {
         'access-control-allow-origin': '*',
         'content-type': 'text/html; charset=utf-8',
-        'last-modified': 'Fri, 30 Apr 2021 03:47:18 GMT',
+        'last-modified': 'Thu Nov 07 2024 00:00:00 GMT+0000',
         'x-surrogate-key': 'AkcHu8fRFT7HarTR foo-id_metadata super-test--helix-pages--adobe_head foo-id AkcHu8fRFT7HarTR_metadata z8NGXvKB0X5Fzcnd',
         link: '</scripts/scripts.js>; rel=modulepreload; as=script; crossorigin=use-credentials',
       });

test/steps/fetch-mapped-metadata.test.js

@@ -11,7 +11,7 @@
  */
 /* eslint-env mocha */
 import assert from 'assert';
-import { PipelineStatusError } from '../../src/index.js';
+import { PipelineResponse, PipelineStatusError } from '../../src/index.js';
 import { StaticS3Loader } from '../StaticS3Loader.js';
 import fetchMappedMetadata from '../../src/steps/fetch-mapped-metadata.js';
 import { FileS3Loader } from '../FileS3Loader.js';
@@ -30,7 +30,7 @@ describe('Fetch Mapped Metadata', () => {
       s3Loader: new FileS3Loader()
         .rewrite('foo-id/live/mapped/metadata.json', 'metadata-kv.json'),
     };
-    await fetchMappedMetadata(state);
+    await fetchMappedMetadata(state, new PipelineResponse());
     assert.deepEqual(state.mappedMetadata.getModifiers('/new/foo'), {
       description: 'Lorem ipsum dolor sit amet.',
       keywords: 'ACME, CORP, PR',
@@ -53,7 +53,7 @@ describe('Fetch Mapped Metadata', () => {
           body: 'this is no json!',
           headers: new Map(),
         }),
-    });
+    }, new PipelineResponse());
     await assert.rejects(promise, new PipelineStatusError(500, 'failed parsing of /mapped/metadata.json: Unexpected token \'h\', "this is no json!" is not valid JSON'));
   });
 
@@ -74,7 +74,7 @@ describe('Fetch Mapped Metadata', () => {
         }),
     });
     await assert.rejects(promise, new PipelineStatusError(500, 'failed loading of /mapped/metadata.json: data must be an array'));
-  });
+  }, new PipelineResponse());
 
   it('ignores metadata with no data array', async () => {
     const state = {
@@ -94,7 +94,7 @@ describe('Fetch Mapped Metadata', () => {
     };
     await fetchMappedMetadata(state);
     assert.strictEqual(state.mappedMetadata, Modifiers.EMPTY);
-  });
+  }, new PipelineResponse());
 
   it('throws error on generic error', async () => {
     const promise = fetchMappedMetadata({
@@ -113,5 +113,5 @@ describe('Fetch Mapped Metadata', () => {
         }),
     });
     await assert.rejects(promise, new PipelineStatusError(502, 'failed to load /mapped/metadata.json: 500'));
-  });
+  }, new PipelineResponse());
 });