@cratis/chronicle 6.64.0 → 6.65.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.
Files changed (47) hide show
  1. package/README.md +1 -1
  2. package/connection/ChronicleConnection.ts +17 -7
  3. package/connection/ChronicleConnectionString.spec.ts +85 -0
  4. package/connection/ChronicleConnectionString.ts +186 -12
  5. package/connection/ChronicleTlsMaterial.spec.ts +160 -0
  6. package/connection/ChronicleTlsMaterial.ts +121 -0
  7. package/connection/CompatibilityPreflight.ts +9 -1
  8. package/connection/LeastConnectionsLoadBalancerStrategy.ts +4 -2
  9. package/connection/LoadBalancerStrategyFactory.ts +7 -2
  10. package/connection/TokenProvider.ts +4 -1
  11. package/connection/fetchOAuthAccessToken.ts +4 -2
  12. package/connection/for_CompatibilityPreflight/when_verifying/with_the_check_skipped.spec.ts +23 -0
  13. package/dist/connection/ChronicleConnection.d.ts +1 -0
  14. package/dist/connection/ChronicleConnection.d.ts.map +1 -1
  15. package/dist/connection/ChronicleConnection.js +15 -7
  16. package/dist/connection/ChronicleConnection.js.map +1 -1
  17. package/dist/connection/ChronicleConnectionString.d.ts +50 -1
  18. package/dist/connection/ChronicleConnectionString.d.ts.map +1 -1
  19. package/dist/connection/ChronicleConnectionString.js +154 -12
  20. package/dist/connection/ChronicleConnectionString.js.map +1 -1
  21. package/dist/connection/ChronicleTlsMaterial.d.ts +54 -0
  22. package/dist/connection/ChronicleTlsMaterial.d.ts.map +1 -0
  23. package/dist/connection/ChronicleTlsMaterial.js +88 -0
  24. package/dist/connection/ChronicleTlsMaterial.js.map +1 -0
  25. package/dist/connection/CompatibilityPreflight.d.ts +2 -1
  26. package/dist/connection/CompatibilityPreflight.d.ts.map +1 -1
  27. package/dist/connection/CompatibilityPreflight.js +6 -1
  28. package/dist/connection/CompatibilityPreflight.js.map +1 -1
  29. package/dist/connection/LeastConnectionsLoadBalancerStrategy.d.ts +2 -1
  30. package/dist/connection/LeastConnectionsLoadBalancerStrategy.d.ts.map +1 -1
  31. package/dist/connection/LeastConnectionsLoadBalancerStrategy.js +3 -2
  32. package/dist/connection/LeastConnectionsLoadBalancerStrategy.js.map +1 -1
  33. package/dist/connection/LoadBalancerStrategyFactory.d.ts +2 -1
  34. package/dist/connection/LoadBalancerStrategyFactory.d.ts.map +1 -1
  35. package/dist/connection/LoadBalancerStrategyFactory.js +3 -2
  36. package/dist/connection/LoadBalancerStrategyFactory.js.map +1 -1
  37. package/dist/connection/TokenProvider.d.ts +4 -1
  38. package/dist/connection/TokenProvider.d.ts.map +1 -1
  39. package/dist/connection/TokenProvider.js +5 -1
  40. package/dist/connection/TokenProvider.js.map +1 -1
  41. package/dist/connection/fetchOAuthAccessToken.d.ts +2 -1
  42. package/dist/connection/fetchOAuthAccessToken.d.ts.map +1 -1
  43. package/dist/connection/fetchOAuthAccessToken.js +3 -2
  44. package/dist/connection/fetchOAuthAccessToken.js.map +1 -1
  45. package/dist/tsconfig.tsbuildinfo +1 -1
  46. package/for_ChronicleOptions/when_configuring_keep_alive/with_skip_keep_alive.spec.ts +1 -1
  47. package/package.json +1 -1
@@ -0,0 +1,88 @@
1
+ // Copyright (c) Cratis. All rights reserved.
2
+ // Licensed under the MIT license. See LICENSE file in the project root for full license information.
3
+ import { readFileSync } from 'node:fs';
4
+ import { createSecureContext } from 'node:tls';
5
+ const certificateBlock = /-----BEGIN CERTIFICATE-----/;
6
+ const privateKeyBlock = /-----BEGIN (?:ENCRYPTED |RSA |EC )?PRIVATE KEY-----/;
7
+ function readFile(path, description) {
8
+ try {
9
+ return readFileSync(path);
10
+ }
11
+ catch (error) {
12
+ throw new Error(`Cannot read the ${description} '${path}': ${error instanceof Error ? error.message : String(error)}`, { cause: error });
13
+ }
14
+ }
15
+ /**
16
+ * The TLS material a connection string names: the client identity from `certificatePath` and the certificate
17
+ * authorities from `caCertificatePath`.
18
+ *
19
+ * It is loaded once when the connection is created, so a missing or unreadable file fails the connection setup
20
+ * instead of every reconnect - and also when validation is skipped or TLS is disabled, so the option cannot lie
21
+ * dormant until validation is switched on.
22
+ */
23
+ export class ChronicleTlsMaterial {
24
+ _certificateAuthorities;
25
+ _identity;
26
+ /** No TLS material beyond the platform defaults. */
27
+ static None = new ChronicleTlsMaterial();
28
+ constructor(_certificateAuthorities, _identity) {
29
+ this._certificateAuthorities = _certificateAuthorities;
30
+ this._identity = _identity;
31
+ }
32
+ /** Whether this configures anything beyond the platform defaults. */
33
+ get isEmpty() {
34
+ return this._certificateAuthorities === undefined && this._identity === undefined;
35
+ }
36
+ /**
37
+ * The options for a Node TLS client. The certificate authorities replace the system trust store, and
38
+ * only when certificate validation is on.
39
+ */
40
+ connectOptions(skipTlsValidation) {
41
+ return {
42
+ ...(!skipTlsValidation && this._certificateAuthorities ? { ca: this._certificateAuthorities } : {}),
43
+ ...this._identity,
44
+ rejectUnauthorized: !skipTlsValidation
45
+ };
46
+ }
47
+ }
48
+ /**
49
+ * Loads the TLS material `source` names.
50
+ *
51
+ * `caCertificatePath` is a PEM file with one or more certificate authorities. `certificatePath` is a PKCS#12
52
+ * file (`.p12`/`.pfx`), or a PEM file holding the certificate chain and the private key; `certificatePassword`
53
+ * unlocks either.
54
+ * @throws When a file is missing, unreadable or holds no usable material.
55
+ */
56
+ export function loadTlsMaterial(source) {
57
+ const authorities = source.caCertificatePath ? loadCertificateAuthorities(source.caCertificatePath) : undefined;
58
+ const identity = source.certificatePath ? loadClientIdentity(source.certificatePath, source.certificatePassword) : undefined;
59
+ return authorities === undefined && identity === undefined ? ChronicleTlsMaterial.None : new ChronicleTlsMaterial(authorities, identity);
60
+ }
61
+ function loadCertificateAuthorities(path) {
62
+ const contents = readFile(path, 'CA certificate file');
63
+ if (!certificateBlock.test(contents.toString('latin1'))) {
64
+ throw new Error(`The CA certificate file '${path}' does not contain any PEM certificates.`);
65
+ }
66
+ return contents;
67
+ }
68
+ function loadClientIdentity(path, password) {
69
+ const contents = readFile(path, 'client certificate');
70
+ const text = contents.toString('latin1');
71
+ const isPem = text.includes('-----BEGIN');
72
+ if (isPem && (!certificateBlock.test(text) || !privateKeyBlock.test(text))) {
73
+ throw new Error(`The client certificate '${path}' must hold both a certificate and a private key.`);
74
+ }
75
+ const identity = isPem
76
+ ? { cert: contents, key: contents, passphrase: password }
77
+ : { pfx: contents, passphrase: password };
78
+ // Building the context validates the password and that the key belongs to the certificate, now rather
79
+ // than on the first connection attempt.
80
+ try {
81
+ createSecureContext(identity);
82
+ }
83
+ catch (error) {
84
+ throw new Error(`The client certificate '${path}' could not be loaded: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
85
+ }
86
+ return identity;
87
+ }
88
+ //# sourceMappingURL=ChronicleTlsMaterial.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ChronicleTlsMaterial.js","sourceRoot":"","sources":["../../connection/ChronicleTlsMaterial.ts"],"names":[],"mappings":"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"}
@@ -4,8 +4,9 @@ import { type ClientMiddleware } from 'nice-grpc-common';
4
4
  export declare class CompatibilityPreflight {
5
5
  private readonly _connections;
6
6
  private readonly _timeout;
7
+ private readonly _skip;
7
8
  private _verification?;
8
- constructor(_connections: ConnectionServiceClient, _timeout: number);
9
+ constructor(_connections: ConnectionServiceClient, _timeout: number, _skip?: boolean);
9
10
  /** Shares in-flight checks and caches verdicts for this channel; transient failures can be retried. */
10
11
  verify(): Promise<void>;
11
12
  /** Gates even direct service calls that did not first call connect(). */
@@ -1 +1 @@
1
- {"version":3,"file":"CompatibilityPreflight.d.ts","sourceRoot":"","sources":["../../connection/CompatibilityPreflight.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0B,KAAK,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQ9E,mGAAmG;AACnG,qBAAa,sBAAsB;IAGnB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAA2B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAF7F,OAAO,CAAC,aAAa,CAAC,CAAgB;IAEtC,YAA6B,YAAY,EAAE,uBAAuB,EAAmB,QAAQ,EAAE,MAAM,EAAI;IAEzG,uGAAuG;IACvG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAWtB;IAED,yEAAyE;IACzE,UAAU,IAAI,gBAAgB,CAM7B;YAEa,KAAK;CAoBtB"}
1
+ {"version":3,"file":"CompatibilityPreflight.d.ts","sourceRoot":"","sources":["../../connection/CompatibilityPreflight.ts"],"names":[],"mappings":"AAIA,OAAO,EAA0B,KAAK,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQ9E,mGAAmG;AACnG,qBAAa,sBAAsB;IAI3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAL1B,OAAO,CAAC,aAAa,CAAC,CAAgB;IAEtC,YACqB,YAAY,EAAE,uBAAuB,EACrC,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,OAAe,EACvC;IAEJ,uGAAuG;IACvG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAetB;IAED,yEAAyE;IACzE,UAAU,IAAI,gBAAgB,CAM7B;YAEa,KAAK;CAoBtB"}
@@ -12,13 +12,18 @@ const protocolVersion = require('@cratis/chronicle.contracts/package.json').vers
12
12
  export class CompatibilityPreflight {
13
13
  _connections;
14
14
  _timeout;
15
+ _skip;
15
16
  _verification;
16
- constructor(_connections, _timeout) {
17
+ constructor(_connections, _timeout, _skip = false) {
17
18
  this._connections = _connections;
18
19
  this._timeout = _timeout;
20
+ this._skip = _skip;
19
21
  }
20
22
  /** Shares in-flight checks and caches verdicts for this channel; transient failures can be retried. */
21
23
  verify() {
24
+ if (this._skip) {
25
+ return Promise.resolve();
26
+ }
22
27
  if (!this._verification) {
23
28
  const verification = runInBackgroundContext(() => this.check()).catch(error => {
24
29
  if (!(error instanceof IncompatibleChronicleServer) && this._verification === verification) {
@@ -1 +1 @@
1
- {"version":3,"file":"CompatibilityPreflight.js","sourceRoot":"","sources":["../../connection/CompatibilityPreflight.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CompatibilityPreflight.js","sourceRoot":"","sources":["../../connection/CompatibilityPreflight.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import type { ChronicleServerAddress } from './ChronicleConnectionString.js';
2
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
2
3
  import type { ILoadBalancerStrategy } from './ILoadBalancerStrategy.js';
3
4
  /**
4
5
  * Selects the least-loaded candidate by probing each one's current connection count over
@@ -21,7 +22,7 @@ export declare class LeastConnectionsLoadBalancerStrategy implements ILoadBalanc
21
22
  * @param maxJitterMs - The maximum jitter, in milliseconds, to wait before every probe
22
23
  * attempt. Defaults to 250ms. 0 disables jitter entirely.
23
24
  */
24
- constructor(_skipTlsValidation: boolean, _maxJitterMs?: number);
25
+ constructor(_skipTlsValidation: boolean, _maxJitterMs?: number, tlsMaterial?: ChronicleTlsMaterial);
25
26
  select(candidates: ChronicleServerAddress[]): Promise<ChronicleServerAddress>;
26
27
  private jitter;
27
28
  private probeConnectionCount;
@@ -1 +1 @@
1
- {"version":3,"file":"LeastConnectionsLoadBalancerStrategy.d.ts","sourceRoot":"","sources":["../../connection/LeastConnectionsLoadBalancerStrategy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAE7E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAWxE;;;;;;;;GAQG;AACH,qBAAa,oCAAqC,YAAW,qBAAqB;IAY1E,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAZjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IAEpC;;;;;;;OAOG;IACH,YACqB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,GAAE,MAA8B,EAGhE;IAEK,MAAM,CAAC,UAAU,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAyBlF;YAEa,MAAM;YAaN,oBAAoB;YAqBpB,OAAO;CAWxB"}
1
+ {"version":3,"file":"LeastConnectionsLoadBalancerStrategy.d.ts","sourceRoot":"","sources":["../../connection/LeastConnectionsLoadBalancerStrategy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAWxE;;;;;;;;GAQG;AACH,qBAAa,oCAAqC,YAAW,qBAAqB;IAY1E,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAZjC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IAEpC;;;;;;;OAOG;IACH,YACqB,kBAAkB,EAAE,OAAO,EAC3B,YAAY,GAAE,MAA8B,EAC7D,WAAW,GAAE,oBAAgD,EAGhE;IAEK,MAAM,CAAC,UAAU,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAyBlF;YAEa,MAAM;YAaN,oBAAoB;YAqBpB,OAAO;CAWxB"}
@@ -1,6 +1,7 @@
1
1
  // Copyright (c) Cratis. All rights reserved.
2
2
  // Licensed under the MIT license. See LICENSE file in the project root for full license information.
3
3
  import { Agent } from 'undici';
4
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
4
5
  import { formatServerAddress } from './formatServerAddress.js';
5
6
  const DEFAULT_MAX_JITTER_MS = 250;
6
7
  const PROBE_TIMEOUT_MS = 2000;
@@ -25,10 +26,10 @@ export class LeastConnectionsLoadBalancerStrategy {
25
26
  * @param maxJitterMs - The maximum jitter, in milliseconds, to wait before every probe
26
27
  * attempt. Defaults to 250ms. 0 disables jitter entirely.
27
28
  */
28
- constructor(_skipTlsValidation, _maxJitterMs = DEFAULT_MAX_JITTER_MS) {
29
+ constructor(_skipTlsValidation, _maxJitterMs = DEFAULT_MAX_JITTER_MS, tlsMaterial = ChronicleTlsMaterial.None) {
29
30
  this._skipTlsValidation = _skipTlsValidation;
30
31
  this._maxJitterMs = _maxJitterMs;
31
- this._dispatcher = new Agent({ connect: { rejectUnauthorized: !this._skipTlsValidation } });
32
+ this._dispatcher = new Agent({ connect: tlsMaterial.connectOptions(this._skipTlsValidation) });
32
33
  }
33
34
  async select(candidates) {
34
35
  if (candidates.length === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"LeastConnectionsLoadBalancerStrategy.js","sourceRoot":"","sources":["../../connection/LeastConnectionsLoadBalancerStrategy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LeastConnectionsLoadBalancerStrategy.js","sourceRoot":"","sources":["../../connection/LeastConnectionsLoadBalancerStrategy.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
1
2
  import type { ILoadBalancerStrategy } from './ILoadBalancerStrategy.js';
2
3
  import { LoadBalancerMode } from './LoadBalancerMode.js';
3
4
  /**
@@ -7,5 +8,5 @@ import { LoadBalancerMode } from './LoadBalancerMode.js';
7
8
  * (an explicit `skipTlsValidation=false` always requires it) for strategies that probe candidates over HTTP (currently only {@link LoadBalancerMode.LeastConnections}).
8
9
  * @returns The load balancer strategy instance.
9
10
  */
10
- export declare function createLoadBalancerStrategy(mode: LoadBalancerMode, skipTlsValidation: boolean): ILoadBalancerStrategy;
11
+ export declare function createLoadBalancerStrategy(mode: LoadBalancerMode, skipTlsValidation: boolean, tlsMaterial?: ChronicleTlsMaterial): ILoadBalancerStrategy;
11
12
  //# sourceMappingURL=LoadBalancerStrategyFactory.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"LoadBalancerStrategyFactory.d.ts","sourceRoot":"","sources":["../../connection/LoadBalancerStrategyFactory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,OAAO,GAAG,qBAAqB,CAWpH"}
1
+ {"version":3,"file":"LoadBalancerStrategyFactory.d.ts","sourceRoot":"","sources":["../../connection/LoadBalancerStrategyFactory.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACtC,IAAI,EAAE,gBAAgB,EACtB,iBAAiB,EAAE,OAAO,EAC1B,WAAW,GAAE,oBAAgD,GAC9D,qBAAqB,CAWvB"}
@@ -1,5 +1,6 @@
1
1
  // Copyright (c) Cratis. All rights reserved.
2
2
  // Licensed under the MIT license. See LICENSE file in the project root for full license information.
3
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
3
4
  import { LeastConnectionsLoadBalancerStrategy } from './LeastConnectionsLoadBalancerStrategy.js';
4
5
  import { LoadBalancerMode } from './LoadBalancerMode.js';
5
6
  import { RandomLoadBalancerStrategy } from './RandomLoadBalancerStrategy.js';
@@ -11,14 +12,14 @@ import { RoundRobinLoadBalancerStrategy } from './RoundRobinLoadBalancerStrategy
11
12
  * (an explicit `skipTlsValidation=false` always requires it) for strategies that probe candidates over HTTP (currently only {@link LoadBalancerMode.LeastConnections}).
12
13
  * @returns The load balancer strategy instance.
13
14
  */
14
- export function createLoadBalancerStrategy(mode, skipTlsValidation) {
15
+ export function createLoadBalancerStrategy(mode, skipTlsValidation, tlsMaterial = ChronicleTlsMaterial.None) {
15
16
  switch (mode) {
16
17
  case LoadBalancerMode.RoundRobin:
17
18
  return new RoundRobinLoadBalancerStrategy();
18
19
  case LoadBalancerMode.Random:
19
20
  return new RandomLoadBalancerStrategy();
20
21
  case LoadBalancerMode.LeastConnections:
21
- return new LeastConnectionsLoadBalancerStrategy(skipTlsValidation);
22
+ return new LeastConnectionsLoadBalancerStrategy(skipTlsValidation, undefined, tlsMaterial);
22
23
  default:
23
24
  throw new Error(`Unknown load balancer mode: ${mode}`);
24
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"LoadBalancerStrategyFactory.js","sourceRoot":"","sources":["../../connection/LoadBalancerStrategyFactory.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,qGAAqG;AAGrG,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAAsB,EAAE,iBAA0B;IACzF,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,gBAAgB,CAAC,UAAU;YAC5B,OAAO,IAAI,8BAA8B,EAAE,CAAC;QAChD,KAAK,gBAAgB,CAAC,MAAM;YACxB,OAAO,IAAI,0BAA0B,EAAE,CAAC;QAC5C,KAAK,gBAAgB,CAAC,gBAAgB;YAClC,OAAO,IAAI,oCAAoC,CAAC,iBAAiB,CAAC,CAAC;QACvE;YACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"LoadBalancerStrategyFactory.js","sourceRoot":"","sources":["../../connection/LoadBalancerStrategyFactory.ts"],"names":[],"mappings":"AAAA,6CAA6C;AAC7C,qGAAqG;AAErG,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,OAAO,EAAE,oCAAoC,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;;;;GAMG;AACH,MAAM,UAAU,0BAA0B,CACtC,IAAsB,EACtB,iBAA0B,EAC1B,WAAW,GAAyB,oBAAoB,CAAC,IAAI;IAE7D,QAAQ,IAAI,EAAE,CAAC;QACX,KAAK,gBAAgB,CAAC,UAAU;YAC5B,OAAO,IAAI,8BAA8B,EAAE,CAAC;QAChD,KAAK,gBAAgB,CAAC,MAAM;YACxB,OAAO,IAAI,0BAA0B,EAAE,CAAC;QAC5C,KAAK,gBAAgB,CAAC,gBAAgB;YAClC,OAAO,IAAI,oCAAoC,CAAC,iBAAiB,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC/F;YACI,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;AACL,CAAC"}
@@ -1,3 +1,4 @@
1
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
1
2
  import { type OAuthTokenResponse } from './fetchOAuthAccessToken.js';
2
3
  /**
3
4
  * Interface for providing authentication tokens.
@@ -39,6 +40,7 @@ export declare class NoOpTokenProvider implements ITokenProvider {
39
40
  export declare class OAuthTokenProvider implements ITokenProvider {
40
41
  private readonly _tokenEndpoint;
41
42
  private readonly _fetchToken;
43
+ private readonly _tlsMaterial;
42
44
  private _accessToken?;
43
45
  private _expiresAt;
44
46
  private _lastFailedFetch?;
@@ -53,8 +55,9 @@ export declare class OAuthTokenProvider implements ITokenProvider {
53
55
  * @param skipTlsValidation - The effective setting: `true` skips TLS certificate chain validation, `false` requires it.
54
56
  * Defaults to `true`, matching the connection string default in this release.
55
57
  * @param _fetchToken - Test-only seam replacing the OAuth2 token request.
58
+ * @param _tlsMaterial - The client certificate and certificate authorities the token request uses.
56
59
  */
57
- constructor(_tokenEndpoint: string, clientId: string, clientSecret: string, skipTlsValidation?: boolean, _fetchToken?: () => Promise<OAuthTokenResponse>);
60
+ constructor(_tokenEndpoint: string, clientId: string, clientSecret: string, skipTlsValidation?: boolean, _fetchToken?: () => Promise<OAuthTokenResponse>, _tlsMaterial?: ChronicleTlsMaterial);
58
61
  getAccessToken(): Promise<string | undefined>;
59
62
  refresh(): Promise<string | undefined>;
60
63
  private hasFreshToken;
@@ -1 +1 @@
1
- {"version":3,"file":"TokenProvider.d.ts","sourceRoot":"","sources":["../../connection/TokenProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8C,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAWjH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;;;;OAKG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9C,iEAAiE;IACjE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAElC;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IAC9C,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3C;CACJ;AAED;;;;;;;;;;GAUG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IAqBjD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAI/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAxBhC,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,eAAe,CAAC,CAAQ;IAChC,OAAO,CAAC,eAAe,CAAC,CAA8B;IAEtD,IAAI,gBAAgB,IAAI,KAAK,GAAG,SAAS,CAExC;IAED;;;;;;;;OAQG;IACH,YACqB,cAAc,EAAE,MAAM,EACvC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,iBAAiB,GAAE,OAAc,EAChB,WAAW,GAAE,MAAM,OAAO,CAAC,kBAAkB,CAC2B,EACzF;IAEE,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsBlD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM3C;IAED,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,qBAAqB;YAIf,wBAAwB;IAmBtC,OAAO,CAAC,mBAAmB;CAI9B;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC"}
1
+ {"version":3,"file":"TokenProvider.d.ts","sourceRoot":"","sources":["../../connection/TokenProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAA8C,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAWjH;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;;;;OAKG;IACH,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9C,iEAAiE;IACjE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAElC;;;OAGG;IACH,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,iBAAkB,YAAW,cAAc;IAC9C,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAE3C;CACJ;AAED;;;;;;;;;;GAUG;AACH,qBAAa,kBAAmB,YAAW,cAAc;IAsBjD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAI/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IA3BjC,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,eAAe,CAAC,CAAQ;IAChC,OAAO,CAAC,eAAe,CAAC,CAA8B;IAEtD,IAAI,gBAAgB,IAAI,KAAK,GAAG,SAAS,CAExC;IAED;;;;;;;;;OASG;IACH,YACqB,cAAc,EAAE,MAAM,EACvC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,iBAAiB,GAAE,OAAc,EAChB,WAAW,GAAE,MAAM,OAAO,CAAC,kBAAkB,CAC8C,EAC3F,YAAY,GAAE,oBAAgD,EAC/E;IAEE,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsBlD;IAEK,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAM3C;IAED,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,WAAW;IASnB,OAAO,CAAC,qBAAqB;YAIf,wBAAwB;IAmBtC,OAAO,CAAC,mBAAmB;CAI9B;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC"}
@@ -1,5 +1,6 @@
1
1
  // Copyright (c) Cratis. All rights reserved.
2
2
  // Licensed under the MIT license. See LICENSE file in the project root for full license information.
3
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
3
4
  import { fetchOAuthAccessToken, OAuthTokenHttpError } from './fetchOAuthAccessToken.js';
4
5
  import { runInBackgroundContext } from '../telemetry/runInBackgroundContext.js';
5
6
  // Refresh once the token has less than this long left before it expires.
@@ -34,6 +35,7 @@ export class NoOpTokenProvider {
34
35
  export class OAuthTokenProvider {
35
36
  _tokenEndpoint;
36
37
  _fetchToken;
38
+ _tlsMaterial;
37
39
  _accessToken;
38
40
  _expiresAt = 0;
39
41
  _lastFailedFetch;
@@ -50,10 +52,12 @@ export class OAuthTokenProvider {
50
52
  * @param skipTlsValidation - The effective setting: `true` skips TLS certificate chain validation, `false` requires it.
51
53
  * Defaults to `true`, matching the connection string default in this release.
52
54
  * @param _fetchToken - Test-only seam replacing the OAuth2 token request.
55
+ * @param _tlsMaterial - The client certificate and certificate authorities the token request uses.
53
56
  */
54
- constructor(_tokenEndpoint, clientId, clientSecret, skipTlsValidation = true, _fetchToken = () => fetchOAuthAccessToken(this._tokenEndpoint, clientId, clientSecret, skipTlsValidation)) {
57
+ constructor(_tokenEndpoint, clientId, clientSecret, skipTlsValidation = true, _fetchToken = () => fetchOAuthAccessToken(this._tokenEndpoint, clientId, clientSecret, skipTlsValidation, this._tlsMaterial), _tlsMaterial = ChronicleTlsMaterial.None) {
55
58
  this._tokenEndpoint = _tokenEndpoint;
56
59
  this._fetchToken = _fetchToken;
60
+ this._tlsMaterial = _tlsMaterial;
57
61
  }
58
62
  async getAccessToken() {
59
63
  if (this.hasFreshToken()) {
@@ -1 +1 @@
1
- {"version":3,"file":"TokenProvider.js","sourceRoot":"","sources":["../../connection/TokenProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TokenProvider.js","sourceRoot":"","sources":["../../connection/TokenProvider.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
1
2
  /**
2
3
  * The shape of a successful OAuth2 token response.
3
4
  */
@@ -19,7 +20,7 @@ export interface OAuthTokenResponse {
19
20
  * @param skipTlsValidation - The effective setting: `true` skips TLS certificate chain validation, `false` requires it.
20
21
  * @returns The parsed token response; rejects when the request fails or the response is not a valid token.
21
22
  */
22
- export declare function fetchOAuthAccessToken(tokenEndpoint: string, clientId: string, clientSecret: string, skipTlsValidation: boolean): Promise<OAuthTokenResponse>;
23
+ export declare function fetchOAuthAccessToken(tokenEndpoint: string, clientId: string, clientSecret: string, skipTlsValidation: boolean, tlsMaterial?: ChronicleTlsMaterial): Promise<OAuthTokenResponse>;
23
24
  /**
24
25
  * Describes a request error. Connecting to a host that resolves to several addresses, such as
25
26
  * localhost, fails with an AggregateError whose own message is empty.
@@ -1 +1 @@
1
- {"version":3,"file":"fetchOAuthAccessToken.d.ts","sourceRoot":"","sources":["../../connection/fetchOAuthAccessToken.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,KAAK;IAG9B,QAAQ,CAAC,UAAU,EAAE,MAAM;IAFvC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B,YAAqB,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EASpD;CACJ;AAED,MAAM,WAAW,kBAAkB;IAC/B,YAAY,EAAE,MAAM,CAAC;IAErB,oFAAoF;IACpF,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,OAAO,GAC3B,OAAO,CAAC,kBAAkB,CAAC,CAwD7B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAQzD"}
1
+ {"version":3,"file":"fetchOAuthAccessToken.d.ts","sourceRoot":"","sources":["../../connection/fetchOAuthAccessToken.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,KAAK;IAG9B,QAAQ,CAAC,UAAU,EAAE,MAAM;IAFvC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B,YAAqB,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EASpD;CACJ;AAED,MAAM,WAAW,kBAAkB;IAC/B,YAAY,EAAE,MAAM,CAAC;IAErB,oFAAoF;IACpF,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACjC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,OAAO,EAC1B,WAAW,GAAE,oBAAgD,GAC9D,OAAO,CAAC,kBAAkB,CAAC,CAwD7B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAQzD"}
@@ -2,6 +2,7 @@
2
2
  // Licensed under the MIT license. See LICENSE file in the project root for full license information.
3
3
  import * as http from 'http';
4
4
  import * as https from 'https';
5
+ import { ChronicleTlsMaterial } from './ChronicleTlsMaterial.js';
5
6
  /**
6
7
  * The shape of a successful OAuth2 token response.
7
8
  */
@@ -30,7 +31,7 @@ export class OAuthTokenHttpError extends Error {
30
31
  * @param skipTlsValidation - The effective setting: `true` skips TLS certificate chain validation, `false` requires it.
31
32
  * @returns The parsed token response; rejects when the request fails or the response is not a valid token.
32
33
  */
33
- export function fetchOAuthAccessToken(tokenEndpoint, clientId, clientSecret, skipTlsValidation) {
34
+ export function fetchOAuthAccessToken(tokenEndpoint, clientId, clientSecret, skipTlsValidation, tlsMaterial = ChronicleTlsMaterial.None) {
34
35
  const params = new URLSearchParams();
35
36
  params.append('grant_type', 'client_credentials');
36
37
  params.append('client_id', clientId);
@@ -48,7 +49,7 @@ export function fetchOAuthAccessToken(tokenEndpoint, clientId, clientSecret, ski
48
49
  },
49
50
  // Chain validation is skipped only when the effective skipTlsValidation is true
50
51
  // (an explicit false always requires it), matching the gRPC channel's credentials for the same connection string.
51
- ...(isHttps && skipTlsValidation ? { rejectUnauthorized: false } : {})
52
+ ...(isHttps && (skipTlsValidation || !tlsMaterial.isEmpty) ? tlsMaterial.connectOptions(skipTlsValidation) : {})
52
53
  }, response => {
53
54
  let data = '';
54
55
  response.on('data', chunk => {
@@ -1 +1 @@
1
- {"version":3,"file":"fetchOAuthAccessToken.js","sourceRoot":"","sources":["../../connection/fetchOAuthAccessToken.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetchOAuthAccessToken.js","sourceRoot":"","sources":["../../connection/fetchOAuthAccessToken.ts"],"names":[],"mappings":"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"}