@wxn0brp/falcon-frame 0.2.0 → 0.2.1

package/dist/helpers.js

@@ -38,9 +38,10 @@ export function handleStaticFiles(dirPath, opts) {
         utf8: true,
         render: true,
         etag: true,
+        errorIfDirNotFound: true,
         ...opts,
     };
-    if (!fs.existsSync(dirPath)) {
+    if (opts.errorIfDirNotFound && !fs.existsSync(dirPath)) {
         throw new Error(`Directory ${dirPath} does not exist`);
     }
     const serveFile = (req, res, filePath, stats) => {
@@ -94,19 +95,8 @@ export function handleStaticFiles(dirPath, opts) {
         try {
             const htmlPath = filePath + ".html";
             const htmlStats = fs.statSync(htmlPath);
-            if (htmlStats.isFile()) {
-                if (opts.etag) {
-                    const etag = `W/"${htmlStats.size}-${htmlStats.mtime.getTime()}"`;
-                    if (req.headers["if-none-match"] === etag) {
-                        res.status(304).end();
-                        return true;
-                    }
-                    res.setHeader("ETag", etag);
-                }
-                res.ct(getContentType(htmlPath, opts.utf8));
-                fs.createReadStream(htmlPath).pipe(res);
-                return true;
-            }
+            if (htmlStats.isFile())
+                return serveFile(req, res, htmlPath, htmlStats);
         }
         catch (e) {
             /* .html file not found, fall through to next() */

package/dist/index.d.ts

@@ -17,7 +17,7 @@ export declare class FalconFrame<Vars extends Record<string, any> = any> extends
     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;

package/dist/router.d.ts

@@ -1,8 +1,10 @@
+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;

package/dist/router.js

@@ -1,4 +1,5 @@
 import { handleStaticFiles } from "./helpers.js";
+import { PluginSystem } from "./plugin.js";
 export class Router {
     middlewares = [];
     addRoute(method, path, ...handlers) {
@@ -7,7 +8,7 @@ export class Router {
         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 = "/";
         }
@@ -20,6 +21,9 @@ export class Router {
         if (middlewareFn instanceof Router) {
             middleware.router = middlewareFn.middlewares;
         }
+        else if (middlewareFn instanceof PluginSystem) {
+            middleware.middleware = middlewareFn.getRouteHandler();
+        }
         else {
             middleware.middleware = middlewareFn;
         }

package/dist/types.d.ts

@@ -58,4 +58,5 @@ export interface StaticServeOptions {
     utf8?: boolean;
     render?: boolean;
     etag?: boolean;
+    errorIfDirNotFound?: boolean;
 }

package/package.json

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