@adobe/helix-html-pipeline 6.7.9 → 6.8.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [6.8.0](https://github.com/adobe/helix-html-pipeline/compare/v6.7.10...v6.8.0) (2024-04-18)
+
+
+### Features
+
+* serve /config.json ([#589](https://github.com/adobe/helix-html-pipeline/issues/589)) ([f01f9ce](https://github.com/adobe/helix-html-pipeline/commit/f01f9ced59e21aa406c24babe4200e8267dd72e8))
+
+## [6.7.10](https://github.com/adobe/helix-html-pipeline/compare/v6.7.9...v6.7.10) (2024-04-17)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/helix-shared-utils to v3.0.2 ([0d2e360](https://github.com/adobe/helix-html-pipeline/commit/0d2e3603ff179694300e2dd5a34e92570b406fba))
+
 ## [6.7.9](https://github.com/adobe/helix-html-pipeline/compare/v6.7.8...v6.7.9) (2024-04-13)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.7.9",
+  "version": "6.8.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "@adobe/helix-markdown-support": "7.1.2",
-    "@adobe/helix-shared-utils": "3.0.1",
+    "@adobe/helix-shared-utils": "3.0.2",
     "@adobe/mdast-util-gridtables": "4.0.4",
     "@adobe/remark-gridtables": "3.0.4",
     "cookie": "0.6.0",
@@ -91,7 +91,7 @@
     "mocha": "10.4.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.5.1",
-    "semantic-release": "22.0.12"
+    "semantic-release": "23.0.8"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/json-pipe.js

@@ -46,10 +46,12 @@ async function fetchJsonContent(state, req, res) {
     owner, repo, ref, contentBusId, partition, s3Loader, log, info,
   } = state;
   const { path } = state.info;
+  state.content.sourceBus = 'content';
   let ret = await s3Loader.getObject('helix-content-bus', `${contentBusId}/${partition}${path}`);
 
   // if not found, fall back to code bus
   if (ret.status === 404) {
+    state.content.sourceBus = 'code';
     ret = await s3Loader.getObject('helix-code-bus', `${owner}/${repo}/${ref}${path}`);
   }
 
@@ -76,15 +78,23 @@ async function fetchJsonContent(state, req, res) {
 
     updateLastModified(state, res, extractLastModified(ret.headers));
   } else {
+    state.content.sourceBus = 'content';
     res.status = ret.status === 404 ? 404 : 502;
     res.error = `failed to load ${state.info.resourcePath}: ${ret.status}`;
   }
 }
 
-async function computeSurrogateKeys(path, contentBusId) {
+async function computeSurrogateKeys(state) {
   const keys = [];
-  keys.push(`${contentBusId}${path}`.replace(/\//g, '_')); // TODO: remove
-  keys.push(await computeSurrogateKey(`${contentBusId}${path}`));
+  const pathKey = state.content?.sourceBus === 'code'
+    ? `${state.ref}--${state.repo}--${state.owner}${state.info.path}`
+    : `${state.contentBusId}${state.info.path}`;
+
+  if (state.info.path === '/config.json') {
+    keys.push(await computeSurrogateKey(`${state.site}--${state.org}_config.json`));
+  }
+  keys.push(pathKey.replace(/\//g, '_')); // TODO: remove
+  keys.push(await computeSurrogateKey(pathKey));
   return keys;
 }
 
@@ -142,23 +152,27 @@ export async function jsonPipe(state, req) {
 
     await authenticate(state, req, res);
 
-    if (res.error) {
+    if (res.status === 404 && state.info.path === '/config.json' && state.config.public) {
+      // special handling for public config
+      res.status = 200;
+      res.body = JSON.stringify(state.config.public, null, 2);
+    } else if (res.error) {
       if (res.status < 400) {
         return res;
       }
       throw new PipelineStatusError(res.status, res.error);
+    } else {
+      // filter data
+      jsonFilter(state, res, {
+        limit: limit ? Number.parseInt(limit, 10) : undefined,
+        offset: offset ? Number.parseInt(offset, 10) : undefined,
+        sheet,
+        raw: limit === undefined && offset === undefined && sheet === undefined,
+      });
     }
 
-    // filter data
-    jsonFilter(state, res, {
-      limit: limit ? Number.parseInt(limit, 10) : undefined,
-      offset: offset ? Number.parseInt(offset, 10) : undefined,
-      sheet,
-      raw: limit === undefined && offset === undefined && sheet === undefined,
-    });
-
     // set surrogate keys
-    const keys = await computeSurrogateKeys(state.info.path, state.contentBusId);
+    const keys = await computeSurrogateKeys(state);
     res.headers.set('x-surrogate-key', keys.join(' '));
 
     await setCustomResponseHeaders(state, req, res);
@@ -175,7 +189,7 @@ export async function jsonPipe(state, req) {
       await setCustomResponseHeaders(state, req, res);
     }
     if (res.status === 404) {
-      const keys = await computeSurrogateKeys(state.info.path, state.contentBusId);
+      const keys = await computeSurrogateKeys(state);
       res.headers.set('x-surrogate-key', keys.join(' '));
     }
     return res;