got 11.1.0 → 11.1.4

package/dist/source/as-promise/calculate-retry-delay.d.ts

@@ -1,3 +1,4 @@
 import { RetryFunction } from './types';
-declare const calculateRetryDelay: RetryFunction;
+declare type Returns<T extends (...args: any) => unknown, V> = (...args: Parameters<T>) => V;
+declare const calculateRetryDelay: Returns<RetryFunction, number>;
 export default calculateRetryDelay;

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

@@ -39,6 +39,11 @@ class PromisableRequest extends core_1.default {
         is_1.assert.any([is_1.default.boolean, is_1.default.undefined], options.resolveBodyOnly);
         is_1.assert.any([is_1.default.boolean, is_1.default.undefined], options.methodRewriting);
         is_1.assert.any([is_1.default.boolean, is_1.default.undefined], options.isStream);
+        is_1.assert.any([is_1.default.string, is_1.default.undefined], options.responseType);
+        // `options.responseType`
+        if (options.responseType === undefined) {
+            options.responseType = 'text';
+        }
         // `options.retry`
         const { retry } = options;
         if (defaults) {

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

@@ -51,7 +51,7 @@ function asPromise(options) {
                 _reject(error);
             };
             globalRequest = request;
-            request.once('response', async (response) => {
+            const onResponse = async (response) => {
                 response.retryCount = retryCount;
                 if (response.request.aborted) {
                     // Canceled while downloading - will throw a `CancelError` or `TimeoutError` error
@@ -126,8 +126,9 @@ function asPromise(options) {
                 }
                 globalResponse = response;
                 resolve(options.resolveBodyOnly ? response.body : response);
-            });
-            request.once('error', (error) => {
+            };
+            request.once('response', onResponse);
+            request.once('error', async (error) => {
                 if (promise.isCanceled) {
                     return;
                 }
@@ -135,10 +136,11 @@ function asPromise(options) {
                     reject(error);
                     return;
                 }
+                request.off('response', onResponse);
                 let backoff;
                 retryCount++;
                 try {
-                    backoff = options.retry.calculateDelay({
+                    backoff = await options.retry.calculateDelay({
                         attemptCount: retryCount,
                         retryOptions: options.retry,
                         error,
@@ -181,7 +183,8 @@ function asPromise(options) {
                 // The retry has not been made
                 retryCount--;
                 if (error instanceof types_1.HTTPError) {
-                    // It will be handled by the `response` event
+                    // The error will be handled by the `response` event
+                    onResponse(request._response);
                     return;
                 }
                 // Don't emit the `response` event

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

@@ -13,7 +13,7 @@ export interface RetryObject {
     error: TimeoutError | RequestError;
     computedValue: number;
 }
-export declare type RetryFunction = (retryObject: RetryObject) => number;
+export declare type RetryFunction = (retryObject: RetryObject) => number | Promise<number>;
 export interface RequiredRetryOptions {
     limit: number;
     methods: Method[];

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

@@ -4,7 +4,7 @@ import { URL, URLSearchParams } from 'url';
 import { Socket } from 'net';
 import { SecureContextOptions } from 'tls';
 import http = require('http');
-import { ClientRequest, RequestOptions, IncomingMessage, ServerResponse, request as httpRequest } from 'http';
+import { ClientRequest, RequestOptions, ServerResponse, request as httpRequest } from 'http';
 import https = require('https');
 import { Timings, IncomingMessageWithTimings } from '@szmarczak/http-timer';
 import CacheableLookup from 'cacheable-lookup';
@@ -29,6 +29,7 @@ declare const kStopReading: unique symbol;
 declare const kTriggerRead: unique symbol;
 declare const kBody: unique symbol;
 declare const kJobs: unique symbol;
+declare const kOriginalResponse: unique symbol;
 export declare const kIsNormalizedAlready: unique symbol;
 export interface Agents {
     http?: http.Agent;
@@ -64,7 +65,7 @@ export interface Hooks {
 }
 export declare type HookEvent = 'init' | 'beforeRequest' | 'beforeRedirect' | 'beforeError';
 export declare const knownHookEvents: HookEvent[];
-declare type AcceptableResponse = IncomingMessage | ResponseLike;
+declare type AcceptableResponse = IncomingMessageWithTimings | ResponseLike;
 declare type AcceptableRequestResult = AcceptableResponse | ClientRequest | Promise<AcceptableResponse | ClientRequest> | undefined;
 export declare type RequestFunction = (url: URL, options: RequestOptions, callback?: (response: AcceptableResponse) => void) => AcceptableRequestResult;
 export declare type Headers = Record<string, string | string[] | undefined>;
@@ -248,7 +249,8 @@ export default class Request extends Duplex implements RequestEvents<Request> {
     [kStartedReading]?: boolean;
     [kCancelTimeouts]?: () => void;
     [kResponseSize]?: number;
-    [kResponse]?: IncomingMessage;
+    [kResponse]?: IncomingMessageWithTimings;
+    [kOriginalResponse]?: IncomingMessageWithTimings;
     [kRequest]?: ClientRequest;
     _noPipe?: boolean;
     _progressCallbacks: Array<() => void>;
@@ -261,7 +263,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
     _lockWrite(): void;
     _unlockWrite(): void;
     _finalizeBody(): Promise<void>;
-    _onResponse(response: IncomingMessage): Promise<void>;
+    _onResponse(response: IncomingMessageWithTimings): Promise<void>;
     _onRequest(request: ClientRequest): void;
     _createCacheableRequest(url: URL, options: RequestOptions): Promise<ClientRequest | ResponseLike>;
     _makeRequest(): Promise<void>;
@@ -278,6 +280,7 @@ export default class Request extends Duplex implements RequestEvents<Request> {
     get uploadProgress(): Progress;
     get timings(): Timings | undefined;
     get isFromCache(): boolean | undefined;
+    get _response(): Response | undefined;
     pipe<T extends NodeJS.WritableStream>(destination: T, options?: {
         end?: boolean;
     }): T;

package/dist/source/core/index.js

@@ -8,9 +8,9 @@ const http = require("http");
 const http_1 = require("http");
 const https = require("https");
 const http_timer_1 = require("@szmarczak/http-timer");
-const decompressResponse = require("decompress-response");
 const cacheable_lookup_1 = require("cacheable-lookup");
 const CacheableRequest = require("cacheable-request");
+const decompressResponse = require("decompress-response");
 // @ts-ignore Missing types
 const http2wrapper = require("http2-wrapper");
 const lowercaseKeys = require("lowercase-keys");
@@ -38,6 +38,7 @@ const kStopReading = Symbol('stopReading');
 const kTriggerRead = Symbol('triggerRead');
 const kBody = Symbol('body');
 const kJobs = Symbol('jobs');
+const kOriginalResponse = Symbol('originalResponse');
 exports.kIsNormalizedAlready = Symbol('isNormalizedAlready');
 const supportsBrotli = is_1.default.string(process.versions.brotli);
 exports.withoutBody = new Set(['GET', 'HEAD']);
@@ -193,7 +194,6 @@ class UnsupportedProtocolError extends RequestError {
 exports.UnsupportedProtocolError = UnsupportedProtocolError;
 const proxiedRequestEvents = [
     'socket',
-    'abort',
     'connect',
     'continue',
     'information',
@@ -264,7 +264,7 @@ class Request extends stream_1.Duplex {
                 await this._finalizeBody();
                 await this._makeRequest();
                 if (this.destroyed) {
-                    (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.abort();
+                    (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.destroy();
                     return;
                 }
                 // Queued writes etc.
@@ -278,15 +278,16 @@ class Request extends stream_1.Duplex {
                     this._beforeError(error);
                     return;
                 }
-                this.destroy(error);
+                // This is a workaround for https://github.com/nodejs/node/issues/33335
+                if (!this.destroyed) {
+                    this.destroy(error);
+                }
             }
         })(options);
     }
     static normalizeArguments(url, options, defaults) {
         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 };
         }
@@ -298,28 +299,8 @@ class Request extends stream_1.Duplex {
             if (url) {
                 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).
-                if (is_1.default.undefined(rawOptions[key]) && !is_1.default.undefined(defaults[key])) {
-                    // @ts-ignore See the note above
-                    options[key] = defaults[key];
-                }
+            if (is_1.default.urlInstance(options.url)) {
+                options.url = new url_1.URL(options.url.toString());
             }
         }
         // TODO: Deprecate URL options in Got 12.
@@ -327,6 +308,9 @@ class Request extends stream_1.Duplex {
         if (options.cache === false) {
             options.cache = undefined;
         }
+        if (options.dnsCache === false) {
+            options.dnsCache = undefined;
+        }
         // Nice type assertions
         is_1.assert.any([is_1.default.string, is_1.default.undefined], options.method);
         is_1.assert.any([is_1.default.object, is_1.default.undefined], options.headers);
@@ -345,6 +329,7 @@ class Request extends stream_1.Duplex {
         is_1.assert.any([is_1.default.boolean, is_1.default.undefined], options.http2);
         is_1.assert.any([is_1.default.boolean, is_1.default.undefined], options.allowGetBody);
         is_1.assert.any([is_1.default.boolean, is_1.default.undefined], options.rejectUnauthorized);
+        is_1.assert.any([is_1.default.string, is_1.default.undefined], options.localAddress);
         // `options.method`
         if (is_1.default.string(options.method)) {
             options.method = options.method.toUpperCase();
@@ -353,10 +338,7 @@ class Request extends stream_1.Duplex {
             options.method = 'GET';
         }
         // `options.headers`
-        if (is_1.default.undefined(options.headers)) {
-            options.headers = {};
-        }
-        else if (options.headers === (defaults === null || defaults === void 0 ? void 0 : defaults.headers)) {
+        if (options.headers === (defaults === null || defaults === void 0 ? void 0 : defaults.headers)) {
             options.headers = { ...options.headers };
         }
         else {
@@ -371,18 +353,21 @@ class Request extends stream_1.Duplex {
             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;
+        if ('searchParams' in options) {
+            if (options.searchParams && options.searchParams !== (defaults === null || defaults === void 0 ? void 0 : defaults.searchParams)) {
+                if (!is_1.default.string(options.searchParams) && !(options.searchParams instanceof url_1.URLSearchParams)) {
+                    validateSearchParameters(options.searchParams);
+                }
+                const searchParameters = 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) => {
+                    // Only use default if one isn't already defined
+                    if (!searchParameters.has(key)) {
+                        searchParameters.append(key, value);
+                    }
+                });
+                options.searchParams = searchParameters;
+            }
         }
         // `options.username` & `options.password`
         options.username = (_b = options.username) !== null && _b !== void 0 ? _b : '';
@@ -430,19 +415,24 @@ class Request extends stream_1.Duplex {
             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);
             }
-            // Update `username` & `password`
-            options.url.username = options.username;
-            options.url.password = options.password;
+            // Update `username`
+            if (options.username === '') {
+                options.username = options.url.username;
+            }
+            else {
+                options.url.username = options.username;
+            }
+            // Update `password`
+            if (options.password === '') {
+                options.password = options.url.password;
+            }
+            else {
+                options.url.password = options.password;
+            }
         }
         // `options.cookieJar`
         const { cookieJar } = options;
@@ -471,7 +461,7 @@ class Request extends stream_1.Duplex {
         if (options.dnsCache === true) {
             options.dnsCache = new cacheable_lookup_1.default();
         }
-        else if (!is_1.default.undefined(options.dnsCache) && options.dnsCache !== false && !(options.dnsCache instanceof cacheable_lookup_1.default)) {
+        else if (!is_1.default.undefined(options.dnsCache) && !options.dnsCache.lookup) {
             throw new TypeError(`Parameter \`dnsCache\` must be a CacheableLookup instance or a boolean, got ${is_1.default(options.dnsCache)}`);
         }
         // `options.timeout`
@@ -492,6 +482,7 @@ class Request extends stream_1.Duplex {
             options.context = {};
         }
         // `options.hooks`
+        const areHooksDefault = options.hooks === (defaults === null || defaults === void 0 ? void 0 : defaults.hooks);
         options.hooks = { ...options.hooks };
         for (const event of exports.knownHookEvents) {
             if (event in options.hooks) {
@@ -507,7 +498,7 @@ class Request extends stream_1.Duplex {
                 options.hooks[event] = [];
             }
         }
-        if (defaults) {
+        if (defaults && !areHooksDefault) {
             for (const event of exports.knownHookEvents) {
                 const defaultHooks = defaults.hooks[event];
                 if (defaultHooks.length !== 0) {
@@ -622,6 +613,7 @@ class Request extends stream_1.Duplex {
     async _onResponse(response) {
         const { options } = this;
         const { url } = options;
+        this[kOriginalResponse] = response;
         if (options.decompress) {
             response = decompressResponse(response);
         }
@@ -642,6 +634,9 @@ class Request extends stream_1.Duplex {
             this.emit('downloadProgress', this.downloadProgress);
         });
         response.once('error', (error) => {
+            // Force clean-up, because some packages don't do this.
+            // TODO: Fix decompress-response
+            response.destroy();
             this._beforeError(new ReadError(error, this));
         });
         response.once('aborted', () => {
@@ -699,13 +694,17 @@ class Request extends stream_1.Duplex {
                 return;
             }
             try {
-                // Handles invalid URLs. See https://github.com/sindresorhus/got/issues/604
+                // Do not remove. See https://github.com/sindresorhus/got/pull/214
                 const redirectBuffer = Buffer.from(response.headers.location, 'binary').toString();
+                // Handles invalid URLs. See https://github.com/sindresorhus/got/issues/604
                 const redirectUrl = new url_1.URL(redirectBuffer, url);
                 const redirectString = redirectUrl.toString();
                 decodeURI(redirectString);
                 // Redirecting to a different site, clear sensitive data.
                 if (redirectUrl.hostname !== url.hostname) {
+                    if ('host' in options.headers) {
+                        delete options.headers.host;
+                    }
                     if ('cookie' in options.headers) {
                         delete options.headers.cookie;
                     }
@@ -775,10 +774,13 @@ class Request extends stream_1.Duplex {
         const { timeout, url } = options;
         http_timer_1.default(request);
         this[kCancelTimeouts] = timed_out_1.default(request, timeout, url);
-        request.once('response', response => {
+        const responseEventName = options.cache ? 'cacheableResponse' : 'response';
+        request.once(responseEventName, (response) => {
             this._onResponse(response);
         });
         request.once('error', (error) => {
+            // Force clean-up, because some packages (e.g. nock) don't do this.
+            request.destroy();
             if (error instanceof timed_out_1.TimeoutError) {
                 error = new TimeoutError(error, this.timings, this);
             }
@@ -823,16 +825,19 @@ class Request extends stream_1.Duplex {
             // `http-cache-semantics` checks this
             delete options.url;
             // This is ugly
-            const cacheRequest = cacheableStore.get(options.cache)(options, resolve);
-            // Restore options
-            options.url = url;
-            cacheRequest.once('error', (error) => {
-                if (error instanceof CacheableRequest.CacheError) {
-                    reject(new CacheError(error, this));
-                    return;
+            const cacheRequest = cacheableStore.get(options.cache)(options, response => {
+                const typedResponse = response;
+                const { req } = typedResponse;
+                // TODO: Fix `cacheable-response`
+                typedResponse._readableState.autoDestroy = false;
+                if (req) {
+                    req.emit('cacheableResponse', typedResponse);
                 }
-                reject(error);
+                resolve(typedResponse);
             });
+            // Restore options
+            options.url = url;
+            cacheRequest.once('error', reject);
             cacheRequest.once('request', resolve);
         });
     }
@@ -884,6 +889,7 @@ class Request extends stream_1.Duplex {
             }
         }
         const isHttps = url.protocol === 'https:';
+        // Fallback function
         let fallbackFn;
         if (options.http2) {
             fallbackFn = http2wrapper.auto;
@@ -892,16 +898,18 @@ class Request extends stream_1.Duplex {
             fallbackFn = isHttps ? https.request : http.request;
         }
         const realFn = (_a = options.request) !== null && _a !== void 0 ? _a : fallbackFn;
-        const fn = options.cache ? this._createCacheableRequest.bind(this) : realFn;
+        // Cache support
+        const fn = options.cache ? this._createCacheableRequest : realFn;
+        // Pass an agent directly when HTTP2 is disabled
         if (agent && !options.http2) {
             options.agent = agent[isHttps ? 'https' : 'http'];
         }
+        // Prepare plain HTTP request options
         options[kRequest] = realFn;
         delete options.request;
         delete options.timeout;
-        let requestOrResponse;
         try {
-            requestOrResponse = await fn(url, options);
+            let requestOrResponse = await fn(url, options);
             if (is_1.default.undefined(requestOrResponse)) {
                 requestOrResponse = fallbackFn(url, options);
             }
@@ -926,8 +934,8 @@ class Request extends stream_1.Duplex {
             }
         }
         catch (error) {
-            if (error instanceof RequestError) {
-                throw error;
+            if (error instanceof CacheableRequest.CacheError) {
+                throw new CacheError(error, this);
             }
             throw new RequestError(error.message, error, this);
         }
@@ -955,7 +963,10 @@ class Request extends stream_1.Duplex {
         catch (error_) {
             error = new RequestError(error_.message, error_, this);
         }
-        this.destroy(error);
+        // This is a workaround for https://github.com/nodejs/node/issues/33335
+        if (!this.destroyed) {
+            this.destroy(error);
+        }
     }
     _read() {
         this[kTriggerRead] = true;
@@ -1017,6 +1028,10 @@ class Request extends stream_1.Duplex {
                 callback();
                 return;
             }
+            if (this[kRequest].destroyed) {
+                callback();
+                return;
+            }
             this[kRequest].end((error) => {
                 if (!error) {
                     this[kBodySize] = this[kUploadedSize];
@@ -1039,9 +1054,8 @@ class Request extends stream_1.Duplex {
             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();
+            if (!((_a = this[kResponse]) === null || _a === void 0 ? void 0 : _a.complete)) {
+                this[kRequest].destroy();
             }
         }
         if (error !== null && !is_1.default.undefined(error) && !(error instanceof RequestError)) {
@@ -1054,8 +1068,8 @@ class Request extends stream_1.Duplex {
         return (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.socket.remoteAddress;
     }
     get aborted() {
-        var _a;
-        return Boolean((_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.aborted);
+        var _a, _b, _c;
+        return ((_b = (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.destroyed) !== null && _b !== void 0 ? _b : this.destroyed) && !((_c = this[kOriginalResponse]) === null || _c === void 0 ? void 0 : _c.complete);
     }
     get socket() {
         var _a;
@@ -1102,6 +1116,9 @@ class Request extends stream_1.Duplex {
     get isFromCache() {
         return this[kIsFromCache];
     }
+    get _response() {
+        return this[kResponse];
+    }
     pipe(destination, options) {
         if (this[kStartedReading]) {
             throw new Error('Failed to pipe. The response has been emitted already.');

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

@@ -48,7 +48,7 @@ exports.default = (request, delays, options) => {
             throw error;
         }
     });
-    request.once('abort', cancelTimeouts);
+    request.once('close', cancelTimeouts);
     once(request, 'response', (response) => {
         once(response, 'end', cancelTimeouts);
     });

package/dist/source/create.js

@@ -60,6 +60,7 @@ const create = (defaults) => {
         }
         return result;
     }));
+    // Got interface
     const got = ((url, options) => {
         var _a, _b;
         let iteration = 0;
@@ -89,8 +90,6 @@ const create = (defaults) => {
             if (initHookError) {
                 throw new as_promise_1.RequestError(initHookError.message, initHookError, normalizedOptions);
             }
-            // A bug.
-            // eslint-disable-next-line @typescript-eslint/return-await
             return iterateHandlers(normalizedOptions);
         }
         catch (error) {
@@ -98,8 +97,6 @@ const create = (defaults) => {
                 throw error;
             }
             else {
-                // A bug.
-                // eslint-disable-next-line @typescript-eslint/return-await
                 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);
             }
         }
@@ -132,7 +129,8 @@ const create = (defaults) => {
             mutableDefaults: Boolean(isMutableDefaults)
         });
     };
-    got.paginate = (async function* (url, options) {
+    // Pagination
+    const paginateEach = (async function* (url, options) {
         let normalizedOptions = normalizeArguments(url, options, defaults.options);
         normalizedOptions.resolveBodyOnly = false;
         const pagination = normalizedOptions.pagination;
@@ -168,12 +166,18 @@ const create = (defaults) => {
             if (optionsToMerge === false) {
                 return;
             }
-            if (optionsToMerge !== undefined) {
+            if (optionsToMerge === result.request.options) {
+                normalizedOptions = result.request.options;
+            }
+            else if (optionsToMerge !== undefined) {
                 normalizedOptions = normalizeArguments(undefined, optionsToMerge, normalizedOptions);
             }
             numberOfRequests++;
         }
     });
+    got.paginate = ((url, options) => {
+        return paginateEach(url, options);
+    });
     got.paginate.all = (async (url, options) => {
         const results = [];
         for await (const item of got.paginate(url, options)) {
@@ -181,7 +185,11 @@ const create = (defaults) => {
         }
         return results;
     });
+    // For those who like very descriptive names
+    got.paginate.each = paginateEach;
+    // Stream API
     got.stream = ((url, options) => got(url, { ...options, isStream: true }));
+    // Shortcuts
     for (const method of aliases) {
         got[method] = ((url, options) => got(url, { ...options, method }));
         got.stream[method] = ((url, options) => {

package/dist/source/index.js

@@ -4,7 +4,6 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 const url_1 = require("url");
-const cacheable_lookup_1 = require("cacheable-lookup");
 const create_1 = require("./create");
 const defaults = {
     options: {
@@ -57,7 +56,7 @@ const defaults = {
             afterResponse: []
         },
         cache: undefined,
-        dnsCache: new cacheable_lookup_1.default(),
+        dnsCache: undefined,
         decompress: true,
         throwHttpErrors: true,
         followRedirect: true,

package/dist/source/types.d.ts

@@ -25,7 +25,7 @@ export declare type OptionsOfTextResponseBody = Merge<Options, {
 export declare type OptionsOfJSONResponseBody = Merge<Options, {
     isStream?: false;
     resolveBodyOnly?: false;
-    responseType: 'json';
+    responseType?: 'json';
 }>;
 export declare type OptionsOfBufferResponseBody = Merge<Options, {
     isStream?: false;
@@ -42,8 +42,10 @@ declare type ResponseBodyOnly = {
 export declare type OptionsWithPagination<T = unknown, R = unknown> = Merge<Options, PaginationOptions<T, R>>;
 export interface GotPaginate {
     <T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
-    all<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>): Promise<T[]>;
     <T, R = unknown>(options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
+    each<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
+    each<T, R = unknown>(options?: OptionsWithPagination<T, R>): AsyncIterableIterator<T>;
+    all<T, R = unknown>(url: string | URL, options?: OptionsWithPagination<T, R>): Promise<T[]>;
     all<T, R = unknown>(options?: OptionsWithPagination<T, R>): Promise<T[]>;
 }
 export interface GotRequestFunction {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "11.1.0",
+	"version": "11.1.4",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -43,15 +43,15 @@
 		"ky"
 	],
 	"dependencies": {
-		"@sindresorhus/is": "^2.1.0",
-		"@szmarczak/http-timer": "^4.0.0",
+		"@sindresorhus/is": "^2.1.1",
+		"@szmarczak/http-timer": "^4.0.5",
 		"@types/cacheable-request": "^6.0.1",
 		"@types/responselike": "^1.0.0",
-		"cacheable-lookup": "^4.1.1",
+		"cacheable-lookup": "^5.0.3",
 		"cacheable-request": "^7.0.1",
-		"decompress-response": "^5.0.0",
-		"get-stream": "^5.0.0",
-		"http2-wrapper": "^1.0.0-beta.4.4",
+		"decompress-response": "^6.0.0",
+		"get-stream": "^5.1.0",
+		"http2-wrapper": "^1.0.0-beta.4.5",
 		"lowercase-keys": "^2.0.0",
 		"p-cancelable": "^2.0.0",
 		"responselike": "^2.0.0"
@@ -59,10 +59,10 @@
 	"devDependencies": {
 		"@ava/typescript": "^1.1.1",
 		"@sindresorhus/tsconfig": "^0.7.0",
+		"@sinonjs/fake-timers": "^6.0.1",
 		"@types/benchmark": "^1.0.31",
 		"@types/express": "^4.17.6",
-		"@types/lolex": "^5.1.0",
-		"@types/node": "13.1.2",
+		"@types/node": "^13.13.4",
 		"@types/node-fetch": "^2.5.5",
 		"@types/request": "^2.48.4",
 		"@types/sinon": "^9.0.0",
@@ -76,7 +76,6 @@
 		"delay": "^4.3.0",
 		"express": "^4.17.1",
 		"form-data": "^3.0.0",
-		"lolex": "^6.0.0",
 		"nock": "^12.0.0",
 		"node-fetch": "^2.6.0",
 		"np": "^6.0.0",
@@ -125,5 +124,6 @@
 			"@typescript-eslint/method-signature-style": "off",
 			"unicorn/no-fn-reference-in-iterator": "off"
 		}
-	}
+	},
+	"runkitExampleFilename": "./documentation/examples/runkit-example.js"
 }

package/readme.md

@@ -139,6 +139,16 @@ Properties from `options` will override properties in the parsed `url`.
 
 If no protocol is specified, it will throw a `TypeError`.
 
+**Note:** The query string is **not** parsed as search params. Example:
+
+```
+got('https://example.com/?query=a b'); //=> https://example.com/?query=a%20b
+got('https://example.com/', {searchParams: {query: 'a b'}}); //=> https://example.com/?query=a+b
+
+// The query string is overridden by `searchParams`
+got('https://example.com/?query=a b', {searchParams: {query: 'a b'}}); //=> https://example.com/?query=a+b
+```
+
 ##### options
 
 Type: `object`
@@ -402,7 +412,7 @@ This also accepts an `object` with the following fields to constrain the duratio
 Type: `number | object`\
 Default:
 - limit: `2`
-- calculateDelay: `({attemptCount, retryOptions, error, computedValue}) => computedValue`
+- calculateDelay: `({attemptCount, retryOptions, error, computedValue}) => computedValue | Promise<computedValue>`
 - methods: `GET` `PUT` `HEAD` `DELETE` `OPTIONS` `TRACE`
 - statusCodes: [`408`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/408) [`413`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/413) [`429`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/429) [`500`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/500) [`502`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/502) [`503`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/503) [`504`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/504) [`521`](https://support.cloudflare.com/hc/en-us/articles/115003011431#521error) [`522`](https://support.cloudflare.com/hc/en-us/articles/115003011431#522error) [`524`](https://support.cloudflare.com/hc/en-us/articles/115003011431#524error)
 - maxRetryAfter: `undefined`
@@ -417,7 +427,7 @@ If [`Retry-After`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Ret
 
 Delays between retries counts with function `1000 * Math.pow(2, retry) + Math.random() * 100`, where `retry` is attempt number (starts from 1).
 
-The `calculateDelay` property is a `function` that receives an object with `attemptCount`, `retryOptions`, `error` and `computedValue` properties for current retry count, the retry options, error and default computed value. The function must return a delay in milliseconds (`0` return value cancels retry).
+The `calculateDelay` property is a `function` that receives an object with `attemptCount`, `retryOptions`, `error` and `computedValue` properties for current retry count, the retry options, error and default computed value. The function must return a delay in milliseconds (or a Promise resolving with it) (`0` return value cancels retry).
 
 By default, it retries *only* on the specified methods, status codes, and on these network errors:
 - `ETIMEDOUT`: One of the [timeout](#timeout) limits were reached.
@@ -481,10 +491,13 @@ Default: `false`
 
 ###### dnsCache
 
-Type: `object | false`\
-Default: `new CacheableLookup()`
+Type: `CacheableLookup | false`\
+Default: `false`
+
+An instance of [`CacheableLookup`](https://github.com/szmarczak/cacheable-lookup) used for making DNS lookups. Useful when making lots of requests to different *public* hostnames.
 
-An instance of [`CacheableLookup`](https://github.com/szmarczak/cacheable-lookup) used for making DNS lookups.
+**Note:** This should stay disabled when making requests to internal hostnames such as `localhost`, `database.local` etc.\
+`CacheableLookup` uses `dns.resolver4(..)` and `dns.resolver6(...)` under the hood and fall backs to `dns.lookup(...)` when the first two fail, which may lead to additional delay.
 
 ###### request
 
@@ -520,7 +533,7 @@ const got = require('got');
 Type: `boolean`\
 Default: `true`
 
-Determines if a `got.HTTPError` is thrown for error responses (non-2xx status codes).
+Determines if a [`got.HTTPError`](#gothttperror) is thrown for unsuccessful responses.
 
 If this is disabled, requests that encounter an error status code will be resolved with the `response` instead of throwing. This may be useful if you are checking for resource availability and are expecting error responses.
 
@@ -721,7 +734,7 @@ The function takes three arguments:
 - `allItems` - An array of the emitted items.
 - `currentItems` - Items from the current response.
 
-It should return an object representing Got options pointing to the next page. If there are no more pages, `false` should be returned.
+It should return an object representing Got options pointing to the next page. The options are merged automatically with the previous request, therefore the options returned `pagination.paginate(...)` must reflect changes only. If there are no more pages, `false` should be returned.
 
 For example, if you want to stop when the response contains less items than expected, you can use something like this:
 
@@ -806,6 +819,31 @@ Type: `string`
 
 The IP address used to send the request from.
 
+##### rejectUnauthorized
+
+Type: `boolean`\
+Default: `true`
+
+If set to `false`, all invalid SSL certificates will be ignored and no error will be thrown.\
+If set to `true`, it will throw an error whenever an invalid SSL certificate is detected.
+
+We strongly recommend to have this set to `true` for security reasons.
+
+```js
+const got = require('got');
+
+(async () => {
+	// Correct:
+	await got('https://example.com', {rejectUnauthorized: true});
+
+	// You can disable it when developing an HTTPS app:
+	await got('https://localhost', {rejectUnauthorized: false});
+
+	// Never do this:
+	await got('https://example.com', {rejectUnauthorized: false});
+})();
+```
+
 #### Response
 
 The response object will typically be a [Node.js HTTP response stream](https://nodejs.org/api/http.html#http_class_http_incomingmessage), however, if returned from the cache it will be a [response-like object](https://github.com/lukechilds/responselike) which behaves in the same way.
@@ -918,7 +956,7 @@ Returns a [duplex stream](https://nodejs.org/api/stream.html#stream_class_stream
 
 ```js
 got.stream('https://github.com')
-	.on('request', request => setTimeout(() => request.abort(), 50));
+	.on('request', request => setTimeout(() => request.destroy(), 50));
 ```
 
 ##### .on('response', response)
@@ -1132,17 +1170,12 @@ const handler = (options, next) => {
 const instance = got.extend({handlers: [handler]});
 ```
 
-#### got.extend(...instances)
+#### got.extend(...options, ...instances, ...)
 
 Merges many instances into a single one:
-- options are merged using [`got.mergeOptions()`](#gotmergeoptionsparentoptions-newoptions) (+ hooks are merged too),
+- options are merged using [`got.mergeOptions()`](#gotmergeoptionsparentoptions-newoptions) (including hooks),
 - handlers are stored in an array (you can access them through `instance.defaults.handlers`).
 
-#### got.extend(...options, ...instances, ...)
-
-It's possible to combine options and instances.\
-It gives the same effect as `got.extend(...options).extend(...instances)`:
-
 ```js
 const a = {headers: {cat: 'meow'}};
 const b = got.extend({
@@ -1159,7 +1192,7 @@ got.extend(a, b);
 //=> {headers: {cat: 'meow', cow: 'moo'}}
 ```
 
-#### got.mergeOptions(parentOptions, newOptions)
+#### got.mergeOptions(parent, ...sources)
 
 Extends parent options. Avoid using [object spread](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax#Spread_in_object_literals) as it doesn't work recursively:
 
@@ -1171,16 +1204,24 @@ const b = {headers: {cow: 'moo', wolf: ['auuu']}};
 got.mergeOptions(a, b)  // => {headers: {cat: 'meow', cow: 'moo', wolf: ['auuu']}}
 ```
 
+**Note:** Only Got options are merged! Custom user options should be defined via [`options.context`](#context).
+
 Options are deeply merged to a new object. The value of each key is determined as follows:
 
-- If the new property is set to `undefined`, it keeps the old one.
-- If both properties are an instances of `URLSearchParams`, a new URLSearchParams instance is created. The values are merged using [`urlSearchParams.append(key, value)`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams/append).
-- If the parent property is an instance of `URL` and the new value is a `string` or `URL`, a new URL instance is created: [`new URL(new, parent)`](https://developer.mozilla.org/en-US/docs/Web/API/URL/URL#Syntax).
+- If the new property is not defined, the old value is used.
+- If the new property is explicitly set to `undefined`:
+	- If the parent property is a plain `object`, the parent value is deeply cloned.
+	- Otherwise, `undefined` is used.
+- If the parent value is an instance of `URLSearchParams`:
+	- If the new value is a `string`, an `object` or an instance of `URLSearchParams`, a new `URLSearchParams` instance is created. The values are merged using [`urlSearchParams.append(key, value)`](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams/append). The keys defined in the new value override the keys defined in the parent value.
+	- Otherwise, the only available value is `undefined`.
 - If the new property is a plain `object`:
 	- If the parent property is a plain `object` too, both values are merged recursively into a new `object`.
 	- Otherwise, only the new value is deeply cloned.
 - If the new property is an `Array`, it overwrites the old one with a deep clone of the new property.
 - Properties that are not enumerable, such as `context`, `body`, `json`, and `form`, will not be merged.
+- Otherwise, the new value is assigned to the key.
+
 ```js
 const a = {json: {cat: 'meow'}};
 const b = {json: {cow: 'moo'}};
@@ -1188,7 +1229,6 @@ const b = {json: {cow: 'moo'}};
 got.mergeOptions(a, b);
 //=> {json: {cow: 'moo'}}
 ```
-- Otherwise, the new value is assigned to the key.
 
 #### got.defaults
 
@@ -1203,7 +1243,7 @@ The Got defaults used in that instance.
 Type: `Function[]`\
 Default: `[]`
 
-An array of functions. You execute them directly by calling `got()`. They are some sort of "global hooks" - these functions are called first. The last handler (*it's hidden*) is either [`asPromise`](source/as-promise.ts) or [`asStream`](source/as-stream.ts), depending on the `options.isStream` property.
+An array of functions. You execute them directly by calling `got()`. They are some sort of "global hooks" - these functions are called first. The last handler (*it's hidden*) is either [`asPromise`](source/core/as-promise/index.ts) or [`asStream`](source/core/index.ts), depending on the `options.isStream` property.
 
 Each handler takes two arguments:
 
@@ -1297,7 +1337,7 @@ When server response code is 2xx, and parsing body fails. Includes a `response`
 
 #### got.HTTPError
 
-When the server response code is not 2xx. Includes a `response` property.
+When the server response code is not 2xx nor 3xx if `options.followRedirect` is `true`, but always except for 304. Includes a `response` property.
 
 #### got.MaxRedirectsError