@jaypie/express 1.2.11-dev.2 → 1.2.11-dev.4

package/dist/cjs/index.cjs

@@ -661,10 +661,6 @@ class LambdaResponseStreaming extends node_stream.Writable {
         // Survives prototype manipulation from Express and dd-trace.
         this[JAYPIE_LAMBDA_STREAMING] =
             true;
-        // DIAGNOSTIC: Log symbol assignment
-        console.log("[DIAG:LambdaResponseStreaming:constructor] Symbol set", {
-            symbolValue: this[JAYPIE_LAMBDA_STREAMING],
-        });
         // Initialize Node's internal kOutHeaders for dd-trace compatibility.
         // dd-trace patches HTTP methods and expects this internal state.
         if (kOutHeaders) {
@@ -852,15 +848,7 @@ class LambdaResponseStreaming extends node_stream.Writable {
         return this._headersSent;
     }
     flushHeaders() {
-        // DIAGNOSTIC: Log every flushHeaders call with stack trace
-        const caller = new Error().stack?.split("\n").slice(1, 5).join("\n");
-        console.log("[DIAG:LambdaResponseStreaming:flushHeaders] Called", {
-            statusCode: this.statusCode,
-            headersSent: this._headersSent,
-            caller,
-        });
         if (this._headersSent) {
-            console.log("[DIAG:LambdaResponseStreaming:flushHeaders] Already sent, returning early");
             return;
         }
         const headers = {};
@@ -871,11 +859,19 @@ class LambdaResponseStreaming extends node_stream.Writable {
             headers,
             statusCode: this.statusCode,
         };
-        // DIAGNOSTIC: Log what we're sending to Lambda
-        console.log("[DIAG:LambdaResponseStreaming:flushHeaders] Creating wrapped stream", {
-            metadata,
-        });
-        // Wrap the stream with metadata using awslambda global
+        // For 204 No Content, write metadata directly without wrapped stream.
+        // Lambda streaming ignores metadata when no body content is written,
+        // so we write the prelude manually and skip creating a wrapped stream.
+        if (this.statusCode === 204) {
+            const prelude = JSON.stringify(metadata);
+            this._responseStream.write(prelude);
+            // Metadata separator (8 null bytes) signals end of prelude
+            this._responseStream.write("\0\0\0\0\0\0\0\0");
+            this._headersSent = true;
+            // Don't create wrapped stream - 204 has no body
+            return;
+        }
+        // Normal streaming: create wrapped stream
         this._wrappedStream = awslambda.HttpResponseStream.from(this._responseStream, metadata);
         this._headersSent = true;
         // Flush pending writes
@@ -908,14 +904,6 @@ class LambdaResponseStreaming extends node_stream.Writable {
         return this;
     }
     status(code) {
-        // DIAGNOSTIC: Log status code changes
-        const caller = new Error().stack?.split("\n").slice(1, 4).join("\n");
-        console.log("[DIAG:LambdaResponseStreaming:status] Setting status", {
-            newCode: code,
-            previousCode: this.statusCode,
-            headersSent: this._headersSent,
-            caller,
-        });
         this.statusCode = code;
         return this;
     }
@@ -961,17 +949,10 @@ class LambdaResponseStreaming extends node_stream.Writable {
         const buffer = Buffer.isBuffer(chunk)
             ? chunk
             : Buffer.from(chunk, encoding);
-        // DIAGNOSTIC: Log every write
-        console.log("[DIAG:LambdaResponseStreaming:_write] Called", {
-            chunkLength: buffer.length,
-            headersSent: this._headersSent,
-            statusCode: this.statusCode,
-        });
         if (!this._headersSent) {
             // Buffer writes until headers are sent
             this._pendingWrites.push({ callback: () => callback(), chunk: buffer });
             // Auto-flush headers on first write
-            console.log("[DIAG:LambdaResponseStreaming:_write] Auto-flushing headers on first write");
             this.flushHeaders();
         }
         else {
@@ -980,18 +961,18 @@ class LambdaResponseStreaming extends node_stream.Writable {
         }
     }
     _final(callback) {
-        // DIAGNOSTIC: Log _final call
-        console.log("[DIAG:LambdaResponseStreaming:_final] Called", {
-            headersSent: this._headersSent,
-            statusCode: this.statusCode,
-            hasWrappedStream: !!this._wrappedStream,
-        });
         if (!this._headersSent) {
-            console.log("[DIAG:LambdaResponseStreaming:_final] Headers not sent, flushing now");
             this.flushHeaders();
         }
-        this._wrappedStream?.end();
-        callback();
+        if (this._wrappedStream) {
+            this._wrappedStream.end();
+        }
+        else {
+            // 204 case: headers were written directly, just end the response stream
+            this._responseStream.end();
+        }
+        // Use setImmediate to ensure stream operations complete before callback
+        setImmediate(callback);
     }
 }
 
@@ -1500,8 +1481,7 @@ const decorateResponse = (res, { handler = "", version = process.env.PROJECT_VER
         // X-Powered-By, override "Express" but nothing else
         const currentPoweredBy = safeGetHeader(extRes, kit.HTTP.HEADER.POWERED_BY);
         if (!currentPoweredBy || currentPoweredBy === "Express") {
-            // DIAGNOSTIC: Include dev marker to verify build deployment
-            safeSetHeader(extRes, kit.HTTP.HEADER.POWERED_BY, `${kit.JAYPIE.LIB.EXPRESS}@1.2.11-dev`);
+            safeSetHeader(extRes, kit.HTTP.HEADER.POWERED_BY, kit.JAYPIE.LIB.EXPRESS);
         }
         // X-Project-Environment
         if (process.env.PROJECT_ENV) {
@@ -1598,16 +1578,8 @@ function isLambdaMockResponse(res) {
  * Uses Symbol marker to survive prototype chain modifications from Express and dd-trace.
  */
 function isLambdaStreamingResponse(res) {
-    const symbolValue = res[JAYPIE_LAMBDA_STREAMING];
-    const result = symbolValue === true;
-    // DIAGNOSTIC: Log symbol check
-    console.log("[DIAG:expressHandler:isLambdaStreamingResponse] Check", {
-        symbolValue,
-        result,
-        resConstructorName: res?.constructor?.name,
-        hasFlushHeaders: typeof res.flushHeaders === "function",
-    });
-    return result;
+    return (res[JAYPIE_LAMBDA_STREAMING] ===
+        true);
 }
 /**
  * Safely send a JSON response, avoiding dd-trace interception.
@@ -1636,34 +1608,19 @@ function safeSendJson(res, statusCode, data) {
             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
-    // DIAGNOSTIC: Log before setting status
-    console.log("[DIAG:expressHandler:safeSendJson] Before res.status()", {
-        statusCode,
-        currentStatusCode: res.statusCode,
-    });
     res.status(statusCode);
-    console.log("[DIAG:expressHandler:safeSendJson] After res.status()", {
-        statusCode,
-        newStatusCode: res.statusCode,
-    });
     // CRITICAL: For Lambda streaming responses, flush headers before send to
     // initialize the stream wrapper. This ensures the status code is captured
     // before any writes occur (which would auto-flush with default 200).
     // Uses Symbol marker for reliable detection that survives prototype manipulation.
-    const isStreaming = isLambdaStreamingResponse(res);
-    console.log("[DIAG:expressHandler:safeSendJson] Streaming check", {
-        isStreaming,
-    });
-    if (isStreaming && typeof res.flushHeaders === "function") {
-        console.log("[DIAG:expressHandler:safeSendJson] Calling flushHeaders explicitly");
+    if (isLambdaStreamingResponse(res) &&
+        typeof res.flushHeaders === "function") {
         res.flushHeaders();
     }
-    console.log("[DIAG:expressHandler:safeSendJson] Calling res.json()");
     res.json(data);
 }
 /**
@@ -1687,40 +1644,23 @@ function safeSend(res, statusCode, body) {
             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
-    // DIAGNOSTIC: Log before setting status
-    console.log("[DIAG:expressHandler:safeSend] Before res.status()", {
-        statusCode,
-        currentStatusCode: res.statusCode,
-        hasBody: body !== undefined,
-    });
     res.status(statusCode);
-    console.log("[DIAG:expressHandler:safeSend] After res.status()", {
-        statusCode,
-        newStatusCode: res.statusCode,
-    });
     // CRITICAL: For Lambda streaming responses, flush headers before send to
     // initialize the stream wrapper. This ensures the status code is captured
     // before any writes occur (which would auto-flush with default 200).
     // Uses Symbol marker for reliable detection that survives prototype manipulation.
-    const isStreaming = isLambdaStreamingResponse(res);
-    console.log("[DIAG:expressHandler:safeSend] Streaming check", {
-        isStreaming,
-    });
-    if (isStreaming && typeof res.flushHeaders === "function") {
-        console.log("[DIAG:expressHandler:safeSend] Calling flushHeaders explicitly");
+    if (isLambdaStreamingResponse(res) &&
+        typeof res.flushHeaders === "function") {
         res.flushHeaders();
     }
     if (body !== undefined) {
-        console.log("[DIAG:expressHandler:safeSend] Calling res.send(body)");
         res.send(body);
     }
     else {
-        console.log("[DIAG:expressHandler:safeSend] Calling res.send() (no body)");
         res.send();
     }
 }