got 11.7.0 → 11.8.3

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

@@ -133,9 +133,10 @@ function asPromise(normalizedOptions) {
                 reject(error);
             };
             request.once('error', onError);
+            const previousBody = request.options.body;
             request.once('retry', (newRetryCount, error) => {
-                var _a;
-                if (is_1.default.nodeStream((_a = error.request) === null || _a === void 0 ? void 0 : _a.options.body)) {
+                var _a, _b;
+                if (previousBody === ((_a = error.request) === null || _a === void 0 ? void 0 : _a.options.body) && is_1.default.nodeStream((_b = error.request) === null || _b === void 0 ? void 0 : _b.options.body)) {
                     onError(error);
                     return;
                 }

package/dist/source/as-promise/parse-body.d.ts

@@ -1,3 +1,3 @@
 import { ResponseType, Response, ParseJsonFunction } from './types';
-declare const parseBody: (response: Response, responseType: ResponseType, parseJson: ParseJsonFunction, encoding?: "ascii" | "utf8" | "utf-8" | "utf16le" | "ucs2" | "ucs-2" | "base64" | "latin1" | "binary" | "hex" | undefined) => unknown;
+declare const parseBody: (response: Response, responseType: ResponseType, parseJson: ParseJsonFunction, encoding?: "ascii" | "utf8" | "utf-8" | "utf16le" | "ucs2" | "ucs-2" | "base64" | "base64url" | "latin1" | "binary" | "hex" | undefined) => unknown;
 export default parseBody;

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

@@ -21,6 +21,7 @@ class ParseError extends core_1.RequestError {
         const { options } = response.request;
         super(`${error.message} in "${options.url.toString()}"`, error, response.request);
         this.name = 'ParseError';
+        this.code = this.code === 'ERR_GOT_REQUEST_ERROR' ? 'ERR_BODY_PARSE_FAILURE' : this.code;
     }
 }
 exports.ParseError = ParseError;
@@ -31,6 +32,7 @@ class CancelError extends core_1.RequestError {
     constructor(request) {
         super('Promise was canceled', {}, request);
         this.name = 'CancelError';
+        this.code = 'ERR_CANCELED';
     }
     get isCanceled() {
         return true;

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

@@ -41,12 +41,8 @@ export interface Agents {
 }
 export declare const withoutBody: ReadonlySet<string>;
 export interface ToughCookieJar {
-    getCookieString: ((currentUrl: string, options: {
-        [key: string]: unknown;
-    }, cb: (err: Error | null, cookies: string) => void) => void) & ((url: string, callback: (error: Error | null, cookieHeader: string) => void) => void);
-    setCookie: ((cookieOrString: unknown, currentUrl: string, options: {
-        [key: string]: unknown;
-    }, cb: (err: Error | null, cookie: unknown) => void) => void) & ((rawCookie: string, url: string, callback: (error: Error | null, result: unknown) => void) => void);
+    getCookieString: ((currentUrl: string, options: Record<string, unknown>, cb: (err: Error | null, cookies: string) => void) => void) & ((url: string, callback: (error: Error | null, cookieHeader: string) => void) => void);
+    setCookie: ((cookieOrString: unknown, currentUrl: string, options: Record<string, unknown>, cb: (err: Error | null, cookie: unknown) => void) => void) & ((rawCookie: string, url: string, callback: (error: Error | null, result: unknown) => void) => void);
 }
 export interface PromiseCookieJar {
     getCookieString: (url: string) => Promise<string>;
@@ -352,9 +348,7 @@ interface PlainOptions extends URLOptions {
 
     __Note #2__: This option is not enumerable and will not be merged with the instance defaults.
     */
-    form?: {
-        [key: string]: any;
-    };
+    form?: Record<string, any>;
     /**
     JSON body. If the `Content-Type` header is not set, it will be set to `application/json`.
 
@@ -362,9 +356,7 @@ interface PlainOptions extends URLOptions {
 
     __Note #2__: This option is not enumerable and will not be merged with the instance defaults.
     */
-    json?: {
-        [key: string]: any;
-    };
+    json?: Record<string, any>;
     /**
     The URL to request, as a string, a [`https.request` options object](https://nodejs.org/api/https.html#https_https_request_options_callback), or a [WHATWG `URL`](https://nodejs.org/api/url.html#url_class_url).
 
@@ -415,9 +407,7 @@ interface PlainOptions extends URLOptions {
     //=> 'key=a&key=b'
     ```
     */
-    searchParams?: string | {
-        [key: string]: string | number | boolean | null | undefined;
-    } | URLSearchParams;
+    searchParams?: string | Record<string, string | number | boolean | null | undefined> | URLSearchParams;
     /**
     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.
@@ -962,7 +952,7 @@ An error to be thrown when a request fails.
 Contains a `code` property with error class code, like `ECONNREFUSED`.
 */
 export declare class RequestError extends Error {
-    code?: string;
+    code: string;
     stack: string;
     readonly options: NormalizedOptions;
     readonly response?: Response;

package/dist/source/core/index.js

@@ -29,7 +29,7 @@ const is_response_ok_1 = require("./utils/is-response-ok");
 const deprecation_warning_1 = require("../utils/deprecation-warning");
 const normalize_arguments_1 = require("../as-promise/normalize-arguments");
 const calculate_retry_delay_1 = require("./calculate-retry-delay");
-const globalDnsCache = new cacheable_lookup_1.default();
+let globalDnsCache;
 const kRequest = Symbol('request');
 const kResponse = Symbol('response');
 const kResponseSize = Symbol('responseSize');
@@ -121,11 +121,11 @@ Contains a `code` property with error class code, like `ECONNREFUSED`.
 */
 class RequestError extends Error {
     constructor(message, error, self) {
-        var _a;
+        var _a, _b;
         super(message);
         Error.captureStackTrace(this, this.constructor);
         this.name = 'RequestError';
-        this.code = error.code;
+        this.code = (_a = error.code) !== null && _a !== void 0 ? _a : 'ERR_GOT_REQUEST_ERROR';
         if (self instanceof Request) {
             Object.defineProperty(this, 'request', {
                 enumerable: false,
@@ -150,9 +150,9 @@ class RequestError extends Error {
                 value: self
             });
         }
-        this.timings = (_a = this.request) === null || _a === void 0 ? void 0 : _a.timings;
+        this.timings = (_b = this.request) === null || _b === void 0 ? void 0 : _b.timings;
         // Recover the original stacktrace
-        if (!is_1.default.undefined(error.stack)) {
+        if (is_1.default.string(error.stack) && is_1.default.string(this.stack)) {
             const indexOfMessage = this.stack.indexOf(this.message) + this.message.length;
             const thisStackTrace = this.stack.slice(indexOfMessage).split('\n').reverse();
             const errorStackTrace = error.stack.slice(error.stack.indexOf(error.message) + error.message.length).split('\n').reverse();
@@ -173,6 +173,7 @@ class MaxRedirectsError extends RequestError {
     constructor(request) {
         super(`Redirected ${request.options.maxRedirects} times. Aborting.`, {}, request);
         this.name = 'MaxRedirectsError';
+        this.code = 'ERR_TOO_MANY_REDIRECTS';
     }
 }
 exports.MaxRedirectsError = MaxRedirectsError;
@@ -184,6 +185,7 @@ class HTTPError extends RequestError {
     constructor(response) {
         super(`Response code ${response.statusCode} (${response.statusMessage})`, {}, response.request);
         this.name = 'HTTPError';
+        this.code = 'ERR_NON_2XX_3XX_RESPONSE';
     }
 }
 exports.HTTPError = HTTPError;
@@ -195,6 +197,7 @@ class CacheError extends RequestError {
     constructor(error, request) {
         super(error.message, error, request);
         this.name = 'CacheError';
+        this.code = this.code === 'ERR_GOT_REQUEST_ERROR' ? 'ERR_CACHE_ACCESS' : this.code;
     }
 }
 exports.CacheError = CacheError;
@@ -205,6 +208,7 @@ class UploadError extends RequestError {
     constructor(error, request) {
         super(error.message, error, request);
         this.name = 'UploadError';
+        this.code = this.code === 'ERR_GOT_REQUEST_ERROR' ? 'ERR_UPLOAD' : this.code;
     }
 }
 exports.UploadError = UploadError;
@@ -228,6 +232,7 @@ class ReadError extends RequestError {
     constructor(error, request) {
         super(error.message, error, request);
         this.name = 'ReadError';
+        this.code = this.code === 'ERR_GOT_REQUEST_ERROR' ? 'ERR_READING_RESPONSE_STREAM' : this.code;
     }
 }
 exports.ReadError = ReadError;
@@ -238,6 +243,7 @@ class UnsupportedProtocolError extends RequestError {
     constructor(options) {
         super(`Unsupported protocol "${options.url.protocol}"`, {}, options);
         this.name = 'UnsupportedProtocolError';
+        this.code = 'ERR_UNSUPPORTED_PROTOCOL';
     }
 }
 exports.UnsupportedProtocolError = UnsupportedProtocolError;
@@ -586,6 +592,9 @@ class Request extends stream_1.Duplex {
         options.cacheOptions = { ...options.cacheOptions };
         // `options.dnsCache`
         if (options.dnsCache === true) {
+            if (!globalDnsCache) {
+                globalDnsCache = new cacheable_lookup_1.default();
+            }
             options.dnsCache = globalDnsCache;
         }
         else if (!is_1.default.undefined(options.dnsCache) && !options.dnsCache.lookup) {
@@ -628,7 +637,7 @@ class Request extends stream_1.Duplex {
         if (defaults && !areHooksDefault) {
             for (const event of exports.knownHookEvents) {
                 const defaultHooks = defaults.hooks[event];
-                if (defaultHooks.length !== 0) {
+                if (defaultHooks.length > 0) {
                     // See https://github.com/microsoft/TypeScript/issues/31445#issuecomment-576929044
                     options.hooks[event] = [
                         ...defaults.hooks[event],
@@ -950,12 +959,7 @@ class Request extends stream_1.Duplex {
             request.destroy();
             // Node.js <= 12.18.2 mistakenly emits the response `end` first.
             (_a = request.res) === null || _a === void 0 ? void 0 : _a.removeAllListeners('end');
-            if (error instanceof timed_out_1.TimeoutError) {
-                error = new TimeoutError(error, this.timings, this);
-            }
-            else {
-                error = new RequestError(error.message, error, this);
-            }
+            error = error instanceof timed_out_1.TimeoutError ? new TimeoutError(error, this.timings, this) : new RequestError(error.message, error, this);
             this._beforeError(error);
         });
         this[kUnproxyEvents] = proxy_events_1.default(request, this, proxiedRequestEvents);
@@ -1319,7 +1323,7 @@ class Request extends stream_1.Duplex {
         });
         // 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) {
+            if (!error && this._progressCallbacks.length > 0) {
                 this._progressCallbacks.shift()();
             }
             callback(error);
@@ -1383,7 +1387,7 @@ class Request extends stream_1.Duplex {
     */
     get ip() {
         var _a;
-        return (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.socket.remoteAddress;
+        return (_a = this.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress;
     }
     /**
     Indicates whether the request has been aborted or not.
@@ -1393,8 +1397,8 @@ class Request extends stream_1.Duplex {
         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;
-        return (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.socket;
+        var _a, _b;
+        return (_b = (_a = this[kRequest]) === null || _a === void 0 ? void 0 : _a.socket) !== null && _b !== void 0 ? _b : undefined;
     }
     /**
     Progress event for downloading (receiving a response).

package/dist/source/core/utils/get-body-size.js

@@ -23,6 +23,9 @@ exports.default = async (body, headers) => {
     }
     if (body instanceof fs_1.ReadStream) {
         const { size } = await statAsync(body.path);
+        if (size === 0) {
+            return undefined;
+        }
         return size;
     }
     return undefined;

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

@@ -14,7 +14,7 @@ exports.default = (url) => {
         href: url.href,
         path: `${url.pathname || ''}${url.search || ''}`
     };
-    if (is_1.default.string(url.port) && url.port.length !== 0) {
+    if (is_1.default.string(url.port) && url.port.length > 0) {
         options.port = Number(url.port);
     }
     if (url.username || url.password) {

package/dist/source/create.js

@@ -82,7 +82,7 @@ const create = (defaults) => {
         return result;
     }));
     // Got interface
-    const got = ((url, options, _defaults) => {
+    const got = ((url, options = {}, _defaults) => {
         var _a, _b;
         let iteration = 0;
         const iterateHandlers = (newOptions) => {
@@ -103,7 +103,7 @@ const create = (defaults) => {
             let initHookError;
             try {
                 callInitHooks(defaults.options.hooks.init, options);
-                callInitHooks((_a = options === null || options === void 0 ? void 0 : options.hooks) === null || _a === void 0 ? void 0 : _a.init, options);
+                callInitHooks((_a = options.hooks) === null || _a === void 0 ? void 0 : _a.init, options);
             }
             catch (error) {
                 initHookError = error;
@@ -117,11 +117,11 @@ const create = (defaults) => {
             return iterateHandlers(normalizedOptions);
         }
         catch (error) {
-            if (options === null || options === void 0 ? void 0 : options.isStream) {
+            if (options.isStream) {
                 throw error;
             }
             else {
-                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);
+                return create_rejection_1.default(error, defaults.options.hooks.beforeError, (_b = options.hooks) === null || _b === void 0 ? void 0 : _b.beforeError);
             }
         }
     });

package/dist/source/types.d.ts

@@ -226,49 +226,51 @@ export interface Got extends Record<HTTPAlias, GotRequestFunction>, GotRequestFu
     */
     defaults: InstanceDefaults;
     /**
-    An error to be thrown when a cache method fails.
-    For example, if the database goes down or there's a filesystem error.
+    An error to be thrown when a cache method fails. For example, if the database goes down or there's a filesystem error.
+    Contains a `code` property with `ERR_CACHE_ACCESS` or a more specific failure code.
     */
     CacheError: typeof CacheError;
     /**
-    An error to be thrown when a request fails.
-    Contains a `code` property with error class code, like `ECONNREFUSED`.
+    An error to be thrown when a request fails. Contains a `code` property with error class code, like `ECONNREFUSED`.
+    If there is no specific code supplied, `code` defaults to `ERR_GOT_REQUEST_ERROR`.
     */
     RequestError: typeof RequestError;
     /**
-    An error to be thrown when reading from response stream fails.
+    An error to be thrown when reading from response stream fails. Contains a `code` property with
+    `ERR_READING_RESPONSE_STREAM` or a more specific failure code.
     */
     ReadError: typeof ReadError;
     /**
-    An error to be thrown when server response code is 2xx, and parsing body fails.
-    Includes a `response` property.
+    An error to be thrown when server response code is 2xx, and parsing body fails. Includes a
+    `response` property. Contains a `code` property with `ERR_BODY_PARSE_FAILURE` or a more specific failure code.
     */
     ParseError: typeof ParseError;
     /**
     An error to be thrown when the server response code is not 2xx nor 3xx if `options.followRedirect` is `true`, but always except for 304.
-    Includes a `response` property.
+    Includes a `response` property. Contains a `code` property with `ERR_NON_2XX_3XX_RESPONSE` or a more specific failure code.
     */
     HTTPError: typeof HTTPError;
     /**
     An error to be thrown when the server redirects you more than ten times.
-    Includes a `response` property.
+    Includes a `response` property. Contains a `code` property with `ERR_TOO_MANY_REDIRECTS`.
     */
     MaxRedirectsError: typeof MaxRedirectsError;
     /**
-    An error to be thrown when given an unsupported protocol.
+    An error to be thrown when given an unsupported protocol. Contains a `code` property with `ERR_UNSUPPORTED_PROTOCOL`.
     */
     UnsupportedProtocolError: typeof UnsupportedProtocolError;
     /**
     An error to be thrown when the request is aborted due to a timeout.
-    Includes an `event` and `timings` property.
+    Includes an `event` and `timings` property. Contains a `code` property with `ETIMEDOUT`.
     */
     TimeoutError: typeof TimeoutError;
     /**
     An error to be thrown when the request body is a stream and an error occurs while reading from that stream.
+    Contains a `code` property with `ERR_UPLOAD` or a more specific failure code.
     */
     UploadError: typeof UploadError;
     /**
-    An error to be thrown when the request is aborted with `.cancel()`.
+    An error to be thrown when the request is aborted with `.cancel()`. Contains a `code` property with `ERR_CANCELED`.
     */
     CancelError: typeof CancelError;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "11.7.0",
+	"version": "11.8.3",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -43,12 +43,12 @@
 		"ky"
 	],
 	"dependencies": {
-		"@sindresorhus/is": "^3.1.1",
+		"@sindresorhus/is": "^4.0.0",
 		"@szmarczak/http-timer": "^4.0.5",
 		"@types/cacheable-request": "^6.0.1",
 		"@types/responselike": "^1.0.0",
 		"cacheable-lookup": "^5.0.3",
-		"cacheable-request": "^7.0.1",
+		"cacheable-request": "^7.0.2",
 		"decompress-response": "^6.0.0",
 		"http2-wrapper": "^1.0.0-beta.5.2",
 		"lowercase-keys": "^2.0.0",
@@ -61,7 +61,7 @@
 		"@sinonjs/fake-timers": "^6.0.1",
 		"@types/benchmark": "^1.0.33",
 		"@types/express": "^4.17.7",
-		"@types/node": "^14.6.0",
+		"@types/node": "^14.14.0",
 		"@types/node-fetch": "^2.5.7",
 		"@types/pem": "^1.9.5",
 		"@types/pify": "^3.0.2",
@@ -87,11 +87,11 @@
 		"pify": "^5.0.0",
 		"sinon": "^9.0.3",
 		"slow-stream": "0.0.4",
-		"tempy": "^0.6.0",
+		"tempy": "^1.0.0",
 		"to-readable-stream": "^2.1.0",
 		"tough-cookie": "^4.0.0",
-		"typescript": "^4.0.2",
-		"xo": "^0.33.0"
+		"typescript": "4.0.3",
+		"xo": "^0.34.1"
 	},
 	"types": "dist/source",
 	"sideEffects": false,
@@ -123,7 +123,7 @@
 			"node/prefer-global/url": "off",
 			"node/prefer-global/url-search-params": "off",
 			"import/no-anonymous-default-export": "off",
-			"@typescript-eslint/no-invalid-void-type": "off"
+			"@typescript-eslint/no-implicit-any-catch": "off"
 		}
 	},
 	"runkitExampleFilename": "./documentation/examples/runkit-example.js"

package/readme.md

@@ -107,16 +107,16 @@ const got = require('got');
 const pipeline = promisify(stream.pipeline);
 
 (async () => {
-    await pipeline(
-        got.stream('https://sindresorhus.com'),
-        fs.createWriteStream('index.html')
-    );
-
-    // For POST, PUT, and PATCH methods `got.stream` returns a `stream.Writable`
-    await pipeline(
-        fs.createReadStream('index.html'),
-        got.stream.post('https://sindresorhus.com')
-    );
+	await pipeline(
+		got.stream('https://sindresorhus.com'),
+		fs.createWriteStream('index.html')
+	);
+
+	// For POST, PUT, PATCH, and DELETE methods, `got.stream` returns a `stream.Writable`.
+	await pipeline(
+		fs.createReadStream('index.html'),
+		got.stream.post('https://sindresorhus.com')
+	);
 })();
 ```
 
@@ -306,7 +306,7 @@ Example:
 	const bufferPromise = responsePromise.buffer();
 	const jsonPromise = responsePromise.json();
 
-	const [response, buffer, json] = Promise.all([responsePromise, bufferPromise, jsonPromise]);
+	const [response, buffer, json] = await Promise.all([responsePromise, bufferPromise, jsonPromise]);
 	// `response` is an instance of Got Response
 	// `buffer` is an instance of Buffer
 	// `json` is an object
@@ -655,6 +655,15 @@ await got('https://api6.ipify.org', {
 });
 ```
 
+###### lookup
+
+Type: `Function`\
+Default: [`dns.lookup`](https://nodejs.org/api/dns.html#dns_dns_lookup_hostname_options_callback)
+
+Custom DNS resolution logic.
+
+The function signature is the same as [`dns.lookup`](https://nodejs.org/api/dns.html#dns_dns_lookup_hostname_options_callback).
+
 ###### request
 
 Type: `Function`\
@@ -873,12 +882,12 @@ got('https://api.github.com/some-endpoint', {
 		beforeError: [
 			error => {
 				const {response} = error;
- 				if (response && response.body) {
+				if (response && response.body) {
 					error.name = 'GitHubError';
 					error.message = `${response.body.message} (${response.statusCode})`;
 				}
 
- 				return error;
+				return error;
 			}
 		]
 	}
@@ -1696,43 +1705,44 @@ Additionaly, the errors may have `request` (Got Stream) and `response` (Got Resp
 
 #### got.RequestError
 
-When a request fails. Contains a `code` property with error class code, like `ECONNREFUSED`. All the errors below inherit this one.
+When a request fails. Contains a `code` property with error class code, like `ECONNREFUSED`. If there is no specific code supplied, `code` defaults to `ERR_GOT_REQUEST_ERROR`. All the errors below inherit this one.
 
 #### got.CacheError
 
-When a cache method fails, for example, if the database goes down or there's a filesystem error.
+When a cache method fails, for example, if the database goes down or there's a filesystem error. Contains a `code` property with `ERR_CACHE_ACCESS` or a more specific failure code.
 
 #### got.ReadError
 
-When reading from response stream fails.
+When reading from response stream fails. Contains a `code` property with `ERR_READING_RESPONSE_STREAM` or a more specific failure code.
 
 #### got.ParseError
 
-When server response code is 2xx, and parsing body fails. Includes a `response` property.
+When server response code is 2xx, and parsing body fails. Includes a `response` property. Contains a `code` property with `ERR_BODY_PARSE_FAILURE` or a more specific failure code.
 
 #### got.UploadError
 
-When the request body is a stream and an error occurs while reading from that stream.
+When the request body is a stream and an error occurs while reading from that stream. Contains a `code` property with `ERR_UPLOAD` or a more specific failure code.
 
 #### got.HTTPError
 
-When the server response code is not 2xx nor 3xx if `options.followRedirect` is `true`, but always except for 304. 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. Contains a `code` property with `ERR_NON_2XX_3XX_RESPONSE` or a more specific failure code.
+
 
 #### got.MaxRedirectsError
 
-When the server redirects you more than ten times. Includes a `response` property.
+When the server redirects you more than ten times. Includes a `response` property. Contains a `code` property with `ERR_TOO_MANY_REDIRECTS`.
 
 #### got.UnsupportedProtocolError
 
-When given an unsupported protocol.
+When given an unsupported protocol. Contains a `code` property with `ERR_UNSUPPORTED_PROTOCOL`.
 
 #### got.TimeoutError
 
-When the request is aborted due to a [timeout](#timeout). Includes an `event` and `timings` property.
+When the request is aborted due to a [timeout](#timeout). Includes an `event` and `timings` property. Contains a `code` property with `ETIMEDOUT`.
 
 #### got.CancelError
 
-When the request is aborted with `.cancel()`.
+When the request is aborted with `.cancel()`. Contains a `code` property with `ERR_CANCELED`.
 
 ## Aborting the request