got 11.7.0 → 11.8.0

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/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.

package/dist/source/core/index.js

@@ -628,7 +628,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 +950,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 +1314,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 +1378,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 +1388,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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "11.7.0",
+	"version": "11.8.0",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -43,7 +43,7 @@
 		"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",
@@ -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;
 			}
 		]
 	}