@jaypie/express 1.1.11 → 1.1.13

package/dist/module.cjs

@@ -3,6 +3,7 @@
 var errors = require('@jaypie/errors');
 var core = require('@jaypie/core');
 var expressCors = require('cors');
+var datadog = require('@jaypie/datadog');
 var serverlessExpress = require('@codegenie/serverless-express');
 
 //
@@ -290,6 +291,7 @@ const expressHandler = (handler, options = {}) => {
   // Validate
   //
   let {
+    chaos,
     locals,
     name,
     setup = [],
@@ -312,6 +314,13 @@ const expressHandler = (handler, options = {}) => {
   return async (req, res, ...params) => {
     // * This is the first line of code that runs when a request is received
 
+    // Set default chaos value
+    if (chaos === undefined) {
+      chaos =
+        process.env.PROJECT_CHAOS ||
+        core.getHeaderFrom(core.HTTP.HEADER.PROJECT.CHAOS, req);
+    }
+
     // Re-init the logger
     core.log.init();
     // Very low-level, internal sub-trace details
@@ -368,7 +377,7 @@ const expressHandler = (handler, options = {}) => {
       status: res.status,
       statusSent: false,
     };
-    // eslint-disable-next-line no-shadow
+
     res.end = (...params) => {
       originalRes.attemptedCall = originalRes.end;
       originalRes.attemptedParams = params;
@@ -376,7 +385,7 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.end(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.json = (...params) => {
       originalRes.attemptedCall = originalRes.json;
       originalRes.attemptedParams = params;
@@ -384,7 +393,7 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.json(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.send = (...params) => {
       originalRes.attemptedCall = originalRes.send;
       originalRes.attemptedParams = params;
@@ -392,9 +401,9 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.send(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.status = (...params) => {
-      originalRes.statusSent = params;
+      originalRes.statusSent = params[0];
       return originalRes.status(...params);
     };
 
@@ -430,6 +439,7 @@ const expressHandler = (handler, options = {}) => {
 
       // Initialize after logging is set up
       jaypieFunction = core.jaypieHandler(handler, {
+        chaos,
         name,
         setup,
         teardown,
@@ -535,6 +545,45 @@ const expressHandler = (handler, options = {}) => {
       res: summarizeResponse(res, extras),
     });
 
+    // Submit metric if Datadog is configured
+    if (datadog.hasDatadogEnv()) {
+      // Construct path from baseUrl and url
+      let path = (req.baseUrl || "") + (req.url || "");
+      // Ensure path starts with /
+      if (!path.startsWith("/")) {
+        path = "/" + path;
+      }
+      // Remove trailing slash unless it's the root path
+      if (path.length > 1 && path.endsWith("/")) {
+        path = path.slice(0, -1);
+      }
+
+      // Replace UUIDs with :id for better aggregation
+      // Matches standard UUID v4 format (8-4-4-4-12 hex characters)
+      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",
+      );
+
+      // Determine metric name based on environment variables
+      let metricPrefix = "project";
+      if (process.env.PROJECT_SPONSOR) {
+        metricPrefix = process.env.PROJECT_SPONSOR;
+      } else if (process.env.PROJECT_KEY) {
+        metricPrefix = `project.${process.env.PROJECT_KEY}`;
+      }
+
+      await datadog.submitMetric({
+        name: `${metricPrefix}.api.response`,
+        type: datadog.DATADOG.METRIC.TYPE.COUNT,
+        value: 1,
+        tags: {
+          code: res.statusCode,
+          path,
+        },
+      });
+    }
+
     // Clean up the public logger
     core.log.untag("handler");
 

package/dist/module.esm.js

@@ -1,6 +1,7 @@
 import { CorsError } from '@jaypie/errors';
-import { force, envBoolean, log, JAYPIE, HTTP, validate, jaypieHandler, UnhandledError, GatewayTimeoutError, UnavailableError, BadGatewayError, InternalError, TeapotError, GoneError, MethodNotAllowedError, NotFoundError, ForbiddenError, UnauthorizedError, BadRequestError, NotImplementedError } from '@jaypie/core';
+import { force, envBoolean, log, JAYPIE, HTTP, validate, getHeaderFrom, jaypieHandler, UnhandledError, GatewayTimeoutError, UnavailableError, BadGatewayError, InternalError, TeapotError, GoneError, MethodNotAllowedError, NotFoundError, ForbiddenError, UnauthorizedError, BadRequestError, NotImplementedError } from '@jaypie/core';
 import expressCors from 'cors';
+import { hasDatadogEnv, submitMetric, DATADOG } from '@jaypie/datadog';
 import { getCurrentInvoke } from '@codegenie/serverless-express';
 
 //
@@ -288,6 +289,7 @@ const expressHandler = (handler, options = {}) => {
   // Validate
   //
   let {
+    chaos,
     locals,
     name,
     setup = [],
@@ -310,6 +312,13 @@ const expressHandler = (handler, options = {}) => {
   return async (req, res, ...params) => {
     // * This is the first line of code that runs when a request is received
 
+    // Set default chaos value
+    if (chaos === undefined) {
+      chaos =
+        process.env.PROJECT_CHAOS ||
+        getHeaderFrom(HTTP.HEADER.PROJECT.CHAOS, req);
+    }
+
     // Re-init the logger
     log.init();
     // Very low-level, internal sub-trace details
@@ -366,7 +375,7 @@ const expressHandler = (handler, options = {}) => {
       status: res.status,
       statusSent: false,
     };
-    // eslint-disable-next-line no-shadow
+
     res.end = (...params) => {
       originalRes.attemptedCall = originalRes.end;
       originalRes.attemptedParams = params;
@@ -374,7 +383,7 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.end(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.json = (...params) => {
       originalRes.attemptedCall = originalRes.json;
       originalRes.attemptedParams = params;
@@ -382,7 +391,7 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.json(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.send = (...params) => {
       originalRes.attemptedCall = originalRes.send;
       originalRes.attemptedParams = params;
@@ -390,9 +399,9 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.send(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.status = (...params) => {
-      originalRes.statusSent = params;
+      originalRes.statusSent = params[0];
       return originalRes.status(...params);
     };
 
@@ -428,6 +437,7 @@ const expressHandler = (handler, options = {}) => {
 
       // Initialize after logging is set up
       jaypieFunction = jaypieHandler(handler, {
+        chaos,
         name,
         setup,
         teardown,
@@ -533,6 +543,45 @@ const expressHandler = (handler, options = {}) => {
       res: summarizeResponse(res, extras),
     });
 
+    // Submit metric if Datadog is configured
+    if (hasDatadogEnv()) {
+      // Construct path from baseUrl and url
+      let path = (req.baseUrl || "") + (req.url || "");
+      // Ensure path starts with /
+      if (!path.startsWith("/")) {
+        path = "/" + path;
+      }
+      // Remove trailing slash unless it's the root path
+      if (path.length > 1 && path.endsWith("/")) {
+        path = path.slice(0, -1);
+      }
+
+      // Replace UUIDs with :id for better aggregation
+      // Matches standard UUID v4 format (8-4-4-4-12 hex characters)
+      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",
+      );
+
+      // Determine metric name based on environment variables
+      let metricPrefix = "project";
+      if (process.env.PROJECT_SPONSOR) {
+        metricPrefix = process.env.PROJECT_SPONSOR;
+      } else if (process.env.PROJECT_KEY) {
+        metricPrefix = `project.${process.env.PROJECT_KEY}`;
+      }
+
+      await submitMetric({
+        name: `${metricPrefix}.api.response`,
+        type: DATADOG.METRIC.TYPE.COUNT,
+        value: 1,
+        tags: {
+          code: res.statusCode,
+          path,
+        },
+      });
+    }
+
     // Clean up the public logger
     log.untag("handler");
 

package/index.d.ts

@@ -10,7 +10,7 @@ export const EXPRESS: {
 };
 
 export interface CorsConfig {
-  origins?: string | string[];
+  origin?: string | string[];
   overrides?: Record<string, unknown>;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "license": "MIT",
   "author": "Finlayson Studio",
   "type": "module",
@@ -39,11 +39,15 @@
   "dependencies": {
     "@codegenie/serverless-express": "^4.15.0",
     "@jaypie/core": "^1.1.0",
+    "@jaypie/datadog": "^1.1.8",
     "@jaypie/errors": "^1.1.2",
     "cors": "^2.8.5"
   },
+  "devDependencies": {
+    "express": "^4.21.2"
+  },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "07f0f0f27e55014e63ccccb433ad515e39552db6"
+  "gitHead": "8d2d1b78cc7181d8bc1ec097bb8e425959e9cd79"
 }

package/src/expressHandler.js

@@ -1,5 +1,6 @@
 import {
   force,
+  getHeaderFrom,
   HTTP,
   JAYPIE,
   jaypieHandler,
@@ -7,6 +8,7 @@ import {
   UnhandledError,
   validate as validateIs,
 } from "@jaypie/core";
+import { DATADOG, hasDatadogEnv, submitMetric } from "@jaypie/datadog";
 
 import getCurrentInvokeUuid from "./getCurrentInvokeUuid.adapter.js";
 import decorateResponse from "./decorateResponse.helper.js";
@@ -31,6 +33,7 @@ const expressHandler = (handler, options = {}) => {
   // Validate
   //
   let {
+    chaos,
     locals,
     name,
     setup = [],
@@ -53,6 +56,13 @@ const expressHandler = (handler, options = {}) => {
   return async (req, res, ...params) => {
     // * This is the first line of code that runs when a request is received
 
+    // Set default chaos value
+    if (chaos === undefined) {
+      chaos =
+        process.env.PROJECT_CHAOS ||
+        getHeaderFrom(HTTP.HEADER.PROJECT.CHAOS, req);
+    }
+
     // Re-init the logger
     publicLogger.init();
     // Very low-level, internal sub-trace details
@@ -109,7 +119,7 @@ const expressHandler = (handler, options = {}) => {
       status: res.status,
       statusSent: false,
     };
-    // eslint-disable-next-line no-shadow
+
     res.end = (...params) => {
       originalRes.attemptedCall = originalRes.end;
       originalRes.attemptedParams = params;
@@ -117,7 +127,7 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.end(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.json = (...params) => {
       originalRes.attemptedCall = originalRes.json;
       originalRes.attemptedParams = params;
@@ -125,7 +135,7 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.json(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.send = (...params) => {
       originalRes.attemptedCall = originalRes.send;
       originalRes.attemptedParams = params;
@@ -133,9 +143,9 @@ const expressHandler = (handler, options = {}) => {
         "[jaypie] Illegal call to res.send(); prefer Jaypie response conventions",
       );
     };
-    // eslint-disable-next-line no-shadow
+
     res.status = (...params) => {
-      originalRes.statusSent = params;
+      originalRes.statusSent = params[0];
       return originalRes.status(...params);
     };
 
@@ -171,6 +181,7 @@ const expressHandler = (handler, options = {}) => {
 
       // Initialize after logging is set up
       jaypieFunction = jaypieHandler(handler, {
+        chaos,
         name,
         setup,
         teardown,
@@ -276,6 +287,45 @@ const expressHandler = (handler, options = {}) => {
       res: summarizeResponse(res, extras),
     });
 
+    // Submit metric if Datadog is configured
+    if (hasDatadogEnv()) {
+      // Construct path from baseUrl and url
+      let path = (req.baseUrl || "") + (req.url || "");
+      // Ensure path starts with /
+      if (!path.startsWith("/")) {
+        path = "/" + path;
+      }
+      // Remove trailing slash unless it's the root path
+      if (path.length > 1 && path.endsWith("/")) {
+        path = path.slice(0, -1);
+      }
+
+      // Replace UUIDs with :id for better aggregation
+      // Matches standard UUID v4 format (8-4-4-4-12 hex characters)
+      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",
+      );
+
+      // Determine metric name based on environment variables
+      let metricPrefix = "project";
+      if (process.env.PROJECT_SPONSOR) {
+        metricPrefix = process.env.PROJECT_SPONSOR;
+      } else if (process.env.PROJECT_KEY) {
+        metricPrefix = `project.${process.env.PROJECT_KEY}`;
+      }
+
+      await submitMetric({
+        name: `${metricPrefix}.api.response`,
+        type: DATADOG.METRIC.TYPE.COUNT,
+        value: 1,
+        tags: {
+          code: res.statusCode,
+          path,
+        },
+      });
+    }
+
     // Clean up the public logger
     publicLogger.untag("handler");