fix: respect last-modified from mapped metadata

fixes #737

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/FileS3Loader.js

@@ -53,15 +53,14 @@ export class FileS3Loader {
     if (!dir) {
       throw Error(`unknown bucketId: ${bucketId}`);
     }
-    // eslint-disable-next-line no-console
-    let fileName = key.split('/').pop();
+    let fileName = key.split('/').slice(2).join('/');
 
     fileName = this.rewrites.reduce((result, rewrite) => rewrite(key) || result, null) || fileName;
     const status = this.statusCodeOverrides[fileName];
     const headers = this.headerOverride[fileName] ?? new Map();
     if (status) {
       // eslint-disable-next-line no-console
-      console.log(`FileS3Loader: loading ${bucketId}/${key} -> ${status}`);
+      console.log(`FileS3Loader: loading ${bucketId}/${fileName} -> ${status}`);
       return {
         status,
         body: '',
@@ -73,7 +72,7 @@ export class FileS3Loader {
     try {
       const body = await readFile(file, 'utf-8');
       // eslint-disable-next-line no-console
-      console.log(`FileS3Loader: loading ${bucketId}/${key} -> 200`);
+      console.log(`FileS3Loader: loading ${bucketId}/${fileName} -> 200`);
       return {
         status: 200,
         body,
@@ -86,7 +85,7 @@ export class FileS3Loader {
       };
     } catch (e) {
       // eslint-disable-next-line no-console
-      console.log(`FileS3Loader: loading ${bucketId}/${key} -> 404 (${e.message})`);
+      console.log(`FileS3Loader: loading ${bucketId}/${fileName} -> 404 (${e.message})`);
       return {
         status: 404,
         body: '',

test/fixtures/code/404-test.html renamed to test/fixtures/code/super-test/404-test.html

@@ -0,0 +1,3 @@
+<!-- this is a test document -->
+# Hello
+

test/fixtures/code/my-block.selector.html renamed to test/fixtures/code/super-test/my-block.selector.html

@@ -0,0 +1,66 @@
+{
+  ":version": 3,
+  ":type": "multi-sheet",
+  ":names": [
+    "default"
+  ],
+  "default": {
+    "total": 2,
+    "offset": 0,
+    "limit": 2,
+    "data": [
+      {
+        "URL": "/page-*",
+        "Category": "rendering-test"
+      },
+      {
+        "url": "**/page-*-blocks",
+        "Glob Test": "match ** and * combo"
+      },
+      {
+        "Url": "**/marketing/**",
+        "Category": "Marketing"
+      },
+      {
+        "URL": "/page-metadata-json.html",
+        "Image": "/media_cf867e391c0b433ec3d416c979aafa1f8e4aae9c.png",
+        "Keywords": "Baz, Bar, Foo",
+        "og:publisher": "Adobe"
+      },
+      {
+        "URL": "/page-metadata-json",
+        "Image": "/media_cf867e391c0b433ec3d416c979aafa1f8e4aae9c.png",
+        "Keywords": "Baz, Bar, Foo",
+        "og:publisher": "Adobe"
+      },
+      {
+        "URL": "/exact-match.html",
+        "Keywords": "Exactomento",
+        "og:publisher": "Adobe",
+        "Short Title": "E"
+      },
+      {
+        "URL": "/page-metadata-block",
+        "Short Title": "global-meta"
+      },
+      {
+        "URL": "/exact-match",
+        "Keywords": "Exactomento",
+        "og:publisher": "Adobe",
+        "Short Title": "E"
+      },
+      {
+        "URL": "/exact-folder/",
+        "Keywords": "Exactomento Folder",
+        "og:publisher": "Adobe",
+        "Short Title": "E"
+      },
+      {
+        "URL": "/products**",
+        "Keywords": "Exactomento Mapped Folder",
+        "og:publisher": "Adobe",
+        "Short Title": "E"
+      }
+    ]
+  }
+}

test/fixtures/code/index.html renamed to test/fixtures/code/super-test/spa/index.html

@@ -0,0 +1,3 @@
+<!-- this is a test document -->
+# Hello
+