on 0151ae5 help sign in
13 files changed+1357−2064
since splitsnapshots
unifiedsplit
.github/dependabot.yml−6 .github/workflows/ci.yaml−47 .gitignore−2 .travis.yml+36 CHANGELOG.md−147 LICENSE.md+1−1 Network/HTTP/Req.hs+685−1034 README.md+144−43 Setup.hs+6 cabal.project−4 httpbin-tests/Network/HTTP/ReqSpec.hs+196−310 pure-tests/Network/HTTP/ReqSpec.hs+185−353 req.cabal+104−117
.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.yamldeleted−47
@@ -1,47 +0,0 @@
1−name: CI
2−on:
3− push:
4− branches:
5− - master
6− pull_request:
7− types:
8− - opened
9− - synchronize
10−jobs:
11− ormolu:
12− runs-on: ubuntu-latest
13− steps:
14− - uses: actions/checkout@v4
15− - uses: haskell-actions/run-ormolu@v17
16− build:
17− runs-on: ubuntu-latest
18− needs: ormolu
19− strategy:
20− matrix:
21− cabal: ["3.12"]
22− ghc: ["9.6.3", "9.8.2", "9.10.1"]
23− steps:
24− - uses: actions/checkout@v4
25− - uses: haskell-actions/setup@v2
26− id: setup-haskell-cabal
27− with:
28− ghc-version: ${{ matrix.ghc }}
29− cabal-version: ${{ matrix.cabal }}
30− - run: cabal update
31− - run: cabal freeze
32− - uses: actions/cache@v4.2.3
33− with:
34− path: |
35− ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
36− dist-newstyle
37− key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
38− restore-keys: |
39− ${{ runner.os }}-${{ matrix.ghc }}-
40− - 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
.gitignore−2
@@ -25,6 +25,4 @@ cabal.project.local
2525cabal.sandbox.config
2626dist-*/
2727dist/
28−hie.yaml
2928stack.yaml
30−stack.yaml.lock
.travis.ymlnew file+36
@@ -0,0 +1,36 @@
1+language: c
2+
3+sudo: false
4+
5+cache:
6+ directories:
7+ - ~/.cabal/packages
8+ - ~/.cabal/store
9+
10+matrix:
11+ include:
12+ - env: CABALVER=2.2 GHCVER=7.10.3
13+ addons: {apt: {packages: [cabal-install-2.2,ghc-7.10.3],sources: [hvr-ghc]}}
14+ - env: CABALVER=2.2 GHCVER=8.0.2
15+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
16+ - env: CABALVER=2.2 GHCVER=8.2.2
17+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
18+ - env: CABALVER=2.2 GHCVER=8.4.3
19+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
20+
21+before_install:
22+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
23+
24+install:
25+ - cabal --version
26+ - ghc --version
27+ - travis_retry cabal update
28+
29+script:
30+ - cabal new-build --enable-tests --enable-benchmarks --flags=dev
31+ - cabal new-test
32+ - cabal new-haddock
33+ - cabal sdist
34+
35+notifications:
36+ email: false
CHANGELOG.md−147
@@ -1,150 +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−
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−
66−## Req 3.7.0
67−
68−* Added `reqCb`, a function that allows you to modify the `Request` object
69− but otherwise performs the requst for you.
70−
71−* Derived `MonadThrow`, `MonadCatch`, and `MonadMask` for the `Req` monad.
72−
73−## Req 3.6.0
74−
75−* Added the `httpConfigBodyPreviewLength` configuration parameter to
76− `HttpConfig`.
77−
78−## Req 3.5.0
79−
80−* Made `Req` an instance of `MonadUnliftIO`. [Issue
81− 100](https://github.com/mrkkrp/req/issues/100).
82−
83−## Req 3.4.0
84−
85−* Requests using `DELETE` method can now have a body. [Issue
86− 89](https://github.com/mrkkrp/req/issues/89).
87−
88−* Added the `httpConfigRetryJudgeException` field to `HttpConfig` so that
89− requests that result in exceptions can be retried. [Issue
90− 93](https://github.com/mrkkrp/req/issues/93).
91−
92−* Added the function `renderUrl`. [Issue
93− 83](https://github.com/mrkkrp/req/issues/83).
94−
95−## Req 3.3.0
96−
97−* Derived `Show` instances for response types `IgnoreResponse`,
98− `JsonResponse`, `BsResponse`, and `LbsResponse`.
99−
100−## Req 3.2.0
101−
102−* Made the tests pass with `http-client-0.7` and later.
103−
104−* Added a quasiquoter for URL creation, `urlQ`.
105−
106−## Req 3.1.0
107−
108−* Changed signature of `httpConfigRetryPolicy` to `RetryPolicyM IO`.
109−
110−## Req 3.0.0
111−
112−* Dropped functions `parseUrlHttp`, `parseUrlHttps`, and `parseUrl`. Instead
113− we now have `useHttpURI`, `useHttpsURI`, and `useURI` take `URI`s from
114− `modern-uri` as their argument. You first parse your URL with the
115− `modern-uri` package and then pass it to those functions. This allows us
116− to work with typed URI representations and seamlessly convert them to
117− something `req` can work with. As a side effect basic auth from the `URI`s
118− is now taken into consideration. In the future we may also start to
119− respect fragments if `http-client` starts to support this.
120−
121−* Dropped support for GHC 8.2 and older.
122−
123−## Req 2.1.0
124−
125−* Dropped support for GHC 7.10.
126−
127−* Added the new `acceptHeader` method to the `HttpResponse` type class.
128− Notably, the `jsonResponse` method now sets `"Accept"` header to
129− `"application/json"`.
130−
131−## Req 2.0.1
132−
133−* Fixed the `httpbin` tests (they changed something on the server again).
134−
135−## Req 2.0.0
136−
137−* Got rid of `data-default-class` dependency, now we export
138− `defaultHttpConfig` instead.
139−
140−## Req 1.2.1
141−
142−* Fixed a typo in the type signature of `parseUrl`.
143−
144−## Req 1.2.0
145−
146−* Added the `parseUrl` function.
147−
1481## Req 1.1.0
1492
1503* Added `customAuth` and `attachHeader` to facilitate creation of custom
LICENSE.md+1−1
@@ -1,4 +1,4 @@
1−Copyright © 2016–present Mark Karpov
1+Copyright © 2016–2018 Mark Karpov
22
33All rights reserved.
44
Network/HTTP/Req.hs+685−1034
@@ -1,16 +1,6 @@
1−{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE LambdaCase #-}
3−{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE QuasiQuotes #-}
5−{-# LANGUAGE RecordWildCards #-}
6−{-# LANGUAGE RoleAnnotations #-}
7−{-# LANGUAGE TemplateHaskellQuotes #-}
8−{-# LANGUAGE TypeFamilies #-}
9−{-# LANGUAGE UndecidableInstances #-}
10−
111-- |
122-- Module : Network.HTTP.Req
13−-- Copyright : © 2016–present Mark Karpov
3+-- Copyright : © 2016–2018 Mark Karpov
144-- License : BSD 3 clause
155--
166-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
@@ -19,40 +9,61 @@
199--
2010-- The documentation below is structured in such a way that the most
2111-- 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
12+-- requests, how to embed them in any monad you have, and then it gives you
2313-- details about less-common things you may want to know about. The
2414-- documentation is written with sufficient coverage of details and
2515-- examples, and it's designed to be a complete tutorial on its own.
2616--
17+-- /(A modest intro goes here, click on 'req' to start making requests.)/
18+--
2719-- === About the library
2820--
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.
21+-- Req is an easy-to-use, type-safe, expandable, high-level HTTP client
22+-- library that just works without any fooling around.
23+--
24+-- What does the phrase “easy-to-use” mean? It means that the library is
25+-- designed to be beginner-friendly so it's simple to add to your monad
26+-- stack, intuitive to work with, well-documented, and does not get in your
27+-- way. Doing HTTP requests is a common task and a Haskell library for this
28+-- should be very approachable and clear to beginners, thus certain
29+-- compromises were made. For example, one cannot currently modify
30+-- 'L.ManagerSettings' of the default manager because the library always
31+-- uses the same implicit global manager for simplicity and maximal
32+-- connection sharing. There is a way to use your own manager with different
33+-- settings, but it requires a bit more typing.
34+--
35+-- “Type-safe” means that the library is protective and eliminates certain
36+-- classes of errors. For example, we have correct-by-construction 'Url's,
37+-- it's guaranteed that the user does not send the request body when using
38+-- methods like 'GET' or 'OPTIONS', and the amount of implicit assumptions
39+-- is minimized by making the user specify his\/her intentions in an
40+-- explicit form (for example, it's not possible to avoid specifying the
41+-- body or method of a request). Authentication methods that assume HTTPS
42+-- force the user to use HTTPS at the type level. The library also carefully
43+-- hides underlying types from the lower-level @http-client@ package because
44+-- those types are not safe enough (for example 'L.Request' is an instance
45+-- of 'Data.String.IsString' and, if it's malformed, it will blow up at
46+-- run-time).
47+--
48+-- “Expandable” refers to the ability of the library to be expanded without
49+-- having to resort to ugly hacking. For example, it's possible to define
50+-- your own HTTP methods, create new ways to construct the body of a
51+-- request, create new authorization options, perform a request in a
52+-- different way, and create your own methods to parse and represent a
53+-- response. As a user extends the library to satisfy his\/her special
54+-- needs, the new solutions will work just like the built-ins. However, all
55+-- of the common cases are also covered by the library out-of-the-box.
56+--
57+-- “High-level” means that there are less details to worry about. The
58+-- library is a result of my experiences as a Haskell consultant. Working
59+-- for several clients, who had very different projects, showed me that the
60+-- library should adapt easily to any particular style of writing Haskell
61+-- applications. For example, some people prefer throwing exceptions, while
62+-- others are concerned with purity. Just define 'handleHttpException'
63+-- accordingly when making your monad instance of 'MonadHttp' and it will
64+-- play together seamlessly. Finally, the library cuts boilerplate down
65+-- considerably, and helps you write concise, easy to read, and maintainable
66+-- code.
5667--
5768-- === Using with other libraries
5869--
@@ -76,200 +87,180 @@
7687-- the whole Haskell ecosystem uses, there is no risk in using @req@. The
7788-- machinery for performing requests is the same as with @http-conduit@ and
7889-- @wreq@. The only difference is the API.
90+
91+{-# LANGUAGE BangPatterns #-}
92+{-# LANGUAGE CPP #-}
93+{-# LANGUAGE DataKinds #-}
94+{-# LANGUAGE DeriveDataTypeable #-}
95+{-# LANGUAGE DeriveGeneric #-}
96+{-# LANGUAGE FlexibleInstances #-}
97+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
98+{-# LANGUAGE KindSignatures #-}
99+{-# LANGUAGE MultiParamTypeClasses #-}
100+{-# LANGUAGE OverloadedStrings #-}
101+{-# LANGUAGE RankNTypes #-}
102+{-# LANGUAGE RecordWildCards #-}
103+{-# LANGUAGE ScopedTypeVariables #-}
104+{-# LANGUAGE TypeFamilies #-}
105+
106+#if MIN_VERSION_base(4,9,0)
107+{-# LANGUAGE UndecidableInstances #-}
108+#endif
109+
110+#if __GLASGOW_HASKELL__ >= 800
111+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
112+#endif
113+
79114module Network.HTTP.Req
80115 ( -- * Making a request
81116 -- $making-a-request
82− req,
83− reqBr,
84− reqCb,
85− req',
86− withReqManager,
87−
88− -- * Embedding requests in your monad
117+ req
118+ , reqBr
119+ , req'
120+ , withReqManager
121+ -- * Embedding requests into your monad
89122 -- $embedding-requests
90− MonadHttp (..),
91− HttpConfig (..),
92− defaultHttpConfig,
93− Req,
94− runReq,
95−
123+ , MonadHttp (..)
124+ , HttpConfig (..)
125+ , Req
126+ , runReq
96127 -- * Request
97−
98128 -- ** Method
99129 -- $method
100− GET (..),
101− POST (..),
102− HEAD (..),
103− PUT (..),
104− DELETE (..),
105− TRACE (..),
106− CONNECT (..),
107− OPTIONS (..),
108− PATCH (..),
109− HttpMethod (..),
110−
130+ , GET (..)
131+ , POST (..)
132+ , HEAD (..)
133+ , PUT (..)
134+ , DELETE (..)
135+ , TRACE (..)
136+ , CONNECT (..)
137+ , OPTIONS (..)
138+ , PATCH (..)
139+ , HttpMethod (..)
111140 -- ** URL
112141 -- $url
113− Url,
114− http,
115− https,
116− (/~),
117− (/:),
118− useHttpURI,
119− useHttpsURI,
120− useURI,
121− urlQ,
122− renderUrl,
123−
142+ , Url
143+ , http
144+ , https
145+ , (/~)
146+ , (/:)
147+ , parseUrlHttp
148+ , parseUrlHttps
124149 -- ** Body
125150 -- $body
126− NoReqBody (..),
127− ReqBodyJson (..),
128− ReqBodyFile (..),
129− ReqBodyBs (..),
130− ReqBodyLbs (..),
131− ReqBodyUrlEnc (..),
132− FormUrlEncodedParam,
133− ReqBodyMultipart,
134− reqBodyMultipart,
135− HttpBody (..),
136− ProvidesBody,
137− HttpBodyAllowed,
138−
151+ , NoReqBody (..)
152+ , ReqBodyJson (..)
153+ , ReqBodyFile (..)
154+ , ReqBodyBs (..)
155+ , ReqBodyLbs (..)
156+ , ReqBodyUrlEnc (..)
157+ , FormUrlEncodedParam
158+ , ReqBodyMultipart
159+ , reqBodyMultipart
160+ , HttpBody (..)
161+ , ProvidesBody
162+ , HttpBodyAllowed
139163 -- ** Optional parameters
140164 -- $optional-parameters
141− Option,
142−
165+ , Option
143166 -- *** Query parameters
144167 -- $query-parameters
145− (=:),
146− queryFlag,
147− formToQuery,
148− QueryParam (..),
149−
168+ , (=:)
169+ , queryFlag
170+ , QueryParam (..)
150171 -- *** Headers
151− header,
152− attachHeader,
153− headerRedacted,
154−
172+ , header
173+ , attachHeader
155174 -- *** Cookies
156175 -- $cookies
157− cookieJar,
158−
176+ , cookieJar
159177 -- *** Authentication
160178 -- $authentication
161− basicAuth,
162− basicAuthUnsafe,
163− basicProxyAuth,
164− oAuth1,
165− oAuth2Bearer,
166− oAuth2Token,
167− customAuth,
168−
179+ , basicAuth
180+ , basicAuthUnsafe
181+ , basicProxyAuth
182+ , oAuth1
183+ , oAuth2Bearer
184+ , oAuth2Token
185+ , customAuth
169186 -- *** Other
170− port,
171− decompress,
172− responseTimeout,
173− httpVersion,
174−
187+ , port
188+ , decompress
189+ , responseTimeout
190+ , httpVersion
175191 -- * Response
176−
177192 -- ** Response interpretations
178− IgnoreResponse,
179− ignoreResponse,
180− JsonResponse,
181− jsonResponse,
182− BsResponse,
183− bsResponse,
184− LbsResponse,
185− lbsResponse,
186−
193+ , IgnoreResponse
194+ , ignoreResponse
195+ , JsonResponse
196+ , jsonResponse
197+ , BsResponse
198+ , bsResponse
199+ , LbsResponse
200+ , lbsResponse
187201 -- ** Inspecting a response
188− responseBody,
189− responseStatusCode,
190− responseStatusMessage,
191− responseHeader,
192− responseCookieJar,
193−
202+ , responseBody
203+ , responseStatusCode
204+ , responseStatusMessage
205+ , responseHeader
206+ , responseCookieJar
194207 -- ** Defining your own interpretation
195208 -- $new-response-interpretation
196− HttpResponse (..),
197−
209+ , HttpResponse (..)
198210 -- * Other
199− HttpException (..),
200− isStatusCodeException,
201− CanHaveBody (..),
202− Scheme (..),
203− )
211+ , HttpException (..)
212+ , CanHaveBody (..)
213+ , Scheme (..) )
204214where
205215
206−import Blaze.ByteString.Builder qualified as BB
207216import Control.Applicative
208217import Control.Arrow (first, second)
209−import Control.Exception hiding (Handler (..), TypeError)
210−import Control.Monad (guard, void, (>=>))
211218import Control.Monad.Base
212−import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)
213219import Control.Monad.IO.Class
214−import Control.Monad.IO.Unlift
215−import Control.Monad.Reader (ReaderT (ReaderT), ask, lift, runReaderT)
216−import Control.Monad.Trans.Accum (AccumT)
217−import Control.Monad.Trans.Cont (ContT)
220+import Control.Monad.Reader
218221import 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
231222import Control.Retry
232−import Data.Aeson (FromJSON (..), ToJSON (..))
233−import Data.Aeson qualified as A
223+import Data.Aeson (ToJSON (..), FromJSON (..))
234224import 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
238225import Data.Data (Data)
239−import Data.Default.Class (def)
226+import Data.Default.Class
240227import Data.Function (on)
241228import Data.IORef
242−import Data.Kind (Constraint, Type)
243−import Data.List (foldl', nubBy)
229+import Data.List (nubBy)
244230import Data.List.NonEmpty (NonEmpty (..))
245−import Data.List.NonEmpty qualified as NE
246231import Data.Maybe (fromMaybe)
247232import Data.Proxy
248−import Data.Semigroup (Endo (..))
249−import Data.Set qualified as S
233+import Data.Semigroup hiding (Option, option)
250234import Data.Text (Text)
251−import Data.Text qualified as T
252−import Data.Text.Encoding qualified as T
253−import Data.Typeable (Typeable, cast)
235+import Data.Typeable (Typeable)
254236import GHC.Generics
255237import 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
265238import System.IO.Unsafe (unsafePerformIO)
266−import Text.URI (URI)
267−import Text.URI qualified as URI
268−import Text.URI.QQ qualified as QQ
269−import Web.Authenticate.OAuth qualified as OAuth
270−import Web.FormUrlEncoded (FromForm (..), ToForm (..))
271−import Web.FormUrlEncoded qualified as Form
272239import Web.HttpApiData (ToHttpApiData (..))
240+import qualified Blaze.ByteString.Builder as BB
241+import qualified Data.Aeson as A
242+import qualified Data.ByteString as B
243+import qualified Data.ByteString.Lazy as BL
244+import qualified Data.CaseInsensitive as CI
245+import qualified Data.List.NonEmpty as NE
246+import qualified Data.Text as T
247+import qualified Data.Text.Encoding as T
248+import qualified Data.Text.Read as TR
249+import qualified Network.Connection as NC
250+import qualified Network.HTTP.Client as L
251+import qualified Network.HTTP.Client.Internal as LI
252+import qualified Network.HTTP.Client.MultipartFormData as LM
253+import qualified Network.HTTP.Client.TLS as L
254+import qualified Network.HTTP.Types as Y
255+import qualified Web.Authenticate.OAuth as OAuth
256+
257+#if MIN_VERSION_base(4,9,0)
258+import Control.Exception hiding (TypeError)
259+import Data.Kind (Constraint)
260+#else
261+import Control.Exception
262+import GHC.Exts (Constraint)
263+#endif
273264
274265----------------------------------------------------------------------------
275266-- Making a request
@@ -293,7 +284,7 @@ import Web.HttpApiData (ToHttpApiData (..))
293284--
294285-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
295286-- tutorial has a section about HTTP bodies, but usage is very
296−-- straightforward and should be clear from the examples.
287+-- straightforward and should be clear from the examples below.
297288--
298289-- @response@ is a type hint how to make and interpret response of an HTTP
299290-- request. Out-of-the-box it can be the following:
@@ -319,7 +310,6 @@ import Web.HttpApiData (ToHttpApiData (..))
319310-- First, this is a piece of boilerplate that should be in place before you
320311-- try the examples:
321312--
322−-- > {-# LANGUAGE DeriveGeneric #-}
323313-- > {-# LANGUAGE OverloadedStrings #-}
324314-- >
325315-- > module Main (main) where
@@ -327,20 +317,20 @@ import Web.HttpApiData (ToHttpApiData (..))
327317-- > import Control.Monad
328318-- > import Control.Monad.IO.Class
329319-- > import Data.Aeson
320+-- > import Data.Default.Class
330321-- > import Data.Maybe (fromJust)
331322-- > import Data.Monoid ((<>))
332323-- > import Data.Text (Text)
333324-- > import GHC.Generics
334325-- > import Network.HTTP.Req
335326-- > import qualified Data.ByteString.Char8 as B
336−-- > import qualified Text.URI as URI
337327--
338328-- We will be making requests against the <https://httpbin.org> service.
339329--
340330-- Make a GET request, grab 5 random bytes:
341331--
342332-- > main :: IO ()
343−-- > main = runReq defaultHttpConfig $ do
333+-- > main = runReq def $ do
344334-- > let n :: Int
345335-- > n = 5
346336-- > bs <- req GET (https "httpbin.org" /: "bytes" /~ n) NoReqBody bsResponse mempty
@@ -350,7 +340,7 @@ import Web.HttpApiData (ToHttpApiData (..))
350340-- seed of the generator:
351341--
352342-- > main :: IO ()
353−-- > main = runReq defaultHttpConfig $ do
343+-- > main = runReq def $ do
354344-- > let n, seed :: Int
355345-- > n = 5
356346-- > seed = 100
@@ -369,7 +359,7 @@ import Web.HttpApiData (ToHttpApiData (..))
369359-- > instance FromJSON MyData
370360-- >
371361-- > main :: IO ()
372−-- > main = runReq defaultHttpConfig $ do
362+-- > main = runReq def $ do
373363-- > let myData = MyData
374364-- > { size = 6
375365-- > , color = "Green" }
@@ -379,7 +369,7 @@ import Web.HttpApiData (ToHttpApiData (..))
379369-- Sending URL-encoded body:
380370--
381371-- > main :: IO ()
382−-- > main = runReq defaultHttpConfig $ do
372+-- > main = runReq def $ do
383373-- > let params =
384374-- > "foo" =: ("bar" :: Text) <>
385375-- > queryFlag "baz"
@@ -389,11 +379,10 @@ import Web.HttpApiData (ToHttpApiData (..))
389379-- Using various optional parameters and URL that is not known in advance:
390380--
391381-- > main :: IO ()
392−-- > main = runReq defaultHttpConfig $ do
382+-- > main = runReq def $ do
393383-- > -- This is an example of what to do when URL is given dynamically. Of
394384-- > -- course in a real application you may not want to use 'fromJust'.
395−-- > uri <- URI.mkURI "https://httpbin.org/get?foo=bar"
396−-- > let (url, options) = fromJust (useHttpsURI uri)
385+-- > let (url, options) = fromJust (parseUrlHttps "https://httpbin.org/get?foo=bar")
397386-- > response <- req GET url NoReqBody jsonResponse $
398387-- > "from" =: (15 :: Int) <>
399388-- > "to" =: (67 :: Int) <>
@@ -401,138 +390,60 @@ import Web.HttpApiData (ToHttpApiData (..))
401390-- > options <> -- contains the ?foo=bar part
402391-- > port 443 -- here you can put any port of course
403392-- > liftIO $ print (responseBody response :: Value)
404−req ::
405− ( MonadHttp m,
406− HttpMethod method,
407− HttpBody body,
408− HttpResponse response,
409− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
410− ) =>
411− -- | HTTP method
412− method ->
413− -- | 'Url'—location of resource
414− Url scheme ->
415− -- | Body of the request
416− body ->
417− -- | A hint how to interpret response
418− Proxy response ->
419− -- | Collection of optional parameters
420− Option scheme ->
421− -- | Response
422− m response
423−req method url body responseProxy options =
424− reqCb method url body responseProxy options pure
393+
394+req
395+ :: ( MonadHttp m
396+ , HttpMethod method
397+ , HttpBody body
398+ , HttpResponse response
399+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
400+ => method -- ^ HTTP method
401+ -> Url scheme -- ^ 'Url'—location of resource
402+ -> body -- ^ Body of the request
403+ -> Proxy response -- ^ A hint how to interpret response
404+ -> Option scheme -- ^ Collection of optional parameters
405+ -> m response -- ^ Response
406+req method url body Proxy options =
407+ reqBr method url body options getHttpResponse
425408
426409-- | A version of 'req' that does not use one of the predefined instances of
427410-- 'HttpResponse' but instead allows the user to consume @'L.Response'
428411-- 'L.BodyReader'@ manually, in a custom way.
429412--
430413-- @since 1.0.0
431−reqBr ::
432− ( MonadHttp m,
433− HttpMethod method,
434− HttpBody body,
435− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
436− ) =>
437− -- | HTTP method
438− method ->
439− -- | 'Url'—location of resource
440− Url scheme ->
441− -- | Body of the request
442− body ->
443− -- | Collection of optional parameters
444− Option scheme ->
445− -- | How to consume response
446− (L.Response L.BodyReader -> IO a) ->
447− -- | Result
448− m a
449−reqBr method url body options consume =
450− req' method url body options (reqHandler consume)
451−
452−-- | A version of 'req' that takes a callback to modify the 'L.Request', but
453−-- otherwise performs the request identically.
454−--
455−-- @since 3.7.0
456−reqCb ::
457− ( MonadHttp m,
458− HttpMethod method,
459− HttpBody body,
460− HttpResponse response,
461− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
462− ) =>
463− -- | HTTP method
464− method ->
465− -- | 'Url'—location of resource
466− Url scheme ->
467− -- | Body of the request
468− body ->
469− -- | A hint how to interpret response
470− Proxy response ->
471− -- | Collection of optional parameters
472− Option scheme ->
473− -- | Callback to modify the request
474− (L.Request -> m L.Request) ->
475− -- | Response
476− m response
477−reqCb method url body responseProxy options adjustRequest =
478− req' method url body (options <> extraOptions) $ \request manager -> do
479− request' <- adjustRequest request
480− reqHandler getHttpResponse request' manager
481− where
482− extraOptions =
483− case acceptHeader responseProxy of
484− Nothing -> mempty
485− Just accept -> header "Accept" accept
486−
487−-- | The default handler function that the higher-level request functions
488−-- pass to 'req''. Internal function.
489−--
490−-- @since 3.7.0
491−reqHandler ::
492− (MonadHttp m) =>
493− -- | How to get final result from a 'L.Response'
494− (L.Response L.BodyReader -> IO b) ->
495− -- | 'L.Request' to perform
496− L.Request ->
497− -- | 'L.Manager' to use
498− L.Manager ->
499− m b
500−reqHandler consume request manager = do
501− HttpConfig {..} <- getHttpConfig
414+
415+reqBr
416+ :: ( MonadHttp m
417+ , HttpMethod method
418+ , HttpBody body
419+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
420+ => method -- ^ HTTP method
421+ -> Url scheme -- ^ 'Url'—location of resource
422+ -> body -- ^ Body of the request
423+ -> Option scheme -- ^ Collection of optional parameters
424+ -> (L.Response L.BodyReader -> IO a) -- ^ How to consume response
425+ -> m a -- ^ Result
426+reqBr method url body options consume = req' method url body options $ \request manager -> do
427+ HttpConfig {..} <- getHttpConfig
502428 let wrapVanilla = handle (throwIO . VanillaHttpException)
503− wrapExc = handle (throwIO . LI.toHttpException request)
504− withRRef =
505− bracket
506− (newIORef Nothing)
507− (readIORef >=> mapM_ L.responseClose)
508− (liftIO . try . wrapVanilla . wrapExc)
509− ( withRRef $ \rref -> do
510− let openResponse = mask_ $ do
511− r <- readIORef rref
512− mapM_ L.responseClose r
513− r' <- L.responseOpen request manager
514− writeIORef rref (Just r')
515− return r'
516− exceptionRetryPolicies =
517− skipAsyncExceptions
518− ++ [ \retryStatus -> Handler $ \e ->
519− return $ httpConfigRetryJudgeException retryStatus e
520− ]
521− r <-
522− retrying
523− httpConfigRetryPolicy
524− (\retryStatus r -> return $ httpConfigRetryJudge retryStatus r)
525− ( const
526− ( recovering
527− httpConfigRetryPolicy
528− exceptionRetryPolicies
529− (const openResponse)
530− )
531− )
532− (preview, r') <- grabPreview httpConfigBodyPreviewLength r
533− mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
534− consume r'
535− )
429+ wrapExc = handle (throwIO . LI.toHttpException request)
430+ withRRef = bracket
431+ (newIORef Nothing)
432+ (readIORef >=> mapM_ L.responseClose)
433+ (liftIO . try . wrapVanilla . wrapExc) (withRRef $ \rref -> do
434+ let openResponse = mask_ $ do
435+ r <- readIORef rref
436+ mapM_ L.responseClose r
437+ r' <- L.responseOpen request manager
438+ writeIORef rref (Just r')
439+ return r'
440+ r <- retrying
441+ httpConfigRetryPolicy
442+ (\st r -> return $ httpConfigRetryJudge st r)
443+ (const openResponse)
444+ (preview, r') <- grabPreview bodyPreviewLength r
445+ mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
446+ consume r')
536447 >>= either handleHttpException return
537448
538449-- | Mostly like 'req' with respect to its arguments, but accepts a callback
@@ -543,57 +454,51 @@ reqHandler consume request manager = do
543454-- 'L.Request' and allows you to use it.
544455--
545456-- @since 0.3.0
546−req' ::
547− forall m method body scheme a.
548− ( MonadHttp m,
549− HttpMethod method,
550− HttpBody body,
551− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
552− ) =>
553− -- | HTTP method
554− method ->
555− -- | 'Url'—location of resource
556− Url scheme ->
557− -- | Body of the request
558− body ->
559− -- | Collection of optional parameters
560− Option scheme ->
561− -- | How to perform request
562− (L.Request -> L.Manager -> m a) ->
563− -- | Result
564− m a
457+
458+req'
459+ :: forall m method body scheme a.
460+ ( MonadHttp m
461+ , HttpMethod method
462+ , HttpBody body
463+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
464+ => method -- ^ HTTP method
465+ -> Url scheme -- ^ 'Url'—location of resource
466+ -> body -- ^ Body of the request
467+ -> Option scheme -- ^ Collection of optional parameters
468+ -> (L.Request -> L.Manager -> m a) -- ^ How to perform request
469+ -> m a -- ^ Result
565470req' method url body options m = do
566− config <- getHttpConfig
471+ config@HttpConfig {..} <- getHttpConfig
567472 let -- NOTE First appearance of any given header wins. This allows to
568473 -- “overwrite” headers when we construct a request by cons-ing.
569474 nubHeaders = Endo $ \x ->
570− x {L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x)}
571− request' =
572− flip appEndo L.defaultRequest $
573− -- NOTE The order of 'mappend's matters, here method is overwritten
574− -- first and 'options' take effect last. In particular, this means
575− -- that 'options' can overwrite things set by other request
576− -- components, which is useful for setting port number,
577− -- "Content-Type" header, etc.
578− nubHeaders
579− <> getRequestMod options
580− <> getRequestMod config
581− <> getRequestMod (Tagged body :: Tagged "body" body)
582− <> getRequestMod url
583− <> getRequestMod (Tagged method :: Tagged "method" method)
475+ x { L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x) }
476+ request' = flip appEndo L.defaultRequest $
477+ -- NOTE The order of 'mappend's matters, here method is overwritten
478+ -- first and 'options' take effect last. In particular, this means
479+ -- that 'options' can overwrite things set by other request
480+ -- components, which is useful for setting port number,
481+ -- "Content-Type" header, etc.
482+ nubHeaders <>
483+ getRequestMod options <>
484+ getRequestMod config <>
485+ getRequestMod (Womb body :: Womb "body" body) <>
486+ getRequestMod url <>
487+ getRequestMod (Womb method :: Womb "method" method)
584488 request <- finalizeRequest options request'
585489 withReqManager (m request)
586490
587491-- | 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
492+-- of the library uses. This allows to reuse connections that the
589493-- 'L.Manager' controls.
590−withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591−withReqManager m = m globalManager
592494
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'.
495+withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
496+withReqManager m = liftIO (readIORef globalManager) >>= m
497+
498+-- | Global 'L.Manager' that 'req' uses. Here we just go with the default
499+-- settings, so users don't need to deal with this manager stuff at all, but
500+-- when we create a request, instance 'HttpConfig' can affect the default
501+-- settings via 'getHttpConfig'.
597502--
598503-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
599504-- The value of 'globalManager' is named and lives on top level. This means
@@ -601,20 +506,17 @@ withReqManager m = m globalManager
601506-- manager. From that moment on the 'IORef' will be just reused—exactly the
602507-- behavior we want here in order to maximize connection sharing. GHC could
603508-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
604−globalManager :: L.Manager
509+
510+globalManager :: IORef L.Manager
605511globalManager = unsafePerformIO $ do
606512 context <- NC.initConnectionContext
607− let settings =
608− L.mkManagerSettingsContext
609− (Just context)
610− def
611− Nothing
513+ let settings = L.mkManagerSettingsContext (Just context) def Nothing
612514 manager <- L.newManager settings
613− return manager
515+ newIORef manager
614516{-# NOINLINE globalManager #-}
615517
616518----------------------------------------------------------------------------
617−-- Embedding requests in your monad
519+-- Embedding requests into your monad
618520
619521-- $embedding-requests
620522--
@@ -623,44 +525,56 @@ globalManager = unsafePerformIO $ do
623525--
624526-- When writing a library, keep your API polymorphic in terms of
625527-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
626−-- 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).
528+-- Another option is to use @newtype@ wrapped monad stack and define
529+-- 'MonadHttp' for it. As of version /0.4.0/, the 'Req' monad that follows
530+-- this strategy is provided out-of-the-box (see below).
629531
630532-- | A type class for monads that support performing HTTP requests.
631533-- Typically, you only need to define the 'handleHttpException' method
632534-- unless you want to tweak 'HttpConfig'.
633−class (MonadIO m) => MonadHttp m where
535+
536+class MonadIO m => MonadHttp m where
537+
634538 -- | This method describes how to deal with 'HttpException' that was
635539 -- caught by the library. One option is to re-throw it if you are OK with
636540 -- exceptions, but if you prefer working with something like
637541 -- 'Control.Monad.Except.MonadError', this is the right place to pass it to
638542 -- 'Control.Monad.Except.throwError'.
543+
639544 handleHttpException :: HttpException -> m a
640545
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
546+ -- | Return 'HttpConfig' to be used when performing HTTP requests. Default
547+ -- implementation returns its 'def' value, which is described in the
548+ -- documentation for the type. Common usage pattern with manually defined
549+ -- 'getHttpConfig' is to return some hard-coded value, or a value
645550 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
646551 -- approach to configuration is desirable.
552+
647553 getHttpConfig :: m HttpConfig
648− getHttpConfig = return defaultHttpConfig
554+ getHttpConfig = return def
555+
556+-- | 'HttpConfig' contains general and default settings to be used when
557+-- making HTTP requests.
649558
650−-- | 'HttpConfig' contains settings to be used when making HTTP requests.
651559data HttpConfig = HttpConfig
652− { -- | Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
560+ { httpConfigProxy :: Maybe L.Proxy
561+ -- ^ Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
653562 -- environment variables are respected, this setting overwrites them.
654563 -- Default value: 'Nothing'.
655− httpConfigProxy :: Maybe L.Proxy,
656− -- | How many redirects to follow when getting a resource. Default
564+ , httpConfigRedirectCount :: Int
565+ -- ^ How many redirects to follow when getting a resource. Default
657566 -- value: 10.
658− httpConfigRedirectCount :: Int,
659− -- | Alternative 'L.Manager' to use. 'Nothing' (default value) means
567+ , httpConfigAltManager :: Maybe L.Manager
568+ -- ^ Alternative 'L.Manager' to use. 'Nothing' (default value) means
660569 -- that the default implicit manager will be used (that's what you want
661570 -- in 99% of cases).
662− httpConfigAltManager :: Maybe L.Manager,
663− -- | Function to check the response immediately after receiving the
571+ , httpConfigCheckResponse
572+ :: forall b.
573+ L.Request
574+ -> L.Response b
575+ -> ByteString
576+ -> Maybe L.HttpExceptionContent
577+ -- ^ Function to check the response immediately after receiving the
664578 -- status and headers, before streaming of response body. The third
665579 -- argument is the beginning of response body (typically first 1024
666580 -- bytes). This is used for throwing exceptions on non-success status
@@ -682,106 +596,63 @@ data HttpConfig = HttpConfig
682596 -- /1.0.0/.
683597 --
684598 -- @since 0.3.0
685− httpConfigCheckResponse ::
686− forall b.
687− L.Request ->
688− L.Response b ->
689− ByteString ->
690− Maybe L.HttpExceptionContent,
691− -- | The retry policy to use for request retrying. By default 'def' is
599+ , httpConfigRetryPolicy :: RetryPolicy
600+ -- ^ The retry policy to use for request retrying. By default 'def' is
692601 -- used (see 'RetryPolicyM').
693602 --
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/.
603+ -- __Note__: signature of this function was changed in the version
604+ -- /1.0.0/.
696605 --
697606 -- @since 0.3.0
698− httpConfigRetryPolicy :: RetryPolicyM IO,
699− -- | The function is used to decide whether to retry a request. 'True'
607+ , httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool
608+ -- ^ The function is used to decide whether to retry a request. 'True'
700609 -- means that the request should be retried.
701610 --
702611 -- __Note__: signature of this function was changed in the version
703612 -- /1.0.0/.
704613 --
705614 -- @since 0.3.0
706− httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool,
707− -- | Similar to 'httpConfigRetryJudge', but is used to decide when to
708− -- retry requests that resulted in an exception. By default it retries
709− -- on response timeout and connection timeout (changed in version
710− -- /3.8.0/).
711− --
712− -- @since 3.4.0
713− httpConfigRetryJudgeException :: RetryStatus -> SomeException -> Bool,
714− -- | Max length of preview fragment of response body.
715− --
716− -- @since 3.6.0
717− httpConfigBodyPreviewLength :: forall a. (Num a) => a
718− }
719−
720−-- | The default value of 'HttpConfig'.
721−--
722−-- @since 2.0.0
723−defaultHttpConfig :: HttpConfig
724−defaultHttpConfig =
725− HttpConfig
726− { httpConfigProxy = Nothing,
727− httpConfigRedirectCount = 10,
728− httpConfigAltManager = Nothing,
729− httpConfigCheckResponse = \_ response preview ->
615+ } deriving Typeable
616+
617+instance Default HttpConfig where
618+ def = HttpConfig
619+ { httpConfigProxy = Nothing
620+ , httpConfigRedirectCount = 10
621+ , httpConfigAltManager = Nothing
622+ , httpConfigCheckResponse = \_ response preview ->
730623 let scode = statusCode response
731− in if 200 <= scode && scode < 300
732− then Nothing
733− else Just (L.StatusCodeException (void response) preview),
734− httpConfigRetryPolicy = retryPolicyDefault,
735− httpConfigRetryJudge = \_ response ->
736− statusCode response
737− `elem` [ 408, -- Request timeout
738− 504, -- Gateway timeout
739− 524, -- A timeout occurred
740− 598, -- (Informal convention) Network read timeout error
741− 599 -- (Informal convention) Network connect timeout error
742− ],
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,
751− httpConfigBodyPreviewLength = 1024
624+ in if 200 <= scode && scode < 300
625+ then Nothing
626+ else Just (L.StatusCodeException (void response) preview)
627+ , httpConfigRetryPolicy = def
628+ , httpConfigRetryJudge = \_ response ->
629+ statusCode response `elem`
630+ [ 408 -- Request timeout
631+ , 504 -- Gateway timeout
632+ , 524 -- A timeout occurred
633+ , 598 -- (Informal convention) Network read timeout error
634+ , 599 -- (Informal convention) Network connect timeout error
635+ ]
752636 }
753− where
754− statusCode = Y.statusCode . L.responseStatus
637+ where
638+ statusCode = Y.statusCode . L.responseStatus
755639
756640instance RequestComponent HttpConfig where
757641 getRequestMod HttpConfig {..} = Endo $ \x ->
758− x
759− { L.proxy = httpConfigProxy,
760− L.redirectCount = httpConfigRedirectCount,
761− LI.requestManagerOverride = httpConfigAltManager
762− }
642+ x { L.proxy = httpConfigProxy
643+ , L.redirectCount = httpConfigRedirectCount
644+ , LI.requestManagerOverride = httpConfigAltManager }
763645
764−-- | A monad that allows us to run 'req' in any 'IO'-enabled monad without
646+-- | A monad that allows to run 'req' in any 'IO'-enabled monad without
765647-- having to define new instances.
766648--
767649-- @since 0.4.0
768−newtype Req a = Req (ReaderT HttpConfig IO a)
769− deriving
770− ( Functor,
771− Applicative,
772− Monad,
773− MonadIO,
774− MonadUnliftIO
775− )
776−
777−-- | @since 3.7.0
778−deriving instance MonadThrow Req
779−
780−-- | @since 3.7.0
781−deriving instance MonadCatch Req
782650
783−-- | @since 3.7.0
784−deriving instance MonadMask Req
651+newtype Req a = Req (ReaderT HttpConfig IO a)
652+ deriving ( Functor
653+ , Applicative
654+ , Monad
655+ , MonadIO )
785656
786657instance MonadBase IO Req where
787658 liftBase = liftIO
@@ -790,99 +661,22 @@ instance MonadBaseControl IO Req where
790661 type StM Req a = a
791662 liftBaseWith f = Req . ReaderT $ \r -> f (runReq r)
792663 {-# INLINEABLE liftBaseWith #-}
793− restoreM = Req . ReaderT . const . return
664+ restoreM = Req . ReaderT . const . return
794665 {-# INLINEABLE restoreM #-}
795666
796667instance MonadHttp Req where
797668 handleHttpException = Req . lift . throwIO
798− getHttpConfig = Req ask
799−
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
669+ getHttpConfig = Req ask
874670
875671-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
876−-- the case of an exceptional situation an 'HttpException' will be thrown.
672+-- case of exceptional situation an 'HttpException' will be thrown.
877673--
878674-- @since 0.4.0
879−runReq ::
880− (MonadIO m) =>
881− -- | 'HttpConfig' to use
882− HttpConfig ->
883− -- | Computation to run
884− Req a ->
885− m a
675+
676+runReq :: MonadIO m
677+ => HttpConfig -- ^ 'HttpConfig' to use
678+ -> Req a -- ^ Computation to run
679+ -> m a
886680runReq config (Req m) = liftIO (runReaderT m config)
887681
888682----------------------------------------------------------------------------
@@ -898,6 +692,7 @@ runReq config (Req m) = liftIO (runReaderT m config)
898692-- define a new method that will works seamlessly, see 'HttpMethod'.
899693
900694-- | 'GET' method.
695+
901696data GET = GET
902697
903698instance HttpMethod GET where
@@ -905,6 +700,7 @@ instance HttpMethod GET where
905700 httpMethodName Proxy = Y.methodGet
906701
907702-- | 'POST' method.
703+
908704data POST = POST
909705
910706instance HttpMethod POST where
@@ -912,6 +708,7 @@ instance HttpMethod POST where
912708 httpMethodName Proxy = Y.methodPost
913709
914710-- | 'HEAD' method.
711+
915712data HEAD = HEAD
916713
917714instance HttpMethod HEAD where
@@ -919,24 +716,26 @@ instance HttpMethod HEAD where
919716 httpMethodName Proxy = Y.methodHead
920717
921718-- | 'PUT' method.
719+
922720data PUT = PUT
923721
924722instance HttpMethod PUT where
925723 type AllowsBody PUT = 'CanHaveBody
926724 httpMethodName Proxy = Y.methodPut
927725
928−-- | 'DELETE' method. RFC 7231 allows a payload in DELETE but without
929−-- semantics.
930−--
931−-- __Note__: before version /3.4.0/ this method did not allow request
932−-- bodies.
726+-- | 'DELETE' method. This data type does not allow having request body with
727+-- 'DELETE' requests, as it should be. However some APIs may expect 'DELETE'
728+-- requests to have bodies, in that case define your own variation of
729+-- 'DELETE' method and allow it to have a body.
730+
933731data DELETE = DELETE
934732
935733instance HttpMethod DELETE where
936− type AllowsBody DELETE = 'CanHaveBody
734+ type AllowsBody DELETE = 'NoBody
937735 httpMethodName Proxy = Y.methodDelete
938736
939737-- | 'TRACE' method.
738+
940739data TRACE = TRACE
941740
942741instance HttpMethod TRACE where
@@ -944,6 +743,7 @@ instance HttpMethod TRACE where
944743 httpMethodName Proxy = Y.methodTrace
945744
946745-- | 'CONNECT' method.
746+
947747data CONNECT = CONNECT
948748
949749instance HttpMethod CONNECT where
@@ -951,6 +751,7 @@ instance HttpMethod CONNECT where
951751 httpMethodName Proxy = Y.methodConnect
952752
953753-- | 'OPTIONS' method.
754+
954755data OPTIONS = OPTIONS
955756
956757instance HttpMethod OPTIONS where
@@ -958,6 +759,7 @@ instance HttpMethod OPTIONS where
958759 httpMethodName Proxy = Y.methodOptions
959760
960761-- | 'PATCH' method.
762+
961763data PATCH = PATCH
962764
963765instance HttpMethod PATCH where
@@ -972,19 +774,23 @@ instance HttpMethod PATCH where
972774-- > instance HttpMethod COPY where
973775-- > type AllowsBody COPY = 'CanHaveBody
974776-- > httpMethodName Proxy = "COPY"
777+
975778class HttpMethod a where
779+
976780 -- | Type function 'AllowsBody' returns a type of kind 'CanHaveBody' which
977− -- tells the rest of the library whether the method can have body or not.
978− -- We use the special type 'CanHaveBody' lifted to the kind level instead
979− -- of 'Bool' to get more user-friendly compiler messages.
781+ -- tells the rest of the library whether the method can have a body or
782+ -- not. We use the special type 'CanHaveBody' lifted to the kind level
783+ -- instead of 'Bool' to get more user-friendly compiler messages.
784+
980785 type AllowsBody a :: CanHaveBody
981786
982787 -- | Return name of the method as a 'ByteString'.
788+
983789 httpMethodName :: Proxy a -> ByteString
984790
985−instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
791+instance HttpMethod method => RequestComponent (Womb "method" method) where
986792 getRequestMod _ = Endo $ \x ->
987− x {L.method = httpMethodName (Proxy :: Proxy method)}
793+ x { L.method = httpMethodName (Proxy :: Proxy method) }
988794
989795----------------------------------------------------------------------------
990796-- Request—URL
@@ -992,7 +798,7 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
992798-- $url
993799--
994800-- We use 'Url's which are correct by construction, see 'Url'. To build a
995−-- 'Url' from a 'URI', use 'useHttpURI', 'useHttpsURI', or generic 'useURI'.
801+-- 'Url' from a 'ByteString', use 'parseUrlHttp' or 'parseUrlHttps'.
996802
997803-- | Request's 'Url'. Start constructing your 'Url' with 'http' or 'https'
998804-- specifying the scheme and host at the same time. Then use the @('/~')@
@@ -1022,194 +828,91 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
1022828--
1023829-- > https "юникод.рф"
1024830-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
831+
1025832data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1026833 -- NOTE The second value is the path segments in reversed order.
1027− deriving (Eq, Ord, Show, Data, Generic)
1028−
1029−type role Url nominal
1030−
1031−-- With template-haskell >=2.15 and text >=1.2.4 Lift can be derived, however
1032−-- the derived lift forgets the type of the scheme.
1033−instance (Typeable scheme) => TH.Lift (Url scheme) where
1034− lift url =
1035− TH.dataToExpQ (fmap liftText . cast) url `TH.sigE` case url of
1036− Url Http _ -> [t|Url 'Http|]
1037− Url Https _ -> [t|Url 'Https|]
1038− where
1039− liftText t = TH.AppE (TH.VarE 'T.pack) <$> TH.lift (T.unpack t)
1040− liftTyped = TH.Code . TH.unsafeTExpCoerce . TH.lift
834+ deriving (Eq, Ord, Show, Data, Typeable, Generic)
1041835
1042−-- | Given host name, produce a 'Url' which has “http” as its scheme and
836+-- | Given host name, produce a 'Url' which have “http” as its scheme and
1043837-- empty path. This also sets port to @80@.
838+
1044839http :: Text -> Url 'Http
1045840http = Url Http . pure
1046841
1047−-- | Given host name, produce a 'Url' which has “https” as its scheme and
842+-- | Given host name, produce a 'Url' which have “https” as its scheme and
1048843-- empty path. This also sets port to @443@.
844+
1049845https :: Text -> Url 'Https
1050846https = Url Https . pure
1051847
1052−-- | Grow a given 'Url' appending a single path segment to it. Note that the
848+-- | Grow given 'Url' appending a single path segment to it. Note that the
1053849-- path segment can be of any type that is an instance of 'ToHttpApiData'.
1054−infixl 5 /~
1055850
1056−(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
851+infixl 5 /~
852+(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
1057853Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
1058854
1059−-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
1060−-- when next URL piece is a 'Data.Text.Text' literal.
1061−infixl 5 /:
855+-- | Type-constrained version of @('/~')@ to remove ambiguity in the cases
856+-- when next URL piece is a 'Text' literal.
1062857
858+infixl 5 /:
1063859(/:) :: Url scheme -> Text -> Url scheme
1064860(/:) = (/~)
1065861
1066−-- | Render a 'Url' as 'Text'.
1067−--
1068−-- @since 3.4.0
1069−renderUrl :: Url scheme -> Text
1070−renderUrl = \case
1071− Url Https parts ->
1072− "https://" <> renderParts parts
1073− Url Http parts ->
1074− "http://" <> renderParts parts
1075− where
1076− renderParts parts =
1077− T.intercalate "/" (reverse $ NE.toList parts)
1078−
1079−-- | The 'useHttpURI' function provides an alternative method to get 'Url'
1080−-- (possibly with some 'Option's) from a 'URI'. This is useful when you are
1081−-- given a URL to query dynamically and don't know it beforehand.
1082−--
1083−-- This function expects the scheme to be “http” and host to be present.
1084−--
1085−-- @since 3.0.0
1086−useHttpURI :: URI -> Maybe (Url 'Http, Option scheme)
1087−useHttpURI uri = do
1088− guard (URI.uriScheme uri == Just [QQ.scheme|http|])
1089− urlHead <- http <$> uriHost uri
1090− let url = case URI.uriPath uri of
1091− Nothing -> urlHead
1092− Just uriPath -> uriPathToUrl uriPath urlHead
1093− return (url, uriOptions uri)
1094−
1095−-- | Just like 'useHttpURI', but expects the “https” scheme.
1096−--
1097−-- @since 3.0.0
1098−useHttpsURI :: URI -> Maybe (Url 'Https, Option scheme)
1099−useHttpsURI uri = do
1100− guard (URI.uriScheme uri == Just [QQ.scheme|https|])
1101− urlHead <- https <$> uriHost uri
1102− let url = case URI.uriPath uri of
1103− Nothing -> urlHead
1104− Just uriPath -> uriPathToUrl uriPath urlHead
1105− return (url, uriOptions uri)
1106−
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−
1119−-- | A combination of 'useHttpURI' and 'useHttpsURI' for cases when scheme
1120−-- is not known in advance.
1121−--
1122−-- @since 3.0.0
1123−useURI ::
1124− URI ->
1125− Maybe
1126− ( Either
1127− (Url 'Http, Option scheme0)
1128− (Url 'Https, Option scheme1)
1129− )
1130−useURI uri =
1131− (Left <$> useHttpURI uri) <|> (Right <$> useHttpsURI uri)
1132−
1133−-- | An internal helper function to extract host from a 'URI'.
1134−uriHost :: URI -> Maybe Text
1135−uriHost uri = case URI.uriAuthority uri of
1136− Left _ -> Nothing
1137− Right URI.Authority {..} ->
1138− Just (URI.unRText authHost)
1139−
1140−-- | A quasiquoter to build an 'Url' and 'Option' tuple. The type of the
1141−-- generated expression is @('Url' scheme0, 'Option' scheme1)@ with
1142−-- @scheme0@ being either 'Http' or 'Https' depending on the input.
1143−--
1144−-- @since 3.2.0
1145−urlQ :: TH.QuasiQuoter
1146−urlQ =
1147− TH.QuasiQuoter
1148− { quoteExp = \str ->
1149− case URI.mkURI (T.pack str) of
1150− Left err -> fail (displayException err)
1151− Right uri -> case useURI uri of
1152− Nothing -> fail "Not a HTTP or HTTPS URL"
1153− Just eurl ->
1154− TH.tupE
1155− [ either (TH.lift . fst) (TH.lift . fst) eurl,
1156− [|uriOptions uri|]
1157− ],
1158− quotePat = error "This usage is not supported",
1159− quoteType = error "This usage is not supported",
1160− quoteDec = error "This usage is not supported"
1161− }
1162−
1163−-- | An internal helper function to extract 'Option's from a 'URI'.
1164−uriOptions :: forall scheme. URI -> Option scheme
1165−uriOptions uri =
1166− mconcat
1167− [ auth,
1168− query,
1169− port'
1170− -- , fragment'
1171− ]
1172− where
1173− (auth, port') =
1174− case URI.uriAuthority uri of
1175− Left _ -> (mempty, mempty)
1176− Right URI.Authority {..} ->
1177− let auth0 = case authUserInfo of
1178− Nothing -> mempty
1179− Just URI.UserInfo {..} ->
1180− let username = T.encodeUtf8 (URI.unRText uiUsername)
1181− password = maybe "" (T.encodeUtf8 . URI.unRText) uiPassword
1182− in basicAuthUnsafe username password
1183− port0 = case authPort of
1184− Nothing -> mempty
1185− Just port'' -> port (fromIntegral port'')
1186− in (auth0, port0)
1187− query =
1188− let liftQueryParam = \case
1189− URI.QueryFlag t -> queryFlag (URI.unRText t)
1190− URI.QueryParam k v -> URI.unRText k =: URI.unRText v
1191− in mconcat (liftQueryParam <$> URI.uriQuery uri)
1192−
1193−-- TODO Blocked on upstream: https://github.com/snoyberg/http-client/issues/424
1194−-- fragment' =
1195−-- case URI.uriFragment uri of
1196−-- Nothing -> mempty
1197−-- Just fragment'' -> fragment (URI.unRText fragment'')
862+-- | The 'parseUrlHttp' function provides an alternative method to get 'Url'
863+-- (possibly with some 'Option's) from a 'ByteString'. This is useful when
864+-- you are given a URL to query dynamically and don't know it beforehand.
865+-- The function parses 'ByteString' because it's the correct type to
866+-- represent a URL, as 'Url' cannot contain characters outside of ASCII
867+-- range, thus we can consider every character a 'Data.Word.Word8' value.
868+--
869+-- This function only parses 'Url' (scheme, host, path) and optional query
870+-- parameters that are returned as 'Option'. It does not parse method name
871+-- or authentication info from given 'ByteString'.
872+
873+parseUrlHttp :: ByteString -> Maybe (Url 'Http, Option scheme)
874+parseUrlHttp url' = do
875+ url <- B.stripPrefix "http://" url'
876+ (host :| path, option) <- parseUrlHelper url
877+ return (foldl (/:) (http host) path, option)
878+
879+-- | Just like 'parseUrlHttp', but expects “https” scheme.
880+
881+parseUrlHttps :: ByteString -> Maybe (Url 'Https, Option scheme)
882+parseUrlHttps url' = do
883+ url <- B.stripPrefix "https://" url'
884+ (host :| path, option) <- parseUrlHelper url
885+ return (foldl (/:) (https host) path, option)
886+
887+-- | Get host\/collection of path pieces and possibly query parameters
888+-- already converted to 'Option'. This function is not public.
889+
890+parseUrlHelper :: ByteString -> Maybe (NonEmpty Text, Option scheme)
891+parseUrlHelper url = do
892+ let (path', query') = B.break (== 0x3f) url
893+ query = mconcat (uncurry queryParam <$> Y.parseQueryText query')
894+ p' :| ps <- NE.nonEmpty (Y.decodePathSegments path')
895+ (p, port') <-
896+ case T.break (== ':') p' of
897+ (x, "") -> return (x, mempty)
898+ (x, prt) ->
899+ case TR.decimal (T.drop 1 prt) of
900+ Right (prt',"") -> return (x, port prt')
901+ _ -> Nothing
902+ return (p :| ps, query <> port')
1198903
1199904instance RequestComponent (Url scheme) where
1200905 getRequestMod (Url scheme segments) = Endo $ \x ->
1201− let (host :| path) = NE.reverse segments
1202− in x
1203− { L.secure = case scheme of
1204− Http -> False
1205− Https -> True,
1206− L.port = case scheme of
1207− Http -> 80
1208− Https -> 443,
1209− L.host = Y.urlEncode False (T.encodeUtf8 host),
1210− L.path =
1211− (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path
1212− }
906+ let (host :| path) = NE.reverse segments in
907+ x { L.secure = case scheme of
908+ Http -> False
909+ Https -> True
910+ , L.port = case scheme of
911+ Http -> 80
912+ Https -> 443
913+ , L.host = Y.urlEncode False (T.encodeUtf8 host)
914+ , L.path =
915+ (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path }
1213916
1214917----------------------------------------------------------------------------
1215918-- Request—Body
@@ -1218,37 +921,39 @@ instance RequestComponent (Url scheme) where
1218921--
1219922-- A number of options for request bodies are available. The @Content-Type@
1220923-- header is set for you automatically according to the body option you use
1221−-- (it's always specified in the documentation for a given body option). To
1222−-- add your own way to represent request body, define an instance of
1223−-- 'HttpBody'.
924+-- (it's always specified in documentation for a given body option). To add
925+-- your own way to represent request body, define an instance of 'HttpBody'.
1224926
1225927-- | This data type represents empty body of an HTTP request. This is the
1226928-- data type to use with 'HttpMethod's that cannot have a body, as it's the
1227929-- only type for which 'ProvidesBody' returns 'NoBody'.
1228930--
1229931-- Using of this body option does not set the @Content-Type@ header.
932+
1230933data NoReqBody = NoReqBody
1231934
1232935instance HttpBody NoReqBody where
1233936 getRequestBody NoReqBody = L.RequestBodyBS B.empty
1234937
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.
938+-- | This body option allows to use a JSON object as request body—probably
939+-- the most popular format right now. Just wrap a data type that is an
940+-- instance of 'ToJSON' type class and you are done: it will be converted to
941+-- JSON and inserted as request body.
1239942--
1240943-- This body option sets the @Content-Type@ header to @\"application/json;
1241944-- charset=utf-8\"@ value.
945+
1242946newtype ReqBodyJson a = ReqBodyJson a
1243947
1244−instance (ToJSON a) => HttpBody (ReqBodyJson a) where
948+instance ToJSON a => HttpBody (ReqBodyJson a) where
1245949 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
1246950 getRequestContentType _ = pure "application/json; charset=utf-8"
1247951
1248952-- | This body option streams request body from a file. It is expected that
1249−-- the file size does not change during streaming.
953+-- the file size does not change during the streaming.
1250954--
1251955-- Using of this body option does not set the @Content-Type@ header.
956+
1252957newtype ReqBodyFile = ReqBodyFile FilePath
1253958
1254959instance HttpBody ReqBodyFile where
@@ -1258,6 +963,7 @@ instance HttpBody ReqBodyFile where
1258963-- | HTTP request body represented by a strict 'ByteString'.
1259964--
1260965-- Using of this body option does not set the @Content-Type@ header.
966+
1261967newtype ReqBodyBs = ReqBodyBs ByteString
1262968
1263969instance HttpBody ReqBodyBs where
@@ -1266,19 +972,22 @@ instance HttpBody ReqBodyBs where
1266972-- | HTTP request body represented by a lazy 'BL.ByteString'.
1267973--
1268974-- Using of this body option does not set the @Content-Type@ header.
975+
1269976newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
1270977
1271978instance HttpBody ReqBodyLbs where
1272979 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
1273980
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'.
981+-- | Form URL-encoded body. This can hold a collection of parameters which
982+-- are encoded similarly to query parameters at the end of query string,
983+-- with the only difference that they are stored in request body. The
984+-- similarity is reflected in the API as well, as you can use the same
985+-- combinators you would use to add query parameters: @('=:')@ and
986+-- 'queryFlag'.
1279987--
1280988-- This body option sets the @Content-Type@ header to
1281989-- @\"application/x-www-form-urlencoded\"@ value.
990+
1282991newtype ReqBodyUrlEnc = ReqBodyUrlEnc FormUrlEncodedParam
1283992
1284993instance HttpBody ReqBodyUrlEnc where
@@ -1288,19 +997,13 @@ instance HttpBody ReqBodyUrlEnc where
1288997
1289998-- | An opaque monoidal value that allows to collect URL-encoded parameters
1290999-- to be wrapped in 'ReqBodyUrlEnc'.
1000+
12911001newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
12921002 deriving (Semigroup, Monoid)
12931003
12941004instance QueryParam FormUrlEncodedParam where
12951005 queryParam name mvalue =
12961006 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
13041007
13051008-- | Multipart form data. Please consult the
13061009-- "Network.HTTP.Client.MultipartFormData" module for how to construct
@@ -1330,6 +1033,7 @@ instance FromForm FormUrlEncodedParam where
13301033-- > bsResponse
13311034-- > mempty
13321035-- > liftIO $ print (responseBody response)
1036+
13331037data ReqBodyMultipart = ReqBodyMultipart ByteString LI.RequestBody
13341038
13351039instance HttpBody ReqBodyMultipart where
@@ -1340,64 +1044,70 @@ instance HttpBody ReqBodyMultipart where
13401044-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
13411045--
13421046-- @since 0.2.0
1343−reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
1047+
1048+reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
13441049reqBodyMultipart parts = liftIO $ do
13451050 boundary <- LM.webkitBoundary
1346− body <- LM.renderParts boundary parts
1051+ body <- LM.renderParts boundary parts
13471052 return (ReqBodyMultipart boundary body)
13481053
13491054-- | A type class for things that can be interpreted as an HTTP
13501055-- 'L.RequestBody'.
1056+
13511057class HttpBody body where
1058+
13521059 -- | How to get actual 'L.RequestBody'.
1060+
13531061 getRequestBody :: body -> L.RequestBody
13541062
1355− -- | This method allows us to optionally specify the value of
1356− -- @Content-Type@ header that should be used with particular body option.
1357− -- By default it returns 'Nothing' and so @Content-Type@ is not set.
1063+ -- | This method allows to optionally specify value of @Content-Type@
1064+ -- header that should be used with particular body option. By default it
1065+ -- returns 'Nothing' and so @Content-Type@ is not set.
1066+
13581067 getRequestContentType :: body -> Maybe ByteString
13591068 getRequestContentType = const Nothing
13601069
13611070-- | The type function recognizes 'NoReqBody' as having 'NoBody', while any
1362−-- other body option 'CanHaveBody'. This forces the user to use 'NoReqBody'
1363−-- with 'GET' method and other methods that should not have body.
1071+-- other body option 'CanHaveBody'. This forces user to use 'NoReqBody' with
1072+-- 'GET' method and other methods that should not send a body.
1073+
13641074type family ProvidesBody body :: CanHaveBody where
13651075 ProvidesBody NoReqBody = 'NoBody
1366− ProvidesBody body = 'CanHaveBody
1076+ ProvidesBody body = 'CanHaveBody
13671077
13681078-- | This type function allows any HTTP body if method says it
13691079-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
13701080-- body option to use is 'NoReqBody'.
1371−type family
1372− HttpBodyAllowed
1373− (allowsBody :: CanHaveBody)
1374− (providesBody :: CanHaveBody) ::
1375− Constraint
1376− where
1377− HttpBodyAllowed 'NoBody 'NoBody = ()
1378− HttpBodyAllowed 'CanHaveBody body = ()
1379− HttpBodyAllowed 'NoBody 'CanHaveBody =
1380− TypeError
1381− ('Text "This HTTP method does not allow attaching a request body.")
1382−
1383−instance (HttpBody body) => RequestComponent (Tagged "body" body) where
1384− getRequestMod (Tagged body) = Endo $ \x ->
1385− x
1386− { L.requestBody = getRequestBody body,
1387− L.requestHeaders =
1388− let old = L.requestHeaders x
1389− in case getRequestContentType body of
1390− Nothing -> old
1391− Just contentType ->
1392− (Y.hContentType, contentType) : old
1393− }
1081+--
1082+-- __Note__: users of GHC 8.0.1 and later will see a slightly more friendly
1083+-- error message when method does not allow a body and body is provided.
1084+
1085+type family HttpBodyAllowed
1086+ (allowsBody :: CanHaveBody)
1087+ (providesBody :: CanHaveBody) :: Constraint where
1088+ HttpBodyAllowed 'NoBody 'NoBody = ()
1089+ HttpBodyAllowed 'CanHaveBody body = ()
1090+#if MIN_VERSION_base(4,9,0)
1091+ HttpBodyAllowed 'NoBody 'CanHaveBody = TypeError
1092+ ('Text "This HTTP method does not allow attaching a request body.")
1093+#endif
1094+
1095+instance HttpBody body => RequestComponent (Womb "body" body) where
1096+ getRequestMod (Womb body) = Endo $ \x ->
1097+ x { L.requestBody = getRequestBody body
1098+ , L.requestHeaders =
1099+ let old = L.requestHeaders x in
1100+ case getRequestContentType body of
1101+ Nothing -> old
1102+ Just contentType ->
1103+ (Y.hContentType, contentType) : old }
13941104
13951105----------------------------------------------------------------------------
13961106-- Request—Optional parameters
13971107
13981108-- $optional-parameters
13991109--
1400−-- Optional parameters of request include things like query parameters,
1110+-- Optional parameters to a request include things like query parameters,
14011111-- headers, port number, etc. All optional parameters have the type
14021112-- 'Option', which is a 'Monoid'. This means that you can use 'mempty' as
14031113-- the last argument of 'req' to specify no optional parameters, or combine
@@ -1406,51 +1116,46 @@ instance (HttpBody body) => RequestComponent (Tagged "body" body) where
14061116-- | The opaque 'Option' type is a 'Monoid' you can use to pack collection
14071117-- of optional parameters like query parameters and headers. See sections
14081118-- below to learn which 'Option' primitives are available.
1409−data Option (scheme :: Scheme)
1410− = Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
14111119
1412−-- 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
1415−-- L.Request) is a finalizer that will be applied after all other
1416−-- transformations. This is for authentication methods that sign requests
1417−-- based on data in Request.
1120+data Option (scheme :: Scheme) =
1121+ Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
1122+ -- NOTE 'QueryText' is just [(Text, Maybe Text)], we keep it along with
1123+ -- Request to avoid appending to existing query string in request every
1124+ -- time new parameter is added. Additional Maybe (L.Request -> IO
1125+ -- L.Request) is a finalizer that will be applied after all other
1126+ -- transformations. This is for authentication methods that sign requests
1127+ -- based on data in Request.
14181128
14191129instance Semigroup (Option scheme) where
1420− Option er0 mr0 <> Option er1 mr1 =
1421− Option
1422− (er0 <> er1)
1423− (mr0 <|> mr1)
1130+ Option er0 mr0 <> Option er1 mr1 = Option
1131+ (er0 <> er1) (mr0 <|> mr1)
14241132
14251133instance Monoid (Option scheme) where
1426− mempty = Option mempty Nothing
1134+ mempty = Option mempty Nothing
14271135 mappend = (<>)
14281136
1429−-- | Use 'formToQuery'.
1430−--
1431−-- @since 3.11.0
1432−instance FromForm (Option scheme) where
1433− fromForm = Right . formToQuery
1434−
14351137-- | A helper to create an 'Option' that modifies only collection of query
14361138-- parameters. This helper is not a part of the public API.
1139+
14371140withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
14381141withQueryParams f = Option (Endo (first f)) Nothing
14391142
14401143-- | A helper to create an 'Option' that modifies only 'L.Request'. This
14411144-- helper is not a part of public API.
1145+
14421146withRequest :: (L.Request -> L.Request) -> Option scheme
14431147withRequest f = Option (Endo (second f)) Nothing
14441148
14451149instance RequestComponent (Option scheme) where
14461150 getRequestMod (Option f _) = Endo $ \x ->
14471151 let (qparams, x') = appEndo f ([], x)
1448− query = Y.renderQuery True (Y.queryTextToQuery qparams)
1449− in x' {L.queryString = query}
1152+ query = Y.renderQuery True (Y.queryTextToQuery qparams)
1153+ in x' { L.queryString = query }
14501154
14511155-- | Finalize given 'L.Request' by applying a finalizer from the given
14521156-- 'Option' (if it has any).
1453−finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
1157+
1158+finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
14541159finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
14551160
14561161----------------------------------------------------------------------------
@@ -1469,12 +1174,12 @@ finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
14691174-- This operator is defined in terms of 'queryParam':
14701175--
14711176-- > name =: value = queryParam name (pure value)
1472−infix 7 =:
14731177
1178+infix 7 =:
14741179(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
14751180name =: value = queryParam name (pure value)
14761181
1477−-- | Construct a flag, that is, a valueless query parameter. For example, in
1182+-- | Construct a flag, that is, valueless query parameter. For example, in
14781183-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
14791184-- with a value:
14801185--
@@ -1483,47 +1188,27 @@ name =: value = queryParam name (pure value)
14831188-- This operator is defined in terms of 'queryParam':
14841189--
14851190-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1486−queryFlag :: (QueryParam param) => Text -> param
1487−queryFlag name = queryParam name (Nothing :: Maybe ())
14881191
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
1192+queryFlag :: QueryParam param => Text -> param
1193+queryFlag name = queryParam name (Nothing :: Maybe ())
15061194
15071195-- | A type class for query-parameter-like things. The reason to have an
15081196-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
15091197-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
15101198-- Having the same syntax for these cases seems natural and user-friendly.
1199+
15111200class QueryParam param where
1201+
15121202 -- | Create a query parameter with given name and value. If value is
15131203 -- 'Nothing', it won't be included at all (i.e. you create a flag this
15141204 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
15151205 -- method, because they are easier to read.
1516− queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
15171206
1518− -- | Get the query parameter names and values set by 'queryParam'.
1519− --
1520− -- @since 3.11.0
1521− queryParamToList :: param -> [(Text, Maybe Text)]
1207+ queryParam :: ToHttpApiData a => Text -> Maybe a -> param
15221208
15231209instance QueryParam (Option scheme) where
15241210 queryParam name mvalue =
15251211 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1526− queryParamToList (Option f _) = fst $ appEndo f ([], L.defaultRequest)
15271212
15281213----------------------------------------------------------------------------
15291214-- Request—Optional parameters—Headers
@@ -1532,28 +1217,21 @@ instance QueryParam (Option scheme) where
15321217-- headers with the same names the leftmost header will win. This means, in
15331218-- particular, that you cannot create a request with several headers of the
15341219-- same name.
1535−header ::
1536− -- | Header name
1537− ByteString ->
1538− -- | Header value
1539− ByteString ->
1540− Option scheme
1220+
1221+header
1222+ :: ByteString -- ^ Header name
1223+ -> ByteString -- ^ Header value
1224+ -> Option scheme
15411225header name value = withRequest (attachHeader name value)
15421226
1543−-- | Attach a header with given name and content to a 'L.Request'.
1227+-- | A non-public helper that attaches a header with given name and content
1228+-- to a 'L.Request'.
15441229--
15451230-- @since 1.1.0
1231+
15461232attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
15471233attachHeader name value x =
1548− x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
1549−
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}
1234+ x { L.requestHeaders = (CI.mk name, value) : L.requestHeaders x }
15571235
15581236----------------------------------------------------------------------------
15591237-- Request—Optional parameters—Cookies
@@ -1566,9 +1244,10 @@ headerRedacted name value = withRequest $ \x ->
15661244
15671245-- | Use the given 'L.CookieJar'. A 'L.CookieJar' can be obtained from a
15681246-- 'L.Response' record.
1247+
15691248cookieJar :: L.CookieJar -> Option scheme
15701249cookieJar jar = withRequest $ \x ->
1571− x {L.cookieJar = Just jar}
1250+ x { L.cookieJar = Just jar }
15721251
15731252----------------------------------------------------------------------------
15741253-- Request—Optional parameters—Authentication
@@ -1586,66 +1265,53 @@ cookieJar jar = withRequest $ \x ->
15861265-- | The 'Option' adds basic authentication.
15871266--
15881267-- See also: <https://en.wikipedia.org/wiki/Basic_access_authentication>.
1589−basicAuth ::
1590− -- | Username
1591− ByteString ->
1592− -- | Password
1593− ByteString ->
1594− -- | Auth 'Option'
1595− Option 'Https
1268+
1269+basicAuth
1270+ :: ByteString -- ^ Username
1271+ -> ByteString -- ^ Password
1272+ -> Option 'Https -- ^ Auth 'Option'
15961273basicAuth = basicAuthUnsafe
15971274
15981275-- | An alternative to 'basicAuth' which works for any scheme. Note that
1599−-- using basic access authentication without SSL\/TLS is vulnerable to
1276+-- using basic access authentication without SSL/TLS is vulnerable to
16001277-- attacks. Use 'basicAuth' instead unless you know what you are doing.
16011278--
16021279-- @since 0.3.1
1603−basicAuthUnsafe ::
1604− -- | Username
1605− ByteString ->
1606− -- | Password
1607− ByteString ->
1608− -- | Auth 'Option'
1609− Option scheme
1610−basicAuthUnsafe username password =
1611− customAuth
1612− (pure . L.applyBasicAuth username password)
1280+
1281+basicAuthUnsafe
1282+ :: ByteString -- ^ Username
1283+ -> ByteString -- ^ Password
1284+ -> Option scheme -- ^ Auth 'Option'
1285+basicAuthUnsafe username password = customAuth
1286+ (pure . L.applyBasicAuth username password)
16131287
16141288-- | The 'Option' set basic proxy authentication header.
16151289--
16161290-- @since 1.1.0
1617−basicProxyAuth ::
1618− -- | Username
1619− ByteString ->
1620− -- | Password
1621− ByteString ->
1622− -- | Auth 'Option'
1623− Option scheme
1291+
1292+basicProxyAuth
1293+ :: ByteString -- ^ Username
1294+ -> ByteString -- ^ Password
1295+ -> Option scheme -- ^ Auth 'Option'
16241296basicProxyAuth username password =
16251297 withRequest (L.applyBasicProxyAuth username password)
16261298
16271299-- | The 'Option' adds OAuth1 authentication.
16281300--
16291301-- @since 0.2.0
1630−oAuth1 ::
1631− -- | Consumer token
1632− ByteString ->
1633− -- | Consumer secret
1634− ByteString ->
1635− -- | OAuth token
1636− ByteString ->
1637− -- | OAuth token secret
1638− ByteString ->
1639− -- | Auth 'Option'
1640− Option scheme
1302+
1303+oAuth1
1304+ :: ByteString -- ^ Consumer token
1305+ -> ByteString -- ^ Consumer secret
1306+ -> ByteString -- ^ OAuth token
1307+ -> ByteString -- ^ OAuth token secret
1308+ -> Option scheme -- ^ Auth 'Option'
16411309oAuth1 consumerToken consumerSecret token tokenSecret =
16421310 customAuth (OAuth.signOAuth app creds)
16431311 where
1644− app =
1645− OAuth.newOAuth
1646− { OAuth.oauthConsumerKey = consumerToken,
1647− OAuth.oauthConsumerSecret = consumerSecret
1648− }
1312+ app = OAuth.newOAuth
1313+ { OAuth.oauthConsumerKey = consumerToken
1314+ , OAuth.oauthConsumerSecret = consumerSecret }
16491315 creds = OAuth.newCredential token tokenSecret
16501316
16511317-- | The 'Option' adds an OAuth2 bearer token. This is treated by many
@@ -1656,14 +1322,12 @@ oAuth1 consumerToken consumerSecret token tokenSecret =
16561322-- > oAuth2Bearer token = header "Authorization" ("Bearer " <> token)
16571323--
16581324-- See also: <https://en.wikipedia.org/wiki/OAuth>.
1659−oAuth2Bearer ::
1660− -- | Token
1661− ByteString ->
1662− -- | Auth 'Option'
1663− Option 'Https
1664−oAuth2Bearer token =
1665− customAuth
1666− (pure . attachHeader "Authorization" ("Bearer " <> token))
1325+
1326+oAuth2Bearer
1327+ :: ByteString -- ^ Token
1328+ -> Option 'Https -- ^ Auth 'Option'
1329+oAuth2Bearer token = customAuth
1330+ (pure . attachHeader "Authorization" ("Bearer " <> token))
16671331
16681332-- | The 'Option' adds a not-quite-standard OAuth2 bearer token (that seems
16691333-- to be used only by GitHub). This will be treated by whatever services
@@ -1674,20 +1338,19 @@ oAuth2Bearer token =
16741338-- > oAuth2Token token = header "Authorization" ("token" <> token)
16751339--
16761340-- See also: <https://developer.github.com/v3/oauth#3-use-the-access-token-to-access-the-api>.
1677−oAuth2Token ::
1678− -- | Token
1679− ByteString ->
1680− -- | Auth 'Option'
1681− Option 'Https
1682−oAuth2Token token =
1683− customAuth
1684− (pure . attachHeader "Authorization" ("token " <> token))
1341+
1342+oAuth2Token
1343+ :: ByteString -- ^ Token
1344+ -> Option 'Https -- ^ Auth 'Option'
1345+oAuth2Token token = customAuth
1346+ (pure . attachHeader "Authorization" ("token " <> token))
16851347
16861348-- | A helper to create custom authentication 'Option's. The given
16871349-- 'IO'-enabled request transformation is applied after all other
16881350-- modifications when constructing a request. Use wisely.
16891351--
16901352-- @since 1.1.0
1353+
16911354customAuth :: (L.Request -> IO L.Request) -> Option scheme
16921355customAuth = Option mempty . pure
16931356
@@ -1696,10 +1359,11 @@ customAuth = Option mempty . pure
16961359
16971360-- | Specify the port to connect to explicitly. Normally, 'Url' you use
16981361-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1699−-- 'Option' allows us to choose an arbitrary port overwriting the defaults.
1362+-- 'Option' allows to choose an arbitrary port overwriting the defaults.
1363+
17001364port :: Int -> Option scheme
17011365port n = withRequest $ \x ->
1702− x {L.port = n}
1366+ x { L.port = n }
17031367
17041368-- | This 'Option' controls whether gzipped data should be decompressed on
17051369-- the fly. By default everything except for @\"application\/x-tar\"@ is
@@ -1710,40 +1374,39 @@ port n = withRequest $ \x ->
17101374-- You can also choose to decompress everything like this:
17111375--
17121376-- > decompress (const True)
1713−decompress ::
1714− -- | Predicate that is given MIME type, it returns 'True' when content
1715− -- should be decompressed on the fly.
1716− (ByteString -> Bool) ->
1717− Option scheme
1377+
1378+decompress
1379+ :: (ByteString -> Bool) -- ^ Predicate that is given MIME type, it
1380+ -- returns 'True' when content should be decompressed on the fly.
1381+ -> Option scheme
17181382decompress f = withRequest $ \x ->
1719− x {L.decompress = f}
1383+ x { L.decompress = f }
17201384
17211385-- | Specify the number of microseconds to wait for response. The default
17221386-- value is 30 seconds (defined in 'L.ManagerSettings' of connection
17231387-- 'L.Manager').
1724−responseTimeout ::
1725− -- | Number of microseconds to wait
1726− Int ->
1727− Option scheme
1388+
1389+responseTimeout
1390+ :: Int -- ^ Number of microseconds to wait
1391+ -> Option scheme
17281392responseTimeout n = withRequest $ \x ->
1729− x {L.responseTimeout = LI.ResponseTimeoutMicro n}
1393+ x { L.responseTimeout = LI.ResponseTimeoutMicro n }
17301394
17311395-- | HTTP version to send to the server, the default is HTTP 1.1.
1732−httpVersion ::
1733− -- | Major version number
1734− Int ->
1735− -- | Minor version number
1736− Int ->
1737− Option scheme
1396+
1397+httpVersion
1398+ :: Int -- ^ Major version number
1399+ -> Int -- ^ Minor version number
1400+ -> Option scheme
17381401httpVersion major minor = withRequest $ \x ->
1739− x {L.requestVersion = Y.HttpVersion major minor}
1402+ x { L.requestVersion = Y.HttpVersion major minor }
17401403
17411404----------------------------------------------------------------------------
17421405-- Response interpretations
17431406
17441407-- | Make a request and ignore the body of the response.
1408+
17451409newtype IgnoreResponse = IgnoreResponse (L.Response ())
1746− deriving (Show)
17471410
17481411instance HttpResponse IgnoreResponse where
17491412 type HttpResponseBody IgnoreResponse = ()
@@ -1752,6 +1415,7 @@ instance HttpResponse IgnoreResponse where
17521415
17531416-- | Use this as the fourth argument of 'req' to specify that you want it to
17541417-- ignore the response body.
1418+
17551419ignoreResponse :: Proxy IgnoreResponse
17561420ignoreResponse = Proxy
17571421
@@ -1759,28 +1423,28 @@ ignoreResponse = Proxy
17591423-- 'handleHttpException' method of 'MonadHttp' instance corresponding to
17601424-- monad in which you use 'req' will determine what to do in the case when
17611425-- parsing fails (the 'JsonHttpException' constructor will be used).
1426+
17621427newtype JsonResponse a = JsonResponse (L.Response a)
1763− deriving (Show)
17641428
1765−instance (FromJSON a) => HttpResponse (JsonResponse a) where
1429+instance FromJSON a => HttpResponse (JsonResponse a) where
17661430 type HttpResponseBody (JsonResponse a) = a
17671431 toVanillaResponse (JsonResponse r) = r
17681432 getHttpResponse r = do
17691433 chunks <- L.brConsume (L.responseBody r)
17701434 case A.eitherDecode (BL.fromChunks chunks) of
1771− Left e -> throwIO (JsonHttpException e)
1435+ Left e -> throwIO (JsonHttpException e)
17721436 Right x -> return $ JsonResponse (x <$ r)
1773− acceptHeader Proxy = Just "application/json"
17741437
17751438-- | Use this as the fourth argument of 'req' to specify that you want it to
17761439-- return the 'JsonResponse' interpretation.
1440+
17771441jsonResponse :: Proxy (JsonResponse a)
17781442jsonResponse = Proxy
17791443
17801444-- | Make a request and interpret the body of the response as a strict
17811445-- 'ByteString'.
1446+
17821447newtype BsResponse = BsResponse (L.Response ByteString)
1783− deriving (Show)
17841448
17851449instance HttpResponse BsResponse where
17861450 type HttpResponseBody BsResponse = ByteString
@@ -1791,13 +1455,14 @@ instance HttpResponse BsResponse where
17911455
17921456-- | Use this as the fourth argument of 'req' to specify that you want to
17931457-- interpret the response body as a strict 'ByteString'.
1458+
17941459bsResponse :: Proxy BsResponse
17951460bsResponse = Proxy
17961461
17971462-- | Make a request and interpret the body of the response as a lazy
17981463-- 'BL.ByteString'.
1464+
17991465newtype LbsResponse = LbsResponse (L.Response BL.ByteString)
1800− deriving (Show)
18011466
18021467instance HttpResponse LbsResponse where
18031468 type HttpResponseBody LbsResponse = BL.ByteString
@@ -1808,22 +1473,24 @@ instance HttpResponse LbsResponse where
18081473
18091474-- | Use this as the fourth argument of 'req' to specify that you want to
18101475-- interpret the response body as a lazy 'BL.ByteString'.
1476+
18111477lbsResponse :: Proxy LbsResponse
18121478lbsResponse = Proxy
18131479
18141480----------------------------------------------------------------------------
18151481-- Helpers for response interpretations
18161482
1817−-- | Fetch beginning of the response and return it together with a new
1483+-- | Fetch beginning of response and return it together with new
18181484-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
18191485-- such.
1820−grabPreview ::
1821− -- | How many bytes to fetch
1822− Int ->
1823− -- | Response with body reader inside
1824− L.Response L.BodyReader ->
1825− -- | Preview 'ByteString' and new response with body reader inside
1826− IO (ByteString, L.Response L.BodyReader)
1486+
1487+grabPreview
1488+ :: Int
1489+ -- ^ How many bytes to fetch
1490+ -> L.Response L.BodyReader
1491+ -- ^ Response with body reader inside
1492+ -> IO (ByteString, L.Response L.BodyReader)
1493+ -- ^ Preview 'ByteString' and new response with body reader inside
18271494grabPreview nbytes r = do
18281495 let br = L.responseBody r
18291496 (target, leftover, done) <- brReadN br nbytes
@@ -1846,17 +1513,18 @@ grabPreview nbytes r = do
18461513 if done
18471514 then return B.empty
18481515 else br
1849− return (target, r {L.responseBody = br'})
1516+ return (target, r { L.responseBody = br' })
18501517
18511518-- | Consume N bytes from 'L.BodyReader', return the target chunk, the
18521519-- leftover (may be empty), and whether we're done consuming the body.
1853−brReadN ::
1854− -- | Body reader to stream from
1855− L.BodyReader ->
1856− -- | How many bytes to consume
1857− Int ->
1858− -- | Target chunk, the leftover, whether we're done
1859− IO (ByteString, ByteString, Bool)
1520+
1521+brReadN
1522+ :: L.BodyReader
1523+ -- ^ Body reader to stream from
1524+ -> Int
1525+ -- ^ How many bytes to consume
1526+ -> IO (ByteString, ByteString, Bool)
1527+ -- ^ Target chunk, the leftover, whether we're done
18601528brReadN br n = go 0 id id
18611529 where
18621530 go !tlen t l = do
@@ -1865,9 +1533,9 @@ brReadN br n = go 0 id id
18651533 then return (r t, r l, True)
18661534 else do
18671535 let (target, leftover) = B.splitAt (n - tlen) chunk
1868− tlen' = B.length target
1869− t' = t . (target :)
1870− l' = l . (leftover :)
1536+ tlen' = B.length target
1537+ t' = t . (target:)
1538+ l' = l . (leftover:)
18711539 if tlen + tlen' < n
18721540 then go (tlen + tlen') t' l'
18731541 else return (r t', r l', False)
@@ -1877,45 +1545,47 @@ brReadN br n = go 0 id id
18771545-- Inspecting a response
18781546
18791547-- | Get the response body.
1880−responseBody ::
1881− (HttpResponse response) =>
1882− response ->
1883− HttpResponseBody response
1548+
1549+responseBody
1550+ :: HttpResponse response
1551+ => response
1552+ -> HttpResponseBody response
18841553responseBody = L.responseBody . toVanillaResponse
18851554
18861555-- | Get the response status code.
1887−responseStatusCode ::
1888− (HttpResponse response) =>
1889− response ->
1890− Int
1556+
1557+responseStatusCode
1558+ :: HttpResponse response
1559+ => response
1560+ -> Int
18911561responseStatusCode =
18921562 Y.statusCode . L.responseStatus . toVanillaResponse
18931563
18941564-- | Get the response status message.
1895−responseStatusMessage ::
1896− (HttpResponse response) =>
1897− response ->
1898− ByteString
1565+
1566+responseStatusMessage
1567+ :: HttpResponse response
1568+ => response
1569+ -> ByteString
18991570responseStatusMessage =
19001571 Y.statusMessage . L.responseStatus . toVanillaResponse
19011572
19021573-- | Lookup a particular header from a response.
1903−responseHeader ::
1904− (HttpResponse response) =>
1905− -- | Response interpretation
1906− response ->
1907− -- | Header to lookup
1908− ByteString ->
1909− -- | Header value if found
1910− Maybe ByteString
1574+
1575+responseHeader
1576+ :: HttpResponse response
1577+ => response -- ^ Response interpretation
1578+ -> ByteString -- ^ Header to lookup
1579+ -> Maybe ByteString -- ^ Header value if found
19111580responseHeader r h =
19121581 (lookup (CI.mk h) . L.responseHeaders . toVanillaResponse) r
19131582
19141583-- | Get the response 'L.CookieJar'.
1915−responseCookieJar ::
1916− (HttpResponse response) =>
1917− response ->
1918− L.CookieJar
1584+
1585+responseCookieJar
1586+ :: HttpResponse response
1587+ => response
1588+ -> L.CookieJar
19191589responseCookieJar = L.responseCookieJar . toVanillaResponse
19201590
19211591----------------------------------------------------------------------------
@@ -1926,15 +1596,19 @@ responseCookieJar = L.responseCookieJar . toVanillaResponse
19261596-- To create a new response interpretation you just need to make your data
19271597-- type an instance of the 'HttpResponse' type class.
19281598
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.
1599+-- | A type class for response interpretations. It allows to describe how to
1600+-- consume response from a @'L.Response' 'L.BodyReader'@ and produce the
1601+-- final result that is to be returned to the user.
1602+
19321603class HttpResponse response where
1604+
19331605 -- | The associated type is the type of body that can be extracted from an
19341606 -- instance of 'HttpResponse'.
1935− type HttpResponseBody response :: Type
1607+
1608+ type HttpResponseBody response :: *
19361609
19371610 -- | The method describes how to get the underlying 'L.Response' record.
1611+
19381612 toVanillaResponse :: response -> L.Response (HttpResponseBody response)
19391613
19401614 -- | This method describes how to consume response body and, more
@@ -1950,32 +1624,12 @@ class HttpResponse response where
19501624 --
19511625 -- __Note__: signature of this function was changed in the version
19521626 -- /1.0.0/.
1953− getHttpResponse ::
1954− -- | Response with body reader inside
1955− L.Response L.BodyReader ->
1956− -- | The final result
1957− IO response
1958−
1959− -- | The value of @\"Accept\"@ header. This is useful, for example, if a
1960− -- website supports both @XML@ and @JSON@ responses, and decides what to
1961− -- reply with based on what @Accept@ headers you have sent.
1962− --
1963− -- __Note__: manually specified 'Options' that set the @\"Accept\"@ header
1964− -- will take precedence.
1965− --
1966− -- @since 2.1.0
1967− acceptHeader :: Proxy response -> Maybe ByteString
1968− acceptHeader Proxy = Nothing
19691627
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
1628+ getHttpResponse
1629+ :: L.Response L.BodyReader
1630+ -- ^ Response with body reader inside
1631+ -> IO response
1632+ -- ^ The final result
19791633
19801634----------------------------------------------------------------------------
19811635-- Other
@@ -1987,12 +1641,15 @@ instance HttpResponse (L.Response ()) where
19871641-- request components easier using @('<>')@.
19881642--
19891643-- __Note__: this type class is not a part of the public API.
1644+
19901645class RequestComponent a where
1646+
19911647 -- | Get a function that takes a 'L.Request' and changes it somehow
19921648 -- returning another 'L.Request'. For example, the 'HttpMethod' instance
19931649 -- of 'RequestComponent' just overwrites method. The function is wrapped
19941650 -- in 'Endo' so it's easier to chain such “modifying applications”
19951651 -- together building bigger and bigger 'RequestComponent's.
1652+
19961653 getRequestMod :: a -> Endo L.Request
19971654
19981655-- | This wrapper is only used to attach a type-level tag to a given type.
@@ -2002,50 +1659,44 @@ class RequestComponent a where
20021659-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
20031660-- which instance to use (i.e. the constraints are taken into account later,
20041661-- when instance is already chosen).
2005−newtype Tagged (tag :: Symbol) a = Tagged a
1662+
1663+newtype Womb (tag :: Symbol) a = Womb a
20061664
20071665-- | Exceptions that this library throws.
1666+
20081667data HttpException
2009− = -- | A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
2010− VanillaHttpException L.HttpException
2011− | -- | A wrapper with Aeson-produced 'String' describing why decoding
1668+ = VanillaHttpException L.HttpException
1669+ -- ^ A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
1670+ | JsonHttpException String
1671+ -- ^ A wrapper with Aeson-produced 'String' describing why decoding
20121672 -- failed
2013− JsonHttpException String
2014− deriving (Show, Generic)
1673+ deriving (Show, Typeable, Generic)
20151674
20161675instance Exception HttpException
20171676
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−
20321677-- | A simple type isomorphic to 'Bool' that we only have for better error
20331678-- messages. We use it as a kind and its data constructors as type-level
20341679-- tags.
20351680--
20361681-- See also: 'HttpMethod' and 'HttpBody'.
1682+
20371683data CanHaveBody
2038− = -- | Indeed can have a body
2039− CanHaveBody
2040− | -- | Should not have a body
2041− NoBody
1684+ = CanHaveBody -- ^ Indeed can have a body
1685+ | NoBody -- ^ Should not have a body
20421686
20431687-- | A type-level tag that specifies URL scheme used (and thus if HTTPS is
20441688-- enabled). This is used to force TLS requirement for some authentication
20451689-- 'Option's.
1690+
20461691data Scheme
2047− = -- | HTTP
2048− Http
2049− | -- | HTTPS
2050− Https
2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
1692+ = Http -- ^ HTTP
1693+ | Https -- ^ HTTPS
1694+ deriving (Eq, Ord, Show, Data, Typeable, Generic)
1695+
1696+----------------------------------------------------------------------------
1697+-- Constants
1698+
1699+-- | Max length of preview fragment of response body.
1700+
1701+bodyPreviewLength :: Num a => a
1702+bodyPreviewLength = 1024
README.md+144−43
@@ -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+[![Build Status](https://travis-ci.org/mrkkrp/req.svg?branch=master)](https://travis-ci.org/mrkkrp/req)
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)
@@ -18,56 +20,69 @@ module Main (main) where
1820
1921import Control.Monad.IO.Class
2022import Data.Aeson
23+import Data.Default.Class
2124import Network.HTTP.Req
2225
2326main :: IO ()
2427-- You can either make your monad an instance of 'MonadHttp', or use
2528-- 'runReq' in any IO-enabled monad without defining new instances.
26−main = runReq defaultHttpConfig $ do
27− let payload =
28− object
29− [ "foo" .= (10 :: Int),
30− "bar" .= (20 :: Int)
31− ]
29+main = runReq def $ do
30+ let payload = object
31+ [ "foo" .= (10 :: Int)
32+ , "bar" .= (20 :: Int) ]
3233 -- One function—full power and flexibility, automatic retrying on timeouts
3334 -- and such, automatic connection sharing.
34− r <-
35− req
36− POST -- method
37− (https "httpbin.org" /: "post") -- safe by construction URL
38− (ReqBodyJson payload) -- use built-in options or add your own
39− jsonResponse -- specify how to interpret response
40− mempty -- query params, headers, explicit port number, etc.
35+ r <- req POST -- method
36+ (https "httpbin.org" /: "post") -- safe by construction URL
37+ (ReqBodyJson payload) -- use built-in options or add your own
38+ jsonResponse -- specify how to interpret response
39+ mempty -- query params, headers, explicit port number, etc.
4140 liftIO $ print (responseBody r :: Value)
4241```
4342
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.
43+Req is an easy-to-use, type-safe, expandable, high-level HTTP client library
44+that just works without any fooling around.
45+
46+What does the phrase “easy-to-use” mean? It means that the library is
47+designed to be beginner-friendly so it's simple to add to your monad stack,
48+intuitive to work with, well-documented, and does not get in your way. Doing
49+HTTP requests is a common task and a Haskell library for this should be very
50+approachable and clear to beginners, thus certain compromises were made. For
51+example, one cannot currently modify `ManagerSettings` of the default
52+manager because the library always uses the same implicit global manager for
53+simplicity and maximal connection sharing. There is a way to use your own
54+manager with different settings, but it requires a bit more typing.
55+
56+“Type-safe” means that the library is protective and eliminates certain
57+classes of errors. For example, we have correct-by-construction URLs, it's
58+guaranteed that the user does not send the request body when using methods
59+like GET or OPTIONS, and the amount of implicit assumptions is minimized by
60+making the user specify his/her intentions in an explicit form (for example,
61+it's not possible to avoid specifying the body or method of a request).
6362Authentication 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.
63+type level. The library also carefully hides underlying types from the
64+lower-level `http-client` package because those types are not safe enough
65+(for example `Request` is an instance of `IsString` and, if it's malformed,
66+it will blow up at run-time).
67+
68+“Expandable” refers to the ability to create new components for dealing with
69+HTTP without having to resort to ugly hacking. For example, it's possible to
70+define your own HTTP methods, create new ways to construct the body of a
71+request, create new authorization options, perform a request in a different
72+way, and create your own methods to parse and represent a response. As a
73+user extends the library to satisfy his/her special needs, the new solutions
74+will work just like the built-ins. However, all of the common cases are also
75+covered by the library out-of-the-box.
76+
77+“High-level” means that there are less details to worry about. The library
78+is a result of my experiences as a Haskell consultant. Working for several
79+clients, who had very different projects, showed me that the library should
80+adapt easily to any particular style of writing Haskell applications. For
81+example, some people prefer throwing exceptions, while others are concerned
82+with purity. Just define `handleHttpException` accordingly when making your
83+monad instance of `MonadHttp` and it will play together seamlessly. Finally,
84+the library cuts boilerplate down considerably, and helps you write concise,
85+easy to read, and maintainable code.
7186
7287The library uses the following mature packages under the hood to guarantee
7388you the best experience:
@@ -77,11 +92,97 @@ you the best experience:
7792* [`http-client-tls`](https://hackage.haskell.org/package/http-client-tls)—TLS
7893 (HTTPS) support for `http-client`.
7994
80−It is important to note that since we leverage well-known libraries that the
95+It's important to note that since we leverage well-known libraries that the
8196whole Haskell ecosystem uses, there is no risk in using Req. The machinery
8297for performing requests is the same as with `http-conduit` and Wreq. The
8398only difference is the API.
8499
100+## Motivation and Req vs other libraries
101+
102+*This section is my opinion and it contains criticisms of other well-known
103+libraries. If you're user/fan of one of these libraries, please remember not
104+to react aggressively and respect the fact that I may have different views
105+on API design from yours.*
106+
107+I have spent time to write the library because sending HTTP requests is such
108+a common thing and still there is no high-level library for that in Haskell
109+that I could use with pleasure. I'll explain why.
110+
111+First of all, there is `http-client` and `http-client-tls`. They just work.
112+I have no issues with the libraries except that they are too low-level for
113+my taste. Indeed, even the docs say that they are low-level and “intended as
114+a base layer for more user-friendly packages”. This is exactly how I use
115+them in Req, as base level. Req is nothing but a different API to
116+`http-client`, so it only works because of the hard work put into
117+`http-client`.
118+
119+`http-conduit` definitely has its place. For one thing it allows you to
120+stream request and response bodies in constant memory, what other library
121+allows you to do that? On the other hand if you take a look at
122+`Network.HTTP.Simple`, then although it's said that it's a “higher level
123+API”, it's mostly the same as vanilla `http-client` in spirit/approach and
124+just adds `conduit`-powered functions to perform requests and allows to use
125+global implicit `Manager` (Req does the same). If I tried to frame what
126+exactly I don't like about `http-conduit` in words, then it would be “the
127+way requests are constructed”. You set, set, set instead of *being forced*
128+to declare necessary bits and *being allowed* to declare optional bits in a
129+way that their combination is certainly valid. And you parse request from a
130+string without the protection of TH that otherwise saves the day as in
131+Yesod.
132+
133+Then there is Wreq. `wreq` [doesn't see much development
134+lately](https://github.com/bos/wreq/issues/93). `wreq` is by itself a weird
135+library, IMO. You have functions per method—not very good, as there may be
136+new methods, like PATCH which is not new but still missing (well you have
137+`customMethod`, but what is the point of having per-method functions if you
138+have a more general way to use any method? you should be able to just insert
139+methods in the “argument slot” of `customMethod` and end up with a more
140+general solution). Now every method function has a companion that takes
141+`Options` (like you have `get` and `getWith`). Why the duplication? Where is
142+generality and flexibility? This is not all though, because you cannot
143+really use `get` you see in the main module, because you want to have
144+connection sharing. Wreq's author does not take the gift of automatic
145+connection re-use `Manager` from `http-client` provides, he invents the
146+whole new thing of “sessions”. Only inside a session your connections will
147+be shared and re-used. However with the session stuff you have yet another
148+set of per-method functions like `get` and `getWith`—these are different
149+ones, to be used with sessions! Now if you have a multi-threaded app, here
150+is a surprise for you: you can't share connections between threads as
151+connections are shared only inside `withSession` friend and “session will no
152+longer be valid after that function returns”. There are valid uses for
153+sessions, but the point is that they are just too inconvenient for common
154+tasks.
155+
156+It's funny that one client I worked for had to have his own little wrapper
157+around `http-client` just because he could not possibly use `wreq` and
158+`http-client` and friends were too low-level. The previous paragraph is
159+extracted from a talk with a Haskell developer who works for that client. I
160+thought to myself “something is wrong with HTTP client libraries in Haskell
161+if they had to make a wrapper”.
162+
163+What else? I used `servant-client` a couple of times but the amount of
164+boilerplate it requires is frightening. If you have several query
165+parameters, and you use just one of them, good luck passing lots of
166+`Nothing`s.
167+
168+## Unsolved problems
169+
170+AWS request signing is problematic because request body can be in the form
171+of an action to execute (and all that “popper” stuff for streaming), not
172+just a `ByteString` and so getting its digest (hash) is not trivial without
173+running the action and consuming body in its entirety before the request in
174+made. In Wreq the author chose to just use `error` when body is not a
175+(strict or lazy) `ByteString`. Maybe it's OK for Wreq, but I don't consider
176+this a proper solution for Req as we support full variety of body options.
177+For example, what if I want to upload 1 Gb file to S3? I want to stream it
178+in constant memory but at the same time I need to calculate its hash before
179+I start streaming. One solution to the problem seems to be in taking the
180+hash explicitly (as an argument of the hypothetical `awsAuth`) and making it
181+a responsibility of the user to calculate the hash correctly. I don't like
182+this because it's not user-friendly. So the question stays open, for now
183+there is no AWS signing functionality provided out-of-the-box. The best
184+solution for talking to AWS is the `amazonka` package so far.
185+
85186## Related packages
86187
87188The following packages are designed to be used with Req:
@@ -101,10 +202,10 @@ please submit a PR to include it in this list.
101202Issues, bugs, and questions may be reported in [the GitHub issue tracker for
102203this project](https://github.com/mrkkrp/req/issues).
103204
104−Pull requests are also welcome.
205+Pull requests are also welcome and will be reviewed quickly.
105206
106207## License
107208
108−Copyright © 2016–present Mark Karpov
209+Copyright © 2016–2018 Mark Karpov
109210
110211Distributed under BSD 3 clause license.
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+196−310
@@ -1,37 +1,39 @@
1−{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE LambdaCase #-}
4−{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE RankNTypes #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DataKinds #-}
3+{-# LANGUAGE FlexibleInstances #-}
4+{-# LANGUAGE OverloadedStrings #-}
5+{-# LANGUAGE RankNTypes #-}
66{-# OPTIONS_GHC -fno-warn-orphans #-}
77
8−module Network.HTTP.ReqSpec (spec) where
8+module Network.HTTP.ReqSpec
9+ ( spec )
10+where
911
1012import Control.Exception
11−import Control.Monad (forM_)
13+import Control.Monad.Reader
1214import Control.Monad.Trans.Control
13−import 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)
15+import Data.Aeson (Value (..), ToJSON (..), object, (.=))
16+import Data.Default.Class
17+import Data.Monoid ((<>))
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 Network.HTTP.Req
3021import Test.Hspec
3122import Test.QuickCheck
23+import qualified Data.Aeson as A
24+import qualified Data.ByteString as B
25+import qualified Data.ByteString.Lazy as BL
26+import qualified Data.HashMap.Strict as HM
27+import qualified Data.Text as T
28+import qualified Data.Text.Encoding as T
29+import qualified Data.Text.IO as TIO
30+import qualified Network.HTTP.Client as L
31+import qualified Network.HTTP.Client.MultipartFormData as LM
32+import qualified Network.HTTP.Types as Y
3233
3334spec :: Spec
3435spec = do
36+
3537 describe "exception throwing on non-2xx status codes" $
3638 it "throws indeed for non-2xx" $
3739 req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
@@ -39,7 +41,7 @@ spec = do
3941
4042 describe "exception throwing on non-2xx status codes (Req monad)" $
4143 it "throws indeed for non-2xx" $
42− asIO . runReq defaultHttpConfig $
44+ asIO . runReq def $
4345 liftBaseWith $ \run ->
4446 run (req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty)
4547 `shouldThrow` selector404
@@ -50,61 +52,41 @@ spec = do
5052 blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
5153 `shouldThrow` anyException
5254
53− describe "isStatusCodeException" $
54− it "extracts non-2xx response" $
55− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
56− `shouldThrow` selector404ByStatusCodeException
57−
5855 describe "receiving user-agent header back" $
5956 it "works" $ do
60− r <-
61− req
62− GET
63− (httpbin /: "user-agent")
64− NoReqBody
65− jsonResponse
66− (header "user-agent" "Req")
67− responseBody r
68− `shouldBe` object
69− ["user-agent" .= ("Req" :: Text)]
70− responseStatusCode r `shouldBe` 200
57+ r <- req GET (httpbin /: "user-agent")
58+ NoReqBody jsonResponse (header "user-agent" "Req")
59+ responseBody r `shouldBe` object
60+ ["user-agent" .= ("Req" :: Text)]
61+ responseStatusCode r `shouldBe` 200
7162 responseStatusMessage r `shouldBe` "OK"
7263
7364 describe "receiving request headers back" $
7465 it "works" $ do
75− r <-
76− req
77− GET
78− (httpbin /: "headers")
79− NoReqBody
80− jsonResponse
81− (header "Foo" "bar" <> header "Baz" "quux")
82− stripFunnyHeaders (responseBody r)
83− `shouldBe` object
84− [ "headers"
85− .= object
86− [ "Accept-Encoding" .= ("gzip" :: Text),
87− "Foo" .= ("bar" :: Text),
88− "Baz" .= ("quux" :: Text)
89− ]
90− ]
91− responseStatusCode r `shouldBe` 200
66+ r <- req GET (httpbin /: "headers")
67+ NoReqBody jsonResponse (header "Foo" "bar" <> header "Baz" "quux")
68+ stripFunnyHeaders (responseBody r) `shouldBe` object
69+ [ "headers" .= object
70+ [ "Accept-Encoding" .= ("gzip" :: Text)
71+ , "Connection" .= ("close" :: Text)
72+ , "Foo" .= ("bar" :: Text)
73+ , "Baz" .= ("quux" :: Text)
74+ , "Host" .= ("httpbin.org" :: Text) ] ]
75+ responseStatusCode r `shouldBe` 200
9276 responseStatusMessage r `shouldBe` "OK"
9377
9478 describe "receiving GET data back" $
9579 it "works" $ do
9680 r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty
97− (stripFunnyHeaders . stripOrigin) (responseBody r)
98− `shouldBe` object
99− [ "args" .= emptyObject,
100− "url" .= ("http://localhost:1234/get" :: Text),
101− "headers"
102− .= object
103− [ "Accept-Encoding" .= ("gzip" :: Text)
104− ]
105− ]
81+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
82+ [ "args" .= emptyObject
83+ , "url" .= ("https://httpbin.org/get" :: Text)
84+ , "headers" .= object
85+ [ "Accept-Encoding" .= ("gzip" :: Text)
86+ , "Connection" .= ("close" :: Text)
87+ , "Host" .= ("httpbin.org" :: Text) ] ]
10688 responseHeader r "Content-Type" `shouldBe` return "application/json"
107− responseStatusCode r `shouldBe` 200
89+ responseStatusCode r `shouldBe` 200
10890 responseStatusMessage r `shouldBe` "OK"
10991
11092 describe "receiving POST JSON data back" $
@@ -112,55 +94,49 @@ spec = do
11294 let text = "foo" :: Text
11395 reflected = reflectJSON text
11496 r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty
115− (stripFunnyHeaders . stripOrigin) (responseBody r)
116− `shouldBe` object
117− [ "args" .= emptyObject,
118− "json" .= text,
119− "data" .= reflected,
120− "url" .= ("http://localhost:1234/post" :: Text),
121− "headers"
122− .= object
123− [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
124− "Accept-Encoding" .= ("gzip" :: Text),
125− "Content-Length" .= show (T.length reflected)
126− ],
127− "files" .= emptyObject,
128− "form" .= emptyObject
129− ]
97+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
98+ [ "args" .= emptyObject
99+ , "json" .= text
100+ , "data" .= reflected
101+ , "url" .= ("https://httpbin.org/post" :: Text)
102+ , "headers" .= object
103+ [ "Content-Type" .= ("application/json; charset=utf-8" :: Text)
104+ , "Accept-Encoding" .= ("gzip" :: Text)
105+ , "Connection" .= ("close" :: Text)
106+ , "Host" .= ("httpbin.org" :: Text)
107+ , "Content-Length" .= show (T.length reflected) ]
108+ , "files" .= emptyObject
109+ , "form" .= emptyObject ]
130110 responseHeader r "Content-Type" `shouldBe` return "application/json"
131− responseStatusCode r `shouldBe` 200
111+ responseStatusCode r `shouldBe` 200
132112 responseStatusMessage r `shouldBe` "OK"
133113
134114 describe "receiving POST data back (multipart form data)" $
135115 it "works" $ do
136− body <-
137− reqBodyMultipart
138− [ LM.partBS "foo" "foo data!",
139− LM.partBS "bar" "bar data!"
140− ]
116+ body <- reqBodyMultipart
117+ [ LM.partBS "foo" "foo data!"
118+ , LM.partBS "bar" "bar data!" ]
141119 r <- req POST (httpbin /: "post") body jsonResponse mempty
142− let contentType = fromJust (getRequestContentType body)
143− (stripFunnyHeaders . stripOrigin) (responseBody r)
144− `shouldBe` object
145− [ "args" .= emptyObject,
146− "json" .= Null,
147− "data" .= ("" :: Text),
148− "url" .= ("http://localhost:1234/post" :: Text),
149− "headers"
150− .= object
151− [ "Content-Type" .= T.decodeUtf8 contentType,
152− "Accept-Encoding" .= ("gzip" :: Text),
153− "Content-Length" .= ("242" :: Text)
154− ],
155− "files" .= emptyObject,
156− "form"
157− .= object
158− [ "foo" .= ("foo data!" :: Text),
159− "bar" .= ("bar data!" :: Text)
160− ]
120+ let Just contentType = getRequestContentType body
121+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
122+ [ "args" .= emptyObject
123+ , "json" .= Null
124+ , "data" .= ("" :: Text)
125+ , "url" .= ("https://httpbin.org/post" :: Text)
126+ , "headers" .= object
127+ [ "Content-Type" .= T.decodeUtf8 contentType
128+ , "Accept-Encoding" .= ("gzip" :: Text)
129+ , "Connection" .= ("close" :: Text)
130+ , "Host" .= ("httpbin.org" :: Text)
131+ , "Content-Length" .= ("242" :: Text)
161132 ]
133+ , "files" .= emptyObject
134+ , "form" .= object
135+ [ "foo" .= ("foo data!" :: Text)
136+ , "bar" .= ("bar data!" :: Text) ]
137+ ]
162138 responseHeader r "Content-Type" `shouldBe` return "application/json"
163− responseStatusCode r `shouldBe` 200
139+ responseStatusCode r `shouldBe` 200
164140 responseStatusMessage r `shouldBe` "OK"
165141
166142 describe "receiving PATCHed file back" $
@@ -169,69 +145,57 @@ spec = do
169145 file = "httpbin-data/robots.txt"
170146 contents <- TIO.readFile file
171147 r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty
172− (stripFunnyHeaders . stripOrigin) (responseBody r)
173− `shouldBe` object
174− [ "args" .= emptyObject,
175− "json" .= Null,
176− "data" .= contents,
177− "url" .= ("http://localhost:1234/patch" :: Text),
178− "headers"
179− .= object
180− [ "Accept-Encoding" .= ("gzip" :: Text),
181− "Content-Length" .= show (T.length contents)
182− ],
183− "files" .= emptyObject,
184− "form" .= emptyObject
185− ]
148+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
149+ [ "args" .= emptyObject
150+ , "json" .= Null
151+ , "data" .= contents
152+ , "url" .= ("https://httpbin.org/patch" :: Text)
153+ , "headers" .= object
154+ [ "Accept-Encoding" .= ("gzip" :: Text)
155+ , "Connection" .= ("close" :: Text)
156+ , "Host" .= ("httpbin.org" :: Text)
157+ , "Content-Length" .= show (T.length contents) ]
158+ , "files" .= emptyObject
159+ , "form" .= emptyObject ]
186160 responseHeader r "Content-Type" `shouldBe` return "application/json"
187− responseStatusCode r `shouldBe` 200
161+ responseStatusCode r `shouldBe` 200
188162 responseStatusMessage r `shouldBe` "OK"
189163
190164 describe "receiving PUT form URL-encoded data back" $
191165 it "works" $ do
192− let params =
193− "foo" =: ("bar" :: Text)
194− <> "baz" =: (5 :: Int)
195− <> queryFlag "quux"
166+ let params = "foo" =: ("bar" :: Text) <>
167+ "baz" =: (5 :: Int) <>
168+ queryFlag "quux"
196169 r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
197− (stripFunnyHeaders . stripOrigin) (responseBody r)
198− `shouldBe` object
199− [ "args" .= emptyObject,
200− "json" .= Null,
201− "data" .= ("" :: Text),
202− "url" .= ("http://localhost:1234/put" :: Text),
203− "headers"
204− .= object
205− [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
206− "Accept-Encoding" .= ("gzip" :: Text),
207− "Content-Length" .= ("18" :: Text)
208− ],
209− "files" .= emptyObject,
210− "form"
211− .= object
212− [ "foo" .= ("bar" :: Text),
213− "baz" .= ("5" :: Text),
214− "quux" .= ("" :: Text)
215− ]
216− ]
170+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
171+ [ "args" .= emptyObject
172+ , "json" .= Null
173+ , "data" .= ("" :: Text)
174+ , "url" .= ("https://httpbin.org/put" :: Text)
175+ , "headers" .= object
176+ [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text)
177+ , "Accept-Encoding" .= ("gzip" :: Text)
178+ , "Connection" .= ("close" :: Text)
179+ , "Host" .= ("httpbin.org" :: Text)
180+ , "Content-Length" .= ("18" :: Text) ]
181+ , "files" .= emptyObject
182+ , "form" .= object
183+ [ "foo" .= ("bar" :: Text)
184+ , "baz" .= ("5" :: Text)
185+ , "quux" .= ("" :: Text) ] ]
217186 responseHeader r "Content-Type" `shouldBe` return "application/json"
218− responseStatusCode r `shouldBe` 200
187+ responseStatusCode r `shouldBe` 200
219188 responseStatusMessage r `shouldBe` "OK"
220189
221190 -- TODO /delete
222191
223192 describe "receiving UTF-8 encoded Unicode data" $
224193 it "works" $ do
225− r <-
226− req
227− GET
228− (httpbin /: "encoding" /: "utf8")
229− NoReqBody
230− bsResponse
231− mempty
194+ r <- req GET (httpbin /: "encoding" /: "utf8")
195+ NoReqBody bsResponse mempty
232196 utf8data <- B.readFile "httpbin-data/utf8.html"
233− responseBody r `shouldBe` utf8data
234− responseStatusCode r `shouldBe` 200
197+ responseBody r `shouldBe` utf8data
198+ responseStatusCode r `shouldBe` 200
235199 responseStatusMessage r `shouldBe` "OK"
236200
237201 -- TODO /gzip
@@ -242,35 +206,24 @@ spec = do
242206 -- FIXME We no longer can count retries because all the functions
243207 -- responsible for controlling retrying are pure now.
244208 let status = 408 :: Int
245− r <-
246− prepareForShit $
247− req
248− GET
249− (httpbin /: "status" /~ status)
250− NoReqBody
251− ignoreResponse
252− mempty
209+ r <- prepareForShit $ req GET (httpbin /: "status" /~ status)
210+ NoReqBody ignoreResponse mempty
253211 responseStatusCode r `shouldBe` status
254212
255213 -- forM_ [101..102] checkStatusCode
256− forM_ [200 .. 208] checkStatusCode
214+ forM_ [200..208] checkStatusCode
257215 -- forM_ [300..308] checkStatusCode
258− forM_ [400 .. 431] checkStatusCode
259− forM_ [500 .. 511] checkStatusCode
216+ forM_ [400..431] checkStatusCode
217+ forM_ [500..511] checkStatusCode
260218
261219 -- TODO /response-headers
262220 -- TODO /redirect
263221
264222 describe "redirects" $
265223 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
224+ r <- req GET (httpbin /: "redirect-to") NoReqBody ignoreResponse
225+ ("url" =: ("https://httpbin.org" :: Text))
226+ responseStatusCode r `shouldBe` 200
274227 responseStatusMessage r `shouldBe` "OK"
275228
276229 -- TODO /relative-redicet
@@ -279,30 +232,21 @@ spec = do
279232
280233 describe "basicAuth" $ do
281234 let user, password :: Text
282− user = "Scooby"
235+ user = "Scooby"
283236 password = "Doo"
284237 context "when we do not send appropriate basic auth data" $
285238 it "fails with 401" $ do
286− r <-
287− prepareForShit $
288− req
289− GET
290− (httpbin /: "basic-auth" /~ user /~ password)
291− NoReqBody
292− ignoreResponse
293− mempty
294− responseStatusCode r `shouldBe` 401
239+ r <- prepareForShit $ req GET
240+ (httpbin /: "basic-auth" /~ user /~ password)
241+ NoReqBody ignoreResponse mempty
242+ responseStatusCode r `shouldBe` 401
295243 responseStatusMessage r `shouldBe` "UNAUTHORIZED"
296244 context "when we provide appropriate basic auth data" $
297245 it "succeeds" $ do
298− r <-
299− req
300− GET
301− (httpbin /: "basic-auth" /~ user /~ password)
302− NoReqBody
303− ignoreResponse
304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
305− responseStatusCode r `shouldBe` 200
246+ r <- req GET (httpbin /: "basic-auth" /~ user /~ password)
247+ NoReqBody ignoreResponse
248+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
249+ responseStatusCode r `shouldBe` 200
306250 responseStatusMessage r `shouldBe` "OK"
307251
308252 -- TODO /hidden-basic-auth
@@ -317,8 +261,8 @@ spec = do
317261 it "works" $ do
318262 r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty
319263 robots <- B.readFile "httpbin-data/robots.txt"
320− responseBody r `shouldBe` robots
321− responseStatusCode r `shouldBe` 200
264+ responseBody r `shouldBe` robots
265+ responseStatusCode r `shouldBe` 200
322266 responseStatusMessage r `shouldBe` "OK"
323267
324268 -- TODO /deny
@@ -329,15 +273,10 @@ spec = do
329273 property $ \n' -> do
330274 let n :: Word
331275 n = getSmall n'
332− r <-
333− req
334− GET
335− (httpbin /: "bytes" /~ n)
336− NoReqBody
337− lbsResponse
338− mempty
276+ r <- req GET (httpbin /: "bytes" /~ n)
277+ NoReqBody lbsResponse mempty
339278 responseBody r `shouldSatisfy` ((== n) . fromIntegral . BL.length)
340− responseStatusCode r `shouldBe` 200
279+ responseStatusCode r `shouldBe` 200
341280 responseStatusMessage r `shouldBe` "OK"
342281 context "when we try to interpret 1000 random bytes as JSON" $
343282 it "throws correct exception" $ do
@@ -346,38 +285,29 @@ spec = do
346285 selector _ = False
347286 n :: Int
348287 n = 1000
349− req
350− GET
351− (httpbin /: "bytes" /~ n)
352− NoReqBody
353− (Proxy :: Proxy (JsonResponse Value))
354− mempty
355− `shouldThrow` selector
288+ req GET (httpbin /: "bytes" /~ n) NoReqBody
289+ (Proxy :: Proxy (JsonResponse Value)) mempty
290+ `shouldThrow` selector
356291
357292 describe "streaming random bytes" $
358293 it "works" $
359294 property $ \n' -> do
360295 let n :: Word
361296 n = getSmall n'
362− r <-
363− req
364− GET
365− (httpbin /: "stream-bytes" /~ n)
366− NoReqBody
367− bsResponse
368− mempty
297+ r <- req GET (httpbin /: "stream-bytes" /~ n)
298+ NoReqBody bsResponse mempty
369299 responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
370− responseStatusCode r `shouldBe` 200
300+ responseStatusCode r `shouldBe` 200
371301 responseStatusMessage r `shouldBe` "OK"
372302
373−-- TODO /links
374−-- TODO /image
375−-- TODO /image/png
376−-- TODO /image/jpeg
377−-- TODO /image/webp
378−-- TODO /image/svg
379−-- TODO /forms/post
380−-- TODO /xml
303+ -- TODO /links
304+ -- TODO /image
305+ -- TODO /image/png
306+ -- TODO /image/jpeg
307+ -- TODO /image/webp
308+ -- TODO /image/svg
309+ -- TODO /forms/post
310+ -- TODO /xml
381311
382312----------------------------------------------------------------------------
383313-- Instances
@@ -388,125 +318,81 @@ instance MonadHttp IO where
388318----------------------------------------------------------------------------
389319-- Helpers
390320
391−-- | Run a request with such settings that it does not signal errors.
321+-- | Run request with such settings that it does not signal error on adverse
322+-- response status codes.
323+
392324prepareForShit :: Req a -> IO a
393−prepareForShit = runReq defaultHttpConfig {httpConfigCheckResponse = noNoise}
325+prepareForShit = runReq def { httpConfigCheckResponse = noNoise }
394326 where
395327 noNoise _ _ _ = Nothing
396328
397−-- | Run a request with such settings that it throws on any response.
329+-- | Run request with such settings that it throws on any response.
330+
398331blindlyThrowing :: Req a -> IO a
399−blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
332+blindlyThrowing = runReq def { httpConfigCheckResponse = doit }
400333 where
401334 doit _ _ = error "Oops!"
402335
403336-- | '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
337+
338+httpbin :: Url 'Https
339+httpbin = https "httpbin.org"
426340
427341-- | Remove “origin” field from JSON value. Origin may change, we don't want
428342-- to depend on that.
343+
429344stripOrigin :: Value -> Value
430−stripOrigin (Object m) = Object (Aeson.KeyMap.delete "origin" m)
431−stripOrigin value = value
345+stripOrigin (Object m) = Object (HM.delete "origin" m)
346+stripOrigin value = value
432347
433348-- | Remove funny headers that might break the tests.
349+
434350stripFunnyHeaders :: 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− ]
351+stripFunnyHeaders (Object m) =
352+ let f (Object p) = Object $ HM.filterWithKey (\k _ -> k `elem` hs) p
353+ f value = value
354+ hs = [ "Content-Type"
355+ , "Accept-Encoding"
356+ , "Connection"
357+ , "Host"
358+ , "Content-Length"
359+ , "Foo"
360+ , "Baz" ]
361+ in Object (HM.adjust f "headers" m)
362+stripFunnyHeaders value = value
465363
466364-- | This is a complete test case that makes use of <https://httpbin.org> to
467365-- get various response status codes.
366+
468367checkStatusCode :: Int -> SpecWith ()
469368checkStatusCode code =
470369 describe ("receiving status code " ++ show code) $
471370 it "works" $ do
472− r <-
473− prepareForShit $
474− req
475− GET
476− (httpbin /: "status" /~ code)
477− NoReqBody
478− ignoreResponse
479− mempty
371+ r <- prepareForShit $ req GET (httpbin /: "status" /~ code)
372+ NoReqBody ignoreResponse mempty
480373 responseStatusCode r `shouldBe` code
481374
482375-- | Exception selector that selects only 404 “Not found” exceptions.
376+
483377selector404 :: HttpException -> Bool
484−selector404
485− ( VanillaHttpException
486− ( L.HttpExceptionRequest
487− _
488− (L.StatusCodeException response chunk)
489− )
490− ) =
491− L.responseStatus response == Y.status404 && not (B.null chunk)
378+selector404 (VanillaHttpException
379+ (L.HttpExceptionRequest _
380+ (L.StatusCodeException response chunk))) =
381+ L.responseStatus response == Y.status404 && not (B.null chunk)
492382selector404 _ = False
493383
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
384+-- | Empty JSON 'Object'.
500385
501−-- | The empty JSON 'Object'.
502386emptyObject :: Value
503−emptyObject = Object Aeson.KeyMap.empty
387+emptyObject = Object HM.empty
504388
505−-- | Get a rendered JSON value as 'Text'.
506−reflectJSON :: (ToJSON a) => a -> Text
389+-- | Get rendered JSON value as 'Text'.
390+
391+reflectJSON :: ToJSON a => a -> Text
507392reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
508393
509394-- | Clarify to the type checker that the inner computation is in the 'IO'
510395-- monad.
396+
511397asIO :: IO a -> IO a
512398asIO = id
pure-tests/Network/HTTP/ReqSpec.hs+185−353
@@ -1,71 +1,61 @@
1−{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE DeriveGeneric #-}
3−{-# LANGUAGE FlexibleInstances #-}
4−{-# LANGUAGE LambdaCase #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−{-# LANGUAGE QuasiQuotes #-}
7−{-# LANGUAGE RankNTypes #-}
8−{-# LANGUAGE RecordWildCards #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE TypeApplications #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DataKinds #-}
3+{-# LANGUAGE DeriveGeneric #-}
4+{-# LANGUAGE FlexibleInstances #-}
115{-# LANGUAGE NoMonomorphismRestriction #-}
12−{-# OPTIONS_GHC -fno-warn-orphans #-}
6+{-# LANGUAGE OverloadedStrings #-}
7+{-# LANGUAGE RankNTypes #-}
8+{-# LANGUAGE RecordWildCards #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
10+{-# OPTIONS_GHC -fno-warn-orphans #-}
1311
14−module Network.HTTP.ReqSpec (spec) where
12+module Network.HTTP.ReqSpec
13+ ( spec )
14+where
1515
16−import Blaze.ByteString.Builder qualified as BB
1716import Control.Exception (throwIO)
18−import Control.Monad
19−import Control.Retry
2017import Data.Aeson (ToJSON (..))
21−import Data.Aeson qualified as A
2218import 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
27−import Data.Either (isRight)
28−import Data.List.NonEmpty qualified as NE
29−import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)
19+import Data.Default.Class
20+import Data.Maybe (isNothing, fromJust)
21+import Data.Monoid ((<>))
3022import Data.Proxy
3123import Data.Text (Text)
32−import Data.Text qualified as T
33−import Data.Text.Encoding qualified as T
3424import Data.Time
35−import Data.Typeable (Typeable, eqT)
36−import GHC.Exts (IsList (..))
3725import 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
4126import Network.HTTP.Req
42−import Network.HTTP.Types qualified as Y
43−import Network.HTTP.Types.Header qualified as Y
4427import Test.Hspec
4528import Test.Hspec.Core.Spec (SpecM)
4629import Test.QuickCheck
47−import 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
30+import qualified Blaze.ByteString.Builder as BB
31+import qualified Data.Aeson as A
32+import qualified Data.ByteString as B
33+import qualified Data.ByteString.Char8 as B8
34+import qualified Data.ByteString.Lazy as BL
35+import qualified Data.CaseInsensitive as CI
36+import qualified Data.Text as T
37+import qualified Data.Text.Encoding as T
38+import qualified Network.HTTP.Client as L
39+import qualified Network.HTTP.Types as Y
40+import qualified Network.HTTP.Types.Header as Y
5141
5242spec :: Spec
5343spec = do
44+
5445 describe "config" $
5546 it "getHttpConfig has effect on resulting request" $
5647 property $ \config -> do
5748 request <- runReq config (req_ GET url NoReqBody mempty)
58− L.proxy request `shouldBe` httpConfigProxy config
49+ L.proxy request `shouldBe` httpConfigProxy config
5950 L.redirectCount request `shouldBe` httpConfigRedirectCount config
6051
6152 describe "methods" $ do
62− let mnth ::
63− forall method.
64− ( HttpMethod method,
65− HttpBodyAllowed (AllowsBody method) 'NoBody
66− ) =>
67− method ->
68− SpecM () ()
53+ let mnth
54+ :: forall method.
55+ ( HttpMethod method
56+ , HttpBodyAllowed (AllowsBody method) 'NoBody )
57+ => method
58+ -> SpecM () ()
6959 mnth method = do
7060 let name = httpMethodName (Proxy :: Proxy method)
7161 describe (B8.unpack name) $
@@ -88,15 +78,15 @@ spec = do
8878 property $ \host -> do
8979 request <- req_ GET (http host) NoReqBody mempty
9080 L.secure request `shouldBe` False
91− L.port request `shouldBe` 80
92− L.host request `shouldBe` urlEncode host
81+ L.port request `shouldBe` 80
82+ L.host request `shouldBe` urlEncode host
9383 describe "https" $
9484 it "sets all the params correctly" $
9585 property $ \host -> do
9686 request <- req_ GET (https host) NoReqBody mempty
9787 L.secure request `shouldBe` True
98− L.port request `shouldBe` 443
99− L.host request `shouldBe` urlEncode host
88+ L.port request `shouldBe` 443
89+ L.host request `shouldBe` urlEncode host
10090 describe "(/~)" $
10191 it "attaches a path piece that is URL-encoded" $
10292 property $ \host pieces -> do
@@ -111,95 +101,40 @@ spec = do
111101 request <- req_ GET url' NoReqBody mempty
112102 L.host request `shouldBe` urlEncode host
113103 L.path request `shouldBe` encodePathPieces pieces
114−
115− describe "useHttpURI" $ do
104+ describe "parseUrlHttp" $ do
116105 it "does not recognize non-http schemes" $
117− property $ \uri ->
118− when (URI.uriScheme uri /= Just [QQ.scheme|http|]) $
119− useHttpURI uri `shouldSatisfy` isNothing
120− it "accepts correct URLs" $
121− property $ \uri' -> do
122− unless (isRight (URI.uriAuthority uri')) discard
123− let uri = uri' {URI.uriScheme = Just [QQ.scheme|http|]}
124− (url', options) = fromJust (useHttpURI uri)
125− request <- req_ GET url' NoReqBody options
126− L.host request `shouldBe` uriHost uri
127− L.port request `shouldBe` uriPort 80 uri
128− L.path request `shouldBe` uriPath uri
129− L.queryString request `shouldBe` uriQuery uri
130− lookup "Authorization" (L.requestHeaders request)
131− `shouldBe` uriBasicAuth uri
132− describe "useHttpsURI" $ do
133− it "does not recognize non-https schemes" $
134− property $ \uri ->
135− when (URI.uriScheme uri /= Just [QQ.scheme|https|]) $
136− useHttpsURI uri `shouldSatisfy` isNothing
106+ parseUrlHttp "https://httpbin.org" `shouldSatisfy` isNothing
137107 it "parses correct URLs" $
138− property $ \uri' -> do
139− unless (isRight (URI.uriAuthority uri')) discard
140− let uri = uri' {URI.uriScheme = Just [QQ.scheme|https|]}
141− (url', options) = fromJust (useHttpsURI uri)
142− request <- req_ GET url' NoReqBody options
143− L.host request `shouldBe` uriHost uri
144− L.port request `shouldBe` uriPort 443 uri
145− L.path request `shouldBe` uriPath uri
146− L.queryString request `shouldBe` uriQuery uri
147− lookup "Authorization" (L.requestHeaders request)
148− `shouldBe` uriBasicAuth uri
149− describe "useURI" $ do
150− it "does not recognize non-http and non-https schemes" $
151− property $ \uri ->
152− when
153− ( ( URI.uriScheme uri /= Just [QQ.scheme|http|]
154− && (URI.uriScheme uri /= Just [QQ.scheme|https|])
155− )
156− )
157− $ useURI uri `shouldSatisfy` isNothing
108+ property $ \host mport' pieces queryParams -> do
109+ let (url', path, queryString) =
110+ assembleUrl Http host mport' pieces queryParams
111+ (url'', options) = fromJust (parseUrlHttp url')
112+ request <- req_ GET url'' NoReqBody options
113+ L.host request `shouldBe` urlEncode (unHost host)
114+ L.port request `shouldBe` maybe 80 getNonNegative mport'
115+ L.path request `shouldBe` path
116+ L.queryString request `shouldBe` queryString
117+ it "rejects gibberish in port component" $ do
118+ parseUrlHttp "http://my-site.com:bob/far" `shouldSatisfy` isNothing
119+ parseUrlHttp "http://my-site.com:7001uh/api" `shouldSatisfy` isNothing
120+ parseUrlHttp "http://my-site.com:/bar" `shouldSatisfy` isNothing
121+ describe "parseUrlHttps" $ do
122+ it "does not recognize non-https schemes" $
123+ parseUrlHttps "http://httpbin.org" `shouldSatisfy` isNothing
158124 it "parses correct URLs" $
159− property $ \uri' -> do
160− unless (isRight (URI.uriAuthority uri')) discard
161− let uriHttp = uri' {URI.uriScheme = Just [QQ.scheme|http|]}
162− uriHttps = uri' {URI.uriScheme = Just [QQ.scheme|https|]}
163− 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− requestHttps <-
168− case fromJust (useURI uriHttps) of
169− Right (url', options) -> req_ GET url' NoReqBody options
170− _ -> error "(useURI uriHttps) should have returned Right"
171− L.host requestHttp `shouldBe` uriHost uriHttp
172− L.host requestHttps `shouldBe` uriHost uriHttps
173− L.port requestHttp `shouldBe` uriPort 80 uriHttp
174− L.port requestHttps `shouldBe` uriPort 443 uriHttps
175− L.path requestHttp `shouldBe` uriPath uriHttp
176− L.path requestHttps `shouldBe` uriPath uriHttps
177− L.queryString requestHttp `shouldBe` uriQuery uriHttp
178− L.queryString requestHttps `shouldBe` uriQuery uriHttps
179− lookup "Authorization" (L.requestHeaders requestHttp)
180− `shouldBe` uriBasicAuth uriHttp
181− lookup "Authorization" (L.requestHeaders requestHttps)
182− `shouldBe` uriBasicAuth uriHttps
183−
184− describe "renderUrl" $ do
185− context "http" $ do
186− context "empty path" $
187− it "renders correctly" $ do
188− let (uriHttp, _) = [urlQ|http://httpbin.org|]
189− renderUrl uriHttp `shouldBe` "http://httpbin.org"
190− context "non-empty path" $
191− it "renders correctly" $ do
192− let (uriHttp, _) = [urlQ|http://httpbin.org/here/we/go|]
193− renderUrl uriHttp `shouldBe` "http://httpbin.org/here/we/go"
194− context "http" $ do
195− context "empty path" $
196− it "renders correctly" $ do
197− let (uriHttp, _) = [urlQ|https://httpbin.org|]
198− renderUrl uriHttp `shouldBe` "https://httpbin.org"
199− context "non-empty path" $
200− it "renders correctly" $ do
201− let (uriHttp, _) = [urlQ|https://httpbin.org/here/we/go|]
202− renderUrl uriHttp `shouldBe` "https://httpbin.org/here/we/go"
125+ property $ \host mport' pieces queryParams -> do
126+ let (url', path, queryString) =
127+ assembleUrl Https host mport' pieces queryParams
128+ (url'', options) = fromJust (parseUrlHttps url')
129+ request <- req_ GET url'' NoReqBody options
130+ L.host request `shouldBe` urlEncode (unHost host)
131+ L.port request `shouldBe` maybe 443 getNonNegative mport'
132+ L.path request `shouldBe` path
133+ L.queryString request `shouldBe` queryString
134+ it "rejects gibberish in port component" $ do
135+ parseUrlHttp "https://my-site.com:bob/far" `shouldSatisfy` isNothing
136+ parseUrlHttp "https://my-site.com:7001uh/api" `shouldSatisfy` isNothing
137+ parseUrlHttp "https://my-site.com:/bar" `shouldSatisfy` isNothing
203138
204139 describe "bodies" $ do
205140 describe "NoReqBody" $
@@ -223,7 +158,7 @@ spec = do
223158 L.RequestBodyBS x -> x `shouldBe` bs
224159 _ -> expectationFailure "Wrong request body constructor."
225160 describe "ReqBodyLbs" $
226− it "sets body to specified lazy byte string" $
161+ it "sets body to specified lazy byte string" $
227162 property $ \lbs -> do
228163 request <- req_ POST url (ReqBodyLbs lbs) mempty
229164 case L.requestBody request of
@@ -237,19 +172,6 @@ spec = do
237172 L.RequestBodyLBS x -> x `shouldBe` renderQuery params
238173 _ -> expectationFailure "Wrong request body constructor."
239174
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−
253175 describe "optional parameters" $ do
254176 describe "header" $ do
255177 it "sets specified header value" $
@@ -258,136 +180,94 @@ spec = do
258180 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value
259181 it "left header wins" $
260182 property $ \name value0 value1 -> do
261− request <-
262− req_
263− GET
264− url
265− NoReqBody
266− (header name value0 <> header name value1)
183+ request <- req_ GET url NoReqBody
184+ (header name value0 <> header name value1)
267185 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value0
268186 it "overwrites headers set by other parts of the lib" $
269187 property $ \value -> do
270− request <-
271− req_
272− POST
273− url
274− (ReqBodyUrlEnc mempty)
275− (header "Content-Type" value)
188+ request <- req_ POST url (ReqBodyUrlEnc mempty)
189+ (header "Content-Type" value)
276190 lookup "Content-Type" (L.requestHeaders request) `shouldBe` pure value
277191 describe "cookieJar" $
278192 it "cookie jar is set without modifications" $
279193 property $ \cjar -> do
280194 request <- req_ GET url NoReqBody (cookieJar cjar)
281− L.cookieJar request `shouldSatisfy` (maybe False (L.equalCookieJar cjar))
195+ L.cookieJar request `shouldBe` pure cjar
282196 describe "basicAuth" $ do
283197 it "sets Authorization header to correct value" $
284198 property $ \username password -> do
285199 request <- req_ GET url NoReqBody (basicAuth username password)
286− lookup "Authorization" (L.requestHeaders request)
287− `shouldBe` Just (basicAuthHeader username password)
200+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
201+ pure (basicAuthHeader username password)
288202 it "overwrites manual setting of header" $
289203 property $ \username password value -> do
290− request0 <-
291− req_
292− GET
293− url
294− NoReqBody
295− (basicAuth username password <> header "Authorization" value)
296− request1 <-
297− req_
298− GET
299− url
300− NoReqBody
301− (header "Authorization" value <> basicAuth username password)
302− let result = Just (basicAuthHeader username password)
303− lookup "Authorization" (L.requestHeaders request0) `shouldBe` result
304− lookup "Authorization" (L.requestHeaders request1) `shouldBe` result
204+ request0 <- req_ GET url NoReqBody
205+ (basicAuth username password <> header "Authorization" value)
206+ request1 <- req_ GET url NoReqBody
207+ (header "Authorization" value <> basicAuth username password)
208+ let result = basicAuthHeader username password
209+ lookup "Authorization" (L.requestHeaders request0) `shouldBe`
210+ pure result
211+ lookup "Authorization" (L.requestHeaders request1) `shouldBe`
212+ pure result
305213 it "left auth option wins" $
306214 property $ \username0 password0 username1 password1 -> do
307− request <-
308− req_
309− GET
310− url
311− NoReqBody
312− (basicAuth username0 password0 <> basicAuth username1 password1)
313− lookup "Authorization" (L.requestHeaders request)
314− `shouldBe` Just (basicAuthHeader username0 password0)
215+ request <- req_ GET url NoReqBody
216+ (basicAuth username0 password0 <> basicAuth username1 password1)
217+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
218+ pure (basicAuthHeader username0 password0)
315219 describe "oAuth2Bearer" $ do
316220 it "sets Authorization header to correct value" $
317221 property $ \token -> do
318222 request <- req_ GET url NoReqBody (oAuth2Bearer token)
319− lookup "Authorization" (L.requestHeaders request)
320− `shouldBe` pure ("Bearer " <> token)
223+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
224+ pure ("Bearer " <> token)
321225 it "overwrites manual setting of header" $
322226 property $ \token value -> do
323− request0 <-
324− req_
325− GET
326− url
327− NoReqBody
328− (oAuth2Bearer token <> header "Authorization" value)
329− request1 <-
330− req_
331− GET
332− url
333− NoReqBody
334− (header "Authorization" value <> oAuth2Bearer token)
227+ request0 <- req_ GET url NoReqBody
228+ (oAuth2Bearer token <> header "Authorization" value)
229+ request1 <- req_ GET url NoReqBody
230+ (header "Authorization" value <> oAuth2Bearer token)
335231 let result = "Bearer " <> token
336− lookup "Authorization" (L.requestHeaders request0)
337− `shouldBe` pure result
338− lookup "Authorization" (L.requestHeaders request1)
339− `shouldBe` pure result
232+ lookup "Authorization" (L.requestHeaders request0) `shouldBe`
233+ pure result
234+ lookup "Authorization" (L.requestHeaders request1) `shouldBe`
235+ pure result
340236 it "left auth option wins" $
341237 property $ \token0 token1 -> do
342− request <-
343− req_
344− GET
345− url
346− NoReqBody
347− (oAuth2Bearer token0 <> oAuth2Bearer token1)
348− lookup "Authorization" (L.requestHeaders request)
349− `shouldBe` pure ("Bearer " <> token0)
350− describe "ProxyAuthorization" $
238+ request <- req_ GET url NoReqBody
239+ (oAuth2Bearer token0 <> oAuth2Bearer token1)
240+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
241+ pure ("Bearer " <> token0)
242+ describe "ProxyAuthorization" $ do
351243 it "sets Authorization header to correct value" $
352244 property $ \username password -> do
353245 request <- req_ GET url NoReqBody (basicProxyAuth username password)
354− lookup "Proxy-Authorization" (L.requestHeaders request)
355− `shouldBe` pure (basicProxyAuthHeader username password)
246+ lookup "Proxy-Authorization" (L.requestHeaders request) `shouldBe`
247+ pure (basicProxyAuthHeader username password)
356248 describe "oAuth2Token" $ do
357249 it "sets Authorization header to correct value" $
358250 property $ \token -> do
359251 request <- req_ GET url NoReqBody (oAuth2Token token)
360− lookup "Authorization" (L.requestHeaders request)
361− `shouldBe` pure ("token " <> token)
252+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
253+ pure ("token " <> token)
362254 it "overwrites manual setting of header" $
363255 property $ \token value -> do
364− request0 <-
365− req_
366− GET
367− url
368− NoReqBody
369− (oAuth2Token token <> header "Authorization" value)
370− request1 <-
371− req_
372− GET
373− url
374− NoReqBody
375− (header "Authorization" value <> oAuth2Token token)
256+ request0 <- req_ GET url NoReqBody
257+ (oAuth2Token token <> header "Authorization" value)
258+ request1 <- req_ GET url NoReqBody
259+ (header "Authorization" value <> oAuth2Token token)
376260 let result = "token " <> token
377− lookup "Authorization" (L.requestHeaders request0)
378− `shouldBe` pure result
379− lookup "Authorization" (L.requestHeaders request1)
380− `shouldBe` pure result
261+ lookup "Authorization" (L.requestHeaders request0) `shouldBe`
262+ pure result
263+ lookup "Authorization" (L.requestHeaders request1) `shouldBe`
264+ pure result
381265 it "left auth option wins" $
382266 property $ \token0 token1 -> do
383− request <-
384− req_
385− GET
386− url
387− NoReqBody
388− (oAuth2Token token0 <> oAuth2Token token1)
389− lookup "Authorization" (L.requestHeaders request)
390− `shouldBe` pure ("token " <> token0)
267+ request <- req_ GET url NoReqBody
268+ (oAuth2Token token0 <> oAuth2Token token1)
269+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
270+ pure ("token " <> token0)
391271 describe "port" $
392272 it "sets port overwriting the defaults" $
393273 property $ \n -> do
@@ -407,19 +287,6 @@ spec = do
407287 request <- req_ GET url NoReqBody (httpVersion major minor)
408288 L.requestVersion request `shouldBe` Y.HttpVersion major minor
409289
410− describe "quasiquoter" $ do
411− it "works for valid urls" $
412− -- Doing it this way instead of just checking if [urlQ|...|] :: (Url
413− -- 'Https, Option _) type checks, so we can catch if the type of scheme
414− -- is unspecified.
415− let testTypeOfQuoterResult ::
416− forall a s. (Typeable a) => (a, Option s) -> Bool
417− testTypeOfQuoterResult _ = isJust $ eqT @a @(Url 'Https)
418− in property $ testTypeOfQuoterResult [urlQ|https://example.org/|]
419− it "doesn't work for invalid urls" $
420− property $
421− TH.runQ (TH.quoteExp urlQ "not a url") `shouldThrow` anyIOException
422−
423290----------------------------------------------------------------------------
424291-- Instances
425292
@@ -428,27 +295,21 @@ instance MonadHttp IO where
428295
429296instance Arbitrary HttpConfig where
430297 arbitrary = do
431− httpConfigProxy <- arbitrary
298+ httpConfigProxy <- arbitrary
432299 httpConfigRedirectCount <- arbitrary
433− let httpConfigAltManager = Nothing
300+ let httpConfigAltManager = Nothing
434301 httpConfigCheckResponse _ _ _ = Nothing
435− httpConfigRetryPolicy = retryPolicyDefault
436− httpConfigRetryJudge _ _ = False
437− httpConfigRetryJudgeException _ _ = False
438− httpConfigBodyPreviewLength = 1024
302+ httpConfigRetryPolicy = def
303+ httpConfigRetryJudge _ _ = False
439304 return HttpConfig {..}
440305
441306instance Show HttpConfig where
442307 show HttpConfig {..} =
443− "HttpConfig\n"
444− ++ "{ httpConfigProxy="
445− ++ show httpConfigProxy
446− ++ "\n"
447− ++ ", httpRedirectCount="
448− ++ show httpConfigRedirectCount
449− ++ "\n"
450− ++ ", httpConfigAltManager=<cannot be shown>\n"
451− ++ ", httpConfigCheckResponse=<cannot be shown>}\n"
308+ "HttpConfig\n" ++
309+ "{ httpConfigProxy=" ++ show httpConfigProxy ++ "\n" ++
310+ ", httpRedirectCount=" ++ show httpConfigRedirectCount ++ "\n" ++
311+ ", httpConfigAltManager=<cannot be shown>\n" ++
312+ ", httpConfigCheckResponse=<cannot be shown>}\n"
452313
453314instance Arbitrary L.Proxy where
454315 arbitrary = L.Proxy <$> arbitrary <*> arbitrary
@@ -466,10 +327,9 @@ instance Show (Option scheme) where
466327 show _ = "<cannot be shown>"
467328
468329data Thing = Thing
469− { _thingBool :: Bool,
470− _thingText :: Text
471− }
472− deriving (Eq, Show, Generic)
330+ { _thingBool :: Bool
331+ , _thingText :: Text
332+ } deriving (Eq, Show, Generic)
473333
474334instance ToJSON Thing
475335
@@ -481,17 +341,17 @@ instance Arbitrary L.CookieJar where
481341
482342instance Arbitrary L.Cookie where
483343 arbitrary = do
484− cookie_name <- arbitrary
485− cookie_value <- arbitrary
486− cookie_expiry_time <- arbitrary
487− cookie_domain <- arbitrary
488− cookie_path <- arbitrary
344+ cookie_name <- arbitrary
345+ cookie_value <- arbitrary
346+ cookie_expiry_time <- arbitrary
347+ cookie_domain <- arbitrary
348+ cookie_path <- arbitrary
489349 cookie_creation_time <- arbitrary
490350 cookie_last_access_time <- arbitrary
491− cookie_persistent <- arbitrary
492− cookie_host_only <- arbitrary
493− cookie_secure_only <- arbitrary
494− cookie_http_only <- arbitrary
351+ cookie_persistent <- arbitrary
352+ cookie_host_only <- arbitrary
353+ cookie_secure_only <- arbitrary
354+ cookie_http_only <- arbitrary
495355 return L.Cookie {..}
496356
497357instance Arbitrary UTCTime where
@@ -503,20 +363,19 @@ instance Arbitrary Day where
503363instance Arbitrary DiffTime where
504364 arbitrary = secondsToDiffTime <$> arbitrary
505365
506−instance Arbitrary F.Form where
507− arbitrary = (F.Form . fromList) <$> arbitrary
508−
509366----------------------------------------------------------------------------
510367-- Helper types
511368
512369-- | A wrapper to generate correct hosts.
513−newtype Host = Host {unHost :: Text}
370+
371+newtype Host = Host { unHost :: Text }
514372 deriving (Eq, Show)
515373
516374instance Arbitrary Host where
517375 arbitrary = Host . T.pack <$> listOf1 (arbitrary `suchThat` (/= ':'))
518376
519377-- | A wrapper to generate correct query parameters.
378+
520379newtype QueryParams = QueryParams [(Text, Maybe Text)]
521380 deriving (Eq, Show)
522381
@@ -529,84 +388,68 @@ instance Arbitrary QueryParams where
529388-- Helpers
530389
531390-- | 'req' that just returns the prepared 'L.Request'.
532−req_ ::
533− ( MonadHttp m,
534− HttpMethod method,
535− HttpBody body,
536− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
537− ) =>
538− -- | HTTP method
539− method ->
540− -- | 'Url' — location of resource
541− Url scheme ->
542− -- | Body of the request
543− body ->
544− -- | Collection of optional parameters
545− Option scheme ->
546− -- | Vanilla request
547− m L.Request
391+
392+req_
393+ :: ( MonadHttp m
394+ , HttpMethod method
395+ , HttpBody body
396+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
397+ => method -- ^ HTTP method
398+ -> Url scheme -- ^ 'Url' — location of resource
399+ -> body -- ^ Body of the request
400+ -> Option scheme -- ^ Collection of optional parameters
401+ -> m L.Request -- ^ Vanilla request
548402req_ method url' body options = req' method url' body options $
549403 \request _ -> return request
550404
551405-- | A dummy 'Url'.
406+
552407url :: Url 'Https
553408url = https "httpbin.org"
554409
555410-- | Percent encode given 'Text'.
411+
556412urlEncode :: Text -> ByteString
557413urlEncode = Y.urlEncode False . T.encodeUtf8
558414
559415-- | Build URL path from given path pieces.
416+
560417encodePathPieces :: [Text] -> ByteString
561418encodePathPieces = BL.toStrict . BB.toLazyByteString . Y.encodePathSegments
562419
563−-- | Get host from a 'URI'. This function is not total.
564−uriHost :: URI -> ByteString
565−uriHost uri =
566− fromJust $
567− urlEncode . URI.unRText . URI.authHost
568− <$> either (const Nothing) Just (URI.uriAuthority uri)
569−
570−-- | Get part from a 'URI' defaulting to the provided value.
571−uriPort :: Int -> URI -> Int
572−uriPort def uri =
573− maybe def (fromIntegral) $
574− either (const Nothing) Just (URI.uriAuthority uri) >>= URI.authPort
575−
576−-- | Get the path from a 'URI'.
577−uriPath :: URI -> ByteString
578−uriPath 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
582−
583−-- | Get the query string from a 'URI'.
584−uriQuery :: URI -> ByteString
585−uriQuery uri = do
586− let liftQueryParam = \case
587− URI.QueryFlag t -> (URI.unRText t, Nothing)
588− URI.QueryParam k v -> (URI.unRText k, Just (URI.unRText v))
589− Y.renderQuery True (Y.queryTextToQuery (liftQueryParam <$> (URI.uriQuery uri)))
590−
591−-- | Predict the headrs that should be set if the given 'URI' has username
592−-- and password in it.
593−uriBasicAuth :: URI -> Maybe ByteString
594−uriBasicAuth uri = do
595− auth <- either (const Nothing) Just (URI.uriAuthority uri)
596− URI.UserInfo {..} <- URI.authUserInfo auth
597− let username = T.encodeUtf8 (URI.unRText uiUsername)
598− password = maybe "" (T.encodeUtf8 . URI.unRText) uiPassword
599− return (basicAuthHeader username password)
600−
601−-- | Render a query as lazy 'BL.ByteString'.
420+-- | Assemble a URL.
421+
422+assembleUrl
423+ :: Scheme -- ^ Scheme
424+ -> Host -- ^ Host
425+ -> Maybe (NonNegative Int) -- ^ Port
426+ -> [Text] -- ^ Path pieces
427+ -> QueryParams -- ^ Query parameters
428+ -> (ByteString, ByteString, ByteString) -- ^ URL, path, query string
429+assembleUrl scheme' (Host host') mport' pathPieces (QueryParams queryParams) =
430+ (scheme <> host <> port' <> path <> queryString, path, queryString)
431+ where
432+ scheme = case scheme' of
433+ Http -> "http://"
434+ Https -> "https://"
435+ host = urlEncode host'
436+ port' =
437+ case mport' of
438+ Nothing -> ""
439+ Just (NonNegative x) -> ":" <> B8.pack (show x)
440+ path = encodePathPieces pathPieces
441+ queryString = Y.renderQuery True (Y.queryTextToQuery queryParams)
442+
602443renderQuery :: [(Text, Maybe Text)] -> BL.ByteString
603444renderQuery = BL.fromStrict . Y.renderQuery False . Y.queryTextToQuery
604445
605446-- | Convert collection of query parameters to 'FormUrlEncodedParam' thing.
447+
606448formUrlEnc :: [(Text, Maybe Text)] -> FormUrlEncodedParam
607449formUrlEnc = foldMap (uncurry queryParam)
608450
609451-- | Get “Authorization” basic auth header given username and password.
452+
610453basicAuthHeader :: ByteString -> ByteString -> ByteString
611454basicAuthHeader username password =
612455 fromJust . lookup Y.hAuthorization . L.requestHeaders $
@@ -614,19 +457,8 @@ basicAuthHeader username password =
614457
615458-- | Get "Proxy-Authorization" basic proxy auth header given username and
616459-- password.
460+
617461basicProxyAuthHeader :: ByteString -> ByteString -> ByteString
618462basicProxyAuthHeader username password =
619463 fromJust . lookup Y.hProxyAuthorization . L.requestHeaders $
620464 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+104−117
@@ -1,127 +1,114 @@
1−cabal-version: 2.4
2−name: req
3−version: 3.13.4
4−license: BSD-3-Clause
5−license-file: LICENSE.md
6−maintainer: Mark Karpov <markkarpov92@gmail.com>
7−author: Mark Karpov <markkarpov92@gmail.com>
8−tested-with: ghc ==9.6.3 ghc ==9.8.2 ghc ==9.10.1
9−homepage: https://github.com/mrkkrp/req
10−bug-reports: https://github.com/mrkkrp/req/issues
11−synopsis: HTTP client library
12−description: HTTP client library.
13−category: Network, Web
14−build-type: Simple
15−data-files:
16− httpbin-data/utf8.html
17− httpbin-data/robots.txt
18−
19−extra-doc-files:
20− CHANGELOG.md
21− README.md
1+name: req
2+version: 1.1.0
3+cabal-version: 1.18
4+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
5+license: BSD3
6+license-file: LICENSE.md
7+author: Mark Karpov <markkarpov92@gmail.com>
8+maintainer: Mark Karpov <markkarpov92@gmail.com>
9+homepage: https://github.com/mrkkrp/req
10+bug-reports: https://github.com/mrkkrp/req/issues
11+category: Network, Web
12+synopsis: Easy-to-use, type-safe, expandable, high-level HTTP client library
13+build-type: Simple
14+description: Easy-to-use, type-safe, expandable, high-level HTTP client library.
15+extra-doc-files: CHANGELOG.md
16+ , README.md
17+data-files: httpbin-data/utf8.html
18+ , httpbin-data/robots.txt
2219
2320source-repository head
24− type: git
25− location: https://github.com/mrkkrp/req.git
21+ type: git
22+ location: https://github.com/mrkkrp/req.git
2623
2724flag dev
28− description: Turn on development settings.
29− default: False
30− manual: True
25+ description: Turn on development settings.
26+ manual: True
27+ default: False
3128
3229library
33− exposed-modules: Network.HTTP.Req
34− default-language: GHC2021
35− build-depends:
36− aeson >=0.9 && <3,
37− authenticate-oauth >=1.5 && <1.8,
38− base >=4.15 && <5,
39− blaze-builder >=0.3 && <0.5,
40− bytestring >=0.10.8 && <0.13,
41− 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,
45− exceptions >=0.6 && <0.11,
46− http-api-data >=0.2 && <0.7,
47− http-client >=0.7.13.1 && <0.8,
48− http-client-tls >=0.3.2 && <0.4,
49− http-types >=0.8 && <10,
50− modern-uri >=0.3 && <0.4,
51− monad-control >=1.0 && <1.1,
52− 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,
58− unliftio-core >=0.1.1 && <0.3
59−
60− if flag(dev)
61− ghc-options:
62− -Wall -Werror -Wpartial-fields -Wunused-packages
63− -Wno-unused-imports
64−
65− else
66− ghc-options: -O2 -Wall
30+ build-depends: aeson >= 0.9 && < 1.4
31+ , authenticate-oauth >= 1.5 && < 1.7
32+ , base >= 4.8 && < 5.0
33+ , blaze-builder >= 0.3 && < 0.5
34+ , bytestring >= 0.10.8 && < 0.11
35+ , case-insensitive >= 0.2 && < 1.3
36+ , connection >= 0.2.2 && < 0.3
37+ , data-default-class
38+ , http-api-data >= 0.2 && < 0.4
39+ , http-client >= 0.5 && < 0.6
40+ , http-client-tls >= 0.3.2 && < 0.4
41+ , http-types >= 0.8 && < 10.0
42+ , monad-control >= 1.0 && < 1.1
43+ , mtl >= 2.0 && < 3.0
44+ , retry >= 0.7 && < 0.8
45+ , text >= 0.2 && < 1.3
46+ , time >= 1.2 && < 1.9
47+ , transformers >= 0.4 && < 0.6
48+ , transformers-base
49+ if !impl(ghc >= 8.0)
50+ build-depends: semigroups == 0.18.*
51+ exposed-modules: Network.HTTP.Req
52+ if flag(dev)
53+ ghc-options: -O0 -Wall -Werror
54+ else
55+ ghc-options: -O2 -Wall
56+ if flag(dev) && impl(ghc >= 8.0)
57+ ghc-options: -Wcompat
58+ -Wincomplete-record-updates
59+ -Wincomplete-uni-patterns
60+ -Wnoncanonical-monad-instances
61+ -Wnoncanonical-monadfail-instances
62+ default-language: Haskell2010
6763
6864test-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− build-depends:
76− QuickCheck >=2.7 && <3,
77− aeson >=0.9 && <3,
78− base >=4.15 && <5.0,
79− blaze-builder >=0.3 && <0.5,
80− bytestring >=0.10.8 && <0.13,
81− 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,
87− 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−
94− if flag(dev)
95− ghc-options:
96− -Wall -Werror -Wredundant-constraints -Wpartial-fields
97− -Wunused-packages
98−
99− else
100− ghc-options: -O2 -Wall
65+ main-is: Spec.hs
66+ other-modules: Network.HTTP.ReqSpec
67+ hs-source-dirs: pure-tests
68+ type: exitcode-stdio-1.0
69+ build-depends: QuickCheck >= 2.7 && < 3.0
70+ , aeson >= 0.9 && < 1.4
71+ , base >= 4.8 && < 5.0
72+ , blaze-builder >= 0.3 && < 0.5
73+ , bytestring >= 0.10.8 && < 0.11
74+ , case-insensitive >= 0.2 && < 1.3
75+ , data-default-class
76+ , hspec >= 2.0 && < 3.0
77+ , hspec-core >= 2.0 && < 3.0
78+ , http-client >= 0.5 && < 0.6
79+ , http-types >= 0.8 && < 10.0
80+ , mtl >= 2.0 && < 3.0
81+ , req
82+ , text >= 0.2 && < 1.3
83+ , time >= 1.2 && < 1.9
84+ build-tools: hspec-discover >= 2.0 && < 3.0
85+ if flag(dev)
86+ ghc-options: -O0 -Wall -Werror
87+ else
88+ ghc-options: -O2 -Wall
89+ default-language: Haskell2010
10190
10291test-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
109− build-depends:
110− QuickCheck >=2.7 && <3,
111− aeson >=2 && <3,
112− base >=4.15 && <5,
113− bytestring >=0.10.8 && <0.13,
114− hspec >=2.0 && <3.0,
115− http-client >=0.7 && <0.8,
116− http-types >=0.8 && <10,
117− monad-control >=1.0 && <1.1,
118− req,
119− text >=0.2 && <2.2
120−
121− if flag(dev)
122− ghc-options:
123− -Wall -Werror -Wredundant-constraints -Wpartial-fields
124− -Wunused-packages
125−
126− else
127− buildable: False
92+ main-is: Spec.hs
93+ other-modules: Network.HTTP.ReqSpec
94+ hs-source-dirs: httpbin-tests
95+ type: exitcode-stdio-1.0
96+ build-depends: QuickCheck >= 2.7 && < 3.0
97+ , aeson >= 0.9 && < 1.4
98+ , base >= 4.8 && < 5.0
99+ , bytestring >= 0.10.8 && < 0.11
100+ , data-default-class
101+ , hspec >= 2.0 && < 3.0
102+ , http-client >= 0.5 && < 0.6
103+ , http-types >= 0.8 && < 10.0
104+ , monad-control >= 1.0 && < 1.1
105+ , mtl >= 2.0 && < 3.0
106+ , req
107+ , text >= 0.2 && < 1.3
108+ , unordered-containers >= 0.2.5 && < 0.2.10
109+ build-tools: hspec-discover >= 2.0 && < 3.0
110+ if flag(dev)
111+ ghc-options: -O0 -Wall -Werror
112+ else
113+ ghc-options: -O2 -Wall
114+ default-language: Haskell2010