diff --git a/packages/logging/package-lock.json b/packages/logging/package-lock.json index 15fe4b6750..30ff45ca24 100644 --- a/packages/logging/package-lock.json +++ b/packages/logging/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@mongodb-js/devtools-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.0.0.tgz", - "integrity": "sha512-+UcVZK8FPFTvOs1VW/RSG0/vR6vAazBwj43FgQLpvfTEJk0MSRpq9F/p+R/g11FLQ+9FTbWsa5lUv+bshAA3Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.1.1.tgz", + "integrity": "sha512-rJL+qF+fMr2/zwJ7WPO4IV4JmJz4Szx0lsuHzvlxQ+OtqAjGgQvg7eT+Ng9sSaZsn4OFAQ30qH9HIkLSVFkZHQ==", "requires": { - "os-dns-native": "^1.0.4", + "os-dns-native": "^1.1.1", "resolve-mongodb-srv": "^1.1.1" } }, @@ -89,9 +89,9 @@ "optional": true }, "os-dns-native": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.0.4.tgz", - "integrity": "sha512-it4uGZMVDQNnD3WHRzegtTKe+o1E+99N6WzeSgH/buHr403RR0gjvzdwbwtmWKl34l8Ujpkh1Siqim2dsVplNw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.1.1.tgz", + "integrity": "sha512-K+ZTJQhzsKqjMvyuSz2Tzv7WX2cTxRR+0qNKVYGfbHNBCsyoN380oYzdVQP6J2wlajtOJQoIQcP2bpg+8njbaA==", "optional": true, "requires": { "bindings": "^1.5.0", diff --git a/packages/logging/package.json b/packages/logging/package.json index fb50e80ab6..3a50bdc638 100644 --- a/packages/logging/package.json +++ b/packages/logging/package.json @@ -17,7 +17,7 @@ "node": ">=12.4.0" }, "dependencies": { - "@mongodb-js/devtools-connect": "^1.0.0", + "@mongodb-js/devtools-connect": "^1.1.1", "@mongosh/errors": "0.0.0-dev.0", "@mongosh/history": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", diff --git a/packages/logging/src/setup-logger-and-telemetry.spec.ts b/packages/logging/src/setup-logger-and-telemetry.spec.ts index 810f057ce0..6240382338 100644 --- a/packages/logging/src/setup-logger-and-telemetry.spec.ts +++ b/packages/logging/src/setup-logger-and-telemetry.spec.ts @@ -102,8 +102,17 @@ describe('setupLoggerAndTelemetry', () => { bus.emit('devtools-connect:connect-heartbeat-succeeded', { connectionId: 'localhost' }); bus.emit('devtools-connect:connect-fail-early'); bus.emit('devtools-connect:connect-attempt-finished'); - bus.emit('devtools-connect:resolve-srv-error', { from: 'mongodb+srv://foo:bar@hello.world/', error: new Error('failed'), duringLoad: false }); - bus.emit('devtools-connect:resolve-srv-succeeded', { from: 'mongodb+srv://foo:bar@hello.world/', to: 'mongodb://foo:bar@db.hello.world/' }); + bus.emit('devtools-connect:resolve-srv-error', { + from: 'mongodb+srv://foo:bar@hello.world/', + error: new Error('failed'), + duringLoad: false, + resolutionDetails: [] + }); + bus.emit('devtools-connect:resolve-srv-succeeded', { + from: 'mongodb+srv://foo:bar@hello.world/', + to: 'mongodb://foo:bar@db.hello.world/', + resolutionDetails: [] + }); bus.emit('devtools-connect:missing-optional-dependency', { name: 'kerberos', error: new Error('no kerberos') }); bus.emit('mongosh-sp:reset-connection-options'); @@ -201,9 +210,9 @@ describe('setupLoggerAndTelemetry', () => { expect(logOutput[i++].msg).to.equal('Aborting connection attempt as irrecoverable'); expect(logOutput[i++].msg).to.equal('Connection attempt finished'); expect(logOutput[i].msg).to.equal('Resolving SRV record failed'); - expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://@hello.world/', error: 'failed', duringLoad: false }); + expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://@hello.world/', error: 'failed', duringLoad: false, resolutionDetails: [] }); expect(logOutput[i].msg).to.equal('Resolving SRV record succeeded'); - expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://@hello.world/', to: 'mongodb://@db.hello.world/' }); + expect(logOutput[i++].attr).to.deep.equal({ from: 'mongodb+srv://@hello.world/', to: 'mongodb://@db.hello.world/', resolutionDetails: [] }); expect(logOutput[i].msg).to.equal('Missing optional dependency'); expect(logOutput[i++].attr).to.deep.equal({ name: 'kerberos', error: 'no kerberos' }); expect(logOutput[i++].msg).to.equal('Reconnect because of changed connection options'); diff --git a/packages/node-runtime-worker-thread/webpack.config.js b/packages/node-runtime-worker-thread/webpack.config.js index 67c737d1f2..ca9a00fed9 100644 --- a/packages/node-runtime-worker-thread/webpack.config.js +++ b/packages/node-runtime-worker-thread/webpack.config.js @@ -42,7 +42,8 @@ const config = { 'mongodb-client-encryption': 'commonjs2 mongodb-client-encryption', kerberos: 'commonjs2 kerberos', snappy: 'commonjs2 snappy', - interruptor: 'commonjs2 interruptor' + interruptor: 'commonjs2 interruptor', + 'os-dns-native': 'commonjs2 os-dns-native', } }; diff --git a/packages/service-provider-server/package-lock.json b/packages/service-provider-server/package-lock.json index 201e6f96a4..b4618b4599 100644 --- a/packages/service-provider-server/package-lock.json +++ b/packages/service-provider-server/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@mongodb-js/devtools-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.0.0.tgz", - "integrity": "sha512-+UcVZK8FPFTvOs1VW/RSG0/vR6vAazBwj43FgQLpvfTEJk0MSRpq9F/p+R/g11FLQ+9FTbWsa5lUv+bshAA3Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.1.1.tgz", + "integrity": "sha512-rJL+qF+fMr2/zwJ7WPO4IV4JmJz4Szx0lsuHzvlxQ+OtqAjGgQvg7eT+Ng9sSaZsn4OFAQ30qH9HIkLSVFkZHQ==", "requires": { - "os-dns-native": "^1.0.4", + "os-dns-native": "^1.1.1", "resolve-mongodb-srv": "^1.1.1" } }, @@ -471,9 +471,9 @@ } }, "os-dns-native": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.0.4.tgz", - "integrity": "sha512-it4uGZMVDQNnD3WHRzegtTKe+o1E+99N6WzeSgH/buHr403RR0gjvzdwbwtmWKl34l8Ujpkh1Siqim2dsVplNw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.1.1.tgz", + "integrity": "sha512-K+ZTJQhzsKqjMvyuSz2Tzv7WX2cTxRR+0qNKVYGfbHNBCsyoN380oYzdVQP6J2wlajtOJQoIQcP2bpg+8njbaA==", "optional": true, "requires": { "bindings": "^1.5.0", diff --git a/packages/service-provider-server/package.json b/packages/service-provider-server/package.json index be692008d3..6b38e953cd 100644 --- a/packages/service-provider-server/package.json +++ b/packages/service-provider-server/package.json @@ -38,7 +38,7 @@ ] }, "dependencies": { - "@mongodb-js/devtools-connect": "^1.0.0", + "@mongodb-js/devtools-connect": "^1.1.1", "@mongosh/errors": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", diff --git a/packages/types/package-lock.json b/packages/types/package-lock.json index 8148ff7dcf..f364220de2 100644 --- a/packages/types/package-lock.json +++ b/packages/types/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@mongodb-js/devtools-connect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.0.0.tgz", - "integrity": "sha512-+UcVZK8FPFTvOs1VW/RSG0/vR6vAazBwj43FgQLpvfTEJk0MSRpq9F/p+R/g11FLQ+9FTbWsa5lUv+bshAA3Aw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.1.1.tgz", + "integrity": "sha512-rJL+qF+fMr2/zwJ7WPO4IV4JmJz4Szx0lsuHzvlxQ+OtqAjGgQvg7eT+Ng9sSaZsn4OFAQ30qH9HIkLSVFkZHQ==", "requires": { - "os-dns-native": "^1.0.4", + "os-dns-native": "^1.1.1", "resolve-mongodb-srv": "^1.1.1" } }, @@ -47,9 +47,9 @@ "optional": true }, "os-dns-native": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.0.4.tgz", - "integrity": "sha512-it4uGZMVDQNnD3WHRzegtTKe+o1E+99N6WzeSgH/buHr403RR0gjvzdwbwtmWKl34l8Ujpkh1Siqim2dsVplNw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/os-dns-native/-/os-dns-native-1.1.1.tgz", + "integrity": "sha512-K+ZTJQhzsKqjMvyuSz2Tzv7WX2cTxRR+0qNKVYGfbHNBCsyoN380oYzdVQP6J2wlajtOJQoIQcP2bpg+8njbaA==", "optional": true, "requires": { "bindings": "^1.5.0", diff --git a/packages/types/package.json b/packages/types/package.json index fbfca76e0b..928b062b4b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -32,6 +32,6 @@ "unitTestsOnly": true }, "dependencies": { - "@mongodb-js/devtools-connect": "^1.0.0" + "@mongodb-js/devtools-connect": "^1.1.1" } }