@jaypie/express 1.2.4-rc14 → 1.2.4-rc15

package/dist/esm/adapter/LambdaResponseBuffered.d.ts

@@ -12,6 +12,7 @@ export declare class LambdaResponseBuffered extends Writable {
         remoteAddress: string;
     };
     _chunks: Buffer[];
+    _ended: boolean;
     _headers: Map<string, string | string[]>;
     _headersSent: boolean;
     _resolve: ((result: LambdaResponse) => void) | null;

package/dist/esm/adapter/__tests__/debug-harness.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esm/index.js

@@ -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,
@@ -193,6 +219,7 @@ 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;
@@ -201,6 +228,32 @@ class LambdaResponseBuffered extends Writable {
         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
@@ -243,7 +296,8 @@ class LambdaResponseBuffered extends Writable {
     //
     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 {
@@ -437,6 +491,7 @@ class LambdaResponseBuffered extends Writable {
         callback();
     }
     _final(callback) {
+        this._ended = true;
         if (this._resolve) {
             this._resolve(this.buildResult());
         }
@@ -522,6 +577,29 @@ 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