@@ -30,6 +30,7 @@ import Prelude
30import PureStack.Route
30import PureStack.Route
32import Bun.Request (Request)
32import Bun.Request (Request)
33+import Bun.Request as Bun
33import Bun.Request as Request
34import Bun.Request as Request
34import Bun.Response as Bun.Response
35import Bun.Response as Bun.Response
35import Control.Alternative (class Plus, empty)
36import Control.Alternative (class Plus, empty)
@@ -60,7 +61,12 @@ import Record.Builder (Builder)
60import Record.Builder as Builder
61import Record.Builder as Builder
61import Type.Proxy (Proxy(..))
62import Type.Proxy (Proxy(..))
65+ { path :: Array String
63−type Route = { path :: Array String, verb :: String, query :: Map String (Array String) }
67+ , query :: Map String (Array String)
68+ , originalRequest :: Bun.Request
65routeFromRequest :: Request -> Route
71routeFromRequest :: Request -> Route
66routeFromRequest req =
72routeFromRequest req =
@@ -77,67 +83,81 @@ routeFromRequest req =
77 , query: case url of
83 , query: case url of
78 Nothing -> Map.empty
84 Nothing -> Map.empty
79 Just u -> URL.query u
85 Just u -> URL.query u
86+ , originalRequest: req
82type Server a = ExceptT Response Aff a
89type Server a = ExceptT Response Aff a
84newtype Nt m = Nt (forall x. m x -> Server x)
91newtype Nt m = Nt (forall x. m x -> Server x)
86−class ServeRoute :: forall k. k -> Type -> (Type -> Type) -> Constraint
93+class ServeRoute :: forall k. k -> Type -> Row Type -> (Type -> Type) -> Constraint
87−class ServeRoute route handler m | route -> handler, handler -> m where
94+class ServeRoute route handler middlewares m | route middlewares -> handler, handler -> m where
88− serveRoute :: Route -> Maybe (Nt m -> handler -> Request -> Server Response)
95+ serveRoute :: Route -> Maybe (Nt m -> handler -> Record middlewares -> Request -> Server Response)
90−instance (ServeRoute rest handler m, IsSymbol path) => ServeRoute (path / rest) handler m where
97+instance (ServeRoute rest handler middlewares m, IsSymbol path) => ServeRoute (path / rest) handler middlewares m where
91 serveRoute route@{ path } = do
98 serveRoute route@{ path } = do
92 { head: h, tail } <- Array.uncons path
99 { head: h, tail } <- Array.uncons path
93 assert $ h == (reflectSymbol @path Proxy)
100 assert $ h == (reflectSymbol @path Proxy)
94 serveRoute @rest route { path = tail }
101 serveRoute @rest route { path = tail }
96else instance
103else instance
97− ( ServeRoute rest handler m
104+ ( ServeRoute rest handler middlewares m
98 , ServeQuery row list
105 , ServeQuery row list
99 , RowToList row list
106 , RowToList row list
101− ServeRoute (Record row / rest) (Record row -> handler) m where
108+ ServeRoute (Record row / rest) (Record row -> handler) middlewares m where
102 serveRoute route@{ query } = do
109 serveRoute route@{ query } = do
103 builder <- serveQuery @row @list query
110 builder <- serveQuery @row @list query
104 serveRoute @rest route <#> (\f nt handler req -> f nt (handler $ Builder.buildFromScratch builder) req)
111 serveRoute @rest route <#> (\f nt handler req -> f nt (handler $ Builder.buildFromScratch builder) req)
114+ ( ServeRoute rest handler middlewares m
116+ , Row.Cons field (Bun.Request -> m x) tail middlewares
118+ ServeRoute (Middleware field / rest) (x -> handler) middlewares m where
119+ serveRoute route@{ originalRequest } = do
120+ serveRoute @rest route <#>
121+ ( \f nt@(Nt ntf) handler middlewares req -> do
122+ x <- ntf $ Record.get (Proxy @field) middlewares originalRequest
123+ f nt (handler x) middlewares req
106−else instance (ServeRoute rest handler m, ParsePathPiece t) => ServeRoute (t / rest) (t -> handler) m where
126+else instance (ServeRoute rest handler middlewares m, ParsePathPiece t) => ServeRoute (t / rest) (t -> handler) middlewares m where
107 serveRoute route@{ path } = do
127 serveRoute route@{ path } = do
108 { head: h, tail } <- Array.uncons path
128 { head: h, tail } <- Array.uncons path
109 t <- parsePathPiece @t h
129 t <- parsePathPiece @t h
110− serveRoute @rest route { path = tail } <#> (\f nt handler req -> f nt (handler t) req)
130+ serveRoute @rest route { path = tail } <#> (\f nt handler mws req -> f nt (handler t) mws req)
112−else instance MethodName (meth Unit Unit) => ServeRoute (meth Unit Unit) (m Unit) m where
132+else instance MethodName (meth Unit Unit) => ServeRoute (meth Unit Unit) (m Unit) middlewares m where
113 serveRoute { path, verb } = do
133 serveRoute { path, verb } = do
114 assert $ verb == methodName @(meth Unit Unit)
134 assert $ verb == methodName @(meth Unit Unit)
115 assert $ path == []
135 assert $ path == []
116− pure $ \(Nt nt) handler _req -> do
136+ pure $ \(Nt nt) handler _middlewares _req -> do
117 nt handler
137 nt handler
118 pure $ ok
138 pure $ ok
119−else instance (ToResponse resp, MethodName (meth Unit resp)) => ServeRoute (meth Unit resp) (m resp) m where
139+else instance (ToResponse resp, MethodName (meth Unit resp)) => ServeRoute (meth Unit resp) (m resp) middlewares m where
120 serveRoute { path, verb } = do
140 serveRoute { path, verb } = do
121 assert $ verb == methodName @(meth Unit resp)
141 assert $ verb == methodName @(meth Unit resp)
122 assert $ path == []
142 assert $ path == []
123− pure $ \(Nt nt) handler _req -> do
143+ pure $ \(Nt nt) handler _middlewares _req -> do
124 resp <- nt handler
144 resp <- nt handler
125 pure $ toResponse resp
145 pure $ toResponse resp
126−else instance (FromRequest req, MethodName (meth resp Unit)) => ServeRoute (meth resp Unit) (req -> m Unit) m where
146+else instance (FromRequest req, MethodName (meth resp Unit)) => ServeRoute (meth resp Unit) (req -> m Unit) middlewares m where
127 serveRoute { path, verb } = do
147 serveRoute { path, verb } = do
128 assert $ verb == methodName @(meth resp Unit)
148 assert $ verb == methodName @(meth resp Unit)
129 assert $ path == []
149 assert $ path == []
130− pure $ \(Nt nt) handler req -> do
150+ pure $ \(Nt nt) handler _middlewares req -> do
131 liftAff (fromRequest req) >>= case _ of
151 liftAff (fromRequest req) >>= case _ of
132 Nothing -> pure $ badRequest
152 Nothing -> pure $ badRequest
133 Just r -> do
153 Just r -> do
134 nt $ handler r
154 nt $ handler r
135 pure $ ok
155 pure $ ok
136−else instance (FromRequest req, ToResponse resp, MethodName (meth req resp)) => ServeRoute (meth req resp) (req -> m resp) m where
156+else instance (FromRequest req, ToResponse resp, MethodName (meth req resp)) => ServeRoute (meth req resp) (req -> m resp) middlewares m where
137 serveRoute { path, verb } = do
157 serveRoute { path, verb } = do
138 assert $ verb == methodName @(meth req resp)
158 assert $ verb == methodName @(meth req resp)
139 assert $ path == []
159 assert $ path == []
140− pure $ \(Nt nt) handler req -> do
160+ pure $ \(Nt nt) handler _middlewares req -> do
141 liftAff (fromRequest req) >>= case _ of
161 liftAff (fromRequest req) >>= case _ of
142 Nothing -> pure $ badRequest
162 Nothing -> pure $ badRequest
143 Just r -> do
163 Just r -> do
@@ -145,12 +165,12 @@ else instance (FromRequest req, ToResponse resp, MethodName (meth req resp)) =>
145 pure $ toResponse resp
165 pure $ toResponse resp
147else instance
167else instance
148− ( ServeAPI routes list handlers m
168+ ( ServeAPI routes list handlers middlewares m
149 , RowToList routes list
169 , RowToList routes list
151− ServeRoute routes (Record handlers) m where
171+ ServeRoute routes (Record handlers) middlewares m where
152− serveRoute route = pure $ \nt handlers req ->
172+ serveRoute route = pure $ \nt handlers middlewares req ->
153− serveAPI @routes @list nt handlers route req
173+ serveAPI @routes @list nt handlers middlewares route req
155class ServeQuery :: Row Type -> RowList Type -> Constraint
175class ServeQuery :: Row Type -> RowList Type -> Constraint
156class ServeQuery row list | list -> row where
176class ServeQuery row list | list -> row where
@@ -337,26 +357,26 @@ assert :: forall m. Applicative m => Plus m => Boolean -> m Unit
337assert true = pure unit
357assert true = pure unit
338assert false = empty
358assert false = empty
340−class ServeAPI :: Row Type -> RowList Type -> Row Type -> (Type -> Type) -> Constraint
360+class ServeAPI :: Row Type -> RowList Type -> Row Type -> Row Type -> (Type -> Type) -> Constraint
341−class ServeAPI row list handlers m | row -> handlers, handlers -> m where
361+class ServeAPI row list handlers middlewares m | row -> handlers, handlers -> m where
342− serveAPI :: Nt m -> Record handlers -> Route -> Request -> Server Response
362+ serveAPI :: Nt m -> Record handlers -> Record middlewares -> Route -> Request -> Server Response
344−instance ServeAPI row RowList.Nil () m where
364+instance ServeAPI row RowList.Nil () middlewares m where
345− serveAPI _ _ _ _ = pure notFound
365+ serveAPI _ _ _ _ _ = pure notFound
348− ( ServeRoute t handler m
368+ ( ServeRoute t handler middlewares m
349 , Row.Cons field t tail row
369 , Row.Cons field t tail row
350− , ServeAPI row rest restHandlers m
370+ , ServeAPI row rest restHandlers middlewares m
351 , IsSymbol field
371 , IsSymbol field
352 , Row.Cons field handler restHandlers handlers
372 , Row.Cons field handler restHandlers handlers
353 , Row.Lacks field restHandlers
373 , Row.Lacks field restHandlers
355− ServeAPI row (RowList.Cons field t rest) handlers m where
375+ ServeAPI row (RowList.Cons field t rest) handlers middlewares m where
356− serveAPI nt handlers route req =
376+ serveAPI nt handlers middlewares route req =
357 case serveRoute @t route of
377 case serveRoute @t route of
358− Nothing -> serveAPI @row @rest @restHandlers nt (Record.delete (Proxy @field) handlers) route req
378+ Nothing -> serveAPI @row @rest @restHandlers @middlewares nt (Record.delete (Proxy @field) handlers) middlewares route req
359− Just f -> f nt (Record.get (Proxy @field) handlers) req
379+ Just f -> f nt (Record.get (Proxy @field) handlers) middlewares req
361notFound :: Response
381notFound :: Response
362notFound = Response { body: EmptyResponseBody, status: 404, statusText: "Not Found", headers: Object.empty }
382notFound = Response { body: EmptyResponseBody, status: 404, statusText: "Not Found", headers: Object.empty }
@@ -373,16 +393,16 @@ ok = Response { body: EmptyResponseBody, status: 200, statusText: "OK", headers:
373-- | The first argument is used to run an arbitrary monad in handlers. To use the 'Server' monad
393-- | The first argument is used to run an arbitrary monad in handlers. To use the 'Server' monad
374-- | instead you can just pass `identity` as the first argument.
394-- | instead you can just pass `identity` as the first argument.
376− :: forall @row list handlers m
396+ :: forall @row list handlers m middlewares
377 . RowToList row list
397 . RowToList row list
378− => ServeAPI row list handlers m
398+ => ServeAPI row list handlers middlewares m
379 => (forall x. m x -> Server x)
399 => (forall x. m x -> Server x)
380− -> { handlers :: Record handlers }
400+ -> { handlers :: Record handlers, middlewares :: Record middlewares }
381 -> Request
401 -> Request
382 -> Aff Bun.Response.Response
402 -> Aff Bun.Response.Response
383−run nt { handlers } req = do
403+run nt { handlers, middlewares } req = do
384 Response { body, headers, status, statusText } <-
404 Response { body, headers, status, statusText } <-
385− map (either identity identity) $ runExceptT $ serveAPI @row @list @handlers (Nt nt) handlers (routeFromRequest req) req
405+ map (either identity identity) $ runExceptT $ serveAPI @row @list @handlers (Nt nt) handlers middlewares (routeFromRequest req) req
386 let opts = { headers, status, statusText }
406 let opts = { headers, status, statusText }
387 pure $ case body of
407 pure $ case body of
388 EmptyResponseBody -> Bun.Response.string "" opts
408 EmptyResponseBody -> Bun.Response.string "" opts