mongodb-mcp-server 0.1.2 → 0.2.0

package/dist/telemetry/telemetry.js

@@ -1,108 +1,89 @@
-import logger, { LogId } from "../logger.js";
+import logger, { LogId } from "../common/logger.js";
 import { MACHINE_METADATA } from "./constants.js";
 import { EventCache } from "./eventCache.js";
 import nodeMachineId from "node-machine-id";
 import { getDeviceId } from "@mongodb-js/device-id";
-import fs from "fs/promises";
-async function fileExists(filePath) {
-    try {
-        await fs.access(filePath, fs.constants.F_OK);
-        return true; // File exists
-    }
-    catch (e) {
-        if (e instanceof Error &&
-            e.code === "ENOENT") {
-            return false; // File does not exist
-        }
-        throw e; // Re-throw unexpected errors
-    }
-}
-async function isContainerized() {
-    if (process.env.container) {
-        return true;
-    }
-    const exists = await Promise.all(["/.dockerenv", "/run/.containerenv", "/var/run/.containerenv"].map(fileExists));
-    return exists.includes(true);
-}
+import { detectContainerEnv } from "../helpers/container.js";
+export const DEVICE_ID_TIMEOUT = 3000;
 export class Telemetry {
-    constructor(session, userConfig, { eventCache, getRawMachineId, getContainerEnv, }) {
+    constructor(session, userConfig, commonProperties, { eventCache, getRawMachineId }) {
         this.session = session;
         this.userConfig = userConfig;
+        this.commonProperties = commonProperties;
+        this.isBufferingEvents = true;
         this.deviceIdAbortController = new AbortController();
-        this.flushing = false;
         this.eventCache = eventCache;
         this.getRawMachineId = getRawMachineId;
-        this.getContainerEnv = getContainerEnv;
     }
-    static create(session, userConfig, { eventCache = EventCache.getInstance(), getRawMachineId = () => nodeMachineId.machineId(true), getContainerEnv = isContainerized, } = {}) {
-        const instance = new Telemetry(session, userConfig, {
-            eventCache,
-            getRawMachineId,
-            getContainerEnv,
-        });
+    static create(session, userConfig, { commonProperties = { ...MACHINE_METADATA }, eventCache = EventCache.getInstance(), getRawMachineId = () => nodeMachineId.machineId(true), } = {}) {
+        const instance = new Telemetry(session, userConfig, commonProperties, { eventCache, getRawMachineId });
+        void instance.setup();
         return instance;
     }
+    async setup() {
+        if (!this.isTelemetryEnabled()) {
+            return;
+        }
+        this.setupPromise = Promise.all([
+            getDeviceId({
+                getMachineId: () => this.getRawMachineId(),
+                onError: (reason, error) => {
+                    switch (reason) {
+                        case "resolutionError":
+                            logger.debug(LogId.telemetryDeviceIdFailure, "telemetry", String(error));
+                            break;
+                        case "timeout":
+                            logger.debug(LogId.telemetryDeviceIdTimeout, "telemetry", "Device ID retrieval timed out");
+                            break;
+                        case "abort":
+                            // No need to log in the case of aborts
+                            break;
+                    }
+                },
+                abortSignal: this.deviceIdAbortController.signal,
+            }),
+            detectContainerEnv(),
+        ]);
+        const [deviceId, containerEnv] = await this.setupPromise;
+        this.commonProperties.device_id = deviceId;
+        this.commonProperties.is_container_env = containerEnv;
+        this.isBufferingEvents = false;
+    }
     async close() {
         this.deviceIdAbortController.abort();
-        await this.flush();
+        this.isBufferingEvents = false;
+        await this.emitEvents(this.eventCache.getEvents());
     }
     /**
      * Emits events through the telemetry pipeline
      * @param events - The events to emit
      */
-    emitEvents(events) {
-        void this.flush(events);
+    async emitEvents(events) {
+        try {
+            if (!this.isTelemetryEnabled()) {
+                logger.info(LogId.telemetryEmitFailure, "telemetry", `Telemetry is disabled.`);
+                return;
+            }
+            await this.emit(events);
+        }
+        catch {
+            logger.debug(LogId.telemetryEmitFailure, "telemetry", `Error emitting telemetry events.`);
+        }
     }
     /**
      * Gets the common properties for events
      * @returns Object containing common properties for all events
      */
-    async getCommonProperties() {
-        if (!this.cachedCommonProperties) {
-            let deviceId;
-            let containerEnv;
-            try {
-                await Promise.all([
-                    getDeviceId({
-                        getMachineId: () => this.getRawMachineId(),
-                        onError: (reason, error) => {
-                            switch (reason) {
-                                case "resolutionError":
-                                    logger.debug(LogId.telemetryDeviceIdFailure, "telemetry", String(error));
-                                    break;
-                                case "timeout":
-                                    logger.debug(LogId.telemetryDeviceIdTimeout, "telemetry", "Device ID retrieval timed out");
-                                    break;
-                                case "abort":
-                                    // No need to log in the case of aborts
-                                    break;
-                            }
-                        },
-                        abortSignal: this.deviceIdAbortController.signal,
-                    }).then((id) => {
-                        deviceId = id;
-                    }),
-                    this.getContainerEnv().then((env) => {
-                        containerEnv = env;
-                    }),
-                ]);
-            }
-            catch (error) {
-                const err = error instanceof Error ? error : new Error(String(error));
-                logger.debug(LogId.telemetryDeviceIdFailure, "telemetry", err.message);
-            }
-            this.cachedCommonProperties = {
-                ...MACHINE_METADATA,
-                mcp_client_version: this.session.agentRunner?.version,
-                mcp_client_name: this.session.agentRunner?.name,
-                session_id: this.session.sessionId,
-                config_atlas_auth: this.session.apiClient.hasCredentials() ? "true" : "false",
-                config_connection_string: this.userConfig.connectionString ? "true" : "false",
-                is_container_env: containerEnv ? "true" : "false",
-                device_id: deviceId,
-            };
-        }
-        return this.cachedCommonProperties;
+    getCommonProperties() {
+        return {
+            ...this.commonProperties,
+            transport: this.userConfig.transport,
+            mcp_client_version: this.session.agentRunner?.version,
+            mcp_client_name: this.session.agentRunner?.name,
+            session_id: this.session.sessionId,
+            config_atlas_auth: this.session.apiClient.hasCredentials() ? "true" : "false",
+            config_connection_string: this.userConfig.connectionString ? "true" : "false",
+        };
     }
     /**
      * Checks if telemetry is currently enabled
@@ -120,54 +101,43 @@ export class Telemetry {
         return !doNotTrack;
     }
     /**
-     * Attempts to flush events through authenticated and unauthenticated clients
+     * Attempts to emit events through authenticated and unauthenticated clients
      * Falls back to caching if both attempts fail
      */
-    async flush(events) {
-        if (!this.isTelemetryEnabled()) {
-            logger.info(LogId.telemetryEmitFailure, "telemetry", `Telemetry is disabled.`);
-            return;
-        }
-        if (this.flushing) {
-            this.eventCache.appendEvents(events ?? []);
-            process.nextTick(async () => {
-                // try again if in the middle of a flush
-                await this.flush();
-            });
+    async emit(events) {
+        if (this.isBufferingEvents) {
+            this.eventCache.appendEvents(events);
             return;
         }
-        this.flushing = true;
-        try {
-            const cachedEvents = this.eventCache.getEvents();
-            const allEvents = [...cachedEvents, ...(events ?? [])];
-            if (allEvents.length <= 0) {
-                this.flushing = false;
-                return;
-            }
-            logger.debug(LogId.telemetryEmitStart, "telemetry", `Attempting to send ${allEvents.length} events (${cachedEvents.length} cached)`);
-            await this.sendEvents(this.session.apiClient, allEvents);
+        const cachedEvents = this.eventCache.getEvents();
+        const allEvents = [...cachedEvents, ...events];
+        logger.debug(LogId.telemetryEmitStart, "telemetry", `Attempting to send ${allEvents.length} events (${cachedEvents.length} cached)`);
+        const result = await this.sendEvents(this.session.apiClient, allEvents);
+        if (result.success) {
             this.eventCache.clearEvents();
             logger.debug(LogId.telemetryEmitSuccess, "telemetry", `Sent ${allEvents.length} events successfully: ${JSON.stringify(allEvents, null, 2)}`);
+            return;
         }
-        catch (error) {
-            logger.debug(LogId.telemetryEmitFailure, "telemetry", `Error sending event to client: ${error instanceof Error ? error.message : String(error)}`);
-            this.eventCache.appendEvents(events ?? []);
-            process.nextTick(async () => {
-                // try again
-                await this.flush();
-            });
-        }
-        this.flushing = false;
+        logger.debug(LogId.telemetryEmitFailure, "telemetry", `Error sending event to client: ${result.error instanceof Error ? result.error.message : String(result.error)}`);
+        this.eventCache.appendEvents(events);
     }
     /**
      * Attempts to send events through the provided API client
      */
     async sendEvents(client, events) {
-        const commonProperties = await this.getCommonProperties();
-        await client.sendEvents(events.map((event) => ({
-            ...event,
-            properties: { ...commonProperties, ...event.properties },
-        })));
+        try {
+            await client.sendEvents(events.map((event) => ({
+                ...event,
+                properties: { ...this.getCommonProperties(), ...event.properties },
+            })));
+            return { success: true };
+        }
+        catch (error) {
+            return {
+                success: false,
+                error: error instanceof Error ? error : new Error(String(error)),
+            };
+        }
     }
 }
 //# sourceMappingURL=telemetry.js.map

package/dist/telemetry/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry/telemetry.ts"],"names":[],"mappings":"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"}

package/dist/tools/atlas/atlasTool.js

@@ -1,5 +1,5 @@
 import { ToolBase } from "../tool.js";
-import logger, { LogId } from "../../logger.js";
+import logger, { LogId } from "../../common/logger.js";
 import { z } from "zod";
 import { ApiClientError } from "../../common/atlas/apiClientError.js";
 export class AtlasToolBase extends ToolBase {
@@ -23,7 +23,7 @@ export class AtlasToolBase extends ToolBase {
                             type: "text",
                             text: `Unable to authenticate with MongoDB Atlas, API error: ${error.message}
 
-Hint: Your API credentials may be invalid, expired or lack permissions. 
+Hint: Your API credentials may be invalid, expired or lack permissions.
 Please check your Atlas API credentials and ensure they have the appropriate permissions.
 For more information on setting up API keys, visit: https://www.mongodb.com/docs/atlas/configure-api-access/`,
                         },
@@ -37,7 +37,7 @@ For more information on setting up API keys, visit: https://www.mongodb.com/docs
                         {
                             type: "text",
                             text: `Received a Forbidden API Error: ${error.message}
-                            
+
 You don't have sufficient permissions to perform this action in MongoDB Atlas
 Please ensure your API key has the necessary roles assigned.
 For more information on Atlas API access roles, visit: https://www.mongodb.com/docs/atlas/api/service-accounts-overview/`,

package/dist/tools/atlas/atlasTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"atlasTool.js","sourceRoot":"","sources":["../../../src/tools/atlas/atlasTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiD,MAAM,YAAY,CAAC;AAGrF,OAAO,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,OAAgB,aAAc,SAAQ,QAAQ;IAApD;;QACc,aAAQ,GAAiB,OAAO,CAAC;IA8F/C,CAAC;IA5Fa,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,aAAa,EAAE,CAAC;IACjC,CAAC;IAES,WAAW,CACjB,KAAc,EACd,IAAqC;QAErC,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YAEzC,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;gBACrB,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,yDAAyD,KAAK,CAAC,OAAO;;;;6GAIK;yBACpF;qBACJ;oBACD,OAAO,EAAE,IAAI;iBAChB,CAAC;YACN,CAAC;YAED,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;gBACrB,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,mCAAmC,KAAK,CAAC,OAAO;;;;yHAIuC;yBAChG;qBACJ;oBACD,OAAO,EAAE,IAAI;iBAChB,CAAC;YACN,CAAC;QACL,CAAC;QAED,gFAAgF;QAChF,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACO,wBAAwB,CAC9B,GAAG,IAAqD;QAExD,MAAM,YAAY,GAA0B,EAAE,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,sDAAsD;QACtD,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CACR,KAAK,CAAC,sBAAsB,EAC5B,MAAM,EACN,iCAAiC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,CAChE,CAAC;YACF,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAE/B,qCAAqC;QACrC,IAAI,WAAW,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC5F,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAC5C,CAAC;QAED,iCAAiC;QACjC,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAChF,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACpC,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ"}
+{"version":3,"file":"atlasTool.js","sourceRoot":"","sources":["../../../src/tools/atlas/atlasTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiD,MAAM,YAAY,CAAC;AAGrF,OAAO,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtE,MAAM,OAAgB,aAAc,SAAQ,QAAQ;IAApD;;QACW,aAAQ,GAAiB,OAAO,CAAC;IA8F5C,CAAC;IA5Fa,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAC3D,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,aAAa,EAAE,CAAC;IACjC,CAAC;IAES,WAAW,CACjB,KAAc,EACd,IAAqC;QAErC,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YAEzC,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;gBACrB,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,yDAAyD,KAAK,CAAC,OAAO;;;;6GAIK;yBACpF;qBACJ;oBACD,OAAO,EAAE,IAAI;iBAChB,CAAC;YACN,CAAC;YAED,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;gBACrB,OAAO;oBACH,OAAO,EAAE;wBACL;4BACI,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,mCAAmC,KAAK,CAAC,OAAO;;;;yHAIuC;yBAChG;qBACJ;oBACD,OAAO,EAAE,IAAI;iBAChB,CAAC;YACN,CAAC;QACL,CAAC;QAED,gFAAgF;QAChF,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;OAMG;IACO,wBAAwB,CAC9B,GAAG,IAAqD;QAExD,MAAM,YAAY,GAA0B,EAAE,CAAC;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,sDAAsD;QACtD,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAElD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CACR,KAAK,CAAC,sBAAsB,EAC5B,MAAM,EACN,iCAAiC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,CAChE,CAAC;YACF,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;QAE/B,qCAAqC;QACrC,IAAI,WAAW,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAC5F,YAAY,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAC5C,CAAC;QAED,iCAAiC;QACjC,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YAChF,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACpC,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ"}

package/dist/tools/atlas/connect/connectCluster.js

@@ -0,0 +1,198 @@
+import { z } from "zod";
+import { AtlasToolBase } from "../atlasTool.js";
+import { generateSecurePassword } from "../../../helpers/generatePassword.js";
+import logger, { LogId } from "../../../common/logger.js";
+import { inspectCluster } from "../../../common/atlas/cluster.js";
+import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
+const EXPIRY_MS = 1000 * 60 * 60 * 12; // 12 hours
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+export class ConnectClusterTool extends AtlasToolBase {
+    constructor() {
+        super(...arguments);
+        this.name = "atlas-connect-cluster";
+        this.description = "Connect to MongoDB Atlas cluster";
+        this.operationType = "connect";
+        this.argsShape = {
+            projectId: z.string().describe("Atlas project ID"),
+            clusterName: z.string().describe("Atlas cluster name"),
+        };
+    }
+    async queryConnection(projectId, clusterName) {
+        if (!this.session.connectedAtlasCluster) {
+            if (this.session.serviceProvider) {
+                return "connected-to-other-cluster";
+            }
+            return "disconnected";
+        }
+        if (this.session.connectedAtlasCluster.projectId !== projectId ||
+            this.session.connectedAtlasCluster.clusterName !== clusterName) {
+            return "connected-to-other-cluster";
+        }
+        if (!this.session.serviceProvider) {
+            return "connecting";
+        }
+        try {
+            await this.session.serviceProvider.runCommand("admin", {
+                ping: 1,
+            });
+            return "connected";
+        }
+        catch (err) {
+            const error = err instanceof Error ? err : new Error(String(err));
+            logger.debug(LogId.atlasConnectFailure, "atlas-connect-cluster", `error querying cluster: ${error.message}`);
+            return "unknown";
+        }
+    }
+    async prepareClusterConnection(projectId, clusterName) {
+        const cluster = await inspectCluster(this.session.apiClient, projectId, clusterName);
+        if (!cluster.connectionString) {
+            throw new Error("Connection string not available");
+        }
+        const username = `mcpUser${Math.floor(Math.random() * 100000)}`;
+        const password = await generateSecurePassword();
+        const expiryDate = new Date(Date.now() + EXPIRY_MS);
+        const readOnly = this.config.readOnly ||
+            (this.config.disabledTools?.includes("create") &&
+                this.config.disabledTools?.includes("update") &&
+                this.config.disabledTools?.includes("delete") &&
+                !this.config.disabledTools?.includes("read") &&
+                !this.config.disabledTools?.includes("metadata"));
+        const roleName = readOnly ? "readAnyDatabase" : "readWriteAnyDatabase";
+        await this.session.apiClient.createDatabaseUser({
+            params: {
+                path: {
+                    groupId: projectId,
+                },
+            },
+            body: {
+                databaseName: "admin",
+                groupId: projectId,
+                roles: [
+                    {
+                        roleName,
+                        databaseName: "admin",
+                    },
+                ],
+                scopes: [{ type: "CLUSTER", name: clusterName }],
+                username,
+                password,
+                awsIAMType: "NONE",
+                ldapAuthType: "NONE",
+                oidcAuthType: "NONE",
+                x509Type: "NONE",
+                deleteAfterDate: expiryDate.toISOString(),
+            },
+        });
+        this.session.connectedAtlasCluster = {
+            username,
+            projectId,
+            clusterName,
+            expiryDate,
+        };
+        const cn = new URL(cluster.connectionString);
+        cn.username = username;
+        cn.password = password;
+        cn.searchParams.set("authSource", "admin");
+        return cn.toString();
+    }
+    async connectToCluster(projectId, clusterName, connectionString) {
+        let lastError = undefined;
+        logger.debug(LogId.atlasConnectAttempt, "atlas-connect-cluster", `attempting to connect to cluster: ${this.session.connectedAtlasCluster?.clusterName}`);
+        // try to connect for about 5 minutes
+        for (let i = 0; i < 600; i++) {
+            if (!this.session.connectedAtlasCluster ||
+                this.session.connectedAtlasCluster.projectId != projectId ||
+                this.session.connectedAtlasCluster.clusterName != clusterName) {
+                throw new Error("Cluster connection aborted");
+            }
+            try {
+                lastError = undefined;
+                await this.session.connectToMongoDB(connectionString, this.config.connectOptions);
+                break;
+            }
+            catch (err) {
+                const error = err instanceof Error ? err : new Error(String(err));
+                lastError = error;
+                logger.debug(LogId.atlasConnectFailure, "atlas-connect-cluster", `error connecting to cluster: ${error.message}`);
+                await sleep(500); // wait for 500ms before retrying
+            }
+        }
+        if (lastError) {
+            if (this.session.connectedAtlasCluster?.projectId == projectId &&
+                this.session.connectedAtlasCluster?.clusterName == clusterName &&
+                this.session.connectedAtlasCluster?.username) {
+                void this.session.apiClient
+                    .deleteDatabaseUser({
+                    params: {
+                        path: {
+                            groupId: this.session.connectedAtlasCluster.projectId,
+                            username: this.session.connectedAtlasCluster.username,
+                            databaseName: "admin",
+                        },
+                    },
+                })
+                    .catch((err) => {
+                    const error = err instanceof Error ? err : new Error(String(err));
+                    logger.debug(LogId.atlasConnectFailure, "atlas-connect-cluster", `error deleting database user: ${error.message}`);
+                });
+            }
+            this.session.connectedAtlasCluster = undefined;
+            throw lastError;
+        }
+        logger.debug(LogId.atlasConnectSucceeded, "atlas-connect-cluster", `connected to cluster: ${this.session.connectedAtlasCluster?.clusterName}`);
+    }
+    async execute({ projectId, clusterName }) {
+        await ensureCurrentIpInAccessList(this.session.apiClient, projectId);
+        for (let i = 0; i < 60; i++) {
+            const state = await this.queryConnection(projectId, clusterName);
+            switch (state) {
+                case "connected": {
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: `Connected to cluster "${clusterName}".`,
+                            },
+                        ],
+                    };
+                }
+                case "connecting":
+                case "unknown": {
+                    break;
+                }
+                case "connected-to-other-cluster":
+                case "disconnected":
+                default: {
+                    await this.session.disconnect();
+                    const connectionString = await this.prepareClusterConnection(projectId, clusterName);
+                    // try to connect for about 5 minutes asynchronously
+                    void this.connectToCluster(projectId, clusterName, connectionString).catch((err) => {
+                        const error = err instanceof Error ? err : new Error(String(err));
+                        logger.error(LogId.atlasConnectFailure, "atlas-connect-cluster", `error connecting to cluster: ${error.message}`);
+                    });
+                    break;
+                }
+            }
+            await sleep(500);
+        }
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: `Attempting to connect to cluster "${clusterName}"...`,
+                },
+                {
+                    type: "text",
+                    text: `Warning: Provisioning a user and connecting to the cluster may take more time, please check again in a few seconds.`,
+                },
+                {
+                    type: "text",
+                    text: `Warning: Make sure your IP address was enabled in the allow list setting of the Atlas cluster.`,
+                },
+            ],
+        };
+    }
+}
+//# sourceMappingURL=connectCluster.js.map

package/dist/tools/atlas/connect/connectCluster.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connectCluster.js","sourceRoot":"","sources":["../../../../src/tools/atlas/connect/connectCluster.ts"],"names":[],"mappings":"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"}

package/dist/tools/atlas/create/createAccessList.js

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { AtlasToolBase } from "../atlasTool.js";
-const DEFAULT_COMMENT = "Added by Atlas MCP";
+import { makeCurrentIpAccessListEntry, DEFAULT_ACCESS_LIST_COMMENT } from "../../../common/atlas/accessListUtils.js";
 export class CreateAccessListTool extends AtlasToolBase {
     constructor() {
         super(...arguments);
@@ -15,7 +15,11 @@ export class CreateAccessListTool extends AtlasToolBase {
                 .optional(),
             cidrBlocks: z.array(z.string().cidr()).describe("CIDR blocks to allow access from").optional(),
             currentIpAddress: z.boolean().describe("Add the current IP address").default(false),
-            comment: z.string().describe("Comment for the access list entries").default(DEFAULT_COMMENT).optional(),
+            comment: z
+                .string()
+                .describe("Comment for the access list entries")
+                .default(DEFAULT_ACCESS_LIST_COMMENT)
+                .optional(),
         };
     }
     async execute({ projectId, ipAddresses, cidrBlocks, comment, currentIpAddress, }) {
@@ -25,21 +29,16 @@ export class CreateAccessListTool extends AtlasToolBase {
         const ipInputs = (ipAddresses || []).map((ipAddress) => ({
             groupId: projectId,
             ipAddress,
-            comment: comment || DEFAULT_COMMENT,
+            comment: comment || DEFAULT_ACCESS_LIST_COMMENT,
         }));
         if (currentIpAddress) {
-            const currentIp = await this.session.apiClient.getIpInfo();
-            const input = {
-                groupId: projectId,
-                ipAddress: currentIp.currentIpv4Address,
-                comment: comment || DEFAULT_COMMENT,
-            };
+            const input = await makeCurrentIpAccessListEntry(this.session.apiClient, projectId, comment || DEFAULT_ACCESS_LIST_COMMENT);
             ipInputs.push(input);
         }
         const cidrInputs = (cidrBlocks || []).map((cidrBlock) => ({
             groupId: projectId,
             cidrBlock,
-            comment: comment || DEFAULT_COMMENT,
+            comment: comment || DEFAULT_ACCESS_LIST_COMMENT,
         }));
         const inputs = [...ipInputs, ...cidrInputs];
         await this.session.apiClient.createProjectIpAccessList({

package/dist/tools/atlas/create/createAccessList.js.map

@@ -1 +1 @@
-{"version":3,"file":"createAccessList.js","sourceRoot":"","sources":["../../../../src/tools/atlas/create/createAccessList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,MAAM,eAAe,GAAG,oBAAoB,CAAC;AAE7C,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IAAvD;;QACc,SAAI,GAAG,0BAA0B,CAAC;QAClC,gBAAW,GAAG,6DAA6D,CAAC;QAC5E,kBAAa,GAAkB,QAAQ,CAAC;QACxC,cAAS,GAAG;YAClB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YAClD,WAAW,EAAE,CAAC;iBACT,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;iBACvC,QAAQ,CAAC,mCAAmC,CAAC;iBAC7C,QAAQ,EAAE;YACf,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,QAAQ,EAAE;YAC9F,gBAAgB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YACnF,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE;SAC1G,CAAC;IAuDN,CAAC;IArDa,KAAK,CAAC,OAAO,CAAC,EACpB,SAAS,EACT,WAAW,EACX,UAAU,EACV,OAAO,EACP,gBAAgB,GACc;QAC9B,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACnE,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QAC3F,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACrD,OAAO,EAAE,SAAS;YAClB,SAAS;YACT,OAAO,EAAE,OAAO,IAAI,eAAe;SACtC,CAAC,CAAC,CAAC;QAEJ,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG;gBACV,OAAO,EAAE,SAAS;gBAClB,SAAS,EAAE,SAAS,CAAC,kBAAkB;gBACvC,OAAO,EAAE,OAAO,IAAI,eAAe;aACtC,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACtD,OAAO,EAAE,SAAS;YAClB,SAAS;YACT,OAAO,EAAE,OAAO,IAAI,eAAe;SACtC,CAAC,CAAC,CAAC;QAEJ,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC;QAE5C,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,yBAAyB,CAAC;YACnD,MAAM,EAAE;gBACJ,IAAI,EAAE;oBACF,OAAO,EAAE,SAAS;iBACrB;aACJ;YACD,IAAI,EAAE,MAAM;SACf,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,mDAAmD,SAAS,GAAG;iBACxE;aACJ;SACJ,CAAC;IACN,CAAC;CACJ"}
+{"version":3,"file":"createAccessList.js","sourceRoot":"","sources":["../../../../src/tools/atlas/create/createAccessList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,0CAA0C,CAAC;AAErH,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IAAvD;;QACW,SAAI,GAAG,0BAA0B,CAAC;QAC/B,gBAAW,GAAG,6DAA6D,CAAC;QAC/E,kBAAa,GAAkB,QAAQ,CAAC;QACrC,cAAS,GAAG;YAClB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YAClD,WAAW,EAAE,CAAC;iBACT,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;iBACvC,QAAQ,CAAC,mCAAmC,CAAC;iBAC7C,QAAQ,EAAE;YACf,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,QAAQ,EAAE;YAC9F,gBAAgB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;YACnF,OAAO,EAAE,CAAC;iBACL,MAAM,EAAE;iBACR,QAAQ,CAAC,qCAAqC,CAAC;iBAC/C,OAAO,CAAC,2BAA2B,CAAC;iBACpC,QAAQ,EAAE;SAClB,CAAC;IAsDN,CAAC;IApDa,KAAK,CAAC,OAAO,CAAC,EACpB,SAAS,EACT,WAAW,EACX,UAAU,EACV,OAAO,EACP,gBAAgB,GACc;QAC9B,IAAI,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACnE,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;QAC3F,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACrD,OAAO,EAAE,SAAS;YAClB,SAAS;YACT,OAAO,EAAE,OAAO,IAAI,2BAA2B;SAClD,CAAC,CAAC,CAAC;QAEJ,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,KAAK,GAAG,MAAM,4BAA4B,CAC5C,IAAI,CAAC,OAAO,CAAC,SAAS,EACtB,SAAS,EACT,OAAO,IAAI,2BAA2B,CACzC,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACtD,OAAO,EAAE,SAAS;YAClB,SAAS;YACT,OAAO,EAAE,OAAO,IAAI,2BAA2B;SAClD,CAAC,CAAC,CAAC;QAEJ,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,UAAU,CAAC,CAAC;QAE5C,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,yBAAyB,CAAC;YACnD,MAAM,EAAE;gBACJ,IAAI,EAAE;oBACF,OAAO,EAAE,SAAS;iBACrB;aACJ;YACD,IAAI,EAAE,MAAM;SACf,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,mDAAmD,SAAS,GAAG;iBACxE;aACJ;SACJ,CAAC;IACN,CAAC;CACJ"}

package/dist/tools/atlas/create/createDBUser.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { AtlasToolBase } from "../atlasTool.js";
-import { generateSecurePassword } from "../../../common/atlas/generatePassword.js";
+import { generateSecurePassword } from "../../../helpers/generatePassword.js";
+import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
 export class CreateDBUserTool extends AtlasToolBase {
     constructor() {
         super(...arguments);
@@ -32,6 +33,7 @@ export class CreateDBUserTool extends AtlasToolBase {
         };
     }
     async execute({ projectId, username, password, roles, clusters, }) {
+        await ensureCurrentIpInAccessList(this.session.apiClient, projectId);
         const shouldGeneratePassword = !password;
         if (shouldGeneratePassword) {
             password = await generateSecurePassword();

package/dist/tools/atlas/create/createDBUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"createDBUser.js","sourceRoot":"","sources":["../../../../src/tools/atlas/create/createDBUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAEnF,MAAM,OAAO,gBAAiB,SAAQ,aAAa;IAAnD;;QACc,SAAI,GAAG,sBAAsB,CAAC;QAC9B,gBAAW,GAAG,uCAAuC,CAAC;QACtD,kBAAa,GAAkB,QAAQ,CAAC;QACxC,cAAS,GAAG;YAClB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC;YAClD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,2BAA2B,CAAC;YAC1D,6EAA6E;YAC7E,kFAAkF;YAClF,gFAAgF;YAChF,QAAQ,EAAE,CAAC;iBACN,MAAM,EAAE;iBACR,QAAQ,EAAE;iBACV,QAAQ,EAAE;iBACV,QAAQ,CACL,0NAA0N,CAC7N;YACL,KAAK,EAAE,CAAC;iBACH,KAAK,CACF,CAAC,CAAC,MAAM,CAAC;gBACL,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAC1C,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;gBACnE,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE;aACpE,CAAC,CACL;iBACA,QAAQ,CAAC,wBAAwB,CAAC;YACvC,QAAQ,EAAE,CAAC;iBACN,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;iBACjB,QAAQ,CAAC,wEAAwE,CAAC;iBAClF,QAAQ,EAAE;SAClB,CAAC;IAkDN,CAAC;IAhDa,KAAK,CAAC,OAAO,CAAC,EACpB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,QAAQ,GACsB;QAC9B,MAAM,sBAAsB,GAAG,CAAC,QAAQ,CAAC;QACzC,IAAI,sBAAsB,EAAE,CAAC;YACzB,QAAQ,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC9C,CAAC;QAED,MAAM,KAAK,GAAG;YACV,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,MAAM;YAClB,YAAY,EAAE,OAAO;YACrB,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,MAAM;YACpB,QAAQ,EAAE,MAAM;YAChB,QAAQ;YACR,QAAQ;YACR,KAAK,EAAE,KAAsC;YAC7C,MAAM,EAAE,QAAQ,EAAE,MAAM;gBACpB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBACvB,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,OAAO;iBAChB,CAAC,CAAC;gBACL,CAAC,CAAC,SAAS;SACG,CAAC;QAEvB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC;YAC5C,MAAM,EAAE;gBACJ,IAAI,EAAE;oBACF,OAAO,EAAE,SAAS;iBACrB;aACJ;YACD,IAAI,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO;YACH,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,SAAS,QAAQ,yBAAyB,sBAAsB,CAAC,CAAC,CAAC,qBAAqB,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG;iBACrH;aACJ;SACJ,CAAC;IACN,CAAC;CACJ"}
+{"version":3,"file":"createDBUser.js","sourceRoot":"","sources":["../../../../src/tools/atlas/create/createDBUser.ts"],"names":[],"mappings":"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"}

package/dist/tools/atlas/create/createFreeCluster.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { AtlasToolBase } from "../atlasTool.js";
+import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
 export class CreateFreeClusterTool extends AtlasToolBase {
     constructor() {
         super(...arguments);
@@ -34,6 +35,7 @@ export class CreateFreeClusterTool extends AtlasToolBase {
             ],
             terminationProtectionEnabled: false,
         };
+        await ensureCurrentIpInAccessList(this.session.apiClient, projectId);
         await this.session.apiClient.createCluster({
             params: {
                 path: {