From 6a9dd924fe1b09637c825868ce6dc5c6fc8be263 Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Fri, 25 Nov 2022 22:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20FIX:=20Import=20undici=20types?= =?UTF-8?q?=20change=20(#422)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/nodejs/undici/pull/1769 ![image](https://user-images.githubusercontent.com/156269/204005771-9a5966f4-8df0-4792-8d94-5791a721f395.png) --- src/HttpAgent.ts | 8 ++++---- src/Request.ts | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/HttpAgent.ts b/src/HttpAgent.ts index bfb0459d..9b7a00f2 100644 --- a/src/HttpAgent.ts +++ b/src/HttpAgent.ts @@ -3,15 +3,15 @@ import { LookupFunction, isIP } from 'net'; import { Agent, } from 'undici'; -import { DispatchHandlers } from 'undici/types/dispatcher'; -import { BuildOptions } from 'undici/types/connector'; +import type Dispatcher from 'undici/types/dispatcher'; +import type buildConnector from 'undici/types/connector'; export type CheckAddressFunction = (ip: string, family: number | string) => boolean; export type HttpAgentOptions = { lookup?: LookupFunction; checkAddress?: CheckAddressFunction; - connect?: BuildOptions, + connect?: buildConnector.BuildOptions, }; class IllegalAddressError extends Error { @@ -51,7 +51,7 @@ export class HttpAgent extends Agent { this.#checkAddress = options.checkAddress; } - dispatch(options: Agent.DispatchOptions, handler: DispatchHandlers): boolean { + dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandlers): boolean { if (this.#checkAddress && options.origin) { const originUrl = typeof options.origin === 'string' ? new URL(options.origin) : options.origin; let hostname = originUrl.hostname; diff --git a/src/Request.ts b/src/Request.ts index 537ed972..00f7bd7b 100644 --- a/src/Request.ts +++ b/src/Request.ts @@ -1,14 +1,11 @@ import { Readable, Writable } from 'stream'; import { IncomingHttpHeaders } from 'http'; -import type { - HttpMethod as UndiciHttpMethod, -} from 'undici/types/dispatcher'; import type Dispatcher from 'undici/types/dispatcher'; import type { HttpClientResponse, } from './Response'; -export type HttpMethod = UndiciHttpMethod; +export type HttpMethod = Dispatcher.HttpMethod; export type RequestURL = string | URL;