chore: simplify query connection logic

kmruiz · kmruiz · commit fe16acd312f4 · 2025-08-06T14:15:59.000+02:00
Now it doesn't need to be async because the connection itself attemps
to ping, it just needs to check the current connection status and map
the exact values
diff --git a/src/tools/atlas/connect/connectCluster.ts b/src/tools/atlas/connect/connectCluster.ts
@@ -23,43 +23,40 @@ export class ConnectClusterTool extends AtlasToolBase {
         clusterName: z.string().describe("Atlas cluster name"),
     };
 
-    private async queryConnection(
+    private queryConnection(
         projectId: string,
         clusterName: string
-    ): Promise<"connected" | "disconnected" | "connecting" | "connected-to-other-cluster" | "unknown"> {
+    ): "connected" | "disconnected" | "connecting" | "connected-to-other-cluster" | "unknown" {
         if (!this.session.connectedAtlasCluster) {
             if (this.session.isConnectedToMongoDB) {
                 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.connectionManager.currentConnectionState.tag !== "connected") {
-            return "connecting";
-        }
+        const currentConectionState = this.session.connectionManager.currentConnectionState;
 
-        try {
-            await this.session.serviceProvider.runCommand("admin", {
-                ping: 1,
-            });
-
-            return "connected";
-        } catch (err: unknown) {
-            const error = err instanceof Error ? err : new Error(String(err));
-            logger.debug(
-                LogId.atlasConnectFailure,
-                "atlas-connect-cluster",
-                `error querying cluster: ${error.message}`
-            );
-            return "unknown";
+        switch (currentConectionState.tag) {
+            case "connected":
+                if (
+                    this.session.connectedAtlasCluster.projectId !== projectId ||
+                    this.session.connectedAtlasCluster.clusterName !== clusterName
+                ) {
+                    return "connected-to-other-cluster";
+                }
+                break;
+            case "connecting":
+            case "disconnected": // we might still be calling Atlas APIs and not attempted yet to connect to MongoDB, but we are still "connecting"
+                return "connecting";
+            case "errored":
+                logger.debug(
+                    LogId.atlasConnectFailure,
+                    "atlas-connect-cluster",
+                    `error querying cluster: ${currentConectionState.errorReason}`
+                );
+                return "unknown";
         }
+        return "unknown";
     }
 
     private async prepareClusterConnection(
@@ -205,7 +202,7 @@ export class ConnectClusterTool extends AtlasToolBase {
     protected async execute({ projectId, clusterName }: ToolArgs<typeof this.argsShape>): Promise<CallToolResult> {
         await ensureCurrentIpInAccessList(this.session.apiClient, projectId);
         for (let i = 0; i < 60; i++) {
-            const state = await this.queryConnection(projectId, clusterName);
+            const state = this.queryConnection(projectId, clusterName);
             switch (state) {
                 case "connected": {
                     return {
