@adobe/helix-html-pipeline 3.11.17 → 3.11.18

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [3.11.18](https://github.com/adobe/helix-html-pipeline/compare/v3.11.17...v3.11.18) (2023-07-04)
+
+
+### Bug Fixes
+
+* ensure contentBusId is loaded properly ([#342](https://github.com/adobe/helix-html-pipeline/issues/342)) ([80e4552](https://github.com/adobe/helix-html-pipeline/commit/80e4552223124ba73cef41829f40bd64ade392c9))
+
 ## [3.11.17](https://github.com/adobe/helix-html-pipeline/compare/v3.11.16...v3.11.17) (2023-06-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-html-pipeline",
-  "version": "3.11.17",
+  "version": "3.11.18",
   "description": "Helix HTML Pipeline",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -83,7 +83,7 @@
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "10.0.4",
     "c8": "8.0.0",
-    "eslint": "8.43.0",
+    "eslint": "8.44.0",
     "eslint-import-resolver-exports": "1.0.0-beta.5",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.27.5",
@@ -92,11 +92,11 @@
     "js-yaml": "4.1.0",
     "jsdom": "22.1.0",
     "junit-report-builder": "3.0.1",
-    "lint-staged": "13.2.2",
+    "lint-staged": "13.2.3",
     "mocha": "10.2.0",
     "mocha-multi-reporters": "1.5.1",
     "remark-gfm": "3.0.1",
-    "semantic-release": "21.0.5"
+    "semantic-release": "21.0.6"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/PipelineState.d.ts

@@ -46,7 +46,6 @@ declare interface PipelineOptions {
   ref: string;
   partition: string;
   path: string;
-  contentBusId: string;
   timer: PipelineTimer;
   env: object;
 }

package/src/PipelineState.js

@@ -29,8 +29,6 @@ export class PipelineState {
       env: opts.env,
       info: getPathInfo(opts.path),
       content: new PipelineContent(),
-      // todo: compute content-bus id from fstab
-      contentBusId: opts.contentBusId,
       owner: opts.owner,
       repo: opts.repo,
       ref: opts.ref,

package/src/json-pipe.js

@@ -98,7 +98,6 @@ async function computeSurrogateKeys(path, contentBusId) {
 export async function jsonPipe(state, req) {
   const { log } = state;
   state.type = 'json';
-  const { contentBusId } = state;
   const { extension } = state.info;
   const { searchParams } = req.url;
   const params = Object.fromEntries(searchParams.entries());
@@ -174,7 +173,7 @@ export async function jsonPipe(state, req) {
     });
 
     // set surrogate keys
-    const keys = await computeSurrogateKeys(state.info.path, contentBusId);
+    const keys = await computeSurrogateKeys(state.info.path, state.contentBusId);
     res.headers.set('x-surrogate-key', keys.join(' '));
 
     await setCustomResponseHeaders(state, req, res);
@@ -191,7 +190,7 @@ export async function jsonPipe(state, req) {
       await setCustomResponseHeaders(state, req, res);
     }
     if (res.status === 404) {
-      const keys = await computeSurrogateKeys(state.info.path, contentBusId);
+      const keys = await computeSurrogateKeys(state.info.path, state.contentBusId);
       res.headers.set('x-surrogate-key', keys.join(' '));
     }
     return res;

package/src/options-pipe.js

@@ -9,9 +9,12 @@
  * OF ANY KIND, either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
  */
+import { cleanupHeaderValue } from '@adobe/helix-shared-utils';
 import { PipelineResponse } from './PipelineResponse.js';
 import fetchConfigAll from './steps/fetch-config-all.js';
 import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
+import fetchConfig from './steps/fetch-config.js';
+import { PipelineStatusError } from './PipelineStatusError.js';
 
 /**
  * Handles options requests
@@ -20,18 +23,39 @@ import setCustomResponseHeaders from './steps/set-custom-response-headers.js';
  * @returns {Response} a response
  */
 export async function optionsPipe(state, request) {
-  // todo: improve
-  const response = new PipelineResponse('', {
-    status: 204,
-    headers: {
-      // Set preflight cache duration
-      'access-control-max-age': '86400',
-      // Allow content type header
-      'access-control-allow-headers': 'content-type',
-    },
-  });
-  await fetchConfigAll(state, request, response);
-  await setCustomResponseHeaders(state, request, response);
+  try {
+    await fetchConfig(state, request);
+    if (!state.contentBusId) {
+      return new PipelineResponse('', {
+        status: 400,
+        headers: {
+          'x-error': 'contentBusId missing',
+        },
+      });
+    }
 
-  return response;
+    // todo: improve
+    const res = new PipelineResponse('', {
+      status: 204,
+      headers: {
+        // Set preflight cache duration
+        'access-control-max-age': '86400',
+        // Allow content type header
+        'access-control-allow-headers': 'content-type',
+      },
+    });
+    await fetchConfigAll(state, request, res);
+    await setCustomResponseHeaders(state, request, res);
+
+    return res;
+  } catch (e) {
+    const res = new PipelineResponse('', {
+      status: e instanceof PipelineStatusError ? e.code : 500,
+    });
+    const level = res.status >= 500 ? 'error' : 'info';
+    state.log[level](`pipeline status: ${res.status} ${e.message}`);
+    res.headers.set('x-error', cleanupHeaderValue(e.message));
+    res.headers.set('cache-control', 'no-store, private, must-revalidate');
+    return res;
+  }
 }