diesel-core 0.0.12 → 0.0.14

package/CONTRIBUTING.md

@@ -1 +1 @@
-if you changes code OR fixing bugs  so after doing make sure to run bun build.js
+if you changes code OR fixing bugs  so after doing make sure to run tsc and  bun build.js

package/README.md

@@ -38,11 +38,89 @@ app.listen(port, () => {
 })
 
 ```
+## Filter and Route Security
+**Diesel** provides a simple way to manage public and protected routes by using a filter() method. You can define specific routes to be publicly accessible, while others will require authentication or custom middleware functions.
+
+### How to Use the Filter
+The **filter()** method allows you to secure certain endpoints while keeping others public. You can specify routes that should be publicly accessible using permitAll(), and apply authentication or other middleware to the remaining routes with require().
+
+
+### Example Usage
+```javascript
+import  Diesel  from "diesel-core";
+import jwt from 'jsonwebtoken';
+
+const app = new Diesel();
+
+async function authJwt (ctx:ContextType, server?:Server): Promise<void | Response> {
+  const token = await ctx.getCookie("accessToken");  // Retrieve the JWT token from cookies
+  if (!token) {
+    return ctx.status(401).json({ message: "Authentication token missing" });
+  }
+  try {
+    // Verify the JWT token using a secret key
+    const user = jwt.verify(token, secret);  // Replace with your JWT secret
+    // Set the user data in context
+    ctx.set("user", user);
+
+    // Proceed to the next middleware/route handler
+    return ctx.next();
+  } catch (error) {
+    return ctx.status(403).json({ message: "Invalid token" });
+  }
+}
+
+// Define routes and apply filter
+app
+  .filter()
+  .routeMatcher('/api/user/register', '/api/user/login', '/test/:id', '/cookie') // Define public routes
+  .permitAll() // Mark these routes as public (no auth required)
+  .require(authJwt); // Apply the authJwt middleware to all other routes
+
+// Example public route (no auth required)
+app.get("/api/user/register", async (xl) => {
+  return xl.json({ msg: "This is a public route. No authentication needed." });
+});
+
+// Example protected route (requires auth)
+app.get("/api/user/profile", async (xl) => {
+  // This route is protected, so the auth middleware will run before this handler
+  return xl.json({ msg: "You are authenticated!" });
+});
+
+// Start the server
+const port = 3000;
+app.listen(port, () => {
+  console.log(`Diesel is running on port ${port}`);
+});
+```
+## Filter Methods
+1. **routeMatcher(...routes: string[])** : Passed endpoints in this routeMatcher will be ***Public*** means they don't need authentication, including those with dynamic parameters (e.g., /test/:id).
+
+```javascript 
+.routeMatcher('/api/user/register', '/api/user/login', '/test/:id')
+```
+1. **permitAll()** : Marks the routes specified in routeMatcher() as publicly accessible, meaning no middleware (like authentication) will be required for these routes.
+
+```javascript 
+.permitAll()
+```
+1. **require(fnc?: middlewareFunc)** :Means that defined routes in ***routeMatcher*** is public & All endpoints needs authentication.
+
+*Note* : If you don't pass a middleware function to require(), DieselJS will throw an "Unauthorized" error by default. Ensure that you implement and pass a valid authentication function
+```javascript 
+.require(authJwt)
+```
+## Use Case
+ * **Public Routes** :  Some routes ***(like /api/user/register or /api/user/login)*** are often open to all users without authentication. These routes can be specified with permitAll().
+
+ * **Protected Routes** : For other routes ***(like /api/user/profile)***, you'll want to require authentication or custom middleware. Use require(authJwt) to ensure that the user is authenticated before accessing these routes.
 
 ## Using Hooks in DieselJS
 
 DieselJS allows you to enhance your request handling by utilizing hooks at various stages of the request lifecycle. This gives you the flexibility to execute custom logic for logging, authentication, data manipulation, and more.
 
+
 ### Available Hooks
 
 1. **onRequest**: Triggered when a request is received.

package/build.js

@@ -1,12 +1,14 @@
-// build.js
-await Bun.build({
+// tsc will create main folder
+Bun.build({
     entrypoints: [
-        './src/main.ts',
-        './src/ctx.ts',
-        './src/handleRequest.ts',
-        './src/trie.ts',
-        './src/router.ts'
+        './main/main.ts',
+        './main/ctx.ts',
+        './main/handleRequest.ts',
+        './main/trie.ts',
+        './main/router.ts'
     ],
     outdir: './dist',
     minify: true, // Enable minification
-});
+})
+
+await Bun.spawn(['rm', '-rf', './main']);

package/dist/handleRequest.js

@@ -1 +1 @@
-function W(G,E,I){let z=new Headers,J={},X=!1,L=null,Z=null,Y=null,K,M=200;return{req:G,server:E,url:I,next:()=>{},status(F){return M=F,this},getIP(){return this.server.requestIP(this.req)},async body(){if(!K)K=await j(G);if(K.error)return new Response(JSON.stringify({error:K.error}),{status:400});return K},setHeader(F,U){return z.set(F,U),this},set(F,U){return J[F]=U,this},get(F){return J[F]||null},setAuth(F){return X=F,this},getAuth(){return X},text(F,U){return new Response(F,{status:U??M,headers:z})},json(F,U){return new Response(JSON.stringify(F),{status:U??M,headers:z})},html(F,U){return new Response(Bun.file(F),{status:U??M,headers:z})},file(F,U){return new Response(Bun.file(F),{status:U??M,headers:z})},redirect(F,U){return z.set("Location",F),new Response(null,{status:U??302,headers:z})},getParams(F){if(!Y)Y=V(G?.routePattern,I?.pathname);return F?Y[F]||null:Y},getQuery(F){if(!L)L=Object.fromEntries(I.searchParams);return F?L[F]||null:L},async cookie(F,U,_={}){let $=`${encodeURIComponent(F)}=${encodeURIComponent(U)}`;if(_.maxAge)$+=`; Max-Age=${_.maxAge}`;if(_.expires)$+=`; Expires=${_.expires.toUTCString()}`;if(_.path)$+=`; Path=${_.path}`;if(_.domain)$+=`; Domain=${_.domain}`;if(_.secure)$+="; Secure";if(_.httpOnly)$+="; HttpOnly";if(_.sameSite)$+=`; SameSite=${_.sameSite}`;return z?.append("Set-Cookie",$),this},async getCookie(F){if(!Z){let U=G.headers.get("cookie");if(U)Z=await A(U)}return F?Z[F]||null:Z}}}async function A(G){let E={};if(!G)return E;return G.split(";").forEach((z)=>{let[J,X]=z?.trim()?.split("=");if(J&&X)E[J.trim()]=X.split(" ")[0].trim()}),E}function V(G,E){let I={},z=G.split("/"),[J]=E.split("?"),X=J.split("/");if(z.length!==X.length)return null;return z.forEach((L,Z)=>{if(L.startsWith(":")){let Y=L.slice(1);I[Y]=X[Z]}}),I}async function j(G){let E=G.headers.get("Content-Type")||"";if(!E)return{};try{if(E.startsWith("application/json"))return await G.json();if(E.startsWith("application/x-www-form-urlencoded")){let I=await G.text();return Object.fromEntries(new URLSearchParams(I))}if(E.startsWith("multipart/form-data")){let I=await G.formData();return D(I)}return{error:"Unknown request body type"}}catch(I){return{error:"Invalid request body format"}}}function D(G){let E={};for(let[I,z]of G.entries())E[I]=z;return E}async function Q(G,E,I,z){let J=W(G,E,I),X=z.trie.search(I.pathname,G.method);if(!X||!X.handler)return new Response(`Route not found for ${I.pathname}`,{status:404});if(X.method!==G.method)return new Response("Method not allowed",{status:405});if(X.isDynamic)G.routePattern=X.path;if(z.corsConfig){let L=await T(G,J,z.corsConfig);if(L)return L}if(z.hasOnReqHook&&z.hooks.onRequest)z.hooks.onRequest(J,E);if(z.filters.length>0){let L=G.routePattern??I.pathname;if(z.filters.includes(L)===!1)if(z.filterFunction){let Y=await z?.filterFunction(J);if(Y)return Y}else return new Response(JSON.stringify({message:"Authentication required"}),{status:400})}if(z.hasMiddleware){let L=[...z.globalMiddlewares,...z.middlewares.get(I.pathname)||[]];for(let Z of L){let Y=await Z(J,E);if(Y)return Y}}if(z.hasPreHandlerHook&&z.hooks.preHandler){let L=await z.hooks.preHandler(J);if(L)return L}try{let L=await X.handler(J);if(z.hasPostHandlerHook&&z.hooks.postHandler)await z.hooks.postHandler(J);if(z.hasOnSendHook&&z.hooks.onSend){let Z=await z.hooks.onSend(J,L);if(Z)return Z}return L??new Response("No response from handler",{status:204})}catch(L){return new Response("Internal Server Error",{status:500})}}async function T(G,E,I={}){let z=G.headers.get("origin")??"*",J=I?.origin,X=I?.allowedHeaders??["Content-Type","Authorization"],L=I?.methods??["GET","POST","PUT","DELETE","OPTIONS"],Z=I?.credentials??!1,Y=I?.exposedHeaders??[];if(E.setHeader("Access-Control-Allow-Methods",L),E.setHeader("Access-Control-Allow-Headers",X),E.setHeader("Access-Control-Allow-Credentials",Z),Y.length)E.setHeader("Access-Control-Expose-Headers",Y);if(J==="*")E.setHeader("Access-Control-Allow-Origin","*");else if(Array.isArray(J))if(z&&J.includes(z))E.setHeader("Access-Control-Allow-Origin",z);else if(J.includes("*"))E.setHeader("Access-Control-Allow-Origin","*");else return E.status(403).json({message:"CORS not allowed"});else if(typeof J==="string")if(z===J)E.setHeader("Access-Control-Allow-Origin",z);else return E.status(403).json({message:"CORS not allowed"});else return E.status(403).json({message:"CORS not allowed"});if(E.setHeader("Access-Control-Allow-Origin",z),G.method==="OPTIONS")return E.setHeader("Access-Control-Max-Age","86400"),E.status(204).text("");return null}export{Q as default};
+function W(G,E,I){let z=new Headers,J={},U=!1,Z=null,L=null,Y=null,$,M=200;return{req:G,server:E,url:I,next:()=>{},status(F){return M=F,this},getIP(){return this.server.requestIP(this.req)},async body(){if(!$)$=await j(G);if($.error)return new Response(JSON.stringify({error:$.error}),{status:400});return $},setHeader(F,X){return z.set(F,X),this},set(F,X){return J[F]=X,this},get(F){return J[F]||null},setAuth(F){return U=F,this},getAuth(){return U},text(F,X){return new Response(F,{status:X??M,headers:z})},json(F,X){return new Response(JSON.stringify(F),{status:X??M,headers:z})},html(F,X){return new Response(Bun.file(F),{status:X??M,headers:z})},file(F,X){return new Response(Bun.file(F),{status:X??M,headers:z})},redirect(F,X){return z.set("Location",F),new Response(null,{status:X??302,headers:z})},getParams(F){if(!Y)Y=V(G?.routePattern,I?.pathname);return F?Y[F]||null:Y},getQuery(F){if(!Z)Z=Object.fromEntries(I.searchParams);return F?Z[F]||null:Z},async cookie(F,X,_={}){let K=`${encodeURIComponent(F)}=${encodeURIComponent(X)}`;if(_.maxAge)K+=`; Max-Age=${_.maxAge}`;if(_.expires)K+=`; Expires=${_.expires.toUTCString()}`;if(_.path)K+=`; Path=${_.path}`;if(_.domain)K+=`; Domain=${_.domain}`;if(_.secure)K+="; Secure";if(_.httpOnly)K+="; HttpOnly";if(_.sameSite)K+=`; SameSite=${_.sameSite}`;return z?.append("Set-Cookie",K),this},async getCookie(F){if(!L){let X=G.headers.get("cookie");if(X)L=await A(X)}return F?L[F]||null:L}}}async function A(G){let E={};if(!G)return E;return G.split(";").forEach((z)=>{let[J,U]=z?.trim()?.split("=");if(J&&U)E[J.trim()]=U.split(" ")[0].trim()}),E}function V(G,E){let I={},z=G.split("/"),[J]=E.split("?"),U=J.split("/");if(z.length!==U.length)return null;return z.forEach((Z,L)=>{if(Z.startsWith(":")){let Y=Z.slice(1);I[Y]=U[L]}}),I}async function j(G){let E=G.headers.get("Content-Type")||"";if(!E)return{};try{if(E.startsWith("application/json"))return await G.json();if(E.startsWith("application/x-www-form-urlencoded")){let I=await G.text();return Object.fromEntries(new URLSearchParams(I))}if(E.startsWith("multipart/form-data")){let I=await G.formData();return D(I)}return{error:"Unknown request body type"}}catch(I){return{error:"Invalid request body format"}}}function D(G){let E={};for(let[I,z]of G.entries())E[I]=z;return E}async function Q(G,E,I,z){let J=W(G,E,I),U=z.trie.search(I.pathname,G.method);if(!U||U.method!==G.method)return new Response(U?"Method not allowed":`Route not found for ${I.pathname}`,{status:U?405:404});if(U.isDynamic)G.routePattern=U.path;if(z.corsConfig){let L=await T(G,J,z.corsConfig);if(L)return L}if(z.hasOnReqHook&&z.hooks.onRequest)z.hooks.onRequest(J,E);if(z.filters.length>0){let L=G.routePattern??I.pathname;if(z.filters.includes(L)===!1)if(z.filterFunction){let $=await z?.filterFunction(J,E);if($)return $}else return new Response(JSON.stringify({message:"Authentication required"}),{status:400})}if(z.hasMiddleware){let L=[...z.globalMiddlewares,...z.middlewares.get(I.pathname)||[]];for(let Y of L){let $=await Y(J,E);if($)return $}}if(z.hasPreHandlerHook&&z.hooks.preHandler){let L=await z.hooks.preHandler(J);if(L)return L}let Z=z.hasPreHandlerHook?await z.hooks.preHandler?.(J):null;if(Z)return Z;try{let L=await U.handler(J);if(z.hasPostHandlerHook&&z.hooks.postHandler)await z.hooks.postHandler(J);if(z.hasOnSendHook&&z.hooks.onSend){let Y=await z.hooks.onSend(J,L);if(Y)return Y}return L??new Response("No response from handler",{status:204})}catch(L){return new Response("Internal Server Error",{status:500})}}async function T(G,E,I={}){let z=G.headers.get("origin")??"*",J=I?.origin,U=I?.allowedHeaders??["Content-Type","Authorization"],Z=I?.methods??["GET","POST","PUT","DELETE","OPTIONS"],L=I?.credentials??!1,Y=I?.exposedHeaders??[];if(E.setHeader("Access-Control-Allow-Methods",Z),E.setHeader("Access-Control-Allow-Headers",U),E.setHeader("Access-Control-Allow-Credentials",L),Y.length)E.setHeader("Access-Control-Expose-Headers",Y);if(J==="*")E.setHeader("Access-Control-Allow-Origin","*");else if(Array.isArray(J))if(z&&J.includes(z))E.setHeader("Access-Control-Allow-Origin",z);else if(J.includes("*"))E.setHeader("Access-Control-Allow-Origin","*");else return E.status(403).json({message:"CORS not allowed"});else if(typeof J==="string")if(z===J)E.setHeader("Access-Control-Allow-Origin",z);else return E.status(403).json({message:"CORS not allowed"});else return E.status(403).json({message:"CORS not allowed"});if(E.setHeader("Access-Control-Allow-Origin",z),G.method==="OPTIONS")return E.setHeader("Access-Control-Max-Age","86400"),E.status(204).text("");return null}export{Q as default};

package/dist/main.d.ts

@@ -2,7 +2,7 @@ import Trie from "./trie.js";
 import rateLimit from "./utils.js";
 import { corsT, FilterMethods, HookFunction, HookType, middlewareFunc, type handlerFunction, type Hooks, type listenCalllBackType } from "./types.js";
 import { Server } from "bun";
-declare class Diesel {
+export default class Diesel {
     #private;
     routes: string[] | undefined;
     globalMiddlewares: middlewareFunc[];
@@ -31,4 +31,4 @@ declare class Diesel {
     patch(path: string, ...handlers: handlerFunction[]): this;
     delete(path: any, ...handlers: handlerFunction[]): this;
 }
-export { Diesel, rateLimit, };
+export { rateLimit, };

package/dist/main.js

@@ -1 +1 @@
-class K{children;isEndOfWord;handler;isDynamic;pattern;path;method;subMiddlewares;constructor(){this.children={},this.isEndOfWord=!1,this.handler=[],this.isDynamic=!1,this.pattern="",this.path="",this.method=[],this.subMiddlewares=new Map}}class Q{root;constructor(){this.root=new K}insert(z,F){let G=this.root,J=z.split("/").filter(Boolean);if(z==="/"){G.isEndOfWord=!0,G.handler.push(F.handler),G.path=z,G.method.push(F.method);return}for(let U of J){let X=!1,Y=U;if(U.startsWith(":"))X=!0,Y=":";if(!G.children[Y])G.children[Y]=new K;G=G.children[Y],G.isDynamic=X,G.pattern=U}G.isEndOfWord=!0,G.method.push(F.method),G.handler.push(F.handler),G.path=z}search(z,F){let G=this.root,J=z.split("/").filter(Boolean);for(let X of J){let Y=X;if(!G.children[Y])if(G.children[":"])G=G.children[":"];else return null;else G=G.children[Y]}let U=G.method.indexOf(F);if(U!==-1)return{path:G.path,handler:G.handler[U],isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]};return{path:G.path,handler:G.handler,isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]}}}function M(z,F,G){let J=new Headers,U={},X=!1,Y=null,$=null,_=null,A,V=200;return{req:z,server:F,url:G,next:()=>{},status(Z){return V=Z,this},getIP(){return this.server.requestIP(this.req)},async body(){if(!A)A=await T(z);if(A.error)return new Response(JSON.stringify({error:A.error}),{status:400});return A},setHeader(Z,E){return J.set(Z,E),this},set(Z,E){return U[Z]=E,this},get(Z){return U[Z]||null},setAuth(Z){return X=Z,this},getAuth(){return X},text(Z,E){return new Response(Z,{status:E??V,headers:J})},json(Z,E){return new Response(JSON.stringify(Z),{status:E??V,headers:J})},html(Z,E){return new Response(Bun.file(Z),{status:E??V,headers:J})},file(Z,E){return new Response(Bun.file(Z),{status:E??V,headers:J})},redirect(Z,E){return J.set("Location",Z),new Response(null,{status:E??302,headers:J})},getParams(Z){if(!_)_=N(z?.routePattern,G?.pathname);return Z?_[Z]||null:_},getQuery(Z){if(!Y)Y=Object.fromEntries(G.searchParams);return Z?Y[Z]||null:Y},async cookie(Z,E,L={}){let W=`${encodeURIComponent(Z)}=${encodeURIComponent(E)}`;if(L.maxAge)W+=`; Max-Age=${L.maxAge}`;if(L.expires)W+=`; Expires=${L.expires.toUTCString()}`;if(L.path)W+=`; Path=${L.path}`;if(L.domain)W+=`; Domain=${L.domain}`;if(L.secure)W+="; Secure";if(L.httpOnly)W+="; HttpOnly";if(L.sameSite)W+=`; SameSite=${L.sameSite}`;return J?.append("Set-Cookie",W),this},async getCookie(Z){if(!$){let E=z.headers.get("cookie");if(E)$=await D(E)}return Z?$[Z]||null:$}}}async function D(z){let F={};if(!z)return F;return z.split(";").forEach((J)=>{let[U,X]=J?.trim()?.split("=");if(U&&X)F[U.trim()]=X.split(" ")[0].trim()}),F}function N(z,F){let G={},J=z.split("/"),[U]=F.split("?"),X=U.split("/");if(J.length!==X.length)return null;return J.forEach((Y,$)=>{if(Y.startsWith(":")){let _=Y.slice(1);G[_]=X[$]}}),G}async function T(z){let F=z.headers.get("Content-Type")||"";if(!F)return{};try{if(F.startsWith("application/json"))return await z.json();if(F.startsWith("application/x-www-form-urlencoded")){let G=await z.text();return Object.fromEntries(new URLSearchParams(G))}if(F.startsWith("multipart/form-data")){let G=await z.formData();return b(G)}return{error:"Unknown request body type"}}catch(G){return{error:"Invalid request body format"}}}function b(z){let F={};for(let[G,J]of z.entries())F[G]=J;return F}async function B(z,F,G,J){let U=M(z,F,G),X=J.trie.search(G.pathname,z.method);if(!X||!X.handler)return new Response(`Route not found for ${G.pathname}`,{status:404});if(X.method!==z.method)return new Response("Method not allowed",{status:405});if(X.isDynamic)z.routePattern=X.path;if(J.corsConfig){let Y=await C(z,U,J.corsConfig);if(Y)return Y}if(J.hasOnReqHook&&J.hooks.onRequest)J.hooks.onRequest(U,F);if(J.filters.length>0){let Y=z.routePattern??G.pathname;if(J.filters.includes(Y)===!1)if(J.filterFunction){let _=await J?.filterFunction(U);if(_)return _}else return new Response(JSON.stringify({message:"Authentication required"}),{status:400})}if(J.hasMiddleware){let Y=[...J.globalMiddlewares,...J.middlewares.get(G.pathname)||[]];for(let $ of Y){let _=await $(U,F);if(_)return _}}if(J.hasPreHandlerHook&&J.hooks.preHandler){let Y=await J.hooks.preHandler(U);if(Y)return Y}try{let Y=await X.handler(U);if(J.hasPostHandlerHook&&J.hooks.postHandler)await J.hooks.postHandler(U);if(J.hasOnSendHook&&J.hooks.onSend){let $=await J.hooks.onSend(U,Y);if($)return $}return Y??new Response("No response from handler",{status:204})}catch(Y){return new Response("Internal Server Error",{status:500})}}async function C(z,F,G={}){let J=z.headers.get("origin")??"*",U=G?.origin,X=G?.allowedHeaders??["Content-Type","Authorization"],Y=G?.methods??["GET","POST","PUT","DELETE","OPTIONS"],$=G?.credentials??!1,_=G?.exposedHeaders??[];if(F.setHeader("Access-Control-Allow-Methods",Y),F.setHeader("Access-Control-Allow-Headers",X),F.setHeader("Access-Control-Allow-Credentials",$),_.length)F.setHeader("Access-Control-Expose-Headers",_);if(U==="*")F.setHeader("Access-Control-Allow-Origin","*");else if(Array.isArray(U))if(J&&U.includes(J))F.setHeader("Access-Control-Allow-Origin",J);else if(U.includes("*"))F.setHeader("Access-Control-Allow-Origin","*");else return F.status(403).json({message:"CORS not allowed"});else if(typeof U==="string")if(J===U)F.setHeader("Access-Control-Allow-Origin",J);else return F.status(403).json({message:"CORS not allowed"});else return F.status(403).json({message:"CORS not allowed"});if(F.setHeader("Access-Control-Allow-Origin",J),z.method==="OPTIONS")return F.setHeader("Access-Control-Max-Age","86400"),F.status(204).text("");return null}function j(z){let{time:F=60000,max:G=100,message:J="Rate limit exceeded. Please try again later."}=z,U=new Map;return(X)=>{let Y=new Date,$=X.getIP().address;if(!U.has($))U.set($,{count:0,startTime:Y});let _=U.get($);if(_)if(Y-_.startTime>F)_.count=1,_.startTime=Y;else _.count++;if(_&&_.count>G)return X.status(429).json({error:J});X.next()}}class v{routes;globalMiddlewares;middlewares;trie;hasOnReqHook;hasMiddleware;hasPreHandlerHook;hasPostHandlerHook;hasOnSendHook;hooks;corsConfig;filters;filterFunction;constructor(){this.routes=[],this.filters=[],this.filterFunction=null,this.globalMiddlewares=[],this.middlewares=new Map,this.trie=new Q,this.corsConfig=null,this.hasMiddleware=!1,this.hasOnReqHook=!1,this.hasPreHandlerHook=!1,this.hasPostHandlerHook=!1,this.hasOnSendHook=!1,this.hooks={onRequest:null,preHandler:null,postHandler:null,onSend:null,onError:null,onClose:null}}filter(){return{routeMatcher:(...z)=>{return this.routes=z.sort(),this.filter()},permitAll:()=>{for(let z of this?.routes)this.filters.push(z);return this.filter()},require:(z)=>{if(!z||typeof z!=="function")return new Response(JSON.stringify({message:"Authentication required"}),{status:400});this.filterFunction=z}}}cors(z){this.corsConfig=z}addHooks(z,F){if(typeof z!=="string")throw new Error("hookName must be a string");if(typeof F!=="function")throw new Error("callback must be a instance of function");if(this.hooks.hasOwnProperty(z))this.hooks[z]=F;else throw new Error(`Unknown hook type: ${z}`)}compile(){if(this.globalMiddlewares.length>0)this.hasMiddleware=!0;for(let[z,F]of this.middlewares.entries())if(F.length>0){this.hasMiddleware=!0;break}if(this.hooks.onRequest)this.hasOnReqHook=!0;if(this.hooks.preHandler)this.hasPreHandlerHook=!0;if(this.hooks.postHandler)this.hasPostHandlerHook=!0;if(this.hooks.onSend)this.hasOnSendHook=!0}listen(z,F,{sslCert:G=null,sslKey:J=null}={}){if(typeof Bun==="undefined")throw new Error(".listen() is designed to run on Bun only...");if(typeof z!=="number")throw new Error("Port must be a numeric value");this.compile();let U=this,X={port:z,fetch:async($,_)=>{let A=new URL($.url);try{return await B($,_,A,this)}catch(V){return new Response("Internal Server Error",{status:500})}},onClose(){console.log("Server is shutting down...")}};if(G&&J)X.certFile=G,X.keyFile=J;let Y=Bun.serve(X);if(typeof F==="function")return F();if(G&&J)console.log(`HTTPS server is running on https://localhost:${z}`);else console.log(`HTTP server is running on http://localhost:${z}`);return Y}register(z,F){if(typeof z!=="string")throw new Error("path must be a string");if(typeof F!=="object")throw new Error("handler parameter should be a instance of router object",F);let G=Object.entries(F.trie.root.children);F.trie.root.subMiddlewares.forEach((J,U)=>{if(!this.middlewares.has(z+U))this.middlewares.set(z+U,[]);J?.forEach((X)=>{if(!this.middlewares.get(z+U)?.includes(X))this.middlewares.get(z+U)?.push(X)})});for(let[J,U]of G){let X=z+U?.path,Y=U.handler[0],$=U.method[0];this.trie.insert(X,{handler:Y,method:$})}F.trie=new Q}#z(z,F,G){if(typeof F!=="string")throw new Error("Path must be a string type");if(typeof z!=="string")throw new Error("method must be a string type");let J=G.slice(0,-1),U=G[G.length-1];if(!this.middlewares.has(F))this.middlewares.set(F,[]);J.forEach((X)=>{if(F==="/"){if(!this.globalMiddlewares.includes(X))this.globalMiddlewares.push(X)}else if(!this.middlewares.get(F)?.includes(X))this.middlewares.get(F)?.push(X)}),this.trie.insert(F,{handler:U,method:z})}use(z,F){if(typeof z==="function"){if(!this.globalMiddlewares.includes(z))this.globalMiddlewares.push(z);return}let G=z;if(!this.middlewares.has(G))this.middlewares.set(G,[]);if(F){if(!this.middlewares.get(G)?.includes(F))this.middlewares.get(G)?.push(F)}}get(z,...F){return this.#z("GET",z,F),this}post(z,...F){return this.#z("POST",z,F),this}put(z,...F){return this.#z("PUT",z,F),this}patch(z,...F){return this.#z("PATCH",z,F),this}delete(z,...F){return this.#z("DELETE",z,F),this}}export{j as rateLimit,v as Diesel};
+class D{children;isEndOfWord;handler;isDynamic;pattern;path;method;subMiddlewares;constructor(){this.children={},this.isEndOfWord=!1,this.handler=[],this.isDynamic=!1,this.pattern="",this.path="",this.method=[],this.subMiddlewares=new Map}}class Q{root;constructor(){this.root=new D}insert(z,F){let G=this.root,J=z.split("/").filter(Boolean);if(z==="/"){G.isEndOfWord=!0,G.handler.push(F.handler),G.path=z,G.method.push(F.method);return}for(let U of J){let X=!1,_=U;if(U.startsWith(":"))X=!0,_=":";if(!G.children[_])G.children[_]=new D;G=G.children[_],G.isDynamic=X,G.pattern=U}G.isEndOfWord=!0,G.method.push(F.method),G.handler.push(F.handler),G.path=z}search(z,F){let G=this.root,J=z.split("/").filter(Boolean);for(let X of J){let _=X;if(!G.children[_])if(G.children[":"])G=G.children[":"];else return null;else G=G.children[_]}let U=G.method.indexOf(F);if(U!==-1)return{path:G.path,handler:G.handler[U],isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]};return{path:G.path,handler:G.handler,isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]}}}function K(z,F,G){let J=new Headers,U={},X=!1,_=null,Y=null,$=null,L,V=200;return{req:z,server:F,url:G,next:()=>{},status(Z){return V=Z,this},getIP(){return this.server.requestIP(this.req)},async body(){if(!L)L=await b(z);if(L.error)return new Response(JSON.stringify({error:L.error}),{status:400});return L},setHeader(Z,E){return J.set(Z,E),this},set(Z,E){return U[Z]=E,this},get(Z){return U[Z]||null},setAuth(Z){return X=Z,this},getAuth(){return X},text(Z,E){return new Response(Z,{status:E??V,headers:J})},json(Z,E){return new Response(JSON.stringify(Z),{status:E??V,headers:J})},html(Z,E){return new Response(Bun.file(Z),{status:E??V,headers:J})},file(Z,E){return new Response(Bun.file(Z),{status:E??V,headers:J})},redirect(Z,E){return J.set("Location",Z),new Response(null,{status:E??302,headers:J})},getParams(Z){if(!$)$=T(z?.routePattern,G?.pathname);return Z?$[Z]||null:$},getQuery(Z){if(!_)_=Object.fromEntries(G.searchParams);return Z?_[Z]||null:_},async cookie(Z,E,W={}){let A=`${encodeURIComponent(Z)}=${encodeURIComponent(E)}`;if(W.maxAge)A+=`; Max-Age=${W.maxAge}`;if(W.expires)A+=`; Expires=${W.expires.toUTCString()}`;if(W.path)A+=`; Path=${W.path}`;if(W.domain)A+=`; Domain=${W.domain}`;if(W.secure)A+="; Secure";if(W.httpOnly)A+="; HttpOnly";if(W.sameSite)A+=`; SameSite=${W.sameSite}`;return J?.append("Set-Cookie",A),this},async getCookie(Z){if(!Y){let E=z.headers.get("cookie");if(E)Y=await N(E)}return Z?Y[Z]||null:Y}}}async function N(z){let F={};if(!z)return F;return z.split(";").forEach((J)=>{let[U,X]=J?.trim()?.split("=");if(U&&X)F[U.trim()]=X.split(" ")[0].trim()}),F}function T(z,F){let G={},J=z.split("/"),[U]=F.split("?"),X=U.split("/");if(J.length!==X.length)return null;return J.forEach((_,Y)=>{if(_.startsWith(":")){let $=_.slice(1);G[$]=X[Y]}}),G}async function b(z){let F=z.headers.get("Content-Type")||"";if(!F)return{};try{if(F.startsWith("application/json"))return await z.json();if(F.startsWith("application/x-www-form-urlencoded")){let G=await z.text();return Object.fromEntries(new URLSearchParams(G))}if(F.startsWith("multipart/form-data")){let G=await z.formData();return C(G)}return{error:"Unknown request body type"}}catch(G){return{error:"Invalid request body format"}}}function C(z){let F={};for(let[G,J]of z.entries())F[G]=J;return F}async function M(z,F,G,J){let U=K(z,F,G),X=J.trie.search(G.pathname,z.method);if(!X||X.method!==z.method)return new Response(X?"Method not allowed":`Route not found for ${G.pathname}`,{status:X?405:404});if(X.isDynamic)z.routePattern=X.path;if(J.corsConfig){let Y=await v(z,U,J.corsConfig);if(Y)return Y}if(J.hasOnReqHook&&J.hooks.onRequest)J.hooks.onRequest(U,F);if(J.filters.length>0){let Y=z.routePattern??G.pathname;if(J.filters.includes(Y)===!1)if(J.filterFunction){let L=await J?.filterFunction(U,F);if(L)return L}else return new Response(JSON.stringify({message:"Authentication required"}),{status:400})}if(J.hasMiddleware){let Y=[...J.globalMiddlewares,...J.middlewares.get(G.pathname)||[]];for(let $ of Y){let L=await $(U,F);if(L)return L}}if(J.hasPreHandlerHook&&J.hooks.preHandler){let Y=await J.hooks.preHandler(U);if(Y)return Y}let _=J.hasPreHandlerHook?await J.hooks.preHandler?.(U):null;if(_)return _;try{let Y=await X.handler(U);if(J.hasPostHandlerHook&&J.hooks.postHandler)await J.hooks.postHandler(U);if(J.hasOnSendHook&&J.hooks.onSend){let $=await J.hooks.onSend(U,Y);if($)return $}return Y??new Response("No response from handler",{status:204})}catch(Y){return new Response("Internal Server Error",{status:500})}}async function v(z,F,G={}){let J=z.headers.get("origin")??"*",U=G?.origin,X=G?.allowedHeaders??["Content-Type","Authorization"],_=G?.methods??["GET","POST","PUT","DELETE","OPTIONS"],Y=G?.credentials??!1,$=G?.exposedHeaders??[];if(F.setHeader("Access-Control-Allow-Methods",_),F.setHeader("Access-Control-Allow-Headers",X),F.setHeader("Access-Control-Allow-Credentials",Y),$.length)F.setHeader("Access-Control-Expose-Headers",$);if(U==="*")F.setHeader("Access-Control-Allow-Origin","*");else if(Array.isArray(U))if(J&&U.includes(J))F.setHeader("Access-Control-Allow-Origin",J);else if(U.includes("*"))F.setHeader("Access-Control-Allow-Origin","*");else return F.status(403).json({message:"CORS not allowed"});else if(typeof U==="string")if(J===U)F.setHeader("Access-Control-Allow-Origin",J);else return F.status(403).json({message:"CORS not allowed"});else return F.status(403).json({message:"CORS not allowed"});if(F.setHeader("Access-Control-Allow-Origin",J),z.method==="OPTIONS")return F.setHeader("Access-Control-Max-Age","86400"),F.status(204).text("");return null}function B(z){let{time:F=60000,max:G=100,message:J="Rate limit exceeded. Please try again later."}=z,U=new Map;return(X)=>{let _=new Date,Y=X.getIP().address;if(!U.has(Y))U.set(Y,{count:0,startTime:_});let $=U.get(Y);if($)if(_-$.startTime>F)$.count=1,$.startTime=_;else $.count++;if($&&$.count>G)return X.status(429).json({error:J});X.next()}}class j{routes;globalMiddlewares;middlewares;trie;hasOnReqHook;hasMiddleware;hasPreHandlerHook;hasPostHandlerHook;hasOnSendHook;hooks;corsConfig;filters;filterFunction;constructor(){this.routes=[],this.filters=[],this.filterFunction=null,this.globalMiddlewares=[],this.middlewares=new Map,this.trie=new Q,this.corsConfig=null,this.hasMiddleware=!1,this.hasOnReqHook=!1,this.hasPreHandlerHook=!1,this.hasPostHandlerHook=!1,this.hasOnSendHook=!1,this.hooks={onRequest:null,preHandler:null,postHandler:null,onSend:null,onError:null,onClose:null}}filter(){return{routeMatcher:(...z)=>{return this.routes=z.sort(),this.filter()},permitAll:()=>{for(let z of this?.routes)this.filters.push(z);return this.filter()},require:(z)=>{if(!z||typeof z!=="function")return new Response(JSON.stringify({message:"Authentication required"}),{status:400});this.filterFunction=z}}}cors(z){this.corsConfig=z}addHooks(z,F){if(typeof z!=="string")throw new Error("hookName must be a string");if(typeof F!=="function")throw new Error("callback must be a instance of function");if(this.hooks.hasOwnProperty(z))this.hooks[z]=F;else throw new Error(`Unknown hook type: ${z}`)}compile(){if(this.globalMiddlewares.length>0)this.hasMiddleware=!0;for(let[z,F]of this.middlewares.entries())if(F.length>0){this.hasMiddleware=!0;break}if(this.hooks.onRequest)this.hasOnReqHook=!0;if(this.hooks.preHandler)this.hasPreHandlerHook=!0;if(this.hooks.postHandler)this.hasPostHandlerHook=!0;if(this.hooks.onSend)this.hasOnSendHook=!0}listen(z,F,{sslCert:G=null,sslKey:J=null}={}){if(typeof Bun==="undefined")throw new Error(".listen() is designed to run on Bun only...");if(typeof z!=="number")throw new Error("Port must be a numeric value");this.compile();let U=this,X={port:z,fetch:async(Y,$)=>{let L=new URL(Y.url);try{return await M(Y,$,L,this)}catch(V){return new Response("Internal Server Error",{status:500})}},onClose(){console.log("Server is shutting down...")}};if(G&&J)X.certFile=G,X.keyFile=J;let _=Bun.serve(X);if(typeof F==="function")return F();if(G&&J)console.log(`HTTPS server is running on https://localhost:${z}`);else console.log(`HTTP server is running on http://localhost:${z}`);return _}register(z,F){if(typeof z!=="string")throw new Error("path must be a string");if(typeof F!=="object")throw new Error("handler parameter should be a instance of router object",F);let G=Object.entries(F.trie.root.children);F.trie.root.subMiddlewares.forEach((J,U)=>{if(!this.middlewares.has(z+U))this.middlewares.set(z+U,[]);J?.forEach((X)=>{if(!this.middlewares.get(z+U)?.includes(X))this.middlewares.get(z+U)?.push(X)})});for(let[J,U]of G){let X=z+U?.path,_=U.handler[0],Y=U.method[0];this.trie.insert(X,{handler:_,method:Y})}F.trie=new Q}#z(z,F,G){if(typeof F!=="string")throw new Error("Path must be a string type");if(typeof z!=="string")throw new Error("method must be a string type");let J=G.slice(0,-1),U=G[G.length-1];if(!this.middlewares.has(F))this.middlewares.set(F,[]);J.forEach((X)=>{if(F==="/"){if(!this.globalMiddlewares.includes(X))this.globalMiddlewares.push(X)}else if(!this.middlewares.get(F)?.includes(X))this.middlewares.get(F)?.push(X)}),this.trie.insert(F,{handler:U,method:z})}use(z,F){if(typeof z==="function"){if(!this.globalMiddlewares.includes(z))this.globalMiddlewares.push(z);return}let G=z;if(!this.middlewares.has(G))this.middlewares.set(G,[]);if(F){if(!this.middlewares.get(G)?.includes(F))this.middlewares.get(G)?.push(F)}}get(z,...F){return this.#z("GET",z,F),this}post(z,...F){return this.#z("POST",z,F),this}put(z,...F){return this.#z("PUT",z,F),this}patch(z,...F){return this.#z("PATCH",z,F),this}delete(z,...F){return this.#z("DELETE",z,F),this}}export{B as rateLimit,j as default};

package/dist/router.d.ts

@@ -1,4 +1,4 @@
-import { Diesel } from "./main";
+import Diesel from "./main";
 import type { handlerFunction } from "./types";
 declare class Router extends Diesel {
     #private;

package/dist/router.js

@@ -1 +1 @@
-class K{children;isEndOfWord;handler;isDynamic;pattern;path;method;subMiddlewares;constructor(){this.children={},this.isEndOfWord=!1,this.handler=[],this.isDynamic=!1,this.pattern="",this.path="",this.method=[],this.subMiddlewares=new Map}}class Q{root;constructor(){this.root=new K}insert(F,z){let G=this.root,J=F.split("/").filter(Boolean);if(F==="/"){G.isEndOfWord=!0,G.handler.push(z.handler),G.path=F,G.method.push(z.method);return}for(let U of J){let X=!1,Y=U;if(U.startsWith(":"))X=!0,Y=":";if(!G.children[Y])G.children[Y]=new K;G=G.children[Y],G.isDynamic=X,G.pattern=U}G.isEndOfWord=!0,G.method.push(z.method),G.handler.push(z.handler),G.path=F}search(F,z){let G=this.root,J=F.split("/").filter(Boolean);for(let X of J){let Y=X;if(!G.children[Y])if(G.children[":"])G=G.children[":"];else return null;else G=G.children[Y]}let U=G.method.indexOf(z);if(U!==-1)return{path:G.path,handler:G.handler[U],isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]};return{path:G.path,handler:G.handler,isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]}}}function B(F,z,G){let J=new Headers,U={},X=!1,Y=null,$=null,_=null,A,V=200;return{req:F,server:z,url:G,next:()=>{},status(Z){return V=Z,this},getIP(){return this.server.requestIP(this.req)},async body(){if(!A)A=await b(F);if(A.error)return new Response(JSON.stringify({error:A.error}),{status:400});return A},setHeader(Z,E){return J.set(Z,E),this},set(Z,E){return U[Z]=E,this},get(Z){return U[Z]||null},setAuth(Z){return X=Z,this},getAuth(){return X},text(Z,E){return new Response(Z,{status:E??V,headers:J})},json(Z,E){return new Response(JSON.stringify(Z),{status:E??V,headers:J})},html(Z,E){return new Response(Bun.file(Z),{status:E??V,headers:J})},file(Z,E){return new Response(Bun.file(Z),{status:E??V,headers:J})},redirect(Z,E){return J.set("Location",Z),new Response(null,{status:E??302,headers:J})},getParams(Z){if(!_)_=C(F?.routePattern,G?.pathname);return Z?_[Z]||null:_},getQuery(Z){if(!Y)Y=Object.fromEntries(G.searchParams);return Z?Y[Z]||null:Y},async cookie(Z,E,L={}){let W=`${encodeURIComponent(Z)}=${encodeURIComponent(E)}`;if(L.maxAge)W+=`; Max-Age=${L.maxAge}`;if(L.expires)W+=`; Expires=${L.expires.toUTCString()}`;if(L.path)W+=`; Path=${L.path}`;if(L.domain)W+=`; Domain=${L.domain}`;if(L.secure)W+="; Secure";if(L.httpOnly)W+="; HttpOnly";if(L.sameSite)W+=`; SameSite=${L.sameSite}`;return J?.append("Set-Cookie",W),this},async getCookie(Z){if(!$){let E=F.headers.get("cookie");if(E)$=await T(E)}return Z?$[Z]||null:$}}}async function T(F){let z={};if(!F)return z;return F.split(";").forEach((J)=>{let[U,X]=J?.trim()?.split("=");if(U&&X)z[U.trim()]=X.split(" ")[0].trim()}),z}function C(F,z){let G={},J=F.split("/"),[U]=z.split("?"),X=U.split("/");if(J.length!==X.length)return null;return J.forEach((Y,$)=>{if(Y.startsWith(":")){let _=Y.slice(1);G[_]=X[$]}}),G}async function b(F){let z=F.headers.get("Content-Type")||"";if(!z)return{};try{if(z.startsWith("application/json"))return await F.json();if(z.startsWith("application/x-www-form-urlencoded")){let G=await F.text();return Object.fromEntries(new URLSearchParams(G))}if(z.startsWith("multipart/form-data")){let G=await F.formData();return v(G)}return{error:"Unknown request body type"}}catch(G){return{error:"Invalid request body format"}}}function v(F){let z={};for(let[G,J]of F.entries())z[G]=J;return z}async function j(F,z,G,J){let U=B(F,z,G),X=J.trie.search(G.pathname,F.method);if(!X||!X.handler)return new Response(`Route not found for ${G.pathname}`,{status:404});if(X.method!==F.method)return new Response("Method not allowed",{status:405});if(X.isDynamic)F.routePattern=X.path;if(J.corsConfig){let Y=await I(F,U,J.corsConfig);if(Y)return Y}if(J.hasOnReqHook&&J.hooks.onRequest)J.hooks.onRequest(U,z);if(J.filters.length>0){let Y=F.routePattern??G.pathname;if(J.filters.includes(Y)===!1)if(J.filterFunction){let _=await J?.filterFunction(U);if(_)return _}else return new Response(JSON.stringify({message:"Authentication required"}),{status:400})}if(J.hasMiddleware){let Y=[...J.globalMiddlewares,...J.middlewares.get(G.pathname)||[]];for(let $ of Y){let _=await $(U,z);if(_)return _}}if(J.hasPreHandlerHook&&J.hooks.preHandler){let Y=await J.hooks.preHandler(U);if(Y)return Y}try{let Y=await X.handler(U);if(J.hasPostHandlerHook&&J.hooks.postHandler)await J.hooks.postHandler(U);if(J.hasOnSendHook&&J.hooks.onSend){let $=await J.hooks.onSend(U,Y);if($)return $}return Y??new Response("No response from handler",{status:204})}catch(Y){return new Response("Internal Server Error",{status:500})}}async function I(F,z,G={}){let J=F.headers.get("origin")??"*",U=G?.origin,X=G?.allowedHeaders??["Content-Type","Authorization"],Y=G?.methods??["GET","POST","PUT","DELETE","OPTIONS"],$=G?.credentials??!1,_=G?.exposedHeaders??[];if(z.setHeader("Access-Control-Allow-Methods",Y),z.setHeader("Access-Control-Allow-Headers",X),z.setHeader("Access-Control-Allow-Credentials",$),_.length)z.setHeader("Access-Control-Expose-Headers",_);if(U==="*")z.setHeader("Access-Control-Allow-Origin","*");else if(Array.isArray(U))if(J&&U.includes(J))z.setHeader("Access-Control-Allow-Origin",J);else if(U.includes("*"))z.setHeader("Access-Control-Allow-Origin","*");else return z.status(403).json({message:"CORS not allowed"});else if(typeof U==="string")if(J===U)z.setHeader("Access-Control-Allow-Origin",J);else return z.status(403).json({message:"CORS not allowed"});else return z.status(403).json({message:"CORS not allowed"});if(z.setHeader("Access-Control-Allow-Origin",J),F.method==="OPTIONS")return z.setHeader("Access-Control-Max-Age","86400"),z.status(204).text("");return null}function M(F){let{time:z=60000,max:G=100,message:J="Rate limit exceeded. Please try again later."}=F,U=new Map;return(X)=>{let Y=new Date,$=X.getIP().address;if(!U.has($))U.set($,{count:0,startTime:Y});let _=U.get($);if(_)if(Y-_.startTime>z)_.count=1,_.startTime=Y;else _.count++;if(_&&_.count>G)return X.status(429).json({error:J});X.next()}}class D{routes;globalMiddlewares;middlewares;trie;hasOnReqHook;hasMiddleware;hasPreHandlerHook;hasPostHandlerHook;hasOnSendHook;hooks;corsConfig;filters;filterFunction;constructor(){this.routes=[],this.filters=[],this.filterFunction=null,this.globalMiddlewares=[],this.middlewares=new Map,this.trie=new Q,this.corsConfig=null,this.hasMiddleware=!1,this.hasOnReqHook=!1,this.hasPreHandlerHook=!1,this.hasPostHandlerHook=!1,this.hasOnSendHook=!1,this.hooks={onRequest:null,preHandler:null,postHandler:null,onSend:null,onError:null,onClose:null}}filter(){return{routeMatcher:(...F)=>{return this.routes=F.sort(),this.filter()},permitAll:()=>{for(let F of this?.routes)this.filters.push(F);return this.filter()},require:(F)=>{if(!F||typeof F!=="function")return new Response(JSON.stringify({message:"Authentication required"}),{status:400});this.filterFunction=F}}}cors(F){this.corsConfig=F}addHooks(F,z){if(typeof F!=="string")throw new Error("hookName must be a string");if(typeof z!=="function")throw new Error("callback must be a instance of function");if(this.hooks.hasOwnProperty(F))this.hooks[F]=z;else throw new Error(`Unknown hook type: ${F}`)}compile(){if(this.globalMiddlewares.length>0)this.hasMiddleware=!0;for(let[F,z]of this.middlewares.entries())if(z.length>0){this.hasMiddleware=!0;break}if(this.hooks.onRequest)this.hasOnReqHook=!0;if(this.hooks.preHandler)this.hasPreHandlerHook=!0;if(this.hooks.postHandler)this.hasPostHandlerHook=!0;if(this.hooks.onSend)this.hasOnSendHook=!0}listen(F,z,{sslCert:G=null,sslKey:J=null}={}){if(typeof Bun==="undefined")throw new Error(".listen() is designed to run on Bun only...");if(typeof F!=="number")throw new Error("Port must be a numeric value");this.compile();let U=this,X={port:F,fetch:async($,_)=>{let A=new URL($.url);try{return await j($,_,A,this)}catch(V){return new Response("Internal Server Error",{status:500})}},onClose(){console.log("Server is shutting down...")}};if(G&&J)X.certFile=G,X.keyFile=J;let Y=Bun.serve(X);if(typeof z==="function")return z();if(G&&J)console.log(`HTTPS server is running on https://localhost:${F}`);else console.log(`HTTP server is running on http://localhost:${F}`);return Y}register(F,z){if(typeof F!=="string")throw new Error("path must be a string");if(typeof z!=="object")throw new Error("handler parameter should be a instance of router object",z);let G=Object.entries(z.trie.root.children);z.trie.root.subMiddlewares.forEach((J,U)=>{if(!this.middlewares.has(F+U))this.middlewares.set(F+U,[]);J?.forEach((X)=>{if(!this.middlewares.get(F+U)?.includes(X))this.middlewares.get(F+U)?.push(X)})});for(let[J,U]of G){let X=F+U?.path,Y=U.handler[0],$=U.method[0];this.trie.insert(X,{handler:Y,method:$})}z.trie=new Q}#z(F,z,G){if(typeof z!=="string")throw new Error("Path must be a string type");if(typeof F!=="string")throw new Error("method must be a string type");let J=G.slice(0,-1),U=G[G.length-1];if(!this.middlewares.has(z))this.middlewares.set(z,[]);J.forEach((X)=>{if(z==="/"){if(!this.globalMiddlewares.includes(X))this.globalMiddlewares.push(X)}else if(!this.middlewares.get(z)?.includes(X))this.middlewares.get(z)?.push(X)}),this.trie.insert(z,{handler:U,method:F})}use(F,z){if(typeof F==="function"){if(!this.globalMiddlewares.includes(F))this.globalMiddlewares.push(F);return}let G=F;if(!this.middlewares.has(G))this.middlewares.set(G,[]);if(z){if(!this.middlewares.get(G)?.includes(z))this.middlewares.get(G)?.push(z)}}get(F,...z){return this.#z("GET",F,z),this}post(F,...z){return this.#z("POST",F,z),this}put(F,...z){return this.#z("PUT",F,z),this}patch(F,...z){return this.#z("PATCH",F,z),this}delete(F,...z){return this.#z("DELETE",F,z),this}}class N extends D{constructor(){super()}#z(F,z,G){if(!this.trie.root.subMiddlewares.has(z))this.trie.root.subMiddlewares.set(z,[]);let J=G.slice(0,-1),U=this.trie.root.subMiddlewares.get(z);J.forEach((Y)=>{if(!U?.includes(Y))U?.push(Y)});let X=G[G.length-1];this.trie.insert(z,{handler:X,method:F})}get(F,...z){return this.#z("GET",F,z),this}post(F,...z){return this.#z("POST",F,z),this}put(F,...z){return this.#z("PUT",F,z),this}patch(F,...z){return this.#z("PATCH",F,z),this}delete(F,...z){return this.#z("DELETE",F,z),this}}var x=N;export{x as default};
+class B{children;isEndOfWord;handler;isDynamic;pattern;path;method;subMiddlewares;constructor(){this.children={},this.isEndOfWord=!1,this.handler=[],this.isDynamic=!1,this.pattern="",this.path="",this.method=[],this.subMiddlewares=new Map}}class Q{root;constructor(){this.root=new B}insert(F,z){let G=this.root,J=F.split("/").filter(Boolean);if(F==="/"){G.isEndOfWord=!0,G.handler.push(z.handler),G.path=F,G.method.push(z.method);return}for(let U of J){let X=!1,Y=U;if(U.startsWith(":"))X=!0,Y=":";if(!G.children[Y])G.children[Y]=new B;G=G.children[Y],G.isDynamic=X,G.pattern=U}G.isEndOfWord=!0,G.method.push(z.method),G.handler.push(z.handler),G.path=F}search(F,z){let G=this.root,J=F.split("/").filter(Boolean);for(let X of J){let Y=X;if(!G.children[Y])if(G.children[":"])G=G.children[":"];else return null;else G=G.children[Y]}let U=G.method.indexOf(z);if(U!==-1)return{path:G.path,handler:G.handler[U],isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]};return{path:G.path,handler:G.handler,isDynamic:G.isDynamic,pattern:G.pattern,method:G.method[U]}}}function D(F,z,G){let J=new Headers,U={},X=!1,Y=null,Z=null,$=null,L,V=200;return{req:F,server:z,url:G,next:()=>{},status(_){return V=_,this},getIP(){return this.server.requestIP(this.req)},async body(){if(!L)L=await b(F);if(L.error)return new Response(JSON.stringify({error:L.error}),{status:400});return L},setHeader(_,E){return J.set(_,E),this},set(_,E){return U[_]=E,this},get(_){return U[_]||null},setAuth(_){return X=_,this},getAuth(){return X},text(_,E){return new Response(_,{status:E??V,headers:J})},json(_,E){return new Response(JSON.stringify(_),{status:E??V,headers:J})},html(_,E){return new Response(Bun.file(_),{status:E??V,headers:J})},file(_,E){return new Response(Bun.file(_),{status:E??V,headers:J})},redirect(_,E){return J.set("Location",_),new Response(null,{status:E??302,headers:J})},getParams(_){if(!$)$=C(F?.routePattern,G?.pathname);return _?$[_]||null:$},getQuery(_){if(!Y)Y=Object.fromEntries(G.searchParams);return _?Y[_]||null:Y},async cookie(_,E,W={}){let A=`${encodeURIComponent(_)}=${encodeURIComponent(E)}`;if(W.maxAge)A+=`; Max-Age=${W.maxAge}`;if(W.expires)A+=`; Expires=${W.expires.toUTCString()}`;if(W.path)A+=`; Path=${W.path}`;if(W.domain)A+=`; Domain=${W.domain}`;if(W.secure)A+="; Secure";if(W.httpOnly)A+="; HttpOnly";if(W.sameSite)A+=`; SameSite=${W.sameSite}`;return J?.append("Set-Cookie",A),this},async getCookie(_){if(!Z){let E=F.headers.get("cookie");if(E)Z=await T(E)}return _?Z[_]||null:Z}}}async function T(F){let z={};if(!F)return z;return F.split(";").forEach((J)=>{let[U,X]=J?.trim()?.split("=");if(U&&X)z[U.trim()]=X.split(" ")[0].trim()}),z}function C(F,z){let G={},J=F.split("/"),[U]=z.split("?"),X=U.split("/");if(J.length!==X.length)return null;return J.forEach((Y,Z)=>{if(Y.startsWith(":")){let $=Y.slice(1);G[$]=X[Z]}}),G}async function b(F){let z=F.headers.get("Content-Type")||"";if(!z)return{};try{if(z.startsWith("application/json"))return await F.json();if(z.startsWith("application/x-www-form-urlencoded")){let G=await F.text();return Object.fromEntries(new URLSearchParams(G))}if(z.startsWith("multipart/form-data")){let G=await F.formData();return v(G)}return{error:"Unknown request body type"}}catch(G){return{error:"Invalid request body format"}}}function v(F){let z={};for(let[G,J]of F.entries())z[G]=J;return z}async function j(F,z,G,J){let U=D(F,z,G),X=J.trie.search(G.pathname,F.method);if(!X||X.method!==F.method)return new Response(X?"Method not allowed":`Route not found for ${G.pathname}`,{status:X?405:404});if(X.isDynamic)F.routePattern=X.path;if(J.corsConfig){let Z=await I(F,U,J.corsConfig);if(Z)return Z}if(J.hasOnReqHook&&J.hooks.onRequest)J.hooks.onRequest(U,z);if(J.filters.length>0){let Z=F.routePattern??G.pathname;if(J.filters.includes(Z)===!1)if(J.filterFunction){let L=await J?.filterFunction(U,z);if(L)return L}else return new Response(JSON.stringify({message:"Authentication required"}),{status:400})}if(J.hasMiddleware){let Z=[...J.globalMiddlewares,...J.middlewares.get(G.pathname)||[]];for(let $ of Z){let L=await $(U,z);if(L)return L}}if(J.hasPreHandlerHook&&J.hooks.preHandler){let Z=await J.hooks.preHandler(U);if(Z)return Z}let Y=J.hasPreHandlerHook?await J.hooks.preHandler?.(U):null;if(Y)return Y;try{let Z=await X.handler(U);if(J.hasPostHandlerHook&&J.hooks.postHandler)await J.hooks.postHandler(U);if(J.hasOnSendHook&&J.hooks.onSend){let $=await J.hooks.onSend(U,Z);if($)return $}return Z??new Response("No response from handler",{status:204})}catch(Z){return new Response("Internal Server Error",{status:500})}}async function I(F,z,G={}){let J=F.headers.get("origin")??"*",U=G?.origin,X=G?.allowedHeaders??["Content-Type","Authorization"],Y=G?.methods??["GET","POST","PUT","DELETE","OPTIONS"],Z=G?.credentials??!1,$=G?.exposedHeaders??[];if(z.setHeader("Access-Control-Allow-Methods",Y),z.setHeader("Access-Control-Allow-Headers",X),z.setHeader("Access-Control-Allow-Credentials",Z),$.length)z.setHeader("Access-Control-Expose-Headers",$);if(U==="*")z.setHeader("Access-Control-Allow-Origin","*");else if(Array.isArray(U))if(J&&U.includes(J))z.setHeader("Access-Control-Allow-Origin",J);else if(U.includes("*"))z.setHeader("Access-Control-Allow-Origin","*");else return z.status(403).json({message:"CORS not allowed"});else if(typeof U==="string")if(J===U)z.setHeader("Access-Control-Allow-Origin",J);else return z.status(403).json({message:"CORS not allowed"});else return z.status(403).json({message:"CORS not allowed"});if(z.setHeader("Access-Control-Allow-Origin",J),F.method==="OPTIONS")return z.setHeader("Access-Control-Max-Age","86400"),z.status(204).text("");return null}function M(F){let{time:z=60000,max:G=100,message:J="Rate limit exceeded. Please try again later."}=F,U=new Map;return(X)=>{let Y=new Date,Z=X.getIP().address;if(!U.has(Z))U.set(Z,{count:0,startTime:Y});let $=U.get(Z);if($)if(Y-$.startTime>z)$.count=1,$.startTime=Y;else $.count++;if($&&$.count>G)return X.status(429).json({error:J});X.next()}}class K{routes;globalMiddlewares;middlewares;trie;hasOnReqHook;hasMiddleware;hasPreHandlerHook;hasPostHandlerHook;hasOnSendHook;hooks;corsConfig;filters;filterFunction;constructor(){this.routes=[],this.filters=[],this.filterFunction=null,this.globalMiddlewares=[],this.middlewares=new Map,this.trie=new Q,this.corsConfig=null,this.hasMiddleware=!1,this.hasOnReqHook=!1,this.hasPreHandlerHook=!1,this.hasPostHandlerHook=!1,this.hasOnSendHook=!1,this.hooks={onRequest:null,preHandler:null,postHandler:null,onSend:null,onError:null,onClose:null}}filter(){return{routeMatcher:(...F)=>{return this.routes=F.sort(),this.filter()},permitAll:()=>{for(let F of this?.routes)this.filters.push(F);return this.filter()},require:(F)=>{if(!F||typeof F!=="function")return new Response(JSON.stringify({message:"Authentication required"}),{status:400});this.filterFunction=F}}}cors(F){this.corsConfig=F}addHooks(F,z){if(typeof F!=="string")throw new Error("hookName must be a string");if(typeof z!=="function")throw new Error("callback must be a instance of function");if(this.hooks.hasOwnProperty(F))this.hooks[F]=z;else throw new Error(`Unknown hook type: ${F}`)}compile(){if(this.globalMiddlewares.length>0)this.hasMiddleware=!0;for(let[F,z]of this.middlewares.entries())if(z.length>0){this.hasMiddleware=!0;break}if(this.hooks.onRequest)this.hasOnReqHook=!0;if(this.hooks.preHandler)this.hasPreHandlerHook=!0;if(this.hooks.postHandler)this.hasPostHandlerHook=!0;if(this.hooks.onSend)this.hasOnSendHook=!0}listen(F,z,{sslCert:G=null,sslKey:J=null}={}){if(typeof Bun==="undefined")throw new Error(".listen() is designed to run on Bun only...");if(typeof F!=="number")throw new Error("Port must be a numeric value");this.compile();let U=this,X={port:F,fetch:async(Z,$)=>{let L=new URL(Z.url);try{return await j(Z,$,L,this)}catch(V){return new Response("Internal Server Error",{status:500})}},onClose(){console.log("Server is shutting down...")}};if(G&&J)X.certFile=G,X.keyFile=J;let Y=Bun.serve(X);if(typeof z==="function")return z();if(G&&J)console.log(`HTTPS server is running on https://localhost:${F}`);else console.log(`HTTP server is running on http://localhost:${F}`);return Y}register(F,z){if(typeof F!=="string")throw new Error("path must be a string");if(typeof z!=="object")throw new Error("handler parameter should be a instance of router object",z);let G=Object.entries(z.trie.root.children);z.trie.root.subMiddlewares.forEach((J,U)=>{if(!this.middlewares.has(F+U))this.middlewares.set(F+U,[]);J?.forEach((X)=>{if(!this.middlewares.get(F+U)?.includes(X))this.middlewares.get(F+U)?.push(X)})});for(let[J,U]of G){let X=F+U?.path,Y=U.handler[0],Z=U.method[0];this.trie.insert(X,{handler:Y,method:Z})}z.trie=new Q}#z(F,z,G){if(typeof z!=="string")throw new Error("Path must be a string type");if(typeof F!=="string")throw new Error("method must be a string type");let J=G.slice(0,-1),U=G[G.length-1];if(!this.middlewares.has(z))this.middlewares.set(z,[]);J.forEach((X)=>{if(z==="/"){if(!this.globalMiddlewares.includes(X))this.globalMiddlewares.push(X)}else if(!this.middlewares.get(z)?.includes(X))this.middlewares.get(z)?.push(X)}),this.trie.insert(z,{handler:U,method:F})}use(F,z){if(typeof F==="function"){if(!this.globalMiddlewares.includes(F))this.globalMiddlewares.push(F);return}let G=F;if(!this.middlewares.has(G))this.middlewares.set(G,[]);if(z){if(!this.middlewares.get(G)?.includes(z))this.middlewares.get(G)?.push(z)}}get(F,...z){return this.#z("GET",F,z),this}post(F,...z){return this.#z("POST",F,z),this}put(F,...z){return this.#z("PUT",F,z),this}patch(F,...z){return this.#z("PATCH",F,z),this}delete(F,...z){return this.#z("DELETE",F,z),this}}class N extends K{constructor(){super()}#z(F,z,G){if(!this.trie.root.subMiddlewares.has(z))this.trie.root.subMiddlewares.set(z,[]);let J=G.slice(0,-1),U=this.trie.root.subMiddlewares.get(z);J.forEach((Y)=>{if(!U?.includes(Y))U?.push(Y)});let X=G[G.length-1];this.trie.insert(z,{handler:X,method:F})}get(F,...z){return this.#z("GET",F,z),this}post(F,...z){return this.#z("POST",F,z),this}put(F,...z){return this.#z("PUT",F,z),this}patch(F,...z){return this.#z("PATCH",F,z),this}delete(F,...z){return this.#z("DELETE",F,z),this}}var x=N;export{x as default};

package/dist/types.d.ts

@@ -76,7 +76,7 @@ export interface DieselT {
         onSend: ((ctx?: ContextType, result?: Response | null | void, serer?: Server) => Promise<Response | void | null>) | null;
     };
     filters: string[];
-    filterFunction: (ctx: ContextType) => void | Response | Promise<Response | void>;
+    filterFunction: (ctx: ContextType, serer?: Server) => void | Response | Promise<Response | void>;
     corsConfig: corsT | null;
     globalMiddlewares: Array<(ctx: ContextType, serer?: Server) => void | Promise<Response | null | void>>;
     middlewares: Map<string, Array<(ctx: ContextType, serer?: Server) => void | Promise<Response | null | void>>>;

package/example/main.ts

@@ -1,15 +1,32 @@
-import {Diesel, rateLimit} from "../src/main";
+import { Server } from "bun";
+import Diesel ,{rateLimit} from "../src/main";
+import { ContextType, CookieOptions, middlewareFunc } from "../dist/types";
+import jwt from 'jsonwebtoken'
 
 const app = new Diesel()
-
+const secret = 'pradeep'
 // app.cors({
 //   origin: ['http://localhost:5173','*'],
 //   methods: 'GET,POST,PUT,DELETE',
 //   allowedHeaders: 'Content-Type,Authorization'
 // })
 
-function h() {
- return new Response("hello world")
+async function authJwt (ctx:ContextType, server?:Server): Promise<void | Response> {
+  const token = await ctx.getCookie("accessToken");  // Retrieve the JWT token from cookies
+  if (!token) {
+    return ctx.status(401).json({ message: "Authentication token missing" });
+  }
+  try {
+    // Verify the JWT token using a secret key
+    const user = jwt.verify(token, secret);  // Replace with your JWT secret
+    // Set the user data in context
+    ctx.set("user", user);
+
+    // Proceed to the next middleware/route handler
+    return ctx.next();
+  } catch (error) {
+    return ctx.status(403).json({ message: "Invalid token" });
+  }
 }
 
 const limiter = rateLimit({
@@ -22,21 +39,19 @@ const limiter = rateLimit({
 
 app
 .filter()
-.routeMatcher('/api/user/register','/api/user/login','/test/:id','/')
+.routeMatcher('/api/user/register','/api/user/login','/test/:id','/cookie')
 .permitAll()
-.require()
+.require(authJwt)
+
+// app.use(authJwt)
 
 // .require(you can pass jwt auth parser)
 
 app.get("/", async(xl) => {
   // const ip = xl.req
   // console.log(ip)
-    return xl.json({
-      message: 'Hello from Express!',
-      author: 'Pradeep',
-      app: 'Express App',
-      features: ['Fast', 'Flexible', 'Lightweight']
-    });
+  const user = xl.get('user')
+    return xl.json({user:user});
 });
 
 app.get("/test/:id", async (xl) => {
@@ -49,4 +64,28 @@ app.get("/test/:id", async (xl) => {
     return xl.status(200).text("kaise ho??")
   })
 
+  app.get("/cookie", async(xl) => {
+    const user = {
+      name: "pk",
+      age: 22,
+    };
+  
+    const accessToken = jwt.sign(user, secret, { expiresIn: "1d" });
+    const refreshToken = jwt.sign(user, secret, { expiresIn: "10d" });
+    const options : CookieOptions= {
+      httpOnly: true, // Makes cookie accessible only by the web server (not JS)
+      secure: true, // Ensures the cookie is sent over HTTPS
+      maxAge: 24 * 60 * 60 * 1000, // 1 day in milliseconds
+      sameSite: "Strict", // Prevents CSRF (strict origin policy)
+      path: "/", // Cookie available for all routes
+    };
+    await xl.cookie("accessToken", accessToken, options)
+    await xl.cookie("refreshToken", refreshToken, options)
+    // xl.cookie("refreshToken", refreshToken, options);
+    await xl.getCookie()
+    return xl.json({msg:"setting cookies"})
+  });
+
+
+
 app.listen(3000)

package/example/package-lock.json

@@ -0,0 +1,177 @@
+{
+  "name": "test",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "test",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "@types/jsonwebtoken": "^9.0.7",
+        "diesel-core": "^0.0.12",
+        "jsonwebtoken": "^9.0.2",
+        "jwt": "^0.2.0"
+      }
+    },
+    "node_modules/@types/jsonwebtoken": {
+      "version": "9.0.7",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "22.7.7",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/diesel-core": {
+      "version": "0.0.12",
+      "license": "ISC",
+      "peerDependencies": {
+        "typescript": "^5.0.0"
+      }
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "1.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "3.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jwt": {
+      "version": "0.2.0",
+      "dependencies": {
+        "node-base64": "0.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "license": "MIT"
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "license": "MIT"
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "license": "MIT"
+    },
+    "node_modules/node-base64": {
+      "version": "0.0.1",
+      "hasInstallScript": true
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.6.3",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.6.3",
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "license": "MIT"
+    }
+  }
+}

package/example/package.json

@@ -10,6 +10,9 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "jsonwebtoken": "^9.0.2"
+    "@types/jsonwebtoken": "^9.0.7",
+    "diesel-core": "^0.0.13",
+    "jsonwebtoken": "^9.0.2",
+    "jwt": "^0.2.0"
   }
 }

package/example/route.js

@@ -1,4 +1,4 @@
-import Router from "../src/router";
+import Router from "../src/route";
 
 const route = new Router();
 
@@ -10,7 +10,7 @@ const s = () =>{
   console.log('s')
 }
 
-route.get("/register", h,(xl) => {
+route.get("/register/:id", h,(xl) => {
   return xl.text("from register user");
 })
 

package/example/tester.js

@@ -1,9 +1,11 @@
-import {Diesel} from "../src/main";
+import Diesel from "../dist/main";
 import jwt from "jsonwebtoken";
 
 const app = new Diesel();
 const secret = "secret";
 
+// app.filter().permitAll().require()
+
 app.get("/r", (xl) => {
   return xl.html(`${import.meta.dir}/index.html`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diesel-core",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "main": "dist/main.js",
   "types": "dist/main.d.ts",
   "scripts": {

package/src/handleRequest.ts

@@ -1,16 +1,17 @@
 import { Server } from "bun";
 import createCtx from "./ctx";
 import type { ContextType, corsT, DieselT, handlerFunction, middlewareFunc, RouteCache, RouteHandlerT } from "./types";
-import { binaryS } from "./utils";
 
-// const routeCache:RouteCache = {}
 
-export default async function handleRequest(req:Request, server:Server ,url:URL, diesel:DieselT): Promise<Response> {
+const routeCache:RouteCache = {}
 
-  const ctx:ContextType = createCtx(req, server,url);
+export default async function handleRequest(req: Request, server: Server, url: URL, diesel: DieselT): Promise<Response> {
+
+  const ctx: ContextType = createCtx(req, server, url);
 
   // Try to find the route handler in the trie
-  let routeHandler :RouteHandlerT | undefined = diesel.trie.search(url.pathname, req.method);; 
+  let routeHandler: RouteHandlerT | undefined = diesel.trie.search(url.pathname, req.method);
+ 
   // if(routeCache[url.pathname+req.method]) {
   //   routeHandler = routeCache[url.pathname+req.method]
   // } else {
@@ -19,99 +20,94 @@ export default async function handleRequest(req:Request, server:Server ,url:URL,
   // }
 
   // Early return if route or method is not found
-  if (!routeHandler || !routeHandler.handler) {
-    return new Response(`Route not found for ${url.pathname}`, { status: 404 })
-  }
-
-  if (routeHandler.method !== req.method) {
-    return new Response("Method not allowed", { status: 405 })
+  if (!routeHandler || routeHandler.method !== req.method) {
+    return new Response(routeHandler ? "Method not allowed" : `Route not found for ${url.pathname}`, {
+      status: routeHandler ? 405 : 404,
+    });
   }
 
   // If the route is dynamic, we only set routePattern if necessary
   if (routeHandler.isDynamic) req.routePattern = routeHandler.path;
 
+  // cors execution
   if (diesel.corsConfig) {
     const corsResult = await applyCors(req, ctx, diesel.corsConfig)
-    if(corsResult) return corsResult;
+    if (corsResult) return corsResult;
   }
 
   // OnReq hook 1
-  if (diesel.hasOnReqHook && diesel.hooks.onRequest) {
-    diesel.hooks.onRequest(ctx,server)
-  }
+  if (diesel.hasOnReqHook && diesel.hooks.onRequest) diesel.hooks.onRequest(ctx, server)
 
+  // filter applying
+  if (diesel.hasFilterEnabled) {
 
-  if (diesel.filters.length > 0) {
     const path = req.routePattern ?? url.pathname
     const hasRoute = diesel.filters.includes(path)
- 
     if (hasRoute === false) {
       if (diesel.filterFunction) {
-        const filterResult = await diesel?.filterFunction(ctx)
-        if(filterResult) return filterResult
-      } 
-      else {
+        try {
+          const filterResult = await diesel.filterFunction(ctx, server)
+          if (filterResult) return filterResult
+        } catch (error) {
+          console.error("Error in filterFunction:", error);
+          return new Response(JSON.stringify({
+            message: "Internal Server Error"
+          }), { status: 500 });
+        }
+      } else {
         return new Response(JSON.stringify({
-          message:"Authentication required"
-        }),{status:400})
+          message: "Authentication required"
+        }), { status: 400 })
       }
     }
   }
 
   // middleware execution 
   if (diesel.hasMiddleware) {
-    const middlewares  = [
+    const middlewares = [
       ...diesel.globalMiddlewares,
       ...diesel.middlewares.get(url.pathname) || []
-    ]  as  middlewareFunc[]
+    ] as middlewareFunc[]
 
     for (const middleware of middlewares) {
-      const result = await middleware(ctx,server);
-      if (result) return result; 
+      const result = await middleware(ctx, server);
+      if (result) return result;
     }
 
   }
 
-  
-
   // Run preHandler hooks 2
   if (diesel.hasPreHandlerHook && diesel.hooks.preHandler) {
-      const Hookresult = await diesel.hooks.preHandler(ctx);
-      if(Hookresult) return Hookresult;
-    }
-  
+    const Hookresult = await diesel.hooks.preHandler(ctx);
+    if (Hookresult) return Hookresult;
+  }
+
+  const preHandlerResult = diesel.hasPreHandlerHook ? await diesel.hooks.preHandler?.(ctx) : null;
+  if (preHandlerResult) return preHandlerResult;
 
   // Finally, execute the route handler and return its result
   try {
-    const result = await routeHandler.handler(ctx) as Response | null | void ;
+    const result = await routeHandler.handler(ctx) as Response | null | void;
 
     // 3. run the postHandler hooks 
     if (diesel.hasPostHandlerHook && diesel.hooks.postHandler) {
-      await diesel.hooks.postHandler(ctx) 
+      await diesel.hooks.postHandler(ctx)
     }
 
     // 4. Run onSend hooks before sending the response
     if (diesel.hasOnSendHook && diesel.hooks.onSend) {
-        const hookResponse = await diesel.hooks.onSend(ctx,result);
-        if(hookResponse) return hookResponse
+      const hookResponse = await diesel.hooks.onSend(ctx, result);
+      if (hookResponse) return hookResponse
     }
 
-    return result ??  new Response("No response from handler", { status: 204 })
+    return result ?? new Response("No response from handler", { status: 204 })
   } catch (error) {
     return new Response("Internal Server Error", { status: 500 });
   }
 }
 
-// middleware execution
-async function executeMiddleware(middlewares: middlewareFunc[], ctx: ContextType, server: Server): Promise<Response | null | void> {
-  for (const middleware of middlewares) {
-    const result = await middleware(ctx,server);
-    if (result) return result; 
-  }
-}
-
 
-async function applyCors(req:Request,ctx:ContextType,config:corsT={}) :Promise<Response | null> {
+async function applyCors(req: Request, ctx: ContextType, config: corsT = {}): Promise<Response | null> {
   const origin = req.headers.get('origin') ?? '*'
   const allowedOrigins = config?.origin
   const allowedHeaders = config?.allowedHeaders ?? ["Content-Type", "Authorization"]
@@ -119,27 +115,27 @@ async function applyCors(req:Request,ctx:ContextType,config:corsT={}) :Promise<R
   const allowedCredentials = config?.credentials ?? false
   const exposedHeaders = config?.exposedHeaders ?? []
 
-  ctx.setHeader('Access-Control-Allow-Methods',allowedMethods)
+  ctx.setHeader('Access-Control-Allow-Methods', allowedMethods)
   ctx.setHeader("Access-Control-Allow-Headers", allowedHeaders);
   ctx.setHeader("Access-Control-Allow-Credentials", allowedCredentials);
   if (exposedHeaders.length) {
     ctx.setHeader("Access-Control-Expose-Headers", exposedHeaders);
   }
 
-  if (allowedOrigins === '*'){
+  if (allowedOrigins === '*') {
     ctx.setHeader("Access-Control-Allow-Origin", "*")
-  } else if (Array.isArray(allowedOrigins)){
+  } else if (Array.isArray(allowedOrigins)) {
     if (origin && allowedOrigins.includes(origin)) {
-      ctx.setHeader("Access-Control-Allow-Origin",origin)
-    } else if(allowedOrigins.includes('*')){
-      ctx.setHeader("Access-Control-Allow-Origin",'*')
+      ctx.setHeader("Access-Control-Allow-Origin", origin)
+    } else if (allowedOrigins.includes('*')) {
+      ctx.setHeader("Access-Control-Allow-Origin", '*')
     }
     else {
       return ctx.status(403).json({ message: "CORS not allowed" })
     }
-  } else if (typeof allowedOrigins === 'string'){
-    if(origin === allowedOrigins){
-      ctx.setHeader("Access-Control-Allow-Origin",origin)
+  } else if (typeof allowedOrigins === 'string') {
+    if (origin === allowedOrigins) {
+      ctx.setHeader("Access-Control-Allow-Origin", origin)
     }
     else {
       return ctx.status(403).json({ message: "CORS not allowed" });
@@ -148,10 +144,10 @@ async function applyCors(req:Request,ctx:ContextType,config:corsT={}) :Promise<R
     return ctx.status(403).json({ message: "CORS not allowed" })
   }
 
-  ctx.setHeader("Access-Control-Allow-Origin",origin)
+  ctx.setHeader("Access-Control-Allow-Origin", origin)
 
   if (req.method === 'OPTIONS') {
-    ctx.setHeader('Access-Control-Max-Age','86400')
+    ctx.setHeader('Access-Control-Max-Age', '86400')
     return ctx.status(204).text('')
   }
 

package/src/main.ts

@@ -3,6 +3,7 @@ import handleRequest from "./handleRequest.js";
 import rateLimit from "./utils.js";
 import {
   corsT,
+  DieselT,
   FilterMethods,
   HookFunction,
   HookType,
@@ -16,9 +17,8 @@ import {
 import { Server } from "bun";
 
 
+export default class Diesel {
 
-
-class Diesel {
   routes : string[] | undefined
   globalMiddlewares: middlewareFunc[]
   middlewares: Map<string, middlewareFunc[]>;
@@ -32,11 +32,11 @@ class Diesel {
   corsConfig: corsT
   filters: string[]
   filterFunction : middlewareFunc | null
+  hasFilterEnabled: boolean
+  wss : WebSocket | null | undefined
 
   constructor() {
     this.routes = []
-    this.filters = []
-    this.filterFunction = null
     this.globalMiddlewares = [];
     this.middlewares = new Map();
     this.trie = new Trie();
@@ -54,10 +54,15 @@ class Diesel {
       onError: null,
       onClose: null
     }
+    this.filters = []
+    this.filterFunction = null
+    this.hasFilterEnabled = false
+    this.wss = null
   }
 
   
   filter() :FilterMethods {
+    this.hasFilterEnabled = true
 
     return {
       routeMatcher: (...routes:string[]) => {
@@ -69,17 +74,13 @@ class Diesel {
         for(const route of this?.routes!){
           this.filters.push(route)
         }
-        // this.routes = []
         return this.filter()
       },
 
       require: (fnc?:middlewareFunc) => {
-        if(!fnc || typeof fnc !== 'function' ){
-          return new Response(JSON.stringify({
-            message:"Authentication required"
-          }),{status:400})
+        if (fnc) {
+          this.filterFunction = fnc
         }
-        this.filterFunction = fnc
       }
     };
   }
@@ -140,13 +141,13 @@ class Diesel {
     }
 
     this.compile();
-    const dieselInstance = this as Diesel
+
     const options: any = {
       port,
       fetch: async (req: Request, server: Server) => {
         const url = new URL(req.url);
         try {
-          return await handleRequest(req, server, url, this);
+          return await handleRequest(req, server, url, this as DieselT);
         } catch (error) {
           return new Response("Internal Server Error", { status: 500 });
         }
@@ -162,7 +163,7 @@ class Diesel {
     }
     const server = Bun.serve(options);
 
-    // Bun?.gc(false)
+    Bun?.gc(false)
 
     if (typeof callback === "function") {
       return callback();
@@ -188,7 +189,7 @@ class Diesel {
       throw new Error("handler parameter should be a instance of router object", handlerInstance)
     }
     const routeEntries: [string, RouteNodeType][] = Object.entries(handlerInstance.trie.root.children) as [string, RouteNodeType][];
-
+    
     handlerInstance.trie.root.subMiddlewares.forEach((middleware: middlewareFunc[], path: string) => {
       if (!this.middlewares.has(pathPrefix + path)) {
         this.middlewares.set(pathPrefix + path, []);
@@ -210,7 +211,7 @@ class Diesel {
     handlerInstance.trie = new Trie();
   }
 
-  #addRoute(
+  addRoute(
     method: HttpMethod, 
     path: string, 
     handlers: handlerFunction[]
@@ -254,7 +255,7 @@ class Diesel {
       }
       return
     }
-    // now it means it is path midl
+    
     const path: string = pathORHandler as string;
 
     if (!this.middlewares.has(path)) {
@@ -272,7 +273,7 @@ class Diesel {
     path: string, 
     ...handlers: handlerFunction[]
   ) : this {
-    this.#addRoute("GET", path, handlers);
+    this.addRoute("GET", path, handlers);
     return this
   }
 
@@ -280,12 +281,12 @@ class Diesel {
     path: string, 
     ...handlers: handlerFunction[]
   ): this {
-    this.#addRoute("POST", path, handlers);
+    this.addRoute("POST", path, handlers);
     return this
   }
 
   put(path: string, ...handlers: handlerFunction[]) : this{
-    this.#addRoute("PUT", path, handlers);
+    this.addRoute("PUT", path, handlers);
     return this
   }
 
@@ -293,7 +294,7 @@ class Diesel {
     path: string, 
     ...handlers: handlerFunction[]
   ) : this {
-    this.#addRoute("PATCH", path, handlers);
+    this.addRoute("PATCH", path, handlers);
     return this
   }
 
@@ -301,14 +302,12 @@ class Diesel {
     path: any, 
     ...handlers: handlerFunction[]
   ) : this {
-    this.#addRoute("DELETE", path, handlers);
+    this.addRoute("DELETE", path, handlers);
     return this;
   }
 }
 
 
 export {
-  Diesel,
   rateLimit,
-  // filter
 }

package/src/route.ts

@@ -0,0 +1,56 @@
+import Diesel from "./main";
+import type { handlerFunction, HttpMethod } from "./types";
+
+class Router extends Diesel {
+  constructor() {
+    super();
+  }
+  
+  // #addRoute(method:HttpMethod, path:string, handlers:handlerFunction[]) {
+  //     if (!this.trie.root.subMiddlewares.has(path)) {
+  //         this.trie.root.subMiddlewares.set(path,[])
+  //       }  
+  //       const middlewareHandlers : handlerFunction[]= handlers.slice(0, -1);
+
+  //       const currentMiddlewares = this.trie.root.subMiddlewares.get(path)
+        
+  //       middlewareHandlers.forEach((midl:handlerFunction) => {
+  //         if (!currentMiddlewares?.includes(midl)) {
+  //           currentMiddlewares?.push(midl)
+  //         }
+  //       })
+
+  //   // if (!this.trie.root.subMiddlewares.get(path).includes(...middlewareHandlers)) {
+  //   //     this.trie.root.subMiddlewares.get(path).push(...middlewareHandlers)
+  //   // }
+
+  //   const handler : handlerFunction = handlers[handlers.length - 1];
+  //   this.trie.insert(path, { handler, method });
+  // }
+  get(path:string, ...handlers:handlerFunction[]) {
+    this.addRoute("GET", path, handlers);
+    return this
+  }
+
+  post(path:string, ...handlers:handlerFunction[]) {
+    this.addRoute("POST", path, handlers);
+    return this;
+  }
+
+  put(path:string, ...handlers:handlerFunction[]) {
+    this.addRoute("PUT", path, handlers);
+    return this
+  }
+
+  patch(path:string, ...handlers:handlerFunction[]) {
+      this.addRoute("PATCH", path, handlers);
+      return this
+  }
+
+  delete(path:string, ...handlers:handlerFunction[]) {
+    this.addRoute("DELETE", path, handlers);
+    return this;
+  }
+}
+
+export default Router;

package/src/trie.ts

@@ -59,9 +59,11 @@ class TrieNode {
         node = node.children[key];
         // Set dynamic route information if applicable
         node.isDynamic = isDynamic;
-        node.pattern = segment;  // Store the actual pattern like ':id'
+        node.pattern = segment;
+        node.method.push(route.method)
+        node.handler.push(route.handler)
+        node.path = path;  // Store the actual pattern like ':id'
       }
-    
       // After looping through the entire path, assign route details
       node.isEndOfWord = true;
       node.method.push(route.method);    
@@ -95,7 +97,7 @@ class TrieNode {
           node = node.children[key];
         }
       }
-    
+      
       // Method matching
       let routeMethodIndex = node.method.indexOf(method); // More efficient method match
       if (routeMethodIndex !== -1) {

package/src/types.ts

@@ -2,7 +2,7 @@ import { Server } from "bun";
 
 export type listenCalllBackType = () => void;
 export type handlerFunction = (ctx: ContextType, server?: Server) => Response | Promise<Response | null | void>;
-export type middlewareFunc = (ctx:ContextType,server?:Server) => void | Response | Promise<Response>
+export type middlewareFunc = (ctx:ContextType,server?:Server | undefined) => void | Response | Promise<Response>
 export type HookFunction = (ctx: ContextType, result?: Response | null | void, server?: Server) => Response | Promise<Response | null | void>
 // export type onSendHookFunc = (result?: Response | null | void, ctx?:ContextType) => Response | Promise<Response | null | void>
 export type HttpMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD";
@@ -86,7 +86,8 @@ export interface DieselT {
         onSend: ((ctx?: ContextType, result?: Response | null | void, serer?: Server) => Promise<Response | void | null>) | null;
     };
     filters: string[]
-    filterFunction: (ctx:ContextType) => void | Response | Promise<Response|void>
+    hasFilterEnabled:boolean
+    filterFunction: (ctx:ContextType,serer?:Server) => void | Response | Promise<Response|void>
     corsConfig: corsT | null
     globalMiddlewares: Array<(ctx: ContextType, serer?: Server) => void | Promise<Response | null | void>>
     middlewares: Map<string, Array<(ctx: ContextType, serer?: Server) => void | Promise<Response | null | void>>>

package/tsconfig.json

@@ -1,11 +1,11 @@
 {
   "compilerOptions": {
     "target": "ES6",                   // Specify ECMAScript target version
-    "module": "commonjs",              // Specify module code generation
-    "outDir": "./dist",                // Redirect output structure to the 'dist' directory
+    "module": "ESNext",              // Specify module code generation
+    "outDir": "./main",                // Redirect output structure to the 'dist' directory
     "rootDir": "./src", 
     "declaration": true, 
-    "emitDeclarationOnly": true,              // Specify the root directory of input files
+    // "emitDeclarationOnly": true,              // Specify the root directory of input files
     "strict": true,                     // Enable all strict type-checking options
     "esModuleInterop": true,            // Enables emit interoperability between CommonJS and ES Modules
     "skipLibCheck": true,               // Skip type checking of declaration files

package/src/router.ts

@@ -1,55 +0,0 @@
-import {Diesel} from "./main";
-import type { handlerFunction, HttpMethod } from "./types";
-
-class Router extends Diesel {
-  constructor() {
-    super();
-  }
-  #addRoute(method:HttpMethod, path:string, handlers:handlerFunction[]) {
-      if (!this.trie.root.subMiddlewares.has(path)) {
-          this.trie.root.subMiddlewares.set(path,[])
-        }  
-        const middlewareHandlers : handlerFunction[]= handlers.slice(0, -1);
-
-        const currentMiddlewares = this.trie.root.subMiddlewares.get(path)
-        
-        middlewareHandlers.forEach((midl:handlerFunction) => {
-          if (!currentMiddlewares?.includes(midl)) {
-            currentMiddlewares?.push(midl)
-          }
-        })
-
-    // if (!this.trie.root.subMiddlewares.get(path).includes(...middlewareHandlers)) {
-    //     this.trie.root.subMiddlewares.get(path).push(...middlewareHandlers)
-    // }
-
-    const handler : handlerFunction = handlers[handlers.length - 1];
-    this.trie.insert(path, { handler, method });
-  }
-  get(path:string, ...handlers:handlerFunction[]) {
-    this.#addRoute("GET", path, handlers);
-    return this
-  }
-
-  post(path:string, ...handlers:handlerFunction[]) {
-    this.#addRoute("POST", path, handlers);
-    return this;
-  }
-
-  put(path:string, ...handlers:handlerFunction[]) {
-    this.#addRoute("PUT", path, handlers);
-    return this
-  }
-
-  patch(path:string, ...handlers:handlerFunction[]) {
-      this.#addRoute("PATCH", path, handlers);
-      return this
-  }
-
-  delete(path : string, ...handlers:handlerFunction[]) {
-    this.#addRoute("DELETE", path, handlers);
-    return this;
-  }
-}
-
-export default Router;