@@ -1,7 +1,5 @@
1module PureStack.Server
1module PureStack.Server
5 , class ToResponse
3 , class ToResponse
6 , toResponse
4 , toResponse
7 , class FromRequest
5 , class FromRequest
@@ -20,53 +18,39 @@ module PureStack.Server
20 , serveQuery
18 , serveQuery
21 , class ParsePathPiece
19 , class ParsePathPiece
22 , parsePathPiece
20 , parsePathPiece
29import Prelude
23import Prelude
30import PureStack.Route
24import PureStack.Route
32import Bun.Request (Request)
26import Bun.Request (Request)
33−import Bun.Request as Bun
34import Bun.Request as Request
27import Bun.Request as Request
35−import Bun.Response as Bun.Response
28+import Bun.Response (Response)
29+import Bun.Response as Response
36import Control.Alternative (class Plus, empty)
30import Control.Alternative (class Plus, empty)
37import Control.Monad.Except (ExceptT, runExceptT)
31import Control.Monad.Except (ExceptT, runExceptT)
38−import Data.Argonaut (class DecodeJson, class EncodeJson, Json, decodeJson, encodeJson)
32+import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, encodeJson)
39import Data.Array as Array
33import Data.Array as Array
40−import Data.Either (Either(..), either)
34+import Data.Either (Either(..))
41import Data.Int as Int
35import Data.Int as Int
42import Data.Map (Map)
36import Data.Map (Map)
43import Data.Map as Map
37import Data.Map as Map
44import Data.Maybe (Maybe(..))
38import Data.Maybe (Maybe(..))
45import Data.Number as Number
39import Data.Number as Number
46−import Data.String as String
47import Data.Symbol (class IsSymbol, reflectSymbol)
40import Data.Symbol (class IsSymbol, reflectSymbol)
48import Data.Traversable (traverse)
41import Data.Traversable (traverse)
49import Data.URL as URL
42import Data.URL as URL
50import Effect.Aff (Aff)
43import Effect.Aff (Aff)
51import Effect.Aff.Class (liftAff)
44import Effect.Aff.Class (liftAff)
52−import Foreign.Object (Object)
53−import Foreign.Object as Object
54import Prim.Row as Row
45import Prim.Row as Row
55import Prim.RowList (class RowToList, RowList)
46import Prim.RowList (class RowToList, RowList)
56import Prim.RowList as RowList
47import Prim.RowList as RowList
57−import PureStack.Cookie (Cookie)
58−import PureStack.Cookie as Cookie
59import Record as Record
48import Record as Record
60import Record.Builder (Builder)
49import Record.Builder (Builder)
61import Record.Builder as Builder
50import Record.Builder as Builder
62import Type.Proxy (Proxy(..))
51import Type.Proxy (Proxy(..))
65− { path :: Array String
67− , query :: Map String (Array String)
53+type Route = { path :: Array String, verb :: String, query :: Map String (Array String) }
68− , originalRequest :: Bun.Request
71routeFromRequest :: Request -> Route
55routeFromRequest :: Request -> Route
72routeFromRequest req =
56routeFromRequest req =
@@ -83,95 +67,65 @@ routeFromRequest req =
83 , query: case url of
67 , query: case url of
84 Nothing -> Map.empty
68 Nothing -> Map.empty
85 Just u -> URL.query u
69 Just u -> URL.query u
86− , originalRequest: req
89type Server a = ExceptT Response Aff a
72type Server a = ExceptT Response Aff a
91newtype Nt m = Nt (forall x. m x -> Server x)
74newtype Nt m = Nt (forall x. m x -> Server x)
93−class ServeRoute :: forall k. k -> Type -> Row Type -> (Type -> Type) -> Constraint
76+class ServeRoute :: forall k. k -> Type -> (Type -> Type) -> Constraint
94−class ServeRoute route handler middlewares m | route middlewares -> handler, handler -> m where
77+class ServeRoute route handler m | route -> handler, handler -> m where
95− serveRoute :: Route -> Maybe (Nt m -> handler -> Record middlewares -> Request -> Server Response)
78+ serveRoute :: Route -> Maybe (Nt m -> handler -> Request -> Server Response)
97−instance (ServeRoute rest handler middlewares m, IsSymbol path) => ServeRoute (path / rest) handler middlewares m where
80+instance (ServeRoute rest handler m, IsSymbol path) => ServeRoute (path / rest) handler m where
98 serveRoute route@{ path } = do
81 serveRoute route@{ path } = do
99 { head: h, tail } <- Array.uncons path
82 { head: h, tail } <- Array.uncons path
100 assert $ h == (reflectSymbol @path Proxy)
83 assert $ h == (reflectSymbol @path Proxy)
101 serveRoute @rest route { path = tail }
84 serveRoute @rest route { path = tail }
103else instance
86else instance
104− ( ServeRoute rest handler middlewares m
87+ ( ServeRoute rest handler m
105 , ServeQuery row list
88 , ServeQuery row list
106 , RowToList row list
89 , RowToList row list
108− ServeRoute (Record row / rest) (Record row -> handler) middlewares m where
91+ ServeRoute (Record row / rest) (Record row -> handler) m where
109 serveRoute route@{ query } = do
92 serveRoute route@{ query } = do
110 builder <- serveQuery @row @list query
93 builder <- serveQuery @row @list query
111 serveRoute @rest route <#> (\f nt handler req -> f nt (handler $ Builder.buildFromScratch builder) req)
94 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
126−else instance (ServeRoute rest handler middlewares m, ParsePathPiece t) => ServeRoute (t / rest) (t -> handler) middlewares m where
96+else instance (ServeRoute rest handler m, ParsePathPiece t) => ServeRoute (t / rest) (t -> handler) m where
127 serveRoute route@{ path } = do
97 serveRoute route@{ path } = do
128 { head: h, tail } <- Array.uncons path
98 { head: h, tail } <- Array.uncons path
129 t <- parsePathPiece @t h
99 t <- parsePathPiece @t h
130− serveRoute @rest route { path = tail } <#> (\f nt handler mws req -> f nt (handler t) mws req)
100+ serveRoute @rest route { path = tail } <#> (\f nt handler req -> f nt (handler t) req)
132−else instance MethodName (meth Unit Unit) => ServeRoute (meth Unit Unit) (m Unit) middlewares m where
102+else instance ToResponse resp => ServeRoute (GET resp) (m resp) m where
133 serveRoute { path, verb } = do
103 serveRoute { path, verb } = do
134− assert $ verb == methodName @(meth Unit Unit)
104+ assert $ verb == "GET"
135 assert $ path == []
105 assert $ path == []
136− pure $ \(Nt nt) handler _middlewares _req -> do
106+ pure $ \(Nt nt) handler _req -> do
139−else instance (ToResponse resp, MethodName (meth Unit resp)) => ServeRoute (meth Unit resp) (m resp) middlewares m where
140− serveRoute { path, verb } = do
141− assert $ verb == methodName @(meth Unit resp)
143− pure $ \(Nt nt) handler _middlewares _req -> do
144 resp <- nt handler
107 resp <- nt handler
145 pure $ toResponse resp
108 pure $ toResponse resp
146−else instance (FromRequest req, MethodName (meth resp Unit)) => ServeRoute (meth resp Unit) (req -> m Unit) middlewares m where
110+else instance (ToResponse resp) => ServeRoute (POST Unit resp) (m resp) m where
147 serveRoute { path, verb } = do
111 serveRoute { path, verb } = do
148− assert $ verb == methodName @(meth resp Unit)
149 assert $ path == []
112 assert $ path == []
113+ assert $ verb == "POST"
150− pure $ \(Nt nt) handler _middlewares req -> do
114+ pure $ \(Nt nt) handler _req -> do
151− liftAff (fromRequest req) >>= case _ of
115+ resp <- nt handler
152− Nothing -> pure $ badRequest
116+ pure $ toResponse resp
156−else instance (FromRequest req, ToResponse resp, MethodName (meth req resp)) => ServeRoute (meth req resp) (req -> m resp) middlewares m where
118+else instance (FromRequest req, ToResponse resp) => ServeRoute (POST req resp) (req -> m resp) m where
157 serveRoute { path, verb } = do
119 serveRoute { path, verb } = do
158− assert $ verb == methodName @(meth req resp)
159 assert $ path == []
120 assert $ path == []
121+ assert $ verb == "POST"
160− pure $ \(Nt nt) handler _middlewares req -> do
122+ pure $ \(Nt nt) handler req -> do
161 liftAff (fromRequest req) >>= case _ of
123 liftAff (fromRequest req) >>= case _ of
162 Nothing -> pure $ badRequest
124 Nothing -> pure $ badRequest
163 Just r -> do
125 Just r -> do
164 resp <- nt $ handler r
126 resp <- nt $ handler r
165 pure $ toResponse resp
127 pure $ toResponse resp
168− ( ServeAPI routes list handlers middlewares m
169− , RowToList routes list
171− ServeRoute routes (Record handlers) middlewares m where
172− serveRoute route = pure $ \nt handlers middlewares req ->
173− serveAPI @routes @list nt handlers middlewares route req
175class ServeQuery :: Row Type -> RowList Type -> Constraint
129class ServeQuery :: Row Type -> RowList Type -> Constraint
176class ServeQuery row list | list -> row where
130class ServeQuery row list | list -> row where
177 serveQuery :: Map String (Array String) -> Maybe (Builder (Record ()) (Record row))
131 serveQuery :: Map String (Array String) -> Maybe (Builder (Record ()) (Record row))
@@ -228,18 +182,11 @@ else instance
228 r <- serveQuery @tail @rest m
182 r <- serveQuery @tail @rest m
229 pure $ Builder.insert (Proxy @field) v <<< r
183 pure $ Builder.insert (Proxy @field) v <<< r
232− = JsonResponseBody Json
234− | StringResponseBody String
236−newtype Response = Response { body :: ResponseBody, status :: Int, statusText :: String, headers :: Object String }
238class ToResponse r where
185class ToResponse r where
239 toResponse :: r -> Response
186 toResponse :: r -> Response
241instance EncodeJson (Record row) => ToResponse (Record row) where
188instance EncodeJson (Record row) => ToResponse (Record row) where
242− toResponse rec = Response { body: JsonResponseBody $ encodeJson rec, status: 200, statusText: "OK", headers: Object.empty }
189+ toResponse rec = Response.json (encodeJson rec) { status: 200, statusText: "OK", headers: [] }
244instance ToResponse Response where
191instance ToResponse Response where
245 toResponse resp = resp
192 toResponse resp = resp
@@ -255,84 +202,6 @@ instance DecodeJson (Record row) => FromRequest (Record row) where
255instance FromRequest Request where
202instance FromRequest Request where
256 fromRequest req = pure $ Just req
203 fromRequest req = pure $ Just req
258−instance FromRequest Unit where
259− fromRequest _ = pure $ Just unit
265− FromRequest (Headers (Object header) req) where
266− fromRequest req = do
267− r <- fromRequest req
269− headers <- traverse fromHeader (Request.headers req)
271− pure $ Headers headers r'
274− ( RowToList headers headersList
276− , FromHeaders headers headersList
278− FromRequest (Headers (Record headers) req) where
279− fromRequest req = do
280− r <- fromRequest req
282− headers <- fromHeaders @headers @headersList (Request.headers req)
284− pure $ Headers (Builder.buildFromScratch headers) r'
286−class FromHeader t where
287− fromHeader :: String -> Maybe t
289−instance FromHeader Cookie where
290− fromHeader = Cookie.parse >>> case _ of
294−instance FromHeader String where
297−instance FromHeader Int where
298− fromHeader = Int.fromString
300−class FromHeaders :: Row Type -> RowList Type -> Constraint
301−class FromHeaders row list | list -> row where
302− fromHeaders :: Object String -> Maybe (Builder {} (Record row))
304−instance FromHeaders () RowList.Nil where
305− fromHeaders _ = Just $ identity
310− , FromHeaders tail rest
311− , Row.Cons field (Maybe t) tail row
312− , Row.Lacks field tail
314− FromHeaders row (RowList.Cons field (Maybe t) rest) where
315− fromHeaders headers = do
316− r <- fromHeaders @tail @rest headers
317− case Object.lookup (reflectSymbol @field Proxy) headers of
318− Nothing -> pure $ Builder.insert (Proxy @field) Nothing <<< r
321− pure $ Builder.insert (Proxy @field) (Just v) <<< r
326− , FromHeaders tail rest
327− , Row.Cons field t tail row
328− , Row.Lacks field tail
330− FromHeaders row (RowList.Cons field t rest) where
331− fromHeaders headers = do
332− t <- Object.lookup (reflectSymbol @field Proxy) headers >>= fromHeader
333− r <- fromHeaders @tail @rest headers
334− pure $ Builder.insert (Proxy @field) t <<< r
336class ParsePathPiece t where
205class ParsePathPiece t where
337 parsePathPiece :: String -> Maybe t
206 parsePathPiece :: String -> Maybe t
@@ -345,66 +214,52 @@ instance ParsePathPiece Int where
345instance ParsePathPiece Number where
214instance ParsePathPiece Number where
346 parsePathPiece = Number.fromString
215 parsePathPiece = Number.fromString
348−instance ParsePathPiece Boolean where
349− parsePathPiece s = case String.toLower s of
352− "false" -> Just false
356assert :: forall m. Applicative m => Plus m => Boolean -> m Unit
217assert :: forall m. Applicative m => Plus m => Boolean -> m Unit
357assert true = pure unit
218assert true = pure unit
358assert false = empty
219assert false = empty
360−class ServeAPI :: Row Type -> RowList Type -> Row Type -> Row Type -> (Type -> Type) -> Constraint
221+class ServeAPI :: Row Type -> RowList Type -> Row Type -> (Type -> Type) -> Constraint
361−class ServeAPI row list handlers middlewares m | row -> handlers, handlers -> m where
222+class ServeAPI row list handlers m | row -> handlers, handlers -> m where
362− serveAPI :: Nt m -> Record handlers -> Record middlewares -> Route -> Request -> Server Response
223+ serveAPI :: Nt m -> Record handlers -> Route -> Request -> Server Response
364−instance ServeAPI row RowList.Nil () middlewares m where
225+instance ServeAPI row RowList.Nil () m where
365− serveAPI _ _ _ _ _ = pure notFound
226+ serveAPI _ _ _ _ = pure notFound
368− ( ServeRoute t handler middlewares m
229+ ( ServeRoute t handler m
369 , Row.Cons field t tail row
230 , Row.Cons field t tail row
370− , ServeAPI row rest restHandlers middlewares m
231+ , ServeAPI row rest restHandlers m
371 , IsSymbol field
232 , IsSymbol field
372 , Row.Cons field handler restHandlers handlers
233 , Row.Cons field handler restHandlers handlers
373 , Row.Lacks field restHandlers
234 , Row.Lacks field restHandlers
375− ServeAPI row (RowList.Cons field t rest) handlers middlewares m where
236+ ServeAPI row (RowList.Cons field t rest) handlers m where
376− serveAPI nt handlers middlewares route req =
237+ serveAPI nt handlers route req =
377 case serveRoute @t route of
238 case serveRoute @t route of
378− Nothing -> serveAPI @row @rest @restHandlers @middlewares nt (Record.delete (Proxy @field) handlers) middlewares route req
239+ Nothing -> serveAPI @row @rest @restHandlers nt (Record.delete (Proxy @field) handlers) route req
379− Just f -> f nt (Record.get (Proxy @field) handlers) middlewares req
240+ Just f -> f nt (Record.get (Proxy @field) handlers) req
381notFound :: Response
242notFound :: Response
382−notFound = Response { body: EmptyResponseBody, status: 404, statusText: "Not Found", headers: Object.empty }
243+notFound = Response.string "" { status: 404, statusText: "Not Found", headers: [] }
384internalServerError :: Response
245internalServerError :: Response
385−internalServerError = Response { body: EmptyResponseBody, status: 500, statusText: "Internal Server Error", headers: Object.empty }
246+internalServerError = Response.string "" { status: 500, statusText: "Internal Server Error", headers: [] }
387badRequest :: Response
248badRequest :: Response
388−badRequest = Response { body: EmptyResponseBody, status: 400, statusText: "Bad Request", headers: Object.empty }
249+badRequest = Response.string "" { status: 400, statusText: "Bad Request", headers: [] }
391−ok = Response { body: EmptyResponseBody, status: 200, statusText: "OK", headers: Object.empty }
393-- | The first argument is used to run an arbitrary monad in handlers. To use the 'Server' monad
251-- | The first argument is used to run an arbitrary monad in handlers. To use the 'Server' monad
394-- | instead you can just pass `identity` as the first argument.
252-- | instead you can just pass `identity` as the first argument.
396− :: forall @row list handlers m middlewares
254+ :: forall @row list handlers m
397 . RowToList row list
255 . RowToList row list
398− => ServeAPI row list handlers middlewares m
256+ => ServeAPI row list handlers m
399 => (forall x. m x -> Server x)
257 => (forall x. m x -> Server x)
400− -> { handlers :: Record handlers, middlewares :: Record middlewares }
258+ -> Record handlers
401 -> Request
259 -> Request
402− -> Aff Bun.Response.Response
260+ -> Aff Response
403−run nt { handlers, middlewares } req = do
261+run nt handlers req = do
404− Response { body, headers, status, statusText } <-
405− map (either identity identity) $ runExceptT $ serveAPI @row @list @handlers (Nt nt) handlers middlewares (routeFromRequest req) req
262+ res <- runExceptT $ serveAPI @row @list @handlers (Nt nt) handlers (routeFromRequest req) req
406− let opts = { headers, status, statusText }
407− pure $ case body of
263+ pure case res of
408− EmptyResponseBody -> Bun.Response.string "" opts
264+ Left resp -> resp
409− JsonResponseBody json -> Bun.Response.json json opts
265+ Right resp -> resp
410− StringResponseBody string -> Bun.Response.string string opts