@adobe/helix-config 5.6.7 → 5.6.9

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.6.9](https://github.com/adobe/helix-config/compare/v5.6.8...v5.6.9) (2025-10-24)
+
+
+### Bug Fixes
+
+* return 404 if legacy config has no contentBusId ([#328](https://github.com/adobe/helix-config/issues/328)) ([a532acd](https://github.com/adobe/helix-config/commit/a532acd172af2755e20aca25058aaa9097041360))
+
+## [5.6.8](https://github.com/adobe/helix-config/compare/v5.6.7...v5.6.8) (2025-10-03)
+
+
+### Bug Fixes
+
+* return 502 for potential storage errors ([#321](https://github.com/adobe/helix-config/issues/321)) ([45c4b5b](https://github.com/adobe/helix-config/commit/45c4b5bbd6dc3c66a63667aed08370e5778927b3))
+
 ## [5.6.7](https://github.com/adobe/helix-config/compare/v5.6.6...v5.6.7) (2025-09-29)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-config",
-  "version": "5.6.7",
+  "version": "5.6.9",
   "description": "Helix Config",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/adobe/helix-config"
+    "url": "https://github.com/adobe/helix-config.git"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -35,20 +35,20 @@
     "reporter-options": "configFile=.mocha-multi.json"
   },
   "devDependencies": {
-    "@adobe/eslint-config-helix": "3.0.10",
-    "@eslint/config-helpers": "0.3.1",
+    "@adobe/eslint-config-helix": "3.0.12",
+    "@eslint/config-helpers": "0.4.0",
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
-    "@semantic-release/npm": "12.0.2",
+    "@semantic-release/npm": "13.0.0",
     "c8": "10.1.3",
     "eslint": "9.4.0",
     "husky": "9.1.7",
     "junit-report-builder": "5.1.1",
-    "lint-staged": "16.1.6",
-    "mocha": "11.7.2",
+    "lint-staged": "16.2.3",
+    "mocha": "11.7.4",
     "mocha-multi-reporters": "1.5.1",
     "mocha-suppress-logs": "0.6.0",
-    "semantic-release": "24.2.8"
+    "semantic-release": "25.0.0"
   },
   "lint-staged": {
     "*.js": "eslint",

package/src/config-legacy.js

@@ -114,6 +114,9 @@ export async function resolveLegacyConfig(ctx, rso, scope) {
   }
   const helixConfig = cfg.data;
   const { contentBusId } = helixConfig.content.data['/'];
+  if (!contentBusId) {
+    return null;
+  }
   const fstab = helixConfig.fstab?.data || helixConfig.fstab;
   if (!fstab) {
     return null;

package/src/config-view.js

@@ -22,6 +22,7 @@ import { resolveLegacyConfig, fetchRobotsTxt, toArray } from './config-legacy.js
 import { deepGetOrCreate, prune } from './utils.js';
 import { ConfigObject } from './config-object.js';
 import { ModifiersConfig } from './ModifiersConfig.js';
+import { StatusCodeError } from './status-code-error.js';
 
 /**
  * @typedef Config
@@ -288,6 +289,10 @@ async function resolveConfig(ctx, rso, scope) {
   ctx.timer?.update('load-config');
   const res = await ctx.loader.getObject(HELIX_CONFIG_BUS, key);
   if (!res.body) {
+    if (res.status !== 404) {
+      ctx.log.error('error loading config %s: %d', key, res.status);
+      throw new StatusCodeError('error loading config', res.status);
+    }
     const config = await resolveLegacyConfig(ctx, rso, scope);
     if (config) {
       ctx.timer?.update('profile');
@@ -523,7 +528,19 @@ export async function getConfigResponse(ctx, opts) {
   }
 
   const rso = { ref, site, org };
-  const siteConfig = await resolveConfig(ctx, rso, scope);
+  let siteConfig;
+  try {
+    siteConfig = await resolveConfig(ctx, rso, scope);
+  } catch (e) {
+    return new PipelineResponse('', {
+      status: 502,
+      headers: {
+        'x-surrogate-key': await getSurrogateKey(opts, null),
+        /* c8 ignore next */
+        'x-error': `${e.message} (${e.statusCode || 500})`,
+      },
+    });
+  }
   const headers = {
     'x-surrogate-key': await getSurrogateKey(opts, siteConfig?.data),
   };

package/src/status-code-error.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2025 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 https://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.
+ */
+export class StatusCodeError extends Error {
+  /**
+   * Constructs a StatusCodeError.
+   * @constructor
+   * @param {string} msg Error message
+   * @param {number} statusCode Status code of the error response
+   */
+  constructor(msg, statusCode) {
+    super(msg?.value ?? msg);
+    this.statusCode = statusCode;
+  }
+}

package/src/utils.js

@@ -50,7 +50,7 @@ export function prune(obj, path = '') {
         // eslint-disable-next-line no-param-reassign
         delete obj[key];
       }
-    } else if (typeof prop === 'object') {
+    } else if (prop && typeof prop === 'object') {
       prune(prop, itemPath);
       if (Object.keys(prop).length === 0) {
         // eslint-disable-next-line no-param-reassign