nlcurl 0.5.0 → 0.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/README.md +41 -8
- package/dist/cache/store.d.ts +89 -0
- package/dist/cache/store.d.ts.map +1 -0
- package/dist/cache/store.js +402 -0
- package/dist/cache/store.js.map +1 -0
- package/dist/cache/types.d.ts +101 -0
- package/dist/cache/types.d.ts.map +1 -0
- package/dist/cache/types.js +2 -0
- package/dist/cache/types.js.map +1 -0
- package/dist/cookies/jar.d.ts +20 -0
- package/dist/cookies/jar.d.ts.map +1 -1
- package/dist/cookies/jar.js +64 -10
- package/dist/cookies/jar.js.map +1 -1
- package/dist/cookies/parser.d.ts +2 -10
- package/dist/cookies/parser.d.ts.map +1 -1
- package/dist/cookies/parser.js +49 -2
- package/dist/cookies/parser.js.map +1 -1
- package/dist/cookies/psl-data.d.ts +12 -0
- package/dist/cookies/psl-data.d.ts.map +1 -0
- package/dist/cookies/psl-data.js +10166 -0
- package/dist/cookies/psl-data.js.map +1 -0
- package/dist/cookies/public-suffix.d.ts +37 -0
- package/dist/cookies/public-suffix.d.ts.map +1 -0
- package/dist/cookies/public-suffix.js +140 -0
- package/dist/cookies/public-suffix.js.map +1 -0
- package/dist/core/client.js +4 -0
- package/dist/core/client.js.map +1 -1
- package/dist/core/request.d.ts +73 -3
- package/dist/core/request.d.ts.map +1 -1
- package/dist/core/response.d.ts +22 -0
- package/dist/core/response.d.ts.map +1 -1
- package/dist/core/response.js +32 -0
- package/dist/core/response.js.map +1 -1
- package/dist/core/session.d.ts +23 -0
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +108 -4
- package/dist/core/session.js.map +1 -1
- package/dist/core/validation.d.ts +11 -0
- package/dist/core/validation.d.ts.map +1 -1
- package/dist/core/validation.js +22 -1
- package/dist/core/validation.js.map +1 -1
- package/dist/dns/codec.d.ts +37 -0
- package/dist/dns/codec.d.ts.map +1 -0
- package/dist/dns/codec.js +254 -0
- package/dist/dns/codec.js.map +1 -0
- package/dist/dns/doh-resolver.d.ts +52 -0
- package/dist/dns/doh-resolver.d.ts.map +1 -0
- package/dist/dns/doh-resolver.js +192 -0
- package/dist/dns/doh-resolver.js.map +1 -0
- package/dist/dns/https-rr.d.ts +51 -0
- package/dist/dns/https-rr.d.ts.map +1 -0
- package/dist/dns/https-rr.js +127 -0
- package/dist/dns/https-rr.js.map +1 -0
- package/dist/dns/types.d.ts +110 -0
- package/dist/dns/types.d.ts.map +1 -0
- package/dist/dns/types.js +34 -0
- package/dist/dns/types.js.map +1 -0
- package/dist/hsts/store.d.ts +41 -0
- package/dist/hsts/store.d.ts.map +1 -0
- package/dist/hsts/store.js +171 -0
- package/dist/hsts/store.js.map +1 -0
- package/dist/hsts/types.d.ts +28 -0
- package/dist/hsts/types.d.ts.map +1 -0
- package/dist/hsts/types.js +2 -0
- package/dist/hsts/types.js.map +1 -0
- package/dist/http/alt-svc.d.ts +85 -0
- package/dist/http/alt-svc.d.ts.map +1 -0
- package/dist/http/alt-svc.js +220 -0
- package/dist/http/alt-svc.js.map +1 -0
- package/dist/http/form-data.d.ts +59 -0
- package/dist/http/form-data.d.ts.map +1 -0
- package/dist/http/form-data.js +90 -0
- package/dist/http/form-data.js.map +1 -0
- package/dist/http/h1/client.d.ts.map +1 -1
- package/dist/http/h1/client.js +21 -3
- package/dist/http/h1/client.js.map +1 -1
- package/dist/http/h1/encoder.d.ts +17 -0
- package/dist/http/h1/encoder.d.ts.map +1 -1
- package/dist/http/h1/encoder.js +53 -5
- package/dist/http/h1/encoder.js.map +1 -1
- package/dist/http/h1/parser.d.ts.map +1 -1
- package/dist/http/h1/parser.js +7 -1
- package/dist/http/h1/parser.js.map +1 -1
- package/dist/http/h2/client.d.ts.map +1 -1
- package/dist/http/h2/client.js +58 -8
- package/dist/http/h2/client.js.map +1 -1
- package/dist/http/h2/hpack.d.ts +7 -0
- package/dist/http/h2/hpack.d.ts.map +1 -1
- package/dist/http/h2/hpack.js +13 -0
- package/dist/http/h2/hpack.js.map +1 -1
- package/dist/http/h3/detection.d.ts +17 -0
- package/dist/http/h3/detection.d.ts.map +1 -0
- package/dist/http/h3/detection.js +59 -0
- package/dist/http/h3/detection.js.map +1 -0
- package/dist/http/negotiator.d.ts +26 -1
- package/dist/http/negotiator.d.ts.map +1 -1
- package/dist/http/negotiator.js +93 -18
- package/dist/http/negotiator.js.map +1 -1
- package/dist/http/pool.d.ts +2 -2
- package/dist/http/pool.d.ts.map +1 -1
- package/dist/http/pool.js.map +1 -1
- package/dist/index.d.ts +19 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -0
- package/dist/index.js.map +1 -1
- package/dist/middleware/rate-limiter.d.ts.map +1 -1
- package/dist/middleware/rate-limiter.js +4 -0
- package/dist/middleware/rate-limiter.js.map +1 -1
- package/dist/middleware/retry.js +2 -2
- package/dist/middleware/retry.js.map +1 -1
- package/dist/proxy/env-proxy.d.ts +21 -0
- package/dist/proxy/env-proxy.d.ts.map +1 -0
- package/dist/proxy/env-proxy.js +74 -0
- package/dist/proxy/env-proxy.js.map +1 -0
- package/dist/proxy/http-proxy.d.ts +2 -0
- package/dist/proxy/http-proxy.d.ts.map +1 -1
- package/dist/proxy/http-proxy.js +29 -6
- package/dist/proxy/http-proxy.js.map +1 -1
- package/dist/proxy/socks.js +10 -1
- package/dist/proxy/socks.js.map +1 -1
- package/dist/sse/parser.d.ts +70 -0
- package/dist/sse/parser.d.ts.map +1 -0
- package/dist/sse/parser.js +153 -0
- package/dist/sse/parser.js.map +1 -0
- package/dist/tls/ech.d.ts +147 -0
- package/dist/tls/ech.d.ts.map +1 -0
- package/dist/tls/ech.js +401 -0
- package/dist/tls/ech.js.map +1 -0
- package/dist/tls/node-engine.d.ts +9 -1
- package/dist/tls/node-engine.d.ts.map +1 -1
- package/dist/tls/node-engine.js +54 -1
- package/dist/tls/node-engine.js.map +1 -1
- package/dist/tls/pin-verification.d.ts +9 -0
- package/dist/tls/pin-verification.d.ts.map +1 -0
- package/dist/tls/pin-verification.js +34 -0
- package/dist/tls/pin-verification.js.map +1 -0
- package/dist/tls/session-cache.d.ts +70 -0
- package/dist/tls/session-cache.d.ts.map +1 -0
- package/dist/tls/session-cache.js +80 -0
- package/dist/tls/session-cache.js.map +1 -0
- package/dist/tls/stealth/client-hello.d.ts +21 -0
- package/dist/tls/stealth/client-hello.d.ts.map +1 -1
- package/dist/tls/stealth/client-hello.js +116 -0
- package/dist/tls/stealth/client-hello.js.map +1 -1
- package/dist/tls/stealth/engine.d.ts.map +1 -1
- package/dist/tls/stealth/engine.js +152 -30
- package/dist/tls/stealth/engine.js.map +1 -1
- package/dist/tls/stealth/handshake.d.ts +2 -1
- package/dist/tls/stealth/handshake.d.ts.map +1 -1
- package/dist/tls/stealth/handshake.js +118 -5
- package/dist/tls/stealth/handshake.js.map +1 -1
- package/dist/tls/stealth/tls12-handshake.d.ts +14 -0
- package/dist/tls/stealth/tls12-handshake.d.ts.map +1 -0
- package/dist/tls/stealth/tls12-handshake.js +462 -0
- package/dist/tls/stealth/tls12-handshake.js.map +1 -0
- package/dist/tls/types.d.ts +40 -0
- package/dist/tls/types.d.ts.map +1 -1
- package/dist/utils/encoding.d.ts +8 -6
- package/dist/utils/encoding.d.ts.map +1 -1
- package/dist/utils/encoding.js +92 -24
- package/dist/utils/encoding.js.map +1 -1
- package/dist/utils/happy-eyeballs.d.ts +3 -0
- package/dist/utils/happy-eyeballs.d.ts.map +1 -1
- package/dist/utils/happy-eyeballs.js +42 -2
- package/dist/utils/happy-eyeballs.js.map +1 -1
- package/dist/ws/client.d.ts +3 -0
- package/dist/ws/client.d.ts.map +1 -1
- package/dist/ws/client.js +63 -7
- package/dist/ws/client.js.map +1 -1
- package/dist/ws/frame.d.ts +4 -2
- package/dist/ws/frame.d.ts.map +1 -1
- package/dist/ws/frame.js +18 -18
- package/dist/ws/frame.js.map +1 -1
- package/dist/ws/permessage-deflate.d.ts +58 -0
- package/dist/ws/permessage-deflate.d.ts.map +1 -0
- package/dist/ws/permessage-deflate.js +148 -0
- package/dist/ws/permessage-deflate.js.map +1 -0
- package/package.json +3 -2
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import type { BrowserProfile } from "../fingerprints/types.js";
|
|
2
|
+
import type { TLSOptions } from "../tls/types.js";
|
|
2
3
|
import { type PoolOptions } from "./pool.js";
|
|
3
4
|
import type { NLcURLRequest } from "../core/request.js";
|
|
4
5
|
import { NLcURLResponse } from "../core/response.js";
|
|
6
|
+
import { AltSvcStore } from "./alt-svc.js";
|
|
7
|
+
import { HTTPSRRResolver } from "../dns/https-rr.js";
|
|
8
|
+
import { DoHResolver } from "../dns/doh-resolver.js";
|
|
9
|
+
import type { DNSConfig } from "../dns/types.js";
|
|
10
|
+
import type { ECHOptions } from "../tls/ech.js";
|
|
5
11
|
/**
|
|
6
12
|
* Controls which TLS engine and browser profile the {@link ProtocolNegotiator}
|
|
7
13
|
* uses when establishing a new connection.
|
|
@@ -17,23 +23,34 @@ export interface NegotiatorOptions {
|
|
|
17
23
|
profile?: BrowserProfile;
|
|
18
24
|
insecure?: boolean;
|
|
19
25
|
pool?: PoolOptions;
|
|
26
|
+
tls?: TLSOptions;
|
|
27
|
+
dns?: DNSConfig;
|
|
28
|
+
ech?: ECHOptions;
|
|
29
|
+
altSvc?: boolean;
|
|
20
30
|
}
|
|
21
31
|
/**
|
|
22
32
|
* Manages the full lifecycle of an outgoing HTTP request: DNS resolution,
|
|
23
33
|
* TCP/TLS connection establishment (via proxy if configured), HTTP/1.1 or
|
|
24
34
|
* HTTP/2 protocol negotiation through ALPN, connection pooling, and response
|
|
25
35
|
* collection. Uses a shared {@link ConnectionPool} to reuse connections.
|
|
36
|
+
*
|
|
37
|
+
* Integrates Alt-Svc (RFC 7838) for HTTP/3 discovery, HTTPS-RR (RFC 9460)
|
|
38
|
+
* for ECH key delivery and ALPN hints, and DoH (RFC 8484) for encrypted DNS.
|
|
26
39
|
*/
|
|
27
40
|
export declare class ProtocolNegotiator {
|
|
28
41
|
private readonly standardEngine;
|
|
29
42
|
private readonly stealthEngine;
|
|
30
43
|
private readonly pool;
|
|
44
|
+
private readonly sessionCache;
|
|
45
|
+
readonly altSvcStore: AltSvcStore;
|
|
46
|
+
private httpsRRResolver;
|
|
47
|
+
private dohResolver;
|
|
31
48
|
/**
|
|
32
49
|
* Creates a new ProtocolNegotiator with an internal connection pool.
|
|
33
50
|
*
|
|
34
51
|
* @param {PoolOptions} [poolOptions] - Optional configuration for the underlying connection pool.
|
|
35
52
|
*/
|
|
36
|
-
constructor(poolOptions?: PoolOptions);
|
|
53
|
+
constructor(poolOptions?: PoolOptions, dnsConfig?: DNSConfig);
|
|
37
54
|
/**
|
|
38
55
|
* Dispatches a single HTTP request. Reuses a pooled connection when one is
|
|
39
56
|
* available for the request’s origin; otherwise establishes a new TCP/TLS
|
|
@@ -55,6 +72,14 @@ export declare class ProtocolNegotiator {
|
|
|
55
72
|
* connections. After calling this method the negotiator must not be reused.
|
|
56
73
|
*/
|
|
57
74
|
close(): void;
|
|
75
|
+
/**
|
|
76
|
+
* Returns the HTTPS-RR resolver, or null if not initialized.
|
|
77
|
+
*/
|
|
78
|
+
getHTTPSRRResolver(): HTTPSRRResolver | null;
|
|
79
|
+
/**
|
|
80
|
+
* Returns the DoH resolver, or null if not initialized.
|
|
81
|
+
*/
|
|
82
|
+
getDoHResolver(): DoHResolver | null;
|
|
58
83
|
private connect;
|
|
59
84
|
}
|
|
60
85
|
//# sourceMappingURL=negotiator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"negotiator.d.ts","sourceRoot":"","sources":["../../src/http/negotiator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"negotiator.d.ts","sourceRoot":"","sources":["../../src/http/negotiator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAA4C,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAO5F,OAAO,EAAkC,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAG7E,OAAO,KAAK,EAAE,aAAa,EAAkB,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,EAAE,WAAW,EAAoB,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAsB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;;;GASG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,UAAU,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAmB;IACjD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,WAAW,CAA4B;IAE/C;;;;OAIG;gBACS,WAAW,CAAC,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,SAAS;IAe5D;;;;;;;;;;;;;OAaG;IACG,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC;YAI9E,KAAK;IAkFnB;;;OAGG;IACH,KAAK,IAAI,IAAI;IAIb;;OAEG;IACH,kBAAkB,IAAI,eAAe,GAAG,IAAI;IAI5C;;OAEG;IACH,cAAc,IAAI,WAAW,GAAG,IAAI;YAItB,OAAO;CAsGtB"}
|
package/dist/http/negotiator.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { NodeTLSEngine } from "../tls/node-engine.js";
|
|
2
2
|
import { StealthTLSEngine } from "../tls/stealth/engine.js";
|
|
3
|
+
import { TLSSessionCache } from "../tls/session-cache.js";
|
|
3
4
|
import { originOf } from "../utils/url.js";
|
|
4
5
|
import { supportsZstd, sanitizeAcceptEncoding } from "../utils/encoding.js";
|
|
5
6
|
import { happyEyeballsConnect } from "../utils/happy-eyeballs.js";
|
|
@@ -8,25 +9,45 @@ import { sendH1Request, sendH1StreamingRequest } from "./h1/client.js";
|
|
|
8
9
|
import { ProtocolError } from "../core/errors.js";
|
|
9
10
|
import { httpProxyConnect } from "../proxy/http-proxy.js";
|
|
10
11
|
import { socksConnect } from "../proxy/socks.js";
|
|
12
|
+
import { assertQuicAvailable, isQuicAvailable } from "./h3/detection.js";
|
|
13
|
+
import { AltSvcStore } from "./alt-svc.js";
|
|
14
|
+
import { HTTPSRRResolver } from "../dns/https-rr.js";
|
|
15
|
+
import { DoHResolver } from "../dns/doh-resolver.js";
|
|
11
16
|
/**
|
|
12
17
|
* Manages the full lifecycle of an outgoing HTTP request: DNS resolution,
|
|
13
18
|
* TCP/TLS connection establishment (via proxy if configured), HTTP/1.1 or
|
|
14
19
|
* HTTP/2 protocol negotiation through ALPN, connection pooling, and response
|
|
15
20
|
* collection. Uses a shared {@link ConnectionPool} to reuse connections.
|
|
21
|
+
*
|
|
22
|
+
* Integrates Alt-Svc (RFC 7838) for HTTP/3 discovery, HTTPS-RR (RFC 9460)
|
|
23
|
+
* for ECH key delivery and ALPN hints, and DoH (RFC 8484) for encrypted DNS.
|
|
16
24
|
*/
|
|
17
25
|
export class ProtocolNegotiator {
|
|
18
26
|
standardEngine;
|
|
19
27
|
stealthEngine;
|
|
20
28
|
pool;
|
|
29
|
+
sessionCache;
|
|
30
|
+
altSvcStore;
|
|
31
|
+
httpsRRResolver = null;
|
|
32
|
+
dohResolver = null;
|
|
21
33
|
/**
|
|
22
34
|
* Creates a new ProtocolNegotiator with an internal connection pool.
|
|
23
35
|
*
|
|
24
36
|
* @param {PoolOptions} [poolOptions] - Optional configuration for the underlying connection pool.
|
|
25
37
|
*/
|
|
26
|
-
constructor(poolOptions) {
|
|
27
|
-
this.
|
|
38
|
+
constructor(poolOptions, dnsConfig) {
|
|
39
|
+
this.sessionCache = new TLSSessionCache();
|
|
40
|
+
this.standardEngine = new NodeTLSEngine(this.sessionCache);
|
|
28
41
|
this.stealthEngine = new StealthTLSEngine();
|
|
29
42
|
this.pool = new ConnectionPool(poolOptions);
|
|
43
|
+
this.altSvcStore = new AltSvcStore();
|
|
44
|
+
if (dnsConfig?.doh) {
|
|
45
|
+
this.dohResolver = new DoHResolver(dnsConfig.doh);
|
|
46
|
+
this.httpsRRResolver = new HTTPSRRResolver(dnsConfig.doh);
|
|
47
|
+
}
|
|
48
|
+
else if (dnsConfig?.httpsRR !== false) {
|
|
49
|
+
this.httpsRRResolver = new HTTPSRRResolver();
|
|
50
|
+
}
|
|
30
51
|
}
|
|
31
52
|
/**
|
|
32
53
|
* Dispatches a single HTTP request. Reuses a pooled connection when one is
|
|
@@ -46,9 +67,18 @@ export class ProtocolNegotiator {
|
|
|
46
67
|
return this._send(request, options, false);
|
|
47
68
|
}
|
|
48
69
|
async _send(request, options, isRetry) {
|
|
70
|
+
if (request.httpVersion === "3") {
|
|
71
|
+
assertQuicAvailable();
|
|
72
|
+
}
|
|
49
73
|
const url = new URL(request.url);
|
|
50
74
|
const origin = originOf(url.toString());
|
|
51
75
|
const timings = {};
|
|
76
|
+
const useAltSvc = options.altSvc !== false;
|
|
77
|
+
if (useAltSvc && !request.httpVersion && isQuicAvailable()) {
|
|
78
|
+
const altEntry = this.altSvcStore.lookup(origin);
|
|
79
|
+
if (altEntry && altEntry.alpn.startsWith("h3")) {
|
|
80
|
+
}
|
|
81
|
+
}
|
|
52
82
|
let poolEntry = this.pool.get(origin);
|
|
53
83
|
if (!poolEntry) {
|
|
54
84
|
const connectStart = Date.now();
|
|
@@ -71,11 +101,11 @@ export class ProtocolNegotiator {
|
|
|
71
101
|
poolEntry = this.pool.put(origin, socket, protocol, undefined, defaultHeaders);
|
|
72
102
|
}
|
|
73
103
|
}
|
|
104
|
+
let response;
|
|
74
105
|
if (poolEntry.protocol === "h2" && poolEntry.h2Client) {
|
|
75
106
|
poolEntry.h2Client.sendPreface();
|
|
76
107
|
try {
|
|
77
|
-
|
|
78
|
-
return response;
|
|
108
|
+
response = request.stream ? await poolEntry.h2Client.streamRequest(request, timings) : await poolEntry.h2Client.request(request, timings);
|
|
79
109
|
}
|
|
80
110
|
catch (err) {
|
|
81
111
|
this.pool.remove(poolEntry);
|
|
@@ -85,21 +115,28 @@ export class ProtocolNegotiator {
|
|
|
85
115
|
throw err;
|
|
86
116
|
}
|
|
87
117
|
}
|
|
88
|
-
const h1Send = request.stream ? sendH1StreamingRequest : sendH1Request;
|
|
89
|
-
let response;
|
|
90
|
-
try {
|
|
91
|
-
response = await h1Send(poolEntry.socket, request, { defaultHeaders: sanitizeProfileHeaders(options.profile?.headers.headers ?? []) }, timings);
|
|
92
|
-
}
|
|
93
|
-
catch (err) {
|
|
94
|
-
this.pool.remove(poolEntry);
|
|
95
|
-
throw err;
|
|
96
|
-
}
|
|
97
|
-
const connection = response.headers["connection"];
|
|
98
|
-
if (connection?.toLowerCase() === "close") {
|
|
99
|
-
this.pool.remove(poolEntry);
|
|
100
|
-
}
|
|
101
118
|
else {
|
|
102
|
-
|
|
119
|
+
const h1Send = request.stream ? sendH1StreamingRequest : sendH1Request;
|
|
120
|
+
try {
|
|
121
|
+
response = await h1Send(poolEntry.socket, request, { defaultHeaders: sanitizeProfileHeaders(options.profile?.headers.headers ?? []) }, timings);
|
|
122
|
+
}
|
|
123
|
+
catch (err) {
|
|
124
|
+
this.pool.remove(poolEntry);
|
|
125
|
+
throw err;
|
|
126
|
+
}
|
|
127
|
+
const connection = response.headers["connection"];
|
|
128
|
+
if (connection?.toLowerCase() === "close") {
|
|
129
|
+
this.pool.remove(poolEntry);
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
this.pool.release(poolEntry);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
if (useAltSvc) {
|
|
136
|
+
const altSvcHeader = response.headers["alt-svc"];
|
|
137
|
+
if (altSvcHeader) {
|
|
138
|
+
this.altSvcStore.parseHeader(origin, altSvcHeader);
|
|
139
|
+
}
|
|
103
140
|
}
|
|
104
141
|
return response;
|
|
105
142
|
}
|
|
@@ -110,12 +147,42 @@ export class ProtocolNegotiator {
|
|
|
110
147
|
close() {
|
|
111
148
|
this.pool.close();
|
|
112
149
|
}
|
|
150
|
+
/**
|
|
151
|
+
* Returns the HTTPS-RR resolver, or null if not initialized.
|
|
152
|
+
*/
|
|
153
|
+
getHTTPSRRResolver() {
|
|
154
|
+
return this.httpsRRResolver;
|
|
155
|
+
}
|
|
156
|
+
/**
|
|
157
|
+
* Returns the DoH resolver, or null if not initialized.
|
|
158
|
+
*/
|
|
159
|
+
getDoHResolver() {
|
|
160
|
+
return this.dohResolver;
|
|
161
|
+
}
|
|
113
162
|
async connect(url, request, options) {
|
|
114
163
|
const engine = (request.stealth ?? options.stealth) ? this.stealthEngine : this.standardEngine;
|
|
115
164
|
const port = url.port ? parseInt(url.port, 10) : url.protocol === "https:" ? 443 : 80;
|
|
116
165
|
const defaultAlpn = request.httpVersion === "1.1" ? ["http/1.1"] : request.httpVersion === "2" ? ["h2"] : ["h2", "http/1.1"];
|
|
117
166
|
const tcpTimeout = typeof request.timeout === "number" ? request.timeout : request.timeout?.connect;
|
|
118
167
|
const tlsTimeout = typeof request.timeout === "number" ? request.timeout : (request.timeout?.tls ?? request.timeout?.connect);
|
|
168
|
+
let httpsRR = null;
|
|
169
|
+
let echConfigList;
|
|
170
|
+
const echOpts = options.ech ?? request.ech;
|
|
171
|
+
const echEnabled = echOpts?.enabled !== false;
|
|
172
|
+
if (echOpts?.echConfigList) {
|
|
173
|
+
echConfigList = typeof echOpts.echConfigList === "string" ? Buffer.from(echOpts.echConfigList, "base64") : echOpts.echConfigList;
|
|
174
|
+
}
|
|
175
|
+
if (this.httpsRRResolver && url.protocol === "https:" && !request.proxy) {
|
|
176
|
+
try {
|
|
177
|
+
httpsRR = await this.httpsRRResolver.resolve(url.hostname, request.signal);
|
|
178
|
+
}
|
|
179
|
+
catch { }
|
|
180
|
+
if (httpsRR) {
|
|
181
|
+
if (!echConfigList && echEnabled && httpsRR.echConfigList) {
|
|
182
|
+
echConfigList = httpsRR.echConfigList;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
119
186
|
const tlsOptions = {
|
|
120
187
|
host: url.hostname,
|
|
121
188
|
port,
|
|
@@ -125,6 +192,13 @@ export class ProtocolNegotiator {
|
|
|
125
192
|
timeout: tlsTimeout,
|
|
126
193
|
signal: request.signal,
|
|
127
194
|
family: request.dnsFamily,
|
|
195
|
+
cert: options.tls?.cert,
|
|
196
|
+
key: options.tls?.key,
|
|
197
|
+
passphrase: options.tls?.passphrase,
|
|
198
|
+
pfx: options.tls?.pfx,
|
|
199
|
+
ca: options.tls?.ca,
|
|
200
|
+
pinnedPublicKey: options.tls?.pinnedPublicKey,
|
|
201
|
+
echConfigList,
|
|
128
202
|
};
|
|
129
203
|
let dnsTimeMs = 0;
|
|
130
204
|
if (request.proxy) {
|
|
@@ -150,6 +224,7 @@ export class ProtocolNegotiator {
|
|
|
150
224
|
auth: proxyAuth,
|
|
151
225
|
timeout: tcpTimeout,
|
|
152
226
|
family: request.dnsFamily,
|
|
227
|
+
secure: scheme === "https",
|
|
153
228
|
}, url.hostname, port);
|
|
154
229
|
tlsOptions.socket = tunnelSocket;
|
|
155
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"negotiator.js","sourceRoot":"","sources":["../../src/http/negotiator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAoC,MAAM,WAAW,CAAC;AAE7E,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAGvE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"negotiator.js","sourceRoot":"","sources":["../../src/http/negotiator.ts"],"names":[],"mappings":"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"}
|
package/dist/http/pool.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ import type { H2Profile } from "../fingerprints/types.js";
|
|
|
17
17
|
export interface PoolEntry {
|
|
18
18
|
origin: string;
|
|
19
19
|
socket: TLSSocket;
|
|
20
|
-
protocol: "h1" | "h2";
|
|
20
|
+
protocol: "h1" | "h2" | "h3";
|
|
21
21
|
h2Client?: H2Client;
|
|
22
22
|
createdAt: number;
|
|
23
23
|
lastUsed: number;
|
|
@@ -77,7 +77,7 @@ export declare class ConnectionPool {
|
|
|
77
77
|
* @param {Array<[string,string]>} [defaultHeaders] - Default headers applied to every H2 request.
|
|
78
78
|
* @returns {PoolEntry} The newly created pool entry.
|
|
79
79
|
*/
|
|
80
|
-
put(origin: string, socket: TLSSocket, protocol: "h1" | "h2", h2Profile?: H2Profile, defaultHeaders?: Array<[string, string]>): PoolEntry;
|
|
80
|
+
put(origin: string, socket: TLSSocket, protocol: "h1" | "h2" | "h3", h2Profile?: H2Profile, defaultHeaders?: Array<[string, string]>): PoolEntry;
|
|
81
81
|
/**
|
|
82
82
|
* Marks an HTTP/1.1 pool entry as available for reuse once a request has
|
|
83
83
|
* completed. Updates the `lastUsed` timestamp.
|
package/dist/http/pool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/http/pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/http/pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAqB,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;;;;;;GAYG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AASD;;;;;GAKG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAkC;IAC9D,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,YAAY,CAA6C;IAEjE;;;;OAIG;gBACS,OAAO,GAAE,WAAgB;IAQrC;;;;;;;OAOG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAyB1C;;;;;;;;;;;;OAYG;IACH,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,GAAG,IAAI,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,SAAS,EAAE,cAAc,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS;IAsChJ;;;;;OAKG;IACH,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAK/B;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAe9B;;;OAGG;IACH,KAAK,IAAI,IAAI;IAgBb;;;;;OAKG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,SAAS;IAkBjB,OAAO,CAAC,WAAW;CAiBpB"}
|
package/dist/http/pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/http/pool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AA0C1C,MAAM,oBAAoB,GAA0B;IAClD,uBAAuB,EAAE,CAAC;IAC1B,mBAAmB,EAAE,EAAE;IACvB,WAAW,EAAE,MAAM;IACnB,MAAM,EAAE,OAAO;CAChB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,OAAO,cAAc;IACR,OAAO,CAAwB;IAC/B,WAAW,GAAG,IAAI,GAAG,EAAuB,CAAC;IACtD,gBAAgB,GAAG,CAAC,CAAC;IACrB,YAAY,CAA6C;IAEjE;;;;OAIG;IACH,YAAY,UAAuB,EAAE;QACnC,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,oBAAoB,EAAE,GAAG,OAAO,EAAE,CAAC;QACvD,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,GAAG,CAAC,MAAc;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC3D,IAAI,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC;oBAC7B,SAAS;gBACX,CAAC;gBACD,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC;gBACrB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC1E,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,QAAQ,GAAG,GAAG,CAAC;gBACrB,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,GAAG,CAAC,MAAc,EAAE,MAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../src/http/pool.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @module nlcurl
|
|
6
6
|
*/
|
|
7
|
-
export type { HttpMethod, NLcURLRequest, NLcURLSessionConfig, RequestBody, RequestTimings, RetryConfig, TimeoutConfig } from "./core/request.js";
|
|
7
|
+
export type { HttpMethod, NLcURLRequest, NLcURLSessionConfig, RequestBody, RequestTimings, RetryConfig, TimeoutConfig, ProgressEvent, ProgressCallback, ServerSentEvent } from "./core/request.js";
|
|
8
8
|
export { NLcURLResponse } from "./core/response.js";
|
|
9
9
|
export type { ResponseMeta } from "./core/response.js";
|
|
10
10
|
export { NLcURLError, TLSError, HTTPError, TimeoutError, ProxyError, AbortError, ConnectionError, ProtocolError } from "./core/errors.js";
|
|
@@ -17,7 +17,25 @@ export type { RateLimitConfig } from "./middleware/rate-limiter.js";
|
|
|
17
17
|
export type { Logger, LogLevel, LogBindings } from "./utils/logger.js";
|
|
18
18
|
export { ConsoleLogger, SILENT_LOGGER, setDefaultLogger, getDefaultLogger } from "./utils/logger.js";
|
|
19
19
|
export { CookieJar } from "./cookies/jar.js";
|
|
20
|
+
export { isPublicSuffix, getRegistrableDomain } from "./cookies/public-suffix.js";
|
|
21
|
+
export { FormData, type FormFile, type FormValue } from "./http/form-data.js";
|
|
22
|
+
export type { TLSOptions } from "./tls/types.js";
|
|
20
23
|
export { WebSocketClient, type WebSocketOptions, type WebSocketEvents } from "./ws/client.js";
|
|
21
24
|
export { ja3Hash, ja3String } from "./fingerprints/ja3.js";
|
|
22
25
|
export { akamaiFingerprint } from "./fingerprints/akamai.js";
|
|
26
|
+
export { TLSSessionCache, type SessionTicketEntry, type SessionCacheOptions } from "./tls/session-cache.js";
|
|
27
|
+
export { resolveEnvProxy } from "./proxy/env-proxy.js";
|
|
28
|
+
export { SSEParser, parseSSEStream } from "./sse/parser.js";
|
|
29
|
+
export { PerMessageDeflate, type DeflateParams, buildDeflateOffer, parseDeflateResponse } from "./ws/permessage-deflate.js";
|
|
30
|
+
export { isQuicAvailable } from "./http/h3/detection.js";
|
|
31
|
+
export { CacheStore, parseCacheControl } from "./cache/store.js";
|
|
32
|
+
export type { CacheConfig, CacheMode, CacheDirectives, CacheEntry } from "./cache/types.js";
|
|
33
|
+
export { HSTSStore } from "./hsts/store.js";
|
|
34
|
+
export type { HSTSConfig, HSTSEntry, HSTSPreloadEntry } from "./hsts/types.js";
|
|
35
|
+
export { DoHResolver } from "./dns/doh-resolver.js";
|
|
36
|
+
export { HTTPSRRResolver, type HTTPSRRResult } from "./dns/https-rr.js";
|
|
37
|
+
export type { DoHConfig, DNSConfig, DNSRecord, SVCBRecord, ResolvedAddress } from "./dns/types.js";
|
|
38
|
+
export { RTYPE, SvcParamKey } from "./dns/types.js";
|
|
39
|
+
export { AltSvcStore, type AltSvcEntry } from "./http/alt-svc.js";
|
|
40
|
+
export { parseECHConfigList, generateGreaseECH, type ECHConfig, type ECHParameters, type ECHOptions } from "./tls/ech.js";
|
|
23
41
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -5,7 +5,21 @@ export { createSession, request, get, post, put, patch, del, head } from "./core
|
|
|
5
5
|
export { getProfile, listProfiles, DEFAULT_PROFILE } from "./fingerprints/database.js";
|
|
6
6
|
export { ConsoleLogger, SILENT_LOGGER, setDefaultLogger, getDefaultLogger } from "./utils/logger.js";
|
|
7
7
|
export { CookieJar } from "./cookies/jar.js";
|
|
8
|
+
export { isPublicSuffix, getRegistrableDomain } from "./cookies/public-suffix.js";
|
|
9
|
+
export { FormData } from "./http/form-data.js";
|
|
8
10
|
export { WebSocketClient } from "./ws/client.js";
|
|
9
11
|
export { ja3Hash, ja3String } from "./fingerprints/ja3.js";
|
|
10
12
|
export { akamaiFingerprint } from "./fingerprints/akamai.js";
|
|
13
|
+
export { TLSSessionCache } from "./tls/session-cache.js";
|
|
14
|
+
export { resolveEnvProxy } from "./proxy/env-proxy.js";
|
|
15
|
+
export { SSEParser, parseSSEStream } from "./sse/parser.js";
|
|
16
|
+
export { PerMessageDeflate, buildDeflateOffer, parseDeflateResponse } from "./ws/permessage-deflate.js";
|
|
17
|
+
export { isQuicAvailable } from "./http/h3/detection.js";
|
|
18
|
+
export { CacheStore, parseCacheControl } from "./cache/store.js";
|
|
19
|
+
export { HSTSStore } from "./hsts/store.js";
|
|
20
|
+
export { DoHResolver } from "./dns/doh-resolver.js";
|
|
21
|
+
export { HTTPSRRResolver } from "./dns/https-rr.js";
|
|
22
|
+
export { RTYPE, SvcParamKey } from "./dns/types.js";
|
|
23
|
+
export { AltSvcStore } from "./http/alt-svc.js";
|
|
24
|
+
export { parseECHConfigList, generateGreaseECH } from "./tls/ech.js";
|
|
11
25
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE1I,OAAO,EAAE,aAAa,EAAuB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE5F,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AASvF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE1I,OAAO,EAAE,aAAa,EAAuB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE5F,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AASvF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErG,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAElF,OAAO,EAAE,QAAQ,EAAiC,MAAM,qBAAqB,CAAC;AAI9E,OAAO,EAAE,eAAe,EAA+C,MAAM,gBAAgB,CAAC;AAE9F,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAqD,MAAM,wBAAwB,CAAC;AAE5G,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAsB,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAE5H,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGjE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAsB,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAoB,MAAM,mBAAmB,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAuD,MAAM,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAyB;IAE1C;;;;OAIG;gBACS,MAAM,EAAE,eAAe;IAQnC;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B,OAAO,CAAC,KAAK;IAeb,OAAO,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAyB;IAE1C;;;;OAIG;gBACS,MAAM,EAAE,eAAe;IAQnC;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B,OAAO,CAAC,KAAK;IAeb,OAAO,CAAC,MAAM;CAYf"}
|
|
@@ -57,6 +57,10 @@ export class RateLimiter {
|
|
|
57
57
|
refill() {
|
|
58
58
|
const now = Date.now();
|
|
59
59
|
const elapsed = now - this.lastRefill;
|
|
60
|
+
if (elapsed < 0) {
|
|
61
|
+
this.lastRefill = now;
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
60
64
|
if (elapsed >= this.windowMs) {
|
|
61
65
|
this.tokens = this.maxRequests;
|
|
62
66
|
this.lastRefill = now;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAchE;;;;GAIG;AACH,MAAM,OAAO,WAAW;IACL,WAAW,CAAS;IACpB,QAAQ,CAAS;IAC1B,MAAM,CAAS;IACf,UAAU,CAAS;IACnB,SAAS,GAAsB,EAAE,CAAC;IAE1C;;;;OAIG;IACH,YAAY,MAAuB;QACjC,uBAAuB,CAAC,MAA4C,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;YACpD,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK;QACX,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAG,CAAC;YACrC,IAAI,EAAE,CAAC;QACT,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;YACpD,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,MAAM;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACxB,CAAC;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../src/middleware/rate-limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAchE;;;;GAIG;AACH,MAAM,OAAO,WAAW;IACL,WAAW,CAAS;IACpB,QAAQ,CAAS;IAC1B,MAAM,CAAS;IACf,UAAU,CAAS;IACnB,SAAS,GAAsB,EAAE,CAAC;IAE1C;;;;OAIG;IACH,YAAY,MAAuB;QACjC,uBAAuB,CAAC,MAA4C,CAAC,CAAC;QACtE,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;YACpD,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK;QACX,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAG,CAAC;YACrC,IAAI,EAAE,CAAC;QACT,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC;YACpD,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEO,MAAM;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;YACtB,OAAO;QACT,CAAC;QACD,IAAI,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACxB,CAAC;IACH,CAAC;CACF"}
|
package/dist/middleware/retry.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AbortError, TLSError, TimeoutError, ConnectionError, ProtocolError } from "../core/errors.js";
|
|
2
2
|
import { getDefaultLogger } from "../utils/logger.js";
|
|
3
|
-
const RETRYABLE_H2_ERROR_CODES = new Set([1, 2, 7, 11]);
|
|
3
|
+
const RETRYABLE_H2_ERROR_CODES = new Set([1, 2, 7, 8, 11, 13]);
|
|
4
4
|
function shouldRetryDefault(error, statusCode) {
|
|
5
5
|
if (error instanceof ConnectionError || error instanceof TimeoutError || error instanceof TLSError)
|
|
6
6
|
return true;
|
|
@@ -33,7 +33,7 @@ export async function withRetry(config, execute, logger) {
|
|
|
33
33
|
let lastResponse;
|
|
34
34
|
for (let attempt = 0; attempt <= count; attempt++) {
|
|
35
35
|
if (attempt > 0) {
|
|
36
|
-
const factor = backoff === "exponential" ? Math.pow(2, attempt - 1) : attempt;
|
|
36
|
+
const factor = backoff === "exponential" ? Math.min(32, Math.pow(2, attempt - 1)) : attempt;
|
|
37
37
|
const delay = baseDelay * factor;
|
|
38
38
|
const jitter = Math.random() * jitterMax;
|
|
39
39
|
log.debug(`retry attempt ${attempt}/${count} after ${Math.round(delay + jitter)}ms`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/middleware/retry.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvG,OAAO,EAAe,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEnE,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/middleware/retry.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolves proxy configuration from standard environment variables
|
|
3
|
+
* (`HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY` and their lowercase variants).
|
|
4
|
+
* Follows the same conventions as curl, got, axios, and undici.
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Resolves a proxy URL from environment variables for the given request URL.
|
|
8
|
+
* Returns `undefined` if no proxy should be used (either not configured or
|
|
9
|
+
* the host is in the `NO_PROXY` bypass list).
|
|
10
|
+
*
|
|
11
|
+
* Precedence (same as curl):
|
|
12
|
+
* 1. `no_proxy` / `NO_PROXY` to skip proxy for matching hosts.
|
|
13
|
+
* 2. `https_proxy` / `HTTPS_PROXY` for HTTPS URLs.
|
|
14
|
+
* 3. `http_proxy` / `HTTP_PROXY` for HTTP URLs.
|
|
15
|
+
* 4. `all_proxy` / `ALL_PROXY` as a fallback for either protocol.
|
|
16
|
+
*
|
|
17
|
+
* @param {string} url - The target request URL.
|
|
18
|
+
* @returns {string | undefined} Proxy URL, or `undefined` if no proxy applies.
|
|
19
|
+
*/
|
|
20
|
+
export declare function resolveEnvProxy(url: string): string | undefined;
|
|
21
|
+
//# sourceMappingURL=env-proxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/env-proxy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA4BH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA2B/D"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolves proxy configuration from standard environment variables
|
|
3
|
+
* (`HTTP_PROXY`, `HTTPS_PROXY`, `NO_PROXY` and their lowercase variants).
|
|
4
|
+
* Follows the same conventions as curl, got, axios, and undici.
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Checks whether the given hostname should bypass the proxy according to the
|
|
8
|
+
* `NO_PROXY` / `no_proxy` environment variable.
|
|
9
|
+
*
|
|
10
|
+
* @param {string} hostname - The target hostname to check.
|
|
11
|
+
* @param {string} noProxy - Comma-separated list of hosts/domains/CIDRs to bypass.
|
|
12
|
+
* @returns {boolean} `true` if the hostname matches a bypass pattern.
|
|
13
|
+
*/
|
|
14
|
+
function matchesNoProxy(hostname, noProxy) {
|
|
15
|
+
if (noProxy === "*")
|
|
16
|
+
return true;
|
|
17
|
+
const host = hostname.toLowerCase();
|
|
18
|
+
const entries = noProxy
|
|
19
|
+
.split(",")
|
|
20
|
+
.map((e) => e.trim().toLowerCase())
|
|
21
|
+
.filter(Boolean);
|
|
22
|
+
for (const entry of entries) {
|
|
23
|
+
if (entry === host)
|
|
24
|
+
return true;
|
|
25
|
+
if (entry.startsWith(".") && (host.endsWith(entry) || host === entry.slice(1)))
|
|
26
|
+
return true;
|
|
27
|
+
if (host === entry || host.endsWith("." + entry))
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Resolves a proxy URL from environment variables for the given request URL.
|
|
34
|
+
* Returns `undefined` if no proxy should be used (either not configured or
|
|
35
|
+
* the host is in the `NO_PROXY` bypass list).
|
|
36
|
+
*
|
|
37
|
+
* Precedence (same as curl):
|
|
38
|
+
* 1. `no_proxy` / `NO_PROXY` to skip proxy for matching hosts.
|
|
39
|
+
* 2. `https_proxy` / `HTTPS_PROXY` for HTTPS URLs.
|
|
40
|
+
* 3. `http_proxy` / `HTTP_PROXY` for HTTP URLs.
|
|
41
|
+
* 4. `all_proxy` / `ALL_PROXY` as a fallback for either protocol.
|
|
42
|
+
*
|
|
43
|
+
* @param {string} url - The target request URL.
|
|
44
|
+
* @returns {string | undefined} Proxy URL, or `undefined` if no proxy applies.
|
|
45
|
+
*/
|
|
46
|
+
export function resolveEnvProxy(url) {
|
|
47
|
+
let parsed;
|
|
48
|
+
try {
|
|
49
|
+
parsed = new URL(url);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
const noProxy = process.env["no_proxy"] ?? process.env["NO_PROXY"] ?? "";
|
|
55
|
+
if (noProxy && matchesNoProxy(parsed.hostname, noProxy)) {
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
const isHttps = parsed.protocol === "https:" || parsed.protocol === "wss:";
|
|
59
|
+
if (isHttps) {
|
|
60
|
+
const proxy = process.env["https_proxy"] ?? process.env["HTTPS_PROXY"];
|
|
61
|
+
if (proxy)
|
|
62
|
+
return proxy;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
const proxy = process.env["http_proxy"] ?? process.env["HTTP_PROXY"];
|
|
66
|
+
if (proxy)
|
|
67
|
+
return proxy;
|
|
68
|
+
}
|
|
69
|
+
const allProxy = process.env["all_proxy"] ?? process.env["ALL_PROXY"];
|
|
70
|
+
if (allProxy)
|
|
71
|
+
return allProxy;
|
|
72
|
+
return undefined;
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=env-proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-proxy.js","sourceRoot":"","sources":["../../src/proxy/env-proxy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;GAOG;AACH,SAAS,cAAc,CAAC,QAAgB,EAAE,OAAe;IACvD,IAAI,OAAO,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,IAAI,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,OAAO;SACpB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;SAClC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAChC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAC5F,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IACzE,IAAI,OAAO,IAAI,cAAc,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,MAAM,CAAC;IAE3E,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACvE,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;IAC1B,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACrE,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;IAC1B,CAAC;IAED,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACtE,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -15,6 +15,8 @@ export interface HttpProxyOptions {
|
|
|
15
15
|
auth?: string;
|
|
16
16
|
timeout?: number;
|
|
17
17
|
family?: 4 | 6;
|
|
18
|
+
/** When `true`, connects to the proxy over TLS (HTTPS proxy). */
|
|
19
|
+
secure?: boolean;
|
|
18
20
|
}
|
|
19
21
|
/**
|
|
20
22
|
* Opens a TCP connection to an HTTP CONNECT proxy and tunnels through it to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/http-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"http-proxy.d.ts","sourceRoot":"","sources":["../../src/proxy/http-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAIhC;;;;;;;;;GASG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACf,iEAAiE;IACjE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CA0G3H"}
|