rouzer 1.1.1 → 1.2.1

package/dist/server/router.d.ts

@@ -46,7 +46,7 @@ export interface Router<T extends MiddlewareTypes = any> extends HattipHandler<T
      *
      * @returns a new `Router` instance.
      */
-    use<const TMiddleware extends ExtractMiddleware<this>>(middleware: TMiddleware): Router<ApplyMiddleware<this, TMiddleware>>;
+    use<const TMiddleware extends ExtractMiddleware<this>>(middleware: TMiddleware | null): Router<ApplyMiddleware<this, TMiddleware>>;
     /**
      * Clone this router and add the given routes and handlers to the chain.
      *

package/dist/server/router.js

@@ -7,12 +7,21 @@ export { chain };
 class RouterObject extends MiddlewareChain {
     config;
     basePath;
-    allowOrigins;
     constructor(config) {
         super();
         this.config = config;
         this.basePath = config.basePath?.replace(/\/?$/, '/');
-        this.allowOrigins = config.cors?.allowOrigins?.map(createOriginPattern);
+        const allowOrigins = config.cors?.allowOrigins?.map(createOriginPattern);
+        if (allowOrigins) {
+            super.use((ctx) => {
+                const origin = ctx.request.headers.get('Origin');
+                if (origin &&
+                    allowOrigins &&
+                    !allowOrigins.some(pattern => pattern.test(origin))) {
+                    return new Response(null, { status: 403 });
+                }
+            });
+        }
     }
     use(...args) {
         const handler = args.length === 1 ? super.use(args[0]) : this.useRoutes(...args);
@@ -21,23 +30,20 @@ class RouterObject extends MiddlewareChain {
     }
     /** @internal */
     useRoutes(routes, handlers) {
-        const { config, basePath, allowOrigins } = this;
+        const { config, basePath } = this;
         const keys = Object.keys(routes);
         const patterns = mapValues(routes, ({ path }) => basePath ? new RoutePattern(path.source.replace(/^\/?/, basePath)) : path);
         return super.use(async function (context) {
             const request = context.request;
             const origin = request.headers.get('Origin');
-            if (origin &&
-                allowOrigins &&
-                !allowOrigins.some(pattern => pattern.test(origin))) {
-                return new Response(null, { status: 403 });
-            }
             const url = (context.url ??= new URL(request.url));
-            let method = request.method.toUpperCase();
             let isPreflight = false;
+            let method = request.method;
             if (method === 'OPTIONS') {
-                method = request.headers.get('Access-Control-Request-Method') ?? 'GET';
                 isPreflight = true;
+                method =
+                    request.headers.get('Access-Control-Request-Method')?.toUpperCase() ??
+                        'GET';
             }
             for (let i = 0; i < keys.length; i++) {
                 const { methods } = routes[keys[i]];
@@ -59,7 +65,7 @@ class RouterObject extends MiddlewareChain {
                 if (isPreflight) {
                     return new Response(null, {
                         headers: {
-                            'Access-Control-Allow-Origin': origin ?? '*',
+                            'Access-Control-Allow-Origin': origin ?? '',
                             'Access-Control-Allow-Methods': method,
                             'Access-Control-Allow-Headers': request.headers.get('Access-Control-Request-Headers') ?? '',
                         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rouzer",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "type": "module",
   "exports": {
     ".": {
@@ -27,7 +27,7 @@
   "dependencies": {
     "@hattip/core": "^0.0.49",
     "@remix-run/route-pattern": "^0.15.3",
-    "alien-middleware": "^0.11.3"
+    "alien-middleware": "^0.11.4"
   },
   "prettier": "@alloc/prettier-config",
   "license": "MIT",