Skip to content

fix(connection-model): try catch os dns native MONGOSH-1080 #2759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2022
Merged

fix(connection-model): try catch os dns native MONGOSH-1080 #2759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions packages/connection-model/lib/model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,19 @@ const AmpersandModel = require('ampersand-model');
const AmpersandCollection = require('ampersand-rest-collection');
const { ReadPreference } = require('mongodb');
const { parseConnectionString } = require('mongodb3/lib/core');
const resolveMongodbSrv = require('resolve-mongodb-srv');
const ConnectionString = require('mongodb-connection-string-url').default;
const osDns = require('os-dns-native');
const dataTypes = require('./data-types');
const localPortGenerator = require('./local-port-generator');

const resolveMongodbSrv = require('resolve-mongodb-srv');
const resolveOptions = {};
try {
const osDns = require('os-dns-native');
resolveOptions.dns = osDns.withNodeFallback;
} catch (e) {
console.error(e);
}

/**
* Defining constants.
*/
Expand Down Expand Up @@ -1103,9 +1110,7 @@ async function createConnectionFromUrl(url) {
// https://jira.mongodb.org/browse/COMPASS-4768
// so we may want to keep it around anyway.
const unescapedUrl = unescape(url);
const resolvedUrl = await resolveMongodbSrv(unescapedUrl, {
dns: osDns.withNodeFallback
});
const resolvedUrl = await resolveMongodbSrv(unescapedUrl, resolveOptions);
const parsed = await parseConnectionStringAsPromise(resolvedUrl);
const isSrvRecord = unescapedUrl.startsWith('mongodb+srv://');
const attrs = Object.assign(
Expand Down