on 7ab742a help sign in
11 files changed+487−681
since splitsnapshots
unifiedsplit
.github/dependabot.yml−6 .github/workflows/ci.yaml+13−20 .gitignore−1 CHANGELOG.md−67 Network/HTTP/Req.hs+170−324 README.md+124−28 Setup.hs+6 cabal.project−4 httpbin-tests/Network/HTTP/ReqSpec.hs+70−107 pure-tests/Network/HTTP/ReqSpec.hs+34−58 req.cabal+70−66
.github/dependabot.ymldeleted−6
@@ -1,6 +0,0 @@
1−version: 2
2−updates:
3− - package-ecosystem: "github-actions"
4− directory: "/"
5− schedule:
6− interval: "weekly"
.github/workflows/ci.yaml+13−20
@@ -8,28 +8,24 @@ on:
88 - opened
99 - synchronize
1010jobs:
11− ormolu:
12− runs-on: ubuntu-latest
13− steps:
14− - uses: actions/checkout@v4
15− - uses: haskell-actions/run-ormolu@v17
1611 build:
1712 runs-on: ubuntu-latest
18− needs: ormolu
1913 strategy:
2014 matrix:
21− cabal: ["3.12"]
22− ghc: ["9.6.3", "9.8.2", "9.10.1"]
15+ cabal: ["3.2"]
16+ ghc: ["8.6.5", "8.8.4", "8.10.2"]
17+ env:
18+ CONFIG: "--enable-tests --enable-benchmarks --flags=dev"
2319 steps:
24− - uses: actions/checkout@v4
25− - uses: haskell-actions/setup@v2
20+ - uses: actions/checkout@v2
21+ - uses: actions/setup-haskell@v1.1.2
2622 id: setup-haskell-cabal
2723 with:
2824 ghc-version: ${{ matrix.ghc }}
2925 cabal-version: ${{ matrix.cabal }}
30− - run: cabal update
31− - run: cabal freeze
32− - uses: actions/cache@v4.2.3
26+ - run: cabal v2-update
27+ - run: cabal v2-freeze $CONFIG
28+ - uses: actions/cache@v2
3329 with:
3430 path: |
3531 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -38,10 +34,7 @@ jobs:
3834 restore-keys: |
3935 ${{ runner.os }}-${{ matrix.ghc }}-
4036 - run: cabal format && git diff --exit-code --color=always
41− - run: cabal build
42− - run: |
43− docker pull kennethreitz/httpbin
44− docker run -p 1234:80 kennethreitz/httpbin &
45− cabal test
46− - run: cabal haddock
47− - run: cabal sdist
37+ - run: cabal v2-build $CONFIG
38+ - run: cabal v2-test $CONFIG
39+ - run: cabal v2-haddock $CONFIG
40+ - run: cabal v2-sdist
.gitignore−1
@@ -25,6 +25,5 @@ cabal.project.local
2525cabal.sandbox.config
2626dist-*/
2727dist/
28−hie.yaml
2928stack.yaml
3029stack.yaml.lock
CHANGELOG.md−67
@@ -1,75 +1,8 @@
1−## Req 3.13.4
2−
3−* Fixed empty ciphersuite list when compiling against `tls < 2.0.6`
4− (see [PR 175](https://github.com/mrkkrp/req/pull/175)). As a side effect, now
5− compatible with older versions of `crypton-connection` (>= 0.3).
6−
7−## Req 3.13.3
8−
9−* Works with `crypton-connection-0.4` and newer.
10−
11−## Req 3.13.2
12−
13−* Disable the problematic `httpbin-tests` test suite by default. Only enable
14− it when the `dev` flag is enabled. In that case it is expected that an
15− httpbin server is run locally at `localhost:1234`.
16−
17−## Req 3.13.1
18−
19−* Switched the non-pure test suite to use https://httpbun.org instead of
20− https://httpbin.org since the latter proved to be highly unreliable
21− lately.
22−
23−* Switched from `connection` to `crypton-connection`.
24−
25−* Builds with GHC 9.6.1.
26−
27−## Req 3.13.0
28−
29−* Add `headerRedacted` function to add header fields, which will be with
30− redacted values on print.
31−
32−## Req 3.12.0
33−
34−* Add `isStatusCodeException` function.
35−* Add `instance HttpResponse (Network.HTTP.Client.Response ())`.
36−
37−## Req 3.11.0
38−
39−* Add the `queryParamToList` method to the `QueryParam` type class.
40−* Add the `formToQuery` function. [Issue 126](https://github.com/mrkkrp/req/issues/126).
41−* Add `FromForm` instances (in the `Web.FormUrlEncoded` module) to the
42− `Option` and `FormUrlEncodedParam` types.
43−
44−## Req 3.10.0
45−
46−* Add `MonadHttp` instances for `transformers` types.
47−
48−## Req 3.9.2
49−
50−* The test suite works with `aeson-2.x.x.x`.
51−
52−## Req 3.9.1
53−
54−* Builds with GHC 9.0.
55−
56−## Req 3.9.0
57−
58−* The `useHttpURI` and `useHttpsURI` functions now preserve trailing
59− slashes.
60−
61−## Req 3.8.0
62−
63−* Adjusted the value of the `httpConfigRetryJudgeException` field of
64− `defaultHttpConfig` to retry on response timeouts and connection timeouts.
65−
661## Req 3.7.0
672
683* Added `reqCb`, a function that allows you to modify the `Request` object
694 but otherwise performs the requst for you.
705
71−* Derived `MonadThrow`, `MonadCatch`, and `MonadMask` for the `Req` monad.
72−
736## Req 3.6.0
747
758* Added the `httpConfigBodyPreviewLength` configuration parameter to
Network/HTTP/Req.hs+170−324
@@ -1,9 +1,19 @@
1+{-# LANGUAGE BangPatterns #-}
2+{-# LANGUAGE CPP #-}
13{-# LANGUAGE DataKinds #-}
4+{-# LANGUAGE DeriveDataTypeable #-}
5+{-# LANGUAGE DeriveGeneric #-}
6+{-# LANGUAGE DeriveLift #-}
7+{-# LANGUAGE FlexibleInstances #-}
8+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
29{-# LANGUAGE LambdaCase #-}
10+{-# LANGUAGE MultiParamTypeClasses #-}
311{-# LANGUAGE OverloadedStrings #-}
412{-# LANGUAGE QuasiQuotes #-}
13+{-# LANGUAGE RankNTypes #-}
514{-# LANGUAGE RecordWildCards #-}
615{-# LANGUAGE RoleAnnotations #-}
16+{-# LANGUAGE ScopedTypeVariables #-}
717{-# LANGUAGE TemplateHaskellQuotes #-}
818{-# LANGUAGE TypeFamilies #-}
919{-# LANGUAGE UndecidableInstances #-}
@@ -19,40 +29,61 @@
1929--
2030-- The documentation below is structured in such a way that the most
2131-- important information is presented first: you learn how to do HTTP
22−-- requests, how to embed them in the monad you have, and then it gives you
32+-- requests, how to embed them in any monad you have, and then it gives you
2333-- details about less-common things you may want to know about. The
2434-- documentation is written with sufficient coverage of details and
2535-- examples, and it's designed to be a complete tutorial on its own.
2636--
37+-- /(A modest intro goes here, click on 'req' to start making requests.)/
38+--
2739-- === About the library
2840--
29−-- Req is an HTTP client library that attempts to be easy-to-use, type-safe,
30−-- and expandable.
31−--
32−-- “Easy-to-use” means that the library is designed to be beginner-friendly
33−-- so it's simple to add to your monad stack, intuitive to work with,
34−-- well-documented, and does not get in your way. Doing HTTP requests is a
35−-- common task and a Haskell library for this should be approachable and
36−-- clear to beginners, thus certain compromises were made. For example, one
37−-- cannot currently modify 'L.ManagerSettings' of the default manager
38−-- because the library always uses the same implicit global manager for
39−-- simplicity and maximal connection sharing. There is a way to use your own
40−-- manager with different settings, but it requires more typing.
41−--
42−-- “Type-safe” means that the library tries to eliminate certain classes of
43−-- errors. For example, we have correct-by-construction URLs; it is
44−-- guaranteed that the user does not send the request body when using
45−-- methods like GET or OPTIONS, and the amount of implicit assumptions is
46−-- minimized by making the user specify their intentions in an explicit
47−-- form. For example, it's not possible to avoid specifying the body or the
48−-- method of a request. Authentication methods that assume HTTPS force the
49−-- user to use HTTPS at the type level.
50−--
51−-- “Expandable” refers to the ability to create new components without
52−-- having to resort to hacking. For example, it's possible to define your
53−-- own HTTP methods, create new ways to construct the body of a request,
54−-- create new authorization options, perform a request in a different way,
55−-- and create your own methods to parse a response.
41+-- Req is an easy-to-use, type-safe, expandable, high-level HTTP client
42+-- library that just works without any fooling around.
43+--
44+-- What does the phrase “easy-to-use” mean? It means that the library is
45+-- designed to be beginner-friendly so it's simple to add to your monad
46+-- stack, intuitive to work with, well-documented, and does not get in your
47+-- way. Doing HTTP requests is a common task and Haskell library for this
48+-- should be very approachable and clear to beginners, thus certain
49+-- compromises were made. For example, one cannot currently modify
50+-- 'L.ManagerSettings' of the default manager because the library always
51+-- uses the same implicit global manager for simplicity and maximal
52+-- connection sharing. There is a way to use your own manager with different
53+-- settings, but it requires a bit more typing.
54+--
55+-- “Type-safe” means that the library is protective and eliminates certain
56+-- classes of errors. For example, we have correct-by-construction 'Url's,
57+-- it's guaranteed that the user does not send the request body when using
58+-- methods like 'GET' or 'OPTIONS', and the amount of implicit assumptions
59+-- is minimized by making the user specify his\/her intentions in an
60+-- explicit form (for example, it's not possible to avoid specifying the
61+-- body or method of request). Authentication methods that assume HTTPS
62+-- force the user to use HTTPS at the type level. The library also carefully
63+-- hides underlying types from the lower-level @http-client@ package because
64+-- those types are not safe enough (for example 'L.Request' is an instance
65+-- of 'Data.String.IsString' and, if it's malformed, it will blow up at
66+-- run-time).
67+--
68+-- “Expandable” refers to the ability of the library to be expanded without
69+-- having to resort to ugly hacking. For example, it's possible to define
70+-- your own HTTP methods, create new ways to construct the body of a
71+-- request, create new authorization options, perform a request in a
72+-- different way, and create your own methods to parse and represent a
73+-- response. As the user extends the library to satisfy his\/her special
74+-- needs, the new solutions will work just like the built-ins. However, all
75+-- of the common cases are also covered by the library out-of-the-box.
76+--
77+-- “High-level” means that there are less details to worry about. The
78+-- library is a result of my experiences as a Haskell consultant. Working
79+-- for several clients, who had very different projects, showed me that the
80+-- library should adapt easily to any particular style of writing Haskell
81+-- applications. For example, some people prefer throwing exceptions, while
82+-- others are concerned with purity. Just define 'handleHttpException'
83+-- accordingly when making your monad instance of 'MonadHttp' and it will
84+-- play together seamlessly. Finally, the library cuts down boilerplate
85+-- considerably, and helps you write concise, easy to read, and maintainable
86+-- code.
5687--
5788-- === Using with other libraries
5889--
@@ -144,13 +175,11 @@ module Network.HTTP.Req
144175 -- $query-parameters
145176 (=:),
146177 queryFlag,
147− formToQuery,
148178 QueryParam (..),
149179
150180 -- *** Headers
151181 header,
152182 attachHeader,
153− headerRedacted,
154183
155184 -- *** Cookies
156185 -- $cookies
@@ -197,78 +226,58 @@ module Network.HTTP.Req
197226
198227 -- * Other
199228 HttpException (..),
200− isStatusCodeException,
201229 CanHaveBody (..),
202230 Scheme (..),
203231 )
204232where
205233
206−import Blaze.ByteString.Builder qualified as BB
234+import qualified Blaze.ByteString.Builder as BB
207235import Control.Applicative
208236import Control.Arrow (first, second)
209237import Control.Exception hiding (Handler (..), TypeError)
210−import Control.Monad (guard, void, (>=>))
211238import Control.Monad.Base
212−import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)
239+import Control.Monad.Catch (Handler (..))
213240import Control.Monad.IO.Class
214241import 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)
242+import Control.Monad.Reader
218243import 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
231244import Control.Retry
232245import Data.Aeson (FromJSON (..), ToJSON (..))
233−import Data.Aeson qualified as A
246+import qualified Data.Aeson as A
234247import 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
248+import qualified Data.ByteString as B
249+import qualified Data.ByteString.Lazy as BL
250+import qualified Data.CaseInsensitive as CI
238251import Data.Data (Data)
239−import Data.Default.Class (def)
240252import Data.Function (on)
241253import Data.IORef
242254import Data.Kind (Constraint, Type)
243255import Data.List (foldl', nubBy)
244256import Data.List.NonEmpty (NonEmpty (..))
245−import Data.List.NonEmpty qualified as NE
257+import qualified Data.List.NonEmpty as NE
246258import Data.Maybe (fromMaybe)
247259import Data.Proxy
248−import Data.Semigroup (Endo (..))
249−import Data.Set qualified as S
260+import Data.Semigroup hiding (Option, option)
250261import Data.Text (Text)
251−import Data.Text qualified as T
252−import Data.Text.Encoding qualified as T
262+import qualified Data.Text as T
263+import qualified Data.Text.Encoding as T
253264import Data.Typeable (Typeable, cast)
254265import GHC.Generics
255266import 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
267+import qualified Language.Haskell.TH as TH
268+import qualified Language.Haskell.TH.Quote as TH
269+import qualified Language.Haskell.TH.Syntax as TH
270+import qualified Network.Connection as NC
271+import qualified Network.HTTP.Client as L
272+import qualified Network.HTTP.Client.Internal as LI
273+import qualified Network.HTTP.Client.MultipartFormData as LM
274+import qualified Network.HTTP.Client.TLS as L
275+import qualified Network.HTTP.Types as Y
265276import System.IO.Unsafe (unsafePerformIO)
266277import 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
278+import qualified Text.URI as URI
279+import qualified Text.URI.QQ as QQ
280+import qualified Web.Authenticate.OAuth as OAuth
272281import Web.HttpApiData (ToHttpApiData (..))
273282
274283----------------------------------------------------------------------------
@@ -293,7 +302,7 @@ import Web.HttpApiData (ToHttpApiData (..))
293302--
294303-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
295304-- tutorial has a section about HTTP bodies, but usage is very
296−-- straightforward and should be clear from the examples.
305+-- straightforward and should be clear from the examples below.
297306--
298307-- @response@ is a type hint how to make and interpret response of an HTTP
299308-- request. Out-of-the-box it can be the following:
@@ -489,7 +498,7 @@ reqCb method url body responseProxy options adjustRequest =
489498--
490499-- @since 3.7.0
491500reqHandler ::
492− (MonadHttp m) =>
501+ MonadHttp m =>
493502 -- | How to get final result from a 'L.Response'
494503 (L.Response L.BodyReader -> IO b) ->
495504 -- | 'L.Request' to perform
@@ -578,22 +587,22 @@ req' method url body options m = do
578587 nubHeaders
579588 <> getRequestMod options
580589 <> getRequestMod config
581− <> getRequestMod (Tagged body :: Tagged "body" body)
590+ <> getRequestMod (Womb body :: Womb "body" body)
582591 <> getRequestMod url
583− <> getRequestMod (Tagged method :: Tagged "method" method)
592+ <> getRequestMod (Womb method :: Womb "method" method)
584593 request <- finalizeRequest options request'
585594 withReqManager (m request)
586595
587596-- | Perform an action using the global implicit 'L.Manager' that the rest
588−-- of the library uses. This allows us to reuse connections that the
597+-- of the library uses. This allows to reuse connections that the
589598-- 'L.Manager' controls.
590−withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591−withReqManager m = m globalManager
599+withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
600+withReqManager m = liftIO (readIORef globalManager) >>= m
592601
593−-- | The global 'L.Manager' that 'req' uses. Here we just go with the
594−-- default settings, so users don't need to deal with this manager stuff at
595−-- all, but when we create a request, instance 'HttpConfig' can affect the
596−-- default settings via 'getHttpConfig'.
602+-- | Global 'L.Manager' that 'req' uses. Here we just go with the default
603+-- settings, so users don't need to deal with this manager stuff at all, but
604+-- when we create a request, instance 'HttpConfig' can affect the default
605+-- settings via 'getHttpConfig'.
597606--
598607-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
599608-- The value of 'globalManager' is named and lives on top level. This means
@@ -601,16 +610,16 @@ withReqManager m = m globalManager
601610-- manager. From that moment on the 'IORef' will be just reused—exactly the
602611-- behavior we want here in order to maximize connection sharing. GHC could
603612-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
604−globalManager :: L.Manager
613+globalManager :: IORef L.Manager
605614globalManager = unsafePerformIO $ do
606615 context <- NC.initConnectionContext
607616 let settings =
608617 L.mkManagerSettingsContext
609618 (Just context)
610− def
619+ (NC.TLSSettingsSimple False False False)
611620 Nothing
612621 manager <- L.newManager settings
613− return manager
622+ newIORef manager
614623{-# NOINLINE globalManager #-}
615624
616625----------------------------------------------------------------------------
@@ -624,13 +633,13 @@ globalManager = unsafePerformIO $ do
624633-- When writing a library, keep your API polymorphic in terms of
625634-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
626635-- Another option is to use a @newtype@-wrapped monad stack and define
627−-- 'MonadHttp' for it. As of the version /0.4.0/, the 'Req' monad that
628−-- follows this strategy is provided out-of-the-box (see below).
636+-- 'MonadHttp' for it. As of version /0.4.0/, the 'Req' monad that follows
637+-- this strategy is provided out-of-the-box (see below).
629638
630639-- | A type class for monads that support performing HTTP requests.
631640-- Typically, you only need to define the 'handleHttpException' method
632641-- unless you want to tweak 'HttpConfig'.
633−class (MonadIO m) => MonadHttp m where
642+class MonadIO m => MonadHttp m where
634643 -- | This method describes how to deal with 'HttpException' that was
635644 -- caught by the library. One option is to re-throw it if you are OK with
636645 -- exceptions, but if you prefer working with something like
@@ -638,16 +647,17 @@ class (MonadIO m) => MonadHttp m where
638647 -- 'Control.Monad.Except.throwError'.
639648 handleHttpException :: HttpException -> m a
640649
641− -- | Return the 'HttpConfig' to be used when performing HTTP requests.
642− -- Default implementation returns its 'def' value, which is described in
643− -- the documentation for the type. Common usage pattern with manually
644− -- defined 'getHttpConfig' is to return some hard-coded value, or a value
650+ -- | Return 'HttpConfig' to be used when performing HTTP requests. Default
651+ -- implementation returns its 'def' value, which is described in the
652+ -- documentation for the type. Common usage pattern with manually defined
653+ -- 'getHttpConfig' is to return some hard-coded value, or a value
645654 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
646655 -- approach to configuration is desirable.
647656 getHttpConfig :: m HttpConfig
648657 getHttpConfig = return defaultHttpConfig
649658
650−-- | 'HttpConfig' contains settings to be used when making HTTP requests.
659+-- | 'HttpConfig' contains general and default settings to be used when
660+-- making HTTP requests.
651661data HttpConfig = HttpConfig
652662 { -- | Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
653663 -- environment variables are respected, this setting overwrites them.
@@ -691,8 +701,8 @@ data HttpConfig = HttpConfig
691701 -- | The retry policy to use for request retrying. By default 'def' is
692702 -- used (see 'RetryPolicyM').
693703 --
694− -- __Note__: signature of this function was changed to disallow 'IO' in
695− -- version /1.0.0/ and then changed back to its current form in /3.1.0/.
704+ -- __Note__: signature of this function was changed in the version
705+ -- /1.0.0/.
696706 --
697707 -- @since 0.3.0
698708 httpConfigRetryPolicy :: RetryPolicyM IO,
@@ -705,19 +715,18 @@ data HttpConfig = HttpConfig
705715 -- @since 0.3.0
706716 httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool,
707717 -- | 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
710− -- /3.8.0/).
718+ -- retry requests that resulted in an exception.
711719 --
712720 -- @since 3.4.0
713721 httpConfigRetryJudgeException :: RetryStatus -> SomeException -> Bool,
714722 -- | Max length of preview fragment of response body.
715723 --
716724 -- @since 3.6.0
717− httpConfigBodyPreviewLength :: forall a. (Num a) => a
725+ httpConfigBodyPreviewLength :: forall a. Num a => a
718726 }
727+ deriving (Typeable)
719728
720−-- | The default value of 'HttpConfig'.
729+-- | Default value of 'HttpConfig'.
721730--
722731-- @since 2.0.0
723732defaultHttpConfig :: HttpConfig
@@ -740,14 +749,7 @@ defaultHttpConfig =
740749 598, -- (Informal convention) Network read timeout error
741750 599 -- (Informal convention) Network connect timeout error
742751 ],
743− httpConfigRetryJudgeException = \_ e ->
744− case fromException e of
745− Just (L.HttpExceptionRequest _ c) ->
746− case c of
747− L.ResponseTimeout -> True
748− L.ConnectionTimeout -> True
749− _ -> False
750− _ -> False,
752+ httpConfigRetryJudgeException = \_ _ -> False,
751753 httpConfigBodyPreviewLength = 1024
752754 }
753755 where
@@ -761,7 +763,7 @@ instance RequestComponent HttpConfig where
761763 LI.requestManagerOverride = httpConfigAltManager
762764 }
763765
764−-- | A monad that allows us to run 'req' in any 'IO'-enabled monad without
766+-- | A monad that allows to run 'req' in any 'IO'-enabled monad without
765767-- having to define new instances.
766768--
767769-- @since 0.4.0
@@ -774,15 +776,6 @@ newtype Req a = Req (ReaderT HttpConfig IO a)
774776 MonadUnliftIO
775777 )
776778
777−-- | @since 3.7.0
778−deriving instance MonadThrow Req
779−
780−-- | @since 3.7.0
781−deriving instance MonadCatch Req
782−
783−-- | @since 3.7.0
784−deriving instance MonadMask Req
785−
786779instance MonadBase IO Req where
787780 liftBase = liftIO
788781
@@ -797,87 +790,12 @@ instance MonadHttp Req where
797790 handleHttpException = Req . lift . throwIO
798791 getHttpConfig = Req ask
799792
800−-- | @since 3.10.0
801−instance (MonadHttp m, Monoid w) => MonadHttp (AccumT w m) where
802− handleHttpException = lift . handleHttpException
803− getHttpConfig = lift getHttpConfig
804−
805−-- | @since 3.10.0
806−instance (MonadHttp m) => MonadHttp (ContT r m) where
807− handleHttpException = lift . handleHttpException
808− getHttpConfig = lift getHttpConfig
809−
810−-- | @since 3.10.0
811−instance (MonadHttp m) => MonadHttp (ExceptT e m) where
812− handleHttpException = lift . handleHttpException
813− getHttpConfig = lift getHttpConfig
814−
815−-- | @since 3.10.0
816−instance (MonadHttp m) => MonadHttp (IdentityT m) where
817− handleHttpException = lift . handleHttpException
818− getHttpConfig = lift getHttpConfig
819−
820−-- | @since 3.10.0
821−instance (MonadHttp m) => MonadHttp (MaybeT m) where
822− handleHttpException = lift . handleHttpException
823− getHttpConfig = lift getHttpConfig
824−
825−-- | @since 3.10.0
826−instance (MonadHttp m) => MonadHttp (ReaderT r m) where
827− handleHttpException = lift . handleHttpException
828− getHttpConfig = lift getHttpConfig
829−
830−-- | @since 3.10.0
831−instance (MonadHttp m, Monoid w) => MonadHttp (RWS.CPS.RWST r w s m) where
832− handleHttpException = lift . handleHttpException
833− getHttpConfig = lift getHttpConfig
834−
835−-- | @since 3.10.0
836−instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Lazy.RWST r w s m) where
837− handleHttpException = lift . handleHttpException
838− getHttpConfig = lift getHttpConfig
839−
840−-- | @since 3.10.0
841−instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Strict.RWST r w s m) where
842− handleHttpException = lift . handleHttpException
843− getHttpConfig = lift getHttpConfig
844−
845−-- | @since 3.10.0
846−instance (MonadHttp m) => MonadHttp (SelectT r m) where
847− handleHttpException = lift . handleHttpException
848− getHttpConfig = lift getHttpConfig
849−
850−-- | @since 3.10.0
851−instance (MonadHttp m) => MonadHttp (State.Lazy.StateT s m) where
852− handleHttpException = lift . handleHttpException
853− getHttpConfig = lift getHttpConfig
854−
855−-- | @since 3.10.0
856−instance (MonadHttp m) => MonadHttp (State.Strict.StateT s m) where
857− handleHttpException = lift . handleHttpException
858− getHttpConfig = lift getHttpConfig
859−
860−-- | @since 3.10.0
861−instance (MonadHttp m, Monoid w) => MonadHttp (Writer.CPS.WriterT w m) where
862− handleHttpException = lift . handleHttpException
863− getHttpConfig = lift getHttpConfig
864−
865−-- | @since 3.10.0
866−instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Lazy.WriterT w m) where
867− handleHttpException = lift . handleHttpException
868− getHttpConfig = lift getHttpConfig
869−
870−-- | @since 3.10.0
871−instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Strict.WriterT w m) where
872− handleHttpException = lift . handleHttpException
873− getHttpConfig = lift getHttpConfig
874−
875793-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
876−-- the case of an exceptional situation an 'HttpException' will be thrown.
794+-- case of exceptional situation an 'HttpException' will be thrown.
877795--
878796-- @since 0.4.0
879797runReq ::
880− (MonadIO m) =>
798+ MonadIO m =>
881799 -- | 'HttpConfig' to use
882800 HttpConfig ->
883801 -- | Computation to run
@@ -982,7 +900,7 @@ class HttpMethod a where
982900 -- | Return name of the method as a 'ByteString'.
983901 httpMethodName :: Proxy a -> ByteString
984902
985−instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
903+instance HttpMethod method => RequestComponent (Womb "method" method) where
986904 getRequestMod _ = Endo $ \x ->
987905 x {L.method = httpMethodName (Proxy :: Proxy method)}
988906
@@ -1024,20 +942,23 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
1024942-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
1025943data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1026944 -- NOTE The second value is the path segments in reversed order.
1027− deriving (Eq, Ord, Show, Data, Generic)
945+ deriving (Eq, Ord, Show, Data, Typeable, Generic)
1028946
1029947type role Url nominal
1030948
1031949-- 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
950+-- the derived lift forgets the type of scheme.
951+instance Typeable scheme => TH.Lift (Url scheme) where
1034952 lift url =
1035953 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of
1036954 Url Http _ -> [t|Url 'Http|]
1037955 Url Https _ -> [t|Url 'Https|]
1038956 where
1039957 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)
1040− liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift
958+
959+#if MIN_VERSION_template_haskell(2,16,0)
960+ liftTyped url = TH.TExp <$> TH.lift url
961+#endif
1041962
1042963-- | Given host name, produce a 'Url' which has “http” as its scheme and
1043964-- empty path. This also sets port to @80@.
@@ -1049,14 +970,14 @@ http = Url Http . pure
1049970https :: Text -> Url 'Https
1050971https = Url Https . pure
1051972
1052−-- | Grow a given 'Url' appending a single path segment to it. Note that the
973+-- | Grow given 'Url' appending a single path segment to it. Note that the
1053974-- path segment can be of any type that is an instance of 'ToHttpApiData'.
1054975infixl 5 /~
1055976
1056−(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
977+(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
1057978Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
1058979
1059−-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
980+-- | Type-constrained version of @('/~')@ to remove ambiguity in the cases
1060981-- when next URL piece is a 'Data.Text.Text' literal.
1061982infixl 5 /:
1062983
@@ -1089,7 +1010,8 @@ useHttpURI uri = do
10891010 urlHead <- http <$> uriHost uri
10901011 let url = case URI.uriPath uri of
10911012 Nothing -> urlHead
1092− Just uriPath -> uriPathToUrl uriPath urlHead
1013+ Just (_, xs) ->
1014+ foldl' (/:) urlHead (URI.unRText <$> NE.toList xs)
10931015 return (url, uriOptions uri)
10941016
10951017-- | Just like 'useHttpURI', but expects the “https” scheme.
@@ -1101,21 +1023,10 @@ useHttpsURI uri = do
11011023 urlHead <- https <$> uriHost uri
11021024 let url = case URI.uriPath uri of
11031025 Nothing -> urlHead
1104− Just uriPath -> uriPathToUrl uriPath urlHead
1026+ Just (_, xs) ->
1027+ foldl' (/:) urlHead (URI.unRText <$> NE.toList xs)
11051028 return (url, uriOptions uri)
11061029
1107−-- | Convert URI path to a 'Url'. Internal.
1108−--
1109−-- @since 3.9.0
1110−uriPathToUrl ::
1111− (Bool, NonEmpty (URI.RText 'URI.PathPiece)) ->
1112− Url scheme ->
1113− Url scheme
1114−uriPathToUrl (trailingSlash, xs) urlHead =
1115− if trailingSlash then path /: T.empty else path
1116− where
1117− path = foldl' (/:) urlHead (URI.unRText <$> NE.toList xs)
1118−
11191030-- | A combination of 'useHttpURI' and 'useHttpsURI' for cases when scheme
11201031-- is not known in advance.
11211032--
@@ -1232,21 +1143,21 @@ data NoReqBody = NoReqBody
12321143instance HttpBody NoReqBody where
12331144 getRequestBody NoReqBody = L.RequestBodyBS B.empty
12341145
1235−-- | This body option allows us to use a JSON object as the request
1236−-- body—probably the most popular format right now. Just wrap a data type
1237−-- that is an instance of 'ToJSON' type class and you are done: it will be
1238−-- converted to JSON and inserted as request body.
1146+-- | This body option allows to use a JSON object as request body—probably
1147+-- the most popular format right now. Just wrap a data type that is an
1148+-- instance of 'ToJSON' type class and you are done: it will be converted to
1149+-- JSON and inserted as request body.
12391150--
12401151-- This body option sets the @Content-Type@ header to @\"application/json;
12411152-- charset=utf-8\"@ value.
12421153newtype ReqBodyJson a = ReqBodyJson a
12431154
1244−instance (ToJSON a) => HttpBody (ReqBodyJson a) where
1155+instance ToJSON a => HttpBody (ReqBodyJson a) where
12451156 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
12461157 getRequestContentType _ = pure "application/json; charset=utf-8"
12471158
12481159-- | This body option streams request body from a file. It is expected that
1249−-- the file size does not change during streaming.
1160+-- the file size does not change during the streaming.
12501161--
12511162-- Using of this body option does not set the @Content-Type@ header.
12521163newtype ReqBodyFile = ReqBodyFile FilePath
@@ -1271,11 +1182,12 @@ newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
12711182instance HttpBody ReqBodyLbs where
12721183 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
12731184
1274−-- | URL-encoded body. This can hold a collection of parameters which are
1275−-- encoded similarly to query parameters at the end of query string, with
1276−-- the only difference that they are stored in request body. The similarity
1277−-- is reflected in the API as well, as you can use the same combinators you
1278−-- would use to add query parameters: @('=:')@ and 'queryFlag'.
1185+-- | Form URL-encoded body. This can hold a collection of parameters which
1186+-- are encoded similarly to query parameters at the end of query string,
1187+-- with the only difference that they are stored in request body. The
1188+-- similarity is reflected in the API as well, as you can use the same
1189+-- combinators you would use to add query parameters: @('=:')@ and
1190+-- 'queryFlag'.
12791191--
12801192-- This body option sets the @Content-Type@ header to
12811193-- @\"application/x-www-form-urlencoded\"@ value.
@@ -1294,13 +1206,6 @@ newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
12941206instance QueryParam FormUrlEncodedParam where
12951207 queryParam name mvalue =
12961208 FormUrlEncodedParam [(name, toQueryParam <$> mvalue)]
1297− queryParamToList (FormUrlEncodedParam p) = p
1298−
1299−-- | Use 'formToQuery'.
1300−--
1301−-- @since 3.11.0
1302−instance FromForm FormUrlEncodedParam where
1303− fromForm = Right . formToQuery
13041209
13051210-- | Multipart form data. Please consult the
13061211-- "Network.HTTP.Client.MultipartFormData" module for how to construct
@@ -1340,7 +1245,7 @@ instance HttpBody ReqBodyMultipart where
13401245-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
13411246--
13421247-- @since 0.2.0
1343−reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
1248+reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
13441249reqBodyMultipart parts = liftIO $ do
13451250 boundary <- LM.webkitBoundary
13461251 body <- LM.renderParts boundary parts
@@ -1368,6 +1273,9 @@ type family ProvidesBody body :: CanHaveBody where
13681273-- | This type function allows any HTTP body if method says it
13691274-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
13701275-- body option to use is 'NoReqBody'.
1276+--
1277+-- __Note__: users of GHC 8.0.1 and later will see a slightly more friendly
1278+-- error message when method does not allow a body and body is provided.
13711279type family
13721280 HttpBodyAllowed
13731281 (allowsBody :: CanHaveBody)
@@ -1380,8 +1288,8 @@ type family
13801288 TypeError
13811289 ('Text "This HTTP method does not allow attaching a request body.")
13821290
1383−instance (HttpBody body) => RequestComponent (Tagged "body" body) where
1384− getRequestMod (Tagged body) = Endo $ \x ->
1291+instance HttpBody body => RequestComponent (Womb "body" body) where
1292+ getRequestMod (Womb body) = Endo $ \x ->
13851293 x
13861294 { L.requestBody = getRequestBody body,
13871295 L.requestHeaders =
@@ -1410,8 +1318,8 @@ data Option (scheme :: Scheme)
14101318 = Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
14111319
14121320-- NOTE 'QueryText' is just [(Text, Maybe Text)], we keep it along with
1413−-- Request to avoid appending to an existing query string in request every
1414−-- time new parameter is added. The additional Maybe (L.Request -> IO
1321+-- Request to avoid appending to existing query string in request every
1322+-- time new parameter is added. Additional Maybe (L.Request -> IO
14151323-- L.Request) is a finalizer that will be applied after all other
14161324-- transformations. This is for authentication methods that sign requests
14171325-- based on data in Request.
@@ -1426,12 +1334,6 @@ instance Monoid (Option scheme) where
14261334 mempty = Option mempty Nothing
14271335 mappend = (<>)
14281336
1429−-- | Use 'formToQuery'.
1430−--
1431−-- @since 3.11.0
1432−instance FromForm (Option scheme) where
1433− fromForm = Right . formToQuery
1434−
14351337-- | A helper to create an 'Option' that modifies only collection of query
14361338-- parameters. This helper is not a part of the public API.
14371339withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
@@ -1450,7 +1352,7 @@ instance RequestComponent (Option scheme) where
14501352
14511353-- | Finalize given 'L.Request' by applying a finalizer from the given
14521354-- 'Option' (if it has any).
1453−finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
1355+finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
14541356finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
14551357
14561358----------------------------------------------------------------------------
@@ -1474,7 +1376,7 @@ infix 7 =:
14741376(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
14751377name =: value = queryParam name (pure value)
14761378
1477−-- | Construct a flag, that is, a valueless query parameter. For example, in
1379+-- | Construct a flag, that is, valueless query parameter. For example, in
14781380-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
14791381-- with a value:
14801382--
@@ -1483,27 +1385,9 @@ name =: value = queryParam name (pure value)
14831385-- This operator is defined in terms of 'queryParam':
14841386--
14851387-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1486−queryFlag :: (QueryParam param) => Text -> param
1388+queryFlag :: QueryParam param => Text -> param
14871389queryFlag name = queryParam name (Nothing :: Maybe ())
14881390
1489−-- | Construct query parameters from a 'ToForm' instance. This function
1490−-- produces the same query params as 'Form.urlEncodeAsFormStable'.
1491−--
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@).
1496−--
1497−-- @since 3.11.0
1498−formToQuery :: (QueryParam param, Monoid param, ToForm f) => f -> param
1499−formToQuery f = mconcat . fmap toParam . Form.toListStable $ toForm f
1500− where
1501− toParam (key, val) =
1502− queryParam key $
1503− if val == ""
1504− then Nothing
1505− else Just val
1506−
15071391-- | A type class for query-parameter-like things. The reason to have an
15081392-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
15091393-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
@@ -1513,17 +1397,11 @@ class QueryParam param where
15131397 -- 'Nothing', it won't be included at all (i.e. you create a flag this
15141398 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
15151399 -- method, because they are easier to read.
1516− queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
1517−
1518− -- | Get the query parameter names and values set by 'queryParam'.
1519− --
1520− -- @since 3.11.0
1521− queryParamToList :: param -> [(Text, Maybe Text)]
1400+ queryParam :: ToHttpApiData a => Text -> Maybe a -> param
15221401
15231402instance QueryParam (Option scheme) where
15241403 queryParam name mvalue =
15251404 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1526− queryParamToList (Option f _) = fst $ appEndo f ([], L.defaultRequest)
15271405
15281406----------------------------------------------------------------------------
15291407-- Request—Optional parameters—Headers
@@ -1547,14 +1425,6 @@ attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
15471425attachHeader name value x =
15481426 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
15491427
1550−-- | Same as 'header', but with redacted values on print.
1551−--
1552−-- @since 3.13.0
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}
1557−
15581428----------------------------------------------------------------------------
15591429-- Request—Optional parameters—Cookies
15601430
@@ -1696,7 +1566,7 @@ customAuth = Option mempty . pure
16961566
16971567-- | Specify the port to connect to explicitly. Normally, 'Url' you use
16981568-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1699−-- 'Option' allows us to choose an arbitrary port overwriting the defaults.
1569+-- 'Option' allows to choose an arbitrary port overwriting the defaults.
17001570port :: Int -> Option scheme
17011571port n = withRequest $ \x ->
17021572 x {L.port = n}
@@ -1711,8 +1581,8 @@ port n = withRequest $ \x ->
17111581--
17121582-- > decompress (const True)
17131583decompress ::
1714− -- | Predicate that is given MIME type, it returns 'True' when content
1715− -- should be decompressed on the fly.
1584+ -- | Predicate that is given MIME type, it
1585+ -- returns 'True' when content should be decompressed on the fly.
17161586 (ByteString -> Bool) ->
17171587 Option scheme
17181588decompress f = withRequest $ \x ->
@@ -1762,7 +1632,7 @@ ignoreResponse = Proxy
17621632newtype JsonResponse a = JsonResponse (L.Response a)
17631633 deriving (Show)
17641634
1765−instance (FromJSON a) => HttpResponse (JsonResponse a) where
1635+instance FromJSON a => HttpResponse (JsonResponse a) where
17661636 type HttpResponseBody (JsonResponse a) = a
17671637 toVanillaResponse (JsonResponse r) = r
17681638 getHttpResponse r = do
@@ -1814,7 +1684,7 @@ lbsResponse = Proxy
18141684----------------------------------------------------------------------------
18151685-- Helpers for response interpretations
18161686
1817−-- | Fetch beginning of the response and return it together with a new
1687+-- | Fetch beginning of response and return it together with new
18181688-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
18191689-- such.
18201690grabPreview ::
@@ -1878,14 +1748,14 @@ brReadN br n = go 0 id id
18781748
18791749-- | Get the response body.
18801750responseBody ::
1881− (HttpResponse response) =>
1751+ HttpResponse response =>
18821752 response ->
18831753 HttpResponseBody response
18841754responseBody = L.responseBody . toVanillaResponse
18851755
18861756-- | Get the response status code.
18871757responseStatusCode ::
1888− (HttpResponse response) =>
1758+ HttpResponse response =>
18891759 response ->
18901760 Int
18911761responseStatusCode =
@@ -1893,7 +1763,7 @@ responseStatusCode =
18931763
18941764-- | Get the response status message.
18951765responseStatusMessage ::
1896− (HttpResponse response) =>
1766+ HttpResponse response =>
18971767 response ->
18981768 ByteString
18991769responseStatusMessage =
@@ -1901,7 +1771,7 @@ responseStatusMessage =
19011771
19021772-- | Lookup a particular header from a response.
19031773responseHeader ::
1904− (HttpResponse response) =>
1774+ HttpResponse response =>
19051775 -- | Response interpretation
19061776 response ->
19071777 -- | Header to lookup
@@ -1913,7 +1783,7 @@ responseHeader r h =
19131783
19141784-- | Get the response 'L.CookieJar'.
19151785responseCookieJar ::
1916− (HttpResponse response) =>
1786+ HttpResponse response =>
19171787 response ->
19181788 L.CookieJar
19191789responseCookieJar = L.responseCookieJar . toVanillaResponse
@@ -1926,9 +1796,9 @@ responseCookieJar = L.responseCookieJar . toVanillaResponse
19261796-- To create a new response interpretation you just need to make your data
19271797-- type an instance of the 'HttpResponse' type class.
19281798
1929−-- | A type class for response interpretations. It allows us to describe how
1930−-- to consume the response from a @'L.Response' 'L.BodyReader'@ and produce
1931−-- the final result that is to be returned to the user.
1799+-- | A type class for response interpretations. It allows to describe how to
1800+-- consume response from a @'L.Response' 'L.BodyReader'@ and produce the
1801+-- final result that is to be returned to the user.
19321802class HttpResponse response where
19331803 -- | The associated type is the type of body that can be extracted from an
19341804 -- instance of 'HttpResponse'.
@@ -1967,16 +1837,6 @@ class HttpResponse response where
19671837 acceptHeader :: Proxy response -> Maybe ByteString
19681838 acceptHeader Proxy = Nothing
19691839
1970−-- | This instance has been added to make it easier to inspect 'L.Response'
1971−-- using Req's functions like 'responseStatusCode', 'responseStatusMessage',
1972−-- etc.
1973−--
1974−-- @since 3.12.0
1975−instance HttpResponse (L.Response ()) where
1976− type HttpResponseBody (L.Response ()) = ()
1977− toVanillaResponse = id
1978− getHttpResponse = return . void
1979−
19801840----------------------------------------------------------------------------
19811841-- Other
19821842
@@ -2002,7 +1862,7 @@ class RequestComponent a where
20021862-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
20031863-- which instance to use (i.e. the constraints are taken into account later,
20041864-- when instance is already chosen).
2005−newtype Tagged (tag :: Symbol) a = Tagged a
1865+newtype Womb (tag :: Symbol) a = Womb a
20061866
20071867-- | Exceptions that this library throws.
20081868data HttpException
@@ -2011,24 +1871,10 @@ data HttpException
20111871 | -- | A wrapper with Aeson-produced 'String' describing why decoding
20121872 -- failed
20131873 JsonHttpException String
2014− deriving (Show, Generic)
1874+ deriving (Show, Typeable, Generic)
20151875
20161876instance Exception HttpException
20171877
2018−-- | Return 'Just' if the given 'HttpException' is wrapping a http-client's
2019−-- 'L.StatusCodeException'. Otherwise, return 'Nothing'.
2020−--
2021−-- @since 3.12.0
2022−isStatusCodeException :: HttpException -> Maybe (L.Response ())
2023−isStatusCodeException
2024− ( VanillaHttpException
2025− ( L.HttpExceptionRequest
2026− _
2027− (L.StatusCodeException r _)
2028− )
2029− ) = Just r
2030−isStatusCodeException _ = Nothing
2031−
20321878-- | A simple type isomorphic to 'Bool' that we only have for better error
20331879-- messages. We use it as a kind and its data constructors as type-level
20341880-- tags.
@@ -2048,4 +1894,4 @@ data Scheme
20481894 Http
20491895 | -- | HTTPS
20501896 Https
2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
1897+ deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)
README.md+124−28
@@ -4,8 +4,10 @@
44[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
55[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
66[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)
7−[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)
7+![CI](https://github.com/mrkkrp/req/workflows/CI/badge.svg?branch=master)
88
9+* [Motivation and Req vs other libraries](#motivation-and-req-vs-other-libraries)
10+* [Unsolved problems](#unsolved-problems)
911* [Related packages](#related-packages)
1012* [Blog posts](#blog-posts)
1113* [Contribution](#contribution)
@@ -41,33 +43,49 @@ main = runReq defaultHttpConfig $ do
4143 liftIO $ print (responseBody r :: Value)
4244```
4345
44−Req is an HTTP client library that attempts to be easy-to-use, type-safe,
45−and expandable.
46−
47−“Easy-to-use” means that the library is designed to be beginner-friendly so
48−it's simple to add to your monad stack, intuitive to work with,
49−well-documented, and does not get in your way. Doing HTTP requests is a
50−common task and a Haskell library for this should be approachable and clear
51−to beginners, thus certain compromises were made. For example, one cannot
52−currently modify `ManagerSettings` of the default manager because the
53−library always uses the same implicit global manager for simplicity and
54−maximal connection sharing. There is a way to use your own manager with
55−different settings, but it requires more typing.
56−
57−“Type-safe” means that the library tries to eliminate certain classes of
58−errors. For example, we have correct-by-construction URLs; it is guaranteed
59−that the user does not send the request body when using methods like GET or
60−OPTIONS, and the amount of implicit assumptions is minimized by making the
61−user specify their intentions in an explicit form. For example, it's not
62−possible to avoid specifying the body or the method of a request.
46+Req is an easy-to-use, type-safe, expandable, high-level HTTP client library
47+that just works without any fooling around.
48+
49+What does the phrase “easy-to-use” mean? It means that the library is
50+designed to be beginner-friendly so it's simple to add to your monad stack,
51+intuitive to work with, well-documented, and does not get in your way. Doing
52+HTTP requests is a common task and Haskell library for this should be very
53+approachable and clear to beginners, thus certain compromises were made. For
54+example, one cannot currently modify `ManagerSettings` of the default
55+manager because the library always uses the same implicit global manager for
56+simplicity and maximal connection sharing. There is a way to use your own
57+manager with different settings, but it requires a bit more typing.
58+
59+“Type-safe” means that the library is protective and eliminates certain
60+classes of errors. For example, we have correct-by-construction URLs, it's
61+guaranteed that the user does not send the request body when using methods
62+like GET or OPTIONS, and the amount of implicit assumptions is minimized by
63+making the user specify his/her intentions in an explicit form (for example,
64+it's not possible to avoid specifying the body or method of request).
6365Authentication methods that assume HTTPS force the user to use HTTPS at the
64−type level.
65−
66−“Expandable” refers to the ability to create new components without having
67−to resort to hacking. For example, it's possible to define your own HTTP
68−methods, create new ways to construct the body of a request, create new
69−authorization options, perform a request in a different way, and create your
70−own methods to parse a response.
66+type level. The library also carefully hides underlying types from the
67+lower-level `http-client` package because those types are not safe enough
68+(for example `Request` is an instance of `IsString` and, if it's malformed,
69+it will blow up at run-time).
70+
71+“Expandable” refers to the ability to create new components for dealing with
72+HTTP without having to resort to ugly hacking. For example, it's possible to
73+define your own HTTP methods, create new ways to construct the body of a
74+request, create new authorization options, perform a request in a different
75+way, and create your own methods to parse and represent a response. As the
76+user extends the library to satisfy his/her special needs, the new solutions
77+will work just like the built-ins. However, all of the common cases are also
78+covered by the library out-of-the-box.
79+
80+“High-level” means that there are less details to worry about. The library
81+is a result of my experiences as a Haskell consultant. Working for several
82+clients, who had very different projects, showed me that the library should
83+adapt easily to any particular style of writing Haskell applications. For
84+example, some people prefer throwing exceptions, while others are concerned
85+with purity. Just define `handleHttpException` accordingly when making your
86+monad instance of `MonadHttp` and it will play together seamlessly. Finally,
87+the library cuts down boilerplate considerably, and helps you write concise,
88+easy to read, and maintainable code.
7189
7290The library uses the following mature packages under the hood to guarantee
7391you the best experience:
@@ -77,11 +95,89 @@ you the best experience:
7795* [`http-client-tls`](https://hackage.haskell.org/package/http-client-tls)—TLS
7896 (HTTPS) support for `http-client`.
7997
80−It is important to note that since we leverage well-known libraries that the
98+It's important to note that since we leverage well-known libraries that the
8199whole Haskell ecosystem uses, there is no risk in using Req. The machinery
82100for performing requests is the same as with `http-conduit` and Wreq. The
83101only difference is the API.
84102
103+## Motivation and Req vs other libraries
104+
105+*This section is my opinion and it contains criticisms of other well-known
106+libraries. If you're a user/fan of one of these libraries, please remember
107+not to react aggressively and respect the fact that I may have different
108+views on API design from yours.*
109+
110+I have spent time to write the library because sending HTTP requests is a
111+common need, but there is no high-level library for that in Haskell that I
112+could use with pleasure. I'll explain why.
113+
114+First of all, there is `http-client` and `http-client-tls`. They just work.
115+I have no issues with the libraries except that they are too low-level for
116+my taste. Indeed, even the docs say that they are low-level and “intended as
117+a base layer for more user-friendly packages”. This is exactly how I use
118+them in Req, as base level. Req is nothing but a different API to
119+`http-client`, so it only works because of the hard work put into
120+`http-client`.
121+
122+`http-conduit` definitely has its place. For one thing it allows you to
123+stream request and response bodies in constant memory, what other library
124+allows you to do that? On the other hand if you take a look at
125+`Network.HTTP.Simple`, then although it's said that it's a “higher level
126+API”, it's mostly the same as vanilla `http-client` in spirit/approach and
127+just adds `conduit`-powered functions to perform requests and allows to use
128+global implicit `Manager` (Req does the same). If I tried to frame what
129+exactly I don't like about `http-conduit` in words, then it would be “the
130+way requests are constructed”. You *set* parameters instead of *being
131+forced* to declare necessary bits and *being allowed* to declare optional
132+bits in a way that their combination is valid. Also, with `http-conduit` you
133+parse request from a string without the protection of TH that otherwise
134+saves the day as in Yesod.
135+
136+Then there is Wreq. `wreq` [doesn't see much development
137+lately](https://github.com/bos/wreq/issues/93). `wreq` is by itself a weird
138+library, IMO. You have functions per method—not very good, as there may be
139+new methods, like PATCH which is not new but still missing (well, you have
140+`customMethod`, but what is the point of having per-method functions if you
141+have a more general way to use any method? you should be able to just insert
142+methods in the “argument slot” of `customMethod` and end up with a more
143+general solution). Now, every method function has a companion that takes
144+`Options` (like you have `get` and `getWith`). Why the duplication? Where is
145+generality and flexibility? This is not all though, because you cannot
146+really use `get` you see in the main module, because you want to have
147+connection sharing. Wreq's author does not take the gift of automatic
148+connection re-use `Manager` from `http-client` provides, he invents the
149+whole new thing of “sessions”. Only inside a session your connections will
150+be shared and re-used. However with the session stuff you have yet another
151+set of per-method functions like `get` and `getWith`—these are different
152+ones, to be used with sessions! Now if you have a multi-threaded app, here
153+is a surprise for you: you can't share connections between threads as
154+connections are shared only inside of the `withSession` friend and “session
155+will no longer be valid after that function returns”. There are valid uses
156+for sessions, but the point is that they are just too inconvenient for
157+common tasks.
158+
159+I used `servant-client` a couple of times but the amount of boilerplate it
160+requires is frightening. If you have several query parameters, and you use
161+just one of them, you'll have to pass lots of `Nothing`s.
162+
163+## Unsolved problems
164+
165+AWS request signing is problematic because request body can be in the form
166+of an action to execute (and all that “popper” stuff for streaming), not
167+just a `ByteString` and so getting its digest (hash) is not trivial without
168+running the action and consuming body in its entirety before the request in
169+made. In Wreq the author chose to just use `error` when body is not a
170+(strict or lazy) `ByteString`. Maybe it's OK for Wreq, but I don't consider
171+this a proper solution for Req as we support full variety of body options.
172+For example, what if I want to upload 1 Gb file to S3? I want to stream it
173+in constant memory but at the same time I need to calculate its hash before
174+I start streaming. One solution to the problem seems to be in taking the
175+hash explicitly (as an argument of the hypothetical `awsAuth`) and making it
176+a responsibility of the user to calculate the hash correctly. I don't like
177+this because it's not user-friendly. So the question stays open, for now
178+there is no AWS signing functionality provided out-of-the-box. The best
179+solution for talking to AWS is the `amazonka` package so far.
180+
85181## Related packages
86182
87183The following packages are designed to be used with Req:
Setup.hsnew file+6
@@ -0,0 +1,6 @@
1+module Main (main) where
2+
3+import Distribution.Simple
4+
5+main :: IO ()
6+main = defaultMain
cabal.projectdeleted−4
@@ -1,4 +0,0 @@
1−packages: .
2−tests: True
3−benchmarks: True
4−constraints: req +dev
httpbin-tests/Network/HTTP/ReqSpec.hs+70−107
@@ -1,6 +1,6 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DataKinds #-}
23{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE LambdaCase #-}
44{-# LANGUAGE OverloadedStrings #-}
55{-# LANGUAGE RankNTypes #-}
66{-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -8,28 +8,29 @@
88module Network.HTTP.ReqSpec (spec) where
99
1010import Control.Exception
11−import Control.Monad (forM_)
11+import Control.Monad.Reader
1212import Control.Monad.Trans.Control
1313import Data.Aeson (ToJSON (..), Value (..), object, (.=))
14−import Data.Aeson qualified as A
15−import Data.Aeson.KeyMap qualified as Aeson.KeyMap
16−import Data.ByteString qualified as B
17−import Data.ByteString.Lazy qualified as BL
18−import Data.Functor.Identity (runIdentity)
19−import Data.Maybe (fromJust)
14+import qualified Data.Aeson as A
15+import qualified Data.ByteString as B
16+import qualified Data.ByteString.Lazy as BL
17+import qualified Data.HashMap.Strict as HM
2018import Data.Proxy
2119import Data.Text (Text)
22−import Data.Text qualified as T
23−import Data.Text.Encoding qualified as T
24−import Data.Text.IO qualified as TIO
25−import Network.HTTP.Client qualified as L
26−import Network.HTTP.Client.MultipartFormData qualified as LM
27−import Network.HTTP.Req hiding (req)
28−import Network.HTTP.Req qualified as Req
29−import Network.HTTP.Types qualified as Y
20+import qualified Data.Text as T
21+import qualified Data.Text.Encoding as T
22+import qualified Data.Text.IO as TIO
23+import qualified Network.HTTP.Client as L
24+import qualified Network.HTTP.Client.MultipartFormData as LM
25+import Network.HTTP.Req
26+import qualified Network.HTTP.Types as Y
3027import Test.Hspec
3128import Test.QuickCheck
3229
30+#if !MIN_VERSION_base(4,13,0)
31+import Data.Semigroup ((<>))
32+#endif
33+
3334spec :: Spec
3435spec = do
3536 describe "exception throwing on non-2xx status codes" $
@@ -50,11 +51,6 @@ spec = do
5051 blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
5152 `shouldThrow` anyException
5253
53− describe "isStatusCodeException" $
54− it "extracts non-2xx response" $
55− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
56− `shouldThrow` selector404ByStatusCodeException
57−
5854 describe "receiving user-agent header back" $
5955 it "works" $ do
6056 r <-
@@ -85,7 +81,8 @@ spec = do
8581 .= object
8682 [ "Accept-Encoding" .= ("gzip" :: Text),
8783 "Foo" .= ("bar" :: Text),
88− "Baz" .= ("quux" :: Text)
84+ "Baz" .= ("quux" :: Text),
85+ "Host" .= ("httpbin.org" :: Text)
8986 ]
9087 ]
9188 responseStatusCode r `shouldBe` 200
@@ -97,10 +94,11 @@ spec = do
9794 (stripFunnyHeaders . stripOrigin) (responseBody r)
9895 `shouldBe` object
9996 [ "args" .= emptyObject,
100− "url" .= ("http://localhost:1234/get" :: Text),
97+ "url" .= ("https://httpbin.org/get" :: Text),
10198 "headers"
10299 .= object
103− [ "Accept-Encoding" .= ("gzip" :: Text)
100+ [ "Accept-Encoding" .= ("gzip" :: Text),
101+ "Host" .= ("httpbin.org" :: Text)
104102 ]
105103 ]
106104 responseHeader r "Content-Type" `shouldBe` return "application/json"
@@ -117,11 +115,12 @@ spec = do
117115 [ "args" .= emptyObject,
118116 "json" .= text,
119117 "data" .= reflected,
120− "url" .= ("http://localhost:1234/post" :: Text),
118+ "url" .= ("https://httpbin.org/post" :: Text),
121119 "headers"
122120 .= object
123121 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
124122 "Accept-Encoding" .= ("gzip" :: Text),
123+ "Host" .= ("httpbin.org" :: Text),
125124 "Content-Length" .= show (T.length reflected)
126125 ],
127126 "files" .= emptyObject,
@@ -139,17 +138,18 @@ spec = do
139138 LM.partBS "bar" "bar data!"
140139 ]
141140 r <- req POST (httpbin /: "post") body jsonResponse mempty
142− let contentType = fromJust (getRequestContentType body)
141+ let Just contentType = getRequestContentType body
143142 (stripFunnyHeaders . stripOrigin) (responseBody r)
144143 `shouldBe` object
145144 [ "args" .= emptyObject,
146145 "json" .= Null,
147146 "data" .= ("" :: Text),
148− "url" .= ("http://localhost:1234/post" :: Text),
147+ "url" .= ("https://httpbin.org/post" :: Text),
149148 "headers"
150149 .= object
151150 [ "Content-Type" .= T.decodeUtf8 contentType,
152151 "Accept-Encoding" .= ("gzip" :: Text),
152+ "Host" .= ("httpbin.org" :: Text),
153153 "Content-Length" .= ("242" :: Text)
154154 ],
155155 "files" .= emptyObject,
@@ -174,10 +174,11 @@ spec = do
174174 [ "args" .= emptyObject,
175175 "json" .= Null,
176176 "data" .= contents,
177− "url" .= ("http://localhost:1234/patch" :: Text),
177+ "url" .= ("https://httpbin.org/patch" :: Text),
178178 "headers"
179179 .= object
180180 [ "Accept-Encoding" .= ("gzip" :: Text),
181+ "Host" .= ("httpbin.org" :: Text),
181182 "Content-Length" .= show (T.length contents)
182183 ],
183184 "files" .= emptyObject,
@@ -199,11 +200,12 @@ spec = do
199200 [ "args" .= emptyObject,
200201 "json" .= Null,
201202 "data" .= ("" :: Text),
202− "url" .= ("http://localhost:1234/put" :: Text),
203+ "url" .= ("https://httpbin.org/put" :: Text),
203204 "headers"
204205 .= object
205206 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
206207 "Accept-Encoding" .= ("gzip" :: Text),
208+ "Host" .= ("httpbin.org" :: Text),
207209 "Content-Length" .= ("18" :: Text)
208210 ],
209211 "files" .= emptyObject,
@@ -261,17 +263,21 @@ spec = do
261263 -- TODO /response-headers
262264 -- TODO /redirect
263265
264− describe "redirects" $
265− it "follows redirects" $ do
266− r <-
267− req
268− GET
269− (httpbin /: "redirect-to")
270− NoReqBody
271− ignoreResponse
272− ("url" =: ("https://httpbin.org" :: Text))
273− responseStatusCode r `shouldBe` 200
274− responseStatusMessage r `shouldBe` "OK"
266+ -- FIXME Redirects test is temporarily disabled due to
267+ --
268+ -- https://github.com/postmanlabs/httpbin/issues/617
269+
270+ -- describe "redirects" $
271+ -- it "follows redirects" $ do
272+ -- r <-
273+ -- req
274+ -- GET
275+ -- (httpbin /: "redirect-to")
276+ -- NoReqBody
277+ -- ignoreResponse
278+ -- ("url" =: ("https://httpbin.org" :: Text))
279+ -- responseStatusCode r `shouldBe` 200
280+ -- responseStatusMessage r `shouldBe` "OK"
275281
276282 -- TODO /relative-redicet
277283 -- TODO /absolute-redirect
@@ -301,7 +307,7 @@ spec = do
301307 (httpbin /: "basic-auth" /~ user /~ password)
302308 NoReqBody
303309 ignoreResponse
304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
310+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
305311 responseStatusCode r `shouldBe` 200
306312 responseStatusMessage r `shouldBe` "OK"
307313
@@ -388,80 +394,44 @@ instance MonadHttp IO where
388394----------------------------------------------------------------------------
389395-- Helpers
390396
391−-- | Run a request with such settings that it does not signal errors.
397+-- | Run request with such settings that it does not signal error on adverse
398+-- response status codes.
392399prepareForShit :: Req a -> IO a
393400prepareForShit = runReq defaultHttpConfig {httpConfigCheckResponse = noNoise}
394401 where
395402 noNoise _ _ _ = Nothing
396403
397−-- | Run a request with such settings that it throws on any response.
404+-- | Run request with such settings that it throws on any response.
398405blindlyThrowing :: Req a -> IO a
399406blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
400407 where
401408 doit _ _ = error "Oops!"
402409
403410-- | 'Url' representing <https://httpbin.org>.
404−httpbin :: Url 'Http
405−httpbin = http "localhost"
406−
407−req ::
408− ( MonadHttp m,
409− HttpMethod method,
410− HttpBody body,
411− HttpResponse response,
412− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
413− ) =>
414− method ->
415− Url scheme ->
416− body ->
417− Proxy response ->
418− Option scheme ->
419− m response
420−req method url body responseProxy options =
421− Req.req method url body responseProxy (options <> defaultOptions)
422−
423−-- | Options to apply by default.
424−defaultOptions :: Option scheme
425−defaultOptions = port 1234
411+httpbin :: Url 'Https
412+httpbin = https "httpbin.org"
426413
427414-- | Remove “origin” field from JSON value. Origin may change, we don't want
428415-- to depend on that.
429416stripOrigin :: Value -> Value
430−stripOrigin (Object m) = Object (Aeson.KeyMap.delete "origin" m)
417+stripOrigin (Object m) = Object (HM.delete "origin" m)
431418stripOrigin value = value
432419
433420-- | Remove funny headers that might break the tests.
434421stripFunnyHeaders :: Value -> Value
435−stripFunnyHeaders = \case
436− Object m ->
437− Object
438− ( runIdentity
439− ( Aeson.KeyMap.alterF
440− (pure . fmap stripFunnyHeaders')
441− "headers"
442− m
443− )
444− )
445− value -> value
446−
447−-- | Similar to 'stripFunnyHeaders', but acts directly on the argument
448−-- without trying to access its "headers" field.
449−stripFunnyHeaders' :: Value -> Value
450−stripFunnyHeaders' = \case
451− Object p ->
452− Object $
453− Aeson.KeyMap.filterWithKey
454− (\k _ -> k `elem` whitelistedHeaders)
455− p
456− value -> value
457− where
458− whitelistedHeaders =
459− [ "Content-Type",
460− "Accept-Encoding",
461− "Content-Length",
462− "Foo",
463− "Baz"
464− ]
422+stripFunnyHeaders (Object m) =
423+ let f (Object p) = Object $ HM.filterWithKey (\k _ -> k `elem` hs) p
424+ f value = value
425+ hs =
426+ [ "Content-Type",
427+ "Accept-Encoding",
428+ "Host",
429+ "Content-Length",
430+ "Foo",
431+ "Baz"
432+ ]
433+ in Object (HM.adjust f "headers" m)
434+stripFunnyHeaders value = value
465435
466436-- | This is a complete test case that makes use of <https://httpbin.org> to
467437-- get various response status codes.
@@ -491,19 +461,12 @@ selector404
491461 L.responseStatus response == Y.status404 && not (B.null chunk)
492462selector404 _ = False
493463
494−-- | Same as 'selector404' except that it uses 'isStatusCodeException'.
495−selector404ByStatusCodeException :: HttpException -> Bool
496−selector404ByStatusCodeException e =
497− case isStatusCodeException e of
498− Nothing -> False
499− Just r -> responseStatusCode r == 404
500−
501−-- | The empty JSON 'Object'.
464+-- | Empty JSON 'Object'.
502465emptyObject :: Value
503−emptyObject = Object Aeson.KeyMap.empty
466+emptyObject = Object HM.empty
504467
505−-- | Get a rendered JSON value as 'Text'.
506−reflectJSON :: (ToJSON a) => a -> Text
468+-- | Get rendered JSON value as 'Text'.
469+reflectJSON :: ToJSON a => a -> Text
507470reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
508471
509472-- | Clarify to the type checker that the inner computation is in the 'IO'
pure-tests/Network/HTTP/ReqSpec.hsmode 100644 → 100755+34−58
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE DataKinds #-}
23{-# LANGUAGE DeriveGeneric #-}
34{-# LANGUAGE FlexibleInstances #-}
@@ -13,41 +14,43 @@
1314
1415module Network.HTTP.ReqSpec (spec) where
1516
16−import Blaze.ByteString.Builder qualified as BB
17+import qualified Blaze.ByteString.Builder as BB
1718import Control.Exception (throwIO)
1819import Control.Monad
1920import Control.Retry
2021import Data.Aeson (ToJSON (..))
21−import Data.Aeson qualified as A
22+import qualified Data.Aeson as A
2223import Data.ByteString (ByteString)
23−import Data.ByteString qualified as B
24−import Data.ByteString.Char8 qualified as B8
25−import Data.ByteString.Lazy qualified as BL
26−import Data.CaseInsensitive qualified as CI
24+import qualified Data.ByteString as B
25+import qualified Data.ByteString.Char8 as B8
26+import qualified Data.ByteString.Lazy as BL
27+import qualified Data.CaseInsensitive as CI
2728import Data.Either (isRight)
28−import Data.List.NonEmpty qualified as NE
29+import qualified Data.List.NonEmpty as NE
2930import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)
3031import Data.Proxy
3132import Data.Text (Text)
32−import Data.Text qualified as T
33−import Data.Text.Encoding qualified as T
33+import qualified Data.Text as T
34+import qualified Data.Text.Encoding as T
3435import Data.Time
3536import Data.Typeable (Typeable, eqT)
36−import GHC.Exts (IsList (..))
3737import GHC.Generics
38−import Language.Haskell.TH qualified as TH
39−import Language.Haskell.TH.Quote qualified as TH
40−import Network.HTTP.Client qualified as L
38+import qualified Language.Haskell.TH as TH
39+import qualified Language.Haskell.TH.Quote as TH
40+import qualified Network.HTTP.Client as L
4141import Network.HTTP.Req
42−import Network.HTTP.Types qualified as Y
43−import Network.HTTP.Types.Header qualified as Y
42+import qualified Network.HTTP.Types as Y
43+import qualified Network.HTTP.Types.Header as Y
4444import Test.Hspec
4545import Test.Hspec.Core.Spec (SpecM)
4646import Test.QuickCheck
4747import Text.URI (URI)
48−import Text.URI qualified as URI
49−import Text.URI.QQ qualified as QQ
50−import Web.FormUrlEncoded qualified as F
48+import qualified Text.URI as URI
49+import qualified Text.URI.QQ as QQ
50+
51+#if !MIN_VERSION_base(4,13,0)
52+import Data.Semigroup ((<>))
53+#endif
5154
5255spec :: Spec
5356spec = do
@@ -161,13 +164,11 @@ spec = do
161164 let uriHttp = uri' {URI.uriScheme = Just [QQ.scheme|http|]}
162165 uriHttps = uri' {URI.uriScheme = Just [QQ.scheme|https|]}
163166 requestHttp <-
164− case fromJust (useURI uriHttp) of
165− Left (url', options) -> req_ GET url' NoReqBody options
166− _ -> error "(useURI uriHttp) should have returned Left"
167+ let Left (url', options) = fromJust (useURI uriHttp)
168+ in req_ GET url' NoReqBody options
167169 requestHttps <-
168− case fromJust (useURI uriHttps) of
169− Right (url', options) -> req_ GET url' NoReqBody options
170− _ -> error "(useURI uriHttps) should have returned Right"
170+ let Right (url', options) = fromJust (useURI uriHttps)
171+ in req_ GET url' NoReqBody options
171172 L.host requestHttp `shouldBe` uriHost uriHttp
172173 L.host requestHttps `shouldBe` uriHost uriHttps
173174 L.port requestHttp `shouldBe` uriPort 80 uriHttp
@@ -237,19 +238,6 @@ spec = do
237238 L.RequestBodyLBS x -> x `shouldBe` renderQuery params
238239 _ -> expectationFailure "Wrong request body constructor."
239240
240− describe "query params" $ do
241− describe "FormUrlEncodedParam" $ do
242− describe "formToQuery" $ do
243− it "should produce the same parameters as F.urlEncodeFormStable" $
244− property $ \form -> do
245− request <- req_ POST url (ReqBodyUrlEnc $ formToQuery form) mempty
246− case L.requestBody request of
247− L.RequestBodyLBS x -> x `shouldBe` F.urlEncodeFormStable form
248− _ -> expectationFailure "Wrong request body constructor"
249− specParamToList (Proxy :: Proxy FormUrlEncodedParam)
250− describe "Option" $ do
251− specParamToList (Proxy :: Proxy (Option 'Http))
252−
253241 describe "optional parameters" $ do
254242 describe "header" $ do
255243 it "sets specified header value" $
@@ -278,7 +266,11 @@ spec = do
278266 it "cookie jar is set without modifications" $
279267 property $ \cjar -> do
280268 request <- req_ GET url NoReqBody (cookieJar cjar)
269+#if MIN_VERSION_http_client(0,7,0)
281270 L.cookieJar request `shouldSatisfy` (maybe False (L.equalCookieJar cjar))
271+#else
272+ L.cookieJar request `shouldBe` Just cjar
273+#endif
282274 describe "basicAuth" $ do
283275 it "sets Authorization header to correct value" $
284276 property $ \username password -> do
@@ -413,7 +405,7 @@ spec = do
413405 -- 'Https, Option _) type checks, so we can catch if the type of scheme
414406 -- is unspecified.
415407 let testTypeOfQuoterResult ::
416− forall a s. (Typeable a) => (a, Option s) -> Bool
408+ forall a s. Typeable a => (a, Option s) -> Bool
417409 testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)
418410 in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]
419411 it "doesn't work for invalid urls" $
@@ -503,9 +495,6 @@ instance Arbitrary Day where
503495instance Arbitrary DiffTime where
504496 arbitrary = secondsToDiffTime <$> arbitrary
505497
506−instance Arbitrary F.Form where
507− arbitrary = (F.Form . fromList) <$> arbitrary
508−
509498----------------------------------------------------------------------------
510499-- Helper types
511500
@@ -573,14 +562,13 @@ uriPort def uri =
573562 maybe def (fromIntegral) $
574563 either (const Nothing) Just (URI.uriAuthority uri) >>= URI.authPort
575564
576−-- | Get the path from a 'URI'.
565+-- | Get path from 'URI'.
577566uriPath :: URI -> ByteString
578567uriPath uri = fromMaybe "" $ do
579− (trailingSlash, xs) <- URI.uriPath uri
580− let pref = (encodePathPieces . fmap URI.unRText . NE.toList) xs
581− return $ if trailingSlash then pref <> "/" else pref
568+ (_, xs) <- URI.uriPath uri
569+ (return . encodePathPieces . fmap URI.unRText . NE.toList) xs
582570
583−-- | Get the query string from a 'URI'.
571+-- | Get query string from 'URI'.
584572uriQuery :: URI -> ByteString
585573uriQuery uri = do
586574 let liftQueryParam = \case
@@ -618,15 +606,3 @@ basicProxyAuthHeader :: ByteString -> ByteString -> ByteString
618606basicProxyAuthHeader username password =
619607 fromJust . lookup Y.hProxyAuthorization . L.requestHeaders $
620608 L.applyBasicProxyAuth username password L.defaultRequest
621−
622−-- | Spec about 'paramToList' for the type @p@.
623−specParamToList :: (QueryParam p, Monoid p) => Proxy p -> Spec
624−specParamToList typeProxy = do
625− describe "paramToList" $ do
626− it "should reproduce the parameters given by queryParam" $
627− property $ \(QueryParams params) -> do
628− let queryParam0 =
629− (mconcat $ fmap (uncurry queryParam) params)
630− `asProxyTypeOf` typeProxy
631− got = queryParamToList queryParam0
632− got `shouldBe` params
req.cabal+70−66
@@ -1,15 +1,19 @@
1−cabal-version: 2.4
1+cabal-version: 1.18
22name: req
3−version: 3.13.4
4−license: BSD-3-Clause
3+version: 3.6.0
4+license: BSD3
55license-file: LICENSE.md
66maintainer: Mark Karpov <markkarpov92@gmail.com>
77author: Mark Karpov <markkarpov92@gmail.com>
8−tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1
8+tested-with: ghc ==8.6.5 ghc ==8.8.4 ghc ==8.10.2
99homepage: https://github.com/mrkkrp/req
1010bug-reports: https://github.com/mrkkrp/req/issues
11−synopsis: HTTP client library
12−description: HTTP client library.
11+synopsis:
12+ Easy-to-use, type-safe, expandable, high-level HTTP client library
13+
14+description:
15+ Easy-to-use, type-safe, expandable, high-level HTTP client library.
16+
1317category: Network, Web
1418build-type: Simple
1519data-files:
@@ -31,97 +35,97 @@ flag dev
3135
3236library
3337 exposed-modules: Network.HTTP.Req
34− default-language: GHC2021
38+ default-language: Haskell2010
3539 build-depends:
36− aeson >=0.9 && <3,
37− authenticate-oauth >=1.5 && <1.8,
38− base >=4.15 && <5,
40+ aeson >=0.9 && <1.6,
41+ authenticate-oauth >=1.5 && <1.7,
42+ base >=4.12 && <5.0,
3943 blaze-builder >=0.3 && <0.5,
40− bytestring >=0.10.8 && <0.13,
44+ bytestring >=0.10.8 && <0.11,
4145 case-insensitive >=0.2 && <1.3,
42− containers >=0.5 && <0.8,
43− crypton-connection >=0.4.2 && <0.5,
44− data-default-class >=0.2.0.0,
46+ connection >=0.2.2 && <0.4,
4547 exceptions >=0.6 && <0.11,
46− http-api-data >=0.2 && <0.7,
47− http-client >=0.7.13.1 && <0.8,
48+ http-api-data >=0.2 && <0.5,
49+ http-client >=0.5 && <0.8,
4850 http-client-tls >=0.3.2 && <0.4,
49− http-types >=0.8 && <10,
51+ http-types >=0.8 && <10.0,
5052 modern-uri >=0.3 && <0.4,
5153 monad-control >=1.0 && <1.1,
5254 mtl >=2.0 && <3.0,
53− retry >=0.8 && <0.10,
54− template-haskell >=2.19 && <2.23,
55− text >=0.2 && <2.2,
56− transformers >=0.5.3.0 && <0.7,
57− transformers-base,
55+ retry >=0.8 && <0.9,
56+ template-haskell >=2.14 && <2.17,
57+ text >=0.2 && <1.3,
58+ time >=1.2 && <1.10,
59+ transformers >=0.4 && <0.6,
60+ transformers-base -any,
5861 unliftio-core >=0.1.1 && <0.3
5962
6063 if flag(dev)
61− ghc-options:
62− -Wall -Werror -Wpartial-fields -Wunused-packages
63− -Wno-unused-imports
64+ ghc-options: -O0 -Wall -Werror
6465
6566 else
6667 ghc-options: -O2 -Wall
6768
69+ if flag(dev)
70+ ghc-options:
71+ -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns
72+ -Wnoncanonical-monad-instances
73+
6874test-suite pure-tests
69− type: exitcode-stdio-1.0
70− main-is: Spec.hs
71− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
72− hs-source-dirs: pure-tests
73− other-modules: Network.HTTP.ReqSpec
74− default-language: GHC2021
75+ type: exitcode-stdio-1.0
76+ main-is: Spec.hs
77+ build-tools: hspec-discover >=2.0 && <3.0
78+ hs-source-dirs: pure-tests
79+ other-modules: Network.HTTP.ReqSpec
80+ default-language: Haskell2010
7581 build-depends:
76− QuickCheck >=2.7 && <3,
77− aeson >=0.9 && <3,
78− base >=4.15 && <5.0,
82+ QuickCheck >=2.7 && <3.0,
83+ aeson >=0.9 && <1.6,
84+ base >=4.12 && <5.0,
7985 blaze-builder >=0.3 && <0.5,
80− bytestring >=0.10.8 && <0.13,
86+ bytestring >=0.10.8 && <0.11,
8187 case-insensitive >=0.2 && <1.3,
82− hspec >=2.0 && <3,
83− hspec-core >=2.0 && <3,
84− http-api-data >=0.2 && <0.7,
85− http-client >=0.7 && <0.8,
86− http-types >=0.8 && <10,
88+ hspec >=2.0 && <3.0,
89+ hspec-core >=2.0 && <3.0,
90+ http-client >=0.5 && <0.8,
91+ http-types >=0.8 && <10.0,
8792 modern-uri >=0.3 && <0.4,
88− req,
89− retry >=0.8 && <0.10,
90− template-haskell >=2.19 && <2.23,
91− text >=0.2 && <2.2,
92− time >=1.2 && <1.15
93+ mtl >=2.0 && <3.0,
94+ req -any,
95+ retry >=0.8 && <0.9,
96+ template-haskell >=2.14 && <2.17,
97+ text >=0.2 && <1.3,
98+ time >=1.2 && <1.10
9399
94100 if flag(dev)
95− ghc-options:
96− -Wall -Werror -Wredundant-constraints -Wpartial-fields
97− -Wunused-packages
101+ ghc-options: -O0 -Wall -Werror
98102
99103 else
100104 ghc-options: -O2 -Wall
101105
102106test-suite httpbin-tests
103− type: exitcode-stdio-1.0
104− main-is: Spec.hs
105− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
106− hs-source-dirs: httpbin-tests
107− other-modules: Network.HTTP.ReqSpec
108− default-language: GHC2021
107+ type: exitcode-stdio-1.0
108+ main-is: Spec.hs
109+ build-tools: hspec-discover >=2.0 && <3.0
110+ hs-source-dirs: httpbin-tests
111+ other-modules: Network.HTTP.ReqSpec
112+ default-language: Haskell2010
109113 build-depends:
110− QuickCheck >=2.7 && <3,
111− aeson >=2 && <3,
112− base >=4.15 && <5,
113− bytestring >=0.10.8 && <0.13,
114+ QuickCheck >=2.7 && <3.0,
115+ aeson >=0.9 && <1.6,
116+ base >=4.12 && <5.0,
117+ bytestring >=0.10.8 && <0.11,
114118 hspec >=2.0 && <3.0,
115− http-client >=0.7 && <0.8,
116− http-types >=0.8 && <10,
119+ http-client >=0.5 && <0.8,
120+ http-types >=0.8 && <10.0,
117121 monad-control >=1.0 && <1.1,
118− req,
119− text >=0.2 && <2.2
122+ mtl >=2.0 && <3.0,
123+ req -any,
124+ text >=0.2 && <1.3,
125+ unordered-containers >=0.2.5 && <0.3
120126
121127 if flag(dev)
122− ghc-options:
123− -Wall -Werror -Wredundant-constraints -Wpartial-fields
124− -Wunused-packages
128+ ghc-options: -O0 -Wall -Werror
125129
126130 else
127− buildable: False
131+ ghc-options: -O2 -Wall