@redocly/cli 2.20.4 → 2.21.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/lib/commands/respect/connection-client.d.ts.map +1 -1
- package/lib/commands/respect/connection-client.js +4 -3
- package/lib/commands/respect/connection-client.js.map +1 -1
- package/lib/utils/fetch-with-timeout.d.ts.map +1 -1
- package/lib/utils/fetch-with-timeout.js +3 -2
- package/lib/utils/fetch-with-timeout.js.map +1 -1
- package/lib/utils/proxy-agent.d.ts +1 -0
- package/lib/utils/proxy-agent.d.ts.map +1 -1
- package/lib/utils/proxy-agent.js +33 -1
- package/lib/utils/proxy-agent.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-client.d.ts","sourceRoot":"","sources":["../../../src/commands/respect/connection-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAsC,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIvF,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,SAAS,GAAE,SAAc,
|
|
1
|
+
{"version":3,"file":"connection-client.d.ts","sourceRoot":"","sources":["../../../src/commands/respect/connection-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAsC,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIvF,MAAM,MAAM,SAAS,GAAG;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,SAAS,GAAE,SAAc,mCAqC3F;AAED,wBAAgB,oBAAoB,CAAC,cAAc,CAAC,EAAE,kBAAkB,gBAuCvE"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Client, ProxyAgent, fetch } from 'undici';
|
|
2
|
-
import { getProxyUrl } from '../../utils/proxy-agent.js';
|
|
2
|
+
import { getProxyUrl, shouldBypassProxy } from '../../utils/proxy-agent.js';
|
|
3
3
|
export function createNetworkDispatcher(parsedPathToFetch, mtlsCerts = {}) {
|
|
4
4
|
const { clientCert, clientKey, caCert } = mtlsCerts;
|
|
5
5
|
const baseUrl = new URL(parsedPathToFetch).origin;
|
|
6
6
|
const proxyUrl = getProxyUrl();
|
|
7
|
+
const useProxy = proxyUrl && !shouldBypassProxy(parsedPathToFetch);
|
|
7
8
|
// Both mTLS and proxy
|
|
8
|
-
if (clientCert && clientKey &&
|
|
9
|
+
if (clientCert && clientKey && useProxy) {
|
|
9
10
|
return new ProxyAgent({
|
|
10
11
|
uri: proxyUrl,
|
|
11
12
|
connect: {
|
|
@@ -28,7 +29,7 @@ export function createNetworkDispatcher(parsedPathToFetch, mtlsCerts = {}) {
|
|
|
28
29
|
});
|
|
29
30
|
}
|
|
30
31
|
// Only proxy
|
|
31
|
-
if (
|
|
32
|
+
if (useProxy) {
|
|
32
33
|
return new ProxyAgent({ uri: proxyUrl });
|
|
33
34
|
}
|
|
34
35
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-client.js","sourceRoot":"","sources":["../../../src/commands/respect/connection-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAsC,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEvF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"connection-client.js","sourceRoot":"","sources":["../../../src/commands/respect/connection-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-with-timeout.d.ts","sourceRoot":"","sources":["../../src/utils/fetch-with-timeout.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,uBAAuB,GAAG,WAAW,GAAG;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;yBAEoB,KAAK,MAAM,EAAE,0BAAyB,uBAA4B;AAAxF,
|
|
1
|
+
{"version":3,"file":"fetch-with-timeout.d.ts","sourceRoot":"","sources":["../../src/utils/fetch-with-timeout.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,uBAAuB,GAAG,WAAW,GAAG;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;yBAEoB,KAAK,MAAM,EAAE,0BAAyB,uBAA4B;AAAxF,wBAuBE"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Agent, ProxyAgent } from 'undici';
|
|
2
|
-
import { getProxyUrl } from './proxy-agent.js';
|
|
2
|
+
import { getProxyUrl, shouldBypassProxy } from './proxy-agent.js';
|
|
3
3
|
export default async (url, { timeout, ...options } = {}) => {
|
|
4
4
|
const proxyUrl = getProxyUrl();
|
|
5
|
+
const useProxy = proxyUrl && !shouldBypassProxy(url);
|
|
5
6
|
let dispatcher;
|
|
6
7
|
const connectOptions = timeout ? { connect: { timeout } } : {};
|
|
7
|
-
if (
|
|
8
|
+
if (useProxy) {
|
|
8
9
|
dispatcher = new ProxyAgent({
|
|
9
10
|
uri: proxyUrl,
|
|
10
11
|
...connectOptions,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-with-timeout.js","sourceRoot":"","sources":["../../src/utils/fetch-with-timeout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch-with-timeout.js","sourceRoot":"","sources":["../../src/utils/fetch-with-timeout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAMlE,eAAe,KAAK,EAAE,GAAW,EAAE,EAAE,OAAO,EAAE,GAAG,OAAO,KAA8B,EAAE,EAAE,EAAE;IAC1F,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,QAAQ,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACrD,IAAI,UAA0C,CAAC;IAE/C,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/D,IAAI,QAAQ,EAAE,CAAC;QACb,UAAU,GAAG,IAAI,UAAU,CAAC;YAC1B,GAAG,EAAE,QAAQ;YACb,GAAG,cAAc;SAClB,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,OAAO,EAAE,CAAC;QACnB,UAAU,GAAG,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC3B,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS;QAC1D,GAAG,OAAO;QACV,UAAU;KACI,CAAC,CAAC;IAElB,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
2
2
|
export declare function getProxyUrl(): string | undefined;
|
|
3
3
|
export declare function getProxyAgent(): HttpsProxyAgent<string> | undefined;
|
|
4
|
+
export declare function shouldBypassProxy(url: string): boolean;
|
|
4
5
|
//# sourceMappingURL=proxy-agent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-agent.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,wBAAgB,WAAW,IAAI,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"proxy-agent.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,wBAAgB,WAAW,IAAI,MAAM,GAAG,SAAS,CAOhD;AAED,wBAAgB,aAAa,wCAG5B;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAwBtD"}
|
package/lib/utils/proxy-agent.js
CHANGED
|
@@ -1,9 +1,41 @@
|
|
|
1
1
|
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
2
2
|
export function getProxyUrl() {
|
|
3
|
-
return process.env.HTTPS_PROXY ||
|
|
3
|
+
return (process.env.HTTPS_PROXY ||
|
|
4
|
+
process.env.HTTP_PROXY ||
|
|
5
|
+
process.env.http_proxy ||
|
|
6
|
+
process.env.https_proxy);
|
|
4
7
|
}
|
|
5
8
|
export function getProxyAgent() {
|
|
6
9
|
const proxy = getProxyUrl();
|
|
7
10
|
return proxy ? new HttpsProxyAgent(proxy) : undefined;
|
|
8
11
|
}
|
|
12
|
+
export function shouldBypassProxy(url) {
|
|
13
|
+
const noProxy = process.env.NO_PROXY || process.env.no_proxy;
|
|
14
|
+
if (!noProxy)
|
|
15
|
+
return false;
|
|
16
|
+
const entries = noProxy
|
|
17
|
+
.split(',')
|
|
18
|
+
.map((s) => s.trim().toLowerCase())
|
|
19
|
+
.filter(Boolean);
|
|
20
|
+
if (entries.length === 0)
|
|
21
|
+
return false;
|
|
22
|
+
let hostname;
|
|
23
|
+
try {
|
|
24
|
+
hostname = new URL(url).hostname.toLowerCase();
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
return entries.some((entry) => {
|
|
30
|
+
if (entry === '*')
|
|
31
|
+
return true;
|
|
32
|
+
if (hostname === entry)
|
|
33
|
+
return true;
|
|
34
|
+
if (entry.startsWith('.') && hostname.endsWith(entry))
|
|
35
|
+
return true;
|
|
36
|
+
if (!entry.startsWith('.') && hostname.endsWith('.' + entry))
|
|
37
|
+
return true;
|
|
38
|
+
return false;
|
|
39
|
+
});
|
|
40
|
+
}
|
|
9
41
|
//# sourceMappingURL=proxy-agent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-agent.js","sourceRoot":"","sources":["../../src/utils/proxy-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,WAAW;IACzB,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"proxy-agent.js","sourceRoot":"","sources":["../../src/utils/proxy-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,UAAU,WAAW;IACzB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,WAAW,CACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;IAC5B,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC7D,IAAI,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAE3B,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;IACnB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAEvC,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5B,IAAI,KAAK,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QAC/B,IAAI,QAAQ,KAAK,KAAK;YAAE,OAAO,IAAI,CAAC;QACpC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACnE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC1E,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.21.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"bin": {
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"@opentelemetry/resources": "2.0.1",
|
|
43
43
|
"@opentelemetry/sdk-trace-node": "2.0.1",
|
|
44
44
|
"@opentelemetry/semantic-conventions": "1.34.0",
|
|
45
|
-
"@redocly/openapi-core": "2.
|
|
46
|
-
"@redocly/respect-core": "2.
|
|
45
|
+
"@redocly/openapi-core": "2.21.0",
|
|
46
|
+
"@redocly/respect-core": "2.21.0",
|
|
47
47
|
"abort-controller": "^3.0.0",
|
|
48
48
|
"ajv": "npm:@redocly/ajv@8.18.0",
|
|
49
49
|
"ajv-formats": "^3.0.1",
|