powr-sdk-api 1.3.3 → 1.4.0

package/dist/middleware/request.js

@@ -40,38 +40,73 @@ const requestHandler = (req, res, next) => {
       res.error = (message, statusCode = 500, error = null) => {
         // Extract error details for logging and response
         let errorDetails = null;
+        let userFriendlyMessage = message;
         if (error) {
           // If error is an Error object, extract relevant properties
           if (error instanceof Error) {
-            errorDetails = {
-              message: error.message,
-              stack: error.stack
-            };
+            // For logging, include the stack trace
+            logger.error(message, {
+              statusCode,
+              requestId: req.requestId,
+              error: {
+                message: error.message,
+                stack: error.stack
+              }
+            });
+
+            // For response, only include the error message without stack
+            errorDetails = error.message;
+
+            // If no user-friendly message was provided, use a generic one
+            if (message === error.message || !message || message === '{}') {
+              userFriendlyMessage = 'An error occurred while processing your request';
+            }
           } else if (typeof error === 'object') {
-            // If error is already an object, use it directly
-            errorDetails = error;
+            // Log the full error object
+            logger.error(message, {
+              statusCode,
+              requestId: req.requestId,
+              error
+            });
+
+            // For response, use the error message or a stringified version
+            errorDetails = error.message || JSON.stringify(error);
+
+            // If no user-friendly message was provided, use a generic one
+            if (!message || message === '{}') {
+              userFriendlyMessage = 'An error occurred while processing your request';
+            }
           } else {
             // If error is a primitive, convert to string
-            errorDetails = {
-              message: String(error)
-            };
-          }
-        }
+            errorDetails = String(error);
+            logger.error(message, {
+              statusCode,
+              requestId: req.requestId,
+              error: errorDetails
+            });
 
-        // Ensure message is a string
-        const errorMessage = typeof message === 'string' ? message : message && message.message ? message.message : 'Internal Server Error';
+            // If no user-friendly message was provided, use a generic one
+            if (!message || message === '{}') {
+              userFriendlyMessage = 'An error occurred while processing your request';
+            }
+          }
+        } else {
+          // Log without error details
+          logger.error(message, {
+            statusCode,
+            requestId: req.requestId
+          });
 
-        // Log the error with details
-        logger.error(errorMessage, {
-          statusCode,
-          requestId: req.requestId,
-          error: errorDetails
-        });
+          // If no user-friendly message was provided, use a generic one
+          if (!message || message === '{}') {
+            userFriendlyMessage = 'An error occurred while processing your request';
+          }
+        }
 
         // Create response object
         const response = {
           success: false,
-          message: errorMessage,
+          message: userFriendlyMessage,
           requestId: req.requestId
         };
 
@@ -106,6 +141,21 @@ const requestHandler = (req, res, next) => {
       };
     }
 
+    // Add 404 handler to response object if not already present
+    if (!res.notFound) {
+      res.notFound = () => {
+        // Log the 404 error
+        logger.warn(`Route not found: ${req.method} ${req.path}`, {
+          requestId: req.requestId,
+          ip: req.ip,
+          userAgent: req.headers['user-agent']
+        });
+
+        // Return a consistent JSON response
+        return res.error('The requested resource was not found', 404, `${req.method} ${req.path}`);
+      };
+    }
+
     // Continue to the next middleware
     next();
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powr-sdk-api",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "Shared API core library for PowrStack projects",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.787.0",
     "express": "^4.18.2",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "^9.0.2",    
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",
     "winston": "^3.17.0"