on master help sign in
12 files changed+1984−1341
since splitsnapshots
unifiedsplit
.github/dependabot.yml+6 .github/workflows/ci.yaml+47 .gitignore+2 .travis.yml−34 CHANGELOG.md+120−2 Network/HTTP/Req.hs+989−663 README.md+40−140 Setup.hs−6 cabal.project+4 httpbin-tests/Network/HTTP/ReqSpec.hs+309−187 pure-tests/Network/HTTP/ReqSpec.hs+350−209 req.cabal+117−100
.github/dependabot.ymlnew file+6
@@ -0,0 +1,6 @@
1+version: 2
2+updates:
3+ - package-ecosystem: "github-actions"
4+ directory: "/"
5+ schedule:
6+ interval: "weekly"
.github/workflows/ci.yamlnew file+47
@@ -0,0 +1,47 @@
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,4 +25,6 @@ cabal.project.local
2525cabal.sandbox.config
2626dist-*/
2727dist/
28+hie.yaml
2829stack.yaml
30+stack.yaml.lock
.travis.ymldeleted−34
@@ -1,34 +0,0 @@
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.4 GHCVER=8.2.2
13− addons: {apt: {packages: [cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
14− - env: CABALVER=2.4 GHCVER=8.4.4
15− addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
16− - env: CABALVER=2.4 GHCVER=8.6.5
17− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}
18−
19−before_install:
20− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
21−
22−install:
23− - cabal --version
24− - ghc --version
25− - travis_retry cabal new-update
26−
27−script:
28− - cabal new-build --enable-tests --enable-benchmarks --flags=dev
29− - cabal new-test --enable-tests --enable-benchmarks --flags=dev
30− - cabal new-haddock
31− - cabal sdist
32−
33−notifications:
34− email: false
CHANGELOG.md+120−2
@@ -1,6 +1,124 @@
1−## Unreleased
1+## Req 3.13.4
22
3−* Dropped support for GHC 8.0.
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.
4122
5123## Req 2.1.0
6124
Network/HTTP/Req.hs+989−663
@@ -1,3 +1,13 @@
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-- |
212-- Module : Network.HTTP.Req
313-- Copyright : © 2016–present Mark Karpov
@@ -9,61 +19,40 @@
919--
1020-- The documentation below is structured in such a way that the most
1121-- important information is presented first: you learn how to do HTTP
12−-- requests, how to embed them in any monad you have, and then it gives you
22+-- requests, how to embed them in the monad you have, and then it gives you
1323-- details about less-common things you may want to know about. The
1424-- documentation is written with sufficient coverage of details and
1525-- examples, and it's designed to be a complete tutorial on its own.
1626--
17−-- /(A modest intro goes here, click on 'req' to start making requests.)/
18−--
1927-- === About the library
2028--
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 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 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 the user extends the library to satisfy his\/her special
54−-- needs, the new solutions will work just like the built-ins. However, all
55−-- of the common cases are also covered by the library out-of-the-box.
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 down boilerplate
65−-- considerably, and helps you write concise, easy to read, and maintainable
66−-- code.
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.
6756--
6857-- === Using with other libraries
6958--
@@ -87,167 +76,200 @@
8776-- the whole Haskell ecosystem uses, there is no risk in using @req@. The
8877-- machinery for performing requests is the same as with @http-conduit@ and
8978-- @wreq@. The only difference is the API.
90−
91−{-# LANGUAGE BangPatterns #-}
92−{-# LANGUAGE DataKinds #-}
93−{-# LANGUAGE DeriveDataTypeable #-}
94−{-# LANGUAGE DeriveGeneric #-}
95−{-# LANGUAGE FlexibleInstances #-}
96−{-# LANGUAGE GeneralizedNewtypeDeriving #-}
97−{-# LANGUAGE KindSignatures #-}
98−{-# LANGUAGE MultiParamTypeClasses #-}
99−{-# LANGUAGE OverloadedStrings #-}
100−{-# LANGUAGE RankNTypes #-}
101−{-# LANGUAGE RecordWildCards #-}
102−{-# LANGUAGE ScopedTypeVariables #-}
103−{-# LANGUAGE TypeFamilies #-}
104−{-# LANGUAGE UndecidableInstances #-}
105−
10679module Network.HTTP.Req
10780 ( -- * Making a request
10881 -- $making-a-request
109− req
110− , reqBr
111− , req'
112− , withReqManager
82+ req,
83+ reqBr,
84+ reqCb,
85+ req',
86+ withReqManager,
87+
11388 -- * Embedding requests in your monad
11489 -- $embedding-requests
115− , MonadHttp (..)
116− , HttpConfig (..)
117− , defaultHttpConfig
118− , Req
119− , runReq
90+ MonadHttp (..),
91+ HttpConfig (..),
92+ defaultHttpConfig,
93+ Req,
94+ runReq,
95+
12096 -- * Request
97+
12198 -- ** Method
12299 -- $method
123− , GET (..)
124− , POST (..)
125− , HEAD (..)
126− , PUT (..)
127− , DELETE (..)
128− , TRACE (..)
129− , CONNECT (..)
130− , OPTIONS (..)
131− , PATCH (..)
132− , HttpMethod (..)
100+ GET (..),
101+ POST (..),
102+ HEAD (..),
103+ PUT (..),
104+ DELETE (..),
105+ TRACE (..),
106+ CONNECT (..),
107+ OPTIONS (..),
108+ PATCH (..),
109+ HttpMethod (..),
110+
133111 -- ** URL
134112 -- $url
135− , Url
136− , http
137− , https
138− , (/~)
139− , (/:)
140− , parseUrlHttp
141− , parseUrlHttps
142− , parseUrl
113+ Url,
114+ http,
115+ https,
116+ (/~),
117+ (/:),
118+ useHttpURI,
119+ useHttpsURI,
120+ useURI,
121+ urlQ,
122+ renderUrl,
123+
143124 -- ** Body
144125 -- $body
145− , NoReqBody (..)
146− , ReqBodyJson (..)
147− , ReqBodyFile (..)
148− , ReqBodyBs (..)
149− , ReqBodyLbs (..)
150− , ReqBodyUrlEnc (..)
151− , FormUrlEncodedParam
152− , ReqBodyMultipart
153− , reqBodyMultipart
154− , HttpBody (..)
155− , ProvidesBody
156− , HttpBodyAllowed
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+
157139 -- ** Optional parameters
158140 -- $optional-parameters
159− , Option
141+ Option,
142+
160143 -- *** Query parameters
161144 -- $query-parameters
162− , (=:)
163− , queryFlag
164− , QueryParam (..)
145+ (=:),
146+ queryFlag,
147+ formToQuery,
148+ QueryParam (..),
149+
165150 -- *** Headers
166− , header
167− , attachHeader
151+ header,
152+ attachHeader,
153+ headerRedacted,
154+
168155 -- *** Cookies
169156 -- $cookies
170− , cookieJar
157+ cookieJar,
158+
171159 -- *** Authentication
172160 -- $authentication
173− , basicAuth
174− , basicAuthUnsafe
175− , basicProxyAuth
176− , oAuth1
177− , oAuth2Bearer
178− , oAuth2Token
179− , customAuth
161+ basicAuth,
162+ basicAuthUnsafe,
163+ basicProxyAuth,
164+ oAuth1,
165+ oAuth2Bearer,
166+ oAuth2Token,
167+ customAuth,
168+
180169 -- *** Other
181− , port
182− , decompress
183− , responseTimeout
184− , httpVersion
170+ port,
171+ decompress,
172+ responseTimeout,
173+ httpVersion,
174+
185175 -- * Response
176+
186177 -- ** Response interpretations
187− , IgnoreResponse
188− , ignoreResponse
189− , JsonResponse
190− , jsonResponse
191− , BsResponse
192− , bsResponse
193− , LbsResponse
194− , lbsResponse
178+ IgnoreResponse,
179+ ignoreResponse,
180+ JsonResponse,
181+ jsonResponse,
182+ BsResponse,
183+ bsResponse,
184+ LbsResponse,
185+ lbsResponse,
186+
195187 -- ** Inspecting a response
196− , responseBody
197− , responseStatusCode
198− , responseStatusMessage
199− , responseHeader
200− , responseCookieJar
188+ responseBody,
189+ responseStatusCode,
190+ responseStatusMessage,
191+ responseHeader,
192+ responseCookieJar,
193+
201194 -- ** Defining your own interpretation
202195 -- $new-response-interpretation
203− , HttpResponse (..)
196+ HttpResponse (..),
197+
204198 -- * Other
205− , HttpException (..)
206− , CanHaveBody (..)
207− , Scheme (..) )
199+ HttpException (..),
200+ isStatusCodeException,
201+ CanHaveBody (..),
202+ Scheme (..),
203+ )
208204where
209205
206+import Blaze.ByteString.Builder qualified as BB
210207import Control.Applicative
211208import Control.Arrow (first, second)
212−import Control.Exception hiding (TypeError)
209+import Control.Exception hiding (Handler (..), TypeError)
210+import Control.Monad (guard, void, (>=>))
213211import Control.Monad.Base
212+import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)
214213import Control.Monad.IO.Class
215−import Control.Monad.Reader
214+import Control.Monad.IO.Unlift
215+import Control.Monad.Reader (ReaderT (ReaderT), ask, lift, runReaderT)
216+import Control.Monad.Trans.Accum (AccumT)
217+import Control.Monad.Trans.Cont (ContT)
216218import 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
217231import Control.Retry
218−import Data.Aeson (ToJSON (..), FromJSON (..))
232+import Data.Aeson (FromJSON (..), ToJSON (..))
233+import Data.Aeson qualified as A
219234import 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
220238import Data.Data (Data)
239+import Data.Default.Class (def)
221240import Data.Function (on)
222241import Data.IORef
223−import Data.Kind (Constraint)
224−import Data.List (nubBy)
242+import Data.Kind (Constraint, Type)
243+import Data.List (foldl', nubBy)
225244import Data.List.NonEmpty (NonEmpty (..))
245+import Data.List.NonEmpty qualified as NE
226246import Data.Maybe (fromMaybe)
227247import Data.Proxy
228−import Data.Semigroup hiding (Option, option)
248+import Data.Semigroup (Endo (..))
249+import Data.Set qualified as S
229250import Data.Text (Text)
230−import Data.Typeable (Typeable)
251+import Data.Text qualified as T
252+import Data.Text.Encoding qualified as T
253+import Data.Typeable (Typeable, cast)
231254import GHC.Generics
232255import 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
233265import 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
234272import Web.HttpApiData (ToHttpApiData (..))
235−import qualified Blaze.ByteString.Builder as BB
236−import qualified Data.Aeson as A
237−import qualified Data.ByteString as B
238−import qualified Data.ByteString.Lazy as BL
239−import qualified Data.CaseInsensitive as CI
240−import qualified Data.List.NonEmpty as NE
241−import qualified Data.Text as T
242−import qualified Data.Text.Encoding as T
243−import qualified Data.Text.Read as TR
244−import qualified Network.Connection as NC
245−import qualified Network.HTTP.Client as L
246−import qualified Network.HTTP.Client.Internal as LI
247−import qualified Network.HTTP.Client.MultipartFormData as LM
248−import qualified Network.HTTP.Client.TLS as L
249−import qualified Network.HTTP.Types as Y
250−import qualified Web.Authenticate.OAuth as OAuth
251273
252274----------------------------------------------------------------------------
253275-- Making a request
@@ -271,7 +293,7 @@ import qualified Web.Authenticate.OAuth as OAuth
271293--
272294-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
273295-- tutorial has a section about HTTP bodies, but usage is very
274−-- straightforward and should be clear from the examples below.
296+-- straightforward and should be clear from the examples.
275297--
276298-- @response@ is a type hint how to make and interpret response of an HTTP
277299-- request. Out-of-the-box it can be the following:
@@ -311,6 +333,7 @@ import qualified Web.Authenticate.OAuth as OAuth
311333-- > import GHC.Generics
312334-- > import Network.HTTP.Req
313335-- > import qualified Data.ByteString.Char8 as B
336+-- > import qualified Text.URI as URI
314337--
315338-- We will be making requests against the <https://httpbin.org> service.
316339--
@@ -369,7 +392,8 @@ import qualified Web.Authenticate.OAuth as OAuth
369392-- > main = runReq defaultHttpConfig $ do
370393-- > -- This is an example of what to do when URL is given dynamically. Of
371394-- > -- course in a real application you may not want to use 'fromJust'.
372−-- > let (url, options) = fromJust (parseUrlHttps "https://httpbin.org/get?foo=bar")
395+-- > uri <- URI.mkURI "https://httpbin.org/get?foo=bar"
396+-- > let (url, options) = fromJust (useHttpsURI uri)
373397-- > response <- req GET url NoReqBody jsonResponse $
374398-- > "from" =: (15 :: Int) <>
375399-- > "to" =: (67 :: Int) <>
@@ -377,65 +401,138 @@ import qualified Web.Authenticate.OAuth as OAuth
377401-- > options <> -- contains the ?foo=bar part
378402-- > port 443 -- here you can put any port of course
379403-- > liftIO $ print (responseBody response :: Value)
380−
381−req
382− :: ( MonadHttp m
383− , HttpMethod method
384− , HttpBody body
385− , HttpResponse response
386− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
387− => method -- ^ HTTP method
388− -> Url scheme -- ^ 'Url'—location of resource
389− -> body -- ^ Body of the request
390− -> Proxy response -- ^ A hint how to interpret response
391− -> Option scheme -- ^ Collection of optional parameters
392− -> m response -- ^ Response
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
393423req method url body responseProxy options =
394− reqBr method url body (options <> extraOptions) getHttpResponse
395− where
396− extraOptions =
397− case acceptHeader responseProxy of
398− Nothing -> mempty
399− Just accept -> header "Accept" accept
424+ reqCb method url body responseProxy options pure
400425
401426-- | A version of 'req' that does not use one of the predefined instances of
402427-- 'HttpResponse' but instead allows the user to consume @'L.Response'
403428-- 'L.BodyReader'@ manually, in a custom way.
404429--
405430-- @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
406486
407−reqBr
408− :: ( MonadHttp m
409− , HttpMethod method
410− , HttpBody body
411− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
412− => method -- ^ HTTP method
413− -> Url scheme -- ^ 'Url'—location of resource
414− -> body -- ^ Body of the request
415− -> Option scheme -- ^ Collection of optional parameters
416− -> (L.Response L.BodyReader -> IO a) -- ^ How to consume response
417− -> m a -- ^ Result
418−reqBr method url body options consume = req' method url body options $ \request manager -> do
419− HttpConfig {..} <- getHttpConfig
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
420502 let wrapVanilla = handle (throwIO . VanillaHttpException)
421− wrapExc = handle (throwIO . LI.toHttpException request)
422− withRRef = bracket
423− (newIORef Nothing)
424− (readIORef >=> mapM_ L.responseClose)
425− (liftIO . try . wrapVanilla . wrapExc) (withRRef $ \rref -> do
426− let openResponse = mask_ $ do
427− r <- readIORef rref
428− mapM_ L.responseClose r
429− r' <- L.responseOpen request manager
430− writeIORef rref (Just r')
431− return r'
432− r <- retrying
433− httpConfigRetryPolicy
434− (\st r -> return $ httpConfigRetryJudge st r)
435− (const openResponse)
436− (preview, r') <- grabPreview bodyPreviewLength r
437− mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
438− consume r')
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+ )
439536 >>= either handleHttpException return
440537
441538-- | Mostly like 'req' with respect to its arguments, but accepts a callback
@@ -446,51 +543,57 @@ reqBr method url body options consume = req' method url body options $ \request
446543-- 'L.Request' and allows you to use it.
447544--
448545-- @since 0.3.0
449−
450−req'
451− :: forall m method body scheme a.
452− ( MonadHttp m
453− , HttpMethod method
454− , HttpBody body
455− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
456− => method -- ^ HTTP method
457− -> Url scheme -- ^ 'Url'—location of resource
458− -> body -- ^ Body of the request
459− -> Option scheme -- ^ Collection of optional parameters
460− -> (L.Request -> L.Manager -> m a) -- ^ How to perform request
461− -> m a -- ^ Result
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
462565req' method url body options m = do
463− config@HttpConfig {..} <- getHttpConfig
566+ config <- getHttpConfig
464567 let -- NOTE First appearance of any given header wins. This allows to
465568 -- “overwrite” headers when we construct a request by cons-ing.
466569 nubHeaders = Endo $ \x ->
467− x { L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x) }
468− request' = flip appEndo L.defaultRequest $
469− -- NOTE The order of 'mappend's matters, here method is overwritten
470− -- first and 'options' take effect last. In particular, this means
471− -- that 'options' can overwrite things set by other request
472− -- components, which is useful for setting port number,
473− -- "Content-Type" header, etc.
474− nubHeaders <>
475− getRequestMod options <>
476− getRequestMod config <>
477− getRequestMod (Womb body :: Womb "body" body) <>
478− getRequestMod url <>
479− getRequestMod (Womb method :: Womb "method" method)
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)
480584 request <- finalizeRequest options request'
481585 withReqManager (m request)
482586
483587-- | Perform an action using the global implicit 'L.Manager' that the rest
484−-- of the library uses. This allows to reuse connections that the
588+-- of the library uses. This allows us to reuse connections that the
485589-- 'L.Manager' controls.
590+withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591+withReqManager m = m globalManager
486592
487−withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
488−withReqManager m = liftIO (readIORef globalManager) >>= m
489−
490−-- | Global 'L.Manager' that 'req' uses. Here we just go with the default
491−-- settings, so users don't need to deal with this manager stuff at all, but
492−-- when we create a request, instance 'HttpConfig' can affect the default
493−-- settings via 'getHttpConfig'.
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'.
494597--
495598-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
496599-- The value of 'globalManager' is named and lives on top level. This means
@@ -498,16 +601,16 @@ withReqManager m = liftIO (readIORef globalManager) >>= m
498601-- manager. From that moment on the 'IORef' will be just reused—exactly the
499602-- behavior we want here in order to maximize connection sharing. GHC could
500603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
501−
502−globalManager :: IORef L.Manager
604+globalManager :: L.Manager
503605globalManager = unsafePerformIO $ do
504606 context <- NC.initConnectionContext
505− let settings = L.mkManagerSettingsContext
506− (Just context)
507− (NC.TLSSettingsSimple False False False)
508− Nothing
607+ let settings =
608+ L.mkManagerSettingsContext
609+ (Just context)
610+ def
611+ Nothing
509612 manager <- L.newManager settings
510− newIORef manager
613+ return manager
511614{-# NOINLINE globalManager #-}
512615
513616----------------------------------------------------------------------------
@@ -521,55 +624,43 @@ globalManager = unsafePerformIO $ do
521624-- When writing a library, keep your API polymorphic in terms of
522625-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
523626-- Another option is to use a @newtype@-wrapped monad stack and define
524−-- 'MonadHttp' for it. As of version /0.4.0/, the 'Req' monad that follows
525−-- this strategy is provided out-of-the-box (see below).
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).
526629
527630-- | A type class for monads that support performing HTTP requests.
528631-- Typically, you only need to define the 'handleHttpException' method
529632-- unless you want to tweak 'HttpConfig'.
530−
531−class MonadIO m => MonadHttp m where
532−
633+class (MonadIO m) => MonadHttp m where
533634 -- | This method describes how to deal with 'HttpException' that was
534635 -- caught by the library. One option is to re-throw it if you are OK with
535636 -- exceptions, but if you prefer working with something like
536637 -- 'Control.Monad.Except.MonadError', this is the right place to pass it to
537638 -- 'Control.Monad.Except.throwError'.
538−
539639 handleHttpException :: HttpException -> m a
540640
541− -- | Return 'HttpConfig' to be used when performing HTTP requests. Default
542− -- implementation returns its 'def' value, which is described in the
543− -- documentation for the type. Common usage pattern with manually defined
544− -- 'getHttpConfig' is to return some hard-coded value, or a value
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
545645 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
546646 -- approach to configuration is desirable.
547−
548647 getHttpConfig :: m HttpConfig
549648 getHttpConfig = return defaultHttpConfig
550649
551−-- | 'HttpConfig' contains general and default settings to be used when
552−-- making HTTP requests.
553−
650+-- | 'HttpConfig' contains settings to be used when making HTTP requests.
554651data HttpConfig = HttpConfig
555− { httpConfigProxy :: Maybe L.Proxy
556− -- ^ Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
652+ { -- | Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
557653 -- environment variables are respected, this setting overwrites them.
558654 -- Default value: 'Nothing'.
559− , httpConfigRedirectCount :: Int
560− -- ^ How many redirects to follow when getting a resource. Default
655+ httpConfigProxy :: Maybe L.Proxy,
656+ -- | How many redirects to follow when getting a resource. Default
561657 -- value: 10.
562− , httpConfigAltManager :: Maybe L.Manager
563− -- ^ Alternative 'L.Manager' to use. 'Nothing' (default value) means
658+ httpConfigRedirectCount :: Int,
659+ -- | Alternative 'L.Manager' to use. 'Nothing' (default value) means
564660 -- that the default implicit manager will be used (that's what you want
565661 -- in 99% of cases).
566− , httpConfigCheckResponse
567− :: forall b.
568− L.Request
569− -> L.Response b
570− -> ByteString
571− -> Maybe L.HttpExceptionContent
572− -- ^ Function to check the response immediately after receiving the
662+ httpConfigAltManager :: Maybe L.Manager,
663+ -- | Function to check the response immediately after receiving the
573664 -- status and headers, before streaming of response body. The third
574665 -- argument is the beginning of response body (typically first 1024
575666 -- bytes). This is used for throwing exceptions on non-success status
@@ -591,67 +682,106 @@ data HttpConfig = HttpConfig
591682 -- /1.0.0/.
592683 --
593684 -- @since 0.3.0
594− , httpConfigRetryPolicy :: RetryPolicy
595− -- ^ The retry policy to use for request retrying. By default 'def' is
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
596692 -- used (see 'RetryPolicyM').
597693 --
598− -- __Note__: signature of this function was changed in the version
599− -- /1.0.0/.
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/.
600696 --
601697 -- @since 0.3.0
602− , httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool
603− -- ^ The function is used to decide whether to retry a request. 'True'
698+ httpConfigRetryPolicy :: RetryPolicyM IO,
699+ -- | The function is used to decide whether to retry a request. 'True'
604700 -- means that the request should be retried.
605701 --
606702 -- __Note__: signature of this function was changed in the version
607703 -- /1.0.0/.
608704 --
609705 -- @since 0.3.0
610− } deriving Typeable
706+ httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool,
707+ -- | Similar to 'httpConfigRetryJudge', but is used to decide when to
708+ -- retry requests that resulted in an exception. By default it retries
709+ -- on response timeout and connection timeout (changed in version
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+ }
611719
612−-- | Default value of 'HttpConfig'.
720+-- | The default value of 'HttpConfig'.
613721--
614722-- @since 2.0.0
615−
616723defaultHttpConfig :: HttpConfig
617−defaultHttpConfig = HttpConfig
618− { httpConfigProxy = Nothing
619− , httpConfigRedirectCount = 10
620− , httpConfigAltManager = Nothing
621− , httpConfigCheckResponse = \_ response preview ->
622− let scode = statusCode response
623− in if 200 <= scode && scode < 300
624− then Nothing
625− else Just (L.StatusCodeException (void response) preview)
626− , httpConfigRetryPolicy = retryPolicyDefault
627− , httpConfigRetryJudge = \_ response ->
628− statusCode response `elem`
629− [ 408 -- Request timeout
630− , 504 -- Gateway timeout
631− , 524 -- A timeout occurred
632− , 598 -- (Informal convention) Network read timeout error
633− , 599 -- (Informal convention) Network connect timeout error
634− ]
635− }
724+defaultHttpConfig =
725+ HttpConfig
726+ { httpConfigProxy = Nothing,
727+ httpConfigRedirectCount = 10,
728+ httpConfigAltManager = Nothing,
729+ httpConfigCheckResponse = \_ response preview ->
730+ 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
752+ }
636753 where
637754 statusCode = Y.statusCode . L.responseStatus
638755
639756instance RequestComponent HttpConfig where
640757 getRequestMod HttpConfig {..} = Endo $ \x ->
641− x { L.proxy = httpConfigProxy
642− , L.redirectCount = httpConfigRedirectCount
643− , LI.requestManagerOverride = httpConfigAltManager }
758+ x
759+ { L.proxy = httpConfigProxy,
760+ L.redirectCount = httpConfigRedirectCount,
761+ LI.requestManagerOverride = httpConfigAltManager
762+ }
644763
645−-- | A monad that allows to run 'req' in any 'IO'-enabled monad without
764+-- | A monad that allows us to run 'req' in any 'IO'-enabled monad without
646765-- having to define new instances.
647766--
648767-- @since 0.4.0
649−
650768newtype Req a = Req (ReaderT HttpConfig IO a)
651− deriving ( Functor
652− , Applicative
653− , Monad
654− , MonadIO )
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
782+
783+-- | @since 3.7.0
784+deriving instance MonadMask Req
655785
656786instance MonadBase IO Req where
657787 liftBase = liftIO
@@ -660,22 +790,99 @@ instance MonadBaseControl IO Req where
660790 type StM Req a = a
661791 liftBaseWith f = Req . ReaderT $ \r -> f (runReq r)
662792 {-# INLINEABLE liftBaseWith #-}
663− restoreM = Req . ReaderT . const . return
793+ restoreM = Req . ReaderT . const . return
664794 {-# INLINEABLE restoreM #-}
665795
666796instance MonadHttp Req where
667797 handleHttpException = Req . lift . throwIO
668− getHttpConfig = Req ask
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
669874
670875-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
671−-- case of exceptional situation an 'HttpException' will be thrown.
876+-- the case of an exceptional situation an 'HttpException' will be thrown.
672877--
673878-- @since 0.4.0
674−
675−runReq :: MonadIO m
676− => HttpConfig -- ^ 'HttpConfig' to use
677− -> Req a -- ^ Computation to run
678− -> m a
879+runReq ::
880+ (MonadIO m) =>
881+ -- | 'HttpConfig' to use
882+ HttpConfig ->
883+ -- | Computation to run
884+ Req a ->
885+ m a
679886runReq config (Req m) = liftIO (runReaderT m config)
680887
681888----------------------------------------------------------------------------
@@ -691,7 +898,6 @@ runReq config (Req m) = liftIO (runReaderT m config)
691898-- define a new method that will works seamlessly, see 'HttpMethod'.
692899
693900-- | 'GET' method.
694−
695901data GET = GET
696902
697903instance HttpMethod GET where
@@ -699,7 +905,6 @@ instance HttpMethod GET where
699905 httpMethodName Proxy = Y.methodGet
700906
701907-- | 'POST' method.
702−
703908data POST = POST
704909
705910instance HttpMethod POST where
@@ -707,7 +912,6 @@ instance HttpMethod POST where
707912 httpMethodName Proxy = Y.methodPost
708913
709914-- | 'HEAD' method.
710−
711915data HEAD = HEAD
712916
713917instance HttpMethod HEAD where
@@ -715,26 +919,24 @@ instance HttpMethod HEAD where
715919 httpMethodName Proxy = Y.methodHead
716920
717921-- | 'PUT' method.
718−
719922data PUT = PUT
720923
721924instance HttpMethod PUT where
722925 type AllowsBody PUT = 'CanHaveBody
723926 httpMethodName Proxy = Y.methodPut
724927
725−-- | 'DELETE' method. This data type does not allow having request body with
726−-- 'DELETE' requests, as it should be. However some APIs may expect 'DELETE'
727−-- requests to have bodies, in that case define your own variation of
728−-- 'DELETE' method and allow it to have a body.
729−
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.
730933data DELETE = DELETE
731934
732935instance HttpMethod DELETE where
733− type AllowsBody DELETE = 'NoBody
936+ type AllowsBody DELETE = 'CanHaveBody
734937 httpMethodName Proxy = Y.methodDelete
735938
736939-- | 'TRACE' method.
737−
738940data TRACE = TRACE
739941
740942instance HttpMethod TRACE where
@@ -742,7 +944,6 @@ instance HttpMethod TRACE where
742944 httpMethodName Proxy = Y.methodTrace
743945
744946-- | 'CONNECT' method.
745−
746947data CONNECT = CONNECT
747948
748949instance HttpMethod CONNECT where
@@ -750,7 +951,6 @@ instance HttpMethod CONNECT where
750951 httpMethodName Proxy = Y.methodConnect
751952
752953-- | 'OPTIONS' method.
753−
754954data OPTIONS = OPTIONS
755955
756956instance HttpMethod OPTIONS where
@@ -758,7 +958,6 @@ instance HttpMethod OPTIONS where
758958 httpMethodName Proxy = Y.methodOptions
759959
760960-- | 'PATCH' method.
761−
762961data PATCH = PATCH
763962
764963instance HttpMethod PATCH where
@@ -773,23 +972,19 @@ instance HttpMethod PATCH where
773972-- > instance HttpMethod COPY where
774973-- > type AllowsBody COPY = 'CanHaveBody
775974-- > httpMethodName Proxy = "COPY"
776−
777975class HttpMethod a where
778−
779976 -- | Type function 'AllowsBody' returns a type of kind 'CanHaveBody' which
780977 -- tells the rest of the library whether the method can have body or not.
781978 -- We use the special type 'CanHaveBody' lifted to the kind level instead
782979 -- of 'Bool' to get more user-friendly compiler messages.
783−
784980 type AllowsBody a :: CanHaveBody
785981
786982 -- | Return name of the method as a 'ByteString'.
787−
788983 httpMethodName :: Proxy a -> ByteString
789984
790−instance HttpMethod method => RequestComponent (Womb "method" method) where
985+instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
791986 getRequestMod _ = Endo $ \x ->
792− x { L.method = httpMethodName (Proxy :: Proxy method) }
987+ x {L.method = httpMethodName (Proxy :: Proxy method)}
793988
794989----------------------------------------------------------------------------
795990-- Request—URL
@@ -797,8 +992,7 @@ instance HttpMethod method => RequestComponent (Womb "method" method) where
797992-- $url
798993--
799994-- We use 'Url's which are correct by construction, see 'Url'. To build a
800−-- 'Url' from a 'ByteString', use 'parseUrlHttp', 'parseUrlHttps', or
801−-- generic 'parseUrl'.
995+-- 'Url' from a 'URI', use 'useHttpURI', 'useHttpsURI', or generic 'useURI'.
802996
803997-- | Request's 'Url'. Start constructing your 'Url' with 'http' or 'https'
804998-- specifying the scheme and host at the same time. Then use the @('/~')@
@@ -828,103 +1022,194 @@ instance HttpMethod method => RequestComponent (Womb "method" method) where
8281022--
8291023-- > https "юникод.рф"
8301024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
831−
8321025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
8331026 -- NOTE The second value is the path segments in reversed order.
834− deriving (Eq, Ord, Show, Data, Typeable, Generic)
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
8351041
8361042-- | Given host name, produce a 'Url' which has “http” as its scheme and
8371043-- empty path. This also sets port to @80@.
838−
8391044http :: Text -> Url 'Http
8401045http = Url Http . pure
8411046
8421047-- | Given host name, produce a 'Url' which has “https” as its scheme and
8431048-- empty path. This also sets port to @443@.
844−
8451049https :: Text -> Url 'Https
8461050https = Url Https . pure
8471051
848−-- | Grow given 'Url' appending a single path segment to it. Note that the
1052+-- | Grow a given 'Url' appending a single path segment to it. Note that the
8491053-- path segment can be of any type that is an instance of 'ToHttpApiData'.
850−
8511054infixl 5 /~
852−(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
1055+
1056+(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
8531057Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
8541058
855−-- | Type-constrained version of @('/~')@ to remove ambiguity in the cases
1059+-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
8561060-- when next URL piece is a 'Data.Text.Text' literal.
857−
8581061infixl 5 /:
1062+
8591063(/:) :: Url scheme -> Text -> Url scheme
8601064(/:) = (/~)
8611065
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−-- This function expected scheme to be “http”.
874−
875−parseUrlHttp :: ByteString -> Maybe (Url 'Http, Option scheme)
876−parseUrlHttp url' = do
877− url <- B.stripPrefix "http://" url'
878− (host :| path, option) <- parseUrlHelper url
879− return (foldl (/:) (http host) path, option)
880−
881−-- | Just like 'parseUrlHttp', but expects the “https” scheme.
882−
883−parseUrlHttps :: ByteString -> Maybe (Url 'Https, Option scheme)
884−parseUrlHttps url' = do
885− url <- B.stripPrefix "https://" url'
886− (host :| path, option) <- parseUrlHelper url
887− return (foldl (/:) (https host) path, option)
888−
889−-- | A more general URI parsing function that can be used when scheme is not
890−-- known beforehand.
891−--
892−-- @since 1.2.1
893−
894−parseUrl
895− :: ByteString
896− -> Maybe (Either (Url 'Http, Option scheme0) (Url 'Https, Option scheme1))
897−parseUrl url = Left <$> parseUrlHttp url <|> Right <$> parseUrlHttps url
898−
899−-- | Get host\/collection of path pieces and possibly query parameters
900−-- already converted to 'Option'. This function is not public.
901−
902−parseUrlHelper :: ByteString -> Maybe (NonEmpty Text, Option scheme)
903−parseUrlHelper url = do
904− let (path', query') = B.break (== 0x3f) url
905− query = mconcat (uncurry queryParam <$> Y.parseQueryText query')
906− p' :| ps <- NE.nonEmpty (Y.decodePathSegments path')
907− (p, port') <-
908− case T.break (== ':') p' of
909− (x, "") -> return (x, mempty)
910− (x, prt) ->
911− case TR.decimal (T.drop 1 prt) of
912− Right (prt',"") -> return (x, port prt')
913− _ -> Nothing
914− return (p :| ps, query <> port')
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'')
9151198
9161199instance RequestComponent (Url scheme) where
9171200 getRequestMod (Url scheme segments) = Endo $ \x ->
918− let (host :| path) = NE.reverse segments in
919− x { L.secure = case scheme of
920− Http -> False
921− Https -> True
922− , L.port = case scheme of
923− Http -> 80
924− Https -> 443
925− , L.host = Y.urlEncode False (T.encodeUtf8 host)
926− , L.path =
927− (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path }
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+ }
9281213
9291214----------------------------------------------------------------------------
9301215-- Request—Body
@@ -942,31 +1227,28 @@ instance RequestComponent (Url scheme) where
9421227-- only type for which 'ProvidesBody' returns 'NoBody'.
9431228--
9441229-- Using of this body option does not set the @Content-Type@ header.
945−
9461230data NoReqBody = NoReqBody
9471231
9481232instance HttpBody NoReqBody where
9491233 getRequestBody NoReqBody = L.RequestBodyBS B.empty
9501234
951−-- | This body option allows to use a JSON object as request body—probably
952−-- the most popular format right now. Just wrap a data type that is an
953−-- instance of 'ToJSON' type class and you are done: it will be converted to
954−-- JSON and inserted as request body.
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.
9551239--
9561240-- This body option sets the @Content-Type@ header to @\"application/json;
9571241-- charset=utf-8\"@ value.
958−
9591242newtype ReqBodyJson a = ReqBodyJson a
9601243
961−instance ToJSON a => HttpBody (ReqBodyJson a) where
1244+instance (ToJSON a) => HttpBody (ReqBodyJson a) where
9621245 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
9631246 getRequestContentType _ = pure "application/json; charset=utf-8"
9641247
9651248-- | This body option streams request body from a file. It is expected that
966−-- the file size does not change during the streaming.
1249+-- the file size does not change during streaming.
9671250--
9681251-- Using of this body option does not set the @Content-Type@ header.
969−
9701252newtype ReqBodyFile = ReqBodyFile FilePath
9711253
9721254instance HttpBody ReqBodyFile where
@@ -976,7 +1258,6 @@ instance HttpBody ReqBodyFile where
9761258-- | HTTP request body represented by a strict 'ByteString'.
9771259--
9781260-- Using of this body option does not set the @Content-Type@ header.
979−
9801261newtype ReqBodyBs = ReqBodyBs ByteString
9811262
9821263instance HttpBody ReqBodyBs where
@@ -985,22 +1266,19 @@ instance HttpBody ReqBodyBs where
9851266-- | HTTP request body represented by a lazy 'BL.ByteString'.
9861267--
9871268-- Using of this body option does not set the @Content-Type@ header.
988−
9891269newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
9901270
9911271instance HttpBody ReqBodyLbs where
9921272 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
9931273
994−-- | Form URL-encoded body. This can hold a collection of parameters which
995−-- are encoded similarly to query parameters at the end of query string,
996−-- with the only difference that they are stored in request body. The
997−-- similarity is reflected in the API as well, as you can use the same
998−-- combinators you would use to add query parameters: @('=:')@ and
999−-- 'queryFlag'.
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'.
10001279--
10011280-- This body option sets the @Content-Type@ header to
10021281-- @\"application/x-www-form-urlencoded\"@ value.
1003−
10041282newtype ReqBodyUrlEnc = ReqBodyUrlEnc FormUrlEncodedParam
10051283
10061284instance HttpBody ReqBodyUrlEnc where
@@ -1010,13 +1288,19 @@ instance HttpBody ReqBodyUrlEnc where
10101288
10111289-- | An opaque monoidal value that allows to collect URL-encoded parameters
10121290-- to be wrapped in 'ReqBodyUrlEnc'.
1013−
10141291newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
10151292 deriving (Semigroup, Monoid)
10161293
10171294instance QueryParam FormUrlEncodedParam where
10181295 queryParam name mvalue =
10191296 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
10201304
10211305-- | Multipart form data. Please consult the
10221306-- "Network.HTTP.Client.MultipartFormData" module for how to construct
@@ -1046,7 +1330,6 @@ instance QueryParam FormUrlEncodedParam where
10461330-- > bsResponse
10471331-- > mempty
10481332-- > liftIO $ print (responseBody response)
1049−
10501333data ReqBodyMultipart = ReqBodyMultipart ByteString LI.RequestBody
10511334
10521335instance HttpBody ReqBodyMultipart where
@@ -1057,61 +1340,57 @@ instance HttpBody ReqBodyMultipart where
10571340-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
10581341--
10591342-- @since 0.2.0
1060−
1061−reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
1343+reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
10621344reqBodyMultipart parts = liftIO $ do
10631345 boundary <- LM.webkitBoundary
1064− body <- LM.renderParts boundary parts
1346+ body <- LM.renderParts boundary parts
10651347 return (ReqBodyMultipart boundary body)
10661348
10671349-- | A type class for things that can be interpreted as an HTTP
10681350-- 'L.RequestBody'.
1069−
10701351class HttpBody body where
1071−
10721352 -- | How to get actual 'L.RequestBody'.
1073−
10741353 getRequestBody :: body -> L.RequestBody
10751354
10761355 -- | This method allows us to optionally specify the value of
10771356 -- @Content-Type@ header that should be used with particular body option.
10781357 -- By default it returns 'Nothing' and so @Content-Type@ is not set.
1079−
10801358 getRequestContentType :: body -> Maybe ByteString
10811359 getRequestContentType = const Nothing
10821360
10831361-- | The type function recognizes 'NoReqBody' as having 'NoBody', while any
10841362-- other body option 'CanHaveBody'. This forces the user to use 'NoReqBody'
10851363-- with 'GET' method and other methods that should not have body.
1086−
10871364type family ProvidesBody body :: CanHaveBody where
10881365 ProvidesBody NoReqBody = 'NoBody
1089− ProvidesBody body = 'CanHaveBody
1366+ ProvidesBody body = 'CanHaveBody
10901367
10911368-- | This type function allows any HTTP body if method says it
10921369-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
10931370-- body option to use is 'NoReqBody'.
1094−--
1095−-- __Note__: users of GHC 8.0.1 and later will see a slightly more friendly
1096−-- error message when method does not allow a body and body is provided.
1097−
1098−type family HttpBodyAllowed
1099− (allowsBody :: CanHaveBody)
1100− (providesBody :: CanHaveBody) :: Constraint where
1101− HttpBodyAllowed 'NoBody 'NoBody = ()
1102− HttpBodyAllowed 'CanHaveBody body = ()
1103− HttpBodyAllowed 'NoBody 'CanHaveBody = TypeError
1104− ('Text "This HTTP method does not allow attaching a request body.")
1105−
1106−instance HttpBody body => RequestComponent (Womb "body" body) where
1107− getRequestMod (Womb body) = Endo $ \x ->
1108− x { L.requestBody = getRequestBody body
1109− , L.requestHeaders =
1110− let old = L.requestHeaders x in
1111− case getRequestContentType body of
1112− Nothing -> old
1113− Just contentType ->
1114− (Y.hContentType, contentType) : old }
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+ }
11151394
11161395----------------------------------------------------------------------------
11171396-- Request—Optional parameters
@@ -1127,46 +1406,51 @@ instance HttpBody body => RequestComponent (Womb "body" body) where
11271406-- | The opaque 'Option' type is a 'Monoid' you can use to pack collection
11281407-- of optional parameters like query parameters and headers. See sections
11291408-- 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))
11301411
1131−data Option (scheme :: Scheme) =
1132− Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
1133− -- NOTE 'QueryText' is just [(Text, Maybe Text)], we keep it along with
1134− -- Request to avoid appending to existing query string in request every
1135− -- time new parameter is added. Additional Maybe (L.Request -> IO
1136− -- L.Request) is a finalizer that will be applied after all other
1137− -- transformations. This is for authentication methods that sign requests
1138− -- based on data in Request.
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.
11391418
11401419instance Semigroup (Option scheme) where
1141− Option er0 mr0 <> Option er1 mr1 = Option
1142− (er0 <> er1) (mr0 <|> mr1)
1420+ Option er0 mr0 <> Option er1 mr1 =
1421+ Option
1422+ (er0 <> er1)
1423+ (mr0 <|> mr1)
11431424
11441425instance Monoid (Option scheme) where
1145− mempty = Option mempty Nothing
1426+ mempty = Option mempty Nothing
11461427 mappend = (<>)
11471428
1429+-- | Use 'formToQuery'.
1430+--
1431+-- @since 3.11.0
1432+instance FromForm (Option scheme) where
1433+ fromForm = Right . formToQuery
1434+
11481435-- | A helper to create an 'Option' that modifies only collection of query
11491436-- parameters. This helper is not a part of the public API.
1150−
11511437withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
11521438withQueryParams f = Option (Endo (first f)) Nothing
11531439
11541440-- | A helper to create an 'Option' that modifies only 'L.Request'. This
11551441-- helper is not a part of public API.
1156−
11571442withRequest :: (L.Request -> L.Request) -> Option scheme
11581443withRequest f = Option (Endo (second f)) Nothing
11591444
11601445instance RequestComponent (Option scheme) where
11611446 getRequestMod (Option f _) = Endo $ \x ->
11621447 let (qparams, x') = appEndo f ([], x)
1163− query = Y.renderQuery True (Y.queryTextToQuery qparams)
1164− in x' { L.queryString = query }
1448+ query = Y.renderQuery True (Y.queryTextToQuery qparams)
1449+ in x' {L.queryString = query}
11651450
11661451-- | Finalize given 'L.Request' by applying a finalizer from the given
11671452-- 'Option' (if it has any).
1168−
1169−finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
1453+finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
11701454finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
11711455
11721456----------------------------------------------------------------------------
@@ -1185,12 +1469,12 @@ finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
11851469-- This operator is defined in terms of 'queryParam':
11861470--
11871471-- > name =: value = queryParam name (pure value)
1188−
11891472infix 7 =:
1473+
11901474(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
11911475name =: value = queryParam name (pure value)
11921476
1193−-- | Construct a flag, that is, valueless query parameter. For example, in
1477+-- | Construct a flag, that is, a valueless query parameter. For example, in
11941478-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
11951479-- with a value:
11961480--
@@ -1199,27 +1483,47 @@ name =: value = queryParam name (pure value)
11991483-- This operator is defined in terms of 'queryParam':
12001484--
12011485-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1202−
1203−queryFlag :: QueryParam param => Text -> param
1486+queryFlag :: (QueryParam param) => Text -> param
12041487queryFlag name = queryParam name (Nothing :: Maybe ())
12051488
1489+-- | Construct query parameters from a 'ToForm' instance. This function
1490+-- produces the same query params as 'Form.urlEncodeAsFormStable'.
1491+--
1492+-- Note that 'Form.Form' doesn't have the concept of parameters with the
1493+-- empty value (i.e. what you can get by @key =: ""@). If the value is
1494+-- empty, it will be encoded as a valueless parameter (i.e. what you can get
1495+-- by @queryFlag key@).
1496+--
1497+-- @since 3.11.0
1498+formToQuery :: (QueryParam param, Monoid param, ToForm f) => f -> param
1499+formToQuery f = mconcat . fmap toParam . Form.toListStable $ toForm f
1500+ where
1501+ toParam (key, val) =
1502+ queryParam key $
1503+ if val == ""
1504+ then Nothing
1505+ else Just val
1506+
12061507-- | A type class for query-parameter-like things. The reason to have an
12071508-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
12081509-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
12091510-- Having the same syntax for these cases seems natural and user-friendly.
1210−
12111511class QueryParam param where
1212−
12131512 -- | Create a query parameter with given name and value. If value is
12141513 -- 'Nothing', it won't be included at all (i.e. you create a flag this
12151514 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
12161515 -- method, because they are easier to read.
1516+ queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
12171517
1218− queryParam :: ToHttpApiData a => Text -> Maybe a -> param
1518+ -- | Get the query parameter names and values set by 'queryParam'.
1519+ --
1520+ -- @since 3.11.0
1521+ queryParamToList :: param -> [(Text, Maybe Text)]
12191522
12201523instance QueryParam (Option scheme) where
12211524 queryParam name mvalue =
12221525 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1526+ queryParamToList (Option f _) = fst $ appEndo f ([], L.defaultRequest)
12231527
12241528----------------------------------------------------------------------------
12251529-- Request—Optional parameters—Headers
@@ -1228,20 +1532,28 @@ instance QueryParam (Option scheme) where
12281532-- headers with the same names the leftmost header will win. This means, in
12291533-- particular, that you cannot create a request with several headers of the
12301534-- same name.
1231−
1232−header
1233− :: ByteString -- ^ Header name
1234− -> ByteString -- ^ Header value
1235− -> Option scheme
1535+header ::
1536+ -- | Header name
1537+ ByteString ->
1538+ -- | Header value
1539+ ByteString ->
1540+ Option scheme
12361541header name value = withRequest (attachHeader name value)
12371542
12381543-- | Attach a header with given name and content to a 'L.Request'.
12391544--
12401545-- @since 1.1.0
1241−
12421546attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
12431547attachHeader name value x =
1244− x { L.requestHeaders = (CI.mk name, value) : L.requestHeaders 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}
12451557
12461558----------------------------------------------------------------------------
12471559-- Request—Optional parameters—Cookies
@@ -1254,10 +1566,9 @@ attachHeader name value x =
12541566
12551567-- | Use the given 'L.CookieJar'. A 'L.CookieJar' can be obtained from a
12561568-- 'L.Response' record.
1257−
12581569cookieJar :: L.CookieJar -> Option scheme
12591570cookieJar jar = withRequest $ \x ->
1260− x { L.cookieJar = Just jar }
1571+ x {L.cookieJar = Just jar}
12611572
12621573----------------------------------------------------------------------------
12631574-- Request—Optional parameters—Authentication
@@ -1275,11 +1586,13 @@ cookieJar jar = withRequest $ \x ->
12751586-- | The 'Option' adds basic authentication.
12761587--
12771588-- See also: <https://en.wikipedia.org/wiki/Basic_access_authentication>.
1278−
1279−basicAuth
1280− :: ByteString -- ^ Username
1281− -> ByteString -- ^ Password
1282− -> Option 'Https -- ^ Auth 'Option'
1589+basicAuth ::
1590+ -- | Username
1591+ ByteString ->
1592+ -- | Password
1593+ ByteString ->
1594+ -- | Auth 'Option'
1595+ Option 'Https
12831596basicAuth = basicAuthUnsafe
12841597
12851598-- | An alternative to 'basicAuth' which works for any scheme. Note that
@@ -1287,41 +1600,52 @@ basicAuth = basicAuthUnsafe
12871600-- attacks. Use 'basicAuth' instead unless you know what you are doing.
12881601--
12891602-- @since 0.3.1
1290−
1291−basicAuthUnsafe
1292− :: ByteString -- ^ Username
1293− -> ByteString -- ^ Password
1294− -> Option scheme -- ^ Auth 'Option'
1295−basicAuthUnsafe username password = customAuth
1296− (pure . L.applyBasicAuth username password)
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)
12971613
12981614-- | The 'Option' set basic proxy authentication header.
12991615--
13001616-- @since 1.1.0
1301−
1302−basicProxyAuth
1303− :: ByteString -- ^ Username
1304− -> ByteString -- ^ Password
1305− -> Option scheme -- ^ Auth 'Option'
1617+basicProxyAuth ::
1618+ -- | Username
1619+ ByteString ->
1620+ -- | Password
1621+ ByteString ->
1622+ -- | Auth 'Option'
1623+ Option scheme
13061624basicProxyAuth username password =
13071625 withRequest (L.applyBasicProxyAuth username password)
13081626
13091627-- | The 'Option' adds OAuth1 authentication.
13101628--
13111629-- @since 0.2.0
1312−
1313−oAuth1
1314− :: ByteString -- ^ Consumer token
1315− -> ByteString -- ^ Consumer secret
1316− -> ByteString -- ^ OAuth token
1317− -> ByteString -- ^ OAuth token secret
1318− -> Option scheme -- ^ Auth 'Option'
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
13191641oAuth1 consumerToken consumerSecret token tokenSecret =
13201642 customAuth (OAuth.signOAuth app creds)
13211643 where
1322− app = OAuth.newOAuth
1323− { OAuth.oauthConsumerKey = consumerToken
1324− , OAuth.oauthConsumerSecret = consumerSecret }
1644+ app =
1645+ OAuth.newOAuth
1646+ { OAuth.oauthConsumerKey = consumerToken,
1647+ OAuth.oauthConsumerSecret = consumerSecret
1648+ }
13251649 creds = OAuth.newCredential token tokenSecret
13261650
13271651-- | The 'Option' adds an OAuth2 bearer token. This is treated by many
@@ -1332,12 +1656,14 @@ oAuth1 consumerToken consumerSecret token tokenSecret =
13321656-- > oAuth2Bearer token = header "Authorization" ("Bearer " <> token)
13331657--
13341658-- See also: <https://en.wikipedia.org/wiki/OAuth>.
1335−
1336−oAuth2Bearer
1337− :: ByteString -- ^ Token
1338− -> Option 'Https -- ^ Auth 'Option'
1339−oAuth2Bearer token = customAuth
1340− (pure . attachHeader "Authorization" ("Bearer " <> token))
1659+oAuth2Bearer ::
1660+ -- | Token
1661+ ByteString ->
1662+ -- | Auth 'Option'
1663+ Option 'Https
1664+oAuth2Bearer token =
1665+ customAuth
1666+ (pure . attachHeader "Authorization" ("Bearer " <> token))
13411667
13421668-- | The 'Option' adds a not-quite-standard OAuth2 bearer token (that seems
13431669-- to be used only by GitHub). This will be treated by whatever services
@@ -1348,19 +1674,20 @@ oAuth2Bearer token = customAuth
13481674-- > oAuth2Token token = header "Authorization" ("token" <> token)
13491675--
13501676-- See also: <https://developer.github.com/v3/oauth#3-use-the-access-token-to-access-the-api>.
1351−
1352−oAuth2Token
1353− :: ByteString -- ^ Token
1354− -> Option 'Https -- ^ Auth 'Option'
1355−oAuth2Token token = customAuth
1356− (pure . attachHeader "Authorization" ("token " <> token))
1677+oAuth2Token ::
1678+ -- | Token
1679+ ByteString ->
1680+ -- | Auth 'Option'
1681+ Option 'Https
1682+oAuth2Token token =
1683+ customAuth
1684+ (pure . attachHeader "Authorization" ("token " <> token))
13571685
13581686-- | A helper to create custom authentication 'Option's. The given
13591687-- 'IO'-enabled request transformation is applied after all other
13601688-- modifications when constructing a request. Use wisely.
13611689--
13621690-- @since 1.1.0
1363−
13641691customAuth :: (L.Request -> IO L.Request) -> Option scheme
13651692customAuth = Option mempty . pure
13661693
@@ -1369,11 +1696,10 @@ customAuth = Option mempty . pure
13691696
13701697-- | Specify the port to connect to explicitly. Normally, 'Url' you use
13711698-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1372−-- 'Option' allows to choose an arbitrary port overwriting the defaults.
1373−
1699+-- 'Option' allows us to choose an arbitrary port overwriting the defaults.
13741700port :: Int -> Option scheme
13751701port n = withRequest $ \x ->
1376− x { L.port = n }
1702+ x {L.port = n}
13771703
13781704-- | This 'Option' controls whether gzipped data should be decompressed on
13791705-- the fly. By default everything except for @\"application\/x-tar\"@ is
@@ -1384,39 +1710,40 @@ port n = withRequest $ \x ->
13841710-- You can also choose to decompress everything like this:
13851711--
13861712-- > decompress (const True)
1387−
1388−decompress
1389− :: (ByteString -> Bool) -- ^ Predicate that is given MIME type, it
1390− -- returns 'True' when content should be decompressed on the fly.
1391− -> Option scheme
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
13921718decompress f = withRequest $ \x ->
1393− x { L.decompress = f }
1719+ x {L.decompress = f}
13941720
13951721-- | Specify the number of microseconds to wait for response. The default
13961722-- value is 30 seconds (defined in 'L.ManagerSettings' of connection
13971723-- 'L.Manager').
1398−
1399−responseTimeout
1400− :: Int -- ^ Number of microseconds to wait
1401− -> Option scheme
1724+responseTimeout ::
1725+ -- | Number of microseconds to wait
1726+ Int ->
1727+ Option scheme
14021728responseTimeout n = withRequest $ \x ->
1403− x { L.responseTimeout = LI.ResponseTimeoutMicro n }
1729+ x {L.responseTimeout = LI.ResponseTimeoutMicro n}
14041730
14051731-- | HTTP version to send to the server, the default is HTTP 1.1.
1406−
1407−httpVersion
1408− :: Int -- ^ Major version number
1409− -> Int -- ^ Minor version number
1410− -> Option scheme
1732+httpVersion ::
1733+ -- | Major version number
1734+ Int ->
1735+ -- | Minor version number
1736+ Int ->
1737+ Option scheme
14111738httpVersion major minor = withRequest $ \x ->
1412− x { L.requestVersion = Y.HttpVersion major minor }
1739+ x {L.requestVersion = Y.HttpVersion major minor}
14131740
14141741----------------------------------------------------------------------------
14151742-- Response interpretations
14161743
14171744-- | Make a request and ignore the body of the response.
1418−
14191745newtype IgnoreResponse = IgnoreResponse (L.Response ())
1746+ deriving (Show)
14201747
14211748instance HttpResponse IgnoreResponse where
14221749 type HttpResponseBody IgnoreResponse = ()
@@ -1425,7 +1752,6 @@ instance HttpResponse IgnoreResponse where
14251752
14261753-- | Use this as the fourth argument of 'req' to specify that you want it to
14271754-- ignore the response body.
1428−
14291755ignoreResponse :: Proxy IgnoreResponse
14301756ignoreResponse = Proxy
14311757
@@ -1433,29 +1759,28 @@ ignoreResponse = Proxy
14331759-- 'handleHttpException' method of 'MonadHttp' instance corresponding to
14341760-- monad in which you use 'req' will determine what to do in the case when
14351761-- parsing fails (the 'JsonHttpException' constructor will be used).
1436−
14371762newtype JsonResponse a = JsonResponse (L.Response a)
1763+ deriving (Show)
14381764
1439−instance FromJSON a => HttpResponse (JsonResponse a) where
1765+instance (FromJSON a) => HttpResponse (JsonResponse a) where
14401766 type HttpResponseBody (JsonResponse a) = a
14411767 toVanillaResponse (JsonResponse r) = r
14421768 getHttpResponse r = do
14431769 chunks <- L.brConsume (L.responseBody r)
14441770 case A.eitherDecode (BL.fromChunks chunks) of
1445− Left e -> throwIO (JsonHttpException e)
1771+ Left e -> throwIO (JsonHttpException e)
14461772 Right x -> return $ JsonResponse (x <$ r)
14471773 acceptHeader Proxy = Just "application/json"
14481774
14491775-- | Use this as the fourth argument of 'req' to specify that you want it to
14501776-- return the 'JsonResponse' interpretation.
1451−
14521777jsonResponse :: Proxy (JsonResponse a)
14531778jsonResponse = Proxy
14541779
14551780-- | Make a request and interpret the body of the response as a strict
14561781-- 'ByteString'.
1457−
14581782newtype BsResponse = BsResponse (L.Response ByteString)
1783+ deriving (Show)
14591784
14601785instance HttpResponse BsResponse where
14611786 type HttpResponseBody BsResponse = ByteString
@@ -1466,14 +1791,13 @@ instance HttpResponse BsResponse where
14661791
14671792-- | Use this as the fourth argument of 'req' to specify that you want to
14681793-- interpret the response body as a strict 'ByteString'.
1469−
14701794bsResponse :: Proxy BsResponse
14711795bsResponse = Proxy
14721796
14731797-- | Make a request and interpret the body of the response as a lazy
14741798-- 'BL.ByteString'.
1475−
14761799newtype LbsResponse = LbsResponse (L.Response BL.ByteString)
1800+ deriving (Show)
14771801
14781802instance HttpResponse LbsResponse where
14791803 type HttpResponseBody LbsResponse = BL.ByteString
@@ -1484,24 +1808,22 @@ instance HttpResponse LbsResponse where
14841808
14851809-- | Use this as the fourth argument of 'req' to specify that you want to
14861810-- interpret the response body as a lazy 'BL.ByteString'.
1487−
14881811lbsResponse :: Proxy LbsResponse
14891812lbsResponse = Proxy
14901813
14911814----------------------------------------------------------------------------
14921815-- Helpers for response interpretations
14931816
1494−-- | Fetch beginning of response and return it together with new
1817+-- | Fetch beginning of the response and return it together with a new
14951818-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
14961819-- such.
1497−
1498−grabPreview
1499− :: Int
1500− -- ^ How many bytes to fetch
1501− -> L.Response L.BodyReader
1502− -- ^ Response with body reader inside
1503− -> IO (ByteString, L.Response L.BodyReader)
1504− -- ^ Preview 'ByteString' and new response with body reader inside
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)
15051827grabPreview nbytes r = do
15061828 let br = L.responseBody r
15071829 (target, leftover, done) <- brReadN br nbytes
@@ -1524,18 +1846,17 @@ grabPreview nbytes r = do
15241846 if done
15251847 then return B.empty
15261848 else br
1527− return (target, r { L.responseBody = br' })
1849+ return (target, r {L.responseBody = br'})
15281850
15291851-- | Consume N bytes from 'L.BodyReader', return the target chunk, the
15301852-- leftover (may be empty), and whether we're done consuming the body.
1531−
1532−brReadN
1533− :: L.BodyReader
1534− -- ^ Body reader to stream from
1535− -> Int
1536− -- ^ How many bytes to consume
1537− -> IO (ByteString, ByteString, Bool)
1538− -- ^ Target chunk, the leftover, whether we're done
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)
15391860brReadN br n = go 0 id id
15401861 where
15411862 go !tlen t l = do
@@ -1544,9 +1865,9 @@ brReadN br n = go 0 id id
15441865 then return (r t, r l, True)
15451866 else do
15461867 let (target, leftover) = B.splitAt (n - tlen) chunk
1547− tlen' = B.length target
1548− t' = t . (target:)
1549− l' = l . (leftover:)
1868+ tlen' = B.length target
1869+ t' = t . (target :)
1870+ l' = l . (leftover :)
15501871 if tlen + tlen' < n
15511872 then go (tlen + tlen') t' l'
15521873 else return (r t', r l', False)
@@ -1556,47 +1877,45 @@ brReadN br n = go 0 id id
15561877-- Inspecting a response
15571878
15581879-- | Get the response body.
1559−
1560−responseBody
1561− :: HttpResponse response
1562− => response
1563− -> HttpResponseBody response
1880+responseBody ::
1881+ (HttpResponse response) =>
1882+ response ->
1883+ HttpResponseBody response
15641884responseBody = L.responseBody . toVanillaResponse
15651885
15661886-- | Get the response status code.
1567−
1568−responseStatusCode
1569− :: HttpResponse response
1570− => response
1571− -> Int
1887+responseStatusCode ::
1888+ (HttpResponse response) =>
1889+ response ->
1890+ Int
15721891responseStatusCode =
15731892 Y.statusCode . L.responseStatus . toVanillaResponse
15741893
15751894-- | Get the response status message.
1576−
1577−responseStatusMessage
1578− :: HttpResponse response
1579− => response
1580− -> ByteString
1895+responseStatusMessage ::
1896+ (HttpResponse response) =>
1897+ response ->
1898+ ByteString
15811899responseStatusMessage =
15821900 Y.statusMessage . L.responseStatus . toVanillaResponse
15831901
15841902-- | Lookup a particular header from a response.
1585−
1586−responseHeader
1587− :: HttpResponse response
1588− => response -- ^ Response interpretation
1589− -> ByteString -- ^ Header to lookup
1590− -> Maybe ByteString -- ^ Header value if found
1903+responseHeader ::
1904+ (HttpResponse response) =>
1905+ -- | Response interpretation
1906+ response ->
1907+ -- | Header to lookup
1908+ ByteString ->
1909+ -- | Header value if found
1910+ Maybe ByteString
15911911responseHeader r h =
15921912 (lookup (CI.mk h) . L.responseHeaders . toVanillaResponse) r
15931913
15941914-- | Get the response 'L.CookieJar'.
1595−
1596−responseCookieJar
1597− :: HttpResponse response
1598− => response
1599− -> L.CookieJar
1915+responseCookieJar ::
1916+ (HttpResponse response) =>
1917+ response ->
1918+ L.CookieJar
16001919responseCookieJar = L.responseCookieJar . toVanillaResponse
16011920
16021921----------------------------------------------------------------------------
@@ -1607,19 +1926,15 @@ responseCookieJar = L.responseCookieJar . toVanillaResponse
16071926-- To create a new response interpretation you just need to make your data
16081927-- type an instance of the 'HttpResponse' type class.
16091928
1610−-- | A type class for response interpretations. It allows to describe how to
1611−-- consume response from a @'L.Response' 'L.BodyReader'@ and produce the
1612−-- final result that is to be returned to the user.
1613−
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.
16141932class HttpResponse response where
1615−
16161933 -- | The associated type is the type of body that can be extracted from an
16171934 -- instance of 'HttpResponse'.
1618−
1619− type HttpResponseBody response :: *
1935+ type HttpResponseBody response :: Type
16201936
16211937 -- | The method describes how to get the underlying 'L.Response' record.
1622−
16231938 toVanillaResponse :: response -> L.Response (HttpResponseBody response)
16241939
16251940 -- | This method describes how to consume response body and, more
@@ -1635,12 +1950,11 @@ class HttpResponse response where
16351950 --
16361951 -- __Note__: signature of this function was changed in the version
16371952 -- /1.0.0/.
1638−
1639− getHttpResponse
1640− :: L.Response L.BodyReader
1641− -- ^ Response with body reader inside
1642− -> IO response
1643− -- ^ The final result
1953+ getHttpResponse ::
1954+ -- | Response with body reader inside
1955+ L.Response L.BodyReader ->
1956+ -- | The final result
1957+ IO response
16441958
16451959 -- | The value of @\"Accept\"@ header. This is useful, for example, if a
16461960 -- website supports both @XML@ and @JSON@ responses, and decides what to
@@ -1650,10 +1964,19 @@ class HttpResponse response where
16501964 -- will take precedence.
16511965 --
16521966 -- @since 2.1.0
1653−
16541967 acceptHeader :: Proxy response -> Maybe ByteString
16551968 acceptHeader Proxy = Nothing
16561969
1970+-- | This instance has been added to make it easier to inspect 'L.Response'
1971+-- using Req's functions like 'responseStatusCode', 'responseStatusMessage',
1972+-- etc.
1973+--
1974+-- @since 3.12.0
1975+instance HttpResponse (L.Response ()) where
1976+ type HttpResponseBody (L.Response ()) = ()
1977+ toVanillaResponse = id
1978+ getHttpResponse = return . void
1979+
16571980----------------------------------------------------------------------------
16581981-- Other
16591982
@@ -1664,15 +1987,12 @@ class HttpResponse response where
16641987-- request components easier using @('<>')@.
16651988--
16661989-- __Note__: this type class is not a part of the public API.
1667−
16681990class RequestComponent a where
1669−
16701991 -- | Get a function that takes a 'L.Request' and changes it somehow
16711992 -- returning another 'L.Request'. For example, the 'HttpMethod' instance
16721993 -- of 'RequestComponent' just overwrites method. The function is wrapped
16731994 -- in 'Endo' so it's easier to chain such “modifying applications”
16741995 -- together building bigger and bigger 'RequestComponent's.
1675−
16761996 getRequestMod :: a -> Endo L.Request
16771997
16781998-- | This wrapper is only used to attach a type-level tag to a given type.
@@ -1682,44 +2002,50 @@ class RequestComponent a where
16822002-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
16832003-- which instance to use (i.e. the constraints are taken into account later,
16842004-- when instance is already chosen).
1685−
1686−newtype Womb (tag :: Symbol) a = Womb a
2005+newtype Tagged (tag :: Symbol) a = Tagged a
16872006
16882007-- | Exceptions that this library throws.
1689−
16902008data HttpException
1691− = VanillaHttpException L.HttpException
1692− -- ^ A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
1693− | JsonHttpException String
1694− -- ^ A wrapper with Aeson-produced 'String' describing why decoding
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
16952012 -- failed
1696− deriving (Show, Typeable, Generic)
2013+ JsonHttpException String
2014+ deriving (Show, Generic)
16972015
16982016instance Exception HttpException
16992017
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+
17002032-- | A simple type isomorphic to 'Bool' that we only have for better error
17012033-- messages. We use it as a kind and its data constructors as type-level
17022034-- tags.
17032035--
17042036-- See also: 'HttpMethod' and 'HttpBody'.
1705−
17062037data CanHaveBody
1707− = CanHaveBody -- ^ Indeed can have a body
1708− | NoBody -- ^ Should not have a body
2038+ = -- | Indeed can have a body
2039+ CanHaveBody
2040+ | -- | Should not have a body
2041+ NoBody
17092042
17102043-- | A type-level tag that specifies URL scheme used (and thus if HTTPS is
17112044-- enabled). This is used to force TLS requirement for some authentication
17122045-- 'Option's.
1713−
17142046data Scheme
1715− = Http -- ^ HTTP
1716− | Https -- ^ HTTPS
1717− deriving (Eq, Ord, Show, Data, Typeable, Generic)
1718−
1719−----------------------------------------------------------------------------
1720−-- Constants
1721−
1722−-- | Max length of preview fragment of response body.
1723−
1724−bodyPreviewLength :: Num a => a
1725−bodyPreviewLength = 1024
2047+ = -- | HTTP
2048+ Http
2049+ | -- | HTTPS
2050+ Https
2051+ deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
README.md+40−140
@@ -4,10 +4,8 @@
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−[![Build Status](https://travis-ci.org/mrkkrp/req.svg?branch=master)](https://travis-ci.org/mrkkrp/req)
7+[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)
88
9−* [Motivation and Req vs other libraries](#motivation-and-req-vs-other-libraries)
10−* [Unsolved problems](#unsolved-problems)
119* [Related packages](#related-packages)
1210* [Blog posts](#blog-posts)
1311* [Contribution](#contribution)
@@ -26,62 +24,50 @@ main :: IO ()
2624-- You can either make your monad an instance of 'MonadHttp', or use
2725-- 'runReq' in any IO-enabled monad without defining new instances.
2826main = runReq defaultHttpConfig $ do
29− let payload = object
30− [ "foo" .= (10 :: Int)
31− , "bar" .= (20 :: Int) ]
27+ let payload =
28+ object
29+ [ "foo" .= (10 :: Int),
30+ "bar" .= (20 :: Int)
31+ ]
3232 -- One function—full power and flexibility, automatic retrying on timeouts
3333 -- and such, automatic connection sharing.
34− r <- req POST -- method
35− (https "httpbin.org" /: "post") -- safe by construction URL
36− (ReqBodyJson payload) -- use built-in options or add your own
37− jsonResponse -- specify how to interpret response
38− mempty -- query params, headers, explicit port number, etc.
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.
3941 liftIO $ print (responseBody r :: Value)
4042```
4143
42−Req is an easy-to-use, type-safe, expandable, high-level HTTP client library
43−that just works without any fooling around.
44−
45−What does the phrase “easy-to-use” mean? It means that the library is
46−designed to be beginner-friendly so it's simple to add to your monad stack,
47−intuitive to work with, well-documented, and does not get in your way. Doing
48−HTTP requests is a common task and Haskell library for this should be very
49−approachable and clear to beginners, thus certain compromises were made. For
50−example, one cannot currently modify `ManagerSettings` of the default
51−manager because the library always uses the same implicit global manager for
52−simplicity and maximal connection sharing. There is a way to use your own
53−manager with different settings, but it requires a bit more typing.
54−
55−“Type-safe” means that the library is protective and eliminates certain
56−classes of errors. For example, we have correct-by-construction URLs, it's
57−guaranteed that the user does not send the request body when using methods
58−like GET or OPTIONS, and the amount of implicit assumptions is minimized by
59−making the user specify his/her intentions in an explicit form (for example,
60−it's not possible to avoid specifying the body or method of request).
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.
6163Authentication methods that assume HTTPS force the user to use HTTPS at the
62−type level. The library also carefully hides underlying types from the
63−lower-level `http-client` package because those types are not safe enough
64−(for example `Request` is an instance of `IsString` and, if it's malformed,
65−it will blow up at run-time).
66−
67−“Expandable” refers to the ability to create new components for dealing with
68−HTTP without having to resort to ugly hacking. For example, it's possible to
69−define your own HTTP methods, create new ways to construct the body of a
70−request, create new authorization options, perform a request in a different
71−way, and create your own methods to parse and represent a response. As the
72−user extends the library to satisfy his/her special needs, the new solutions
73−will work just like the built-ins. However, all of the common cases are also
74−covered by the library out-of-the-box.
75−
76−“High-level” means that there are less details to worry about. The library
77−is a result of my experiences as a Haskell consultant. Working for several
78−clients, who had very different projects, showed me that the library should
79−adapt easily to any particular style of writing Haskell applications. For
80−example, some people prefer throwing exceptions, while others are concerned
81−with purity. Just define `handleHttpException` accordingly when making your
82−monad instance of `MonadHttp` and it will play together seamlessly. Finally,
83−the library cuts down boilerplate considerably, and helps you write concise,
84−easy to read, and maintainable code.
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.
8571
8672The library uses the following mature packages under the hood to guarantee
8773you the best experience:
@@ -91,97 +77,11 @@ you the best experience:
9177* [`http-client-tls`](https://hackage.haskell.org/package/http-client-tls)—TLS
9278 (HTTPS) support for `http-client`.
9379
94−It's important to note that since we leverage well-known libraries that the
80+It is important to note that since we leverage well-known libraries that the
9581whole Haskell ecosystem uses, there is no risk in using Req. The machinery
9682for performing requests is the same as with `http-conduit` and Wreq. The
9783only difference is the API.
9884
99−## Motivation and Req vs other libraries
100−
101−*This section is my opinion and it contains criticisms of other well-known
102−libraries. If you're user/fan of one of these libraries, please remember not
103−to react aggressively and respect the fact that I may have different views
104−on API design from yours.*
105−
106−I have spent time to write the library because sending HTTP requests is such
107−a common thing and still there is no high-level library for that in Haskell
108−that I could use with pleasure. I'll explain why.
109−
110−First of all, there is `http-client` and `http-client-tls`. They just work.
111−I have no issues with the libraries except that they are too low-level for
112−my taste. Indeed, even the docs say that they are low-level and “intended as
113−a base layer for more user-friendly packages”. This is exactly how I use
114−them in Req, as base level. Req is nothing but a different API to
115−`http-client`, so it only works because of the hard work put into
116−`http-client`.
117−
118−`http-conduit` definitely has its place. For one thing it allows you to
119−stream request and response bodies in constant memory, what other library
120−allows you to do that? On the other hand if you take a look at
121−`Network.HTTP.Simple`, then although it's said that it's a “higher level
122−API”, it's mostly the same as vanilla `http-client` in spirit/approach and
123−just adds `conduit`-powered functions to perform requests and allows to use
124−global implicit `Manager` (Req does the same). If I tried to frame what
125−exactly I don't like about `http-conduit` in words, then it would be “the
126−way requests are constructed”. You set, set, set instead of *being forced*
127−to declare necessary bits and *being allowed* to declare optional bits in a
128−way that their combination is certainly valid. Also, with `http-conduit` you
129−parse request from a string without the protection of TH that otherwise
130−saves the day as in Yesod.
131−
132−Then there is Wreq. `wreq` [doesn't see much development
133−lately](https://github.com/bos/wreq/issues/93). `wreq` is by itself a weird
134−library, IMO. You have functions per method—not very good, as there may be
135−new methods, like PATCH which is not new but still missing (well, you have
136−`customMethod`, but what is the point of having per-method functions if you
137−have a more general way to use any method? you should be able to just insert
138−methods in the “argument slot” of `customMethod` and end up with a more
139−general solution). Now, every method function has a companion that takes
140−`Options` (like you have `get` and `getWith`). Why the duplication? Where is
141−generality and flexibility? This is not all though, because you cannot
142−really use `get` you see in the main module, because you want to have
143−connection sharing. Wreq's author does not take the gift of automatic
144−connection re-use `Manager` from `http-client` provides, he invents the
145−whole new thing of “sessions”. Only inside a session your connections will
146−be shared and re-used. However with the session stuff you have yet another
147−set of per-method functions like `get` and `getWith`—these are different
148−ones, to be used with sessions! Now if you have a multi-threaded app, here
149−is a surprise for you: you can't share connections between threads as
150−connections are shared only inside of the `withSession` friend and “session
151−will no longer be valid after that function returns”. There are valid uses
152−for sessions, but the point is that they are just too inconvenient for
153−common tasks.
154−
155−It's funny that one client I worked for had to invent his own little wrapper
156−around `http-client` just because he could not possibly use `wreq` and
157−`http-client` and friends were too low-level. The previous paragraph is
158−extracted from a talk with a Haskell developer who works for that client. I
159−thought to myself “something is wrong with HTTP client libraries in Haskell
160−if they had to make a wrapper”.
161−
162−What else? I used `servant-client` a couple of times but the amount of
163−boilerplate it requires is frightening. If you have several query
164−parameters, and you use just one of them, good luck passing lots of
165−`Nothing`s.
166−
167−## Unsolved problems
168−
169−AWS request signing is problematic because request body can be in the form
170−of an action to execute (and all that “popper” stuff for streaming), not
171−just a `ByteString` and so getting its digest (hash) is not trivial without
172−running the action and consuming body in its entirety before the request in
173−made. In Wreq the author chose to just use `error` when body is not a
174−(strict or lazy) `ByteString`. Maybe it's OK for Wreq, but I don't consider
175−this a proper solution for Req as we support full variety of body options.
176−For example, what if I want to upload 1 Gb file to S3? I want to stream it
177−in constant memory but at the same time I need to calculate its hash before
178−I start streaming. One solution to the problem seems to be in taking the
179−hash explicitly (as an argument of the hypothetical `awsAuth`) and making it
180−a responsibility of the user to calculate the hash correctly. I don't like
181−this because it's not user-friendly. So the question stays open, for now
182−there is no AWS signing functionality provided out-of-the-box. The best
183−solution for talking to AWS is the `amazonka` package so far.
184−
18585## Related packages
18686
18787The following packages are designed to be used with Req:
Setup.hsdeleted−6
@@ -1,6 +0,0 @@
1−module Main (main) where
2−
3−import Distribution.Simple
4−
5−main :: IO ()
6−main = defaultMain
cabal.projectnew file+4
@@ -0,0 +1,4 @@
1+packages: .
2+tests: True
3+benchmarks: True
4+constraints: req +dev
httpbin-tests/Network/HTTP/ReqSpec.hs+309−187
@@ -1,38 +1,37 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DataKinds #-}
3−{-# LANGUAGE FlexibleInstances #-}
4−{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE RankNTypes #-}
1+{-# LANGUAGE DataKinds #-}
2+{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE LambdaCase #-}
4+{-# LANGUAGE OverloadedStrings #-}
5+{-# LANGUAGE RankNTypes #-}
66{-# OPTIONS_GHC -fno-warn-orphans #-}
77
8−module Network.HTTP.ReqSpec
9− ( spec )
10−where
8+module Network.HTTP.ReqSpec (spec) where
119
1210import Control.Exception
13−import Control.Monad.Reader
11+import Control.Monad (forM_)
1412import Control.Monad.Trans.Control
15−import Data.Aeson (Value (..), ToJSON (..), object, (.=))
16−import Data.Monoid ((<>))
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)
1720import Data.Proxy
1821import Data.Text (Text)
19−import Network.HTTP.Req
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
2030import Test.Hspec
2131import Test.QuickCheck
22−import qualified Data.Aeson as A
23−import qualified Data.ByteString as B
24−import qualified Data.ByteString.Lazy as BL
25−import qualified Data.HashMap.Strict as HM
26−import qualified Data.Text as T
27−import qualified Data.Text.Encoding as T
28−import qualified Data.Text.IO as TIO
29−import qualified Network.HTTP.Client as L
30−import qualified Network.HTTP.Client.MultipartFormData as LM
31−import qualified Network.HTTP.Types as Y
3232
3333spec :: Spec
3434spec = do
35−
3635 describe "exception throwing on non-2xx status codes" $
3736 it "throws indeed for non-2xx" $
3837 req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
@@ -51,39 +50,61 @@ spec = do
5150 blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
5251 `shouldThrow` anyException
5352
53+ describe "isStatusCodeException" $
54+ it "extracts non-2xx response" $
55+ req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
56+ `shouldThrow` selector404ByStatusCodeException
57+
5458 describe "receiving user-agent header back" $
5559 it "works" $ do
56− r <- req GET (httpbin /: "user-agent")
57− NoReqBody jsonResponse (header "user-agent" "Req")
58− responseBody r `shouldBe` object
59− ["user-agent" .= ("Req" :: Text)]
60− responseStatusCode r `shouldBe` 200
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
6171 responseStatusMessage r `shouldBe` "OK"
6272
6373 describe "receiving request headers back" $
6474 it "works" $ do
65− r <- req GET (httpbin /: "headers")
66− NoReqBody jsonResponse (header "Foo" "bar" <> header "Baz" "quux")
67− stripFunnyHeaders (responseBody r) `shouldBe` object
68− [ "headers" .= object
69− [ "Accept-Encoding" .= ("gzip" :: Text)
70− , "Foo" .= ("bar" :: Text)
71− , "Baz" .= ("quux" :: Text)
72− , "Host" .= ("httpbin.org" :: Text) ] ]
73− responseStatusCode r `shouldBe` 200
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
7492 responseStatusMessage r `shouldBe` "OK"
7593
7694 describe "receiving GET data back" $
7795 it "works" $ do
7896 r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty
79− (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
80− [ "args" .= emptyObject
81− , "url" .= ("https://httpbin.org/get" :: Text)
82− , "headers" .= object
83− [ "Accept-Encoding" .= ("gzip" :: Text)
84− , "Host" .= ("httpbin.org" :: Text) ] ]
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+ ]
85106 responseHeader r "Content-Type" `shouldBe` return "application/json"
86− responseStatusCode r `shouldBe` 200
107+ responseStatusCode r `shouldBe` 200
87108 responseStatusMessage r `shouldBe` "OK"
88109
89110 describe "receiving POST JSON data back" $
@@ -91,47 +112,55 @@ spec = do
91112 let text = "foo" :: Text
92113 reflected = reflectJSON text
93114 r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty
94− (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
95− [ "args" .= emptyObject
96− , "json" .= text
97− , "data" .= reflected
98− , "url" .= ("https://httpbin.org/post" :: Text)
99− , "headers" .= object
100− [ "Content-Type" .= ("application/json; charset=utf-8" :: Text)
101− , "Accept-Encoding" .= ("gzip" :: Text)
102− , "Host" .= ("httpbin.org" :: Text)
103− , "Content-Length" .= show (T.length reflected) ]
104− , "files" .= emptyObject
105− , "form" .= emptyObject ]
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+ ]
106130 responseHeader r "Content-Type" `shouldBe` return "application/json"
107− responseStatusCode r `shouldBe` 200
131+ responseStatusCode r `shouldBe` 200
108132 responseStatusMessage r `shouldBe` "OK"
109133
110134 describe "receiving POST data back (multipart form data)" $
111135 it "works" $ do
112− body <- reqBodyMultipart
113− [ LM.partBS "foo" "foo data!"
114− , LM.partBS "bar" "bar data!" ]
136+ body <-
137+ reqBodyMultipart
138+ [ LM.partBS "foo" "foo data!",
139+ LM.partBS "bar" "bar data!"
140+ ]
115141 r <- req POST (httpbin /: "post") body jsonResponse mempty
116− let Just contentType = getRequestContentType body
117− (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
118− [ "args" .= emptyObject
119− , "json" .= Null
120− , "data" .= ("" :: Text)
121− , "url" .= ("https://httpbin.org/post" :: Text)
122− , "headers" .= object
123− [ "Content-Type" .= T.decodeUtf8 contentType
124− , "Accept-Encoding" .= ("gzip" :: Text)
125− , "Host" .= ("httpbin.org" :: Text)
126− , "Content-Length" .= ("242" :: Text)
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+ ]
127161 ]
128− , "files" .= emptyObject
129− , "form" .= object
130− [ "foo" .= ("foo data!" :: Text)
131− , "bar" .= ("bar data!" :: Text) ]
132− ]
133162 responseHeader r "Content-Type" `shouldBe` return "application/json"
134− responseStatusCode r `shouldBe` 200
163+ responseStatusCode r `shouldBe` 200
135164 responseStatusMessage r `shouldBe` "OK"
136165
137166 describe "receiving PATCHed file back" $
@@ -140,55 +169,69 @@ spec = do
140169 file = "httpbin-data/robots.txt"
141170 contents <- TIO.readFile file
142171 r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty
143− (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
144− [ "args" .= emptyObject
145− , "json" .= Null
146− , "data" .= contents
147− , "url" .= ("https://httpbin.org/patch" :: Text)
148− , "headers" .= object
149− [ "Accept-Encoding" .= ("gzip" :: Text)
150− , "Host" .= ("httpbin.org" :: Text)
151− , "Content-Length" .= show (T.length contents) ]
152− , "files" .= emptyObject
153− , "form" .= emptyObject ]
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+ ]
154186 responseHeader r "Content-Type" `shouldBe` return "application/json"
155− responseStatusCode r `shouldBe` 200
187+ responseStatusCode r `shouldBe` 200
156188 responseStatusMessage r `shouldBe` "OK"
157189
158190 describe "receiving PUT form URL-encoded data back" $
159191 it "works" $ do
160− let params = "foo" =: ("bar" :: Text) <>
161− "baz" =: (5 :: Int) <>
162− queryFlag "quux"
192+ let params =
193+ "foo" =: ("bar" :: Text)
194+ <> "baz" =: (5 :: Int)
195+ <> queryFlag "quux"
163196 r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
164− (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
165− [ "args" .= emptyObject
166− , "json" .= Null
167− , "data" .= ("" :: Text)
168− , "url" .= ("https://httpbin.org/put" :: Text)
169− , "headers" .= object
170− [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text)
171− , "Accept-Encoding" .= ("gzip" :: Text)
172− , "Host" .= ("httpbin.org" :: Text)
173− , "Content-Length" .= ("18" :: Text) ]
174− , "files" .= emptyObject
175− , "form" .= object
176− [ "foo" .= ("bar" :: Text)
177− , "baz" .= ("5" :: Text)
178− , "quux" .= ("" :: Text) ] ]
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+ ]
179217 responseHeader r "Content-Type" `shouldBe` return "application/json"
180− responseStatusCode r `shouldBe` 200
218+ responseStatusCode r `shouldBe` 200
181219 responseStatusMessage r `shouldBe` "OK"
182220
183221 -- TODO /delete
184222
185223 describe "receiving UTF-8 encoded Unicode data" $
186224 it "works" $ do
187− r <- req GET (httpbin /: "encoding" /: "utf8")
188− NoReqBody bsResponse mempty
225+ r <-
226+ req
227+ GET
228+ (httpbin /: "encoding" /: "utf8")
229+ NoReqBody
230+ bsResponse
231+ mempty
189232 utf8data <- B.readFile "httpbin-data/utf8.html"
190− responseBody r `shouldBe` utf8data
191− responseStatusCode r `shouldBe` 200
233+ responseBody r `shouldBe` utf8data
234+ responseStatusCode r `shouldBe` 200
192235 responseStatusMessage r `shouldBe` "OK"
193236
194237 -- TODO /gzip
@@ -199,24 +242,35 @@ spec = do
199242 -- FIXME We no longer can count retries because all the functions
200243 -- responsible for controlling retrying are pure now.
201244 let status = 408 :: Int
202− r <- prepareForShit $ req GET (httpbin /: "status" /~ status)
203− NoReqBody ignoreResponse mempty
245+ r <-
246+ prepareForShit $
247+ req
248+ GET
249+ (httpbin /: "status" /~ status)
250+ NoReqBody
251+ ignoreResponse
252+ mempty
204253 responseStatusCode r `shouldBe` status
205254
206255 -- forM_ [101..102] checkStatusCode
207− forM_ [200..208] checkStatusCode
256+ forM_ [200 .. 208] checkStatusCode
208257 -- forM_ [300..308] checkStatusCode
209− forM_ [400..431] checkStatusCode
210− forM_ [500..511] checkStatusCode
258+ forM_ [400 .. 431] checkStatusCode
259+ forM_ [500 .. 511] checkStatusCode
211260
212261 -- TODO /response-headers
213262 -- TODO /redirect
214263
215264 describe "redirects" $
216265 it "follows redirects" $ do
217− r <- req GET (httpbin /: "redirect-to") NoReqBody ignoreResponse
218− ("url" =: ("https://httpbin.org" :: Text))
219− responseStatusCode r `shouldBe` 200
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
220274 responseStatusMessage r `shouldBe` "OK"
221275
222276 -- TODO /relative-redicet
@@ -225,21 +279,30 @@ spec = do
225279
226280 describe "basicAuth" $ do
227281 let user, password :: Text
228− user = "Scooby"
282+ user = "Scooby"
229283 password = "Doo"
230284 context "when we do not send appropriate basic auth data" $
231285 it "fails with 401" $ do
232− r <- prepareForShit $ req GET
233− (httpbin /: "basic-auth" /~ user /~ password)
234− NoReqBody ignoreResponse mempty
235− responseStatusCode r `shouldBe` 401
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
236295 responseStatusMessage r `shouldBe` "UNAUTHORIZED"
237296 context "when we provide appropriate basic auth data" $
238297 it "succeeds" $ do
239− r <- req GET (httpbin /: "basic-auth" /~ user /~ password)
240− NoReqBody ignoreResponse
241− (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
242− responseStatusCode r `shouldBe` 200
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
243306 responseStatusMessage r `shouldBe` "OK"
244307
245308 -- TODO /hidden-basic-auth
@@ -254,8 +317,8 @@ spec = do
254317 it "works" $ do
255318 r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty
256319 robots <- B.readFile "httpbin-data/robots.txt"
257− responseBody r `shouldBe` robots
258− responseStatusCode r `shouldBe` 200
320+ responseBody r `shouldBe` robots
321+ responseStatusCode r `shouldBe` 200
259322 responseStatusMessage r `shouldBe` "OK"
260323
261324 -- TODO /deny
@@ -266,10 +329,15 @@ spec = do
266329 property $ \n' -> do
267330 let n :: Word
268331 n = getSmall n'
269− r <- req GET (httpbin /: "bytes" /~ n)
270− NoReqBody lbsResponse mempty
332+ r <-
333+ req
334+ GET
335+ (httpbin /: "bytes" /~ n)
336+ NoReqBody
337+ lbsResponse
338+ mempty
271339 responseBody r `shouldSatisfy` ((== n) . fromIntegral . BL.length)
272− responseStatusCode r `shouldBe` 200
340+ responseStatusCode r `shouldBe` 200
273341 responseStatusMessage r `shouldBe` "OK"
274342 context "when we try to interpret 1000 random bytes as JSON" $
275343 it "throws correct exception" $ do
@@ -278,29 +346,38 @@ spec = do
278346 selector _ = False
279347 n :: Int
280348 n = 1000
281− req GET (httpbin /: "bytes" /~ n) NoReqBody
282− (Proxy :: Proxy (JsonResponse Value)) mempty
283− `shouldThrow` selector
349+ req
350+ GET
351+ (httpbin /: "bytes" /~ n)
352+ NoReqBody
353+ (Proxy :: Proxy (JsonResponse Value))
354+ mempty
355+ `shouldThrow` selector
284356
285357 describe "streaming random bytes" $
286358 it "works" $
287359 property $ \n' -> do
288360 let n :: Word
289361 n = getSmall n'
290− r <- req GET (httpbin /: "stream-bytes" /~ n)
291− NoReqBody bsResponse mempty
362+ r <-
363+ req
364+ GET
365+ (httpbin /: "stream-bytes" /~ n)
366+ NoReqBody
367+ bsResponse
368+ mempty
292369 responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
293− responseStatusCode r `shouldBe` 200
370+ responseStatusCode r `shouldBe` 200
294371 responseStatusMessage r `shouldBe` "OK"
295372
296− -- TODO /links
297− -- TODO /image
298− -- TODO /image/png
299− -- TODO /image/jpeg
300− -- TODO /image/webp
301− -- TODO /image/svg
302− -- TODO /forms/post
303− -- TODO /xml
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
304381
305382----------------------------------------------------------------------------
306383-- Instances
@@ -311,80 +388,125 @@ instance MonadHttp IO where
311388----------------------------------------------------------------------------
312389-- Helpers
313390
314−-- | Run request with such settings that it does not signal error on adverse
315−-- response status codes.
316−
391+-- | Run a request with such settings that it does not signal errors.
317392prepareForShit :: Req a -> IO a
318−prepareForShit = runReq defaultHttpConfig { httpConfigCheckResponse = noNoise }
393+prepareForShit = runReq defaultHttpConfig {httpConfigCheckResponse = noNoise}
319394 where
320395 noNoise _ _ _ = Nothing
321396
322−-- | Run request with such settings that it throws on any response.
323−
397+-- | Run a request with such settings that it throws on any response.
324398blindlyThrowing :: Req a -> IO a
325−blindlyThrowing = runReq defaultHttpConfig { httpConfigCheckResponse = doit }
399+blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
326400 where
327401 doit _ _ = error "Oops!"
328402
329403-- | 'Url' representing <https://httpbin.org>.
330−
331−httpbin :: Url 'Https
332−httpbin = 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
333426
334427-- | Remove “origin” field from JSON value. Origin may change, we don't want
335428-- to depend on that.
336−
337429stripOrigin :: Value -> Value
338−stripOrigin (Object m) = Object (HM.delete "origin" m)
339−stripOrigin value = value
430+stripOrigin (Object m) = Object (Aeson.KeyMap.delete "origin" m)
431+stripOrigin value = value
340432
341433-- | Remove funny headers that might break the tests.
342−
343434stripFunnyHeaders :: Value -> Value
344−stripFunnyHeaders (Object m) =
345− let f (Object p) = Object $ HM.filterWithKey (\k _ -> k `elem` hs) p
346− f value = value
347− hs = [ "Content-Type"
348− , "Accept-Encoding"
349− , "Host"
350− , "Content-Length"
351− , "Foo"
352− , "Baz" ]
353− in Object (HM.adjust f "headers" m)
354−stripFunnyHeaders 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+ ]
355465
356466-- | This is a complete test case that makes use of <https://httpbin.org> to
357467-- get various response status codes.
358−
359468checkStatusCode :: Int -> SpecWith ()
360469checkStatusCode code =
361470 describe ("receiving status code " ++ show code) $
362471 it "works" $ do
363− r <- prepareForShit $ req GET (httpbin /: "status" /~ code)
364− NoReqBody ignoreResponse mempty
472+ r <-
473+ prepareForShit $
474+ req
475+ GET
476+ (httpbin /: "status" /~ code)
477+ NoReqBody
478+ ignoreResponse
479+ mempty
365480 responseStatusCode r `shouldBe` code
366481
367482-- | Exception selector that selects only 404 “Not found” exceptions.
368−
369483selector404 :: HttpException -> Bool
370−selector404 (VanillaHttpException
371− (L.HttpExceptionRequest _
372− (L.StatusCodeException response chunk))) =
373− L.responseStatus response == Y.status404 && not (B.null chunk)
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)
374492selector404 _ = False
375493
376−-- | Empty JSON 'Object'.
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
377500
501+-- | The empty JSON 'Object'.
378502emptyObject :: Value
379−emptyObject = Object HM.empty
503+emptyObject = Object Aeson.KeyMap.empty
380504
381−-- | Get rendered JSON value as 'Text'.
382−
383−reflectJSON :: ToJSON a => a -> Text
505+-- | Get a rendered JSON value as 'Text'.
506+reflectJSON :: (ToJSON a) => a -> Text
384507reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
385508
386509-- | Clarify to the type checker that the inner computation is in the 'IO'
387510-- monad.
388−
389511asIO :: IO a -> IO a
390512asIO = id
pure-tests/Network/HTTP/ReqSpec.hs+350−209
@@ -1,61 +1,71 @@
1−{-# LANGUAGE CPP #-}
2−{-# LANGUAGE DataKinds #-}
3−{-# LANGUAGE DeriveGeneric #-}
4−{-# LANGUAGE FlexibleInstances #-}
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 #-}
511{-# LANGUAGE NoMonomorphismRestriction #-}
6−{-# LANGUAGE OverloadedStrings #-}
7−{-# LANGUAGE RankNTypes #-}
8−{-# LANGUAGE RecordWildCards #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# OPTIONS_GHC -fno-warn-orphans #-}
12+{-# OPTIONS_GHC -fno-warn-orphans #-}
1113
12−module Network.HTTP.ReqSpec
13− ( spec )
14−where
14+module Network.HTTP.ReqSpec (spec) where
1515
16+import Blaze.ByteString.Builder qualified as BB
1617import Control.Exception (throwIO)
18+import Control.Monad
1719import Control.Retry
1820import Data.Aeson (ToJSON (..))
21+import Data.Aeson qualified as A
1922import Data.ByteString (ByteString)
20−import Data.Maybe (isNothing, fromJust)
21−import Data.Monoid ((<>))
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)
2230import Data.Proxy
2331import Data.Text (Text)
32+import Data.Text qualified as T
33+import Data.Text.Encoding qualified as T
2434import Data.Time
35+import Data.Typeable (Typeable, eqT)
36+import GHC.Exts (IsList (..))
2537import 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
2641import Network.HTTP.Req
42+import Network.HTTP.Types qualified as Y
43+import Network.HTTP.Types.Header qualified as Y
2744import Test.Hspec
2845import Test.Hspec.Core.Spec (SpecM)
2946import Test.QuickCheck
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
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
4151
4252spec :: Spec
4353spec = do
44−
4554 describe "config" $
4655 it "getHttpConfig has effect on resulting request" $
4756 property $ \config -> do
4857 request <- runReq config (req_ GET url NoReqBody mempty)
49− L.proxy request `shouldBe` httpConfigProxy config
58+ L.proxy request `shouldBe` httpConfigProxy config
5059 L.redirectCount request `shouldBe` httpConfigRedirectCount config
5160
5261 describe "methods" $ do
53− let mnth
54− :: forall method.
55− ( HttpMethod method
56− , HttpBodyAllowed (AllowsBody method) 'NoBody )
57− => method
58− -> SpecM () ()
62+ let mnth ::
63+ forall method.
64+ ( HttpMethod method,
65+ HttpBodyAllowed (AllowsBody method) 'NoBody
66+ ) =>
67+ method ->
68+ SpecM () ()
5969 mnth method = do
6070 let name = httpMethodName (Proxy :: Proxy method)
6171 describe (B8.unpack name) $
@@ -78,15 +88,15 @@ spec = do
7888 property $ \host -> do
7989 request <- req_ GET (http host) NoReqBody mempty
8090 L.secure request `shouldBe` False
81− L.port request `shouldBe` 80
82− L.host request `shouldBe` urlEncode host
91+ L.port request `shouldBe` 80
92+ L.host request `shouldBe` urlEncode host
8393 describe "https" $
8494 it "sets all the params correctly" $
8595 property $ \host -> do
8696 request <- req_ GET (https host) NoReqBody mempty
8797 L.secure request `shouldBe` True
88− L.port request `shouldBe` 443
89− L.host request `shouldBe` urlEncode host
98+ L.port request `shouldBe` 443
99+ L.host request `shouldBe` urlEncode host
90100 describe "(/~)" $
91101 it "attaches a path piece that is URL-encoded" $
92102 property $ \host pieces -> do
@@ -101,67 +111,95 @@ spec = do
101111 request <- req_ GET url' NoReqBody mempty
102112 L.host request `shouldBe` urlEncode host
103113 L.path request `shouldBe` encodePathPieces pieces
104− describe "parseUrlHttp" $ do
114+
115+ describe "useHttpURI" $ do
105116 it "does not recognize non-http schemes" $
106− parseUrlHttp "https://httpbin.org" `shouldSatisfy` isNothing
107− it "parses correct URLs" $
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
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
122133 it "does not recognize non-https schemes" $
123− parseUrlHttps "http://httpbin.org" `shouldSatisfy` isNothing
134+ property $ \uri ->
135+ when (URI.uriScheme uri /= Just [QQ.scheme|https|]) $
136+ useHttpsURI uri `shouldSatisfy` isNothing
124137 it "parses correct URLs" $
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
138− describe "parseUrl" $ do
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
139150 it "does not recognize non-http and non-https schemes" $
140− parseUrl "ftp://httpbin.org" `shouldSatisfy` isNothing
141− it "parses correct http URLs" $
142− property $ \host mport' pieces queryParams -> do
143− let (url', path, queryString) =
144− assembleUrl Http host mport' pieces queryParams
145− Left (url'', options) = fromJust (parseUrl url')
146− request <- req_ GET url'' NoReqBody options
147− L.host request `shouldBe` urlEncode (unHost host)
148− L.port request `shouldBe` maybe 80 getNonNegative mport'
149− L.path request `shouldBe` path
150− L.queryString request `shouldBe` queryString
151− it "parses correct https URLs" $
152− property $ \host mport' pieces queryParams -> do
153− let (url', path, queryString) =
154− assembleUrl Https host mport' pieces queryParams
155− Right (url'', options) = fromJust (parseUrl url')
156− request <- req_ GET url'' NoReqBody options
157− L.host request `shouldBe` urlEncode (unHost host)
158− L.port request `shouldBe` maybe 443 getNonNegative mport'
159− L.path request `shouldBe` path
160− L.queryString request `shouldBe` queryString
161− it "rejects gibberish in port component" $ do
162− parseUrl "http://my-site.com:bob/far" `shouldSatisfy` isNothing
163− parseUrl "https://my-site.com:7001uh/api" `shouldSatisfy` isNothing
164− parseUrl "http://my-site.com:/bar" `shouldSatisfy` isNothing
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
158+ 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"
165203
166204 describe "bodies" $ do
167205 describe "NoReqBody" $
@@ -185,7 +223,7 @@ spec = do
185223 L.RequestBodyBS x -> x `shouldBe` bs
186224 _ -> expectationFailure "Wrong request body constructor."
187225 describe "ReqBodyLbs" $
188− it "sets body to specified lazy byte string" $
226+ it "sets body to specified lazy byte string" $
189227 property $ \lbs -> do
190228 request <- req_ POST url (ReqBodyLbs lbs) mempty
191229 case L.requestBody request of
@@ -199,6 +237,19 @@ spec = do
199237 L.RequestBodyLBS x -> x `shouldBe` renderQuery params
200238 _ -> expectationFailure "Wrong request body constructor."
201239
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+
202253 describe "optional parameters" $ do
203254 describe "header" $ do
204255 it "sets specified header value" $
@@ -207,94 +258,136 @@ spec = do
207258 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value
208259 it "left header wins" $
209260 property $ \name value0 value1 -> do
210− request <- req_ GET url NoReqBody
211− (header name value0 <> header name value1)
261+ request <-
262+ req_
263+ GET
264+ url
265+ NoReqBody
266+ (header name value0 <> header name value1)
212267 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value0
213268 it "overwrites headers set by other parts of the lib" $
214269 property $ \value -> do
215− request <- req_ POST url (ReqBodyUrlEnc mempty)
216− (header "Content-Type" value)
270+ request <-
271+ req_
272+ POST
273+ url
274+ (ReqBodyUrlEnc mempty)
275+ (header "Content-Type" value)
217276 lookup "Content-Type" (L.requestHeaders request) `shouldBe` pure value
218277 describe "cookieJar" $
219278 it "cookie jar is set without modifications" $
220279 property $ \cjar -> do
221280 request <- req_ GET url NoReqBody (cookieJar cjar)
222− L.cookieJar request `shouldBe` pure cjar
281+ L.cookieJar request `shouldSatisfy` (maybe False (L.equalCookieJar cjar))
223282 describe "basicAuth" $ do
224283 it "sets Authorization header to correct value" $
225284 property $ \username password -> do
226285 request <- req_ GET url NoReqBody (basicAuth username password)
227− lookup "Authorization" (L.requestHeaders request) `shouldBe`
228− pure (basicAuthHeader username password)
286+ lookup "Authorization" (L.requestHeaders request)
287+ `shouldBe` Just (basicAuthHeader username password)
229288 it "overwrites manual setting of header" $
230289 property $ \username password value -> do
231− request0 <- req_ GET url NoReqBody
232− (basicAuth username password <> header "Authorization" value)
233− request1 <- req_ GET url NoReqBody
234− (header "Authorization" value <> basicAuth username password)
235− let result = basicAuthHeader username password
236− lookup "Authorization" (L.requestHeaders request0) `shouldBe`
237− pure result
238− lookup "Authorization" (L.requestHeaders request1) `shouldBe`
239− pure result
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
240305 it "left auth option wins" $
241306 property $ \username0 password0 username1 password1 -> do
242− request <- req_ GET url NoReqBody
243− (basicAuth username0 password0 <> basicAuth username1 password1)
244− lookup "Authorization" (L.requestHeaders request) `shouldBe`
245− pure (basicAuthHeader username0 password0)
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)
246315 describe "oAuth2Bearer" $ do
247316 it "sets Authorization header to correct value" $
248317 property $ \token -> do
249318 request <- req_ GET url NoReqBody (oAuth2Bearer token)
250− lookup "Authorization" (L.requestHeaders request) `shouldBe`
251− pure ("Bearer " <> token)
319+ lookup "Authorization" (L.requestHeaders request)
320+ `shouldBe` pure ("Bearer " <> token)
252321 it "overwrites manual setting of header" $
253322 property $ \token value -> do
254− request0 <- req_ GET url NoReqBody
255− (oAuth2Bearer token <> header "Authorization" value)
256− request1 <- req_ GET url NoReqBody
257− (header "Authorization" value <> oAuth2Bearer token)
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)
258335 let result = "Bearer " <> token
259− lookup "Authorization" (L.requestHeaders request0) `shouldBe`
260− pure result
261− lookup "Authorization" (L.requestHeaders request1) `shouldBe`
262− pure result
336+ lookup "Authorization" (L.requestHeaders request0)
337+ `shouldBe` pure result
338+ lookup "Authorization" (L.requestHeaders request1)
339+ `shouldBe` pure result
263340 it "left auth option wins" $
264341 property $ \token0 token1 -> do
265− request <- req_ GET url NoReqBody
266− (oAuth2Bearer token0 <> oAuth2Bearer token1)
267− lookup "Authorization" (L.requestHeaders request) `shouldBe`
268− pure ("Bearer " <> token0)
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)
269350 describe "ProxyAuthorization" $
270351 it "sets Authorization header to correct value" $
271352 property $ \username password -> do
272353 request <- req_ GET url NoReqBody (basicProxyAuth username password)
273− lookup "Proxy-Authorization" (L.requestHeaders request) `shouldBe`
274− pure (basicProxyAuthHeader username password)
354+ lookup "Proxy-Authorization" (L.requestHeaders request)
355+ `shouldBe` pure (basicProxyAuthHeader username password)
275356 describe "oAuth2Token" $ do
276357 it "sets Authorization header to correct value" $
277358 property $ \token -> do
278359 request <- req_ GET url NoReqBody (oAuth2Token token)
279− lookup "Authorization" (L.requestHeaders request) `shouldBe`
280− pure ("token " <> token)
360+ lookup "Authorization" (L.requestHeaders request)
361+ `shouldBe` pure ("token " <> token)
281362 it "overwrites manual setting of header" $
282363 property $ \token value -> do
283− request0 <- req_ GET url NoReqBody
284− (oAuth2Token token <> header "Authorization" value)
285− request1 <- req_ GET url NoReqBody
286− (header "Authorization" value <> oAuth2Token token)
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)
287376 let result = "token " <> token
288− lookup "Authorization" (L.requestHeaders request0) `shouldBe`
289− pure result
290− lookup "Authorization" (L.requestHeaders request1) `shouldBe`
291− pure result
377+ lookup "Authorization" (L.requestHeaders request0)
378+ `shouldBe` pure result
379+ lookup "Authorization" (L.requestHeaders request1)
380+ `shouldBe` pure result
292381 it "left auth option wins" $
293382 property $ \token0 token1 -> do
294− request <- req_ GET url NoReqBody
295− (oAuth2Token token0 <> oAuth2Token token1)
296− lookup "Authorization" (L.requestHeaders request) `shouldBe`
297− pure ("token " <> token0)
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)
298391 describe "port" $
299392 it "sets port overwriting the defaults" $
300393 property $ \n -> do
@@ -314,6 +407,19 @@ spec = do
314407 request <- req_ GET url NoReqBody (httpVersion major minor)
315408 L.requestVersion request `shouldBe` Y.HttpVersion major minor
316409
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+
317423----------------------------------------------------------------------------
318424-- Instances
319425
@@ -322,21 +428,27 @@ instance MonadHttp IO where
322428
323429instance Arbitrary HttpConfig where
324430 arbitrary = do
325− httpConfigProxy <- arbitrary
431+ httpConfigProxy <- arbitrary
326432 httpConfigRedirectCount <- arbitrary
327− let httpConfigAltManager = Nothing
433+ let httpConfigAltManager = Nothing
328434 httpConfigCheckResponse _ _ _ = Nothing
329− httpConfigRetryPolicy = retryPolicyDefault
330− httpConfigRetryJudge _ _ = False
435+ httpConfigRetryPolicy = retryPolicyDefault
436+ httpConfigRetryJudge _ _ = False
437+ httpConfigRetryJudgeException _ _ = False
438+ httpConfigBodyPreviewLength = 1024
331439 return HttpConfig {..}
332440
333441instance Show HttpConfig where
334442 show HttpConfig {..} =
335− "HttpConfig\n" ++
336− "{ httpConfigProxy=" ++ show httpConfigProxy ++ "\n" ++
337− ", httpRedirectCount=" ++ show httpConfigRedirectCount ++ "\n" ++
338− ", httpConfigAltManager=<cannot be shown>\n" ++
339− ", httpConfigCheckResponse=<cannot be shown>}\n"
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"
340452
341453instance Arbitrary L.Proxy where
342454 arbitrary = L.Proxy <$> arbitrary <*> arbitrary
@@ -354,9 +466,10 @@ instance Show (Option scheme) where
354466 show _ = "<cannot be shown>"
355467
356468data Thing = Thing
357− { _thingBool :: Bool
358− , _thingText :: Text
359− } deriving (Eq, Show, Generic)
469+ { _thingBool :: Bool,
470+ _thingText :: Text
471+ }
472+ deriving (Eq, Show, Generic)
360473
361474instance ToJSON Thing
362475
@@ -368,17 +481,17 @@ instance Arbitrary L.CookieJar where
368481
369482instance Arbitrary L.Cookie where
370483 arbitrary = do
371− cookie_name <- arbitrary
372− cookie_value <- arbitrary
373− cookie_expiry_time <- arbitrary
374− cookie_domain <- arbitrary
375− cookie_path <- arbitrary
484+ cookie_name <- arbitrary
485+ cookie_value <- arbitrary
486+ cookie_expiry_time <- arbitrary
487+ cookie_domain <- arbitrary
488+ cookie_path <- arbitrary
376489 cookie_creation_time <- arbitrary
377490 cookie_last_access_time <- arbitrary
378− cookie_persistent <- arbitrary
379− cookie_host_only <- arbitrary
380− cookie_secure_only <- arbitrary
381− cookie_http_only <- arbitrary
491+ cookie_persistent <- arbitrary
492+ cookie_host_only <- arbitrary
493+ cookie_secure_only <- arbitrary
494+ cookie_http_only <- arbitrary
382495 return L.Cookie {..}
383496
384497instance Arbitrary UTCTime where
@@ -390,19 +503,20 @@ instance Arbitrary Day where
390503instance Arbitrary DiffTime where
391504 arbitrary = secondsToDiffTime <$> arbitrary
392505
506+instance Arbitrary F.Form where
507+ arbitrary = (F.Form . fromList) <$> arbitrary
508+
393509----------------------------------------------------------------------------
394510-- Helper types
395511
396512-- | A wrapper to generate correct hosts.
397−
398−newtype Host = Host { unHost :: Text }
513+newtype Host = Host {unHost :: Text}
399514 deriving (Eq, Show)
400515
401516instance Arbitrary Host where
402517 arbitrary = Host . T.pack <$> listOf1 (arbitrary `suchThat` (/= ':'))
403518
404519-- | A wrapper to generate correct query parameters.
405−
406520newtype QueryParams = QueryParams [(Text, Maybe Text)]
407521 deriving (Eq, Show)
408522
@@ -415,68 +529,84 @@ instance Arbitrary QueryParams where
415529-- Helpers
416530
417531-- | 'req' that just returns the prepared 'L.Request'.
418−
419−req_
420− :: ( MonadHttp m
421− , HttpMethod method
422− , HttpBody body
423− , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
424− => method -- ^ HTTP method
425− -> Url scheme -- ^ 'Url' — location of resource
426− -> body -- ^ Body of the request
427− -> Option scheme -- ^ Collection of optional parameters
428− -> m L.Request -- ^ Vanilla 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
429548req_ method url' body options = req' method url' body options $
430549 \request _ -> return request
431550
432551-- | A dummy 'Url'.
433−
434552url :: Url 'Https
435553url = https "httpbin.org"
436554
437555-- | Percent encode given 'Text'.
438−
439556urlEncode :: Text -> ByteString
440557urlEncode = Y.urlEncode False . T.encodeUtf8
441558
442559-- | Build URL path from given path pieces.
443−
444560encodePathPieces :: [Text] -> ByteString
445561encodePathPieces = BL.toStrict . BB.toLazyByteString . Y.encodePathSegments
446562
447−-- | Assemble a URL.
448−
449−assembleUrl
450− :: Scheme -- ^ Scheme
451− -> Host -- ^ Host
452− -> Maybe (NonNegative Int) -- ^ Port
453− -> [Text] -- ^ Path pieces
454− -> QueryParams -- ^ Query parameters
455− -> (ByteString, ByteString, ByteString) -- ^ URL, path, query string
456−assembleUrl scheme' (Host host') mport' pathPieces (QueryParams queryParams) =
457− (scheme <> host <> port' <> path <> queryString, path, queryString)
458− where
459− scheme = case scheme' of
460− Http -> "http://"
461− Https -> "https://"
462− host = urlEncode host'
463− port' =
464− case mport' of
465− Nothing -> ""
466− Just (NonNegative x) -> ":" <> B8.pack (show x)
467− path = encodePathPieces pathPieces
468− queryString = Y.renderQuery True (Y.queryTextToQuery queryParams)
469−
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'.
470602renderQuery :: [(Text, Maybe Text)] -> BL.ByteString
471603renderQuery = BL.fromStrict . Y.renderQuery False . Y.queryTextToQuery
472604
473605-- | Convert collection of query parameters to 'FormUrlEncodedParam' thing.
474−
475606formUrlEnc :: [(Text, Maybe Text)] -> FormUrlEncodedParam
476607formUrlEnc = foldMap (uncurry queryParam)
477608
478609-- | Get “Authorization” basic auth header given username and password.
479−
480610basicAuthHeader :: ByteString -> ByteString -> ByteString
481611basicAuthHeader username password =
482612 fromJust . lookup Y.hAuthorization . L.requestHeaders $
@@ -484,8 +614,19 @@ basicAuthHeader username password =
484614
485615-- | Get "Proxy-Authorization" basic proxy auth header given username and
486616-- password.
487−
488617basicProxyAuthHeader :: ByteString -> ByteString -> ByteString
489618basicProxyAuthHeader username password =
490619 fromJust . lookup Y.hProxyAuthorization . L.requestHeaders $
491620 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+117−100
@@ -1,110 +1,127 @@
1−name: req
2−version: 2.1.0
3−cabal-version: 1.18
4−tested-with: GHC==8.2.2, GHC==8.4.4, GHC==8.6.5
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
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
1922
2023source-repository head
21− type: git
22− location: https://github.com/mrkkrp/req.git
24+ type: git
25+ location: https://github.com/mrkkrp/req.git
2326
2427flag dev
25− description: Turn on development settings.
26− manual: True
27− default: False
28+ description: Turn on development settings.
29+ default: False
30+ manual: True
2831
2932library
30− build-depends: aeson >= 0.9 && < 1.5
31− , authenticate-oauth >= 1.5 && < 1.7
32− , base >= 4.10 && < 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.4
37− , http-api-data >= 0.2 && < 0.5
38− , http-client >= 0.5 && < 0.7
39− , http-client-tls >= 0.3.2 && < 0.4
40− , http-types >= 0.8 && < 10.0
41− , monad-control >= 1.0 && < 1.1
42− , mtl >= 2.0 && < 3.0
43− , retry >= 0.8 && < 0.9
44− , text >= 0.2 && < 1.3
45− , time >= 1.2 && < 1.10
46− , transformers >= 0.4 && < 0.6
47− , transformers-base
48− exposed-modules: Network.HTTP.Req
49− if flag(dev)
50− ghc-options: -O0 -Wall -Werror
51− else
52− ghc-options: -O2 -Wall
53− if flag(dev)
54− ghc-options: -Wcompat
55− -Wincomplete-record-updates
56− -Wincomplete-uni-patterns
57− -Wnoncanonical-monad-instances
58− -Wnoncanonical-monadfail-instances
59− default-language: Haskell2010
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
6067
6168test-suite pure-tests
62− main-is: Spec.hs
63− other-modules: Network.HTTP.ReqSpec
64− hs-source-dirs: pure-tests
65− type: exitcode-stdio-1.0
66− build-depends: QuickCheck >= 2.7 && < 3.0
67− , aeson >= 0.9 && < 1.5
68− , base >= 4.10 && < 5.0
69− , blaze-builder >= 0.3 && < 0.5
70− , bytestring >= 0.10.8 && < 0.11
71− , case-insensitive >= 0.2 && < 1.3
72− , hspec >= 2.0 && < 3.0
73− , hspec-core >= 2.0 && < 3.0
74− , http-client >= 0.5 && < 0.7
75− , http-types >= 0.8 && < 10.0
76− , mtl >= 2.0 && < 3.0
77− , req
78− , retry >= 0.8 && < 0.9
79− , text >= 0.2 && < 1.3
80− , time >= 1.2 && < 1.9
81− build-tools: hspec-discover >= 2.0 && < 3.0
82− if flag(dev)
83− ghc-options: -O0 -Wall -Werror
84− else
85− ghc-options: -O2 -Wall
86− default-language: Haskell2010
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
87101
88102test-suite httpbin-tests
89− main-is: Spec.hs
90− other-modules: Network.HTTP.ReqSpec
91− hs-source-dirs: httpbin-tests
92− type: exitcode-stdio-1.0
93− build-depends: QuickCheck >= 2.7 && < 3.0
94− , aeson >= 0.9 && < 1.5
95− , base >= 4.10 && < 5.0
96− , bytestring >= 0.10.8 && < 0.11
97− , hspec >= 2.0 && < 3.0
98− , http-client >= 0.5 && < 0.7
99− , http-types >= 0.8 && < 10.0
100− , monad-control >= 1.0 && < 1.1
101− , mtl >= 2.0 && < 3.0
102− , req
103− , text >= 0.2 && < 1.3
104− , unordered-containers >= 0.2.5 && < 0.2.11
105− build-tools: hspec-discover >= 2.0 && < 3.0
106− if flag(dev)
107− ghc-options: -O0 -Wall -Werror
108− else
109− ghc-options: -O2 -Wall
110− default-language: Haskell2010
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