From edd50ef9b161e046dec7d3fa7f1cb9f04827e327 Mon Sep 17 00:00:00 2001
From: Flummi <git@srv.fail>
Date: Sat, 15 Mar 2025 22:00:18 +0100
Subject: [PATCH] clean up imports in index.ts and router.ts, improve types in
 router.ts and types.d.ts

---
 src/index.ts   | 8 ++++----
 src/router.ts  | 8 ++++----
 src/types.d.ts | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 03a882f..601ad6e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,10 +2,10 @@ import http, { IncomingMessage, ServerResponse } from "node:http";
 import { URL } from "node:url";
 import querystring from "node:querystring";
 
-import Router from "./router.js";
-import Tpl from "./template.js";
+import Router from "./router";
+import Tpl from "./template";
 
-import { Request, Response, Middleware } from "./types.js";
+import { Request, Response, Middleware } from "./types";
 
 export { Router, Tpl };
 
@@ -114,7 +114,7 @@ export default class Flummpress {
     };
     req.cookies = {};
     if(req.headers.cookie) {
-      req.headers.cookie.split("; ").forEach((cookie) => {
+      req.headers.cookie.split("; ").forEach(cookie => {
         const [key, value] = cookie.split("=");
         req.cookies[key] = decodeURIComponent(value);
       });
diff --git a/src/router.ts b/src/router.ts
index 3ee1419..e0df380 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,8 +1,8 @@
 import fs from "node:fs";
 import path from "node:path";
-import Tpl from "./template.js";
+import Tpl from "./template";
 
-import { Middleware, RouteCallback } from "./types.js";
+import { Request, Middleware, RouteCallback } from "./types";
 
 export default class Router {
   private routes: Map<RegExp | string, { [key: string]: RouteCallback | RouteCallback[] }>;
@@ -232,9 +232,9 @@ export default class Router {
     if(!this.mimes.size)
       this.readMimes();
 
-    this.get(route, (req: any, res: any) => {
+    this.get(route, (req: Request, res: any) => {
       try {
-        const filename = req.url.pathname.replace(route, "") || "index.html";
+        const filename = req.parsedUrl.pathname.replace(route, "") || "index.html";
         const mime = this.mimes.get(filename.split(".").pop() || "");
         const file = path.join(dir, filename);
         const stat = fs.statSync(file);
diff --git a/src/types.d.ts b/src/types.d.ts
index 49a8a7f..187a3fe 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -7,7 +7,7 @@ export interface Request extends IncomingMessage {
     searchParams: URLSearchParams;
     qs: Record<string, string>;
   };
-  cookies: Record<string, string>;
+  cookies?: Record<string, string>;
   params?: Record<string, string>;
   post?: Record<string, string>;
 }