apitally 0.19.0 → 0.21.0

package/dist/loggers/index.d.cts

@@ -1,4 +1,5 @@
 export { patchConsole } from './console.cjs';
+export { handleHapiRequestEvent } from './hapi.cjs';
 export { patchNestLogger } from './nestjs.cjs';
 export { patchPinoLogger } from './pino.cjs';
 export { patchWinston } from './winston.cjs';
@@ -7,3 +8,4 @@ import '../common/requestLogger.cjs';
 import 'node:buffer';
 import 'node:http';
 import '../common/tempGzipFile.cjs';
+import '@hapi/hapi';

package/dist/loggers/index.d.ts

@@ -1,4 +1,5 @@
 export { patchConsole } from './console.js';
+export { handleHapiRequestEvent } from './hapi.js';
 export { patchNestLogger } from './nestjs.js';
 export { patchPinoLogger } from './pino.js';
 export { patchWinston } from './winston.js';
@@ -7,3 +8,4 @@ import '../common/requestLogger.js';
 import 'node:buffer';
 import 'node:http';
 import '../common/tempGzipFile.js';
+import '@hapi/hapi';

package/dist/loggers/index.js

@@ -1265,8 +1265,8 @@ var require_quick_format_unescaped = __commonJS({
       }
     }
     __name(tryStringify, "tryStringify");
-    module.exports = format3;
-    function format3(f, args, opts) {
+    module.exports = format4;
+    function format4(f, args, opts) {
       var ss = opts && opts.stringify || tryStringify;
       var offset = 1;
       if (typeof f === "object" && f !== null) {
@@ -1357,7 +1357,7 @@ var require_quick_format_unescaped = __commonJS({
       }
       return str;
     }
-    __name(format3, "format");
+    __name(format4, "format");
   }
 });
 
@@ -2832,7 +2832,7 @@ var require_transport = __commonJS({
 var require_tools = __commonJS({
   "node_modules/pino/lib/tools.js"(exports, module) {
     "use strict";
-    var format3 = require_quick_format_unescaped();
+    var format4 = require_quick_format_unescaped();
     var { mapHttpRequest, mapHttpResponse } = require_pino_std_serializers();
     var SonicBoom = require_sonic_boom();
     var onExit = require_on_exit_leak_free();
@@ -2869,13 +2869,13 @@ var require_tools = __commonJS({
           if (typeof this[msgPrefixSym] === "string" && msg !== void 0 && msg !== null) {
             msg = this[msgPrefixSym] + msg;
           }
-          this[writeSym](o, format3(msg, formatParams, this[formatOptsSym]), level);
+          this[writeSym](o, format4(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, format3(msg, n, this[formatOptsSym]), level);
+          this[writeSym](null, format4(msg, n, this[formatOptsSym]), level);
         }
       }
       __name(LOG, "LOG");
@@ -3374,7 +3374,7 @@ var require_meta = __commonJS({
   "node_modules/pino/lib/meta.js"(exports, module) {
     "use strict";
     module.exports = {
-      version: "9.8.0"
+      version: "9.9.0"
     };
   }
 });
@@ -4175,7 +4175,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
@@ -4190,10 +4189,12 @@ var require_multistream = __commonJS({
       const res = {
         write,
         add,
+        remove,
         emit,
         flushSync,
         end,
         minLevel: 0,
+        lastId: 0,
         streams: [],
         clone,
         [metadata]: true,
@@ -4277,7 +4278,7 @@ var require_multistream = __commonJS({
           stream: stream_,
           level,
           levelVal: void 0,
-          id: counter++
+          id: ++res.lastId
         };
         streams.unshift(dest_);
         streams.sort(compareByLevel);
@@ -4285,6 +4286,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") {
@@ -4305,6 +4317,7 @@ var require_multistream = __commonJS({
         return {
           write,
           add,
+          remove,
           minLevel: level,
           streams,
           clone,
@@ -4550,8 +4563,33 @@ function captureLog(level, args) {
 }
 __name(captureLog, "captureLog");
 
-// src/loggers/utils.ts
+// src/loggers/hapi.ts
 import { format as format2 } from "util";
+var MAX_BUFFER_SIZE2 = 1e3;
+var VALID_LOG_LEVELS = /* @__PURE__ */ new Set([
+  "trace",
+  "debug",
+  "info",
+  "warn",
+  "warning",
+  "error",
+  "fatal"
+]);
+function handleHapiRequestEvent(event, logsContext) {
+  const logs = logsContext.getStore();
+  if (!logs || logs.length >= MAX_BUFFER_SIZE2) {
+    return;
+  }
+  logs.push({
+    timestamp: Number(event.timestamp) / 1e3,
+    level: event.tags.find((tag) => VALID_LOG_LEVELS.has(tag.toLowerCase())) || "log",
+    message: format2(event.data)
+  });
+}
+__name(handleHapiRequestEvent, "handleHapiRequestEvent");
+
+// src/loggers/utils.ts
+import { format as format3 } from "util";
 function formatMessage(message, ...args) {
   return [
     message,
@@ -4568,7 +4606,7 @@ function formatArg(arg) {
     return arg.trim();
   }
   if (arg instanceof Error) {
-    return format2(arg).trim();
+    return format3(arg).trim();
   }
   if (arg === void 0 || arg === null || isEmptyObject(arg)) {
     return "";
@@ -4576,7 +4614,7 @@ function formatArg(arg) {
   try {
     return JSON.stringify(arg);
   } catch {
-    return format2(arg).trim();
+    return format3(arg).trim();
   }
 }
 __name(formatArg, "formatArg");
@@ -4586,7 +4624,7 @@ function isEmptyObject(obj) {
 __name(isEmptyObject, "isEmptyObject");
 
 // src/loggers/nestjs.ts
-var MAX_BUFFER_SIZE2 = 1e3;
+var MAX_BUFFER_SIZE3 = 1e3;
 var isPatched2 = false;
 var globalLogsContext2;
 async function patchNestLogger(logsContext) {
@@ -4637,7 +4675,7 @@ async function patchNestLogger(logsContext) {
 __name(patchNestLogger, "patchNestLogger");
 function captureLog2(level, args, context) {
   const logs = globalLogsContext2 == null ? void 0 : globalLogsContext2.getStore();
-  if (logs && logs.length < MAX_BUFFER_SIZE2) {
+  if (logs && logs.length < MAX_BUFFER_SIZE3) {
     logs.push({
       timestamp: Date.now() / 1e3,
       logger: context,
@@ -4649,7 +4687,7 @@ function captureLog2(level, args, context) {
 __name(captureLog2, "captureLog");
 
 // src/loggers/pino.ts
-var MAX_BUFFER_SIZE3 = 1e3;
+var MAX_BUFFER_SIZE4 = 1e3;
 var originalStreamSym = Symbol.for("apitally.originalStream");
 var logLevelMap = {
   10: "trace",
@@ -4661,18 +4699,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
@@ -4685,7 +4728,9 @@ async function patchPinoLogger(logger, logsContext) {
         levels: logger.levels
       });
     }
+    return true;
   } catch {
+    return false;
   }
 }
 __name(patchPinoLogger, "patchPinoLogger");
@@ -4703,7 +4748,7 @@ var ApitallyLogCaptureStream = (_a = class {
   }
   write(msg) {
     const logs = this.logsContext.getStore();
-    if (!logs || !msg || logs.length >= MAX_BUFFER_SIZE3) {
+    if (!logs || !msg || logs.length >= MAX_BUFFER_SIZE4) {
       return;
     }
     let obj;
@@ -4716,8 +4761,8 @@ var ApitallyLogCaptureStream = (_a = class {
       return;
     }
     try {
-      const message = obj[this.messageKey];
-      const rest = removeKeys(obj, [
+      let message = obj[this.messageKey];
+      const ignoreKeys = [
         "hostname",
         "level",
         this.messageKey,
@@ -4726,7 +4771,13 @@ var ApitallyLogCaptureStream = (_a = 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({
@@ -4747,7 +4798,7 @@ var ApitallyLogCaptureStream = (_a = class {
 }, __name(_a, "ApitallyLogCaptureStream"), _a);
 
 // src/loggers/winston.ts
-var MAX_BUFFER_SIZE4 = 1e3;
+var MAX_BUFFER_SIZE5 = 1e3;
 var isPatched3 = false;
 var globalLogsContext3;
 async function patchWinston(logsContext) {
@@ -4772,7 +4823,7 @@ async function patchWinston(logsContext) {
 __name(patchWinston, "patchWinston");
 function captureLog3(info) {
   const logs = globalLogsContext3 == null ? void 0 : globalLogsContext3.getStore();
-  if (!logs || !info || logs.length >= MAX_BUFFER_SIZE4) {
+  if (!logs || !info || logs.length >= MAX_BUFFER_SIZE5) {
     return;
   }
   try {
@@ -4805,6 +4856,7 @@ function parseTimestamp(timestamp) {
 }
 __name(parseTimestamp, "parseTimestamp");
 export {
+  handleHapiRequestEvent,
   patchConsole,
   patchNestLogger,
   patchPinoLogger,