diff --git a/src/main.ts b/src/main.ts index ea3344c..a3d8ac3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,7 +1,7 @@ import { PostListener, MessagesResponder } from "./routes"; import express from "express"; import dotenv from "dotenv"; -import { emp, Logger } from "./utils"; +import { Logger } from "./utils"; dotenv.config(); const app = express(); @@ -15,5 +15,5 @@ post.start(); query.start(); app.listen(port, () => { - logger.log(`Server started on ${emp(`http://localhost:${port}`)}`); + logger.log(`Server started on ${Logger.emp(`http://localhost:${port}`)}`); }); diff --git a/src/routes/post.ts b/src/routes/post.ts index 1e360d6..bb5f82b 100644 --- a/src/routes/post.ts +++ b/src/routes/post.ts @@ -1,5 +1,5 @@ import { userReviewSchema, typeJson } from "../types"; -import { bold, emp, Logger, responder, data } from "../utils"; +import { Logger, responder, data } from "../utils"; import { Express, Request, Response } from "express"; export class PostListener { @@ -13,7 +13,7 @@ export class PostListener { public async start(): Promise { this.server.post("/post", (req: Request, res: Response) => { req.on("data", async (chunk) => { - const sender = `${bold(emp("Client:"))} ${emp(req.headers["user-agent"])}`; + const sender = `${Logger.bold(Logger.emp("Client:"))} ${Logger.emp(req.headers["user-agent"])}`; let temp: any; diff --git a/src/routes/reviews.ts b/src/routes/reviews.ts index 8456ef1..06f522b 100644 --- a/src/routes/reviews.ts +++ b/src/routes/reviews.ts @@ -1,5 +1,5 @@ import { Express, Request, Response } from "express"; -import { Logger, data, emp } from "../utils"; +import { Logger, data } from "../utils"; import { IdRequest, typeJson } from "../types"; export class MessagesResponder { @@ -19,7 +19,7 @@ export class MessagesResponder { res.write(JSON.stringify(result)); res.end(); - this.logger.log(`${emp(receiver)} <~ "${req.path}"`); + this.logger.log(`${Logger.emp(receiver)} <~ "${req.path}"`); }); this.server.get("/reviews/:id", (req: IdRequest, res: Response) => { @@ -30,7 +30,7 @@ export class MessagesResponder { res.write(JSON.stringify(result)); res.end(); - this.logger.log(`${emp(receiver)} <~ "${req.path}"`); + this.logger.log(`${Logger.emp(receiver)} <~ "${req.path}"`); }); this.logger.log("Loading complete."); diff --git a/src/utils/logger.ts b/src/utils/logger.ts index 8a92dd2..e7f55a2 100644 --- a/src/utils/logger.ts +++ b/src/utils/logger.ts @@ -9,12 +9,12 @@ export class Logger { public isMainFunction: boolean; constructor(origin?: string) { - this._wrn = chalk.yellow("[WARN] "); - this._err = chalk.red("[ERROR] "); + this._wrn = Logger.wrn("[WARN] "); + this._err = Logger.err("[ERROR] "); this.name = origin ?? "Anonymous"; this.isMainFunction = this.name === "Main"; - this._main = chalk.bold.gray(`[SRS | ${emp(this.name)}] `); + this._main = chalk.bold.gray(`[SRS | ${Logger.emp(this.name)}] `); } public log(text?: any, args?: any): void { @@ -38,12 +38,12 @@ export class Logger { ? console.error(this._main + this._err + text, args) : console.error(this._main + this._err + text); } + + public static readonly emp = chalk.green; + public static readonly wrn = chalk.yellow; + public static readonly err = chalk.red; + + public static readonly bold = chalk.bold; + public static readonly itl = chalk.italic; + public static readonly udln = chalk.underline; } - -export const emp = chalk.green; -export const wrn = chalk.yellow; -export const err = chalk.red; - -export const bold = chalk.bold; -export const itl = chalk.italic; -export const udln = chalk.underline;