@jaypie/express 1.2.4-rc22 → 1.2.4-rc24

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

@@ -1,6 +1,7 @@
 import type { OutgoingHttpHeaders } from "node:http";
 import { Writable } from "node:stream";
 import type { LambdaResponse } from "./types.js";
+export declare const JAYPIE_LAMBDA_MOCK: unique symbol;
 /**
  * Mock ServerResponse that buffers the response.
  * Collects status, headers, and body chunks, then returns a Lambda response.

package/dist/cjs/getCurrentInvokeUuid.adapter.d.ts

@@ -1,10 +1,10 @@
 import type { Request } from "express";
 /**
  * Get the current invoke UUID from Lambda context.
- * Works with Jaypie Lambda adapter and Lambda Web Adapter mode.
+ * Works with Jaypie Lambda adapter (createLambdaHandler/createLambdaStreamHandler).
  *
  * @param req - Optional Express request object. Used to extract context
- *              from Web Adapter headers or Jaypie adapter's _lambdaContext.
+ *              from Jaypie adapter's _lambdaContext.
  * @returns The AWS request ID or undefined if not in Lambda context
  */
 declare function getCurrentInvokeUuid(req?: Request): string | undefined;

package/dist/cjs/index.cjs

@@ -5,8 +5,8 @@ var node_http = require('node:http');
 var errors = require('@jaypie/errors');
 var kit = require('@jaypie/kit');
 var expressCors = require('cors');
-var logger$2 = require('@jaypie/logger');
 var aws = require('@jaypie/aws');
+var logger$2 = require('@jaypie/logger');
 var datadog = require('@jaypie/datadog');
 
 //
@@ -188,6 +188,9 @@ function createLambdaRequest(event, context) {
 //
 // Constants
 //
+// Symbol to identify Lambda mock responses. Uses Symbol.for() to ensure
+// the same symbol is used across bundles/realms. Survives prototype manipulation.
+const JAYPIE_LAMBDA_MOCK = Symbol.for("@jaypie/express/LambdaMock");
 // 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.
@@ -225,6 +228,8 @@ class LambdaResponseBuffered extends node_stream.Writable {
         this._headers = new Map();
         this._headersSent = false;
         this._resolve = null;
+        // Mark as Lambda mock response for identification in expressHandler
+        this[JAYPIE_LAMBDA_MOCK] = true;
         // Initialize Node's internal kOutHeaders for dd-trace compatibility.
         // dd-trace patches HTTP methods and expects this internal state.
         if (kOutHeaders$1) {
@@ -1113,7 +1118,7 @@ const corsHelper = (config = {}) => {
     };
     return expressCors(options);
 };
-var cors = (config) => {
+var cors_helper = (config) => {
     const cors = corsHelper(config);
     return (req, res, next) => {
         cors(req, res, (error) => {
@@ -1128,154 +1133,10 @@ var cors = (config) => {
     };
 };
 
-//
-//
-// Constants
-//
-const DEFAULT_PORT = 8080;
-//
-//
-// Main
-//
-/**
- * Creates and starts an Express server with standard Jaypie middleware.
- *
- * Features:
- * - CORS handling (configurable)
- * - JSON body parsing
- * - Listens on PORT env var (default 8080)
- *
- * Usage:
- * ```ts
- * import express from "express";
- * import { createServer, expressHandler } from "@jaypie/express";
- *
- * const app = express();
- *
- * app.get("/", expressHandler(async (req, res) => {
- *   return { message: "Hello World" };
- * }));
- *
- * const { server, port } = await createServer(app);
- * console.log(`Server running on port ${port}`);
- * ```
- *
- * @param app - Express application instance
- * @param options - Server configuration options
- * @returns Promise resolving to server instance and port
- */
-async function createServer(app, options = {}) {
-    const { cors: corsConfig, jsonLimit = "1mb", middleware = [], port: portOption, } = options;
-    // Determine port
-    const port = typeof portOption === "string"
-        ? parseInt(portOption, 10)
-        : (portOption ?? parseInt(process.env.PORT || String(DEFAULT_PORT), 10));
-    // Apply CORS middleware (unless explicitly disabled)
-    if (corsConfig !== false) {
-        app.use(cors(corsConfig));
-    }
-    // Apply JSON body parser
-    // Note: We use dynamic import to avoid requiring express as a direct dependency
-    const express = await import('express');
-    app.use(express.json({ limit: jsonLimit }));
-    // Apply additional middleware
-    for (const mw of middleware) {
-        app.use(mw);
-    }
-    // Start server
-    return new Promise((resolve, reject) => {
-        try {
-            const server = app.listen(port, () => {
-                // Get the actual port (important when port 0 is passed to get an ephemeral port)
-                const address = server.address();
-                const actualPort = address?.port ?? port;
-                logger$2.log.info(`Server listening on port ${actualPort}`);
-                resolve({ port: actualPort, server });
-            });
-            server.on("error", (error) => {
-                logger$2.log.error("Server error", { error });
-                reject(error);
-            });
-        }
-        catch (error) {
-            reject(error);
-        }
-    });
-}
-
-//
-//
-// Constants
-//
-const HEADER_AMZN_REQUEST_ID$1 = "x-amzn-request-id";
-const ENV_AMZN_TRACE_ID = "_X_AMZN_TRACE_ID";
 //
 //
 // Helper Functions
 //
-/**
- * Extract request ID from X-Ray trace ID environment variable
- * Format: Root=1-5e6b4a90-example;Parent=example;Sampled=1
- * We extract the trace ID from the Root segment
- */
-function parseTraceId(traceId) {
-    if (!traceId)
-        return undefined;
-    // Extract the Root segment (format: Root=1-{timestamp}-{uuid})
-    const rootMatch = traceId.match(/Root=([^;]+)/);
-    if (rootMatch && rootMatch[1]) {
-        return rootMatch[1];
-    }
-    return undefined;
-}
-//
-//
-// Main
-//
-/**
- * Get the current invoke UUID from Lambda Web Adapter context.
- * This function extracts the request ID from either:
- * 1. The x-amzn-request-id header (set by Lambda Web Adapter)
- * 2. The _X_AMZN_TRACE_ID environment variable (set by Lambda runtime)
- *
- * @param req - Optional Express request object to extract headers from
- * @returns The AWS request ID or undefined if not in Lambda context
- */
-function getWebAdapterUuid(req) {
-    // First, try to get from request headers
-    if (req && req.headers) {
-        const headerValue = req.headers[HEADER_AMZN_REQUEST_ID$1];
-        if (headerValue) {
-            return Array.isArray(headerValue) ? headerValue[0] : headerValue;
-        }
-    }
-    // Fall back to environment variable (X-Ray trace ID)
-    const traceId = process.env[ENV_AMZN_TRACE_ID];
-    if (traceId) {
-        return parseTraceId(traceId);
-    }
-    return undefined;
-}
-
-//
-//
-// Constants
-//
-const HEADER_AMZN_REQUEST_ID = "x-amzn-request-id";
-//
-//
-// Helper Functions
-//
-/**
- * Detect if we're running in Lambda Web Adapter mode.
- * Web Adapter sets the x-amzn-request-id header on requests.
- */
-function isWebAdapterMode(req) {
-    if (req && req.headers && req.headers[HEADER_AMZN_REQUEST_ID]) {
-        return true;
-    }
-    return false;
-}
 /**
  * Get UUID from Jaypie Lambda adapter context.
  * This is set by createLambdaHandler/createLambdaStreamHandler.
@@ -1292,8 +1153,12 @@ function getJaypieAdapterUuid() {
  * The Jaypie adapter attaches _lambdaContext to the request.
  */
 function getRequestContextUuid(req) {
-    if (req && req._lambdaContext?.awsRequestId) {
-        return req._lambdaContext.awsRequestId;
+    if (req && req._lambdaContext) {
+        const lambdaContext = req
+            ._lambdaContext;
+        if (lambdaContext.awsRequestId) {
+            return lambdaContext.awsRequestId;
+        }
     }
     return undefined;
 }
@@ -1303,29 +1168,20 @@ function getRequestContextUuid(req) {
 //
 /**
  * Get the current invoke UUID from Lambda context.
- * Works with Jaypie Lambda adapter and Lambda Web Adapter mode.
+ * Works with Jaypie Lambda adapter (createLambdaHandler/createLambdaStreamHandler).
  *
  * @param req - Optional Express request object. Used to extract context
- *              from Web Adapter headers or Jaypie adapter's _lambdaContext.
+ *              from Jaypie adapter's _lambdaContext.
  * @returns The AWS request ID or undefined if not in Lambda context
  */
 function getCurrentInvokeUuid(req) {
-    // Priority 1: Web Adapter mode (header-based)
-    if (isWebAdapterMode(req)) {
-        return getWebAdapterUuid(req);
-    }
-    // Priority 2: Request has Lambda context attached (Jaypie adapter)
+    // Priority 1: Request has Lambda context attached (Jaypie adapter)
     const requestContextUuid = getRequestContextUuid(req);
     if (requestContextUuid) {
         return requestContextUuid;
     }
-    // Priority 3: Global context from Jaypie adapter
-    const jaypieAdapterUuid = getJaypieAdapterUuid();
-    if (jaypieAdapterUuid) {
-        return jaypieAdapterUuid;
-    }
-    // Fallback: Web Adapter env var
-    return getWebAdapterUuid();
+    // Priority 2: Global context from Jaypie adapter
+    return getJaypieAdapterUuid();
 }
 
 //
@@ -1507,12 +1363,10 @@ const logger$1 = logger$2.log;
 //
 /**
  * Check if response is a Lambda mock response with direct internal access.
+ * Uses Symbol marker to survive prototype chain modifications from Express and dd-trace.
  */
 function isLambdaMockResponse(res) {
-    const mock = res;
-    return (mock._headers instanceof Map &&
-        Array.isArray(mock._chunks) &&
-        typeof mock.buildResult === "function");
+    return res[JAYPIE_LAMBDA_MOCK] === true;
 }
 /**
  * Safely send a JSON response, avoiding dd-trace interception.
@@ -1838,10 +1692,17 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         }
         catch (error) {
             // 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)}`);
+            // Handle both Error objects and plain thrown values
+            const errorMessage = error instanceof Error
+                ? error.message
+                : typeof error === "object" && error !== null
+                    ? JSON.stringify(error)
+                    : String(error);
+            const errorStack = error instanceof Error
+                ? error.stack
+                : new Error("Stack trace").stack?.replace("Error: Stack trace", `Error: ${errorMessage}`);
+            console.error("Express response error stack trace:", errorStack);
+            log.fatal(`Express encountered an error while sending the response: ${errorMessage}`);
             log.var({ responseError: error });
         }
         // Log response
@@ -2222,10 +2083,9 @@ exports.LambdaRequest = LambdaRequest;
 exports.LambdaResponseBuffered = LambdaResponseBuffered;
 exports.LambdaResponseStreaming = LambdaResponseStreaming;
 exports.badRequestRoute = badRequestRoute;
-exports.cors = cors;
+exports.cors = cors_helper;
 exports.createLambdaHandler = createLambdaHandler;
 exports.createLambdaStreamHandler = createLambdaStreamHandler;
-exports.createServer = createServer;
 exports.echoRoute = echoRoute;
 exports.expressHandler = expressHandler;
 exports.expressHttpCodeHandler = httpHandler;