apitally 0.14.0 → 0.15.0

package/dist/hono/middleware.js

@@ -10,7 +10,6 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/hono/middleware.ts
-import { isMiddleware } from "hono/utils/handler";
 import { performance } from "perf_hooks";
 
 // src/common/client.ts
@@ -377,6 +376,8 @@ var BODY_MASKED = Buffer3.from("<masked>");
 var MASKED = "******";
 var ALLOWED_CONTENT_TYPES = [
   "application/json",
+  "application/problem+json",
+  "application/vnd.api+json",
   "text/plain"
 ];
 var EXCLUDE_PATH_PATTERNS = [
@@ -441,6 +442,9 @@ var _RequestLogger = class _RequestLogger {
       }, 1e3);
     }
   }
+  get maxBodySize() {
+    return MAX_BODY_SIZE;
+  }
   shouldExcludePath(urlPath) {
     const patterns = [
       ...this.config.excludePaths,
@@ -995,24 +999,7 @@ __name(_ApitallyClient, "ApitallyClient");
 __publicField(_ApitallyClient, "instance");
 var ApitallyClient = _ApitallyClient;
 
-// src/common/packageVersions.ts
-import { createRequire } from "module";
-function getPackageVersion(name) {
-  const packageJsonPath = `${name}/package.json`;
-  try {
-    return __require(packageJsonPath).version || null;
-  } catch (error) {
-    try {
-      const _require = 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;
@@ -1031,102 +1018,8 @@ function parseContentLength(contentLength) {
 }
 __name(parseContentLength, "parseContentLength");
 
-// src/hono/middleware.ts
-var useApitally = /* @__PURE__ */ __name((app, config) => {
-  const client = new ApitallyClient(config);
-  const middleware = getMiddleware(client);
-  app.use(middleware);
-  setTimeout(() => {
-    client.setStartupData(getAppInfo(app, config.appVersion));
-  }, 1e3);
-}, "useApitally");
-var getMiddleware = /* @__PURE__ */ __name((client) => {
-  return async (c, next) => {
-    if (!client.isEnabled()) {
-      await next();
-      return;
-    }
-    const startTime = performance.now();
-    await next();
-    let response;
-    const responseTime = performance.now() - startTime;
-    const [responseSize, newResponse] = await measureResponseSize(c.res);
-    const requestSize = parseContentLength(c.req.header("content-length"));
-    const consumer = getConsumer(c);
-    client.consumerRegistry.addOrUpdateConsumer(consumer);
-    client.requestCounter.addRequest({
-      consumer: consumer == null ? void 0 : consumer.identifier,
-      method: c.req.method,
-      path: c.req.routePath,
-      statusCode: c.res.status,
-      responseTime,
-      requestSize,
-      responseSize
-    });
-    response = newResponse;
-    if (c.res.status === 400) {
-      const [responseJson, newResponse2] = await getResponseJson(response);
-      const validationErrors = extractZodErrors(responseJson);
-      validationErrors.forEach((error) => {
-        client.validationErrorCounter.addValidationError({
-          consumer: consumer == null ? void 0 : consumer.identifier,
-          method: c.req.method,
-          path: c.req.routePath,
-          ...error
-        });
-      });
-      response = newResponse2;
-    }
-    if (c.error) {
-      client.serverErrorCounter.addServerError({
-        consumer: consumer == null ? void 0 : consumer.identifier,
-        method: c.req.method,
-        path: c.req.routePath,
-        type: c.error.name,
-        msg: c.error.message,
-        traceback: c.error.stack || ""
-      });
-    }
-    if (client.requestLogger.enabled) {
-      let requestBody;
-      let responseBody;
-      let newResponse2 = response;
-      const responseContentType = c.res.headers.get("content-type");
-      if (client.requestLogger.config.logRequestBody) {
-        requestBody = Buffer.from(await c.req.arrayBuffer());
-      }
-      if (client.requestLogger.config.logResponseBody && client.requestLogger.isSupportedContentType(responseContentType)) {
-        [responseBody, newResponse2] = await getResponseBody(response);
-        response = newResponse2;
-      }
-      client.requestLogger.logRequest({
-        timestamp: Date.now() / 1e3,
-        method: c.req.method,
-        path: c.req.routePath,
-        url: c.req.url,
-        headers: convertHeaders(c.req.header()),
-        size: Number(requestSize),
-        consumer: consumer == null ? void 0 : consumer.identifier,
-        body: requestBody
-      }, {
-        statusCode: c.res.status,
-        responseTime: responseTime / 1e3,
-        headers: convertHeaders(c.res.headers),
-        size: responseSize,
-        body: responseBody
-      }, c.error);
-    }
-    c.res = response;
-  };
-}, "getMiddleware");
-var getConsumer = /* @__PURE__ */ __name((c) => {
-  const consumer = c.get("apitallyConsumer");
-  if (consumer) {
-    return consumerFromStringOrObject(consumer);
-  }
-  return null;
-}, "getConsumer");
-var measureResponseSize = /* @__PURE__ */ __name(async (response) => {
+// src/common/response.ts
+async function measureResponseSize(response) {
   const [newResponse1, newResponse2] = await teeResponse(response);
   let size = 0;
   if (newResponse2.body) {
@@ -1144,18 +1037,20 @@ var measureResponseSize = /* @__PURE__ */ __name(async (response) => {
     size,
     newResponse1
   ];
-}, "measureResponseSize");
-var getResponseBody = /* @__PURE__ */ __name(async (response) => {
+}
+__name(measureResponseSize, "measureResponseSize");
+async function getResponseBody(response) {
   const [newResponse1, newResponse2] = await teeResponse(response);
   const responseBuffer = Buffer.from(await newResponse2.arrayBuffer());
   return [
     responseBuffer,
     newResponse1
   ];
-}, "getResponseBody");
-var getResponseJson = /* @__PURE__ */ __name(async (response) => {
+}
+__name(getResponseBody, "getResponseBody");
+async function getResponseJson(response) {
   const contentType = response.headers.get("content-type");
-  if (contentType && contentType.includes("application/json")) {
+  if (contentType == null ? void 0 : contentType.includes("application/json")) {
     const [newResponse1, newResponse2] = await teeResponse(response);
     const responseJson = await newResponse2.json();
     return [
@@ -1167,8 +1062,9 @@ var getResponseJson = /* @__PURE__ */ __name(async (response) => {
     null,
     response
   ];
-}, "getResponseJson");
-var teeResponse = /* @__PURE__ */ __name(async (response) => {
+}
+__name(getResponseJson, "getResponseJson");
+async function teeResponse(response) {
   if (!response.body) {
     return [
       response,
@@ -1190,22 +1086,31 @@ var teeResponse = /* @__PURE__ */ __name(async (response) => {
     newResponse1,
     newResponse2
   ];
-}, "teeResponse");
-var extractZodErrors = /* @__PURE__ */ __name((responseJson) => {
-  const errors = [];
-  if (responseJson && responseJson.success === false && responseJson.error && responseJson.error.name === "ZodError") {
-    const zodError = responseJson.error;
-    zodError.issues.forEach((zodIssue) => {
-      errors.push({
-        loc: zodIssue.path.join("."),
-        msg: zodIssue.message,
-        type: zodIssue.code
-      });
-    });
+}
+__name(teeResponse, "teeResponse");
+
+// src/hono/utils.ts
+import { isMiddleware } from "hono/utils/handler";
+
+// src/common/packageVersions.ts
+import { createRequire } from "module";
+function getPackageVersion(name) {
+  const packageJsonPath = `${name}/package.json`;
+  try {
+    return __require(packageJsonPath).version || null;
+  } catch (error) {
+    try {
+      const _require = createRequire(import.meta.url);
+      return _require(packageJsonPath).version || null;
+    } catch (error2) {
+      return null;
+    }
   }
-  return errors;
-}, "extractZodErrors");
-var getAppInfo = /* @__PURE__ */ __name((app, appVersion) => {
+}
+__name(getPackageVersion, "getPackageVersion");
+
+// src/hono/utils.ts
+function getAppInfo(app, appVersion) {
   const versions = [];
   if (process.versions.node) {
     versions.push([
@@ -1244,8 +1149,9 @@ var getAppInfo = /* @__PURE__ */ __name((app, appVersion) => {
     versions: Object.fromEntries(versions),
     client: "js:hono"
   };
-}, "getAppInfo");
-var listEndpoints = /* @__PURE__ */ __name((app) => {
+}
+__name(getAppInfo, "getAppInfo");
+function listEndpoints(app) {
   const endpoints = [];
   app.routes.forEach((route) => {
     if (route.method !== "ALL" && !isMiddleware(route.handler)) {
@@ -1256,8 +1162,137 @@ var listEndpoints = /* @__PURE__ */ __name((app) => {
     }
   });
   return endpoints;
-}, "listEndpoints");
+}
+__name(listEndpoints, "listEndpoints");
+function extractZodErrors(responseJson) {
+  var _a2;
+  const errors = [];
+  if (responseJson && responseJson.success === false && responseJson.error && responseJson.error.name === "ZodError") {
+    const zodError = responseJson.error;
+    (_a2 = zodError.issues) == null ? void 0 : _a2.forEach((zodIssue) => {
+      errors.push({
+        loc: zodIssue.path.join("."),
+        msg: zodIssue.message,
+        type: zodIssue.code
+      });
+    });
+  }
+  return errors;
+}
+__name(extractZodErrors, "extractZodErrors");
+
+// src/hono/middleware.ts
+function useApitally(app, config) {
+  const client = new ApitallyClient(config);
+  const middleware = getMiddleware(client);
+  app.use(middleware);
+  const setStartupData = /* @__PURE__ */ __name((attempt = 1) => {
+    const appInfo = getAppInfo(app, 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(client) {
+  return async (c, next) => {
+    if (!client.isEnabled()) {
+      await next();
+      return;
+    }
+    const timestamp = Date.now() / 1e3;
+    const startTime = performance.now();
+    await next();
+    let response;
+    const responseTime = performance.now() - startTime;
+    const [responseSize, newResponse] = await measureResponseSize(c.res);
+    const requestSize = parseContentLength(c.req.header("content-length"));
+    const consumer = getConsumer(c);
+    client.consumerRegistry.addOrUpdateConsumer(consumer);
+    client.requestCounter.addRequest({
+      consumer: consumer == null ? void 0 : consumer.identifier,
+      method: c.req.method,
+      path: c.req.routePath,
+      statusCode: c.res.status,
+      responseTime,
+      requestSize,
+      responseSize
+    });
+    response = newResponse;
+    if (c.res.status === 400) {
+      const [responseJson, newResponse2] = await getResponseJson(response);
+      const validationErrors = extractZodErrors(responseJson);
+      validationErrors.forEach((error) => {
+        client.validationErrorCounter.addValidationError({
+          consumer: consumer == null ? void 0 : consumer.identifier,
+          method: c.req.method,
+          path: c.req.routePath,
+          ...error
+        });
+      });
+      response = newResponse2;
+    }
+    if (c.error) {
+      client.serverErrorCounter.addServerError({
+        consumer: consumer == null ? void 0 : consumer.identifier,
+        method: c.req.method,
+        path: c.req.routePath,
+        type: c.error.name,
+        msg: c.error.message,
+        traceback: c.error.stack || ""
+      });
+    }
+    if (client.requestLogger.enabled) {
+      let requestBody;
+      let responseBody;
+      let newResponse2 = response;
+      const requestContentType = c.req.header("content-type");
+      const responseContentType = c.res.headers.get("content-type");
+      if (client.requestLogger.config.logRequestBody && client.requestLogger.isSupportedContentType(requestContentType)) {
+        requestBody = Buffer.from(await c.req.arrayBuffer());
+      }
+      if (client.requestLogger.config.logResponseBody && client.requestLogger.isSupportedContentType(responseContentType)) {
+        [responseBody, newResponse2] = await getResponseBody(response);
+        response = newResponse2;
+      }
+      client.requestLogger.logRequest({
+        timestamp,
+        method: c.req.method,
+        path: c.req.routePath,
+        url: c.req.url,
+        headers: convertHeaders(c.req.header()),
+        size: Number(requestSize),
+        consumer: consumer == null ? void 0 : consumer.identifier,
+        body: requestBody
+      }, {
+        statusCode: c.res.status,
+        responseTime: responseTime / 1e3,
+        headers: convertHeaders(c.res.headers),
+        size: responseSize,
+        body: responseBody
+      }, c.error);
+    }
+    c.res = response;
+  };
+}
+__name(getMiddleware, "getMiddleware");
+function setConsumer(c, consumer) {
+  c.set("apitallyConsumer", consumer || void 0);
+}
+__name(setConsumer, "setConsumer");
+function getConsumer(c) {
+  const consumer = c.get("apitallyConsumer");
+  if (consumer) {
+    return consumerFromStringOrObject(consumer);
+  }
+  return null;
+}
+__name(getConsumer, "getConsumer");
 export {
+  setConsumer,
   useApitally
 };
 //# sourceMappingURL=middleware.js.map