From 82e7f854b94e236468fc2f9f75aee94caf03daad Mon Sep 17 00:00:00 2001 From: Siddharth Singh Date: Sun, 6 Apr 2025 15:22:45 +0530 Subject: [PATCH] replace logi handler --- packages/ditto/app.ts | 3 ++ packages/ditto/utils/logi.ts | 71 ++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 packages/ditto/utils/logi.ts diff --git a/packages/ditto/app.ts b/packages/ditto/app.ts index b4ecbaec..857bae60 100644 --- a/packages/ditto/app.ts +++ b/packages/ditto/app.ts @@ -152,6 +152,8 @@ import dittoNamesRoute from '@/routes/dittoNamesRoute.ts'; import pleromaAdminPermissionGroupsRoute from '@/routes/pleromaAdminPermissionGroupsRoute.ts'; import pleromaStatusesRoute from '@/routes/pleromaStatusesRoute.ts'; import { DittoRelayStore } from '@/storages/DittoRelayStore.ts'; +import { logi } from '@soapbox/logi'; +import { createLogiHandler } from '@/utils/logi.ts'; export interface AppEnv extends DittoEnv { Variables: DittoEnv['Variables'] & { @@ -179,6 +181,7 @@ type AppMiddleware = MiddlewareHandler; type AppController

= Handler>; const conf = new DittoConf(Deno.env); +logi.handler = createLogiHandler(conf, logi.handler); startSentry(conf); diff --git a/packages/ditto/utils/logi.ts b/packages/ditto/utils/logi.ts new file mode 100644 index 00000000..18305459 --- /dev/null +++ b/packages/ditto/utils/logi.ts @@ -0,0 +1,71 @@ +import type { LogiHandler, LogiLog, LogiValue } from '@soapbox/logi'; +import { DittoConf } from '@ditto/conf'; + +type Level = LogiLog['level']; + +const levels: Level[] = ['trace', 'debug', 'info', 'warn', 'error', 'fatal', 'critical']; + +const lowerLevels: Record = levels.reduce((acc, level, index) => { + acc[level] = levels.slice(index); + return acc; +}, {} as Record); + +const colors: Record = { + trace: 'grey', + debug: 'white', + info: 'blue', + warn: 'yellow', + error: 'orange', + fatal: 'red', + critical: 'red', +}; + +const levelSet = new Set(levels); +const isLevel = (str: string): str is Level => levelSet.has(str as Level); + +const prettyPrint = (msg: LogiValue): string => { + const message = msg || ''; + const type = typeof message; + switch (type) { + case 'string': + case 'bigint': + case 'number': + case 'boolean': + return message.toString(); + case 'function': + case 'symbol': + case 'undefined': + return `<${type}>`; + case 'object': + if (message === null) return ""; + return JSON.stringify(message, (_, v) => { + if (Array.isArray(v)) { + return `[${v.map(itm => JSON.stringify(itm)).join(', ')}]`; + } + if (typeof v === 'string') return `\`${v}\``; + return v; + }, 2) + .replaceAll('\\"', '"') + .replace(/^"/, '') + .replace(/"$/, ''); + } +} + +const pair = (key: string, value: LogiValue | undefined) => { + return `${key} => ${prettyPrint(value || '')}` +} + +export const createLogiHandler = (conf: DittoConf, defaultHandler: LogiHandler) => (log: LogiLog) => { + const { fmt, level, scopes } = conf.logConfig; + if (fmt === 'jsonl') return defaultHandler(log); + if (!isLevel(level)) throw new Error(`Invalid log level ${level} specified`); + if (!lowerLevels[level].includes(log.level)) return; + if (scopes.length && !scopes.includes(log.ns)) return; + const message = prettyPrint(log.message || log.msg || ''); + const remaining = Object.entries(log) + .filter(([key]) => !['ns', 'level', 'message', 'msg'].includes(key)); + + console.group(`%c${log.level.toUpperCase()} %c${log.ns} %c${message || ''}`, `color: ${colors[log.level]}; font-weight: bold`, 'font-weight: normal; color: yellow', 'color: unset'); + console.log(remaining.map(itm => pair(...itm)).join('\n')); + console.groupEnd(); +};