urllib 3.25.1 → 4.0.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/README.md +5 -16
- package/dist/commonjs/HttpAgent.d.ts +0 -1
- package/dist/commonjs/HttpAgent.js +1 -0
- package/dist/commonjs/HttpClient.d.ts +1 -3
- package/dist/commonjs/HttpClient.js +20 -43
- package/dist/commonjs/HttpClientError.js +1 -0
- package/dist/commonjs/IncomingHttpHeaders.d.ts +0 -1
- package/dist/commonjs/IncomingHttpHeaders.js +1 -0
- package/dist/commonjs/Request.d.ts +0 -4
- package/dist/commonjs/Request.js +1 -0
- package/dist/commonjs/Response.d.ts +0 -1
- package/dist/commonjs/Response.js +1 -0
- package/dist/commonjs/diagnosticsChannel.js +24 -32
- package/dist/commonjs/index.js +7 -9
- package/dist/commonjs/symbols.js +1 -0
- package/dist/commonjs/utils.d.ts +0 -1
- package/dist/commonjs/utils.js +6 -12
- package/dist/esm/HttpAgent.d.ts +0 -1
- package/dist/esm/HttpAgent.js +1 -0
- package/dist/esm/HttpClient.d.ts +1 -3
- package/dist/esm/HttpClient.js +17 -40
- package/dist/esm/HttpClientError.js +1 -0
- package/dist/esm/IncomingHttpHeaders.d.ts +0 -1
- package/dist/esm/IncomingHttpHeaders.js +1 -0
- package/dist/esm/Request.d.ts +0 -4
- package/dist/esm/Request.js +1 -0
- package/dist/esm/Response.d.ts +0 -1
- package/dist/esm/Response.js +1 -0
- package/dist/esm/diagnosticsChannel.js +23 -30
- package/dist/esm/index.js +2 -1
- package/dist/esm/symbols.js +1 -0
- package/dist/esm/utils.d.ts +0 -1
- package/dist/esm/utils.js +1 -5
- package/package.json +18 -23
- package/src/HttpClient.ts +18 -40
- package/src/diagnosticsChannel.ts +31 -35
- package/src/index.ts +1 -1
- package/src/utils.ts +1 -7
package/README.md
CHANGED
@@ -283,25 +283,14 @@ Fork [undici benchmarks script](https://github.com/fengmk2/undici/blob/urllib-be
|
|
283
283
|
| undici - stream | 45 | 12523.45 req/sec | ± 2.97 % | + 754.61 % |
|
284
284
|
| undici - dispatch | 51 | 12970.18 req/sec | ± 3.15 % | + 785.10 % |
|
285
285
|
|
286
|
+
## License
|
287
|
+
|
288
|
+
[MIT](LICENSE)
|
286
289
|
|
287
290
|
<!-- GITCONTRIBUTOR_START -->
|
288
291
|
|
289
292
|
## Contributors
|
290
293
|
|
291
|
-
|
292
|
-
| :---: | :---: | :---: | :---: | :---: | :---: |
|
293
|
-
|[<img src="https://avatars.githubusercontent.com/u/543405?v=4" width="100px;"/><br/><sub><b>ibigbug</b></sub>](https://github.com/ibigbug)<br/>|[<img src="https://avatars.githubusercontent.com/u/14790466?v=4" width="100px;"/><br/><sub><b>greenkeeperio-bot</b></sub>](https://github.com/greenkeeperio-bot)<br/>|[<img src="https://avatars.githubusercontent.com/u/227713?v=4" width="100px;"/><br/><sub><b>atian25</b></sub>](https://github.com/atian25)<br/>|[<img src="https://avatars.githubusercontent.com/u/6897780?v=4" width="100px;"/><br/><sub><b>killagu</b></sub>](https://github.com/killagu)<br/>|[<img src="https://avatars.githubusercontent.com/u/5381764?v=4" width="100px;"/><br/><sub><b>paambaati</b></sub>](https://github.com/paambaati)<br/>|[<img src="https://avatars.githubusercontent.com/u/199635?v=4" width="100px;"/><br/><sub><b>tremby</b></sub>](https://github.com/tremby)<br/>|
|
294
|
-
|[<img src="https://avatars.githubusercontent.com/u/1433247?v=4" width="100px;"/><br/><sub><b>denghongcai</b></sub>](https://github.com/denghongcai)<br/>|[<img src="https://avatars.githubusercontent.com/u/4635838?v=4" width="100px;"/><br/><sub><b>gemwuu</b></sub>](https://github.com/gemwuu)<br/>|[<img src="https://avatars.githubusercontent.com/u/2842176?v=4" width="100px;"/><br/><sub><b>XadillaX</b></sub>](https://github.com/XadillaX)<br/>|[<img src="https://avatars.githubusercontent.com/u/1147375?v=4" width="100px;"/><br/><sub><b>alsotang</b></sub>](https://github.com/alsotang)<br/>|[<img src="https://avatars.githubusercontent.com/u/546535?v=4" width="100px;"/><br/><sub><b>leoner</b></sub>](https://github.com/leoner)<br/>|[<img src="https://avatars.githubusercontent.com/u/19908330?v=4" width="100px;"/><br/><sub><b>hyj1991</b></sub>](https://github.com/hyj1991)<br/>|
|
295
|
-
|[<img src="https://avatars.githubusercontent.com/u/1747852?v=4" width="100px;"/><br/><sub><b>isayme</b></sub>](https://github.com/isayme)<br/>|[<img src="https://avatars.githubusercontent.com/u/252317?v=4" width="100px;"/><br/><sub><b>cyjake</b></sub>](https://github.com/cyjake)<br/>|[<img src="https://avatars.githubusercontent.com/u/5856440?v=4" width="100px;"/><br/><sub><b>whxaxes</b></sub>](https://github.com/whxaxes)<br/>|[<img src="https://avatars.githubusercontent.com/u/309219?v=4" width="100px;"/><br/><sub><b>chadxz</b></sub>](https://github.com/chadxz)<br/>|[<img src="https://avatars.githubusercontent.com/u/2055702?v=4" width="100px;"/><br/><sub><b>adapt0</b></sub>](https://github.com/adapt0)<br/>|[<img src="https://avatars.githubusercontent.com/u/5139554?v=4" width="100px;"/><br/><sub><b>danielwpz</b></sub>](https://github.com/danielwpz)<br/>|
|
296
|
-
|[<img src="https://avatars.githubusercontent.com/u/5127897?v=4" width="100px;"/><br/><sub><b>danielsss</b></sub>](https://github.com/danielsss)<br/>|[<img src="https://avatars.githubusercontent.com/u/3367820?v=4" width="100px;"/><br/><sub><b>Jeff-Tian</b></sub>](https://github.com/Jeff-Tian)<br/>|[<img src="https://avatars.githubusercontent.com/u/17075261?v=4" width="100px;"/><br/><sub><b>nick-ng</b></sub>](https://github.com/nick-ng)<br/>|[<img src="https://avatars.githubusercontent.com/u/1706595?v=4" width="100px;"/><br/><sub><b>rishavsharan</b></sub>](https://github.com/rishavsharan)<br/>|[<img src="https://avatars.githubusercontent.com/u/1886161?v=4" width="100px;"/><br/><sub><b>willizm</b></sub>](https://github.com/willizm)<br/>|[<img src="https://avatars.githubusercontent.com/u/7227589?v=4" width="100px;"/><br/><sub><b>davidkhala</b></sub>](https://github.com/davidkhala)<br/>|
|
297
|
-
|[<img src="https://avatars.githubusercontent.com/u/535479?v=4" width="100px;"/><br/><sub><b>aleafs</b></sub>](https://github.com/aleafs)<br/>|[<img src="https://avatars.githubusercontent.com/u/3689968?v=4" width="100px;"/><br/><sub><b>Amunu</b></sub>](https://github.com/Amunu)<br/>|[<img src="https://avatars.githubusercontent.com/in/9426?v=4" width="100px;"/><br/><sub><b>azure-pipelines[bot]</b></sub>](https://github.com/apps/azure-pipelines)<br/>|[<img src="https://avatars.githubusercontent.com/u/108602490?v=4" width="100px;"/><br/><sub><b>capsice</b></sub>](https://github.com/capsice)<br/>|[<img src="https://avatars.githubusercontent.com/u/1281323?v=4" width="100px;"/><br/><sub><b>changzhiwin</b></sub>](https://github.com/changzhiwin)<br/>|[<img src="https://avatars.githubusercontent.com/u/929503?v=4" width="100px;"/><br/><sub><b>yuzhigang33</b></sub>](https://github.com/yuzhigang33)<br/>|
|
298
|
-
|[<img src="https://avatars.githubusercontent.com/u/5574625?v=4" width="100px;"/><br/><sub><b>elrrrrrrr</b></sub>](https://github.com/elrrrrrrr)<br/>|[<img src="https://avatars.githubusercontent.com/u/981128?v=4" width="100px;"/><br/><sub><b>fishbar</b></sub>](https://github.com/fishbar)<br/>|[<img src="https://avatars.githubusercontent.com/u/1207064?v=4" width="100px;"/><br/><sub><b>gxcsoccer</b></sub>](https://github.com/gxcsoccer)<br/>|[<img src="https://avatars.githubusercontent.com/u/17476119?v=4" width="100px;"/><br/><sub><b>mars-coder</b></sub>](https://github.com/mars-coder)<br/>|[<img src="https://avatars.githubusercontent.com/u/929179?v=4" width="100px;"/><br/><sub><b>rockdai</b></sub>](https://github.com/rockdai)<br/>|[<img src="https://avatars.githubusercontent.com/u/2196373?v=4" width="100px;"/><br/><sub><b>dickeylth</b></sub>](https://github.com/dickeylth)<br/>|
|
299
|
-
[<img src="https://avatars.githubusercontent.com/u/13050025?v=4" width="100px;"/><br/><sub><b>aladdin-add</b></sub>](https://github.com/aladdin-add)<br/>
|
300
|
-
|
301
|
-
This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto updated at `Mon Dec 04 2023 00:13:39 GMT+0800`.
|
294
|
+
[](https://github.com/node-modules/urllib/graphs/contributors)
|
302
295
|
|
303
|
-
|
304
|
-
|
305
|
-
## License
|
306
|
-
|
307
|
-
[MIT](LICENSE)
|
296
|
+
Made with [contributors-img](https://contrib.rocks).
|
@@ -78,3 +78,4 @@ class HttpAgent extends undici_1.Agent {
|
|
78
78
|
}
|
79
79
|
}
|
80
80
|
exports.HttpAgent = HttpAgent;
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cEFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBBZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSx3REFBMkI7QUFDM0IsdUNBQWdEO0FBQ2hELG1DQUlnQjtBQVVoQixNQUFNLG1CQUFvQixTQUFRLEtBQUs7SUFDckMsUUFBUSxDQUFTO0lBQ2pCLEVBQUUsQ0FBUztJQUNYLE1BQU0sQ0FBUztJQUVmLFlBQVksUUFBZ0IsRUFBRSxFQUFVLEVBQUUsTUFBYztRQUN0RCxNQUFNLE9BQU8sR0FBRyxpQkFBaUIsQ0FBQztRQUNsQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO1FBQ2IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBRUQsTUFBYSxTQUFVLFNBQVEsY0FBSztJQUNsQyxhQUFhLENBQXdCO0lBRXJDLFlBQVksT0FBeUI7UUFDbkMseUNBQXlDO1FBQ3pDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLElBQUksa0JBQUcsQ0FBQyxNQUFNLENBQUM7UUFDN0MsTUFBTSxNQUFNLEdBQW1CLENBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsRUFBRTtZQUNoRSxPQUFPLENBQUMsUUFBUSxFQUFFLFVBQVUsRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQVcsRUFBRSxFQUFFO2dCQUNwRCx5Q0FBeUM7Z0JBQ3pDLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDeEIsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN2QixJQUFJLEdBQUc7b0JBQUUsT0FBUSxRQUFnQixDQUFDLEdBQUcsRUFBRSxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUM7Z0JBQ3hELElBQUksT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDO29CQUN6Qiw4RkFBOEY7b0JBQzlGLElBQUksT0FBTyxPQUFPLEtBQUssUUFBUSxFQUFFLENBQUM7d0JBQ2hDLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDOzRCQUMzQyxHQUFHLEdBQUcsSUFBSSxtQkFBbUIsQ0FBQyxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sQ0FBQyxDQUFDO3dCQUMzRCxDQUFDO29CQUNILENBQUM7eUJBQU0sSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7d0JBQ2xDLE1BQU0sU0FBUyxHQUFHLE9BQWdELENBQUM7d0JBQ25FLEtBQUssTUFBTSxJQUFJLElBQUksU0FBUyxFQUFFLENBQUM7NEJBQzdCLElBQUksQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7Z0NBQ3JELEdBQUcsR0FBRyxJQUFJLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztnQ0FDbkUsTUFBTTs0QkFDUixDQUFDO3dCQUNILENBQUM7b0JBQ0gsQ0FBQztnQkFDSCxDQUFDO2dCQUNBLFFBQWdCLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztZQUMxQyxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUMsQ0FBQztRQUNGLEtBQUssQ0FBQztZQUNKLE9BQU8sRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUU7U0FDeEMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxDQUFDLGFBQWEsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDO0lBQzVDLENBQUM7SUFFRCxRQUFRLENBQUMsT0FBOEIsRUFBRSxPQUFvQztRQUMzRSxJQUFJLElBQUksQ0FBQyxhQUFhLElBQUksT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ3pDLE1BQU0sU0FBUyxHQUFHLE9BQU8sT0FBTyxDQUFDLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQztZQUNoRyxJQUFJLFFBQVEsR0FBRyxTQUFTLENBQUMsUUFBUSxDQUFDO1lBQ2xDLDJDQUEyQztZQUMzQyxJQUFJLFFBQVEsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUN2RCxRQUFRLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztZQUN4RCxDQUFDO1lBQ0QsTUFBTSxNQUFNLEdBQUcsSUFBQSxlQUFJLEVBQUMsUUFBUSxDQUFDLENBQUM7WUFDOUIsSUFBSSxNQUFNLEtBQUssQ0FBQyxJQUFJLE1BQU0sS0FBSyxDQUFDLEVBQUUsQ0FBQztnQkFDakMseURBQXlEO2dCQUN6RCxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLEVBQUUsQ0FBQztvQkFDMUMsTUFBTSxJQUFJLG1CQUFtQixDQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7Z0JBQzVELENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDMUMsQ0FBQztDQUNGO0FBdkRELDhCQXVEQyJ9
|
@@ -1,6 +1,3 @@
|
|
1
|
-
/// <reference types="node" />
|
2
|
-
/// <reference types="node" />
|
3
|
-
/// <reference types="node" />
|
4
1
|
import { EventEmitter } from 'node:events';
|
5
2
|
import { LookupFunction } from 'node:net';
|
6
3
|
import { Dispatcher } from 'undici';
|
@@ -41,6 +38,7 @@ export type ClientOptions = {
|
|
41
38
|
timeout?: number;
|
42
39
|
};
|
43
40
|
};
|
41
|
+
export declare const VERSION = "VERSION";
|
44
42
|
export declare const HEADER_USER_AGENT: string;
|
45
43
|
export type RequestContext = {
|
46
44
|
retries: number;
|
@@ -3,7 +3,7 @@ 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.HttpClient = exports.HEADER_USER_AGENT = void 0;
|
6
|
+
exports.HttpClient = exports.HEADER_USER_AGENT = exports.VERSION = void 0;
|
7
7
|
const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel"));
|
8
8
|
const node_events_1 = require("node:events");
|
9
9
|
const node_http_1 = require("node:http");
|
@@ -11,20 +11,19 @@ const node_util_1 = require("node:util");
|
|
11
11
|
const node_zlib_1 = require("node:zlib");
|
12
12
|
const node_buffer_1 = require("node:buffer");
|
13
13
|
const node_stream_1 = require("node:stream");
|
14
|
-
const
|
14
|
+
const promises_1 = require("node:stream/promises");
|
15
15
|
const node_path_1 = require("node:path");
|
16
16
|
const node_fs_1 = require("node:fs");
|
17
17
|
const node_url_1 = require("node:url");
|
18
18
|
const node_perf_hooks_1 = require("node:perf_hooks");
|
19
19
|
const node_querystring_1 = __importDefault(require("node:querystring"));
|
20
|
+
const promises_2 = require("node:timers/promises");
|
20
21
|
const undici_1 = require("undici");
|
22
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
23
|
+
// @ts-ignore
|
21
24
|
const symbols_js_1 = __importDefault(require("undici/lib/core/symbols.js"));
|
22
|
-
const formdata_node_1 = require("formdata-node");
|
23
|
-
const form_data_encoder_1 = require("form-data-encoder");
|
24
|
-
const default_user_agent_1 = __importDefault(require("default-user-agent"));
|
25
25
|
const mime_types_1 = __importDefault(require("mime-types"));
|
26
26
|
const qs_1 = __importDefault(require("qs"));
|
27
|
-
const pump_1 = __importDefault(require("pump"));
|
28
27
|
// Compatible with old style formstream
|
29
28
|
const formstream_1 = __importDefault(require("formstream"));
|
30
29
|
const HttpAgent_js_1 = require("./HttpAgent.js");
|
@@ -33,23 +32,10 @@ const symbols_js_2 = __importDefault(require("./symbols.js"));
|
|
33
32
|
const diagnosticsChannel_js_1 = require("./diagnosticsChannel.js");
|
34
33
|
const HttpClientError_js_1 = require("./HttpClientError.js");
|
35
34
|
const PROTO_RE = /^https?:\/\//i;
|
36
|
-
const FormData = undici_1.FormData ?? formdata_node_1.FormData;
|
37
|
-
// impl promise pipeline on Node.js 14
|
38
|
-
const pipelinePromise = node_stream_2.default.promises?.pipeline ?? function pipeline(...args) {
|
39
|
-
return new Promise((resolve, reject) => {
|
40
|
-
(0, pump_1.default)(...args, (err) => {
|
41
|
-
if (err)
|
42
|
-
return reject(err);
|
43
|
-
resolve();
|
44
|
-
});
|
45
|
-
});
|
46
|
-
};
|
47
35
|
function noop() {
|
48
36
|
// noop
|
49
37
|
}
|
50
38
|
const debug = (0, node_util_1.debuglog)('urllib:HttpClient');
|
51
|
-
// Node.js 14 or 16
|
52
|
-
const isNode14Or16 = /v1[46]\./.test(process.version);
|
53
39
|
// https://github.com/octet-stream/form-data
|
54
40
|
class BlobFromStream {
|
55
41
|
#stream;
|
@@ -68,7 +54,9 @@ class BlobFromStream {
|
|
68
54
|
return 'Blob';
|
69
55
|
}
|
70
56
|
}
|
71
|
-
exports.
|
57
|
+
exports.VERSION = 'VERSION';
|
58
|
+
// 'node-urllib/4.0.0 Node.js/18.19.0 (darwin; x64)'
|
59
|
+
exports.HEADER_USER_AGENT = `node-urllib/${exports.VERSION} Node.js/${process.version.substring(1)} (${process.platform}; ${process.arch})`;
|
72
60
|
function getFileName(stream) {
|
73
61
|
const filePath = stream.path;
|
74
62
|
if (filePath) {
|
@@ -112,13 +100,13 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
112
100
|
getDispatcherPoolStats() {
|
113
101
|
const agent = this.getDispatcher();
|
114
102
|
// origin => Pool Instance
|
115
|
-
const clients = agent
|
103
|
+
const clients = Reflect.get(agent, symbols_js_1.default.kClients);
|
116
104
|
const poolStatsMap = {};
|
117
105
|
if (!clients) {
|
118
106
|
return poolStatsMap;
|
119
107
|
}
|
120
108
|
for (const [key, ref] of clients) {
|
121
|
-
const pool = ref.deref();
|
109
|
+
const pool = typeof ref.deref === 'function' ? ref.deref() : ref;
|
122
110
|
const stats = pool?.stats;
|
123
111
|
if (!stats)
|
124
112
|
continue;
|
@@ -340,7 +328,7 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
340
328
|
if (isGETOrHEAD) {
|
341
329
|
requestOptions.method = 'POST';
|
342
330
|
}
|
343
|
-
const formData = new FormData();
|
331
|
+
const formData = new undici_1.FormData();
|
344
332
|
const uploadFiles = [];
|
345
333
|
if (Array.isArray(args.files)) {
|
346
334
|
for (const [index, file] of args.files.entries()) {
|
@@ -355,9 +343,11 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
355
343
|
uploadFiles.push(['file', args.files]);
|
356
344
|
}
|
357
345
|
else if (typeof args.files === 'object') {
|
358
|
-
|
346
|
+
const files = args.files;
|
347
|
+
for (const field in files) {
|
359
348
|
// set custom fileName
|
360
|
-
|
349
|
+
const file = files[field];
|
350
|
+
uploadFiles.push([field, file, field]);
|
361
351
|
}
|
362
352
|
}
|
363
353
|
// set normal fields first
|
@@ -384,18 +374,7 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
384
374
|
isStreamingRequest = true;
|
385
375
|
}
|
386
376
|
}
|
387
|
-
|
388
|
-
requestOptions.body = formData;
|
389
|
-
}
|
390
|
-
else {
|
391
|
-
// Node.js 14 does not support spec-compliant FormData
|
392
|
-
// https://github.com/octet-stream/form-data#usage
|
393
|
-
const encoder = new form_data_encoder_1.FormDataEncoder(formData);
|
394
|
-
Object.assign(headers, encoder.headers);
|
395
|
-
// fix "Content-Length":"NaN"
|
396
|
-
delete headers['Content-Length'];
|
397
|
-
requestOptions.body = node_stream_1.Readable.from(encoder);
|
398
|
-
}
|
377
|
+
requestOptions.body = formData;
|
399
378
|
}
|
400
379
|
else if (args.content) {
|
401
380
|
if (!isGETOrHEAD) {
|
@@ -518,15 +497,12 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
518
497
|
}
|
519
498
|
}
|
520
499
|
else if (args.writeStream) {
|
521
|
-
if (isNode14Or16 && args.writeStream.destroyed) {
|
522
|
-
throw new Error('writeStream is destroyed');
|
523
|
-
}
|
524
500
|
if (args.compressed === true && isCompressedContent) {
|
525
501
|
const decoder = contentEncoding === 'gzip' ? (0, node_zlib_1.createGunzip)() : (0, node_zlib_1.createBrotliDecompress)();
|
526
|
-
await
|
502
|
+
await (0, promises_1.pipeline)(response.body, decoder, args.writeStream);
|
527
503
|
}
|
528
504
|
else {
|
529
|
-
await
|
505
|
+
await (0, promises_1.pipeline)(response.body, args.writeStream);
|
530
506
|
}
|
531
507
|
}
|
532
508
|
else {
|
@@ -574,7 +550,7 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
574
550
|
const isRetry = args.isRetry ?? defaultIsRetry;
|
575
551
|
if (isRetry(clientResponse)) {
|
576
552
|
if (args.retryDelay) {
|
577
|
-
await (0,
|
553
|
+
await (0, promises_2.setTimeout)(args.retryDelay);
|
578
554
|
}
|
579
555
|
requestContext.retries++;
|
580
556
|
return await this.#requestInternal(url, options, requestContext);
|
@@ -690,3 +666,4 @@ class HttpClient extends node_events_1.EventEmitter {
|
|
690
666
|
}
|
691
667
|
}
|
692
668
|
exports.HttpClient = HttpClient;
|
669
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/HttpClient.ts"],"names":[],"mappings":"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"}
|
@@ -27,3 +27,4 @@ class HttpClientConnectTimeoutError extends HttpClientRequestError {
|
|
27
27
|
}
|
28
28
|
}
|
29
29
|
exports.HttpClientConnectTimeoutError = HttpClientConnectTimeoutError;
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSHR0cENsaWVudEVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0h0dHBDbGllbnRFcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFRQSxNQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsTUFBTSxDQUFVO0lBQ2hCLE9BQU8sQ0FBdUI7SUFDOUIsTUFBTSxDQUFjO0lBQ3BCLEdBQUcsQ0FBdUI7Q0FDM0I7QUFMRCx3REFLQztBQUVELE1BQWEsNkJBQThCLFNBQVEsc0JBQXNCO0lBQ3ZFLFlBQVksT0FBZSxFQUFFLE9BQXFCO1FBQ2hELE1BQU0sT0FBTyxHQUFHLHVCQUF1QixPQUFPLEtBQUssQ0FBQztRQUNwRCxLQUFLLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1FBQ3hCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUM7UUFDbEMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEQsQ0FBQztDQUNGO0FBUEQsc0VBT0M7QUFFRCxNQUFhLDZCQUE4QixTQUFRLHNCQUFzQjtJQUN2RSxJQUFJLENBQVM7SUFFYixZQUFZLE9BQWUsRUFBRSxJQUFZLEVBQUUsT0FBcUI7UUFDOUQsS0FBSyxDQUFDLE9BQU8sRUFBRSxPQUFPLENBQUMsQ0FBQztRQUN4QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDO1FBQ2xDLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ2pCLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQ2xELENBQUM7Q0FDRjtBQVRELHNFQVNDIn0=
|
@@ -1,2 +1,3 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSW5jb21pbmdIdHRwSGVhZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9JbmNvbWluZ0h0dHBIZWFkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
|
@@ -1,7 +1,3 @@
|
|
1
|
-
/// <reference types="node" />
|
2
|
-
/// <reference types="node" />
|
3
|
-
/// <reference types="node" />
|
4
|
-
/// <reference types="node" />
|
5
1
|
import type { Readable, Writable } from 'node:stream';
|
6
2
|
import type { EventEmitter } from 'node:events';
|
7
3
|
import type { Dispatcher } from 'undici';
|
package/dist/commonjs/Request.js
CHANGED
@@ -1,2 +1,3 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9SZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
|
@@ -1,2 +1,3 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUmVzcG9uc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
|
@@ -3,7 +3,7 @@ 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.initDiagnosticsChannel =
|
6
|
+
exports.initDiagnosticsChannel = initDiagnosticsChannel;
|
7
7
|
const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel"));
|
8
8
|
const node_perf_hooks_1 = require("node:perf_hooks");
|
9
9
|
const node_util_1 = require("node:util");
|
@@ -23,13 +23,7 @@ let initedDiagnosticsChannel = false;
|
|
23
23
|
// undici:request:headers => { request, response }
|
24
24
|
// -> undici:request:trailers => { request, trailers }
|
25
25
|
function subscribe(name, listener) {
|
26
|
-
|
27
|
-
node_diagnostics_channel_1.default.subscribe(name, listener);
|
28
|
-
}
|
29
|
-
else {
|
30
|
-
// TODO: support Node.js 14, will be removed on the next major version
|
31
|
-
node_diagnostics_channel_1.default.channel(name).subscribe(listener);
|
32
|
-
}
|
26
|
+
node_diagnostics_channel_1.default.subscribe(name, listener);
|
33
27
|
}
|
34
28
|
function formatSocket(socket) {
|
35
29
|
if (!socket)
|
@@ -44,8 +38,7 @@ function formatSocket(socket) {
|
|
44
38
|
};
|
45
39
|
}
|
46
40
|
// make sure error contains socket info
|
47
|
-
const
|
48
|
-
node_net_1.Socket.prototype[kDestroy] = node_net_1.Socket.prototype.destroy;
|
41
|
+
const destroySocket = node_net_1.Socket.prototype.destroy;
|
49
42
|
node_net_1.Socket.prototype.destroy = function (err) {
|
50
43
|
if (err) {
|
51
44
|
Object.defineProperty(err, symbols_js_1.default.kErrorSocket, {
|
@@ -54,12 +47,12 @@ node_net_1.Socket.prototype.destroy = function (err) {
|
|
54
47
|
value: this,
|
55
48
|
});
|
56
49
|
}
|
57
|
-
return this
|
50
|
+
return destroySocket.call(this, err);
|
58
51
|
};
|
59
52
|
function getRequestOpaque(request, kHandler) {
|
60
53
|
if (!kHandler)
|
61
54
|
return;
|
62
|
-
const handler = request
|
55
|
+
const handler = Reflect.get(request, kHandler);
|
63
56
|
// maxRedirects = 0 will get [Symbol(handler)]: RequestHandler {
|
64
57
|
// responseHeaders: null,
|
65
58
|
// opaque: {
|
@@ -72,7 +65,7 @@ function getRequestOpaque(request, kHandler) {
|
|
72
65
|
return handler?.opts?.opaque ?? handler?.opaque;
|
73
66
|
}
|
74
67
|
function initDiagnosticsChannel() {
|
75
|
-
//
|
68
|
+
// make sure init global DiagnosticsChannel once
|
76
69
|
if (initedDiagnosticsChannel)
|
77
70
|
return;
|
78
71
|
initedDiagnosticsChannel = true;
|
@@ -99,27 +92,26 @@ function initDiagnosticsChannel() {
|
|
99
92
|
return;
|
100
93
|
opaque[symbols_js_1.default.kRequestTiming].queuing = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
|
101
94
|
});
|
102
|
-
// diagnosticsChannel.channel('undici:client:beforeConnect')
|
103
95
|
subscribe('undici:client:connectError', (message, name) => {
|
104
|
-
const { error, connectParams } = message;
|
105
|
-
let
|
106
|
-
if (!
|
107
|
-
|
96
|
+
const { error, connectParams, socket } = message;
|
97
|
+
let sock = socket;
|
98
|
+
if (!sock && error[symbols_js_1.default.kErrorSocket]) {
|
99
|
+
sock = error[symbols_js_1.default.kErrorSocket];
|
108
100
|
}
|
109
|
-
if (
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
101
|
+
if (sock) {
|
102
|
+
sock[symbols_js_1.default.kSocketId] = (0, utils_js_1.globalId)('UndiciSocket');
|
103
|
+
sock[symbols_js_1.default.kSocketConnectErrorTime] = new Date();
|
104
|
+
sock[symbols_js_1.default.kHandledRequests] = 0;
|
105
|
+
sock[symbols_js_1.default.kHandledResponses] = 0;
|
114
106
|
// copy local address to symbol, avoid them be reset after request error throw
|
115
|
-
if (
|
116
|
-
|
117
|
-
|
107
|
+
if (sock.localAddress) {
|
108
|
+
sock[symbols_js_1.default.kSocketLocalAddress] = sock.localAddress;
|
109
|
+
sock[symbols_js_1.default.kSocketLocalPort] = sock.localPort;
|
118
110
|
}
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name,
|
111
|
+
sock[symbols_js_1.default.kSocketConnectProtocol] = connectParams.protocol;
|
112
|
+
sock[symbols_js_1.default.kSocketConnectHost] = connectParams.host;
|
113
|
+
sock[symbols_js_1.default.kSocketConnectPort] = connectParams.port;
|
114
|
+
debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, sock[symbols_js_1.default.kSocketId], connectParams, error.message, formatSocket(sock));
|
123
115
|
}
|
124
116
|
else {
|
125
117
|
debug('[%s] connectError, connectParams: %o, error: %o', name, connectParams, error);
|
@@ -154,7 +146,7 @@ function initDiagnosticsChannel() {
|
|
154
146
|
if (!opaque[symbols_js_1.default.kEnableRequestTiming])
|
155
147
|
return;
|
156
148
|
opaque[symbols_js_1.default.kRequestTiming].requestHeadersSent = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
|
157
|
-
// first socket need to
|
149
|
+
// first socket need to calculate the connected time
|
158
150
|
if (socket[symbols_js_1.default.kHandledRequests] === 1) {
|
159
151
|
// kSocketStartTime - kRequestStartTime = connected time
|
160
152
|
opaque[symbols_js_1.default.kRequestTiming].connected =
|
@@ -213,4 +205,4 @@ function initDiagnosticsChannel() {
|
|
213
205
|
// formatSocket(socket), error);
|
214
206
|
// });
|
215
207
|
}
|
216
|
-
exports.initDiagnosticsChannel = initDiagnosticsChannel;
|
208
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"diagnosticsChannel.js","sourceRoot":"","sources":["../../src/diagnosticsChannel.ts"],"names":[],"mappings":"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"}
|
package/dist/commonjs/index.js
CHANGED
@@ -13,22 +13,21 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
|
|
13
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
15
15
|
};
|
16
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
17
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
18
|
-
};
|
19
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
20
|
-
exports.USER_AGENT = exports.HttpClient2 = exports.HttpClient = exports.getGlobalDispatcher = exports.setGlobalDispatcher = exports.Dispatcher = exports.Agent = exports.ProxyAgent = exports.MockAgent =
|
21
|
-
|
17
|
+
exports.USER_AGENT = exports.HttpClient2 = exports.HttpClient = exports.getGlobalDispatcher = exports.setGlobalDispatcher = exports.Dispatcher = exports.Agent = exports.ProxyAgent = exports.MockAgent = void 0;
|
18
|
+
exports.getDefaultHttpClient = getDefaultHttpClient;
|
19
|
+
exports.request = request;
|
20
|
+
exports.curl = curl;
|
21
|
+
const ylru_1 = require("ylru");
|
22
22
|
const HttpClient_js_1 = require("./HttpClient.js");
|
23
23
|
let httpClient;
|
24
|
-
const domainSocketHttpClients = new ylru_1.
|
24
|
+
const domainSocketHttpClients = new ylru_1.LRU(50);
|
25
25
|
function getDefaultHttpClient() {
|
26
26
|
if (!httpClient) {
|
27
27
|
httpClient = new HttpClient_js_1.HttpClient();
|
28
28
|
}
|
29
29
|
return httpClient;
|
30
30
|
}
|
31
|
-
exports.getDefaultHttpClient = getDefaultHttpClient;
|
32
31
|
async function request(url, options) {
|
33
32
|
if (options?.socketPath) {
|
34
33
|
let domainSocketHttpclient = domainSocketHttpClients.get(options.socketPath);
|
@@ -42,7 +41,6 @@ async function request(url, options) {
|
|
42
41
|
}
|
43
42
|
return await getDefaultHttpClient().request(url, options);
|
44
43
|
}
|
45
|
-
exports.request = request;
|
46
44
|
// export curl method is keep compatible with urllib.curl()
|
47
45
|
// ```ts
|
48
46
|
// import * as urllib from 'urllib';
|
@@ -51,7 +49,6 @@ exports.request = request;
|
|
51
49
|
async function curl(url, options) {
|
52
50
|
return await request(url, options);
|
53
51
|
}
|
54
|
-
exports.curl = curl;
|
55
52
|
var undici_1 = require("undici");
|
56
53
|
Object.defineProperty(exports, "MockAgent", { enumerable: true, get: function () { return undici_1.MockAgent; } });
|
57
54
|
Object.defineProperty(exports, "ProxyAgent", { enumerable: true, get: function () { return undici_1.ProxyAgent; } });
|
@@ -70,3 +67,4 @@ exports.default = {
|
|
70
67
|
curl,
|
71
68
|
USER_AGENT: HttpClient_js_1.HEADER_USER_AGENT,
|
72
69
|
};
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFPQSxvREFLQztBQUVELDBCQWFDO0FBT0Qsb0JBRUM7QUFwQ0QsK0JBQTJCO0FBQzNCLG1EQUFnRTtBQUdoRSxJQUFJLFVBQXNCLENBQUM7QUFDM0IsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLFVBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztBQUU1QyxTQUFnQixvQkFBb0I7SUFDbEMsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2hCLFVBQVUsR0FBRyxJQUFJLDBCQUFVLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBQ0QsT0FBTyxVQUFVLENBQUM7QUFDcEIsQ0FBQztBQUVNLEtBQUssVUFBVSxPQUFPLENBQVUsR0FBZSxFQUFFLE9BQXdCO0lBQzlFLElBQUksT0FBTyxFQUFFLFVBQVUsRUFBRSxDQUFDO1FBQ3hCLElBQUksc0JBQXNCLEdBQUcsdUJBQXVCLENBQUMsR0FBRyxDQUFhLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUN6RixJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztZQUM1QixzQkFBc0IsR0FBRyxJQUFJLDBCQUFVLENBQUM7Z0JBQ3RDLE9BQU8sRUFBRSxFQUFFLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVSxFQUFFO2FBQzVDLENBQUMsQ0FBQztZQUNILHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLHNCQUFzQixDQUFDLENBQUM7UUFDMUUsQ0FBQztRQUNELE9BQU8sTUFBTSxzQkFBc0IsQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxPQUFPLE1BQU0sb0JBQW9CLEVBQUUsQ0FBQyxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQy9ELENBQUM7QUFFRCwyREFBMkQ7QUFDM0QsUUFBUTtBQUNSLG9DQUFvQztBQUNwQyxvQkFBb0I7QUFDcEIsTUFBTTtBQUNDLEtBQUssVUFBVSxJQUFJLENBQVUsR0FBZSxFQUFFLE9BQXdCO0lBQzNFLE9BQU8sTUFBTSxPQUFPLENBQUksR0FBRyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ3hDLENBQUM7QUFFRCxpQ0FHZ0I7QUFGZCxtR0FBQSxTQUFTLE9BQUE7QUFBRSxvR0FBQSxVQUFVLE9BQUE7QUFBRSwrRkFBQSxLQUFLLE9BQUE7QUFBRSxvR0FBQSxVQUFVLE9BQUE7QUFDeEMsNkdBQUEsbUJBQW1CLE9BQUE7QUFBRSw2R0FBQSxtQkFBbUIsT0FBQTtBQUUxQywyREFBMkQ7QUFDM0QsaURBR3lCO0FBRnZCLDJHQUFBLFVBQVUsT0FBQTtBQUFFLDRHQUFBLFVBQVUsT0FBZTtBQUFFLDJHQUFBLGlCQUFpQixPQUFjO0FBZXhFLHVEQUFxQztBQUVyQyxrQkFBZTtJQUNiLE9BQU87SUFDUCxJQUFJO0lBQ0osVUFBVSxFQUFFLGlDQUFpQjtDQUM5QixDQUFDIn0=
|
package/dist/commonjs/symbols.js
CHANGED
@@ -21,3 +21,4 @@ exports.default = {
|
|
21
21
|
kRequestOriginalOpaque: Symbol('request original opaque'),
|
22
22
|
kErrorSocket: Symbol('socket of error'),
|
23
23
|
};
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3ltYm9scy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zeW1ib2xzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsa0JBQWU7SUFDYixTQUFTLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQztJQUM5QixnQkFBZ0IsRUFBRSxNQUFNLENBQUMsbUJBQW1CLENBQUM7SUFDN0Msb0JBQW9CLEVBQUUsTUFBTSxDQUFDLHVCQUF1QixDQUFDO0lBQ3JELHVCQUF1QixFQUFFLE1BQU0sQ0FBQywwQkFBMEIsQ0FBQztJQUMzRCxxQkFBcUIsRUFBRSxNQUFNLENBQUMseUJBQXlCLENBQUM7SUFDeEQsbUJBQW1CLEVBQUUsTUFBTSxDQUFDLHNCQUFzQixDQUFDO0lBQ25ELGdCQUFnQixFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQztJQUM3QyxrQkFBa0IsRUFBRSxNQUFNLENBQUMsNkJBQTZCLENBQUM7SUFDekQsa0JBQWtCLEVBQUUsTUFBTSxDQUFDLDZCQUE2QixDQUFDO0lBQ3pELHNCQUFzQixFQUFFLE1BQU0sQ0FBQyxpQ0FBaUMsQ0FBQztJQUNqRSxnQkFBZ0IsRUFBRSxNQUFNLENBQUMsNkJBQTZCLENBQUM7SUFDdkQsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLDhCQUE4QixDQUFDO0lBQ3pELGNBQWMsRUFBRSxNQUFNLENBQUMsdUJBQXVCLENBQUM7SUFDL0MsVUFBVSxFQUFFLE1BQU0sQ0FBQyxZQUFZLENBQUM7SUFDaEMsaUJBQWlCLEVBQUUsTUFBTSxDQUFDLG9CQUFvQixDQUFDO0lBQy9DLG9CQUFvQixFQUFFLE1BQU0sQ0FBQyw4QkFBOEIsQ0FBQztJQUM1RCxjQUFjLEVBQUUsTUFBTSxDQUFDLGdCQUFnQixDQUFDO0lBQ3hDLHNCQUFzQixFQUFFLE1BQU0sQ0FBQyx5QkFBeUIsQ0FBQztJQUN6RCxZQUFZLEVBQUUsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0NBQ3hDLENBQUMifQ==
|
package/dist/commonjs/utils.d.ts
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
import type { FixJSONCtlChars } from './Request.js';
|
2
2
|
export declare function parseJSON(data: string, fixJSONCtlChars?: FixJSONCtlChars): string;
|
3
|
-
export declare function sleep(ms: number): Promise<void>;
|
4
3
|
export declare function digestAuthHeader(method: string, uri: string, wwwAuthenticate: string, userpass: string): string;
|
5
4
|
export declare function globalId(category: string): number;
|
6
5
|
export declare function performanceTime(startTime: number, now?: number): number;
|