@jaypie/express 1.2.4-rc6 → 1.2.4-rc7

package/dist/cjs/index.cjs

@@ -1126,6 +1126,64 @@ 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 direct _headers access first (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 direct _headers access first (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
@@ -1142,36 +1200,37 @@ const decorateResponse = (res, { handler = "", version = process.env.PROJECT_VER
         log.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(kit.HTTP.HEADER.POWERED_BY) ||
-            res.get(kit.HTTP.HEADER.POWERED_BY) === "Express") {
-            res.set(kit.HTTP.HEADER.POWERED_BY, kit.JAYPIE.LIB.EXPRESS);
+        const currentPoweredBy = safeGetHeader(extRes, kit.HTTP.HEADER.POWERED_BY);
+        if (!currentPoweredBy || currentPoweredBy === "Express") {
+            safeSetHeader(extRes, kit.HTTP.HEADER.POWERED_BY, kit.JAYPIE.LIB.EXPRESS);
         }
         // X-Project-Environment
         if (process.env.PROJECT_ENV) {
-            res.set(kit.HTTP.HEADER.PROJECT.ENVIRONMENT, process.env.PROJECT_ENV);
+            safeSetHeader(extRes, kit.HTTP.HEADER.PROJECT.ENVIRONMENT, process.env.PROJECT_ENV);
         }
         // X-Project-Handler
         if (handler) {
-            res.set(kit.HTTP.HEADER.PROJECT.HANDLER, handler);
+            safeSetHeader(extRes, kit.HTTP.HEADER.PROJECT.HANDLER, handler);
         }
         // X-Project-Invocation
         const currentInvoke = getCurrentInvokeUuid();
         if (currentInvoke) {
-            res.set(kit.HTTP.HEADER.PROJECT.INVOCATION, currentInvoke);
+            safeSetHeader(extRes, kit.HTTP.HEADER.PROJECT.INVOCATION, currentInvoke);
         }
         // X-Project-Key
         if (process.env.PROJECT_KEY) {
-            res.set(kit.HTTP.HEADER.PROJECT.KEY, process.env.PROJECT_KEY);
+            safeSetHeader(extRes, kit.HTTP.HEADER.PROJECT.KEY, process.env.PROJECT_KEY);
         }
         // X-Project-Version
         if (version) {
-            res.set(kit.HTTP.HEADER.PROJECT.VERSION, version);
+            safeSetHeader(extRes, kit.HTTP.HEADER.PROJECT.VERSION, version);
         }
         //
         //