@redocly/cli 2.7.0 → 2.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/respect/connection-client.d.ts +9 -0
- package/lib/commands/respect/connection-client.d.ts.map +1 -0
- package/lib/commands/respect/connection-client.js +62 -0
- package/lib/commands/respect/connection-client.js.map +1 -0
- package/lib/commands/respect/index.js +2 -2
- package/lib/commands/respect/index.js.map +1 -1
- package/lib/commands/respect/mtls/resolve-mtls-certificates.d.ts +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 +4 -1
- package/lib/utils/proxy-agent.js.map +1 -1
- package/package.json +3 -3
- package/lib/commands/respect/mtls/create-mtls-client.d.ts +0 -9
- package/lib/commands/respect/mtls/create-mtls-client.d.ts.map +0 -1
- package/lib/commands/respect/mtls/create-mtls-client.js +0 -32
- package/lib/commands/respect/mtls/create-mtls-client.js.map +0 -1
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Client, ProxyAgent, fetch } from 'undici';
|
|
2
|
+
export type MtlsCerts = {
|
|
3
|
+
clientCert?: string;
|
|
4
|
+
clientKey?: string;
|
|
5
|
+
caCert?: string;
|
|
6
|
+
};
|
|
7
|
+
export declare function createNetworkDispatcher(parsedPathToFetch: string, mtlsCerts?: MtlsCerts): ProxyAgent | Client | undefined;
|
|
8
|
+
export declare function withConnectionClient(mtlsCerts?: MtlsCerts): typeof fetch;
|
|
9
|
+
//# sourceMappingURL=connection-client.d.ts.map
|
|
@@ -0,0 +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;AAGvF,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,wBAAgB,uBAAuB,CAAC,iBAAiB,EAAE,MAAM,EAAE,SAAS,GAAE,SAAc,mCAwC3F;AAED,wBAAgB,oBAAoB,CAAC,SAAS,GAAE,SAAc,gBA0B7D"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { Client, ProxyAgent, fetch } from 'undici';
|
|
2
|
+
import { getProxyUrl } from '../../utils/proxy-agent.js';
|
|
3
|
+
export function createNetworkDispatcher(parsedPathToFetch, mtlsCerts = {}) {
|
|
4
|
+
const { clientCert, clientKey, caCert } = mtlsCerts;
|
|
5
|
+
const baseUrl = new URL(parsedPathToFetch).origin;
|
|
6
|
+
const proxyUrl = getProxyUrl();
|
|
7
|
+
// Both mTLS and proxy
|
|
8
|
+
if (clientCert && clientKey && proxyUrl) {
|
|
9
|
+
return new ProxyAgent({
|
|
10
|
+
uri: proxyUrl,
|
|
11
|
+
connect: {
|
|
12
|
+
key: Buffer.from(clientKey),
|
|
13
|
+
cert: Buffer.from(clientCert),
|
|
14
|
+
...(caCert && { ca: Buffer.from(caCert) }),
|
|
15
|
+
// Keeping this `false` to have the ability to call different servers in one Arazzo file
|
|
16
|
+
// some of them might not require mTLS.
|
|
17
|
+
rejectUnauthorized: false,
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
// Only mTLS
|
|
22
|
+
if (clientCert && clientKey) {
|
|
23
|
+
return new Client(baseUrl, {
|
|
24
|
+
connect: {
|
|
25
|
+
key: Buffer.from(clientKey),
|
|
26
|
+
cert: Buffer.from(clientCert),
|
|
27
|
+
...(caCert && { ca: Buffer.from(caCert) }),
|
|
28
|
+
// Keeping this `false` to have the ability to call different servers in one Arazzo file
|
|
29
|
+
// some of them might not require mTLS.
|
|
30
|
+
rejectUnauthorized: false,
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
// Only proxy
|
|
35
|
+
if (proxyUrl) {
|
|
36
|
+
return new ProxyAgent({ uri: proxyUrl });
|
|
37
|
+
}
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
export function withConnectionClient(mtlsCerts = {}) {
|
|
41
|
+
const proxyUrl = getProxyUrl();
|
|
42
|
+
if (!mtlsCerts && !proxyUrl) {
|
|
43
|
+
return fetch;
|
|
44
|
+
}
|
|
45
|
+
return (input, init) => {
|
|
46
|
+
const url = typeof input === 'string'
|
|
47
|
+
? input
|
|
48
|
+
: input instanceof URL
|
|
49
|
+
? input.toString()
|
|
50
|
+
: 'url' in input
|
|
51
|
+
? input.url
|
|
52
|
+
: undefined;
|
|
53
|
+
if (!url) {
|
|
54
|
+
throw new Error('Invalid input URL');
|
|
55
|
+
}
|
|
56
|
+
return fetch(input, {
|
|
57
|
+
...init,
|
|
58
|
+
dispatcher: createNetworkDispatcher(url, mtlsCerts) || init?.dispatcher,
|
|
59
|
+
});
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=connection-client.js.map
|
|
@@ -0,0 +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;AACvF,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAQzD,MAAM,UAAU,uBAAuB,CAAC,iBAAyB,EAAE,YAAuB,EAAE;IAC1F,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;IAClD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,sBAAsB;IACtB,IAAI,UAAU,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;QACxC,OAAO,IAAI,UAAU,CAAC;YACpB,GAAG,EAAE,QAAQ;YACb,OAAO,EAAE;gBACP,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,wFAAwF;gBACxF,uCAAuC;gBACvC,kBAAkB,EAAE,KAAK;aAC1B;SACF,CAAC,CAAC;IACL,CAAC;IAED,YAAY;IACZ,IAAI,UAAU,IAAI,SAAS,EAAE,CAAC;QAC5B,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE;gBACP,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,wFAAwF;gBACxF,uCAAuC;gBACvC,kBAAkB,EAAE,KAAK;aAC1B;SACF,CAAC,CAAC;IACL,CAAC;IAED,aAAa;IACb,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,IAAI,UAAU,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,YAAuB,EAAE;IAC5D,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,IAAI,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CAAC,KAAkB,EAAE,IAAkB,EAAE,EAAE;QAChD,MAAM,GAAG,GACP,OAAO,KAAK,KAAK,QAAQ;YACvB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,KAAK,YAAY,GAAG;gBACtB,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE;gBAClB,CAAC,CAAC,KAAK,IAAI,KAAK;oBAChB,CAAC,CAAC,KAAK,CAAC,GAAG;oBACX,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,EAAE;YAClB,GAAG,IAAI;YACP,UAAU,EAAE,uBAAuB,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,IAAI,EAAE,UAAU;SACxE,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { composeJsonLogsFiles } from './json-logs.js';
|
|
|
6
6
|
import { displayFilesSummaryTable } from './display-files-summary-table.js';
|
|
7
7
|
import { readEnvVariables } from '../../utils/read-env-variables.js';
|
|
8
8
|
import { resolveMtlsCertificates } from './mtls/resolve-mtls-certificates.js';
|
|
9
|
-
import {
|
|
9
|
+
import { withConnectionClient } from './connection-client.js';
|
|
10
10
|
import { withHar } from './har-logs/index.js';
|
|
11
11
|
import { createHarLog } from './har-logs/har-logs.js';
|
|
12
12
|
import { jsonStringifyWithArrayBuffer } from '../../utils/json-stringify-with-array-buffer.js';
|
|
@@ -26,7 +26,7 @@ export async function handleRespect({ argv, config, version, collectSpecData, })
|
|
|
26
26
|
}, workingDir)
|
|
27
27
|
: undefined;
|
|
28
28
|
}
|
|
29
|
-
let customFetch =
|
|
29
|
+
let customFetch = withConnectionClient(mtlsCerts);
|
|
30
30
|
if (argv['har-output']) {
|
|
31
31
|
harLogs = createHarLog({ version });
|
|
32
32
|
customFetch = withHar(customFetch, { har: harLogs });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/respect/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/respect/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { MtlsCerts } from '
|
|
1
|
+
import type { MtlsCerts } from '../connection-client.js';
|
|
2
2
|
export declare function resolveMtlsCertificates(mtlsCertificates: Partial<MtlsCerts> | undefined, workingDir: string): {
|
|
3
3
|
clientCert: string | undefined;
|
|
4
4
|
clientKey: string | undefined;
|
|
@@ -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,aAAa,wCAG5B"}
|
|
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,CAEhD;AAED,wBAAgB,aAAa,wCAG5B"}
|
package/lib/utils/proxy-agent.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
2
|
+
export function getProxyUrl() {
|
|
3
|
+
return process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
|
|
4
|
+
}
|
|
2
5
|
export function getProxyAgent() {
|
|
3
|
-
const proxy =
|
|
6
|
+
const proxy = getProxyUrl();
|
|
4
7
|
return proxy ? new HttpsProxyAgent(proxy) : undefined;
|
|
5
8
|
}
|
|
6
9
|
//# 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,
|
|
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,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AAC3D,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/cli",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.1",
|
|
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.7.
|
|
46
|
-
"@redocly/respect-core": "2.7.
|
|
45
|
+
"@redocly/openapi-core": "2.7.1",
|
|
46
|
+
"@redocly/respect-core": "2.7.1",
|
|
47
47
|
"abort-controller": "^3.0.0",
|
|
48
48
|
"chokidar": "^3.5.1",
|
|
49
49
|
"colorette": "^1.2.0",
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { Client, fetch } from 'undici';
|
|
2
|
-
export type MtlsCerts = {
|
|
3
|
-
clientCert?: string;
|
|
4
|
-
clientKey?: string;
|
|
5
|
-
caCert?: string;
|
|
6
|
-
};
|
|
7
|
-
export declare function createMtlsClient(parsedPathToFetch: string, mtlsCerts?: MtlsCerts): Client | undefined;
|
|
8
|
-
export declare function withMtlsClientIfNeeded(mtlsCerts?: MtlsCerts): typeof fetch;
|
|
9
|
-
//# sourceMappingURL=create-mtls-client.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create-mtls-client.d.ts","sourceRoot":"","sources":["../../../../src/commands/respect/mtls/create-mtls-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsC,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE3E,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,wBAAgB,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,SAAS,GAAE,SAAc,sBAiBpF;AAED,wBAAgB,sBAAsB,CAAC,SAAS,GAAE,SAAc,gBAa/D"}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
import { Client, fetch } from 'undici';
|
|
2
|
-
export function createMtlsClient(parsedPathToFetch, mtlsCerts = {}) {
|
|
3
|
-
const { clientCert, clientKey, caCert } = mtlsCerts;
|
|
4
|
-
const baseUrl = new URL(parsedPathToFetch).origin;
|
|
5
|
-
if (clientCert && clientKey) {
|
|
6
|
-
return new Client(baseUrl, {
|
|
7
|
-
connect: {
|
|
8
|
-
key: Buffer.from(clientKey),
|
|
9
|
-
cert: Buffer.from(clientCert),
|
|
10
|
-
...(caCert && { ca: Buffer.from(caCert) }),
|
|
11
|
-
// Keeping this `false` to have the ability to call different servers in one Arazzo file
|
|
12
|
-
// some of them might not require mTLS.
|
|
13
|
-
rejectUnauthorized: false,
|
|
14
|
-
},
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
return undefined;
|
|
18
|
-
}
|
|
19
|
-
export function withMtlsClientIfNeeded(mtlsCerts = {}) {
|
|
20
|
-
if (!mtlsCerts) {
|
|
21
|
-
return fetch;
|
|
22
|
-
}
|
|
23
|
-
return function fetchWithMtls(input, init) {
|
|
24
|
-
const url = typeof input === 'string' ? input : 'url' in input ? input.url : input.toString();
|
|
25
|
-
const client = createMtlsClient(url, mtlsCerts);
|
|
26
|
-
return fetch(input, {
|
|
27
|
-
...init,
|
|
28
|
-
dispatcher: client,
|
|
29
|
-
});
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
//# sourceMappingURL=create-mtls-client.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"create-mtls-client.js","sourceRoot":"","sources":["../../../../src/commands/respect/mtls/create-mtls-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAsC,KAAK,EAAE,MAAM,QAAQ,CAAC;AAQ3E,MAAM,UAAU,gBAAgB,CAAC,iBAAyB,EAAE,YAAuB,EAAE;IACnF,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;IAElD,IAAI,UAAU,IAAI,SAAS,EAAE,CAAC;QAC5B,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE;YACzB,OAAO,EAAE;gBACP,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;gBAC3B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC7B,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1C,wFAAwF;gBACxF,uCAAuC;gBACvC,kBAAkB,EAAE,KAAK;aAC1B;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,YAAuB,EAAE;IAC9D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,SAAS,aAAa,CAAC,KAAiC,EAAE,IAAkB;QACjF,MAAM,GAAG,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC9F,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAChD,OAAO,KAAK,CAAC,KAAK,EAAE;YAClB,GAAG,IAAI;YACP,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|