apitally 0.12.0 → 0.14.0

package/dist/common/validationErrorCounter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["validationErrorCounter.ts"],"sourcesContent":["import { createHash } from \"crypto\";\n\nimport {\n  ConsumerMethodPath,\n  ValidationError,\n  ValidationErrorsItem,\n} from \"./types.js\";\n\nexport default class ValidationErrorCounter {\n  private errorCounts: Map<string, number>;\n  private errorDetails: Map<string, ConsumerMethodPath & ValidationError>;\n\n  constructor() {\n    this.errorCounts = new Map();\n    this.errorDetails = new Map();\n  }\n\n  public addValidationError(\n    validationError: ConsumerMethodPath & ValidationError,\n  ) {\n    const key = this.getKey(validationError);\n    if (!this.errorDetails.has(key)) {\n      this.errorDetails.set(key, validationError);\n    }\n    this.errorCounts.set(key, (this.errorCounts.get(key) || 0) + 1);\n  }\n\n  public getAndResetValidationErrors() {\n    const data: Array<ValidationErrorsItem> = [];\n    this.errorCounts.forEach((count, key) => {\n      const validationError = this.errorDetails.get(key);\n      if (validationError) {\n        data.push({\n          consumer: validationError.consumer || null,\n          method: validationError.method,\n          path: validationError.path,\n          loc: validationError.loc.split(\".\"),\n          msg: validationError.msg,\n          type: validationError.type,\n          error_count: count,\n        });\n      }\n    });\n    this.errorCounts.clear();\n    this.errorDetails.clear();\n    return data;\n  }\n\n  private getKey(validationError: ConsumerMethodPath & ValidationError) {\n    const hashInput = [\n      validationError.consumer || \"\",\n      validationError.method.toUpperCase(),\n      validationError.path,\n      validationError.loc,\n      validationError.msg.trim(),\n      validationError.type,\n    ].join(\"|\");\n    return createHash(\"md5\").update(hashInput).digest(\"hex\");\n  }\n}\n"],"mappings":";;;;AAAA,SAASA,kBAAkB;AAQ3B,IAAqBC,0BAArB,MAAqBA,wBAAAA;EACXC;EACAC;EAERC,cAAc;AACZ,SAAKF,cAAc,oBAAIG,IAAAA;AACvB,SAAKF,eAAe,oBAAIE,IAAAA;EAC1B;EAEOC,mBACLC,iBACA;AACA,UAAMC,MAAM,KAAKC,OAAOF,eAAAA;AACxB,QAAI,CAAC,KAAKJ,aAAaO,IAAIF,GAAAA,GAAM;AAC/B,WAAKL,aAAaQ,IAAIH,KAAKD,eAAAA;IAC7B;AACA,SAAKL,YAAYS,IAAIH,MAAM,KAAKN,YAAYU,IAAIJ,GAAAA,KAAQ,KAAK,CAAA;EAC/D;EAEOK,8BAA8B;AACnC,UAAMC,OAAoC,CAAA;AAC1C,SAAKZ,YAAYa,QAAQ,CAACC,OAAOR,QAAAA;AAC/B,YAAMD,kBAAkB,KAAKJ,aAAaS,IAAIJ,GAAAA;AAC9C,UAAID,iBAAiB;AACnBO,aAAKG,KAAK;UACRC,UAAUX,gBAAgBW,YAAY;UACtCC,QAAQZ,gBAAgBY;UACxBC,MAAMb,gBAAgBa;UACtBC,KAAKd,gBAAgBc,IAAIC,MAAM,GAAA;UAC/BC,KAAKhB,gBAAgBgB;UACrBC,MAAMjB,gBAAgBiB;UACtBC,aAAaT;QACf,CAAA;MACF;IACF,CAAA;AACA,SAAKd,YAAYwB,MAAK;AACtB,SAAKvB,aAAauB,MAAK;AACvB,WAAOZ;EACT;EAEQL,OAAOF,iBAAuD;AACpE,UAAMoB,YAAY;MAChBpB,gBAAgBW,YAAY;MAC5BX,gBAAgBY,OAAOS,YAAW;MAClCrB,gBAAgBa;MAChBb,gBAAgBc;MAChBd,gBAAgBgB,IAAIM,KAAI;MACxBtB,gBAAgBiB;MAChBM,KAAK,GAAA;AACP,WAAOC,WAAW,KAAA,EAAOC,OAAOL,SAAAA,EAAWM,OAAO,KAAA;EACpD;AACF;AAnDqBhC;AAArB,IAAqBA,yBAArB;","names":["createHash","ValidationErrorCounter","errorCounts","errorDetails","constructor","Map","addValidationError","validationError","key","getKey","has","set","get","getAndResetValidationErrors","data","forEach","count","push","consumer","method","path","loc","split","msg","type","error_count","clear","hashInput","toUpperCase","trim","join","createHash","update","digest"]}
+{"version":3,"sources":["../../src/common/validationErrorCounter.ts"],"sourcesContent":["import { createHash } from \"crypto\";\n\nimport {\n  ConsumerMethodPath,\n  ValidationError,\n  ValidationErrorsItem,\n} from \"./types.js\";\n\nexport default class ValidationErrorCounter {\n  private errorCounts: Map<string, number>;\n  private errorDetails: Map<string, ConsumerMethodPath & ValidationError>;\n\n  constructor() {\n    this.errorCounts = new Map();\n    this.errorDetails = new Map();\n  }\n\n  public addValidationError(\n    validationError: ConsumerMethodPath & ValidationError,\n  ) {\n    const key = this.getKey(validationError);\n    if (!this.errorDetails.has(key)) {\n      this.errorDetails.set(key, validationError);\n    }\n    this.errorCounts.set(key, (this.errorCounts.get(key) || 0) + 1);\n  }\n\n  public getAndResetValidationErrors() {\n    const data: Array<ValidationErrorsItem> = [];\n    this.errorCounts.forEach((count, key) => {\n      const validationError = this.errorDetails.get(key);\n      if (validationError) {\n        data.push({\n          consumer: validationError.consumer || null,\n          method: validationError.method,\n          path: validationError.path,\n          loc: validationError.loc.split(\".\"),\n          msg: validationError.msg,\n          type: validationError.type,\n          error_count: count,\n        });\n      }\n    });\n    this.errorCounts.clear();\n    this.errorDetails.clear();\n    return data;\n  }\n\n  private getKey(validationError: ConsumerMethodPath & ValidationError) {\n    const hashInput = [\n      validationError.consumer || \"\",\n      validationError.method.toUpperCase(),\n      validationError.path,\n      validationError.loc,\n      validationError.msg.trim(),\n      validationError.type,\n    ].join(\"|\");\n    return createHash(\"md5\").update(hashInput).digest(\"hex\");\n  }\n}\n"],"mappings":";;;;AAAA,SAASA,kBAAkB;AAQ3B,IAAqBC,0BAArB,MAAqBA,wBAAAA;EACXC;EACAC;EAER,cAAc;AACZ,SAAKD,cAAc,oBAAIE,IAAAA;AACvB,SAAKD,eAAe,oBAAIC,IAAAA;EAC1B;EAEOC,mBACLC,iBACA;AACA,UAAMC,MAAM,KAAKC,OAAOF,eAAAA;AACxB,QAAI,CAAC,KAAKH,aAAaM,IAAIF,GAAAA,GAAM;AAC/B,WAAKJ,aAAaO,IAAIH,KAAKD,eAAAA;IAC7B;AACA,SAAKJ,YAAYQ,IAAIH,MAAM,KAAKL,YAAYS,IAAIJ,GAAAA,KAAQ,KAAK,CAAA;EAC/D;EAEOK,8BAA8B;AACnC,UAAMC,OAAoC,CAAA;AAC1C,SAAKX,YAAYY,QAAQ,CAACC,OAAOR,QAAAA;AAC/B,YAAMD,kBAAkB,KAAKH,aAAaQ,IAAIJ,GAAAA;AAC9C,UAAID,iBAAiB;AACnBO,aAAKG,KAAK;UACRC,UAAUX,gBAAgBW,YAAY;UACtCC,QAAQZ,gBAAgBY;UACxBC,MAAMb,gBAAgBa;UACtBC,KAAKd,gBAAgBc,IAAIC,MAAM,GAAA;UAC/BC,KAAKhB,gBAAgBgB;UACrBC,MAAMjB,gBAAgBiB;UACtBC,aAAaT;QACf,CAAA;MACF;IACF,CAAA;AACA,SAAKb,YAAYuB,MAAK;AACtB,SAAKtB,aAAasB,MAAK;AACvB,WAAOZ;EACT;EAEQL,OAAOF,iBAAuD;AACpE,UAAMoB,YAAY;MAChBpB,gBAAgBW,YAAY;MAC5BX,gBAAgBY,OAAOS,YAAW;MAClCrB,gBAAgBa;MAChBb,gBAAgBc;MAChBd,gBAAgBgB,IAAIM,KAAI;MACxBtB,gBAAgBiB;MAChBM,KAAK,GAAA;AACP,WAAOC,WAAW,KAAA,EAAOC,OAAOL,SAAAA,EAAWM,OAAO,KAAA;EACpD;AACF;AAnDqB/B;AAArB,IAAqBA,yBAArB;","names":["createHash","ValidationErrorCounter","errorCounts","errorDetails","Map","addValidationError","validationError","key","getKey","has","set","get","getAndResetValidationErrors","data","forEach","count","push","consumer","method","path","loc","split","msg","type","error_count","clear","hashInput","toUpperCase","trim","join","createHash","update","digest"]}

package/dist/express/index.cjs

@@ -816,7 +816,7 @@ var _ApitallyClient = class _ApitallyClient {
       throw new Error("Apitally client is already initialized");
     }
     if (!isValidClientId(clientId)) {
-      throw new Error(`Invalid client ID '${clientId}' (expecting hexadeciaml UUID format)`);
+      throw new Error(`Invalid Apitally client ID '${clientId}' (expecting hexadecimal UUID format)`);
     }
     if (!isValidEnv(env)) {
       throw new Error(`Invalid env '${env}' (expecting 1-32 alphanumeric lowercase characters and hyphens only)`);
@@ -1072,6 +1072,25 @@ function getPackageVersion(name) {
 }
 __name(getPackageVersion, "getPackageVersion");
 
+// src/common/utils.ts
+function parseContentLength(contentLength) {
+  if (contentLength === void 0 || contentLength === null) {
+    return void 0;
+  }
+  if (typeof contentLength === "number") {
+    return contentLength;
+  }
+  if (typeof contentLength === "string") {
+    const parsed = parseInt(contentLength);
+    return isNaN(parsed) ? void 0 : parsed;
+  }
+  if (Array.isArray(contentLength)) {
+    return parseContentLength(contentLength[0]);
+  }
+  return void 0;
+}
+__name(parseContentLength, "parseContentLength");
+
 // src/express/utils.js
 var regExpToParseExpressPathRegExp = /^\/\^\\?\/?(?:(:?[\w\\.-]*(?:\\\/:?[\w\\.-]*)*)|(\(\?:\\?\/?\([^)]+\)\)))\\\/.*/;
 var regExpToReplaceExpressPathRegExpParams = /\(\?:\\?\/?\([^)]+\)\)/;
@@ -1083,6 +1102,29 @@ var STACK_ITEM_VALID_NAMES = [
   "bound dispatch",
   "mounted_app"
 ];
+var getRouterInfo = /* @__PURE__ */ __name(function(app) {
+  var _a2, _b;
+  if (app.stack) {
+    return {
+      stack: app.stack,
+      version: "v4"
+    };
+  } else if ((_a2 = app._router) == null ? void 0 : _a2.stack) {
+    return {
+      stack: app._router.stack,
+      version: "v4"
+    };
+  } else if ((_b = app.router) == null ? void 0 : _b.stack) {
+    return {
+      stack: app.router.stack,
+      version: "v5"
+    };
+  }
+  return {
+    stack: null,
+    version: "v4"
+  };
+}, "getRouterInfo");
 var getRouteMethods = /* @__PURE__ */ __name(function(route) {
   let methods = Object.keys(route.methods);
   methods = methods.filter((method) => method !== "_all");
@@ -1115,12 +1157,12 @@ var parseExpressRoute = /* @__PURE__ */ __name(function(route, basePath) {
   });
   return endpoints;
 }, "parseExpressRoute");
-var parseExpressPath = /* @__PURE__ */ __name(function(expressPathRegExp, params) {
+var parseExpressPathRegExp = /* @__PURE__ */ __name(function(expressPathRegExp, keys) {
   let parsedRegExp = expressPathRegExp.toString();
   let expressPathRegExpExec = regExpToParseExpressPathRegExp.exec(parsedRegExp);
   let paramIndex = 0;
   while (hasParams(parsedRegExp)) {
-    const paramName = params[paramIndex].name;
+    const paramName = keys[paramIndex].name;
     const paramId = `:${paramName}`;
     parsedRegExp = parsedRegExp.replace(regExpToReplaceExpressPathRegExpParams, (str) => {
       if (str.startsWith("(?:\\/")) {
@@ -1133,11 +1175,19 @@ var parseExpressPath = /* @__PURE__ */ __name(function(expressPathRegExp, params
   if (parsedRegExp !== expressPathRegExp.toString()) {
     expressPathRegExpExec = regExpToParseExpressPathRegExp.exec(parsedRegExp);
   }
-  const parsedPath = expressPathRegExpExec[1].replace(/\\\//g, "/");
-  return parsedPath;
+  return expressPathRegExpExec[1].replace(/\\\//g, "/");
+}, "parseExpressPathRegExp");
+var parseExpressPath = /* @__PURE__ */ __name(function(expressPath, params) {
+  let result = expressPath;
+  for (const [paramName, paramValue] of Object.entries(params)) {
+    result = result.replace(paramValue, `:${paramName}`);
+  }
+  return result;
 }, "parseExpressPath");
 var parseEndpoints = /* @__PURE__ */ __name(function(app, basePath, endpoints) {
-  const stack = app.stack || app._router && app._router.stack;
+  const routerInfo = getRouterInfo(app);
+  const stack = routerInfo.stack;
+  const version = routerInfo.version;
   endpoints = endpoints || [];
   basePath = basePath || "";
   if (!stack) {
@@ -1151,7 +1201,7 @@ var parseEndpoints = /* @__PURE__ */ __name(function(app, basePath, endpoints) {
       ]);
     }
   } else {
-    endpoints = parseStack(stack, basePath, endpoints);
+    endpoints = parseStack(stack, basePath, endpoints, version);
   }
   return endpoints;
 }, "parseEndpoints");
@@ -1167,20 +1217,28 @@ var addEndpoints = /* @__PURE__ */ __name(function(currentEndpoints, endpointsTo
   });
   return currentEndpoints;
 }, "addEndpoints");
-var parseStack = /* @__PURE__ */ __name(function(stack, basePath, endpoints) {
+var parseStack = /* @__PURE__ */ __name(function(stack, basePath, endpoints, version) {
   stack.forEach((stackItem) => {
     if (stackItem.route) {
       const newEndpoints = parseExpressRoute(stackItem.route, basePath);
       endpoints = addEndpoints(endpoints, newEndpoints);
     } else if (STACK_ITEM_VALID_NAMES.includes(stackItem.name)) {
-      const isExpressPathRegexp = regExpToParseExpressPathRegExp.test(stackItem.regexp);
       let newBasePath = basePath;
-      if (isExpressPathRegexp) {
-        const parsedPath = parseExpressPath(stackItem.regexp, stackItem.keys);
-        newBasePath += `/${parsedPath}`;
-      } else if (!stackItem.path && stackItem.regexp && stackItem.regexp.toString() !== EXPRESS_ROOT_PATH_REGEXP_VALUE) {
-        const regExpPath = ` RegExp(${stackItem.regexp}) `;
-        newBasePath += `/${regExpPath}`;
+      if (version === "v4") {
+        const isExpressPathRegExp = regExpToParseExpressPathRegExp.test(stackItem.regexp);
+        if (isExpressPathRegExp) {
+          const parsedPath = parseExpressPathRegExp(stackItem.regexp, stackItem.keys);
+          newBasePath += `/${parsedPath}`;
+        } else if (!stackItem.path && stackItem.regexp && stackItem.regexp.toString() !== EXPRESS_ROOT_PATH_REGEXP_VALUE) {
+          const regExpPath = `RegExp(${stackItem.regexp})`;
+          newBasePath += `/${regExpPath}`;
+        }
+      } else if (version === "v5") {
+        if (!stackItem.path) {
+          return;
+        } else if (stackItem.path !== "/") {
+          newBasePath += stackItem.path.startsWith("/") ? stackItem.path : `/${stackItem.path}`;
+        }
       }
       endpoints = parseEndpoints(stackItem.handle, newBasePath, endpoints);
     }
@@ -1231,12 +1289,14 @@ var getMiddleware = /* @__PURE__ */ __name((app, client) => {
         }
         return originalSend.call(res, body);
       };
-      res.on("finish", () => {
+      res.once("finish", () => {
         try {
           const responseTime = import_perf_hooks.performance.now() - startTime;
           const path = getRoutePath(req);
           const consumer = getConsumer(req);
           client.consumerRegistry.addOrUpdateConsumer(consumer);
+          const requestSize = parseContentLength(req.get("content-length"));
+          const responseSize = parseContentLength(res.get("content-length"));
           if (path) {
             client.requestCounter.addRequest({
               consumer: consumer == null ? void 0 : consumer.identifier,
@@ -1244,8 +1304,8 @@ var getMiddleware = /* @__PURE__ */ __name((app, client) => {
               path,
               statusCode: res.statusCode,
               responseTime,
-              requestSize: req.get("content-length"),
-              responseSize: res.get("content-length")
+              requestSize,
+              responseSize
             });
             if ((res.statusCode === 400 || res.statusCode === 422) && res.locals.body) {
               let jsonBody;
@@ -1293,14 +1353,14 @@ var getMiddleware = /* @__PURE__ */ __name((app, client) => {
               path,
               url: `${req.protocol}://${req.host}${req.originalUrl}`,
               headers: convertHeaders(req.headers),
-              size: Number(req.get("content-length")),
+              size: requestSize,
               consumer: consumer == null ? void 0 : consumer.identifier,
               body: convertBody(req.body, req.get("content-type"))
             }, {
               statusCode: res.statusCode,
               responseTime: responseTime / 1e3,
               headers: convertHeaders(res.getHeaders()),
-              size: Number(res.get("content-length")),
+              size: responseSize,
               body: convertBody(res.locals.body, res.get("content-type"))
             }, res.locals.serverError);
           }
@@ -1328,8 +1388,11 @@ var getRoutePath = /* @__PURE__ */ __name((req) => {
     return;
   }
   if (req.baseUrl) {
-    const routerPath = getRouterPath(req.app._router.stack, req.baseUrl);
-    return req.route.path === "/" ? routerPath : routerPath + req.route.path;
+    const routerInfo = getRouterInfo(req.app);
+    if (routerInfo.stack) {
+      const routerPath = getRouterPath(routerInfo.stack, req.baseUrl);
+      return req.route.path === "/" ? routerPath : routerPath + req.route.path;
+    }
   }
   return req.route.path;
 }, "getRoutePath");
@@ -1339,12 +1402,15 @@ var getRouterPath = /* @__PURE__ */ __name((stack, baseUrl) => {
   while (stack && stack.length > 0) {
     const routerLayer = stack.find((layer) => {
       var _a3;
-      return layer.name === "router" && layer.path && ((_a3 = layer.regexp) == null ? void 0 : _a3.test(baseUrl));
+      return layer.name === "router" && layer.path && (baseUrl.startsWith(layer.path) || ((_a3 = layer.regexp) == null ? void 0 : _a3.test(baseUrl)));
     });
     if (routerLayer) {
-      if (routerLayer.keys.length > 0) {
-        const parsedPath = parseExpressPath(routerLayer.regexp, routerLayer.keys);
+      if (routerLayer.regexp && routerLayer.keys && routerLayer.keys.length > 0) {
+        const parsedPath = parseExpressPathRegExp(routerLayer.regexp, routerLayer.keys);
         routerPaths.push("/" + parsedPath);
+      } else if (routerLayer.params && Object.keys(routerLayer.params).length > 0) {
+        const parsedPath = parseExpressPath(routerLayer.path, routerLayer.params);
+        routerPaths.push(parsedPath);
       } else {
         routerPaths.push(routerLayer.path);
       }