@wxn0brp/falcon-frame 0.7.0 → 0.7.1

package/dist/cors.d.ts

@@ -4,4 +4,4 @@ export interface Opts {
     accessControlAllowHeaders?: boolean;
     headers?: Record<string, string>;
 }
-export declare function createCORS(allowedOrigins: string[], opts?: Opts): RouteHandler;
+export declare function createCORS(allowedOrigins: (string | RegExp)[], opts?: Opts): RouteHandler;

package/dist/cors.js

@@ -4,6 +4,54 @@ function setHeader(res, opts) {
     if (opts.accessControlAllowHeaders)
         res.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
 }
+function parseOrigin(origin) {
+    try {
+        const url = new URL(origin);
+        return {
+            host: url.hostname,
+            port: url.port ||
+                (url.protocol === "https:" ? "443" : "80")
+        };
+    }
+    catch {
+        return null;
+    }
+}
+function matches(origin, pattern) {
+    if (pattern === "*")
+        return true;
+    if (pattern instanceof RegExp)
+        return pattern.test(origin);
+    if (pattern.toLowerCase() === origin.toLowerCase())
+        return true;
+    const o = parseOrigin(origin);
+    if (!o)
+        return false;
+    // *.example.com[:port]
+    if (pattern.startsWith("*.")) {
+        const [pHost, pPort] = pattern.split(":");
+        const base = pHost.slice(2).toLowerCase();
+        if (o.host !== base && o.host.endsWith("." + base)) {
+            return !pPort || pPort === "*" || pPort === o.port;
+        }
+        return false;
+    }
+    // localhost:port
+    if (pattern.includes(":")) {
+        const [pHost, pPort] = pattern.split(":");
+        const base = pHost.toLowerCase();
+        return o.host === base && (pPort === "*" || o.port === pPort);
+    }
+    return false;
+}
+function handleEnd(req, res, next, origin) {
+    res.setHeader("Access-Control-Allow-Origin", origin);
+    if (req.method === "OPTIONS") {
+        res.statusCode = 204;
+        return res.end();
+    }
+    next();
+}
 export function createCORS(allowedOrigins, opts = {}) {
     opts = {
         accessControlAllowMethods: true,
@@ -16,24 +64,12 @@ export function createCORS(allowedOrigins, opts = {}) {
                 res.setHeader(key, value);
             }
         }
-        if (allowedOrigins.includes("*")) {
-            res.setHeader("Access-Control-Allow-Origin", "*");
-            setHeader(res, opts);
-            if (req.method === "OPTIONS") {
-                res.statusCode = 204;
-                return res.end();
-            }
-            return next();
-        }
+        setHeader(res, opts);
         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 (allowedOrigins.includes("*"))
+            return handleEnd(req, res, next, origin || "*");
+        if (origin && allowedOrigins.some((pattern) => matches(origin, pattern)))
+            return handleEnd(req, res, next, origin);
         next();
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/falcon-frame",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",
@@ -29,7 +29,7 @@
     "typescript": "*"
   },
   "dependencies": {
-    "@wxn0brp/lucerna-log": "^0.2.0"
+    "@wxn0brp/lucerna-log": "^0.2.2"
   },
   "files": [
     "dist"