@wxn0brp/falcon-frame 0.0.12 → 0.0.14

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Logger, LoggerOptions } from "@wxn0brp/lucerna-log";
 import http from "http";
 import { FFResponse } from "./res.js";
-import { AfterHandleRequest, FFRequest, Method, Middleware, RouteHandler } from "./types.js";
+import { AfterHandleRequest as BeforeHandleRequest, FFRequest, Method, Middleware, RouteHandler } from "./types.js";
 import { renderHTML } from "./render.js";
 import { PluginSystem } from "./plugins.js";
 export declare class FalconFrame {
@@ -16,8 +16,8 @@ export declare class FalconFrame {
     delete(path: string, ...handlers: RouteHandler[]): void;
     all(path: string, ...handlers: RouteHandler[]): void;
     static(apiPath: string, dirPath: string): void;
-    listen(port: number, callback?: () => void, afterHandleRequest?: AfterHandleRequest): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
-    getApp(afterHandleRequest?: AfterHandleRequest): (req: any, res: any) => any;
+    listen(port: number, callback?: () => void, beforeHandleRequest?: BeforeHandleRequest): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
+    getApp(beforeHandleRequest?: BeforeHandleRequest): (req: any, res: any) => Promise<void>;
 }
 export default FalconFrame;
 export { FFResponse, FFRequest, RouteHandler, renderHTML, PluginSystem, };

package/dist/index.js

@@ -54,19 +54,19 @@ export class FalconFrame {
             middleware: handleStaticFiles(apiPath, dirPath)
         });
     }
-    listen(port, callback, afterHandleRequest) {
-        const server = http.createServer(this.getApp(afterHandleRequest));
+    listen(port, callback, beforeHandleRequest) {
+        const server = http.createServer(this.getApp(beforeHandleRequest));
         server.listen(port, callback);
         return server;
     }
-    getApp(afterHandleRequest) {
-        return (req, res) => {
-            if (afterHandleRequest) {
-                const result = afterHandleRequest(req, res);
-                if (result)
-                    return result;
+    getApp(beforeHandleRequest) {
+        return async (req, res) => {
+            if (beforeHandleRequest) {
+                const result = await beforeHandleRequest(req, res);
+                if (result || res._ended)
+                    return;
             }
-            handleRequest(req, res, this);
+            await handleRequest(req, res, this);
         };
     }
 }

package/dist/plugins/cors.js

@@ -16,16 +16,20 @@ export function createCORSPlugin(allowedOrigins, opts = {}) {
             if (allowedOrigins.includes("*")) {
                 res.setHeader("Access-Control-Allow-Origin", "*");
                 setHeader(res, opts);
+                if (req.method === "OPTIONS") {
+                    res.statusCode = 204;
+                    return res.end();
+                }
                 return next();
             }
             const origin = req.headers.origin;
             if (origin && allowedOrigins.includes(origin)) {
                 res.setHeader("Access-Control-Allow-Origin", origin);
                 setHeader(res, opts);
-            }
-            if (req.method === "OPTIONS") {
-                res.statusCode = 204;
-                return res.end();
+                if (req.method === "OPTIONS") {
+                    res.statusCode = 204;
+                    return res.end();
+                }
             }
             next();
         },

package/package.json

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