got 11.0.2 → 11.0.3

package/dist/source/as-promise/core.js

@@ -20,12 +20,10 @@ exports.parseBody = (response, responseType, encoding) => {
         if (responseType === 'buffer') {
             return Buffer.from(rawBody);
         }
-        if (!exports.knownBodyTypes.includes(responseType)) {
-            throw new types_1.ParseError({
-                message: `Unknown body type '${responseType}'`,
-                name: 'Error'
-            }, response);
-        }
+        throw new types_1.ParseError({
+            message: `Unknown body type '${responseType}'`,
+            name: 'Error'
+        }, response);
     }
     catch (error) {
         throw new types_1.ParseError(error, response);

package/dist/source/as-promise/index.js

@@ -68,9 +68,9 @@ function asPromise(options) {
                     rawBody = await getStream.buffer(request);
                     response.rawBody = rawBody;
                 }
-                catch (error) {
-                    // TODO: Call `request._beforeError`, see https://github.com/nodejs/node/issues/32995
-                    reject(new types_1.ReadError(error, request));
+                catch (_) {
+                    // The same error is caught below.
+                    // See request.once('error')
                     return;
                 }
                 // Parse body
@@ -91,7 +91,6 @@ function asPromise(options) {
                         // @ts-ignore TS doesn't notice that CancelableRequest is a Promise
                         // eslint-disable-next-line no-await-in-loop
                         response = await hook(response, async (updatedOptions) => {
-                            request.destroy();
                             const typedOptions = core_1.default.normalizeArguments(undefined, {
                                 ...updatedOptions,
                                 retry: {
@@ -118,12 +117,7 @@ function asPromise(options) {
                 }
                 catch (error) {
                     // TODO: Call `request._beforeError`, see https://github.com/nodejs/node/issues/32995
-                    if (error instanceof types_1.RequestError) {
-                        reject(error);
-                    }
-                    else {
-                        reject(new types_1.RequestError(error.message, error, request));
-                    }
+                    reject(new types_1.RequestError(error.message, error, request));
                     return;
                 }
                 if (throwHttpErrors && !isOk()) {

package/dist/source/as-promise/types.d.ts

@@ -35,6 +35,7 @@ export interface PaginationOptions<T> {
         paginate?: (response: Response, allItems: T[], currentItems: T[]) => Options | false;
         shouldContinue?: (item: T, allItems: T[], currentItems: T[]) => boolean;
         countLimit?: number;
+        requestLimit?: number;
     };
 }
 export interface Options extends RequestOptions, PaginationOptions<unknown> {

package/dist/source/core/index.d.ts

@@ -28,6 +28,7 @@ declare const kStartedReading: unique symbol;
 declare const kStopReading: unique symbol;
 declare const kTriggerRead: unique symbol;
 declare const kBody: unique symbol;
+declare const kJobs: unique symbol;
 export declare const kIsNormalizedAlready: unique symbol;
 export interface Agents {
     http?: http.Agent;
@@ -240,6 +241,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
     [kStopReading]: boolean;
     [kTriggerRead]: boolean;
     [kBody]: Options['body'];
+    [kJobs]: Array<() => void>;
     [kBodySize]?: number;
     [kServerResponsesPiped]: Set<ServerResponse>;
     [kIsFromCache]?: boolean;
@@ -252,7 +254,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
     _progressCallbacks: Array<() => void>;
     options: NormalizedOptions;
     requestUrl: string;
-    finalized: boolean;
+    requestInitialized: boolean;
     redirects: string[];
     constructor(url: string | URL, options?: Options, defaults?: Defaults);
     static normalizeArguments(url?: string | URL, options?: Options, defaults?: Defaults): NormalizedOptions;

package/dist/source/core/index.js

@@ -37,6 +37,7 @@ const kStartedReading = Symbol('startedReading');
 const kStopReading = Symbol('stopReading');
 const kTriggerRead = Symbol('triggerRead');
 const kBody = Symbol('body');
+const kJobs = Symbol('jobs');
 exports.kIsNormalizedAlready = Symbol('isNormalizedAlready');
 const supportsBrotli = is_1.default.string(process.versions.brotli);
 exports.withoutBody = new Set(['GET', 'HEAD']);
@@ -207,11 +208,12 @@ class Request extends stream_1.Duplex {
         });
         this[kDownloadedSize] = 0;
         this[kUploadedSize] = 0;
-        this.finalized = false;
+        this.requestInitialized = false;
         this[kServerResponsesPiped] = new Set();
         this.redirects = [];
         this[kStopReading] = false;
         this[kTriggerRead] = false;
+        this[kJobs] = [];
         // TODO: Remove this when targeting Node.js >= 12
         this._progressCallbacks = [];
         const unlockWrite = () => this._unlockWrite();
@@ -241,6 +243,7 @@ class Request extends stream_1.Duplex {
             this._lockWrite();
         }
         (async (nonNormalizedOptions) => {
+            var _a;
             try {
                 if (nonNormalizedOptions.body instanceof fs_1.ReadStream) {
                     await waitForOpenFile(nonNormalizedOptions.body);
@@ -260,8 +263,15 @@ class Request extends stream_1.Duplex {
                 decodeURI(this.requestUrl);
                 await this._finalizeBody();
                 await this._makeRequest();
-                this.finalized = true;
-                this.emit('finalized');
+                if (this.destroyed) {
+                    (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.abort();
+                    return;
+                }
+                // Queued writes etc.
+                for (const job of this[kJobs]) {
+                    job();
+                }
+                this.requestInitialized = true;
             }
             catch (error) {
                 if (error instanceof RequestError) {
@@ -273,8 +283,10 @@ class Request extends stream_1.Duplex {
         })(options);
     }
     static normalizeArguments(url, options, defaults) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d;
         const rawOptions = options;
+        const searchParameters = options === null || options === void 0 ? void 0 : options.searchParams;
+        const hooks = options === null || options === void 0 ? void 0 : options.hooks;
         if (is_1.default.object(url) && !is_1.default.urlInstance(url)) {
             options = { ...defaults, ...url, ...options };
         }
@@ -287,6 +299,20 @@ class Request extends stream_1.Duplex {
                 options.url = url;
             }
         }
+        // Prevent duplicating default search params & hooks
+        if (searchParameters === undefined) {
+            delete options.searchParams;
+        }
+        else {
+            options.searchParams = searchParameters;
+        }
+        if (hooks === undefined) {
+            delete options.hooks;
+        }
+        else {
+            options.hooks = hooks;
+        }
+        // Setting options to `undefined` turns off its functionalities
         if (rawOptions && defaults) {
             for (const key in rawOptions) {
                 // @ts-ignore Dear TypeScript, all object keys are strings (or symbols which are NOT enumerable).
@@ -330,11 +356,11 @@ class Request extends stream_1.Duplex {
         if (is_1.default.undefined(options.headers)) {
             options.headers = {};
         }
-        else if (options.headers === ((_a = defaults) === null || _a === void 0 ? void 0 : _a.headers)) {
+        else if (options.headers === (defaults === null || defaults === void 0 ? void 0 : defaults.headers)) {
             options.headers = { ...options.headers };
         }
         else {
-            options.headers = lowercaseKeys({ ...((_b = defaults) === null || _b === void 0 ? void 0 : _b.headers), ...options.headers });
+            options.headers = lowercaseKeys({ ...(defaults === null || defaults === void 0 ? void 0 : defaults.headers), ...options.headers });
         }
         // Disallow legacy `url.Url`
         if ('slashes' in options) {
@@ -344,6 +370,23 @@ class Request extends stream_1.Duplex {
         if ('auth' in options) {
             throw new TypeError('Parameter `auth` is deprecated. Use `username` / `password` instead.');
         }
+        // `options.searchParams`
+        if (options.searchParams) {
+            if (!is_1.default.string(options.searchParams) && !(options.searchParams instanceof url_1.URLSearchParams)) {
+                validateSearchParameters(options.searchParams);
+            }
+            options.searchParams = new url_1.URLSearchParams(options.searchParams);
+            // `normalizeArguments()` is also used to merge options
+            (_a = defaults === null || defaults === void 0 ? void 0 : defaults.searchParams) === null || _a === void 0 ? void 0 : _a.forEach((value, key) => {
+                options.searchParams.append(key, value);
+            });
+        }
+        else {
+            options.searchParams = defaults === null || defaults === void 0 ? void 0 : defaults.searchParams;
+        }
+        // `options.username` & `options.password`
+        options.username = (_b = options.username) !== null && _b !== void 0 ? _b : '';
+        options.password = (_c = options.password) !== null && _c !== void 0 ? _c : '';
         // `options.prefixUrl` & `options.url`
         if (options.prefixUrl) {
             options.prefixUrl = options.prefixUrl.toString();
@@ -377,25 +420,27 @@ class Request extends stream_1.Duplex {
                 },
                 get: () => prefixUrl
             });
-            // Protocol check
+            // Support UNIX sockets
             let { protocol } = options.url;
             if (protocol === 'unix:') {
                 protocol = 'http:';
                 options.url = new url_1.URL(`http://unix${options.url.pathname}${options.url.search}`);
             }
+            // Set search params
+            if (options.searchParams) {
+                options.url.search = options.searchParams.toString();
+            }
+            // Trigger search params normalization
             if (options.url.search) {
                 const triggerSearchParameters = '_GOT_INTERNAL_TRIGGER_NORMALIZATION';
                 options.url.searchParams.append(triggerSearchParameters, '');
                 options.url.searchParams.delete(triggerSearchParameters);
             }
+            // Protocol check
             if (protocol !== 'http:' && protocol !== 'https:') {
                 throw new UnsupportedProtocolError(options);
             }
-        }
-        // `options.username` & `options.password`
-        options.username = (_c = options.username, (_c !== null && _c !== void 0 ? _c : ''));
-        options.password = (_d = options.password, (_d !== null && _d !== void 0 ? _d : ''));
-        if (options.url) {
+            // Update `username` & `password`
             options.url.username = options.username;
             options.url.password = options.password;
         }
@@ -415,23 +460,6 @@ class Request extends stream_1.Duplex {
                 };
             }
         }
-        // `options.searchParams`
-        if (options.searchParams) {
-            if (!is_1.default.string(options.searchParams) && !(options.searchParams instanceof url_1.URLSearchParams)) {
-                validateSearchParameters(options.searchParams);
-            }
-            options.searchParams = new url_1.URLSearchParams(options.searchParams);
-            // `normalizeArguments()` is also used to merge options
-            const defaultsAsOptions = defaults;
-            if (defaultsAsOptions && defaultsAsOptions.searchParams instanceof url_1.URLSearchParams) {
-                defaultsAsOptions.searchParams.forEach((value, key) => {
-                    options.searchParams.append(key, value);
-                });
-            }
-            if (options.url) {
-                options.url.search = options.searchParams.toString();
-            }
-        }
         // `options.cache`
         const { cache } = options;
         if (cache) {
@@ -464,7 +492,6 @@ class Request extends stream_1.Duplex {
             options.context = {};
         }
         // `options.hooks`
-        const areHooksUserDefined = options.hooks !== ((_e = defaults) === null || _e === void 0 ? void 0 : _e.hooks);
         options.hooks = { ...options.hooks };
         for (const event of exports.knownHookEvents) {
             if (event in options.hooks) {
@@ -480,7 +507,7 @@ class Request extends stream_1.Duplex {
                 options.hooks[event] = [];
             }
         }
-        if (defaults && areHooksUserDefined) {
+        if (defaults) {
             for (const event of exports.knownHookEvents) {
                 const defaultHooks = defaults.hooks[event];
                 if (defaultHooks.length !== 0) {
@@ -503,7 +530,7 @@ class Request extends stream_1.Duplex {
                 }
             }
         }
-        options.maxRedirects = (_f = options.maxRedirects, (_f !== null && _f !== void 0 ? _f : 0));
+        options.maxRedirects = (_d = options.maxRedirects) !== null && _d !== void 0 ? _d : 0;
         // Set non-enumerable properties
         setNonEnumerableProperties([defaults, options], options);
         return options;
@@ -614,7 +641,7 @@ class Request extends stream_1.Duplex {
             this[kResponseSize] = this[kDownloadedSize];
             this.emit('downloadProgress', this.downloadProgress);
         });
-        response.on('error', (error) => {
+        response.once('error', (error) => {
             this._beforeError(new ReadError(error, this));
         });
         response.once('aborted', () => {
@@ -810,7 +837,7 @@ class Request extends stream_1.Duplex {
         });
     }
     async _makeRequest() {
-        var _a, _b;
+        var _a;
         const { options } = this;
         const { url, headers, request, agent, timeout } = options;
         for (const key in headers) {
@@ -847,7 +874,7 @@ class Request extends stream_1.Duplex {
         // UNIX sockets
         if (url.hostname === 'unix') {
             const matches = /(?<socketPath>.+?):(?<path>.+)/.exec(`${url.pathname}${url.search}`);
-            if ((_a = matches) === null || _a === void 0 ? void 0 : _a.groups) {
+            if (matches === null || matches === void 0 ? void 0 : matches.groups) {
                 const { socketPath, path } = matches.groups;
                 Object.assign(options, {
                     socketPath,
@@ -864,7 +891,7 @@ class Request extends stream_1.Duplex {
         else {
             fallbackFn = isHttps ? https.request : http.request;
         }
-        const realFn = (_b = options.request, (_b !== null && _b !== void 0 ? _b : fallbackFn));
+        const realFn = (_a = options.request) !== null && _a !== void 0 ? _a : fallbackFn;
         const fn = options.cache ? this._createCacheableRequest.bind(this) : realFn;
         if (agent && !options.http2) {
             options.agent = agent[isHttps ? 'https' : 'http'];
@@ -955,11 +982,11 @@ class Request extends stream_1.Duplex {
         const write = () => {
             this._writeRequest(chunk, encoding, callback);
         };
-        if (this.finalized) {
+        if (this.requestInitialized) {
             write();
         }
         else {
-            this.once('finalized', write);
+            this[kJobs].push(write);
         }
     }
     _writeRequest(chunk, encoding, callback) {
@@ -970,6 +997,7 @@ class Request extends stream_1.Duplex {
                 this.emit('uploadProgress', progress);
             }
         });
+        // TODO: What happens if it's from cache? Then this[kRequest] won't be defined.
         this[kRequest].write(chunk, encoding, (error) => {
             if (!error && this._progressCallbacks.length !== 0) {
                 this._progressCallbacks.shift()();
@@ -998,28 +1026,24 @@ class Request extends stream_1.Duplex {
                 callback(error);
             });
         };
-        if (this.finalized) {
+        if (this.requestInitialized) {
             endRequest();
         }
         else {
-            this.once('finalized', endRequest);
+            this[kJobs].push(endRequest);
         }
     }
     _destroy(error, callback) {
         var _a;
         if (kRequest in this) {
-            // TODO: Remove the next `if` when https://github.com/nodejs/node/issues/32851 gets fixed
-            if (!((_a = this[kResponse]) === null || _a === void 0 ? void 0 : _a.complete)) {
+            this[kCancelTimeouts]();
+            // TODO: Remove the next `if` when these get fixed:
+            // - https://github.com/nodejs/node/issues/32851
+            // - https://github.com/nock/nock/issues/1981
+            if (!((_a = this[kResponse]) === null || _a === void 0 ? void 0 : _a.complete) && !this[kRequest].destroyed) {
                 this[kRequest].abort();
             }
         }
-        else {
-            this.once('finalized', () => {
-                if (kRequest in this) {
-                    this[kRequest].abort();
-                }
-            });
-        }
         if (error !== null && !is_1.default.undefined(error) && !(error instanceof RequestError)) {
             error = new RequestError(error.message, error, this);
         }

package/dist/source/core/utils/options-to-url.js

@@ -30,7 +30,7 @@ exports.default = (origin, options) => {
         if (!options.protocol) {
             throw new TypeError('No URL protocol specified');
         }
-        origin = `${options.protocol}//${_b = (_a = options.hostname, (_a !== null && _a !== void 0 ? _a : options.host)), (_b !== null && _b !== void 0 ? _b : '')}`;
+        origin = `${options.protocol}//${(_b = (_a = options.hostname) !== null && _a !== void 0 ? _a : options.host) !== null && _b !== void 0 ? _b : ''}`;
     }
     const url = new url_1.URL(origin);
     if (options.path) {

package/dist/source/core/utils/timed-out.js

@@ -21,9 +21,9 @@ exports.default = (request, delays, options) => {
     const cancelers = [];
     const { once, unhandleAll } = unhandle_1.default();
     const addTimeout = (delay, callback, event) => {
-        var _a, _b;
+        var _a;
         const timeout = setTimeout(callback, delay, delay, event);
-        (_b = (_a = timeout).unref) === null || _b === void 0 ? void 0 : _b.call(_a);
+        (_a = timeout.unref) === null || _a === void 0 ? void 0 : _a.call(timeout);
         const cancel = () => {
             clearTimeout(timeout);
         };
@@ -32,9 +32,6 @@ exports.default = (request, delays, options) => {
     };
     const { host, hostname } = options;
     const timeoutHandler = (delay, event) => {
-        if (request.socket) {
-            request.socket._hadError = true;
-        }
         request.destroy(new TimeoutError(delay, event));
     };
     const cancelTimeouts = () => {
@@ -46,6 +43,7 @@ exports.default = (request, delays, options) => {
     request.once('error', error => {
         cancelTimeouts();
         // Save original behavior
+        /* istanbul ignore next */
         if (request.listenerCount('error') === 0) {
             throw error;
         }
@@ -74,7 +72,7 @@ exports.default = (request, delays, options) => {
         const { socketPath } = request;
         /* istanbul ignore next: hard to test */
         if (socket.connecting) {
-            const hasPath = Boolean((socketPath !== null && socketPath !== void 0 ? socketPath : net.isIP((_a = (hostname !== null && hostname !== void 0 ? hostname : host), (_a !== null && _a !== void 0 ? _a : ''))) !== 0));
+            const hasPath = Boolean(socketPath !== null && socketPath !== void 0 ? socketPath : net.isIP((_a = hostname !== null && hostname !== void 0 ? hostname : host) !== null && _a !== void 0 ? _a : '') !== 0);
             if (typeof delays.lookup !== 'undefined' && !hasPath && typeof socket.address().address === 'undefined') {
                 const cancelTimeout = addTimeout(delays.lookup, timeoutHandler, 'lookup');
                 once(socket, 'lookup', cancelTimeout);

package/dist/source/create.js

@@ -60,8 +60,8 @@ const create = (defaults) => {
         }
         return result;
     }));
-    const got = ((url, options = {}) => {
-        var _a, _b, _c, _d, _e;
+    const got = ((url, options) => {
+        var _a, _b;
         let iteration = 0;
         const iterateHandlers = (newOptions) => {
             return defaults.handlers[iteration++](newOptions, iteration === defaults.handlers.length ? getPromiseOrStream : iterateHandlers);
@@ -78,7 +78,7 @@ const create = (defaults) => {
             let initHookError;
             try {
                 callInitHooks(defaults.options.hooks.init, options);
-                callInitHooks((_b = (_a = options) === null || _a === void 0 ? void 0 : _a.hooks) === null || _b === void 0 ? void 0 : _b.init, options);
+                callInitHooks((_a = options === null || options === void 0 ? void 0 : options.hooks) === null || _a === void 0 ? void 0 : _a.init, options);
             }
             catch (error) {
                 initHookError = error;
@@ -94,13 +94,13 @@ const create = (defaults) => {
             return iterateHandlers(normalizedOptions);
         }
         catch (error) {
-            if ((_c = options) === null || _c === void 0 ? void 0 : _c.isStream) {
+            if (options === null || options === void 0 ? void 0 : options.isStream) {
                 throw error;
             }
             else {
                 // A bug.
                 // eslint-disable-next-line @typescript-eslint/return-await
-                return create_rejection_1.default(error, defaults.options.hooks.beforeError, (_e = (_d = options) === null || _d === void 0 ? void 0 : _d.hooks) === null || _e === void 0 ? void 0 : _e.beforeError);
+                return create_rejection_1.default(error, defaults.options.hooks.beforeError, (_b = options === null || options === void 0 ? void 0 : options.hooks) === null || _b === void 0 ? void 0 : _b.beforeError);
             }
         }
     });
@@ -140,7 +140,8 @@ const create = (defaults) => {
             throw new TypeError('`options.pagination` must be implemented');
         }
         const all = [];
-        while (true) {
+        let numberOfRequests = 0;
+        while (numberOfRequests < pagination.requestLimit) {
             // TODO: Throw when result is not an instance of Response
             // eslint-disable-next-line no-await-in-loop
             const result = (await got('', normalizedOptions));
@@ -167,6 +168,7 @@ const create = (defaults) => {
             if (optionsToMerge !== undefined) {
                 normalizedOptions = normalizeArguments(undefined, optionsToMerge, normalizedOptions);
             }
+            numberOfRequests++;
         }
     });
     got.paginate.all = (async (url, options) => {

package/dist/source/index.js

@@ -104,7 +104,8 @@ const defaults = {
             },
             filter: () => true,
             shouldContinue: () => true,
-            countLimit: Infinity
+            countLimit: Infinity,
+            requestLimit: 10000
         }
     },
     handlers: [create_1.defaultHandler],

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "11.0.2",
+	"version": "11.0.3",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -67,8 +67,6 @@
 		"@types/request": "^2.48.4",
 		"@types/sinon": "^9.0.0",
 		"@types/tough-cookie": "^4.0.0",
-		"@typescript-eslint/eslint-plugin": "^2.27.0",
-		"@typescript-eslint/parser": "^2.27.0",
 		"ava": "^3.6.0",
 		"axios": "^0.19.2",
 		"benchmark": "^2.1.4",
@@ -76,7 +74,6 @@
 		"create-test-server": "^3.0.1",
 		"del-cli": "^3.0.0",
 		"delay": "^4.3.0",
-		"eslint-config-xo-typescript": "^0.27.0",
 		"express": "^4.17.1",
 		"form-data": "^3.0.0",
 		"lolex": "^6.0.0",
@@ -90,8 +87,8 @@
 		"tempy": "^0.5.0",
 		"to-readable-stream": "^2.1.0",
 		"tough-cookie": "^4.0.0",
-		"typescript": "3.7.5",
-		"xo": "^0.29.0"
+		"typescript": "3.8.3",
+		"xo": "^0.30.0"
 	},
 	"types": "dist/source",
 	"sideEffects": false,
@@ -115,10 +112,6 @@
 		]
 	},
 	"xo": {
-		"extends": "xo-typescript",
-		"extensions": [
-			"ts"
-		],
 		"ignores": [
 			"documentation/examples/*"
 		],
@@ -127,11 +120,10 @@
 			"@typescript-eslint/no-base-to-string": "off",
 			"node/prefer-global/url": "off",
 			"node/prefer-global/url-search-params": "off",
-			"unicorn/string-content": "off",
 			"@typescript-eslint/prefer-readonly-parameter-types": "off",
-			"@typescript-eslint/no-unsafe-member-access": "off",
-			"@typescript-eslint/no-unsafe-call": "off",
-			"@typescript-eslint/no-unsafe-return": "off"
+			"@typescript-eslint/no-floating-promises": "off",
+			"@typescript-eslint/method-signature-style": "off",
+			"unicorn/no-fn-reference-in-iterator": "off"
 		}
 	}
 }

package/readme.md

@@ -56,6 +56,8 @@ $ npm install got
 
 ## Usage
 
+###### Promise
+
 ```js
 const got = require('got');
 
@@ -71,6 +73,26 @@ const got = require('got');
 })();
 ```
 
+###### JSON
+
+```js
+const got = require('got');
+
+(async () => {
+	const {body} = await got.post('https://httpbin.org/anything', {
+		json: {
+			hello: 'world'
+		},
+		responseType: 'json'
+	});
+
+	console.log(body.data);
+	//=> {hello: 'world'}
+})();
+```
+
+See [JSON mode](#json-mode) for more details.
+
 ###### Streams
 
 ```js
@@ -452,14 +474,14 @@ If this is disabled, a compressed response is returned as a `Buffer`. This may b
 
 ###### cache
 
-Type: `object`\
+Type: `object | false`\
 Default: `false`
 
 [Cache adapter instance](#cache-adapters) for storing cached response data.
 
 ###### dnsCache
 
-Type: `object`\
+Type: `object | false`\
 Default: `new CacheableLookup()`
 
 An instance of [`CacheableLookup`](https://github.com/szmarczak/cacheable-lookup) used for making DNS lookups.
@@ -760,6 +782,15 @@ Default: `Infinity`
 
 The maximum amount of items that should be emitted.
 
+###### pagination.requestLimit
+
+Type: `number`\
+Default: `10000`
+
+The maximum amount of request that should be triggered. [Retries on failure](#retry) are not counted towards this limit.
+
+For example, it can be helpful during development to avoid an infinite number of requests.
+
 ##### localAddress
 
 Type: `string`
@@ -972,6 +1003,25 @@ Returns an async iterator:
 
 See [`options.pagination`](#pagination) for more pagination options.
 
+#### got.paginate.all(url, options?)
+
+Returns a Promise for an array of all results:
+
+```js
+(async () => {
+	const countLimit = 10;
+
+	const results = await got.paginate.all('https://api.github.com/repos/sindresorhus/got/commits', {
+		pagination: {countLimit}
+	});
+
+	console.log(`Printing latest ${countLimit} Got commits (newest to oldest):`);
+	console.log(results);
+})();
+```
+
+See [`options.pagination`](#pagination) for more pagination options.
+
 #### got.get(url, options?)
 #### got.post(url, options?)
 #### got.put(url, options?)
@@ -1382,11 +1432,13 @@ const got = require('got');
 const tunnel = require('tunnel');
 
 got('https://sindresorhus.com', {
-	agent: tunnel.httpOverHttp({
-		proxy: {
-			host: 'localhost'
-		}
-	})
+	agent: {
+		https: tunnel.httpOverHttp({
+			proxy: {
+				host: 'localhost'
+			}
+		})
+	}
 });
 ```
 
@@ -1684,7 +1736,7 @@ The Electron `net` module is not consistent with the Node.js `http` module. See
 <!-- GITHUB -->
 [k0]: https://github.com/sindresorhus/ky
 [r0]: https://github.com/request/request
-[n0]: https://github.com/bitinn/node-fetch
+[n0]: https://github.com/node-fetch/node-fetch
 [a0]: https://github.com/axios/axios
 [s0]: https://github.com/visionmedia/superagent