@jaypie/express 1.2.4-rc15 → 1.2.4-rc17

package/dist/cjs/index.cjs

@@ -934,6 +934,7 @@ function runExpressApp(app, req, res) {
  */
 function createLambdaHandler(app, _options) {
     return async (event, context) => {
+        let result;
         try {
             // Set current invoke for getCurrentInvokeUuid
             setCurrentInvoke(event, context);
@@ -943,8 +944,38 @@ function createLambdaHandler(app, _options) {
             const res = new LambdaResponseBuffered();
             // Run Express app
             await runExpressApp(app, req, res);
-            // Return Lambda response
-            return res.getResult();
+            // Get Lambda response - await explicitly to ensure we have the result
+            result = await res.getResult();
+            // Debug: Log the response before returning
+            console.log("[createLambdaHandler] Returning response:", JSON.stringify({
+                statusCode: result.statusCode,
+                headers: result.headers,
+                bodyLength: result.body?.length,
+                isBase64Encoded: result.isBase64Encoded,
+            }));
+            return result;
+        }
+        catch (error) {
+            // Log any unhandled errors
+            console.error("[createLambdaHandler] Unhandled error:", error);
+            if (error instanceof Error) {
+                console.error("[createLambdaHandler] Stack:", error.stack);
+            }
+            // Return a proper error response instead of throwing
+            return {
+                statusCode: 500,
+                headers: { "content-type": "application/json" },
+                body: JSON.stringify({
+                    errors: [
+                        {
+                            status: 500,
+                            title: "Internal Server Error",
+                            detail: error instanceof Error ? error.message : "Unknown error occurred",
+                        },
+                    ],
+                }),
+                isBase64Encoded: false,
+            };
         }
         finally {
             // Clear current invoke context
@@ -1796,12 +1827,12 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
             }
         }
         catch (error) {
-            log.fatal("Express encountered an error while sending the response");
-            log.var({ responseError: error });
-            // Log full stack trace for debugging
-            if (error instanceof Error && error.stack) {
-                log.error(error.stack);
+            // Use console.error for raw stack trace to ensure it appears in CloudWatch
+            if (error instanceof Error) {
+                console.error("Express response error stack trace:", error.stack);
             }
+            log.fatal(`Express encountered an error while sending the response: ${error instanceof Error ? error.message : String(error)}`);
+            log.var({ responseError: error });
         }
         // Log response
         const extras = {};