Merge branch 'ni/connection-config' into ni/integration-tests

Author: nirinchev

src/config.ts

@@ -9,7 +9,7 @@ const { localDataPath, configPath } = getLocalDataPath();
 
 // If we decide to support non-string config options, we'll need to extend the mechanism for parsing
 // env variables.
-interface UserConfig extends Record<string, unknown> {
+interface UserConfig {
     apiBaseUrl: string;
     clientId: string;
     stateFile: string;
@@ -106,15 +106,16 @@ function getEnvConfig(): Partial<UserConfig> {
     }
 
     const result: Record<string, unknown> = {};
-    for (const [key, value] of Object.entries(process.env).filter(
+    const mcpVariables = Object.entries(process.env).filter(
         ([key, value]) => value !== undefined && key.startsWith("MDB_MCP_")
-    )) {
+    ) as [string, string][];
+    for (const [key, value] of mcpVariables) {
         const fieldPath = key
             .replace("MDB_MCP_", "")
             .split(".")
             .map((part) => SNAKE_CASE_toCamelCase(part));
 
-        setValue(result, fieldPath, value!);
+        setValue(result, fieldPath, value);
     }
 
     return result;

src/tools/mongodb/connect.ts

@@ -4,7 +4,6 @@ import { DbOperationType, MongoDBToolBase } from "./mongodbTool.js";
 import { ToolArgs } from "../tool.js";
 import { ErrorCodes, MongoDBError } from "../../errors.js";
 import config from "../../config.js";
-import { connectToMongoDB } from "../../common/mongodb/connect.js";
 
 export class ConnectTool extends MongoDBToolBase {
     protected name = "connect";
@@ -58,7 +57,7 @@ export class ConnectTool extends MongoDBToolBase {
             throw new MongoDBError(ErrorCodes.InvalidParams, "Invalid connection options");
         }
 
-        await connectToMongoDB(connectionString, this.state);
+        await this.connectToMongoDB(connectionString, this.state);
 
         return {
             content: [{ type: "text", text: `Successfully connected to ${connectionString}.` }],

src/tools/mongodb/mongodbTool.ts

@@ -5,7 +5,6 @@ import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { ErrorCodes, MongoDBError } from "../../errors.js";
 import config from "../../config.js";
-import { connectToMongoDB } from "../../common/mongodb/connect.js";
 
 export const DbOperationArgs = {
     database: z.string().describe("Database name"),
@@ -24,7 +23,7 @@ export abstract class MongoDBToolBase extends ToolBase {
     protected async ensureConnected(): Promise<NodeDriverServiceProvider> {
         const provider = this.state.serviceProvider;
         if (!provider && config.connectionString) {
-            await connectToMongoDB(config.connectionString, this.state);
+            await this.connectToMongoDB(config.connectionString, this.state);
         }
 
         if (!provider) {
@@ -52,4 +51,23 @@ export abstract class MongoDBToolBase extends ToolBase {
 
         return undefined;
     }
+
+    protected async connectToMongoDB(connectionString: string, state: State): Promise<void> {
+        const provider = await NodeDriverServiceProvider.connect(connectionString, {
+            productDocsLink: "https://docs.mongodb.com/todo-mcp",
+            productName: "MongoDB MCP",
+            readConcern: {
+                level: config.connectOptions.readConcern,
+            },
+            readPreference: config.connectOptions.readPreference,
+            writeConcern: {
+                w: config.connectOptions.writeConcern,
+            },
+            timeoutMS: config.connectOptions.timeoutMS,
+        });
+
+        state.serviceProvider = provider;
+        state.credentials.connectionString = connectionString;
+        await state.persistCredentials();
+    }
 }