@@ -1,6 +1,16 @@
1+{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE LambdaCase #-}
3+{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE QuasiQuotes #-}
5+{-# LANGUAGE RecordWildCards #-}
6+{-# LANGUAGE RoleAnnotations #-}
7+{-# LANGUAGE TemplateHaskellQuotes #-}
8+{-# LANGUAGE TypeFamilies #-}
9+{-# LANGUAGE UndecidableInstances #-}
2-- Module : Network.HTTP.Req
12-- Module : Network.HTTP.Req
3−-- Copyright : © 2016–2019 Mark Karpov
13+-- Copyright : © 2016–present Mark Karpov
4-- License : BSD 3 clause
14-- License : BSD 3 clause
6-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
16-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
@@ -9,61 +19,40 @@
10-- The documentation below is structured in such a way that the most
20-- The documentation below is structured in such a way that the most
11-- important information is presented first: you learn how to do HTTP
21-- important information is presented first: you learn how to do HTTP
12−-- requests, how to embed them in any monad you have, and then it gives you
22+-- requests, how to embed them in the monad you have, and then it gives you
13-- details about less-common things you may want to know about. The
23-- details about less-common things you may want to know about. The
14-- documentation is written with sufficient coverage of details and
24-- documentation is written with sufficient coverage of details and
15-- examples, and it's designed to be a complete tutorial on its own.
25-- examples, and it's designed to be a complete tutorial on its own.
17−-- /(A modest intro goes here, click on 'req' to start making requests.)/
19-- === About the library
27-- === About the library
21−-- Req is an easy-to-use, type-safe, expandable, high-level HTTP client
29+-- Req is an HTTP client library that attempts to be easy-to-use, type-safe,
22−-- library that just works without any fooling around.
30+-- and expandable.
24−-- What does the phrase “easy-to-use” mean? It means that the library is
32+-- “Easy-to-use” means that the library is designed to be beginner-friendly
25−-- designed to be beginner-friendly so it's simple to add to your monad
33+-- so it's simple to add to your monad stack, intuitive to work with,
26−-- stack, intuitive to work with, well-documented, and does not get in your
34+-- well-documented, and does not get in your way. Doing HTTP requests is a
27−-- way. Doing HTTP requests is a common task and Haskell library for this
35+-- common task and a Haskell library for this should be approachable and
28−-- should be very approachable and clear to beginners, thus certain
29−-- compromises were made. For example, one cannot currently modify
36+-- clear to beginners, thus certain compromises were made. For example, one
30−-- 'L.ManagerSettings' of the default manager because the library always
37+-- cannot currently modify 'L.ManagerSettings' of the default manager
31−-- uses the same implicit global manager for simplicity and maximal
38+-- because the library always uses the same implicit global manager for
32−-- connection sharing. There is a way to use your own manager with different
39+-- simplicity and maximal connection sharing. There is a way to use your own
33−-- settings, but it requires a bit more typing.
40+-- manager with different settings, but it requires more typing.
35−-- “Type-safe” means that the library is protective and eliminates certain
42+-- “Type-safe” means that the library tries to eliminate certain classes of
36−-- classes of errors. For example, we have correct-by-construction 'Url's,
43+-- errors. For example, we have correct-by-construction URLs; it is
37−-- it's guaranteed that the user does not send the request body when using
44+-- guaranteed that the user does not send the request body when using
38−-- methods like 'GET' or 'OPTIONS', and the amount of implicit assumptions
45+-- methods like GET or OPTIONS, and the amount of implicit assumptions is
39−-- is minimized by making the user specify his\/her intentions in an
46+-- minimized by making the user specify their intentions in an explicit
40−-- explicit form (for example, it's not possible to avoid specifying the
47+-- form. For example, it's not possible to avoid specifying the body or the
41−-- body or method of request). Authentication methods that assume HTTPS
48+-- method of a request. Authentication methods that assume HTTPS force the
42−-- force the user to use HTTPS at the type level. The library also carefully
49+-- user to use HTTPS at the type level.
43−-- hides underlying types from the lower-level @http-client@ package because
44−-- those types are not safe enough (for example 'L.Request' is an instance
45−-- of 'Data.String.IsString' and, if it's malformed, it will blow up at
48−-- “Expandable” refers to the ability of the library to be expanded without
51+-- “Expandable” refers to the ability to create new components without
49−-- having to resort to ugly hacking. For example, it's possible to define
52+-- having to resort to hacking. For example, it's possible to define your
50−-- your own HTTP methods, create new ways to construct the body of a
53+-- own HTTP methods, create new ways to construct the body of a request,
51−-- request, create new authorization options, perform a request in a
54+-- create new authorization options, perform a request in a different way,
52−-- different way, and create your own methods to parse and represent a
55+-- and create your own methods to parse a response.
53−-- response. As the user extends the library to satisfy his\/her special
54−-- needs, the new solutions will work just like the built-ins. However, all
55−-- of the common cases are also covered by the library out-of-the-box.
57−-- “High-level” means that there are less details to worry about. The
58−-- library is a result of my experiences as a Haskell consultant. Working
59−-- for several clients, who had very different projects, showed me that the
60−-- library should adapt easily to any particular style of writing Haskell
61−-- applications. For example, some people prefer throwing exceptions, while
62−-- others are concerned with purity. Just define 'handleHttpException'
63−-- accordingly when making your monad instance of 'MonadHttp' and it will
64−-- play together seamlessly. Finally, the library cuts down boilerplate
65−-- considerably, and helps you write concise, easy to read, and maintainable
68-- === Using with other libraries
57-- === Using with other libraries
@@ -87,168 +76,200 @@
87-- the whole Haskell ecosystem uses, there is no risk in using @req@. The
76-- the whole Haskell ecosystem uses, there is no risk in using @req@. The
88-- machinery for performing requests is the same as with @http-conduit@ and
77-- machinery for performing requests is the same as with @http-conduit@ and
89-- @wreq@. The only difference is the API.
78-- @wreq@. The only difference is the API.
91−{-# LANGUAGE BangPatterns #-}
92−{-# LANGUAGE DataKinds #-}
93−{-# LANGUAGE DeriveDataTypeable #-}
94−{-# LANGUAGE DeriveGeneric #-}
95−{-# LANGUAGE FlexibleInstances #-}
96−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
97−{-# LANGUAGE KindSignatures #-}
98−{-# LANGUAGE MultiParamTypeClasses #-}
99−{-# LANGUAGE OverloadedStrings #-}
100−{-# LANGUAGE RankNTypes #-}
101−{-# LANGUAGE RecordWildCards #-}
102−{-# LANGUAGE ScopedTypeVariables #-}
103−{-# LANGUAGE TypeFamilies #-}
104−{-# LANGUAGE UndecidableInstances #-}
105−{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
107module Network.HTTP.Req
79module Network.HTTP.Req
108 ( -- * Making a request
80 ( -- * Making a request
109 -- $making-a-request
81 -- $making-a-request
113− , withReqManager
86+ withReqManager,
114 -- * Embedding requests in your monad
88 -- * Embedding requests in your monad
115 -- $embedding-requests
89 -- $embedding-requests
116− , MonadHttp (..)
90+ MonadHttp (..),
117− , HttpConfig (..)
91+ HttpConfig (..),
118− , defaultHttpConfig
92+ defaultHttpConfig,
121 -- * Request
96 -- * Request
122 -- ** Method
98 -- ** Method
123 -- $method
99 -- $method
124− , GET (..)
100+ GET (..),
125− , POST (..)
101+ POST (..),
126− , HEAD (..)
102+ HEAD (..),
127− , PUT (..)
103+ PUT (..),
128− , DELETE (..)
104+ DELETE (..),
129− , TRACE (..)
105+ TRACE (..),
130− , CONNECT (..)
106+ CONNECT (..),
131− , OPTIONS (..)
107+ OPTIONS (..),
132− , PATCH (..)
108+ PATCH (..),
133− , HttpMethod (..)
109+ HttpMethod (..),
134 -- ** URL
111 -- ** URL
141− , parseUrlHttp
118+ useHttpURI,
142− , parseUrlHttps
119+ useHttpsURI,
143− , parseUrl
120+ useURI,
144 -- ** Body
124 -- ** Body
146− , NoReqBody (..)
126+ NoReqBody (..),
147− , ReqBodyJson (..)
127+ ReqBodyJson (..),
148− , ReqBodyFile (..)
128+ ReqBodyFile (..),
149− , ReqBodyBs (..)
129+ ReqBodyBs (..),
150− , ReqBodyLbs (..)
130+ ReqBodyLbs (..),
151− , ReqBodyUrlEnc (..)
131+ ReqBodyUrlEnc (..),
152− , FormUrlEncodedParam
132+ FormUrlEncodedParam,
153− , ReqBodyMultipart
133+ ReqBodyMultipart,
154− , reqBodyMultipart
134+ reqBodyMultipart,
155− , HttpBody (..)
135+ HttpBody (..),
156− , ProvidesBody
136+ ProvidesBody,
157− , HttpBodyAllowed
137+ HttpBodyAllowed,
158 -- ** Optional parameters
139 -- ** Optional parameters
159 -- $optional-parameters
140 -- $optional-parameters
160− , Option
141+ Option,
161 -- *** Query parameters
143 -- *** Query parameters
162 -- $query-parameters
144 -- $query-parameters
164− , queryFlag
146+ queryFlag,
165− , QueryParam (..)
148+ QueryParam (..),
166 -- *** Headers
150 -- *** Headers
167− , header
151+ header,
168− , attachHeader
152+ attachHeader,
169 -- *** Cookies
155 -- *** Cookies
170 -- $cookies
156 -- $cookies
171− , cookieJar
157+ cookieJar,
172 -- *** Authentication
159 -- *** Authentication
173 -- $authentication
160 -- $authentication
174− , basicAuth
161+ basicAuth,
175− , basicAuthUnsafe
162+ basicAuthUnsafe,
176− , basicProxyAuth
163+ basicProxyAuth,
177− , oAuth1
164+ oAuth1,
178− , oAuth2Bearer
165+ oAuth2Bearer,
179− , oAuth2Token
166+ oAuth2Token,
180− , customAuth
167+ customAuth,
181 -- *** Other
169 -- *** Other
183− , decompress
171+ decompress,
184− , responseTimeout
172+ responseTimeout,
185− , httpVersion
173+ httpVersion,
186 -- * Response
175 -- * Response
187 -- ** Response interpretations
177 -- ** Response interpretations
188− , IgnoreResponse
178+ IgnoreResponse,
189− , ignoreResponse
179+ ignoreResponse,
190− , JsonResponse
180+ JsonResponse,
191− , jsonResponse
181+ jsonResponse,
192− , BsResponse
182+ BsResponse,
193− , bsResponse
183+ bsResponse,
194− , LbsResponse
184+ LbsResponse,
195− , lbsResponse
185+ lbsResponse,
196 -- ** Inspecting a response
187 -- ** Inspecting a response
197− , responseBody
188+ responseBody,
198− , responseStatusCode
189+ responseStatusCode,
199− , responseStatusMessage
190+ responseStatusMessage,
200− , responseHeader
191+ responseHeader,
201− , responseCookieJar
192+ responseCookieJar,
202 -- ** Defining your own interpretation
194 -- ** Defining your own interpretation
203 -- $new-response-interpretation
195 -- $new-response-interpretation
204− , HttpResponse (..)
196+ HttpResponse (..),
205 -- * Other
198 -- * Other
206− , HttpException (..)
199+ HttpException (..),
200+ isStatusCodeException,
207− , CanHaveBody (..)
201+ CanHaveBody (..),
208− , Scheme (..) )
202+ Scheme (..),
206+import Blaze.ByteString.Builder qualified as BB
211import Control.Applicative
207import Control.Applicative
212import Control.Arrow (first, second)
208import Control.Arrow (first, second)
213−import Control.Exception hiding (TypeError)
209+import Control.Exception hiding (Handler (..), TypeError)
210+import Control.Monad (guard, void, (>=>))
214import Control.Monad.Base
211import Control.Monad.Base
212+import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)
215import Control.Monad.IO.Class
213import Control.Monad.IO.Class
216−import Control.Monad.Reader
214+import Control.Monad.IO.Unlift
215+import Control.Monad.Reader (ReaderT (ReaderT), ask, lift, runReaderT)
216+import Control.Monad.Trans.Accum (AccumT)
217+import Control.Monad.Trans.Cont (ContT)
217import Control.Monad.Trans.Control
218import Control.Monad.Trans.Control
219+import Control.Monad.Trans.Except (ExceptT)
220+import Control.Monad.Trans.Identity (IdentityT)
221+import Control.Monad.Trans.Maybe (MaybeT)
222+import Control.Monad.Trans.RWS.CPS qualified as RWS.CPS
223+import Control.Monad.Trans.RWS.Lazy qualified as RWS.Lazy
224+import Control.Monad.Trans.RWS.Strict qualified as RWS.Strict
225+import Control.Monad.Trans.Select (SelectT)
226+import Control.Monad.Trans.State.Lazy qualified as State.Lazy
227+import Control.Monad.Trans.State.Strict qualified as State.Strict
228+import Control.Monad.Trans.Writer.CPS qualified as Writer.CPS
229+import Control.Monad.Trans.Writer.Lazy qualified as Writer.Lazy
230+import Control.Monad.Trans.Writer.Strict qualified as Writer.Strict
218import Control.Retry
231import Control.Retry
219−import Data.Aeson (ToJSON (..), FromJSON (..))
232+import Data.Aeson (FromJSON (..), ToJSON (..))
233+import Data.Aeson qualified as A
220import Data.ByteString (ByteString)
234import Data.ByteString (ByteString)
235+import Data.ByteString qualified as B
236+import Data.ByteString.Lazy qualified as BL
237+import Data.CaseInsensitive qualified as CI
221import Data.Data (Data)
238import Data.Data (Data)
239+import Data.Default.Class (def)
222import Data.Function (on)
240import Data.Function (on)
223import Data.IORef
241import Data.IORef
224−import Data.Kind (Constraint)
242+import Data.Kind (Constraint, Type)
225−import Data.List (nubBy)
243+import Data.List (foldl', nubBy)
226import Data.List.NonEmpty (NonEmpty (..))
244import Data.List.NonEmpty (NonEmpty (..))
245+import Data.List.NonEmpty qualified as NE
227import Data.Maybe (fromMaybe)
246import Data.Maybe (fromMaybe)
228import Data.Proxy
247import Data.Proxy
229−import Data.Semigroup hiding (Option, option)
248+import Data.Semigroup (Endo (..))
249+import Data.Set qualified as S
230import Data.Text (Text)
250import Data.Text (Text)
251+import Data.Text qualified as T
252+import Data.Text.Encoding qualified as T
231−import Data.Typeable (Typeable)
253+import Data.Typeable (Typeable, cast)
232import GHC.Generics
254import GHC.Generics
233import GHC.TypeLits
255import GHC.TypeLits
256+import Language.Haskell.TH qualified as TH
257+import Language.Haskell.TH.Quote qualified as TH
258+import Language.Haskell.TH.Syntax qualified as TH
259+import Network.Connection qualified as NC
260+import Network.HTTP.Client qualified as L
261+import Network.HTTP.Client.Internal qualified as LI
262+import Network.HTTP.Client.MultipartFormData qualified as LM
263+import Network.HTTP.Client.TLS qualified as L
264+import Network.HTTP.Types qualified as Y
234import System.IO.Unsafe (unsafePerformIO)
265import System.IO.Unsafe (unsafePerformIO)
266+import Text.URI (URI)
267+import Text.URI qualified as URI
268+import Text.URI.QQ qualified as QQ
269+import Web.Authenticate.OAuth qualified as OAuth
270+import Web.FormUrlEncoded (FromForm (..), ToForm (..))
271+import Web.FormUrlEncoded qualified as Form
235import Web.HttpApiData (ToHttpApiData (..))
272import Web.HttpApiData (ToHttpApiData (..))
236−import qualified Blaze.ByteString.Builder as BB
237−import qualified Data.Aeson as A
238−import qualified Data.ByteString as B
239−import qualified Data.ByteString.Lazy as BL
240−import qualified Data.CaseInsensitive as CI
241−import qualified Data.List.NonEmpty as NE
242−import qualified Data.Text as T
243−import qualified Data.Text.Encoding as T
244−import qualified Data.Text.Read as TR
245−import qualified Network.Connection as NC
246−import qualified Network.HTTP.Client as L
247−import qualified Network.HTTP.Client.Internal as LI
248−import qualified Network.HTTP.Client.MultipartFormData as LM
249−import qualified Network.HTTP.Client.TLS as L
250−import qualified Network.HTTP.Types as Y
251−import qualified Web.Authenticate.OAuth as OAuth
253----------------------------------------------------------------------------
274----------------------------------------------------------------------------
254-- Making a request
275-- Making a request
@@ -272,7 +293,7 @@ import qualified Web.Authenticate.OAuth as OAuth
273-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
294-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
274-- tutorial has a section about HTTP bodies, but usage is very
295-- tutorial has a section about HTTP bodies, but usage is very
275−-- straightforward and should be clear from the examples below.
296+-- straightforward and should be clear from the examples.
277-- @response@ is a type hint how to make and interpret response of an HTTP
298-- @response@ is a type hint how to make and interpret response of an HTTP
278-- request. Out-of-the-box it can be the following:
299-- request. Out-of-the-box it can be the following:
@@ -312,6 +333,7 @@ import qualified Web.Authenticate.OAuth as OAuth
312-- > import GHC.Generics
333-- > import GHC.Generics
313-- > import Network.HTTP.Req
334-- > import Network.HTTP.Req
314-- > import qualified Data.ByteString.Char8 as B
335-- > import qualified Data.ByteString.Char8 as B
336+-- > import qualified Text.URI as URI
316-- We will be making requests against the <https://httpbin.org> service.
338-- We will be making requests against the <https://httpbin.org> service.
@@ -370,7 +392,8 @@ import qualified Web.Authenticate.OAuth as OAuth
370-- > main = runReq defaultHttpConfig $ do
392-- > main = runReq defaultHttpConfig $ do
371-- > -- This is an example of what to do when URL is given dynamically. Of
393-- > -- This is an example of what to do when URL is given dynamically. Of
372-- > -- course in a real application you may not want to use 'fromJust'.
394-- > -- course in a real application you may not want to use 'fromJust'.
373−-- > let (url, options) = fromJust (parseUrlHttps "https://httpbin.org/get?foo=bar")
395+-- > uri <- URI.mkURI "https://httpbin.org/get?foo=bar"
396+-- > let (url, options) = fromJust (useHttpsURI uri)
374-- > response <- req GET url NoReqBody jsonResponse $
397-- > response <- req GET url NoReqBody jsonResponse $
375-- > "from" =: (15 :: Int) <>
398-- > "from" =: (15 :: Int) <>
376-- > "to" =: (67 :: Int) <>
399-- > "to" =: (67 :: Int) <>
@@ -378,60 +401,138 @@ import qualified Web.Authenticate.OAuth as OAuth
378-- > options <> -- contains the ?foo=bar part
401-- > options <> -- contains the ?foo=bar part
379-- > port 443 -- here you can put any port of course
402-- > port 443 -- here you can put any port of course
380-- > liftIO $ print (responseBody response :: Value)
403-- > liftIO $ print (responseBody response :: Value)
383− :: ( MonadHttp m
405+ ( MonadHttp m,
384− , HttpMethod method
406+ HttpMethod method,
385− , HttpBody body
407+ HttpBody body,
386− , HttpResponse response
408+ HttpResponse response,
387− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
409+ HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
388− => method -- ^ HTTP method
411+ -- | HTTP method
389− -> Url scheme -- ^ 'Url'—location of resource
413+ -- | 'Url'—location of resource
390− -> body -- ^ Body of the request
415+ -- | Body of the request
391− -> Proxy response -- ^ A hint how to interpret response
417+ -- | A hint how to interpret response
392− -> Option scheme -- ^ Collection of optional parameters
419+ -- | Collection of optional parameters
393− -> m response -- ^ Response
421+ -- | Response
394−req method url body Proxy options =
423+req method url body responseProxy options =
395− reqBr method url body options getHttpResponse
424+ reqCb method url body responseProxy options pure
397-- | A version of 'req' that does not use one of the predefined instances of
426-- | A version of 'req' that does not use one of the predefined instances of
398-- 'HttpResponse' but instead allows the user to consume @'L.Response'
427-- 'HttpResponse' but instead allows the user to consume @'L.Response'
399-- 'L.BodyReader'@ manually, in a custom way.
428-- 'L.BodyReader'@ manually, in a custom way.
401-- @since 1.0.0
430-- @since 1.0.0
404− :: ( MonadHttp m
432+ ( MonadHttp m,
405− , HttpMethod method
433+ HttpMethod method,
406− , HttpBody body
434+ HttpBody body,
407− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
435+ HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
408− => method -- ^ HTTP method
437+ -- | HTTP method
409− -> Url scheme -- ^ 'Url'—location of resource
439+ -- | 'Url'—location of resource
410− -> body -- ^ Body of the request
441+ -- | Body of the request
411− -> Option scheme -- ^ Collection of optional parameters
443+ -- | Collection of optional parameters
445+ -- | How to consume response
412− -> (L.Response L.BodyReader -> IO a) -- ^ How to consume response
446+ (L.Response L.BodyReader -> IO a) ->
413− -> m a -- ^ Result
447+ -- | Result
449+reqBr method url body options consume =
450+ req' method url body options (reqHandler consume)
452+-- | A version of 'req' that takes a callback to modify the 'L.Request', but
453+-- otherwise performs the request identically.
460+ HttpResponse response,
461+ HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
465+ -- | 'Url'—location of resource
467+ -- | Body of the request
469+ -- | A hint how to interpret response
471+ -- | Collection of optional parameters
473+ -- | Callback to modify the request
474+ (L.Request -> m L.Request) ->
477+reqCb method url body responseProxy options adjustRequest =
414−reqBr method url body options consume = req' method url body options $ \request manager -> do
478+ req' method url body (options <> extraOptions) $ \request manager -> do
479+ request' <- adjustRequest request
480+ reqHandler getHttpResponse request' manager
483+ case acceptHeader responseProxy of
485+ Just accept -> header "Accept" accept
487+-- | The default handler function that the higher-level request functions
488+-- pass to 'req''. Internal function.
493+ -- | How to get final result from a 'L.Response'
494+ (L.Response L.BodyReader -> IO b) ->
495+ -- | 'L.Request' to perform
497+ -- | 'L.Manager' to use
500+reqHandler consume request manager = do
415− HttpConfig {..} <- getHttpConfig
501+ HttpConfig {..} <- getHttpConfig
416 let wrapVanilla = handle (throwIO . VanillaHttpException)
502 let wrapVanilla = handle (throwIO . VanillaHttpException)
417− wrapExc = handle (throwIO . LI.toHttpException request)
503+ wrapExc = handle (throwIO . LI.toHttpException request)
418− withRRef = bracket
504+ withRRef =
419− (newIORef Nothing)
506+ (newIORef Nothing)
420− (readIORef >=> mapM_ L.responseClose)
507+ (readIORef >=> mapM_ L.responseClose)
421− (liftIO . try . wrapVanilla . wrapExc) (withRRef $ \rref -> do
508+ (liftIO . try . wrapVanilla . wrapExc)
509+ ( withRRef $ \rref -> do
422− let openResponse = mask_ $ do
510+ let openResponse = mask_ $ do
423− r <- readIORef rref
511+ r <- readIORef rref
424− mapM_ L.responseClose r
512+ mapM_ L.responseClose r
425− r' <- L.responseOpen request manager
513+ r' <- L.responseOpen request manager
426− writeIORef rref (Just r')
514+ writeIORef rref (Just r')
427− return r'
515+ return r'
516+ exceptionRetryPolicies =
518+ ++ [ \retryStatus -> Handler $ \e ->
519+ return $ httpConfigRetryJudgeException retryStatus e
428− r <- retrying
522+ retrying
429− httpConfigRetryPolicy
523+ httpConfigRetryPolicy
430− (\st r -> return $ httpConfigRetryJudge st r)
524+ (\retryStatus r -> return $ httpConfigRetryJudge retryStatus r)
527+ httpConfigRetryPolicy
528+ exceptionRetryPolicies
431− (const openResponse)
529+ (const openResponse)
432− (preview, r') <- grabPreview bodyPreviewLength r
532+ (preview, r') <- grabPreview httpConfigBodyPreviewLength r
433− mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
533+ mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
434− consume r')
534+ consume r'
435 >>= either handleHttpException return
536 >>= either handleHttpException return
437-- | Mostly like 'req' with respect to its arguments, but accepts a callback
538-- | Mostly like 'req' with respect to its arguments, but accepts a callback
@@ -442,51 +543,57 @@ reqBr method url body options consume = req' method url body options $ \request
442-- 'L.Request' and allows you to use it.
543-- 'L.Request' and allows you to use it.
444-- @since 0.3.0
545-- @since 0.3.0
447− :: forall m method body scheme a.
547+ forall m method body scheme a.
448− ( MonadHttp m
548+ ( MonadHttp m,
449− , HttpMethod method
549+ HttpMethod method,
450− , HttpBody body
550+ HttpBody body,
451− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
551+ HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
452− => method -- ^ HTTP method
553+ -- | HTTP method
453− -> Url scheme -- ^ 'Url'—location of resource
555+ -- | 'Url'—location of resource
454− -> body -- ^ Body of the request
557+ -- | Body of the request
455− -> Option scheme -- ^ Collection of optional parameters
559+ -- | Collection of optional parameters
456− -> (L.Request -> L.Manager -> m a) -- ^ How to perform request
561+ -- | How to perform request
562+ (L.Request -> L.Manager -> m a) ->
457− -> m a -- ^ Result
563+ -- | Result
458req' method url body options m = do
565req' method url body options m = do
459− config@HttpConfig {..} <- getHttpConfig
566+ config <- getHttpConfig
460 let -- NOTE First appearance of any given header wins. This allows to
567 let -- NOTE First appearance of any given header wins. This allows to
461 -- “overwrite” headers when we construct a request by cons-ing.
568 -- “overwrite” headers when we construct a request by cons-ing.
462 nubHeaders = Endo $ \x ->
569 nubHeaders = Endo $ \x ->
463− x { L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x) }
570+ x {L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x)}
464− request' = flip appEndo L.defaultRequest $
572+ flip appEndo L.defaultRequest $
465− -- NOTE The order of 'mappend's matters, here method is overwritten
573+ -- NOTE The order of 'mappend's matters, here method is overwritten
466− -- first and 'options' take effect last. In particular, this means
574+ -- first and 'options' take effect last. In particular, this means
467− -- that 'options' can overwrite things set by other request
575+ -- that 'options' can overwrite things set by other request
468− -- components, which is useful for setting port number,
576+ -- components, which is useful for setting port number,
469− -- "Content-Type" header, etc.
577+ -- "Content-Type" header, etc.
470− nubHeaders <>
578+ nubHeaders
471− getRequestMod options <>
579+ <> getRequestMod options
472− getRequestMod config <>
580+ <> getRequestMod config
473− getRequestMod (Womb body :: Womb "body" body) <>
581+ <> getRequestMod (Tagged body :: Tagged "body" body)
474− getRequestMod url <>
582+ <> getRequestMod url
475− getRequestMod (Womb method :: Womb "method" method)
583+ <> getRequestMod (Tagged method :: Tagged "method" method)
476 request <- finalizeRequest options request'
584 request <- finalizeRequest options request'
477 withReqManager (m request)
585 withReqManager (m request)
479-- | Perform an action using the global implicit 'L.Manager' that the rest
587-- | Perform an action using the global implicit 'L.Manager' that the rest
480−-- of the library uses. This allows to reuse connections that the
588+-- of the library uses. This allows us to reuse connections that the
481-- 'L.Manager' controls.
589-- 'L.Manager' controls.
590+withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591+withReqManager m = m globalManager
483−withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
484−withReqManager m = liftIO (readIORef globalManager) >>= m
486−-- | Global 'L.Manager' that 'req' uses. Here we just go with the default
593+-- | The global 'L.Manager' that 'req' uses. Here we just go with the
487−-- settings, so users don't need to deal with this manager stuff at all, but
594+-- default settings, so users don't need to deal with this manager stuff at
488−-- when we create a request, instance 'HttpConfig' can affect the default
595+-- all, but when we create a request, instance 'HttpConfig' can affect the
489−-- settings via 'getHttpConfig'.
596+-- default settings via 'getHttpConfig'.
491-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
598-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
492-- The value of 'globalManager' is named and lives on top level. This means
599-- The value of 'globalManager' is named and lives on top level. This means
@@ -494,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m
494-- manager. From that moment on the 'IORef' will be just reused—exactly the
601-- manager. From that moment on the 'IORef' will be just reused—exactly the
495-- behavior we want here in order to maximize connection sharing. GHC could
602-- behavior we want here in order to maximize connection sharing. GHC could
496-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
498−globalManager :: IORef L.Manager
604+globalManager :: L.Manager
499globalManager = unsafePerformIO $ do
605globalManager = unsafePerformIO $ do
500 context <- NC.initConnectionContext
606 context <- NC.initConnectionContext
501− let settings = L.mkManagerSettingsContext
608+ L.mkManagerSettingsContext
502− (Just context)
609+ (Just context)
503− (NC.TLSSettingsSimple False False False)
610+ def
505 manager <- L.newManager settings
612 manager <- L.newManager settings
506− newIORef manager
613+ return manager
507{-# NOINLINE globalManager #-}
614{-# NOINLINE globalManager #-}
509----------------------------------------------------------------------------
616----------------------------------------------------------------------------
@@ -517,55 +624,43 @@ globalManager = unsafePerformIO $ do
517-- When writing a library, keep your API polymorphic in terms of
624-- When writing a library, keep your API polymorphic in terms of
518-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
625-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
519-- Another option is to use a @newtype@-wrapped monad stack and define
626-- Another option is to use a @newtype@-wrapped monad stack and define
520−-- 'MonadHttp' for it. As of version /0.4.0/, the 'Req' monad that follows
627+-- 'MonadHttp' for it. As of the version /0.4.0/, the 'Req' monad that
521−-- this strategy is provided out-of-the-box (see below).
628+-- follows this strategy is provided out-of-the-box (see below).
523-- | A type class for monads that support performing HTTP requests.
630-- | A type class for monads that support performing HTTP requests.
524-- Typically, you only need to define the 'handleHttpException' method
631-- Typically, you only need to define the 'handleHttpException' method
525-- unless you want to tweak 'HttpConfig'.
632-- unless you want to tweak 'HttpConfig'.
527−class MonadIO m => MonadHttp m where
633+class (MonadIO m) => MonadHttp m where
529 -- | This method describes how to deal with 'HttpException' that was
634 -- | This method describes how to deal with 'HttpException' that was
530 -- caught by the library. One option is to re-throw it if you are OK with
635 -- caught by the library. One option is to re-throw it if you are OK with
531 -- exceptions, but if you prefer working with something like
636 -- exceptions, but if you prefer working with something like
532 -- 'Control.Monad.Except.MonadError', this is the right place to pass it to
637 -- 'Control.Monad.Except.MonadError', this is the right place to pass it to
533 -- 'Control.Monad.Except.throwError'.
638 -- 'Control.Monad.Except.throwError'.
535 handleHttpException :: HttpException -> m a
639 handleHttpException :: HttpException -> m a
537− -- | Return 'HttpConfig' to be used when performing HTTP requests. Default
641+ -- | Return the 'HttpConfig' to be used when performing HTTP requests.
538− -- implementation returns its 'def' value, which is described in the
642+ -- Default implementation returns its 'def' value, which is described in
539− -- documentation for the type. Common usage pattern with manually defined
643+ -- the documentation for the type. Common usage pattern with manually
540− -- 'getHttpConfig' is to return some hard-coded value, or a value
644+ -- defined 'getHttpConfig' is to return some hard-coded value, or a value
541 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
645 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
542 -- approach to configuration is desirable.
646 -- approach to configuration is desirable.
544 getHttpConfig :: m HttpConfig
647 getHttpConfig :: m HttpConfig
545 getHttpConfig = return defaultHttpConfig
648 getHttpConfig = return defaultHttpConfig
547−-- | 'HttpConfig' contains general and default settings to be used when
650+-- | 'HttpConfig' contains settings to be used when making HTTP requests.
548−-- making HTTP requests.
550data HttpConfig = HttpConfig
651data HttpConfig = HttpConfig
551− { httpConfigProxy :: Maybe L.Proxy
552− -- ^ Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
652+ { -- | Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
553 -- environment variables are respected, this setting overwrites them.
653 -- environment variables are respected, this setting overwrites them.
554 -- Default value: 'Nothing'.
654 -- Default value: 'Nothing'.
555− , httpConfigRedirectCount :: Int
655+ httpConfigProxy :: Maybe L.Proxy,
556− -- ^ How many redirects to follow when getting a resource. Default
656+ -- | How many redirects to follow when getting a resource. Default
557 -- value: 10.
657 -- value: 10.
558− , httpConfigAltManager :: Maybe L.Manager
658+ httpConfigRedirectCount :: Int,
559− -- ^ Alternative 'L.Manager' to use. 'Nothing' (default value) means
659+ -- | Alternative 'L.Manager' to use. 'Nothing' (default value) means
560 -- that the default implicit manager will be used (that's what you want
660 -- that the default implicit manager will be used (that's what you want
561 -- in 99% of cases).
661 -- in 99% of cases).
562− , httpConfigCheckResponse
662+ httpConfigAltManager :: Maybe L.Manager,
567− -> Maybe L.HttpExceptionContent
568− -- ^ Function to check the response immediately after receiving the
663+ -- | Function to check the response immediately after receiving the
569 -- status and headers, before streaming of response body. The third
664 -- status and headers, before streaming of response body. The third
570 -- argument is the beginning of response body (typically first 1024
665 -- argument is the beginning of response body (typically first 1024
571 -- bytes). This is used for throwing exceptions on non-success status
666 -- bytes). This is used for throwing exceptions on non-success status
@@ -587,67 +682,106 @@ data HttpConfig = HttpConfig
587 -- /1.0.0/.
682 -- /1.0.0/.
589 -- @since 0.3.0
684 -- @since 0.3.0
590− , httpConfigRetryPolicy :: RetryPolicy
685+ httpConfigCheckResponse ::
690+ Maybe L.HttpExceptionContent,
591− -- ^ The retry policy to use for request retrying. By default 'def' is
691+ -- | The retry policy to use for request retrying. By default 'def' is
592 -- used (see 'RetryPolicyM').
692 -- used (see 'RetryPolicyM').
594− -- __Note__: signature of this function was changed in the version
694+ -- __Note__: signature of this function was changed to disallow 'IO' in
595− -- /1.0.0/.
695+ -- version /1.0.0/ and then changed back to its current form in /3.1.0/.
597 -- @since 0.3.0
697 -- @since 0.3.0
598− , httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool
698+ httpConfigRetryPolicy :: RetryPolicyM IO,
599− -- ^ The function is used to decide whether to retry a request. 'True'
699+ -- | The function is used to decide whether to retry a request. 'True'
600 -- means that the request should be retried.
700 -- means that the request should be retried.
602 -- __Note__: signature of this function was changed in the version
702 -- __Note__: signature of this function was changed in the version
603 -- /1.0.0/.
703 -- /1.0.0/.
605 -- @since 0.3.0
705 -- @since 0.3.0
606− } deriving Typeable
706+ httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool,
707+ -- | Similar to 'httpConfigRetryJudge', but is used to decide when to
708+ -- retry requests that resulted in an exception. By default it retries
709+ -- on response timeout and connection timeout (changed in version
713+ httpConfigRetryJudgeException :: RetryStatus -> SomeException -> Bool,
714+ -- | Max length of preview fragment of response body.
717+ httpConfigBodyPreviewLength :: forall a. (Num a) => a
608−-- | Default value of 'HttpConfig'.
720+-- | The default value of 'HttpConfig'.
610-- @since 2.0.0
722-- @since 2.0.0
612defaultHttpConfig :: HttpConfig
723defaultHttpConfig :: HttpConfig
613−defaultHttpConfig = HttpConfig
724+defaultHttpConfig =
614− { httpConfigProxy = Nothing
726+ { httpConfigProxy = Nothing,
615− , httpConfigRedirectCount = 10
727+ httpConfigRedirectCount = 10,
616− , httpConfigAltManager = Nothing
728+ httpConfigAltManager = Nothing,
617− , httpConfigCheckResponse = \_ response preview ->
729+ httpConfigCheckResponse = \_ response preview ->
618− let scode = statusCode response
730+ let scode = statusCode response
619− in if 200 <= scode && scode < 300
731+ in if 200 <= scode && scode < 300
620− then Nothing
732+ then Nothing
621− else Just (L.StatusCodeException (void response) preview)
733+ else Just (L.StatusCodeException (void response) preview),
622− , httpConfigRetryPolicy = retryPolicyDefault
734+ httpConfigRetryPolicy = retryPolicyDefault,
623− , httpConfigRetryJudge = \_ response ->
735+ httpConfigRetryJudge = \_ response ->
624− statusCode response `elem`
736+ statusCode response
625− [ 408 -- Request timeout
737+ `elem` [ 408, -- Request timeout
626− , 504 -- Gateway timeout
738+ 504, -- Gateway timeout
627− , 524 -- A timeout occurred
739+ 524, -- A timeout occurred
628− , 598 -- (Informal convention) Network read timeout error
740+ 598, -- (Informal convention) Network read timeout error
629− , 599 -- (Informal convention) Network connect timeout error
741+ 599 -- (Informal convention) Network connect timeout error
743+ httpConfigRetryJudgeException = \_ e ->
744+ case fromException e of
745+ Just (L.HttpExceptionRequest _ c) ->
747+ L.ResponseTimeout -> True
748+ L.ConnectionTimeout -> True
751+ httpConfigBodyPreviewLength = 1024
633 statusCode = Y.statusCode . L.responseStatus
754 statusCode = Y.statusCode . L.responseStatus
635instance RequestComponent HttpConfig where
756instance RequestComponent HttpConfig where
636 getRequestMod HttpConfig {..} = Endo $ \x ->
757 getRequestMod HttpConfig {..} = Endo $ \x ->
637− x { L.proxy = httpConfigProxy
759+ { L.proxy = httpConfigProxy,
638− , L.redirectCount = httpConfigRedirectCount
760+ L.redirectCount = httpConfigRedirectCount,
639− , LI.requestManagerOverride = httpConfigAltManager }
761+ LI.requestManagerOverride = httpConfigAltManager
641−-- | A monad that allows to run 'req' in any 'IO'-enabled monad without
764+-- | A monad that allows us to run 'req' in any 'IO'-enabled monad without
642-- having to define new instances.
765-- having to define new instances.
644-- @since 0.4.0
767-- @since 0.4.0
646newtype Req a = Req (ReaderT HttpConfig IO a)
768newtype Req a = Req (ReaderT HttpConfig IO a)
647− deriving ( Functor
769+ deriving
648− , Applicative
771+ Applicative,
650− , MonadIO )
773+ MonadIO,
778+deriving instance MonadThrow Req
781+deriving instance MonadCatch Req
784+deriving instance MonadMask Req
652instance MonadBase IO Req where
786instance MonadBase IO Req where
653 liftBase = liftIO
787 liftBase = liftIO
@@ -656,22 +790,99 @@ instance MonadBaseControl IO Req where
656 type StM Req a = a
790 type StM Req a = a
657 liftBaseWith f = Req . ReaderT $ \r -> f (runReq r)
791 liftBaseWith f = Req . ReaderT $ \r -> f (runReq r)
658 {-# INLINEABLE liftBaseWith #-}
792 {-# INLINEABLE liftBaseWith #-}
659− restoreM = Req . ReaderT . const . return
793+ restoreM = Req . ReaderT . const . return
660 {-# INLINEABLE restoreM #-}
794 {-# INLINEABLE restoreM #-}
662instance MonadHttp Req where
796instance MonadHttp Req where
663 handleHttpException = Req . lift . throwIO
797 handleHttpException = Req . lift . throwIO
664− getHttpConfig = Req ask
798+ getHttpConfig = Req ask
801+instance (MonadHttp m, Monoid w) => MonadHttp (AccumT w m) where
802+ handleHttpException = lift . handleHttpException
803+ getHttpConfig = lift getHttpConfig
806+instance (MonadHttp m) => MonadHttp (ContT r m) where
807+ handleHttpException = lift . handleHttpException
808+ getHttpConfig = lift getHttpConfig
811+instance (MonadHttp m) => MonadHttp (ExceptT e m) where
812+ handleHttpException = lift . handleHttpException
813+ getHttpConfig = lift getHttpConfig
816+instance (MonadHttp m) => MonadHttp (IdentityT m) where
817+ handleHttpException = lift . handleHttpException
818+ getHttpConfig = lift getHttpConfig
821+instance (MonadHttp m) => MonadHttp (MaybeT m) where
822+ handleHttpException = lift . handleHttpException
823+ getHttpConfig = lift getHttpConfig
826+instance (MonadHttp m) => MonadHttp (ReaderT r m) where
827+ handleHttpException = lift . handleHttpException
828+ getHttpConfig = lift getHttpConfig
831+instance (MonadHttp m, Monoid w) => MonadHttp (RWS.CPS.RWST r w s m) where
832+ handleHttpException = lift . handleHttpException
833+ getHttpConfig = lift getHttpConfig
836+instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Lazy.RWST r w s m) where
837+ handleHttpException = lift . handleHttpException
838+ getHttpConfig = lift getHttpConfig
841+instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Strict.RWST r w s m) where
842+ handleHttpException = lift . handleHttpException
843+ getHttpConfig = lift getHttpConfig
846+instance (MonadHttp m) => MonadHttp (SelectT r m) where
847+ handleHttpException = lift . handleHttpException
848+ getHttpConfig = lift getHttpConfig
851+instance (MonadHttp m) => MonadHttp (State.Lazy.StateT s m) where
852+ handleHttpException = lift . handleHttpException
853+ getHttpConfig = lift getHttpConfig
856+instance (MonadHttp m) => MonadHttp (State.Strict.StateT s m) where
857+ handleHttpException = lift . handleHttpException
858+ getHttpConfig = lift getHttpConfig
861+instance (MonadHttp m, Monoid w) => MonadHttp (Writer.CPS.WriterT w m) where
862+ handleHttpException = lift . handleHttpException
863+ getHttpConfig = lift getHttpConfig
866+instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Lazy.WriterT w m) where
867+ handleHttpException = lift . handleHttpException
868+ getHttpConfig = lift getHttpConfig
871+instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Strict.WriterT w m) where
872+ handleHttpException = lift . handleHttpException
873+ getHttpConfig = lift getHttpConfig
666-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
875-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
667−-- case of exceptional situation an 'HttpException' will be thrown.
876+-- the case of an exceptional situation an 'HttpException' will be thrown.
669-- @since 0.4.0
878-- @since 0.4.0
671−runReq :: MonadIO m
880+ (MonadIO m) =>
672− => HttpConfig -- ^ 'HttpConfig' to use
881+ -- | 'HttpConfig' to use
673− -> Req a -- ^ Computation to run
883+ -- | Computation to run
675runReq config (Req m) = liftIO (runReaderT m config)
886runReq config (Req m) = liftIO (runReaderT m config)
677----------------------------------------------------------------------------
888----------------------------------------------------------------------------
@@ -687,7 +898,6 @@ runReq config (Req m) = liftIO (runReaderT m config)
687-- define a new method that will works seamlessly, see 'HttpMethod'.
898-- define a new method that will works seamlessly, see 'HttpMethod'.
689-- | 'GET' method.
900-- | 'GET' method.
691data GET = GET
901data GET = GET
693instance HttpMethod GET where
903instance HttpMethod GET where
@@ -695,7 +905,6 @@ instance HttpMethod GET where
695 httpMethodName Proxy = Y.methodGet
905 httpMethodName Proxy = Y.methodGet
697-- | 'POST' method.
907-- | 'POST' method.
699data POST = POST
908data POST = POST
701instance HttpMethod POST where
910instance HttpMethod POST where
@@ -703,7 +912,6 @@ instance HttpMethod POST where
703 httpMethodName Proxy = Y.methodPost
912 httpMethodName Proxy = Y.methodPost
705-- | 'HEAD' method.
914-- | 'HEAD' method.
707data HEAD = HEAD
915data HEAD = HEAD
709instance HttpMethod HEAD where
917instance HttpMethod HEAD where
@@ -711,26 +919,24 @@ instance HttpMethod HEAD where
711 httpMethodName Proxy = Y.methodHead
919 httpMethodName Proxy = Y.methodHead
713-- | 'PUT' method.
921-- | 'PUT' method.
715data PUT = PUT
922data PUT = PUT
717instance HttpMethod PUT where
924instance HttpMethod PUT where
718 type AllowsBody PUT = 'CanHaveBody
925 type AllowsBody PUT = 'CanHaveBody
719 httpMethodName Proxy = Y.methodPut
926 httpMethodName Proxy = Y.methodPut
721−-- | 'DELETE' method. This data type does not allow having request body with
928+-- | 'DELETE' method. RFC 7231 allows a payload in DELETE but without
722−-- 'DELETE' requests, as it should be. However some APIs may expect 'DELETE'
929+-- semantics.
723−-- requests to have bodies, in that case define your own variation of
930+--
724−-- 'DELETE' method and allow it to have a body.
931+-- __Note__: before version /3.4.0/ this method did not allow request
726data DELETE = DELETE
933data DELETE = DELETE
728instance HttpMethod DELETE where
935instance HttpMethod DELETE where
729− type AllowsBody DELETE = 'NoBody
936+ type AllowsBody DELETE = 'CanHaveBody
730 httpMethodName Proxy = Y.methodDelete
937 httpMethodName Proxy = Y.methodDelete
732-- | 'TRACE' method.
939-- | 'TRACE' method.
734data TRACE = TRACE
940data TRACE = TRACE
736instance HttpMethod TRACE where
942instance HttpMethod TRACE where
@@ -738,7 +944,6 @@ instance HttpMethod TRACE where
738 httpMethodName Proxy = Y.methodTrace
944 httpMethodName Proxy = Y.methodTrace
740-- | 'CONNECT' method.
946-- | 'CONNECT' method.
742data CONNECT = CONNECT
947data CONNECT = CONNECT
744instance HttpMethod CONNECT where
949instance HttpMethod CONNECT where
@@ -746,7 +951,6 @@ instance HttpMethod CONNECT where
746 httpMethodName Proxy = Y.methodConnect
951 httpMethodName Proxy = Y.methodConnect
748-- | 'OPTIONS' method.
953-- | 'OPTIONS' method.
750data OPTIONS = OPTIONS
954data OPTIONS = OPTIONS
752instance HttpMethod OPTIONS where
956instance HttpMethod OPTIONS where
@@ -754,7 +958,6 @@ instance HttpMethod OPTIONS where
754 httpMethodName Proxy = Y.methodOptions
958 httpMethodName Proxy = Y.methodOptions
756-- | 'PATCH' method.
960-- | 'PATCH' method.
758data PATCH = PATCH
961data PATCH = PATCH
760instance HttpMethod PATCH where
963instance HttpMethod PATCH where
@@ -769,23 +972,19 @@ instance HttpMethod PATCH where
769-- > instance HttpMethod COPY where
972-- > instance HttpMethod COPY where
770-- > type AllowsBody COPY = 'CanHaveBody
973-- > type AllowsBody COPY = 'CanHaveBody
771-- > httpMethodName Proxy = "COPY"
974-- > httpMethodName Proxy = "COPY"
773class HttpMethod a where
975class HttpMethod a where
775 -- | Type function 'AllowsBody' returns a type of kind 'CanHaveBody' which
976 -- | Type function 'AllowsBody' returns a type of kind 'CanHaveBody' which
776 -- tells the rest of the library whether the method can have body or not.
977 -- tells the rest of the library whether the method can have body or not.
777 -- We use the special type 'CanHaveBody' lifted to the kind level instead
978 -- We use the special type 'CanHaveBody' lifted to the kind level instead
778 -- of 'Bool' to get more user-friendly compiler messages.
979 -- of 'Bool' to get more user-friendly compiler messages.
780 type AllowsBody a :: CanHaveBody
980 type AllowsBody a :: CanHaveBody
782 -- | Return name of the method as a 'ByteString'.
982 -- | Return name of the method as a 'ByteString'.
784 httpMethodName :: Proxy a -> ByteString
983 httpMethodName :: Proxy a -> ByteString
786−instance HttpMethod method => RequestComponent (Womb "method" method) where
985+instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
787 getRequestMod _ = Endo $ \x ->
986 getRequestMod _ = Endo $ \x ->
788− x { L.method = httpMethodName (Proxy :: Proxy method) }
987+ x {L.method = httpMethodName (Proxy :: Proxy method)}
790----------------------------------------------------------------------------
989----------------------------------------------------------------------------
791-- Request—URL
990-- Request—URL
@@ -793,8 +992,7 @@ instance HttpMethod method => RequestComponent (Womb "method" method) where
795-- We use 'Url's which are correct by construction, see 'Url'. To build a
994-- We use 'Url's which are correct by construction, see 'Url'. To build a
796−-- 'Url' from a 'ByteString', use 'parseUrlHttp', 'parseUrlHttps', or
995+-- 'Url' from a 'URI', use 'useHttpURI', 'useHttpsURI', or generic 'useURI'.
797−-- generic 'parseUrl'.
799-- | Request's 'Url'. Start constructing your 'Url' with 'http' or 'https'
997-- | Request's 'Url'. Start constructing your 'Url' with 'http' or 'https'
800-- specifying the scheme and host at the same time. Then use the @('/~')@
998-- specifying the scheme and host at the same time. Then use the @('/~')@
@@ -824,103 +1022,194 @@ instance HttpMethod method => RequestComponent (Womb "method" method) where
825-- > https "юникод.рф"
1023-- > https "юникод.рф"
826-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
828data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
829 -- NOTE The second value is the path segments in reversed order.
1026 -- NOTE The second value is the path segments in reversed order.
830− deriving (Eq, Ord, Show, Data, Typeable, Generic)
1027+ deriving (Eq, Ord, Show, Data, Generic)
1029+type role Url nominal
1031+-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however
1032+-- the derived lift forgets the type of the scheme.
1033+instance (Typeable scheme) => TH.Lift (Url scheme) where
1035+ TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of
1036+ Url Http _ -> [t|Url 'Http|]
1037+ Url Https _ -> [t|Url 'Https|]
1039+ liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)
1040+ liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift
832-- | Given host name, produce a 'Url' which has “http” as its scheme and
1042-- | Given host name, produce a 'Url' which has “http” as its scheme and
833-- empty path. This also sets port to @80@.
1043-- empty path. This also sets port to @80@.
835http :: Text -> Url 'Http
1044http :: Text -> Url 'Http
836http = Url Http . pure
1045http = Url Http . pure
838-- | Given host name, produce a 'Url' which has “https” as its scheme and
1047-- | Given host name, produce a 'Url' which has “https” as its scheme and
839-- empty path. This also sets port to @443@.
1048-- empty path. This also sets port to @443@.
841https :: Text -> Url 'Https
1049https :: Text -> Url 'Https
842https = Url Https . pure
1050https = Url Https . pure
844−-- | Grow given 'Url' appending a single path segment to it. Note that the
1052+-- | Grow a given 'Url' appending a single path segment to it. Note that the
845-- path segment can be of any type that is an instance of 'ToHttpApiData'.
1053-- path segment can be of any type that is an instance of 'ToHttpApiData'.
847infixl 5 /~
1054infixl 5 /~
848−(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
849−Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
851−-- | Type-constrained version of @('/~')@ to remove ambiguity in the cases
1056+(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
852−-- when next URL piece is a 'Text' literal.
1057+Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
1059+-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
1060+-- when next URL piece is a 'Data.Text.Text' literal.
854infixl 5 /:
1061infixl 5 /:
855(/:) :: Url scheme -> Text -> Url scheme
1063(/:) :: Url scheme -> Text -> Url scheme
856(/:) = (/~)
1064(/:) = (/~)
1066+-- | Render a 'Url' as 'Text'.
1069+renderUrl :: Url scheme -> Text
1072+ "https://" <> renderParts parts
1074+ "http://" <> renderParts parts
1076+ renderParts parts =
1077+ T.intercalate "/" (reverse $ NE.toList parts)
858−-- | The 'parseUrlHttp' function provides an alternative method to get 'Url'
1079+-- | The 'useHttpURI' function provides an alternative method to get 'Url'
859−-- (possibly with some 'Option's) from a 'ByteString'. This is useful when
1080+-- (possibly with some 'Option's) from a 'URI'. This is useful when you are
860−-- you are given a URL to query dynamically and don't know it beforehand.
1081+-- given a URL to query dynamically and don't know it beforehand.
861−-- The function parses 'ByteString' because it's the correct type to
1082+--
862−-- represent a URL, as 'Url' cannot contain characters outside of ASCII
1083+-- This function expects the scheme to be “http” and host to be present.
863−-- range, thus we can consider every character a 'Data.Word.Word8' value.
1084+--
864−--
1085+-- @since 3.0.0
865−-- This function only parses 'Url' (scheme, host, path) and optional query
1086+useHttpURI :: URI -> Maybe (Url 'Http, Option scheme)
866−-- parameters that are returned as 'Option'. It does not parse method name
1087+useHttpURI uri = do
867−-- or authentication info from given 'ByteString'.
1088+ guard (URI.uriScheme uri == Just [QQ.scheme|http|])
868−--
1089+ urlHead <- http <$> uriHost uri
869−-- This function expected scheme to be “http”.
1090+ let url = case URI.uriPath uri of
870−
1091+ Nothing -> urlHead
871−parseUrlHttp :: ByteString -> Maybe (Url 'Http, Option scheme)
1092+ Just uriPath -> uriPathToUrl uriPath urlHead
872−parseUrlHttp url' = do
1093+ return (url, uriOptions uri)
873− url <- B.stripPrefix "http://" url'
1094+
874− (host :| path, option) <- parseUrlHelper url
875− return (foldl (/:) (http host) path, option)
877−-- | Just like 'parseUrlHttp', but expects the “https” scheme.
1095+-- | Just like 'useHttpURI', but expects the “https” scheme.
879−parseUrlHttps :: ByteString -> Maybe (Url 'Https, Option scheme)
1098+useHttpsURI :: URI -> Maybe (Url 'Https, Option scheme)
880−parseUrlHttps url' = do
1099+useHttpsURI uri = do
881− url <- B.stripPrefix "https://" url'
1100+ guard (URI.uriScheme uri == Just [QQ.scheme|https|])
882− (host :| path, option) <- parseUrlHelper url
1101+ urlHead <- https <$> uriHost uri
883− return (foldl (/:) (https host) path, option)
1102+ let url = case URI.uriPath uri of
884−
1103+ Nothing -> urlHead
885−-- | A more general URI parsing function that can be used when scheme is not
1104+ Just uriPath -> uriPathToUrl uriPath urlHead
886−-- known beforehand.
1105+ return (url, uriOptions uri)
1107+-- | Convert URI path to a 'Url'. Internal.
1111+ (Bool, NonEmpty (URI.RText 'URI.PathPiece)) ->
1114+uriPathToUrl (trailingSlash, xs) urlHead =
1115+ if trailingSlash then path /: T.empty else path
1117+ path = foldl' (/:) urlHead (URI.unRText <$> NE.toList xs)
1119+-- | A combination of 'useHttpURI' and 'useHttpsURI' for cases when scheme
1120+-- is not known in advance.
888−-- @since 1.2.1
1122+-- @since 3.0.0
891− :: ByteString
1125+ Maybe
1127+ (Url 'Http, Option scheme0)
892− -> Maybe (Either (Url 'Http, Option scheme0) (Url 'Https, Option scheme1))
1128+ (Url 'Https, Option scheme1)
893−parseUrl url = Left <$> parseUrlHttp url <|> Right <$> parseUrlHttps url
1129+ )
895−-- | Get host\/collection of path pieces and possibly query parameters
1131+ (Left <$> useHttpURI uri) <|> (Right <$> useHttpsURI uri)
896−-- already converted to 'Option'. This function is not public.
1132+
897−
1133+-- | An internal helper function to extract host from a 'URI'.
898−parseUrlHelper :: ByteString -> Maybe (NonEmpty Text, Option scheme)
1134+uriHost :: URI -> Maybe Text
899−parseUrlHelper url = do
1135+uriHost uri = case URI.uriAuthority uri of
900− let (path', query') = B.break (== 0x3f) url
1136+ Left _ -> Nothing
901− query = mconcat (uncurry queryParam <$> Y.parseQueryText query')
1137+ Right URI.Authority {..} ->
902− p' :| ps <- NE.nonEmpty (Y.decodePathSegments path')
1138+ Just (URI.unRText authHost)
904− case T.break (== ':') p' of
1140+-- | A quasiquoter to build an 'Url' and 'Option' tuple. The type of the
905− (x, "") -> return (x, mempty)
1141+-- generated expression is @('Url' scheme0, 'Option' scheme1)@ with
906− (x, prt) ->
1142+-- @scheme0@ being either 'Http' or 'Https' depending on the input.
907− case TR.decimal (T.drop 1 prt) of
1143+--
908− Right (prt',"") -> return (x, port prt')
1144+-- @since 3.2.0
909− _ -> Nothing
1145+urlQ :: TH.QuasiQuoter
910− return (p :| ps, query <> port')
1146+urlQ =
1148+ { quoteExp = \str ->
1149+ case URI.mkURI (T.pack str) of
1150+ Left err -> fail (displayException err)
1151+ Right uri -> case useURI uri of
1152+ Nothing -> fail "Not a HTTP or HTTPS URL"
1155+ [ either (TH.lift . fst) (TH.lift . fst) eurl,
1158+ quotePat = error "This usage is not supported",
1159+ quoteType = error "This usage is not supported",
1160+ quoteDec = error "This usage is not supported"
1163+-- | An internal helper function to extract 'Option's from a 'URI'.
1164+uriOptions :: forall scheme. URI -> Option scheme
1174+ case URI.uriAuthority uri of
1175+ Left _ -> (mempty, mempty)
1176+ Right URI.Authority {..} ->
1177+ let auth0 = case authUserInfo of
1179+ Just URI.UserInfo {..} ->
1180+ let username = T.encodeUtf8 (URI.unRText uiUsername)
1181+ password = maybe "" (T.encodeUtf8 . URI.unRText) uiPassword
1182+ in basicAuthUnsafe username password
1183+ port0 = case authPort of
1185+ Just port'' -> port (fromIntegral port'')
1188+ let liftQueryParam = \case
1189+ URI.QueryFlag t -> queryFlag (URI.unRText t)
1190+ URI.QueryParam k v -> URI.unRText k =: URI.unRText v
1191+ in mconcat (liftQueryParam <$> URI.uriQuery uri)
1193+-- TODO Blocked on upstream: https://github.com/snoyberg/http-client/issues/424
1195+-- case URI.uriFragment uri of
1196+-- Nothing -> mempty
1197+-- Just fragment'' -> fragment (URI.unRText fragment'')
912instance RequestComponent (Url scheme) where
1199instance RequestComponent (Url scheme) where
913 getRequestMod (Url scheme segments) = Endo $ \x ->
1200 getRequestMod (Url scheme segments) = Endo $ \x ->
914− let (host :| path) = NE.reverse segments in
1201+ let (host :| path) = NE.reverse segments
915− x { L.secure = case scheme of
1203+ { L.secure = case scheme of
916− Http -> False
1204+ Http -> False
917− Https -> True
1205+ Https -> True,
918− , L.port = case scheme of
1206+ L.port = case scheme of
919− Http -> 80
1207+ Http -> 80
920− Https -> 443
1208+ Https -> 443,
921− , L.host = Y.urlEncode False (T.encodeUtf8 host)
1209+ L.host = Y.urlEncode False (T.encodeUtf8 host),
922− , L.path =
1210+ L.path =
923− (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path }
1211+ (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path
925----------------------------------------------------------------------------
1214----------------------------------------------------------------------------
926-- Request—Body
1215-- Request—Body
@@ -938,31 +1227,28 @@ instance RequestComponent (Url scheme) where
938-- only type for which 'ProvidesBody' returns 'NoBody'.
1227-- only type for which 'ProvidesBody' returns 'NoBody'.
940-- Using of this body option does not set the @Content-Type@ header.
1229-- Using of this body option does not set the @Content-Type@ header.
942data NoReqBody = NoReqBody
1230data NoReqBody = NoReqBody
944instance HttpBody NoReqBody where
1232instance HttpBody NoReqBody where
945 getRequestBody NoReqBody = L.RequestBodyBS B.empty
1233 getRequestBody NoReqBody = L.RequestBodyBS B.empty
947−-- | This body option allows to use a JSON object as request body—probably
1235+-- | This body option allows us to use a JSON object as the request
948−-- the most popular format right now. Just wrap a data type that is an
1236+-- body—probably the most popular format right now. Just wrap a data type
949−-- instance of 'ToJSON' type class and you are done: it will be converted to
1237+-- that is an instance of 'ToJSON' type class and you are done: it will be
950−-- JSON and inserted as request body.
1238+-- converted to JSON and inserted as request body.
952-- This body option sets the @Content-Type@ header to @\"application/json;
1240-- This body option sets the @Content-Type@ header to @\"application/json;
953-- charset=utf-8\"@ value.
1241-- charset=utf-8\"@ value.
955newtype ReqBodyJson a = ReqBodyJson a
1242newtype ReqBodyJson a = ReqBodyJson a
957−instance ToJSON a => HttpBody (ReqBodyJson a) where
1244+instance (ToJSON a) => HttpBody (ReqBodyJson a) where
958 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
1245 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
959 getRequestContentType _ = pure "application/json; charset=utf-8"
1246 getRequestContentType _ = pure "application/json; charset=utf-8"
961-- | This body option streams request body from a file. It is expected that
1248-- | This body option streams request body from a file. It is expected that
962−-- the file size does not change during the streaming.
1249+-- the file size does not change during streaming.
964-- Using of this body option does not set the @Content-Type@ header.
1251-- Using of this body option does not set the @Content-Type@ header.
966newtype ReqBodyFile = ReqBodyFile FilePath
1252newtype ReqBodyFile = ReqBodyFile FilePath
968instance HttpBody ReqBodyFile where
1254instance HttpBody ReqBodyFile where
@@ -972,7 +1258,6 @@ instance HttpBody ReqBodyFile where
972-- | HTTP request body represented by a strict 'ByteString'.
1258-- | HTTP request body represented by a strict 'ByteString'.
974-- Using of this body option does not set the @Content-Type@ header.
1260-- Using of this body option does not set the @Content-Type@ header.
976newtype ReqBodyBs = ReqBodyBs ByteString
1261newtype ReqBodyBs = ReqBodyBs ByteString
978instance HttpBody ReqBodyBs where
1263instance HttpBody ReqBodyBs where
@@ -981,22 +1266,19 @@ instance HttpBody ReqBodyBs where
981-- | HTTP request body represented by a lazy 'BL.ByteString'.
1266-- | HTTP request body represented by a lazy 'BL.ByteString'.
983-- Using of this body option does not set the @Content-Type@ header.
1268-- Using of this body option does not set the @Content-Type@ header.
985newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
1269newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
987instance HttpBody ReqBodyLbs where
1271instance HttpBody ReqBodyLbs where
988 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
1272 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
990−-- | Form URL-encoded body. This can hold a collection of parameters which
1274+-- | URL-encoded body. This can hold a collection of parameters which are
991−-- are encoded similarly to query parameters at the end of query string,
1275+-- encoded similarly to query parameters at the end of query string, with
992−-- with the only difference that they are stored in request body. The
1276+-- the only difference that they are stored in request body. The similarity
993−-- similarity is reflected in the API as well, as you can use the same
1277+-- is reflected in the API as well, as you can use the same combinators you
994−-- combinators you would use to add query parameters: @('=:')@ and
1278+-- would use to add query parameters: @('=:')@ and 'queryFlag'.
997-- This body option sets the @Content-Type@ header to
1280-- This body option sets the @Content-Type@ header to
998-- @\"application/x-www-form-urlencoded\"@ value.
1281-- @\"application/x-www-form-urlencoded\"@ value.
1000newtype ReqBodyUrlEnc = ReqBodyUrlEnc FormUrlEncodedParam
1282newtype ReqBodyUrlEnc = ReqBodyUrlEnc FormUrlEncodedParam
1002instance HttpBody ReqBodyUrlEnc where
1284instance HttpBody ReqBodyUrlEnc where
@@ -1006,13 +1288,19 @@ instance HttpBody ReqBodyUrlEnc where
1007-- | An opaque monoidal value that allows to collect URL-encoded parameters
1289-- | An opaque monoidal value that allows to collect URL-encoded parameters
1008-- to be wrapped in 'ReqBodyUrlEnc'.
1290-- to be wrapped in 'ReqBodyUrlEnc'.
1010newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
1291newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
1011 deriving (Semigroup, Monoid)
1292 deriving (Semigroup, Monoid)
1013instance QueryParam FormUrlEncodedParam where
1294instance QueryParam FormUrlEncodedParam where
1014 queryParam name mvalue =
1295 queryParam name mvalue =
1015 FormUrlEncodedParam [(name, toQueryParam <$> mvalue)]
1296 FormUrlEncodedParam [(name, toQueryParam <$> mvalue)]
1297+ queryParamToList (FormUrlEncodedParam p) = p
1299+-- | Use 'formToQuery'.
1302+instance FromForm FormUrlEncodedParam where
1303+ fromForm = Right . formToQuery
1017-- | Multipart form data. Please consult the
1305-- | Multipart form data. Please consult the
1018-- "Network.HTTP.Client.MultipartFormData" module for how to construct
1306-- "Network.HTTP.Client.MultipartFormData" module for how to construct
@@ -1042,7 +1330,6 @@ instance QueryParam FormUrlEncodedParam where
1042-- > bsResponse
1330-- > bsResponse
1043-- > mempty
1331-- > mempty
1044-- > liftIO $ print (responseBody response)
1332-- > liftIO $ print (responseBody response)
1046data ReqBodyMultipart = ReqBodyMultipart ByteString LI.RequestBody
1333data ReqBodyMultipart = ReqBodyMultipart ByteString LI.RequestBody
1048instance HttpBody ReqBodyMultipart where
1335instance HttpBody ReqBodyMultipart where
@@ -1053,61 +1340,57 @@ instance HttpBody ReqBodyMultipart where
1053-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
1340-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
1055-- @since 0.2.0
1342-- @since 0.2.0
1057−reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
1343+reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
1058reqBodyMultipart parts = liftIO $ do
1344reqBodyMultipart parts = liftIO $ do
1059 boundary <- LM.webkitBoundary
1345 boundary <- LM.webkitBoundary
1060− body <- LM.renderParts boundary parts
1346+ body <- LM.renderParts boundary parts
1061 return (ReqBodyMultipart boundary body)
1347 return (ReqBodyMultipart boundary body)
1063-- | A type class for things that can be interpreted as an HTTP
1349-- | A type class for things that can be interpreted as an HTTP
1064-- 'L.RequestBody'.
1350-- 'L.RequestBody'.
1066class HttpBody body where
1351class HttpBody body where
1068 -- | How to get actual 'L.RequestBody'.
1352 -- | How to get actual 'L.RequestBody'.
1070 getRequestBody :: body -> L.RequestBody
1353 getRequestBody :: body -> L.RequestBody
1072 -- | This method allows us to optionally specify the value of
1355 -- | This method allows us to optionally specify the value of
1073 -- @Content-Type@ header that should be used with particular body option.
1356 -- @Content-Type@ header that should be used with particular body option.
1074 -- By default it returns 'Nothing' and so @Content-Type@ is not set.
1357 -- By default it returns 'Nothing' and so @Content-Type@ is not set.
1076 getRequestContentType :: body -> Maybe ByteString
1358 getRequestContentType :: body -> Maybe ByteString
1077 getRequestContentType = const Nothing
1359 getRequestContentType = const Nothing
1079-- | The type function recognizes 'NoReqBody' as having 'NoBody', while any
1361-- | The type function recognizes 'NoReqBody' as having 'NoBody', while any
1080-- other body option 'CanHaveBody'. This forces the user to use 'NoReqBody'
1362-- other body option 'CanHaveBody'. This forces the user to use 'NoReqBody'
1081-- with 'GET' method and other methods that should not have body.
1363-- with 'GET' method and other methods that should not have body.
1083type family ProvidesBody body :: CanHaveBody where
1364type family ProvidesBody body :: CanHaveBody where
1084 ProvidesBody NoReqBody = 'NoBody
1365 ProvidesBody NoReqBody = 'NoBody
1085− ProvidesBody body = 'CanHaveBody
1366+ ProvidesBody body = 'CanHaveBody
1087-- | This type function allows any HTTP body if method says it
1368-- | This type function allows any HTTP body if method says it
1088-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
1369-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
1089-- body option to use is 'NoReqBody'.
1370-- body option to use is 'NoReqBody'.
1091−-- __Note__: users of GHC 8.0.1 and later will see a slightly more friendly
1092−-- error message when method does not allow a body and body is provided.
1094−type family HttpBodyAllowed
1371+type family
1095− (allowsBody :: CanHaveBody)
1373+ (allowsBody :: CanHaveBody)
1096− (providesBody :: CanHaveBody) :: Constraint where
1374+ (providesBody :: CanHaveBody) ::
1097− HttpBodyAllowed 'NoBody 'NoBody = ()
1377+ HttpBodyAllowed 'NoBody 'NoBody = ()
1098− HttpBodyAllowed 'CanHaveBody body = ()
1378+ HttpBodyAllowed 'CanHaveBody body = ()
1099− HttpBodyAllowed 'NoBody 'CanHaveBody = TypeError
1379+ HttpBodyAllowed 'NoBody 'CanHaveBody =
1100− ('Text "This HTTP method does not allow attaching a request body.")
1381+ ('Text "This HTTP method does not allow attaching a request body.")
1102−instance HttpBody body => RequestComponent (Womb "body" body) where
1383+instance (HttpBody body) => RequestComponent (Tagged "body" body) where
1103− getRequestMod (Womb body) = Endo $ \x ->
1384+ getRequestMod (Tagged body) = Endo $ \x ->
1104− x { L.requestBody = getRequestBody body
1386+ { L.requestBody = getRequestBody body,
1105− , L.requestHeaders =
1387+ L.requestHeaders =
1106− let old = L.requestHeaders x in
1388+ let old = L.requestHeaders x
1107− case getRequestContentType body of
1389+ in case getRequestContentType body of
1108− Nothing -> old
1390+ Nothing -> old
1109− Just contentType ->
1391+ Just contentType ->
1110− (Y.hContentType, contentType) : old }
1392+ (Y.hContentType, contentType) : old
1112----------------------------------------------------------------------------
1395----------------------------------------------------------------------------
1113-- Request—Optional parameters
1396-- Request—Optional parameters
@@ -1123,46 +1406,51 @@ instance HttpBody body => RequestComponent (Womb "body" body) where
1123-- | The opaque 'Option' type is a 'Monoid' you can use to pack collection
1406-- | The opaque 'Option' type is a 'Monoid' you can use to pack collection
1124-- of optional parameters like query parameters and headers. See sections
1407-- of optional parameters like query parameters and headers. See sections
1125-- below to learn which 'Option' primitives are available.
1408-- below to learn which 'Option' primitives are available.
1409+data Option (scheme :: Scheme)
1410+ = Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
1127−data Option (scheme :: Scheme) =
1128− Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
1129− -- NOTE 'QueryText' is just [(Text, Maybe Text)], we keep it along with
1412+-- NOTE 'QueryText' is just [(Text, Maybe Text)], we keep it along with
1130− -- Request to avoid appending to existing query string in request every
1413+-- Request to avoid appending to an existing query string in request every
1131− -- time new parameter is added. Additional Maybe (L.Request -> IO
1414+-- time new parameter is added. The additional Maybe (L.Request -> IO
1132− -- L.Request) is a finalizer that will be applied after all other
1415+-- L.Request) is a finalizer that will be applied after all other
1133− -- transformations. This is for authentication methods that sign requests
1416+-- transformations. This is for authentication methods that sign requests
1134− -- based on data in Request.
1417+-- based on data in Request.
1136instance Semigroup (Option scheme) where
1419instance Semigroup (Option scheme) where
1137− Option er0 mr0 <> Option er1 mr1 = Option
1420+ Option er0 mr0 <> Option er1 mr1 =
1138− (er0 <> er1) (mr0 <|> mr1)
1422+ (er0 <> er1)
1140instance Monoid (Option scheme) where
1425instance Monoid (Option scheme) where
1141− mempty = Option mempty Nothing
1426+ mempty = Option mempty Nothing
1142 mappend = (<>)
1427 mappend = (<>)
1429+-- | Use 'formToQuery'.
1432+instance FromForm (Option scheme) where
1433+ fromForm = Right . formToQuery
1144-- | A helper to create an 'Option' that modifies only collection of query
1435-- | A helper to create an 'Option' that modifies only collection of query
1145-- parameters. This helper is not a part of the public API.
1436-- parameters. This helper is not a part of the public API.
1147withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
1437withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
1148withQueryParams f = Option (Endo (first f)) Nothing
1438withQueryParams f = Option (Endo (first f)) Nothing
1150-- | A helper to create an 'Option' that modifies only 'L.Request'. This
1440-- | A helper to create an 'Option' that modifies only 'L.Request'. This
1151-- helper is not a part of public API.
1441-- helper is not a part of public API.
1153withRequest :: (L.Request -> L.Request) -> Option scheme
1442withRequest :: (L.Request -> L.Request) -> Option scheme
1154withRequest f = Option (Endo (second f)) Nothing
1443withRequest f = Option (Endo (second f)) Nothing
1156instance RequestComponent (Option scheme) where
1445instance RequestComponent (Option scheme) where
1157 getRequestMod (Option f _) = Endo $ \x ->
1446 getRequestMod (Option f _) = Endo $ \x ->
1158 let (qparams, x') = appEndo f ([], x)
1447 let (qparams, x') = appEndo f ([], x)
1159− query = Y.renderQuery True (Y.queryTextToQuery qparams)
1448+ query = Y.renderQuery True (Y.queryTextToQuery qparams)
1160− in x' { L.queryString = query }
1449+ in x' {L.queryString = query}
1162-- | Finalize given 'L.Request' by applying a finalizer from the given
1451-- | Finalize given 'L.Request' by applying a finalizer from the given
1163-- 'Option' (if it has any).
1452-- 'Option' (if it has any).
1165−finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
1453+finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
1166finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1454finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1168----------------------------------------------------------------------------
1456----------------------------------------------------------------------------
@@ -1181,12 +1469,12 @@ finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1181-- This operator is defined in terms of 'queryParam':
1469-- This operator is defined in terms of 'queryParam':
1183-- > name =: value = queryParam name (pure value)
1471-- > name =: value = queryParam name (pure value)
1185infix 7 =:
1472infix 7 =:
1186(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
1474(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
1187name =: value = queryParam name (pure value)
1475name =: value = queryParam name (pure value)
1189−-- | Construct a flag, that is, valueless query parameter. For example, in
1477+-- | Construct a flag, that is, a valueless query parameter. For example, in
1190-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
1478-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
1191-- with a value:
1479-- with a value:
@@ -1195,27 +1483,47 @@ name =: value = queryParam name (pure value)
1195-- This operator is defined in terms of 'queryParam':
1483-- This operator is defined in terms of 'queryParam':
1197-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1485-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1199−queryFlag :: QueryParam param => Text -> param
1486+queryFlag :: (QueryParam param) => Text -> param
1200queryFlag name = queryParam name (Nothing :: Maybe ())
1487queryFlag name = queryParam name (Nothing :: Maybe ())
1489+-- | Construct query parameters from a 'ToForm' instance. This function
1490+-- produces the same query params as 'Form.urlEncodeAsFormStable'.
1492+-- Note that 'Form.Form' doesn't have the concept of parameters with the
1493+-- empty value (i.e. what you can get by @key =: ""@). If the value is
1494+-- empty, it will be encoded as a valueless parameter (i.e. what you can get
1495+-- by @queryFlag key@).
1498+formToQuery :: (QueryParam param, Monoid param, ToForm f) => f -> param
1499+formToQuery f = mconcat . fmap toParam . Form.toListStable $ toForm f
1501+ toParam (key, val) =
1202-- | A type class for query-parameter-like things. The reason to have an
1507-- | A type class for query-parameter-like things. The reason to have an
1203-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
1508-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
1204-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
1509-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
1205-- Having the same syntax for these cases seems natural and user-friendly.
1510-- Having the same syntax for these cases seems natural and user-friendly.
1207class QueryParam param where
1511class QueryParam param where
1209 -- | Create a query parameter with given name and value. If value is
1512 -- | Create a query parameter with given name and value. If value is
1210 -- 'Nothing', it won't be included at all (i.e. you create a flag this
1513 -- 'Nothing', it won't be included at all (i.e. you create a flag this
1211 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
1514 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
1212 -- method, because they are easier to read.
1515 -- method, because they are easier to read.
1516+ queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
1214− queryParam :: ToHttpApiData a => Text -> Maybe a -> param
1518+ -- | Get the query parameter names and values set by 'queryParam'.
1521+ queryParamToList :: param -> [(Text, Maybe Text)]
1216instance QueryParam (Option scheme) where
1523instance QueryParam (Option scheme) where
1217 queryParam name mvalue =
1524 queryParam name mvalue =
1218 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1525 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1526+ queryParamToList (Option f _) = fst $ appEndo f ([], L.defaultRequest)
1220----------------------------------------------------------------------------
1528----------------------------------------------------------------------------
1221-- Request—Optional parameters—Headers
1529-- Request—Optional parameters—Headers
@@ -1224,20 +1532,28 @@ instance QueryParam (Option scheme) where
1224-- headers with the same names the leftmost header will win. This means, in
1532-- headers with the same names the leftmost header will win. This means, in
1225-- particular, that you cannot create a request with several headers of the
1533-- particular, that you cannot create a request with several headers of the
1226-- same name.
1534-- same name.
1228−header
1535+header ::
1229− :: ByteString -- ^ Header name
1536+ -- | Header name
1230− -> ByteString -- ^ Header value
1538+ -- | Header value
1231− -> Option scheme
1540+ Option scheme
1232header name value = withRequest (attachHeader name value)
1541header name value = withRequest (attachHeader name value)
1234-- | Attach a header with given name and content to a 'L.Request'.
1543-- | Attach a header with given name and content to a 'L.Request'.
1236-- @since 1.1.0
1545-- @since 1.1.0
1238attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
1546attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
1239attachHeader name value x =
1547attachHeader name value x =
1240− x { L.requestHeaders = (CI.mk name, value) : L.requestHeaders x }
1548+ x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
1550+-- | Same as 'header', but with redacted values on print.
1553+headerRedacted :: ByteString -> ByteString -> Option scheme
1554+headerRedacted name value = withRequest $ \x ->
1555+ let y = attachHeader name value x
1556+ in y {L.redactHeaders = CI.mk name `S.insert` L.redactHeaders y}
1242----------------------------------------------------------------------------
1558----------------------------------------------------------------------------
1243-- Request—Optional parameters—Cookies
1559-- Request—Optional parameters—Cookies
@@ -1250,10 +1566,9 @@ attachHeader name value x =
1251-- | Use the given 'L.CookieJar'. A 'L.CookieJar' can be obtained from a
1567-- | Use the given 'L.CookieJar'. A 'L.CookieJar' can be obtained from a
1252-- 'L.Response' record.
1568-- 'L.Response' record.
1254cookieJar :: L.CookieJar -> Option scheme
1569cookieJar :: L.CookieJar -> Option scheme
1255cookieJar jar = withRequest $ \x ->
1570cookieJar jar = withRequest $ \x ->
1256− x { L.cookieJar = Just jar }
1571+ x {L.cookieJar = Just jar}
1258----------------------------------------------------------------------------
1573----------------------------------------------------------------------------
1259-- Request—Optional parameters—Authentication
1574-- Request—Optional parameters—Authentication
@@ -1271,11 +1586,13 @@ cookieJar jar = withRequest $ \x ->
1271-- | The 'Option' adds basic authentication.
1586-- | The 'Option' adds basic authentication.
1273-- See also: <https://en.wikipedia.org/wiki/Basic_access_authentication>.
1588-- See also: <https://en.wikipedia.org/wiki/Basic_access_authentication>.
1275−basicAuth
1589+basicAuth ::
1276− :: ByteString -- ^ Username
1590+ -- | Username
1277− -> ByteString -- ^ Password
1591+ ByteString ->
1278− -> Option 'Https -- ^ Auth 'Option'
1594+ -- | Auth 'Option'
1279basicAuth = basicAuthUnsafe
1596basicAuth = basicAuthUnsafe
1281-- | An alternative to 'basicAuth' which works for any scheme. Note that
1598-- | An alternative to 'basicAuth' which works for any scheme. Note that
@@ -1283,41 +1600,52 @@ basicAuth = basicAuthUnsafe
1283-- attacks. Use 'basicAuth' instead unless you know what you are doing.
1600-- attacks. Use 'basicAuth' instead unless you know what you are doing.
1285-- @since 0.3.1
1602-- @since 0.3.1
1287−basicAuthUnsafe
1603+basicAuthUnsafe ::
1288− :: ByteString -- ^ Username
1604+ -- | Username
1289− -> ByteString -- ^ Password
1605+ ByteString ->
1290− -> Option scheme -- ^ Auth 'Option'
1609+ Option scheme
1291−basicAuthUnsafe username password = customAuth
1610+basicAuthUnsafe username password =
1292− (pure . L.applyBasicAuth username password)
1612+ (pure . L.applyBasicAuth username password)
1294-- | The 'Option' set basic proxy authentication header.
1614-- | The 'Option' set basic proxy authentication header.
1296-- @since 1.1.0
1616-- @since 1.1.0
1298−basicProxyAuth
1617+basicProxyAuth ::
1299− :: ByteString -- ^ Username
1618+ -- | Username
1300− -> ByteString -- ^ Password
1619+ ByteString ->
1301− -> Option scheme -- ^ Auth 'Option'
1622+ -- | Auth 'Option'
1302basicProxyAuth username password =
1624basicProxyAuth username password =
1303 withRequest (L.applyBasicProxyAuth username password)
1625 withRequest (L.applyBasicProxyAuth username password)
1305-- | The 'Option' adds OAuth1 authentication.
1627-- | The 'Option' adds OAuth1 authentication.
1307-- @since 0.2.0
1629-- @since 0.2.0
1309−oAuth1
1630+oAuth1 ::
1310− :: ByteString -- ^ Consumer token
1631+ -- | Consumer token
1311− -> ByteString -- ^ Consumer secret
1633+ -- | Consumer secret
1312− -> ByteString -- ^ OAuth token
1634+ ByteString ->
1313− -> ByteString -- ^ OAuth token secret
1637+ -- | OAuth token secret
1314− -> Option scheme -- ^ Auth 'Option'
1639+ -- | Auth 'Option'
1315oAuth1 consumerToken consumerSecret token tokenSecret =
1641oAuth1 consumerToken consumerSecret token tokenSecret =
1316 customAuth (OAuth.signOAuth app creds)
1642 customAuth (OAuth.signOAuth app creds)
1318− app = OAuth.newOAuth
1645+ OAuth.newOAuth
1319− { OAuth.oauthConsumerKey = consumerToken
1646+ { OAuth.oauthConsumerKey = consumerToken,
1320− , OAuth.oauthConsumerSecret = consumerSecret }
1647+ OAuth.oauthConsumerSecret = consumerSecret
1321 creds = OAuth.newCredential token tokenSecret
1649 creds = OAuth.newCredential token tokenSecret
1323-- | The 'Option' adds an OAuth2 bearer token. This is treated by many
1651-- | The 'Option' adds an OAuth2 bearer token. This is treated by many
@@ -1328,12 +1656,14 @@ oAuth1 consumerToken consumerSecret token tokenSecret =
1328-- > oAuth2Bearer token = header "Authorization" ("Bearer " <> token)
1656-- > oAuth2Bearer token = header "Authorization" ("Bearer " <> token)
1330-- See also: <https://en.wikipedia.org/wiki/OAuth>.
1658-- See also: <https://en.wikipedia.org/wiki/OAuth>.
1332−oAuth2Bearer
1659+oAuth2Bearer ::
1333− :: ByteString -- ^ Token
1661+ ByteString ->
1334− -> Option 'Https -- ^ Auth 'Option'
1662+ -- | Auth 'Option'
1335−oAuth2Bearer token = customAuth
1664+oAuth2Bearer token =
1336− (pure . attachHeader "Authorization" ("Bearer " <> token))
1666+ (pure . attachHeader "Authorization" ("Bearer " <> token))
1338-- | The 'Option' adds a not-quite-standard OAuth2 bearer token (that seems
1668-- | The 'Option' adds a not-quite-standard OAuth2 bearer token (that seems
1339-- to be used only by GitHub). This will be treated by whatever services
1669-- to be used only by GitHub). This will be treated by whatever services
@@ -1344,19 +1674,20 @@ oAuth2Bearer token = customAuth
1344-- > oAuth2Token token = header "Authorization" ("token" <> token)
1674-- > oAuth2Token token = header "Authorization" ("token" <> token)
1346-- See also: <https://developer.github.com/v3/oauth#3-use-the-access-token-to-access-the-api>.
1676-- See also: <https://developer.github.com/v3/oauth#3-use-the-access-token-to-access-the-api>.
1348−oAuth2Token
1677+oAuth2Token ::
1349− :: ByteString -- ^ Token
1679+ ByteString ->
1350− -> Option 'Https -- ^ Auth 'Option'
1680+ -- | Auth 'Option'
1351−oAuth2Token token = customAuth
1682+oAuth2Token token =
1352− (pure . attachHeader "Authorization" ("token " <> token))
1684+ (pure . attachHeader "Authorization" ("token " <> token))
1354-- | A helper to create custom authentication 'Option's. The given
1686-- | A helper to create custom authentication 'Option's. The given
1355-- 'IO'-enabled request transformation is applied after all other
1687-- 'IO'-enabled request transformation is applied after all other
1356-- modifications when constructing a request. Use wisely.
1688-- modifications when constructing a request. Use wisely.
1358-- @since 1.1.0
1690-- @since 1.1.0
1360customAuth :: (L.Request -> IO L.Request) -> Option scheme
1691customAuth :: (L.Request -> IO L.Request) -> Option scheme
1361customAuth = Option mempty . pure
1692customAuth = Option mempty . pure
@@ -1365,11 +1696,10 @@ customAuth = Option mempty . pure
1366-- | Specify the port to connect to explicitly. Normally, 'Url' you use
1697-- | Specify the port to connect to explicitly. Normally, 'Url' you use
1367-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1698-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1368−-- 'Option' allows to choose an arbitrary port overwriting the defaults.
1699+-- 'Option' allows us to choose an arbitrary port overwriting the defaults.
1370port :: Int -> Option scheme
1700port :: Int -> Option scheme
1371port n = withRequest $ \x ->
1701port n = withRequest $ \x ->
1372− x { L.port = n }
1702+ x {L.port = n}
1374-- | This 'Option' controls whether gzipped data should be decompressed on
1704-- | This 'Option' controls whether gzipped data should be decompressed on
1375-- the fly. By default everything except for @\"application\/x-tar\"@ is
1705-- the fly. By default everything except for @\"application\/x-tar\"@ is
@@ -1380,39 +1710,40 @@ port n = withRequest $ \x ->
1380-- You can also choose to decompress everything like this:
1710-- You can also choose to decompress everything like this:
1382-- > decompress (const True)
1712-- > decompress (const True)
1384−decompress
1713+decompress ::
1385− :: (ByteString -> Bool) -- ^ Predicate that is given MIME type, it
1714+ -- | Predicate that is given MIME type, it returns 'True' when content
1386− -- returns 'True' when content should be decompressed on the fly.
1715+ -- should be decompressed on the fly.
1716+ (ByteString -> Bool) ->
1387− -> Option scheme
1717+ Option scheme
1388decompress f = withRequest $ \x ->
1718decompress f = withRequest $ \x ->
1389− x { L.decompress = f }
1719+ x {L.decompress = f}
1391-- | Specify the number of microseconds to wait for response. The default
1721-- | Specify the number of microseconds to wait for response. The default
1392-- value is 30 seconds (defined in 'L.ManagerSettings' of connection
1722-- value is 30 seconds (defined in 'L.ManagerSettings' of connection
1393-- 'L.Manager').
1723-- 'L.Manager').
1395−responseTimeout
1724+responseTimeout ::
1396− :: Int -- ^ Number of microseconds to wait
1725+ -- | Number of microseconds to wait
1397− -> Option scheme
1727+ Option scheme
1398responseTimeout n = withRequest $ \x ->
1728responseTimeout n = withRequest $ \x ->
1399− x { L.responseTimeout = LI.ResponseTimeoutMicro n }
1729+ x {L.responseTimeout = LI.ResponseTimeoutMicro n}
1401-- | HTTP version to send to the server, the default is HTTP 1.1.
1731-- | HTTP version to send to the server, the default is HTTP 1.1.
1403−httpVersion
1732+httpVersion ::
1404− :: Int -- ^ Major version number
1733+ -- | Major version number
1405− -> Int -- ^ Minor version number
1735+ -- | Minor version number
1406− -> Option scheme
1737+ Option scheme
1407httpVersion major minor = withRequest $ \x ->
1738httpVersion major minor = withRequest $ \x ->
1408− x { L.requestVersion = Y.HttpVersion major minor }
1739+ x {L.requestVersion = Y.HttpVersion major minor}
1410----------------------------------------------------------------------------
1741----------------------------------------------------------------------------
1411-- Response interpretations
1742-- Response interpretations
1413-- | Make a request and ignore the body of the response.
1744-- | Make a request and ignore the body of the response.
1415newtype IgnoreResponse = IgnoreResponse (L.Response ())
1745newtype IgnoreResponse = IgnoreResponse (L.Response ())
1417instance HttpResponse IgnoreResponse where
1748instance HttpResponse IgnoreResponse where
1418 type HttpResponseBody IgnoreResponse = ()
1749 type HttpResponseBody IgnoreResponse = ()
@@ -1421,7 +1752,6 @@ instance HttpResponse IgnoreResponse where
1422-- | Use this as the fourth argument of 'req' to specify that you want it to
1753-- | Use this as the fourth argument of 'req' to specify that you want it to
1423-- ignore the response body.
1754-- ignore the response body.
1425ignoreResponse :: Proxy IgnoreResponse
1755ignoreResponse :: Proxy IgnoreResponse
1426ignoreResponse = Proxy
1756ignoreResponse = Proxy
@@ -1429,28 +1759,28 @@ ignoreResponse = Proxy
1429-- 'handleHttpException' method of 'MonadHttp' instance corresponding to
1759-- 'handleHttpException' method of 'MonadHttp' instance corresponding to
1430-- monad in which you use 'req' will determine what to do in the case when
1760-- monad in which you use 'req' will determine what to do in the case when
1431-- parsing fails (the 'JsonHttpException' constructor will be used).
1761-- parsing fails (the 'JsonHttpException' constructor will be used).
1433newtype JsonResponse a = JsonResponse (L.Response a)
1762newtype JsonResponse a = JsonResponse (L.Response a)
1435−instance FromJSON a => HttpResponse (JsonResponse a) where
1765+instance (FromJSON a) => HttpResponse (JsonResponse a) where
1436 type HttpResponseBody (JsonResponse a) = a
1766 type HttpResponseBody (JsonResponse a) = a
1437 toVanillaResponse (JsonResponse r) = r
1767 toVanillaResponse (JsonResponse r) = r
1438 getHttpResponse r = do
1768 getHttpResponse r = do
1439 chunks <- L.brConsume (L.responseBody r)
1769 chunks <- L.brConsume (L.responseBody r)
1440 case A.eitherDecode (BL.fromChunks chunks) of
1770 case A.eitherDecode (BL.fromChunks chunks) of
1441− Left e -> throwIO (JsonHttpException e)
1771+ Left e -> throwIO (JsonHttpException e)
1442 Right x -> return $ JsonResponse (x <$ r)
1772 Right x -> return $ JsonResponse (x <$ r)
1773+ acceptHeader Proxy = Just "application/json"
1444-- | Use this as the fourth argument of 'req' to specify that you want it to
1775-- | Use this as the fourth argument of 'req' to specify that you want it to
1445-- return the 'JsonResponse' interpretation.
1776-- return the 'JsonResponse' interpretation.
1447jsonResponse :: Proxy (JsonResponse a)
1777jsonResponse :: Proxy (JsonResponse a)
1448jsonResponse = Proxy
1778jsonResponse = Proxy
1450-- | Make a request and interpret the body of the response as a strict
1780-- | Make a request and interpret the body of the response as a strict
1451-- 'ByteString'.
1781-- 'ByteString'.
1453newtype BsResponse = BsResponse (L.Response ByteString)
1782newtype BsResponse = BsResponse (L.Response ByteString)
1455instance HttpResponse BsResponse where
1785instance HttpResponse BsResponse where
1456 type HttpResponseBody BsResponse = ByteString
1786 type HttpResponseBody BsResponse = ByteString
@@ -1461,14 +1791,13 @@ instance HttpResponse BsResponse where
1462-- | Use this as the fourth argument of 'req' to specify that you want to
1792-- | Use this as the fourth argument of 'req' to specify that you want to
1463-- interpret the response body as a strict 'ByteString'.
1793-- interpret the response body as a strict 'ByteString'.
1465bsResponse :: Proxy BsResponse
1794bsResponse :: Proxy BsResponse
1466bsResponse = Proxy
1795bsResponse = Proxy
1468-- | Make a request and interpret the body of the response as a lazy
1797-- | Make a request and interpret the body of the response as a lazy
1469-- 'BL.ByteString'.
1798-- 'BL.ByteString'.
1471newtype LbsResponse = LbsResponse (L.Response BL.ByteString)
1799newtype LbsResponse = LbsResponse (L.Response BL.ByteString)
1473instance HttpResponse LbsResponse where
1802instance HttpResponse LbsResponse where
1474 type HttpResponseBody LbsResponse = BL.ByteString
1803 type HttpResponseBody LbsResponse = BL.ByteString
@@ -1479,24 +1808,22 @@ instance HttpResponse LbsResponse where
1480-- | Use this as the fourth argument of 'req' to specify that you want to
1809-- | Use this as the fourth argument of 'req' to specify that you want to
1481-- interpret the response body as a lazy 'BL.ByteString'.
1810-- interpret the response body as a lazy 'BL.ByteString'.
1483lbsResponse :: Proxy LbsResponse
1811lbsResponse :: Proxy LbsResponse
1484lbsResponse = Proxy
1812lbsResponse = Proxy
1486----------------------------------------------------------------------------
1814----------------------------------------------------------------------------
1487-- Helpers for response interpretations
1815-- Helpers for response interpretations
1489−-- | Fetch beginning of response and return it together with new
1817+-- | Fetch beginning of the response and return it together with a new
1490-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
1818-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
1493−grabPreview
1820+grabPreview ::
1495− -- ^ How many bytes to fetch
1821+ -- | How many bytes to fetch
1823+ -- | Response with body reader inside
1496− -> L.Response L.BodyReader
1824+ L.Response L.BodyReader ->
1497− -- ^ Response with body reader inside
1825+ -- | Preview 'ByteString' and new response with body reader inside
1498− -> IO (ByteString, L.Response L.BodyReader)
1826+ IO (ByteString, L.Response L.BodyReader)
1499− -- ^ Preview 'ByteString' and new response with body reader inside
1500grabPreview nbytes r = do
1827grabPreview nbytes r = do
1501 let br = L.responseBody r
1828 let br = L.responseBody r
1502 (target, leftover, done) <- brReadN br nbytes
1829 (target, leftover, done) <- brReadN br nbytes
@@ -1519,18 +1846,17 @@ grabPreview nbytes r = do
1520 then return B.empty
1847 then return B.empty
1522− return (target, r { L.responseBody = br' })
1849+ return (target, r {L.responseBody = br'})
1524-- | Consume N bytes from 'L.BodyReader', return the target chunk, the
1851-- | Consume N bytes from 'L.BodyReader', return the target chunk, the
1525-- leftover (may be empty), and whether we're done consuming the body.
1852-- leftover (may be empty), and whether we're done consuming the body.
1527−brReadN
1853+brReadN ::
1529− -- ^ Body reader to stream from
1854+ -- | Body reader to stream from
1530− -> Int
1855+ L.BodyReader ->
1531− -- ^ How many bytes to consume
1856+ -- | How many bytes to consume
1532− -> IO (ByteString, ByteString, Bool)
1857+ Int ->
1533− -- ^ Target chunk, the leftover, whether we're done
1858+ -- | Target chunk, the leftover, whether we're done
1859+ IO (ByteString, ByteString, Bool)
1534brReadN br n = go 0 id id
1860brReadN br n = go 0 id id
1536 go !tlen t l = do
1862 go !tlen t l = do
@@ -1539,9 +1865,9 @@ brReadN br n = go 0 id id
1539 then return (r t, r l, True)
1865 then return (r t, r l, True)
1541 let (target, leftover) = B.splitAt (n - tlen) chunk
1867 let (target, leftover) = B.splitAt (n - tlen) chunk
1542− tlen' = B.length target
1868+ tlen' = B.length target
1543− t' = t . (target:)
1869+ t' = t . (target :)
1544− l' = l . (leftover:)
1870+ l' = l . (leftover :)
1545 if tlen + tlen' < n
1871 if tlen + tlen' < n
1546 then go (tlen + tlen') t' l'
1872 then go (tlen + tlen') t' l'
1547 else return (r t', r l', False)
1873 else return (r t', r l', False)
@@ -1551,47 +1877,45 @@ brReadN br n = go 0 id id
1551-- Inspecting a response
1877-- Inspecting a response
1553-- | Get the response body.
1879-- | Get the response body.
1555−responseBody
1880+responseBody ::
1556− :: HttpResponse response
1881+ (HttpResponse response) =>
1557− => response
1882+ response ->
1558− -> HttpResponseBody response
1883+ HttpResponseBody response
1559responseBody = L.responseBody . toVanillaResponse
1884responseBody = L.responseBody . toVanillaResponse
1561-- | Get the response status code.
1886-- | Get the response status code.
1563−responseStatusCode
1887+responseStatusCode ::
1564− :: HttpResponse response
1888+ (HttpResponse response) =>
1565− => response
1889+ response ->
1567responseStatusCode =
1891responseStatusCode =
1568 Y.statusCode . L.responseStatus . toVanillaResponse
1892 Y.statusCode . L.responseStatus . toVanillaResponse
1570-- | Get the response status message.
1894-- | Get the response status message.
1572−responseStatusMessage
1895+responseStatusMessage ::
1573− :: HttpResponse response
1896+ (HttpResponse response) =>
1574− => response
1897+ response ->
1575− -> ByteString
1898+ ByteString
1576responseStatusMessage =
1899responseStatusMessage =
1577 Y.statusMessage . L.responseStatus . toVanillaResponse
1900 Y.statusMessage . L.responseStatus . toVanillaResponse
1579-- | Lookup a particular header from a response.
1902-- | Lookup a particular header from a response.
1581−responseHeader
1903+responseHeader ::
1582− :: HttpResponse response
1904+ (HttpResponse response) =>
1583− => response -- ^ Response interpretation
1905+ -- | Response interpretation
1584− -> ByteString -- ^ Header to lookup
1907+ -- | Header to lookup
1585− -> Maybe ByteString -- ^ Header value if found
1909+ -- | Header value if found
1586responseHeader r h =
1911responseHeader r h =
1587 (lookup (CI.mk h) . L.responseHeaders . toVanillaResponse) r
1912 (lookup (CI.mk h) . L.responseHeaders . toVanillaResponse) r
1589-- | Get the response 'L.CookieJar'.
1914-- | Get the response 'L.CookieJar'.
1591−responseCookieJar
1915+responseCookieJar ::
1592− :: HttpResponse response
1916+ (HttpResponse response) =>
1593− => response
1917+ response ->
1594− -> L.CookieJar
1918+ L.CookieJar
1595responseCookieJar = L.responseCookieJar . toVanillaResponse
1919responseCookieJar = L.responseCookieJar . toVanillaResponse
1597----------------------------------------------------------------------------
1921----------------------------------------------------------------------------
@@ -1602,19 +1926,15 @@ responseCookieJar = L.responseCookieJar . toVanillaResponse
1602-- To create a new response interpretation you just need to make your data
1926-- To create a new response interpretation you just need to make your data
1603-- type an instance of the 'HttpResponse' type class.
1927-- type an instance of the 'HttpResponse' type class.
1605−-- | A type class for response interpretations. It allows to describe how to
1929+-- | A type class for response interpretations. It allows us to describe how
1606−-- consume response from a @'L.Response' 'L.BodyReader'@ and produce the
1930+-- to consume the response from a @'L.Response' 'L.BodyReader'@ and produce
1607−-- final result that is to be returned to the user.
1931+-- the final result that is to be returned to the user.
1609class HttpResponse response where
1932class HttpResponse response where
1611 -- | The associated type is the type of body that can be extracted from an
1933 -- | The associated type is the type of body that can be extracted from an
1612 -- instance of 'HttpResponse'.
1934 -- instance of 'HttpResponse'.
1614− type HttpResponseBody response :: *
1935+ type HttpResponseBody response :: Type
1616 -- | The method describes how to get the underlying 'L.Response' record.
1937 -- | The method describes how to get the underlying 'L.Response' record.
1618 toVanillaResponse :: response -> L.Response (HttpResponseBody response)
1938 toVanillaResponse :: response -> L.Response (HttpResponseBody response)
1620 -- | This method describes how to consume response body and, more
1940 -- | This method describes how to consume response body and, more
@@ -1630,12 +1950,32 @@ class HttpResponse response where
1631 -- __Note__: signature of this function was changed in the version
1951 -- __Note__: signature of this function was changed in the version
1632 -- /1.0.0/.
1952 -- /1.0.0/.
1954+ -- | Response with body reader inside
1955+ L.Response L.BodyReader ->
1956+ -- | The final result
1959+ -- | The value of @\"Accept\"@ header. This is useful, for example, if a
1960+ -- website supports both @XML@ and @JSON@ responses, and decides what to
1961+ -- reply with based on what @Accept@ headers you have sent.
1963+ -- __Note__: manually specified 'Options' that set the @\"Accept\"@ header
1964+ -- will take precedence.
1967+ acceptHeader :: Proxy response -> Maybe ByteString
1968+ acceptHeader Proxy = Nothing
1970+-- | This instance has been added to make it easier to inspect 'L.Response'
1971+-- using Req's functions like 'responseStatusCode', 'responseStatusMessage',
1975+instance HttpResponse (L.Response ()) where
1976+ type HttpResponseBody (L.Response ()) = ()
1977+ toVanillaResponse = id
1634− getHttpResponse
1978+ getHttpResponse = return . void
1635− :: L.Response L.BodyReader
1636− -- ^ Response with body reader inside
1638− -- ^ The final result
1640----------------------------------------------------------------------------
1980----------------------------------------------------------------------------
@@ -1647,15 +1987,12 @@ class HttpResponse response where
1647-- request components easier using @('<>')@.
1987-- request components easier using @('<>')@.
1649-- __Note__: this type class is not a part of the public API.
1989-- __Note__: this type class is not a part of the public API.
1651class RequestComponent a where
1990class RequestComponent a where
1653 -- | Get a function that takes a 'L.Request' and changes it somehow
1991 -- | Get a function that takes a 'L.Request' and changes it somehow
1654 -- returning another 'L.Request'. For example, the 'HttpMethod' instance
1992 -- returning another 'L.Request'. For example, the 'HttpMethod' instance
1655 -- of 'RequestComponent' just overwrites method. The function is wrapped
1993 -- of 'RequestComponent' just overwrites method. The function is wrapped
1656 -- in 'Endo' so it's easier to chain such “modifying applications”
1994 -- in 'Endo' so it's easier to chain such “modifying applications”
1657 -- together building bigger and bigger 'RequestComponent's.
1995 -- together building bigger and bigger 'RequestComponent's.
1659 getRequestMod :: a -> Endo L.Request
1996 getRequestMod :: a -> Endo L.Request
1661-- | This wrapper is only used to attach a type-level tag to a given type.
1998-- | This wrapper is only used to attach a type-level tag to a given type.
@@ -1665,44 +2002,50 @@ class RequestComponent a where
1665-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
2002-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
1666-- which instance to use (i.e. the constraints are taken into account later,
2003-- which instance to use (i.e. the constraints are taken into account later,
1667-- when instance is already chosen).
2004-- when instance is already chosen).
1669−newtype Womb (tag :: Symbol) a = Womb a
2005+newtype Tagged (tag :: Symbol) a = Tagged a
1671-- | Exceptions that this library throws.
2007-- | Exceptions that this library throws.
1673data HttpException
2008data HttpException
1674− = VanillaHttpException L.HttpException
1675− -- ^ A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
2009+ = -- | A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
1676− | JsonHttpException String
2010+ VanillaHttpException L.HttpException
1677− -- ^ A wrapper with Aeson-produced 'String' describing why decoding
2011+ | -- | A wrapper with Aeson-produced 'String' describing why decoding
1678 -- failed
2012 -- failed
2013+ JsonHttpException String
1679− deriving (Show, Typeable, Generic)
2014+ deriving (Show, Generic)
1681instance Exception HttpException
2016instance Exception HttpException
2018+-- | Return 'Just' if the given 'HttpException' is wrapping a http-client's
2019+-- 'L.StatusCodeException'. Otherwise, return 'Nothing'.
2022+isStatusCodeException :: HttpException -> Maybe (L.Response ())
2023+isStatusCodeException
2024+ ( VanillaHttpException
2025+ ( L.HttpExceptionRequest
2027+ (L.StatusCodeException r _)
2030+isStatusCodeException _ = Nothing
1683-- | A simple type isomorphic to 'Bool' that we only have for better error
2032-- | A simple type isomorphic to 'Bool' that we only have for better error
1684-- messages. We use it as a kind and its data constructors as type-level
2033-- messages. We use it as a kind and its data constructors as type-level
1687-- See also: 'HttpMethod' and 'HttpBody'.
2036-- See also: 'HttpMethod' and 'HttpBody'.
1689data CanHaveBody
2037data CanHaveBody
1690− = CanHaveBody -- ^ Indeed can have a body
2038+ = -- | Indeed can have a body
1691− | NoBody -- ^ Should not have a body
2040+ | -- | Should not have a body
1693-- | A type-level tag that specifies URL scheme used (and thus if HTTPS is
2043-- | A type-level tag that specifies URL scheme used (and thus if HTTPS is
1694-- enabled). This is used to force TLS requirement for some authentication
2044-- enabled). This is used to force TLS requirement for some authentication
1695-- 'Option's.
2045-- 'Option's.
1697data Scheme
2046data Scheme
1698− = Http -- ^ HTTP
2048+ Http
1699− | Https -- ^ HTTPS
2050+ Https
1700− deriving (Eq, Ord, Show, Data, Typeable, Generic)
2051+ deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
1702−----------------------------------------------------------------------------
1705−-- | Max length of preview fragment of response body.
1707−bodyPreviewLength :: Num a => a
1708−bodyPreviewLength = 1024