@adobe/helix-html-pipeline 6.3.3 → 6.4.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [6.4.0](https://github.com/adobe/helix-html-pipeline/compare/v6.3.4...v6.4.0) (2024-02-06)
+
+
+### Features
+
+* serve or render sitemap.xml ([#530](https://github.com/adobe/helix-html-pipeline/issues/530)) ([b72fe70](https://github.com/adobe/helix-html-pipeline/commit/b72fe70d1b7b22ce7c0ec7d9fefe72db2f472885)), closes [#472](https://github.com/adobe/helix-html-pipeline/issues/472)
+
+## [6.3.4](https://github.com/adobe/helix-html-pipeline/compare/v6.3.3...v6.3.4) (2024-01-30)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/remark-gridtables to v3 ([#521](https://github.com/adobe/helix-html-pipeline/issues/521)) ([367d13d](https://github.com/adobe/helix-html-pipeline/commit/367d13de7884d09184f5705b69fb7d5ba0c114db))
+
 ## [6.3.3](https://github.com/adobe/helix-html-pipeline/compare/v6.3.2...v6.3.3) (2024-01-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "6.3.3",
+  "version": "6.4.0",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -46,7 +46,7 @@
     "@adobe/helix-markdown-support": "7.1.0",
     "@adobe/helix-shared-utils": "3.0.1",
     "@adobe/mdast-util-gridtables": "4.0.0",
-    "@adobe/remark-gridtables": "2.0.2",
+    "@adobe/remark-gridtables": "3.0.0",
     "cookie": "0.6.0",
     "github-slugger": "2.0.0",
     "hast-util-raw": "9.0.2",
@@ -54,7 +54,8 @@
     "hast-util-to-html": "9.0.0",
     "hast-util-to-string": "3.0.0",
     "hastscript": "9.0.0",
-    "jose": "5.2.0",
+    "jose": "5.2.1",
+    "lodash.escape": "4.0.1",
     "mdast-util-to-hast": "13.1.0",
     "mdast-util-to-string": "4.0.0",
     "mime": "4.0.1",
@@ -71,7 +72,7 @@
     "unist-util-visit-parents": "6.0.1"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "2.0.5",
+    "@adobe/eslint-config-helix": "2.0.6",
     "@markedjs/html-differ": "4.0.2",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -82,11 +83,11 @@
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.29.1",
     "esmock": "2.6.3",
-    "husky": "9.0.6",
+    "husky": "9.0.10",
     "js-yaml": "4.1.0",
     "jsdom": "24.0.0",
-    "junit-report-builder": "3.1.0",
-    "lint-staged": "15.2.0",
+    "junit-report-builder": "3.2.1",
+    "lint-staged": "15.2.1",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.4.1",

package/src/index.js

@@ -13,6 +13,7 @@ export * from './html-pipe.js';
 export * from './json-pipe.js';
 export * from './auth-pipe.js';
 export * from './options-pipe.js';
+export * from './sitemap-pipe.js';
 export * from './PipelineContent.js';
 export * from './PipelineRequest.js';
 export * from './PipelineResponse.js';

package/src/sitemap-pipe.js

@@ -0,0 +1,146 @@
+/*
+ * Copyright 2024 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+import escape from 'lodash.escape';
+import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
+import { authenticate } from './steps/authenticate.js';
+import fetchContent from './steps/fetch-content.js';
+import renderCode from './steps/render-code.js';
+import setXSurrogateKeyHeader from './steps/set-x-surrogate-key-header.js';
+import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
+import { PipelineStatusError } from './PipelineStatusError.js';
+import { PipelineResponse } from './PipelineResponse.js';
+import initConfig from './steps/init-config.js';
+import { extractLastModified, updateLastModified } from './utils/last-modified.js';
+
+async function generateSitemap(state, partition) {
+  const {
+    owner, repo, ref, contentBusId, s3Loader, log,
+    previewHost, liveHost, prodHost,
+  } = state;
+  const ret = await s3Loader.getObject('helix-content-bus', `${contentBusId}/live/sitemap.json`);
+  if (ret.status !== 200) {
+    return ret;
+  }
+  let config;
+  try {
+    config = JSON.parse(ret.body);
+  } catch (e) {
+    log.info('failed to parse /sitemap.json', e);
+    throw new PipelineStatusError(404, `Failed to parse /sitemap.json: ${e.message}`);
+  }
+  const { data } = config;
+  if (!data || !Array.isArray(data)) {
+    throw new PipelineStatusError(404, 'Expected \'data\' array not found in /sitemap.json');
+  }
+  const host = partition === 'preview'
+    ? (previewHost || `${ref}--${repo}--${owner}.hlx.page`)
+    : (prodHost || liveHost || `${ref}--${repo}--${owner}.hlx.live`);
+  const loc = ({ path, lastModified }) => `  <url>
+    <loc>https://${host}${escape(path)}</loc>
+    <lastmod>${new Date(lastModified * 1000).toISOString().substring(0, 10)}</lastmod>
+  </url>`;
+  const xml = [
+    '<?xml version="1.0" encoding="utf-8"?>',
+    '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">',
+    ...data.map((record) => loc(record)),
+    '</urlset>',
+  ].join('\n');
+  return new PipelineResponse(xml, {
+    status: 200,
+    headers: {
+      'content-type': 'application/xml; charset=utf-8',
+      'last-modified': ret.headers.get('last-modified'),
+    },
+  });
+}
+
+/**
+ * Serves or renders the sitemap xml. The sitemap is always served from the preview content-bus
+ * partition.
+ *
+ * todo: currently only serves an existing sitemap.xml from the contentbus.
+ *       generate sitemap on the fly based on the sitemap.json
+ *
+ * @param {PipelineState} state
+ * @param {PipelineRequest} req
+ * @returns {PipelineResponse}
+ */
+export async function sitemapPipe(state, req) {
+  const { partition, log } = state;
+  state.type = 'sitemap';
+
+  // force loading from preview
+  state.partition = 'preview';
+
+  if (state.info?.path !== '/sitemap.xml') {
+    // this should not happen as it would mean that the caller used the wrong route. so we respond
+    // with a 500 to indicate that something is wrong.
+    return new PipelineResponse('', {
+      status: 500,
+      headers: {
+        'x-error': 'invalid route',
+      },
+    });
+  }
+
+  /** @type PipelineResponse */
+  const res = new PipelineResponse('', {
+    headers: {
+      'content-type': 'text/plain; charset=utf-8',
+    },
+  });
+
+  try {
+    await initConfig(state, req, res);
+
+    // await requireProject(state, req, res);
+    if (res.error !== 401) {
+      await authenticate(state, req, res);
+    }
+
+    // ...and apply the folder mapping
+    state.timer?.update('content-fetch');
+
+    // fetch sitemap.xml
+    await fetchContent(state, req, res);
+    if (res.status === 404) {
+      const ret = await generateSitemap(state, partition);
+      if (ret.status === 200) {
+        res.status = 200;
+        updateLastModified(state, res, extractLastModified(ret.headers));
+        delete res.error;
+        state.content.data = ret.body;
+      }
+    }
+    if (res.error) {
+      // if content loading produced an error, we're done.
+      throw new PipelineStatusError(res.status, res.error);
+    }
+
+    state.timer?.update('serialize');
+    await renderCode(state, req, res);
+    await setCustomResponseHeaders(state, req, res);
+    await setXSurrogateKeyHeader(state, req, res);
+  } catch (e) {
+    res.error = e.message;
+    res.status = e.code || 500;
+
+    const level = res.status >= 500 ? 'error' : 'info';
+    log[level](`pipeline status: ${res.status} ${res.error}`);
+    res.headers.set('x-error', cleanupHeaderValue(res.error));
+    if (res.status < 500) {
+      await setCustomResponseHeaders(state, req, res);
+      await setXSurrogateKeyHeader(state, req, res);
+    }
+  }
+  return res;
+}