@jaypie/express 1.2.11 → 1.2.13

package/dist/cjs/index.cjs

@@ -55,18 +55,21 @@ class LambdaRequest extends node_stream.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) {
+        // Schedule body push for next tick to ensure stream is ready.
+        // This is needed for body parsers that consume the stream.
+        // CRITICAL: Always schedule the push, even for empty bodies, to ensure
+        // the stream emits 'end'. Otherwise, middleware that waits for the request
+        // stream to end (like body parsers) will hang forever on GET requests.
+        process.nextTick(() => {
+            if (!this.bodyPushed) {
+                if (this.bodyBuffer && this.bodyBuffer.length > 0) {
                     this.push(this.bodyBuffer);
-                    this.push(null);
-                    this.bodyPushed = true;
-                    this.complete = true;
                 }
-            });
-        }
+                this.push(null); // Signal end of stream
+                this.bodyPushed = true;
+                this.complete = true;
+            }
+        });
     }
     //
     // Readable stream implementation
@@ -1613,15 +1616,22 @@ function safeSendJson(res, statusCode, data) {
     }
     // Fall back to standard Express methods for real responses
     res.status(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).
+    // CRITICAL: For Lambda streaming responses, set content-type BEFORE flushing
+    // headers, then flush to initialize the stream wrapper with all headers.
     // Uses Symbol marker for reliable detection that survives prototype manipulation.
-    if (isLambdaStreamingResponse(res) &&
-        typeof res.flushHeaders === "function") {
-        res.flushHeaders();
+    if (isLambdaStreamingResponse(res)) {
+        // Set content-type before flushing so it's included in the metadata
+        res.setHeader("content-type", "application/json");
+        if (typeof res.flushHeaders === "function") {
+            res.flushHeaders();
+        }
+        // Write JSON directly and end the stream (don't call res.json which would
+        // try to set content-type again after headers are already sent)
+        res.end(JSON.stringify(data));
+    }
+    else {
+        res.json(data);
     }
-    res.json(data);
 }
 /**
  * Safely send a response body, avoiding dd-trace interception.
@@ -1653,15 +1663,25 @@ function safeSend(res, statusCode, body) {
     // 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.
-    if (isLambdaStreamingResponse(res) &&
-        typeof res.flushHeaders === "function") {
-        res.flushHeaders();
-    }
-    if (body !== undefined) {
-        res.send(body);
+    if (isLambdaStreamingResponse(res)) {
+        if (typeof res.flushHeaders === "function") {
+            res.flushHeaders();
+        }
+        // Write directly to stream and end (bypass Express send middleware)
+        if (body !== undefined) {
+            res.end(body);
+        }
+        else {
+            res.end();
+        }
     }
     else {
-        res.send();
+        if (body !== undefined) {
+            res.send(body);
+        }
+        else {
+            res.send();
+        }
     }
 }
 function expressHandler(handlerOrOptions, optionsOrHandler) {