@pori15/logixlysia 0.0.1 → 6.0.2

package/src/output/rotation-manager.ts

@@ -1,122 +1,122 @@
-import { promises as fs } from 'node:fs'
-import { promisify } from 'node:util'
-import { gzip } from 'node:zlib'
-import type { LogRotationConfig } from '../interfaces'
-import {
-  getRotatedFiles,
-  parseRetention,
-  parseSize,
-  shouldRotateBySize
-} from '../utils/rotation'
-
-const gzipAsync = promisify(gzip)
-
-const pad2 = (value: number): string => String(value).padStart(2, '0')
-
-export const getRotatedFileName = (filePath: string, date: Date): string => {
-  const yyyy = date.getFullYear()
-  const mm = pad2(date.getMonth() + 1)
-  const dd = pad2(date.getDate())
-  const HH = pad2(date.getHours())
-  const MM = pad2(date.getMinutes())
-  const ss = pad2(date.getSeconds())
-  return `${filePath}.${yyyy}-${mm}-${dd}-${HH}-${MM}-${ss}`
-}
-
-export const rotateFile = async (filePath: string): Promise<string> => {
-  try {
-    const stat = await fs.stat(filePath)
-    if (stat.size === 0) {
-      return ''
-    }
-  } catch {
-    return ''
-  }
-
-  const rotated = getRotatedFileName(filePath, new Date())
-  await fs.rename(filePath, rotated)
-  return rotated
-}
-
-export const compressFile = async (filePath: string): Promise<void> => {
-  const content = await fs.readFile(filePath)
-  const compressed = await gzipAsync(content)
-  await fs.writeFile(`${filePath}.gz`, compressed)
-  await fs.rm(filePath, { force: true })
-}
-
-export const shouldRotate = async (
-  filePath: string,
-  config: LogRotationConfig
-): Promise<boolean> => {
-  if (config.maxSize === undefined) {
-    return false
-  }
-  const maxSize = parseSize(config.maxSize)
-  return await shouldRotateBySize(filePath, maxSize)
-}
-
-const cleanupByCount = async (
-  filePath: string,
-  maxFiles: number
-): Promise<void> => {
-  const rotated = await getRotatedFiles(filePath)
-  if (rotated.length <= maxFiles) {
-    return
-  }
-
-  const stats = await Promise.all(
-    rotated.map(async p => ({ path: p, stat: await fs.stat(p) }))
-  )
-
-  stats.sort((a, b) => b.stat.mtimeMs - a.stat.mtimeMs)
-  const toDelete = stats.slice(maxFiles)
-  await Promise.all(toDelete.map(({ path }) => fs.rm(path, { force: true })))
-}
-
-const cleanupByTime = async (
-  filePath: string,
-  maxAgeMs: number
-): Promise<void> => {
-  const rotated = await getRotatedFiles(filePath)
-  if (rotated.length === 0) {
-    return
-  }
-
-  const now = Date.now()
-  const stats = await Promise.all(
-    rotated.map(async p => ({ path: p, stat: await fs.stat(p) }))
-  )
-
-  const toDelete = stats.filter(({ stat }) => now - stat.mtimeMs > maxAgeMs)
-  await Promise.all(toDelete.map(({ path }) => fs.rm(path, { force: true })))
-}
-
-export const performRotation = async (
-  filePath: string,
-  config: LogRotationConfig
-): Promise<void> => {
-  const rotated = await rotateFile(filePath)
-  if (!rotated) {
-    return
-  }
-
-  const shouldCompress = config.compress === true
-  if (shouldCompress) {
-    const algo = config.compression ?? 'gzip'
-    if (algo === 'gzip') {
-      await compressFile(rotated)
-    }
-  }
-
-  if (config.maxFiles !== undefined) {
-    const retention = parseRetention(config.maxFiles)
-    if (retention.type === 'count') {
-      await cleanupByCount(filePath, retention.value)
-    } else {
-      await cleanupByTime(filePath, retention.value)
-    }
-  }
-
-  // Optional interval-based rotation cleanup (create interval directories / naming) is not required by tests.
-}
+import { promises as fs } from 'node:fs'
+import { promisify } from 'node:util'
+import { gzip } from 'node:zlib'
+import type { LogRotationConfig } from '../interfaces'
+import {
+  getRotatedFiles,
+  parseRetention,
+  parseSize,
+  shouldRotateBySize
+} from '../utils/rotation'
+
+const gzipAsync = promisify(gzip)
+
+const pad2 = (value: number): string => String(value).padStart(2, '0')
+
+export const getRotatedFileName = (filePath: string, date: Date): string => {
+  const yyyy = date.getFullYear()
+  const mm = pad2(date.getMonth() + 1)
+  const dd = pad2(date.getDate())
+  const HH = pad2(date.getHours())
+  const MM = pad2(date.getMinutes())
+  const ss = pad2(date.getSeconds())
+  return `${filePath}.${yyyy}-${mm}-${dd}-${HH}-${MM}-${ss}`
+}
+
+export const rotateFile = async (filePath: string): Promise<string> => {
+  try {
+    const stat = await fs.stat(filePath)
+    if (stat.size === 0) {
+      return ''
+    }
+  } catch {
+    return ''
+  }
+
+  const rotated = getRotatedFileName(filePath, new Date())
+  await fs.rename(filePath, rotated)
+  return rotated
+}
+
+export const compressFile = async (filePath: string): Promise<void> => {
+  const content = await fs.readFile(filePath)
+  const compressed = await gzipAsync(content)
+  await fs.writeFile(`${filePath}.gz`, compressed)
+  await fs.rm(filePath, { force: true })
+}
+
+export const shouldRotate = async (
+  filePath: string,
+  config: LogRotationConfig
+): Promise<boolean> => {
+  if (config.maxSize === undefined) {
+    return false
+  }
+  const maxSize = parseSize(config.maxSize)
+  return await shouldRotateBySize(filePath, maxSize)
+}
+
+const cleanupByCount = async (
+  filePath: string,
+  maxFiles: number
+): Promise<void> => {
+  const rotated = await getRotatedFiles(filePath)
+  if (rotated.length <= maxFiles) {
+    return
+  }
+
+  const stats = await Promise.all(
+    rotated.map(async p => ({ path: p, stat: await fs.stat(p) }))
+  )
+
+  stats.sort((a, b) => b.stat.mtimeMs - a.stat.mtimeMs)
+  const toDelete = stats.slice(maxFiles)
+  await Promise.all(toDelete.map(({ path }) => fs.rm(path, { force: true })))
+}
+
+const cleanupByTime = async (
+  filePath: string,
+  maxAgeMs: number
+): Promise<void> => {
+  const rotated = await getRotatedFiles(filePath)
+  if (rotated.length === 0) {
+    return
+  }
+
+  const now = Date.now()
+  const stats = await Promise.all(
+    rotated.map(async p => ({ path: p, stat: await fs.stat(p) }))
+  )
+
+  const toDelete = stats.filter(({ stat }) => now - stat.mtimeMs > maxAgeMs)
+  await Promise.all(toDelete.map(({ path }) => fs.rm(path, { force: true })))
+}
+
+export const performRotation = async (
+  filePath: string,
+  config: LogRotationConfig
+): Promise<void> => {
+  const rotated = await rotateFile(filePath)
+  if (!rotated) {
+    return
+  }
+
+  const shouldCompress = config.compress === true
+  if (shouldCompress) {
+    const algo = config.compression ?? 'gzip'
+    if (algo === 'gzip') {
+      await compressFile(rotated)
+    }
+  }
+
+  if (config.maxFiles !== undefined) {
+    const retention = parseRetention(config.maxFiles)
+    if (retention.type === 'count') {
+      await cleanupByCount(filePath, retention.value)
+    } else {
+      await cleanupByTime(filePath, retention.value)
+    }
+  }
+
+  // Optional interval-based rotation cleanup (create interval directories / naming) is not required by tests.
+}

package/src/utils/error.ts

@@ -1,15 +1,13 @@
-export const parseError = (error: unknown): string => {
-  let message = 'An error occurred'
-
-  if (error instanceof Error) {
-    message = error.message
-  } else if (error && typeof error === 'object' && 'message' in error) {
-    message = error.message as string
-  } else {
-    message = String(error)
-  }
-
-  console.error(`Parsing error: ${message}`)
-
-  return message
-}
+export const parseError = (error: unknown): string => {
+  let message = 'An error occurred'
+
+  if (error instanceof Error) {
+    message = error.message
+  } else if (error && typeof error === 'object' && 'message' in error) {
+    message = error.message as string
+  } else {
+    message = String(error)
+  }
+
+  return message
+}

package/src/utils/handle-error.ts

@@ -3,9 +3,8 @@
  * @see https://www.rfc-editor.org/rfc/rfc9457.html
  */
 
-import { ProblemError } from "../Error/errors";
-import { Code } from "../Error/type";
-
+import { ProblemError } from '../Error/errors'
+import type { Code } from '../Error/type'
 
 /**
  * 默认的状态码与标题映射表 (RFC 标准推荐)
@@ -18,62 +17,64 @@ const DEFAULT_TITLES: Record<number, string> = {
   409: 'Conflict',
   422: 'Unprocessable Entity',
   500: 'Internal Server Error',
-  503: 'Service Unavailable',
-};
+  503: 'Service Unavailable'
+}
 
 export const normalizeToProblem = (
   error: any,
   code: Code,
   path: string,
-  typeBaseUrl: string = 'about:blank'
+  typeBaseUrl = 'about:blank'
 ): ProblemError => {
   // 1. 如果已经是 ProblemError，直接补充 instance 并返回
   if (error instanceof ProblemError) {
     // 如果没有 instance，自动补全为当前请求路径
-    return error.instance ? error : new ProblemError(
-      error.type,
-      error.title,
-      error.status,
-      error.detail,
-      path,
-      error.extensions
-    );
+    return error.instance
+      ? error
+      : new ProblemError(
+          error.type,
+          error.title,
+          error.status,
+          error.detail,
+          path,
+          error.extensions
+        )
   }
 
   // 2. 初始化默认值
-  let status = 500;
-  let title = 'Internal Server Error';
-  let detail = error instanceof Error ? error.message : String(error);
-  let extensions: Record<string, unknown> = {};
+  let status = 500
+  let title = 'Internal Server Error'
+  let detail = error instanceof Error ? error.message : String(error)
+  let extensions: Record<string, unknown> = {}
 
   // 3. 识别 Elysia 内置错误码并“对齐”标准
   switch (code) {
     case 'VALIDATION':
-      status = 400;
-      title = 'Validation Failed';
+      status = 400
+      title = 'Validation Failed'
       // 提取 Elysia 的校验细节
-      extensions = { errors: error.all || [] };
-      break;
+      extensions = { errors: error.all || [] }
+      break
     case 'NOT_FOUND':
-      status = 404;
-      title = 'Resource Not Found';
-      break;
+      status = 404
+      title = 'Resource Not Found'
+      break
     case 'PARSE':
-      status = 400;
-      title = 'Invalid Payload';
-      detail = 'The request body could not be parsed as valid JSON.';
-      break;
+      status = 400
+      title = 'Invalid Payload'
+      detail = 'The request body could not be parsed as valid JSON.'
+      break
     case 'INVALID_COOKIE_SIGNATURE':
-      status = 401;
-      title = 'Invalid Credentials';
-      break;
+      status = 401
+      title = 'Invalid Credentials'
+      break
     default:
       // 如果错误对象本身带有状态码（比如某些库抛出的）
       if (typeof error?.status === 'number') {
-        status = error.status;
-        title = DEFAULT_TITLES[status] || 'Unknown Error';
+        status = error.status
+        title = DEFAULT_TITLES[status] || 'Unknown Error'
       }
-      break;
+      break
   }
 
   // 4. 构造并返回标准的 ProblemError
@@ -84,9 +85,8 @@ export const normalizeToProblem = (
     detail,
     path,
     extensions
-  );
-};
-
+  )
+}
 
 export interface ProblemJson {
   type?: string
@@ -116,9 +116,7 @@ export interface ProblemJsonOptions {
   format?: (error: unknown, request: Request) => ProblemJson | null
 }
 
-const isErrorWithStatus = (
-  value: unknown
-): value is { status: number } =>
+const isErrorWithStatus = (value: unknown): value is { status: number } =>
   typeof value === 'object' &&
   value !== null &&
   'status' in value &&
@@ -251,9 +249,7 @@ export function formatProblemJsonLog(
   // 标题行
   const statusStr = problem.status.toString()
   const emoji = getStatusEmoji(problem.status)
-  parts.push(
-    `\n${emoji} [HTTP ${statusStr}] ${request.method} ${url.pathname}`
-  )
+  parts.push(`\n${emoji} [HTTP ${statusStr}] ${request.method} ${url.pathname}`)
 
   // Problem JSON 内容
   parts.push(`  Type:    ${problem.type}`)
@@ -267,8 +263,7 @@ export function formatProblemJsonLog(
 
   // 扩展字段
   const extensions = Object.entries(problem).filter(
-    ([key]) =>
-      !['type', 'title', 'status', 'detail', 'instance'].includes(key)
+    ([key]) => !['type', 'title', 'status', 'detail', 'instance'].includes(key)
   )
   if (extensions.length > 0) {
     parts.push('  Extensions:')

package/src/utils/rotation.ts

@@ -1,91 +1,91 @@
-import { promises as fs } from 'node:fs'
-import { basename, dirname } from 'node:path'
-
-const SIZE_REGEX = /^(\d+(?:\.\d+)?)(k|kb|m|mb|g|gb)$/i
-const INTERVAL_REGEX = /^(\d+)(h|d|w)$/i
-const ROTATED_REGEX = /\.(\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2})(?:\.gz)?$/
-
-export const parseSize = (value: number | string): number => {
-  if (typeof value === 'number') {
-    return value
-  }
-
-  const trimmed = value.trim()
-  const asNumber = Number(trimmed)
-  if (Number.isFinite(asNumber)) {
-    return asNumber
-  }
-
-  const match = trimmed.match(SIZE_REGEX)
-  if (!match) {
-    throw new Error(`Invalid size format: ${value}`)
-  }
-
-  const amount = Number(match[1])
-  const unit = match[2].toLowerCase()
-
-  let base = 1024
-  if (unit.startsWith('m')) {
-    base = 1024 * 1024
-  } else if (unit.startsWith('g')) {
-    base = 1024 * 1024 * 1024
-  }
-
-  return Math.floor(amount * base)
-}
-
-export const parseInterval = (value: string): number => {
-  const match = value.trim().match(INTERVAL_REGEX)
-  if (!match) {
-    throw new Error(`Invalid interval format: ${value}`)
-  }
-
-  const amount = Number(match[1])
-  const unit = match[2].toLowerCase()
-
-  let ms = 60 * 60 * 1000
-  if (unit === 'd') {
-    ms = 24 * 60 * 60 * 1000
-  } else if (unit === 'w') {
-    ms = 7 * 24 * 60 * 60 * 1000
-  }
-
-  return amount * ms
-}
-
-export const parseRetention = (
-  value: number | string
-): { type: 'count' | 'time'; value: number } => {
-  if (typeof value === 'number') {
-    return { type: 'count', value }
-  }
-  return { type: 'time', value: parseInterval(value) }
-}
-
-export const shouldRotateBySize = async (
-  filePath: string,
-  maxSizeBytes: number
-): Promise<boolean> => {
-  try {
-    const stat = await fs.stat(filePath)
-    return stat.size > maxSizeBytes
-  } catch {
-    return false
-  }
-}
-
-export const getRotatedFiles = async (filePath: string): Promise<string[]> => {
-  const dir = dirname(filePath)
-  const base = basename(filePath)
-
-  let entries: string[]
-  try {
-    entries = await fs.readdir(dir)
-  } catch {
-    return []
-  }
-
-  return entries
-    .filter(name => name.startsWith(`${base}.`) && ROTATED_REGEX.test(name))
-    .map(name => `${dir}/${name}`)
-}
+import { promises as fs } from 'node:fs'
+import { basename, dirname } from 'node:path'
+
+const SIZE_REGEX = /^(\d+(?:\.\d+)?)(k|kb|m|mb|g|gb)$/i
+const INTERVAL_REGEX = /^(\d+)(h|d|w)$/i
+const ROTATED_REGEX = /\.(\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2})(?:\.gz)?$/
+
+export const parseSize = (value: number | string): number => {
+  if (typeof value === 'number') {
+    return value
+  }
+
+  const trimmed = value.trim()
+  const asNumber = Number(trimmed)
+  if (Number.isFinite(asNumber)) {
+    return asNumber
+  }
+
+  const match = trimmed.match(SIZE_REGEX)
+  if (!match) {
+    throw new Error(`Invalid size format: ${value}`)
+  }
+
+  const amount = Number(match[1])
+  const unit = match[2].toLowerCase()
+
+  let base = 1024
+  if (unit.startsWith('m')) {
+    base = 1024 * 1024
+  } else if (unit.startsWith('g')) {
+    base = 1024 * 1024 * 1024
+  }
+
+  return Math.floor(amount * base)
+}
+
+export const parseInterval = (value: string): number => {
+  const match = value.trim().match(INTERVAL_REGEX)
+  if (!match) {
+    throw new Error(`Invalid interval format: ${value}`)
+  }
+
+  const amount = Number(match[1])
+  const unit = match[2].toLowerCase()
+
+  let ms = 60 * 60 * 1000
+  if (unit === 'd') {
+    ms = 24 * 60 * 60 * 1000
+  } else if (unit === 'w') {
+    ms = 7 * 24 * 60 * 60 * 1000
+  }
+
+  return amount * ms
+}
+
+export const parseRetention = (
+  value: number | string
+): { type: 'count' | 'time'; value: number } => {
+  if (typeof value === 'number') {
+    return { type: 'count', value }
+  }
+  return { type: 'time', value: parseInterval(value) }
+}
+
+export const shouldRotateBySize = async (
+  filePath: string,
+  maxSizeBytes: number
+): Promise<boolean> => {
+  try {
+    const stat = await fs.stat(filePath)
+    return stat.size > maxSizeBytes
+  } catch {
+    return false
+  }
+}
+
+export const getRotatedFiles = async (filePath: string): Promise<string[]> => {
+  const dir = dirname(filePath)
+  const base = basename(filePath)
+
+  let entries: string[]
+  try {
+    entries = await fs.readdir(dir)
+  } catch {
+    return []
+  }
+
+  return entries
+    .filter(name => name.startsWith(`${base}.`) && ROTATED_REGEX.test(name))
+    .map(name => `${dir}/${name}`)
+}