From 2eebc3126a8967d285566b3237dfdec28f50eb63 Mon Sep 17 00:00:00 2001 From: creations Date: Tue, 3 Jun 2025 21:03:28 -0400 Subject: [PATCH] - Remove Bunserver and just use buns type - Stop logging every start aswell as available routes --- .gitignore | 2 +- src/server.ts | 13 ++++++++----- types/bun.d.ts | 14 -------------- types/routes.d.ts | 2 +- types/server.d.ts | 8 ++++++++ 5 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 types/bun.d.ts create mode 100644 types/server.d.ts diff --git a/.gitignore b/.gitignore index ad20b9c..3ca3be7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /node_modules bun.lock -robots.txt logs public/custom +.env diff --git a/src/server.ts b/src/server.ts index e9dea42..d24b025 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,5 +1,5 @@ import { resolve } from "node:path"; -import { echo } from "@atums/echo"; +import { Echo, echo } from "@atums/echo"; import { environment } from "@config"; import { type BunFile, @@ -37,12 +37,15 @@ class ServerHandler { }, }); - echo.info(`Server running at http://${server.hostname}:${server.port}`); + const echoChild = new Echo({ disableFile: true }); - this.logRoutes(); + echoChild.info( + `Server running at http://${server.hostname}:${server.port}`, + ); + this.logRoutes(echoChild); } - private logRoutes(): void { + private logRoutes(echo: Echo): void { echo.info("Available routes:"); const sortedRoutes: [string, string][] = Object.entries( @@ -122,7 +125,7 @@ class ServerHandler { private async handleRequest( request: Request, - server: BunServer, + server: Server, ): Promise { const extendedRequest: ExtendedRequest = request as ExtendedRequest; extendedRequest.startPerf = performance.now(); diff --git a/types/bun.d.ts b/types/bun.d.ts deleted file mode 100644 index 018bf35..0000000 --- a/types/bun.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { Server } from "bun"; - -type Query = Record; -type Params = Record; - -declare global { - type BunServer = Server; - - interface ExtendedRequest extends Request { - startPerf: number; - query: Query; - params: Params; - } -} diff --git a/types/routes.d.ts b/types/routes.d.ts index 9d9d809..9814e87 100644 --- a/types/routes.d.ts +++ b/types/routes.d.ts @@ -9,7 +9,7 @@ type RouteModule = { handler: ( request: Request | ExtendedRequest, requestBody: unknown, - server: BunServer, + server: Server, ) => Promise | Response; routeDef: RouteDef; }; diff --git a/types/server.d.ts b/types/server.d.ts new file mode 100644 index 0000000..9afe286 --- /dev/null +++ b/types/server.d.ts @@ -0,0 +1,8 @@ +type Query = Record; +type Params = Record; + +interface ExtendedRequest extends Request { + startPerf: number; + query: Query; + params: Params; +}