Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/data-service/src/connection-storage.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ describe('ConnectionStorage', function () {
id,
connectionOptions: {
connectionString:
'mongodb://localhost:27017/?readPreference=primary&ssl=false',
'mongodb://localhost:27017/?readPreference=primary&ssl=false&directConnection=true',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,97 @@ describe('LegacyConnectionModel', function () {
expect(id).to.deep.equal('1234-1234-1234-1234');
});

it('add directConnection=true if is a single one host', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017/admin',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.get('directConnection')
).to.equal('true');
});

it('does not alter directConnection=true', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017/admin?directConnection=true',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.get('directConnection')
).to.equal('true');
});

it('does not alter directConnection=false', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017/admin?directConnection=false',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.get('directConnection')
).to.equal('false');
});

it('does not add directConnection=true if replicaSet', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017/admin?replicaSet=rs1',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.has('directConnection')
).to.be.false;
});

it('does not add directConnection=true if srv', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb+srv://compass-data-sets.e06dc.mongodb.net',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.has('directConnection')
).to.be.false;
});

it('does not add directConnection=true if loadBalanced', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017/admin?loadBalanced=true',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.has('directConnection')
).to.be.false;
});

it('does not add directConnection=true if multiple hosts', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017,localhost2:27017/admin',
{ _id: '1234-1234-1234-1234' }
);

expect(
new ConnectionString(
connectionOptions.connectionString
).searchParams.has('directConnection')
).to.be.false;
});

it('removes appName if matches MongoDB Compass', async function () {
const { connectionOptions } = await createAndConvertModel(
'mongodb://localhost:27017/admin?appName=MongoDB+Compass',
Expand Down
36 changes: 35 additions & 1 deletion packages/data-service/src/legacy/legacy-connection-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,41 @@ export function convertConnectionModelToInfo(
info.lastUsed = legacyModel.lastUsed;
}

return deleteCompassAppNameParam(info);
return deleteCompassAppNameParam(setDirectConnectionForSingleHosts(info));
}

function setDirectConnectionForSingleHosts(connectionInfo: ConnectionInfo) {
let connectionStringUrl;

try {
connectionStringUrl = new ConnectionString(
connectionInfo.connectionOptions.connectionString,
{ looseValidation: true }
);
} catch {
return connectionInfo;
}

const isLoadBalanced =
connectionStringUrl.searchParams.get('loadBalanced') === 'true';
const isReplicaSet =
connectionStringUrl.isSRV ||
connectionStringUrl.hosts.length > 1 ||
connectionStringUrl.searchParams.has('replicaSet');
const hasDirectConnection =
connectionStringUrl.searchParams.has('directConnection');

if (!isReplicaSet && !isLoadBalanced && !hasDirectConnection) {
connectionStringUrl.searchParams.set('directConnection', 'true');
}

return {
...connectionInfo,
connectionOptions: {
...connectionInfo.connectionOptions,
connectionString: connectionStringUrl.href,
},
};
}

function setConnectionStringParam<K extends keyof MongoClientOptions>(
Expand Down