npm - apitally - Versions diffs - 0.18.0 → 0.19.0 - Mend

apitally 0.18.0 → 0.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (179) hide show

package/dist/adonisjs/configure.cjs +2 -2
package/dist/adonisjs/configure.cjs.map +1 -1
package/dist/adonisjs/configure.js.map +1 -1
package/dist/adonisjs/index.cjs +2 -2
package/dist/adonisjs/index.cjs.map +1 -1
package/dist/adonisjs/index.d.cts +2 -2
package/dist/adonisjs/index.d.ts +2 -2
package/dist/adonisjs/index.js.map +1 -1
package/dist/adonisjs/middleware.cjs +104 -84
package/dist/adonisjs/middleware.cjs.map +1 -1
package/dist/adonisjs/middleware.d.cts +2 -2
package/dist/adonisjs/middleware.d.ts +2 -2
package/dist/adonisjs/middleware.js +103 -83
package/dist/adonisjs/middleware.js.map +1 -1
package/dist/adonisjs/provider.cjs +4750 -60
package/dist/adonisjs/provider.cjs.map +1 -1
package/dist/adonisjs/provider.d.cts +7 -4
package/dist/adonisjs/provider.d.ts +7 -4
package/dist/adonisjs/provider.js +4728 -15
package/dist/adonisjs/provider.js.map +1 -1
package/dist/common/client.cjs +62 -40
package/dist/common/client.cjs.map +1 -1
package/dist/common/client.d.cts +2 -2
package/dist/common/client.d.ts +2 -2
package/dist/common/client.js +31 -9
package/dist/common/client.js.map +1 -1
package/dist/common/consumerRegistry.d.cts +2 -2
package/dist/common/consumerRegistry.d.ts +2 -2
package/dist/common/headers.cjs.map +1 -1
package/dist/common/headers.d.cts +1 -1
package/dist/common/headers.d.ts +1 -1
package/dist/common/headers.js.map +1 -1
package/dist/common/logging.cjs +3 -2
package/dist/common/logging.cjs.map +1 -1
package/dist/common/logging.d.cts +1 -1
package/dist/common/logging.d.ts +1 -1
package/dist/common/logging.js +3 -2
package/dist/common/logging.js.map +1 -1
package/dist/common/packageVersions.cjs +2 -2
package/dist/common/packageVersions.cjs.map +1 -1
package/dist/common/packageVersions.js.map +1 -1
package/dist/common/requestCounter.d.cts +2 -2
package/dist/common/requestCounter.d.ts +2 -2
package/dist/common/requestLogger.cjs +54 -33
package/dist/common/requestLogger.cjs.map +1 -1
package/dist/common/requestLogger.d.cts +11 -4
package/dist/common/requestLogger.d.ts +11 -4
package/dist/common/requestLogger.js +27 -6
package/dist/common/requestLogger.js.map +1 -1
package/dist/common/serverErrorCounter.cjs +3 -2
package/dist/common/serverErrorCounter.cjs.map +1 -1
package/dist/common/serverErrorCounter.d.cts +2 -2
package/dist/common/serverErrorCounter.d.ts +2 -2
package/dist/common/serverErrorCounter.js +1 -0
package/dist/common/serverErrorCounter.js.map +1 -1
package/dist/common/tempGzipFile.cjs +15 -14
package/dist/common/tempGzipFile.cjs.map +1 -1
package/dist/common/tempGzipFile.d.cts +1 -1
package/dist/common/tempGzipFile.d.ts +1 -1
package/dist/common/tempGzipFile.js +3 -2
package/dist/common/tempGzipFile.js.map +1 -1
package/dist/common/types.d.cts +2 -2
package/dist/common/types.d.ts +2 -2
package/dist/common/validationErrorCounter.cjs +2 -2
package/dist/common/validationErrorCounter.cjs.map +1 -1
package/dist/common/validationErrorCounter.d.cts +2 -2
package/dist/common/validationErrorCounter.d.ts +2 -2
package/dist/common/validationErrorCounter.js.map +1 -1
package/dist/express/index.cjs +4979 -167
package/dist/express/index.cjs.map +1 -1
package/dist/express/index.d.cts +2 -2
package/dist/express/index.d.ts +2 -2
package/dist/express/index.js +4951 -118
package/dist/express/index.js.map +1 -1
package/dist/express/middleware.cjs +4979 -167
package/dist/express/middleware.cjs.map +1 -1
package/dist/express/middleware.d.cts +2 -2
package/dist/express/middleware.d.ts +2 -2
package/dist/express/middleware.js +4951 -118
package/dist/express/middleware.js.map +1 -1
package/dist/fastify/index.cjs +4908 -70
package/dist/fastify/index.cjs.map +1 -1
package/dist/fastify/index.d.cts +3 -2
package/dist/fastify/index.d.ts +3 -2
package/dist/fastify/index.js +4881 -22
package/dist/fastify/index.js.map +1 -1
package/dist/fastify/plugin.cjs +4908 -70
package/dist/fastify/plugin.cjs.map +1 -1
package/dist/fastify/plugin.d.cts +8 -3
package/dist/fastify/plugin.d.ts +8 -3
package/dist/fastify/plugin.js +4881 -22
package/dist/fastify/plugin.js.map +1 -1
package/dist/h3/index.cjs +219 -50
package/dist/h3/index.cjs.map +1 -1
package/dist/h3/index.d.cts +2 -2
package/dist/h3/index.d.ts +2 -2
package/dist/h3/index.js +184 -15
package/dist/h3/index.js.map +1 -1
package/dist/h3/plugin.cjs +219 -50
package/dist/h3/plugin.cjs.map +1 -1
package/dist/h3/plugin.d.cts +6 -4
package/dist/h3/plugin.d.ts +6 -4
package/dist/h3/plugin.js +184 -15
package/dist/h3/plugin.js.map +1 -1
package/dist/h3/utils.cjs +2 -2
package/dist/h3/utils.cjs.map +1 -1
package/dist/h3/utils.js.map +1 -1
package/dist/hono/index.cjs +278 -110
package/dist/hono/index.cjs.map +1 -1
package/dist/hono/index.d.cts +2 -2
package/dist/hono/index.d.ts +2 -2
package/dist/hono/index.js +244 -76
package/dist/hono/index.js.map +1 -1
package/dist/hono/middleware.cjs +278 -110
package/dist/hono/middleware.cjs.map +1 -1
package/dist/hono/middleware.d.cts +2 -2
package/dist/hono/middleware.d.ts +2 -2
package/dist/hono/middleware.js +244 -76
package/dist/hono/middleware.js.map +1 -1
package/dist/hono/utils.cjs +2 -2
package/dist/hono/utils.cjs.map +1 -1
package/dist/hono/utils.d.cts +2 -2
package/dist/hono/utils.d.ts +2 -2
package/dist/hono/utils.js.map +1 -1
package/dist/koa/index.cjs +275 -105
package/dist/koa/index.cjs.map +1 -1
package/dist/koa/index.d.cts +2 -2
package/dist/koa/index.d.ts +2 -2
package/dist/koa/index.js +239 -69
package/dist/koa/index.js.map +1 -1
package/dist/koa/middleware.cjs +273 -105
package/dist/koa/middleware.cjs.map +1 -1
package/dist/koa/middleware.d.cts +2 -2
package/dist/koa/middleware.d.ts +2 -2
package/dist/koa/middleware.js +239 -69
package/dist/koa/middleware.js.map +1 -1
package/dist/loggers/console.cjs +69 -0
package/dist/loggers/console.cjs.map +1 -0
package/dist/loggers/console.d.cts +9 -0
package/dist/loggers/console.d.ts +9 -0
package/dist/loggers/console.js +46 -0
package/dist/loggers/console.js.map +1 -0
package/dist/loggers/index.cjs +4824 -0
package/dist/loggers/index.cjs.map +1 -0
package/dist/loggers/index.d.cts +9 -0
package/dist/loggers/index.d.ts +9 -0
package/dist/loggers/index.js +4813 -0
package/dist/loggers/index.js.map +1 -0
package/dist/loggers/nestjs.cjs +135 -0
package/dist/loggers/nestjs.cjs.map +1 -0
package/dist/loggers/nestjs.d.cts +9 -0
package/dist/loggers/nestjs.d.ts +9 -0
package/dist/loggers/nestjs.js +100 -0
package/dist/loggers/nestjs.js.map +1 -0
package/dist/loggers/pino.cjs +4656 -0
package/dist/loggers/pino.cjs.map +1 -0
package/dist/loggers/pino.d.cts +9 -0
package/dist/loggers/pino.d.ts +9 -0
package/dist/loggers/pino.js +4648 -0
package/dist/loggers/pino.js.map +1 -0
package/dist/loggers/utils.cjs +66 -0
package/dist/loggers/utils.cjs.map +1 -0
package/dist/loggers/utils.d.cts +6 -0
package/dist/loggers/utils.d.ts +6 -0
package/dist/loggers/utils.js +42 -0
package/dist/loggers/utils.js.map +1 -0
package/dist/loggers/winston.cjs +135 -0
package/dist/loggers/winston.cjs.map +1 -0
package/dist/loggers/winston.d.cts +9 -0
package/dist/loggers/winston.d.ts +9 -0
package/dist/loggers/winston.js +100 -0
package/dist/loggers/winston.js.map +1 -0
package/dist/nestjs/index.cjs +5341 -451
package/dist/nestjs/index.cjs.map +1 -1
package/dist/nestjs/index.d.cts +2 -2
package/dist/nestjs/index.d.ts +2 -2
package/dist/nestjs/index.js +5294 -406
package/dist/nestjs/index.js.map +1 -1
package/package.json +4 -3

package/dist/koa/middleware.js CHANGED Viewed

@@ -9,9 +9,12 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+// src/koa/middleware.ts
+import { AsyncLocalStorage } from "async_hooks";
 // src/common/client.ts
-import { randomUUID as randomUUID3 } from "crypto";
 import fetchRetry from "fetch-retry";
+import { randomUUID as randomUUID3 } from "crypto";
 // src/common/consumerRegistry.ts
 var consumerFromStringOrObject = /* @__PURE__ */ __name((consumer) => {
@@ -71,7 +74,7 @@ var ConsumerRegistry = _ConsumerRegistry;
 // src/common/logging.ts
 import { createLogger, format, transports } from "winston";
-var getLogger = /* @__PURE__ */ __name(() => {
+function getLogger() {
   return createLogger({
     level: process.env.APITALLY_DEBUG ? "debug" : "warn",
     format: format.combine(format.colorize(), format.timestamp(), format.printf((info) => `${info.timestamp} ${info.level}: ${info.message}`)),
@@ -79,7 +82,8 @@ var getLogger = /* @__PURE__ */ __name(() => {
       new transports.Console()
     ]
   });
-}, "getLogger");
+}
+__name(getLogger, "getLogger");
 // src/common/paramValidation.ts
 function isValidClientId(clientId) {
@@ -183,7 +187,7 @@ var RequestCounter = _RequestCounter;
 import AsyncLock from "async-lock";
 import { Buffer as Buffer3 } from "buffer";
 import { randomUUID as randomUUID2 } from "crypto";
-import { unlinkSync as unlinkSync2, writeFileSync } from "fs";
+import { unlinkSync, writeFileSync } from "fs";
 import { tmpdir as tmpdir2 } from "os";
 import { join as join2 } from "path";
@@ -246,6 +250,7 @@ var _ServerErrorCounter = class _ServerErrorCounter {
     });
     this.errorCounts.clear();
     this.errorDetails.clear();
+    this.sentryEventIds.clear();
     return data;
   }
   getKey(serverError) {
@@ -292,7 +297,8 @@ __name(truncateExceptionStackTrace, "truncateExceptionStackTrace");
 // src/common/tempGzipFile.ts
 import { Buffer as Buffer2 } from "buffer";
 import { randomUUID } from "crypto";
-import { createWriteStream, readFile, unlinkSync } from "fs";
+import { createWriteStream, readFile } from "fs";
+import { unlink } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
 import { createGzip } from "zlib";
@@ -357,7 +363,7 @@ var _TempGzipFile = class _TempGzipFile {
   }
   async delete() {
     await this.close();
-    unlinkSync(this.filePath);
+    await unlink(this.filePath);
   }
 };
 __name(_TempGzipFile, "TempGzipFile");
@@ -368,6 +374,7 @@ var MAX_BODY_SIZE = 5e4;
 var MAX_FILE_SIZE = 1e6;
 var MAX_FILES = 50;
 var MAX_PENDING_WRITES = 100;
+var MAX_LOG_MSG_LENGTH = 2048;
 var BODY_TOO_LARGE = Buffer3.from("<body too large>");
 var BODY_MASKED = Buffer3.from("<masked>");
 var MASKED = "******";
@@ -424,6 +431,7 @@ var DEFAULT_CONFIG = {
   logResponseHeaders: true,
   logResponseBody: false,
   logException: true,
+  captureLogs: false,
   maskQueryParams: [],
   maskHeaders: [],
   maskBodyFields: [],
@@ -578,7 +586,7 @@ var _RequestLogger = class _RequestLogger {
     item.request.url = url.toString();
     return item;
   }
-  logRequest(request, response, error) {
+  logRequest(request, response, error, logs) {
     var _a2, _b, _c;
     if (!this.enabled || this.suspendUntil !== null) return;
     const url = new URL(request.url);
@@ -610,6 +618,14 @@ var _RequestLogger = class _RequestLogger {
         sentryEventId: getSentryEventId()
       } : void 0
     };
+    if (logs && logs.length > 0) {
+      item.logs = logs.map((log) => ({
+        timestamp: log.timestamp,
+        logger: log.logger,
+        level: log.level,
+        message: truncateLogMessage(log.message)
+      }));
+    }
     this.pendingWrites.push(item);
     if (this.pendingWrites.length > MAX_PENDING_WRITES) {
       this.pendingWrites.shift();
@@ -631,7 +647,8 @@ var _RequestLogger = class _RequestLogger {
             uuid: item.uuid,
             request: skipEmptyValues(item.request),
             response: skipEmptyValues(item.response),
-            exception: item.exception
+            exception: item.exception,
+            logs: item.logs
           };
           [
             finalItem.request.body,
@@ -765,11 +782,19 @@ function skipEmptyValues(data) {
   }));
 }
 __name(skipEmptyValues, "skipEmptyValues");
+function truncateLogMessage(msg) {
+  if (msg.length > MAX_LOG_MSG_LENGTH) {
+    const suffix = "... (truncated)";
+    return msg.slice(0, MAX_LOG_MSG_LENGTH - suffix.length) + suffix;
+  }
+  return msg;
+}
+__name(truncateLogMessage, "truncateLogMessage");
 function checkWritableFs() {
   try {
     const testPath = join2(tmpdir2(), `apitally-${randomUUID2()}`);
     writeFileSync(testPath, "test");
-    unlinkSync2(testPath);
+    unlinkSync(testPath);
     return true;
   } catch (error) {
     return false;
@@ -1120,6 +1145,143 @@ function getPackageVersion(name) {
 }
 __name(getPackageVersion, "getPackageVersion");
+// src/loggers/console.ts
+import { format as format2 } from "util";
+var MAX_BUFFER_SIZE = 1e3;
+var isPatched = false;
+var globalLogsContext;
+function patchConsole(logsContext) {
+  globalLogsContext = logsContext;
+  if (isPatched) {
+    return;
+  }
+  const logMethods = [
+    "log",
+    "warn",
+    "error",
+    "info",
+    "debug"
+  ];
+  logMethods.forEach((method) => {
+    const originalMethod = console[method];
+    console[method] = function(...args) {
+      captureLog(method, args);
+      return originalMethod.apply(console, args);
+    };
+  });
+  isPatched = true;
+}
+__name(patchConsole, "patchConsole");
+function captureLog(level, args) {
+  const logs = globalLogsContext == null ? void 0 : globalLogsContext.getStore();
+  if (logs && logs.length < MAX_BUFFER_SIZE) {
+    logs.push({
+      timestamp: Date.now() / 1e3,
+      logger: "console",
+      level,
+      message: format2(...args)
+    });
+  }
+}
+__name(captureLog, "captureLog");
+// src/loggers/utils.ts
+import { format as format3 } from "util";
+function formatMessage(message, ...args) {
+  return [
+    message,
+    ...args
+  ].map(formatArg).filter((arg) => arg !== "").join("\n");
+}
+__name(formatMessage, "formatMessage");
+function removeKeys(obj, keys) {
+  return Object.fromEntries(Object.entries(obj).filter(([key]) => !keys.includes(key)));
+}
+__name(removeKeys, "removeKeys");
+function formatArg(arg) {
+  if (typeof arg === "string") {
+    return arg.trim();
+  }
+  if (arg instanceof Error) {
+    return format3(arg).trim();
+  }
+  if (arg === void 0 || arg === null || isEmptyObject(arg)) {
+    return "";
+  }
+  try {
+    return JSON.stringify(arg);
+  } catch {
+    return format3(arg).trim();
+  }
+}
+__name(formatArg, "formatArg");
+function isEmptyObject(obj) {
+  return obj !== null && typeof obj === "object" && Object.getPrototypeOf(obj) === Object.prototype && Object.keys(obj).length === 0;
+}
+__name(isEmptyObject, "isEmptyObject");
+// src/loggers/pino.ts
+var originalStreamSym = Symbol.for("apitally.originalStream");
+// src/loggers/winston.ts
+var MAX_BUFFER_SIZE2 = 1e3;
+var isPatched2 = false;
+var globalLogsContext2;
+async function patchWinston(logsContext) {
+  var _a2, _b;
+  globalLogsContext2 = logsContext;
+  if (isPatched2) {
+    return;
+  }
+  try {
+    const loggerModule = await import("winston/lib/winston/logger.js");
+    if ((_b = (_a2 = loggerModule.default) == null ? void 0 : _a2.prototype) == null ? void 0 : _b.write) {
+      const originalWrite = loggerModule.default.prototype.write;
+      loggerModule.default.prototype.write = function(info) {
+        captureLog2(info);
+        return originalWrite.call(this, info);
+      };
+    }
+  } catch {
+  }
+  isPatched2 = true;
+}
+__name(patchWinston, "patchWinston");
+function captureLog2(info) {
+  const logs = globalLogsContext2 == null ? void 0 : globalLogsContext2.getStore();
+  if (!logs || !info || logs.length >= MAX_BUFFER_SIZE2) {
+    return;
+  }
+  try {
+    const rest = removeKeys(info, [
+      "timestamp",
+      "level",
+      "message",
+      "splat"
+    ]);
+    const formattedMessage = formatMessage(info.message, rest);
+    if (formattedMessage) {
+      logs.push({
+        timestamp: parseTimestamp(info.timestamp),
+        level: info.level || "info",
+        message: formattedMessage.trim()
+      });
+    }
+  } catch (e) {
+  }
+}
+__name(captureLog2, "captureLog");
+function parseTimestamp(timestamp) {
+  if (timestamp) {
+    const ts = new Date(timestamp).getTime();
+    if (!isNaN(ts)) {
+      return ts / 1e3;
+    }
+  }
+  return Date.now() / 1e3;
+}
+__name(parseTimestamp, "parseTimestamp");
 // src/koa/middleware.ts
 function useApitally(app, config) {
   const client = new ApitallyClient(config);
@@ -1137,77 +1299,85 @@ function useApitally(app, config) {
 }
 __name(useApitally, "useApitally");
 function getMiddleware(client) {
+  const logsContext = new AsyncLocalStorage();
+  if (client.requestLogger.config.captureLogs) {
+    patchConsole(logsContext);
+    patchWinston(logsContext);
+  }
   return async (ctx, next) => {
-    var _a2;
     if (!client.isEnabled() || ctx.request.method.toUpperCase() === "OPTIONS") {
       await next();
       return;
     }
-    let path;
-    let statusCode;
-    let serverError;
-    const startTime = performance.now();
-    try {
-      await next();
-    } catch (error) {
-      path = getPath(ctx);
-      statusCode = error.statusCode || error.status || 500;
-      if (path && statusCode === 500 && error instanceof Error) {
-        serverError = error;
-        client.serverErrorCounter.addServerError({
-          consumer: (_a2 = getConsumer(ctx)) == null ? void 0 : _a2.identifier,
-          method: ctx.request.method,
-          path,
-          type: error.name,
-          msg: error.message,
-          traceback: error.stack || ""
-        });
-      }
-      throw error;
-    } finally {
-      const responseTime = performance.now() - startTime;
-      const consumer = getConsumer(ctx);
-      client.consumerRegistry.addOrUpdateConsumer(consumer);
-      if (!path) {
+    await logsContext.run([], async () => {
+      var _a2;
+      let path;
+      let statusCode;
+      let serverError;
+      const startTime = performance.now();
+      try {
+        await next();
+      } catch (error) {
         path = getPath(ctx);
-      }
-      if (path) {
-        try {
-          client.requestCounter.addRequest({
-            consumer: consumer == null ? void 0 : consumer.identifier,
+        statusCode = error.statusCode || error.status || 500;
+        if (path && statusCode === 500 && error instanceof Error) {
+          serverError = error;
+          client.serverErrorCounter.addServerError({
+            consumer: (_a2 = getConsumer(ctx)) == null ? void 0 : _a2.identifier,
             method: ctx.request.method,
             path,
-            statusCode: statusCode || ctx.response.status,
-            responseTime,
-            requestSize: ctx.request.length,
-            responseSize: ctx.response.length
-          });
-        } catch (error) {
-          client.logger.error("Error while logging request in Apitally middleware.", {
-            context: ctx,
-            error
+            type: error.name,
+            msg: error.message,
+            traceback: error.stack || ""
           });
         }
+        throw error;
+      } finally {
+        const responseTime = performance.now() - startTime;
+        const consumer = getConsumer(ctx);
+        client.consumerRegistry.addOrUpdateConsumer(consumer);
+        if (!path) {
+          path = getPath(ctx);
+        }
+        if (path) {
+          try {
+            client.requestCounter.addRequest({
+              consumer: consumer == null ? void 0 : consumer.identifier,
+              method: ctx.request.method,
+              path,
+              statusCode: statusCode || ctx.response.status,
+              responseTime,
+              requestSize: ctx.request.length,
+              responseSize: ctx.response.length
+            });
+          } catch (error) {
+            client.logger.error("Error while logging request in Apitally middleware.", {
+              context: ctx,
+              error
+            });
+          }
+        }
+        if (client.requestLogger.enabled) {
+          const logs = logsContext.getStore();
+          client.requestLogger.logRequest({
+            timestamp: Date.now() / 1e3,
+            method: ctx.request.method,
+            path,
+            url: ctx.request.href,
+            headers: convertHeaders(ctx.request.headers),
+            size: ctx.request.length,
+            consumer: consumer == null ? void 0 : consumer.identifier,
+            body: convertBody(ctx.request.body, ctx.request.get("content-type"))
+          }, {
+            statusCode: statusCode || ctx.response.status,
+            responseTime: responseTime / 1e3,
+            headers: convertHeaders(ctx.response.headers),
+            size: ctx.response.length,
+            body: convertBody(ctx.response.body, ctx.response.get("content-type"))
+          }, serverError, logs);
+        }
       }
-      if (client.requestLogger.enabled) {
-        client.requestLogger.logRequest({
-          timestamp: Date.now() / 1e3,
-          method: ctx.request.method,
-          path,
-          url: ctx.request.href,
-          headers: convertHeaders(ctx.request.headers),
-          size: ctx.request.length,
-          consumer: consumer == null ? void 0 : consumer.identifier,
-          body: convertBody(ctx.request.body, ctx.request.get("content-type"))
-        }, {
-          statusCode: statusCode || ctx.response.status,
-          responseTime: responseTime / 1e3,
-          headers: convertHeaders(ctx.response.headers),
-          size: ctx.response.length,
-          body: convertBody(ctx.response.body, ctx.response.get("content-type"))
-        }, serverError);
-      }
-    }
+    });
   };
 }
 __name(getMiddleware, "getMiddleware");