@middy/http-error-handler 5.0.3 → 5.2.0

package/index.js

@@ -1,49 +1,59 @@
-import { jsonSafeParse, normalizeHttpResponse } from '@middy/util';
+import { jsonSafeParse, normalizeHttpResponse } from '@middy/util'
+
 const defaults = {
-    logger: console.error,
-    fallbackMessage: undefined
-};
-const httpErrorHandlerMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const httpErrorHandlerMiddlewareOnError = async (request)=>{
-        if (request.response !== undefined) return;
-        if (typeof options.logger === 'function') {
-            options.logger(request.error);
-        }
-        if (request.error.statusCode && request.error.expose === undefined) {
-            request.error.expose = request.error.statusCode < 500;
-        }
-        if (!request.error.expose || !request.error.statusCode) {
-            request.error = {
-                statusCode: 500,
-                message: options.fallbackMessage,
-                expose: true
-            };
-        }
-        if (request.error.expose) {
-            normalizeHttpResponse(request);
-            const { statusCode, message, headers } = request.error;
-            request.response = {
-                ...request.response,
-                statusCode,
-                headers: {
-                    ...request.response.headers,
-                    ...headers
-                }
-            };
-            if (message) {
-                const headerContentType = typeof jsonSafeParse(message) === 'string' ? 'text/plain' : 'application/json';
-                request.response.body = message;
-                request.response.headers['Content-Type'] = headerContentType;
-            }
+  logger: console.error,
+  fallbackMessage: undefined
+}
+
+const httpErrorHandlerMiddleware = (opts = {}) => {
+  const options = { ...defaults, ...opts }
+
+  const httpErrorHandlerMiddlewareOnError = async (request) => {
+    if (request.response !== undefined) return
+    if (typeof options.logger === 'function') {
+      options.logger(request.error)
+    }
+
+    // Set default expose value, only passes in when there is an override
+    if (request.error.statusCode && request.error.expose === undefined) {
+      request.error.expose = request.error.statusCode < 500
+    }
+
+    // Non-http error OR expose set to false
+    if (!request.error.expose || !request.error.statusCode) {
+      request.error = {
+        statusCode: 500,
+        message: options.fallbackMessage,
+        expose: true
+      }
+    }
+
+    if (request.error.expose) {
+      normalizeHttpResponse(request)
+      const { statusCode, message, headers } = request.error
+
+      request.response = {
+        ...request.response,
+        statusCode,
+        headers: {
+          ...request.response.headers,
+          ...headers
         }
-    };
-    return {
-        onError: httpErrorHandlerMiddlewareOnError
-    };
-};
-export default httpErrorHandlerMiddleware;
+      }
+
+      if (message) {
+        const headerContentType =
+          typeof jsonSafeParse(message) === 'string'
+            ? 'text/plain'
+            : 'application/json'
+        request.response.body = message
+        request.response.headers['Content-Type'] = headerContentType
+      }
+    }
+  }
 
+  return {
+    onError: httpErrorHandlerMiddlewareOnError
+  }
+}
+export default httpErrorHandlerMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/http-error-handler",
-  "version": "5.0.3",
+  "version": "5.2.0",
   "description": "Http error handler middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -61,12 +61,12 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.0.3"
+    "@middy/util": "5.2.0"
   },
   "devDependencies": {
-    "@middy/core": "5.0.3",
+    "@middy/core": "5.2.0",
     "@types/http-errors": "^2.0.0",
     "@types/node": "^20.0.0"
   },
-  "gitHead": "87660575a7ac2b52e4153c407a4c63c9449dcd0d"
+  "gitHead": "2d9096a49cd8fb62359517be96d6c93609df41f0"
 }