apitally 0.13.0 → 0.15.0

package/dist/express/middleware.cjs

@@ -33,6 +33,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // src/express/middleware.ts
 var middleware_exports = {};
 __export(middleware_exports, {
+  setConsumer: () => setConsumer,
   useApitally: () => useApitally
 });
 module.exports = __toCommonJS(middleware_exports);
@@ -402,6 +403,8 @@ var BODY_MASKED = import_buffer2.Buffer.from("<masked>");
 var MASKED = "******";
 var ALLOWED_CONTENT_TYPES = [
   "application/json",
+  "application/problem+json",
+  "application/vnd.api+json",
   "text/plain"
 ];
 var EXCLUDE_PATH_PATTERNS = [
@@ -466,6 +469,9 @@ var _RequestLogger = class _RequestLogger {
       }, 1e3);
     }
   }
+  get maxBodySize() {
+    return MAX_BODY_SIZE;
+  }
   shouldExcludePath(urlPath) {
     const patterns = [
       ...this.config.excludePaths,
@@ -1052,25 +1058,7 @@ __name(_ApitallyClient, "ApitallyClient");
 __publicField(_ApitallyClient, "instance");
 var ApitallyClient = _ApitallyClient;
 
-// src/common/packageVersions.ts
-var import_module = require("module");
-var import_meta = {};
-function getPackageVersion(name) {
-  const packageJsonPath = `${name}/package.json`;
-  try {
-    return require(packageJsonPath).version || null;
-  } catch (error) {
-    try {
-      const _require = (0, import_module.createRequire)(import_meta.url);
-      return _require(packageJsonPath).version || null;
-    } catch (error2) {
-      return null;
-    }
-  }
-}
-__name(getPackageVersion, "getPackageVersion");
-
-// src/common/utils.ts
+// src/common/headers.ts
 function parseContentLength(contentLength) {
   if (contentLength === void 0 || contentLength === null) {
     return void 0;
@@ -1089,6 +1077,24 @@ function parseContentLength(contentLength) {
 }
 __name(parseContentLength, "parseContentLength");
 
+// src/common/packageVersions.ts
+var import_module = require("module");
+var import_meta = {};
+function getPackageVersion(name) {
+  const packageJsonPath = `${name}/package.json`;
+  try {
+    return require(packageJsonPath).version || null;
+  } catch (error) {
+    try {
+      const _require = (0, import_module.createRequire)(import_meta.url);
+      return _require(packageJsonPath).version || null;
+    } catch (error2) {
+      return null;
+    }
+  }
+}
+__name(getPackageVersion, "getPackageVersion");
+
 // src/express/utils.js
 var regExpToParseExpressPathRegExp = /^\/\^\\?\/?(?:(:?[\w\\.-]*(?:\\\/:?[\w\\.-]*)*)|(\(\?:\\?\/?\([^)]+\)\)))\\\/.*/;
 var regExpToReplaceExpressPathRegExpParams = /\(\?:\\?\/?\([^)]+\)\)/;
@@ -1100,6 +1106,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");
@@ -1132,12 +1161,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("(?:\\/")) {
@@ -1150,11 +1179,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) {
@@ -1168,7 +1205,7 @@ var parseEndpoints = /* @__PURE__ */ __name(function(app, basePath, endpoints) {
       ]);
     }
   } else {
-    endpoints = parseStack(stack, basePath, endpoints);
+    endpoints = parseStack(stack, basePath, endpoints, version);
   }
   return endpoints;
 }, "parseEndpoints");
@@ -1184,20 +1221,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);
     }
@@ -1216,15 +1261,22 @@ var getEndpoints = /* @__PURE__ */ __name(function(app, basePath) {
 }, "getEndpoints");
 
 // src/express/middleware.ts
-var useApitally = /* @__PURE__ */ __name((app, config) => {
+function useApitally(app, config) {
   const client = new ApitallyClient(config);
   const middleware = getMiddleware(app, client);
   app.use(middleware);
-  setTimeout(() => {
-    client.setStartupData(getAppInfo(app, config.basePath, config.appVersion));
-  }, 1e3);
-}, "useApitally");
-var getMiddleware = /* @__PURE__ */ __name((app, client) => {
+  const setStartupData = /* @__PURE__ */ __name((attempt = 1) => {
+    const appInfo = getAppInfo(app, config.basePath, config.appVersion);
+    if (appInfo.paths.length > 0 || attempt >= 10) {
+      client.setStartupData(appInfo);
+    } else {
+      setTimeout(() => setStartupData(attempt + 1), 500);
+    }
+  }, "setStartupData");
+  setTimeout(() => setStartupData(), 500);
+}
+__name(useApitally, "useApitally");
+function getMiddleware(app, client) {
   let errorHandlerConfigured = false;
   return (req, res, next) => {
     if (!client.isEnabled()) {
@@ -1248,7 +1300,7 @@ 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);
@@ -1341,29 +1393,37 @@ var getMiddleware = /* @__PURE__ */ __name((app, client) => {
       next();
     }
   };
-}, "getMiddleware");
-var getRoutePath = /* @__PURE__ */ __name((req) => {
+}
+__name(getMiddleware, "getMiddleware");
+function getRoutePath(req) {
   if (!req.route) {
     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");
-var getRouterPath = /* @__PURE__ */ __name((stack, baseUrl) => {
+}
+__name(getRoutePath, "getRoutePath");
+function getRouterPath(stack, baseUrl) {
   var _a2;
   const routerPaths = [];
   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);
       }
@@ -1374,8 +1434,13 @@ var getRouterPath = /* @__PURE__ */ __name((stack, baseUrl) => {
     }
   }
   return routerPaths.filter((path) => path !== "/").join("");
-}, "getRouterPath");
-var getConsumer = /* @__PURE__ */ __name((req) => {
+}
+__name(getRouterPath, "getRouterPath");
+function setConsumer(req, consumer) {
+  req.apitallyConsumer = consumer || void 0;
+}
+__name(setConsumer, "setConsumer");
+function getConsumer(req) {
   if (req.apitallyConsumer) {
     return consumerFromStringOrObject(req.apitallyConsumer);
   } else if (req.consumerIdentifier) {
@@ -1383,8 +1448,9 @@ var getConsumer = /* @__PURE__ */ __name((req) => {
     return consumerFromStringOrObject(req.consumerIdentifier);
   }
   return null;
-}, "getConsumer");
-var extractExpressValidatorErrors = /* @__PURE__ */ __name((responseBody) => {
+}
+__name(getConsumer, "getConsumer");
+function extractExpressValidatorErrors(responseBody) {
   try {
     const errors = [];
     if (responseBody && responseBody.errors && Array.isArray(responseBody.errors)) {
@@ -1402,8 +1468,9 @@ var extractExpressValidatorErrors = /* @__PURE__ */ __name((responseBody) => {
   } catch (error) {
     return [];
   }
-}, "extractExpressValidatorErrors");
-var extractCelebrateErrors = /* @__PURE__ */ __name((responseBody) => {
+}
+__name(extractExpressValidatorErrors, "extractExpressValidatorErrors");
+function extractCelebrateErrors(responseBody) {
   try {
     const errors = [];
     if (responseBody && responseBody.validation) {
@@ -1423,8 +1490,9 @@ var extractCelebrateErrors = /* @__PURE__ */ __name((responseBody) => {
   } catch (error) {
     return [];
   }
-}, "extractCelebrateErrors");
-var extractNestValidationErrors = /* @__PURE__ */ __name((responseBody) => {
+}
+__name(extractCelebrateErrors, "extractCelebrateErrors");
+function extractNestValidationErrors(responseBody) {
   try {
     const errors = [];
     if (responseBody && Array.isArray(responseBody.message)) {
@@ -1440,12 +1508,14 @@ var extractNestValidationErrors = /* @__PURE__ */ __name((responseBody) => {
   } catch (error) {
     return [];
   }
-}, "extractNestValidationErrors");
-var subsetJoiMessage = /* @__PURE__ */ __name((message, key) => {
+}
+__name(extractNestValidationErrors, "extractNestValidationErrors");
+function subsetJoiMessage(message, key) {
   const messageWithKey = message.split(". ").find((message2) => message2.includes(`"${key}"`));
   return messageWithKey ? messageWithKey : message;
-}, "subsetJoiMessage");
-var getAppInfo = /* @__PURE__ */ __name((app, basePath, appVersion) => {
+}
+__name(subsetJoiMessage, "subsetJoiMessage");
+function getAppInfo(app, basePath, appVersion) {
   const versions = [
     [
       "nodejs",
@@ -1484,9 +1554,11 @@ var getAppInfo = /* @__PURE__ */ __name((app, basePath, appVersion) => {
     versions: Object.fromEntries(versions),
     client: "js:express"
   };
-}, "getAppInfo");
+}
+__name(getAppInfo, "getAppInfo");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  setConsumer,
   useApitally
 });
 //# sourceMappingURL=middleware.cjs.map