@wxn0brp/falcon-frame 0.0.15 → 0.0.17

package/dist/helpers.d.ts

@@ -2,4 +2,4 @@ import { Body, Cookies, RouteHandler } from "./types.js";
 export declare function parseCookies(cookieHeader: string): Cookies;
 export declare function parseBody(contentType: string, body: string): Body;
 export declare function getContentType(filePath: string, utf8?: boolean): string;
-export declare function handleStaticFiles(apiPath: string, dirPath: string, utf8?: boolean): RouteHandler;
+export declare function handleStaticFiles(dirPath: string, utf8?: boolean): RouteHandler;

package/dist/helpers.js

@@ -60,24 +60,26 @@ export function getContentType(filePath, utf8 = false) {
         contentType += "; charset=utf-8";
     return contentType;
 }
-export function handleStaticFiles(apiPath, dirPath, utf8 = true) {
+export function handleStaticFiles(dirPath, utf8 = true) {
     return (req, res, next) => {
-        if (!req.path.startsWith(apiPath))
+        if (req.method.toLowerCase() !== "get")
             return next();
-        const filePath = path.join(dirPath, req.path.slice(apiPath.length));
+        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 (req.path.endsWith("/")) {
-            if (fs.existsSync(filePath) && fs.statSync(filePath).isDirectory()) {
-                const indexPath = path.join(filePath, "index.html");
-                if (fs.existsSync(indexPath) && fs.statSync(indexPath).isFile()) {
-                    res.ct(getContentType(indexPath, utf8));
-                    fs.createReadStream(indexPath).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 + "/");
                 }
+                res.ct(getContentType(indexPath, utf8));
+                fs.createReadStream(indexPath).pipe(res);
+                return true;
             }
         }
         next();

package/dist/req.js

@@ -26,7 +26,8 @@ export function handleRequest(req, res, FF) {
     req.params = {};
     req.valid = (schema) => validate(schema, req.body);
     logger.info(`Incoming request: ${req.method} ${req.url}`);
-    const middlewares = getMiddlewares(FF.middlewares, (req.url + "/").replace(/\/+/g, "/"));
+    const middlewaresPath = req.url.split("?")[0] + "/";
+    const middlewares = getMiddlewares(FF.middlewares, middlewaresPath.replace(/\/+/g, "/"));
     let body = "";
     req.on("data", chunk => (body += chunk.toString()));
     req.on("end", () => {
@@ -57,6 +58,7 @@ export function handleRequest(req, res, FF) {
                     }
                 }
             }
+            req.middleware = middleware;
             const result = await middleware.middleware(req, res, next);
             if (result && !res._ended) {
                 if (typeof result === "string") {
@@ -123,6 +125,7 @@ function getMiddlewares(middlewares, matchUrl, basePath = "") {
         const midPath = (middleware.path || "").replace(/\/+$/, "");
         const fullPath = (basePath + "/" + midPath).replace(/\/+/g, "/");
         const matches = matchUrl === fullPath ||
+            (middleware.use && matchUrl.startsWith(fullPath)) ||
             fullPath.includes(":") ||
             fullPath.includes("*") ||
             matchUrl.startsWith(fullPath + "/");

package/dist/router.js

@@ -45,15 +45,6 @@ export class Router {
             dirPath = apiPath;
             apiPath = "/";
         }
-        this.middlewares.push({
-            path: (apiPath + "/*").replace("//", "/"),
-            method: "get",
-            middleware: handleStaticFiles(apiPath, dirPath, utf8)
-        });
-        this.middlewares.push({
-            path: apiPath,
-            method: "get",
-            middleware: handleStaticFiles(apiPath, dirPath, utf8)
-        });
+        this.use(apiPath, handleStaticFiles(dirPath, utf8));
     }
 }

package/dist/types.d.ts

@@ -21,6 +21,7 @@ export declare class FFRequest extends http.IncomingMessage {
     cookies: Cookies;
     body: Body;
     valid: (schema: ValidationSchema) => ValidationResult;
+    middleware: Middleware;
 }
 export interface Middleware {
     path: string;

package/dist/types.js

@@ -6,4 +6,5 @@ export class FFRequest extends http.IncomingMessage {
     cookies;
     body;
     valid;
+    middleware;
 }

package/package.json

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