tallship/FoundKey
0
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Packages Projects Releases Wiki Activity

server: use color-convert KEYWORD instead of extracting parameter type

Browse source
This commit is contained in:
Norm 2022-12-13 15:11:29 -05:00
parent 73f81177b4
commit 3f0228e14c
Signed by untrusted user: norm
GPG key ID: 7123E30E441E80DE
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/backend/src/services/logger.ts
View file

@ -1,16 +1,15 @@
import cluster from 'node:cluster'; import cluster from 'node:cluster';
import chalk from 'chalk'; import chalk from 'chalk';
import convertColor from 'color-convert'; import convertKEYWORD from 'color-convert';
import { format as dateFormat } from 'date-fns'; import { format as dateFormat } from 'date-fns';
import * as SyslogPro from 'syslog-pro'; import * as SyslogPro from 'syslog-pro';
import config from '@/config/index.js'; import config from '@/config/index.js';
import { envOption } from '@/env.js'; import { envOption } from '@/env.js';
import type { KEYWORD } from 'color-convert/conversions.js';
type Color = Parameters<typeof convertColor.keyword.rgb>[0];
type Domain = { type Domain = {
name: string; name: string;
color?: Color; color?: KEYWORD;
}; };
type Level = 'error' | 'success' | 'warning' | 'debug' | 'info'; type Level = 'error' | 'success' | 'warning' | 'debug' | 'info';
@ -30,7 +29,7 @@ export default class Logger {
* @param color Log message color * @param color Log message color
* @param store Whether to store messages * @param store Whether to store messages
*/ */
constructor(domain: string, color?: Color, store = true) { constructor(domain: string, color?: KEYWORD, store = true) {
this.domain = { this.domain = {
name: domain, name: domain,
color, color,
@ -59,7 +58,7 @@ export default class Logger {
* @param store Whether to store messages * @param store Whether to store messages
* @returns A Logger instance whose parent logger is this instance. * @returns A Logger instance whose parent logger is this instance.
*/ */
public createSubLogger(domain: string, color?: Color, store = true): Logger { public createSubLogger(domain: string, color?: KEYWORD, store = true): Logger {
const logger = new Logger(domain, color, store); const logger = new Logger(domain, color, store);
logger.parentLogger = this; logger.parentLogger = this;
return logger; return logger;
@ -82,7 +81,7 @@ export default class Logger {
level === 'success' ? important ? chalk.bgGreen.white('DONE') : chalk.green('DONE') : level === 'success' ? important ? chalk.bgGreen.white('DONE') : chalk.green('DONE') :
level === 'debug' ? chalk.gray('VERB') : level === 'debug' ? chalk.gray('VERB') :
chalk.blue('INFO'); chalk.blue('INFO');
const domains = [this.domain].concat(subDomains).map(d => d.color ? chalk.rgb(...convertColor.keyword.rgb(d.color))(d.name) : chalk.white(d.name)); const domains = [this.domain].concat(subDomains).map(d => d.color ? chalk.rgb(...convertKEYWORD.keyword.rgb(d.color))(d.name) : chalk.white(d.name));
const m = const m =
level === 'error' ? chalk.red(message) : level === 'error' ? chalk.red(message) :
level === 'warning' ? chalk.yellow(message) : level === 'warning' ? chalk.yellow(message) :