diesel-core 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diesel-core",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "main": "src/server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/ctx.js

@@ -11,11 +11,10 @@ export default function createCtx(req, url) {
     req,
     url,
     next: () => {},
-
+    ///////
     async body() {
       if (!parsedBody) {
         parsedBody = await parseBody(req)
-        return parsedBody;
       }
       return parsedBody;
     },
@@ -83,9 +82,9 @@ export default function createCtx(req, url) {
       });
     },
 
-    getParams(props) {
+    async getParams(props) {
       if (!parsedParams) {
-        parsedParams = extractDynamicParams(req.routePattern, url.pathname);
+        parsedParams = await extractDynamicParams(req.routePattern, url.pathname);
       }
       return props ? parsedParams[props] : parsedParams;
     },
@@ -123,16 +122,16 @@ export default function createCtx(req, url) {
         headers["Set-Cookie"] = cookieString;
       }
     },
-    getCookie(cookieName) {
+    async getCookie(cookieName) {
       if (!parsedCookie) {
-        parsedCookie = parseCookie(req.headers.get("cookie"));
+        parsedCookie = await parseCookie(req.headers.get("cookie"));
       }
       return cookieName ? parsedCookie[cookieName] : parsedCookie;
     },
   };
 }
 
-function parseCookie(header) {
+async function parseCookie(header) {
   const cookies = {};
   if (!header) return cookies;
 
@@ -144,7 +143,7 @@ function parseCookie(header) {
   return cookies;
 }
 
-const extractDynamicParams = (routePattern, path) => {
+async function extractDynamicParams (routePattern, path) {
   const object = {};
   const routeSegments = routePattern.split("/");
   const [pathWithoutQuery] = path.split("?"); // Ignore the query string in the path

package/src/handleRequest.js

@@ -10,7 +10,6 @@ export default async function handleRequest(req, url, diesel) {
   // Early return if route or method is not found
   if (!routeHandler || !routeHandler.handler) return responseNotFound(pathname);
   if (routeHandler.method !== method) return responseMethodNotAllowed();
-
   // If the route is dynamic, we only set routePattern if necessary
   if (routeHandler.isDynamic) req.routePattern = routeHandler.path;
 
@@ -19,7 +18,7 @@ export default async function handleRequest(req, url, diesel) {
   if (diesel.hasMiddleware) {
   const middlewares = [
     ...diesel.globalMiddlewares,
-    ...(diesel.middlewares.get(pathname) || [])
+    ...diesel.middlewares.get(pathname) || []
   ];
 
   const middlewareResult = await executeMiddleware(middlewares, ctx);

package/src/router.js

@@ -1,53 +1,43 @@
 import diesel from "./server";
 
-class Router extends diesel{
-    constructor(){
-        super()
-    }
-    #addRoute(method,path,handlers){
-        
+class Router extends diesel {
+  constructor() {
+    super();
+  }
+  #addRoute(method, path, handlers) {
+      if (!this.trie.root.subMiddlewares.has(path)) {
+          this.trie.root.subMiddlewares.set(path,[])
+        }  
         const middlewareHandlers = handlers.slice(0, -1);
 
-        if (!this.middlewares.has(path)) {
-            this.middlewares.set(path,[])
-        }
-        if (path === '/') {
-            middlewareHandlers.forEach(midlleware => {
-                if(!this.globalMiddlewares.includes(midlleware)){
-                    this.globalMiddlewares.push(midlleware)
-                }
-            })
-        } else {
-            if (!this.middlewares.get(path).includes(...middlewareHandlers)) {
-                this.middlewares.get(path).push(...middlewareHandlers);
-            }
-        }
-
-        const handler = handlers[handlers.length-1]
-        this.trie.insert(path,{handler,method})
-        
+    if (!this.trie.root.subMiddlewares.get(path).includes(...middlewareHandlers)) {
+        this.trie.root.subMiddlewares.get(path).push(...middlewareHandlers)
     }
-    get(path,...handlers){
-        return this.#addRoute("GET",path,handlers)
-}
 
-post(path,...handlers){
-        return this.#addRoute("POST",path,handlers)
-}
+    const handler = handlers[handlers.length - 1];
+    this.trie.insert(path, { handler, method });
+  }
+  get(path, ...handlers) {
+    return this.#addRoute("GET", path, handlers);
+  }
 
-put(path,...handlers){
-        return this.#addRoute("PUT",path,handlers)
-}
+  post(path, ...handlers) {
+    return this.#addRoute("POST", path, handlers);
+  }
 
-patch(path,...handlers){
-    if (handlers.length>0) {
-        return this.#addRoute("PATCH",path,handlers)
+  put(path, ...handlers) {
+    return this.#addRoute("PUT", path, handlers);
+  }
+
+  patch(path, ...handlers) {
+    if (handlers.length > 0) {
+      return this.#addRoute("PATCH", path, handlers);
     }
-}
+  }
 
-delete(path,...handlers){
-        return this.#addRoute("DELETE",path,handlers)
-}
+  delete(path, ...handlers) {
+    return this.#addRoute("DELETE", path, handlers);
+  }
 }
 
-export default Router
+export default Router;

package/src/server.js

@@ -27,9 +27,13 @@ class diesel {
         this.compile()
         const server = serve({
             port,
-            fetch: (req) => {
+            fetch: async (req) => {
                 const url = new  URL(req.url)
-                return handleRequest(req,url,this)
+                try {
+                    return await handleRequest(req,url,this)
+                } catch (error) {
+                    return new Response('Internal Server Error', { status: 500 });
+                }
             },
             onClose() {
                 console.log("Server is shutting down...");
@@ -44,6 +48,7 @@ class diesel {
 
     register(pathPrefix,handlerInstance){
         const routeEntries = Object.entries(handlerInstance.trie.root.children);
+        // console.log(handlerInstance.trie.root);
         handlerInstance.trie.root.subMiddlewares.forEach((middleware,path)=>{
             if (!this.middlewares.has(pathPrefix+path)) {
               this.middlewares.set(pathPrefix+path, []);

package/src/trie.js

@@ -98,7 +98,13 @@ class TrieNode {
       }
     
       // Fallback if method is not found
-      return null;
+      return {
+        path: node.path,
+        handler: node.handler,
+        isDynamic: node.isDynamic,
+        pattern: node.pattern,
+        method: node.method[routeMethodIndex]
+      };
     }