chore: rename connectionManager to mcpConnectionManager

Author: himanshusinghs

src/common/connectionManager.ts renamed to src/common/mcpConnectionManager.ts

@@ -63,15 +63,15 @@ export type AnyConnectionState =
     | ConnectionStateDisconnected
     | ConnectionStateErrored;
 
-export interface ConnectionManagerEvents {
+export interface MCPConnectionManagerEvents {
     "connection-requested": [AnyConnectionState];
     "connection-succeeded": [ConnectionStateConnected];
     "connection-timed-out": [ConnectionStateErrored];
     "connection-closed": [ConnectionStateDisconnected];
     "connection-errored": [ConnectionStateErrored];
 }
 
-export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
+export class MCPConnectionManager extends EventEmitter<MCPConnectionManagerEvents> {
     private state: AnyConnectionState;
     private deviceId: DeviceId;
     private clientName: string;
@@ -158,7 +158,10 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
         }
 
         try {
-            const connectionType = ConnectionManager.inferConnectionTypeFromSettings(this.userConfig, connectionInfo);
+            const connectionType = MCPConnectionManager.inferConnectionTypeFromSettings(
+                this.userConfig,
+                connectionInfo
+            );
             if (connectionType.startsWith("oidc")) {
                 void this.pingAndForget(serviceProvider);
 
@@ -212,7 +215,7 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
         return this.state;
     }
 
-    changeState<Event extends keyof ConnectionManagerEvents, State extends ConnectionManagerEvents[Event][0]>(
+    changeState<Event extends keyof MCPConnectionManagerEvents, State extends MCPConnectionManagerEvents[Event][0]>(
         event: Event,
         newState: State
     ): State {

src/common/session.ts

@@ -7,10 +7,10 @@ import { LogId } from "./logger.js";
 import EventEmitter from "events";
 import type {
     AtlasClusterConnectionInfo,
-    ConnectionManager,
+    MCPConnectionManager,
     ConnectionSettings,
     ConnectionStateConnected,
-} from "./connectionManager.js";
+} from "./mcpConnectionManager.js";
 import type { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { ErrorCodes, MongoDBError } from "./errors.js";
 import type { ExportsManager } from "./exportsManager.js";
@@ -21,7 +21,7 @@ export interface SessionOptions {
     apiClientSecret?: string;
     logger: CompositeLogger;
     exportsManager: ExportsManager;
-    connectionManager: ConnectionManager;
+    connectionManager: MCPConnectionManager;
 }
 
 export type SessionEvents = {
@@ -34,7 +34,7 @@ export type SessionEvents = {
 export class Session extends EventEmitter<SessionEvents> {
     readonly sessionId: string = new ObjectId().toString();
     readonly exportsManager: ExportsManager;
-    readonly connectionManager: ConnectionManager;
+    readonly connectionManager: MCPConnectionManager;
     readonly apiClient: ApiClient;
     mcpClient?: {
         name?: string;

src/tools/atlas/connect/connectCluster.ts

@@ -6,7 +6,7 @@ import { generateSecurePassword } from "../../../helpers/generatePassword.js";
 import { LogId } from "../../../common/logger.js";
 import { inspectCluster } from "../../../common/atlas/cluster.js";
 import { ensureCurrentIpInAccessList } from "../../../common/atlas/accessListUtils.js";
-import type { AtlasClusterConnectionInfo } from "../../../common/connectionManager.js";
+import type { AtlasClusterConnectionInfo } from "../../../common/mcpConnectionManager.js";
 import { getDefaultRoleFromConfig } from "../../../common/atlas/roles.js";
 
 const EXPIRY_MS = 1000 * 60 * 60 * 12; // 12 hours

src/transports/base.ts

@@ -7,7 +7,7 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { LoggerBase } from "../common/logger.js";
 import { CompositeLogger, ConsoleLogger, DiskLogger, McpLogger } from "../common/logger.js";
 import { ExportsManager } from "../common/exportsManager.js";
-import { ConnectionManager } from "../common/connectionManager.js";
+import { MCPConnectionManager } from "../common/mcpConnectionManager.js";
 import { DeviceId } from "../helpers/deviceId.js";
 
 export abstract class TransportRunnerBase {
@@ -51,7 +51,7 @@ export abstract class TransportRunnerBase {
 
         const logger = new CompositeLogger(...loggers);
         const exportsManager = ExportsManager.init(this.userConfig, logger);
-        const connectionManager = new ConnectionManager(this.userConfig, this.driverOptions, logger, this.deviceId);
+        const connectionManager = new MCPConnectionManager(this.userConfig, this.driverOptions, logger, this.deviceId);
 
         const session = new Session({
             apiBaseUrl: this.userConfig.apiBaseUrl,

tests/integration/common/connectionManager.oidc.test.ts

@@ -5,7 +5,7 @@ import process from "process";
 import type { MongoDBIntegrationTestCase } from "../tools/mongodb/mongodbHelpers.js";
 import { describeWithMongoDB, isCommunityServer, getServerVersion } from "../tools/mongodb/mongodbHelpers.js";
 import { defaultTestConfig, responseAsText, timeout, waitUntil } from "../helpers.js";
-import type { ConnectionStateConnected, ConnectionStateConnecting } from "../../../src/common/connectionManager.js";
+import type { ConnectionStateConnected, ConnectionStateConnecting } from "../../../src/common/mcpConnectionManager.js";
 import type { UserConfig } from "../../../src/common/config.js";
 import { setupDriverConfig } from "../../../src/common/config.js";
 import path from "path";

tests/integration/common/connectionManager.test.ts

@@ -1,15 +1,15 @@
 import type {
-    ConnectionManagerEvents,
+    MCPConnectionManagerEvents,
     ConnectionStateConnected,
     ConnectionStringAuthType,
-} from "../../../src/common/connectionManager.js";
-import { ConnectionManager } from "../../../src/common/connectionManager.js";
+} from "../../../src/common/mcpConnectionManager.js";
+import { MCPConnectionManager } from "../../../src/common/mcpConnectionManager.js";
 import type { UserConfig } from "../../../src/common/config.js";
 import { describeWithMongoDB } from "../tools/mongodb/mongodbHelpers.js";
 import { describe, beforeEach, expect, it, vi, afterEach } from "vitest";
 
 describeWithMongoDB("Connection Manager", (integration) => {
-    function connectionManager(): ConnectionManager {
+    function connectionManager(): MCPConnectionManager {
         return integration.mcpServer().session.connectionManager;
     }
 
@@ -24,11 +24,11 @@ describeWithMongoDB("Connection Manager", (integration) => {
 
     describe("when successfully connected", () => {
         type ConnectionManagerSpies = {
-            "connection-requested": (event: ConnectionManagerEvents["connection-requested"][0]) => void;
-            "connection-succeeded": (event: ConnectionManagerEvents["connection-succeeded"][0]) => void;
-            "connection-timed-out": (event: ConnectionManagerEvents["connection-timed-out"][0]) => void;
-            "connection-closed": (event: ConnectionManagerEvents["connection-closed"][0]) => void;
-            "connection-errored": (event: ConnectionManagerEvents["connection-errored"][0]) => void;
+            "connection-requested": (event: MCPConnectionManagerEvents["connection-requested"][0]) => void;
+            "connection-succeeded": (event: MCPConnectionManagerEvents["connection-succeeded"][0]) => void;
+            "connection-timed-out": (event: MCPConnectionManagerEvents["connection-timed-out"][0]) => void;
+            "connection-closed": (event: MCPConnectionManagerEvents["connection-closed"][0]) => void;
+            "connection-errored": (event: MCPConnectionManagerEvents["connection-errored"][0]) => void;
         };
 
         let connectionManagerSpies: ConnectionManagerSpies;
@@ -43,7 +43,7 @@ describeWithMongoDB("Connection Manager", (integration) => {
             };
 
             for (const [event, spy] of Object.entries(connectionManagerSpies)) {
-                connectionManager().on(event as keyof ConnectionManagerEvents, spy);
+                connectionManager().on(event as keyof MCPConnectionManagerEvents, spy);
             }
 
             await connectionManager().connect({
@@ -182,9 +182,12 @@ describe("Connection Manager connection type inference", () => {
 
     for (const { userConfig, connectionString, connectionType } of testCases) {
         it(`infers ${connectionType} from ${connectionString}`, () => {
-            const actualConnectionType = ConnectionManager.inferConnectionTypeFromSettings(userConfig as UserConfig, {
-                connectionString,
-            });
+            const actualConnectionType = MCPConnectionManager.inferConnectionTypeFromSettings(
+                userConfig as UserConfig,
+                {
+                    connectionString,
+                }
+            );
 
             expect(actualConnectionType).toBe(connectionType);
         });

tests/integration/helpers.ts

@@ -10,8 +10,8 @@ import type { UserConfig, DriverOptions } from "../../src/common/config.js";
 import { McpError, ResourceUpdatedNotificationSchema } from "@modelcontextprotocol/sdk/types.js";
 import { config, driverOptions } from "../../src/common/config.js";
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
-import type { ConnectionState } from "../../src/common/connectionManager.js";
-import { ConnectionManager } from "../../src/common/connectionManager.js";
+import type { ConnectionState } from "../../src/common/mcpConnectionManager.js";
+import { MCPConnectionManager } from "../../src/common/mcpConnectionManager.js";
 import { DeviceId } from "../../src/helpers/deviceId.js";
 
 interface ParameterInfo {
@@ -72,7 +72,7 @@ export function setupIntegrationTest(
         const exportsManager = ExportsManager.init(userConfig, logger);
 
         deviceId = DeviceId.create(logger);
-        const connectionManager = new ConnectionManager(userConfig, driverOptions, logger, deviceId);
+        const connectionManager = new MCPConnectionManager(userConfig, driverOptions, logger, deviceId);
 
         const session = new Session({
             apiBaseUrl: userConfig.apiBaseUrl,
@@ -315,7 +315,7 @@ export function responseAsText(response: Awaited<ReturnType<Client["callTool"]>>
 
 export function waitUntil<T extends ConnectionState>(
     tag: T["tag"],
-    cm: ConnectionManager,
+    cm: MCPConnectionManager,
     signal: AbortSignal,
     additionalCondition?: (state: T) => boolean
 ): Promise<T> {

tests/integration/telemetry.test.ts

@@ -4,7 +4,7 @@ import { config, driverOptions } from "../../src/common/config.js";
 import { DeviceId } from "../../src/helpers/deviceId.js";
 import { describe, expect, it } from "vitest";
 import { CompositeLogger } from "../../src/common/logger.js";
-import { ConnectionManager } from "../../src/common/connectionManager.js";
+import { MCPConnectionManager } from "../../src/common/mcpConnectionManager.js";
 import { ExportsManager } from "../../src/common/exportsManager.js";
 
 describe("Telemetry", () => {
@@ -19,7 +19,7 @@ describe("Telemetry", () => {
                 apiBaseUrl: "",
                 logger,
                 exportsManager: ExportsManager.init(config, logger),
-                connectionManager: new ConnectionManager(config, driverOptions, logger, deviceId),
+                connectionManager: new MCPConnectionManager(config, driverOptions, logger, deviceId),
             }),
             config,
             deviceId

tests/unit/common/session.test.ts

@@ -4,7 +4,7 @@ import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver
 import { Session } from "../../../src/common/session.js";
 import { config, driverOptions } from "../../../src/common/config.js";
 import { CompositeLogger } from "../../../src/common/logger.js";
-import { ConnectionManager } from "../../../src/common/connectionManager.js";
+import { MCPConnectionManager } from "../../../src/common/mcpConnectionManager.js";
 import { ExportsManager } from "../../../src/common/exportsManager.js";
 import { DeviceId } from "../../../src/helpers/deviceId.js";
 
@@ -27,7 +27,7 @@ describe("Session", () => {
             apiBaseUrl: "https://api.test.com",
             logger,
             exportsManager: ExportsManager.init(config, logger),
-            connectionManager: new ConnectionManager(config, driverOptions, logger, mockDeviceId),
+            connectionManager: new MCPConnectionManager(config, driverOptions, logger, mockDeviceId),
         });
 
         MockNodeDriverServiceProvider.connect = vi.fn().mockResolvedValue({} as unknown as NodeDriverServiceProvider);

tests/unit/resources/common/debug.test.ts

@@ -4,7 +4,7 @@ import { Session } from "../../../../src/common/session.js";
 import { Telemetry } from "../../../../src/telemetry/telemetry.js";
 import { config, driverOptions } from "../../../../src/common/config.js";
 import { CompositeLogger } from "../../../../src/common/logger.js";
-import { ConnectionManager } from "../../../../src/common/connectionManager.js";
+import { MCPConnectionManager } from "../../../../src/common/mcpConnectionManager.js";
 import { ExportsManager } from "../../../../src/common/exportsManager.js";
 import { DeviceId } from "../../../../src/helpers/deviceId.js";
 
@@ -15,7 +15,7 @@ describe("debug resource", () => {
         apiBaseUrl: "",
         logger,
         exportsManager: ExportsManager.init(config, logger),
-        connectionManager: new ConnectionManager(config, driverOptions, logger, deviceId),
+        connectionManager: new MCPConnectionManager(config, driverOptions, logger, deviceId),
     });
     const telemetry = Telemetry.create(session, { ...config, telemetry: "disabled" }, deviceId);