rouzer 1.0.0-beta.11 → 1.0.0-beta.13

package/dist/server/router.d.ts

@@ -1,6 +1,5 @@
-import type { AdapterRequestContext } from '@hattip/core';
 import { type Params } from '@remix-run/route-pattern';
-import { chain, MiddlewareChain, type MiddlewareContext } from 'alien-middleware';
+import { chain, MiddlewareChain, type HattipContext, type MiddlewareContext } from 'alien-middleware';
 import * as z from 'zod/mini';
 import type { InferRouteResponse, MutationMethod, Promisable, QueryMethod, Routes } from '../types.js';
 export { chain };
@@ -95,7 +94,7 @@ export declare function createRouter<TRoutes extends Routes, TMiddleware extends
     } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]["source"]>;
     body: z.infer<T["body"]>;
     headers: z.infer<T["headers"]>;
-}) => Promisable<Response | InferRouteResponse<T>> : never : never : never; }; }) => import("alien-middleware").ApplyMiddleware<TMiddleware, (context: AdapterRequestContext<TMiddleware extends MiddlewareChain<infer T extends {
+}) => Promisable<Response | InferRouteResponse<T>> : never : never : never; }; }) => import("alien-middleware").ApplyMiddleware<TMiddleware, (context: HattipContext<TMiddleware extends MiddlewareChain<infer T extends {
     initial: {
         env: object;
         properties: object;
@@ -105,7 +104,7 @@ export declare function createRouter<TRoutes extends Routes, TMiddleware extends
         properties: object;
     };
     platform: unknown;
-}> ? T["platform"] : never> & {
+}> ? T["platform"] : never, any> & {
     url?: URL | undefined;
     path?: {} | undefined;
 }) => Promise<Response | undefined>>;

package/dist/server/router.js

@@ -16,13 +16,18 @@ export function createRouter(config) {
             return new RegExp(`^${origin
                 .replace(/\./g, '\\.')
                 .replace(/\*:/g, '[^:]+:') // Wildcard protocol
-                .replace(/\*\\\./g, '([^/.]+\\.)?') // Wildcard subdomain
+                .replace(/\*\\\./g, '([^/]+\\.)?') // Wildcard subdomain
             }$`);
         }
         return new ExactPattern(origin);
     });
     return (handlers) => middlewares.use(async function (context) {
         const request = context.request;
+        const origin = request.headers.get('Origin');
+        if (allowOrigins &&
+            !(origin && 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;
@@ -47,11 +52,6 @@ export function createRouter(config) {
                 continue;
             }
             if (isPreflight) {
-                const origin = request.headers.get('Origin');
-                if (allowOrigins &&
-                    !(origin && allowOrigins.some(pattern => pattern.test(origin)))) {
-                    return new Response(null, { status: 403 });
-                }
                 return new Response(null, {
                     headers: {
                         'Access-Control-Allow-Origin': origin ?? '*',
@@ -60,6 +60,9 @@ export function createRouter(config) {
                     },
                 });
             }
+            // Since we can't know if this was preceded by a preflight request, we
+            // set this header for all requests.
+            context.setHeader('Access-Control-Allow-Origin', origin ?? '*');
             if (route.path) {
                 const error = parsePathParams(context, enableStringParsing(route.path), match.params);
                 if (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rouzer",
-  "version": "1.0.0-beta.11",
+  "version": "1.0.0-beta.13",
   "type": "module",
   "exports": {
     ".": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@hattip/core": "^0.0.49",
     "@remix-run/route-pattern": "^0.15.3",
-    "alien-middleware": "^0.10.2"
+    "alien-middleware": "^0.10.3"
   },
   "prettier": "@alloc/prettier-config",
   "license": "MIT",