apitally 0.19.0 → 0.21.0

package/dist/express/middleware.cjs

@@ -1267,8 +1267,8 @@ var require_quick_format_unescaped = __commonJS({
       }
     }
     __name(tryStringify, "tryStringify");
-    module2.exports = format4;
-    function format4(f, args, opts) {
+    module2.exports = format5;
+    function format5(f, args, opts) {
       var ss = opts && opts.stringify || tryStringify;
       var offset = 1;
       if (typeof f === "object" && f !== null) {
@@ -1359,7 +1359,7 @@ var require_quick_format_unescaped = __commonJS({
       }
       return str;
     }
-    __name(format4, "format");
+    __name(format5, "format");
   }
 });
 
@@ -2834,7 +2834,7 @@ var require_transport = __commonJS({
 var require_tools = __commonJS({
   "node_modules/pino/lib/tools.js"(exports2, module2) {
     "use strict";
-    var format4 = require_quick_format_unescaped();
+    var format5 = require_quick_format_unescaped();
     var { mapHttpRequest, mapHttpResponse } = require_pino_std_serializers();
     var SonicBoom = require_sonic_boom();
     var onExit = require_on_exit_leak_free();
@@ -2871,13 +2871,13 @@ var require_tools = __commonJS({
           if (typeof this[msgPrefixSym] === "string" && msg !== void 0 && msg !== null) {
             msg = this[msgPrefixSym] + msg;
           }
-          this[writeSym](o, format4(msg, formatParams, this[formatOptsSym]), level);
+          this[writeSym](o, format5(msg, formatParams, this[formatOptsSym]), level);
         } else {
           let msg = o === void 0 ? n.shift() : o;
           if (typeof this[msgPrefixSym] === "string" && msg !== void 0 && msg !== null) {
             msg = this[msgPrefixSym] + msg;
           }
-          this[writeSym](null, format4(msg, n, this[formatOptsSym]), level);
+          this[writeSym](null, format5(msg, n, this[formatOptsSym]), level);
         }
       }
       __name(LOG, "LOG");
@@ -3376,7 +3376,7 @@ var require_meta = __commonJS({
   "node_modules/pino/lib/meta.js"(exports2, module2) {
     "use strict";
     module2.exports = {
-      version: "9.8.0"
+      version: "9.9.0"
     };
   }
 });
@@ -4177,7 +4177,6 @@ var require_multistream = __commonJS({
     var { DEFAULT_LEVELS } = require_constants();
     var DEFAULT_INFO_LEVEL = DEFAULT_LEVELS.info;
     function multistream(streamsArray, opts) {
-      let counter = 0;
       streamsArray = streamsArray || [];
       opts = opts || {
         dedupe: false
@@ -4192,10 +4191,12 @@ var require_multistream = __commonJS({
       const res = {
         write,
         add,
+        remove,
         emit,
         flushSync,
         end,
         minLevel: 0,
+        lastId: 0,
         streams: [],
         clone,
         [metadata]: true,
@@ -4279,7 +4280,7 @@ var require_multistream = __commonJS({
           stream: stream_,
           level,
           levelVal: void 0,
-          id: counter++
+          id: ++res.lastId
         };
         streams.unshift(dest_);
         streams.sort(compareByLevel);
@@ -4287,6 +4288,17 @@ var require_multistream = __commonJS({
         return res;
       }
       __name(add, "add");
+      function remove(id) {
+        const { streams } = this;
+        const index = streams.findIndex((s) => s.id === id);
+        if (index >= 0) {
+          streams.splice(index, 1);
+          streams.sort(compareByLevel);
+          this.minLevel = streams.length > 0 ? streams[0].level : -1;
+        }
+        return res;
+      }
+      __name(remove, "remove");
       function end() {
         for (const { stream } of this.streams) {
           if (typeof stream.flushSync === "function") {
@@ -4307,6 +4319,7 @@ var require_multistream = __commonJS({
         return {
           write,
           add,
+          remove,
           minLevel: level,
           streams,
           clone,
@@ -4892,7 +4905,8 @@ var ALLOWED_CONTENT_TYPES = [
   "application/json",
   "application/problem+json",
   "application/vnd.api+json",
-  "text/plain"
+  "text/plain",
+  "text/html"
 ];
 var EXCLUDE_PATH_PATTERNS = [
   /\/_?healthz?$/i,
@@ -5222,6 +5236,9 @@ var _RequestLogger = class _RequestLogger {
 __name(_RequestLogger, "RequestLogger");
 var RequestLogger = _RequestLogger;
 function convertHeaders(headers) {
+  if (!headers) {
+    return [];
+  }
   if (headers instanceof Headers) {
     return Array.from(headers.entries());
   }
@@ -5337,7 +5354,7 @@ var _ValidationErrorCounter = class _ValidationErrorCounter {
           consumer: validationError.consumer || null,
           method: validationError.method,
           path: validationError.path,
-          loc: validationError.loc.split("."),
+          loc: validationError.loc.split(".").filter(Boolean),
           msg: validationError.msg,
           type: validationError.type,
           error_count: count
@@ -5353,7 +5370,7 @@ var _ValidationErrorCounter = class _ValidationErrorCounter {
       validationError.consumer || "",
       validationError.method.toUpperCase(),
       validationError.path,
-      validationError.loc,
+      validationError.loc.split(".").filter(Boolean),
       validationError.msg.trim(),
       validationError.type
     ].join("|");
@@ -5715,8 +5732,11 @@ function captureLog(level, args) {
 }
 __name(captureLog, "captureLog");
 
-// src/loggers/utils.ts
+// src/loggers/hapi.ts
 var import_node_util2 = require("util");
+
+// src/loggers/utils.ts
+var import_node_util3 = require("util");
 function formatMessage(message, ...args) {
   return [
     message,
@@ -5733,7 +5753,7 @@ function formatArg(arg) {
     return arg.trim();
   }
   if (arg instanceof Error) {
-    return (0, import_node_util2.format)(arg).trim();
+    return (0, import_node_util3.format)(arg).trim();
   }
   if (arg === void 0 || arg === null || isEmptyObject(arg)) {
     return "";
@@ -5741,7 +5761,7 @@ function formatArg(arg) {
   try {
     return JSON.stringify(arg);
   } catch {
-    return (0, import_node_util2.format)(arg).trim();
+    return (0, import_node_util3.format)(arg).trim();
   }
 }
 __name(formatArg, "formatArg");
@@ -5826,18 +5846,23 @@ var logLevelMap = {
 };
 async function patchPinoLogger(logger, logsContext) {
   try {
-    const pino = await Promise.resolve().then(() => __toESM(require_pino(), 1));
-    if (!(pino.default.symbols.streamSym in logger)) {
-      return;
+    const symbols = [
+      ...Object.getOwnPropertySymbols(logger),
+      ...Object.getOwnPropertySymbols(Object.getPrototypeOf(logger))
+    ];
+    const streamSym = symbols.find((sym) => sym.toString() === "Symbol(pino.stream)");
+    const messageKeySym = symbols.find((sym) => sym.toString() === "Symbol(pino.messageKey)");
+    if (!streamSym || !messageKeySym) {
+      return false;
     }
     if (!(originalStreamSym in logger)) {
-      logger[originalStreamSym] = logger[pino.default.symbols.streamSym];
+      logger[originalStreamSym] = logger[streamSym];
     }
     const originalStream = logger[originalStreamSym];
     if (originalStream) {
-      const messageKey = logger[pino.default.symbols.messageKeySym];
-      const captureStream = new ApitallyLogCaptureStream(logsContext, messageKey);
-      logger[pino.default.symbols.streamSym] = pino.default.multistream([
+      const pino = await Promise.resolve().then(() => __toESM(require_pino(), 1));
+      const captureStream = new ApitallyLogCaptureStream(logsContext, logger[messageKeySym]);
+      logger[streamSym] = pino.default.multistream([
         {
           level: 0,
           stream: originalStream
@@ -5850,7 +5875,9 @@ async function patchPinoLogger(logger, logsContext) {
         levels: logger.levels
       });
     }
+    return true;
   } catch {
+    return false;
   }
 }
 __name(patchPinoLogger, "patchPinoLogger");
@@ -5881,8 +5908,8 @@ var ApitallyLogCaptureStream = (_a2 = class {
       return;
     }
     try {
-      const message = obj[this.messageKey];
-      const rest = removeKeys(obj, [
+      let message = obj[this.messageKey];
+      const ignoreKeys = [
         "hostname",
         "level",
         this.messageKey,
@@ -5891,7 +5918,13 @@ var ApitallyLogCaptureStream = (_a2 = class {
         "reqId",
         "req",
         "res"
-      ]);
+      ];
+      if (!message && "data" in obj && "tags" in obj) {
+        message = obj.data;
+        ignoreKeys.push("data");
+        ignoreKeys.push("tags");
+      }
+      const rest = removeKeys(obj, ignoreKeys);
       const formattedMessage = formatMessage(message, rest);
       if (formattedMessage) {
         logs.push({