got 11.6.1 → 11.6.2

package/dist/source/core/index.js

@@ -341,7 +341,7 @@ class Request extends stream_1.Duplex {
         })(options);
     }
     static normalizeArguments(url, options, defaults) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const rawOptions = options;
         if (is_1.default.object(url) && !is_1.default.urlInstance(url)) {
             options = { ...defaults, ...url, ...options };
@@ -453,15 +453,15 @@ class Request extends stream_1.Duplex {
         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) {
+        if (is_1.default.undefined(options.prefixUrl)) {
+            options.prefixUrl = (_d = defaults === null || defaults === void 0 ? void 0 : defaults.prefixUrl) !== null && _d !== void 0 ? _d : '';
+        }
+        else {
             options.prefixUrl = options.prefixUrl.toString();
             if (options.prefixUrl !== '' && !options.prefixUrl.endsWith('/')) {
                 options.prefixUrl += '/';
             }
         }
-        else {
-            options.prefixUrl = '';
-        }
         if (is_1.default.string(options.url)) {
             if (options.url.startsWith('/')) {
                 throw new Error('`input` must not start with a slash when using `prefixUrl`');
@@ -660,7 +660,7 @@ class Request extends stream_1.Duplex {
                 }
             }
         }
-        options.maxRedirects = (_d = options.maxRedirects) !== null && _d !== void 0 ? _d : 0;
+        options.maxRedirects = (_e = options.maxRedirects) !== null && _e !== void 0 ? _e : 0;
         // Set non-enumerable properties
         exports.setNonEnumerableProperties([defaults, rawOptions], options);
         return normalize_arguments_1.default(options, defaults);
@@ -1182,9 +1182,9 @@ class Request extends stream_1.Duplex {
                 response.setEncoding(this._readableState.encoding);
                 try {
                     response.rawBody = await get_buffer_1.default(response);
+                    response.body = response.rawBody.toString();
                 }
                 catch (_a) { }
-                response.body = response.rawBody.toString();
             }
             if (this.listenerCount('retry') !== 0) {
                 let backoff;
@@ -1280,6 +1280,10 @@ class Request extends stream_1.Duplex {
         }
     }
     _writeRequest(chunk, encoding, callback) {
+        if (this[kRequest].destroyed) {
+            // Probably the `ClientRequest` instance will throw
+            return;
+        }
         this._progressCallbacks.push(() => {
             this[kUploadedSize] += Buffer.byteLength(chunk, encoding);
             const progress = this.uploadProgress;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "11.6.1",
+	"version": "11.6.2",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",

package/readme.md

@@ -519,6 +519,8 @@ Delays between retries counts with function `1000 * Math.pow(2, retry - 1) + Mat
 
 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).
 
+**Note:** The `calculateDelay` function is responsible for the entire cache mechanism, including the `limit` property. To support it, you need to check whether `computedValue` is different than `0`.
+
 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.
 - `ECONNRESET`: Connection was forcibly closed by a peer.
@@ -726,7 +728,7 @@ Called with plain [request options](#options), right before their normalization.
 See the [Request migration guide](documentation/migration-guides.md#breaking-changes) for an example.
 
 **Note #1:** This hook must be synchronous!\
-**Note #2:** Errors in this hook will be converted into an instances of [`RequestError`](#got.requesterror).\
+**Note #2:** Errors in this hook will be converted into an instances of [`RequestError`](#gotrequesterror).\
 **Note #3:** The options object may not have a `url` property. To modify it, use a `beforeRequest` hook instead.
 
 ###### hooks.beforeRequest
@@ -1320,7 +1322,7 @@ The same as `response.socket`.
 
 ##### .on('error', error)
 
-The emitted `error` is an instance of [`RequestError`](#got.requesterror).
+The emitted `error` is an instance of [`RequestError`](#gotrequesterror).
 
 #### Pagination
 
@@ -2194,12 +2196,12 @@ The Electron `net` module is not consistent with the Node.js `http` module. See
 [ab]: https://badgen.net/travis/axios/axios?label
 [sb]: https://badgen.net/travis/visionmedia/superagent?label
 
-[g5]: https://travis-ci.org/sindresorhus/got
-[k5]: https://travis-ci.org/sindresorhus/ky
-[r5]: https://travis-ci.org/request/request
-[n5]: https://travis-ci.org/bitinn/node-fetch
-[a5]: https://travis-ci.org/axios/axios
-[s5]: https://travis-ci.org/visionmedia/superagent
+[g5]: https://travis-ci.com/github/sindresorhus/got
+[k5]: https://travis-ci.com/github/sindresorhus/ky
+[r5]: https://travis-ci.org/github/request/request
+[n5]: https://travis-ci.org/github/bitinn/node-fetch
+[a5]: https://travis-ci.org/github/axios/axios
+[s5]: https://travis-ci.org/github/visionmedia/superagent
 
 <!-- BUGS -->
 [gbg]: https://badgen.net/github/label-issues/sindresorhus/got/bug/open?label