@mongodb-js/devtools-connect 1.1.0 → 1.2.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/connect.d.ts CHANGED
@@ -3,4 +3,7 @@ import type { MongoClient, MongoClientOptions } from 'mongodb';
3
3
  export declare class MongoAutoencryptionUnavailable extends Error {
4
4
  constructor();
5
5
  }
6
- export declare function connectMongoClient(uri: string, clientOptions: MongoClientOptions, logger: ConnectLogEmitter, MongoClientClass: typeof MongoClient): Promise<MongoClient>;
6
+ export interface DevtoolsConnectOptions extends MongoClientOptions {
7
+ useSystemCA?: boolean;
8
+ }
9
+ export declare function connectMongoClient(uri: string, clientOptions: DevtoolsConnectOptions, logger: ConnectLogEmitter, MongoClientClass: typeof MongoClient): Promise<MongoClient>;
package/lib/connect.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.connectMongoClient = exports.MongoAutoencryptionUnavailable = void 0;
4
4
  const fast_failure_connect_1 = require("./fast-failure-connect");
5
+ const system_ca_1 = require("system-ca");
5
6
  class MongoAutoencryptionUnavailable extends Error {
6
7
  constructor() {
7
8
  super('Automatic encryption is only available with Atlas and MongoDB Enterprise');
@@ -87,7 +88,7 @@ async function resolveMongodbSrv(uri, logger) {
87
88
  resolveSrv(hostname, (...args) => {
88
89
  var _a;
89
90
  resolutionDetails.push({
90
- hostname, error: (_a = args[0]) === null || _a === void 0 ? void 0 : _a.message, wasNativelyLookedUp: wasNativelyLookedUp(args[1])
91
+ query: 'SRV', hostname, error: (_a = args[0]) === null || _a === void 0 ? void 0 : _a.message, wasNativelyLookedUp: wasNativelyLookedUp(args[1])
91
92
  });
92
93
  cb(...args);
93
94
  });
@@ -96,7 +97,7 @@ async function resolveMongodbSrv(uri, logger) {
96
97
  resolveTxt(hostname, (...args) => {
97
98
  var _a;
98
99
  resolutionDetails.push({
99
- hostname, error: (_a = args[0]) === null || _a === void 0 ? void 0 : _a.message, wasNativelyLookedUp: wasNativelyLookedUp(args[1])
100
+ query: 'TXT', hostname, error: (_a = args[0]) === null || _a === void 0 ? void 0 : _a.message, wasNativelyLookedUp: wasNativelyLookedUp(args[1])
100
101
  });
101
102
  cb(...args);
102
103
  });
@@ -149,6 +150,18 @@ function detectAndLogMissingOptionalDependencies(logger) {
149
150
  async function connectMongoClient(uri, clientOptions, logger, MongoClientClass) {
150
151
  var _a, _b;
151
152
  detectAndLogMissingOptionalDependencies(logger);
153
+ if (clientOptions.useSystemCA) {
154
+ const systemCAOpts = { includeNodeCertificates: true };
155
+ const ca = await (0, system_ca_1.systemCertsAsync)(systemCAOpts);
156
+ logger.emit('devtools-connect:used-system-ca', {
157
+ caCount: ca.length,
158
+ asyncFallbackError: systemCAOpts.asyncFallbackError
159
+ });
160
+ clientOptions = {
161
+ ...clientOptions,
162
+ ca
163
+ };
164
+ }
152
165
  if (clientOptions.autoEncryption !== undefined &&
153
166
  !clientOptions.autoEncryption.bypassAutoEncryption) {
154
167
  const optionsWithoutFLE = { ...clientOptions };
@@ -1 +1 @@
1
- {"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"connect.js","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export * from './types';
2
- export { connectMongoClient } from './connect';
2
+ export { connectMongoClient, DevtoolsConnectOptions } from './connect';
3
3
  export { hookLogger } from './log-hook';
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAC3B,uCAAwC;AAA/B,sGAAA,UAAU,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qCAAuE;AAA9D,6GAAA,kBAAkB,OAAA;AAC3B,uCAAwC;AAA/B,sGAAA,UAAU,OAAA"}
package/lib/log-hook.js CHANGED
@@ -44,7 +44,14 @@ function hookLogger(emitter, log, contextPrefix, redactURICredentials) {
44
44
  emitter.on('devtools-connect:missing-optional-dependency', function (ev) {
45
45
  log.error('DEVTOOLS-CONNECT', mongoLogId(1000000041), `${contextPrefix}-deps`, 'Missing optional dependency', {
46
46
  name: ev.name,
47
- error: ev === null || ev === void 0 ? void 0 : ev.error.message
47
+ error: ev.error.message
48
+ });
49
+ });
50
+ emitter.on('devtools-connect:used-system-ca', function (ev) {
51
+ var _a;
52
+ log.error('DEVTOOLS-CONNECT', mongoLogId(1000000049), `${contextPrefix}-connect`, 'Loaded system CA list', {
53
+ caCount: ev.caCount,
54
+ asyncFallbackError: (_a = ev.asyncFallbackError) === null || _a === void 0 ? void 0 : _a.message
48
55
  });
49
56
  });
50
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"log-hook.js","sourceRoot":"","sources":["../src/log-hook.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"log-hook.js","sourceRoot":"","sources":["../src/log-hook.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -17,6 +17,7 @@ export interface ConnectHeartbeatSucceededEvent {
17
17
  connectionId: string;
18
18
  }
19
19
  export interface ConnectDnsResolutionDetail {
20
+ query: 'TXT' | 'SRV';
20
21
  hostname: string;
21
22
  error?: string;
22
23
  wasNativelyLookedUp?: boolean;
@@ -36,6 +37,10 @@ export interface ConnectMissingOptionalDependencyEvent {
36
37
  name: string;
37
38
  error: Error;
38
39
  }
40
+ export interface ConnectUsedSystemCAEvent {
41
+ caCount: number;
42
+ asyncFallbackError: Error | undefined;
43
+ }
39
44
  export interface ConnectEventMap {
40
45
  'devtools-connect:connect-attempt-initialized': (ev: ConnectAttemptInitializedEvent) => void;
41
46
  'devtools-connect:connect-heartbeat-failure': (ev: ConnectHeartbeatFailureEvent) => void;
@@ -45,6 +50,7 @@ export interface ConnectEventMap {
45
50
  'devtools-connect:resolve-srv-error': (ev: ConnectResolveSrvErrorEvent) => void;
46
51
  'devtools-connect:resolve-srv-succeeded': (ev: ConnectResolveSrvSucceededEvent) => void;
47
52
  'devtools-connect:missing-optional-dependency': (ev: ConnectMissingOptionalDependencyEvent) => void;
53
+ 'devtools-connect:used-system-ca': (ev: ConnectUsedSystemCAEvent) => void;
48
54
  }
49
55
  export interface ConnectLogEmitter {
50
56
  on<K extends keyof ConnectEventMap>(event: K, listener: ConnectEventMap[K]): this;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongodb-js/devtools-connect",
3
- "version": "1.1.0",
3
+ "version": "1.2.0",
4
4
  "description": "A connection establishment utility for MongoDB developer tools",
5
5
  "homepage": "https://github.com/mongodb-js/devtools-connect",
6
6
  "repository": {
@@ -34,7 +34,9 @@
34
34
  "compile-ts": "tsc -p tsconfig.json"
35
35
  },
36
36
  "license": "Apache-2.0",
37
- "dependencies": {},
37
+ "dependencies": {
38
+ "system-ca": "^1.0.0"
39
+ },
38
40
  "peerDependencies": {
39
41
  "mongodb": "^4.2.2",
40
42
  "mongodb-log-writer": "^1.1.3"
@@ -65,7 +67,7 @@
65
67
  "typescript": "^4.5.4"
66
68
  },
67
69
  "optionalDependencies": {
68
- "os-dns-native": "^1.1.0",
70
+ "os-dns-native": "^1.1.2",
69
71
  "resolve-mongodb-srv": "^1.1.1"
70
72
  }
71
73
  }