got 12.0.1 → 12.0.4

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

@@ -121,8 +121,6 @@ export default class Request extends Duplex implements RequestEvents<Request> {
         end?: boolean;
     }): T;
     unpipe<T extends NodeJS.WritableStream>(destination: T): this;
-    private _lockWrite;
-    private _unlockWrite;
     private _finalizeBody;
     private _onResponseBase;
     private _setRawBody;

package/dist/source/core/index.js

@@ -201,24 +201,6 @@ export default class Request extends Duplex {
         this.redirectUrls = [];
         this.retryCount = 0;
         this._stopRetry = noop;
-        const unlockWrite = () => {
-            this._unlockWrite();
-        };
-        const lockWrite = () => {
-            this._lockWrite();
-        };
-        this.on('pipe', (source) => {
-            source.prependListener('data', unlockWrite);
-            source.on('data', lockWrite);
-            source.prependListener('end', unlockWrite);
-            source.on('end', lockWrite);
-        });
-        this.on('unpipe', (source) => {
-            source.off('data', unlockWrite);
-            source.off('data', lockWrite);
-            source.off('end', unlockWrite);
-            source.off('end', lockWrite);
-        });
         this.on('pipe', source => {
             if (source.headers) {
                 Object.assign(this.options.headers, source.headers);
@@ -250,12 +232,9 @@ export default class Request extends Duplex {
             };
             return;
         }
-        const { json, body, form } = this.options;
-        if (json || body || form) {
-            this._lockWrite();
-        }
         // Important! If you replace `body` in a handler with another stream, make sure it's readable first.
         // The below is run only once.
+        const { body } = this.options;
         if (is.nodeStream(body)) {
             body.once('error', error => {
                 if (this._flushed) {
@@ -410,7 +389,7 @@ export default class Request extends Duplex {
             }
             let data;
             while ((data = response.read()) !== null) {
-                this._downloadedSize += data.length;
+                this._downloadedSize += data.length; // eslint-disable-line @typescript-eslint/restrict-plus-operands
                 const progress = this.downloadProgress;
                 if (progress.percent < 1) {
                     this.emit('downloadProgress', progress);
@@ -492,17 +471,6 @@ export default class Request extends Duplex {
         super.unpipe(destination);
         return this;
     }
-    _lockWrite() {
-        const onLockedWrite = () => {
-            throw new TypeError('The payload has been already provided');
-        };
-        this.write = onLockedWrite;
-        this.end = onLockedWrite;
-    }
-    _unlockWrite() {
-        this.write = super.write;
-        this.end = super.end;
-    }
     async _finalizeBody() {
         const { options } = this;
         const { headers } = options;
@@ -563,12 +531,6 @@ export default class Request extends Duplex {
                 headers['content-length'] = String(uploadBodySize);
             }
         }
-        else if (cannotHaveBody) {
-            this._lockWrite();
-        }
-        else {
-            this._unlockWrite();
-        }
         if (options.responseType === 'json' && !('accept' in options.headers)) {
             options.headers.accept = 'application/json';
         }
@@ -829,17 +791,12 @@ export default class Request extends Duplex {
                 }
             })();
         }
-        else {
-            this._unlockWrite();
-            if (!is.undefined(body)) {
-                this._writeRequest(body, undefined, () => { });
-                currentRequest.end();
-                this._lockWrite();
-            }
-            else if (this._cannotHaveBody || this._noPipe) {
-                currentRequest.end();
-                this._lockWrite();
-            }
+        else if (!is.undefined(body)) {
+            this._writeRequest(body, undefined, () => { });
+            currentRequest.end();
+        }
+        else if (this._cannotHaveBody || this._noPipe) {
+            currentRequest.end();
         }
     }
     _prepareCache(cache) {
@@ -1117,7 +1074,6 @@ export default class Request extends Duplex {
         return this._isFromCache;
     }
     get reusedSocket() {
-        // @ts-expect-error `@types/node` has incomplete types
         return this._request?.reusedSocket;
     }
 }

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

@@ -701,8 +701,8 @@ export default class Options {
 
     __Note #2__: This option is not enumerable and will not be merged with the instance defaults.
     */
-    get json(): Record<string, any> | undefined;
-    set json(value: Record<string, any> | undefined);
+    get json(): unknown;
+    set json(value: unknown);
     /**
     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).
 
@@ -1102,7 +1102,7 @@ export default class Options {
         request: RequestFunction | undefined;
         username: string;
         password: string;
-        json: Record<string, any> | undefined;
+        json: unknown;
         retry: Partial<RetryOptions>;
         agent: Agents;
         h2session: http2wrapper.ClientHttp2Session | undefined;
@@ -1152,7 +1152,7 @@ export default class Options {
         ALPNProtocols: string[] | undefined;
         ca: string | Buffer | (string | Buffer)[] | undefined;
         cert: string | Buffer | (string | Buffer)[] | undefined;
-        key: string | Buffer | (Buffer | import("tls").KeyObject)[] | undefined;
+        key: string | Buffer | (string | Buffer | import("tls").KeyObject)[] | undefined;
         passphrase: string | undefined;
         pfx: PfxType;
         rejectUnauthorized: boolean | undefined;

package/dist/source/core/options.js

@@ -151,13 +151,13 @@ const defaultInternals = {
     responseType: 'text',
     url: undefined,
     pagination: {
-        transform: (response) => {
+        transform(response) {
             if (response.request.options.responseType === 'json') {
                 return response.body;
             }
             return JSON.parse(response.body);
         },
-        paginate: ({ response }) => {
+        paginate({ response }) {
             const rawLinkHeader = response.headers.link;
             if (typeof rawLinkHeader !== 'string' || rawLinkHeader.trim() === '') {
                 return false;
@@ -648,7 +648,6 @@ export default class Options {
         return this._internals.json;
     }
     set json(value) {
-        assert.any([is.object, is.undefined], value);
         if (value !== undefined) {
             assert.undefined(this._internals.body);
             assert.undefined(this._internals.form);

package/dist/source/core/response.js

@@ -23,7 +23,7 @@ export const parseBody = (response, responseType, parseJson, encoding) => {
             return rawBody.toString(encoding);
         }
         if (responseType === 'json') {
-            return rawBody.length === 0 ? '' : parseJson(rawBody.toString());
+            return rawBody.length === 0 ? '' : parseJson(rawBody.toString(encoding));
         }
         if (responseType === 'buffer') {
             return rawBody;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "12.0.1",
+	"version": "12.0.4",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -44,7 +44,7 @@
 		"ky"
 	],
 	"dependencies": {
-		"@sindresorhus/is": "^4.2.0",
+		"@sindresorhus/is": "^4.6.0",
 		"@szmarczak/http-timer": "^5.0.1",
 		"@types/cacheable-request": "^6.0.2",
 		"@types/responselike": "^1.0.0",
@@ -53,7 +53,7 @@
 		"decompress-response": "^6.0.0",
 		"form-data-encoder": "1.7.1",
 		"get-stream": "^6.0.1",
-		"http2-wrapper": "^2.1.9",
+		"http2-wrapper": "^2.1.10",
 		"lowercase-keys": "^3.0.0",
 		"p-cancelable": "^3.0.0",
 		"responselike": "^2.0.0"
@@ -61,47 +61,47 @@
 	"devDependencies": {
 		"@hapi/bourne": "^2.0.0",
 		"@sindresorhus/tsconfig": "^2.0.0",
-		"@sinonjs/fake-timers": "^8.1.0",
+		"@sinonjs/fake-timers": "^9.1.1",
 		"@types/benchmark": "^2.1.1",
 		"@types/express": "^4.17.13",
-		"@types/node": "^16.11.12",
+		"@types/node": "^17.0.21",
 		"@types/pem": "^1.9.6",
 		"@types/pify": "^5.0.1",
-		"@types/readable-stream": "^2.3.12",
-		"@types/request": "^2.48.7",
-		"@types/sinon": "^10.0.6",
+		"@types/readable-stream": "^2.3.13",
+		"@types/request": "^2.48.8",
+		"@types/sinon": "^10.0.11",
 		"@types/sinonjs__fake-timers": "^8.1.1",
 		"@types/tough-cookie": "^4.0.1",
 		"ava": "^3.15.0",
-		"axios": "^0.24.0",
+		"axios": "^0.26.1",
 		"benchmark": "^2.1.4",
 		"bluebird": "^3.7.2",
-		"body-parser": "^1.19.0",
+		"body-parser": "^1.19.2",
 		"create-cert": "^1.0.6",
 		"create-test-server": "^3.0.1",
 		"del-cli": "^4.0.1",
 		"delay": "^5.0.0",
-		"express": "^4.17.1",
+		"express": "^4.17.3",
 		"form-data": "^4.0.0",
-		"formdata-node": "^4.3.1",
-		"nock": "^13.2.1",
-		"node-fetch": "^3.1.0",
+		"formdata-node": "^4.3.2",
+		"nock": "^13.2.4",
+		"node-fetch": "^3.2.3",
 		"np": "^7.6.0",
 		"nyc": "^15.1.0",
 		"p-event": "^5.0.1",
-		"pem": "^1.14.4",
+		"pem": "^1.14.6",
 		"pify": "^5.0.0",
 		"readable-stream": "^3.6.0",
 		"request": "^2.88.2",
-		"sinon": "^12.0.1",
+		"sinon": "^13.0.1",
 		"slow-stream": "0.0.4",
 		"tempy": "^2.0.0",
 		"then-busboy": "^5.1.1",
 		"to-readable-stream": "^3.0.0",
 		"tough-cookie": "^4.0.0",
-		"ts-node": "^10.4.0",
-		"typescript": "4.5.3",
-		"xo": "^0.47.0"
+		"ts-node": "^10.7.0",
+		"typescript": "4.6.2",
+		"xo": "^0.48.0"
 	},
 	"types": "dist/source",
 	"sideEffects": false,

package/readme.md

@@ -70,9 +70,11 @@ For browser usage, we recommend [Ky](https://github.com/sindresorhus/ky) by the
 
 ## Install
 
+```sh
+npm install got
 ```
-$ npm install got
-```
+
+**Warning:** This package is native [ESM](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) and no longer provides a CommonJS export. If your project uses CommonJS, you'll have to [convert to ESM](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c) or use the [dynamic `import()`](https://v8.dev/features/dynamic-import) function. Please don't open issues for questions regarding CommonJS / ESM. You can also use [Got v11](https://github.com/sindresorhus/got/tree/v11.8.3) instead which is pretty stable.
 
 ## Take a peek