@mongodb-js/devtools-connect 3.3.3 → 3.4.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/dist/connect.d.ts CHANGED
@@ -11,7 +11,7 @@ export declare class DevtoolsConnectionState {
11
11
  productName: string;
12
12
  private stateShareClient;
13
13
  private stateShareServer;
14
- constructor(options: Pick<DevtoolsConnectOptions, 'productDocsLink' | 'productName' | 'oidc' | 'parentHandle'>, logger: ConnectLogEmitter, ca: string);
14
+ constructor(options: Pick<DevtoolsConnectOptions, 'productDocsLink' | 'productName' | 'oidc' | 'parentHandle'>, logger: ConnectLogEmitter, ca: string | undefined);
15
15
  getStateShareServer(): Promise<string>;
16
16
  destroy(): Promise<void>;
17
17
  }
@@ -24,9 +24,10 @@ export interface DevtoolsConnectOptions extends MongoClientOptions {
24
24
  proxy?: DevtoolsProxyOptions | AgentWithInitialize;
25
25
  applyProxyToOIDC?: boolean;
26
26
  }
27
- export declare function connectMongoClient(uri: string, clientOptions: DevtoolsConnectOptions, logger: ConnectLogEmitter, MongoClientClass: typeof MongoClient): Promise<{
27
+ export type ConnectMongoClientResult = {
28
28
  client: MongoClient;
29
29
  state: DevtoolsConnectionState;
30
- }>;
30
+ };
31
+ export declare function connectMongoClient(uri: string, clientOptions: DevtoolsConnectOptions, logger: ConnectLogEmitter, MongoClientClass: typeof MongoClient): Promise<ConnectMongoClientResult>;
31
32
  export declare function isHumanOidcFlow(uri: string, clientOptions: MongoClientOptions): boolean;
32
33
  //# sourceMappingURL=connect.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGjD,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAEV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAEL,oBAAoB,EACpB,mBAAmB,EAIpB,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;AAW1D,qBAAa,8BAA+B,SAAQ,KAAK;;CAMxD;AAkQD,qBAAa,uBAAuB;IAC3B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,gBAAgB,CAAiC;IACzD,OAAO,CAAC,gBAAgB,CAAiC;gBAGvD,OAAO,EAAE,IAAI,CACX,sBAAsB,EACtB,iBAAiB,GAAG,aAAa,GAAG,MAAM,GAAG,cAAc,CAC5D,EACD,MAAM,EAAE,iBAAiB,EACzB,EAAE,EAAE,MAAM;IA0BN,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAIhE,eAAe,EAAE,MAAM,CAAC;IAIxB,WAAW,EAAE,MAAM,CAAC;IAIpB,IAAI,CAAC,EAAE,IAAI,CACT,wBAAwB,EACxB,QAAQ,GAAG,8BAA8B,CAC1C,CAAC;IAKF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAStC,YAAY,CAAC,EAAE,MAAM,CAAC;IAKtB,KAAK,CAAC,EAAE,oBAAoB,GAAG,mBAAmB,CAAC;IAKnD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAOD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,sBAAsB,EACrC,MAAM,EAAE,iBAAiB,EACzB,gBAAgB,EAAE,OAAO,WAAW,GACnC,OAAO,CAAC;IACT,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC,CAkJD;AA+BD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAmBT"}
1
+ {"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../src/connect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAMjD,OAAO,KAAK,EACV,WAAW,EACX,kBAAkB,EAInB,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAEV,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,yBAAyB,CAAC;AASjC,OAAO,EAEL,oBAAoB,EACpB,mBAAmB,EAIpB,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;AAW1D,qBAAa,8BAA+B,SAAQ,KAAK;;CAMxD;AAkQD,qBAAa,uBAAuB;IAC3B,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,gBAAgB,CAAiC;IACzD,OAAO,CAAC,gBAAgB,CAAiC;gBAGvD,OAAO,EAAE,IAAI,CACX,sBAAsB,EACtB,iBAAiB,GAAG,aAAa,GAAG,MAAM,GAAG,cAAc,CAC5D,EACD,MAAM,EAAE,iBAAiB,EACzB,EAAE,EAAE,MAAM,GAAG,SAAS;IA0BlB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKtC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,kBAAkB;IAIhE,eAAe,EAAE,MAAM,CAAC;IAIxB,WAAW,EAAE,MAAM,CAAC;IAIpB,IAAI,CAAC,EAAE,IAAI,CACT,wBAAwB,EACxB,QAAQ,GAAG,8BAA8B,CAC1C,CAAC;IAKF,WAAW,CAAC,EAAE,uBAAuB,CAAC;IAStC,YAAY,CAAC,EAAE,MAAM,CAAC;IAKtB,KAAK,CAAC,EAAE,oBAAoB,GAAG,mBAAmB,CAAC;IAKnD,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,uBAAuB,CAAC;CAChC,CAAC;AAOF,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,sBAAsB,EACrC,MAAM,EAAE,iBAAiB,EACzB,gBAAgB,EAAE,OAAO,WAAW,GACnC,OAAO,CAAC,wBAAwB,CAAC,CAwBnC;AAmMD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAmBT"}
package/dist/connect.js CHANGED
@@ -253,7 +253,7 @@ class DevtoolsConnectionState {
253
253
  ...options.oidc,
254
254
  logger: proxyingLogger,
255
255
  redirectServerRequestHandler: handler_1.oidcServerRequestHandler.bind(null, options),
256
- ...addToOIDCPluginHttpOptions(options.oidc, { ca }),
256
+ ...addToOIDCPluginHttpOptions(options.oidc, ca ? { ca } : {}),
257
257
  });
258
258
  }
259
259
  }
@@ -268,30 +268,53 @@ class DevtoolsConnectionState {
268
268
  }
269
269
  exports.DevtoolsConnectionState = DevtoolsConnectionState;
270
270
  async function connectMongoClient(uri, clientOptions, logger, MongoClientClass) {
271
+ detectAndLogMissingOptionalDependencies(logger);
272
+ const options = { uri, clientOptions, logger, MongoClientClass };
273
+ try {
274
+ return await connectMongoClientImpl({ ...options, useSystemCA: true });
275
+ }
276
+ catch (error) {
277
+ if ((0, fast_failure_connect_1.isPotentialTLSCertificateError)(error)) {
278
+ logger.emit('devtools-connect:retry-after-tls-error', {
279
+ error: String(error),
280
+ });
281
+ try {
282
+ return await connectMongoClientImpl({ ...options, useSystemCA: false });
283
+ }
284
+ catch { }
285
+ }
286
+ throw error;
287
+ }
288
+ }
289
+ exports.connectMongoClient = connectMongoClient;
290
+ async function connectMongoClientImpl({ uri, clientOptions, logger, MongoClientClass, useSystemCA, }) {
271
291
  const cleanupOnClientClose = [];
272
292
  const runClose = async () => {
273
293
  let item;
274
294
  while ((item = cleanupOnClientClose.shift()))
275
295
  await item();
276
296
  };
277
- detectAndLogMissingOptionalDependencies(logger);
297
+ let ca;
278
298
  try {
279
- const { ca, asyncFallbackError, systemCertsError, systemCACount, messages, } = await (0, devtools_proxy_support_1.systemCA)({
280
- ca: clientOptions.ca,
281
- tlsCAFile: clientOptions.tlsCAFile || getConnectionStringParam(uri, 'tlsCAFile'),
282
- });
283
- logger.emit('devtools-connect:used-system-ca', {
284
- caCount: systemCACount,
285
- asyncFallbackError,
286
- systemCertsError,
287
- messages,
288
- });
299
+ if (useSystemCA) {
300
+ const { ca: caWithSystemCerts, asyncFallbackError, systemCertsError, systemCACount, messages, } = await (0, devtools_proxy_support_1.systemCA)({
301
+ ca: clientOptions.ca,
302
+ tlsCAFile: clientOptions.tlsCAFile || getConnectionStringParam(uri, 'tlsCAFile'),
303
+ });
304
+ logger.emit('devtools-connect:used-system-ca', {
305
+ caCount: systemCACount,
306
+ asyncFallbackError,
307
+ systemCertsError,
308
+ messages,
309
+ });
310
+ ca = caWithSystemCerts;
311
+ }
289
312
  const proxyAgent = clientOptions.proxy &&
290
313
  (0, devtools_proxy_support_1.useOrCreateAgent)('createConnection' in clientOptions.proxy
291
314
  ? clientOptions.proxy
292
315
  : {
293
316
  ...clientOptions.proxy,
294
- ca,
317
+ ...(ca ? { ca } : {}),
295
318
  }, clientOptions.applyProxyToOIDC ? undefined : 'mongodb://');
296
319
  cleanupOnClientClose.push(() => proxyAgent?.destroy());
297
320
  if (clientOptions.applyProxyToOIDC) {
@@ -322,7 +345,7 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
322
345
  const shouldAddOidcCallbacks = isHumanOidcFlow(uri, clientOptions);
323
346
  const state = clientOptions.parentState ??
324
347
  new DevtoolsConnectionState(clientOptions, logger, ca);
325
- const mongoClientOptions = (0, lodash_merge_1.default)({}, clientOptions, shouldAddOidcCallbacks ? state.oidcPlugin.mongoClientOptions : {}, { ca, allowPartialTrustChain: true });
348
+ const mongoClientOptions = (0, lodash_merge_1.default)({}, clientOptions, shouldAddOidcCallbacks ? state.oidcPlugin.mongoClientOptions : {}, { allowPartialTrustChain: true }, ca ? { ca } : {});
326
349
  mongoClientOptions.lookup = (hostname, options, callback) => {
327
350
  return dns_1.default.lookup(hostname, { verbatim: false, ...options }, callback);
328
351
  };
@@ -368,7 +391,6 @@ async function connectMongoClient(uri, clientOptions, logger, MongoClientClass)
368
391
  throw err;
369
392
  }
370
393
  }
371
- exports.connectMongoClient = connectMongoClient;
372
394
  function getMaybeConectionString(uri) {
373
395
  try {
374
396
  return new mongodb_connection_string_url_1.default(uri, { looseValidation: true });
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAsB;AACtB,iEAGgC;AAchC,yDAAkE;AAClE,gEAAiC;AACjC,4CAA0D;AAC1D,+DAA2E;AAC3E,+FAEuC;AACvC,mCAAsC;AACtC,+EAO4C;AAG5C,SAAS,OAAO,CAAC,GAAW;IAC1B,IAAI,CAAC;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,uCAAgB,CAAC,GAAG,CAAC,CAAC;QAC5C,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACpE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAa,8BAA+B,SAAQ,KAAK;IACvD;QACE,KAAK,CACH,0EAA0E,CAC3E,CAAC;IACJ,CAAC;CACF;AAND,wEAMC;AAMD,KAAK,UAAU,mBAAmB,CAChC,GAAW,EACX,MAAmB,EACnB,MAAyB;IAEzB,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAiB,CAAC;IACnD,IAAI,qBAAqB,GAAyB,IAAI,CAAC;IACvD,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;QAC1D,GAAG;QACH,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM;QAEtC,sBAAsB,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO;QAC1D,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,CAAC,EAChC,OAAO,EACP,YAAY,GACe,EAAE,EAAE;QAC/B,MAAM,mBAAmB,GAAqC,MAAc;aACzE,QAAQ,EAAE,WAAW,CAAC;QACzB,MAAM,OAAO,GAAG,mBAAmB,EAAE,OAAO,CAAC;QAC7C,MAAM,UAAU,GAAG,IAAA,mDAA4B,EAAC,OAAO,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE;YACxD,YAAY;YACZ,OAAO;YACP,UAAU;YACV,aAAa;SACd,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;YAC1B,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAC7C,IACE,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EACpE,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;gBAEnD,qBAAqB,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YACzC,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,0BAA0B,GAAG,CAAC,EAClC,YAAY,GACkB,EAAE,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAC1D,YAAY;SACb,CAAC,CAAC;QACH,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACzC,CAAC,CAAC;IAEF,MAAM,CAAC,WAAW,CAAC,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;IACtE,MAAM,CAAC,WAAW,CAAC,0BAA0B,EAAE,0BAA0B,CAAC,CAAC;IAC3E,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;YACnC,MAAO,qBAAuC,CAAC;YAC/C,UAAU,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;QACvD,CAAC;QACD,IACE,OAAO,UAAU,KAAK,QAAQ;YAC9B,UAAU,EAAE,WAAW,CAAC,IAAI,KAAK,2BAA2B;YAC5D,OAAO,CAAC,GAAG,CAAC,EACZ,CAAC;YACA,UAAoB,CAAC,OAAO,GAAG,GAC7B,UAAoB,CAAC,OACxB,+HAA+H,CAAC;QAClI,CAAC;QACD,MAAM,UAAU,CAAC;IACnB,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,cAAc,CAAC,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,cAAc,CACnB,0BAA0B,EAC1B,0BAA0B,CAC3B,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,2CAA2C,EAAE;YACvD,yBAAyB,EAAG,MAAc,EAAE,aAAa;gBACvD,EAAE,yBAAyB;SAC9B,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,IAAI,iBAOS,CAAC;AAEd,KAAK,UAAU,iBAAiB,CAC9B,GAAW,EACX,MAAyB;IAEzB,MAAM,iBAAiB,GAAiC,EAAE,CAAC;IAC3D,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,iBAAiB,KAAjB,iBAAiB,GAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC;gBACvC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;aAChC,EAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE;gBAChD,IAAI,EAAE,EAAE;gBACR,KAAK;gBACL,UAAU,EAAE,IAAI;gBAChB,iBAAiB;aAClB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,EACJ,mBAAmB,EACnB,gBAAgB,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,GAC7C,GAAG,iBAAiB,CAAC,KAAK,CAAC;gBAC5B,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,GAAG,EAAE;oBACpD,GAAG,EAAE;wBACH,UAAU,CAAC,QAAgB,EAAE,EAAoC;4BAC/D,UAAU,CACR,QAAQ,EACR,CAAC,GAAG,IAAkD,EAAE,EAAE;gCACxD,iBAAiB,CAAC,IAAI,CAAC;oCACrB,KAAK,EAAE,KAAK;oCACZ,QAAQ;oCACR,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO;oCACvB,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iCAClD,CAAC,CAAC;gCACH,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;4BACd,CAAC,CACF,CAAC;wBACJ,CAAC;wBACD,UAAU,CAAC,QAAgB,EAAE,EAAoC;4BAC/D,UAAU,CACR,QAAQ,EACR,CAAC,GAAG,IAAkD,EAAE,EAAE;gCACxD,iBAAiB,CAAC,IAAI,CAAC;oCACrB,KAAK,EAAE,KAAK;oCACZ,QAAQ;oCACR,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO;oCACvB,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iCAClD,CAAC,CAAC;gCACH,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;4BACd,CAAC,CACF,CAAC;wBACJ,CAAC;qBACF;iBACF,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;oBACpD,IAAI,EAAE,GAAG;oBACT,EAAE,EAAE,QAAQ;oBACZ,iBAAiB;iBAClB,CAAC,CAAC;gBACH,OAAO,QAAQ,CAAC;YAClB,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBACpB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE;oBAChD,IAAI,EAAE,GAAG;oBACT,KAAK;oBACL,UAAU,EAAE,KAAK;oBACjB,iBAAiB;iBAClB,CAAC,CAAC;gBACH,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,uCAAuC,CAAC,MAAyB;IAExE,IAAI,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAC1D,IAAI,EAAE,OAAO;YACb,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC;QACH,OAAO,CAAC,2BAA2B,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAC1D,IAAI,EAAE,2BAA2B;YACjC,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC;QACH,OAAO,CAAC,eAAe,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAC1D,IAAI,EAAE,eAAe;YACrB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC;QACH,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAC1D,IAAI,EAAE,qBAAqB;YAC3B,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC;QACH,OAAO,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE;YAC1D,IAAI,EAAE,UAAU;YAChB,KAAK;SACN,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAGD,SAAS,sBAAsB,CAC7B,IAKC,EACD,EAKC;IAED,IAAI,CAAC,IAAI,GAAG,UACV,KAAQ,EACR,GAAG,IAAwD;QAE3D,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;QACxB,OAAO,qBAAY,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;IAChE,CAAC,CAAC;AACJ,CAAC;AAYD,MAAa,uBAAuB;IAOlC,YACE,OAGC,EACD,MAAyB,EACzB,EAAsB;QAThB,qBAAgB,GAA4B,IAAI,CAAC;QACjD,qBAAgB,GAA4B,IAAI,CAAC;QAUvD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACnE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC;QACrD,CAAC;aAAM,CAAC;YAKN,MAAM,cAAc,GAAG,IAAI,qBAAY,EAAE,CAAC;YAC1C,cAAc,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YACzC,sBAAsB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,UAAU,GAAG,IAAA,qCAAuB,EAAC;gBACxC,GAAG,OAAO,CAAC,IAAI;gBACf,MAAM,EAAE,cAAc;gBACtB,4BAA4B,EAAE,kCAAwB,CAAC,IAAI,CACzD,IAAI,EACJ,OAAO,CACR;gBACD,GAAG,0BAA0B,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC,gBAAgB,KAArB,IAAI,CAAC,gBAAgB,GAAK,MAAM,sCAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAC;QAC9D,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;IACnC,CAAC;CACF;AAhDD,0DAgDC;AAsDM,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,aAAqC,EACrC,MAAyB,EACzB,gBAAoC;IAEpC,uCAAuC,CAAC,MAAM,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAQjE,IAAI,CAAC;QACH,OAAO,MAAM,sBAAsB,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,IAAA,qDAA8B,EAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;gBACpD,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;aACrB,CAAC,CAAC;YACH,IAAI,CAAC;gBACH,OAAO,MAAM,sBAAsB,CAAC,EAAE,GAAG,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1E,CAAC;YAAC,MAAM,CAAC,CAAA,CAAC;QACZ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AA7BD,gDA6BC;AAED,KAAK,UAAU,sBAAsB,CAAC,EACpC,GAAG,EACH,aAAa,EACb,MAAM,EACN,gBAAgB,EAChB,WAAW,GAOZ;IACC,MAAM,oBAAoB,GAAmC,EAAE,CAAC;IAChE,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,IAAI,IAA8C,CAAC;QACnD,OAAO,CAAC,IAAI,GAAG,oBAAoB,CAAC,KAAK,EAAE,CAAC;YAAE,MAAM,IAAI,EAAE,CAAC;IAC7D,CAAC,CAAC;IAEF,IAAI,EAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,EACJ,EAAE,EAAE,iBAAiB,EACrB,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,QAAQ,GACT,GAAG,MAAM,IAAA,iCAAQ,EAAC;gBACjB,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,SAAS,EACP,aAAa,CAAC,SAAS,IAAI,wBAAwB,CAAC,GAAG,EAAE,WAAW,CAAC;aACxE,CAAC,CAAC;YACH,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE;gBAC7C,OAAO,EAAE,aAAa;gBACtB,kBAAkB;gBAClB,gBAAgB;gBAChB,QAAQ;aACT,CAAC,CAAC;YACH,EAAE,GAAG,iBAAiB,CAAC;QACzB,CAAC;QAMD,MAAM,UAAU,GACd,aAAa,CAAC,KAAK;YACnB,IAAA,yCAAgB,EACd,kBAAkB,IAAI,aAAa,CAAC,KAAK;gBACvC,CAAC,CAAC,aAAa,CAAC,KAAK;gBACrB,CAAC,CAAC;oBACE,GAAI,aAAa,CAAC,KAA8B;oBAChD,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACtB,EACL,aAAa,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAC1D,CAAC;QACJ,oBAAoB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QAEvD,IAAI,aAAa,CAAC,gBAAgB,EAAE,CAAC;YACnC,aAAa,CAAC,IAAI,GAAG;gBACnB,GAAG,aAAa,CAAC,IAAI;gBACrB,GAAG,0BAA0B,CAAC,aAAa,CAAC,IAAI,EAAE;oBAChD,KAAK,EAAE,UAAU;iBAClB,CAAC;aACH,CAAC;QACJ,CAAC;QAED,IAAI,MAA0B,CAAC;QAC/B,IAAI,UAAU,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC;YAC1D,MAAM,GAAG,IAAA,2CAAkB,EACzB,UAAU,EACV,sBAAsB,EACtB,YAAY,CACb,CAAC;YACF,oBAAoB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,KAAK,MAAM,WAAW,IAAI,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YACxE,IAAI,WAAW,EAAE,CAAC;gBAChB,sBAAsB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YAEX,MAAM,MAAM,EAAE,MAAM,EAAE,CAAC;YACvB,aAAa,GAAG;gBACd,GAAG,aAAa;gBAChB,GAAG,MAAM,EAAE,MAAM;aAClB,CAAC;QACJ,CAAC;QAKD,MAAM,sBAAsB,GAAG,eAAe,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACnE,MAAM,KAAK,GACT,aAAa,CAAC,WAAW;YACzB,IAAI,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACzD,MAAM,kBAAkB,GACY,IAAA,sBAAK,EACvC,EAAE,EACF,aAAa,EACb,sBAAsB,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EACjE,EAAE,sBAAsB,EAAE,IAAI,EAAE,EAChC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CACjB,CAAC;QAIF,kBAAkB,CAAC,MAAM,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YAC1D,OAAO,aAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,EAAE,QAAQ,CAAC,CAAC;QACzE,CAAC,CAAC;QAEF,OAAQ,kBAA0B,CAAC,WAAW,CAAC;QAC/C,OAAO,kBAAkB,CAAC,eAAe,CAAC;QAC1C,OAAO,kBAAkB,CAAC,WAAW,CAAC;QACtC,OAAO,kBAAkB,CAAC,IAAI,CAAC;QAC/B,OAAO,kBAAkB,CAAC,WAAW,CAAC;QACtC,OAAO,kBAAkB,CAAC,YAAY,CAAC;QACvC,OAAO,kBAAkB,CAAC,KAAK,CAAC;QAChC,OAAO,kBAAkB,CAAC,gBAAgB,CAAC;QAE3C,IACE,kBAAkB,CAAC,cAAc,KAAK,SAAS;YAC/C,CAAC,kBAAkB,CAAC,cAAc,CAAC,oBAAoB;YACvD,CAAC,kBAAkB,CAAC,cAAc,CAAC,mBAAmB,EACtD,CAAC;YAED,MAAM,iBAAiB,GAAG,EAAE,GAAG,kBAAkB,EAAE,CAAC;YACpD,OAAO,iBAAiB,CAAC,cAAc,CAAC;YACxC,OAAO,iBAAiB,CAAC,SAAS,CAAC;YACnC,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;YAC5D,6BAA6B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YAC/C,MAAM,SAAS,GAAG,MAAM,MAAM;iBAC3B,EAAE,CAAC,OAAO,CAAC;iBACX,KAAK,EAAE;iBACP,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,IACE,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC;gBAC1C,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,EAC1C,CAAC;gBACD,MAAM,IAAI,8BAA8B,EAAE,CAAC;YAC7C,CAAC;QACH,CAAC;QACD,GAAG,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAC7D,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC/B,6BAA6B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAK,MAAc,CAAC,aAAa,EAAE,CAAC;YAEjC,MAAc,CAAC,aAAa,CAC3B,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAC7C,GAAG,IAAI,CAAC;QACX,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,MAAM,QAAQ,EAAE,CAAC;QACjB,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,SAAS,uBAAuB,CAAC,GAAW;IAC1C,IAAI,CAAC;QACH,OAAO,IAAI,uCAAgB,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,GAAW,EACX,GAAM;IAEN,OAAO,CACL,uBAAuB,CAAC,GAAG,CAAC;QAC1B,EAAE,iBAAiB,EAAsB;SACxC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CACpB,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,GAAW,EACX,aAAiC;IAEjC,IAAI,aAAa,CAAC,SAAS,IAAI,aAAa,CAAC,SAAS;QAAE,OAAO,IAAI,CAAC;IACpE,MAAM,EAAE,GACN,uBAAuB,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAsB,CAAC;IACxE,OAAO,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC;AAC/D,CAAC;AAED,SAAgB,eAAe,CAC7B,GAAW,EACX,aAAiC;IAEjC,IACE,CAAC,aAAa,CAAC,aAAa;QAC1B,aAAa,CAAC,aAAa,KAAK,cAAc,CAAC;QACjD,aAAa,CAAC,uBAAuB,EAAE,WAAW;QAClD,aAAa,CAAC,uBAAuB,EAAE,aAAa,EACpD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,EAAE,GACN,uBAAuB,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAsB,CAAC;IACxE,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa,IAAI,EAAE,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC9E,OAAO,CACL,aAAa,KAAK,cAAc;QAChC,CAAC,IAAI,4DAA4B,CAAC,EAAE,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,GAAG,CACvE,aAAa,CACd,CACF,CAAC;AACJ,CAAC;AAtBD,0CAsBC;AAED,SAAS,6BAA6B,CACpC,KAA8B,EAC9B,MAAmB;IAKnB,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IACnC,MAAM,CAAC,KAAK,GAAG,KAAK,WAAW,GAAG,IAAI;QACpC,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;QAC5C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAMF,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC9D,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAC1B,iCAAiC,EACjC,gBAAgB,CACjB,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CACxB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAC3B,iCAAiC,EACjC,gBAAgB,CACjB,CACF,CAAC;AACJ,CAAC;AAED,SAAS,0BAA0B,CACjC,yBAA+D,EAC/D,YAAsC;IAEtC,MAAM,qBAAqB,GAAG,yBAAyB,EAAE,iBAAiB,CAAC;IAC3E,IAAI,OAAO,qBAAqB,KAAK,UAAU,EAAE,CAAC;QAChD,OAAO;YACL,iBAAiB,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,EAAE,CAC/C,qBAAqB,CACnB,GAAG,EACH,EAAE,GAAG,OAAO,EAAE,GAAG,YAAY,EAAE,EAC/B,GAAG,QAAQ,CACZ;SACJ,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,iBAAiB,EAAE,EAAE,GAAG,qBAAqB,EAAE,GAAG,YAAY,EAAE,EAAE,CAAC;AAC9E,CAAC"}
@@ -1,2 +1,3 @@
1
- export declare function isFastFailureConnectionError(error: Error): boolean;
1
+ export declare const isFastFailureConnectionError: (err: unknown) => boolean;
2
+ export declare const isPotentialTLSCertificateError: (err: unknown) => boolean;
2
3
  //# sourceMappingURL=fast-failure-connect.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"fast-failure-connect.d.ts","sourceRoot":"","sources":["../src/fast-failure-connect.ts"],"names":[],"mappings":"AAGA,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAWlE"}
1
+ {"version":3,"file":"fast-failure-connect.d.ts","sourceRoot":"","sources":["../src/fast-failure-connect.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,4BAA4B,QAgDhC,OAAO,KAAK,OAAO,AA9C3B,CAAC;AAsCF,eAAO,MAAM,8BAA8B,QAQlC,OAAO,KAAK,OAAO,AAN3B,CAAC"}
@@ -1,15 +1,67 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.isFastFailureConnectionError = void 0;
4
- function isFastFailureConnectionError(error) {
3
+ exports.isPotentialTLSCertificateError = exports.isFastFailureConnectionError = void 0;
4
+ function isFastFailureConnectionSingleError(error) {
5
5
  switch (error.name) {
6
6
  case 'MongoNetworkError':
7
7
  return /\b(ECONNREFUSED|ENOTFOUND|ENETUNREACH|EINVAL)\b/.test(error.message);
8
8
  case 'MongoError':
9
9
  return /The apiVersion parameter is required/.test(error.message);
10
10
  default:
11
- return false;
11
+ return (['ECONNREFUSED', 'ENOTFOUND', 'ENETUNREACH', 'EINVAL'].includes(error.code ?? '') || (0, exports.isPotentialTLSCertificateError)(error));
12
12
  }
13
13
  }
14
- exports.isFastFailureConnectionError = isFastFailureConnectionError;
14
+ exports.isFastFailureConnectionError = handleNestedErrors(isFastFailureConnectionSingleError);
15
+ function isPotentialTLSCertificateSingleError(error) {
16
+ return [
17
+ 'UNABLE_TO_GET_ISSUER_CERT',
18
+ 'UNABLE_TO_GET_CRL',
19
+ 'UNABLE_TO_DECRYPT_CERT_SIGNATURE',
20
+ 'UNABLE_TO_DECRYPT_CRL_SIGNATURE',
21
+ 'UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY',
22
+ 'CERT_SIGNATURE_FAILURE',
23
+ 'CRL_SIGNATURE_FAILURE',
24
+ 'CERT_NOT_YET_VALID',
25
+ 'CERT_HAS_EXPIRED',
26
+ 'CRL_NOT_YET_VALID',
27
+ 'CRL_HAS_EXPIRED',
28
+ 'ERROR_IN_CERT_NOT_BEFORE_FIELD',
29
+ 'ERROR_IN_CERT_NOT_AFTER_FIELD',
30
+ 'ERROR_IN_CRL_LAST_UPDATE_FIELD',
31
+ 'ERROR_IN_CRL_NEXT_UPDATE_FIELD',
32
+ 'OUT_OF_MEM',
33
+ 'DEPTH_ZERO_SELF_SIGNED_CERT',
34
+ 'SELF_SIGNED_CERT_IN_CHAIN',
35
+ 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY',
36
+ 'UNABLE_TO_VERIFY_LEAF_SIGNATURE',
37
+ 'CERT_CHAIN_TOO_LONG',
38
+ 'CERT_REVOKED',
39
+ 'INVALID_CA',
40
+ 'PATH_LENGTH_EXCEEDED',
41
+ 'INVALID_PURPOSE',
42
+ 'CERT_UNTRUSTED',
43
+ 'CERT_REJECTED',
44
+ 'HOSTNAME_MISMATCH',
45
+ ].includes(error.code ?? '');
46
+ }
47
+ exports.isPotentialTLSCertificateError = handleNestedErrors(isPotentialTLSCertificateSingleError);
48
+ function handleNestedErrors(fn) {
49
+ const checker = (err) => {
50
+ if (Object.prototype.toString.call(err).toLowerCase() !== '[object error]') {
51
+ return checker(new Error(String(err)));
52
+ }
53
+ if (!err || typeof err !== 'object')
54
+ return false;
55
+ if ('cause' in err && checker(err.cause)) {
56
+ return true;
57
+ }
58
+ if ('errors' in err &&
59
+ Array.isArray(err.errors) &&
60
+ err.errors.some((err) => checker(err))) {
61
+ return true;
62
+ }
63
+ return fn(err);
64
+ };
65
+ return checker;
66
+ }
15
67
  //# sourceMappingURL=fast-failure-connect.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"fast-failure-connect.js","sourceRoot":"","sources":["../src/fast-failure-connect.ts"],"names":[],"mappings":";;;AAGA,SAAgB,4BAA4B,CAAC,KAAY;IACvD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,mBAAmB;YACtB,OAAO,iDAAiD,CAAC,IAAI,CAC3D,KAAK,CAAC,OAAO,CACd,CAAC;QACJ,KAAK,YAAY;YACf,OAAO,sCAAsC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpE;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC;AAXD,oEAWC"}
1
+ {"version":3,"file":"fast-failure-connect.js","sourceRoot":"","sources":["../src/fast-failure-connect.ts"],"names":[],"mappings":";;;AAGA,SAAS,kCAAkC,CACzC,KAAgC;IAEhC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,KAAK,mBAAmB;YACtB,OAAO,iDAAiD,CAAC,IAAI,CAC3D,KAAK,CAAC,OAAO,CACd,CAAC;QACJ,KAAK,YAAY;YACf,OAAO,sCAAsC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpE;YACE,OAAO,CACL,CAAC,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAC7D,KAAK,CAAC,IAAI,IAAI,EAAE,CACjB,IAAI,IAAA,sCAA8B,EAAC,KAAK,CAAC,CAC3C,CAAC;IACN,CAAC;AACH,CAAC;AAEY,QAAA,4BAA4B,GAAG,kBAAkB,CAC5D,kCAAkC,CACnC,CAAC;AAEF,SAAS,oCAAoC,CAC3C,KAAgC;IAGhC,OAAO;QACL,2BAA2B;QAC3B,mBAAmB;QACnB,kCAAkC;QAClC,iCAAiC;QACjC,oCAAoC;QACpC,wBAAwB;QACxB,uBAAuB;QACvB,oBAAoB;QACpB,kBAAkB;QAClB,mBAAmB;QACnB,iBAAiB;QACjB,gCAAgC;QAChC,+BAA+B;QAC/B,gCAAgC;QAChC,gCAAgC;QAChC,YAAY;QACZ,6BAA6B;QAC7B,2BAA2B;QAC3B,mCAAmC;QACnC,iCAAiC;QACjC,qBAAqB;QACrB,cAAc;QACd,YAAY;QACZ,sBAAsB;QACtB,iBAAiB;QACjB,gBAAgB;QAChB,eAAe;QACf,mBAAmB;KACpB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAC/B,CAAC;AAEY,QAAA,8BAA8B,GAAG,kBAAkB,CAC9D,oCAAoC,CACrC,CAAC;AAIF,SAAS,kBAAkB,CACzB,EAA+C;IAE/C,MAAM,OAAO,GAAG,CAAC,GAAY,EAAW,EAAE;QACxC,IACE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,KAAK,gBAAgB,EACtE,CAAC;YACD,OAAO,OAAO,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QAClD,IAAI,OAAO,IAAI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IACE,QAAQ,IAAI,GAAG;YACf,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;YACzB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EACtC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAE,CAAC,GAAY,CAAC,CAAC;IAC1B,CAAC,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export * from './types';
2
2
  export { connectMongoClient } from './connect';
3
- export type { DevtoolsConnectOptions, DevtoolsConnectionState, DevtoolsProxyOptions, AgentWithInitialize, } from './connect';
3
+ export type { DevtoolsConnectOptions, DevtoolsConnectionState, DevtoolsProxyOptions, AgentWithInitialize, ConnectMongoClientResult, } from './connect';
4
4
  export { hookLogger } from './log-hook';
5
5
  export { oidcServerRequestHandler } from './oidc/handler';
6
6
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,YAAY,EACV,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,YAAY,EACV,sBAAsB,EACtB,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC"}
package/dist/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;AAO3B,uCAAwC;AAA/B,sGAAA,UAAU,OAAA;AACnB,0CAA0D;AAAjD,mHAAA,wBAAwB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA;AAQ3B,uCAAwC;AAA/B,sGAAA,UAAU,OAAA;AACnB,0CAA0D;AAAjD,mHAAA,wBAAwB,OAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"log-hook.d.ts","sourceRoot":"","sources":["../src/log-hook.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EASV,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAKjB,UAAU,cAAc;IACtB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IACzE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IACzE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC1E,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;CAC7C;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,cAAc,EACnB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAC5C,IAAI,CAqJN"}
1
+ {"version":3,"file":"log-hook.d.ts","sourceRoot":"","sources":["../src/log-hook.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EASV,iBAAiB,EAElB,MAAM,SAAS,CAAC;AAKjB,UAAU,cAAc;IACtB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IACzE,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IACzE,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC;IAC1E,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;CAC7C;AAED,wBAAgB,UAAU,CACxB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,cAAc,EACnB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAC5C,IAAI,CAoKN"}
package/dist/log-hook.js CHANGED
@@ -66,6 +66,11 @@ function hookLogger(emitter, log, contextPrefix, redactURICredentials) {
66
66
  messages: ev.messages,
67
67
  });
68
68
  });
69
+ emitter.on('devtools-connect:retry-after-tls-error', function (ev) {
70
+ log.info('DEVTOOLS-CONNECT', mongoLogId(1000000054), `${contextPrefix}-connect`, 'Restarting connection attempt after TLS error', {
71
+ error: ev.error,
72
+ });
73
+ });
69
74
  }
70
75
  exports.hookLogger = hookLogger;
71
76
  //# sourceMappingURL=log-hook.js.map
@@ -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/dist/types.d.ts CHANGED
@@ -51,6 +51,9 @@ export interface ConnectUsedSystemCAEvent {
51
51
  systemCertsError: Error | undefined;
52
52
  messages: string[];
53
53
  }
54
+ export interface ConnectRetryAfterTLSErrorEvent {
55
+ error: string;
56
+ }
54
57
  export interface ConnectEventMap extends MongoDBOIDCLogEventsMap, ProxyEventMap {
55
58
  'devtools-connect:connect-attempt-initialized': (ev: ConnectAttemptInitializedEvent) => void;
56
59
  'devtools-connect:connect-heartbeat-failure': (ev: ConnectHeartbeatFailureEvent) => void;
@@ -61,6 +64,7 @@ export interface ConnectEventMap extends MongoDBOIDCLogEventsMap, ProxyEventMap
61
64
  'devtools-connect:resolve-srv-succeeded': (ev: ConnectResolveSrvSucceededEvent) => void;
62
65
  'devtools-connect:missing-optional-dependency': (ev: ConnectMissingOptionalDependencyEvent) => void;
63
66
  'devtools-connect:used-system-ca': (ev: ConnectUsedSystemCAEvent) => void;
67
+ 'devtools-connect:retry-after-tls-error': (ev: ConnectRetryAfterTLSErrorEvent) => void;
64
68
  }
65
69
  export type ConnectEventArgs<K extends keyof ConnectEventMap> = ConnectEventMap[K] extends (...args: infer P) => any ? P : never;
66
70
  export interface ConnectLogEmitter {
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAEvE,MAAM,WAAW,8BAA8B;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1C,sBAAsB,EAAE,MAAM,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,2BAA2B;IAC1C,yBAAyB,CAAC,EAAE;QAC1B,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;KACpB,GAAG,IAAI,CAAC;CACV;AAED,MAAM,WAAW,4BAA4B;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,8BAA8B;IAC7C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,0BAA0B,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,+BAA+B;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,iBAAiB,EAAE,0BAA0B,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,qCAAqC;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,EAAE,KAAK,GAAG,SAAS,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,SAAS,CAAC;IACpC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,eACf,SAAQ,uBAAuB,EAC7B,aAAa;IAEf,8CAA8C,EAAE,CAC9C,EAAE,EAAE,8BAA8B,KAC/B,IAAI,CAAC;IAEV,4CAA4C,EAAE,CAC5C,EAAE,EAAE,4BAA4B,KAC7B,IAAI,CAAC;IAEV,8CAA8C,EAAE,CAC9C,EAAE,EAAE,8BAA8B,KAC/B,IAAI,CAAC;IAEV,qCAAqC,EAAE,MAAM,IAAI,CAAC;IAElD,2CAA2C,EAAE,CAC3C,EAAE,EAAE,2BAA2B,KAC5B,IAAI,CAAC;IAEV,oCAAoC,EAAE,CACpC,EAAE,EAAE,2BAA2B,KAC5B,IAAI,CAAC;IAEV,wCAAwC,EAAE,CACxC,EAAE,EAAE,+BAA+B,KAChC,IAAI,CAAC;IAEV,8CAA8C,EAAE,CAC9C,EAAE,EAAE,qCAAqC,KACtC,IAAI,CAAC;IAEV,iCAAiC,EAAE,CAAC,EAAE,EAAE,wBAAwB,KAAK,IAAI,CAAC;CAC3E;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,SAAS,MAAM,eAAe,IAC1D,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC;AAEnE,MAAM,WAAW,iBAAiB;IAEhC,EAAE,CAAC,CAAC,SAAS,MAAM,eAAe,EAChC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,GAC3B,IAAI,CAAC;IACR,GAAG,CAAC,CAAC,CAAC,SAAS,MAAM,eAAe,EAClC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,GAC3B,IAAI,CAAC;IACR,IAAI,CAAC,CAAC,SAAS,MAAM,eAAe,EAClC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,GAC3B,IAAI,CAAC;IACR,IAAI,CAAC,CAAC,SAAS,MAAM,eAAe,EAClC,KAAK,EAAE,CAAC,EACR,GAAG,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC3B,OAAO,CAAC;CACZ"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongodb-js/devtools-connect",
3
- "version": "3.3.3",
3
+ "version": "3.4.0",
4
4
  "description": "A connection establishment utility for MongoDB developer tools",
5
5
  "homepage": "https://github.com/mongodb-js/devtools-shared/tree/main/packages/devtools-connect",
6
6
  "repository": {
@@ -56,7 +56,7 @@
56
56
  "peerDependencies": {
57
57
  "@mongodb-js/oidc-plugin": "^1.1.0",
58
58
  "mongodb": "^6.9.0",
59
- "mongodb-log-writer": "^1.4.2"
59
+ "mongodb-log-writer": "^2.1.0"
60
60
  },
61
61
  "devDependencies": {
62
62
  "@mongodb-js/oidc-plugin": "^1.1.0",
@@ -76,7 +76,7 @@
76
76
  "gen-esm-wrapper": "^1.1.0",
77
77
  "mocha": "^8.4.0",
78
78
  "mongodb": "^6.9.0",
79
- "mongodb-log-writer": "^1.4.2",
79
+ "mongodb-log-writer": "^2.1.0",
80
80
  "nyc": "^15.1.0",
81
81
  "os-dns-native": "^1.2.0",
82
82
  "resolve-mongodb-srv": "^1.1.1",
@@ -91,5 +91,5 @@
91
91
  "os-dns-native": "^1.2.0",
92
92
  "resolve-mongodb-srv": "^1.1.1"
93
93
  },
94
- "gitHead": "29ceeb5f51d29883d4a69c83e68ad37b0965d49e"
94
+ "gitHead": "409286ec2b2ac665897210ea27be6c54ebda76d6"
95
95
  }