move some things

src/server.ts

@@ -1,6 +1,7 @@
 import { resolve } from "node:path";
 import { Echo, echo } from "@atums/echo";
 import { environment } from "@config";
+import { webSocketHandler } from "@websocket";
 import {
 	type BunFile,
 	FileSystemRouter,
@@ -8,8 +9,6 @@ import {
 	type Server,
 } from "bun";
 
-import { webSocketHandler } from "@websocket";
-
 class ServerHandler {
 	private router: FileSystemRouter;
 
@@ -251,12 +250,9 @@ class ServerHandler {
 					} else {
 						extendedRequest.params = params;
 						extendedRequest.query = query;
+						extendedRequest.body = requestBody;
 
-						response = await routeModule.handler(
+						response = await routeModule.handler(extendedRequest, server);
-							extendedRequest,
-							requestBody,
-							server,
-						);
 
 						if (routeModule.routeDef.returns !== "*/*") {
 							response.headers.set(

types/logger.d.ts

@@ -1,9 +0,0 @@
-type ILogMessagePart = { value: string; color: string };
-
-type ILogMessageParts = {
-	level: ILogMessagePart;
-	filename: ILogMessagePart;
-	readableTimestamp: ILogMessagePart;
-	message: ILogMessagePart;
-	[key: string]: ILogMessagePart;
-};

types/routes.d.ts

@@ -5,11 +5,12 @@ type RouteDef = {
 	needsBody?: "multipart" | "json";
 };
 
-type RouteModule = {
+type handler = (
-	handler: (
 	request: Request | ExtendedRequest,
-		requestBody: unknown,
 	server: Server,
 ) => Promise<Response> | Response;
+
+type RouteModule = {
+	handler: handler;
 	routeDef: RouteDef;
 };

types/server.d.ts

@@ -5,4 +5,5 @@ interface ExtendedRequest extends Request {
 	startPerf: number;
 	query: Query;
 	params: Params;
+	body: unknown;
 }