@rawnodes/logger 2.3.0 → 2.5.0

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { hostname } from 'os';
 import pino from 'pino';
 import { AsyncLocalStorage } from 'async_hooks';
 import { Transform, Writable } from 'stream';
@@ -5,9 +6,9 @@ import { mkdir } from 'fs/promises';
 import { createStream } from 'rotating-file-stream';
 import { EventEmitter } from 'events';
 import { CloudWatchLogsClient, PutLogEventsCommand, CreateLogGroupCommand, CreateLogStreamCommand, DescribeLogStreamsCommand } from '@aws-sdk/client-cloudwatch-logs';
+import { randomUUID } from 'crypto';
 import { z } from 'zod';
 import { relative, basename } from 'path';
-import { randomUUID } from 'crypto';
 
 // src/state.ts
 var LoggerStore = class {
@@ -415,13 +416,50 @@ var TelegramTransport = class extends BaseHttpTransport {
     return text.replace(/[&<>"']/g, (c) => entities[c] || c);
   }
 };
+var instanceUuid = randomUUID().slice(0, 8);
+function formatDate() {
+  return (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+}
+function formatDateTime() {
+  return (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace(/[T:]/g, "-");
+}
+function resolveLogStreamName(config, configHostname) {
+  const hostname$1 = configHostname || process.env.HOSTNAME || hostname();
+  if (!config) {
+    return hostname$1;
+  }
+  if (typeof config === "string") {
+    return config;
+  }
+  if ("pattern" in config) {
+    switch (config.pattern) {
+      case "hostname":
+        return hostname$1;
+      case "hostname-date":
+        return `${hostname$1}/${formatDate()}`;
+      case "hostname-uuid":
+        return `${hostname$1}-${instanceUuid}`;
+      case "date":
+        return formatDate();
+      case "uuid":
+        return randomUUID();
+      default:
+        return hostname$1;
+    }
+  }
+  if ("template" in config) {
+    return config.template.replace(/\{hostname\}/g, hostname$1).replace(/\{date\}/g, formatDate()).replace(/\{datetime\}/g, formatDateTime()).replace(/\{uuid\}/g, instanceUuid).replace(/\{pid\}/g, String(process.pid)).replace(/\{env\}/g, process.env.NODE_ENV || "development");
+  }
+  return hostname$1;
+}
 var CloudWatchTransport = class extends BaseHttpTransport {
   config;
   client;
   sequenceToken;
   initialized = false;
   initPromise = null;
-  constructor(config) {
+  resolvedLogStreamName;
+  constructor(config, configHostname) {
     super({
       batchSize: config.batchSize ?? 100,
       flushInterval: config.flushInterval ?? 1e3,
@@ -429,6 +467,7 @@ var CloudWatchTransport = class extends BaseHttpTransport {
       retryDelay: config.retryDelay
     });
     this.config = config;
+    this.resolvedLogStreamName = resolveLogStreamName(config.logStreamName, configHostname);
     this.client = new CloudWatchLogsClient({
       region: config.region,
       credentials: {
@@ -451,7 +490,7 @@ var CloudWatchTransport = class extends BaseHttpTransport {
     logEvents.sort((a, b) => (a.timestamp ?? 0) - (b.timestamp ?? 0));
     const command = new PutLogEventsCommand({
       logGroupName: this.config.logGroupName,
-      logStreamName: this.config.logStreamName,
+      logStreamName: this.resolvedLogStreamName,
       logEvents,
       sequenceToken: this.sequenceToken
     });
@@ -463,7 +502,7 @@ var CloudWatchTransport = class extends BaseHttpTransport {
         await this.fetchSequenceToken();
         const retryCommand = new PutLogEventsCommand({
           logGroupName: this.config.logGroupName,
-          logStreamName: this.config.logStreamName,
+          logStreamName: this.resolvedLogStreamName,
           logEvents,
           sequenceToken: this.sequenceToken
         });
@@ -509,7 +548,7 @@ var CloudWatchTransport = class extends BaseHttpTransport {
       await this.client.send(
         new CreateLogStreamCommand({
           logGroupName: this.config.logGroupName,
-          logStreamName: this.config.logStreamName
+          logStreamName: this.resolvedLogStreamName
         })
       );
     } catch (error) {
@@ -522,11 +561,11 @@ var CloudWatchTransport = class extends BaseHttpTransport {
     const response = await this.client.send(
       new DescribeLogStreamsCommand({
         logGroupName: this.config.logGroupName,
-        logStreamNamePrefix: this.config.logStreamName,
+        logStreamNamePrefix: this.resolvedLogStreamName,
         limit: 1
       })
     );
-    const stream = response.logStreams?.find((s) => s.logStreamName === this.config.logStreamName);
+    const stream = response.logStreams?.find((s) => s.logStreamName === this.resolvedLogStreamName);
     this.sequenceToken = stream?.uploadSequenceToken;
   }
   isResourceAlreadyExistsError(error) {
@@ -706,7 +745,7 @@ function createStreams(config, store) {
     });
   }
   for (const cloudwatchConfig of toArray(config.cloudwatch)) {
-    const transport = new CloudWatchTransport(cloudwatchConfig);
+    const transport = new CloudWatchTransport(cloudwatchConfig, config.hostname);
     const cwStream = createHttpTransportStream(transport, cloudwatchConfig.level, cloudwatchConfig.rules, store);
     streams.push({
       level: "trace",
@@ -803,8 +842,7 @@ function createState(config, store) {
     level: "trace",
     // Accept all, we filter in shouldLog()
     customLevels: CUSTOM_LEVELS,
-    base: void 0
-    // Disable pid and hostname
+    base: { hostname: config.hostname ?? hostname() }
   };
   const pinoLogger = pino(options, streams);
   let callerConfig;
@@ -921,6 +959,24 @@ var TelegramConfigSchema = z.object({
   threadId: z.number().int().optional(),
   replyToMessageId: z.number().int().optional()
 });
+var LogStreamPatternSchema = z.enum([
+  "hostname",
+  "hostname-date",
+  "hostname-uuid",
+  "date",
+  "uuid"
+]);
+var LogStreamPatternConfigSchema = z.object({
+  pattern: LogStreamPatternSchema
+});
+var LogStreamTemplateConfigSchema = z.object({
+  template: z.string().min(1, "template is required")
+});
+var LogStreamNameSchema = z.union([
+  z.string().min(1, "logStreamName string must not be empty"),
+  LogStreamPatternConfigSchema,
+  LogStreamTemplateConfigSchema
+]);
 var CloudWatchConfigSchema = z.object({
   level: LogLevelSchema.optional(),
   rules: z.array(LevelRuleSchema).optional(),
@@ -929,7 +985,7 @@ var CloudWatchConfigSchema = z.object({
   maxRetries: z.number().int().nonnegative().optional(),
   retryDelay: z.number().int().positive().optional(),
   logGroupName: z.string().min(1, "logGroupName is required"),
-  logStreamName: z.string().min(1, "logStreamName is required"),
+  logStreamName: LogStreamNameSchema.optional(),
   region: z.string().min(1, "region is required"),
   accessKeyId: z.string().min(1, "accessKeyId is required"),
   secretAccessKey: z.string().min(1, "secretAccessKey is required"),
@@ -955,7 +1011,8 @@ var LoggerConfigSchema = z.object({
   discord: z.union([DiscordConfigSchema, z.array(DiscordConfigSchema)]).optional(),
   telegram: z.union([TelegramConfigSchema, z.array(TelegramConfigSchema)]).optional(),
   cloudwatch: z.union([CloudWatchConfigSchema, z.array(CloudWatchConfigSchema)]).optional(),
-  caller: z.union([z.boolean(), CallerConfigSchema]).optional()
+  caller: z.union([z.boolean(), CallerConfigSchema]).optional(),
+  hostname: z.string().optional()
 });
 function validateConfig(config) {
   return LoggerConfigSchema.parse(config);
@@ -1380,6 +1437,6 @@ function formatLogfmt(data) {
   return Object.entries(flattened).filter(([, value]) => value !== void 0 && value !== null).map(([key, value]) => `${key}=${formatLogfmtValue(value)}`).join(" ");
 }
 
-export { BaseHttpTransport, CallerConfigSchema, CloudWatchConfigSchema, CloudWatchTransport, ConsoleConfigSchema, DiscordConfigSchema, DiscordTransport, FileConfigSchema, HttpTransportBaseConfigSchema, LOG_LEVELS, LevelConfigObjectSchema, LevelConfigSchema, LevelRuleSchema, LogFormatSchema, LogLevelSchema, Logger, LoggerConfigSchema, LoggerStore, MessageBuffer, TelegramConfigSchema, TelegramTransport, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };
+export { BaseHttpTransport, CallerConfigSchema, CloudWatchConfigSchema, CloudWatchTransport, ConsoleConfigSchema, DiscordConfigSchema, DiscordTransport, FileConfigSchema, HttpTransportBaseConfigSchema, LOG_LEVELS, LevelConfigObjectSchema, LevelConfigSchema, LevelRuleSchema, LogFormatSchema, LogLevelSchema, LogStreamNameSchema, LogStreamPatternConfigSchema, LogStreamPatternSchema, LogStreamTemplateConfigSchema, Logger, LoggerConfigSchema, LoggerStore, MessageBuffer, TelegramConfigSchema, TelegramTransport, assertLogLevel, createMasker, createSingletonLogger, extractRequestId, flattenObject, formatCallerInfo, formatLogfmt, formatLogfmtValue, generateRequestId, getCallerInfo, getOrGenerateRequestId, isValidLogLevel, maskSecrets, matchesContext, measureAsync, measureSync, safeValidateConfig, validateConfig };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map