diff --git a/package.json b/package.json
index db5e8a9..0e80369 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"dev": "bun run --hot src/index.ts --dev",
"lint": "bunx biome check",
"lint:fix": "bunx biome check --fix",
- "cleanup": "rm -rf logs node_modules bun.lockdb"
+ "cleanup": "rm -rf logs node_modules bun.lock"
},
"devDependencies": {
"@types/bun": "^1.2.9",
@@ -19,6 +19,7 @@
"typescript": "^5.8.3"
},
"dependencies": {
+ "@creations.works/logger": "^1.0.3",
"ejs": "^3.1.10"
}
}
diff --git a/src/helpers/char.ts b/src/helpers/char.ts
index c885429..74868aa 100644
--- a/src/helpers/char.ts
+++ b/src/helpers/char.ts
@@ -1,10 +1,3 @@
-export function timestampToReadable(timestamp?: number): string {
- const date: Date =
- timestamp && !Number.isNaN(timestamp) ? new Date(timestamp) : new Date();
- if (Number.isNaN(date.getTime())) return "Invalid Date";
- return date.toISOString().replace("T", " ").replace("Z", "");
-}
-
export function validateID(id: string): boolean {
if (!id) return false;
diff --git a/src/helpers/logger.ts b/src/helpers/logger.ts
deleted file mode 100644
index 4cbb12b..0000000
--- a/src/helpers/logger.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import type { Stats } from "node:fs";
-import {
- type WriteStream,
- createWriteStream,
- existsSync,
- mkdirSync,
- statSync,
-} from "node:fs";
-import { EOL } from "node:os";
-import { basename, join } from "node:path";
-import { environment } from "@config/environment";
-import { timestampToReadable } from "@helpers/char";
-
-class Logger {
- private static instance: Logger;
- private static log: string = join(__dirname, "../../logs");
-
- public static getInstance(): Logger {
- if (!Logger.instance) {
- Logger.instance = new Logger();
- }
-
- return Logger.instance;
- }
-
- private writeToLog(logMessage: string): void {
- if (environment.development) return;
-
- const date: Date = new Date();
- const logDir: string = Logger.log;
- const logFile: string = join(
- logDir,
- `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}.log`,
- );
-
- if (!existsSync(logDir)) {
- mkdirSync(logDir, { recursive: true });
- }
-
- let addSeparator = false;
-
- if (existsSync(logFile)) {
- const fileStats: Stats = statSync(logFile);
- if (fileStats.size > 0) {
- const lastModified: Date = new Date(fileStats.mtime);
- if (
- lastModified.getFullYear() === date.getFullYear() &&
- lastModified.getMonth() === date.getMonth() &&
- lastModified.getDate() === date.getDate() &&
- lastModified.getHours() !== date.getHours()
- ) {
- addSeparator = true;
- }
- }
- }
-
- const stream: WriteStream = createWriteStream(logFile, { flags: "a" });
-
- if (addSeparator) {
- stream.write(`${EOL}${date.toISOString()}${EOL}`);
- }
-
- stream.write(`${logMessage}${EOL}`);
- stream.close();
- }
-
- private extractFileName(stack: string): string {
- const stackLines: string[] = stack.split("\n");
- let callerFile = "";
-
- for (let i = 2; i < stackLines.length; i++) {
- const line: string = stackLines[i].trim();
- if (line && !line.includes("Logger.") && line.includes("(")) {
- callerFile = line.split("(")[1]?.split(")")[0] || "";
- break;
- }
- }
-
- return basename(callerFile);
- }
-
- private getCallerInfo(stack: unknown): {
- filename: string;
- timestamp: string;
- } {
- const filename: string =
- typeof stack === "string" ? this.extractFileName(stack) : "unknown";
-
- const readableTimestamp: string = timestampToReadable();
-
- return { filename, timestamp: readableTimestamp };
- }
-
- public info(message: string | string[], breakLine = false): void {
- const stack: string = new Error().stack || "";
- const { filename, timestamp } = this.getCallerInfo(stack);
-
- const joinedMessage: string = Array.isArray(message)
- ? message.join(" ")
- : message;
-
- const logMessageParts: ILogMessageParts = {
- readableTimestamp: { value: timestamp, color: "90" },
- level: { value: "[INFO]", color: "32" },
- filename: { value: `(${filename})`, color: "36" },
- message: { value: joinedMessage, color: "0" },
- };
-
- this.writeToLog(`${timestamp} [INFO] (${filename}) ${joinedMessage}`);
- this.writeConsoleMessageColored(logMessageParts, breakLine);
- }
-
- public warn(message: string | string[], breakLine = false): void {
- const stack: string = new Error().stack || "";
- const { filename, timestamp } = this.getCallerInfo(stack);
-
- const joinedMessage: string = Array.isArray(message)
- ? message.join(" ")
- : message;
-
- const logMessageParts: ILogMessageParts = {
- readableTimestamp: { value: timestamp, color: "90" },
- level: { value: "[WARN]", color: "33" },
- filename: { value: `(${filename})`, color: "36" },
- message: { value: joinedMessage, color: "0" },
- };
-
- this.writeToLog(`${timestamp} [WARN] (${filename}) ${joinedMessage}`);
- this.writeConsoleMessageColored(logMessageParts, breakLine);
- }
-
- public error(
- message: string | Error | (string | Error)[],
- breakLine = false,
- ): void {
- const stack: string = new Error().stack || "";
- const { filename, timestamp } = this.getCallerInfo(stack);
-
- const messages: (string | Error)[] = Array.isArray(message)
- ? message
- : [message];
- const joinedMessage: string = messages
- .map((msg: string | Error): string =>
- typeof msg === "string" ? msg : msg.message,
- )
- .join(" ");
-
- const logMessageParts: ILogMessageParts = {
- readableTimestamp: { value: timestamp, color: "90" },
- level: { value: "[ERROR]", color: "31" },
- filename: { value: `(${filename})`, color: "36" },
- message: { value: joinedMessage, color: "0" },
- };
-
- this.writeToLog(`${timestamp} [ERROR] (${filename}) ${joinedMessage}`);
- this.writeConsoleMessageColored(logMessageParts, breakLine);
- }
-
- public custom(
- bracketMessage: string,
- bracketMessage2: string,
- message: string | string[],
- color: string,
- breakLine = false,
- ): void {
- const stack: string = new Error().stack || "";
- const { timestamp } = this.getCallerInfo(stack);
-
- const joinedMessage: string = Array.isArray(message)
- ? message.join(" ")
- : message;
-
- const logMessageParts: ILogMessageParts = {
- readableTimestamp: { value: timestamp, color: "90" },
- level: { value: bracketMessage, color },
- filename: { value: `${bracketMessage2}`, color: "36" },
- message: { value: joinedMessage, color: "0" },
- };
-
- this.writeToLog(
- `${timestamp} ${bracketMessage} (${bracketMessage2}) ${joinedMessage}`,
- );
- this.writeConsoleMessageColored(logMessageParts, breakLine);
- }
-
- public space(): void {
- console.log();
- }
-
- private writeConsoleMessageColored(
- logMessageParts: ILogMessageParts,
- breakLine = false,
- ): void {
- const logMessage: string = Object.keys(logMessageParts)
- .map((key: string) => {
- const part: ILogMessagePart = logMessageParts[key];
- return `\x1b[${part.color}m${part.value}\x1b[0m`;
- })
- .join(" ");
- console.log(logMessage + (breakLine ? EOL : ""));
- }
-}
-
-const logger: Logger = Logger.getInstance();
-export { logger };
diff --git a/src/index.ts b/src/index.ts
index 60606d4..c4148b4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,4 @@
-import { logger } from "@helpers/logger";
+import { logger } from "@creations.works/logger";
import { serverHandler } from "@/server";
diff --git a/src/server.ts b/src/server.ts
index 909813c..ee79859 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -1,6 +1,6 @@
import { resolve } from "node:path";
import { environment } from "@config/environment";
-import { logger } from "@helpers/logger";
+import { logger } from "@creations.works/logger";
import {
type BunFile,
FileSystemRouter,
@@ -39,7 +39,9 @@ class ServerHandler {
logger.info(
`Server running at http://${server.hostname}:${server.port}`,
- true,
+ {
+ breakLine: true,
+ }
);
this.logRoutes();
diff --git a/src/websocket.ts b/src/websocket.ts
index 99686e8..7b65476 100644
--- a/src/websocket.ts
+++ b/src/websocket.ts
@@ -1,4 +1,4 @@
-import { logger } from "@helpers/logger";
+import { logger } from "@creations.works/logger";
import type { ServerWebSocket } from "bun";
class WebSocketHandler {