urllib 4.6.0 → 4.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/BaseAgent.d.ts +11 -0
- package/dist/commonjs/BaseAgent.js +20 -0
- package/dist/commonjs/FetchOpaqueInterceptor.d.ts +0 -2
- package/dist/commonjs/FetchOpaqueInterceptor.js +1 -12
- package/dist/commonjs/HttpAgent.d.ts +3 -2
- package/dist/commonjs/HttpAgent.js +3 -3
- package/dist/commonjs/HttpClient.js +1 -1
- package/dist/commonjs/fetch.d.ts +2 -2
- package/dist/commonjs/fetch.js +6 -13
- package/dist/esm/BaseAgent.d.ts +11 -0
- package/dist/esm/BaseAgent.js +16 -0
- package/dist/esm/FetchOpaqueInterceptor.d.ts +0 -2
- package/dist/esm/FetchOpaqueInterceptor.js +1 -11
- package/dist/esm/HttpAgent.d.ts +3 -2
- package/dist/esm/HttpAgent.js +3 -3
- package/dist/esm/HttpClient.js +1 -1
- package/dist/esm/fetch.d.ts +2 -2
- package/dist/esm/fetch.js +7 -14
- package/dist/package.json +1 -1
- package/package.json +1 -1
- package/src/BaseAgent.ts +27 -0
- package/src/FetchOpaqueInterceptor.ts +0 -12
- package/src/HttpAgent.ts +3 -2
- package/src/fetch.ts +10 -15
@@ -0,0 +1,11 @@
|
|
1
|
+
import { Agent, Dispatcher } from 'undici';
|
2
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
3
|
+
import { FetchOpaque } from './FetchOpaqueInterceptor.js';
|
4
|
+
export interface BaseAgentOptions extends Agent.Options {
|
5
|
+
opaqueLocalStorage?: AsyncLocalStorage<FetchOpaque>;
|
6
|
+
}
|
7
|
+
export declare class BaseAgent extends Agent {
|
8
|
+
#private;
|
9
|
+
constructor(options: BaseAgentOptions);
|
10
|
+
dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean;
|
11
|
+
}
|
@@ -0,0 +1,20 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.BaseAgent = void 0;
|
4
|
+
const undici_1 = require("undici");
|
5
|
+
class BaseAgent extends undici_1.Agent {
|
6
|
+
#opaqueLocalStorage;
|
7
|
+
constructor(options) {
|
8
|
+
super(options);
|
9
|
+
this.#opaqueLocalStorage = options.opaqueLocalStorage;
|
10
|
+
}
|
11
|
+
dispatch(options, handler) {
|
12
|
+
const opaque = this.#opaqueLocalStorage?.getStore();
|
13
|
+
if (opaque) {
|
14
|
+
handler.opaque = opaque;
|
15
|
+
}
|
16
|
+
return super.dispatch(options, handler);
|
17
|
+
}
|
18
|
+
}
|
19
|
+
exports.BaseAgent = BaseAgent;
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Jhc2VBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FHZ0I7QUFRaEIsTUFBYSxTQUFVLFNBQVEsY0FBSztJQUNsQyxtQkFBbUIsQ0FBa0M7SUFFckQsWUFBWSxPQUF5QjtRQUNuQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDO0lBQ3hELENBQUM7SUFFRCxRQUFRLENBQUMsT0FBOEIsRUFBRSxPQUFtQztRQUMxRSxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFDcEQsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNWLE9BQWUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ25DLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRjtBQWZELDhCQWVDIn0=
|
@@ -1,8 +1,6 @@
|
|
1
1
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
2
|
-
import { Dispatcher } from 'undici';
|
3
2
|
export interface FetchOpaque {
|
4
3
|
}
|
5
4
|
export interface OpaqueInterceptorOptions {
|
6
5
|
opaqueLocalStorage: AsyncLocalStorage<FetchOpaque>;
|
7
6
|
}
|
8
|
-
export declare function fetchOpaqueInterceptor(opts: OpaqueInterceptorOptions): (dispatch: Dispatcher["dispatch"]) => Dispatcher["dispatch"];
|
@@ -3,16 +3,5 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.fetchOpaqueInterceptor = fetchOpaqueInterceptor;
|
7
6
|
const symbols_js_1 = __importDefault(require("./symbols.js"));
|
8
|
-
|
9
|
-
const opaqueLocalStorage = opts?.opaqueLocalStorage;
|
10
|
-
return (dispatch) => {
|
11
|
-
return function redirectInterceptor(opts, handler) {
|
12
|
-
const opaque = opaqueLocalStorage?.getStore();
|
13
|
-
handler.opaque = opaque;
|
14
|
-
return dispatch(opts, handler);
|
15
|
-
};
|
16
|
-
};
|
17
|
-
}
|
18
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmV0Y2hPcGFxdWVJbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9GZXRjaE9wYXF1ZUludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBK0JBLHdEQVNDO0FBdENELDhEQUFtQztBQTZCbkMsU0FBZ0Isc0JBQXNCLENBQUMsSUFBOEI7SUFDbkUsTUFBTSxrQkFBa0IsR0FBRyxJQUFJLEVBQUUsa0JBQWtCLENBQUM7SUFDcEQsT0FBTyxDQUFDLFFBQWdDLEVBQTBCLEVBQUU7UUFDbEUsT0FBTyxTQUFTLG1CQUFtQixDQUFDLElBQWdDLEVBQUUsT0FBbUM7WUFDdkcsTUFBTSxNQUFNLEdBQUcsa0JBQWtCLEVBQUUsUUFBUSxFQUFFLENBQUM7WUFDN0MsT0FBZSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7WUFDakMsT0FBTyxRQUFRLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ2pDLENBQUMsQ0FBQztJQUNKLENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmV0Y2hPcGFxdWVJbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9GZXRjaE9wYXF1ZUludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBRUEsOERBQW1DIn0=
|
@@ -1,13 +1,14 @@
|
|
1
1
|
import { LookupFunction } from 'node:net';
|
2
2
|
import { Agent, Dispatcher, buildConnector } from 'undici';
|
3
|
+
import { BaseAgent, BaseAgentOptions } from './BaseAgent.js';
|
3
4
|
export type CheckAddressFunction = (ip: string, family: number | string, hostname: string) => boolean;
|
4
|
-
export interface HttpAgentOptions extends
|
5
|
+
export interface HttpAgentOptions extends BaseAgentOptions {
|
5
6
|
lookup?: LookupFunction;
|
6
7
|
checkAddress?: CheckAddressFunction;
|
7
8
|
connect?: buildConnector.BuildOptions;
|
8
9
|
allowH2?: boolean;
|
9
10
|
}
|
10
|
-
export declare class HttpAgent extends
|
11
|
+
export declare class HttpAgent extends BaseAgent {
|
11
12
|
#private;
|
12
13
|
constructor(options: HttpAgentOptions);
|
13
14
|
dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean;
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.HttpAgent = void 0;
|
7
7
|
const node_dns_1 = __importDefault(require("node:dns"));
|
8
8
|
const node_net_1 = require("node:net");
|
9
|
-
const
|
9
|
+
const BaseAgent_js_1 = require("./BaseAgent.js");
|
10
10
|
class IllegalAddressError extends Error {
|
11
11
|
hostname;
|
12
12
|
ip;
|
@@ -21,7 +21,7 @@ class IllegalAddressError extends Error {
|
|
21
21
|
Error.captureStackTrace(this, this.constructor);
|
22
22
|
}
|
23
23
|
}
|
24
|
-
class HttpAgent extends
|
24
|
+
class HttpAgent extends BaseAgent_js_1.BaseAgent {
|
25
25
|
#checkAddress;
|
26
26
|
constructor(options) {
|
27
27
|
/* eslint node/prefer-promises/dns: off*/
|
@@ -79,4 +79,4 @@ class HttpAgent extends undici_1.Agent {
|
|
79
79
|
}
|
80
80
|
}
|
81
81
|
exports.HttpAgent = HttpAgent;
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cEFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBMkI7QUFDM0IsdUNBQWdEO0FBTWhELGlEQUE2RDtBQVc3RCxNQUFNLG1CQUFvQixTQUFRLEtBQUs7SUFDckMsUUFBUSxDQUFTO0lBQ2pCLEVBQUUsQ0FBUztJQUNYLE1BQU0sQ0FBUztJQUVmLFlBQVksUUFBZ0IsRUFBRSxFQUFVLEVBQUUsTUFBYztRQUN0RCxNQUFNLE9BQU8sR0FBRyxpQkFBaUIsQ0FBQztRQUNsQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBRUQsTUFBYSxTQUFVLFNBQVEsd0JBQVM7SUFDdEMsYUFBYSxDQUF3QjtJQUVyQyxZQUFZLE9BQXlCO1FBQ25DLHlDQUF5QztRQUN6QyxNQUFNLEVBQUUsTUFBTSxHQUFHLGtCQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsUUFBUSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBRXJELE1BQU0sY0FBYyxHQUFtQixDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLEVBQUU7WUFDeEUsTUFBTSxDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxJQUFXLEVBQUUsRUFBRTtnQkFDbkQseUNBQXlDO2dCQUN6QyxNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMs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
|
@@ -36,7 +36,7 @@ function noop() {
|
|
36
36
|
// noop
|
37
37
|
}
|
38
38
|
const debug = (0, node_util_1.debuglog)('urllib:HttpClient');
|
39
|
-
exports.VERSION = '4.6.
|
39
|
+
exports.VERSION = '4.6.1';
|
40
40
|
// 'node-urllib/4.0.0 Node.js/18.19.0 (darwin; x64)'
|
41
41
|
exports.HEADER_USER_AGENT = `node-urllib/${exports.VERSION} Node.js/${process.version.substring(1)} (${process.platform}; ${process.arch})`;
|
42
42
|
function getFileName(stream) {
|
package/dist/commonjs/fetch.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { RequestInfo, RequestInit, Response, Agent } from 'undici';
|
1
|
+
import { RequestInfo, RequestInit, Response, Agent, Dispatcher } from 'undici';
|
2
2
|
import { ClientOptions, PoolStat, UndiciTimingInfo } from './HttpClient.js';
|
3
3
|
import { FetchMeta } from './Request.js';
|
4
4
|
export interface UrllibRequestInit extends RequestInit {
|
@@ -15,7 +15,7 @@ export type FetchResponseDiagnosticsMessage = {
|
|
15
15
|
};
|
16
16
|
export declare class FetchFactory {
|
17
17
|
#private;
|
18
|
-
static getDispatcher():
|
18
|
+
static getDispatcher(): Dispatcher.ComposedDispatcher;
|
19
19
|
static setDispatcher(dispatcher: Agent): void;
|
20
20
|
static setClientOptions(clientOptions: ClientOptions): void;
|
21
21
|
static getDispatcherPoolStats(): Record<string, PoolStat>;
|
package/dist/commonjs/fetch.js
CHANGED
@@ -17,7 +17,7 @@ const HttpAgent_js_1 = require("./HttpAgent.js");
|
|
17
17
|
const diagnosticsChannel_js_1 = require("./diagnosticsChannel.js");
|
18
18
|
const utils_js_1 = require("./utils.js");
|
19
19
|
const symbols_js_2 = __importDefault(require("./symbols.js"));
|
20
|
-
const
|
20
|
+
const BaseAgent_js_1 = require("./BaseAgent.js");
|
21
21
|
class FetchFactory {
|
22
22
|
static #dispatcher;
|
23
23
|
static #opaqueLocalStorage = new node_async_hooks_1.AsyncLocalStorage();
|
@@ -29,16 +29,9 @@ class FetchFactory {
|
|
29
29
|
}
|
30
30
|
static setClientOptions(clientOptions) {
|
31
31
|
let dispatcherOption = {
|
32
|
-
|
33
|
-
Agent: [
|
34
|
-
(0, FetchOpaqueInterceptor_js_1.fetchOpaqueInterceptor)({
|
35
|
-
opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
|
36
|
-
}),
|
37
|
-
],
|
38
|
-
Client: [],
|
39
|
-
},
|
32
|
+
opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
|
40
33
|
};
|
41
|
-
let dispatcherClazz =
|
34
|
+
let dispatcherClazz = BaseAgent_js_1.BaseAgent;
|
42
35
|
if (clientOptions?.lookup || clientOptions?.checkAddress) {
|
43
36
|
dispatcherOption = {
|
44
37
|
...dispatcherOption,
|
@@ -55,7 +48,7 @@ class FetchFactory {
|
|
55
48
|
connect: clientOptions.connect,
|
56
49
|
allowH2: clientOptions.allowH2,
|
57
50
|
};
|
58
|
-
dispatcherClazz =
|
51
|
+
dispatcherClazz = BaseAgent_js_1.BaseAgent;
|
59
52
|
}
|
60
53
|
else if (clientOptions?.allowH2) {
|
61
54
|
// Support HTTP2
|
@@ -63,7 +56,7 @@ class FetchFactory {
|
|
63
56
|
...dispatcherOption,
|
64
57
|
allowH2: clientOptions.allowH2,
|
65
58
|
};
|
66
|
-
dispatcherClazz =
|
59
|
+
dispatcherClazz = BaseAgent_js_1.BaseAgent;
|
67
60
|
}
|
68
61
|
FetchFactory.#dispatcher = new dispatcherClazz(dispatcherOption);
|
69
62
|
(0, diagnosticsChannel_js_1.initDiagnosticsChannel)();
|
@@ -218,4 +211,4 @@ class FetchFactory {
|
|
218
211
|
}
|
219
212
|
exports.FetchFactory = FetchFactory;
|
220
213
|
exports.fetch = FetchFactory.fetch;
|
221
|
-
//# sourceMappingURL=data:application/json;base64,
|
214
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmV0Y2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsdURBQXFEO0FBQ3JELG1DQVVnQjtBQUNoQiw2REFBNkQ7QUFDN0QsYUFBYTtBQUNiLDRFQUF1RDtBQUN2RCw2REFBNkQ7QUFDN0QsYUFBYTtBQUNiLGtFQUFvRTtBQUNwRSxtREFPeUI7QUFDekIsaURBR3dCO0FBQ3hCLG1FQUFpRTtBQUNqRSx5Q0FBd0Y7QUFDeEYsOERBQW1DO0FBU25DLGlEQUE2RDtBQWtCN0QsTUFBYSxZQUFZO0lBQ3ZCLE1BQU0sQ0FBQyxXQUFXLENBQWdDO0lBQ2xELE1BQU0sQ0FBQyxtQkFBbUIsR0FBRyxJQUFJLG9DQUFpQixFQUFlLENBQUM7SUFFbEUsTUFBTSxDQUFDLGFBQWE7UUFDbEIsT0FBTyxZQUFZLENBQUMsV0FBVyxJQUFJLElBQUEsNEJBQW1CLEdBQUUsQ0FBQztJQUMzRCxDQUFDO0lBRUQsTUFBTSxDQUFDLGFBQWEsQ0FBQyxVQUFpQjtRQUNwQyxZQUFZLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQztJQUN4QyxDQUFDO0lBRUQsTUFBTSxDQUFDLGdCQUFnQixDQUFDLGFBQTRCO1FBQ2xELElBQUksZ0JBQWdCLEdBQXFCO1lBQ3ZDLGtCQUFrQixFQUFFLFlBQVksQ0FBQyxtQkFBbUI7U0FDckQsQ0FBQztRQUNGLElBQUksZUFBZSxHQUFpRCx3QkFBUyxDQUFDO1FBQzlFLElBQUksYUFBYSxFQUFFLE1BQU0sSUFBSSxhQUFhLEVBQUUsWUFBWSxFQUFFLENBQUM7WUFDekQsZ0JBQWdCLEdBQUc7Z0JBQ2pCLEdBQUcsZ0JBQWdCO2dCQUNuQixNQUFNLEVBQUUsYUFBYSxDQUFDLE1BQU07Z0JBQzVCLFlBQVksRUFBRSxhQUFhLENBQUMsWUFBWTtnQkFDeEMsT0FBTyxFQUFFLGFBQWEsQ0FBQyxPQUFPO2dCQUM5QixPQUFPLEVBQUUsYUFBYSxDQUFDLE9BQU87YUFD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
|
@@ -0,0 +1,11 @@
|
|
1
|
+
import { Agent, Dispatcher } from 'undici';
|
2
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
3
|
+
import { FetchOpaque } from './FetchOpaqueInterceptor.js';
|
4
|
+
export interface BaseAgentOptions extends Agent.Options {
|
5
|
+
opaqueLocalStorage?: AsyncLocalStorage<FetchOpaque>;
|
6
|
+
}
|
7
|
+
export declare class BaseAgent extends Agent {
|
8
|
+
#private;
|
9
|
+
constructor(options: BaseAgentOptions);
|
10
|
+
dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean;
|
11
|
+
}
|
@@ -0,0 +1,16 @@
|
|
1
|
+
import { Agent, } from 'undici';
|
2
|
+
export class BaseAgent extends Agent {
|
3
|
+
#opaqueLocalStorage;
|
4
|
+
constructor(options) {
|
5
|
+
super(options);
|
6
|
+
this.#opaqueLocalStorage = options.opaqueLocalStorage;
|
7
|
+
}
|
8
|
+
dispatch(options, handler) {
|
9
|
+
const opaque = this.#opaqueLocalStorage?.getStore();
|
10
|
+
if (opaque) {
|
11
|
+
handler.opaque = opaque;
|
12
|
+
}
|
13
|
+
return super.dispatch(options, handler);
|
14
|
+
}
|
15
|
+
}
|
16
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmFzZUFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Jhc2VBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxHQUVOLE1BQU0sUUFBUSxDQUFDO0FBUWhCLE1BQU0sT0FBTyxTQUFVLFNBQVEsS0FBSztJQUNsQyxtQkFBbUIsQ0FBa0M7SUFFckQsWUFBWSxPQUF5QjtRQUNuQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsbUJBQW1CLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDO0lBQ3hELENBQUM7SUFFRCxRQUFRLENBQUMsT0FBOEIsRUFBRSxPQUFtQztRQUMxRSxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsUUFBUSxFQUFFLENBQUM7UUFDcEQsSUFBSSxNQUFNLEVBQUUsQ0FBQztZQUNWLE9BQWUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1FBQ25DLENBQUM7UUFDRCxPQUFPLEtBQUssQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzFDLENBQUM7Q0FDRiJ9
|
@@ -1,8 +1,6 @@
|
|
1
1
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
2
|
-
import { Dispatcher } from 'undici';
|
3
2
|
export interface FetchOpaque {
|
4
3
|
}
|
5
4
|
export interface OpaqueInterceptorOptions {
|
6
5
|
opaqueLocalStorage: AsyncLocalStorage<FetchOpaque>;
|
7
6
|
}
|
8
|
-
export declare function fetchOpaqueInterceptor(opts: OpaqueInterceptorOptions): (dispatch: Dispatcher["dispatch"]) => Dispatcher["dispatch"];
|
@@ -1,12 +1,2 @@
|
|
1
1
|
import symbols from './symbols.js';
|
2
|
-
|
3
|
-
const opaqueLocalStorage = opts?.opaqueLocalStorage;
|
4
|
-
return (dispatch) => {
|
5
|
-
return function redirectInterceptor(opts, handler) {
|
6
|
-
const opaque = opaqueLocalStorage?.getStore();
|
7
|
-
handler.opaque = opaque;
|
8
|
-
return dispatch(opts, handler);
|
9
|
-
};
|
10
|
-
};
|
11
|
-
}
|
12
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmV0Y2hPcGFxdWVJbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9GZXRjaE9wYXF1ZUludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sT0FBTyxNQUFNLGNBQWMsQ0FBQztBQTZCbkMsTUFBTSxVQUFVLHNCQUFzQixDQUFDLElBQThCO0lBQ25FLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxFQUFFLGtCQUFrQixDQUFDO0lBQ3BELE9BQU8sQ0FBQyxRQUFnQyxFQUEwQixFQUFFO1FBQ2xFLE9BQU8sU0FBUyxtQkFBbUIsQ0FBQyxJQUFnQyxFQUFFLE9BQW1DO1lBQ3ZHLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixFQUFFLFFBQVEsRUFBRSxDQUFDO1lBQzdDLE9BQWUsQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO1lBQ2pDLE9BQU8sUUFBUSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztRQUNqQyxDQUFDLENBQUM7SUFDSixDQUFDLENBQUM7QUFDSixDQUFDIn0=
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRmV0Y2hPcGFxdWVJbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9GZXRjaE9wYXF1ZUludGVyY2VwdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sT0FBTyxNQUFNLGNBQWMsQ0FBQyJ9
|
package/dist/esm/HttpAgent.d.ts
CHANGED
@@ -1,13 +1,14 @@
|
|
1
1
|
import { LookupFunction } from 'node:net';
|
2
2
|
import { Agent, Dispatcher, buildConnector } from 'undici';
|
3
|
+
import { BaseAgent, BaseAgentOptions } from './BaseAgent.js';
|
3
4
|
export type CheckAddressFunction = (ip: string, family: number | string, hostname: string) => boolean;
|
4
|
-
export interface HttpAgentOptions extends
|
5
|
+
export interface HttpAgentOptions extends BaseAgentOptions {
|
5
6
|
lookup?: LookupFunction;
|
6
7
|
checkAddress?: CheckAddressFunction;
|
7
8
|
connect?: buildConnector.BuildOptions;
|
8
9
|
allowH2?: boolean;
|
9
10
|
}
|
10
|
-
export declare class HttpAgent extends
|
11
|
+
export declare class HttpAgent extends BaseAgent {
|
11
12
|
#private;
|
12
13
|
constructor(options: HttpAgentOptions);
|
13
14
|
dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean;
|
package/dist/esm/HttpAgent.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import dns from 'node:dns';
|
2
2
|
import { isIP } from 'node:net';
|
3
|
-
import {
|
3
|
+
import { BaseAgent } from './BaseAgent.js';
|
4
4
|
class IllegalAddressError extends Error {
|
5
5
|
hostname;
|
6
6
|
ip;
|
@@ -15,7 +15,7 @@ class IllegalAddressError extends Error {
|
|
15
15
|
Error.captureStackTrace(this, this.constructor);
|
16
16
|
}
|
17
17
|
}
|
18
|
-
export class HttpAgent extends
|
18
|
+
export class HttpAgent extends BaseAgent {
|
19
19
|
#checkAddress;
|
20
20
|
constructor(options) {
|
21
21
|
/* eslint node/prefer-promises/dns: off*/
|
@@ -72,4 +72,4 @@ export class HttpAgent extends Agent {
|
|
72
72
|
return super.dispatch(options, handler);
|
73
73
|
}
|
74
74
|
}
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cEFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEdBQUcsTUFBTSxVQUFVLENBQUM7QUFDM0IsT0FBTyxFQUFrQixJQUFJLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFNaEQsT0FBTyxFQUFFLFNBQVMsRUFBb0IsTUFBTSxnQkFBZ0IsQ0FBQztBQVc3RCxNQUFNLG1CQUFvQixTQUFRLEtBQUs7SUFDckMsUUFBUSxDQUFTO0lBQ2pCLEVBQUUsQ0FBUztJQUNYLE1BQU0sQ0FBUztJQUVmLFlBQVksUUFBZ0IsRUFBRSxFQUFVLEVBQUUsTUFBYztRQUN0RCxNQUFNLE9BQU8sR0FBRyxpQkFBaUIsQ0FBQztRQUNsQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLFNBQVUsU0FBUSxTQUFTO0lBQ3RDLGFBQWEsQ0FBd0I7SUFFckMsWUFBWSxPQUF5QjtRQUNuQyx5Q0FBeUM7UUFDekMsTUFBTSxFQUFFLE1BQU0sR0FBRyxHQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsUUFBUSxFQUFFLEdBQUcsT0FBTyxDQUFDO1FBRXJELE1BQU0sY0FBYyxHQUFtQixDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLEVBQUU7WUFDeEUsTUFBTSxDQUFDLFFBQVEsRUFBRSxVQUFVLEVBQUUsQ0FBQyxH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
|
package/dist/esm/HttpClient.js
CHANGED
@@ -30,7 +30,7 @@ function noop() {
|
|
30
30
|
// noop
|
31
31
|
}
|
32
32
|
const debug = debuglog('urllib:HttpClient');
|
33
|
-
export const VERSION = '4.6.
|
33
|
+
export const VERSION = '4.6.1';
|
34
34
|
// 'node-urllib/4.0.0 Node.js/18.19.0 (darwin; x64)'
|
35
35
|
export const HEADER_USER_AGENT = `node-urllib/${VERSION} Node.js/${process.version.substring(1)} (${process.platform}; ${process.arch})`;
|
36
36
|
function getFileName(stream) {
|
package/dist/esm/fetch.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { RequestInfo, RequestInit, Response, Agent } from 'undici';
|
1
|
+
import { RequestInfo, RequestInit, Response, Agent, Dispatcher } from 'undici';
|
2
2
|
import { ClientOptions, PoolStat, UndiciTimingInfo } from './HttpClient.js';
|
3
3
|
import { FetchMeta } from './Request.js';
|
4
4
|
export interface UrllibRequestInit extends RequestInit {
|
@@ -15,7 +15,7 @@ export type FetchResponseDiagnosticsMessage = {
|
|
15
15
|
};
|
16
16
|
export declare class FetchFactory {
|
17
17
|
#private;
|
18
|
-
static getDispatcher():
|
18
|
+
static getDispatcher(): Dispatcher.ComposedDispatcher;
|
19
19
|
static setDispatcher(dispatcher: Agent): void;
|
20
20
|
static setClientOptions(clientOptions: ClientOptions): void;
|
21
21
|
static getDispatcherPoolStats(): Record<string, PoolStat>;
|
package/dist/esm/fetch.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
2
|
-
import { fetch as UndiciFetch, Request,
|
2
|
+
import { fetch as UndiciFetch, Request, getGlobalDispatcher, } from 'undici';
|
3
3
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
4
4
|
// @ts-ignore
|
5
5
|
import undiciSymbols from 'undici/lib/core/symbols.js';
|
@@ -11,7 +11,7 @@ import { HttpAgent, } from './HttpAgent.js';
|
|
11
11
|
import { initDiagnosticsChannel } from './diagnosticsChannel.js';
|
12
12
|
import { convertHeader, globalId, performanceTime, updateSocketInfo } from './utils.js';
|
13
13
|
import symbols from './symbols.js';
|
14
|
-
import {
|
14
|
+
import { BaseAgent } from './BaseAgent.js';
|
15
15
|
export class FetchFactory {
|
16
16
|
static #dispatcher;
|
17
17
|
static #opaqueLocalStorage = new AsyncLocalStorage();
|
@@ -23,16 +23,9 @@ export class FetchFactory {
|
|
23
23
|
}
|
24
24
|
static setClientOptions(clientOptions) {
|
25
25
|
let dispatcherOption = {
|
26
|
-
|
27
|
-
Agent: [
|
28
|
-
fetchOpaqueInterceptor({
|
29
|
-
opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
|
30
|
-
}),
|
31
|
-
],
|
32
|
-
Client: [],
|
33
|
-
},
|
26
|
+
opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
|
34
27
|
};
|
35
|
-
let dispatcherClazz =
|
28
|
+
let dispatcherClazz = BaseAgent;
|
36
29
|
if (clientOptions?.lookup || clientOptions?.checkAddress) {
|
37
30
|
dispatcherOption = {
|
38
31
|
...dispatcherOption,
|
@@ -49,7 +42,7 @@ export class FetchFactory {
|
|
49
42
|
connect: clientOptions.connect,
|
50
43
|
allowH2: clientOptions.allowH2,
|
51
44
|
};
|
52
|
-
dispatcherClazz =
|
45
|
+
dispatcherClazz = BaseAgent;
|
53
46
|
}
|
54
47
|
else if (clientOptions?.allowH2) {
|
55
48
|
// Support HTTP2
|
@@ -57,7 +50,7 @@ export class FetchFactory {
|
|
57
50
|
...dispatcherOption,
|
58
51
|
allowH2: clientOptions.allowH2,
|
59
52
|
};
|
60
|
-
dispatcherClazz =
|
53
|
+
dispatcherClazz = BaseAgent;
|
61
54
|
}
|
62
55
|
FetchFactory.#dispatcher = new dispatcherClazz(dispatcherOption);
|
63
56
|
initDiagnosticsChannel();
|
@@ -211,4 +204,4 @@ export class FetchFactory {
|
|
211
204
|
}
|
212
205
|
}
|
213
206
|
export const fetch = FetchFactory.fetch;
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
207
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZmV0Y2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDckQsT0FBTyxFQUNMLEtBQUssSUFBSSxXQUFXLEVBR3BCLE9BQU8sRUFHUCxtQkFBbUIsR0FHcEIsTUFBTSxRQUFRLENBQUM7QUFDaEIsNkRBQTZEO0FBQzdELGFBQWE7QUFDYixPQUFPLGFBQWEsTUFBTSw0QkFBNEIsQ0FBQztBQUN2RCw2REFBNkQ7QUFDN0QsYUFBYTtBQUNiLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3BFLE9BQU8sRUFDTCxRQUFRLEdBTVQsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QixPQUFPLEVBQ0wsU0FBUyxHQUVWLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEIsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDakUsT0FBTyxFQUFFLGFBQWEsRUFBRSxRQUFRLEVBQUUsZUFBZSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3hGLE9BQU8sT0FBTyxNQUFNLGNBQWMsQ0FBQztBQVNuQyxPQUFPLEVBQUUsU0FBUyxFQUFvQixNQUFNLGdCQUFnQixDQUFDO0FBa0I3RCxNQUFNLE9BQU8sWUFBWTtJQUN2QixNQUFNLENBQUMsV0FBVyxDQUFnQztJQUNsRCxNQUFNLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxpQkFBaUIsRUFBZSxDQUFDO0lBRWxFLE1BQU0sQ0FBQyxhQUFhO1FBQ2xCLE9BQU8sWUFBWSxDQUFDLFdBQVcsSUFBSSxtQkFBbUIsRUFBRSxDQUFDO0lBQzNELENBQUM7SUFFRCxNQUFNLENBQUMsYUFBYSxDQUFDLFVBQWlCO1FBQ3BDLFlBQVksQ0FBQyxXQUFXLEdBQUcsVUFBVSxDQUFDO0lBQ3hDLENBQUM7SUFFRCxNQUFNLENBQUMsZ0JB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
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
package/src/BaseAgent.ts
ADDED
@@ -0,0 +1,27 @@
|
|
1
|
+
import {
|
2
|
+
Agent,
|
3
|
+
Dispatcher,
|
4
|
+
} from 'undici';
|
5
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
6
|
+
import { FetchOpaque } from './FetchOpaqueInterceptor.js';
|
7
|
+
|
8
|
+
export interface BaseAgentOptions extends Agent.Options {
|
9
|
+
opaqueLocalStorage?: AsyncLocalStorage<FetchOpaque>;
|
10
|
+
}
|
11
|
+
|
12
|
+
export class BaseAgent extends Agent {
|
13
|
+
#opaqueLocalStorage?: AsyncLocalStorage<FetchOpaque>;
|
14
|
+
|
15
|
+
constructor(options: BaseAgentOptions) {
|
16
|
+
super(options);
|
17
|
+
this.#opaqueLocalStorage = options.opaqueLocalStorage;
|
18
|
+
}
|
19
|
+
|
20
|
+
dispatch(options: Agent.DispatchOptions, handler: Dispatcher.DispatchHandler): boolean {
|
21
|
+
const opaque = this.#opaqueLocalStorage?.getStore();
|
22
|
+
if (opaque) {
|
23
|
+
(handler as any).opaque = opaque;
|
24
|
+
}
|
25
|
+
return super.dispatch(options, handler);
|
26
|
+
}
|
27
|
+
}
|
@@ -1,7 +1,6 @@
|
|
1
1
|
// const { AsyncLocalStorage } = require('node:async_hooks');
|
2
2
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
3
3
|
import symbols from './symbols.js';
|
4
|
-
import { Dispatcher } from 'undici';
|
5
4
|
|
6
5
|
// const RedirectHandler = require('../handler/redirect-handler')
|
7
6
|
|
@@ -28,14 +27,3 @@ export interface FetchOpaque {
|
|
28
27
|
export interface OpaqueInterceptorOptions {
|
29
28
|
opaqueLocalStorage: AsyncLocalStorage<FetchOpaque>;
|
30
29
|
}
|
31
|
-
|
32
|
-
export function fetchOpaqueInterceptor(opts: OpaqueInterceptorOptions) {
|
33
|
-
const opaqueLocalStorage = opts?.opaqueLocalStorage;
|
34
|
-
return (dispatch: Dispatcher['dispatch']): Dispatcher['dispatch'] => {
|
35
|
-
return function redirectInterceptor(opts: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandler) {
|
36
|
-
const opaque = opaqueLocalStorage?.getStore();
|
37
|
-
(handler as any).opaque = opaque;
|
38
|
-
return dispatch(opts, handler);
|
39
|
-
};
|
40
|
-
};
|
41
|
-
}
|
package/src/HttpAgent.ts
CHANGED
@@ -5,10 +5,11 @@ import {
|
|
5
5
|
Dispatcher,
|
6
6
|
buildConnector,
|
7
7
|
} from 'undici';
|
8
|
+
import { BaseAgent, BaseAgentOptions } from './BaseAgent.js';
|
8
9
|
|
9
10
|
export type CheckAddressFunction = (ip: string, family: number | string, hostname: string) => boolean;
|
10
11
|
|
11
|
-
export interface HttpAgentOptions extends
|
12
|
+
export interface HttpAgentOptions extends BaseAgentOptions {
|
12
13
|
lookup?: LookupFunction;
|
13
14
|
checkAddress?: CheckAddressFunction;
|
14
15
|
connect?: buildConnector.BuildOptions,
|
@@ -31,7 +32,7 @@ class IllegalAddressError extends Error {
|
|
31
32
|
}
|
32
33
|
}
|
33
34
|
|
34
|
-
export class HttpAgent extends
|
35
|
+
export class HttpAgent extends BaseAgent {
|
35
36
|
#checkAddress?: CheckAddressFunction;
|
36
37
|
|
37
38
|
constructor(options: HttpAgentOptions) {
|
package/src/fetch.ts
CHANGED
@@ -8,6 +8,7 @@ import {
|
|
8
8
|
Agent,
|
9
9
|
getGlobalDispatcher,
|
10
10
|
Pool,
|
11
|
+
Dispatcher,
|
11
12
|
} from 'undici';
|
12
13
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
13
14
|
// @ts-ignore
|
@@ -35,9 +36,10 @@ import {
|
|
35
36
|
HttpMethod,
|
36
37
|
RequestMeta,
|
37
38
|
} from './Request.js';
|
38
|
-
import { FetchOpaque
|
39
|
+
import { FetchOpaque } from './FetchOpaqueInterceptor.js';
|
39
40
|
import { RawResponseWithMeta, SocketInfo } from './Response.js';
|
40
41
|
import { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
|
42
|
+
import { BaseAgent, BaseAgentOptions } from './BaseAgent.js';
|
41
43
|
|
42
44
|
export interface UrllibRequestInit extends RequestInit {
|
43
45
|
// default is true
|
@@ -56,7 +58,7 @@ export type FetchResponseDiagnosticsMessage = {
|
|
56
58
|
};
|
57
59
|
|
58
60
|
export class FetchFactory {
|
59
|
-
static #dispatcher:
|
61
|
+
static #dispatcher: Dispatcher.ComposedDispatcher;
|
60
62
|
static #opaqueLocalStorage = new AsyncLocalStorage<FetchOpaque>();
|
61
63
|
|
62
64
|
static getDispatcher() {
|
@@ -68,17 +70,10 @@ export class FetchFactory {
|
|
68
70
|
}
|
69
71
|
|
70
72
|
static setClientOptions(clientOptions: ClientOptions) {
|
71
|
-
let dispatcherOption:
|
72
|
-
|
73
|
-
Agent: [
|
74
|
-
fetchOpaqueInterceptor({
|
75
|
-
opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
|
76
|
-
}),
|
77
|
-
],
|
78
|
-
Client: [],
|
79
|
-
},
|
73
|
+
let dispatcherOption: BaseAgentOptions = {
|
74
|
+
opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
|
80
75
|
};
|
81
|
-
let dispatcherClazz: new (options:
|
76
|
+
let dispatcherClazz: new (options: BaseAgentOptions) => BaseAgent = BaseAgent;
|
82
77
|
if (clientOptions?.lookup || clientOptions?.checkAddress) {
|
83
78
|
dispatcherOption = {
|
84
79
|
...dispatcherOption,
|
@@ -87,21 +82,21 @@ export class FetchFactory {
|
|
87
82
|
connect: clientOptions.connect,
|
88
83
|
allowH2: clientOptions.allowH2,
|
89
84
|
} as HttpAgentOptions;
|
90
|
-
dispatcherClazz = HttpAgent as unknown as new (options:
|
85
|
+
dispatcherClazz = HttpAgent as unknown as new (options: BaseAgentOptions) => BaseAgent;
|
91
86
|
} else if (clientOptions?.connect) {
|
92
87
|
dispatcherOption = {
|
93
88
|
...dispatcherOption,
|
94
89
|
connect: clientOptions.connect,
|
95
90
|
allowH2: clientOptions.allowH2,
|
96
91
|
} as HttpAgentOptions;
|
97
|
-
dispatcherClazz =
|
92
|
+
dispatcherClazz = BaseAgent;
|
98
93
|
} else if (clientOptions?.allowH2) {
|
99
94
|
// Support HTTP2
|
100
95
|
dispatcherOption = {
|
101
96
|
...dispatcherOption,
|
102
97
|
allowH2: clientOptions.allowH2,
|
103
98
|
} as HttpAgentOptions;
|
104
|
-
dispatcherClazz =
|
99
|
+
dispatcherClazz = BaseAgent;
|
105
100
|
}
|
106
101
|
FetchFactory.#dispatcher = new dispatcherClazz(dispatcherOption);
|
107
102
|
initDiagnosticsChannel();
|