got 14.4.0 → 14.4.2

package/dist/source/as-promise/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { Buffer } from 'node:buffer';
 import type PCancelable from 'p-cancelable';
 import { RequestError } from '../core/errors.js';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { Timings } from '@szmarczak/http-timer';
 import type Options from './options.js';
 import type { TimeoutError as TimedOutTimeoutError } from './timed-out.js';

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

@@ -1,8 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { Duplex } from 'node:stream';
 import { type ClientRequest } from 'node:http';
 import type { Socket } from 'node:net';

package/dist/source/core/index.js

@@ -5,8 +5,7 @@ import http, { ServerResponse } from 'node:http';
 import timer from '@szmarczak/http-timer';
 import CacheableRequest, { CacheError as CacheableCacheError, } from 'cacheable-request';
 import decompressResponse from 'decompress-response';
-import is from '@sindresorhus/is';
-import { getStreamAsBuffer } from 'get-stream';
+import is, { isBuffer } from '@sindresorhus/is';
 import { FormDataEncoder, isFormData as isFormDataLike } from 'form-data-encoder';
 import getBodySize from './utils/get-body-size.js';
 import isFormData from './utils/is-form-data.js';
@@ -627,10 +626,8 @@ export default class Request extends Duplex {
         }
         try {
             // Errors are emitted via the `error` event
-            const rawBody = await getStreamAsBuffer(from);
-            // TODO: Switch to this:
-            // let rawBody = await from.toArray();
-            // rawBody = Buffer.concat(rawBody);
+            const fromArray = await from.toArray();
+            const rawBody = isBuffer(fromArray.at(0)) ? Buffer.concat(fromArray) : Buffer.from(fromArray.join(''));
             // On retry Request is destroyed with no error, therefore the above will successfully resolve.
             // So in order to check if this was really successfull, we need to check if it has been properly ended.
             if (!this.isAborted) {
@@ -794,7 +791,7 @@ export default class Request extends Duplex {
                 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                 delete headers[key];
             }
-            else if (is.null_(headers[key])) {
+            else if (is.null(headers[key])) {
                 throw new TypeError(`Use \`undefined\` instead of \`null\` to delete the \`${key}\` header`);
             }
         }

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

@@ -1,11 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import type { Buffer } from 'node:buffer';
 import { checkServerIdentity, type SecureContextOptions, type DetailedPeerCertificate } from 'node:tls';
 import https, { type RequestOptions as HttpsRequestOptions, type Agent as HttpsAgent } from 'node:https';
@@ -1151,7 +1143,7 @@ export default class Options {
             (hostname: string, callback: (error: NodeJS.ErrnoException | null, address: string, family: import("cacheable-lookup").IPFamily) => void): void;
             (hostname: string, options: import("cacheable-lookup").LookupOptions & {
                 all: true;
-            }, callback: (error: NodeJS.ErrnoException | null, result: readonly import("cacheable-lookup").EntryObject[]) => void): void;
+            }, callback: (error: NodeJS.ErrnoException | null, result: ReadonlyArray<import("cacheable-lookup").EntryObject>) => void): void;
             (hostname: string, options: import("cacheable-lookup").LookupOptions, callback: (error: NodeJS.ErrnoException | null, address: string, family: import("cacheable-lookup").IPFamily) => void): void;
         } | undefined;
         dnsCache: boolean | CacheableLookup | undefined;
@@ -1203,7 +1195,7 @@ export default class Options {
             (hostname: string, callback: (error: NodeJS.ErrnoException | null, address: string, family: import("cacheable-lookup").IPFamily) => void): void;
             (hostname: string, options: import("cacheable-lookup").LookupOptions & {
                 all: true;
-            }, callback: (error: NodeJS.ErrnoException | null, result: readonly import("cacheable-lookup").EntryObject[]) => void): void;
+            }, callback: (error: NodeJS.ErrnoException | null, result: ReadonlyArray<import("cacheable-lookup").EntryObject>) => void): void;
             (hostname: string, options: import("cacheable-lookup").LookupOptions, callback: (error: NodeJS.ErrnoException | null, address: string, family: import("cacheable-lookup").IPFamily) => void): void;
         } | undefined;
         family: DnsLookupIpVersion;
@@ -1218,19 +1210,19 @@ export default class Options {
         h2session: http2wrapper.ClientHttp2Session | undefined;
         _defaultAgent?: http.Agent | undefined;
         auth?: string | null | undefined;
-        defaultPort?: string | number | undefined;
-        hints?: number | undefined;
+        defaultPort?: number | string | undefined;
+        hints?: import("dns").LookupOptions["hints"];
         host?: string | null | undefined;
         hostname?: string | null | undefined;
         insecureHTTPParser?: boolean | undefined;
         localPort?: number | undefined;
         path?: string | null | undefined;
-        port?: string | number | null | undefined;
+        port?: number | string | null | undefined;
         protocol?: string | null | undefined;
         signal?: AbortSignal | undefined;
         socketPath?: string | undefined;
-        uniqueHeaders?: (string | string[])[] | undefined;
-        joinDuplicateHeaders?: boolean | undefined;
+        uniqueHeaders?: Array<string | string[]> | undefined;
+        joinDuplicateHeaders?: boolean;
         ALPNCallback?: ((arg: {
             servername: string;
             protocols: string[];
@@ -1243,10 +1235,10 @@ export default class Options {
         sessionIdContext?: string | undefined;
         ticketKeys?: Buffer | undefined;
         servername?: string | undefined;
-        shared?: boolean | undefined;
-        cacheHeuristic?: number | undefined;
-        immutableMinTimeToLive?: number | undefined;
-        ignoreCargoCult?: boolean | undefined;
+        shared?: boolean;
+        cacheHeuristic?: number;
+        immutableMinTimeToLive?: number;
+        ignoreCargoCult?: boolean;
     };
     getRequestFunction(): RequestFunction | typeof https.request | undefined;
     getFallbackRequestFunction(): RequestFunction | typeof https.request | undefined;

package/dist/source/core/options.js

@@ -15,7 +15,7 @@ function validateSearchParameters(searchParameters) {
     // eslint-disable-next-line guard-for-in
     for (const key in searchParameters) {
         const value = searchParameters[key];
-        assert.any([is.string, is.number, is.boolean, is.null_, is.undefined], value);
+        assert.any([is.string, is.number, is.boolean, is.null, is.undefined], value);
     }
 }
 const globalCache = new Map();
@@ -413,7 +413,7 @@ export default class Options {
         return this._internals.request;
     }
     set request(value) {
-        assert.any([is.function_, is.undefined], value);
+        assert.any([is.function, is.undefined], value);
         this._internals.request = value;
     }
     /**
@@ -730,8 +730,8 @@ export default class Options {
             return;
         }
         let { setCookie, getCookieString } = value;
-        assert.function_(setCookie);
-        assert.function_(getCookieString);
+        assert.function(setCookie);
+        assert.function(getCookieString);
         /* istanbul ignore next: Horrible `tough-cookie` v3 check */
         if (setCookie.length === 4 && getCookieString.length === 0) {
             setCookie = promisify(setCookie.bind(value));
@@ -871,7 +871,7 @@ export default class Options {
         return this._internals.dnsLookup;
     }
     set dnsLookup(value) {
-        assert.any([is.function_, is.undefined], value);
+        assert.any([is.function, is.undefined], value);
         this._internals.dnsLookup = value;
     }
     /**
@@ -961,7 +961,7 @@ export default class Options {
             assert.any([is.array, is.undefined], hooks);
             if (hooks) {
                 for (const hook of hooks) {
-                    assert.function_(hook);
+                    assert.function(hook);
                 }
             }
             if (this._merging) {
@@ -993,7 +993,7 @@ export default class Options {
         return this._internals.followRedirect;
     }
     set followRedirect(value) {
-        assert.any([is.boolean, is.function_], value);
+        assert.any([is.boolean, is.function], value);
         this._internals.followRedirect = value;
     }
     get followRedirects() {
@@ -1199,7 +1199,7 @@ export default class Options {
         return this._internals.parseJson;
     }
     set parseJson(value) {
-        assert.function_(value);
+        assert.function(value);
         this._internals.parseJson = value;
     }
     /**
@@ -1247,7 +1247,7 @@ export default class Options {
         return this._internals.stringifyJson;
     }
     set stringifyJson(value) {
-        assert.function_(value);
+        assert.function(value);
         this._internals.stringifyJson = value;
     }
     /**
@@ -1277,7 +1277,7 @@ export default class Options {
     }
     set retry(value) {
         assert.plainObject(value);
-        assert.any([is.function_, is.undefined], value.calculateDelay);
+        assert.any([is.function, is.undefined], value.calculateDelay);
         assert.any([is.number, is.undefined], value.maxRetryAfter);
         assert.any([is.number, is.undefined], value.limit);
         assert.any([is.array, is.undefined], value.methods);
@@ -1331,7 +1331,7 @@ export default class Options {
         return this._internals.createConnection;
     }
     set createConnection(value) {
-        assert.any([is.function_, is.undefined], value);
+        assert.any([is.function, is.undefined], value);
         this._internals.createConnection = value;
     }
     /**
@@ -1369,7 +1369,7 @@ export default class Options {
     set https(value) {
         assert.plainObject(value);
         assert.any([is.boolean, is.undefined], value.rejectUnauthorized);
-        assert.any([is.function_, is.undefined], value.checkServerIdentity);
+        assert.any([is.function, is.undefined], value.checkServerIdentity);
         assert.any([is.string, is.object, is.array, is.undefined], value.certificateAuthority);
         assert.any([is.string, is.object, is.array, is.undefined], value.key);
         assert.any([is.string, is.object, is.array, is.undefined], value.certificate);

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { Buffer } from 'node:buffer';
 import type { IncomingMessageWithTimings, Timings } from '@szmarczak/http-timer';
 import { RequestError } from './errors.js';

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { ClientRequest } from 'node:http';
 declare const reentry: unique symbol;
 type TimedOutOptions = {

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

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

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { Readable } from 'node:stream';
 type FormData = {
     getBoundary: () => string;

package/dist/source/core/utils/is-form-data.js

@@ -1,4 +1,4 @@
 import is from '@sindresorhus/is';
 export default function isFormData(body) {
-    return is.nodeStream(body) && is.function_(body.getBoundary);
+    return is.nodeStream(body) && is.function(body.getBoundary);
 }

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

@@ -1,3 +1,2 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { 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,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { EventEmitter } from 'node:events';
 type Origin = EventEmitter;
 type Event = string | symbol;

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { UrlWithStringQuery } from 'node:url';
 export type LegacyUrlOptions = {
     protocol: string;

package/dist/source/create.js

@@ -6,7 +6,7 @@ import Options from './core/options.js';
 const delay = async (ms) => new Promise(resolve => {
     setTimeout(resolve, ms);
 });
-const isGotInstance = (value) => is.function_(value);
+const isGotInstance = (value) => is.function(value);
 const aliases = [
     'get',
     'post',
@@ -33,9 +33,9 @@ const create = (defaults) => {
         const lastHandler = (normalized) => {
             // Note: `options` is `undefined` when `new Options(...)` fails
             request.options = normalized;
-            request._noPipe = !normalized.isStream;
+            request._noPipe = !normalized?.isStream;
             void request.flush();
-            if (normalized.isStream) {
+            if (normalized?.isStream) {
                 return request;
             }
             promise ||= asPromise(request);
@@ -45,7 +45,7 @@ const create = (defaults) => {
         const iterateHandlers = (newOptions) => {
             const handler = defaults.handlers[iteration++] ?? lastHandler;
             const result = handler(newOptions, iterateHandlers);
-            if (is.promise(result) && !request.options.isStream) {
+            if (is.promise(result) && !request.options?.isStream) {
                 promise ||= asPromise(request);
                 if (result !== promise) {
                     const descriptors = Object.getOwnPropertyDescriptors(promise);
@@ -93,10 +93,10 @@ const create = (defaults) => {
         let normalizedOptions = new Options(url, options, defaults.options);
         normalizedOptions.resolveBodyOnly = false;
         const { pagination } = normalizedOptions;
-        assert.function_(pagination.transform);
-        assert.function_(pagination.shouldContinue);
-        assert.function_(pagination.filter);
-        assert.function_(pagination.paginate);
+        assert.function(pagination.transform);
+        assert.function(pagination.shouldContinue);
+        assert.function(pagination.filter);
+        assert.function(pagination.paginate);
         assert.number(pagination.countLimit);
         assert.number(pagination.requestLimit);
         assert.number(pagination.backoff);

package/dist/source/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { Buffer } from 'node:buffer';
 import type { Spread } from 'type-fest';
 import type { CancelableRequest } from './as-promise/types.js';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "got",
-	"version": "14.4.0",
+	"version": "14.4.2",
 	"description": "Human-friendly and powerful HTTP request library for Node.js",
 	"license": "MIT",
 	"repository": "sindresorhus/got",
@@ -48,17 +48,17 @@
 		"ky"
 	],
 	"dependencies": {
-		"@sindresorhus/is": "^6.3.1",
+		"@sindresorhus/is": "^7.0.0",
 		"@szmarczak/http-timer": "^5.0.1",
 		"cacheable-lookup": "^7.0.0",
 		"cacheable-request": "^12.0.1",
 		"decompress-response": "^6.0.0",
 		"form-data-encoder": "^4.0.2",
-		"get-stream": "^8.0.1",
 		"http2-wrapper": "^2.2.1",
 		"lowercase-keys": "^3.0.0",
 		"p-cancelable": "^4.0.1",
-		"responselike": "^3.0.0"
+		"responselike": "^3.0.0",
+		"type-fest": "^4.19.0"
 	},
 	"devDependencies": {
 		"@hapi/bourne": "^3.0.0",
@@ -85,6 +85,7 @@
 		"express": "^4.19.2",
 		"form-data": "^4.0.0",
 		"formdata-node": "^6.0.3",
+		"get-stream": "^9.0.1",
 		"nock": "^13.5.4",
 		"node-fetch": "^3.3.2",
 		"np": "^10.0.5",
@@ -100,7 +101,6 @@
 		"then-busboy": "^5.2.1",
 		"tough-cookie": "^4.1.4",
 		"tsx": "^4.10.4",
-		"type-fest": "^4.8.2",
 		"typescript": "^5.4.5",
 		"xo": "^0.56.0"
 	},

package/readme.md

@@ -321,11 +321,11 @@ By default, Got will retry on failure. To disable this option, set [`options.ret
 [s7]: https://www.npmjs.com/package/visionmedia?activeTab=dependents
 
 <!-- INSTALL SIZE -->
-[gis]: https://badgen.net/packagephobia/install/got?color=blue&label
-[kis]: https://badgen.net/packagephobia/install/ky?color=blue&label
-[nis]: https://badgen.net/packagephobia/install/node-fetch?color=blue&label
-[ais]: https://badgen.net/packagephobia/install/axios?color=blue&label
-[sis]: https://badgen.net/packagephobia/install/superagent?color=blue&label
+[gis]: https://packagephobia.com/badge?p=got
+[kis]: https://packagephobia.com/badge?p=ky
+[nis]: https://packagephobia.com/badge?p=node-fetch
+[ais]: https://packagephobia.com/badge?p=axios
+[sis]: https://packagephobia.com/badge?p=superagent
 
 [g8]: https://packagephobia.com/result?p=got
 [k8]: https://packagephobia.com/result?p=ky
@@ -374,7 +374,7 @@ By default, Got will retry on failure. To disable this option, set [`options.ret
 
 [Click here][InstallSizeOfTheDependencies] to see the install size of the Got dependencies.
 
-[InstallSizeOfTheDependencies]: https://packagephobia.com/result?p=@sindresorhus/is@4.0.1,@szmarczak/http-timer@4.0.5,@types/cacheable-request@6.0.1,@types/responselike@1.0.0,cacheable-lookup@6.0.0,cacheable-request@7.0.2,decompress-response@6.0.0,get-stream@6.0.1,http2-wrapper@2.0.5,lowercase-keys@2.0.0,p-cancelable@2.1.1,responselike@2.0.0
+[InstallSizeOfTheDependencies]: https://packagephobia.com/result?p=@sindresorhus/is@7.0.0,@szmarczak/http-timer@5.0.1,cacheable-lookup@7.0.0,cacheable-request@12.0.1,decompress-response@6.0.0,form-data-encoder@4.0.2,http2-wrapper@2.2.1,lowercase-keys@3.0.0,p-cancelable@4.0.1,responselike@3.0.0,type-fest@4.19.0
 
 ## Maintainers
 
@@ -412,12 +412,12 @@ By default, Got will retry on failure. To disable this option, set [`options.ret
 	<tr>
 		<td align="center">
 			<a href="http://karaokes.moe">
-				<img width="140" valign="middle" src="https://camo.githubusercontent.com/6860e5fa4684c14d8e1aa65df0aba4e6808ea1a9/687474703a2f2f6b6172616f6b65732e6d6f652f6173736574732f696d616765732f696e6465782e706e67">
+				<img width="140" valign="middle" src="https://karaokes.moe/assets/images/index.png">
 			</a>
 		</td>
 		<td align="center">
 			<a href="https://github.com/renovatebot/renovate">
-				<img width="150" valign="middle" src="https://camo.githubusercontent.com/7c2dc41a8407d4cfa700f762a1abf46b232858ae7e3a2bf5aee7d9f36416127c/68747470733a2f2f6170702e72656e6f76617465626f742e636f6d2f696d616765732f72656e6f766174655f3636305f3232302e6a7067">
+				<img width="150" valign="middle" src="https://avatars.githubusercontent.com/u/38656520?s=200&v=4">
 			</a>
 		</td>
 		<td align="center">
@@ -442,11 +442,6 @@ By default, Got will retry on failure. To disable this option, set [`options.ret
 				<img width="150" valign="middle" src="https://user-images.githubusercontent.com/29518613/91814036-97fb9500-ec44-11ea-8c6c-d198cc23ca29.png">
 			</a>
 		</td>
-		<td align="center">
-			<a href="https://apify.com">
-				<img width="150" valign="middle" src="https://user-images.githubusercontent.com/23726914/128673143-958b5930-b677-40ef-8087-5698a0c29c45.png">
-			</a>
-		</td>
 	</tr>
 </tbody>
 </table>
@@ -496,7 +491,3 @@ By default, Got will retry on failure. To disable this option, set [`options.ret
 > We’re using Got at Radity. Thanks for such an amazing work!
 >
 > — <a href="https://github.com/MirzayevFarid">Mirzayev Farid</a>
-
-> Got has been a crucial component of Apify's scraping for years. We use it to extract data from billions of web pages every month, and we really appreciate the powerful API and extensibility, which allowed us to build our own specialized HTTP client on top of Got. The support has always been stellar too.
->
-> — <a href="https://github.com/mnmkng">Ondra Urban</a>