@pori15/logixlysia 0.0.1 → 6.0.2

package/src/logger/index.ts

@@ -1,125 +1,138 @@
-import pino from 'pino'
-import type {
-  Logger,
-  LogLevel,
-  Options,
-  Pino,
-  StoreData
-} from '../interfaces'
-import { logToTransports } from '../output'
-import { logToFile } from '../output/file'
-import { formatLine } from './create-logger'
-import { handleHttpError } from './handle-http-error'
-
-export const createLogger = (options: Options = {}): Logger => {
-  const config = options.config
-
-  const pinoConfig = config?.pino
-  const { prettyPrint, ...pinoOptions } = pinoConfig ?? {}
-
-  const shouldPrettyPrint =
-    prettyPrint === true && pinoOptions.transport === undefined
-
-  const transport = shouldPrettyPrint
-    ? pino.transport({
-        target: 'pino-pretty',
-        options: {
-          colorize: process.stdout?.isTTY === true,
-          translateTime: config?.timestamp?.translateTime,
-          messageKey: pinoOptions.messageKey,
-          errorKey: pinoOptions.errorKey
-        }
-      })
-    : pinoOptions.transport
-
-  const pinoLogger: Pino = pino({
-    ...pinoOptions,
-    level: pinoOptions.level ?? 'info',
-    messageKey: pinoOptions.messageKey,
-    errorKey: pinoOptions.errorKey,
-    transport
-  })
-
-  const log = (
-    level: LogLevel,
-    request: Request,
-    data: Record<string, unknown>,
-    store: StoreData
-  ): void => {
-    logToTransports({ level, request, data, store, options })
-
-    const useTransportsOnly = config?.useTransportsOnly === true
-    const disableInternalLogger = config?.disableInternalLogger === true
-    const disableFileLogging = config?.disableFileLogging === true
-
-    if (!(useTransportsOnly || disableFileLogging)) {
-      const filePath = config?.logFilePath
-      if (filePath) {
-        logToFile({ filePath, level, request, data, store, options }).catch(
-          () => {
-            // Ignore errors
-          }
-        )
-      }
-    }
-
-    if (useTransportsOnly || disableInternalLogger) {
-      return
-    }
-
-    const message = formatLine({ level, request, data, store, options })
-
-    switch (level) {
-      case 'DEBUG': {
-        console.debug(message)
-        break
-      }
-      case 'INFO': {
-        console.info(message)
-        break
-      }
-      case 'WARNING': {
-        console.warn(message)
-        break
-      }
-      case 'ERROR': {
-        console.error(message)
-        break
-      }
-      default: {
-        console.log(message)
-        break
-      }
-    }
-  }
-
-  const logWithContext = (
-    level: LogLevel,
-    request: Request,
-    message: string,
-    context?: Record<string, unknown>
-  ): void => {
-    const store: StoreData = { beforeTime: process.hrtime.bigint() }
-    log(level, request, { message, context }, store)
-  }
-
-  return {
-    pino: pinoLogger,
-    log,
-    handleHttpError: (request, error, store) => {
-      handleHttpError(request, error, store, options)
-    },
-    debug: (request, message, context) => {
-      logWithContext('DEBUG', request, message, context)
-    },
-    info: (request, message, context) => {
-      logWithContext('INFO', request, message, context)
-    },
-    warn: (request, message, context) => {
-      logWithContext('WARNING', request, message, context)
-    },
-    error: (request, message, context) => {
-      logWithContext('ERROR', request, message, context)
-    }
-  }
-}
+import pino from 'pino'
+import type {
+  LogFilter,
+  Logger,
+  LogLevel,
+  Options,
+  Pino,
+  StoreData
+} from '../interfaces'
+import { logToTransports } from '../output'
+import { logToFile } from '../output/file'
+import { formatLine } from './create-logger'
+import { handleHttpError } from './handle-http-error'
+
+export const createLogger = (options: Options = {}): Logger => {
+  const config = options.config
+
+  const pinoConfig = config?.pino
+  const { prettyPrint, ...pinoOptions } = pinoConfig ?? {}
+
+  const shouldPrettyPrint =
+    prettyPrint === true && pinoOptions.transport === undefined
+
+  const transport = shouldPrettyPrint
+    ? pino.transport({
+        target: 'pino-pretty',
+        options: {
+          colorize: process.stdout?.isTTY === true,
+          translateTime: config?.timestamp?.translateTime,
+          messageKey: pinoOptions.messageKey,
+          errorKey: pinoOptions.errorKey
+        }
+      })
+    : pinoOptions.transport
+
+  const pinoLogger: Pino = pino({
+    ...pinoOptions,
+    level: pinoOptions.level ?? 'info',
+    messageKey: pinoOptions.messageKey,
+    errorKey: pinoOptions.errorKey,
+    transport
+  })
+
+  const shouldLog = (level: LogLevel, logFilter?: LogFilter): boolean => {
+    if (!logFilter?.level || logFilter.level.length === 0) {
+      return true
+    }
+    return logFilter.level.includes(level)
+  }
+
+  const log = (
+    level: LogLevel,
+    request: Request,
+    data: Record<string, unknown>,
+    store: StoreData
+  ): void => {
+    // Check if this log level should be filtered
+    if (!shouldLog(level, config?.logFilter)) {
+      return
+    }
+
+    logToTransports({ level, request, data, store, options })
+
+    const useTransportsOnly = config?.useTransportsOnly === true
+    const disableInternalLogger = config?.disableInternalLogger === true
+    const disableFileLogging = config?.disableFileLogging === true
+
+    if (!(useTransportsOnly || disableFileLogging)) {
+      const filePath = config?.logFilePath
+      if (filePath) {
+        logToFile({ filePath, level, request, data, store, options }).catch(
+          () => {
+            // Ignore errors
+          }
+        )
+      }
+    }
+
+    if (useTransportsOnly || disableInternalLogger) {
+      return
+    }
+
+    const message = formatLine({ level, request, data, store, options })
+
+    switch (level) {
+      case 'DEBUG': {
+        console.debug(message)
+        break
+      }
+      case 'INFO': {
+        console.info(message)
+        break
+      }
+      case 'WARNING': {
+        console.warn(message)
+        break
+      }
+      case 'ERROR': {
+        console.error(message)
+        break
+      }
+      default: {
+        console.log(message)
+        break
+      }
+    }
+  }
+
+  const logWithContext = (
+    level: LogLevel,
+    request: Request,
+    message: string,
+    context?: Record<string, unknown>
+  ): void => {
+    const store: StoreData = { beforeTime: process.hrtime.bigint() }
+    log(level, request, { message, context }, store)
+  }
+
+  return {
+    pino: pinoLogger,
+    log,
+    handleHttpError: (request, error, store) => {
+      handleHttpError(request, error, store, options)
+    },
+    debug: (request, message, context) => {
+      logWithContext('DEBUG', request, message, context)
+    },
+    info: (request, message, context) => {
+      logWithContext('INFO', request, message, context)
+    },
+    warn: (request, message, context) => {
+      logWithContext('WARNING', request, message, context)
+    },
+    error: (request, message, context) => {
+      logWithContext('ERROR', request, message, context)
+    }
+  }
+}

package/src/output/file.ts

@@ -1,85 +1,85 @@
-import { appendFile } from 'node:fs/promises'
-import { dirname } from 'node:path'
-import type { LogLevel, Options, RequestInfo, StoreData } from '../interfaces'
-import { ensureDir } from './fs'
-import { performRotation, shouldRotate } from './rotation-manager'
-
-interface LogToFileInput {
-  filePath: string
-  level: LogLevel
-  request: RequestInfo
-  data: Record<string, unknown>
-  store: StoreData
-  options: Options
-}
-
-export const logToFile = async (
-  ...args:
-    | [LogToFileInput]
-    | [
-        string,
-        LogLevel,
-        RequestInfo,
-        Record<string, unknown>,
-        StoreData,
-        Options
-      ]
-): Promise<void> => {
-  const input: LogToFileInput =
-    typeof args[0] === 'string'
-      ? (() => {
-          const [
-            filePathArg,
-            levelArg,
-            requestArg,
-            dataArg,
-            storeArg,
-            optionsArg
-          ] = args as [
-            string,
-            LogLevel,
-            RequestInfo,
-            Record<string, unknown>,
-            StoreData,
-            Options
-          ]
-          return {
-            filePath: filePathArg,
-            level: levelArg,
-            request: requestArg,
-            data: dataArg,
-            store: storeArg,
-            options: optionsArg
-          }
-        })()
-      : args[0]
-
-  const { filePath, level, request, data, store, options } = input
-  const config = options.config
-  const useTransportsOnly = config?.useTransportsOnly === true
-  const disableFileLogging = config?.disableFileLogging === true
-  if (useTransportsOnly || disableFileLogging) {
-    return
-  }
-
-  const message = typeof data.message === 'string' ? data.message : ''
-  const durationMs =
-    store.beforeTime === BigInt(0)
-      ? 0
-      : Number(process.hrtime.bigint() - store.beforeTime) / 1_000_000
-
-  const line = `${level} ${durationMs.toFixed(2)}ms ${request.method} ${new URL(request.url).pathname} ${message}\n`
-
-  await ensureDir(dirname(filePath))
-  await appendFile(filePath, line, { encoding: 'utf-8' })
-
-  const rotation = config?.logRotation
-  if (!rotation) {
-    return
-  }
-
-  const should = await shouldRotate(filePath, rotation)
-  if (should) {
-    await performRotation(filePath, rotation)
-  }
-}
+import { appendFile } from 'node:fs/promises'
+import { dirname } from 'node:path'
+import type { LogLevel, Options, RequestInfo, StoreData } from '../interfaces'
+import { ensureDir } from './fs'
+import { performRotation, shouldRotate } from './rotation-manager'
+
+interface LogToFileInput {
+  filePath: string
+  level: LogLevel
+  request: RequestInfo
+  data: Record<string, unknown>
+  store: StoreData
+  options: Options
+}
+
+export const logToFile = async (
+  ...args:
+    | [LogToFileInput]
+    | [
+        string,
+        LogLevel,
+        RequestInfo,
+        Record<string, unknown>,
+        StoreData,
+        Options
+      ]
+): Promise<void> => {
+  const input: LogToFileInput =
+    typeof args[0] === 'string'
+      ? (() => {
+          const [
+            filePathArg,
+            levelArg,
+            requestArg,
+            dataArg,
+            storeArg,
+            optionsArg
+          ] = args as [
+            string,
+            LogLevel,
+            RequestInfo,
+            Record<string, unknown>,
+            StoreData,
+            Options
+          ]
+          return {
+            filePath: filePathArg,
+            level: levelArg,
+            request: requestArg,
+            data: dataArg,
+            store: storeArg,
+            options: optionsArg
+          }
+        })()
+      : args[0]
+
+  const { filePath, level, request, data, store, options } = input
+  const config = options.config
+  const useTransportsOnly = config?.useTransportsOnly === true
+  const disableFileLogging = config?.disableFileLogging === true
+  if (useTransportsOnly || disableFileLogging) {
+    return
+  }
+
+  const message = typeof data.message === 'string' ? data.message : ''
+  const durationMs =
+    store.beforeTime === BigInt(0)
+      ? 0
+      : Number(process.hrtime.bigint() - store.beforeTime) / 1_000_000
+
+  const line = `${level} ${durationMs.toFixed(2)}ms ${request.method} ${new URL(request.url).pathname} ${message}\n`
+
+  await ensureDir(dirname(filePath))
+  await appendFile(filePath, line, { encoding: 'utf-8' })
+
+  const rotation = config?.logRotation
+  if (!rotation) {
+    return
+  }
+
+  const should = await shouldRotate(filePath, rotation)
+  if (should) {
+    await performRotation(filePath, rotation)
+  }
+}

package/src/output/fs.ts

@@ -1,5 +1,5 @@
-import { promises as fs } from 'node:fs'
-
-export const ensureDir = async (dirPath: string): Promise<void> => {
-  await fs.mkdir(dirPath, { recursive: true })
-}
+import { promises as fs } from 'node:fs'
+
+export const ensureDir = async (dirPath: string): Promise<void> => {
+  await fs.mkdir(dirPath, { recursive: true })
+}

package/src/output/index.ts

@@ -1,58 +1,58 @@
-import type { LogLevel, Options, Request, StoreData } from '../interfaces'
-
-interface LogToTransportsInput {
-  level: LogLevel
-  request: Request
-  data: Record<string, unknown>
-  store: StoreData
-  options: Options
-}
-
-export const logToTransports = (
-  ...args:
-    | [LogToTransportsInput]
-    | [LogLevel, Request, Record<string, unknown>, StoreData, Options]
-): void => {
-  const input: LogToTransportsInput =
-    typeof args[0] === 'string'
-      ? {
-          level: args[0],
-          request: args[1],
-          data: args[2],
-          store: args[3],
-          options: args[4]
-        }
-      : args[0]
-
-  const { level, request, data, store, options } = input
-  const transports = options.config?.transports ?? []
-  if (transports.length === 0) {
-    return
-  }
-
-  const message = typeof data.message === 'string' ? data.message : ''
-  const meta: Record<string, unknown> = {
-    request: {
-      method: request.method,
-      url: request.url
-    },
-    ...data,
-    beforeTime: store.beforeTime
-  }
-
-  for (const transport of transports) {
-    try {
-      const result = transport.log(level, message, meta)
-      if (
-        result &&
-        typeof (result as { catch?: unknown }).catch === 'function'
-      ) {
-        ;(result as Promise<void>).catch(() => {
-          // Ignore errors
-        })
-      }
-    } catch {
-      // Transport failures must never crash application logging.
-    }
-  }
-}
+import type { LogLevel, Options, Request, StoreData } from '../interfaces'
+
+interface LogToTransportsInput {
+  level: LogLevel
+  request: Request
+  data: Record<string, unknown>
+  store: StoreData
+  options: Options
+}
+
+export const logToTransports = (
+  ...args:
+    | [LogToTransportsInput]
+    | [LogLevel, Request, Record<string, unknown>, StoreData, Options]
+): void => {
+  const input: LogToTransportsInput =
+    typeof args[0] === 'string'
+      ? {
+          level: args[0],
+          request: args[1],
+          data: args[2],
+          store: args[3],
+          options: args[4]
+        }
+      : args[0]
+
+  const { level, request, data, store, options } = input
+  const transports = options.config?.transports ?? []
+  if (transports.length === 0) {
+    return
+  }
+
+  const message = typeof data.message === 'string' ? data.message : ''
+  const meta: Record<string, unknown> = {
+    request: {
+      method: request.method,
+      url: request.url
+    },
+    ...data,
+    beforeTime: store.beforeTime
+  }
+
+  for (const transport of transports) {
+    try {
+      const result = transport.log(level, message, meta)
+      if (
+        result &&
+        typeof (result as { catch?: unknown }).catch === 'function'
+      ) {
+        ;(result as Promise<void>).catch(() => {
+          // Ignore errors
+        })
+      }
+    } catch {
+      // Transport failures must never crash application logging.
+    }
+  }
+}