@jaypie/express 1.2.27 → 1.2.29

package/dist/esm/index.js

@@ -4,7 +4,7 @@ import { ServerResponse } from 'node:http';
 import { CorsError, BadRequestError, UnhandledError, GatewayTimeoutError, UnavailableError, BadGatewayError, InternalError, TeapotError, GoneError, MethodNotAllowedError, NotFoundError, ForbiddenError, UnauthorizedError, NotImplementedError } from '@jaypie/errors';
 import { force, envBoolean, JAYPIE, HTTP, getHeaderFrom, jaypieHandler } from '@jaypie/kit';
 import expressCors from 'cors';
-import { loadEnvSecrets, getContentTypeForFormat, formatStreamError } from '@jaypie/aws';
+import { loadEnvVariables, loadEnvSecrets, getContentTypeForFormat, formatStreamError } from '@jaypie/aws';
 import { log, redactAuth } from '@jaypie/logger';
 
 //
@@ -1786,6 +1786,9 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
     //
     // Setup
     //
+    // Start the variables fetch at cold start; request setup awaits the cached
+    // promise. No-op without the pointer.
+    void loadEnvVariables().catch(() => { });
     let jaypieFunction;
     return async (req, res, ...params) => {
         // * This is the first line of code that runs when a request is received
@@ -1876,6 +1879,11 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         //
         // Build a request-local setup list to avoid mutating the shared array
         const requestSetup = [];
+        // Hydrate non-secret variables first so everything after, including Datadog
+        // and secrets, can be configured from the bundle. No-op without the pointer.
+        requestSetup.push(async () => {
+            await loadEnvVariables();
+        });
         // Load the Datadog LLM Observability API key into the environment when enabled
         requestSetup.push(async () => {
             await loadDatadogApiKey();
@@ -2065,14 +2073,18 @@ function expressHandler(handlerOrOptions, optionsOrHandler) {
         const contentLengthHeader = headers["content-length"];
         const contentLength = contentLengthHeader ? Number(contentLengthHeader) : 0;
         // Add request data to session report
-        logger$1.report({
+        const reportData = {
             method: req.method,
             path,
             query,
             contentType,
             contentLength,
             status: String(res.statusCode),
-        });
+        };
+        if (req.params && Object.keys(req.params).length > 0) {
+            reportData.parameters = { ...req.params };
+        }
+        logger$1.report(reportData);
         // Submit metric if Datadog is configured
         if (hasDatadogEnv()) {
             let metricPrefix = "project";
@@ -2191,6 +2203,9 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
     //
     // Setup
     //
+    // Start the variables fetch at cold start; request setup awaits the cached
+    // promise. No-op without the pointer.
+    void loadEnvVariables().catch(() => { });
     let jaypieFunction;
     return async (req, res, ...params) => {
         const extReq = req;
@@ -2255,6 +2270,11 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
         //
         // Build a request-local setup list to avoid mutating the shared array
         const requestSetup = [];
+        // Hydrate non-secret variables before secrets so both can be configured
+        // from the bundle. No-op without the pointer.
+        requestSetup.push(async () => {
+            await loadEnvVariables();
+        });
         // Load secrets into process.env if configured
         if (secrets && secrets.length > 0) {
             const secretsToLoad = secrets;
@@ -2353,11 +2373,15 @@ function expressStreamHandler(handlerOrOptions, optionsOrHandler) {
             }
             path = path.replace(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/gi, ":id");
             // Add request data to session report
-            logger.report({
+            const reportData = {
                 method: req.method,
                 path,
                 status: String(res.statusCode),
-            });
+            };
+            if (req.params && Object.keys(req.params).length > 0) {
+                reportData.parameters = { ...req.params };
+            }
+            logger.report(reportData);
             // Submit metric if Datadog is configured
             if (hasDatadogEnv()) {
                 let metricPrefix = "project";