@lwrjs/core 0.17.2-alpha.3 → 0.17.2-alpha.5

package/build/cjs/middleware/bundle-middleware.cjs

@@ -45,17 +45,17 @@ function createBundleMiddleware(context) {
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
       return;
     }
     if (!req.validateJsonRequest()) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_JSON());
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_JSON());
       return;
     }
     if (!req.validateApiVersion(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
       return;
     }
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);
@@ -92,7 +92,7 @@ function createSourceMapMiddleware(context) {
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
       return;
     }
     const {runtimeEnvironment} = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/cjs/middleware/mapping-middleware.cjs

@@ -41,7 +41,7 @@ function createMappingMiddleware(context) {
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
       return;
     }
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/cjs/middleware/module-middleware.cjs

@@ -39,17 +39,17 @@ function createModuleMiddleware(context) {
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
       return;
     }
     if (!req.validateJsonRequest()) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_JSON());
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_JSON());
       return;
     }
     if (!req.validateApiVersion(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
       return;
     }
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/cjs/middleware/resource-middleware.cjs

@@ -33,7 +33,7 @@ function createResourceMiddleware(context) {
   const {appConfig, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment} = context;
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
-      res.status(400).send(import_diagnostics.descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+      res.status(400).send(import_diagnostics.descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
       return;
     }
     const {runtimeEnvironment, runtimeParams} = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/cjs/middleware/utils/error-handling.cjs

@@ -28,16 +28,42 @@ __export(exports, {
 });
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_diagnostics2 = __toModule(require("@lwrjs/diagnostics"));
-function createReturnStatus(error, url) {
-  if (error instanceof import_diagnostics.LwrApplicationError) {
-    return {status: 400, message: error.message};
+var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
+function addRedirectQueryParam(redirectUrl, depth) {
+  const fakeOrigin = "http://parse.com";
+  const url = (0, import_shared_utils.isURL)(redirectUrl) ? new URL(redirectUrl) : new URL(`${fakeOrigin}${redirectUrl}`);
+  url.searchParams.set(import_shared_utils.REQUEST_DEPTH_KEY, String(depth + 1));
+  return url.toString().replace(fakeOrigin, "");
+}
+function createReturnStatus(error, req, debug) {
+  let status = 500, body = error.message || "";
+  const headers = {};
+  if (error instanceof import_diagnostics.LwrStatusError) {
+    status = error.status;
+    const rawHeaders = error.headers || {};
+    Object.entries(rawHeaders).forEach(([key, value]) => headers[key.toLowerCase()] = value);
+    if (status === 301 || status === 302) {
+      const location = headers.location;
+      if (location && (0, import_shared_utils.isURL)(location) || location?.startsWith("/")) {
+        headers.location = addRedirectQueryParam(location, (0, import_shared_utils.parseRequestDepth)(req.headers, req.query));
+      } else {
+        import_diagnostics2.logger.warn(`[error-middleware] Invalid location header for HTTP status ${status}: "${location}"`);
+      }
+    }
+  }
+  if (error instanceof import_diagnostics.LwrInvalidError) {
+    status = 400;
+  } else if (error instanceof import_diagnostics.LwrUnresolvableError) {
+    status = 404;
+  } else {
+    body = error instanceof import_diagnostics.LwrError ? body : `${import_diagnostics.descriptions.SERVER.SERVER_ERROR(req.originalUrl)}: ${body}`;
   }
-  if (error instanceof import_diagnostics.LwrUnresolvableError) {
-    return {status: 404, message: error.message};
+  if (debug) {
+    body = `<div style="font-family:sans-serif;margin:50px;"><h1>${status}: Document generation failed</h1><p>${body.replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p></div>`;
   }
-  return {status: 500, message: `${import_diagnostics.descriptions.SERVER.SERVER_ERROR(url)}: ${error.message}`};
+  return {status, body, headers: Object.keys(headers).length > 0 ? headers : void 0};
 }
-function handleErrors(middleware) {
+function handleErrors(middleware, isBaseDoc = false) {
   return async (req, res, next) => {
     try {
       await middleware(req, res, next);
@@ -49,9 +75,10 @@ function handleErrors(middleware) {
       } else {
         import_diagnostics2.logger.error(err);
       }
-      const {status, message} = createReturnStatus(err, req.originalUrl);
+      const {status, body, headers} = createReturnStatus(err, req, req.query.debug !== void 0 && isBaseDoc);
+      headers && res.set(headers);
       res.status(status);
-      res.send(message);
+      res.send(body);
     }
   };
 }

package/build/cjs/middleware/utils/identity.cjs

@@ -37,7 +37,7 @@ function validateSpecifier(specifer) {
 function getModuleIdentity(req, importer) {
   const {specifier, signature} = req.params;
   if (validateSpecifier(specifier) === false) {
-    throw new import_diagnostics.LwrApplicationError(import_diagnostics.descriptions.APPLICATION.INVALID_SPECIFIER(specifier));
+    throw new import_diagnostics.LwrInvalidError(import_diagnostics.descriptions.INVALID.INVALID_SPECIFIER(specifier));
   }
   const moduleId = (0, import_shared_utils.explodeSpecifier)(specifier);
   return {
@@ -61,7 +61,7 @@ function getMappingIdentity(req) {
 function getResourceIdentity(req) {
   const {specifier, signature = import_shared_utils.LATEST_SIGNATURE} = req.params;
   if (validateSpecifier(specifier) === false) {
-    throw new import_diagnostics.LwrApplicationError(import_diagnostics.descriptions.APPLICATION.INVALID_SPECIFIER(specifier));
+    throw new import_diagnostics.LwrInvalidError(import_diagnostics.descriptions.INVALID.INVALID_SPECIFIER(specifier));
   }
   const resourceId = (0, import_shared_utils.explodeSpecifier)(specifier);
   return {
@@ -73,7 +73,7 @@ function getAssetIdentity(req) {
   const {signature, immutable, assetType: type} = req.params;
   const specifier = type ? process.platform === "win32" ? req.params[0] : "/" + req.params[0] : req.originalUrl.split("?")[0];
   if (validateSpecifier(specifier) === false) {
-    throw new import_diagnostics.LwrApplicationError(import_diagnostics.descriptions.APPLICATION.INVALID_SPECIFIER(specifier));
+    throw new import_diagnostics.LwrInvalidError(import_diagnostics.descriptions.INVALID.INVALID_SPECIFIER(specifier));
   }
   return {
     immutable,

package/build/cjs/middleware/view-middleware.cjs

@@ -45,12 +45,12 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
   return async (req, res) => {
     if (!req.validateEnvironmentRequest(appConfig)) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
       return;
     }
     if (!req.validateJsonRequest()) {
       res.status(400);
-      res.send(import_diagnostics.descriptions.APPLICATION.INVALID_JSON());
+      res.send(import_diagnostics.descriptions.INVALID.INVALID_JSON());
       return;
     }
     const {runtimeEnvironment, runtimeParams: defaultRuntimeParams} = req.getRuntimeContext(context.runtimeEnvironment);
@@ -96,7 +96,7 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
       });
       resolvedRoute = route;
     } catch (err) {
-      if (!errorRoute) {
+      if (!errorRoute || runtimeEnvironment.debug) {
         throw err;
       }
       import_diagnostics.logger.error(`[view-middleware] Route Error ${req.originalUrl}`);
@@ -136,24 +136,8 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
       }
     }
     let status = resolvedRoute.status || viewResponse.status || 200;
-    const viewDefinitionStatus = viewResponse.metadata?.viewDefinition?.status;
     if (viewResponse.status === 301 || viewResponse.status === 302) {
       status = viewResponse.status;
-    } else if (viewDefinitionStatus && viewDefinitionStatus.code) {
-      const origStatus = status;
-      const {code, location} = viewDefinitionStatus;
-      const isRedirect = code === 301 || code === 302;
-      status = code;
-      if (isRedirect) {
-        if (location && (0, import_shared_utils.isURL)(location) || location?.startsWith("/")) {
-          res.set({
-            location: addRedirectQueryParam(location, (0, import_shared_utils.parseRequestDepth)(req.headers, req.query))
-          });
-        } else {
-          status = origStatus;
-          import_diagnostics.logger.warn(`[view-middleware] Ignoring invalid location header: "${location}"`);
-        }
-      }
     }
     res.status(status);
     const viewResponseBody = viewResponse.body;
@@ -264,7 +248,7 @@ function viewMiddleware(app, context) {
       }
     }
     import_diagnostics.logger.debug({label: `view-middleware`, message: `Add view paths ${paths}`});
-    app.get(paths, (0, import_error_handling.handleErrors)(createViewMiddleware(route, errorRoutes, context, viewHandler)));
+    app.get(paths, (0, import_error_handling.handleErrors)(createViewMiddleware(route, errorRoutes, context, viewHandler), true));
   }
   app.get((0, import_shared_utils.getClientBootstrapConfigurationRoutes)(), (0, import_error_handling.handleErrors)(createConfigMiddleware(routes, context, viewHandler)));
   app.get("/" + app.getRegexWildcard(), (0, import_error_handling.handleErrors)(createNotFoundMiddleware(errorRoutes, context, viewHandler)));
@@ -299,12 +283,6 @@ function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, defaultRed
     return res.sendStatus(301);
   });
 }
-function addRedirectQueryParam(redirectUrl, depth) {
-  const fakeOrigin = "http://parse.com";
-  const url = (0, import_shared_utils.isURL)(redirectUrl) ? new URL(redirectUrl) : new URL(`${fakeOrigin}${redirectUrl}`);
-  url.searchParams.set(import_shared_utils.REQUEST_DEPTH_KEY, String(depth + 1));
-  return url.toString().replace(fakeOrigin, "");
-}
 function byteSize(body) {
   if (Buffer.isBuffer(body)) {
     return body.length;

package/build/es/middleware/bundle-middleware.js

@@ -12,17 +12,17 @@ function createBundleMiddleware(context) {
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+            res.send(descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
             return;
         }
         if (!req.validateJsonRequest()) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_JSON());
+            res.send(descriptions.INVALID.INVALID_JSON());
             return;
         }
         if (!req.validateApiVersion(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
+            res.send(descriptions.INVALID.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
             return;
         }
         const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);
@@ -65,7 +65,7 @@ function createSourceMapMiddleware(context) {
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+            res.send(descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
             return;
         }
         const { runtimeEnvironment } = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/es/middleware/mapping-middleware.js

@@ -8,7 +8,7 @@ function createMappingMiddleware(context) {
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+            res.send(descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
             return;
         }
         const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/es/middleware/module-middleware.js

@@ -11,17 +11,17 @@ function createModuleMiddleware(context) {
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+            res.send(descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
             return;
         }
         if (!req.validateJsonRequest()) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_JSON());
+            res.send(descriptions.INVALID.INVALID_JSON());
             return;
         }
         if (!req.validateApiVersion(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
+            res.send(descriptions.INVALID.INVALID_API_VERSION(req.params.apiVersion, appConfig.apiVersion));
             return;
         }
         const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/es/middleware/resource-middleware.js

@@ -5,7 +5,7 @@ function createResourceMiddleware(context) {
     const { appConfig, resourceRegistry, runtimeEnvironment: defaultRuntimeEnvironment } = context;
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
-            res.status(400).send(descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+            res.status(400).send(descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
             return;
         }
         const { runtimeEnvironment, runtimeParams } = req.getRuntimeContext(defaultRuntimeEnvironment);

package/build/es/middleware/utils/error-handling.d.ts

@@ -1,3 +1,3 @@
 import type { MiddlewareFunction } from '@lwrjs/types';
-export declare function handleErrors(middleware: MiddlewareFunction): MiddlewareFunction;
+export declare function handleErrors(middleware: MiddlewareFunction, isBaseDoc?: boolean): MiddlewareFunction;
 //# sourceMappingURL=error-handling.d.ts.map

package/build/es/middleware/utils/error-handling.js

@@ -1,16 +1,53 @@
-import { descriptions, DiagnosticsError, LwrApplicationError, LwrUnresolvableError, } from '@lwrjs/diagnostics';
+import { descriptions, DiagnosticsError, LwrError, LwrInvalidError, LwrStatusError, LwrUnresolvableError, } from '@lwrjs/diagnostics';
 import { logger } from '@lwrjs/diagnostics';
-function createReturnStatus(error, url) {
-    if (error instanceof LwrApplicationError) {
-        return { status: 400, message: error.message };
+import { isURL, parseRequestDepth, REQUEST_DEPTH_KEY } from '@lwrjs/shared-utils';
+function addRedirectQueryParam(redirectUrl, depth) {
+    // add a request depth query param to the URL
+    // the depth header cannot be used since headers cannot be added to a redirect
+    const fakeOrigin = 'http://parse.com';
+    const url = isURL(redirectUrl) ? new URL(redirectUrl) : new URL(`${fakeOrigin}${redirectUrl}`);
+    url.searchParams.set(REQUEST_DEPTH_KEY, String(depth + 1));
+    return url.toString().replace(fakeOrigin, '');
+}
+function createReturnStatus(error, req, debug) {
+    let status = 500, body = error.message || '';
+    const headers = {};
+    if (error instanceof LwrStatusError) {
+        // handle special HTTP statuses, eg: 301, 302, 429, 503
+        status = error.status;
+        const rawHeaders = error.headers || {};
+        Object.entries(rawHeaders).forEach(([key, value]) => (headers[key.toLowerCase()] = value));
+        if (status === 301 || status === 302) {
+            // handle redirect
+            const location = headers.location;
+            if ((location && isURL(location)) || location?.startsWith('/')) {
+                headers.location = addRedirectQueryParam(location, parseRequestDepth(req.headers, req.query));
+            }
+            else {
+                logger.warn(`[error-middleware] Invalid location header for HTTP status ${status}: "${location}"`);
+            }
+        }
+    }
+    if (error instanceof LwrInvalidError) {
+        status = 400;
+    }
+    else if (error instanceof LwrUnresolvableError) {
+        status = 404;
+    }
+    else {
+        // catchall: likely a LwrServerError
+        body =
+            error instanceof LwrError
+                ? body
+                : `${descriptions.SERVER.SERVER_ERROR(req.originalUrl)}: ${body}`;
     }
-    if (error instanceof LwrUnresolvableError) {
-        return { status: 404, message: error.message };
+    if (debug) {
+        // return a debug base doc if debug mode is on
+        body = `<div style="font-family:sans-serif;margin:50px;"><h1>${status}: Document generation failed</h1><p>${body.replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p></div>`;
     }
-    // catchall: likely a LwrServerError
-    return { status: 500, message: `${descriptions.SERVER.SERVER_ERROR(url)}: ${error.message}` };
+    return { status, body, headers: Object.keys(headers).length > 0 ? headers : undefined };
 }
-export function handleErrors(middleware) {
+export function handleErrors(middleware, isBaseDoc = false) {
     return async (req, res, next) => {
         try {
             await middleware(req, res, next);
@@ -24,9 +61,12 @@ export function handleErrors(middleware) {
             else {
                 logger.error(err);
             }
-            const { status, message } = createReturnStatus(err, req.originalUrl);
+            const { status, body, headers } = createReturnStatus(err, req, 
+            // only return HTML error screen for base doc requests in debug mode
+            req.query.debug !== undefined && isBaseDoc);
+            headers && res.set(headers);
             res.status(status);
-            res.send(message);
+            res.send(body);
         }
     };
 }

package/build/es/middleware/utils/identity.js

@@ -1,12 +1,12 @@
 import { explodeSpecifier, explodeSpecifiers, LATEST_SIGNATURE } from '@lwrjs/shared-utils';
-import { descriptions, LwrApplicationError } from '@lwrjs/diagnostics';
+import { descriptions, LwrInvalidError } from '@lwrjs/diagnostics';
 function validateSpecifier(specifer) {
     return specifer.indexOf('../') < 0;
 }
 export function getModuleIdentity(req, importer) {
     const { specifier, signature } = req.params;
     if (validateSpecifier(specifier) === false) {
-        throw new LwrApplicationError(descriptions.APPLICATION.INVALID_SPECIFIER(specifier));
+        throw new LwrInvalidError(descriptions.INVALID.INVALID_SPECIFIER(specifier));
     }
     const moduleId = explodeSpecifier(specifier);
     return {
@@ -30,7 +30,7 @@ export function getMappingIdentity(req) {
 export function getResourceIdentity(req) {
     const { specifier, signature = LATEST_SIGNATURE } = req.params;
     if (validateSpecifier(specifier) === false) {
-        throw new LwrApplicationError(descriptions.APPLICATION.INVALID_SPECIFIER(specifier));
+        throw new LwrInvalidError(descriptions.INVALID.INVALID_SPECIFIER(specifier));
     }
     const resourceId = explodeSpecifier(specifier);
     return {
@@ -46,7 +46,7 @@ export function getAssetIdentity(req) {
             : '/' + req.params[0]
         : req.originalUrl.split('?')[0];
     if (validateSpecifier(specifier) === false) {
-        throw new LwrApplicationError(descriptions.APPLICATION.INVALID_SPECIFIER(specifier));
+        throw new LwrInvalidError(descriptions.INVALID.INVALID_SPECIFIER(specifier));
     }
     return {
         immutable,

package/build/es/middleware/view-middleware.js

@@ -2,7 +2,7 @@ import { TextEncoder } from 'util';
 import { URLSearchParams } from 'url';
 import { descriptions, logger } from '@lwrjs/diagnostics';
 import { getClientRoutes } from '@lwrjs/router';
-import { decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRoutes, isURL, parseRequestDepth, REQUEST_DEPTH_KEY, isLocalDev, shortestTtl, isLambdaEnv, } from '@lwrjs/shared-utils';
+import { decodeViewPath, extractRequestParams, getClientBootstrapConfigurationRoutes, isLocalDev, shortestTtl, isLambdaEnv, } from '@lwrjs/shared-utils';
 import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
 import { handleErrors } from './utils/error-handling.js';
 import { LwrViewHandler } from '@lwrjs/view-registry';
@@ -17,12 +17,12 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
     return async (req, res) => {
         if (!req.validateEnvironmentRequest(appConfig)) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_ENVIRONMENT(req.params.environment));
+            res.send(descriptions.INVALID.INVALID_ENVIRONMENT(req.params.environment));
             return;
         }
         if (!req.validateJsonRequest()) {
             res.status(400);
-            res.send(descriptions.APPLICATION.INVALID_JSON());
+            res.send(descriptions.INVALID.INVALID_JSON());
             return;
         }
         const { runtimeEnvironment, runtimeParams: defaultRuntimeParams } = req.getRuntimeContext(context.runtimeEnvironment);
@@ -72,7 +72,9 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             resolvedRoute = route;
         }
         catch (err) {
-            if (!errorRoute) {
+            if (!errorRoute || runtimeEnvironment.debug) {
+                // this is handled by the error middleware
+                // when debug mode is on, always show the error screen
                 throw err;
             }
             // Log Unexpected Routing Errors
@@ -119,29 +121,10 @@ function createViewMiddleware(route, errorRoutes, context, viewHandler) {
             }
         }
         let status = resolvedRoute.status || viewResponse.status || 200;
-        const viewDefinitionStatus = viewResponse.metadata?.viewDefinition?.status;
         if (viewResponse.status === 301 || viewResponse.status === 302) {
             // route handle redirect status takes precedence
             status = viewResponse.status;
         }
-        else if (viewDefinitionStatus && viewDefinitionStatus.code) {
-            const origStatus = status;
-            const { code, location } = viewDefinitionStatus;
-            const isRedirect = code === 301 || code === 302;
-            status = code;
-            if (isRedirect) {
-                if ((location && isURL(location)) || location?.startsWith('/')) {
-                    res.set({
-                        location: addRedirectQueryParam(location, parseRequestDepth(req.headers, req.query)),
-                    });
-                }
-                else {
-                    // reset the status in the event of an invalid location when redirecting
-                    status = origStatus;
-                    logger.warn(`[view-middleware] Ignoring invalid location header: "${location}"`);
-                }
-            }
-        }
         res.status(status);
         // LWR@MRT 254 temporary safeguard for "dupe styles" issue causing huge base docs
         // Re-evaluate for removal once we determine it is no longer needed: W-17201070
@@ -272,7 +255,7 @@ export function viewMiddleware(app, context) {
             }
         }
         logger.debug({ label: `view-middleware`, message: `Add view paths ${paths}` });
-        app.get(paths, handleErrors(createViewMiddleware(route, errorRoutes, context, viewHandler)));
+        app.get(paths, handleErrors(createViewMiddleware(route, errorRoutes, context, viewHandler), true));
     }
     // create and attach middleware for bootstrap configurations
     app.get(getClientBootstrapConfigurationRoutes(), handleErrors(createConfigMiddleware(routes, context, viewHandler)));
@@ -325,14 +308,6 @@ function addDefaultLocaleRedirects(defaultLocale, defaultLocalePaths, defaultRed
         return res.sendStatus(301);
     });
 }
-function addRedirectQueryParam(redirectUrl, depth) {
-    // add a request depth query param to the URL
-    // the depth header cannot be used since headers cannot be added to a redirect
-    const fakeOrigin = 'http://parse.com';
-    const url = isURL(redirectUrl) ? new URL(redirectUrl) : new URL(`${fakeOrigin}${redirectUrl}`);
-    url.searchParams.set(REQUEST_DEPTH_KEY, String(depth + 1));
-    return url.toString().replace(fakeOrigin, '');
-}
 // Get number of bytes from a string.  Different char encodings can effect size per char.
 function byteSize(body) {
     if (Buffer.isBuffer(body)) {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.17.2-alpha.3",
+    "version": "0.17.2-alpha.5",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -43,34 +43,34 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/app-service": "0.17.2-alpha.3",
-        "@lwrjs/asset-registry": "0.17.2-alpha.3",
-        "@lwrjs/asset-transformer": "0.17.2-alpha.3",
-        "@lwrjs/base-view-provider": "0.17.2-alpha.3",
-        "@lwrjs/base-view-transformer": "0.17.2-alpha.3",
-        "@lwrjs/client-modules": "0.17.2-alpha.3",
-        "@lwrjs/config": "0.17.2-alpha.3",
-        "@lwrjs/diagnostics": "0.17.2-alpha.3",
-        "@lwrjs/esbuild": "0.17.2-alpha.3",
-        "@lwrjs/fs-asset-provider": "0.17.2-alpha.3",
-        "@lwrjs/fs-watch": "0.17.2-alpha.3",
-        "@lwrjs/html-view-provider": "0.17.2-alpha.3",
-        "@lwrjs/instrumentation": "0.17.2-alpha.3",
-        "@lwrjs/loader": "0.17.2-alpha.3",
-        "@lwrjs/lwc-module-provider": "0.17.2-alpha.3",
-        "@lwrjs/lwc-ssr": "0.17.2-alpha.3",
-        "@lwrjs/markdown-view-provider": "0.17.2-alpha.3",
-        "@lwrjs/module-bundler": "0.17.2-alpha.3",
-        "@lwrjs/module-registry": "0.17.2-alpha.3",
-        "@lwrjs/npm-module-provider": "0.17.2-alpha.3",
-        "@lwrjs/nunjucks-view-provider": "0.17.2-alpha.3",
-        "@lwrjs/o11y": "0.17.2-alpha.3",
-        "@lwrjs/resource-registry": "0.17.2-alpha.3",
-        "@lwrjs/router": "0.17.2-alpha.3",
-        "@lwrjs/server": "0.17.2-alpha.3",
-        "@lwrjs/shared-utils": "0.17.2-alpha.3",
-        "@lwrjs/static": "0.17.2-alpha.3",
-        "@lwrjs/view-registry": "0.17.2-alpha.3",
+        "@lwrjs/app-service": "0.17.2-alpha.5",
+        "@lwrjs/asset-registry": "0.17.2-alpha.5",
+        "@lwrjs/asset-transformer": "0.17.2-alpha.5",
+        "@lwrjs/base-view-provider": "0.17.2-alpha.5",
+        "@lwrjs/base-view-transformer": "0.17.2-alpha.5",
+        "@lwrjs/client-modules": "0.17.2-alpha.5",
+        "@lwrjs/config": "0.17.2-alpha.5",
+        "@lwrjs/diagnostics": "0.17.2-alpha.5",
+        "@lwrjs/esbuild": "0.17.2-alpha.5",
+        "@lwrjs/fs-asset-provider": "0.17.2-alpha.5",
+        "@lwrjs/fs-watch": "0.17.2-alpha.5",
+        "@lwrjs/html-view-provider": "0.17.2-alpha.5",
+        "@lwrjs/instrumentation": "0.17.2-alpha.5",
+        "@lwrjs/loader": "0.17.2-alpha.5",
+        "@lwrjs/lwc-module-provider": "0.17.2-alpha.5",
+        "@lwrjs/lwc-ssr": "0.17.2-alpha.5",
+        "@lwrjs/markdown-view-provider": "0.17.2-alpha.5",
+        "@lwrjs/module-bundler": "0.17.2-alpha.5",
+        "@lwrjs/module-registry": "0.17.2-alpha.5",
+        "@lwrjs/npm-module-provider": "0.17.2-alpha.5",
+        "@lwrjs/nunjucks-view-provider": "0.17.2-alpha.5",
+        "@lwrjs/o11y": "0.17.2-alpha.5",
+        "@lwrjs/resource-registry": "0.17.2-alpha.5",
+        "@lwrjs/router": "0.17.2-alpha.5",
+        "@lwrjs/server": "0.17.2-alpha.5",
+        "@lwrjs/shared-utils": "0.17.2-alpha.5",
+        "@lwrjs/static": "0.17.2-alpha.5",
+        "@lwrjs/view-registry": "0.17.2-alpha.5",
         "chokidar": "^3.6.0",
         "esbuild": "^0.9.7",
         "fs-extra": "^11.2.0",
@@ -80,7 +80,7 @@
         "ws": "^8.18.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.17.2-alpha.3",
+        "@lwrjs/types": "0.17.2-alpha.5",
         "@types/ws": "^8.5.12",
         "memfs": "^4.13.0"
     },
@@ -93,5 +93,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "43757693dfca356cff105d4896a7a3cbf11ac017"
+    "gitHead": "b87daf19f22c54126ccaf01e0f899aabe6265885"
 }