chore: Inherit always preconfigured default driver options

The driver options can not be sent by the agent, so we are going to
use the ones specified in the CLI arguments / ENV Vars. This is
relevant because new connections should use any inherited
configuration like TLS settings or FIPS by default.

Author: kmruiz

src/common/config.ts

@@ -2,7 +2,7 @@ import path from "path";
 import os from "os";
 import argv from "yargs-parser";
 import type { CliOptions } from "@mongosh/arg-parser";
-import { ReadConcernLevel, ReadPreferenceMode, W } from "mongodb";
+import type { ConnectionInfo } from "@mongosh/arg-parser";
 
 // From: https://github.com/mongodb-js/mongosh/blob/main/packages/cli-repl/src/arg-parser.ts
 const OPTIONS = {
@@ -98,13 +98,6 @@ function isConnectionSpecifier(arg: string | undefined): boolean {
     );
 }
 
-export interface ConnectOptions {
-    readConcern: ReadConcernLevel;
-    readPreference: ReadPreferenceMode;
-    writeConcern: W;
-    timeoutMS: number;
-}
-
 // If we decide to support non-string config options, we'll need to extend the mechanism for parsing
 // env variables.
 export interface UserConfig extends CliOptions {
@@ -117,7 +110,6 @@ export interface UserConfig extends CliOptions {
     exportTimeoutMs: number;
     exportCleanupIntervalMs: number;
     connectionString?: string;
-    connectOptions: ConnectOptions;
     disabledTools: Array<string>;
     readOnly?: boolean;
     indexCheck?: boolean;
@@ -135,12 +127,6 @@ const defaults: UserConfig = {
     exportsPath: getExportsPath(),
     exportTimeoutMs: 300000, // 5 minutes
     exportCleanupIntervalMs: 120000, // 2 minutes
-    connectOptions: {
-        readConcern: "local",
-        readPreference: "secondaryPreferred",
-        writeConcern: "majority",
-        timeoutMS: 30_000,
-    },
     disabledTools: [],
     telemetry: "enabled",
     readOnly: false,
@@ -165,6 +151,19 @@ function getLocalDataPath(): string {
         : path.join(os.homedir(), ".mongodb");
 }
 
+export const defaultDriverOptions: ConnectionInfo["driverOptions"] = {
+    readConcern: {
+        level: "local",
+    },
+    readPreference: "secondaryPreferred",
+    writeConcern: {
+        w: "majority",
+    },
+    timeoutMS: 30_000,
+    proxy: { useEnvironmentVariableProxies: true },
+    applyProxyToOIDC: true,
+};
+
 function getLogPath(): string {
     const logPath = path.join(getLocalDataPath(), "mongodb-mcp", ".app-logs");
     return logPath;
@@ -302,3 +301,16 @@ export function setupUserConfig({
 
     return userConfig;
 }
+
+/**
+                   readConcern: {
+                    level: settings.readConcern,
+                },
+                readPreference: settings.readPreference,
+                writeConcern: {
+                    w: settings.writeConcern,
+                },
+                timeoutMS: settings.timeoutMS,
+                proxy: { useEnvironmentVariableProxies: true },
+                applyProxyToOIDC: true,
+**/

src/common/connectionManager.ts

@@ -1,4 +1,4 @@
-import { ConnectOptions } from "./config.js";
+import { defaultDriverOptions } from "./config.js";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import EventEmitter from "events";
 import { setAppNameParamIfMissing } from "../helpers/connectionOptions.js";
@@ -14,7 +14,7 @@ export interface AtlasClusterConnectionInfo {
     expiryDate: Date;
 }
 
-export interface ConnectionSettings extends ConnectOptions {
+export interface ConnectionSettings {
     connectionString: string;
     atlas?: AtlasClusterConnectionInfo;
 }
@@ -70,6 +70,7 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
 
     constructor() {
         super();
+
         this.state = { tag: "disconnected" };
     }
 
@@ -91,16 +92,7 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
             serviceProvider = await NodeDriverServiceProvider.connect(settings.connectionString, {
                 productDocsLink: "https://github.com/mongodb-js/mongodb-mcp-server/",
                 productName: "MongoDB MCP",
-                readConcern: {
-                    level: settings.readConcern,
-                },
-                readPreference: settings.readPreference,
-                writeConcern: {
-                    w: settings.writeConcern,
-                },
-                timeoutMS: settings.timeoutMS,
-                proxy: { useEnvironmentVariableProxies: true },
-                applyProxyToOIDC: true,
+                ...defaultDriverOptions,
             });
         } catch (error: unknown) {
             const errorReason = error instanceof Error ? error.message : `${error as string}`;

src/index.ts

@@ -111,15 +111,15 @@ function assertFIPSMode() {
 }
 
 function assertHelpMode() {
-    if (!!config.help) {
+    if (config.help) {
         console.log("For usage information refer to the README.md:");
         console.log("https://github.com/mongodb-js/mongodb-mcp-server?tab=readme-ov-file#quick-start");
         process.exit(0);
     }
 }
 
 function assertVersionMode() {
-    if (!!config.version) {
+    if (config.version) {
         console.log(packageInfo.version);
         process.exit(0);
     }

src/resources/common/config.ts

@@ -1,4 +1,5 @@
 import { ReactiveResource } from "../resource.js";
+import { defaultDriverOptions } from "../../common/config.js";
 import type { UserConfig } from "../../common/config.js";
 import type { Telemetry } from "../../telemetry/telemetry.js";
 import type { Session } from "../../lib.js";
@@ -37,7 +38,7 @@ export class ConfigResource extends ReactiveResource<UserConfig, readonly []> {
             connectionString: this.current.connectionString
                 ? "set; access to MongoDB tools are currently available to use"
                 : "not set; before using any MongoDB tool, you need to configure a connection string, alternatively you can setup MongoDB Atlas access, more info at 'https://github.com/mongodb-js/mongodb-mcp-server'.",
-            connectOptions: this.current.connectOptions,
+            connectOptions: defaultDriverOptions,
             atlas:
                 this.current.apiClientId && this.current.apiClientSecret
                     ? "set; MongoDB Atlas tools are currently available to use"

src/server.ts

@@ -221,7 +221,6 @@ export class Server {
             try {
                 await this.session.connectToMongoDB({
                     connectionString: this.userConfig.connectionString,
-                    ...this.userConfig.connectOptions,
                 });
             } catch (error) {
                 console.error(

src/tools/atlas/connect/connectCluster.ts

@@ -139,7 +139,7 @@ export class ConnectClusterTool extends AtlasToolBase {
             try {
                 lastError = undefined;
 
-                await this.session.connectToMongoDB({ connectionString, ...this.config.connectOptions, atlas });
+                await this.session.connectToMongoDB({ connectionString, atlas });
                 break;
             } catch (err: unknown) {
                 const error = err instanceof Error ? err : new Error(String(err));

src/tools/mongodb/mongodbTool.ts

@@ -118,7 +118,7 @@ export abstract class MongoDBToolBase extends ToolBase {
     }
 
     protected connectToMongoDB(connectionString: string): Promise<void> {
-        return this.session.connectToMongoDB({ connectionString, ...this.config.connectOptions });
+        return this.session.connectToMongoDB({ connectionString });
     }
 
     protected resolveTelemetryMetadata(

tests/integration/common/connectionManager.test.ts

@@ -6,7 +6,6 @@ import {
 } from "../../../src/common/connectionManager.js";
 import { describeWithMongoDB } from "../tools/mongodb/mongodbHelpers.js";
 import { describe, beforeEach, expect, it, vi, afterEach } from "vitest";
-import { config } from "../../../src/common/config.js";
 
 describeWithMongoDB("Connection Manager", (integration) => {
     function connectionManager(): ConnectionManager {
@@ -48,7 +47,6 @@ describeWithMongoDB("Connection Manager", (integration) => {
 
             await connectionManager().connect({
                 connectionString: integration.connectionString(),
-                ...integration.mcpServer().userConfig.connectOptions,
             });
         });
 
@@ -88,7 +86,6 @@ describeWithMongoDB("Connection Manager", (integration) => {
             beforeEach(async () => {
                 await connectionManager().connect({
                     connectionString: integration.connectionString(),
-                    ...integration.mcpServer().userConfig.connectOptions,
                 });
             });
 
@@ -110,7 +107,6 @@ describeWithMongoDB("Connection Manager", (integration) => {
                 try {
                     await connectionManager().connect({
                         connectionString: "mongodb://localhost:xxxxx",
-                        ...integration.mcpServer().userConfig.connectOptions,
                     });
                 } catch (_error: unknown) {
                     void _error;
@@ -158,7 +154,6 @@ describe("Connection Manager connection type inference", () => {
         it(`infers ${connectionType} from ${connectionString}`, () => {
             const actualConnectionType = ConnectionManager.inferConnectionTypeFromSettings({
                 connectionString,
-                ...config.connectOptions,
             });
 
             expect(actualConnectionType).toBe(connectionType);

tests/integration/tools/mongodb/connect/connect.test.ts

@@ -15,7 +15,6 @@ describeWithMongoDB(
         beforeEach(async () => {
             await integration.mcpServer().session.connectToMongoDB({
                 connectionString: integration.connectionString(),
-                ...config.connectOptions,
             });
         });
 

tests/unit/common/session.test.ts

@@ -1,7 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { Session } from "../../../src/common/session.js";
-import { config } from "../../../src/common/config.js";
 import { CompositeLogger } from "../../../src/common/logger.js";
 import { ConnectionManager } from "../../../src/common/connectionManager.js";
 import { ExportsManager } from "../../../src/common/exportsManager.js";
@@ -52,7 +51,6 @@ describe("Session", () => {
             it(`should update connection string for ${testCase.name}`, async () => {
                 await session.connectToMongoDB({
                     connectionString: testCase.connectionString,
-                    ...config.connectOptions,
                 });
                 expect(session.serviceProvider).toBeDefined();
 
@@ -68,7 +66,7 @@ describe("Session", () => {
         }
 
         it("should configure the proxy to use environment variables", async () => {
-            await session.connectToMongoDB({ connectionString: "mongodb://localhost", ...config.connectOptions });
+            await session.connectToMongoDB({ connectionString: "mongodb://localhost" });
             expect(session.serviceProvider).toBeDefined();
 
             const connectMock = MockNodeDriverServiceProvider.connect;