@mongodb-js/devtools-connect 1.0.0-beta.1 → 1.1.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.js CHANGED
@@ -65,6 +65,7 @@ async function connectWithFailFast(uri, client, logger) {
65
65
  }
66
66
  let resolveDnsHelpers;
67
67
  async function resolveMongodbSrv(uri, logger) {
68
+ const resolutionDetails = [];
68
69
  if (uri.startsWith('mongodb+srv://')) {
69
70
  try {
70
71
  resolveDnsHelpers !== null && resolveDnsHelpers !== void 0 ? resolveDnsHelpers : (resolveDnsHelpers = {
@@ -73,18 +74,40 @@ async function resolveMongodbSrv(uri, logger) {
73
74
  });
74
75
  }
75
76
  catch (error) {
76
- logger.emit('devtools-connect:resolve-srv-error', { from: '', error, duringLoad: true });
77
+ logger.emit('devtools-connect:resolve-srv-error', {
78
+ from: '', error, duringLoad: true, resolutionDetails
79
+ });
77
80
  }
78
81
  if (resolveDnsHelpers !== undefined) {
79
82
  try {
83
+ const { wasNativelyLookedUp, withNodeFallback: { resolveSrv, resolveTxt } } = resolveDnsHelpers.osDns;
80
84
  const resolved = await resolveDnsHelpers.resolve(uri, {
81
- dns: resolveDnsHelpers.osDns.withNodeFallback
85
+ dns: {
86
+ resolveSrv(hostname, cb) {
87
+ resolveSrv(hostname, (...args) => {
88
+ var _a;
89
+ resolutionDetails.push({
90
+ hostname, error: (_a = args[0]) === null || _a === void 0 ? void 0 : _a.message, wasNativelyLookedUp: wasNativelyLookedUp(args[1])
91
+ });
92
+ cb(...args);
93
+ });
94
+ },
95
+ resolveTxt(hostname, cb) {
96
+ resolveTxt(hostname, (...args) => {
97
+ var _a;
98
+ resolutionDetails.push({
99
+ hostname, error: (_a = args[0]) === null || _a === void 0 ? void 0 : _a.message, wasNativelyLookedUp: wasNativelyLookedUp(args[1])
100
+ });
101
+ cb(...args);
102
+ });
103
+ }
104
+ }
82
105
  });
83
- logger.emit('devtools-connect:resolve-srv-succeeded', { from: uri, to: resolved });
106
+ logger.emit('devtools-connect:resolve-srv-succeeded', { from: uri, to: resolved, resolutionDetails });
84
107
  return resolved;
85
108
  }
86
109
  catch (error) {
87
- logger.emit('devtools-connect:resolve-srv-error', { from: uri, error, duringLoad: false });
110
+ logger.emit('devtools-connect:resolve-srv-error', { from: uri, error, duringLoad: false, resolutionDetails });
88
111
  throw error;
89
112
  }
90
113
  }
@@ -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,iEAAsE;AAUtE,MAAa,8BAA+B,SAAQ,KAAK;IACvD;QACE,KAAK,CAAC,0EAA0E,CAAC,CAAC;IACpF,CAAC;CACF;AAJD,wEAIC;AAMD,KAAK,UAAU,mBAAmB,CAAC,GAAW,EAAE,MAAmB,EAAE,MAAyB;;IAC5F,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,MAAA,MAAM,CAAC,OAAO,CAAC,OAAO,mCAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,wBAAwB,GAAG,CAAC,EAAE,OAAO,EAAE,YAAY,EAA8B,EAAE,EAAE;;QACzF,MAAM,mBAAmB,GAAoC,MAAC,MAAc,CAAC,QAAQ,0CAAE,WAAW,CAAC;QACnG,MAAM,OAAO,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,OAAO,CAAC;QAC7C,MAAM,UAAU,GAAG,IAAA,mDAA4B,EAAC,OAAO,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,CAAC,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,GAAG,CAAC,YAAY,CAAC,CAAA,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,4CAA4C,EAAE;YACxD,YAAY;YACZ,OAAO;YACP,UAAU;YACV,aAAa;SACd,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO;SACR;QAED,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,iBAAiB,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE;gBACtE,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;gBAEnD,qBAAqB,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;aACxC;SACF;IACH,CAAC,CAAC;IAEF,MAAM,0BAA0B,GAAG,CAAC,EAAE,YAAY,EAAiC,EAAE,EAAE;QACrF,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;QAC9E,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;QACF,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;KACxB;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,qBAAqB,KAAK,IAAI,EAAE;YAClC,MAAM,qBAAqB,CAAC;YAC5B,MAAM,iBAAiB,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;SAC/C;QACD,MAAM,GAAG,CAAC;KACX;YAAS;QACR,MAAM,CAAC,cAAc,CAAC,uBAAuB,EAAE,wBAAwB,CAAC,CAAC;QACzE,MAAM,CAAC,cAAc,CAAC,0BAA0B,EAAE,0BAA0B,CAAC,CAAC;QAC9E,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;KAC1D;AACH,CAAC;AAED,IAAI,iBAGS,CAAC;AAEd,KAAK,UAAU,iBAAiB,CAAC,GAAW,EAAE,MAAyB;IACrE,MAAM,iBAAiB,GAAiC,EAAE,CAAC;IAC3D,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,IAAI;YACF,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,IAAjB,iBAAiB,GAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC;gBACvC,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC;aAChC,EAAC;SACH;QAAC,OAAO,KAAU,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE;gBAChD,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,iBAAiB;aACrD,CAAC,CAAC;SACJ;QACD,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACnC,IAAI;gBACF,MAAM,EACJ,mBAAmB,EACnB,gBAAgB,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,EAC7C,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,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAkD,EAAE,EAAE;;gCAC7E,iBAAiB,CAAC,IAAI,CAAC;oCACrB,QAAQ,EAAE,KAAK,EAAE,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iCACrF,CAAC,CAAC;gCAEH,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;4BACd,CAAC,CAAC,CAAC;wBACL,CAAC;wBACD,UAAU,CAAC,QAAgB,EAAE,EAAoC;4BAC/D,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAkD,EAAE,EAAE;;gCAC7E,iBAAiB,CAAC,IAAI,CAAC;oCACrB,QAAQ,EAAE,KAAK,EAAE,MAAA,IAAI,CAAC,CAAC,CAAC,0CAAE,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iCACrF,CAAC,CAAC;gCAEH,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;4BACd,CAAC,CAAC,CAAC;wBACL,CAAC;qBACF;iBACF,CAAC,CAAC;gBACH,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBACtG,OAAO,QAAQ,CAAC;aACjB;YAAC,OAAO,KAAU,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC,oCAAoC,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBAC9G,MAAM,KAAK,CAAC;aACb;SACF;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,uCAAuC,CAAC,MAAyB;IAExE,IAAI;QACF,OAAO,CAAC,UAAU,CAAC,CAAC;KACrB;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;KAC1F;IACD,IAAI;QACF,OAAO,CAAC,2BAA2B,CAAC,CAAC;KACtC;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,CAAC,CAAC;KAC3G;IACD,IAAI;QACF,OAAO,CAAC,eAAe,CAAC,CAAC;KAC1B;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;KAC/F;IACD,IAAI;QACF,OAAO,CAAC,qBAAqB,CAAC,CAAC;KAChC;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC,CAAC;KACrG;IACD,IAAI;QACF,OAAO,CAAC,UAAU,CAAC,CAAC;KACrB;IAAC,OAAO,KAAU,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;KAC1F;AACH,CAAC;AAOM,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,aAAiC,EACjC,MAAyB,EACzB,gBAAoC;;IACpC,uCAAuC,CAAC,MAAM,CAAC,CAAC;IAChD,IAAI,aAAa,CAAC,cAAc,KAAK,SAAS;QAC5C,CAAC,aAAa,CAAC,cAAc,CAAC,oBAAoB,EAAE;QAEpD,MAAM,iBAAiB,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;QAC/C,OAAO,iBAAiB,CAAC,cAAc,CAAC;QACxC,OAAO,iBAAiB,CAAC,SAAS,CAAC;QACnC,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAC5D,MAAM,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7E,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,IACE,CAAC,CAAC,MAAA,SAAS,CAAC,OAAO,0CAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;YAC5C,CAAC,CAAC,MAAA,SAAS,CAAC,UAAU,0CAAE,KAAK,CAAC,YAAY,CAAC,CAAC,EAC5C;YACA,MAAM,IAAI,8BAA8B,EAAE,CAAC;SAC5C;KACF;IACD,GAAG,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACxD,MAAM,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC;AAChB,CAAC;AA3BD,gDA2BC"}
package/lib/log-hook.d.ts CHANGED
@@ -1,3 +1,9 @@
1
1
  import type { ConnectLogEmitter } from './types';
2
- import { MongoLogWriter } from 'mongodb-log-writer';
2
+ interface MongoLogWriter {
3
+ info(c: string, id: unknown, ctx: string, msg: string, attr?: any): void;
4
+ warn(c: string, id: unknown, ctx: string, msg: string, attr?: any): void;
5
+ error(c: string, id: unknown, ctx: string, msg: string, attr?: any): void;
6
+ mongoLogId(id: number): unknown;
7
+ }
3
8
  export declare function hookLogger(emitter: ConnectLogEmitter, log: MongoLogWriter, contextPrefix: string, redactURICredentials: (uri: string) => string): void;
9
+ export {};
package/lib/log-hook.js CHANGED
@@ -1,49 +1,48 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.hookLogger = void 0;
4
- const mongodb_log_writer_1 = require("mongodb-log-writer");
5
4
  function hookLogger(emitter, log, contextPrefix, redactURICredentials) {
5
+ const { mongoLogId } = log;
6
6
  emitter.on('devtools-connect:connect-attempt-initialized', function (ev) {
7
- log.info('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000042), `${contextPrefix}-connect`, 'Initiating connection attempt', {
7
+ log.info('DEVTOOLS-CONNECT', mongoLogId(1000000042), `${contextPrefix}-connect`, 'Initiating connection attempt', {
8
8
  ...ev,
9
9
  uri: redactURICredentials(ev.uri)
10
10
  });
11
11
  });
12
12
  emitter.on('devtools-connect:connect-heartbeat-failure', function (ev) {
13
13
  var _a;
14
- log.warn('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000034), `${contextPrefix}-connect`, 'Server heartbeat failure', {
14
+ log.warn('DEVTOOLS-CONNECT', mongoLogId(1000000034), `${contextPrefix}-connect`, 'Server heartbeat failure', {
15
15
  ...ev,
16
16
  failure: (_a = ev.failure) === null || _a === void 0 ? void 0 : _a.message
17
17
  });
18
18
  });
19
19
  emitter.on('devtools-connect:connect-heartbeat-succeeded', function (ev) {
20
- log.info('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000035), `${contextPrefix}-connect`, 'Server heartbeat succeeded', ev);
20
+ log.info('DEVTOOLS-CONNECT', mongoLogId(1000000035), `${contextPrefix}-connect`, 'Server heartbeat succeeded', ev);
21
21
  });
22
22
  emitter.on('devtools-connect:connect-fail-early', function () {
23
- log.warn('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000036), `${contextPrefix}-connect`, 'Aborting connection attempt as irrecoverable');
23
+ log.warn('DEVTOOLS-CONNECT', mongoLogId(1000000036), `${contextPrefix}-connect`, 'Aborting connection attempt as irrecoverable');
24
24
  });
25
25
  emitter.on('devtools-connect:connect-attempt-finished', function () {
26
- log.info('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000037), `${contextPrefix}-connect`, 'Connection attempt finished');
26
+ log.info('DEVTOOLS-CONNECT', mongoLogId(1000000037), `${contextPrefix}-connect`, 'Connection attempt finished');
27
27
  });
28
28
  emitter.on('devtools-connect:resolve-srv-error', function (ev) {
29
29
  var _a;
30
- log.error('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000038), `${contextPrefix}-connect`, 'Resolving SRV record failed', {
30
+ log.error('DEVTOOLS-CONNECT', mongoLogId(1000000038), `${contextPrefix}-connect`, 'Resolving SRV record failed', {
31
31
  from: redactURICredentials(ev.from),
32
32
  error: (_a = ev.error) === null || _a === void 0 ? void 0 : _a.message,
33
- duringLoad: ev.duringLoad
33
+ duringLoad: ev.duringLoad,
34
+ resolutionDetails: ev.resolutionDetails
34
35
  });
35
36
  });
36
37
  emitter.on('devtools-connect:resolve-srv-succeeded', function (ev) {
37
- log.info('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000039), `${contextPrefix}-connect`, 'Resolving SRV record succeeded', {
38
+ log.info('DEVTOOLS-CONNECT', mongoLogId(1000000039), `${contextPrefix}-connect`, 'Resolving SRV record succeeded', {
38
39
  from: redactURICredentials(ev.from),
39
- to: redactURICredentials(ev.to)
40
+ to: redactURICredentials(ev.to),
41
+ resolutionDetails: ev.resolutionDetails
40
42
  });
41
43
  });
42
- emitter.on('devtools-connect:reset-connection-options', function () {
43
- log.info('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000040), `${contextPrefix}-connect`, 'Reconnect because of changed connection options');
44
- });
45
44
  emitter.on('devtools-connect:missing-optional-dependency', function (ev) {
46
- log.error('DEVTOOLS-CONNECT', (0, mongodb_log_writer_1.mongoLogId)(1000000041), `${contextPrefix}-deps`, 'Missing optional dependency', {
45
+ log.error('DEVTOOLS-CONNECT', mongoLogId(1000000041), `${contextPrefix}-deps`, 'Missing optional dependency', {
47
46
  name: ev.name,
48
47
  error: ev === null || ev === void 0 ? void 0 : ev.error.message
49
48
  });
@@ -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
@@ -16,14 +16,21 @@ export interface ConnectHeartbeatFailureEvent {
16
16
  export interface ConnectHeartbeatSucceededEvent {
17
17
  connectionId: string;
18
18
  }
19
+ export interface ConnectDnsResolutionDetail {
20
+ hostname: string;
21
+ error?: string;
22
+ wasNativelyLookedUp?: boolean;
23
+ }
19
24
  export interface ConnectResolveSrvErrorEvent {
20
25
  from: string;
21
26
  error: Error;
22
27
  duringLoad: boolean;
28
+ resolutionDetails: ConnectDnsResolutionDetail[];
23
29
  }
24
30
  export interface ConnectResolveSrvSucceededEvent {
25
31
  from: string;
26
32
  to: string;
33
+ resolutionDetails: ConnectDnsResolutionDetail[];
27
34
  }
28
35
  export interface ConnectMissingOptionalDependencyEvent {
29
36
  name: string;
@@ -37,7 +44,6 @@ export interface ConnectEventMap {
37
44
  'devtools-connect:connect-attempt-finished': () => void;
38
45
  'devtools-connect:resolve-srv-error': (ev: ConnectResolveSrvErrorEvent) => void;
39
46
  'devtools-connect:resolve-srv-succeeded': (ev: ConnectResolveSrvSucceededEvent) => void;
40
- 'devtools-connect:reset-connection-options': () => void;
41
47
  'devtools-connect:missing-optional-dependency': (ev: ConnectMissingOptionalDependencyEvent) => void;
42
48
  }
43
49
  export interface ConnectLogEmitter {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongodb-js/devtools-connect",
3
- "version": "1.0.0-beta.1",
3
+ "version": "1.1.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": {
@@ -37,7 +37,7 @@
37
37
  "dependencies": {},
38
38
  "peerDependencies": {
39
39
  "mongodb": "^4.2.2",
40
- "mongodb-log-writer": "^1.0.3"
40
+ "mongodb-log-writer": "^1.1.3"
41
41
  },
42
42
  "devDependencies": {
43
43
  "@types/mocha": "^9.0.0",
@@ -57,7 +57,7 @@
57
57
  "mocha": "^9.1.1",
58
58
  "mongodb": "^4.2.2",
59
59
  "mongodb-connection-string-url": "^2.3.2",
60
- "mongodb-log-writer": "^1.0.3",
60
+ "mongodb-log-writer": "^1.1.3",
61
61
  "nyc": "^15.1.0",
62
62
  "sinon-chai": "^3.7.0",
63
63
  "ts-node": "^10.2.1",
@@ -65,7 +65,7 @@
65
65
  "typescript": "^4.5.4"
66
66
  },
67
67
  "optionalDependencies": {
68
- "os-dns-native": "^1.0.4",
68
+ "os-dns-native": "^1.1.0",
69
69
  "resolve-mongodb-srv": "^1.1.1"
70
70
  }
71
71
  }