urllib 4.6.12 → 4.7.0
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/HttpClient.js +1 -1
- package/dist/commonjs/fetch.d.ts +7 -2
- package/dist/commonjs/fetch.js +33 -17
- package/dist/esm/HttpClient.js +1 -1
- package/dist/esm/fetch.d.ts +7 -2
- package/dist/esm/fetch.js +33 -17
- package/dist/package.json +1 -1
- package/package.json +3 -3
- package/src/fetch.ts +39 -17
|
@@ -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.
|
|
39
|
+
exports.VERSION = '4.7.0';
|
|
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
|
@@ -15,10 +15,15 @@ export type FetchResponseDiagnosticsMessage = {
|
|
|
15
15
|
};
|
|
16
16
|
export declare class FetchFactory {
|
|
17
17
|
#private;
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
setClientOptions(clientOptions: ClientOptions): void;
|
|
19
|
+
getDispatcher(): Dispatcher;
|
|
20
|
+
setDispatcher(dispatcher: Agent): void;
|
|
21
|
+
getDispatcherPoolStats(): Record<string, PoolStat>;
|
|
20
22
|
static setClientOptions(clientOptions: ClientOptions): void;
|
|
21
23
|
static getDispatcherPoolStats(): Record<string, PoolStat>;
|
|
24
|
+
fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response>;
|
|
25
|
+
static getDispatcher(): Dispatcher;
|
|
26
|
+
static setDispatcher(dispatcher: Agent): void;
|
|
22
27
|
static fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response>;
|
|
23
28
|
}
|
|
24
29
|
export declare const fetch: typeof FetchFactory.fetch;
|
package/dist/commonjs/fetch.js
CHANGED
|
@@ -21,17 +21,12 @@ const symbols_js_2 = __importDefault(require("./symbols.js"));
|
|
|
21
21
|
const BaseAgent_js_1 = require("./BaseAgent.js");
|
|
22
22
|
const debug = (0, node_util_1.debuglog)('urllib/fetch');
|
|
23
23
|
class FetchFactory {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
static
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
static setDispatcher(dispatcher) {
|
|
30
|
-
FetchFactory.#dispatcher = dispatcher;
|
|
31
|
-
}
|
|
32
|
-
static setClientOptions(clientOptions) {
|
|
24
|
+
#dispatcher;
|
|
25
|
+
#opaqueLocalStorage = new node_async_hooks_1.AsyncLocalStorage();
|
|
26
|
+
static #instance = new FetchFactory();
|
|
27
|
+
setClientOptions(clientOptions) {
|
|
33
28
|
let dispatcherOption = {
|
|
34
|
-
opaqueLocalStorage:
|
|
29
|
+
opaqueLocalStorage: this.#opaqueLocalStorage,
|
|
35
30
|
};
|
|
36
31
|
let dispatcherClazz = BaseAgent_js_1.BaseAgent;
|
|
37
32
|
if (clientOptions?.lookup || clientOptions?.checkAddress) {
|
|
@@ -60,11 +55,17 @@ class FetchFactory {
|
|
|
60
55
|
};
|
|
61
56
|
dispatcherClazz = BaseAgent_js_1.BaseAgent;
|
|
62
57
|
}
|
|
63
|
-
|
|
58
|
+
this.#dispatcher = new dispatcherClazz(dispatcherOption);
|
|
64
59
|
(0, diagnosticsChannel_js_1.initDiagnosticsChannel)();
|
|
65
60
|
}
|
|
66
|
-
|
|
67
|
-
|
|
61
|
+
getDispatcher() {
|
|
62
|
+
return this.#dispatcher ?? (0, undici_1.getGlobalDispatcher)();
|
|
63
|
+
}
|
|
64
|
+
setDispatcher(dispatcher) {
|
|
65
|
+
this.#dispatcher = dispatcher;
|
|
66
|
+
}
|
|
67
|
+
getDispatcherPoolStats() {
|
|
68
|
+
const agent = this.getDispatcher();
|
|
68
69
|
// origin => Pool Instance
|
|
69
70
|
const clients = Reflect.get(agent, symbols_js_1.default.kClients);
|
|
70
71
|
const poolStatsMap = {};
|
|
@@ -88,10 +89,16 @@ class FetchFactory {
|
|
|
88
89
|
}
|
|
89
90
|
return poolStatsMap;
|
|
90
91
|
}
|
|
91
|
-
static
|
|
92
|
+
static setClientOptions(clientOptions) {
|
|
93
|
+
FetchFactory.#instance.setClientOptions(clientOptions);
|
|
94
|
+
}
|
|
95
|
+
static getDispatcherPoolStats() {
|
|
96
|
+
return FetchFactory.#instance.getDispatcherPoolStats();
|
|
97
|
+
}
|
|
98
|
+
async fetch(input, init) {
|
|
92
99
|
const requestStartTime = performance.now();
|
|
93
100
|
init = init ?? {};
|
|
94
|
-
init.dispatcher = init.dispatcher ??
|
|
101
|
+
init.dispatcher = init.dispatcher ?? this.#dispatcher;
|
|
95
102
|
const request = new undici_1.Request(input, init);
|
|
96
103
|
const requestId = (0, utils_js_1.globalId)('HttpClientRequest');
|
|
97
104
|
// https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
|
|
@@ -174,7 +181,7 @@ class FetchFactory {
|
|
|
174
181
|
socketErrorRetries: 0,
|
|
175
182
|
};
|
|
176
183
|
try {
|
|
177
|
-
await
|
|
184
|
+
await this.#opaqueLocalStorage.run(internalOpaque, async () => {
|
|
178
185
|
res = await (0, undici_1.fetch)(request);
|
|
179
186
|
});
|
|
180
187
|
}
|
|
@@ -215,7 +222,16 @@ class FetchFactory {
|
|
|
215
222
|
});
|
|
216
223
|
return res;
|
|
217
224
|
}
|
|
225
|
+
static getDispatcher() {
|
|
226
|
+
return FetchFactory.#instance.getDispatcher();
|
|
227
|
+
}
|
|
228
|
+
static setDispatcher(dispatcher) {
|
|
229
|
+
FetchFactory.#instance.setDispatcher(dispatcher);
|
|
230
|
+
}
|
|
231
|
+
static async fetch(input, init) {
|
|
232
|
+
return FetchFactory.#instance.fetch(input, init);
|
|
233
|
+
}
|
|
218
234
|
}
|
|
219
235
|
exports.FetchFactory = FetchFactory;
|
|
220
236
|
exports.fetch = FetchFactory.fetch;
|
|
221
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
237
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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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.
|
|
33
|
+
export const VERSION = '4.7.0';
|
|
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
|
@@ -15,10 +15,15 @@ export type FetchResponseDiagnosticsMessage = {
|
|
|
15
15
|
};
|
|
16
16
|
export declare class FetchFactory {
|
|
17
17
|
#private;
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
setClientOptions(clientOptions: ClientOptions): void;
|
|
19
|
+
getDispatcher(): Dispatcher;
|
|
20
|
+
setDispatcher(dispatcher: Agent): void;
|
|
21
|
+
getDispatcherPoolStats(): Record<string, PoolStat>;
|
|
20
22
|
static setClientOptions(clientOptions: ClientOptions): void;
|
|
21
23
|
static getDispatcherPoolStats(): Record<string, PoolStat>;
|
|
24
|
+
fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response>;
|
|
25
|
+
static getDispatcher(): Dispatcher;
|
|
26
|
+
static setDispatcher(dispatcher: Agent): void;
|
|
22
27
|
static fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response>;
|
|
23
28
|
}
|
|
24
29
|
export declare const fetch: typeof FetchFactory.fetch;
|
package/dist/esm/fetch.js
CHANGED
|
@@ -15,17 +15,12 @@ import symbols from './symbols.js';
|
|
|
15
15
|
import { BaseAgent } from './BaseAgent.js';
|
|
16
16
|
const debug = debuglog('urllib/fetch');
|
|
17
17
|
export class FetchFactory {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
static
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
static setDispatcher(dispatcher) {
|
|
24
|
-
FetchFactory.#dispatcher = dispatcher;
|
|
25
|
-
}
|
|
26
|
-
static setClientOptions(clientOptions) {
|
|
18
|
+
#dispatcher;
|
|
19
|
+
#opaqueLocalStorage = new AsyncLocalStorage();
|
|
20
|
+
static #instance = new FetchFactory();
|
|
21
|
+
setClientOptions(clientOptions) {
|
|
27
22
|
let dispatcherOption = {
|
|
28
|
-
opaqueLocalStorage:
|
|
23
|
+
opaqueLocalStorage: this.#opaqueLocalStorage,
|
|
29
24
|
};
|
|
30
25
|
let dispatcherClazz = BaseAgent;
|
|
31
26
|
if (clientOptions?.lookup || clientOptions?.checkAddress) {
|
|
@@ -54,11 +49,17 @@ export class FetchFactory {
|
|
|
54
49
|
};
|
|
55
50
|
dispatcherClazz = BaseAgent;
|
|
56
51
|
}
|
|
57
|
-
|
|
52
|
+
this.#dispatcher = new dispatcherClazz(dispatcherOption);
|
|
58
53
|
initDiagnosticsChannel();
|
|
59
54
|
}
|
|
60
|
-
|
|
61
|
-
|
|
55
|
+
getDispatcher() {
|
|
56
|
+
return this.#dispatcher ?? getGlobalDispatcher();
|
|
57
|
+
}
|
|
58
|
+
setDispatcher(dispatcher) {
|
|
59
|
+
this.#dispatcher = dispatcher;
|
|
60
|
+
}
|
|
61
|
+
getDispatcherPoolStats() {
|
|
62
|
+
const agent = this.getDispatcher();
|
|
62
63
|
// origin => Pool Instance
|
|
63
64
|
const clients = Reflect.get(agent, undiciSymbols.kClients);
|
|
64
65
|
const poolStatsMap = {};
|
|
@@ -82,10 +83,16 @@ export class FetchFactory {
|
|
|
82
83
|
}
|
|
83
84
|
return poolStatsMap;
|
|
84
85
|
}
|
|
85
|
-
static
|
|
86
|
+
static setClientOptions(clientOptions) {
|
|
87
|
+
FetchFactory.#instance.setClientOptions(clientOptions);
|
|
88
|
+
}
|
|
89
|
+
static getDispatcherPoolStats() {
|
|
90
|
+
return FetchFactory.#instance.getDispatcherPoolStats();
|
|
91
|
+
}
|
|
92
|
+
async fetch(input, init) {
|
|
86
93
|
const requestStartTime = performance.now();
|
|
87
94
|
init = init ?? {};
|
|
88
|
-
init.dispatcher = init.dispatcher ??
|
|
95
|
+
init.dispatcher = init.dispatcher ?? this.#dispatcher;
|
|
89
96
|
const request = new Request(input, init);
|
|
90
97
|
const requestId = globalId('HttpClientRequest');
|
|
91
98
|
// https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
|
|
@@ -168,7 +175,7 @@ export class FetchFactory {
|
|
|
168
175
|
socketErrorRetries: 0,
|
|
169
176
|
};
|
|
170
177
|
try {
|
|
171
|
-
await
|
|
178
|
+
await this.#opaqueLocalStorage.run(internalOpaque, async () => {
|
|
172
179
|
res = await UndiciFetch(request);
|
|
173
180
|
});
|
|
174
181
|
}
|
|
@@ -209,6 +216,15 @@ export class FetchFactory {
|
|
|
209
216
|
});
|
|
210
217
|
return res;
|
|
211
218
|
}
|
|
219
|
+
static getDispatcher() {
|
|
220
|
+
return FetchFactory.#instance.getDispatcher();
|
|
221
|
+
}
|
|
222
|
+
static setDispatcher(dispatcher) {
|
|
223
|
+
FetchFactory.#instance.setDispatcher(dispatcher);
|
|
224
|
+
}
|
|
225
|
+
static async fetch(input, init) {
|
|
226
|
+
return FetchFactory.#instance.fetch(input, init);
|
|
227
|
+
}
|
|
212
228
|
}
|
|
213
229
|
export const fetch = FetchFactory.fetch;
|
|
214
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
230
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "urllib",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.7.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"tag": "latest"
|
|
6
6
|
},
|
|
@@ -54,8 +54,8 @@
|
|
|
54
54
|
"ylru": "^2.0.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
|
-
"@arethetypeswrong/cli": "^0.
|
|
58
|
-
"@eggjs/tsconfig": "^
|
|
57
|
+
"@arethetypeswrong/cli": "^0.18.0",
|
|
58
|
+
"@eggjs/tsconfig": "^2.0.0",
|
|
59
59
|
"@tsconfig/node18": "^18.2.1",
|
|
60
60
|
"@tsconfig/strictest": "^2.0.2",
|
|
61
61
|
"@types/busboy": "^1.5.0",
|
package/src/fetch.ts
CHANGED
|
@@ -61,20 +61,14 @@ export type FetchResponseDiagnosticsMessage = {
|
|
|
61
61
|
};
|
|
62
62
|
|
|
63
63
|
export class FetchFactory {
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
#dispatcher?: Dispatcher.ComposedDispatcher;
|
|
65
|
+
#opaqueLocalStorage = new AsyncLocalStorage<FetchOpaque>();
|
|
66
66
|
|
|
67
|
-
static
|
|
68
|
-
return FetchFactory.#dispatcher ?? getGlobalDispatcher();
|
|
69
|
-
}
|
|
67
|
+
static #instance = new FetchFactory();
|
|
70
68
|
|
|
71
|
-
|
|
72
|
-
FetchFactory.#dispatcher = dispatcher;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
static setClientOptions(clientOptions: ClientOptions) {
|
|
69
|
+
setClientOptions(clientOptions: ClientOptions) {
|
|
76
70
|
let dispatcherOption: BaseAgentOptions = {
|
|
77
|
-
opaqueLocalStorage:
|
|
71
|
+
opaqueLocalStorage: this.#opaqueLocalStorage,
|
|
78
72
|
};
|
|
79
73
|
let dispatcherClazz: new (options: BaseAgentOptions) => BaseAgent = BaseAgent;
|
|
80
74
|
if (clientOptions?.lookup || clientOptions?.checkAddress) {
|
|
@@ -101,12 +95,20 @@ export class FetchFactory {
|
|
|
101
95
|
} as HttpAgentOptions;
|
|
102
96
|
dispatcherClazz = BaseAgent;
|
|
103
97
|
}
|
|
104
|
-
|
|
98
|
+
this.#dispatcher = new dispatcherClazz(dispatcherOption);
|
|
105
99
|
initDiagnosticsChannel();
|
|
106
100
|
}
|
|
107
101
|
|
|
108
|
-
|
|
109
|
-
|
|
102
|
+
getDispatcher() {
|
|
103
|
+
return this.#dispatcher ?? getGlobalDispatcher();
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
setDispatcher(dispatcher: Agent) {
|
|
107
|
+
this.#dispatcher = dispatcher;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
getDispatcherPoolStats() {
|
|
111
|
+
const agent = this.getDispatcher();
|
|
110
112
|
// origin => Pool Instance
|
|
111
113
|
const clients: Map<string, WeakRef<Pool>> | undefined = Reflect.get(agent, undiciSymbols.kClients);
|
|
112
114
|
const poolStatsMap: Record<string, PoolStat> = {};
|
|
@@ -131,10 +133,18 @@ export class FetchFactory {
|
|
|
131
133
|
return poolStatsMap;
|
|
132
134
|
}
|
|
133
135
|
|
|
134
|
-
static
|
|
136
|
+
static setClientOptions(clientOptions: ClientOptions) {
|
|
137
|
+
FetchFactory.#instance.setClientOptions(clientOptions);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
static getDispatcherPoolStats() {
|
|
141
|
+
return FetchFactory.#instance.getDispatcherPoolStats();
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
async fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response> {
|
|
135
145
|
const requestStartTime = performance.now();
|
|
136
146
|
init = init ?? {};
|
|
137
|
-
init.dispatcher = init.dispatcher ??
|
|
147
|
+
init.dispatcher = init.dispatcher ?? this.#dispatcher;
|
|
138
148
|
const request = new Request(input, init);
|
|
139
149
|
const requestId = globalId('HttpClientRequest');
|
|
140
150
|
// https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
|
|
@@ -219,7 +229,7 @@ export class FetchFactory {
|
|
|
219
229
|
socketErrorRetries: 0,
|
|
220
230
|
} as any as RawResponseWithMeta;
|
|
221
231
|
try {
|
|
222
|
-
await
|
|
232
|
+
await this.#opaqueLocalStorage.run(internalOpaque, async () => {
|
|
223
233
|
res = await UndiciFetch(request);
|
|
224
234
|
});
|
|
225
235
|
} catch (e: any) {
|
|
@@ -262,6 +272,18 @@ export class FetchFactory {
|
|
|
262
272
|
} as ResponseDiagnosticsMessage);
|
|
263
273
|
return res!;
|
|
264
274
|
}
|
|
275
|
+
|
|
276
|
+
static getDispatcher() {
|
|
277
|
+
return FetchFactory.#instance.getDispatcher();
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
static setDispatcher(dispatcher: Agent) {
|
|
281
|
+
FetchFactory.#instance.setDispatcher(dispatcher);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
static async fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response> {
|
|
285
|
+
return FetchFactory.#instance.fetch(input, init);
|
|
286
|
+
}
|
|
265
287
|
}
|
|
266
288
|
|
|
267
289
|
export const fetch = FetchFactory.fetch;
|