apitally 0.20.0 → 0.21.1

package/dist/express/middleware.cjs

@@ -1246,11 +1246,31 @@ var require_time = __commonJS({
     var epochTime = /* @__PURE__ */ __name(() => `,"time":${Date.now()}`, "epochTime");
     var unixTime = /* @__PURE__ */ __name(() => `,"time":${Math.round(Date.now() / 1e3)}`, "unixTime");
     var isoTime = /* @__PURE__ */ __name(() => `,"time":"${new Date(Date.now()).toISOString()}"`, "isoTime");
+    var NS_PER_MS = 1000000n;
+    var NS_PER_SEC = 1000000000n;
+    var startWallTimeNs = BigInt(Date.now()) * NS_PER_MS;
+    var startHrTime = process.hrtime.bigint();
+    var isoTimeNano = /* @__PURE__ */ __name(() => {
+      const elapsedNs = process.hrtime.bigint() - startHrTime;
+      const currentTimeNs = startWallTimeNs + elapsedNs;
+      const secondsSinceEpoch = currentTimeNs / NS_PER_SEC;
+      const nanosWithinSecond = currentTimeNs % NS_PER_SEC;
+      const msSinceEpoch = Number(secondsSinceEpoch * 1000n + nanosWithinSecond / 1000000n);
+      const date = new Date(msSinceEpoch);
+      const year = date.getUTCFullYear();
+      const month = (date.getUTCMonth() + 1).toString().padStart(2, "0");
+      const day = date.getUTCDate().toString().padStart(2, "0");
+      const hours = date.getUTCHours().toString().padStart(2, "0");
+      const minutes = date.getUTCMinutes().toString().padStart(2, "0");
+      const seconds = date.getUTCSeconds().toString().padStart(2, "0");
+      return `,"time":"${year}-${month}-${day}T${hours}:${minutes}:${seconds}.${nanosWithinSecond.toString().padStart(9, "0")}Z"`;
+    }, "isoTimeNano");
     module2.exports = {
       nullTime,
       epochTime,
       unixTime,
-      isoTime
+      isoTime,
+      isoTimeNano
     };
   }
 });
@@ -1267,8 +1287,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 +1379,7 @@ var require_quick_format_unescaped = __commonJS({
       }
       return str;
     }
-    __name(format4, "format");
+    __name(format5, "format");
   }
 });
 
@@ -2834,13 +2854,25 @@ 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 diagChan = require("diagnostics_channel");
+    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();
     var { lsCacheSym, chindingsSym, writeSym, serializersSym, formatOptsSym, endSym, stringifiersSym, stringifySym, stringifySafeSym, wildcardFirstSym, nestedKeySym, formattersSym, messageKeySym, errorKeySym, nestedKeyStrSym, msgPrefixSym } = require_symbols();
     var { isMainThread } = require("worker_threads");
     var transport = require_transport();
+    var asJsonChan;
+    if (typeof diagChan.tracingChannel === "function") {
+      asJsonChan = diagChan.tracingChannel("pino_asJson");
+    } else {
+      asJsonChan = {
+        hasSubscribers: false,
+        traceSync(fn, store, thisArg, ...args) {
+          return fn.call(thisArg, ...args);
+        }
+      };
+    }
     function noop() {
     }
     __name(noop, "noop");
@@ -2871,13 +2903,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");
@@ -2909,6 +2941,17 @@ var require_tools = __commonJS({
     }
     __name(asString, "asString");
     function asJson(obj, msg, num, time) {
+      if (asJsonChan.hasSubscribers === false) {
+        return _asJson.call(this, obj, msg, num, time);
+      }
+      const store = {
+        instance: this,
+        arguments
+      };
+      return asJsonChan.traceSync(_asJson, store, this, obj, msg, num, time);
+    }
+    __name(asJson, "asJson");
+    function _asJson(obj, msg, num, time) {
       const stringify2 = this[stringifySym];
       const stringifySafe = this[stringifySafeSym];
       const stringifiers = this[stringifiersSym];
@@ -2989,7 +3032,7 @@ var require_tools = __commonJS({
         return data + propStr + msgStr + end;
       }
     }
-    __name(asJson, "asJson");
+    __name(_asJson, "_asJson");
     function asChindings(instance, bindings) {
       let value;
       let data = instance[chindingsSym];
@@ -3376,7 +3419,7 @@ var require_meta = __commonJS({
   "node_modules/pino/lib/meta.js"(exports2, module2) {
     "use strict";
     module2.exports = {
-      version: "9.9.0"
+      version: "9.11.0"
     };
   }
 });
@@ -3417,6 +3460,9 @@ var require_proto = __commonJS({
       get msgPrefix() {
         return this[msgPrefixSym];
       },
+      get [Symbol.toStringTag]() {
+        return "Pino";
+      },
       [lsCacheSym]: initialLsCache,
       [writeSym]: write,
       [asJsonSym]: asJson,
@@ -3480,8 +3526,10 @@ var require_proto = __commonJS({
         instance[msgPrefixSym] = (this[msgPrefixSym] || "") + options.msgPrefix;
       }
       instance[chindingsSym] = asChindings(instance, bindings2);
-      const childLevel = options.level || this.level;
-      instance[setLevelSym](childLevel);
+      if (options.level !== void 0 && options.level !== this.level || options.hasOwnProperty("customLevels")) {
+        const childLevel = options.level || this.level;
+        instance[setLevelSym](childLevel);
+      }
       this.onChild(instance);
       return instance;
     }
@@ -4905,7 +4953,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,
@@ -5731,8 +5780,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,
@@ -5749,7 +5801,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 "";
@@ -5757,7 +5809,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");
@@ -5842,18 +5894,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
@@ -5866,7 +5923,9 @@ async function patchPinoLogger(logger, logsContext) {
         levels: logger.levels
       });
     }
+    return true;
   } catch {
+    return false;
   }
 }
 __name(patchPinoLogger, "patchPinoLogger");
@@ -5897,8 +5956,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,
@@ -5907,7 +5966,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({