master..95f6a21 · typeable/req

git.iko.soy/typeable/req

11 files changed+203−266

unifiedsplit

.github/dependabot.yml−6 .github/workflows/ci.yaml+13−14 .gitignore−1 CHANGELOG.md−31 Network/HTTP/Req.hs+82−76 README.md+1−1 Setup.hs+6 cabal.project−4 httpbin-tests/Network/HTTP/ReqSpec.hs+41−73 pure-tests/Network/HTTP/ReqSpec.hs+18−18 req.cabal+42−42

.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−14

@@ -11,25 +11,27 @@ jobs:

1111 ormolu:

1212 runs-on: ubuntu-latest

1313 steps:

14− - uses: actions/checkout@v4

15− - uses: haskell-actions/run-ormolu@v17

14+ - uses: actions/checkout@v2.3.4

15+ - uses: mrkkrp/ormolu-action@v6

1616 build:

1717 runs-on: ubuntu-latest

1818 needs: ormolu

1919 strategy:

2020 matrix:

21− cabal: ["3.12"]

22− ghc: ["9.6.3", "9.8.2", "9.10.1"]

21+ cabal: ["3.6"]

22+ ghc: ["8.10.7", "9.0.2", "9.2.1"]

23+ env:

24+ CONFIG: "--enable-tests --enable-benchmarks --flags=dev"

2325 steps:

24− - uses: actions/checkout@v4

25− - uses: haskell-actions/setup@v2

26+ - uses: actions/checkout@v2.3.4

27+ - uses: haskell/actions/setup@v1.2.9

2628 id: setup-haskell-cabal

2729 with:

2830 ghc-version: ${{ matrix.ghc }}

2931 cabal-version: ${{ matrix.cabal }}

3032 - run: cabal update

31− - run: cabal freeze

32− - uses: actions/cache@v4.2.3

33+ - run: cabal freeze $CONFIG

34+ - uses: actions/cache@v2.1.3

3335 with:

3436 path: |

3537 ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

@@ -38,10 +40,7 @@ jobs:

3840 restore-keys: |

3941 ${{ runner.os }}-${{ matrix.ghc }}-

4042 - 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

43+ - run: cabal build $CONFIG

44+ - run: cabal test $CONFIG

45+ - run: cabal haddock $CONFIG

4746 - run: cabal 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−31

@@ -1,34 +1,3 @@

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−

321## Req 3.12.0

332

343* Add `isStatusCodeException` function.

Network/HTTP/Req.hs+82−76

@@ -1,9 +1,20 @@

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 #-}

17+{-# LANGUAGE StandaloneDeriving #-}

718{-# LANGUAGE TemplateHaskellQuotes #-}

819{-# LANGUAGE TypeFamilies #-}

920{-# LANGUAGE UndecidableInstances #-}

@@ -150,7 +161,6 @@ module Network.HTTP.Req

150161 -- *** Headers

151162 header,

152163 attachHeader,

153− headerRedacted,

154164

155165 -- *** Cookies

156166 -- $cookies

@@ -203,7 +213,7 @@ module Network.HTTP.Req

203213 )

204214where

205215

206−import Blaze.ByteString.Builder qualified as BB

216+import qualified Blaze.ByteString.Builder as BB

207217import Control.Applicative

208218import Control.Arrow (first, second)

209219import Control.Exception hiding (Handler (..), TypeError)

@@ -219,56 +229,54 @@ import Control.Monad.Trans.Control

219229import Control.Monad.Trans.Except (ExceptT)

220230import Control.Monad.Trans.Identity (IdentityT)

221231import 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

232+import qualified Control.Monad.Trans.RWS.CPS as RWS.CPS

233+import qualified Control.Monad.Trans.RWS.Lazy as RWS.Lazy

234+import qualified Control.Monad.Trans.RWS.Strict as RWS.Strict

225235import 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

236+import qualified Control.Monad.Trans.State.Lazy as State.Lazy

237+import qualified Control.Monad.Trans.State.Strict as State.Strict

238+import qualified Control.Monad.Trans.Writer.CPS as Writer.CPS

239+import qualified Control.Monad.Trans.Writer.Lazy as Writer.Lazy

240+import qualified Control.Monad.Trans.Writer.Strict as Writer.Strict

231241import Control.Retry

232242import Data.Aeson (FromJSON (..), ToJSON (..))

233−import Data.Aeson qualified as A

243+import qualified Data.Aeson as A

234244import 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

245+import qualified Data.ByteString as B

246+import qualified Data.ByteString.Lazy as BL

247+import qualified Data.CaseInsensitive as CI

238248import Data.Data (Data)

239−import Data.Default.Class (def)

240249import Data.Function (on)

241250import Data.IORef

242251import Data.Kind (Constraint, Type)

243252import Data.List (foldl', nubBy)

244253import Data.List.NonEmpty (NonEmpty (..))

245−import Data.List.NonEmpty qualified as NE

254+import qualified Data.List.NonEmpty as NE

246255import Data.Maybe (fromMaybe)

247256import Data.Proxy

248257import Data.Semigroup (Endo (..))

249−import Data.Set qualified as S

250258import Data.Text (Text)

251−import Data.Text qualified as T

252−import Data.Text.Encoding qualified as T

259+import qualified Data.Text as T

260+import qualified Data.Text.Encoding as T

253261import Data.Typeable (Typeable, cast)

254262import GHC.Generics

255263import 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

264+import qualified Language.Haskell.TH as TH

265+import qualified Language.Haskell.TH.Quote as TH

266+import qualified Language.Haskell.TH.Syntax as TH

267+import qualified Network.Connection as NC

268+import qualified Network.HTTP.Client as L

269+import qualified Network.HTTP.Client.Internal as LI

270+import qualified Network.HTTP.Client.MultipartFormData as LM

271+import qualified Network.HTTP.Client.TLS as L

272+import qualified Network.HTTP.Types as Y

265273import System.IO.Unsafe (unsafePerformIO)

266274import 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

275+import qualified Text.URI as URI

276+import qualified Text.URI.QQ as QQ

277+import qualified Web.Authenticate.OAuth as OAuth

270278import Web.FormUrlEncoded (FromForm (..), ToForm (..))

271−import Web.FormUrlEncoded qualified as Form

279+import qualified Web.FormUrlEncoded as Form

272280import Web.HttpApiData (ToHttpApiData (..))

273281

274282----------------------------------------------------------------------------

@@ -489,7 +497,7 @@ reqCb method url body responseProxy options adjustRequest =

489497--

490498-- @since 3.7.0

491499reqHandler ::

492− (MonadHttp m) =>

500+ MonadHttp m =>

493501 -- | How to get final result from a 'L.Response'

494502 (L.Response L.BodyReader -> IO b) ->

495503 -- | 'L.Request' to perform

@@ -585,10 +593,10 @@ req' method url body options m = do

585593 withReqManager (m request)

586594

587595-- | 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

596+-- of the library uses. This allows to reuse connections that the

589597-- 'L.Manager' controls.

590−withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a

591−withReqManager m = m globalManager

598+withReqManager :: MonadIO m => (L.Manager -> m a) -> m a

599+withReqManager m = liftIO (readIORef globalManager) >>= m

592600

593601-- | The global 'L.Manager' that 'req' uses. Here we just go with the

594602-- default settings, so users don't need to deal with this manager stuff at

@@ -601,16 +609,16 @@ withReqManager m = m globalManager

601609-- manager. From that moment on the 'IORef' will be just reused—exactly the

602610-- behavior we want here in order to maximize connection sharing. GHC could

603611-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.

604−globalManager :: L.Manager

612+globalManager :: IORef L.Manager

605613globalManager = unsafePerformIO $ do

606614 context <- NC.initConnectionContext

607615 let settings =

608616 L.mkManagerSettingsContext

609617 (Just context)

610− def

618+ (NC.TLSSettingsSimple False False False)

611619 Nothing

612620 manager <- L.newManager settings

613− return manager

621+ newIORef manager

614622{-# NOINLINE globalManager #-}

615623

616624----------------------------------------------------------------------------

@@ -630,7 +638,7 @@ globalManager = unsafePerformIO $ do

630638-- | A type class for monads that support performing HTTP requests.

631639-- Typically, you only need to define the 'handleHttpException' method

632640-- unless you want to tweak 'HttpConfig'.

633−class (MonadIO m) => MonadHttp m where

641+class MonadIO m => MonadHttp m where

634642 -- | This method describes how to deal with 'HttpException' that was

635643 -- caught by the library. One option is to re-throw it if you are OK with

636644 -- exceptions, but if you prefer working with something like

@@ -714,8 +722,9 @@ data HttpConfig = HttpConfig

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

720729-- | The default value of 'HttpConfig'.

721730--

@@ -803,27 +812,27 @@ instance (MonadHttp m, Monoid w) => MonadHttp (AccumT w m) where

803812 getHttpConfig = lift getHttpConfig

804813

805814-- | @since 3.10.0

806−instance (MonadHttp m) => MonadHttp (ContT r m) where

815+instance MonadHttp m => MonadHttp (ContT r m) where

807816 handleHttpException = lift . handleHttpException

808817 getHttpConfig = lift getHttpConfig

809818

810819-- | @since 3.10.0

811−instance (MonadHttp m) => MonadHttp (ExceptT e m) where

820+instance MonadHttp m => MonadHttp (ExceptT e m) where

812821 handleHttpException = lift . handleHttpException

813822 getHttpConfig = lift getHttpConfig

814823

815824-- | @since 3.10.0

816−instance (MonadHttp m) => MonadHttp (IdentityT m) where

825+instance MonadHttp m => MonadHttp (IdentityT m) where

817826 handleHttpException = lift . handleHttpException

818827 getHttpConfig = lift getHttpConfig

819828

820829-- | @since 3.10.0

821−instance (MonadHttp m) => MonadHttp (MaybeT m) where

830+instance MonadHttp m => MonadHttp (MaybeT m) where

822831 handleHttpException = lift . handleHttpException

823832 getHttpConfig = lift getHttpConfig

824833

825834-- | @since 3.10.0

826−instance (MonadHttp m) => MonadHttp (ReaderT r m) where

835+instance MonadHttp m => MonadHttp (ReaderT r m) where

827836 handleHttpException = lift . handleHttpException

828837 getHttpConfig = lift getHttpConfig

829838

@@ -843,17 +852,17 @@ instance (MonadHttp m, Monoid w) => MonadHttp (RWS.Strict.RWST r w s m) where

843852 getHttpConfig = lift getHttpConfig

844853

845854-- | @since 3.10.0

846−instance (MonadHttp m) => MonadHttp (SelectT r m) where

855+instance MonadHttp m => MonadHttp (SelectT r m) where

847856 handleHttpException = lift . handleHttpException

848857 getHttpConfig = lift getHttpConfig

849858

850859-- | @since 3.10.0

851−instance (MonadHttp m) => MonadHttp (State.Lazy.StateT s m) where

860+instance MonadHttp m => MonadHttp (State.Lazy.StateT s m) where

852861 handleHttpException = lift . handleHttpException

853862 getHttpConfig = lift getHttpConfig

854863

855864-- | @since 3.10.0

856−instance (MonadHttp m) => MonadHttp (State.Strict.StateT s m) where

865+instance MonadHttp m => MonadHttp (State.Strict.StateT s m) where

857866 handleHttpException = lift . handleHttpException

858867 getHttpConfig = lift getHttpConfig

859868

@@ -877,7 +886,7 @@ instance (MonadHttp m, Monoid w) => MonadHttp (Writer.Strict.WriterT w m) where

877886--

878887-- @since 0.4.0

879888runReq ::

880− (MonadIO m) =>

889+ MonadIO m =>

881890 -- | 'HttpConfig' to use

882891 HttpConfig ->

883892 -- | Computation to run

@@ -982,7 +991,7 @@ class HttpMethod a where

982991 -- | Return name of the method as a 'ByteString'.

983992 httpMethodName :: Proxy a -> ByteString

984993

985−instance (HttpMethod method) => RequestComponent (Tagged "method" method) where

994+instance HttpMethod method => RequestComponent (Tagged "method" method) where

986995 getRequestMod _ = Endo $ \x ->

987996 x {L.method = httpMethodName (Proxy :: Proxy method)}

988997

@@ -1024,20 +1033,25 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where

10241033-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84

10251034data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)

10261035 -- NOTE The second value is the path segments in reversed order.

1027− deriving (Eq, Ord, Show, Data, Generic)

1036+ deriving (Eq, Ord, Show, Data, Typeable, Generic)

10281037

10291038type role Url nominal

10301039

10311040-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however

10321041-- the derived lift forgets the type of the scheme.

1033−instance (Typeable scheme) => TH.Lift (Url scheme) where

1042+instance Typeable scheme => TH.Lift (Url scheme) where

10341043 lift url =

10351044 TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of

10361045 Url Http _ -> [t|Url 'Http|]

10371046 Url Https _ -> [t|Url 'Https|]

10381047 where

10391048 liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)

1049+

1050+#if MIN_VERSION_template_haskell(2,17,0)

10401051 liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift

1052+#elif MIN_VERSION_template_haskell(2,16,0)

1053+ liftTyped = TH.unsafeTExpCoerce . TH.lift

1054+#endif

10411055

10421056-- | Given host name, produce a 'Url' which has “http” as its scheme and

10431057-- empty path. This also sets port to @80@.

@@ -1053,7 +1067,7 @@ https = Url Https . pure

10531067-- path segment can be of any type that is an instance of 'ToHttpApiData'.

10541068infixl 5 /~

10551069

1056−(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme

1070+(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme

10571071Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)

10581072

10591073-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases

@@ -1241,7 +1255,7 @@ instance HttpBody NoReqBody where

12411255-- charset=utf-8\"@ value.

12421256newtype ReqBodyJson a = ReqBodyJson a

12431257

1244−instance (ToJSON a) => HttpBody (ReqBodyJson a) where

1258+instance ToJSON a => HttpBody (ReqBodyJson a) where

12451259 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)

12461260 getRequestContentType _ = pure "application/json; charset=utf-8"

12471261

@@ -1340,7 +1354,7 @@ instance HttpBody ReqBodyMultipart where

13401354-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.

13411355--

13421356-- @since 0.2.0

1343−reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart

1357+reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart

13441358reqBodyMultipart parts = liftIO $ do

13451359 boundary <- LM.webkitBoundary

13461360 body <- LM.renderParts boundary parts

@@ -1380,7 +1394,7 @@ type family

13801394 TypeError

13811395 ('Text "This HTTP method does not allow attaching a request body.")

13821396

1383−instance (HttpBody body) => RequestComponent (Tagged "body" body) where

1397+instance HttpBody body => RequestComponent (Tagged "body" body) where

13841398 getRequestMod (Tagged body) = Endo $ \x ->

13851399 x

13861400 { L.requestBody = getRequestBody body,

@@ -1450,7 +1464,7 @@ instance RequestComponent (Option scheme) where

14501464

14511465-- | Finalize given 'L.Request' by applying a finalizer from the given

14521466-- 'Option' (if it has any).

1453−finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request

1467+finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request

14541468finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer

14551469

14561470----------------------------------------------------------------------------

@@ -1483,7 +1497,7 @@ name =: value = queryParam name (pure value)

14831497-- This operator is defined in terms of 'queryParam':

14841498--

14851499-- > queryFlag name = queryParam name (Nothing :: Maybe ())

1486−queryFlag :: (QueryParam param) => Text -> param

1500+queryFlag :: QueryParam param => Text -> param

14871501queryFlag name = queryParam name (Nothing :: Maybe ())

14881502

14891503-- | Construct query parameters from a 'ToForm' instance. This function

@@ -1513,7 +1527,7 @@ class QueryParam param where

15131527 -- 'Nothing', it won't be included at all (i.e. you create a flag this

15141528 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this

15151529 -- method, because they are easier to read.

1516− queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param

1530+ queryParam :: ToHttpApiData a => Text -> Maybe a -> param

15171531

15181532 -- | Get the query parameter names and values set by 'queryParam'.

15191533 --

@@ -1547,14 +1561,6 @@ attachHeader :: ByteString -> ByteString -> L.Request -> L.Request

15471561attachHeader name value x =

15481562 x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}

15491563

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−

15581564----------------------------------------------------------------------------

15591565-- Request—Optional parameters—Cookies

15601566

@@ -1762,7 +1768,7 @@ ignoreResponse = Proxy

17621768newtype JsonResponse a = JsonResponse (L.Response a)

17631769 deriving (Show)

17641770

1765−instance (FromJSON a) => HttpResponse (JsonResponse a) where

1771+instance FromJSON a => HttpResponse (JsonResponse a) where

17661772 type HttpResponseBody (JsonResponse a) = a

17671773 toVanillaResponse (JsonResponse r) = r

17681774 getHttpResponse r = do

@@ -1878,14 +1884,14 @@ brReadN br n = go 0 id id

18781884

18791885-- | Get the response body.

18801886responseBody ::

1881− (HttpResponse response) =>

1887+ HttpResponse response =>

18821888 response ->

18831889 HttpResponseBody response

18841890responseBody = L.responseBody . toVanillaResponse

18851891

18861892-- | Get the response status code.

18871893responseStatusCode ::

1888− (HttpResponse response) =>

1894+ HttpResponse response =>

18891895 response ->

18901896 Int

18911897responseStatusCode =

@@ -1893,7 +1899,7 @@ responseStatusCode =

18931899

18941900-- | Get the response status message.

18951901responseStatusMessage ::

1896− (HttpResponse response) =>

1902+ HttpResponse response =>

18971903 response ->

18981904 ByteString

18991905responseStatusMessage =

@@ -1901,7 +1907,7 @@ responseStatusMessage =

19011907

19021908-- | Lookup a particular header from a response.

19031909responseHeader ::

1904− (HttpResponse response) =>

1910+ HttpResponse response =>

19051911 -- | Response interpretation

19061912 response ->

19071913 -- | Header to lookup

@@ -1913,7 +1919,7 @@ responseHeader r h =

19131919

19141920-- | Get the response 'L.CookieJar'.

19151921responseCookieJar ::

1916− (HttpResponse response) =>

1922+ HttpResponse response =>

19171923 response ->

19181924 L.CookieJar

19191925responseCookieJar = L.responseCookieJar . toVanillaResponse

@@ -2011,7 +2017,7 @@ data HttpException

20112017 | -- | A wrapper with Aeson-produced 'String' describing why decoding

20122018 -- failed

20132019 JsonHttpException String

2014− deriving (Show, Generic)

2020+ deriving (Show, Typeable, Generic)

20152021

20162022instance Exception HttpException

20172023

@@ -2048,4 +2054,4 @@ data Scheme

20482054 Http

20492055 | -- | HTTPS

20502056 Https

2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)

2057+ deriving (Eq, Ord, Show, Data, Typeable, Generic, TH.Lift)

README.md+1−1

@@ -4,7 +4,7 @@

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)

99* [Related packages](#related-packages)

1010* [Blog posts](#blog-posts)

Setup.hsnew file+6

@@ -0,0 +1,6 @@

1+module Main (main) where

3+import Distribution.Simple

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+41−73

@@ -11,22 +11,21 @@ import Control.Exception

1111import Control.Monad (forM_)

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

14+import qualified Data.Aeson as A

15+import qualified Data.Aeson.KeyMap as Aeson.KeyMap

16+import qualified Data.ByteString as B

17+import qualified Data.ByteString.Lazy as BL

1818import Data.Functor.Identity (runIdentity)

1919import Data.Maybe (fromJust)

2020import Data.Proxy

2121import 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

22+import qualified Data.Text as T

23+import qualified Data.Text.Encoding as T

24+import qualified Data.Text.IO as TIO

25+import qualified Network.HTTP.Client as L

26+import qualified Network.HTTP.Client.MultipartFormData as LM

27+import Network.HTTP.Req

28+import qualified Network.HTTP.Types as Y

3029import Test.Hspec

3130import Test.QuickCheck

3231

@@ -85,7 +84,8 @@ spec = do

8584 .= object

8685 [ "Accept-Encoding" .= ("gzip" :: Text),

8786 "Foo" .= ("bar" :: Text),

88− "Baz" .= ("quux" :: Text)

87+ "Baz" .= ("quux" :: Text),

88+ "Host" .= ("httpbin.org" :: Text)

8989 ]

9090 ]

9191 responseStatusCode r `shouldBe` 200

@@ -97,10 +97,11 @@ spec = do

9797 (stripFunnyHeaders . stripOrigin) (responseBody r)

9898 `shouldBe` object

9999 [ "args" .= emptyObject,

100− "url" .= ("http://localhost:1234/get" :: Text),

100+ "url" .= ("https://httpbin.org/get" :: Text),

101101 "headers"

102102 .= object

103− [ "Accept-Encoding" .= ("gzip" :: Text)

103+ [ "Accept-Encoding" .= ("gzip" :: Text),

104+ "Host" .= ("httpbin.org" :: Text)

104105 ]

105106 ]

106107 responseHeader r "Content-Type" `shouldBe` return "application/json"

@@ -117,11 +118,12 @@ spec = do

117118 [ "args" .= emptyObject,

118119 "json" .= text,

119120 "data" .= reflected,

120− "url" .= ("http://localhost:1234/post" :: Text),

121+ "url" .= ("https://httpbin.org/post" :: Text),

121122 "headers"

122123 .= object

123124 [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),

124125 "Accept-Encoding" .= ("gzip" :: Text),

126+ "Host" .= ("httpbin.org" :: Text),

125127 "Content-Length" .= show (T.length reflected)

126128 ],

127129 "files" .= emptyObject,

@@ -145,11 +147,12 @@ spec = do

145147 [ "args" .= emptyObject,

146148 "json" .= Null,

147149 "data" .= ("" :: Text),

148− "url" .= ("http://localhost:1234/post" :: Text),

150+ "url" .= ("https://httpbin.org/post" :: Text),

149151 "headers"

150152 .= object

151153 [ "Content-Type" .= T.decodeUtf8 contentType,

152154 "Accept-Encoding" .= ("gzip" :: Text),

155+ "Host" .= ("httpbin.org" :: Text),

153156 "Content-Length" .= ("242" :: Text)

154157 ],

155158 "files" .= emptyObject,

@@ -174,10 +177,11 @@ spec = do

174177 [ "args" .= emptyObject,

175178 "json" .= Null,

176179 "data" .= contents,

177− "url" .= ("http://localhost:1234/patch" :: Text),

180+ "url" .= ("https://httpbin.org/patch" :: Text),

178181 "headers"

179182 .= object

180183 [ "Accept-Encoding" .= ("gzip" :: Text),

184+ "Host" .= ("httpbin.org" :: Text),

181185 "Content-Length" .= show (T.length contents)

182186 ],

183187 "files" .= emptyObject,

@@ -199,11 +203,12 @@ spec = do

199203 [ "args" .= emptyObject,

200204 "json" .= Null,

201205 "data" .= ("" :: Text),

202− "url" .= ("http://localhost:1234/put" :: Text),

206+ "url" .= ("https://httpbin.org/put" :: Text),

203207 "headers"

204208 .= object

205209 [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),

206210 "Accept-Encoding" .= ("gzip" :: Text),

211+ "Host" .= ("httpbin.org" :: Text),

207212 "Content-Length" .= ("18" :: Text)

208213 ],

209214 "files" .= emptyObject,

@@ -301,7 +306,7 @@ spec = do

301306 (httpbin /: "basic-auth" /~ user /~ password)

302307 NoReqBody

303308 ignoreResponse

304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))

309+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))

305310 responseStatusCode r `shouldBe` 200

306311 responseStatusMessage r `shouldBe` "OK"

307312

@@ -401,28 +406,8 @@ blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}

401406 doit _ _ = error "Oops!"

402407

403408-- | '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

409+httpbin :: Url 'Https

410+httpbin = https "httpbin.org"

426411

427412-- | Remove “origin” field from JSON value. Origin may change, we don't want

428413-- to depend on that.

@@ -432,36 +417,19 @@ stripOrigin value = value

432417

433418-- | Remove funny headers that might break the tests.

434419stripFunnyHeaders :: 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− ]

420+stripFunnyHeaders (Object m) =

421+ let f (Object p) = Object $ Aeson.KeyMap.filterWithKey (\k _ -> k `elem` hs) p

422+ f value = value

423+ hs =

424+ [ "Content-Type",

425+ "Accept-Encoding",

426+ "Host",

427+ "Content-Length",

428+ "Foo",

429+ "Baz"

430+ ]

431+ in Object (runIdentity (Aeson.KeyMap.alterF (pure . fmap f) "headers" m))

432+stripFunnyHeaders value = value

465433

466434-- | This is a complete test case that makes use of <https://httpbin.org> to

467435-- get various response status codes.

@@ -503,7 +471,7 @@ emptyObject :: Value

503471emptyObject = Object Aeson.KeyMap.empty

504472

505473-- | Get a rendered JSON value as 'Text'.

506−reflectJSON :: (ToJSON a) => a -> Text

474+reflectJSON :: ToJSON a => a -> Text

507475reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode

508476

509477-- | Clarify to the type checker that the inner computation is in the 'IO'

pure-tests/Network/HTTP/ReqSpec.hs+18−18

@@ -13,41 +13,41 @@

1313

1414module Network.HTTP.ReqSpec (spec) where

1515

16−import Blaze.ByteString.Builder qualified as BB

16+import qualified Blaze.ByteString.Builder as BB

1717import Control.Exception (throwIO)

1818import Control.Monad

1919import Control.Retry

2020import Data.Aeson (ToJSON (..))

21−import Data.Aeson qualified as A

21+import qualified Data.Aeson as A

2222import 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

23+import qualified Data.ByteString as B

24+import qualified Data.ByteString.Char8 as B8

25+import qualified Data.ByteString.Lazy as BL

26+import qualified Data.CaseInsensitive as CI

2727import Data.Either (isRight)

28−import Data.List.NonEmpty qualified as NE

28+import qualified Data.List.NonEmpty as NE

2929import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)

3030import Data.Proxy

3131import Data.Text (Text)

32−import Data.Text qualified as T

33−import Data.Text.Encoding qualified as T

32+import qualified Data.Text as T

33+import qualified Data.Text.Encoding as T

3434import Data.Time

3535import Data.Typeable (Typeable, eqT)

3636import 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+import qualified Web.FormUrlEncoded as F

5151

5252spec :: Spec

5353spec = do

@@ -413,7 +413,7 @@ spec = do

413413 -- 'Https, Option _) type checks, so we can catch if the type of scheme

414414 -- is unspecified.

415415 let testTypeOfQuoterResult ::

416− forall a s. (Typeable a) => (a, Option s) -> Bool

416+ forall a s. Typeable a => (a, Option s) -> Bool

417417 testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)

418418 in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]

419419 it "doesn't work for invalid urls" $

req.cabal+42−42

@@ -1,11 +1,11 @@

11cabal-version: 2.4

22name: req

3−version: 3.13.4

3+version: 3.12.0

44license: BSD-3-Clause

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.10.7 ghc ==9.0.2 ghc ==9.2.1

99homepage: https://github.com/mrkkrp/req

1010bug-reports: https://github.com/mrkkrp/req/issues

1111synopsis: HTTP client library

@@ -31,70 +31,71 @@ flag dev

3131

3232library

3333 exposed-modules: Network.HTTP.Req

34− default-language: GHC2021

34+ default-language: Haskell2010

3535 build-depends:

3636 aeson >=0.9 && <3,

3737 authenticate-oauth >=1.5 && <1.8,

38− base >=4.15 && <5,

38+ base >=4.13 && <5.0,

3939 blaze-builder >=0.3 && <0.5,

40− bytestring >=0.10.8 && <0.13,

40+ bytestring >=0.10.8 && <0.12,

4141 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,

42+ connection >=0.2.2 && <0.4,

4543 exceptions >=0.6 && <0.11,

46− http-api-data >=0.2 && <0.7,

47− http-client >=0.7.13.1 && <0.8,

44+ http-api-data >=0.2 && <0.6,

45+ http-client >=0.7 && <0.8,

4846 http-client-tls >=0.3.2 && <0.4,

49− http-types >=0.8 && <10,

47+ http-types >=0.8 && <10.0,

5048 modern-uri >=0.3 && <0.4,

5149 monad-control >=1.0 && <1.1,

5250 mtl >=2.0 && <3.0,

5351 retry >=0.8 && <0.10,

54− template-haskell >=2.19 && <2.23,

55− text >=0.2 && <2.2,

52+ template-haskell >=2.14 && <2.19,

53+ text >=0.2 && <2.1,

54+ time >=1.2 && <1.13,

5655 transformers >=0.5.3.0 && <0.7,

5756 transformers-base,

5857 unliftio-core >=0.1.1 && <0.3

5958

6059 if flag(dev)

61− ghc-options:

62− -Wall -Werror -Wpartial-fields -Wunused-packages

63− -Wno-unused-imports

60+ ghc-options: -O0 -Wall -Werror

6461

6562 else

6663 ghc-options: -O2 -Wall

6764

65+ if flag(dev)

66+ ghc-options:

67+ -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns

68+ -Wnoncanonical-monad-instances

69+

6870test-suite pure-tests

6971 type: exitcode-stdio-1.0

7072 main-is: Spec.hs

71− build-tool-depends: hspec-discover:hspec-discover >=2 && <3

73+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

7274 hs-source-dirs: pure-tests

7375 other-modules: Network.HTTP.ReqSpec

74− default-language: GHC2021

76+ default-language: Haskell2010

7577 build-depends:

76− QuickCheck >=2.7 && <3,

78+ QuickCheck >=2.7 && <3.0,

7779 aeson >=0.9 && <3,

78− base >=4.15 && <5.0,

80+ base >=4.13 && <5.0,

7981 blaze-builder >=0.3 && <0.5,

80− bytestring >=0.10.8 && <0.13,

82+ bytestring >=0.10.8 && <0.12,

8183 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,

84+ hspec >=2.0 && <3.0,

85+ hspec-core >=2.0 && <3.0,

86+ http-api-data >=0.2 && <0.6,

8587 http-client >=0.7 && <0.8,

86− http-types >=0.8 && <10,

88+ http-types >=0.8 && <10.0,

8789 modern-uri >=0.3 && <0.4,

90+ mtl >=2.0 && <3.0,

8891 req,

8992 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+ template-haskell >=2.14 && <2.19,

94+ text >=0.2 && <2.1,

95+ time >=1.2 && <1.13

9396

9497 if flag(dev)

95− ghc-options:

96− -Wall -Werror -Wredundant-constraints -Wpartial-fields

97− -Wunused-packages

98+ ghc-options: -O0 -Wall -Werror

9899

99100 else

100101 ghc-options: -O2 -Wall

@@ -102,26 +103,25 @@ test-suite pure-tests

102103test-suite httpbin-tests

103104 type: exitcode-stdio-1.0

104105 main-is: Spec.hs

105− build-tool-depends: hspec-discover:hspec-discover >=2 && <3

106+ build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

106107 hs-source-dirs: httpbin-tests

107108 other-modules: Network.HTTP.ReqSpec

108− default-language: GHC2021

109+ default-language: Haskell2010

109110 build-depends:

110− QuickCheck >=2.7 && <3,

111+ QuickCheck >=2.7 && <3.0,

111112 aeson >=2 && <3,

112− base >=4.15 && <5,

113− bytestring >=0.10.8 && <0.13,

113+ base >=4.13 && <5.0,

114+ bytestring >=0.10.8 && <0.12,

114115 hspec >=2.0 && <3.0,

115116 http-client >=0.7 && <0.8,

116− http-types >=0.8 && <10,

117+ http-types >=0.8 && <10.0,

117118 monad-control >=1.0 && <1.1,

119+ mtl >=2.0 && <3.0,

118120 req,

119− text >=0.2 && <2.2

121+ text >=0.2 && <2.1

120122

121123 if flag(dev)

122− ghc-options:

123− -Wall -Werror -Wredundant-constraints -Wpartial-fields

124− -Wunused-packages

124+ ghc-options: -O0 -Wall -Werror

125125

126126 else

127− buildable: False

127+ ghc-options: -O2 -Wall