@jaypie/express 1.2.4-rc21 → 1.2.4-rc23

package/dist/cjs/adapter/LambdaResponseBuffered.d.ts

@@ -1,6 +1,7 @@
 import type { OutgoingHttpHeaders } from "node:http";
 import { Writable } from "node:stream";
 import type { LambdaResponse } from "./types.js";
+export declare const JAYPIE_LAMBDA_MOCK: unique symbol;
 /**
  * Mock ServerResponse that buffers the response.
  * Collects status, headers, and body chunks, then returns a Lambda response.

package/dist/cjs/index.cjs

@@ -188,6 +188,9 @@ function createLambdaRequest(event, context) {
 //
 // Constants
 //
+// Symbol to identify Lambda mock responses. Uses Symbol.for() to ensure
+// the same symbol is used across bundles/realms. Survives prototype manipulation.
+const JAYPIE_LAMBDA_MOCK = Symbol.for("@jaypie/express/LambdaMock");
 // Get Node's internal kOutHeaders symbol from ServerResponse prototype.
 // This is needed for compatibility with Datadog dd-trace instrumentation,
 // which patches HTTP methods and expects this internal state to exist.
@@ -225,6 +228,8 @@ class LambdaResponseBuffered extends node_stream.Writable {
         this._headers = new Map();
         this._headersSent = false;
         this._resolve = null;
+        // Mark as Lambda mock response for identification in expressHandler
+        this[JAYPIE_LAMBDA_MOCK] = true;
         // Initialize Node's internal kOutHeaders for dd-trace compatibility.
         // dd-trace patches HTTP methods and expects this internal state.
         if (kOutHeaders$1) {
@@ -1507,12 +1512,10 @@ const logger$1 = logger$2.log;
 //
 /**
  * Check if response is a Lambda mock response with direct internal access.
+ * Uses Symbol marker to survive prototype chain modifications from Express and dd-trace.
  */
 function isLambdaMockResponse(res) {
-    const mock = res;
-    return (mock._headers instanceof Map &&
-        Array.isArray(mock._chunks) &&
-        typeof mock.buildResult === "function");
+    return res[JAYPIE_LAMBDA_MOCK] === true;
 }
 /**
  * Safely send a JSON response, avoiding dd-trace interception.
@@ -1534,6 +1537,8 @@ function safeSendJson(res, statusCode, data) {
         const chunk = Buffer.from(JSON.stringify(data));
         res._chunks.push(chunk);
         res._headersSent = true;
+        // Mark as ended so getResult() resolves immediately
+        res._ended = true;
         // Signal completion if a promise is waiting
         if (res._resolve) {
             res._resolve(res.buildResult());
@@ -1560,6 +1565,8 @@ function safeSend(res, statusCode, body) {
             res._chunks.push(chunk);
         }
         res._headersSent = true;
+        // Mark as ended so getResult() resolves immediately
+        res._ended = true;
         // Signal completion if a promise is waiting
         if (res._resolve) {
             res._resolve(res.buildResult());
@@ -1834,10 +1841,17 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         }
         catch (error) {
             // 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)}`);
+            // Handle both Error objects and plain thrown values
+            const errorMessage = error instanceof Error
+                ? error.message
+                : typeof error === "object" && error !== null
+                    ? JSON.stringify(error)
+                    : String(error);
+            const errorStack = error instanceof Error
+                ? error.stack
+                : new Error("Stack trace").stack?.replace("Error: Stack trace", `Error: ${errorMessage}`);
+            console.error("Express response error stack trace:", errorStack);
+            log.fatal(`Express encountered an error while sending the response: ${errorMessage}`);
             log.var({ responseError: error });
         }
         // Log response