on 4cce62b help sign in
.github/dependabot.ymldeleted−6
since splitsnapshots
unifiedsplit
@@ -1,6 +0,0 @@
1−version: 2
2−updates:
3− - package-ecosystem: "github-actions"
4− directory: "/"
5− schedule:
6− interval: "weekly"
.github/workflows/ci.yamldeleted−47
@@ -1,47 +0,0 @@
1−name: CI
2−on:
3− push:
4− branches:
5− - master
6− pull_request:
7− types:
8− - opened
9− - synchronize
10−jobs:
11− ormolu:
12− runs-on: ubuntu-latest
13− steps:
14− - uses: actions/checkout@v4
15− - uses: haskell-actions/run-ormolu@v17
16− build:
17− runs-on: ubuntu-latest
18− needs: ormolu
19− strategy:
20− matrix:
21− cabal: ["3.12"]
22− ghc: ["9.6.3", "9.8.2", "9.10.1"]
23− steps:
24− - uses: actions/checkout@v4
25− - uses: haskell-actions/setup@v2
26− id: setup-haskell-cabal
27− with:
28− ghc-version: ${{ matrix.ghc }}
29− cabal-version: ${{ matrix.cabal }}
30− - run: cabal update
31− - run: cabal freeze
32− - uses: actions/cache@v4.2.3
33− with:
34− path: |
35− ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
36− dist-newstyle
37− key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
38− restore-keys: |
39− ${{ runner.os }}-${{ matrix.ghc }}-
40− - run: cabal format && git diff --exit-code --color=always
41− - run: cabal build
42− - run: |
43− docker pull kennethreitz/httpbin
44− docker run -p 1234:80 kennethreitz/httpbin &
45− cabal test
46− - run: cabal haddock
47− - run: cabal sdist
.gitignore−2
@@ -25,6 +25,4 @@ cabal.project.local
25cabal.sandbox.config
25cabal.sandbox.config
26dist-*/
26dist-*/
27dist/
27dist/
28−hie.yaml
29stack.yaml
28stack.yaml
30−stack.yaml.lock
.travis.ymlnew file+38
@@ -0,0 +1,38 @@
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=7.10.3
13+ addons: {apt: {packages: [cabal-install-2.4,ghc-7.10.3],sources: [hvr-ghc]}}
14+ - env: CABALVER=2.4 GHCVER=8.0.2
15+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
16+ - env: CABALVER=2.4 GHCVER=8.2.2
17+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
18+ - env: CABALVER=2.4 GHCVER=8.4.3
19+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
20+ - env: CABALVER=2.4 GHCVER=8.6.1
21+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
22+
23+before_install:
24+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
25+
26+install:
27+ - cabal --version
28+ - ghc --version
29+ - travis_retry cabal update
30+
31+script:
32+ - cabal new-build --enable-tests --enable-benchmarks --flags=dev
33+ - cabal new-test
34+ - cabal new-haddock
35+ - cabal sdist
36+
37+notifications:
38+ email: false
CHANGELOG.md−139
@@ -1,142 +1,3 @@
1−## Req 3.13.4
2−
3−* Fixed empty ciphersuite list when compiling against `tls < 2.0.6`
4− (see [PR 175](https://github.com/mrkkrp/req/pull/175)). As a side effect, now
5− compatible with older versions of `crypton-connection` (>= 0.3).
6−
7−## Req 3.13.3
8−
9−* Works with `crypton-connection-0.4` and newer.
10−
11−## Req 3.13.2
12−
13−* Disable the problematic `httpbin-tests` test suite by default. Only enable
14− it when the `dev` flag is enabled. In that case it is expected that an
15− httpbin server is run locally at `localhost:1234`.
16−
17−## Req 3.13.1
18−
19−* Switched the non-pure test suite to use https://httpbun.org instead of
20− https://httpbin.org since the latter proved to be highly unreliable
21− lately.
22−
23−* Switched from `connection` to `crypton-connection`.
24−
25−* Builds with GHC 9.6.1.
26−
27−## Req 3.13.0
28−
29−* Add `headerRedacted` function to add header fields, which will be with
30− redacted values on print.
31−
32−## Req 3.12.0
33−
34−* Add `isStatusCodeException` function.
35−* Add `instance HttpResponse (Network.HTTP.Client.Response ())`.
36−
37−## Req 3.11.0
38−
39−* Add the `queryParamToList` method to the `QueryParam` type class.
40−* Add the `formToQuery` function. [Issue 126](https://github.com/mrkkrp/req/issues/126).
41−* Add `FromForm` instances (in the `Web.FormUrlEncoded` module) to the
42− `Option` and `FormUrlEncodedParam` types.
43−
44−## Req 3.10.0
45−
46−* Add `MonadHttp` instances for `transformers` types.
47−
48−## Req 3.9.2
49−
50−* The test suite works with `aeson-2.x.x.x`.
51−
52−## Req 3.9.1
53−
54−* Builds with GHC 9.0.
55−
56−## Req 3.9.0
57−
58−* The `useHttpURI` and `useHttpsURI` functions now preserve trailing
59− slashes.
60−
61−## Req 3.8.0
62−
63−* Adjusted the value of the `httpConfigRetryJudgeException` field of
64− `defaultHttpConfig` to retry on response timeouts and connection timeouts.
65−
66−## Req 3.7.0
67−
68−* Added `reqCb`, a function that allows you to modify the `Request` object
69− but otherwise performs the requst for you.
70−
71−* Derived `MonadThrow`, `MonadCatch`, and `MonadMask` for the `Req` monad.
72−
73−## Req 3.6.0
74−
75−* Added the `httpConfigBodyPreviewLength` configuration parameter to
76− `HttpConfig`.
77−
78−## Req 3.5.0
79−
80−* Made `Req` an instance of `MonadUnliftIO`. [Issue
81− 100](https://github.com/mrkkrp/req/issues/100).
82−
83−## Req 3.4.0
84−
85−* Requests using `DELETE` method can now have a body. [Issue
86− 89](https://github.com/mrkkrp/req/issues/89).
87−
88−* Added the `httpConfigRetryJudgeException` field to `HttpConfig` so that
89− requests that result in exceptions can be retried. [Issue
90− 93](https://github.com/mrkkrp/req/issues/93).
91−
92−* Added the function `renderUrl`. [Issue
93− 83](https://github.com/mrkkrp/req/issues/83).
94−
95−## Req 3.3.0
96−
97−* Derived `Show` instances for response types `IgnoreResponse`,
98− `JsonResponse`, `BsResponse`, and `LbsResponse`.
99−
100−## Req 3.2.0
101−
102−* Made the tests pass with `http-client-0.7` and later.
103−
104−* Added a quasiquoter for URL creation, `urlQ`.
105−
106−## Req 3.1.0
107−
108−* Changed signature of `httpConfigRetryPolicy` to `RetryPolicyM IO`.
109−
110−## Req 3.0.0
111−
112−* Dropped functions `parseUrlHttp`, `parseUrlHttps`, and `parseUrl`. Instead
113− we now have `useHttpURI`, `useHttpsURI`, and `useURI` take `URI`s from
114− `modern-uri` as their argument. You first parse your URL with the
115− `modern-uri` package and then pass it to those functions. This allows us
116− to work with typed URI representations and seamlessly convert them to
117− something `req` can work with. As a side effect basic auth from the `URI`s
118− is now taken into consideration. In the future we may also start to
119− respect fragments if `http-client` starts to support this.
120−
121−* Dropped support for GHC 8.2 and older.
122−
123−## Req 2.1.0
124−
125−* Dropped support for GHC 7.10.
126−
127−* Added the new `acceptHeader` method to the `HttpResponse` type class.
128− Notably, the `jsonResponse` method now sets `"Accept"` header to
129− `"application/json"`.
130−
131−## Req 2.0.1
132−
133−* Fixed the `httpbin` tests (they changed something on the server again).
134−
135−## Req 2.0.0
136−
137−* Got rid of `data-default-class` dependency, now we export
138− `defaultHttpConfig` instead.
139−
140## Req 1.2.1
1## Req 1.2.1
141
2
142* Fixed a typo in the type signature of `parseUrl`.
3* Fixed a typo in the type signature of `parseUrl`.
LICENSE.md+1−1
@@ -1,4 +1,4 @@
1−Copyright © 2016–present Mark Karpov
1+Copyright © 2016–2018 Mark Karpov
2
2
3All rights reserved.
3All rights reserved.
4
4
Network/HTTP/Req.hs+697−1034
@@ -1,16 +1,6 @@
1−{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE LambdaCase #-}
3−{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE QuasiQuotes #-}
5−{-# LANGUAGE RecordWildCards #-}
6−{-# LANGUAGE RoleAnnotations #-}
7−{-# LANGUAGE TemplateHaskellQuotes #-}
8−{-# LANGUAGE TypeFamilies #-}
9−{-# LANGUAGE UndecidableInstances #-}
10−
11-- |
1-- |
12-- Module : Network.HTTP.Req
2-- Module : Network.HTTP.Req
13−-- Copyright : © 2016–present Mark Karpov
3+-- Copyright : © 2016–2018 Mark Karpov
14-- License : BSD 3 clause
4-- License : BSD 3 clause
15--
5--
16-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
6-- Maintainer : Mark Karpov <markkarpov92@gmail.com>
@@ -19,40 +9,61 @@
19--
9--
20-- The documentation below is structured in such a way that the most
10-- The documentation below is structured in such a way that the most
21-- important information is presented first: you learn how to do HTTP
11-- important information is presented first: you learn how to do HTTP
22−-- requests, how to embed them in the monad you have, and then it gives you
12+-- requests, how to embed them in any monad you have, and then it gives you
23-- details about less-common things you may want to know about. The
13-- details about less-common things you may want to know about. The
24-- documentation is written with sufficient coverage of details and
14-- documentation is written with sufficient coverage of details and
25-- examples, and it's designed to be a complete tutorial on its own.
15-- examples, and it's designed to be a complete tutorial on its own.
26--
16--
17+-- /(A modest intro goes here, click on 'req' to start making requests.)/
18+--
27-- === About the library
19-- === About the library
28--
20--
29−-- Req is an HTTP client library that attempts to be easy-to-use, type-safe,
21+-- Req is an easy-to-use, type-safe, expandable, high-level HTTP client
30−-- and expandable.
22+-- library that just works without any fooling around.
31−--
23+--
32−-- “Easy-to-use” means that the library is designed to be beginner-friendly
24+-- What does the phrase “easy-to-use” mean? It means that the library is
33−-- so it's simple to add to your monad stack, intuitive to work with,
25+-- designed to be beginner-friendly so it's simple to add to your monad
34−-- well-documented, and does not get in your way. Doing HTTP requests is a
26+-- stack, intuitive to work with, well-documented, and does not get in your
35−-- common task and a Haskell library for this should be approachable and
27+-- way. Doing HTTP requests is a common task and a Haskell library for this
28+-- should be very approachable and clear to beginners, thus certain
36−-- clear to beginners, thus certain compromises were made. For example, one
29+-- compromises were made. For example, one cannot currently modify
37−-- cannot currently modify 'L.ManagerSettings' of the default manager
30+-- 'L.ManagerSettings' of the default manager because the library always
38−-- because the library always uses the same implicit global manager for
31+-- uses the same implicit global manager for simplicity and maximal
39−-- simplicity and maximal connection sharing. There is a way to use your own
32+-- connection sharing. There is a way to use your own manager with different
40−-- manager with different settings, but it requires more typing.
33+-- settings, but it requires a bit more typing.
41−--
34+--
42−-- “Type-safe” means that the library tries to eliminate certain classes of
35+-- “Type-safe” means that the library is protective and eliminates certain
43−-- errors. For example, we have correct-by-construction URLs; it is
36+-- classes of errors. For example, we have correct-by-construction 'Url's,
44−-- guaranteed that the user does not send the request body when using
37+-- it's 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
38+-- methods like 'GET' or 'OPTIONS', and the amount of implicit assumptions
46−-- minimized by making the user specify their intentions in an explicit
39+-- is minimized by making the user specify his\/her intentions in an
47−-- form. For example, it's not possible to avoid specifying the body or the
40+-- explicit form (for example, it's not possible to avoid specifying the
48−-- method of a request. Authentication methods that assume HTTPS force the
41+-- body or method of a request). Authentication methods that assume HTTPS
49−-- user to use HTTPS at the type level.
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).
50−--
47+--
51−-- “Expandable” refers to the ability to create new components without
48+-- “Expandable” refers to the ability of the library to be expanded without
52−-- having to resort to hacking. For example, it's possible to define your
49+-- having to resort to ugly hacking. For example, it's possible to define
53−-- own HTTP methods, create new ways to construct the body of a request,
50+-- your own HTTP methods, create new ways to construct the body of a
54−-- create new authorization options, perform a request in a different way,
51+-- request, create new authorization options, perform a request in a
55−-- and create your own methods to parse a response.
52+-- different way, and create your own methods to parse and represent a
53+-- response. As a user extends the library to satisfy his\/her special
54+-- needs, the new solutions will work just like the built-ins. However, all
55+-- of the common cases are also covered by the library out-of-the-box.
56+--
57+-- “High-level” means that there are less details to worry about. The
58+-- library is a result of my experiences as a Haskell consultant. Working
59+-- for several clients, who had very different projects, showed me that the
60+-- library should adapt easily to any particular style of writing Haskell
61+-- applications. For example, some people prefer throwing exceptions, while
62+-- others are concerned with purity. Just define 'handleHttpException'
63+-- accordingly when making your monad instance of 'MonadHttp' and it will
64+-- play together seamlessly. Finally, the library cuts boilerplate down
65+-- considerably, and helps you write concise, easy to read, and maintainable
66+-- code.
56--
67--
57-- === Using with other libraries
68-- === Using with other libraries
58--
69--
@@ -76,200 +87,181 @@
76-- the whole Haskell ecosystem uses, there is no risk in using @req@. The
87-- the whole Haskell ecosystem uses, there is no risk in using @req@. The
77-- machinery for performing requests is the same as with @http-conduit@ and
88-- machinery for performing requests is the same as with @http-conduit@ and
78-- @wreq@. The only difference is the API.
89-- @wreq@. The only difference is the API.
90+
91+{-# LANGUAGE BangPatterns #-}
92+{-# LANGUAGE CPP #-}
93+{-# LANGUAGE DataKinds #-}
94+{-# LANGUAGE DeriveDataTypeable #-}
95+{-# LANGUAGE DeriveGeneric #-}
96+{-# LANGUAGE FlexibleInstances #-}
97+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
98+{-# LANGUAGE KindSignatures #-}
99+{-# LANGUAGE MultiParamTypeClasses #-}
100+{-# LANGUAGE OverloadedStrings #-}
101+{-# LANGUAGE RankNTypes #-}
102+{-# LANGUAGE RecordWildCards #-}
103+{-# LANGUAGE ScopedTypeVariables #-}
104+{-# LANGUAGE TypeFamilies #-}
105+
106+#if MIN_VERSION_base(4,9,0)
107+{-# LANGUAGE UndecidableInstances #-}
108+#endif
109+
110+#if __GLASGOW_HASKELL__ >= 800
111+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
112+#endif
113+
79module Network.HTTP.Req
114module Network.HTTP.Req
80 ( -- * Making a request
115 ( -- * Making a request
81 -- $making-a-request
116 -- $making-a-request
82− req,
117+ req
83− reqBr,
118+ , reqBr
84− reqCb,
85− req',
119+ , req'
86− withReqManager,
120+ , withReqManager
87−
88− -- * Embedding requests in your monad
121+ -- * Embedding requests into your monad
89 -- $embedding-requests
122 -- $embedding-requests
90− MonadHttp (..),
123+ , MonadHttp (..)
91− HttpConfig (..),
124+ , HttpConfig (..)
92− defaultHttpConfig,
93− Req,
125+ , Req
94− runReq,
126+ , runReq
95−
96 -- * Request
127 -- * Request
97−
98 -- ** Method
128 -- ** Method
99 -- $method
129 -- $method
100− GET (..),
130+ , GET (..)
101− POST (..),
131+ , POST (..)
102− HEAD (..),
132+ , HEAD (..)
103− PUT (..),
133+ , PUT (..)
104− DELETE (..),
134+ , DELETE (..)
105− TRACE (..),
135+ , TRACE (..)
106− CONNECT (..),
136+ , CONNECT (..)
107− OPTIONS (..),
137+ , OPTIONS (..)
108− PATCH (..),
138+ , PATCH (..)
109− HttpMethod (..),
139+ , HttpMethod (..)
110−
111 -- ** URL
140 -- ** URL
112 -- $url
141 -- $url
113− Url,
142+ , Url
114− http,
143+ , http
115− https,
144+ , https
116− (/~),
145+ , (/~)
117− (/:),
146+ , (/:)
118− useHttpURI,
147+ , parseUrlHttp
119− useHttpsURI,
148+ , parseUrlHttps
120− useURI,
149+ , parseUrl
121− urlQ,
122− renderUrl,
123−
124 -- ** Body
150 -- ** Body
125 -- $body
151 -- $body
126− NoReqBody (..),
152+ , NoReqBody (..)
127− ReqBodyJson (..),
153+ , ReqBodyJson (..)
128− ReqBodyFile (..),
154+ , ReqBodyFile (..)
129− ReqBodyBs (..),
155+ , ReqBodyBs (..)
130− ReqBodyLbs (..),
156+ , ReqBodyLbs (..)
131− ReqBodyUrlEnc (..),
157+ , ReqBodyUrlEnc (..)
132− FormUrlEncodedParam,
158+ , FormUrlEncodedParam
133− ReqBodyMultipart,
159+ , ReqBodyMultipart
134− reqBodyMultipart,
160+ , reqBodyMultipart
135− HttpBody (..),
161+ , HttpBody (..)
136− ProvidesBody,
162+ , ProvidesBody
137− HttpBodyAllowed,
163+ , HttpBodyAllowed
138−
139 -- ** Optional parameters
164 -- ** Optional parameters
140 -- $optional-parameters
165 -- $optional-parameters
141− Option,
166+ , Option
142−
143 -- *** Query parameters
167 -- *** Query parameters
144 -- $query-parameters
168 -- $query-parameters
145− (=:),
169+ , (=:)
146− queryFlag,
170+ , queryFlag
147− formToQuery,
148− QueryParam (..),
171+ , QueryParam (..)
149−
150 -- *** Headers
172 -- *** Headers
151− header,
173+ , header
152− attachHeader,
174+ , attachHeader
153− headerRedacted,
154−
155 -- *** Cookies
175 -- *** Cookies
156 -- $cookies
176 -- $cookies
157− cookieJar,
177+ , cookieJar
158−
159 -- *** Authentication
178 -- *** Authentication
160 -- $authentication
179 -- $authentication
161− basicAuth,
180+ , basicAuth
162− basicAuthUnsafe,
181+ , basicAuthUnsafe
163− basicProxyAuth,
182+ , basicProxyAuth
164− oAuth1,
183+ , oAuth1
165− oAuth2Bearer,
184+ , oAuth2Bearer
166− oAuth2Token,
185+ , oAuth2Token
167− customAuth,
186+ , customAuth
168−
169 -- *** Other
187 -- *** Other
170− port,
188+ , port
171− decompress,
189+ , decompress
172− responseTimeout,
190+ , responseTimeout
173− httpVersion,
191+ , httpVersion
174−
175 -- * Response
192 -- * Response
176−
177 -- ** Response interpretations
193 -- ** Response interpretations
178− IgnoreResponse,
194+ , IgnoreResponse
179− ignoreResponse,
195+ , ignoreResponse
180− JsonResponse,
196+ , JsonResponse
181− jsonResponse,
197+ , jsonResponse
182− BsResponse,
198+ , BsResponse
183− bsResponse,
199+ , bsResponse
184− LbsResponse,
200+ , LbsResponse
185− lbsResponse,
201+ , lbsResponse
186−
187 -- ** Inspecting a response
202 -- ** Inspecting a response
188− responseBody,
203+ , responseBody
189− responseStatusCode,
204+ , responseStatusCode
190− responseStatusMessage,
205+ , responseStatusMessage
191− responseHeader,
206+ , responseHeader
192− responseCookieJar,
207+ , responseCookieJar
193−
194 -- ** Defining your own interpretation
208 -- ** Defining your own interpretation
195 -- $new-response-interpretation
209 -- $new-response-interpretation
196− HttpResponse (..),
210+ , HttpResponse (..)
197−
198 -- * Other
211 -- * Other
199− HttpException (..),
212+ , HttpException (..)
200− isStatusCodeException,
201− CanHaveBody (..),
213+ , CanHaveBody (..)
202− Scheme (..),
214+ , Scheme (..) )
203− )
204where
215where
205
216
206−import Blaze.ByteString.Builder qualified as BB
207import Control.Applicative
217import Control.Applicative
208import Control.Arrow (first, second)
218import Control.Arrow (first, second)
209−import Control.Exception hiding (Handler (..), TypeError)
210−import Control.Monad (guard, void, (>=>))
211import Control.Monad.Base
219import Control.Monad.Base
212−import Control.Monad.Catch (Handler (..), MonadCatch, MonadMask, MonadThrow)
213import Control.Monad.IO.Class
220import Control.Monad.IO.Class
214−import Control.Monad.IO.Unlift
221+import Control.Monad.Reader
215−import Control.Monad.Reader (ReaderT (ReaderT), ask, lift, runReaderT)
216−import Control.Monad.Trans.Accum (AccumT)
217−import Control.Monad.Trans.Cont (ContT)
218import Control.Monad.Trans.Control
222import 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
231import Control.Retry
223import Control.Retry
232−import Data.Aeson (FromJSON (..), ToJSON (..))
224+import Data.Aeson (ToJSON (..), FromJSON (..))
233−import Data.Aeson qualified as A
234import Data.ByteString (ByteString)
225import 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
238import Data.Data (Data)
226import Data.Data (Data)
239−import Data.Default.Class (def)
227+import Data.Default.Class
240import Data.Function (on)
228import Data.Function (on)
241import Data.IORef
229import Data.IORef
242−import Data.Kind (Constraint, Type)
230+import Data.List (nubBy)
243−import Data.List (foldl', nubBy)
244import Data.List.NonEmpty (NonEmpty (..))
231import Data.List.NonEmpty (NonEmpty (..))
245−import Data.List.NonEmpty qualified as NE
246import Data.Maybe (fromMaybe)
232import Data.Maybe (fromMaybe)
247import Data.Proxy
233import Data.Proxy
248−import Data.Semigroup (Endo (..))
234+import Data.Semigroup hiding (Option, option)
249−import Data.Set qualified as S
250import Data.Text (Text)
235import Data.Text (Text)
251−import Data.Text qualified as T
252−import Data.Text.Encoding qualified as T
253−import Data.Typeable (Typeable, cast)
236+import Data.Typeable (Typeable)
254import GHC.Generics
237import GHC.Generics
255import GHC.TypeLits
238import 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
265import System.IO.Unsafe (unsafePerformIO)
239import 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
272import Web.HttpApiData (ToHttpApiData (..))
240import Web.HttpApiData (ToHttpApiData (..))
241+import qualified Blaze.ByteString.Builder as BB
242+import qualified Data.Aeson as A
243+import qualified Data.ByteString as B
244+import qualified Data.ByteString.Lazy as BL
245+import qualified Data.CaseInsensitive as CI
246+import qualified Data.List.NonEmpty as NE
247+import qualified Data.Text as T
248+import qualified Data.Text.Encoding as T
249+import qualified Data.Text.Read as TR
250+import qualified Network.Connection as NC
251+import qualified Network.HTTP.Client as L
252+import qualified Network.HTTP.Client.Internal as LI
253+import qualified Network.HTTP.Client.MultipartFormData as LM
254+import qualified Network.HTTP.Client.TLS as L
255+import qualified Network.HTTP.Types as Y
256+import qualified Web.Authenticate.OAuth as OAuth
257+
258+#if MIN_VERSION_base(4,9,0)
259+import Control.Exception hiding (TypeError)
260+import Data.Kind (Constraint)
261+#else
262+import Control.Exception
263+import GHC.Exts (Constraint)
264+#endif
273
265
274----------------------------------------------------------------------------
266----------------------------------------------------------------------------
275-- Making a request
267-- Making a request
@@ -293,7 +285,7 @@ import Web.HttpApiData (ToHttpApiData (..))
293--
285--
294-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
286-- @body@ is a body option such as 'NoReqBody' or 'ReqBodyJson'. The
295-- tutorial has a section about HTTP bodies, but usage is very
287-- tutorial has a section about HTTP bodies, but usage is very
296−-- straightforward and should be clear from the examples.
288+-- straightforward and should be clear from the examples below.
297--
289--
298-- @response@ is a type hint how to make and interpret response of an HTTP
290-- @response@ is a type hint how to make and interpret response of an HTTP
299-- request. Out-of-the-box it can be the following:
291-- request. Out-of-the-box it can be the following:
@@ -319,7 +311,6 @@ import Web.HttpApiData (ToHttpApiData (..))
319-- First, this is a piece of boilerplate that should be in place before you
311-- First, this is a piece of boilerplate that should be in place before you
320-- try the examples:
312-- try the examples:
321--
313--
322−-- > {-# LANGUAGE DeriveGeneric #-}
323-- > {-# LANGUAGE OverloadedStrings #-}
314-- > {-# LANGUAGE OverloadedStrings #-}
324-- >
315-- >
325-- > module Main (main) where
316-- > module Main (main) where
@@ -327,20 +318,20 @@ import Web.HttpApiData (ToHttpApiData (..))
327-- > import Control.Monad
318-- > import Control.Monad
328-- > import Control.Monad.IO.Class
319-- > import Control.Monad.IO.Class
329-- > import Data.Aeson
320-- > import Data.Aeson
321+-- > import Data.Default.Class
330-- > import Data.Maybe (fromJust)
322-- > import Data.Maybe (fromJust)
331-- > import Data.Monoid ((<>))
323-- > import Data.Monoid ((<>))
332-- > import Data.Text (Text)
324-- > import Data.Text (Text)
333-- > import GHC.Generics
325-- > import GHC.Generics
334-- > import Network.HTTP.Req
326-- > import Network.HTTP.Req
335-- > import qualified Data.ByteString.Char8 as B
327-- > import qualified Data.ByteString.Char8 as B
336−-- > import qualified Text.URI as URI
337--
328--
338-- We will be making requests against the <https://httpbin.org> service.
329-- We will be making requests against the <https://httpbin.org> service.
339--
330--
340-- Make a GET request, grab 5 random bytes:
331-- Make a GET request, grab 5 random bytes:
341--
332--
342-- > main :: IO ()
333-- > main :: IO ()
343−-- > main = runReq defaultHttpConfig $ do
334+-- > main = runReq def $ do
344-- > let n :: Int
335-- > let n :: Int
345-- > n = 5
336-- > n = 5
346-- > bs <- req GET (https "httpbin.org" /: "bytes" /~ n) NoReqBody bsResponse mempty
337-- > bs <- req GET (https "httpbin.org" /: "bytes" /~ n) NoReqBody bsResponse mempty
@@ -350,7 +341,7 @@ import Web.HttpApiData (ToHttpApiData (..))
350-- seed of the generator:
341-- seed of the generator:
351--
342--
352-- > main :: IO ()
343-- > main :: IO ()
353−-- > main = runReq defaultHttpConfig $ do
344+-- > main = runReq def $ do
354-- > let n, seed :: Int
345-- > let n, seed :: Int
355-- > n = 5
346-- > n = 5
356-- > seed = 100
347-- > seed = 100
@@ -369,7 +360,7 @@ import Web.HttpApiData (ToHttpApiData (..))
369-- > instance FromJSON MyData
360-- > instance FromJSON MyData
370-- >
361-- >
371-- > main :: IO ()
362-- > main :: IO ()
372−-- > main = runReq defaultHttpConfig $ do
363+-- > main = runReq def $ do
373-- > let myData = MyData
364-- > let myData = MyData
374-- > { size = 6
365-- > { size = 6
375-- > , color = "Green" }
366-- > , color = "Green" }
@@ -379,7 +370,7 @@ import Web.HttpApiData (ToHttpApiData (..))
379-- Sending URL-encoded body:
370-- Sending URL-encoded body:
380--
371--
381-- > main :: IO ()
372-- > main :: IO ()
382−-- > main = runReq defaultHttpConfig $ do
373+-- > main = runReq def $ do
383-- > let params =
374-- > let params =
384-- > "foo" =: ("bar" :: Text) <>
375-- > "foo" =: ("bar" :: Text) <>
385-- > queryFlag "baz"
376-- > queryFlag "baz"
@@ -389,11 +380,10 @@ import Web.HttpApiData (ToHttpApiData (..))
389-- Using various optional parameters and URL that is not known in advance:
380-- Using various optional parameters and URL that is not known in advance:
390--
381--
391-- > main :: IO ()
382-- > main :: IO ()
392−-- > main = runReq defaultHttpConfig $ do
383+-- > main = runReq def $ do
393-- > -- This is an example of what to do when URL is given dynamically. Of
384-- > -- This is an example of what to do when URL is given dynamically. Of
394-- > -- course in a real application you may not want to use 'fromJust'.
385-- > -- course in a real application you may not want to use 'fromJust'.
395−-- > uri <- URI.mkURI "https://httpbin.org/get?foo=bar"
386+-- > let (url, options) = fromJust (parseUrlHttps "https://httpbin.org/get?foo=bar")
396−-- > let (url, options) = fromJust (useHttpsURI uri)
397-- > response <- req GET url NoReqBody jsonResponse $
387-- > response <- req GET url NoReqBody jsonResponse $
398-- > "from" =: (15 :: Int) <>
388-- > "from" =: (15 :: Int) <>
399-- > "to" =: (67 :: Int) <>
389-- > "to" =: (67 :: Int) <>
@@ -401,138 +391,60 @@ import Web.HttpApiData (ToHttpApiData (..))
401-- > options <> -- contains the ?foo=bar part
391-- > options <> -- contains the ?foo=bar part
402-- > port 443 -- here you can put any port of course
392-- > port 443 -- here you can put any port of course
403-- > liftIO $ print (responseBody response :: Value)
393-- > liftIO $ print (responseBody response :: Value)
394+
404−req ::
395+req
405− ( MonadHttp m,
396+ :: ( MonadHttp m
406− HttpMethod method,
397+ , HttpMethod method
407− HttpBody body,
398+ , HttpBody body
408− HttpResponse response,
399+ , HttpResponse response
409− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
400+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
410− ) =>
411− -- | HTTP method
401+ => method -- ^ HTTP method
412− method ->
413− -- | 'Url'—location of resource
402+ -> Url scheme -- ^ 'Url'—location of resource
414− Url scheme ->
415− -- | Body of the request
403+ -> body -- ^ Body of the request
416− body ->
417− -- | A hint how to interpret response
404+ -> Proxy response -- ^ A hint how to interpret response
418− Proxy response ->
419− -- | Collection of optional parameters
405+ -> Option scheme -- ^ Collection of optional parameters
420− Option scheme ->
421− -- | Response
406+ -> m response -- ^ Response
422− m response
423−req method url body responseProxy options =
407+req method url body Proxy options =
424− reqCb method url body responseProxy options pure
408+ reqBr method url body options getHttpResponse
425
409
426-- | A version of 'req' that does not use one of the predefined instances of
410-- | A version of 'req' that does not use one of the predefined instances of
427-- 'HttpResponse' but instead allows the user to consume @'L.Response'
411-- 'HttpResponse' but instead allows the user to consume @'L.Response'
428-- 'L.BodyReader'@ manually, in a custom way.
412-- 'L.BodyReader'@ manually, in a custom way.
429--
413--
430-- @since 1.0.0
414-- @since 1.0.0
415+
431−reqBr ::
416+reqBr
432− ( MonadHttp m,
417+ :: ( MonadHttp m
433− HttpMethod method,
418+ , HttpMethod method
434− HttpBody body,
419+ , HttpBody body
435− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
420+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
436− ) =>
437− -- | HTTP method
421+ => method -- ^ HTTP method
438− method ->
439− -- | 'Url'—location of resource
422+ -> Url scheme -- ^ 'Url'—location of resource
440− Url scheme ->
441− -- | Body of the request
423+ -> body -- ^ Body of the request
442− body ->
443− -- | Collection of optional parameters
424+ -> Option scheme -- ^ Collection of optional parameters
444− Option scheme ->
445− -- | How to consume response
446− (L.Response L.BodyReader -> IO a) ->
425+ -> (L.Response L.BodyReader -> IO a) -- ^ How to consume response
447− -- | Result
426+ -> m a -- ^ 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
427+reqBr method url body options consume = req' method url body options $ \request manager -> do
479− request' <- adjustRequest request
480− reqHandler getHttpResponse request' manager
481− where
482− extraOptions =
483− case acceptHeader responseProxy of
484− Nothing -> mempty
485− Just accept -> header "Accept" accept
486−
487−-- | The default handler function that the higher-level request functions
488−-- pass to 'req''. Internal function.
489−--
490−-- @since 3.7.0
491−reqHandler ::
492− (MonadHttp m) =>
493− -- | How to get final result from a 'L.Response'
494− (L.Response L.BodyReader -> IO b) ->
495− -- | 'L.Request' to perform
496− L.Request ->
497− -- | 'L.Manager' to use
498− L.Manager ->
499− m b
500−reqHandler consume request manager = do
501− HttpConfig {..} <- getHttpConfig
428+ HttpConfig {..} <- getHttpConfig
502 let wrapVanilla = handle (throwIO . VanillaHttpException)
429 let wrapVanilla = handle (throwIO . VanillaHttpException)
503− wrapExc = handle (throwIO . LI.toHttpException request)
430+ wrapExc = handle (throwIO . LI.toHttpException request)
504− withRRef =
431+ withRRef = bracket
505− bracket
506− (newIORef Nothing)
432+ (newIORef Nothing)
507− (readIORef >=> mapM_ L.responseClose)
433+ (readIORef >=> mapM_ L.responseClose)
508− (liftIO . try . wrapVanilla . wrapExc)
434+ (liftIO . try . wrapVanilla . wrapExc) (withRRef $ \rref -> do
509− ( withRRef $ \rref -> do
510− let openResponse = mask_ $ do
435+ let openResponse = mask_ $ do
511− r <- readIORef rref
436+ r <- readIORef rref
512− mapM_ L.responseClose r
437+ mapM_ L.responseClose r
513− r' <- L.responseOpen request manager
438+ r' <- L.responseOpen request manager
514− writeIORef rref (Just r')
439+ writeIORef rref (Just r')
515− return r'
440+ return r'
516− exceptionRetryPolicies =
517− skipAsyncExceptions
518− ++ [ \retryStatus -> Handler $ \e ->
519− return $ httpConfigRetryJudgeException retryStatus e
520− ]
521− r <-
522− retrying
441+ r <- retrying
523− httpConfigRetryPolicy
442+ httpConfigRetryPolicy
524− (\retryStatus r -> return $ httpConfigRetryJudge retryStatus r)
443+ (\st r -> return $ httpConfigRetryJudge st r)
525− ( const
526− ( recovering
527− httpConfigRetryPolicy
528− exceptionRetryPolicies
529− (const openResponse)
444+ (const openResponse)
530− )
531− )
532− (preview, r') <- grabPreview httpConfigBodyPreviewLength r
445+ (preview, r') <- grabPreview bodyPreviewLength r
533− mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
446+ mapM_ LI.throwHttp (httpConfigCheckResponse request r' preview)
534− consume r'
447+ consume r')
535− )
536 >>= either handleHttpException return
448 >>= either handleHttpException return
537
449
538-- | Mostly like 'req' with respect to its arguments, but accepts a callback
450-- | Mostly like 'req' with respect to its arguments, but accepts a callback
@@ -543,57 +455,51 @@ reqHandler consume request manager = do
543-- 'L.Request' and allows you to use it.
455-- 'L.Request' and allows you to use it.
544--
456--
545-- @since 0.3.0
457-- @since 0.3.0
458+
546−req' ::
459+req'
547− forall m method body scheme a.
460+ :: forall m method body scheme a.
548− ( MonadHttp m,
461+ ( MonadHttp m
549− HttpMethod method,
462+ , HttpMethod method
550− HttpBody body,
463+ , HttpBody body
551− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
464+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
552− ) =>
553− -- | HTTP method
465+ => method -- ^ HTTP method
554− method ->
555− -- | 'Url'—location of resource
466+ -> Url scheme -- ^ 'Url'—location of resource
556− Url scheme ->
557− -- | Body of the request
467+ -> body -- ^ Body of the request
558− body ->
559− -- | Collection of optional parameters
468+ -> Option scheme -- ^ Collection of optional parameters
560− Option scheme ->
561− -- | How to perform request
469+ -> (L.Request -> L.Manager -> m a) -- ^ How to perform request
562− (L.Request -> L.Manager -> m a) ->
563− -- | Result
470+ -> m a -- ^ Result
564− m a
565req' method url body options m = do
471req' method url body options m = do
566− config <- getHttpConfig
472+ config@HttpConfig {..} <- getHttpConfig
567 let -- NOTE First appearance of any given header wins. This allows to
473 let -- NOTE First appearance of any given header wins. This allows to
568 -- “overwrite” headers when we construct a request by cons-ing.
474 -- “overwrite” headers when we construct a request by cons-ing.
569 nubHeaders = Endo $ \x ->
475 nubHeaders = Endo $ \x ->
570− x {L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x)}
476+ x { L.requestHeaders = nubBy ((==) `on` fst) (L.requestHeaders x) }
571− request' =
572− flip appEndo L.defaultRequest $
477+ request' = flip appEndo L.defaultRequest $
573− -- NOTE The order of 'mappend's matters, here method is overwritten
478+ -- NOTE The order of 'mappend's matters, here method is overwritten
574− -- first and 'options' take effect last. In particular, this means
479+ -- first and 'options' take effect last. In particular, this means
575− -- that 'options' can overwrite things set by other request
480+ -- that 'options' can overwrite things set by other request
576− -- components, which is useful for setting port number,
481+ -- components, which is useful for setting port number,
577− -- "Content-Type" header, etc.
482+ -- "Content-Type" header, etc.
578− nubHeaders
483+ nubHeaders <>
579− <> getRequestMod options
484+ getRequestMod options <>
580− <> getRequestMod config
485+ getRequestMod config <>
581− <> getRequestMod (Tagged body :: Tagged "body" body)
486+ getRequestMod (Womb body :: Womb "body" body) <>
582− <> getRequestMod url
487+ getRequestMod url <>
583− <> getRequestMod (Tagged method :: Tagged "method" method)
488+ getRequestMod (Womb method :: Womb "method" method)
584 request <- finalizeRequest options request'
489 request <- finalizeRequest options request'
585 withReqManager (m request)
490 withReqManager (m request)
586
491
587-- | Perform an action using the global implicit 'L.Manager' that the rest
492-- | Perform an action using the global implicit 'L.Manager' that the rest
588−-- of the library uses. This allows us to reuse connections that the
493+-- of the library uses. This allows to reuse connections that the
589-- 'L.Manager' controls.
494-- 'L.Manager' controls.
590−withReqManager :: (MonadIO m) => (L.Manager -> m a) -> m a
591−withReqManager m = m globalManager
592
495
496+withReqManager :: MonadIO m => (L.Manager -> m a) -> m a
497+withReqManager m = liftIO (readIORef globalManager) >>= m
498+
593−-- | The global 'L.Manager' that 'req' uses. Here we just go with the
499+-- | Global 'L.Manager' that 'req' uses. Here we just go with the default
594−-- default settings, so users don't need to deal with this manager stuff at
500+-- settings, so users don't need to deal with this manager stuff at all, but
595−-- all, but when we create a request, instance 'HttpConfig' can affect the
501+-- when we create a request, instance 'HttpConfig' can affect the default
596−-- default settings via 'getHttpConfig'.
502+-- settings via 'getHttpConfig'.
597--
503--
598-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
504-- A note about safety, in case 'unsafePerformIO' looks suspicious to you.
599-- The value of 'globalManager' is named and lives on top level. This means
505-- The value of 'globalManager' is named and lives on top level. This means
@@ -601,20 +507,17 @@ withReqManager m = m globalManager
601-- manager. From that moment on the 'IORef' will be just reused—exactly the
507-- manager. From that moment on the 'IORef' will be just reused—exactly the
602-- behavior we want here in order to maximize connection sharing. GHC could
508-- behavior we want here in order to maximize connection sharing. GHC could
603-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
509-- spoil the plan by inlining the definition, hence the @NOINLINE@ pragma.
510+
604−globalManager :: L.Manager
511+globalManager :: IORef L.Manager
605globalManager = unsafePerformIO $ do
512globalManager = unsafePerformIO $ do
606 context <- NC.initConnectionContext
513 context <- NC.initConnectionContext
607− let settings =
608− L.mkManagerSettingsContext
514+ let settings = L.mkManagerSettingsContext (Just context) def Nothing
609− (Just context)
610− def
611− Nothing
612 manager <- L.newManager settings
515 manager <- L.newManager settings
613− return manager
516+ newIORef manager
614{-# NOINLINE globalManager #-}
517{-# NOINLINE globalManager #-}
615
518
616----------------------------------------------------------------------------
519----------------------------------------------------------------------------
617−-- Embedding requests in your monad
520+-- Embedding requests into your monad
618
521
619-- $embedding-requests
522-- $embedding-requests
620--
523--
@@ -623,44 +526,56 @@ globalManager = unsafePerformIO $ do
623--
526--
624-- When writing a library, keep your API polymorphic in terms of
527-- When writing a library, keep your API polymorphic in terms of
625-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
528-- 'MonadHttp', only define instance of 'MonadHttp' in final application.
626−-- Another option is to use a @newtype@-wrapped monad stack and define
529+-- Another option is to use @newtype@ wrapped monad stack and define
627−-- 'MonadHttp' for it. As of the version /0.4.0/, the 'Req' monad that
530+-- 'MonadHttp' for it. As of version /0.4.0/, the 'Req' monad that follows
628−-- follows this strategy is provided out-of-the-box (see below).
531+-- this strategy is provided out-of-the-box (see below).
629
532
630-- | A type class for monads that support performing HTTP requests.
533-- | A type class for monads that support performing HTTP requests.
631-- Typically, you only need to define the 'handleHttpException' method
534-- Typically, you only need to define the 'handleHttpException' method
632-- unless you want to tweak 'HttpConfig'.
535-- unless you want to tweak 'HttpConfig'.
536+
633−class (MonadIO m) => MonadHttp m where
537+class MonadIO m => MonadHttp m where
538+
634 -- | This method describes how to deal with 'HttpException' that was
539 -- | This method describes how to deal with 'HttpException' that was
635 -- caught by the library. One option is to re-throw it if you are OK with
540 -- caught by the library. One option is to re-throw it if you are OK with
636 -- exceptions, but if you prefer working with something like
541 -- exceptions, but if you prefer working with something like
637 -- 'Control.Monad.Except.MonadError', this is the right place to pass it to
542 -- 'Control.Monad.Except.MonadError', this is the right place to pass it to
638 -- 'Control.Monad.Except.throwError'.
543 -- 'Control.Monad.Except.throwError'.
544+
639 handleHttpException :: HttpException -> m a
545 handleHttpException :: HttpException -> m a
640
546
641− -- | Return the 'HttpConfig' to be used when performing HTTP requests.
547+ -- | Return 'HttpConfig' to be used when performing HTTP requests. Default
642− -- Default implementation returns its 'def' value, which is described in
548+ -- implementation returns its 'def' value, which is described in the
643− -- the documentation for the type. Common usage pattern with manually
549+ -- documentation for the type. Common usage pattern with manually defined
644− -- defined 'getHttpConfig' is to return some hard-coded value, or a value
550+ -- 'getHttpConfig' is to return some hard-coded value, or a value
645 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
551 -- extracted from 'Control.Monad.Reader.MonadReader' if a more flexible
646 -- approach to configuration is desirable.
552 -- approach to configuration is desirable.
553+
647 getHttpConfig :: m HttpConfig
554 getHttpConfig :: m HttpConfig
648− getHttpConfig = return defaultHttpConfig
555+ getHttpConfig = return def
556+
557+-- | 'HttpConfig' contains general and default settings to be used when
558+-- making HTTP requests.
649
559
650−-- | 'HttpConfig' contains settings to be used when making HTTP requests.
651data HttpConfig = HttpConfig
560data HttpConfig = HttpConfig
561+ { httpConfigProxy :: Maybe L.Proxy
652− { -- | Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
562+ -- ^ Proxy to use. By default values of @HTTP_PROXY@ and @HTTPS_PROXY@
653 -- environment variables are respected, this setting overwrites them.
563 -- environment variables are respected, this setting overwrites them.
654 -- Default value: 'Nothing'.
564 -- Default value: 'Nothing'.
655− httpConfigProxy :: Maybe L.Proxy,
565+ , httpConfigRedirectCount :: Int
656− -- | How many redirects to follow when getting a resource. Default
566+ -- ^ How many redirects to follow when getting a resource. Default
657 -- value: 10.
567 -- value: 10.
658− httpConfigRedirectCount :: Int,
568+ , httpConfigAltManager :: Maybe L.Manager
659− -- | Alternative 'L.Manager' to use. 'Nothing' (default value) means
569+ -- ^ Alternative 'L.Manager' to use. 'Nothing' (default value) means
660 -- that the default implicit manager will be used (that's what you want
570 -- that the default implicit manager will be used (that's what you want
661 -- in 99% of cases).
571 -- in 99% of cases).
662− httpConfigAltManager :: Maybe L.Manager,
572+ , httpConfigCheckResponse
573+ :: forall b.
574+ L.Request
575+ -> L.Response b
576+ -> ByteString
577+ -> Maybe L.HttpExceptionContent
663− -- | Function to check the response immediately after receiving the
578+ -- ^ Function to check the response immediately after receiving the
664 -- status and headers, before streaming of response body. The third
579 -- status and headers, before streaming of response body. The third
665 -- argument is the beginning of response body (typically first 1024
580 -- argument is the beginning of response body (typically first 1024
666 -- bytes). This is used for throwing exceptions on non-success status
581 -- bytes). This is used for throwing exceptions on non-success status
@@ -682,106 +597,63 @@ data HttpConfig = HttpConfig
682 -- /1.0.0/.
597 -- /1.0.0/.
683 --
598 --
684 -- @since 0.3.0
599 -- @since 0.3.0
685− httpConfigCheckResponse ::
600+ , httpConfigRetryPolicy :: RetryPolicy
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
601+ -- ^ The retry policy to use for request retrying. By default 'def' is
692 -- used (see 'RetryPolicyM').
602 -- used (see 'RetryPolicyM').
693 --
603 --
694− -- __Note__: signature of this function was changed to disallow 'IO' in
604+ -- __Note__: signature of this function was changed in the version
695− -- version /1.0.0/ and then changed back to its current form in /3.1.0/.
605+ -- /1.0.0/.
696 --
606 --
697 -- @since 0.3.0
607 -- @since 0.3.0
698− httpConfigRetryPolicy :: RetryPolicyM IO,
608+ , httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool
699− -- | The function is used to decide whether to retry a request. 'True'
609+ -- ^ The function is used to decide whether to retry a request. 'True'
700 -- means that the request should be retried.
610 -- means that the request should be retried.
701 --
611 --
702 -- __Note__: signature of this function was changed in the version
612 -- __Note__: signature of this function was changed in the version
703 -- /1.0.0/.
613 -- /1.0.0/.
704 --
614 --
705 -- @since 0.3.0
615 -- @since 0.3.0
706− httpConfigRetryJudge :: forall b. RetryStatus -> L.Response b -> Bool,
616+ } deriving Typeable
707− -- | Similar to 'httpConfigRetryJudge', but is used to decide when to
617+
708− -- retry requests that resulted in an exception. By default it retries
618+instance Default HttpConfig where
709− -- on response timeout and connection timeout (changed in version
710− -- /3.8.0/).
711− --
712− -- @since 3.4.0
713− httpConfigRetryJudgeException :: RetryStatus -> SomeException -> Bool,
714− -- | Max length of preview fragment of response body.
715− --
716− -- @since 3.6.0
717− httpConfigBodyPreviewLength :: forall a. (Num a) => a
718− }
719−
720−-- | The default value of 'HttpConfig'.
721−--
722−-- @since 2.0.0
723−defaultHttpConfig :: HttpConfig
724−defaultHttpConfig =
725− HttpConfig
619+ def = HttpConfig
726− { httpConfigProxy = Nothing,
620+ { httpConfigProxy = Nothing
727− httpConfigRedirectCount = 10,
621+ , httpConfigRedirectCount = 10
728− httpConfigAltManager = Nothing,
622+ , httpConfigAltManager = Nothing
729− httpConfigCheckResponse = \_ response preview ->
623+ , httpConfigCheckResponse = \_ response preview ->
730 let scode = statusCode response
624 let scode = statusCode response
731− in if 200 <= scode && scode < 300
625+ in if 200 <= scode && scode < 300
732− then Nothing
626+ then Nothing
733− else Just (L.StatusCodeException (void response) preview),
627+ else Just (L.StatusCodeException (void response) preview)
734− httpConfigRetryPolicy = retryPolicyDefault,
628+ , httpConfigRetryPolicy = def
735− httpConfigRetryJudge = \_ response ->
629+ , httpConfigRetryJudge = \_ response ->
736− statusCode response
630+ statusCode response `elem`
737− `elem` [ 408, -- Request timeout
631+ [ 408 -- Request timeout
738− 504, -- Gateway timeout
632+ , 504 -- Gateway timeout
739− 524, -- A timeout occurred
633+ , 524 -- A timeout occurred
740− 598, -- (Informal convention) Network read timeout error
634+ , 598 -- (Informal convention) Network read timeout error
741− 599 -- (Informal convention) Network connect timeout error
635+ , 599 -- (Informal convention) Network connect timeout error
742− ],
636+ ]
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 }
637 }
753− where
638+ where
754− statusCode = Y.statusCode . L.responseStatus
639+ statusCode = Y.statusCode . L.responseStatus
755
640
756instance RequestComponent HttpConfig where
641instance RequestComponent HttpConfig where
757 getRequestMod HttpConfig {..} = Endo $ \x ->
642 getRequestMod HttpConfig {..} = Endo $ \x ->
758− x
759− { L.proxy = httpConfigProxy,
643+ x { L.proxy = httpConfigProxy
760− L.redirectCount = httpConfigRedirectCount,
644+ , L.redirectCount = httpConfigRedirectCount
761− LI.requestManagerOverride = httpConfigAltManager
645+ , LI.requestManagerOverride = httpConfigAltManager }
762− }
763
646
764−-- | A monad that allows us to run 'req' in any 'IO'-enabled monad without
647+-- | A monad that allows to run 'req' in any 'IO'-enabled monad without
765-- having to define new instances.
648-- having to define new instances.
766--
649--
767-- @since 0.4.0
650-- @since 0.4.0
768−newtype Req a = Req (ReaderT HttpConfig IO a)
769− deriving
770− ( Functor,
771− Applicative,
772− Monad,
773− MonadIO,
774− MonadUnliftIO
775− )
776−
777−-- | @since 3.7.0
778−deriving instance MonadThrow Req
779−
780−-- | @since 3.7.0
781−deriving instance MonadCatch Req
782
651
783−-- | @since 3.7.0
652+newtype Req a = Req (ReaderT HttpConfig IO a)
784−deriving instance MonadMask Req
653+ deriving ( Functor
654+ , Applicative
655+ , Monad
656+ , MonadIO )
785
657
786instance MonadBase IO Req where
658instance MonadBase IO Req where
787 liftBase = liftIO
659 liftBase = liftIO
@@ -790,99 +662,22 @@ instance MonadBaseControl IO Req where
790 type StM Req a = a
662 type StM Req a = a
791 liftBaseWith f = Req . ReaderT $ \r -> f (runReq r)
663 liftBaseWith f = Req . ReaderT $ \r -> f (runReq r)
792 {-# INLINEABLE liftBaseWith #-}
664 {-# INLINEABLE liftBaseWith #-}
793− restoreM = Req . ReaderT . const . return
665+ restoreM = Req . ReaderT . const . return
794 {-# INLINEABLE restoreM #-}
666 {-# INLINEABLE restoreM #-}
795
667
796instance MonadHttp Req where
668instance MonadHttp Req where
797 handleHttpException = Req . lift . throwIO
669 handleHttpException = Req . lift . throwIO
798− getHttpConfig = Req ask
670+ 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
874
671
875-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
672-- | Run a computation in the 'Req' monad with the given 'HttpConfig'. In
876−-- the case of an exceptional situation an 'HttpException' will be thrown.
673+-- case of exceptional situation an 'HttpException' will be thrown.
877--
674--
878-- @since 0.4.0
675-- @since 0.4.0
879−runReq ::
676+
880− (MonadIO m) =>
677+runReq :: MonadIO m
881− -- | 'HttpConfig' to use
678+ => HttpConfig -- ^ 'HttpConfig' to use
882− HttpConfig ->
883− -- | Computation to run
679+ -> Req a -- ^ Computation to run
884− Req a ->
885− m a
680+ -> m a
886runReq config (Req m) = liftIO (runReaderT m config)
681runReq config (Req m) = liftIO (runReaderT m config)
887
682
888----------------------------------------------------------------------------
683----------------------------------------------------------------------------
@@ -898,6 +693,7 @@ runReq config (Req m) = liftIO (runReaderT m config)
898-- define a new method that will works seamlessly, see 'HttpMethod'.
693-- define a new method that will works seamlessly, see 'HttpMethod'.
899
694
900-- | 'GET' method.
695-- | 'GET' method.
696+
901data GET = GET
697data GET = GET
902
698
903instance HttpMethod GET where
699instance HttpMethod GET where
@@ -905,6 +701,7 @@ instance HttpMethod GET where
905 httpMethodName Proxy = Y.methodGet
701 httpMethodName Proxy = Y.methodGet
906
702
907-- | 'POST' method.
703-- | 'POST' method.
704+
908data POST = POST
705data POST = POST
909
706
910instance HttpMethod POST where
707instance HttpMethod POST where
@@ -912,6 +709,7 @@ instance HttpMethod POST where
912 httpMethodName Proxy = Y.methodPost
709 httpMethodName Proxy = Y.methodPost
913
710
914-- | 'HEAD' method.
711-- | 'HEAD' method.
712+
915data HEAD = HEAD
713data HEAD = HEAD
916
714
917instance HttpMethod HEAD where
715instance HttpMethod HEAD where
@@ -919,24 +717,26 @@ instance HttpMethod HEAD where
919 httpMethodName Proxy = Y.methodHead
717 httpMethodName Proxy = Y.methodHead
920
718
921-- | 'PUT' method.
719-- | 'PUT' method.
720+
922data PUT = PUT
721data PUT = PUT
923
722
924instance HttpMethod PUT where
723instance HttpMethod PUT where
925 type AllowsBody PUT = 'CanHaveBody
724 type AllowsBody PUT = 'CanHaveBody
926 httpMethodName Proxy = Y.methodPut
725 httpMethodName Proxy = Y.methodPut
927
726
928−-- | 'DELETE' method. RFC 7231 allows a payload in DELETE but without
727+-- | 'DELETE' method. This data type does not allow having request body with
929−-- semantics.
728+-- 'DELETE' requests, as it should be. However some APIs may expect 'DELETE'
930−--
729+-- requests to have bodies, in that case define your own variation of
931−-- __Note__: before version /3.4.0/ this method did not allow request
730+-- 'DELETE' method and allow it to have a body.
932−-- bodies.
731+
933data DELETE = DELETE
732data DELETE = DELETE
934
733
935instance HttpMethod DELETE where
734instance HttpMethod DELETE where
936− type AllowsBody DELETE = 'CanHaveBody
735+ type AllowsBody DELETE = 'NoBody
937 httpMethodName Proxy = Y.methodDelete
736 httpMethodName Proxy = Y.methodDelete
938
737
939-- | 'TRACE' method.
738-- | 'TRACE' method.
739+
940data TRACE = TRACE
740data TRACE = TRACE
941
741
942instance HttpMethod TRACE where
742instance HttpMethod TRACE where
@@ -944,6 +744,7 @@ instance HttpMethod TRACE where
944 httpMethodName Proxy = Y.methodTrace
744 httpMethodName Proxy = Y.methodTrace
945
745
946-- | 'CONNECT' method.
746-- | 'CONNECT' method.
747+
947data CONNECT = CONNECT
748data CONNECT = CONNECT
948
749
949instance HttpMethod CONNECT where
750instance HttpMethod CONNECT where
@@ -951,6 +752,7 @@ instance HttpMethod CONNECT where
951 httpMethodName Proxy = Y.methodConnect
752 httpMethodName Proxy = Y.methodConnect
952
753
953-- | 'OPTIONS' method.
754-- | 'OPTIONS' method.
755+
954data OPTIONS = OPTIONS
756data OPTIONS = OPTIONS
955
757
956instance HttpMethod OPTIONS where
758instance HttpMethod OPTIONS where
@@ -958,6 +760,7 @@ instance HttpMethod OPTIONS where
958 httpMethodName Proxy = Y.methodOptions
760 httpMethodName Proxy = Y.methodOptions
959
761
960-- | 'PATCH' method.
762-- | 'PATCH' method.
763+
961data PATCH = PATCH
764data PATCH = PATCH
962
765
963instance HttpMethod PATCH where
766instance HttpMethod PATCH where
@@ -972,19 +775,23 @@ instance HttpMethod PATCH where
972-- > instance HttpMethod COPY where
775-- > instance HttpMethod COPY where
973-- > type AllowsBody COPY = 'CanHaveBody
776-- > type AllowsBody COPY = 'CanHaveBody
974-- > httpMethodName Proxy = "COPY"
777-- > httpMethodName Proxy = "COPY"
778+
975class HttpMethod a where
779class HttpMethod a where
780+
976 -- | Type function 'AllowsBody' returns a type of kind 'CanHaveBody' which
781 -- | Type function 'AllowsBody' returns a type of kind 'CanHaveBody' which
977− -- tells the rest of the library whether the method can have body or not.
782+ -- tells the rest of the library whether the method can have a body or
978− -- We use the special type 'CanHaveBody' lifted to the kind level instead
783+ -- not. We use the special type 'CanHaveBody' lifted to the kind level
979− -- of 'Bool' to get more user-friendly compiler messages.
784+ -- instead of 'Bool' to get more user-friendly compiler messages.
785+
980 type AllowsBody a :: CanHaveBody
786 type AllowsBody a :: CanHaveBody
981
787
982 -- | Return name of the method as a 'ByteString'.
788 -- | Return name of the method as a 'ByteString'.
789+
983 httpMethodName :: Proxy a -> ByteString
790 httpMethodName :: Proxy a -> ByteString
984
791
985−instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
792+instance HttpMethod method => RequestComponent (Womb "method" method) where
986 getRequestMod _ = Endo $ \x ->
793 getRequestMod _ = Endo $ \x ->
987− x {L.method = httpMethodName (Proxy :: Proxy method)}
794+ x { L.method = httpMethodName (Proxy :: Proxy method) }
988
795
989----------------------------------------------------------------------------
796----------------------------------------------------------------------------
990-- Request—URL
797-- Request—URL
@@ -992,7 +799,8 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
992-- $url
799-- $url
993--
800--
994-- We use 'Url's which are correct by construction, see 'Url'. To build a
801-- We use 'Url's which are correct by construction, see 'Url'. To build a
995−-- 'Url' from a 'URI', use 'useHttpURI', 'useHttpsURI', or generic 'useURI'.
802+-- 'Url' from a 'ByteString', use 'parseUrlHttp', 'parseUrlHttps', or
803+-- generic 'parseUrl'.
996
804
997-- | Request's 'Url'. Start constructing your 'Url' with 'http' or 'https'
805-- | Request's 'Url'. Start constructing your 'Url' with 'http' or 'https'
998-- specifying the scheme and host at the same time. Then use the @('/~')@
806-- specifying the scheme and host at the same time. Then use the @('/~')@
@@ -1022,194 +830,101 @@ instance (HttpMethod method) => RequestComponent (Tagged "method" method) where
1022--
830--
1023-- > https "юникод.рф"
831-- > https "юникод.рф"
1024-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
832-- > -- https://%D1%8E%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4.%D1%80%D1%84
833+
1025data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
834data Url (scheme :: Scheme) = Url Scheme (NonEmpty Text)
1026 -- NOTE The second value is the path segments in reversed order.
835 -- NOTE The second value is the path segments in reversed order.
1027− deriving (Eq, Ord, Show, Data, Generic)
836+ deriving (Eq, Ord, Show, Data, Typeable, 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
1041
837
1042−-- | Given host name, produce a 'Url' which has “http” as its scheme and
838+-- | Given host name, produce a 'Url' which have “http” as its scheme and
1043-- empty path. This also sets port to @80@.
839-- empty path. This also sets port to @80@.
840+
1044http :: Text -> Url 'Http
841http :: Text -> Url 'Http
1045http = Url Http . pure
842http = Url Http . pure
1046
843
1047−-- | Given host name, produce a 'Url' which has “https” as its scheme and
844+-- | Given host name, produce a 'Url' which have “https” as its scheme and
1048-- empty path. This also sets port to @443@.
845-- empty path. This also sets port to @443@.
846+
1049https :: Text -> Url 'Https
847https :: Text -> Url 'Https
1050https = Url Https . pure
848https = Url Https . pure
1051
849
1052−-- | Grow a given 'Url' appending a single path segment to it. Note that the
850+-- | Grow given 'Url' appending a single path segment to it. Note that the
1053-- path segment can be of any type that is an instance of 'ToHttpApiData'.
851-- path segment can be of any type that is an instance of 'ToHttpApiData'.
1054−infixl 5 /~
1055
852
853+infixl 5 /~
1056−(/~) :: (ToHttpApiData a) => Url scheme -> a -> Url scheme
854+(/~) :: ToHttpApiData a => Url scheme -> a -> Url scheme
1057Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
855Url secure path /~ segment = Url secure (NE.cons (toUrlPiece segment) path)
1058
856
1059−-- | A type-constrained version of @('/~')@ to remove ambiguity in the cases
857+-- | Type-constrained version of @('/~')@ to remove ambiguity in the cases
1060−-- when next URL piece is a 'Data.Text.Text' literal.
858+-- when next URL piece is a 'Text' literal.
1061−infixl 5 /:
1062
859
860+infixl 5 /:
1063(/:) :: Url scheme -> Text -> Url scheme
861(/:) :: Url scheme -> Text -> Url scheme
1064(/:) = (/~)
862(/:) = (/~)
1065
863
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'
864+-- | The 'parseUrlHttp' function provides an alternative method to get 'Url'
1080−-- (possibly with some 'Option's) from a 'URI'. This is useful when you are
865+-- (possibly with some 'Option's) from a 'ByteString'. This is useful when
1081−-- given a URL to query dynamically and don't know it beforehand.
866+-- you are given a URL to query dynamically and don't know it beforehand.
1082−--
867+-- The function parses 'ByteString' because it's the correct type to
1083−-- This function expects the scheme to be “http” and host to be present.
868+-- represent a URL, as 'Url' cannot contain characters outside of ASCII
1084−--
869+-- range, thus we can consider every character a 'Data.Word.Word8' value.
1085−-- @since 3.0.0
870+--
871+-- This function only parses 'Url' (scheme, host, path) and optional query
872+-- parameters that are returned as 'Option'. It does not parse method name
873+-- or authentication info from given 'ByteString'.
874+
1086−useHttpURI :: URI -> Maybe (Url 'Http, Option scheme)
875+parseUrlHttp :: ByteString -> Maybe (Url 'Http, Option scheme)
1087−useHttpURI uri = do
876+parseUrlHttp url' = do
1088− guard (URI.uriScheme uri == Just [QQ.scheme|http|])
877+ url <- B.stripPrefix "http://" url'
1089− urlHead <- http <$> uriHost uri
878+ (host :| path, option) <- parseUrlHelper url
1090− let url = case URI.uriPath uri of
879+ return (foldl (/:) (http host) path, option)
1091− Nothing -> urlHead
880+
1092− Just uriPath -> uriPathToUrl uriPath urlHead
1093− return (url, uriOptions uri)
1094−
1095−-- | Just like 'useHttpURI', but expects the “https” scheme.
881+-- | Just like 'parseUrlHttp', but expects “https” scheme.
1096−--
882+
1097−-- @since 3.0.0
1098−useHttpsURI :: URI -> Maybe (Url 'Https, Option scheme)
883+parseUrlHttps :: ByteString -> Maybe (Url 'Https, Option scheme)
1099−useHttpsURI uri = do
884+parseUrlHttps url' = do
1100− guard (URI.uriScheme uri == Just [QQ.scheme|https|])
885+ url <- B.stripPrefix "https://" url'
1101− urlHead <- https <$> uriHost uri
886+ (host :| path, option) <- parseUrlHelper url
1102− let url = case URI.uriPath uri of
887+ return (foldl (/:) (https host) path, option)
1103− Nothing -> urlHead
888+
1104− Just uriPath -> uriPathToUrl uriPath urlHead
889+-- | A more general URI parsing function that can be used when scheme is not
1105− return (url, uriOptions uri)
890+-- known beforehand.
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−--
891+--
1122−-- @since 3.0.0
892+-- @since 1.2.1
1123−useURI ::
893+
1124− URI ->
894+parseUrl
1125− Maybe
895+ :: ByteString
1126− ( Either
1127− (Url 'Http, Option scheme0)
1128− (Url 'Https, Option scheme1)
896+ -> Maybe (Either (Url 'Http, Option scheme0) (Url 'Https, Option scheme1))
1129− )
897+parseUrl url = Left <$> parseUrlHttp url <|> Right <$> parseUrlHttps url
1130−useURI uri =
898+
1131− (Left <$> useHttpURI uri) <|> (Right <$> useHttpsURI uri)
899+-- | Get host\/collection of path pieces and possibly query parameters
1132−
900+-- already converted to 'Option'. This function is not public.
1133−-- | An internal helper function to extract host from a 'URI'.
901+
1134−uriHost :: URI -> Maybe Text
902+parseUrlHelper :: ByteString -> Maybe (NonEmpty Text, Option scheme)
1135−uriHost uri = case URI.uriAuthority uri of
903+parseUrlHelper url = do
1136− Left _ -> Nothing
904+ let (path', query') = B.break (== 0x3f) url
1137− Right URI.Authority {..} ->
905+ query = mconcat (uncurry queryParam <$> Y.parseQueryText query')
1138− Just (URI.unRText authHost)
906+ p' :| ps <- NE.nonEmpty (Y.decodePathSegments path')
1139−
907+ (p, port') <-
1140−-- | A quasiquoter to build an 'Url' and 'Option' tuple. The type of the
908+ case T.break (== ':') p' of
1141−-- generated expression is @('Url' scheme0, 'Option' scheme1)@ with
909+ (x, "") -> return (x, mempty)
1142−-- @scheme0@ being either 'Http' or 'Https' depending on the input.
910+ (x, prt) ->
1143−--
911+ case TR.decimal (T.drop 1 prt) of
1144−-- @since 3.2.0
912+ Right (prt',"") -> return (x, port prt')
1145−urlQ :: TH.QuasiQuoter
913+ _ -> Nothing
1146−urlQ =
914+ return (p :| ps, query <> port')
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'')
1198
915
1199instance RequestComponent (Url scheme) where
916instance RequestComponent (Url scheme) where
1200 getRequestMod (Url scheme segments) = Endo $ \x ->
917 getRequestMod (Url scheme segments) = Endo $ \x ->
1201− let (host :| path) = NE.reverse segments
918+ let (host :| path) = NE.reverse segments in
1202− in x
1203− { L.secure = case scheme of
919+ x { L.secure = case scheme of
1204− Http -> False
920+ Http -> False
1205− Https -> True,
921+ Https -> True
1206− L.port = case scheme of
922+ , L.port = case scheme of
1207− Http -> 80
923+ Http -> 80
1208− Https -> 443,
924+ Https -> 443
1209− L.host = Y.urlEncode False (T.encodeUtf8 host),
925+ , L.host = Y.urlEncode False (T.encodeUtf8 host)
1210− L.path =
926+ , L.path =
1211− (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path
927+ (BL.toStrict . BB.toLazyByteString . Y.encodePathSegments) path }
1212− }
1213
928
1214----------------------------------------------------------------------------
929----------------------------------------------------------------------------
1215-- Request—Body
930-- Request—Body
@@ -1218,37 +933,39 @@ instance RequestComponent (Url scheme) where
1218--
933--
1219-- A number of options for request bodies are available. The @Content-Type@
934-- A number of options for request bodies are available. The @Content-Type@
1220-- header is set for you automatically according to the body option you use
935-- header is set for you automatically according to the body option you use
1221−-- (it's always specified in the documentation for a given body option). To
936+-- (it's always specified in documentation for a given body option). To add
1222−-- add your own way to represent request body, define an instance of
937+-- your own way to represent request body, define an instance of 'HttpBody'.
1223−-- 'HttpBody'.
1224
938
1225-- | This data type represents empty body of an HTTP request. This is the
939-- | This data type represents empty body of an HTTP request. This is the
1226-- data type to use with 'HttpMethod's that cannot have a body, as it's the
940-- data type to use with 'HttpMethod's that cannot have a body, as it's the
1227-- only type for which 'ProvidesBody' returns 'NoBody'.
941-- only type for which 'ProvidesBody' returns 'NoBody'.
1228--
942--
1229-- Using of this body option does not set the @Content-Type@ header.
943-- Using of this body option does not set the @Content-Type@ header.
944+
1230data NoReqBody = NoReqBody
945data NoReqBody = NoReqBody
1231
946
1232instance HttpBody NoReqBody where
947instance HttpBody NoReqBody where
1233 getRequestBody NoReqBody = L.RequestBodyBS B.empty
948 getRequestBody NoReqBody = L.RequestBodyBS B.empty
1234
949
1235−-- | This body option allows us to use a JSON object as the request
950+-- | This body option allows to use a JSON object as request body—probably
1236−-- body—probably the most popular format right now. Just wrap a data type
951+-- the most popular format right now. Just wrap a data type that is an
1237−-- that is an instance of 'ToJSON' type class and you are done: it will be
952+-- instance of 'ToJSON' type class and you are done: it will be converted to
1238−-- converted to JSON and inserted as request body.
953+-- JSON and inserted as request body.
1239--
954--
1240-- This body option sets the @Content-Type@ header to @\"application/json;
955-- This body option sets the @Content-Type@ header to @\"application/json;
1241-- charset=utf-8\"@ value.
956-- charset=utf-8\"@ value.
957+
1242newtype ReqBodyJson a = ReqBodyJson a
958newtype ReqBodyJson a = ReqBodyJson a
1243
959
1244−instance (ToJSON a) => HttpBody (ReqBodyJson a) where
960+instance ToJSON a => HttpBody (ReqBodyJson a) where
1245 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
961 getRequestBody (ReqBodyJson a) = L.RequestBodyLBS (A.encode a)
1246 getRequestContentType _ = pure "application/json; charset=utf-8"
962 getRequestContentType _ = pure "application/json; charset=utf-8"
1247
963
1248-- | This body option streams request body from a file. It is expected that
964-- | This body option streams request body from a file. It is expected that
1249−-- the file size does not change during streaming.
965+-- the file size does not change during the streaming.
1250--
966--
1251-- Using of this body option does not set the @Content-Type@ header.
967-- Using of this body option does not set the @Content-Type@ header.
968+
1252newtype ReqBodyFile = ReqBodyFile FilePath
969newtype ReqBodyFile = ReqBodyFile FilePath
1253
970
1254instance HttpBody ReqBodyFile where
971instance HttpBody ReqBodyFile where
@@ -1258,6 +975,7 @@ instance HttpBody ReqBodyFile where
1258-- | HTTP request body represented by a strict 'ByteString'.
975-- | HTTP request body represented by a strict 'ByteString'.
1259--
976--
1260-- Using of this body option does not set the @Content-Type@ header.
977-- Using of this body option does not set the @Content-Type@ header.
978+
1261newtype ReqBodyBs = ReqBodyBs ByteString
979newtype ReqBodyBs = ReqBodyBs ByteString
1262
980
1263instance HttpBody ReqBodyBs where
981instance HttpBody ReqBodyBs where
@@ -1266,19 +984,22 @@ instance HttpBody ReqBodyBs where
1266-- | HTTP request body represented by a lazy 'BL.ByteString'.
984-- | HTTP request body represented by a lazy 'BL.ByteString'.
1267--
985--
1268-- Using of this body option does not set the @Content-Type@ header.
986-- Using of this body option does not set the @Content-Type@ header.
987+
1269newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
988newtype ReqBodyLbs = ReqBodyLbs BL.ByteString
1270
989
1271instance HttpBody ReqBodyLbs where
990instance HttpBody ReqBodyLbs where
1272 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
991 getRequestBody (ReqBodyLbs bs) = L.RequestBodyLBS bs
1273
992
1274−-- | URL-encoded body. This can hold a collection of parameters which are
993+-- | Form URL-encoded body. This can hold a collection of parameters which
1275−-- encoded similarly to query parameters at the end of query string, with
994+-- are encoded similarly to query parameters at the end of query string,
1276−-- the only difference that they are stored in request body. The similarity
995+-- with the only difference that they are stored in request body. The
1277−-- is reflected in the API as well, as you can use the same combinators you
996+-- similarity is reflected in the API as well, as you can use the same
1278−-- would use to add query parameters: @('=:')@ and 'queryFlag'.
997+-- combinators you would use to add query parameters: @('=:')@ and
998+-- 'queryFlag'.
1279--
999--
1280-- This body option sets the @Content-Type@ header to
1000-- This body option sets the @Content-Type@ header to
1281-- @\"application/x-www-form-urlencoded\"@ value.
1001-- @\"application/x-www-form-urlencoded\"@ value.
1002+
1282newtype ReqBodyUrlEnc = ReqBodyUrlEnc FormUrlEncodedParam
1003newtype ReqBodyUrlEnc = ReqBodyUrlEnc FormUrlEncodedParam
1283
1004
1284instance HttpBody ReqBodyUrlEnc where
1005instance HttpBody ReqBodyUrlEnc where
@@ -1288,19 +1009,13 @@ instance HttpBody ReqBodyUrlEnc where
1288
1009
1289-- | An opaque monoidal value that allows to collect URL-encoded parameters
1010-- | An opaque monoidal value that allows to collect URL-encoded parameters
1290-- to be wrapped in 'ReqBodyUrlEnc'.
1011-- to be wrapped in 'ReqBodyUrlEnc'.
1012+
1291newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
1013newtype FormUrlEncodedParam = FormUrlEncodedParam [(Text, Maybe Text)]
1292 deriving (Semigroup, Monoid)
1014 deriving (Semigroup, Monoid)
1293
1015
1294instance QueryParam FormUrlEncodedParam where
1016instance QueryParam FormUrlEncodedParam where
1295 queryParam name mvalue =
1017 queryParam name mvalue =
1296 FormUrlEncodedParam [(name, toQueryParam <$> mvalue)]
1018 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
1304
1019
1305-- | Multipart form data. Please consult the
1020-- | Multipart form data. Please consult the
1306-- "Network.HTTP.Client.MultipartFormData" module for how to construct
1021-- "Network.HTTP.Client.MultipartFormData" module for how to construct
@@ -1330,6 +1045,7 @@ instance FromForm FormUrlEncodedParam where
1330-- > bsResponse
1045-- > bsResponse
1331-- > mempty
1046-- > mempty
1332-- > liftIO $ print (responseBody response)
1047-- > liftIO $ print (responseBody response)
1048+
1333data ReqBodyMultipart = ReqBodyMultipart ByteString LI.RequestBody
1049data ReqBodyMultipart = ReqBodyMultipart ByteString LI.RequestBody
1334
1050
1335instance HttpBody ReqBodyMultipart where
1051instance HttpBody ReqBodyMultipart where
@@ -1340,64 +1056,70 @@ instance HttpBody ReqBodyMultipart where
1340-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
1056-- | Create 'ReqBodyMultipart' request body from a collection of 'LM.Part's.
1341--
1057--
1342-- @since 0.2.0
1058-- @since 0.2.0
1059+
1343−reqBodyMultipart :: (MonadIO m) => [LM.Part] -> m ReqBodyMultipart
1060+reqBodyMultipart :: MonadIO m => [LM.Part] -> m ReqBodyMultipart
1344reqBodyMultipart parts = liftIO $ do
1061reqBodyMultipart parts = liftIO $ do
1345 boundary <- LM.webkitBoundary
1062 boundary <- LM.webkitBoundary
1346− body <- LM.renderParts boundary parts
1063+ body <- LM.renderParts boundary parts
1347 return (ReqBodyMultipart boundary body)
1064 return (ReqBodyMultipart boundary body)
1348
1065
1349-- | A type class for things that can be interpreted as an HTTP
1066-- | A type class for things that can be interpreted as an HTTP
1350-- 'L.RequestBody'.
1067-- 'L.RequestBody'.
1068+
1351class HttpBody body where
1069class HttpBody body where
1070+
1352 -- | How to get actual 'L.RequestBody'.
1071 -- | How to get actual 'L.RequestBody'.
1072+
1353 getRequestBody :: body -> L.RequestBody
1073 getRequestBody :: body -> L.RequestBody
1354
1074
1355− -- | This method allows us to optionally specify the value of
1075+ -- | This method allows to optionally specify value of @Content-Type@
1356− -- @Content-Type@ header that should be used with particular body option.
1076+ -- header that should be used with particular body option. By default it
1357− -- By default it returns 'Nothing' and so @Content-Type@ is not set.
1077+ -- returns 'Nothing' and so @Content-Type@ is not set.
1078+
1358 getRequestContentType :: body -> Maybe ByteString
1079 getRequestContentType :: body -> Maybe ByteString
1359 getRequestContentType = const Nothing
1080 getRequestContentType = const Nothing
1360
1081
1361-- | The type function recognizes 'NoReqBody' as having 'NoBody', while any
1082-- | The type function recognizes 'NoReqBody' as having 'NoBody', while any
1362−-- other body option 'CanHaveBody'. This forces the user to use 'NoReqBody'
1083+-- other body option 'CanHaveBody'. This forces user to use 'NoReqBody' with
1363−-- with 'GET' method and other methods that should not have body.
1084+-- 'GET' method and other methods that should not send a body.
1085+
1364type family ProvidesBody body :: CanHaveBody where
1086type family ProvidesBody body :: CanHaveBody where
1365 ProvidesBody NoReqBody = 'NoBody
1087 ProvidesBody NoReqBody = 'NoBody
1366− ProvidesBody body = 'CanHaveBody
1088+ ProvidesBody body = 'CanHaveBody
1367
1089
1368-- | This type function allows any HTTP body if method says it
1090-- | This type function allows any HTTP body if method says it
1369-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
1091-- 'CanHaveBody'. When the method says it should have 'NoBody', the only
1370-- body option to use is 'NoReqBody'.
1092-- body option to use is 'NoReqBody'.
1371−type family
1093+--
1094+-- __Note__: users of GHC 8.0.1 and later will see a slightly more friendly
1095+-- error message when method does not allow a body and body is provided.
1096+
1372− HttpBodyAllowed
1097+type family HttpBodyAllowed
1373− (allowsBody :: CanHaveBody)
1098+ (allowsBody :: CanHaveBody)
1374− (providesBody :: CanHaveBody) ::
1099+ (providesBody :: CanHaveBody) :: Constraint where
1375− Constraint
1376− where
1377− HttpBodyAllowed 'NoBody 'NoBody = ()
1100+ HttpBodyAllowed 'NoBody 'NoBody = ()
1378− HttpBodyAllowed 'CanHaveBody body = ()
1101+ HttpBodyAllowed 'CanHaveBody body = ()
1102+#if MIN_VERSION_base(4,9,0)
1379− HttpBodyAllowed 'NoBody 'CanHaveBody =
1103+ HttpBodyAllowed 'NoBody 'CanHaveBody = TypeError
1380− TypeError
1381− ('Text "This HTTP method does not allow attaching a request body.")
1104+ ('Text "This HTTP method does not allow attaching a request body.")
1382−
1105+#endif
1106+
1383−instance (HttpBody body) => RequestComponent (Tagged "body" body) where
1107+instance HttpBody body => RequestComponent (Womb "body" body) where
1384− getRequestMod (Tagged body) = Endo $ \x ->
1108+ getRequestMod (Womb body) = Endo $ \x ->
1385− x
1386− { L.requestBody = getRequestBody body,
1109+ x { L.requestBody = getRequestBody body
1387− L.requestHeaders =
1110+ , L.requestHeaders =
1388− let old = L.requestHeaders x
1111+ let old = L.requestHeaders x in
1389− in case getRequestContentType body of
1112+ case getRequestContentType body of
1390− Nothing -> old
1113+ Nothing -> old
1391− Just contentType ->
1114+ Just contentType ->
1392− (Y.hContentType, contentType) : old
1115+ (Y.hContentType, contentType) : old }
1393− }
1394
1116
1395----------------------------------------------------------------------------
1117----------------------------------------------------------------------------
1396-- Request—Optional parameters
1118-- Request—Optional parameters
1397
1119
1398-- $optional-parameters
1120-- $optional-parameters
1399--
1121--
1400−-- Optional parameters of request include things like query parameters,
1122+-- Optional parameters to a request include things like query parameters,
1401-- headers, port number, etc. All optional parameters have the type
1123-- headers, port number, etc. All optional parameters have the type
1402-- 'Option', which is a 'Monoid'. This means that you can use 'mempty' as
1124-- 'Option', which is a 'Monoid'. This means that you can use 'mempty' as
1403-- the last argument of 'req' to specify no optional parameters, or combine
1125-- the last argument of 'req' to specify no optional parameters, or combine
@@ -1406,51 +1128,46 @@ instance (HttpBody body) => RequestComponent (Tagged "body" body) where
1406-- | The opaque 'Option' type is a 'Monoid' you can use to pack collection
1128-- | The opaque 'Option' type is a 'Monoid' you can use to pack collection
1407-- of optional parameters like query parameters and headers. See sections
1129-- of optional parameters like query parameters and headers. See sections
1408-- below to learn which 'Option' primitives are available.
1130-- 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))
1411
1131
1132+data Option (scheme :: Scheme) =
1133+ Option (Endo (Y.QueryText, L.Request)) (Maybe (L.Request -> IO L.Request))
1412−-- NOTE 'QueryText' is just [(Text, Maybe Text)], we keep it along with
1134+ -- 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
1135+ -- Request to avoid appending to existing query string in request every
1414−-- time new parameter is added. The additional Maybe (L.Request -> IO
1136+ -- time new parameter is added. Additional Maybe (L.Request -> IO
1415−-- L.Request) is a finalizer that will be applied after all other
1137+ -- L.Request) is a finalizer that will be applied after all other
1416−-- transformations. This is for authentication methods that sign requests
1138+ -- transformations. This is for authentication methods that sign requests
1417−-- based on data in Request.
1139+ -- based on data in Request.
1418
1140
1419instance Semigroup (Option scheme) where
1141instance Semigroup (Option scheme) where
1420− Option er0 mr0 <> Option er1 mr1 =
1142+ Option er0 mr0 <> Option er1 mr1 = Option
1421− Option
1422− (er0 <> er1)
1143+ (er0 <> er1) (mr0 <|> mr1)
1423− (mr0 <|> mr1)
1424
1144
1425instance Monoid (Option scheme) where
1145instance Monoid (Option scheme) where
1426− mempty = Option mempty Nothing
1146+ mempty = Option mempty Nothing
1427 mappend = (<>)
1147 mappend = (<>)
1428
1148
1429−-- | Use 'formToQuery'.
1430−--
1431−-- @since 3.11.0
1432−instance FromForm (Option scheme) where
1433− fromForm = Right . formToQuery
1434−
1435-- | A helper to create an 'Option' that modifies only collection of query
1149-- | A helper to create an 'Option' that modifies only collection of query
1436-- parameters. This helper is not a part of the public API.
1150-- parameters. This helper is not a part of the public API.
1151+
1437withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
1152withQueryParams :: (Y.QueryText -> Y.QueryText) -> Option scheme
1438withQueryParams f = Option (Endo (first f)) Nothing
1153withQueryParams f = Option (Endo (first f)) Nothing
1439
1154
1440-- | A helper to create an 'Option' that modifies only 'L.Request'. This
1155-- | A helper to create an 'Option' that modifies only 'L.Request'. This
1441-- helper is not a part of public API.
1156-- helper is not a part of public API.
1157+
1442withRequest :: (L.Request -> L.Request) -> Option scheme
1158withRequest :: (L.Request -> L.Request) -> Option scheme
1443withRequest f = Option (Endo (second f)) Nothing
1159withRequest f = Option (Endo (second f)) Nothing
1444
1160
1445instance RequestComponent (Option scheme) where
1161instance RequestComponent (Option scheme) where
1446 getRequestMod (Option f _) = Endo $ \x ->
1162 getRequestMod (Option f _) = Endo $ \x ->
1447 let (qparams, x') = appEndo f ([], x)
1163 let (qparams, x') = appEndo f ([], x)
1448− query = Y.renderQuery True (Y.queryTextToQuery qparams)
1164+ query = Y.renderQuery True (Y.queryTextToQuery qparams)
1449− in x' {L.queryString = query}
1165+ in x' { L.queryString = query }
1450
1166
1451-- | Finalize given 'L.Request' by applying a finalizer from the given
1167-- | Finalize given 'L.Request' by applying a finalizer from the given
1452-- 'Option' (if it has any).
1168-- 'Option' (if it has any).
1169+
1453−finalizeRequest :: (MonadIO m) => Option scheme -> L.Request -> m L.Request
1170+finalizeRequest :: MonadIO m => Option scheme -> L.Request -> m L.Request
1454finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1171finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1455
1172
1456----------------------------------------------------------------------------
1173----------------------------------------------------------------------------
@@ -1469,12 +1186,12 @@ finalizeRequest (Option _ mfinalizer) = liftIO . fromMaybe pure mfinalizer
1469-- This operator is defined in terms of 'queryParam':
1186-- This operator is defined in terms of 'queryParam':
1470--
1187--
1471-- > name =: value = queryParam name (pure value)
1188-- > name =: value = queryParam name (pure value)
1472−infix 7 =:
1473
1189
1190+infix 7 =:
1474(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
1191(=:) :: (QueryParam param, ToHttpApiData a) => Text -> a -> param
1475name =: value = queryParam name (pure value)
1192name =: value = queryParam name (pure value)
1476
1193
1477−-- | Construct a flag, that is, a valueless query parameter. For example, in
1194+-- | Construct a flag, that is, valueless query parameter. For example, in
1478-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
1195-- the following URL @\"a\"@ is a flag, while @\"b\"@ is a query parameter
1479-- with a value:
1196-- with a value:
1480--
1197--
@@ -1483,47 +1200,27 @@ name =: value = queryParam name (pure value)
1483-- This operator is defined in terms of 'queryParam':
1200-- This operator is defined in terms of 'queryParam':
1484--
1201--
1485-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1202-- > queryFlag name = queryParam name (Nothing :: Maybe ())
1486−queryFlag :: (QueryParam param) => Text -> param
1487−queryFlag name = queryParam name (Nothing :: Maybe ())
1488
1203
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
1204+queryFlag :: QueryParam param => Text -> param
1499−formToQuery f = mconcat . fmap toParam . Form.toListStable $ toForm f
1205+queryFlag name = queryParam name (Nothing :: Maybe ())
1500− where
1501− toParam (key, val) =
1502− queryParam key $
1503− if val == ""
1504− then Nothing
1505− else Just val
1506
1206
1507-- | A type class for query-parameter-like things. The reason to have an
1207-- | A type class for query-parameter-like things. The reason to have an
1508-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
1208-- overloaded 'queryParam' is to be able to use it as an 'Option' and as a
1509-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
1209-- 'FormUrlEncodedParam' when constructing form URL encoded request bodies.
1510-- Having the same syntax for these cases seems natural and user-friendly.
1210-- Having the same syntax for these cases seems natural and user-friendly.
1211+
1511class QueryParam param where
1212class QueryParam param where
1213+
1512 -- | Create a query parameter with given name and value. If value is
1214 -- | Create a query parameter with given name and value. If value is
1513 -- 'Nothing', it won't be included at all (i.e. you create a flag this
1215 -- 'Nothing', it won't be included at all (i.e. you create a flag this
1514 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
1216 -- way). It's recommended to use @('=:')@ and 'queryFlag' instead of this
1515 -- method, because they are easier to read.
1217 -- method, because they are easier to read.
1516− queryParam :: (ToHttpApiData a) => Text -> Maybe a -> param
1517
1218
1518− -- | Get the query parameter names and values set by 'queryParam'.
1219+ queryParam :: ToHttpApiData a => Text -> Maybe a -> param
1519− --
1520− -- @since 3.11.0
1521− queryParamToList :: param -> [(Text, Maybe Text)]
1522
1220
1523instance QueryParam (Option scheme) where
1221instance QueryParam (Option scheme) where
1524 queryParam name mvalue =
1222 queryParam name mvalue =
1525 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1223 withQueryParams ((:) (name, toQueryParam <$> mvalue))
1526− queryParamToList (Option f _) = fst $ appEndo f ([], L.defaultRequest)
1527
1224
1528----------------------------------------------------------------------------
1225----------------------------------------------------------------------------
1529-- Request—Optional parameters—Headers
1226-- Request—Optional parameters—Headers
@@ -1532,28 +1229,21 @@ instance QueryParam (Option scheme) where
1532-- headers with the same names the leftmost header will win. This means, in
1229-- headers with the same names the leftmost header will win. This means, in
1533-- particular, that you cannot create a request with several headers of the
1230-- particular, that you cannot create a request with several headers of the
1534-- same name.
1231-- same name.
1232+
1535−header ::
1233+header
1536− -- | Header name
1234+ :: ByteString -- ^ Header name
1537− ByteString ->
1538− -- | Header value
1235+ -> ByteString -- ^ Header value
1539− ByteString ->
1540− Option scheme
1236+ -> Option scheme
1541header name value = withRequest (attachHeader name value)
1237header name value = withRequest (attachHeader name value)
1542
1238
1543−-- | Attach a header with given name and content to a 'L.Request'.
1239+-- | A non-public helper that attaches a header with given name and content
1240+-- to a 'L.Request'.
1544--
1241--
1545-- @since 1.1.0
1242-- @since 1.1.0
1243+
1546attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
1244attachHeader :: ByteString -> ByteString -> L.Request -> L.Request
1547attachHeader name value x =
1245attachHeader name value x =
1548− x {L.requestHeaders = (CI.mk name, value) : L.requestHeaders x}
1246+ 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}
1557
1247
1558----------------------------------------------------------------------------
1248----------------------------------------------------------------------------
1559-- Request—Optional parameters—Cookies
1249-- Request—Optional parameters—Cookies
@@ -1566,9 +1256,10 @@ headerRedacted name value = withRequest $ \x ->
1566
1256
1567-- | Use the given 'L.CookieJar'. A 'L.CookieJar' can be obtained from a
1257-- | Use the given 'L.CookieJar'. A 'L.CookieJar' can be obtained from a
1568-- 'L.Response' record.
1258-- 'L.Response' record.
1259+
1569cookieJar :: L.CookieJar -> Option scheme
1260cookieJar :: L.CookieJar -> Option scheme
1570cookieJar jar = withRequest $ \x ->
1261cookieJar jar = withRequest $ \x ->
1571− x {L.cookieJar = Just jar}
1262+ x { L.cookieJar = Just jar }
1572
1263
1573----------------------------------------------------------------------------
1264----------------------------------------------------------------------------
1574-- Request—Optional parameters—Authentication
1265-- Request—Optional parameters—Authentication
@@ -1586,66 +1277,53 @@ cookieJar jar = withRequest $ \x ->
1586-- | The 'Option' adds basic authentication.
1277-- | The 'Option' adds basic authentication.
1587--
1278--
1588-- See also: <https://en.wikipedia.org/wiki/Basic_access_authentication>.
1279-- See also: <https://en.wikipedia.org/wiki/Basic_access_authentication>.
1280+
1589−basicAuth ::
1281+basicAuth
1590− -- | Username
1282+ :: ByteString -- ^ Username
1591− ByteString ->
1592− -- | Password
1283+ -> ByteString -- ^ Password
1593− ByteString ->
1594− -- | Auth 'Option'
1595− Option 'Https
1284+ -> Option 'Https -- ^ Auth 'Option'
1596basicAuth = basicAuthUnsafe
1285basicAuth = basicAuthUnsafe
1597
1286
1598-- | An alternative to 'basicAuth' which works for any scheme. Note that
1287-- | An alternative to 'basicAuth' which works for any scheme. Note that
1599−-- using basic access authentication without SSL\/TLS is vulnerable to
1288+-- using basic access authentication without SSL/TLS is vulnerable to
1600-- attacks. Use 'basicAuth' instead unless you know what you are doing.
1289-- attacks. Use 'basicAuth' instead unless you know what you are doing.
1601--
1290--
1602-- @since 0.3.1
1291-- @since 0.3.1
1292+
1603−basicAuthUnsafe ::
1293+basicAuthUnsafe
1604− -- | Username
1294+ :: ByteString -- ^ Username
1605− ByteString ->
1606− -- | Password
1295+ -> ByteString -- ^ Password
1607− ByteString ->
1608− -- | Auth 'Option'
1296+ -> Option scheme -- ^ Auth 'Option'
1609− Option scheme
1610−basicAuthUnsafe username password =
1297+basicAuthUnsafe username password = customAuth
1611− customAuth
1612− (pure . L.applyBasicAuth username password)
1298+ (pure . L.applyBasicAuth username password)
1613
1299
1614-- | The 'Option' set basic proxy authentication header.
1300-- | The 'Option' set basic proxy authentication header.
1615--
1301--
1616-- @since 1.1.0
1302-- @since 1.1.0
1303+
1617−basicProxyAuth ::
1304+basicProxyAuth
1618− -- | Username
1305+ :: ByteString -- ^ Username
1619− ByteString ->
1620− -- | Password
1306+ -> ByteString -- ^ Password
1621− ByteString ->
1622− -- | Auth 'Option'
1623− Option scheme
1307+ -> Option scheme -- ^ Auth 'Option'
1624basicProxyAuth username password =
1308basicProxyAuth username password =
1625 withRequest (L.applyBasicProxyAuth username password)
1309 withRequest (L.applyBasicProxyAuth username password)
1626
1310
1627-- | The 'Option' adds OAuth1 authentication.
1311-- | The 'Option' adds OAuth1 authentication.
1628--
1312--
1629-- @since 0.2.0
1313-- @since 0.2.0
1314+
1630−oAuth1 ::
1315+oAuth1
1631− -- | Consumer token
1316+ :: ByteString -- ^ Consumer token
1632− ByteString ->
1633− -- | Consumer secret
1317+ -> ByteString -- ^ Consumer secret
1634− ByteString ->
1318+ -> ByteString -- ^ OAuth token
1635− -- | OAuth token
1636− ByteString ->
1637− -- | OAuth token secret
1319+ -> ByteString -- ^ OAuth token secret
1638− ByteString ->
1639− -- | Auth 'Option'
1640− Option scheme
1320+ -> Option scheme -- ^ Auth 'Option'
1641oAuth1 consumerToken consumerSecret token tokenSecret =
1321oAuth1 consumerToken consumerSecret token tokenSecret =
1642 customAuth (OAuth.signOAuth app creds)
1322 customAuth (OAuth.signOAuth app creds)
1643 where
1323 where
1644− app =
1645− OAuth.newOAuth
1324+ app = OAuth.newOAuth
1646− { OAuth.oauthConsumerKey = consumerToken,
1325+ { OAuth.oauthConsumerKey = consumerToken
1647− OAuth.oauthConsumerSecret = consumerSecret
1326+ , OAuth.oauthConsumerSecret = consumerSecret }
1648− }
1649 creds = OAuth.newCredential token tokenSecret
1327 creds = OAuth.newCredential token tokenSecret
1650
1328
1651-- | The 'Option' adds an OAuth2 bearer token. This is treated by many
1329-- | The 'Option' adds an OAuth2 bearer token. This is treated by many
@@ -1656,14 +1334,12 @@ oAuth1 consumerToken consumerSecret token tokenSecret =
1656-- > oAuth2Bearer token = header "Authorization" ("Bearer " <> token)
1334-- > oAuth2Bearer token = header "Authorization" ("Bearer " <> token)
1657--
1335--
1658-- See also: <https://en.wikipedia.org/wiki/OAuth>.
1336-- See also: <https://en.wikipedia.org/wiki/OAuth>.
1337+
1659−oAuth2Bearer ::
1338+oAuth2Bearer
1660− -- | Token
1339+ :: ByteString -- ^ Token
1661− ByteString ->
1662− -- | Auth 'Option'
1663− Option 'Https
1340+ -> Option 'Https -- ^ Auth 'Option'
1664−oAuth2Bearer token =
1341+oAuth2Bearer token = customAuth
1665− customAuth
1666− (pure . attachHeader "Authorization" ("Bearer " <> token))
1342+ (pure . attachHeader "Authorization" ("Bearer " <> token))
1667
1343
1668-- | The 'Option' adds a not-quite-standard OAuth2 bearer token (that seems
1344-- | The 'Option' adds a not-quite-standard OAuth2 bearer token (that seems
1669-- to be used only by GitHub). This will be treated by whatever services
1345-- to be used only by GitHub). This will be treated by whatever services
@@ -1674,20 +1350,19 @@ oAuth2Bearer token =
1674-- > oAuth2Token token = header "Authorization" ("token" <> token)
1350-- > oAuth2Token token = header "Authorization" ("token" <> token)
1675--
1351--
1676-- See also: <https://developer.github.com/v3/oauth#3-use-the-access-token-to-access-the-api>.
1352-- See also: <https://developer.github.com/v3/oauth#3-use-the-access-token-to-access-the-api>.
1353+
1677−oAuth2Token ::
1354+oAuth2Token
1678− -- | Token
1355+ :: ByteString -- ^ Token
1679− ByteString ->
1680− -- | Auth 'Option'
1681− Option 'Https
1356+ -> Option 'Https -- ^ Auth 'Option'
1682−oAuth2Token token =
1357+oAuth2Token token = customAuth
1683− customAuth
1684− (pure . attachHeader "Authorization" ("token " <> token))
1358+ (pure . attachHeader "Authorization" ("token " <> token))
1685
1359
1686-- | A helper to create custom authentication 'Option's. The given
1360-- | A helper to create custom authentication 'Option's. The given
1687-- 'IO'-enabled request transformation is applied after all other
1361-- 'IO'-enabled request transformation is applied after all other
1688-- modifications when constructing a request. Use wisely.
1362-- modifications when constructing a request. Use wisely.
1689--
1363--
1690-- @since 1.1.0
1364-- @since 1.1.0
1365+
1691customAuth :: (L.Request -> IO L.Request) -> Option scheme
1366customAuth :: (L.Request -> IO L.Request) -> Option scheme
1692customAuth = Option mempty . pure
1367customAuth = Option mempty . pure
1693
1368
@@ -1696,10 +1371,11 @@ customAuth = Option mempty . pure
1696
1371
1697-- | Specify the port to connect to explicitly. Normally, 'Url' you use
1372-- | Specify the port to connect to explicitly. Normally, 'Url' you use
1698-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1373-- determines the default port: @80@ for HTTP and @443@ for HTTPS. This
1699−-- 'Option' allows us to choose an arbitrary port overwriting the defaults.
1374+-- 'Option' allows to choose an arbitrary port overwriting the defaults.
1375+
1700port :: Int -> Option scheme
1376port :: Int -> Option scheme
1701port n = withRequest $ \x ->
1377port n = withRequest $ \x ->
1702− x {L.port = n}
1378+ x { L.port = n }
1703
1379
1704-- | This 'Option' controls whether gzipped data should be decompressed on
1380-- | This 'Option' controls whether gzipped data should be decompressed on
1705-- the fly. By default everything except for @\"application\/x-tar\"@ is
1381-- the fly. By default everything except for @\"application\/x-tar\"@ is
@@ -1710,40 +1386,39 @@ port n = withRequest $ \x ->
1710-- You can also choose to decompress everything like this:
1386-- You can also choose to decompress everything like this:
1711--
1387--
1712-- > decompress (const True)
1388-- > decompress (const True)
1389+
1713−decompress ::
1390+decompress
1714− -- | Predicate that is given MIME type, it returns 'True' when content
1391+ :: (ByteString -> Bool) -- ^ Predicate that is given MIME type, it
1715− -- should be decompressed on the fly.
1392+ -- returns 'True' when content should be decompressed on the fly.
1716− (ByteString -> Bool) ->
1717− Option scheme
1393+ -> Option scheme
1718decompress f = withRequest $ \x ->
1394decompress f = withRequest $ \x ->
1719− x {L.decompress = f}
1395+ x { L.decompress = f }
1720
1396
1721-- | Specify the number of microseconds to wait for response. The default
1397-- | Specify the number of microseconds to wait for response. The default
1722-- value is 30 seconds (defined in 'L.ManagerSettings' of connection
1398-- value is 30 seconds (defined in 'L.ManagerSettings' of connection
1723-- 'L.Manager').
1399-- 'L.Manager').
1400+
1724−responseTimeout ::
1401+responseTimeout
1725− -- | Number of microseconds to wait
1402+ :: Int -- ^ Number of microseconds to wait
1726− Int ->
1727− Option scheme
1403+ -> Option scheme
1728responseTimeout n = withRequest $ \x ->
1404responseTimeout n = withRequest $ \x ->
1729− x {L.responseTimeout = LI.ResponseTimeoutMicro n}
1405+ x { L.responseTimeout = LI.ResponseTimeoutMicro n }
1730
1406
1731-- | HTTP version to send to the server, the default is HTTP 1.1.
1407-- | HTTP version to send to the server, the default is HTTP 1.1.
1408+
1732−httpVersion ::
1409+httpVersion
1733− -- | Major version number
1410+ :: Int -- ^ Major version number
1734− Int ->
1735− -- | Minor version number
1411+ -> Int -- ^ Minor version number
1736− Int ->
1737− Option scheme
1412+ -> Option scheme
1738httpVersion major minor = withRequest $ \x ->
1413httpVersion major minor = withRequest $ \x ->
1739− x {L.requestVersion = Y.HttpVersion major minor}
1414+ x { L.requestVersion = Y.HttpVersion major minor }
1740
1415
1741----------------------------------------------------------------------------
1416----------------------------------------------------------------------------
1742-- Response interpretations
1417-- Response interpretations
1743
1418
1744-- | Make a request and ignore the body of the response.
1419-- | Make a request and ignore the body of the response.
1420+
1745newtype IgnoreResponse = IgnoreResponse (L.Response ())
1421newtype IgnoreResponse = IgnoreResponse (L.Response ())
1746− deriving (Show)
1747
1422
1748instance HttpResponse IgnoreResponse where
1423instance HttpResponse IgnoreResponse where
1749 type HttpResponseBody IgnoreResponse = ()
1424 type HttpResponseBody IgnoreResponse = ()
@@ -1752,6 +1427,7 @@ instance HttpResponse IgnoreResponse where
1752
1427
1753-- | Use this as the fourth argument of 'req' to specify that you want it to
1428-- | Use this as the fourth argument of 'req' to specify that you want it to
1754-- ignore the response body.
1429-- ignore the response body.
1430+
1755ignoreResponse :: Proxy IgnoreResponse
1431ignoreResponse :: Proxy IgnoreResponse
1756ignoreResponse = Proxy
1432ignoreResponse = Proxy
1757
1433
@@ -1759,28 +1435,28 @@ ignoreResponse = Proxy
1759-- 'handleHttpException' method of 'MonadHttp' instance corresponding to
1435-- 'handleHttpException' method of 'MonadHttp' instance corresponding to
1760-- monad in which you use 'req' will determine what to do in the case when
1436-- monad in which you use 'req' will determine what to do in the case when
1761-- parsing fails (the 'JsonHttpException' constructor will be used).
1437-- parsing fails (the 'JsonHttpException' constructor will be used).
1438+
1762newtype JsonResponse a = JsonResponse (L.Response a)
1439newtype JsonResponse a = JsonResponse (L.Response a)
1763− deriving (Show)
1764
1440
1765−instance (FromJSON a) => HttpResponse (JsonResponse a) where
1441+instance FromJSON a => HttpResponse (JsonResponse a) where
1766 type HttpResponseBody (JsonResponse a) = a
1442 type HttpResponseBody (JsonResponse a) = a
1767 toVanillaResponse (JsonResponse r) = r
1443 toVanillaResponse (JsonResponse r) = r
1768 getHttpResponse r = do
1444 getHttpResponse r = do
1769 chunks <- L.brConsume (L.responseBody r)
1445 chunks <- L.brConsume (L.responseBody r)
1770 case A.eitherDecode (BL.fromChunks chunks) of
1446 case A.eitherDecode (BL.fromChunks chunks) of
1771− Left e -> throwIO (JsonHttpException e)
1447+ Left e -> throwIO (JsonHttpException e)
1772 Right x -> return $ JsonResponse (x <$ r)
1448 Right x -> return $ JsonResponse (x <$ r)
1773− acceptHeader Proxy = Just "application/json"
1774
1449
1775-- | Use this as the fourth argument of 'req' to specify that you want it to
1450-- | Use this as the fourth argument of 'req' to specify that you want it to
1776-- return the 'JsonResponse' interpretation.
1451-- return the 'JsonResponse' interpretation.
1452+
1777jsonResponse :: Proxy (JsonResponse a)
1453jsonResponse :: Proxy (JsonResponse a)
1778jsonResponse = Proxy
1454jsonResponse = Proxy
1779
1455
1780-- | Make a request and interpret the body of the response as a strict
1456-- | Make a request and interpret the body of the response as a strict
1781-- 'ByteString'.
1457-- 'ByteString'.
1458+
1782newtype BsResponse = BsResponse (L.Response ByteString)
1459newtype BsResponse = BsResponse (L.Response ByteString)
1783− deriving (Show)
1784
1460
1785instance HttpResponse BsResponse where
1461instance HttpResponse BsResponse where
1786 type HttpResponseBody BsResponse = ByteString
1462 type HttpResponseBody BsResponse = ByteString
@@ -1791,13 +1467,14 @@ instance HttpResponse BsResponse where
1791
1467
1792-- | Use this as the fourth argument of 'req' to specify that you want to
1468-- | Use this as the fourth argument of 'req' to specify that you want to
1793-- interpret the response body as a strict 'ByteString'.
1469-- interpret the response body as a strict 'ByteString'.
1470+
1794bsResponse :: Proxy BsResponse
1471bsResponse :: Proxy BsResponse
1795bsResponse = Proxy
1472bsResponse = Proxy
1796
1473
1797-- | Make a request and interpret the body of the response as a lazy
1474-- | Make a request and interpret the body of the response as a lazy
1798-- 'BL.ByteString'.
1475-- 'BL.ByteString'.
1476+
1799newtype LbsResponse = LbsResponse (L.Response BL.ByteString)
1477newtype LbsResponse = LbsResponse (L.Response BL.ByteString)
1800− deriving (Show)
1801
1478
1802instance HttpResponse LbsResponse where
1479instance HttpResponse LbsResponse where
1803 type HttpResponseBody LbsResponse = BL.ByteString
1480 type HttpResponseBody LbsResponse = BL.ByteString
@@ -1808,22 +1485,24 @@ instance HttpResponse LbsResponse where
1808
1485
1809-- | Use this as the fourth argument of 'req' to specify that you want to
1486-- | Use this as the fourth argument of 'req' to specify that you want to
1810-- interpret the response body as a lazy 'BL.ByteString'.
1487-- interpret the response body as a lazy 'BL.ByteString'.
1488+
1811lbsResponse :: Proxy LbsResponse
1489lbsResponse :: Proxy LbsResponse
1812lbsResponse = Proxy
1490lbsResponse = Proxy
1813
1491
1814----------------------------------------------------------------------------
1492----------------------------------------------------------------------------
1815-- Helpers for response interpretations
1493-- Helpers for response interpretations
1816
1494
1817−-- | Fetch beginning of the response and return it together with a new
1495+-- | Fetch beginning of response and return it together with new
1818-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
1496-- @'L.Response' 'L.BodyReader'@ that can be passed to 'getHttpResponse' and
1819-- such.
1497-- such.
1498+
1820−grabPreview ::
1499+grabPreview
1500+ :: Int
1821− -- | How many bytes to fetch
1501+ -- ^ How many bytes to fetch
1822− Int ->
1502+ -> L.Response L.BodyReader
1823− -- | Response with body reader inside
1503+ -- ^ Response with body reader inside
1824− L.Response L.BodyReader ->
1504+ -> IO (ByteString, L.Response L.BodyReader)
1825− -- | Preview 'ByteString' and new response with body reader inside
1505+ -- ^ Preview 'ByteString' and new response with body reader inside
1826− IO (ByteString, L.Response L.BodyReader)
1827grabPreview nbytes r = do
1506grabPreview nbytes r = do
1828 let br = L.responseBody r
1507 let br = L.responseBody r
1829 (target, leftover, done) <- brReadN br nbytes
1508 (target, leftover, done) <- brReadN br nbytes
@@ -1846,17 +1525,18 @@ grabPreview nbytes r = do
1846 if done
1525 if done
1847 then return B.empty
1526 then return B.empty
1848 else br
1527 else br
1849− return (target, r {L.responseBody = br'})
1528+ return (target, r { L.responseBody = br' })
1850
1529
1851-- | Consume N bytes from 'L.BodyReader', return the target chunk, the
1530-- | Consume N bytes from 'L.BodyReader', return the target chunk, the
1852-- leftover (may be empty), and whether we're done consuming the body.
1531-- leftover (may be empty), and whether we're done consuming the body.
1532+
1853−brReadN ::
1533+brReadN
1534+ :: L.BodyReader
1854− -- | Body reader to stream from
1535+ -- ^ Body reader to stream from
1855− L.BodyReader ->
1536+ -> Int
1856− -- | How many bytes to consume
1537+ -- ^ How many bytes to consume
1857− Int ->
1538+ -> IO (ByteString, ByteString, Bool)
1858− -- | Target chunk, the leftover, whether we're done
1539+ -- ^ Target chunk, the leftover, whether we're done
1859− IO (ByteString, ByteString, Bool)
1860brReadN br n = go 0 id id
1540brReadN br n = go 0 id id
1861 where
1541 where
1862 go !tlen t l = do
1542 go !tlen t l = do
@@ -1865,9 +1545,9 @@ brReadN br n = go 0 id id
1865 then return (r t, r l, True)
1545 then return (r t, r l, True)
1866 else do
1546 else do
1867 let (target, leftover) = B.splitAt (n - tlen) chunk
1547 let (target, leftover) = B.splitAt (n - tlen) chunk
1868− tlen' = B.length target
1548+ tlen' = B.length target
1869− t' = t . (target :)
1549+ t' = t . (target:)
1870− l' = l . (leftover :)
1550+ l' = l . (leftover:)
1871 if tlen + tlen' < n
1551 if tlen + tlen' < n
1872 then go (tlen + tlen') t' l'
1552 then go (tlen + tlen') t' l'
1873 else return (r t', r l', False)
1553 else return (r t', r l', False)
@@ -1877,45 +1557,47 @@ brReadN br n = go 0 id id
1877-- Inspecting a response
1557-- Inspecting a response
1878
1558
1879-- | Get the response body.
1559-- | Get the response body.
1560+
1880−responseBody ::
1561+responseBody
1881− (HttpResponse response) =>
1562+ :: HttpResponse response
1882− response ->
1563+ => response
1883− HttpResponseBody response
1564+ -> HttpResponseBody response
1884responseBody = L.responseBody . toVanillaResponse
1565responseBody = L.responseBody . toVanillaResponse
1885
1566
1886-- | Get the response status code.
1567-- | Get the response status code.
1568+
1887−responseStatusCode ::
1569+responseStatusCode
1888− (HttpResponse response) =>
1570+ :: HttpResponse response
1889− response ->
1571+ => response
1890− Int
1572+ -> Int
1891responseStatusCode =
1573responseStatusCode =
1892 Y.statusCode . L.responseStatus . toVanillaResponse
1574 Y.statusCode . L.responseStatus . toVanillaResponse
1893
1575
1894-- | Get the response status message.
1576-- | Get the response status message.
1577+
1895−responseStatusMessage ::
1578+responseStatusMessage
1896− (HttpResponse response) =>
1579+ :: HttpResponse response
1897− response ->
1580+ => response
1898− ByteString
1581+ -> ByteString
1899responseStatusMessage =
1582responseStatusMessage =
1900 Y.statusMessage . L.responseStatus . toVanillaResponse
1583 Y.statusMessage . L.responseStatus . toVanillaResponse
1901
1584
1902-- | Lookup a particular header from a response.
1585-- | Lookup a particular header from a response.
1586+
1903−responseHeader ::
1587+responseHeader
1904− (HttpResponse response) =>
1588+ :: HttpResponse response
1905− -- | Response interpretation
1589+ => response -- ^ Response interpretation
1906− response ->
1907− -- | Header to lookup
1590+ -> ByteString -- ^ Header to lookup
1908− ByteString ->
1909− -- | Header value if found
1591+ -> Maybe ByteString -- ^ Header value if found
1910− Maybe ByteString
1911responseHeader r h =
1592responseHeader r h =
1912 (lookup (CI.mk h) . L.responseHeaders . toVanillaResponse) r
1593 (lookup (CI.mk h) . L.responseHeaders . toVanillaResponse) r
1913
1594
1914-- | Get the response 'L.CookieJar'.
1595-- | Get the response 'L.CookieJar'.
1596+
1915−responseCookieJar ::
1597+responseCookieJar
1916− (HttpResponse response) =>
1598+ :: HttpResponse response
1917− response ->
1599+ => response
1918− L.CookieJar
1600+ -> L.CookieJar
1919responseCookieJar = L.responseCookieJar . toVanillaResponse
1601responseCookieJar = L.responseCookieJar . toVanillaResponse
1920
1602
1921----------------------------------------------------------------------------
1603----------------------------------------------------------------------------
@@ -1926,15 +1608,19 @@ responseCookieJar = L.responseCookieJar . toVanillaResponse
1926-- To create a new response interpretation you just need to make your data
1608-- To create a new response interpretation you just need to make your data
1927-- type an instance of the 'HttpResponse' type class.
1609-- type an instance of the 'HttpResponse' type class.
1928
1610
1929−-- | A type class for response interpretations. It allows us to describe how
1611+-- | A type class for response interpretations. It allows to describe how to
1930−-- to consume the response from a @'L.Response' 'L.BodyReader'@ and produce
1612+-- consume response from a @'L.Response' 'L.BodyReader'@ and produce the
1931−-- the final result that is to be returned to the user.
1613+-- final result that is to be returned to the user.
1614+
1932class HttpResponse response where
1615class HttpResponse response where
1616+
1933 -- | The associated type is the type of body that can be extracted from an
1617 -- | The associated type is the type of body that can be extracted from an
1934 -- instance of 'HttpResponse'.
1618 -- instance of 'HttpResponse'.
1619+
1935− type HttpResponseBody response :: Type
1620+ type HttpResponseBody response :: *
1936
1621
1937 -- | The method describes how to get the underlying 'L.Response' record.
1622 -- | The method describes how to get the underlying 'L.Response' record.
1623+
1938 toVanillaResponse :: response -> L.Response (HttpResponseBody response)
1624 toVanillaResponse :: response -> L.Response (HttpResponseBody response)
1939
1625
1940 -- | This method describes how to consume response body and, more
1626 -- | This method describes how to consume response body and, more
@@ -1950,32 +1636,12 @@ class HttpResponse response where
1950 --
1636 --
1951 -- __Note__: signature of this function was changed in the version
1637 -- __Note__: signature of this function was changed in the version
1952 -- /1.0.0/.
1638 -- /1.0.0/.
1953− getHttpResponse ::
1954− -- | Response with body reader inside
1955− L.Response L.BodyReader ->
1956− -- | The final result
1957− IO response
1958−
1959− -- | The value of @\"Accept\"@ header. This is useful, for example, if a
1960− -- website supports both @XML@ and @JSON@ responses, and decides what to
1961− -- reply with based on what @Accept@ headers you have sent.
1962− --
1963− -- __Note__: manually specified 'Options' that set the @\"Accept\"@ header
1964− -- will take precedence.
1965− --
1966− -- @since 2.1.0
1967− acceptHeader :: Proxy response -> Maybe ByteString
1968− acceptHeader Proxy = Nothing
1969
1639
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
1640+ getHttpResponse
1641+ :: L.Response L.BodyReader
1642+ -- ^ Response with body reader inside
1643+ -> IO response
1644+ -- ^ The final result
1979
1645
1980----------------------------------------------------------------------------
1646----------------------------------------------------------------------------
1981-- Other
1647-- Other
@@ -1987,12 +1653,15 @@ instance HttpResponse (L.Response ()) where
1987-- request components easier using @('<>')@.
1653-- request components easier using @('<>')@.
1988--
1654--
1989-- __Note__: this type class is not a part of the public API.
1655-- __Note__: this type class is not a part of the public API.
1656+
1990class RequestComponent a where
1657class RequestComponent a where
1658+
1991 -- | Get a function that takes a 'L.Request' and changes it somehow
1659 -- | Get a function that takes a 'L.Request' and changes it somehow
1992 -- returning another 'L.Request'. For example, the 'HttpMethod' instance
1660 -- returning another 'L.Request'. For example, the 'HttpMethod' instance
1993 -- of 'RequestComponent' just overwrites method. The function is wrapped
1661 -- of 'RequestComponent' just overwrites method. The function is wrapped
1994 -- in 'Endo' so it's easier to chain such “modifying applications”
1662 -- in 'Endo' so it's easier to chain such “modifying applications”
1995 -- together building bigger and bigger 'RequestComponent's.
1663 -- together building bigger and bigger 'RequestComponent's.
1664+
1996 getRequestMod :: a -> Endo L.Request
1665 getRequestMod :: a -> Endo L.Request
1997
1666
1998-- | This wrapper is only used to attach a type-level tag to a given type.
1667-- | This wrapper is only used to attach a type-level tag to a given type.
@@ -2002,50 +1671,44 @@ class RequestComponent a where
2002-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
1671-- method@ and @'HttpBody' body => 'RequestComponent' body@ when it decides
2003-- which instance to use (i.e. the constraints are taken into account later,
1672-- which instance to use (i.e. the constraints are taken into account later,
2004-- when instance is already chosen).
1673-- when instance is already chosen).
1674+
2005−newtype Tagged (tag :: Symbol) a = Tagged a
1675+newtype Womb (tag :: Symbol) a = Womb a
2006
1676
2007-- | Exceptions that this library throws.
1677-- | Exceptions that this library throws.
1678+
2008data HttpException
1679data HttpException
1680+ = VanillaHttpException L.HttpException
2009− = -- | A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
1681+ -- ^ A wrapper with an 'L.HttpException' from "Network.HTTP.Client"
2010− VanillaHttpException L.HttpException
1682+ | JsonHttpException String
2011− | -- | A wrapper with Aeson-produced 'String' describing why decoding
1683+ -- ^ A wrapper with Aeson-produced 'String' describing why decoding
2012 -- failed
1684 -- failed
2013− JsonHttpException String
2014− deriving (Show, Generic)
1685+ deriving (Show, Typeable, Generic)
2015
1686
2016instance Exception HttpException
1687instance Exception HttpException
2017
1688
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−
2032-- | A simple type isomorphic to 'Bool' that we only have for better error
1689-- | A simple type isomorphic to 'Bool' that we only have for better error
2033-- messages. We use it as a kind and its data constructors as type-level
1690-- messages. We use it as a kind and its data constructors as type-level
2034-- tags.
1691-- tags.
2035--
1692--
2036-- See also: 'HttpMethod' and 'HttpBody'.
1693-- See also: 'HttpMethod' and 'HttpBody'.
1694+
2037data CanHaveBody
1695data CanHaveBody
2038− = -- | Indeed can have a body
1696+ = CanHaveBody -- ^ Indeed can have a body
2039− CanHaveBody
2040− | -- | Should not have a body
1697+ | NoBody -- ^ Should not have a body
2041− NoBody
2042
1698
2043-- | A type-level tag that specifies URL scheme used (and thus if HTTPS is
1699-- | A type-level tag that specifies URL scheme used (and thus if HTTPS is
2044-- enabled). This is used to force TLS requirement for some authentication
1700-- enabled). This is used to force TLS requirement for some authentication
2045-- 'Option's.
1701-- 'Option's.
1702+
2046data Scheme
1703data Scheme
2047− = -- | HTTP
1704+ = Http -- ^ HTTP
2048− Http
2049− | -- | HTTPS
1705+ | Https -- ^ HTTPS
2050− Https
2051− deriving (Eq, Ord, Show, Data, Generic, TH.Lift)
1706+ deriving (Eq, Ord, Show, Data, Typeable, Generic)
1707+
1708+----------------------------------------------------------------------------
1709+-- Constants
1710+
1711+-- | Max length of preview fragment of response body.
1712+
1713+bodyPreviewLength :: Num a => a
1714+bodyPreviewLength = 1024
README.md+144−43
@@ -4,8 +4,10 @@
4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
4[![Hackage](https://img.shields.io/hackage/v/req.svg?style=flat)](https://hackage.haskell.org/package/req)
5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
5[![Stackage Nightly](http://stackage.org/package/req/badge/nightly)](http://stackage.org/nightly/package/req)
6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)
6[![Stackage LTS](http://stackage.org/package/req/badge/lts)](http://stackage.org/lts/package/req)
7−[![CI](https://github.com/mrkkrp/req/actions/workflows/ci.yaml/badge.svg)](https://github.com/mrkkrp/req/actions/workflows/ci.yaml)
7+[![Build Status](https://travis-ci.org/mrkkrp/req.svg?branch=master)](https://travis-ci.org/mrkkrp/req)
8
8
9+* [Motivation and Req vs other libraries](#motivation-and-req-vs-other-libraries)
10+* [Unsolved problems](#unsolved-problems)
9* [Related packages](#related-packages)
11* [Related packages](#related-packages)
10* [Blog posts](#blog-posts)
12* [Blog posts](#blog-posts)
11* [Contribution](#contribution)
13* [Contribution](#contribution)
@@ -18,56 +20,69 @@ module Main (main) where
18
20
19import Control.Monad.IO.Class
21import Control.Monad.IO.Class
20import Data.Aeson
22import Data.Aeson
23+import Data.Default.Class
21import Network.HTTP.Req
24import Network.HTTP.Req
22
25
23main :: IO ()
26main :: IO ()
24-- You can either make your monad an instance of 'MonadHttp', or use
27-- You can either make your monad an instance of 'MonadHttp', or use
25-- 'runReq' in any IO-enabled monad without defining new instances.
28-- 'runReq' in any IO-enabled monad without defining new instances.
26−main = runReq defaultHttpConfig $ do
29+main = runReq def $ do
27− let payload =
30+ let payload = object
28− object
29− [ "foo" .= (10 :: Int),
31+ [ "foo" .= (10 :: Int)
30− "bar" .= (20 :: Int)
32+ , "bar" .= (20 :: Int) ]
31− ]
32 -- One function—full power and flexibility, automatic retrying on timeouts
33 -- One function—full power and flexibility, automatic retrying on timeouts
33 -- and such, automatic connection sharing.
34 -- and such, automatic connection sharing.
34− r <-
35− req
36− POST -- method
35+ r <- req POST -- method
37− (https "httpbin.org" /: "post") -- safe by construction URL
36+ (https "httpbin.org" /: "post") -- safe by construction URL
38− (ReqBodyJson payload) -- use built-in options or add your own
37+ (ReqBodyJson payload) -- use built-in options or add your own
39− jsonResponse -- specify how to interpret response
38+ jsonResponse -- specify how to interpret response
40− mempty -- query params, headers, explicit port number, etc.
39+ mempty -- query params, headers, explicit port number, etc.
41 liftIO $ print (responseBody r :: Value)
40 liftIO $ print (responseBody r :: Value)
42```
41```
43
42
44−Req is an HTTP client library that attempts to be easy-to-use, type-safe,
43+Req is an easy-to-use, type-safe, expandable, high-level HTTP client library
45−and expandable.
44+that just works without any fooling around.
46−
45+
47−“Easy-to-use” means that the library is designed to be beginner-friendly so
46+What does the phrase “easy-to-use” mean? It means that the library is
48−it's simple to add to your monad stack, intuitive to work with,
47+designed to be beginner-friendly so it's simple to add to your monad stack,
49−well-documented, and does not get in your way. Doing HTTP requests is a
48+intuitive to work with, well-documented, and does not get in your way. Doing
50−common task and a Haskell library for this should be approachable and clear
49+HTTP requests is a common task and a Haskell library for this should be very
51−to beginners, thus certain compromises were made. For example, one cannot
50+approachable and clear to beginners, thus certain compromises were made. For
52−currently modify `ManagerSettings` of the default manager because the
51+example, one cannot currently modify `ManagerSettings` of the default
53−library always uses the same implicit global manager for simplicity and
52+manager because the library always uses the same implicit global manager for
54−maximal connection sharing. There is a way to use your own manager with
53+simplicity and maximal connection sharing. There is a way to use your own
55−different settings, but it requires more typing.
54+manager with different settings, but it requires a bit more typing.
56−
55+
57−“Type-safe” means that the library tries to eliminate certain classes of
56+“Type-safe” means that the library is protective and eliminates certain
58−errors. For example, we have correct-by-construction URLs; it is guaranteed
57+classes of errors. For example, we have correct-by-construction URLs, it's
59−that the user does not send the request body when using methods like GET or
58+guaranteed that the user does not send the request body when using methods
60−OPTIONS, and the amount of implicit assumptions is minimized by making the
59+like GET or OPTIONS, and the amount of implicit assumptions is minimized by
61−user specify their intentions in an explicit form. For example, it's not
60+making the user specify his/her intentions in an explicit form (for example,
62−possible to avoid specifying the body or the method of a request.
61+it's not possible to avoid specifying the body or method of a request).
63Authentication methods that assume HTTPS force the user to use HTTPS at the
62Authentication methods that assume HTTPS force the user to use HTTPS at the
64−type level.
63+type level. The library also carefully hides underlying types from the
65−
64+lower-level `http-client` package because those types are not safe enough
65+(for example `Request` is an instance of `IsString` and, if it's malformed,
66+it will blow up at run-time).
67+
66−“Expandable” refers to the ability to create new components without having
68+“Expandable” refers to the ability to create new components for dealing with
67−to resort to hacking. For example, it's possible to define your own HTTP
69+HTTP without having to resort to ugly hacking. For example, it's possible to
68−methods, create new ways to construct the body of a request, create new
70+define your own HTTP methods, create new ways to construct the body of a
69−authorization options, perform a request in a different way, and create your
71+request, create new authorization options, perform a request in a different
70−own methods to parse a response.
72+way, and create your own methods to parse and represent a response. As a
73+user extends the library to satisfy his/her special needs, the new solutions
74+will work just like the built-ins. However, all of the common cases are also
75+covered by the library out-of-the-box.
76+
77+“High-level” means that there are less details to worry about. The library
78+is a result of my experiences as a Haskell consultant. Working for several
79+clients, who had very different projects, showed me that the library should
80+adapt easily to any particular style of writing Haskell applications. For
81+example, some people prefer throwing exceptions, while others are concerned
82+with purity. Just define `handleHttpException` accordingly when making your
83+monad instance of `MonadHttp` and it will play together seamlessly. Finally,
84+the library cuts boilerplate down considerably, and helps you write concise,
85+easy to read, and maintainable code.
71
86
72The library uses the following mature packages under the hood to guarantee
87The library uses the following mature packages under the hood to guarantee
73you the best experience:
88you the best experience:
@@ -77,11 +92,97 @@ you the best experience:
77* [`http-client-tls`](https://hackage.haskell.org/package/http-client-tls)—TLS
92* [`http-client-tls`](https://hackage.haskell.org/package/http-client-tls)—TLS
78 (HTTPS) support for `http-client`.
93 (HTTPS) support for `http-client`.
79
94
80−It is important to note that since we leverage well-known libraries that the
95+It's important to note that since we leverage well-known libraries that the
81whole Haskell ecosystem uses, there is no risk in using Req. The machinery
96whole Haskell ecosystem uses, there is no risk in using Req. The machinery
82for performing requests is the same as with `http-conduit` and Wreq. The
97for performing requests is the same as with `http-conduit` and Wreq. The
83only difference is the API.
98only difference is the API.
84
99
100+## Motivation and Req vs other libraries
101+
102+*This section is my opinion and it contains criticisms of other well-known
103+libraries. If you're user/fan of one of these libraries, please remember not
104+to react aggressively and respect the fact that I may have different views
105+on API design from yours.*
106+
107+I have spent time to write the library because sending HTTP requests is such
108+a common thing and still there is no high-level library for that in Haskell
109+that I could use with pleasure. I'll explain why.
110+
111+First of all, there is `http-client` and `http-client-tls`. They just work.
112+I have no issues with the libraries except that they are too low-level for
113+my taste. Indeed, even the docs say that they are low-level and “intended as
114+a base layer for more user-friendly packages”. This is exactly how I use
115+them in Req, as base level. Req is nothing but a different API to
116+`http-client`, so it only works because of the hard work put into
117+`http-client`.
118+
119+`http-conduit` definitely has its place. For one thing it allows you to
120+stream request and response bodies in constant memory, what other library
121+allows you to do that? On the other hand if you take a look at
122+`Network.HTTP.Simple`, then although it's said that it's a “higher level
123+API”, it's mostly the same as vanilla `http-client` in spirit/approach and
124+just adds `conduit`-powered functions to perform requests and allows to use
125+global implicit `Manager` (Req does the same). If I tried to frame what
126+exactly I don't like about `http-conduit` in words, then it would be “the
127+way requests are constructed”. You set, set, set instead of *being forced*
128+to declare necessary bits and *being allowed* to declare optional bits in a
129+way that their combination is certainly valid. And you parse request from a
130+string without the protection of TH that otherwise saves the day as in
131+Yesod.
132+
133+Then there is Wreq. `wreq` [doesn't see much development
134+lately](https://github.com/bos/wreq/issues/93). `wreq` is by itself a weird
135+library, IMO. You have functions per method—not very good, as there may be
136+new methods, like PATCH which is not new but still missing (well you have
137+`customMethod`, but what is the point of having per-method functions if you
138+have a more general way to use any method? you should be able to just insert
139+methods in the “argument slot” of `customMethod` and end up with a more
140+general solution). Now every method function has a companion that takes
141+`Options` (like you have `get` and `getWith`). Why the duplication? Where is
142+generality and flexibility? This is not all though, because you cannot
143+really use `get` you see in the main module, because you want to have
144+connection sharing. Wreq's author does not take the gift of automatic
145+connection re-use `Manager` from `http-client` provides, he invents the
146+whole new thing of “sessions”. Only inside a session your connections will
147+be shared and re-used. However with the session stuff you have yet another
148+set of per-method functions like `get` and `getWith`—these are different
149+ones, to be used with sessions! Now if you have a multi-threaded app, here
150+is a surprise for you: you can't share connections between threads as
151+connections are shared only inside `withSession` friend and “session will no
152+longer be valid after that function returns”. There are valid uses for
153+sessions, but the point is that they are just too inconvenient for common
154+tasks.
155+
156+It's funny that one client I worked for had to have his own little wrapper
157+around `http-client` just because he could not possibly use `wreq` and
158+`http-client` and friends were too low-level. The previous paragraph is
159+extracted from a talk with a Haskell developer who works for that client. I
160+thought to myself “something is wrong with HTTP client libraries in Haskell
161+if they had to make a wrapper”.
162+
163+What else? I used `servant-client` a couple of times but the amount of
164+boilerplate it requires is frightening. If you have several query
165+parameters, and you use just one of them, good luck passing lots of
166+`Nothing`s.
167+
168+## Unsolved problems
169+
170+AWS request signing is problematic because request body can be in the form
171+of an action to execute (and all that “popper” stuff for streaming), not
172+just a `ByteString` and so getting its digest (hash) is not trivial without
173+running the action and consuming body in its entirety before the request in
174+made. In Wreq the author chose to just use `error` when body is not a
175+(strict or lazy) `ByteString`. Maybe it's OK for Wreq, but I don't consider
176+this a proper solution for Req as we support full variety of body options.
177+For example, what if I want to upload 1 Gb file to S3? I want to stream it
178+in constant memory but at the same time I need to calculate its hash before
179+I start streaming. One solution to the problem seems to be in taking the
180+hash explicitly (as an argument of the hypothetical `awsAuth`) and making it
181+a responsibility of the user to calculate the hash correctly. I don't like
182+this because it's not user-friendly. So the question stays open, for now
183+there is no AWS signing functionality provided out-of-the-box. The best
184+solution for talking to AWS is the `amazonka` package so far.
185+
85## Related packages
186## Related packages
86
187
87The following packages are designed to be used with Req:
188The following packages are designed to be used with Req:
@@ -101,10 +202,10 @@ please submit a PR to include it in this list.
101Issues, bugs, and questions may be reported in [the GitHub issue tracker for
202Issues, bugs, and questions may be reported in [the GitHub issue tracker for
102this project](https://github.com/mrkkrp/req/issues).
203this project](https://github.com/mrkkrp/req/issues).
103
204
104−Pull requests are also welcome.
205+Pull requests are also welcome and will be reviewed quickly.
105
206
106## License
207## License
107
208
108−Copyright © 2016–present Mark Karpov
209+Copyright © 2016–2018 Mark Karpov
109
210
110Distributed under BSD 3 clause license.
211Distributed under BSD 3 clause license.
Setup.hsnew file+6
@@ -0,0 +1,6 @@
1+module Main (main) where
2+
3+import Distribution.Simple
4+
5+main :: IO ()
6+main = defaultMain
cabal.projectdeleted−4
@@ -1,4 +0,0 @@
1−packages: .
2−tests: True
3−benchmarks: True
4−constraints: req +dev
httpbin-tests/Network/HTTP/ReqSpec.hs+196−310
@@ -1,37 +1,39 @@
1−{-# LANGUAGE DataKinds #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE FlexibleInstances #-}
3+{-# LANGUAGE FlexibleInstances #-}
3−{-# LANGUAGE LambdaCase #-}
4−{-# LANGUAGE OverloadedStrings #-}
4+{-# LANGUAGE OverloadedStrings #-}
5−{-# LANGUAGE RankNTypes #-}
5+{-# LANGUAGE RankNTypes #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
6{-# OPTIONS_GHC -fno-warn-orphans #-}
7
7
8−module Network.HTTP.ReqSpec (spec) where
8+module Network.HTTP.ReqSpec
9+ ( spec )
10+where
9
11
10import Control.Exception
12import Control.Exception
11−import Control.Monad (forM_)
13+import Control.Monad.Reader
12import Control.Monad.Trans.Control
14import Control.Monad.Trans.Control
13−import Data.Aeson (ToJSON (..), Value (..), object, (.=))
15+import Data.Aeson (Value (..), ToJSON (..), object, (.=))
14−import Data.Aeson qualified as A
16+import Data.Default.Class
15−import Data.Aeson.KeyMap qualified as Aeson.KeyMap
16−import Data.ByteString qualified as B
17+import Data.Monoid ((<>))
17−import Data.ByteString.Lazy qualified as BL
18−import Data.Functor.Identity (runIdentity)
19−import Data.Maybe (fromJust)
20import Data.Proxy
18import Data.Proxy
21import Data.Text (Text)
19import Data.Text (Text)
22−import Data.Text qualified as T
23−import Data.Text.Encoding qualified as T
24−import Data.Text.IO qualified as TIO
25−import Network.HTTP.Client qualified as L
26−import Network.HTTP.Client.MultipartFormData qualified as LM
27−import Network.HTTP.Req hiding (req)
28−import Network.HTTP.Req qualified as Req
20+import Network.HTTP.Req
29−import Network.HTTP.Types qualified as Y
30import Test.Hspec
21import Test.Hspec
31import Test.QuickCheck
22import Test.QuickCheck
23+import qualified Data.Aeson as A
24+import qualified Data.ByteString as B
25+import qualified Data.ByteString.Lazy as BL
26+import qualified Data.HashMap.Strict as HM
27+import qualified Data.Text as T
28+import qualified Data.Text.Encoding as T
29+import qualified Data.Text.IO as TIO
30+import qualified Network.HTTP.Client as L
31+import qualified Network.HTTP.Client.MultipartFormData as LM
32+import qualified Network.HTTP.Types as Y
32
33
33spec :: Spec
34spec :: Spec
34spec = do
35spec = do
36+
35 describe "exception throwing on non-2xx status codes" $
37 describe "exception throwing on non-2xx status codes" $
36 it "throws indeed for non-2xx" $
38 it "throws indeed for non-2xx" $
37 req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
39 req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
@@ -39,7 +41,7 @@ spec = do
39
41
40 describe "exception throwing on non-2xx status codes (Req monad)" $
42 describe "exception throwing on non-2xx status codes (Req monad)" $
41 it "throws indeed for non-2xx" $
43 it "throws indeed for non-2xx" $
42− asIO . runReq defaultHttpConfig $
44+ asIO . runReq def $
43 liftBaseWith $ \run ->
45 liftBaseWith $ \run ->
44 run (req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty)
46 run (req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty)
45 `shouldThrow` selector404
47 `shouldThrow` selector404
@@ -50,61 +52,41 @@ spec = do
50 blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
52 blindlyThrowing (req GET httpbin NoReqBody ignoreResponse mempty)
51 `shouldThrow` anyException
53 `shouldThrow` anyException
52
54
53− describe "isStatusCodeException" $
54− it "extracts non-2xx response" $
55− req GET (httpbin /: "foo") NoReqBody ignoreResponse mempty
56− `shouldThrow` selector404ByStatusCodeException
57−
58 describe "receiving user-agent header back" $
55 describe "receiving user-agent header back" $
59 it "works" $ do
56 it "works" $ do
60− r <-
61− req
62− GET
63− (httpbin /: "user-agent")
57+ r <- req GET (httpbin /: "user-agent")
64− NoReqBody
65− jsonResponse
66− (header "user-agent" "Req")
58+ NoReqBody jsonResponse (header "user-agent" "Req")
67− responseBody r
68− `shouldBe` object
59+ responseBody r `shouldBe` object
69− ["user-agent" .= ("Req" :: Text)]
60+ ["user-agent" .= ("Req" :: Text)]
70− responseStatusCode r `shouldBe` 200
61+ responseStatusCode r `shouldBe` 200
71 responseStatusMessage r `shouldBe` "OK"
62 responseStatusMessage r `shouldBe` "OK"
72
63
73 describe "receiving request headers back" $
64 describe "receiving request headers back" $
74 it "works" $ do
65 it "works" $ do
75− r <-
76− req
77− GET
78− (httpbin /: "headers")
66+ r <- req GET (httpbin /: "headers")
79− NoReqBody
80− jsonResponse
81− (header "Foo" "bar" <> header "Baz" "quux")
67+ NoReqBody jsonResponse (header "Foo" "bar" <> header "Baz" "quux")
82− stripFunnyHeaders (responseBody r)
68+ stripFunnyHeaders (responseBody r) `shouldBe` object
83− `shouldBe` object
84− [ "headers"
69+ [ "headers" .= object
85− .= object
86− [ "Accept-Encoding" .= ("gzip" :: Text),
70+ [ "Accept-Encoding" .= ("gzip" :: Text)
71+ , "Connection" .= ("close" :: Text)
87− "Foo" .= ("bar" :: Text),
72+ , "Foo" .= ("bar" :: Text)
88− "Baz" .= ("quux" :: Text)
73+ , "Baz" .= ("quux" :: Text)
89− ]
74+ , "Host" .= ("httpbin.org" :: Text) ] ]
90− ]
91− responseStatusCode r `shouldBe` 200
75+ responseStatusCode r `shouldBe` 200
92 responseStatusMessage r `shouldBe` "OK"
76 responseStatusMessage r `shouldBe` "OK"
93
77
94 describe "receiving GET data back" $
78 describe "receiving GET data back" $
95 it "works" $ do
79 it "works" $ do
96 r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty
80 r <- req GET (httpbin /: "get") NoReqBody jsonResponse mempty
97− (stripFunnyHeaders . stripOrigin) (responseBody r)
81+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
98− `shouldBe` object
99− [ "args" .= emptyObject,
82+ [ "args" .= emptyObject
100− "url" .= ("http://localhost:1234/get" :: Text),
83+ , "url" .= ("https://httpbin.org/get" :: Text)
101− "headers"
84+ , "headers" .= object
102− .= object
103− [ "Accept-Encoding" .= ("gzip" :: Text)
85+ [ "Accept-Encoding" .= ("gzip" :: Text)
104− ]
86+ , "Connection" .= ("close" :: Text)
105− ]
87+ , "Host" .= ("httpbin.org" :: Text) ] ]
106 responseHeader r "Content-Type" `shouldBe` return "application/json"
88 responseHeader r "Content-Type" `shouldBe` return "application/json"
107− responseStatusCode r `shouldBe` 200
89+ responseStatusCode r `shouldBe` 200
108 responseStatusMessage r `shouldBe` "OK"
90 responseStatusMessage r `shouldBe` "OK"
109
91
110 describe "receiving POST JSON data back" $
92 describe "receiving POST JSON data back" $
@@ -112,55 +94,49 @@ spec = do
112 let text = "foo" :: Text
94 let text = "foo" :: Text
113 reflected = reflectJSON text
95 reflected = reflectJSON text
114 r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty
96 r <- req POST (httpbin /: "post") (ReqBodyJson text) jsonResponse mempty
115− (stripFunnyHeaders . stripOrigin) (responseBody r)
97+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
116− `shouldBe` object
117− [ "args" .= emptyObject,
98+ [ "args" .= emptyObject
118− "json" .= text,
99+ , "json" .= text
119− "data" .= reflected,
100+ , "data" .= reflected
120− "url" .= ("http://localhost:1234/post" :: Text),
101+ , "url" .= ("https://httpbin.org/post" :: Text)
121− "headers"
102+ , "headers" .= object
122− .= object
123− [ "Content-Type" .= ("application/json; charset=utf-8" :: Text),
103+ [ "Content-Type" .= ("application/json; charset=utf-8" :: Text)
124− "Accept-Encoding" .= ("gzip" :: Text),
104+ , "Accept-Encoding" .= ("gzip" :: Text)
105+ , "Connection" .= ("close" :: Text)
106+ , "Host" .= ("httpbin.org" :: Text)
125− "Content-Length" .= show (T.length reflected)
107+ , "Content-Length" .= show (T.length reflected) ]
126− ],
127− "files" .= emptyObject,
108+ , "files" .= emptyObject
128− "form" .= emptyObject
109+ , "form" .= emptyObject ]
129− ]
130 responseHeader r "Content-Type" `shouldBe` return "application/json"
110 responseHeader r "Content-Type" `shouldBe` return "application/json"
131− responseStatusCode r `shouldBe` 200
111+ responseStatusCode r `shouldBe` 200
132 responseStatusMessage r `shouldBe` "OK"
112 responseStatusMessage r `shouldBe` "OK"
133
113
134 describe "receiving POST data back (multipart form data)" $
114 describe "receiving POST data back (multipart form data)" $
135 it "works" $ do
115 it "works" $ do
136− body <-
137− reqBodyMultipart
116+ body <- reqBodyMultipart
138− [ LM.partBS "foo" "foo data!",
117+ [ LM.partBS "foo" "foo data!"
139− LM.partBS "bar" "bar data!"
118+ , LM.partBS "bar" "bar data!" ]
140− ]
141 r <- req POST (httpbin /: "post") body jsonResponse mempty
119 r <- req POST (httpbin /: "post") body jsonResponse mempty
142− let contentType = fromJust (getRequestContentType body)
120+ let Just contentType = getRequestContentType body
143− (stripFunnyHeaders . stripOrigin) (responseBody r)
121+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
144− `shouldBe` object
145− [ "args" .= emptyObject,
122+ [ "args" .= emptyObject
146− "json" .= Null,
123+ , "json" .= Null
147− "data" .= ("" :: Text),
124+ , "data" .= ("" :: Text)
148− "url" .= ("http://localhost:1234/post" :: Text),
125+ , "url" .= ("https://httpbin.org/post" :: Text)
149− "headers"
126+ , "headers" .= object
150− .= object
151− [ "Content-Type" .= T.decodeUtf8 contentType,
127+ [ "Content-Type" .= T.decodeUtf8 contentType
152− "Accept-Encoding" .= ("gzip" :: Text),
128+ , "Accept-Encoding" .= ("gzip" :: Text)
129+ , "Connection" .= ("close" :: Text)
130+ , "Host" .= ("httpbin.org" :: Text)
153− "Content-Length" .= ("242" :: Text)
131+ , "Content-Length" .= ("242" :: Text)
154− ],
155− "files" .= emptyObject,
156− "form"
157− .= object
158− [ "foo" .= ("foo data!" :: Text),
159− "bar" .= ("bar data!" :: Text)
160− ]
161 ]
132 ]
133+ , "files" .= emptyObject
134+ , "form" .= object
135+ [ "foo" .= ("foo data!" :: Text)
136+ , "bar" .= ("bar data!" :: Text) ]
137+ ]
162 responseHeader r "Content-Type" `shouldBe` return "application/json"
138 responseHeader r "Content-Type" `shouldBe` return "application/json"
163− responseStatusCode r `shouldBe` 200
139+ responseStatusCode r `shouldBe` 200
164 responseStatusMessage r `shouldBe` "OK"
140 responseStatusMessage r `shouldBe` "OK"
165
141
166 describe "receiving PATCHed file back" $
142 describe "receiving PATCHed file back" $
@@ -169,69 +145,57 @@ spec = do
169 file = "httpbin-data/robots.txt"
145 file = "httpbin-data/robots.txt"
170 contents <- TIO.readFile file
146 contents <- TIO.readFile file
171 r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty
147 r <- req PATCH (httpbin /: "patch") (ReqBodyFile file) jsonResponse mempty
172− (stripFunnyHeaders . stripOrigin) (responseBody r)
148+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
173− `shouldBe` object
174− [ "args" .= emptyObject,
149+ [ "args" .= emptyObject
175− "json" .= Null,
150+ , "json" .= Null
176− "data" .= contents,
151+ , "data" .= contents
177− "url" .= ("http://localhost:1234/patch" :: Text),
152+ , "url" .= ("https://httpbin.org/patch" :: Text)
178− "headers"
153+ , "headers" .= object
179− .= object
180− [ "Accept-Encoding" .= ("gzip" :: Text),
154+ [ "Accept-Encoding" .= ("gzip" :: Text)
155+ , "Connection" .= ("close" :: Text)
156+ , "Host" .= ("httpbin.org" :: Text)
181− "Content-Length" .= show (T.length contents)
157+ , "Content-Length" .= show (T.length contents) ]
182− ],
183− "files" .= emptyObject,
158+ , "files" .= emptyObject
184− "form" .= emptyObject
159+ , "form" .= emptyObject ]
185− ]
186 responseHeader r "Content-Type" `shouldBe` return "application/json"
160 responseHeader r "Content-Type" `shouldBe` return "application/json"
187− responseStatusCode r `shouldBe` 200
161+ responseStatusCode r `shouldBe` 200
188 responseStatusMessage r `shouldBe` "OK"
162 responseStatusMessage r `shouldBe` "OK"
189
163
190 describe "receiving PUT form URL-encoded data back" $
164 describe "receiving PUT form URL-encoded data back" $
191 it "works" $ do
165 it "works" $ do
192− let params =
193− "foo" =: ("bar" :: Text)
166+ let params = "foo" =: ("bar" :: Text) <>
194− <> "baz" =: (5 :: Int)
167+ "baz" =: (5 :: Int) <>
195− <> queryFlag "quux"
168+ queryFlag "quux"
196 r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
169 r <- req PUT (httpbin /: "put") (ReqBodyUrlEnc params) jsonResponse mempty
197− (stripFunnyHeaders . stripOrigin) (responseBody r)
170+ (stripFunnyHeaders . stripOrigin) (responseBody r) `shouldBe` object
198− `shouldBe` object
199− [ "args" .= emptyObject,
171+ [ "args" .= emptyObject
200− "json" .= Null,
172+ , "json" .= Null
201− "data" .= ("" :: Text),
173+ , "data" .= ("" :: Text)
202− "url" .= ("http://localhost:1234/put" :: Text),
174+ , "url" .= ("https://httpbin.org/put" :: Text)
203− "headers"
175+ , "headers" .= object
204− .= object
205− [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text),
176+ [ "Content-Type" .= ("application/x-www-form-urlencoded" :: Text)
206− "Accept-Encoding" .= ("gzip" :: Text),
177+ , "Accept-Encoding" .= ("gzip" :: Text)
178+ , "Connection" .= ("close" :: Text)
179+ , "Host" .= ("httpbin.org" :: Text)
207− "Content-Length" .= ("18" :: Text)
180+ , "Content-Length" .= ("18" :: Text) ]
208− ],
209− "files" .= emptyObject,
181+ , "files" .= emptyObject
210− "form"
211− .= object
182+ , "form" .= object
212− [ "foo" .= ("bar" :: Text),
183+ [ "foo" .= ("bar" :: Text)
213− "baz" .= ("5" :: Text),
184+ , "baz" .= ("5" :: Text)
214− "quux" .= ("" :: Text)
185+ , "quux" .= ("" :: Text) ] ]
215− ]
216− ]
217 responseHeader r "Content-Type" `shouldBe` return "application/json"
186 responseHeader r "Content-Type" `shouldBe` return "application/json"
218− responseStatusCode r `shouldBe` 200
187+ responseStatusCode r `shouldBe` 200
219 responseStatusMessage r `shouldBe` "OK"
188 responseStatusMessage r `shouldBe` "OK"
220
189
221 -- TODO /delete
190 -- TODO /delete
222
191
223 describe "receiving UTF-8 encoded Unicode data" $
192 describe "receiving UTF-8 encoded Unicode data" $
224 it "works" $ do
193 it "works" $ do
225− r <-
226− req
227− GET
228− (httpbin /: "encoding" /: "utf8")
194+ r <- req GET (httpbin /: "encoding" /: "utf8")
229− NoReqBody
230− bsResponse
195+ NoReqBody bsResponse mempty
231− mempty
232 utf8data <- B.readFile "httpbin-data/utf8.html"
196 utf8data <- B.readFile "httpbin-data/utf8.html"
233− responseBody r `shouldBe` utf8data
197+ responseBody r `shouldBe` utf8data
234− responseStatusCode r `shouldBe` 200
198+ responseStatusCode r `shouldBe` 200
235 responseStatusMessage r `shouldBe` "OK"
199 responseStatusMessage r `shouldBe` "OK"
236
200
237 -- TODO /gzip
201 -- TODO /gzip
@@ -242,35 +206,24 @@ spec = do
242 -- FIXME We no longer can count retries because all the functions
206 -- FIXME We no longer can count retries because all the functions
243 -- responsible for controlling retrying are pure now.
207 -- responsible for controlling retrying are pure now.
244 let status = 408 :: Int
208 let status = 408 :: Int
245− r <-
246− prepareForShit $
247− req
248− GET
249− (httpbin /: "status" /~ status)
209+ r <- prepareForShit $ req GET (httpbin /: "status" /~ status)
250− NoReqBody
251− ignoreResponse
210+ NoReqBody ignoreResponse mempty
252− mempty
253 responseStatusCode r `shouldBe` status
211 responseStatusCode r `shouldBe` status
254
212
255 -- forM_ [101..102] checkStatusCode
213 -- forM_ [101..102] checkStatusCode
256− forM_ [200 .. 208] checkStatusCode
214+ forM_ [200..208] checkStatusCode
257 -- forM_ [300..308] checkStatusCode
215 -- forM_ [300..308] checkStatusCode
258− forM_ [400 .. 431] checkStatusCode
216+ forM_ [400..431] checkStatusCode
259− forM_ [500 .. 511] checkStatusCode
217+ forM_ [500..511] checkStatusCode
260
218
261 -- TODO /response-headers
219 -- TODO /response-headers
262 -- TODO /redirect
220 -- TODO /redirect
263
221
264 describe "redirects" $
222 describe "redirects" $
265 it "follows redirects" $ do
223 it "follows redirects" $ do
266− r <-
267− req
268− GET
269− (httpbin /: "redirect-to")
224+ r <- req GET (httpbin /: "redirect-to") NoReqBody ignoreResponse
270− NoReqBody
271− ignoreResponse
272− ("url" =: ("https://httpbin.org" :: Text))
225+ ("url" =: ("https://httpbin.org" :: Text))
273− responseStatusCode r `shouldBe` 200
226+ responseStatusCode r `shouldBe` 200
274 responseStatusMessage r `shouldBe` "OK"
227 responseStatusMessage r `shouldBe` "OK"
275
228
276 -- TODO /relative-redicet
229 -- TODO /relative-redicet
@@ -279,30 +232,21 @@ spec = do
279
232
280 describe "basicAuth" $ do
233 describe "basicAuth" $ do
281 let user, password :: Text
234 let user, password :: Text
282− user = "Scooby"
235+ user = "Scooby"
283 password = "Doo"
236 password = "Doo"
284 context "when we do not send appropriate basic auth data" $
237 context "when we do not send appropriate basic auth data" $
285 it "fails with 401" $ do
238 it "fails with 401" $ do
286− r <-
287− prepareForShit $
239+ r <- prepareForShit $ req GET
288− req
289− GET
290− (httpbin /: "basic-auth" /~ user /~ password)
240+ (httpbin /: "basic-auth" /~ user /~ password)
291− NoReqBody
292− ignoreResponse
241+ NoReqBody ignoreResponse mempty
293− mempty
294− responseStatusCode r `shouldBe` 401
242+ responseStatusCode r `shouldBe` 401
295 responseStatusMessage r `shouldBe` "UNAUTHORIZED"
243 responseStatusMessage r `shouldBe` "UNAUTHORIZED"
296 context "when we provide appropriate basic auth data" $
244 context "when we provide appropriate basic auth data" $
297 it "succeeds" $ do
245 it "succeeds" $ do
298− r <-
299− req
300− GET
301− (httpbin /: "basic-auth" /~ user /~ password)
246+ r <- req GET (httpbin /: "basic-auth" /~ user /~ password)
302− NoReqBody
303− ignoreResponse
247+ NoReqBody ignoreResponse
304− (basicAuthUnsafe (T.encodeUtf8 user) (T.encodeUtf8 password))
248+ (basicAuth (T.encodeUtf8 user) (T.encodeUtf8 password))
305− responseStatusCode r `shouldBe` 200
249+ responseStatusCode r `shouldBe` 200
306 responseStatusMessage r `shouldBe` "OK"
250 responseStatusMessage r `shouldBe` "OK"
307
251
308 -- TODO /hidden-basic-auth
252 -- TODO /hidden-basic-auth
@@ -317,8 +261,8 @@ spec = do
317 it "works" $ do
261 it "works" $ do
318 r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty
262 r <- req GET (httpbin /: "robots.txt") NoReqBody bsResponse mempty
319 robots <- B.readFile "httpbin-data/robots.txt"
263 robots <- B.readFile "httpbin-data/robots.txt"
320− responseBody r `shouldBe` robots
264+ responseBody r `shouldBe` robots
321− responseStatusCode r `shouldBe` 200
265+ responseStatusCode r `shouldBe` 200
322 responseStatusMessage r `shouldBe` "OK"
266 responseStatusMessage r `shouldBe` "OK"
323
267
324 -- TODO /deny
268 -- TODO /deny
@@ -329,15 +273,10 @@ spec = do
329 property $ \n' -> do
273 property $ \n' -> do
330 let n :: Word
274 let n :: Word
331 n = getSmall n'
275 n = getSmall n'
332− r <-
333− req
334− GET
335− (httpbin /: "bytes" /~ n)
276+ r <- req GET (httpbin /: "bytes" /~ n)
336− NoReqBody
337− lbsResponse
277+ NoReqBody lbsResponse mempty
338− mempty
339 responseBody r `shouldSatisfy` ((== n) . fromIntegral . BL.length)
278 responseBody r `shouldSatisfy` ((== n) . fromIntegral . BL.length)
340− responseStatusCode r `shouldBe` 200
279+ responseStatusCode r `shouldBe` 200
341 responseStatusMessage r `shouldBe` "OK"
280 responseStatusMessage r `shouldBe` "OK"
342 context "when we try to interpret 1000 random bytes as JSON" $
281 context "when we try to interpret 1000 random bytes as JSON" $
343 it "throws correct exception" $ do
282 it "throws correct exception" $ do
@@ -346,38 +285,29 @@ spec = do
346 selector _ = False
285 selector _ = False
347 n :: Int
286 n :: Int
348 n = 1000
287 n = 1000
349− req
350− GET
351− (httpbin /: "bytes" /~ n)
288+ req GET (httpbin /: "bytes" /~ n) NoReqBody
352− NoReqBody
353− (Proxy :: Proxy (JsonResponse Value))
289+ (Proxy :: Proxy (JsonResponse Value)) mempty
354− mempty
355− `shouldThrow` selector
290+ `shouldThrow` selector
356
291
357 describe "streaming random bytes" $
292 describe "streaming random bytes" $
358 it "works" $
293 it "works" $
359 property $ \n' -> do
294 property $ \n' -> do
360 let n :: Word
295 let n :: Word
361 n = getSmall n'
296 n = getSmall n'
362− r <-
363− req
364− GET
365− (httpbin /: "stream-bytes" /~ n)
297+ r <- req GET (httpbin /: "stream-bytes" /~ n)
366− NoReqBody
367− bsResponse
298+ NoReqBody bsResponse mempty
368− mempty
369 responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
299 responseBody r `shouldSatisfy` ((== n) . fromIntegral . B.length)
370− responseStatusCode r `shouldBe` 200
300+ responseStatusCode r `shouldBe` 200
371 responseStatusMessage r `shouldBe` "OK"
301 responseStatusMessage r `shouldBe` "OK"
372
302
373−-- TODO /links
303+ -- TODO /links
374−-- TODO /image
304+ -- TODO /image
375−-- TODO /image/png
305+ -- TODO /image/png
376−-- TODO /image/jpeg
306+ -- TODO /image/jpeg
377−-- TODO /image/webp
307+ -- TODO /image/webp
378−-- TODO /image/svg
308+ -- TODO /image/svg
379−-- TODO /forms/post
309+ -- TODO /forms/post
380−-- TODO /xml
310+ -- TODO /xml
381
311
382----------------------------------------------------------------------------
312----------------------------------------------------------------------------
383-- Instances
313-- Instances
@@ -388,125 +318,81 @@ instance MonadHttp IO where
388----------------------------------------------------------------------------
318----------------------------------------------------------------------------
389-- Helpers
319-- Helpers
390
320
391−-- | Run a request with such settings that it does not signal errors.
321+-- | Run request with such settings that it does not signal error on adverse
322+-- response status codes.
323+
392prepareForShit :: Req a -> IO a
324prepareForShit :: Req a -> IO a
393−prepareForShit = runReq defaultHttpConfig {httpConfigCheckResponse = noNoise}
325+prepareForShit = runReq def { httpConfigCheckResponse = noNoise }
394 where
326 where
395 noNoise _ _ _ = Nothing
327 noNoise _ _ _ = Nothing
396
328
397−-- | Run a request with such settings that it throws on any response.
329+-- | Run request with such settings that it throws on any response.
330+
398blindlyThrowing :: Req a -> IO a
331blindlyThrowing :: Req a -> IO a
399−blindlyThrowing = runReq defaultHttpConfig {httpConfigCheckResponse = doit}
332+blindlyThrowing = runReq def { httpConfigCheckResponse = doit }
400 where
333 where
401 doit _ _ = error "Oops!"
334 doit _ _ = error "Oops!"
402
335
403-- | 'Url' representing <https://httpbin.org>.
336-- | 'Url' representing <https://httpbin.org>.
337+
404−httpbin :: Url 'Http
338+httpbin :: Url 'Https
405−httpbin = http "localhost"
339+httpbin = https "httpbin.org"
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
426
340
427-- | Remove “origin” field from JSON value. Origin may change, we don't want
341-- | Remove “origin” field from JSON value. Origin may change, we don't want
428-- to depend on that.
342-- to depend on that.
343+
429stripOrigin :: Value -> Value
344stripOrigin :: Value -> Value
430−stripOrigin (Object m) = Object (Aeson.KeyMap.delete "origin" m)
345+stripOrigin (Object m) = Object (HM.delete "origin" m)
431−stripOrigin value = value
346+stripOrigin value = value
432
347
433-- | Remove funny headers that might break the tests.
348-- | Remove funny headers that might break the tests.
349+
434stripFunnyHeaders :: Value -> Value
350stripFunnyHeaders :: Value -> Value
435−stripFunnyHeaders = \case
351+stripFunnyHeaders (Object m) =
436− Object m ->
352+ let f (Object p) = Object $ HM.filterWithKey (\k _ -> k `elem` hs) p
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
353+ f value = value
457− where
458− whitelistedHeaders =
459− [ "Content-Type",
354+ hs = [ "Content-Type"
460− "Accept-Encoding",
355+ , "Accept-Encoding"
356+ , "Connection"
357+ , "Host"
461− "Content-Length",
358+ , "Content-Length"
462− "Foo",
359+ , "Foo"
463− "Baz"
360+ , "Baz" ]
464− ]
361+ in Object (HM.adjust f "headers" m)
362+stripFunnyHeaders value = value
465
363
466-- | This is a complete test case that makes use of <https://httpbin.org> to
364-- | This is a complete test case that makes use of <https://httpbin.org> to
467-- get various response status codes.
365-- get various response status codes.
366+
468checkStatusCode :: Int -> SpecWith ()
367checkStatusCode :: Int -> SpecWith ()
469checkStatusCode code =
368checkStatusCode code =
470 describe ("receiving status code " ++ show code) $
369 describe ("receiving status code " ++ show code) $
471 it "works" $ do
370 it "works" $ do
472− r <-
473− prepareForShit $
474− req
475− GET
476− (httpbin /: "status" /~ code)
371+ r <- prepareForShit $ req GET (httpbin /: "status" /~ code)
477− NoReqBody
478− ignoreResponse
372+ NoReqBody ignoreResponse mempty
479− mempty
480 responseStatusCode r `shouldBe` code
373 responseStatusCode r `shouldBe` code
481
374
482-- | Exception selector that selects only 404 “Not found” exceptions.
375-- | Exception selector that selects only 404 “Not found” exceptions.
376+
483selector404 :: HttpException -> Bool
377selector404 :: HttpException -> Bool
484−selector404
485− ( VanillaHttpException
378+selector404 (VanillaHttpException
486− ( L.HttpExceptionRequest
379+ (L.HttpExceptionRequest _
487− _
488− (L.StatusCodeException response chunk)
380+ (L.StatusCodeException response chunk))) =
489− )
490− ) =
491− L.responseStatus response == Y.status404 && not (B.null chunk)
381+ L.responseStatus response == Y.status404 && not (B.null chunk)
492selector404 _ = False
382selector404 _ = False
493
383
494−-- | Same as 'selector404' except that it uses 'isStatusCodeException'.
384+-- | Empty JSON 'Object'.
495−selector404ByStatusCodeException :: HttpException -> Bool
496−selector404ByStatusCodeException e =
497− case isStatusCodeException e of
498− Nothing -> False
499− Just r -> responseStatusCode r == 404
500
385
501−-- | The empty JSON 'Object'.
502emptyObject :: Value
386emptyObject :: Value
503−emptyObject = Object Aeson.KeyMap.empty
387+emptyObject = Object HM.empty
504
388
505−-- | Get a rendered JSON value as 'Text'.
389+-- | Get rendered JSON value as 'Text'.
390+
506−reflectJSON :: (ToJSON a) => a -> Text
391+reflectJSON :: ToJSON a => a -> Text
507reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
392reflectJSON = T.decodeUtf8 . BL.toStrict . A.encode
508
393
509-- | Clarify to the type checker that the inner computation is in the 'IO'
394-- | Clarify to the type checker that the inner computation is in the 'IO'
510-- monad.
395-- monad.
396+
511asIO :: IO a -> IO a
397asIO :: IO a -> IO a
512asIO = id
398asIO = id
pure-tests/Network/HTTP/ReqSpec.hs+211−352
@@ -1,71 +1,61 @@
1−{-# LANGUAGE DataKinds #-}
1+{-# LANGUAGE CPP #-}
2+{-# LANGUAGE DataKinds #-}
2−{-# LANGUAGE DeriveGeneric #-}
3+{-# LANGUAGE DeriveGeneric #-}
3−{-# LANGUAGE FlexibleInstances #-}
4+{-# LANGUAGE FlexibleInstances #-}
4−{-# LANGUAGE LambdaCase #-}
5−{-# LANGUAGE OverloadedStrings #-}
6−{-# LANGUAGE QuasiQuotes #-}
7−{-# LANGUAGE RankNTypes #-}
8−{-# LANGUAGE RecordWildCards #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE TypeApplications #-}
11{-# LANGUAGE NoMonomorphismRestriction #-}
5{-# LANGUAGE NoMonomorphismRestriction #-}
6+{-# LANGUAGE OverloadedStrings #-}
7+{-# LANGUAGE RankNTypes #-}
8+{-# LANGUAGE RecordWildCards #-}
9+{-# LANGUAGE ScopedTypeVariables #-}
12−{-# OPTIONS_GHC -fno-warn-orphans #-}
10+{-# OPTIONS_GHC -fno-warn-orphans #-}
13
11
14−module Network.HTTP.ReqSpec (spec) where
12+module Network.HTTP.ReqSpec
13+ ( spec )
14+where
15
15
16−import Blaze.ByteString.Builder qualified as BB
17import Control.Exception (throwIO)
16import Control.Exception (throwIO)
18−import Control.Monad
19−import Control.Retry
20import Data.Aeson (ToJSON (..))
17import Data.Aeson (ToJSON (..))
21−import Data.Aeson qualified as A
22import Data.ByteString (ByteString)
18import Data.ByteString (ByteString)
23−import Data.ByteString qualified as B
19+import Data.Default.Class
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)
20+import Data.Maybe (isNothing, fromJust)
21+import Data.Monoid ((<>))
30import Data.Proxy
22import Data.Proxy
31import Data.Text (Text)
23import Data.Text (Text)
32−import Data.Text qualified as T
33−import Data.Text.Encoding qualified as T
34import Data.Time
24import Data.Time
35−import Data.Typeable (Typeable, eqT)
36−import GHC.Exts (IsList (..))
37import GHC.Generics
25import 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
41import Network.HTTP.Req
26import Network.HTTP.Req
42−import Network.HTTP.Types qualified as Y
43−import Network.HTTP.Types.Header qualified as Y
44import Test.Hspec
27import Test.Hspec
45import Test.Hspec.Core.Spec (SpecM)
28import Test.Hspec.Core.Spec (SpecM)
46import Test.QuickCheck
29import Test.QuickCheck
47−import Text.URI (URI)
30+import qualified Blaze.ByteString.Builder as BB
48−import Text.URI qualified as URI
31+import qualified Data.Aeson as A
49−import Text.URI.QQ qualified as QQ
32+import qualified Data.ByteString as B
50−import Web.FormUrlEncoded qualified as F
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
51
41
52spec :: Spec
42spec :: Spec
53spec = do
43spec = do
44+
54 describe "config" $
45 describe "config" $
55 it "getHttpConfig has effect on resulting request" $
46 it "getHttpConfig has effect on resulting request" $
56 property $ \config -> do
47 property $ \config -> do
57 request <- runReq config (req_ GET url NoReqBody mempty)
48 request <- runReq config (req_ GET url NoReqBody mempty)
58− L.proxy request `shouldBe` httpConfigProxy config
49+ L.proxy request `shouldBe` httpConfigProxy config
59 L.redirectCount request `shouldBe` httpConfigRedirectCount config
50 L.redirectCount request `shouldBe` httpConfigRedirectCount config
60
51
61 describe "methods" $ do
52 describe "methods" $ do
62− let mnth ::
53+ let mnth
63− forall method.
54+ :: forall method.
64− ( HttpMethod method,
55+ ( HttpMethod method
65− HttpBodyAllowed (AllowsBody method) 'NoBody
56+ , HttpBodyAllowed (AllowsBody method) 'NoBody )
66− ) =>
57+ => method
67− method ->
68− SpecM () ()
58+ -> SpecM () ()
69 mnth method = do
59 mnth method = do
70 let name = httpMethodName (Proxy :: Proxy method)
60 let name = httpMethodName (Proxy :: Proxy method)
71 describe (B8.unpack name) $
61 describe (B8.unpack name) $
@@ -88,15 +78,15 @@ spec = do
88 property $ \host -> do
78 property $ \host -> do
89 request <- req_ GET (http host) NoReqBody mempty
79 request <- req_ GET (http host) NoReqBody mempty
90 L.secure request `shouldBe` False
80 L.secure request `shouldBe` False
91− L.port request `shouldBe` 80
81+ L.port request `shouldBe` 80
92− L.host request `shouldBe` urlEncode host
82+ L.host request `shouldBe` urlEncode host
93 describe "https" $
83 describe "https" $
94 it "sets all the params correctly" $
84 it "sets all the params correctly" $
95 property $ \host -> do
85 property $ \host -> do
96 request <- req_ GET (https host) NoReqBody mempty
86 request <- req_ GET (https host) NoReqBody mempty
97 L.secure request `shouldBe` True
87 L.secure request `shouldBe` True
98− L.port request `shouldBe` 443
88+ L.port request `shouldBe` 443
99− L.host request `shouldBe` urlEncode host
89+ L.host request `shouldBe` urlEncode host
100 describe "(/~)" $
90 describe "(/~)" $
101 it "attaches a path piece that is URL-encoded" $
91 it "attaches a path piece that is URL-encoded" $
102 property $ \host pieces -> do
92 property $ \host pieces -> do
@@ -111,95 +101,67 @@ spec = do
111 request <- req_ GET url' NoReqBody mempty
101 request <- req_ GET url' NoReqBody mempty
112 L.host request `shouldBe` urlEncode host
102 L.host request `shouldBe` urlEncode host
113 L.path request `shouldBe` encodePathPieces pieces
103 L.path request `shouldBe` encodePathPieces pieces
114−
115− describe "useHttpURI" $ do
104+ describe "parseUrlHttp" $ do
116 it "does not recognize non-http schemes" $
105 it "does not recognize non-http schemes" $
117− property $ \uri ->
118− when (URI.uriScheme uri /= Just [QQ.scheme|http|]) $
119− useHttpURI uri `shouldSatisfy` isNothing
106+ parseUrlHttp "https://httpbin.org" `shouldSatisfy` isNothing
120− it "accepts correct URLs" $
107+ it "parses correct URLs" $
121− property $ \uri' -> do
108+ property $ \host mport' pieces queryParams -> do
122− unless (isRight (URI.uriAuthority uri')) discard
109+ let (url', path, queryString) =
123− let uri = uri' {URI.uriScheme = Just [QQ.scheme|http|]}
110+ assembleUrl Http host mport' pieces queryParams
124− (url', options) = fromJust (useHttpURI uri)
111+ (url'', options) = fromJust (parseUrlHttp url')
125− request <- req_ GET url' NoReqBody options
112+ request <- req_ GET url'' NoReqBody options
126− L.host request `shouldBe` uriHost uri
113+ L.host request `shouldBe` urlEncode (unHost host)
127− L.port request `shouldBe` uriPort 80 uri
114+ L.port request `shouldBe` maybe 80 getNonNegative mport'
128− L.path request `shouldBe` uriPath uri
115+ L.path request `shouldBe` path
129− L.queryString request `shouldBe` uriQuery uri
116+ L.queryString request `shouldBe` queryString
130− lookup "Authorization" (L.requestHeaders request)
117+ it "rejects gibberish in port component" $ do
131− `shouldBe` uriBasicAuth uri
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
132− describe "useHttpsURI" $ do
121+ describe "parseUrlHttps" $ do
133 it "does not recognize non-https schemes" $
122 it "does not recognize non-https schemes" $
134− property $ \uri ->
135− when (URI.uriScheme uri /= Just [QQ.scheme|https|]) $
136− useHttpsURI uri `shouldSatisfy` isNothing
123+ parseUrlHttps "http://httpbin.org" `shouldSatisfy` isNothing
137 it "parses correct URLs" $
124 it "parses correct URLs" $
138− property $ \uri' -> do
125+ property $ \host mport' pieces queryParams -> do
139− unless (isRight (URI.uriAuthority uri')) discard
126+ let (url', path, queryString) =
140− let uri = uri' {URI.uriScheme = Just [QQ.scheme|https|]}
127+ assembleUrl Https host mport' pieces queryParams
141− (url', options) = fromJust (useHttpsURI uri)
128+ (url'', options) = fromJust (parseUrlHttps url')
142− request <- req_ GET url' NoReqBody options
129+ request <- req_ GET url'' NoReqBody options
143− L.host request `shouldBe` uriHost uri
130+ L.host request `shouldBe` urlEncode (unHost host)
144− L.port request `shouldBe` uriPort 443 uri
131+ L.port request `shouldBe` maybe 443 getNonNegative mport'
145− L.path request `shouldBe` uriPath uri
132+ L.path request `shouldBe` path
146− L.queryString request `shouldBe` uriQuery uri
133+ L.queryString request `shouldBe` queryString
147− lookup "Authorization" (L.requestHeaders request)
134+ it "rejects gibberish in port component" $ do
148− `shouldBe` uriBasicAuth uri
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
149− describe "useURI" $ do
138+ describe "parseUrl" $ do
150 it "does not recognize non-http and non-https schemes" $
139 it "does not recognize non-http and non-https schemes" $
151− property $ \uri ->
152− when
153− ( ( URI.uriScheme uri /= Just [QQ.scheme|http|]
154− && (URI.uriScheme uri /= Just [QQ.scheme|https|])
155− )
156− )
157− $ useURI uri `shouldSatisfy` isNothing
140+ parseUrl "ftp://httpbin.org" `shouldSatisfy` isNothing
158− it "parses correct URLs" $
141+ it "parses correct http URLs" $
159− property $ \uri' -> do
142+ property $ \host mport' pieces queryParams -> do
160− unless (isRight (URI.uriAuthority uri')) discard
143+ let (url', path, queryString) =
161− let uriHttp = uri' {URI.uriScheme = Just [QQ.scheme|http|]}
144+ assembleUrl Http host mport' pieces queryParams
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
145+ Left (url'', options) = fromJust (parseUrl url')
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
146+ request <- req_ GET url'' NoReqBody options
170− _ -> error "(useURI uriHttps) should have returned Right"
147+ L.host request `shouldBe` urlEncode (unHost host)
171− L.host requestHttp `shouldBe` uriHost uriHttp
148+ L.port request `shouldBe` maybe 80 getNonNegative mport'
172− L.host requestHttps `shouldBe` uriHost uriHttps
149+ L.path request `shouldBe` path
173− L.port requestHttp `shouldBe` uriPort 80 uriHttp
150+ L.queryString request `shouldBe` queryString
174− L.port requestHttps `shouldBe` uriPort 443 uriHttps
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'
175− L.path requestHttp `shouldBe` uriPath uriHttp
159+ L.path request `shouldBe` path
176− L.path requestHttps `shouldBe` uriPath uriHttps
177− L.queryString requestHttp `shouldBe` uriQuery uriHttp
160+ L.queryString request `shouldBe` queryString
178− L.queryString requestHttps `shouldBe` uriQuery uriHttps
161+ it "rejects gibberish in port component" $ do
179− lookup "Authorization" (L.requestHeaders requestHttp)
162+ parseUrl "http://my-site.com:bob/far" `shouldSatisfy` isNothing
180− `shouldBe` uriBasicAuth uriHttp
163+ parseUrl "https://my-site.com:7001uh/api" `shouldSatisfy` isNothing
181− lookup "Authorization" (L.requestHeaders requestHttps)
164+ parseUrl "http://my-site.com:/bar" `shouldSatisfy` isNothing
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"
203
165
204 describe "bodies" $ do
166 describe "bodies" $ do
205 describe "NoReqBody" $
167 describe "NoReqBody" $
@@ -223,7 +185,7 @@ spec = do
223 L.RequestBodyBS x -> x `shouldBe` bs
185 L.RequestBodyBS x -> x `shouldBe` bs
224 _ -> expectationFailure "Wrong request body constructor."
186 _ -> expectationFailure "Wrong request body constructor."
225 describe "ReqBodyLbs" $
187 describe "ReqBodyLbs" $
226− it "sets body to specified lazy byte string" $
188+ it "sets body to specified lazy byte string" $
227 property $ \lbs -> do
189 property $ \lbs -> do
228 request <- req_ POST url (ReqBodyLbs lbs) mempty
190 request <- req_ POST url (ReqBodyLbs lbs) mempty
229 case L.requestBody request of
191 case L.requestBody request of
@@ -237,19 +199,6 @@ spec = do
237 L.RequestBodyLBS x -> x `shouldBe` renderQuery params
199 L.RequestBodyLBS x -> x `shouldBe` renderQuery params
238 _ -> expectationFailure "Wrong request body constructor."
200 _ -> expectationFailure "Wrong request body constructor."
239
201
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−
253 describe "optional parameters" $ do
202 describe "optional parameters" $ do
254 describe "header" $ do
203 describe "header" $ do
255 it "sets specified header value" $
204 it "sets specified header value" $
@@ -258,136 +207,94 @@ spec = do
258 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value
207 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value
259 it "left header wins" $
208 it "left header wins" $
260 property $ \name value0 value1 -> do
209 property $ \name value0 value1 -> do
261− request <-
262− req_
263− GET
264− url
265− NoReqBody
210+ request <- req_ GET url NoReqBody
266− (header name value0 <> header name value1)
211+ (header name value0 <> header name value1)
267 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value0
212 lookup (CI.mk name) (L.requestHeaders request) `shouldBe` pure value0
268 it "overwrites headers set by other parts of the lib" $
213 it "overwrites headers set by other parts of the lib" $
269 property $ \value -> do
214 property $ \value -> do
270− request <-
271− req_
272− POST
273− url
274− (ReqBodyUrlEnc mempty)
215+ request <- req_ POST url (ReqBodyUrlEnc mempty)
275− (header "Content-Type" value)
216+ (header "Content-Type" value)
276 lookup "Content-Type" (L.requestHeaders request) `shouldBe` pure value
217 lookup "Content-Type" (L.requestHeaders request) `shouldBe` pure value
277 describe "cookieJar" $
218 describe "cookieJar" $
278 it "cookie jar is set without modifications" $
219 it "cookie jar is set without modifications" $
279 property $ \cjar -> do
220 property $ \cjar -> do
280 request <- req_ GET url NoReqBody (cookieJar cjar)
221 request <- req_ GET url NoReqBody (cookieJar cjar)
281− L.cookieJar request `shouldSatisfy` (maybe False (L.equalCookieJar cjar))
222+ L.cookieJar request `shouldBe` pure cjar
282 describe "basicAuth" $ do
223 describe "basicAuth" $ do
283 it "sets Authorization header to correct value" $
224 it "sets Authorization header to correct value" $
284 property $ \username password -> do
225 property $ \username password -> do
285 request <- req_ GET url NoReqBody (basicAuth username password)
226 request <- req_ GET url NoReqBody (basicAuth username password)
286− lookup "Authorization" (L.requestHeaders request)
227+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
287− `shouldBe` Just (basicAuthHeader username password)
228+ pure (basicAuthHeader username password)
288 it "overwrites manual setting of header" $
229 it "overwrites manual setting of header" $
289 property $ \username password value -> do
230 property $ \username password value -> do
290− request0 <-
291− req_
292− GET
293− url
294− NoReqBody
231+ request0 <- req_ GET url NoReqBody
295− (basicAuth username password <> header "Authorization" value)
232+ (basicAuth username password <> header "Authorization" value)
296− request1 <-
297− req_
298− GET
299− url
300− NoReqBody
233+ request1 <- req_ GET url NoReqBody
301− (header "Authorization" value <> basicAuth username password)
234+ (header "Authorization" value <> basicAuth username password)
302− let result = Just (basicAuthHeader username password)
235+ let result = basicAuthHeader username password
303− lookup "Authorization" (L.requestHeaders request0) `shouldBe` result
236+ lookup "Authorization" (L.requestHeaders request0) `shouldBe`
237+ pure result
304− lookup "Authorization" (L.requestHeaders request1) `shouldBe` result
238+ lookup "Authorization" (L.requestHeaders request1) `shouldBe`
239+ pure result
305 it "left auth option wins" $
240 it "left auth option wins" $
306 property $ \username0 password0 username1 password1 -> do
241 property $ \username0 password0 username1 password1 -> do
307− request <-
308− req_
309− GET
310− url
311− NoReqBody
242+ request <- req_ GET url NoReqBody
312− (basicAuth username0 password0 <> basicAuth username1 password1)
243+ (basicAuth username0 password0 <> basicAuth username1 password1)
313− lookup "Authorization" (L.requestHeaders request)
244+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
314− `shouldBe` Just (basicAuthHeader username0 password0)
245+ pure (basicAuthHeader username0 password0)
315 describe "oAuth2Bearer" $ do
246 describe "oAuth2Bearer" $ do
316 it "sets Authorization header to correct value" $
247 it "sets Authorization header to correct value" $
317 property $ \token -> do
248 property $ \token -> do
318 request <- req_ GET url NoReqBody (oAuth2Bearer token)
249 request <- req_ GET url NoReqBody (oAuth2Bearer token)
319− lookup "Authorization" (L.requestHeaders request)
250+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
320− `shouldBe` pure ("Bearer " <> token)
251+ pure ("Bearer " <> token)
321 it "overwrites manual setting of header" $
252 it "overwrites manual setting of header" $
322 property $ \token value -> do
253 property $ \token value -> do
323− request0 <-
324− req_
325− GET
326− url
327− NoReqBody
254+ request0 <- req_ GET url NoReqBody
328− (oAuth2Bearer token <> header "Authorization" value)
255+ (oAuth2Bearer token <> header "Authorization" value)
329− request1 <-
330− req_
331− GET
332− url
333− NoReqBody
256+ request1 <- req_ GET url NoReqBody
334− (header "Authorization" value <> oAuth2Bearer token)
257+ (header "Authorization" value <> oAuth2Bearer token)
335 let result = "Bearer " <> token
258 let result = "Bearer " <> token
336− lookup "Authorization" (L.requestHeaders request0)
259+ lookup "Authorization" (L.requestHeaders request0) `shouldBe`
337− `shouldBe` pure result
260+ pure result
338− lookup "Authorization" (L.requestHeaders request1)
261+ lookup "Authorization" (L.requestHeaders request1) `shouldBe`
339− `shouldBe` pure result
262+ pure result
340 it "left auth option wins" $
263 it "left auth option wins" $
341 property $ \token0 token1 -> do
264 property $ \token0 token1 -> do
342− request <-
343− req_
344− GET
345− url
346− NoReqBody
265+ request <- req_ GET url NoReqBody
347− (oAuth2Bearer token0 <> oAuth2Bearer token1)
266+ (oAuth2Bearer token0 <> oAuth2Bearer token1)
348− lookup "Authorization" (L.requestHeaders request)
267+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
349− `shouldBe` pure ("Bearer " <> token0)
268+ pure ("Bearer " <> token0)
350− describe "ProxyAuthorization" $
269+ describe "ProxyAuthorization" $ do
351 it "sets Authorization header to correct value" $
270 it "sets Authorization header to correct value" $
352 property $ \username password -> do
271 property $ \username password -> do
353 request <- req_ GET url NoReqBody (basicProxyAuth username password)
272 request <- req_ GET url NoReqBody (basicProxyAuth username password)
354− lookup "Proxy-Authorization" (L.requestHeaders request)
273+ lookup "Proxy-Authorization" (L.requestHeaders request) `shouldBe`
355− `shouldBe` pure (basicProxyAuthHeader username password)
274+ pure (basicProxyAuthHeader username password)
356 describe "oAuth2Token" $ do
275 describe "oAuth2Token" $ do
357 it "sets Authorization header to correct value" $
276 it "sets Authorization header to correct value" $
358 property $ \token -> do
277 property $ \token -> do
359 request <- req_ GET url NoReqBody (oAuth2Token token)
278 request <- req_ GET url NoReqBody (oAuth2Token token)
360− lookup "Authorization" (L.requestHeaders request)
279+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
361− `shouldBe` pure ("token " <> token)
280+ pure ("token " <> token)
362 it "overwrites manual setting of header" $
281 it "overwrites manual setting of header" $
363 property $ \token value -> do
282 property $ \token value -> do
364− request0 <-
365− req_
366− GET
367− url
368− NoReqBody
283+ request0 <- req_ GET url NoReqBody
369− (oAuth2Token token <> header "Authorization" value)
284+ (oAuth2Token token <> header "Authorization" value)
370− request1 <-
371− req_
372− GET
373− url
374− NoReqBody
285+ request1 <- req_ GET url NoReqBody
375− (header "Authorization" value <> oAuth2Token token)
286+ (header "Authorization" value <> oAuth2Token token)
376 let result = "token " <> token
287 let result = "token " <> token
377− lookup "Authorization" (L.requestHeaders request0)
288+ lookup "Authorization" (L.requestHeaders request0) `shouldBe`
378− `shouldBe` pure result
289+ pure result
379− lookup "Authorization" (L.requestHeaders request1)
290+ lookup "Authorization" (L.requestHeaders request1) `shouldBe`
380− `shouldBe` pure result
291+ pure result
381 it "left auth option wins" $
292 it "left auth option wins" $
382 property $ \token0 token1 -> do
293 property $ \token0 token1 -> do
383− request <-
384− req_
385− GET
386− url
387− NoReqBody
294+ request <- req_ GET url NoReqBody
388− (oAuth2Token token0 <> oAuth2Token token1)
295+ (oAuth2Token token0 <> oAuth2Token token1)
389− lookup "Authorization" (L.requestHeaders request)
296+ lookup "Authorization" (L.requestHeaders request) `shouldBe`
390− `shouldBe` pure ("token " <> token0)
297+ pure ("token " <> token0)
391 describe "port" $
298 describe "port" $
392 it "sets port overwriting the defaults" $
299 it "sets port overwriting the defaults" $
393 property $ \n -> do
300 property $ \n -> do
@@ -407,19 +314,6 @@ spec = do
407 request <- req_ GET url NoReqBody (httpVersion major minor)
314 request <- req_ GET url NoReqBody (httpVersion major minor)
408 L.requestVersion request `shouldBe` Y.HttpVersion major minor
315 L.requestVersion request `shouldBe` Y.HttpVersion major minor
409
316
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−
423----------------------------------------------------------------------------
317----------------------------------------------------------------------------
424-- Instances
318-- Instances
425
319
@@ -428,27 +322,21 @@ instance MonadHttp IO where
428
322
429instance Arbitrary HttpConfig where
323instance Arbitrary HttpConfig where
430 arbitrary = do
324 arbitrary = do
431− httpConfigProxy <- arbitrary
325+ httpConfigProxy <- arbitrary
432 httpConfigRedirectCount <- arbitrary
326 httpConfigRedirectCount <- arbitrary
433− let httpConfigAltManager = Nothing
327+ let httpConfigAltManager = Nothing
434 httpConfigCheckResponse _ _ _ = Nothing
328 httpConfigCheckResponse _ _ _ = Nothing
435− httpConfigRetryPolicy = retryPolicyDefault
329+ httpConfigRetryPolicy = def
436− httpConfigRetryJudge _ _ = False
330+ httpConfigRetryJudge _ _ = False
437− httpConfigRetryJudgeException _ _ = False
438− httpConfigBodyPreviewLength = 1024
439 return HttpConfig {..}
331 return HttpConfig {..}
440
332
441instance Show HttpConfig where
333instance Show HttpConfig where
442 show HttpConfig {..} =
334 show HttpConfig {..} =
443− "HttpConfig\n"
335+ "HttpConfig\n" ++
444− ++ "{ httpConfigProxy="
445− ++ show httpConfigProxy
336+ "{ httpConfigProxy=" ++ show httpConfigProxy ++ "\n" ++
446− ++ "\n"
447− ++ ", httpRedirectCount="
448− ++ show httpConfigRedirectCount
337+ ", httpRedirectCount=" ++ show httpConfigRedirectCount ++ "\n" ++
449− ++ "\n"
450− ++ ", httpConfigAltManager=<cannot be shown>\n"
338+ ", httpConfigAltManager=<cannot be shown>\n" ++
451− ++ ", httpConfigCheckResponse=<cannot be shown>}\n"
339+ ", httpConfigCheckResponse=<cannot be shown>}\n"
452
340
453instance Arbitrary L.Proxy where
341instance Arbitrary L.Proxy where
454 arbitrary = L.Proxy <$> arbitrary <*> arbitrary
342 arbitrary = L.Proxy <$> arbitrary <*> arbitrary
@@ -466,10 +354,9 @@ instance Show (Option scheme) where
466 show _ = "<cannot be shown>"
354 show _ = "<cannot be shown>"
467
355
468data Thing = Thing
356data Thing = Thing
469− { _thingBool :: Bool,
357+ { _thingBool :: Bool
470− _thingText :: Text
358+ , _thingText :: Text
471− }
472− deriving (Eq, Show, Generic)
359+ } deriving (Eq, Show, Generic)
473
360
474instance ToJSON Thing
361instance ToJSON Thing
475
362
@@ -481,17 +368,17 @@ instance Arbitrary L.CookieJar where
481
368
482instance Arbitrary L.Cookie where
369instance Arbitrary L.Cookie where
483 arbitrary = do
370 arbitrary = do
484− cookie_name <- arbitrary
371+ cookie_name <- arbitrary
485− cookie_value <- arbitrary
372+ cookie_value <- arbitrary
486− cookie_expiry_time <- arbitrary
373+ cookie_expiry_time <- arbitrary
487− cookie_domain <- arbitrary
374+ cookie_domain <- arbitrary
488− cookie_path <- arbitrary
375+ cookie_path <- arbitrary
489 cookie_creation_time <- arbitrary
376 cookie_creation_time <- arbitrary
490 cookie_last_access_time <- arbitrary
377 cookie_last_access_time <- arbitrary
491− cookie_persistent <- arbitrary
378+ cookie_persistent <- arbitrary
492− cookie_host_only <- arbitrary
379+ cookie_host_only <- arbitrary
493− cookie_secure_only <- arbitrary
380+ cookie_secure_only <- arbitrary
494− cookie_http_only <- arbitrary
381+ cookie_http_only <- arbitrary
495 return L.Cookie {..}
382 return L.Cookie {..}
496
383
497instance Arbitrary UTCTime where
384instance Arbitrary UTCTime where
@@ -503,20 +390,19 @@ instance Arbitrary Day where
503instance Arbitrary DiffTime where
390instance Arbitrary DiffTime where
504 arbitrary = secondsToDiffTime <$> arbitrary
391 arbitrary = secondsToDiffTime <$> arbitrary
505
392
506−instance Arbitrary F.Form where
507− arbitrary = (F.Form . fromList) <$> arbitrary
508−
509----------------------------------------------------------------------------
393----------------------------------------------------------------------------
510-- Helper types
394-- Helper types
511
395
512-- | A wrapper to generate correct hosts.
396-- | A wrapper to generate correct hosts.
397+
513−newtype Host = Host {unHost :: Text}
398+newtype Host = Host { unHost :: Text }
514 deriving (Eq, Show)
399 deriving (Eq, Show)
515
400
516instance Arbitrary Host where
401instance Arbitrary Host where
517 arbitrary = Host . T.pack <$> listOf1 (arbitrary `suchThat` (/= ':'))
402 arbitrary = Host . T.pack <$> listOf1 (arbitrary `suchThat` (/= ':'))
518
403
519-- | A wrapper to generate correct query parameters.
404-- | A wrapper to generate correct query parameters.
405+
520newtype QueryParams = QueryParams [(Text, Maybe Text)]
406newtype QueryParams = QueryParams [(Text, Maybe Text)]
521 deriving (Eq, Show)
407 deriving (Eq, Show)
522
408
@@ -529,84 +415,68 @@ instance Arbitrary QueryParams where
529-- Helpers
415-- Helpers
530
416
531-- | 'req' that just returns the prepared 'L.Request'.
417-- | 'req' that just returns the prepared 'L.Request'.
418+
532−req_ ::
419+req_
533− ( MonadHttp m,
420+ :: ( MonadHttp m
534− HttpMethod method,
421+ , HttpMethod method
535− HttpBody body,
422+ , HttpBody body
536− HttpBodyAllowed (AllowsBody method) (ProvidesBody body)
423+ , HttpBodyAllowed (AllowsBody method) (ProvidesBody body) )
537− ) =>
538− -- | HTTP method
424+ => method -- ^ HTTP method
539− method ->
540− -- | 'Url' — location of resource
425+ -> Url scheme -- ^ 'Url' — location of resource
541− Url scheme ->
542− -- | Body of the request
426+ -> body -- ^ Body of the request
543− body ->
544− -- | Collection of optional parameters
427+ -> Option scheme -- ^ Collection of optional parameters
545− Option scheme ->
546− -- | Vanilla request
547− m L.Request
428+ -> m L.Request -- ^ Vanilla request
548req_ method url' body options = req' method url' body options $
429req_ method url' body options = req' method url' body options $
549 \request _ -> return request
430 \request _ -> return request
550
431
551-- | A dummy 'Url'.
432-- | A dummy 'Url'.
433+
552url :: Url 'Https
434url :: Url 'Https
553url = https "httpbin.org"
435url = https "httpbin.org"
554
436
555-- | Percent encode given 'Text'.
437-- | Percent encode given 'Text'.
438+
556urlEncode :: Text -> ByteString
439urlEncode :: Text -> ByteString
557urlEncode = Y.urlEncode False . T.encodeUtf8
440urlEncode = Y.urlEncode False . T.encodeUtf8
558
441
559-- | Build URL path from given path pieces.
442-- | Build URL path from given path pieces.
443+
560encodePathPieces :: [Text] -> ByteString
444encodePathPieces :: [Text] -> ByteString
561encodePathPieces = BL.toStrict . BB.toLazyByteString . Y.encodePathSegments
445encodePathPieces = BL.toStrict . BB.toLazyByteString . Y.encodePathSegments
562
446
563−-- | Get host from a 'URI'. This function is not total.
447+-- | Assemble a URL.
564−uriHost :: URI -> ByteString
448+
565−uriHost uri =
449+assembleUrl
566− fromJust $
450+ :: Scheme -- ^ Scheme
567− urlEncode . URI.unRText . URI.authHost
451+ -> Host -- ^ Host
568− <$> either (const Nothing) Just (URI.uriAuthority uri)
452+ -> Maybe (NonNegative Int) -- ^ Port
569−
453+ -> [Text] -- ^ Path pieces
570−-- | Get part from a 'URI' defaulting to the provided value.
454+ -> QueryParams -- ^ Query parameters
571−uriPort :: Int -> URI -> Int
455+ -> (ByteString, ByteString, ByteString) -- ^ URL, path, query string
572−uriPort def uri =
456+assembleUrl scheme' (Host host') mport' pathPieces (QueryParams queryParams) =
573− maybe def (fromIntegral) $
457+ (scheme <> host <> port' <> path <> queryString, path, queryString)
574− either (const Nothing) Just (URI.uriAuthority uri) >>= URI.authPort
458+ where
575−
459+ scheme = case scheme' of
576−-- | Get the path from a 'URI'.
460+ Http -> "http://"
577−uriPath :: URI -> ByteString
461+ Https -> "https://"
578−uriPath uri = fromMaybe "" $ do
462+ host = urlEncode host'
579− (trailingSlash, xs) <- URI.uriPath uri
463+ port' =
464+ case mport' of
465+ Nothing -> ""
466+ Just (NonNegative x) -> ":" <> B8.pack (show x)
580− let pref = (encodePathPieces . fmap URI.unRText . NE.toList) xs
467+ path = encodePathPieces pathPieces
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)))
468+ queryString = Y.renderQuery True (Y.queryTextToQuery queryParams)
590−
469+
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'.
602renderQuery :: [(Text, Maybe Text)] -> BL.ByteString
470renderQuery :: [(Text, Maybe Text)] -> BL.ByteString
603renderQuery = BL.fromStrict . Y.renderQuery False . Y.queryTextToQuery
471renderQuery = BL.fromStrict . Y.renderQuery False . Y.queryTextToQuery
604
472
605-- | Convert collection of query parameters to 'FormUrlEncodedParam' thing.
473-- | Convert collection of query parameters to 'FormUrlEncodedParam' thing.
474+
606formUrlEnc :: [(Text, Maybe Text)] -> FormUrlEncodedParam
475formUrlEnc :: [(Text, Maybe Text)] -> FormUrlEncodedParam
607formUrlEnc = foldMap (uncurry queryParam)
476formUrlEnc = foldMap (uncurry queryParam)
608
477
609-- | Get “Authorization” basic auth header given username and password.
478-- | Get “Authorization” basic auth header given username and password.
479+
610basicAuthHeader :: ByteString -> ByteString -> ByteString
480basicAuthHeader :: ByteString -> ByteString -> ByteString
611basicAuthHeader username password =
481basicAuthHeader username password =
612 fromJust . lookup Y.hAuthorization . L.requestHeaders $
482 fromJust . lookup Y.hAuthorization . L.requestHeaders $
@@ -614,19 +484,8 @@ basicAuthHeader username password =
614
484
615-- | Get "Proxy-Authorization" basic proxy auth header given username and
485-- | Get "Proxy-Authorization" basic proxy auth header given username and
616-- password.
486-- password.
487+
617basicProxyAuthHeader :: ByteString -> ByteString -> ByteString
488basicProxyAuthHeader :: ByteString -> ByteString -> ByteString
618basicProxyAuthHeader username password =
489basicProxyAuthHeader username password =
619 fromJust . lookup Y.hProxyAuthorization . L.requestHeaders $
490 fromJust . lookup Y.hProxyAuthorization . L.requestHeaders $
620 L.applyBasicProxyAuth username password L.defaultRequest
491 L.applyBasicProxyAuth username password L.defaultRequest
621−
622−-- | Spec about 'paramToList' for the type @p@.
623−specParamToList :: (QueryParam p, Monoid p) => Proxy p -> Spec
624−specParamToList typeProxy = do
625− describe "paramToList" $ do
626− it "should reproduce the parameters given by queryParam" $
627− property $ \(QueryParams params) -> do
628− let queryParam0 =
629− (mconcat $ fmap (uncurry queryParam) params)
630− `asProxyTypeOf` typeProxy
631− got = queryParamToList queryParam0
632− got `shouldBe` params
req.cabal+104−117
@@ -1,127 +1,114 @@
1+name: req
2+version: 1.2.1
1−cabal-version: 2.4
3+cabal-version: 1.18
2−name: req
4+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3, GHC==8.6.1
3−version: 3.13.4
4−license: BSD-3-Clause
5+license: BSD3
5−license-file: LICENSE.md
6+license-file: LICENSE.md
6−maintainer: Mark Karpov <markkarpov92@gmail.com>
7−author: 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
8+maintainer: Mark Karpov <markkarpov92@gmail.com>
9−homepage: https://github.com/mrkkrp/req
9+homepage: https://github.com/mrkkrp/req
10−bug-reports: https://github.com/mrkkrp/req/issues
10+bug-reports: https://github.com/mrkkrp/req/issues
11−synopsis: HTTP client library
12−description: HTTP client library.
13−category: Network, Web
11+category: Network, Web
12+synopsis: Easy-to-use, type-safe, expandable, high-level HTTP client library
14−build-type: Simple
13+build-type: Simple
15−data-files:
14+description: Easy-to-use, type-safe, expandable, high-level HTTP client library.
16− httpbin-data/utf8.html
17− httpbin-data/robots.txt
18−
19−extra-doc-files:
15+extra-doc-files: CHANGELOG.md
20− CHANGELOG.md
21− README.md
16+ , README.md
17+data-files: httpbin-data/utf8.html
18+ , httpbin-data/robots.txt
22
19
23source-repository head
20source-repository head
24− type: git
21+ type: git
25− location: https://github.com/mrkkrp/req.git
22+ location: https://github.com/mrkkrp/req.git
26
23
27flag dev
24flag dev
28− description: Turn on development settings.
25+ description: Turn on development settings.
29− default: False
30− manual: True
26+ manual: True
27+ default: False
31
28
32library
29library
33− exposed-modules: Network.HTTP.Req
34− default-language: GHC2021
35− build-depends:
30+ build-depends: aeson >= 0.9 && < 1.5
36− aeson >=0.9 && <3,
37− authenticate-oauth >=1.5 && <1.8,
31+ , authenticate-oauth >= 1.5 && < 1.7
38− base >=4.15 && <5,
32+ , base >= 4.8 && < 5.0
39− blaze-builder >=0.3 && <0.5,
33+ , blaze-builder >= 0.3 && < 0.5
40− bytestring >=0.10.8 && <0.13,
34+ , bytestring >= 0.10.8 && < 0.11
41− case-insensitive >=0.2 && <1.3,
35+ , case-insensitive >= 0.2 && < 1.3
42− containers >=0.5 && <0.8,
43− crypton-connection >=0.4.2 && <0.5,
36+ , connection >= 0.2.2 && < 0.3
44− data-default-class >=0.2.0.0,
37+ , data-default-class
45− exceptions >=0.6 && <0.11,
46− http-api-data >=0.2 && <0.7,
38+ , http-api-data >= 0.2 && < 0.4
47− http-client >=0.7.13.1 && <0.8,
39+ , http-client >= 0.5 && < 0.6
48− http-client-tls >=0.3.2 && <0.4,
40+ , http-client-tls >= 0.3.2 && < 0.4
49− http-types >=0.8 && <10,
41+ , http-types >= 0.8 && < 10.0
50− modern-uri >=0.3 && <0.4,
51− monad-control >=1.0 && <1.1,
42+ , monad-control >= 1.0 && < 1.1
52− mtl >=2.0 && <3.0,
43+ , mtl >= 2.0 && < 3.0
53− retry >=0.8 && <0.10,
44+ , retry >= 0.7 && < 0.8
54− template-haskell >=2.19 && <2.23,
55− text >=0.2 && <2.2,
45+ , text >= 0.2 && < 1.3
56− transformers >=0.5.3.0 && <0.7,
46+ , time >= 1.2 && < 1.9
47+ , transformers >= 0.4 && < 0.6
57− transformers-base,
48+ , transformers-base
58− unliftio-core >=0.1.1 && <0.3
49+ if !impl(ghc >= 8.0)
59−
50+ build-depends: semigroups == 0.18.*
51+ exposed-modules: Network.HTTP.Req
60− if flag(dev)
52+ if flag(dev)
61− ghc-options:
53+ ghc-options: -O0 -Wall -Werror
62− -Wall -Werror -Wpartial-fields -Wunused-packages
63− -Wno-unused-imports
64−
65− else
54+ else
66− ghc-options: -O2 -Wall
55+ ghc-options: -O2 -Wall
56+ if flag(dev) && impl(ghc >= 8.0)
57+ ghc-options: -Wcompat
58+ -Wincomplete-record-updates
59+ -Wincomplete-uni-patterns
60+ -Wnoncanonical-monad-instances
61+ -Wnoncanonical-monadfail-instances
62+ default-language: Haskell2010
67
63
68test-suite pure-tests
64test-suite pure-tests
69− type: exitcode-stdio-1.0
70− main-is: Spec.hs
65+ main-is: Spec.hs
71− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
66+ other-modules: Network.HTTP.ReqSpec
72− hs-source-dirs: pure-tests
67+ hs-source-dirs: pure-tests
73− other-modules: Network.HTTP.ReqSpec
68+ type: exitcode-stdio-1.0
74− default-language: GHC2021
75− build-depends:
76− QuickCheck >=2.7 && <3,
69+ build-depends: QuickCheck >= 2.7 && < 3.0
77− aeson >=0.9 && <3,
70+ , aeson >= 0.9 && < 1.5
78− base >=4.15 && <5.0,
71+ , base >= 4.8 && < 5.0
79− blaze-builder >=0.3 && <0.5,
72+ , blaze-builder >= 0.3 && < 0.5
80− bytestring >=0.10.8 && <0.13,
73+ , bytestring >= 0.10.8 && < 0.11
81− case-insensitive >=0.2 && <1.3,
74+ , case-insensitive >= 0.2 && < 1.3
82− hspec >=2.0 && <3,
75+ , data-default-class
83− hspec-core >=2.0 && <3,
76+ , hspec >= 2.0 && < 3.0
84− http-api-data >=0.2 && <0.7,
77+ , hspec-core >= 2.0 && < 3.0
85− http-client >=0.7 && <0.8,
78+ , http-client >= 0.5 && < 0.6
86− http-types >=0.8 && <10,
79+ , http-types >= 0.8 && < 10.0
87− modern-uri >=0.3 && <0.4,
80+ , mtl >= 2.0 && < 3.0
88− req,
81+ , req
89− retry >=0.8 && <0.10,
90− template-haskell >=2.19 && <2.23,
91− text >=0.2 && <2.2,
82+ , text >= 0.2 && < 1.3
92− time >=1.2 && <1.15
83+ , time >= 1.2 && < 1.9
93−
84+ build-tools: hspec-discover >= 2.0 && < 3.0
94− if flag(dev)
85+ if flag(dev)
95− ghc-options:
86+ ghc-options: -O0 -Wall -Werror
96− -Wall -Werror -Wredundant-constraints -Wpartial-fields
97− -Wunused-packages
98−
99− else
87+ else
100− ghc-options: -O2 -Wall
88+ ghc-options: -O2 -Wall
89+ default-language: Haskell2010
101
90
102test-suite httpbin-tests
91test-suite httpbin-tests
103− type: exitcode-stdio-1.0
104− main-is: Spec.hs
92+ main-is: Spec.hs
105− build-tool-depends: hspec-discover:hspec-discover >=2 && <3
93+ other-modules: Network.HTTP.ReqSpec
106− hs-source-dirs: httpbin-tests
94+ hs-source-dirs: httpbin-tests
107− other-modules: Network.HTTP.ReqSpec
95+ type: exitcode-stdio-1.0
108− default-language: GHC2021
109− build-depends:
110− QuickCheck >=2.7 && <3,
96+ build-depends: QuickCheck >= 2.7 && < 3.0
111− aeson >=2 && <3,
97+ , aeson >= 0.9 && < 1.5
112− base >=4.15 && <5,
98+ , base >= 4.8 && < 5.0
113− bytestring >=0.10.8 && <0.13,
99+ , bytestring >= 0.10.8 && < 0.11
100+ , data-default-class
114− hspec >=2.0 && <3.0,
101+ , hspec >= 2.0 && < 3.0
115− http-client >=0.7 && <0.8,
102+ , http-client >= 0.5 && < 0.6
116− http-types >=0.8 && <10,
103+ , http-types >= 0.8 && < 10.0
117− monad-control >=1.0 && <1.1,
104+ , monad-control >= 1.0 && < 1.1
105+ , mtl >= 2.0 && < 3.0
118− req,
106+ , req
119− text >=0.2 && <2.2
107+ , text >= 0.2 && < 1.3
120−
108+ , unordered-containers >= 0.2.5 && < 0.2.10
109+ build-tools: hspec-discover >= 2.0 && < 3.0
121− if flag(dev)
110+ if flag(dev)
122− ghc-options:
111+ ghc-options: -O0 -Wall -Werror
123− -Wall -Werror -Wredundant-constraints -Wpartial-fields
124− -Wunused-packages
125−
126− else
112+ else
127− buildable: False
113+ ghc-options: -O2 -Wall
114+ default-language: Haskell2010