refactor: re-introduce the server class

Author: gagik

src/index.ts

@@ -5,27 +5,29 @@ import { ApiClient } from "./common/atlas/apiClient.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import config from "./config.js";
 import { State } from "./state.js";
-import { registerAtlasTools } from "./tools/atlas/tools.js";
-import { registerMongoDBTools } from "./tools/mongodb/index.js";
+import { Server } from "./server.js";
 
 try {
     const state = new State();
     await state.loadCredentials();
 
     const apiClient = ApiClient.fromState(state);
 
-    const mcp = new McpServer({
+    const mcpServer = new McpServer({
         name: "MongoDB Atlas",
         version: config.version,
     });
 
-    mcp.server.registerCapabilities({ logging: {} });
+    const transport = new StdioServerTransport();
 
-    registerAtlasTools(mcp, state, apiClient);
-    registerMongoDBTools(mcp, state);
+    const server = new Server({
+        mcpServer,
+        state,
+        apiClient,
+        transport,
+    });
 
-    const transport = new StdioServerTransport();
-    await mcp.server.connect(transport);
+    await server.registerAndConnect();
 } catch (error) {
     logger.emergency(mongoLogId(1_000_004), "server", `Fatal error running server: ${error}`);
 

src/server.ts

@@ -0,0 +1,58 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { ApiClient } from "./common/atlas/apiClient.js";
+import { State } from "./state.js";
+import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import { registerAtlasTools } from "./tools/atlas/tools.js";
+import { registerMongoDBTools } from "./tools/mongodb/index.js";
+import logger, { initializeLogger } from "./logger.js";
+import { mongoLogId } from "mongodb-log-writer";
+
+export class Server {
+    readonly state: State;
+    private readonly apiClient: ApiClient;
+    private readonly mcpServer: McpServer;
+    private readonly transport: Transport;
+
+    constructor({
+        state,
+        apiClient,
+        mcpServer,
+        transport,
+    }: {
+        state: State;
+        apiClient: ApiClient;
+        mcpServer: McpServer;
+        transport: Transport;
+    }) {
+        this.state = state;
+        this.apiClient = apiClient;
+        this.mcpServer = mcpServer;
+        this.transport = transport;
+    }
+
+    async registerAndConnect() {
+        this.mcpServer.server.registerCapabilities({ logging: {} });
+
+        registerAtlasTools(this.mcpServer, this.state, this.apiClient);
+        registerMongoDBTools(this.mcpServer, this.state);
+
+        await this.mcpServer.connect(this.transport);
+
+        await initializeLogger(this.mcpServer);
+
+        logger.info(
+            mongoLogId(1_000_004),
+            "server",
+            `Server started with transport ${this.transport.constructor.name}`
+        );
+    }
+
+    async close(): Promise<void> {
+        try {
+            await this.state.serviceProvider?.close(true);
+        } catch {
+            // Ignore errors during service provider close
+        }
+        await this.mcpServer.close();
+    }
+}