@jaypie/express 1.2.4-rc9 → 1.2.4

package/dist/esm/index.js

@@ -3,8 +3,8 @@ import { ServerResponse } from 'node:http';
 import { CorsError, BadRequestError, UnhandledError, GatewayTimeoutError, UnavailableError, BadGatewayError, InternalError, TeapotError, GoneError, MethodNotAllowedError, NotFoundError, ForbiddenError, UnauthorizedError, NotImplementedError } from '@jaypie/errors';
 import { force, envBoolean, JAYPIE, HTTP, getHeaderFrom, jaypieHandler } from '@jaypie/kit';
 import expressCors from 'cors';
+import { loadEnvSecrets, getContentTypeForFormat, formatStreamError } from '@jaypie/aws';
 import { log } from '@jaypie/logger';
-import { loadEnvSecrets } from '@jaypie/aws';
 import { hasDatadogEnv, submitMetric, DATADOG } from '@jaypie/datadog';
 
 //
@@ -32,6 +32,15 @@ class LambdaRequest extends Readable {
         this.path = options.url.split("?")[0];
         this.headers = this.normalizeHeaders(options.headers);
         this.bodyBuffer = options.body ?? null;
+        // Parse query string from URL
+        const queryIndex = options.url.indexOf("?");
+        if (queryIndex !== -1) {
+            const queryString = options.url.slice(queryIndex + 1);
+            const params = new URLSearchParams(queryString);
+            for (const [key, value] of params) {
+                this.query[key] = value;
+            }
+        }
         // Store Lambda context
         this._lambdaContext = options.lambdaContext;
         this._lambdaEvent = options.lambdaEvent;
@@ -42,6 +51,18 @@ class LambdaRequest extends Readable {
             remoteAddress: options.remoteAddress,
         };
         this.connection = this.socket;
+        // Schedule body push for next tick to ensure stream is ready
+        // This is needed for body parsers that consume the stream
+        if (this.bodyBuffer && this.bodyBuffer.length > 0) {
+            process.nextTick(() => {
+                if (!this.bodyPushed) {
+                    this.push(this.bodyBuffer);
+                    this.push(null);
+                    this.bodyPushed = true;
+                    this.complete = true;
+                }
+            });
+        }
     }
     //
     // Readable stream implementation
@@ -143,6 +164,11 @@ function createLambdaRequest(event, context) {
         body = event.isBase64Encoded
             ? Buffer.from(event.body, "base64")
             : Buffer.from(event.body, "utf8");
+        // Add content-length header if not present (required for body parsers)
+        const hasContentLength = Object.keys(headers).some((k) => k.toLowerCase() === "content-length");
+        if (!hasContentLength) {
+            headers["content-length"] = String(body.length);
+        }
     }
     return new LambdaRequest({
         body,
@@ -160,6 +186,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.
@@ -193,21 +222,87 @@ class LambdaResponseBuffered extends Writable {
         // Internal state exposed for direct manipulation by safe response methods
         // that need to bypass dd-trace interception of stream methods
         this._chunks = [];
+        this._ended = false; // Track ended state since writableEnded is lost after prototype change
         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) {
             this[kOutHeaders$1] = Object.create(null);
         }
+        // CRITICAL: Define key methods as instance properties to survive Express's
+        // setPrototypeOf(res, app.response) in middleware/init.js which would
+        // otherwise replace our prototype with ServerResponse.prototype.
+        // Instance properties take precedence over prototype properties.
+        this.getHeader = this.getHeader.bind(this);
+        this.setHeader = this.setHeader.bind(this);
+        this.removeHeader = this.removeHeader.bind(this);
+        this.hasHeader = this.hasHeader.bind(this);
+        this.getHeaders = this.getHeaders.bind(this);
+        this.getHeaderNames = this.getHeaderNames.bind(this);
+        this.writeHead = this.writeHead.bind(this);
+        this.get = this.get.bind(this);
+        this.set = this.set.bind(this);
+        this.status = this.status.bind(this);
+        this.json = this.json.bind(this);
+        this.send = this.send.bind(this);
+        this.vary = this.vary.bind(this);
+        this.end = this.end.bind(this);
+        this.write = this.write.bind(this);
+        // Also bind internal Writable methods that are called via prototype chain
+        this._write = this._write.bind(this);
+        this._final = this._final.bind(this);
+        // Bind result-building methods
+        this.getResult = this.getResult.bind(this);
+        this.buildResult = this.buildResult.bind(this);
+        this.isBinaryContentType = this.isBinaryContentType.bind(this);
+    }
+    //
+    // Internal bypass methods - completely avoid prototype chain lookup
+    // These directly access _headers Map, safe from dd-trace interception
+    //
+    _internalGetHeader(name) {
+        const value = this._headers.get(name.toLowerCase());
+        return value ? String(value) : undefined;
+    }
+    _internalSetHeader(name, value) {
+        if (!this._headersSent) {
+            const lowerName = name.toLowerCase();
+            this._headers.set(lowerName, value);
+            // Also sync kOutHeaders for any code that expects it
+            if (kOutHeaders$1) {
+                const outHeaders = this[kOutHeaders$1];
+                if (outHeaders) {
+                    outHeaders[lowerName] = [name, value];
+                }
+            }
+        }
+    }
+    _internalHasHeader(name) {
+        return this._headers.has(name.toLowerCase());
+    }
+    _internalRemoveHeader(name) {
+        if (!this._headersSent) {
+            const lowerName = name.toLowerCase();
+            this._headers.delete(lowerName);
+            if (kOutHeaders$1) {
+                const outHeaders = this[kOutHeaders$1];
+                if (outHeaders) {
+                    delete outHeaders[lowerName];
+                }
+            }
+        }
     }
     //
     // Promise-based API for getting final result
     //
     getResult() {
         return new Promise((resolve) => {
-            if (this.writableEnded) {
+            // Use _ended instead of writableEnded since Express's setPrototypeOf breaks the getter
+            if (this._ended) {
                 resolve(this.buildResult());
             }
             else {
@@ -265,36 +360,40 @@ class LambdaResponseBuffered extends Writable {
     /**
      * Proxy for direct header access (e.g., res.headers['content-type']).
      * Required for compatibility with middleware like helmet that access headers directly.
+     * Uses direct _headers access to bypass dd-trace interception.
      */
     get headers() {
         return new Proxy({}, {
             deleteProperty: (_target, prop) => {
-                this.removeHeader(String(prop));
+                this._headers.delete(String(prop).toLowerCase());
                 return true;
             },
             get: (_target, prop) => {
                 if (typeof prop === "symbol")
                     return undefined;
-                return this.getHeader(String(prop));
+                return this._headers.get(String(prop).toLowerCase());
             },
             getOwnPropertyDescriptor: (_target, prop) => {
-                if (this.hasHeader(String(prop))) {
+                const lowerProp = String(prop).toLowerCase();
+                if (this._headers.has(lowerProp)) {
                     return {
                         configurable: true,
                         enumerable: true,
-                        value: this.getHeader(String(prop)),
+                        value: this._headers.get(lowerProp),
                     };
                 }
                 return undefined;
             },
             has: (_target, prop) => {
-                return this.hasHeader(String(prop));
+                return this._headers.has(String(prop).toLowerCase());
             },
             ownKeys: () => {
-                return this.getHeaderNames();
+                return Array.from(this._headers.keys());
             },
             set: (_target, prop, value) => {
-                this.setHeader(String(prop), value);
+                if (!this._headersSent) {
+                    this._headers.set(String(prop).toLowerCase(), value);
+                }
                 return true;
             },
         });
@@ -311,9 +410,10 @@ class LambdaResponseBuffered extends Writable {
             headersToSet = statusMessageOrHeaders;
         }
         if (headersToSet) {
+            // Use direct _headers access to bypass dd-trace interception
             for (const [key, value] of Object.entries(headersToSet)) {
                 if (value !== undefined) {
-                    this.setHeader(key, value);
+                    this._headers.set(key.toLowerCase(), String(value));
                 }
             }
         }
@@ -350,7 +450,8 @@ class LambdaResponseBuffered extends Writable {
         return this;
     }
     json(data) {
-        this.setHeader("content-type", "application/json");
+        // Use direct _headers access to bypass dd-trace interception
+        this._headers.set("content-type", "application/json");
         this.end(JSON.stringify(data));
         return this;
     }
@@ -364,11 +465,12 @@ class LambdaResponseBuffered extends Writable {
     /**
      * Add a field to the Vary response header.
      * Used by CORS middleware to indicate response varies by Origin.
+     * Uses direct _headers access to bypass dd-trace interception.
      */
     vary(field) {
-        const existing = this.getHeader("vary");
+        const existing = this._headers.get("vary");
         if (!existing) {
-            this.setHeader("vary", field);
+            this._headers.set("vary", field);
         }
         else {
             // Append to existing Vary header if field not already present
@@ -376,7 +478,7 @@ class LambdaResponseBuffered extends Writable {
                 .split(",")
                 .map((f) => f.trim().toLowerCase());
             if (!fields.includes(field.toLowerCase())) {
-                this.setHeader("vary", `${existing}, ${field}`);
+                this._headers.set("vary", `${existing}, ${field}`);
             }
         }
         return this;
@@ -394,6 +496,7 @@ class LambdaResponseBuffered extends Writable {
         callback();
     }
     _final(callback) {
+        this._ended = true;
         if (this._resolve) {
             this._resolve(this.buildResult());
         }
@@ -404,7 +507,8 @@ class LambdaResponseBuffered extends Writable {
     //
     buildResult() {
         const body = Buffer.concat(this._chunks);
-        const contentType = this.getHeader("content-type") || "";
+        // Use direct _headers access to bypass dd-trace interception
+        const contentType = this._headers.get("content-type") || "";
         // Determine if response should be base64 encoded
         const isBase64Encoded = this.isBinaryContentType(contentType);
         // Build headers object
@@ -466,6 +570,8 @@ class LambdaResponseStreaming extends Writable {
         this.socket = {
             remoteAddress: "127.0.0.1",
         };
+        // Internal state exposed for direct manipulation by safe response methods
+        // that need to bypass dd-trace interception
         this._headers = new Map();
         this._headersSent = false;
         this._pendingWrites = [];
@@ -476,6 +582,65 @@ class LambdaResponseStreaming extends Writable {
         if (kOutHeaders) {
             this[kOutHeaders] = Object.create(null);
         }
+        // CRITICAL: Define key methods as instance properties to survive Express's
+        // setPrototypeOf(res, app.response) in middleware/init.js which would
+        // otherwise replace our prototype with ServerResponse.prototype.
+        // Instance properties take precedence over prototype properties.
+        this.getHeader = this.getHeader.bind(this);
+        this.setHeader = this.setHeader.bind(this);
+        this.removeHeader = this.removeHeader.bind(this);
+        this.hasHeader = this.hasHeader.bind(this);
+        this.getHeaders = this.getHeaders.bind(this);
+        this.getHeaderNames = this.getHeaderNames.bind(this);
+        this.writeHead = this.writeHead.bind(this);
+        this.flushHeaders = this.flushHeaders.bind(this);
+        this.get = this.get.bind(this);
+        this.set = this.set.bind(this);
+        this.status = this.status.bind(this);
+        this.json = this.json.bind(this);
+        this.send = this.send.bind(this);
+        this.vary = this.vary.bind(this);
+        this.end = this.end.bind(this);
+        this.write = this.write.bind(this);
+        // Also bind internal Writable methods that are called via prototype chain
+        this._write = this._write.bind(this);
+        this._final = this._final.bind(this);
+    }
+    //
+    // Internal bypass methods - completely avoid prototype chain lookup
+    // These directly access _headers Map, safe from dd-trace interception
+    //
+    _internalGetHeader(name) {
+        const value = this._headers.get(name.toLowerCase());
+        return value ? String(value) : undefined;
+    }
+    _internalSetHeader(name, value) {
+        if (!this._headersSent) {
+            const lowerName = name.toLowerCase();
+            this._headers.set(lowerName, value);
+            // Also sync kOutHeaders for any code that expects it
+            if (kOutHeaders) {
+                const outHeaders = this[kOutHeaders];
+                if (outHeaders) {
+                    outHeaders[lowerName] = [name, value];
+                }
+            }
+        }
+    }
+    _internalHasHeader(name) {
+        return this._headers.has(name.toLowerCase());
+    }
+    _internalRemoveHeader(name) {
+        if (!this._headersSent) {
+            const lowerName = name.toLowerCase();
+            this._headers.delete(lowerName);
+            if (kOutHeaders) {
+                const outHeaders = this[kOutHeaders];
+                if (outHeaders) {
+                    delete outHeaders[lowerName];
+                }
+            }
+        }
     }
     //
     // Header management
@@ -530,36 +695,42 @@ class LambdaResponseStreaming extends Writable {
     /**
      * Proxy for direct header access (e.g., res.headers['content-type']).
      * Required for compatibility with middleware like helmet that access headers directly.
+     * Uses direct _headers access to bypass dd-trace interception.
      */
     get headers() {
         return new Proxy({}, {
             deleteProperty: (_target, prop) => {
-                this.removeHeader(String(prop));
+                if (!this._headersSent) {
+                    this._headers.delete(String(prop).toLowerCase());
+                }
                 return true;
             },
             get: (_target, prop) => {
                 if (typeof prop === "symbol")
                     return undefined;
-                return this.getHeader(String(prop));
+                return this._headers.get(String(prop).toLowerCase());
             },
             getOwnPropertyDescriptor: (_target, prop) => {
-                if (this.hasHeader(String(prop))) {
+                const lowerProp = String(prop).toLowerCase();
+                if (this._headers.has(lowerProp)) {
                     return {
                         configurable: true,
                         enumerable: true,
-                        value: this.getHeader(String(prop)),
+                        value: this._headers.get(lowerProp),
                     };
                 }
                 return undefined;
             },
             has: (_target, prop) => {
-                return this.hasHeader(String(prop));
+                return this._headers.has(String(prop).toLowerCase());
             },
             ownKeys: () => {
-                return this.getHeaderNames();
+                return Array.from(this._headers.keys());
             },
             set: (_target, prop, value) => {
-                this.setHeader(String(prop), value);
+                if (!this._headersSent) {
+                    this._headers.set(String(prop).toLowerCase(), value);
+                }
                 return true;
             },
         });
@@ -579,9 +750,10 @@ class LambdaResponseStreaming extends Writable {
             headersToSet = statusMessageOrHeaders;
         }
         if (headersToSet) {
+            // Use direct _headers access to bypass dd-trace interception
             for (const [key, value] of Object.entries(headersToSet)) {
                 if (value !== undefined) {
-                    this.setHeader(key, value);
+                    this._headers.set(key.toLowerCase(), String(value));
                 }
             }
         }
@@ -639,7 +811,8 @@ class LambdaResponseStreaming extends Writable {
         return this;
     }
     json(data) {
-        this.setHeader("content-type", "application/json");
+        // Use direct _headers access to bypass dd-trace interception
+        this._headers.set("content-type", "application/json");
         this.end(JSON.stringify(data));
         return this;
     }
@@ -653,11 +826,12 @@ class LambdaResponseStreaming extends Writable {
     /**
      * Add a field to the Vary response header.
      * Used by CORS middleware to indicate response varies by Origin.
+     * Uses direct _headers access to bypass dd-trace interception.
      */
     vary(field) {
-        const existing = this.getHeader("vary");
+        const existing = this._headers.get("vary");
         if (!existing) {
-            this.setHeader("vary", field);
+            this._headers.set("vary", field);
         }
         else {
             // Append to existing Vary header if field not already present
@@ -665,7 +839,7 @@ class LambdaResponseStreaming extends Writable {
                 .split(",")
                 .map((f) => f.trim().toLowerCase());
             if (!fields.includes(field.toLowerCase())) {
-                this.setHeader("vary", `${existing}, ${field}`);
+                this._headers.set("vary", `${existing}, ${field}`);
             }
         }
         return this;
@@ -763,6 +937,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);
@@ -772,8 +947,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
@@ -911,7 +1116,7 @@ const corsHelper = (config = {}) => {
     };
     return expressCors(options);
 };
-var cors = (config) => {
+var cors_helper = (config) => {
     const cors = corsHelper(config);
     return (req, res, next) => {
         cors(req, res, (error) => {
@@ -926,154 +1131,10 @@ var cors = (config) => {
     };
 };
 
-//
-//
-// Constants
-//
-const DEFAULT_PORT = 8080;
-//
-//
-// Main
-//
-/**
- * Creates and starts an Express server with standard Jaypie middleware.
- *
- * Features:
- * - CORS handling (configurable)
- * - JSON body parsing
- * - Listens on PORT env var (default 8080)
- *
- * Usage:
- * ```ts
- * import express from "express";
- * import { createServer, expressHandler } from "@jaypie/express";
- *
- * const app = express();
- *
- * app.get("/", expressHandler(async (req, res) => {
- *   return { message: "Hello World" };
- * }));
- *
- * const { server, port } = await createServer(app);
- * console.log(`Server running on port ${port}`);
- * ```
- *
- * @param app - Express application instance
- * @param options - Server configuration options
- * @returns Promise resolving to server instance and port
- */
-async function createServer(app, options = {}) {
-    const { cors: corsConfig, jsonLimit = "1mb", middleware = [], port: portOption, } = options;
-    // Determine port
-    const port = typeof portOption === "string"
-        ? parseInt(portOption, 10)
-        : (portOption ?? parseInt(process.env.PORT || String(DEFAULT_PORT), 10));
-    // Apply CORS middleware (unless explicitly disabled)
-    if (corsConfig !== false) {
-        app.use(cors(corsConfig));
-    }
-    // Apply JSON body parser
-    // Note: We use dynamic import to avoid requiring express as a direct dependency
-    const express = await import('express');
-    app.use(express.json({ limit: jsonLimit }));
-    // Apply additional middleware
-    for (const mw of middleware) {
-        app.use(mw);
-    }
-    // Start server
-    return new Promise((resolve, reject) => {
-        try {
-            const server = app.listen(port, () => {
-                // Get the actual port (important when port 0 is passed to get an ephemeral port)
-                const address = server.address();
-                const actualPort = address?.port ?? port;
-                log.info(`Server listening on port ${actualPort}`);
-                resolve({ port: actualPort, server });
-            });
-            server.on("error", (error) => {
-                log.error("Server error", { error });
-                reject(error);
-            });
-        }
-        catch (error) {
-            reject(error);
-        }
-    });
-}
-
-//
-//
-// Constants
-//
-const HEADER_AMZN_REQUEST_ID$1 = "x-amzn-request-id";
-const ENV_AMZN_TRACE_ID = "_X_AMZN_TRACE_ID";
 //
 //
 // Helper Functions
 //
-/**
- * Extract request ID from X-Ray trace ID environment variable
- * Format: Root=1-5e6b4a90-example;Parent=example;Sampled=1
- * We extract the trace ID from the Root segment
- */
-function parseTraceId(traceId) {
-    if (!traceId)
-        return undefined;
-    // Extract the Root segment (format: Root=1-{timestamp}-{uuid})
-    const rootMatch = traceId.match(/Root=([^;]+)/);
-    if (rootMatch && rootMatch[1]) {
-        return rootMatch[1];
-    }
-    return undefined;
-}
-//
-//
-// Main
-//
-/**
- * Get the current invoke UUID from Lambda Web Adapter context.
- * This function extracts the request ID from either:
- * 1. The x-amzn-request-id header (set by Lambda Web Adapter)
- * 2. The _X_AMZN_TRACE_ID environment variable (set by Lambda runtime)
- *
- * @param req - Optional Express request object to extract headers from
- * @returns The AWS request ID or undefined if not in Lambda context
- */
-function getWebAdapterUuid(req) {
-    // First, try to get from request headers
-    if (req && req.headers) {
-        const headerValue = req.headers[HEADER_AMZN_REQUEST_ID$1];
-        if (headerValue) {
-            return Array.isArray(headerValue) ? headerValue[0] : headerValue;
-        }
-    }
-    // Fall back to environment variable (X-Ray trace ID)
-    const traceId = process.env[ENV_AMZN_TRACE_ID];
-    if (traceId) {
-        return parseTraceId(traceId);
-    }
-    return undefined;
-}
-
-//
-//
-// Constants
-//
-const HEADER_AMZN_REQUEST_ID = "x-amzn-request-id";
-//
-//
-// Helper Functions
-//
-/**
- * Detect if we're running in Lambda Web Adapter mode.
- * Web Adapter sets the x-amzn-request-id header on requests.
- */
-function isWebAdapterMode(req) {
-    if (req && req.headers && req.headers[HEADER_AMZN_REQUEST_ID]) {
-        return true;
-    }
-    return false;
-}
 /**
  * Get UUID from Jaypie Lambda adapter context.
  * This is set by createLambdaHandler/createLambdaStreamHandler.
@@ -1090,8 +1151,12 @@ function getJaypieAdapterUuid() {
  * The Jaypie adapter attaches _lambdaContext to the request.
  */
 function getRequestContextUuid(req) {
-    if (req && req._lambdaContext?.awsRequestId) {
-        return req._lambdaContext.awsRequestId;
+    if (req && req._lambdaContext) {
+        const lambdaContext = req
+            ._lambdaContext;
+        if (lambdaContext.awsRequestId) {
+            return lambdaContext.awsRequestId;
+        }
     }
     return undefined;
 }
@@ -1101,29 +1166,20 @@ function getRequestContextUuid(req) {
 //
 /**
  * Get the current invoke UUID from Lambda context.
- * Works with Jaypie Lambda adapter and Lambda Web Adapter mode.
+ * Works with Jaypie Lambda adapter (createLambdaHandler/createLambdaStreamHandler).
  *
  * @param req - Optional Express request object. Used to extract context
- *              from Web Adapter headers or Jaypie adapter's _lambdaContext.
+ *              from Jaypie adapter's _lambdaContext.
  * @returns The AWS request ID or undefined if not in Lambda context
  */
 function getCurrentInvokeUuid(req) {
-    // Priority 1: Web Adapter mode (header-based)
-    if (isWebAdapterMode(req)) {
-        return getWebAdapterUuid(req);
-    }
-    // Priority 2: Request has Lambda context attached (Jaypie adapter)
+    // Priority 1: Request has Lambda context attached (Jaypie adapter)
     const requestContextUuid = getRequestContextUuid(req);
     if (requestContextUuid) {
         return requestContextUuid;
     }
-    // Priority 3: Global context from Jaypie adapter
-    const jaypieAdapterUuid = getJaypieAdapterUuid();
-    if (jaypieAdapterUuid) {
-        return jaypieAdapterUuid;
-    }
-    // Fallback: Web Adapter env var
-    return getWebAdapterUuid();
+    // Priority 2: Global context from Jaypie adapter
+    return getJaypieAdapterUuid();
 }
 
 //
@@ -1137,7 +1193,11 @@ function getCurrentInvokeUuid(req) {
  */
 function safeGetHeader(res, name) {
     try {
-        // Try direct _headers access first (Lambda adapter, avoids dd-trace)
+        // Try internal method first (completely bypasses dd-trace)
+        if (typeof res._internalGetHeader === "function") {
+            return res._internalGetHeader(name);
+        }
+        // Fall back to _headers Map access (Lambda adapter, avoids dd-trace)
         if (res._headers instanceof Map) {
             const value = res._headers.get(name.toLowerCase());
             return value ? String(value) : undefined;
@@ -1165,7 +1225,12 @@ function safeGetHeader(res, name) {
  */
 function safeSetHeader(res, name, value) {
     try {
-        // Try direct _headers access first (Lambda adapter, avoids dd-trace)
+        // Try internal method first (completely bypasses dd-trace)
+        if (typeof res._internalSetHeader === "function") {
+            res._internalSetHeader(name, value);
+            return;
+        }
+        // Fall back to _headers Map access (Lambda adapter, avoids dd-trace)
         if (res._headers instanceof Map) {
             res._headers.set(name.toLowerCase(), value);
             return;
@@ -1296,12 +1361,10 @@ const logger$1 = 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.
@@ -1310,17 +1373,28 @@ function isLambdaMockResponse(res) {
  */
 function safeSendJson(res, statusCode, data) {
     if (isLambdaMockResponse(res)) {
-        // Direct internal state manipulation - bypasses dd-trace completely
-        res._headers.set("content-type", "application/json");
+        // Use internal method to set header (completely bypasses dd-trace)
+        if (typeof res._internalSetHeader === "function") {
+            res._internalSetHeader("content-type", "application/json");
+        }
+        else {
+            // Fall back to direct _headers manipulation
+            res._headers.set("content-type", "application/json");
+        }
         res.statusCode = statusCode;
         // Directly push to chunks array instead of using stream write/end
         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());
         }
+        // Emit "finish" event so runExpressApp's promise resolves
+        console.log("[safeSendJson] Emitting finish event");
+        res.emit("finish");
         return;
     }
     // Fall back to standard Express methods for real responses
@@ -1340,10 +1414,15 @@ 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());
         }
+        // Emit "finish" event so runExpressApp's promise resolves
+        console.log("[safeSend] Emitting finish event");
+        res.emit("finish");
         return;
     }
     // Fall back to standard Express methods for real responses
@@ -1610,7 +1689,18 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
             }
         }
         catch (error) {
-            log.fatal("Express encountered an error while sending the response");
+            // Use console.error for raw stack trace to ensure it appears in CloudWatch
+            // 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
@@ -1710,14 +1800,13 @@ const logger = log;
 // Helper
 //
 /**
- * Format an error as an SSE error event
+ * Get error body from an error
  */
-function formatErrorSSE(error) {
+function getErrorBody(error) {
     const isJaypieError = error.isProjectError;
-    const body = isJaypieError
+    return isJaypieError
         ? (error.body?.() ?? { error: error.message })
         : new UnhandledError().body();
-    return `event: error\ndata: ${JSON.stringify(body)}\n\n`;
 }
 function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
     /* eslint-enable no-redeclare */
@@ -1737,7 +1826,8 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
     //
     // Validate
     //
-    let { chaos, contentType = "text/event-stream", locals, name, secrets, setup = [], teardown = [], unavailable, validate, } = options;
+    const format = options.format ?? "sse";
+    let { chaos, contentType = getContentTypeForFormat(format), locals, name, secrets, setup = [], teardown = [], unavailable, validate, } = options;
     if (typeof handler !== "function") {
         throw new BadRequestError(`Argument "${handler}" doesn't match type "function"`);
     }
@@ -1875,9 +1965,10 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
                 log.fatal("Caught unhandled error in stream handler");
                 log.info.var({ unhandledError: error.message });
             }
-            // Write error as SSE event
+            // Write error in the appropriate format
             try {
-                res.write(formatErrorSSE(error));
+                const errorBody = getErrorBody(error);
+                res.write(formatStreamError(errorBody, format));
             }
             catch {
                 // Response may already be closed
@@ -1986,5 +2077,5 @@ const noContentRoute = routes.noContentRoute;
 const notFoundRoute = routes.notFoundRoute;
 const notImplementedRoute = routes.notImplementedRoute;
 
-export { EXPRESS, LambdaRequest, LambdaResponseBuffered, LambdaResponseStreaming, badRequestRoute, cors, createLambdaHandler, createLambdaStreamHandler, createServer, echoRoute, expressHandler, httpHandler as expressHttpCodeHandler, expressStreamHandler, forbiddenRoute, getCurrentInvoke, getCurrentInvokeUuid, goneRoute, methodNotAllowedRoute, noContentRoute, notFoundRoute, notImplementedRoute };
+export { EXPRESS, LambdaRequest, LambdaResponseBuffered, LambdaResponseStreaming, badRequestRoute, cors_helper as cors, createLambdaHandler, createLambdaStreamHandler, echoRoute, expressHandler, httpHandler as expressHttpCodeHandler, expressStreamHandler, forbiddenRoute, getCurrentInvoke, getCurrentInvokeUuid, goneRoute, methodNotAllowedRoute, noContentRoute, notFoundRoute, notImplementedRoute };
 //# sourceMappingURL=index.js.map