@@ -1,31 +1,29 @@
1−{-# LANGUAGE AllowAmbiguousTypes #-}
2−{-# LANGUAGE ConstraintKinds #-}
3{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ConstraintKinds #-}
4{-# LANGUAGE DataKinds #-}
3{-# LANGUAGE DataKinds #-}
5{-# LANGUAGE DeriveDataTypeable #-}
4{-# LANGUAGE DeriveDataTypeable #-}
6{-# LANGUAGE FlexibleContexts #-}
5{-# LANGUAGE FlexibleContexts #-}
7{-# LANGUAGE FlexibleInstances #-}
6{-# LANGUAGE FlexibleInstances #-}
8−{-# LANGUAGE InstanceSigs #-}
9−{-# LANGUAGE LambdaCase #-}
10{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
11{-# LANGUAGE OverloadedStrings #-}
8{-# LANGUAGE OverloadedStrings #-}
12{-# LANGUAGE PolyKinds #-}
9{-# LANGUAGE PolyKinds #-}
13−{-# LANGUAGE QuantifiedConstraints #-}
14{-# LANGUAGE RankNTypes #-}
10{-# LANGUAGE RankNTypes #-}
15{-# LANGUAGE ScopedTypeVariables #-}
11{-# LANGUAGE ScopedTypeVariables #-}
16{-# LANGUAGE TupleSections #-}
12{-# LANGUAGE TupleSections #-}
17−{-# LANGUAGE TypeApplications #-}
18{-# LANGUAGE TypeFamilies #-}
13{-# LANGUAGE TypeFamilies #-}
19{-# LANGUAGE TypeOperators #-}
14{-# LANGUAGE TypeOperators #-}
20{-# LANGUAGE UndecidableInstances #-}
15{-# LANGUAGE UndecidableInstances #-}
17+#if MIN_VERSION_base(4,9,0) && __GLASGOW_HASKELL__ >= 802
18+#define HAS_TYPE_ERROR
22module Servant.Server.Internal
21module Servant.Server.Internal
23 ( module Servant.Server.Internal
22 ( module Servant.Server.Internal
24 , module Servant.Server.Internal.BasicAuth
23 , module Servant.Server.Internal.BasicAuth
25 , module Servant.Server.Internal.Context
24 , module Servant.Server.Internal.Context
26 , module Servant.Server.Internal.Delayed
25 , module Servant.Server.Internal.Delayed
27 , module Servant.Server.Internal.DelayedIO
26 , module Servant.Server.Internal.DelayedIO
28− , module Servant.Server.Internal.ErrorFormatter
29 , module Servant.Server.Internal.Handler
27 , module Servant.Server.Internal.Handler
30 , module Servant.Server.Internal.Router
28 , module Servant.Server.Internal.Router
31 , module Servant.Server.Internal.RouteResult
29 , module Servant.Server.Internal.RouteResult
@@ -36,19 +34,19 @@ module Servant.Server.Internal
36import Control.Monad
34import Control.Monad
37 (join, when)
35 (join, when)
38import Control.Monad.Trans
36import Control.Monad.Trans
39− (liftIO, lift)
37+ (liftIO)
40import Control.Monad.Trans.Resource
38import Control.Monad.Trans.Resource
41− (runResourceT, ReleaseKey)
39+ (runResourceT)
43import qualified Data.ByteString as B
40import qualified Data.ByteString as B
44import qualified Data.ByteString.Builder as BB
41import qualified Data.ByteString.Builder as BB
45import qualified Data.ByteString.Char8 as BC8
42import qualified Data.ByteString.Char8 as BC8
46import qualified Data.ByteString.Lazy as BL
43import qualified Data.ByteString.Lazy as BL
47−import Data.Constraint (Constraint, Dict(..))
48import Data.Either
44import Data.Either
49 (partitionEithers)
45 (partitionEithers)
50import Data.Maybe
46import Data.Maybe
51 (fromMaybe, isNothing, mapMaybe, maybeToList)
47 (fromMaybe, isNothing, mapMaybe, maybeToList)
52import Data.String
50import Data.String
53 (IsString (..))
51 (IsString (..))
54import Data.String.Conversions
52import Data.String.Conversions
@@ -57,70 +55,56 @@ import Data.Tagged
57 (Tagged (..), retag, untag)
55 (Tagged (..), retag, untag)
58import qualified Data.Text as T
56import qualified Data.Text as T
59import Data.Typeable
57import Data.Typeable
61import GHC.TypeLits
58import GHC.TypeLits
62− (KnownNat, KnownSymbol, TypeError, symbolVal)
59+ (KnownNat, KnownSymbol, natVal, symbolVal)
63import qualified Network.HTTP.Media as NHM
60import qualified Network.HTTP.Media as NHM
64import Network.HTTP.Types hiding
61import Network.HTTP.Types hiding
65 (Header, ResponseHeaders)
62 (Header, ResponseHeaders)
66import Network.Socket
63import Network.Socket
67 (SockAddr)
64 (SockAddr)
68import Network.Wai
65import Network.Wai
69− (Application, Request, Response, ResponseReceived, httpVersion, isSecure, lazyRequestBody,
66+ (Application, Request, httpVersion, isSecure, lazyRequestBody,
70− queryString, remoteHost, getRequestBodyChunk, requestHeaders,
67+ rawQueryString, remoteHost, requestBody, requestHeaders,
71 requestMethod, responseLBS, responseStream, vault)
68 requestMethod, responseLBS, responseStream, vault)
72import Prelude ()
69import Prelude ()
73import Prelude.Compat
70import Prelude.Compat
74import Servant.API
71import Servant.API
75 ((:<|>) (..), (:>), Accept (..), BasicAuth, Capture',
72 ((:<|>) (..), (:>), Accept (..), BasicAuth, Capture',
76− CaptureAll, Description, EmptyAPI, Fragment,
73+ CaptureAll, Description, EmptyAPI, FramingRender (..),
77− FramingRender (..), FramingUnrender (..), FromSourceIO (..),
74+ FramingUnrender (..), FromSourceIO (..), Header', If,
78− Header', If, IsSecure (..), NoContentVerb, QueryFlag,
75+ IsSecure (..), QueryFlag, QueryParam', QueryParams, Raw,
79− QueryParam', QueryParams, Raw, RawM, ReflectMethod (reflectMethod),
76+ ReflectMethod (reflectMethod), RemoteHost, ReqBody',
80− RemoteHost, ReqBody', SBool (..), SBoolI (..), SourceIO,
77+ SBool (..), SBoolI (..), SourceIO, Stream, StreamBody',
81− Stream, StreamBody', Summary, ToSourceIO (..), Vault, Verb,
78+ Summary, ToSourceIO (..), Vault, Verb, WithNamedContext)
82− WithNamedContext, WithResource, NamedRoutes)
83−import Servant.API.Generic (GenericMode(..), ToServant, ToServantApi, GServantProduct, toServant, fromServant)
84import Servant.API.ContentTypes
79import Servant.API.ContentTypes
85 (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
80 (AcceptHeader (..), AllCTRender (..), AllCTUnrender (..),
86− AllMime, MimeRender (..), MimeUnrender (..), NoContent,
81+ AllMime, MimeRender (..), MimeUnrender (..), canHandleAcceptH)
88import Servant.API.Modifiers
82import Servant.API.Modifiers
89 (FoldLenient, FoldRequired, RequestArgument,
83 (FoldLenient, FoldRequired, RequestArgument,
90 unfoldRequestArgument)
84 unfoldRequestArgument)
91import Servant.API.ResponseHeaders
85import Servant.API.ResponseHeaders
92 (GetHeaders, Headers, getHeaders, getResponse)
86 (GetHeaders, Headers, getHeaders, getResponse)
93−import Servant.API.Status
95import qualified Servant.Types.SourceT as S
87import qualified Servant.Types.SourceT as S
96−import Servant.API.TypeErrors
97import Web.HttpApiData
88import Web.HttpApiData
98− (FromHttpApiData, parseHeader, parseQueryParam, parseUrlPiece,
89+ (FromHttpApiData, parseHeader, parseQueryParam,
99− parseUrlPieces)
90+ parseUrlPieceMaybe, parseUrlPieces)
103import Servant.Server.Internal.BasicAuth
92import Servant.Server.Internal.BasicAuth
104import Servant.Server.Internal.Context
93import Servant.Server.Internal.Context
105import Servant.Server.Internal.Delayed
94import Servant.Server.Internal.Delayed
106import Servant.Server.Internal.DelayedIO
95import Servant.Server.Internal.DelayedIO
107−import Servant.Server.Internal.ErrorFormatter
108import Servant.Server.Internal.Handler
96import Servant.Server.Internal.Handler
109import Servant.Server.Internal.Router
97import Servant.Server.Internal.Router
110import Servant.Server.Internal.RouteResult
98import Servant.Server.Internal.RouteResult
111import Servant.Server.Internal.RoutingApplication
99import Servant.Server.Internal.RoutingApplication
112import Servant.Server.Internal.ServerError
100import Servant.Server.Internal.ServerError
102+#ifdef HAS_TYPE_ERROR
114import GHC.TypeLits
103import GHC.TypeLits
115 (ErrorMessage (..), TypeError)
104 (ErrorMessage (..), TypeError)
116−import Servant.API.TypeLevel
105+#endif
117− (AtLeastOneFragment, FragmentUnique)
119class HasServer api context where
107class HasServer api context where
120− -- | The type of a server for this API, given a monad to run effects in.
122− -- Note that the result kind is @*@, so it is /not/ a monad transformer, unlike
123− -- what the @T@ in the name might suggest.
124 type ServerT api (m :: * -> *) :: *
108 type ServerT api (m :: * -> *) :: *
@@ -182,31 +166,22 @@ instance (HasServer a context, HasServer b context) => HasServer (a :<|> b) cont
182-- > server = getBook
166-- > server = getBook
183-- > where getBook :: Text -> Handler Book
167-- > where getBook :: Text -> Handler Book
184-- > getBook isbn = ...
168-- > getBook isbn = ...
185−instance (KnownSymbol capture, FromHttpApiData a, Typeable a
169+instance (KnownSymbol capture, FromHttpApiData a, HasServer api context)
186− , HasServer api context, SBoolI (FoldLenient mods)
187− , HasContextEntry (MkContextWithErrorFormatter context) ErrorFormatters
189 => HasServer (Capture' mods capture a :> api) context where
170 => HasServer (Capture' mods capture a :> api) context where
191 type ServerT (Capture' mods capture a :> api) m =
172 type ServerT (Capture' mods capture a :> api) m =
192− If (FoldLenient mods) (Either String a) a -> ServerT api m
173+ a -> ServerT api m
194 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
175 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
196 route Proxy context d =
177 route Proxy context d =
197− CaptureRouter [hint] $
178+ CaptureRouter $
198 route (Proxy :: Proxy api)
179 route (Proxy :: Proxy api)
200− (addCapture d $ \ txt -> withRequest $ \ request ->
181+ (addCapture d $ \ txt -> case parseUrlPieceMaybe txt of
201− case ( sbool :: SBool (FoldLenient mods)
182+ Nothing -> delayedFail err400
202− , parseUrlPiece txt :: Either T.Text a) of
203− (SFalse, Left e) -> delayedFail $ formatError rep request $ cs e
204− (SFalse, Right v) -> return v
183+ Just v -> return v
205− (STrue, piece) -> return $ (either (Left . cs) Right) piece)
184+ )
207− rep = typeRep (Proxy :: Proxy Capture')
208− formatError = urlParseErrorFormatter $ getContextEntry (mkContextWithErrorFormatter context)
209− hint = CaptureHint (T.pack $ symbolVal $ Proxy @capture) (typeRep (Proxy :: Proxy a))
211-- | If you use 'CaptureAll' in one of the endpoints for your API,
186-- | If you use 'CaptureAll' in one of the endpoints for your API,
212-- this automatically requires your server-side handler to be a
187-- this automatically requires your server-side handler to be a
@@ -225,10 +200,7 @@ instance (KnownSymbol capture, FromHttpApiData a, Typeable a
225-- > server = getSourceFile
200-- > server = getSourceFile
226-- > where getSourceFile :: [Text] -> Handler Book
201-- > where getSourceFile :: [Text] -> Handler Book
227-- > getSourceFile pathSegments = ...
202-- > getSourceFile pathSegments = ...
228−instance (KnownSymbol capture, FromHttpApiData a, Typeable a
203+instance (KnownSymbol capture, FromHttpApiData a, HasServer api context)
229− , HasServer api context
230− , HasContextEntry (MkContextWithErrorFormatter context) ErrorFormatters
232 => HasServer (CaptureAll capture a :> api) context where
204 => HasServer (CaptureAll capture a :> api) context where
234 type ServerT (CaptureAll capture a :> api) m =
206 type ServerT (CaptureAll capture a :> api) m =
@@ -237,53 +209,13 @@ instance (KnownSymbol capture, FromHttpApiData a, Typeable a
237 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
209 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
239 route Proxy context d =
211 route Proxy context d =
240− CaptureAllRouter [hint] $
212+ CaptureAllRouter $
241 route (Proxy :: Proxy api)
213 route (Proxy :: Proxy api)
243− (addCapture d $ \ txts -> withRequest $ \ request ->
244− case parseUrlPieces txts of
215+ (addCapture d $ \ txts -> case parseUrlPieces txts of
245− Left e -> delayedFail $ formatError rep request $ cs e
216+ Left _ -> delayedFail err400
246− Right v -> return v
217+ Right v -> return v
249− rep = typeRep (Proxy :: Proxy CaptureAll)
250− formatError = urlParseErrorFormatter $ getContextEntry (mkContextWithErrorFormatter context)
251− hint = CaptureHint (T.pack $ symbolVal $ Proxy @capture) (typeRep (Proxy :: Proxy [a]))
253−-- | If you use 'WithResource' in one of the endpoints for your API Servant
254−-- will provide the handler for this endpoint an argument of the specified type.
255−-- The lifespan of this resource will be automatically managed by Servant. This
256−-- resource will be created before the handler starts and it will be destoyed
257−-- after it ends. A new resource is created for each request to the endpoint.
259−-- The creation and destruction are done using a 'Data.Acquire.Acquire'
260−-- provided via server 'Context'.
264−-- > type MyApi = WithResource Handle :> "writeToFile" :> Post '[JSON] NoContent
266−-- > server :: Server MyApi
267−-- > server = writeToFile
268−-- > where writeToFile :: (ReleaseKey, Handle) -> Handler NoContent
269−-- > writeToFile (_, h) = hPutStrLn h "message"
271−-- In addition to the resource, the handler will also receive a 'ReleaseKey'
272−-- which can be used to deallocate the resource before the end of the request
275−instance (HasServer api ctx, HasContextEntry ctx (Acquire a))
276− => HasServer (WithResource a :> api) ctx where
278− type ServerT (WithResource a :> api) m = (ReleaseKey, a) -> ServerT api m
280− hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy @api) pc nt . s
282− route Proxy context d = route (Proxy @api) context (d `addParameterCheck` allocateResource)
284− allocateResource :: DelayedIO (ReleaseKey, a)
285− allocateResource = DelayedIO $ lift $ allocateAcquire (getContextEntry context)
289allowedMethodHead :: Method -> Request -> Bool
221allowedMethodHead :: Method -> Request -> Bool
@@ -304,10 +236,10 @@ methodCheck method request
304-- body check is no longer an option. However, we now run the accept
236-- body check is no longer an option. However, we now run the accept
305-- check before the body check and can therefore afford to make it
237-- check before the body check and can therefore afford to make it
306-- recoverable.
238-- recoverable.
307−acceptCheck :: (AllMime list) => Proxy list -> AcceptHeader -> DelayedIO ()
239+acceptCheck :: (AllMime list) => Proxy list -> B.ByteString -> DelayedIO ()
308acceptCheck proxy accH
240acceptCheck proxy accH
309− | canHandleAcceptH proxy accH = return ()
241+ | canHandleAcceptH proxy (AcceptHeader accH) = return ()
310− | otherwise = delayedFail err406
242+ | otherwise = delayedFail err406
312methodRouter :: (AllCTRender ctypes a)
244methodRouter :: (AllCTRender ctypes a)
313 => (b -> ([(HeaderName, B.ByteString)], a))
245 => (b -> ([(HeaderName, B.ByteString)], a))
@@ -317,28 +249,17 @@ methodRouter :: (AllCTRender ctypes a)
317methodRouter splitHeaders method proxy status action = leafRouter route'
249methodRouter splitHeaders method proxy status action = leafRouter route'
319 route' env request respond =
251 route' env request respond =
320− let accH = getAcceptHeader request
252+ let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
321 in runAction (action `addMethodCheck` methodCheck method request
253 in runAction (action `addMethodCheck` methodCheck method request
322 `addAcceptCheck` acceptCheck proxy accH
254 `addAcceptCheck` acceptCheck proxy accH
323 ) env request respond $ \ output -> do
255 ) env request respond $ \ output -> do
324 let (headers, b) = splitHeaders output
256 let (headers, b) = splitHeaders output
325− case handleAcceptH proxy accH b of
257+ case handleAcceptH proxy (AcceptHeader accH) b of
326 Nothing -> FailFatal err406 -- this should not happen (checked before), so we make it fatal if it does
258 Nothing -> FailFatal err406 -- this should not happen (checked before), so we make it fatal if it does
327 Just (contentT, body) ->
259 Just (contentT, body) ->
328 let bdy = if allowedMethodHead method request then "" else body
260 let bdy = if allowedMethodHead method request then "" else body
329 in Route $ responseLBS status ((hContentType, cs contentT) : headers) bdy
261 in Route $ responseLBS status ((hContentType, cs contentT) : headers) bdy
331−noContentRouter :: Method
333− -> Delayed env (Handler b)
335−noContentRouter method status action = leafRouter route'
337− route' env request respond =
338− runAction (action `addMethodCheck` methodCheck method request)
339− env request respond $ \ _output ->
340− Route $ responseLBS status [] ""
342instance {-# OVERLAPPABLE #-}
263instance {-# OVERLAPPABLE #-}
343 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
264 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
344 ) => HasServer (Verb method status ctypes a) context where
265 ) => HasServer (Verb method status ctypes a) context where
@@ -348,7 +269,7 @@ instance {-# OVERLAPPABLE #-}
349 route Proxy _ = methodRouter ([],) method (Proxy :: Proxy ctypes) status
270 route Proxy _ = methodRouter ([],) method (Proxy :: Proxy ctypes) status
350 where method = reflectMethod (Proxy :: Proxy method)
271 where method = reflectMethod (Proxy :: Proxy method)
351− status = statusFromNat (Proxy :: Proxy status)
272+ status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
353instance {-# OVERLAPPING #-}
274instance {-# OVERLAPPING #-}
354 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
275 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
@@ -360,16 +281,8 @@ instance {-# OVERLAPPING #-}
361 route Proxy _ = methodRouter (\x -> (getHeaders x, getResponse x)) method (Proxy :: Proxy ctypes) status
282 route Proxy _ = methodRouter (\x -> (getHeaders x, getResponse x)) method (Proxy :: Proxy ctypes) status
362 where method = reflectMethod (Proxy :: Proxy method)
283 where method = reflectMethod (Proxy :: Proxy method)
363− status = statusFromNat (Proxy :: Proxy status)
284+ status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
365−instance (ReflectMethod method) =>
366− HasServer (NoContentVerb method) context where
368− type ServerT (NoContentVerb method) m = m NoContent
369− hoistServerWithContext _ _ nt s = nt s
371− route Proxy _ = noContentRouter method status204
372− where method = reflectMethod (Proxy :: Proxy method)
374instance {-# OVERLAPPABLE #-}
287instance {-# OVERLAPPABLE #-}
375 ( MimeRender ctype chunk, ReflectMethod method, KnownNat status,
288 ( MimeRender ctype chunk, ReflectMethod method, KnownNat status,
@@ -381,7 +294,7 @@ instance {-# OVERLAPPABLE #-}
382 route Proxy _ = streamRouter ([],) method status (Proxy :: Proxy framing) (Proxy :: Proxy ctype)
295 route Proxy _ = streamRouter ([],) method status (Proxy :: Proxy framing) (Proxy :: Proxy ctype)
383 where method = reflectMethod (Proxy :: Proxy method)
296 where method = reflectMethod (Proxy :: Proxy method)
384− status = statusFromNat (Proxy :: Proxy status)
297+ status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
387instance {-# OVERLAPPING #-}
300instance {-# OVERLAPPING #-}
@@ -395,7 +308,7 @@ instance {-# OVERLAPPING #-}
396 route Proxy _ = streamRouter (\x -> (getHeaders x, getResponse x)) method status (Proxy :: Proxy framing) (Proxy :: Proxy ctype)
309 route Proxy _ = streamRouter (\x -> (getHeaders x, getResponse x)) method status (Proxy :: Proxy framing) (Proxy :: Proxy ctype)
397 where method = reflectMethod (Proxy :: Proxy method)
310 where method = reflectMethod (Proxy :: Proxy method)
398− status = statusFromNat (Proxy :: Proxy status)
311+ status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
401streamRouter :: forall ctype a c chunk env framing. (MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a) =>
314streamRouter :: forall ctype a c chunk env framing. (MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a) =>
@@ -407,7 +320,7 @@ streamRouter :: forall ctype a c chunk env framing. (MimeRender ctype chunk, Fra
407 -> Delayed env (Handler c)
320 -> Delayed env (Handler c)
408 -> Router env
321 -> Router env
409streamRouter splitHeaders method status framingproxy ctypeproxy action = leafRouter $ \env request respond ->
322streamRouter splitHeaders method status framingproxy ctypeproxy action = leafRouter $ \env request respond ->
410− let AcceptHeader accH = getAcceptHeader request
323+ let accH = fromMaybe ct_wildcard $ lookup hAccept $ requestHeaders request
411 cmediatype = NHM.matchAccept [contentType ctypeproxy] accH
324 cmediatype = NHM.matchAccept [contentType ctypeproxy] accH
412 accCheck = when (isNothing cmediatype) $ delayedFail err406
325 accCheck = when (isNothing cmediatype) $ delayedFail err406
413 contentHeader = (hContentType, NHM.renderHeader . maybeToList $ cmediatype)
326 contentHeader = (hContentType, NHM.renderHeader . maybeToList $ cmediatype)
@@ -452,7 +365,6 @@ streamRouter splitHeaders method status framingproxy ctypeproxy action = leafRou
453 (KnownSymbol sym, FromHttpApiData a, HasServer api context
366 (KnownSymbol sym, FromHttpApiData a, HasServer api context
454 , SBoolI (FoldRequired mods), SBoolI (FoldLenient mods)
367 , SBoolI (FoldRequired mods), SBoolI (FoldLenient mods)
455− , HasContextEntry (MkContextWithErrorFormatter context) ErrorFormatters
457 => HasServer (Header' mods sym a :> api) context where
369 => HasServer (Header' mods sym a :> api) context where
@@ -464,9 +376,6 @@ instance
464 route Proxy context subserver = route (Proxy :: Proxy api) context $
376 route Proxy context subserver = route (Proxy :: Proxy api) context $
465 subserver `addHeaderCheck` withRequest headerCheck
377 subserver `addHeaderCheck` withRequest headerCheck
467− rep = typeRep (Proxy :: Proxy Header')
468− formatError = headerParseErrorFormatter $ getContextEntry (mkContextWithErrorFormatter context)
470 headerName :: IsString n => n
379 headerName :: IsString n => n
471 headerName = fromString $ symbolVal (Proxy :: Proxy sym)
380 headerName = fromString $ symbolVal (Proxy :: Proxy sym)
@@ -477,13 +386,15 @@ instance
477 mev :: Maybe (Either T.Text a)
386 mev :: Maybe (Either T.Text a)
478 mev = fmap parseHeader $ lookup headerName (requestHeaders req)
387 mev = fmap parseHeader $ lookup headerName (requestHeaders req)
480− errReq = delayedFailFatal $ formatError rep req
389+ errReq = delayedFailFatal err400
481− $ "Header " <> headerName <> " is required"
390+ { errBody = "Header " <> headerName <> " is required"
483− errSt e = delayedFailFatal $ formatError rep req
393+ errSt e = delayedFailFatal err400
484− $ cs $ "Error parsing header "
394+ { errBody = cs $ "Error parsing header "
485− <> headerName
395+ <> headerName
486− <> " failed: " <> e
396+ <> " failed: " <> e
488-- | If you use @'QueryParam' "author" Text@ in one of the endpoints for your API,
399-- | If you use @'QueryParam' "author" Text@ in one of the endpoints for your API,
489-- this automatically requires your server-side handler to be a function
400-- this automatically requires your server-side handler to be a function
@@ -509,7 +420,6 @@ instance
510 ( KnownSymbol sym, FromHttpApiData a, HasServer api context
421 ( KnownSymbol sym, FromHttpApiData a, HasServer api context
511 , SBoolI (FoldRequired mods), SBoolI (FoldLenient mods)
422 , SBoolI (FoldRequired mods), SBoolI (FoldLenient mods)
512− , HasContextEntry (MkContextWithErrorFormatter context) ErrorFormatters
514 => HasServer (QueryParam' mods sym a :> api) context where
424 => HasServer (QueryParam' mods sym a :> api) context where
@@ -519,12 +429,9 @@ instance
519 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
429 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
521 route Proxy context subserver =
431 route Proxy context subserver =
522− let querytext = queryToQueryText . queryString
432+ let querytext req = parseQueryText $ rawQueryString req
523 paramname = cs $ symbolVal (Proxy :: Proxy sym)
433 paramname = cs $ symbolVal (Proxy :: Proxy sym)
525− rep = typeRep (Proxy :: Proxy QueryParam')
526− formatError = urlParseErrorFormatter $ getContextEntry (mkContextWithErrorFormatter context)
528 parseParam :: Request -> DelayedIO (RequestArgument mods a)
435 parseParam :: Request -> DelayedIO (RequestArgument mods a)
529 parseParam req =
436 parseParam req =
530 unfoldRequestArgument (Proxy :: Proxy mods) errReq errSt mev
437 unfoldRequestArgument (Proxy :: Proxy mods) errReq errSt mev
@@ -532,12 +439,14 @@ instance
532 mev :: Maybe (Either T.Text a)
439 mev :: Maybe (Either T.Text a)
533 mev = fmap parseQueryParam $ join $ lookup paramname $ querytext req
440 mev = fmap parseQueryParam $ join $ lookup paramname $ querytext req
535− errReq = delayedFailFatal $ formatError rep req
442+ errReq = delayedFailFatal err400
536− $ cs $ "Query parameter " <> paramname <> " is required"
443+ { errBody = cs $ "Query parameter " <> paramname <> " is required"
538− errSt e = delayedFailFatal $ formatError rep req
446+ errSt e = delayedFailFatal err400
539− $ cs $ "Error parsing query parameter "
447+ { errBody = cs $ "Error parsing query parameter "
540− <> paramname <> " failed: " <> e
448+ <> paramname <> " failed: " <> e
542 delayed = addParameterCheck subserver . withRequest $ \req ->
451 delayed = addParameterCheck subserver . withRequest $ \req ->
543 parseParam req
452 parseParam req
@@ -563,8 +472,7 @@ instance
563-- > server = getBooksBy
472-- > server = getBooksBy
564-- > where getBooksBy :: [Text] -> Handler [Book]
473-- > where getBooksBy :: [Text] -> Handler [Book]
565-- > getBooksBy authors = ...return all books by these authors...
474-- > getBooksBy authors = ...return all books by these authors...
566−instance (KnownSymbol sym, FromHttpApiData a, HasServer api context
475+instance (KnownSymbol sym, FromHttpApiData a, HasServer api context)
567− , HasContextEntry (MkContextWithErrorFormatter context) ErrorFormatters)
568 => HasServer (QueryParams sym a :> api) context where
476 => HasServer (QueryParams sym a :> api) context where
570 type ServerT (QueryParams sym a :> api) m =
478 type ServerT (QueryParams sym a :> api) m =
@@ -575,23 +483,21 @@ instance (KnownSymbol sym, FromHttpApiData a, HasServer api context
575 route Proxy context subserver = route (Proxy :: Proxy api) context $
483 route Proxy context subserver = route (Proxy :: Proxy api) context $
576 subserver `addParameterCheck` withRequest paramsCheck
484 subserver `addParameterCheck` withRequest paramsCheck
578− rep = typeRep (Proxy :: Proxy QueryParams)
579− formatError = urlParseErrorFormatter $ getContextEntry (mkContextWithErrorFormatter context)
581 paramname = cs $ symbolVal (Proxy :: Proxy sym)
486 paramname = cs $ symbolVal (Proxy :: Proxy sym)
582 paramsCheck req =
487 paramsCheck req =
583 case partitionEithers $ fmap parseQueryParam params of
488 case partitionEithers $ fmap parseQueryParam params of
584 ([], parsed) -> return parsed
489 ([], parsed) -> return parsed
585− (errs, _) -> delayedFailFatal $ formatError rep req
490+ (errs, _) -> delayedFailFatal err400
586− $ cs $ "Error parsing query parameter(s) "
491+ { errBody = cs $ "Error parsing query parameter(s) "
587− <> paramname <> " failed: "
492+ <> paramname <> " failed: "
588− <> T.intercalate ", " errs
493+ <> T.intercalate ", " errs
590 params :: [T.Text]
496 params :: [T.Text]
591 params = mapMaybe snd
497 params = mapMaybe snd
592 . filter (looksLikeParam . fst)
498 . filter (looksLikeParam . fst)
593− . queryToQueryText
499+ . parseQueryText
594− . queryString
500+ . rawQueryString
597 looksLikeParam name = name == paramname || name == (paramname <> "[]")
503 looksLikeParam name = name == paramname || name == (paramname <> "[]")
@@ -617,7 +523,7 @@ instance (KnownSymbol sym, HasServer api context)
617 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
523 hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy api) pc nt . s
619 route Proxy context subserver =
525 route Proxy context subserver =
620− let querytext = queryToQueryText . queryString
526+ let querytext r = parseQueryText $ rawQueryString r
621 param r = case lookup paramname (querytext r) of
527 param r = case lookup paramname (querytext r) of
622 Just Nothing -> True -- param is there, with no value
528 Just Nothing -> True -- param is there, with no value
623 Just (Just v) -> examine v -- param with a value
529 Just (Just v) -> examine v -- param with a value
@@ -653,42 +559,13 @@ instance HasServer Raw context where
653 Fail a -> respond $ Fail a
559 Fail a -> respond $ Fail a
654 FailFatal e -> respond $ FailFatal e
560 FailFatal e -> respond $ FailFatal e
656−-- | Just pass the request to the underlying application and serve its response.
660−-- > type MyApi = "images" :> Raw
662−-- > server :: Server MyApi
663−-- > server = serveDirectory "/var/www/images"
664−instance HasServer RawM context where
665− type ServerT RawM m = Request -> (Response -> IO ResponseReceived) -> m ResponseReceived
670− -> Delayed env (Request -> (Response -> IO ResponseReceived) -> Handler ResponseReceived) -> Router env
671− route _ _ handleDelayed = RawRouter $ \env request respond -> runResourceT $ do
672− routeResult <- runDelayed handleDelayed env request
673− let respond' = liftIO . respond
674− liftIO $ case routeResult of
675− Route handler -> runHandler (handler request (respond . Route)) >>=
677− Left e -> respond' $ FailFatal e
679− Fail e -> respond' $ Fail e
680− FailFatal e -> respond' $ FailFatal e
682− hoistServerWithContext _ _ f srvM = \req respond -> f (srvM req respond)
685-- | If you use 'ReqBody' in one of the endpoints for your API,
562-- | If you use 'ReqBody' in one of the endpoints for your API,
686-- this automatically requires your server-side handler to be a function
563-- this automatically requires your server-side handler to be a function
687-- that takes an argument of the type specified by 'ReqBody'.
564-- that takes an argument of the type specified by 'ReqBody'.
688-- The @Content-Type@ header is inspected, and the list provided is used to
565-- The @Content-Type@ header is inspected, and the list provided is used to
689-- attempt deserialization. If the request does not have a @Content-Type@
566-- attempt deserialization. If the request does not have a @Content-Type@
690-- header, it is treated as @application/octet-stream@ (as specified in
567-- header, it is treated as @application/octet-stream@ (as specified in
691−-- [RFC 7231 section 3.1.1.5](http://tools.ietf.org/html/rfc7231#section-3.1.1.5)).
568+-- <http://tools.ietf.org/html/rfc7231#section-3.1.1.5 RFC7231>.
692-- This lets servant worry about extracting it from the request and turning
569-- This lets servant worry about extracting it from the request and turning
693-- it into a value of the type you specify.
570-- it into a value of the type you specify.
@@ -704,7 +581,6 @@ instance HasServer RawM context where
704-- > where postBook :: Book -> Handler Book
581-- > where postBook :: Book -> Handler Book
705-- > postBook book = ...insert into your db...
582-- > postBook book = ...insert into your db...
706instance ( AllCTUnrender list a, HasServer api context, SBoolI (FoldLenient mods)
583instance ( AllCTUnrender list a, HasServer api context, SBoolI (FoldLenient mods)
707− , HasContextEntry (MkContextWithErrorFormatter context) ErrorFormatters
708 ) => HasServer (ReqBody' mods list a :> api) context where
584 ) => HasServer (ReqBody' mods list a :> api) context where
710 type ServerT (ReqBody' mods list a :> api) m =
586 type ServerT (ReqBody' mods list a :> api) m =
@@ -716,9 +592,6 @@ instance ( AllCTUnrender list a, HasServer api context, SBoolI (FoldLenient mods
716 = route (Proxy :: Proxy api) context $
592 = route (Proxy :: Proxy api) context $
717 addBodyCheck subserver ctCheck bodyCheck
593 addBodyCheck subserver ctCheck bodyCheck
719− rep = typeRep (Proxy :: Proxy ReqBody')
720− formatError = bodyParserErrorFormatter $ getContextEntry (mkContextWithErrorFormatter context)
722 -- Content-Type check, we only lookup we can try to parse the request body
595 -- Content-Type check, we only lookup we can try to parse the request body
723 ctCheck = withRequest $ \ request -> do
596 ctCheck = withRequest $ \ request -> do
724 -- See HTTP RFC 2616, section 7.2.1
597 -- See HTTP RFC 2616, section 7.2.1
@@ -737,7 +610,7 @@ instance ( AllCTUnrender list a, HasServer api context, SBoolI (FoldLenient mods
737 case sbool :: SBool (FoldLenient mods) of
610 case sbool :: SBool (FoldLenient mods) of
738 STrue -> return mrqbody
611 STrue -> return mrqbody
739 SFalse -> case mrqbody of
612 SFalse -> case mrqbody of
740− Left e -> delayedFailFatal $ formatError rep request e
613+ Left e -> delayedFailFatal err400 { errBody = cs e }
741 Right v -> return v
614 Right v -> return v
@@ -760,7 +633,7 @@ instance
760 bodyCheck fromRS = withRequest $ \req -> do
633 bodyCheck fromRS = withRequest $ \req -> do
761 let mimeUnrender' = mimeUnrender (Proxy :: Proxy ctype) :: BL.ByteString -> Either String chunk
634 let mimeUnrender' = mimeUnrender (Proxy :: Proxy ctype) :: BL.ByteString -> Either String chunk
762 let framingUnrender' = framingUnrender (Proxy :: Proxy framing) mimeUnrender' :: SourceIO B.ByteString -> SourceIO chunk
635 let framingUnrender' = framingUnrender (Proxy :: Proxy framing) mimeUnrender' :: SourceIO B.ByteString -> SourceIO chunk
763− let body = getRequestBodyChunk req
636+ let body = requestBody req
764 let rs = S.fromAction B.null body
637 let rs = S.fromAction B.null body
765 let rs' = fromRS $ framingUnrender' rs
638 let rs' = fromRS $ framingUnrender' rs
766 return rs'
639 return rs'
@@ -829,12 +702,12 @@ data EmptyServer = EmptyServer deriving (Typeable, Eq, Show, Bounded, Enum)
829emptyServer :: ServerT EmptyAPI m
702emptyServer :: ServerT EmptyAPI m
830emptyServer = Tagged EmptyServer
703emptyServer = Tagged EmptyServer
832−-- | The server for an `EmptyAPI` is `emptyServer`.
705+-- | The server for an `EmptyAPI` is `emptyAPIServer`.
834-- > type MyApi = "nothing" :> EmptyApi
707-- > type MyApi = "nothing" :> EmptyApi
836-- > server :: Server MyApi
709-- > server :: Server MyApi
837−-- > server = emptyServer
710+-- > server = emptyAPIServer
838instance HasServer EmptyAPI context where
711instance HasServer EmptyAPI context where
839 type ServerT EmptyAPI m = Tagged m EmptyServer
712 type ServerT EmptyAPI m = Tagged m EmptyServer
@@ -863,10 +736,7 @@ instance ( KnownSymbol realm
863-- * helpers
736-- * helpers
865ct_wildcard :: B.ByteString
738ct_wildcard :: B.ByteString
866−ct_wildcard = "*" <> "/" <> "*"
739+ct_wildcard = "*" <> "/" <> "*" -- Because CPP
868−getAcceptHeader :: Request -> AcceptHeader
869−getAcceptHeader = AcceptHeader . fromMaybe ct_wildcard . lookup hAccept . requestHeaders
871-- * General Authentication
741-- * General Authentication
@@ -891,19 +761,39 @@ instance (HasContextEntry context (NamedContext name subContext), HasServer subA
891 hoistServerWithContext _ _ nt s = hoistServerWithContext (Proxy :: Proxy subApi) (Proxy :: Proxy subContext) nt s
761 hoistServerWithContext _ _ nt s = hoistServerWithContext (Proxy :: Proxy subApi) (Proxy :: Proxy subContext) nt s
893-------------------------------------------------------------------------------
763-------------------------------------------------------------------------------
894−-- Custom type errors
764+-- TypeError helpers
895-------------------------------------------------------------------------------
765-------------------------------------------------------------------------------
897−-- Erroring instance for 'HasServer' when a combinator is not fully applied
767+#ifdef HAS_TYPE_ERROR
898−instance TypeError (PartialApplication
768+-- | This instance catches mistakes when there are non-saturated
899−#if __GLASGOW_HASKELL__ >= 904
769+-- type applications on LHS of ':>'.
900− @(Type -> [Type] -> Constraint)
770+--
901−#endif
771+-- >>> serve (Proxy :: Proxy (Capture "foo" :> Get '[JSON] Int)) (error "...")
773+-- ...Expected something of kind Symbol or *, got: k -> l on the LHS of ':>'.
774+-- ...Maybe you haven't applied enough arguments to
775+-- ...Capture' '[] "foo"
778+-- >>> undefined :: Server (Capture "foo" :> Get '[JSON] Int)
780+-- ...Expected something of kind Symbol or *, got: k -> l on the LHS of ':>'.
781+-- ...Maybe you haven't applied enough arguments to
782+-- ...Capture' '[] "foo"
902− HasServer arr) => HasServer ((arr :: a -> b) :> sub) context
785+instance TypeError (HasServerArrowKindError arr) => HasServer ((arr :: k -> l) :> api) context
904− type ServerT (arr :> sub) _ = TypeError (PartialApplication (HasServer :: * -> [*] -> Constraint) arr)
787+ type ServerT (arr :> api) m = TypeError (HasServerArrowKindError arr)
905− route = error "unreachable"
788+ -- it doens't really matter what sub route we peak
789+ route _ _ _ = error "servant-server panic: impossible happened in HasServer (arr :> api)"
906− hoistServerWithContext _ _ _ _ = error "unreachable"
790+ hoistServerWithContext _ _ _ = id
792+-- Cannot have TypeError here, otherwise use of this symbol will error :)
793+type HasServerArrowKindError arr =
794+ 'Text "Expected something of kind Symbol or *, got: k -> l on the LHS of ':>'."
795+ ':$$: 'Text "Maybe you haven't applied enough arguments to"
908-- | This instance prevents from accidentally using '->' instead of ':>'
798-- | This instance prevents from accidentally using '->' instead of ':>'
@@ -937,107 +827,7 @@ type HasServerArrowTypeError a b =
937 ':$$: 'ShowType a
827 ':$$: 'ShowType a
938 ':$$: 'Text "and"
828 ':$$: 'Text "and"
939 ':$$: 'ShowType b
829 ':$$: 'ShowType b
941−-- Erroring instances for 'HasServer' for unknown API combinators
943−-- XXX: This omits the @context@ parameter, e.g.:
945−-- "There is no instance for HasServer (Bool :> …)". Do we care ?
946−instance {-# OVERLAPPABLE #-} TypeError (NoInstanceForSub
947−#if __GLASGOW_HASKELL__ >= 904
948− @(Type -> [Type] -> Constraint)
950− HasServer ty) => HasServer (ty :> sub) context
952−instance {-# OVERLAPPABLE #-} TypeError (NoInstanceFor (HasServer api context)) => HasServer api context
954−-- | Ignore @'Fragment'@ in server handlers.
955−-- See <https://ietf.org/rfc/rfc2616.html#section-15.1.3> for more details.
959−-- > type MyApi = "books" :> Fragment Text :> Get '[JSON] [Book]
961−-- > server :: Server MyApi
962−-- > server = getBooks
963−-- > where getBooks :: Handler [Book]
964−-- > getBooks = ...return all books...
965−instance (AtLeastOneFragment api, FragmentUnique (Fragment a1 :> api), HasServer api context)
966− => HasServer (Fragment a1 :> api) context where
967− type ServerT (Fragment a1 :> api) m = ServerT api m
969− route _ = route (Proxy :: Proxy api)
971− hoistServerWithContext _ = hoistServerWithContext (Proxy :: Proxy api)
974-- >>> import Servant
833-- >>> import Servant
976−-- | A type that specifies that an API record contains a server implementation.
977−data AsServerT (m :: * -> *)
978−instance GenericMode (AsServerT m) where
979− type AsServerT m :- api = ServerT api m
981−type AsServer = AsServerT Handler
984−-- | Set of constraints required to convert to / from vanilla server types.
985−type GServerConstraints api m =
986− ( ToServant api (AsServerT m) ~ ServerT (ToServantApi api) m
987− , GServantProduct (Rep (api (AsServerT m)))
990−-- | This class is a necessary evil: in the implementation of 'HasServer' for
991−-- @'NamedRoutes' api@, we essentially need the quantified constraint @forall
992−-- m. 'GServerConstraints' m@ to hold.
994−-- We cannot require do that directly as the definition of 'GServerConstraints'
995−-- contains type family applications ('Rep' and 'ServerT'). The trick is to hide
996−-- those type family applications behind a typeclass providing evidence for
997−-- @'GServerConstraints' api m@ in the form of a dictionary, and require that
998−-- @forall m. 'GServer' api m@ instead.
1000−-- Users shouldn't have to worry about this class, as the only possible instance
1001−-- is provided in this module for all record APIs.
1003−class GServer (api :: * -> *) (m :: * -> *) where
1004− gServerProof :: Dict (GServerConstraints api m)
1007− ( ToServant api (AsServerT m) ~ ServerT (ToServantApi api) m
1008− , GServantProduct (Rep (api (AsServerT m)))
1009− ) => GServer api m where
1010− gServerProof = Dict
1013− ( HasServer (ToServantApi api) context
1014− , forall m. Generic (api (AsServerT m))
1015− , forall m. GServer api m
1016− ) => HasServer (NamedRoutes api) context where
1018− type ServerT (NamedRoutes api) m = api (AsServerT m)
1021− :: Proxy (NamedRoutes api)
1023− -> Delayed env (api (AsServerT Handler))
1025− route _ ctx delayed =
1026− case gServerProof @api @Handler of
1027− Dict -> route (Proxy @(ToServantApi api)) ctx (toServant <$> delayed)
1029− hoistServerWithContext
1030− :: forall m n. Proxy (NamedRoutes api)
1032− -> (forall x. m x -> n x)
1033− -> api (AsServerT m)
1034− -> api (AsServerT n)
1035− hoistServerWithContext _ pctx nat server =
1036− case (gServerProof @api @m, gServerProof @api @n) of
1038− fromServant servantSrvN
1040− servantSrvM :: ServerT (ToServantApi api) m =
1042− servantSrvN :: ServerT (ToServantApi api) n =
1043− hoistServerWithContext (Proxy @(ToServantApi api)) pctx nat servantSrvM