got 12.0.0-beta.2 → 12.0.1

package/dist/source/core/options.js

@@ -1,12 +1,15 @@
-import { promisify, inspect } from 'util';
-import { URL, URLSearchParams } from 'url';
-import { checkServerIdentity } from 'tls';
-import { request as httpRequest } from 'http';
-import { request as httpsRequest } from 'https';
+import process from 'node:process';
+import { promisify, inspect } from 'node:util';
+import { URL, URLSearchParams } from 'node:url';
+import { checkServerIdentity } from 'node:tls';
+// DO NOT use destructuring for `https.request` and `http.request` as it's not compatible with `nock`.
+import http from 'node:http';
+import https from 'node:https';
 import is, { assert } from '@sindresorhus/is';
 import lowercaseKeys from 'lowercase-keys';
 import CacheableLookup from 'cacheable-lookup';
 import http2wrapper from 'http2-wrapper';
+import { isFormDataLike } from 'form-data-encoder';
 import parseLinkHeader from './parse-link-header.js';
 const [major, minor] = process.versions.node.split('.').map(v => Number(v));
 function validateSearchParameters(searchParameters) {
@@ -210,6 +213,71 @@ const cloneInternals = (internals) => {
     }
     return result;
 };
+const cloneRaw = (raw) => {
+    const { hooks, retry } = raw;
+    const result = { ...raw };
+    if (is.object(raw.context)) {
+        result.context = { ...raw.context };
+    }
+    if (is.object(raw.cacheOptions)) {
+        result.cacheOptions = { ...raw.cacheOptions };
+    }
+    if (is.object(raw.https)) {
+        result.https = { ...raw.https };
+    }
+    if (is.object(raw.cacheOptions)) {
+        result.cacheOptions = { ...result.cacheOptions };
+    }
+    if (is.object(raw.agent)) {
+        result.agent = { ...raw.agent };
+    }
+    if (is.object(raw.headers)) {
+        result.headers = { ...raw.headers };
+    }
+    if (is.object(retry)) {
+        result.retry = { ...retry };
+        if (is.array(retry.errorCodes)) {
+            result.retry.errorCodes = [...retry.errorCodes];
+        }
+        if (is.array(retry.methods)) {
+            result.retry.methods = [...retry.methods];
+        }
+        if (is.array(retry.statusCodes)) {
+            result.retry.statusCodes = [...retry.statusCodes];
+        }
+    }
+    if (is.object(raw.timeout)) {
+        result.timeout = { ...raw.timeout };
+    }
+    if (is.object(hooks)) {
+        result.hooks = {
+            ...hooks,
+        };
+        if (is.array(hooks.init)) {
+            result.hooks.init = [...hooks.init];
+        }
+        if (is.array(hooks.beforeRequest)) {
+            result.hooks.beforeRequest = [...hooks.beforeRequest];
+        }
+        if (is.array(hooks.beforeError)) {
+            result.hooks.beforeError = [...hooks.beforeError];
+        }
+        if (is.array(hooks.beforeRedirect)) {
+            result.hooks.beforeRedirect = [...hooks.beforeRedirect];
+        }
+        if (is.array(hooks.beforeRetry)) {
+            result.hooks.beforeRetry = [...hooks.beforeRetry];
+        }
+        if (is.array(hooks.afterResponse)) {
+            result.hooks.afterResponse = [...hooks.afterResponse];
+        }
+    }
+    // TODO: raw.searchParams
+    if (is.object(raw.pagination)) {
+        result.pagination = { ...raw.pagination };
+    }
+    return result;
+};
 const getHttp2TimeoutOption = (internals) => {
     const delays = [internals.timeout.socket, internals.timeout.connect, internals.timeout.lookup, internals.timeout.request, internals.timeout.secureConnect].filter(delay => typeof delay === 'number');
     if (delays.length > 0) {
@@ -315,19 +383,9 @@ export default class Options {
             }
             return;
         }
+        options = cloneRaw(options);
         init(this, options, this);
         init(options, options, this);
-        // This is way much faster than cloning ^_^
-        Object.freeze(options);
-        Object.freeze(options.hooks);
-        Object.freeze(options.https);
-        Object.freeze(options.cacheOptions);
-        Object.freeze(options.agent);
-        Object.freeze(options.headers);
-        Object.freeze(options.timeout);
-        Object.freeze(options.retry);
-        Object.freeze(options.hooks);
-        Object.freeze(options.context);
         this._merging = true;
         // Always merge `isStream` first
         if ('isStream' in options) {
@@ -541,7 +599,7 @@ export default class Options {
 
     __Note #4__: This option is not enumerable and will not be merged with the instance defaults.
 
-    The `content-length` header will be automatically set if `body` is a `string` / `Buffer` / [`form-data` instance](https://github.com/form-data/form-data), and `content-length` and `transfer-encoding` are not manually set in `options.headers`.
+    The `content-length` header will be automatically set if `body` is a `string` / `Buffer` / [`FormData`](https://developer.mozilla.org/en-US/docs/Web/API/FormData) / [`form-data` instance](https://github.com/form-data/form-data), and `content-length` and `transfer-encoding` are not manually set in `options.headers`.
 
     Since Got 12, the `content-length` is not automatically set when `body` is a `fs.createReadStream`.
     */
@@ -549,7 +607,7 @@ export default class Options {
         return this._internals.body;
     }
     set body(value) {
-        assert.any([is.string, is.buffer, is.nodeStream, is.generator, is.asyncGenerator, is.undefined], value);
+        assert.any([is.string, is.buffer, is.nodeStream, is.generator, is.asyncGenerator, isFormDataLike, is.undefined], value);
         if (is.nodeStream(value)) {
             assert.truthy(value.readable);
         }
@@ -1441,6 +1499,7 @@ export default class Options {
         assert.any([is.number, is.undefined], value);
         this._internals.maxHeaderSize = value;
     }
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     toJSON() {
         return { ...this._internals };
     }
@@ -1469,6 +1528,8 @@ export default class Options {
             ...internals.cacheOptions,
             ...this._unixOptions,
             // HTTPS options
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            ALPNProtocols: https.alpnProtocols,
             ca: https.certificateAuthority,
             cert: https.certificate,
             key: https.key,
@@ -1522,21 +1583,29 @@ export default class Options {
                 }
                 return http2wrapper.auto;
             }
-            return httpsRequest;
+            return https.request;
         }
-        return httpRequest;
+        return http.request;
     }
     freeze() {
         const options = this._internals;
         Object.freeze(options);
         Object.freeze(options.hooks);
+        Object.freeze(options.hooks.afterResponse);
+        Object.freeze(options.hooks.beforeError);
+        Object.freeze(options.hooks.beforeRedirect);
+        Object.freeze(options.hooks.beforeRequest);
+        Object.freeze(options.hooks.beforeRetry);
+        Object.freeze(options.hooks.init);
         Object.freeze(options.https);
         Object.freeze(options.cacheOptions);
         Object.freeze(options.agent);
         Object.freeze(options.headers);
         Object.freeze(options.timeout);
         Object.freeze(options.retry);
-        Object.freeze(options.hooks);
+        Object.freeze(options.retry.errorCodes);
+        Object.freeze(options.retry.methods);
+        Object.freeze(options.retry.statusCodes);
         Object.freeze(options.context);
     }
 }

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

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import type { URL } from 'url';
+import type { Buffer } from 'node:buffer';
+import type { URL } from 'node:url';
 import type { IncomingMessageWithTimings, Timings } from '@szmarczak/http-timer';
 import { RequestError } from './errors.js';
 import type { ParseJsonFunction, ResponseType } from './options.js';

package/dist/source/core/response.js

@@ -28,12 +28,12 @@ export const parseBody = (response, responseType, parseJson, encoding) => {
         if (responseType === 'buffer') {
             return rawBody;
         }
-        throw new ParseError({
-            message: `Unknown body type '${responseType}'`,
-            name: 'Error',
-        }, response);
     }
     catch (error) {
         throw new ParseError(error, response);
     }
+    throw new ParseError({
+        message: `Unknown body type '${responseType}'`,
+        name: 'Error',
+    }, response);
 };

package/dist/source/core/timed-out.d.ts

@@ -1,4 +1,4 @@
-import { ClientRequest } from 'http';
+import { ClientRequest } from 'node:http';
 declare const reentry: unique symbol;
 interface TimedOutOptions {
     host?: string;

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

@@ -1,4 +1,4 @@
-import net from 'net';
+import net from 'node:net';
 import unhandler from './utils/unhandle.js';
 const reentry = Symbol('reentry');
 const noop = () => { };

package/dist/source/core/utils/get-body-size.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="node" />
-import { ClientRequestArgs } from 'http';
+import { ClientRequestArgs } from 'node:http';
 export default function getBodySize(body: unknown, headers: ClientRequestArgs['headers']): Promise<number | undefined>;

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

@@ -1,4 +1,5 @@
-import { promisify } from 'util';
+import { Buffer } from 'node:buffer';
+import { promisify } from 'node:util';
 import is from '@sindresorhus/is';
 import isFormData from './is-form-data.js';
 export default async function getBodySize(body, headers) {

package/dist/source/core/utils/is-client-request.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { Writable, Readable } from 'stream';
-import type { ClientRequest } from 'http';
+import type { Writable, Readable } from 'node:stream';
+import type { ClientRequest } from 'node:http';
 declare function isClientRequest(clientRequest: Writable | Readable): clientRequest is ClientRequest;
 export default isClientRequest;

package/dist/source/core/utils/is-form-data.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Readable } from 'stream';
+import { Readable } from 'node:stream';
 interface FormData extends Readable {
     getBoundary: () => string;
     getLength: (callback: (error: Error | null, length: number) => void) => void;

package/dist/source/core/utils/options-to-url.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { URL } from 'url';
+import { URL } from 'node:url';
 export interface URLOptions {
     href?: string;
     protocol?: string;

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

@@ -1,5 +1,5 @@
 /* istanbul ignore file: deprecated */
-import { URL } from 'url';
+import { URL } from 'node:url';
 const keys = [
     'protocol',
     'host',

package/dist/source/core/utils/proxy-events.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="node" />
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 export default function proxyEvents(from: EventEmitter, to: EventEmitter, events: Readonly<string[]>): () => void;

package/dist/source/core/utils/unhandle.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'node:events';
 declare type Origin = EventEmitter;
 declare type Event = string | symbol;
 declare type Fn = (...args: any[]) => void;

package/dist/source/core/utils/url-to-options.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { URL, UrlWithStringQuery } from 'url';
+import { URL, UrlWithStringQuery } from 'node:url';
 export interface LegacyUrlOptions {
     protocol: string;
     hostname: string;

package/dist/source/index.d.ts

@@ -4,6 +4,7 @@ export { got };
 export { default as Options } from './core/options.js';
 export * from './core/options.js';
 export * from './core/response.js';
+export type { default as Request } from './core/index.js';
 export * from './core/index.js';
 export * from './core/errors.js';
 export { Delays } from './core/timed-out.js';

package/dist/source/types.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import type { URL } from 'url';
+import type { Buffer } from 'node:buffer';
+import type { URL } from 'node:url';
 import type { CancelableRequest } from './as-promise/types.js';
 import type { Response } from './core/response.js';
 import type Options from './core/options.js';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "12.0.0-beta.2",
+	"version": "12.0.1",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -44,60 +44,64 @@
 		"ky"
 	],
 	"dependencies": {
-		"@sindresorhus/is": "^4.0.1",
-		"@szmarczak/http-timer": "^4.0.6",
+		"@sindresorhus/is": "^4.2.0",
+		"@szmarczak/http-timer": "^5.0.1",
 		"@types/cacheable-request": "^6.0.2",
 		"@types/responselike": "^1.0.0",
-		"cacheable-lookup": "^6.0.0",
+		"cacheable-lookup": "^6.0.4",
 		"cacheable-request": "^7.0.2",
 		"decompress-response": "^6.0.0",
+		"form-data-encoder": "1.7.1",
 		"get-stream": "^6.0.1",
-		"http2-wrapper": "^2.0.7",
-		"lowercase-keys": "^2.0.0",
-		"p-cancelable": "^2.1.1",
+		"http2-wrapper": "^2.1.9",
+		"lowercase-keys": "^3.0.0",
+		"p-cancelable": "^3.0.0",
 		"responselike": "^2.0.0"
 	},
 	"devDependencies": {
 		"@hapi/bourne": "^2.0.0",
-		"@sindresorhus/tsconfig": "^1.0.2",
-		"@sinonjs/fake-timers": "^6.0.1",
+		"@sindresorhus/tsconfig": "^2.0.0",
+		"@sinonjs/fake-timers": "^8.1.0",
 		"@types/benchmark": "^2.1.1",
 		"@types/express": "^4.17.13",
-		"@types/node": "^14.14.45",
-		"@types/node-fetch": "^2.5.11",
+		"@types/node": "^16.11.12",
 		"@types/pem": "^1.9.6",
 		"@types/pify": "^5.0.1",
-		"@types/readable-stream": "^2.3.11",
-		"@types/request": "^2.48.6",
-		"@types/sinon": "^9.0.9",
+		"@types/readable-stream": "^2.3.12",
+		"@types/request": "^2.48.7",
+		"@types/sinon": "^10.0.6",
+		"@types/sinonjs__fake-timers": "^8.1.1",
 		"@types/tough-cookie": "^4.0.1",
 		"ava": "^3.15.0",
-		"axios": "^0.21.1",
+		"axios": "^0.24.0",
 		"benchmark": "^2.1.4",
+		"bluebird": "^3.7.2",
 		"body-parser": "^1.19.0",
 		"create-cert": "^1.0.6",
 		"create-test-server": "^3.0.1",
-		"del-cli": "^3.0.1",
+		"del-cli": "^4.0.1",
 		"delay": "^5.0.0",
 		"express": "^4.17.1",
 		"form-data": "^4.0.0",
-		"nock": "^13.1.1",
-		"node-fetch": "^2.6.1",
-		"np": "^7.5.0",
+		"formdata-node": "^4.3.1",
+		"nock": "^13.2.1",
+		"node-fetch": "^3.1.0",
+		"np": "^7.6.0",
 		"nyc": "^15.1.0",
-		"p-event": "^4.2.0",
+		"p-event": "^5.0.1",
 		"pem": "^1.14.4",
 		"pify": "^5.0.0",
 		"readable-stream": "^3.6.0",
 		"request": "^2.88.2",
-		"sinon": "^10.0.0",
+		"sinon": "^12.0.1",
 		"slow-stream": "0.0.4",
-		"tempy": "^1.0.1",
+		"tempy": "^2.0.0",
+		"then-busboy": "^5.1.1",
 		"to-readable-stream": "^3.0.0",
 		"tough-cookie": "^4.0.0",
-		"ts-node": "^10.1.0",
-		"typescript": "4.3.5",
-		"xo": "^0.41.0"
+		"ts-node": "^10.4.0",
+		"typescript": "4.5.3",
+		"xo": "^0.47.0"
 	},
 	"types": "dist/source",
 	"sideEffects": false,
@@ -146,7 +150,9 @@
 			"@typescript-eslint/no-unsafe-return": "off",
 			"@typescript-eslint/no-unsafe-assignment": "off",
 			"@typescript-eslint/no-unsafe-call": "off",
-			"@typescript-eslint/await-thenable": "off"
+			"@typescript-eslint/await-thenable": "off",
+			"no-lone-blocks": "off",
+			"unicorn/no-await-expression-member": "off"
 		}
 	},
 	"runkitExampleFilename": "./documentation/examples/runkit-example.js"