@wxn0brp/falcon-frame 0.1.0 → 0.2.1

package/dist/body.js

@@ -1,7 +1,9 @@
 import querystring from "querystring";
 const parseBodyFunctions = {
     "application/json": async (body) => ({ body: JSON.parse(body) }),
-    "application/x-www-form-urlencoded": async (body) => ({ body: querystring.parse(body) }),
+    "application/x-www-form-urlencoded": async (body) => ({
+        body: querystring.parse(body),
+    }),
 };
 export async function parseBody(req, body, FF) {
     const funcs = Object.assign({}, parseBodyFunctions, FF.customParsers || {});
@@ -38,9 +40,13 @@ function parseLimit(limit) {
     const num = parseInt(match[1], 10);
     const unit = match[2]?.toLowerCase();
     switch (unit) {
-        case "k": return num * 1024;
-        case "m": return num * 1024 * 1024;
-        case "g": return num * 1024 * 1024 * 1024;
-        default: return num;
+        case "k":
+            return num * 1024;
+        case "m":
+            return num * 1024 * 1024;
+        case "g":
+            return num * 1024 * 1024 * 1024;
+        default:
+            return num;
     }
 }

package/dist/helpers.d.ts

@@ -1,4 +1,4 @@
-import { Cookies, RouteHandler } from "./types.js";
+import { Cookies, RouteHandler, StaticServeOptions } from "./types.js";
 export declare function parseCookies(cookieHeader: string): Cookies;
 export declare function getContentType(filePath: string, utf8?: boolean): string;
-export declare function handleStaticFiles(dirPath: string, utf8?: boolean): RouteHandler;
+export declare function handleStaticFiles(dirPath: string, opts: StaticServeOptions): RouteHandler;

package/dist/helpers.js

@@ -2,42 +2,30 @@ import fs from "fs";
 import path from "path";
 export function parseCookies(cookieHeader) {
     const cookies = {};
-    cookieHeader.split(";").forEach(cookie => {
+    cookieHeader.split(";").forEach((cookie) => {
         const [name, ...valueParts] = cookie.split("=");
         const value = decodeURIComponent(valueParts.join("=").trim());
         cookies[name.trim()] = value;
     });
     return cookies;
 }
+const mimeTypes = {
+    ".html": "text/html",
+    ".css": "text/css",
+    ".js": "application/javascript",
+    ".json": "application/json",
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".gif": "image/gif",
+    ".svg": "image/svg+xml",
+    ".ico": "image/x-icon",
+    ".txt": "text/plain",
+    ".pdf": "application/pdf",
+};
 function _getContentType(filePath) {
     const ext = path.extname(filePath).toLowerCase();
-    switch (ext) {
-        case ".html":
-            return "text/html";
-        case ".css":
-            return "text/css";
-        case ".js":
-            return "application/javascript";
-        case ".json":
-            return "application/json";
-        case ".png":
-            return "image/png";
-        case ".jpg":
-        case ".jpeg":
-            return "image/jpeg";
-        case ".gif":
-            return "image/gif";
-        case ".svg":
-            return "image/svg+xml";
-        case ".ico":
-            return "image/x-icon";
-        case ".txt":
-            return "text/plain";
-        case ".pdf":
-            return "application/pdf";
-        default:
-            return "application/octet-stream";
-    }
+    return mimeTypes[ext] || "application/octet-stream";
 }
 export function getContentType(filePath, utf8 = false) {
     let contentType = _getContentType(filePath);
@@ -45,34 +33,73 @@ export function getContentType(filePath, utf8 = false) {
         contentType += "; charset=utf-8";
     return contentType;
 }
-export function handleStaticFiles(dirPath, utf8 = true) {
+export function handleStaticFiles(dirPath, opts) {
+    opts = {
+        utf8: true,
+        render: true,
+        etag: true,
+        errorIfDirNotFound: true,
+        ...opts,
+    };
+    if (opts.errorIfDirNotFound && !fs.existsSync(dirPath)) {
+        throw new Error(`Directory ${dirPath} does not exist`);
+    }
+    const serveFile = (req, res, filePath, stats) => {
+        if (opts.etag) {
+            const etag = `W/"${stats.size}-${stats.mtime.getTime()}"`;
+            if (req.headers["if-none-match"] === etag) {
+                res.status(304).end();
+                return true;
+            }
+            res.setHeader("ETag", etag);
+        }
+        if (opts.render && filePath.endsWith(".html")) {
+            res.ct("text/html");
+            res.render(filePath);
+            return true;
+        }
+        res.ct(getContentType(filePath, opts.utf8));
+        fs.createReadStream(filePath).pipe(res);
+        return true;
+    };
     return (req, res, next) => {
         if (req.method.toLowerCase() !== "get")
             return next();
         const apiPath = req.middleware.path;
         const filePath = path.join(dirPath, req.path.replace(apiPath, ""));
-        if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
-            res.ct(getContentType(filePath, utf8));
-            fs.createReadStream(filePath).pipe(res);
-            return true;
-        }
-        if (fs.existsSync(filePath) && fs.statSync(filePath).isDirectory()) {
-            const indexPath = path.join(filePath, "index.html");
-            if (fs.existsSync(indexPath) && fs.statSync(indexPath).isFile()) {
-                if (!req.path.endsWith("/")) {
-                    res.redirect(req.path + "/");
-                    return true;
+        try {
+            const stats = fs.statSync(filePath);
+            if (stats.isFile()) {
+                return serveFile(req, res, filePath, stats);
+            }
+            if (stats.isDirectory()) {
+                const indexPath = path.join(filePath, "index.html");
+                try {
+                    const indexStats = fs.statSync(indexPath);
+                    if (indexStats.isFile()) {
+                        if (!req.path.endsWith("/")) {
+                            res.redirect(req.path + "/");
+                            return true;
+                        }
+                        return serveFile(req, res, indexPath, indexStats);
+                    }
+                }
+                catch (e) {
+                    /* index.html not found, do nothing */
                 }
-                res.ct(getContentType(indexPath, utf8));
-                fs.createReadStream(indexPath).pipe(res);
-                return true;
             }
         }
-        const htmlPath = filePath + ".html";
-        if (fs.existsSync(htmlPath) && fs.statSync(htmlPath).isFile()) {
-            res.ct(getContentType(htmlPath, utf8));
-            fs.createReadStream(htmlPath).pipe(res);
-            return true;
+        catch (e) {
+            /* file/dir not found, proceed to check for .html */
+        }
+        try {
+            const htmlPath = filePath + ".html";
+            const htmlStats = fs.statSync(htmlPath);
+            if (htmlStats.isFile())
+                return serveFile(req, res, htmlPath, htmlStats);
+        }
+        catch (e) {
+            /* .html file not found, fall through to next() */
         }
         next();
     };

package/dist/index.d.ts

@@ -1,10 +1,11 @@
 import { Logger, LoggerOptions } from "@wxn0brp/lucerna-log";
 import http from "http";
-import { PluginSystem } from "./plugins.js";
+import { PluginSystem } from "./plugin.js";
 import { renderHTML } from "./render.js";
 import { FFResponse } from "./res.js";
 import { Router } from "./router.js";
 import type { BeforeHandleRequest, FFRequest, ParseBodyFunction, RouteHandler } from "./types.js";
+export type EngineCallback = (path: string, options: any, callback: (e: any, rendered?: string) => void) => void;
 export interface Opts {
     loggerOpts?: LoggerOptions;
     bodyLimit?: string;
@@ -14,14 +15,24 @@ export declare class FalconFrame<Vars extends Record<string, any> = any> extends
     customParsers: Record<string, ParseBodyFunction>;
     vars: Vars;
     opts: Opts;
+    engines: Record<string, EngineCallback>;
     constructor(opts?: Partial<Opts>);
-    listen(port: number, callback?: (() => void) | boolean, beforeHandleRequest?: BeforeHandleRequest): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    listen(port: number | string, callback?: (() => void) | boolean, beforeHandleRequest?: BeforeHandleRequest): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     getApp(beforeHandleRequest?: BeforeHandleRequest): (req: any, res: any) => Promise<void>;
+    engine(ext: string, callback: EngineCallback): this;
     setVar(key: keyof Vars, value: typeof this.vars[keyof Vars]): void;
     getVar(key: string): typeof this.vars[keyof Vars];
+    /**
+     * Sets the allowed origins for CORS.
+     * This method is a shortcut that simplifies CORS configuration
+     * without needing to manually create and register a plugin.
+     * @param origin - An array of allowed origins.
+     * @example
+     * app.setOrigin(["http://example.com", "https://example.com"]);
+    */
+    setOrigin(origin: string[]): void;
 }
 export default FalconFrame;
-export { FFRequest, FFResponse, PluginSystem, renderHTML, Router, RouteHandler };
-export * as Plugins from "./plugins/index.js";
-export * as PluginsEngine from "./plugins.js";
 export * as Helpers from "./helpers.js";
+export * as PluginsEngine from "./plugin.js";
+export { FFRequest, FFResponse, PluginSystem, renderHTML, RouteHandler, Router };

package/dist/index.js

@@ -1,6 +1,7 @@
 import { Logger } from "@wxn0brp/lucerna-log";
 import http from "http";
-import { PluginSystem } from "./plugins.js";
+import { PluginSystem } from "./plugin.js";
+import { createCORSPlugin } from "./plugins/cors.js";
 import { renderHTML } from "./render.js";
 import { handleRequest } from "./req.js";
 import { FFResponse } from "./res.js";
@@ -10,6 +11,7 @@ export class FalconFrame extends Router {
     customParsers = {};
     vars = {};
     opts = {};
+    engines = {};
     constructor(opts = {}) {
         super();
         this.logger = new Logger({
@@ -20,6 +22,15 @@ export class FalconFrame extends Router {
             bodyLimit: "10m",
             ...opts,
         };
+        this.engine(".html", (path, options, callback) => {
+            try {
+                const content = renderHTML(path, options);
+                callback(null, content);
+            }
+            catch (e) {
+                callback(e);
+            }
+        });
     }
     listen(port, callback, beforeHandleRequest) {
         const server = http.createServer(this.getApp(beforeHandleRequest));
@@ -44,6 +55,13 @@ export class FalconFrame extends Router {
             await handleRequest(req, res, this);
         };
     }
+    engine(ext, callback) {
+        if (ext[0] !== ".") {
+            ext = "." + ext;
+        }
+        this.engines[ext] = callback;
+        return this;
+    }
     setVar(key, value) {
         // @ts-ignore
         this.vars[key] = value;
@@ -52,9 +70,19 @@ export class FalconFrame extends Router {
         // @ts-ignore
         return this.vars[key];
     }
+    /**
+     * Sets the allowed origins for CORS.
+     * This method is a shortcut that simplifies CORS configuration
+     * without needing to manually create and register a plugin.
+     * @param origin - An array of allowed origins.
+     * @example
+     * app.setOrigin(["http://example.com", "https://example.com"]);
+    */
+    setOrigin(origin) {
+        this.use(createCORSPlugin(origin).process);
+    }
 }
 export default FalconFrame;
-export { FFResponse, PluginSystem, renderHTML, Router };
-export * as Plugins from "./plugins/index.js";
-export * as PluginsEngine from "./plugins.js";
 export * as Helpers from "./helpers.js";
+export * as PluginsEngine from "./plugin.js";
+export { FFResponse, PluginSystem, renderHTML, Router };

package/dist/{plugins.d.ts → plugin.d.ts}

@@ -3,7 +3,8 @@ export type PluginId = string;
 export interface Plugin {
     id: PluginId;
     process: RouteHandler;
-    priority?: number;
+    before?: PluginId | PluginId[];
+    after?: PluginId | PluginId[];
 }
 export interface PluginOptions {
     before?: PluginId | PluginId[];

package/dist/{plugins.js → plugin.js}

@@ -7,30 +7,29 @@ export class PluginSystem {
      * @param options - Options for positioning plugins
      */
     register(plugin, options) {
-        if (this.plugins.some(p => p.id === plugin.id)) {
+        if (this.plugins.some((p) => p.id === plugin.id)) {
             throw new Error(`Plugin with id '${plugin.id}' already registered`);
         }
-        // Add plugin to the list
         this.plugins.push(plugin);
-        // Update the execution order
-        this.updateExecutionOrder(plugin.id, options);
+        this.updateExecutionOrder(plugin, options);
     }
     /**
      * Updates the execution order of plugins
      * @param pluginId - ID of the plugin to position
      * @param options - Options for positioning
      */
-    updateExecutionOrder(pluginId, options) {
+    updateExecutionOrder(plugin, options) {
+        const pluginId = plugin.id;
         if (this.executionOrder.includes(pluginId))
             return;
         const resolveTarget = (target) => {
             if (!target)
                 return null;
             const list = Array.isArray(target) ? target : [target];
-            return list.find(id => this.executionOrder.includes(id)) || null;
+            return list.find((id) => this.executionOrder.includes(id)) || null;
         };
-        const beforeTarget = resolveTarget(options?.before);
-        const afterTarget = resolveTarget(options?.after);
+        const beforeTarget = resolveTarget(options?.before || plugin.before);
+        const afterTarget = resolveTarget(options?.after || plugin.after);
         if (beforeTarget) {
             const index = this.executionOrder.indexOf(beforeTarget);
             this.executionOrder.splice(index, 0, pluginId);
@@ -74,7 +73,7 @@ export class PluginSystem {
             return;
         }
         const pluginId = this.executionOrder[index];
-        const plugin = this.plugins.find(p => p.id === pluginId);
+        const plugin = this.plugins.find((p) => p.id === pluginId);
         if (!plugin) {
             throw new Error(`Plugin '${pluginId}' not found`);
         }
@@ -87,7 +86,7 @@ export class PluginSystem {
      */
     getPluginsInOrder() {
         return this.executionOrder
-            .map(id => this.plugins.find(p => p.id === id))
+            .map((id) => this.plugins.find((p) => p.id === id))
             .filter((p) => p !== undefined);
     }
 }

package/dist/plugins/cors.d.ts

@@ -1,7 +1,8 @@
-import { Plugin } from "../plugins.js";
+import { Plugin } from "../plugin.js";
 interface Opts {
     accessControlAllowMethods?: boolean;
     accessControlAllowHeaders?: boolean;
+    headers?: Record<string, string>;
 }
 export declare function createCORSPlugin(allowedOrigins: string[], opts?: Opts): Plugin;
 export {};

package/dist/plugins/cors.js

@@ -13,6 +13,11 @@ export function createCORSPlugin(allowedOrigins, opts = {}) {
     return {
         id: "cors",
         process: (req, res, next) => {
+            if (opts.headers) {
+                for (const [key, value] of Object.entries(opts.headers)) {
+                    res.setHeader(key, value);
+                }
+            }
             if (allowedOrigins.includes("*")) {
                 res.setHeader("Access-Control-Allow-Origin", "*");
                 setHeader(res, opts);

package/dist/plugins/rateLimit.d.ts

@@ -1,2 +1,2 @@
-import { Plugin } from "../plugins.js";
+import { Plugin } from "../plugin.js";
 export declare function createRateLimiterPlugin(maxRequests: number, windowMs: number): Plugin;

package/dist/plugins/security.d.ts

@@ -0,0 +1,2 @@
+import { Plugin } from "../plugin.js";
+export declare function createSecurityPlugin(): Plugin;

package/dist/plugins/security.js

@@ -0,0 +1,14 @@
+export function createSecurityPlugin() {
+    return {
+        id: "security",
+        process: (req, res, next) => {
+            res.setHeader("X-Content-Type-Options", "nosniff");
+            res.setHeader("X-Frame-Options", "SAMEORIGIN");
+            res.setHeader("Referrer-Policy", "no-referrer");
+            res.setHeader("X-XSS-Protection", "1; mode=block");
+            res.setHeader("Strict-Transport-Security", "max-age=31536000; includeSubDomains");
+            next();
+        },
+        after: "cors",
+    };
+}

package/dist/render.d.ts

@@ -1,5 +1,5 @@
 interface RenderData {
     [key: string]: string;
 }
-export declare function renderHTML(templatePath: string, data: RenderData): string;
+export declare function renderHTML(templatePath: string, data: RenderData, renderedPaths?: string[]): string;
 export {};

package/dist/render.js

@@ -1,18 +1,25 @@
 import fs from "fs";
 import path from "path";
-export function renderHTML(templatePath, data) {
-    if (!fs.existsSync(templatePath))
-        return "Template not found";
-    let template = fs.readFileSync(templatePath, "utf8");
-    // Inserting data, e.g. {{name}}
-    template = template.replace(/{{(.*?)}}/g, (_, key) => data[key.trim()] || "");
-    // Loading partials, e.g. <!-- include header -->
-    template = template.replace(/<!--\s*include\s*(.*?)\s*-->/g, (_, partialName) => {
-        const partialPath = path.join(path.dirname(templatePath), partialName + ".html");
-        if (fs.existsSync(partialPath))
-            return renderHTML(partialPath, data);
-        else
-            return `<!-- Partial "${partialName}" (${partialPath.replace(process.cwd() + "/", "")}) not found -->`;
-    });
-    return template;
+export function renderHTML(templatePath, data, renderedPaths = []) {
+    try {
+        const realPath = path.resolve(templatePath);
+        if (renderedPaths.includes(realPath)) {
+            return `<!-- Circular dependency detected: tried to render ${templatePath} again -->`;
+        }
+        let template = fs.readFileSync(templatePath, "utf8");
+        // Inserting data, e.g. {{name}}
+        template = template.replace(/{{(.*?)}}/g, (_, key) => data[key.trim()] || "");
+        // Loading partials, e.g. <!-- include header -->
+        template = template.replace(/<!--\s*include\s*(.*?)\s*-->/g, (_, partialName) => {
+            const partialPath = path.join(path.dirname(templatePath), partialName + ".html");
+            return renderHTML(partialPath, data, [
+                ...renderedPaths,
+                realPath,
+            ]);
+        });
+        return template;
+    }
+    catch (error) {
+        return `<!-- Template not found: ${templatePath} -->`;
+    }
 }

package/dist/req.js

@@ -31,9 +31,11 @@ export function handleRequest(req, res, FF) {
     logger.info(`Incoming request: ${req.method} ${req.url}`);
     const middlewaresPath = req.path + "/";
     const middlewares = getMiddlewares(FF.middlewares, middlewaresPath.replace(/\/+/g, "/"));
-    const matchedTypeMiddlewares = middlewares.filter(middleware => middleware.method === req.method.toLowerCase() || middleware.method === "all");
+    const matchedTypeMiddlewares = middlewares.filter((middleware) => middleware.method === req.method.toLowerCase() ||
+        middleware.method === "all");
     const matchedMiddlewares = matchMiddleware(req.path, matchedTypeMiddlewares);
-    logger.debug("Matched middlewares: " + matchedMiddlewares.map(middleware => middleware.path).join(", "));
+    logger.debug("Matched middlewares: " +
+        matchedMiddlewares.map((middleware) => middleware.path).join(", "));
     if (matchedMiddlewares.length === 0) {
         res.status(404).end("404: File had second thoughts");
         return;
@@ -69,12 +71,15 @@ export function handleRequest(req, res, FF) {
             }
         }
     }
-    if (req.method === "GET" && middlewares[middlewares.length - 1]?.sse) {
+    if (req.method === "GET" ||
+        req.method === "HEAD" ||
+        req.method === "OPTIONS") {
+        req.body = {};
         next();
         return;
     }
     let body = "";
-    req.on("data", chunk => (body += chunk.toString()));
+    req.on("data", (chunk) => (body += chunk.toString()));
     req.on("end", async () => {
         const parsedBody = await parseBody(req, body, FF);
         Object.assign(req, parsedBody);

package/dist/res.d.ts

@@ -1,12 +1,12 @@
 import http from "http";
-import { CookieOptions } from "./types.js";
 import FalconFrame from "./index.js";
+import { CookieOptions } from "./types.js";
 export declare class FFResponse extends http.ServerResponse {
     _ended: boolean;
     FF: FalconFrame;
     /**
      * bind end for compatibility
-    */
+     */
     send(data: string): void;
     /**
      * Sets a header. This is a shortcut for setHeader.
@@ -56,13 +56,13 @@ export declare class FFResponse extends http.ServerResponse {
      */
     sendFile(filePath: string, contentType?: string): this;
     /**
-     * Renders an HTML template with the provided data and sends it as the response.
-     * Sets the "Content-Type" header to "text/html".
-     * @param templatePath The path to the HTML template file.
+     * Renders a view with the given data and sends it as the response.
+     * It uses the registered template engine.
+     * @param view The name of the view file to render.
      * @param data An object containing data to be injected into the template.
      * @returns The response object.
      */
-    render(templatePath: string, data?: any): this;
+    render(view: string, data?: any): this;
     /**
      * Initialize SSE headers to start a server-sent event stream.
      * Sets:

package/dist/res.js

@@ -1,14 +1,13 @@
+import { createReadStream } from "fs";
 import http from "http";
+import path from "path";
 import { getContentType } from "./helpers.js";
-import { createReadStream } from "fs";
-import { renderHTML } from "./render.js";
-import { resolve } from "path";
 export class FFResponse extends http.ServerResponse {
     _ended = false;
     FF;
     /**
      * bind end for compatibility
-    */
+     */
     send(data) {
         this.end(data);
     }
@@ -99,18 +98,47 @@ export class FFResponse extends http.ServerResponse {
         return this;
     }
     /**
-     * Renders an HTML template with the provided data and sends it as the response.
-     * Sets the "Content-Type" header to "text/html".
-     * @param templatePath The path to the HTML template file.
+     * Renders a view with the given data and sends it as the response.
+     * It uses the registered template engine.
+     * @param view The name of the view file to render.
      * @param data An object containing data to be injected into the template.
      * @returns The response object.
      */
-    render(templatePath, data = {}) {
-        this.setHeader("Content-Type", "text/html");
-        if (this.FF.vars["views"] && !templatePath.endsWith(".html")) {
-            templatePath = resolve(this.FF.vars["views"] + "/" + templatePath + ".html");
+    render(view, data = {}) {
+        const ff = this.FF;
+        const viewEngine = ff.getVar("view engine");
+        const viewsDir = ff.getVar("views") || ".";
+        let finalExt = path.extname(view);
+        let filePath = view;
+        if (!finalExt) {
+            const defaultExt = viewEngine ? (viewEngine.startsWith(".") ? viewEngine : "." + viewEngine) : ".html";
+            finalExt = defaultExt;
+            filePath += finalExt;
+        }
+        const engine = ff.engines[finalExt];
+        if (!engine) {
+            const errMessage = `No engine registered for extension ${finalExt}`;
+            ff.logger.error(errMessage);
+            this.status(500).end("Server Error: " + errMessage);
+            return this;
+        }
+        const fullPath = path.resolve(viewsDir, filePath);
+        try {
+            engine(fullPath, data, (err, str) => {
+                if (err) {
+                    ff.logger.error(`Error rendering view: ${err}`);
+                    this.status(500).end("Server Error: Failed to render view.");
+                }
+                else {
+                    this.setHeader("Content-Type", "text/html");
+                    this.end(str);
+                }
+            });
+        }
+        catch (err) {
+            ff.logger.error(`Unhandled error in template engine: ${err}`);
+            this.status(500).end("Server Error: Unhandled exception in template engine.");
         }
-        this.end(renderHTML(templatePath, data));
         return this;
     }
     /**

package/dist/router.d.ts

@@ -1,13 +1,15 @@
-import { Method, Middleware, RouteHandler } from "./types.js";
+import { PluginSystem } from "./plugin.js";
+import { Method, Middleware, RouteHandler, StaticServeOptions } from "./types.js";
+export type MiddlewareFn = RouteHandler | Router | PluginSystem;
 export declare class Router {
     middlewares: Middleware[];
     addRoute(method: Method, path: string, ...handlers: RouteHandler[]): number;
-    use(path?: string | RouteHandler | Router, middlewareFn?: RouteHandler | Router, method?: Method): this;
+    use(path?: string | MiddlewareFn, middlewareFn?: MiddlewareFn, method?: Method): this;
     get(path: string, ...handlers: RouteHandler[]): this;
     post(path: string, ...handlers: RouteHandler[]): this;
     put(path: string, ...handlers: RouteHandler[]): this;
     delete(path: string, ...handlers: RouteHandler[]): this;
     all(path: string, ...handlers: RouteHandler[]): this;
-    static(apiPath: string, dirPath?: string, utf8?: boolean): this;
+    static(apiPath: string, dirPath?: string, opts?: StaticServeOptions): this;
     sse(path: string, ...handlers: RouteHandler[]): this;
 }

package/dist/router.js

@@ -1,13 +1,14 @@
 import { handleStaticFiles } from "./helpers.js";
+import { PluginSystem } from "./plugin.js";
 export class Router {
     middlewares = [];
     addRoute(method, path, ...handlers) {
         const handler = handlers.pop();
-        handlers.forEach(middleware => this.use(path, middleware));
+        handlers.forEach((middleware) => this.use(path, middleware));
         return this.middlewares.push({ path, middleware: handler, method });
     }
     use(path = "/", middlewareFn, method = "all") {
-        if (typeof path === "function" || path instanceof Router) {
+        if (typeof path === "function" || path instanceof Router || path instanceof PluginSystem) {
             middlewareFn = path;
             path = "/";
         }
@@ -15,11 +16,14 @@ export class Router {
             path,
             method,
             middleware: null,
-            use: true
+            use: true,
         };
         if (middlewareFn instanceof Router) {
             middleware.router = middlewareFn.middlewares;
         }
+        else if (middlewareFn instanceof PluginSystem) {
+            middleware.middleware = middlewareFn.getRouteHandler();
+        }
         else {
             middleware.middleware = middlewareFn;
         }
@@ -46,12 +50,12 @@ export class Router {
         this.addRoute("all", path, ...handlers);
         return this;
     }
-    static(apiPath, dirPath, utf8 = true) {
+    static(apiPath, dirPath, opts = {}) {
         if (!dirPath) {
             dirPath = apiPath;
             apiPath = "/";
         }
-        this.use(apiPath, handleStaticFiles(dirPath, utf8));
+        this.use(apiPath, handleStaticFiles(dirPath, opts));
         return this;
     }
     sse(path, ...handlers) {

package/dist/types.d.ts

@@ -54,3 +54,9 @@ export interface ValidationResult {
     };
 }
 export type BeforeHandleRequest = (req: http.IncomingMessage, res: http.ServerResponse) => any;
+export interface StaticServeOptions {
+    utf8?: boolean;
+    render?: boolean;
+    etag?: boolean;
+    errorIfDirNotFound?: boolean;
+}

package/dist/valid.js

@@ -24,7 +24,8 @@ export function validate(schema, data) {
                     }
                     break;
                 case "min":
-                    if (typeof value === "string" && value.length < parseInt(param)) {
+                    if (typeof value === "string" &&
+                        value.length < parseInt(param)) {
                         fieldErrors.push(`${key} must be at least ${param} characters long`);
                     }
                     if (typeof value === "number" && value < parseInt(param)) {
@@ -32,7 +33,8 @@ export function validate(schema, data) {
                     }
                     break;
                 case "max":
-                    if (typeof value === "string" && value.length > parseInt(param)) {
+                    if (typeof value === "string" &&
+                        value.length > parseInt(param)) {
                         fieldErrors.push(`${key} must not exceed ${param} characters`);
                     }
                     if (typeof value === "number" && value > parseInt(param)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/falcon-frame",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",

package/dist/plugins/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./cors.js";
-export * from "./rateLimit.js";

package/dist/plugins/index.js

@@ -1,2 +0,0 @@
-export * from "./cors.js";
-export * from "./rateLimit.js";