@jaypie/express 1.2.4-rc2 → 1.2.4-rc21

package/dist/esm/index.js

@@ -1,4 +1,5 @@
 import { Readable, Writable } from 'node:stream';
+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';
@@ -31,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;
@@ -41,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
@@ -142,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,
@@ -159,6 +186,10 @@ function createLambdaRequest(event, context) {
 //
 // Constants
 //
+// 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.
+const kOutHeaders$1 = Object.getOwnPropertySymbols(ServerResponse.prototype).find((s) => s.toString() === "Symbol(kOutHeaders)");
 const BINARY_CONTENT_TYPE_PATTERNS = [
     /^application\/octet-stream$/,
     /^application\/pdf$/,
@@ -185,17 +216,88 @@ class LambdaResponseBuffered 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 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;
+        // 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 {
@@ -211,14 +313,31 @@ class LambdaResponseBuffered extends Writable {
             // In production, log warning but don't throw to match Express behavior
             return this;
         }
-        this._headers.set(name.toLowerCase(), String(value));
+        const lowerName = name.toLowerCase();
+        this._headers.set(lowerName, String(value));
+        // Sync with kOutHeaders for dd-trace compatibility
+        // Node stores as { 'header-name': ['Header-Name', value] }
+        if (kOutHeaders$1) {
+            const outHeaders = this[kOutHeaders$1];
+            if (outHeaders) {
+                outHeaders[lowerName] = [name, String(value)];
+            }
+        }
         return this;
     }
     getHeader(name) {
         return this._headers.get(name.toLowerCase());
     }
     removeHeader(name) {
-        this._headers.delete(name.toLowerCase());
+        const lowerName = name.toLowerCase();
+        this._headers.delete(lowerName);
+        // Sync with kOutHeaders for dd-trace compatibility
+        if (kOutHeaders$1) {
+            const outHeaders = this[kOutHeaders$1];
+            if (outHeaders) {
+                delete outHeaders[lowerName];
+            }
+        }
     }
     getHeaders() {
         const headers = {};
@@ -233,6 +352,47 @@ class LambdaResponseBuffered extends Writable {
     getHeaderNames() {
         return Array.from(this._headers.keys());
     }
+    /**
+     * 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._headers.delete(String(prop).toLowerCase());
+                return true;
+            },
+            get: (_target, prop) => {
+                if (typeof prop === "symbol")
+                    return undefined;
+                return this._headers.get(String(prop).toLowerCase());
+            },
+            getOwnPropertyDescriptor: (_target, prop) => {
+                const lowerProp = String(prop).toLowerCase();
+                if (this._headers.has(lowerProp)) {
+                    return {
+                        configurable: true,
+                        enumerable: true,
+                        value: this._headers.get(lowerProp),
+                    };
+                }
+                return undefined;
+            },
+            has: (_target, prop) => {
+                return this._headers.has(String(prop).toLowerCase());
+            },
+            ownKeys: () => {
+                return Array.from(this._headers.keys());
+            },
+            set: (_target, prop, value) => {
+                if (!this._headersSent) {
+                    this._headers.set(String(prop).toLowerCase(), value);
+                }
+                return true;
+            },
+        });
+    }
     writeHead(statusCode, statusMessageOrHeaders, headers) {
         this.statusCode = statusCode;
         let headersToSet;
@@ -245,9 +405,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));
                 }
             }
         }
@@ -260,12 +421,32 @@ class LambdaResponseBuffered extends Writable {
     //
     // Express compatibility methods
     //
+    /**
+     * Express-style alias for getHeader().
+     * Used by middleware like decorateResponse that use res.get().
+     * Note: Directly accesses _headers to avoid prototype chain issues with bundled code.
+     */
+    get(name) {
+        return this._headers.get(name.toLowerCase());
+    }
+    /**
+     * Express-style alias for setHeader().
+     * Used by middleware like decorateResponse that use res.set().
+     * Note: Directly accesses _headers to avoid prototype chain issues with bundled code.
+     */
+    set(name, value) {
+        if (!this._headersSent) {
+            this._headers.set(name.toLowerCase(), String(value));
+        }
+        return this;
+    }
     status(code) {
         this.statusCode = code;
         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;
     }
@@ -276,6 +457,27 @@ class LambdaResponseBuffered extends Writable {
         this.end(body);
         return this;
     }
+    /**
+     * 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._headers.get("vary");
+        if (!existing) {
+            this._headers.set("vary", field);
+        }
+        else {
+            // Append to existing Vary header if field not already present
+            const fields = String(existing)
+                .split(",")
+                .map((f) => f.trim().toLowerCase());
+            if (!fields.includes(field.toLowerCase())) {
+                this._headers.set("vary", `${existing}, ${field}`);
+            }
+        }
+        return this;
+    }
     //
     // Writable stream implementation
     //
@@ -289,6 +491,7 @@ class LambdaResponseBuffered extends Writable {
         callback();
     }
     _final(callback) {
+        this._ended = true;
         if (this._resolve) {
             this._resolve(this.buildResult());
         }
@@ -299,7 +502,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
@@ -336,6 +540,14 @@ class LambdaResponseBuffered extends Writable {
     }
 }
 
+//
+//
+// Constants
+//
+// 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.
+const kOutHeaders = Object.getOwnPropertySymbols(ServerResponse.prototype).find((s) => s.toString() === "Symbol(kOutHeaders)");
 //
 //
 // LambdaResponseStreaming Class
@@ -353,11 +565,77 @@ 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 = [];
         this._wrappedStream = null;
         this._responseStream = responseStream;
+        // Initialize Node's internal kOutHeaders for dd-trace compatibility.
+        // dd-trace patches HTTP methods and expects this internal state.
+        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
@@ -368,7 +646,16 @@ class LambdaResponseStreaming extends Writable {
             // Headers cannot be changed after body starts
             return this;
         }
-        this._headers.set(name.toLowerCase(), String(value));
+        const lowerName = name.toLowerCase();
+        this._headers.set(lowerName, String(value));
+        // Sync with kOutHeaders for dd-trace compatibility
+        // Node stores as { 'header-name': ['Header-Name', value] }
+        if (kOutHeaders) {
+            const outHeaders = this[kOutHeaders];
+            if (outHeaders) {
+                outHeaders[lowerName] = [name, String(value)];
+            }
+        }
         return this;
     }
     getHeader(name) {
@@ -376,7 +663,15 @@ class LambdaResponseStreaming extends Writable {
     }
     removeHeader(name) {
         if (!this._headersSent) {
-            this._headers.delete(name.toLowerCase());
+            const lowerName = name.toLowerCase();
+            this._headers.delete(lowerName);
+            // Sync with kOutHeaders for dd-trace compatibility
+            if (kOutHeaders) {
+                const outHeaders = this[kOutHeaders];
+                if (outHeaders) {
+                    delete outHeaders[lowerName];
+                }
+            }
         }
     }
     getHeaders() {
@@ -392,6 +687,49 @@ class LambdaResponseStreaming extends Writable {
     getHeaderNames() {
         return Array.from(this._headers.keys());
     }
+    /**
+     * 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) => {
+                if (!this._headersSent) {
+                    this._headers.delete(String(prop).toLowerCase());
+                }
+                return true;
+            },
+            get: (_target, prop) => {
+                if (typeof prop === "symbol")
+                    return undefined;
+                return this._headers.get(String(prop).toLowerCase());
+            },
+            getOwnPropertyDescriptor: (_target, prop) => {
+                const lowerProp = String(prop).toLowerCase();
+                if (this._headers.has(lowerProp)) {
+                    return {
+                        configurable: true,
+                        enumerable: true,
+                        value: this._headers.get(lowerProp),
+                    };
+                }
+                return undefined;
+            },
+            has: (_target, prop) => {
+                return this._headers.has(String(prop).toLowerCase());
+            },
+            ownKeys: () => {
+                return Array.from(this._headers.keys());
+            },
+            set: (_target, prop, value) => {
+                if (!this._headersSent) {
+                    this._headers.set(String(prop).toLowerCase(), value);
+                }
+                return true;
+            },
+        });
+    }
     writeHead(statusCode, statusMessageOrHeaders, headers) {
         if (this._headersSent) {
             return this;
@@ -407,9 +745,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));
                 }
             }
         }
@@ -443,12 +782,32 @@ class LambdaResponseStreaming extends Writable {
     //
     // Express compatibility methods
     //
+    /**
+     * Express-style alias for getHeader().
+     * Used by middleware like decorateResponse that use res.get().
+     * Note: Directly accesses _headers to avoid prototype chain issues with bundled code.
+     */
+    get(name) {
+        return this._headers.get(name.toLowerCase());
+    }
+    /**
+     * Express-style alias for setHeader().
+     * Used by middleware like decorateResponse that use res.set().
+     * Note: Directly accesses _headers to avoid prototype chain issues with bundled code.
+     */
+    set(name, value) {
+        if (!this._headersSent) {
+            this._headers.set(name.toLowerCase(), String(value));
+        }
+        return this;
+    }
     status(code) {
         this.statusCode = code;
         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;
     }
@@ -459,6 +818,27 @@ class LambdaResponseStreaming extends Writable {
         this.end(body);
         return this;
     }
+    /**
+     * 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._headers.get("vary");
+        if (!existing) {
+            this._headers.set("vary", field);
+        }
+        else {
+            // Append to existing Vary header if field not already present
+            const fields = String(existing)
+                .split(",")
+                .map((f) => f.trim().toLowerCase());
+            if (!fields.includes(field.toLowerCase())) {
+                this._headers.set("vary", `${existing}, ${field}`);
+            }
+        }
+        return this;
+    }
     //
     // Writable stream implementation
     //
@@ -552,6 +932,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);
@@ -561,8 +942,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
@@ -915,6 +1326,73 @@ function getCurrentInvokeUuid(req) {
     return getWebAdapterUuid();
 }
 
+//
+//
+// Helpers
+//
+/**
+ * Safely get a header value from response.
+ * Handles both Express Response and Lambda adapter responses.
+ * Defensive against dd-trace instrumentation issues.
+ */
+function safeGetHeader(res, name) {
+    try {
+        // 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;
+        }
+        // Fall back to getHeader (more standard than get)
+        if (typeof res.getHeader === "function") {
+            const value = res.getHeader(name);
+            return value ? String(value) : undefined;
+        }
+        // Last resort: try get
+        if (typeof res.get === "function") {
+            const value = res.get(name);
+            return value ? String(value) : undefined;
+        }
+    }
+    catch {
+        // Silently fail - caller will handle missing value
+    }
+    return undefined;
+}
+/**
+ * Safely set a header value on response.
+ * Handles both Express Response and Lambda adapter responses.
+ * Defensive against dd-trace instrumentation issues.
+ */
+function safeSetHeader(res, name, value) {
+    try {
+        // 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;
+        }
+        // Fall back to setHeader (more standard than set)
+        if (typeof res.setHeader === "function") {
+            res.setHeader(name, value);
+            return;
+        }
+        // Last resort: try set
+        if (typeof res.set === "function") {
+            res.set(name, value);
+        }
+    }
+    catch {
+        // Silently fail - header just won't be set
+    }
+}
 //
 //
 // Main
@@ -931,36 +1409,37 @@ const decorateResponse = (res, { handler = "", version = process.env.PROJECT_VER
         log$1.warn("decorateResponse called but response is not an object");
         return;
     }
+    const extRes = res;
     try {
         //
         //
         // Decorate Headers
         //
         // X-Powered-By, override "Express" but nothing else
-        if (!res.get(HTTP.HEADER.POWERED_BY) ||
-            res.get(HTTP.HEADER.POWERED_BY) === "Express") {
-            res.set(HTTP.HEADER.POWERED_BY, JAYPIE.LIB.EXPRESS);
+        const currentPoweredBy = safeGetHeader(extRes, HTTP.HEADER.POWERED_BY);
+        if (!currentPoweredBy || currentPoweredBy === "Express") {
+            safeSetHeader(extRes, HTTP.HEADER.POWERED_BY, JAYPIE.LIB.EXPRESS);
         }
         // X-Project-Environment
         if (process.env.PROJECT_ENV) {
-            res.set(HTTP.HEADER.PROJECT.ENVIRONMENT, process.env.PROJECT_ENV);
+            safeSetHeader(extRes, HTTP.HEADER.PROJECT.ENVIRONMENT, process.env.PROJECT_ENV);
         }
         // X-Project-Handler
         if (handler) {
-            res.set(HTTP.HEADER.PROJECT.HANDLER, handler);
+            safeSetHeader(extRes, HTTP.HEADER.PROJECT.HANDLER, handler);
         }
         // X-Project-Invocation
         const currentInvoke = getCurrentInvokeUuid();
         if (currentInvoke) {
-            res.set(HTTP.HEADER.PROJECT.INVOCATION, currentInvoke);
+            safeSetHeader(extRes, HTTP.HEADER.PROJECT.INVOCATION, currentInvoke);
         }
         // X-Project-Key
         if (process.env.PROJECT_KEY) {
-            res.set(HTTP.HEADER.PROJECT.KEY, process.env.PROJECT_KEY);
+            safeSetHeader(extRes, HTTP.HEADER.PROJECT.KEY, process.env.PROJECT_KEY);
         }
         // X-Project-Version
         if (version) {
-            res.set(HTTP.HEADER.PROJECT.VERSION, version);
+            safeSetHeader(extRes, HTTP.HEADER.PROJECT.VERSION, version);
         }
         //
         //
@@ -1020,6 +1499,82 @@ function summarizeResponse(res, extras) {
 
 // Cast logger to extended interface for runtime features not in type definitions
 const logger$1 = log;
+//
+//
+// Helpers - Safe response methods to bypass dd-trace interception
+//
+/**
+ * Check if response is a Lambda mock response with direct internal access.
+ */
+function isLambdaMockResponse(res) {
+    const mock = res;
+    return (mock._headers instanceof Map &&
+        Array.isArray(mock._chunks) &&
+        typeof mock.buildResult === "function");
+}
+/**
+ * Safely send a JSON response, avoiding dd-trace interception.
+ * For Lambda mock responses, directly manipulates internal state instead of
+ * using stream methods (write/end) which dd-trace intercepts.
+ */
+function safeSendJson(res, statusCode, data) {
+    if (isLambdaMockResponse(res)) {
+        // 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;
+        // 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
+    res.status(statusCode).json(data);
+}
+/**
+ * Safely send a response body, avoiding dd-trace interception.
+ * For Lambda mock responses, directly manipulates internal state instead of
+ * using stream methods (write/end) which dd-trace intercepts.
+ */
+function safeSend(res, statusCode, body) {
+    if (isLambdaMockResponse(res)) {
+        // Direct internal state manipulation - bypasses dd-trace completely
+        res.statusCode = statusCode;
+        if (body !== undefined) {
+            const chunk = Buffer.from(body);
+            res._chunks.push(chunk);
+        }
+        res._headersSent = 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
+    if (body !== undefined) {
+        res.status(statusCode).send(body);
+    }
+    else {
+        res.status(statusCode).send();
+    }
+}
 function expressHandler(handlerOrOptions, optionsOrHandler) {
     /* eslint-enable no-redeclare */
     let handler;
@@ -1236,30 +1791,30 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
                     if (typeof response === "object") {
                         if (typeof response.json ===
                             "function") {
-                            res.json(response.json());
+                            safeSendJson(res, status, response.json());
                         }
                         else {
-                            res.status(status).json(response);
+                            safeSendJson(res, status, response);
                         }
                     }
                     else if (typeof response === "string") {
                         try {
-                            res.status(status).json(JSON.parse(response));
+                            safeSendJson(res, status, JSON.parse(response));
                         }
                         catch {
-                            res.status(status).send(response);
+                            safeSend(res, status, response);
                         }
                     }
                     else if (response === true) {
-                        res.status(HTTP.CODE.CREATED).send();
+                        safeSend(res, HTTP.CODE.CREATED);
                     }
                     else {
-                        res.status(status).send(response);
+                        safeSend(res, status, response);
                     }
                 }
                 else {
                     // No response
-                    res.status(HTTP.CODE.NO_CONTENT).send();
+                    safeSend(res, HTTP.CODE.NO_CONTENT);
                 }
             }
             else {
@@ -1276,7 +1831,11 @@ 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
+            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