fix: address comments

Author: fmenezes

src/common/atlas/apiClient.ts

@@ -1,8 +1,8 @@
-import version from "../../version.js";
 import createClient, { Client, FetchOptions, Middleware } from "openapi-fetch";
 import { AccessToken, ClientCredentials } from "simple-oauth2";
 import { ApiClientError } from "./apiClientError.js";
 import { paths, operations } from "./openapi.js";
+import { packageInfo } from "../../package.js";
 
 const ATLAS_API_VERSION = "2025-03-12";
 
@@ -67,7 +67,7 @@ export class ApiClient {
             baseUrl: options?.baseUrl || "https://cloud.mongodb.com/",
             userAgent:
                 options?.userAgent ||
-                `AtlasMCP/${version} (${process.platform}; ${process.arch}; ${process.env.HOSTNAME || "unknown"})`,
+                `AtlasMCP/${packageInfo.version} (${process.platform}; ${process.arch}; ${process.env.HOSTNAME || "unknown"})`,
         };
 
         this.client = createClient<paths>({

src/index.ts

@@ -5,9 +5,25 @@ import logger from "./logger.js";
 import { mongoLogId } from "mongodb-log-writer";
 import { Server } from "./server.js";
 import { config } from "./config.js";
+import { Session } from "./session.js";
+import { packageInfo } from "./package.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 try {
-    const server = new Server(config);
+    const session = new Session({
+        apiBaseUrl: config.apiBaseUrl,
+        apiClientId: config.apiClientId,
+        apiClientSecret: config.apiClientSecret,
+    });
+    const mcpServer = new McpServer({
+        name: packageInfo.mcpServerName,
+        version: packageInfo.version,
+    });
+    const server = new Server({
+        session,
+        userConfig: config,
+        mcpServer,
+    });
 
     const transport = new StdioServerTransport();
 

src/package.ts

@@ -0,0 +1,6 @@
+import packageJson from "../package.json" with { type: "json" };
+
+export const packageInfo = {
+    version: packageJson.version,
+    mcpServerName: "MongoDB MCP Server",
+};

src/server.ts

@@ -6,21 +6,22 @@ import { MongoDbTools } from "./tools/mongodb/tools.js";
 import logger, { initializeLogger } from "./logger.js";
 import { mongoLogId } from "mongodb-log-writer";
 import { UserConfig } from "./config.js";
-import version from "./version.js";
+
+export interface ServerOptions {
+    session: Session;
+    userConfig: UserConfig;
+    mcpServer: McpServer;
+}
 
 export class Server {
     public readonly session: Session;
-    private readonly mcpServer: McpServer = new McpServer({
-        name: "MongoDB Atlas",
-        version,
-    });
+    private readonly mcpServer: McpServer;
+    private readonly userConfig: UserConfig;
 
-    constructor(private readonly config: UserConfig) {
-        this.session = new Session({
-            apiBaseUrl: config.apiBaseUrl,
-            apiClientId: config.apiClientId,
-            apiClientSecret: config.apiClientSecret,
-        });
+    constructor({ session, mcpServer, userConfig }: ServerOptions) {
+        this.session = session;
+        this.mcpServer = mcpServer;
+        this.userConfig = userConfig;
     }
 
     async connect(transport: Transport) {
@@ -29,7 +30,7 @@ export class Server {
         this.registerTools();
         this.registerResources();
 
-        await initializeLogger(this.mcpServer, this.config.logPath);
+        await initializeLogger(this.mcpServer, this.userConfig.logPath);
 
         await this.mcpServer.connect(transport);
 
@@ -43,12 +44,12 @@ export class Server {
 
     private registerTools() {
         for (const tool of [...AtlasTools, ...MongoDbTools]) {
-            new tool(this.session, this.config).register(this.mcpServer);
+            new tool(this.session, this.userConfig).register(this.mcpServer);
         }
     }
 
     private registerResources() {
-        if (this.config.connectionString) {
+        if (this.userConfig.connectionString) {
             this.mcpServer.resource(
                 "connection-string",
                 "config://connection-string",
@@ -59,7 +60,7 @@ export class Server {
                     return {
                         contents: [
                             {
-                                text: `Preconfigured connection string: ${this.config.connectionString}`,
+                                text: `Preconfigured connection string: ${this.userConfig.connectionString}`,
                                 uri: uri.href,
                             },
                         ],

src/session.ts

@@ -11,17 +11,17 @@ export class Session {
     serviceProvider?: NodeDriverServiceProvider;
     apiClient: ApiClient;
 
-    constructor(options?: SessionOptions) {
+    constructor({ apiBaseUrl, apiClientId, apiClientSecret }: SessionOptions = {}) {
         const credentials: ApiClientCredentials | undefined =
-            options?.apiClientId && options?.apiClientSecret
+            apiClientId && apiClientSecret
                 ? {
-                      clientId: options?.apiClientId,
-                      clientSecret: options?.apiClientSecret,
+                      clientId: apiClientId,
+                      clientSecret: apiClientSecret,
                   }
                 : undefined;
 
         this.apiClient = new ApiClient({
-            baseUrl: options?.apiBaseUrl,
+            baseUrl: apiBaseUrl,
             credentials,
         });
     }

src/version.ts

@@ -8,6 +8,8 @@ import { MongoClient, ObjectId } from "mongodb";
 import { toIncludeAllMembers } from "jest-extended";
 import { config, UserConfig } from "../../src/config.js";
 import { McpError } from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { Session } from "../../src/session.js";
 
 interface ParameterInfo {
     name: string;
@@ -27,7 +29,7 @@ export interface IntegrationTest {
     randomDbName: () => string;
 }
 
-export function setupIntegrationTest(cfg: UserConfig = config): IntegrationTest {
+export function setupIntegrationTest(userConfig: UserConfig = config): IntegrationTest {
     let mongoCluster: runner.MongoCluster | undefined;
     let mongoClient: MongoClient | undefined;
 
@@ -56,7 +58,20 @@ export function setupIntegrationTest(cfg: UserConfig = config): IntegrationTest
             }
         );
 
-        mcpServer = new Server(cfg);
+        const session = new Session({
+            apiBaseUrl: userConfig.apiBaseUrl,
+            apiClientId: userConfig.apiClientId,
+            apiClientSecret: userConfig.apiClientSecret,
+        });
+
+        mcpServer = new Server({
+            session,
+            userConfig,
+            mcpServer: new McpServer({
+                name: "test-server",
+                version: "1.2.3",
+            }),
+        });
         await mcpServer.connect(serverTransport);
         await mcpClient.connect(clientTransport);
     });