chore: disconnect sessionId and ExportsManager unique path id

Author: himanshusinghs

src/common/exportsManager.ts

@@ -4,7 +4,7 @@ import fs from "fs/promises";
 import EventEmitter from "events";
 import { createWriteStream } from "fs";
 import { FindCursor } from "mongodb";
-import { EJSON, EJSONOptions } from "bson";
+import { EJSON, EJSONOptions, ObjectId } from "bson";
 import { Transform } from "stream";
 import { pipeline } from "stream/promises";
 
@@ -335,7 +335,11 @@ export class ExportsManager extends EventEmitter<ExportsManagerEvents> {
         }
     }
 
-    static init(sessionId: string, config: ExportsManagerConfig, logger: LoggerBase): ExportsManager {
+    static init(
+        config: ExportsManagerConfig,
+        logger: LoggerBase,
+        sessionId = new ObjectId().toString()
+    ): ExportsManager {
         const exportsDirectoryPath = path.join(config.exportsPath, sessionId);
         const exportsManager = new ExportsManager(exportsDirectoryPath, config, logger);
         exportsManager.init();

src/common/session.ts

@@ -1,3 +1,4 @@
+import { ObjectId } from "bson";
 import { ApiClient, ApiClientCredentials } from "./atlas/apiClient.js";
 import { Implementation } from "@modelcontextprotocol/sdk/types.js";
 import { CompositeLogger, LogId } from "./logger.js";
@@ -17,7 +18,6 @@ export interface SessionOptions {
     apiClientId?: string;
     apiClientSecret?: string;
     logger: CompositeLogger;
-    sessionId: string;
     exportsManager: ExportsManager;
     connectionManager: ConnectionManager;
 }
@@ -30,7 +30,7 @@ export type SessionEvents = {
 };
 
 export class Session extends EventEmitter<SessionEvents> {
-    readonly sessionId: string;
+    readonly sessionId: string = new ObjectId().toString();
     readonly exportsManager: ExportsManager;
     readonly connectionManager: ConnectionManager;
     readonly apiClient: ApiClient;
@@ -46,7 +46,6 @@ export class Session extends EventEmitter<SessionEvents> {
         apiClientId,
         apiClientSecret,
         logger,
-        sessionId,
         connectionManager,
         exportsManager,
     }: SessionOptions) {
@@ -62,8 +61,6 @@ export class Session extends EventEmitter<SessionEvents> {
                 : undefined;
 
         this.apiClient = new ApiClient({ baseUrl: apiBaseUrl, credentials }, logger);
-
-        this.sessionId = sessionId;
         this.exportsManager = exportsManager;
         this.connectionManager = connectionManager;
         this.connectionManager.on("connection-succeeded", () => this.emit("connect"));

src/transports/base.ts

@@ -5,7 +5,6 @@ import { Session } from "../common/session.js";
 import { Telemetry } from "../telemetry/telemetry.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CompositeLogger, ConsoleLogger, DiskLogger, LoggerBase, McpLogger } from "../common/logger.js";
-import { ObjectId } from "bson";
 import { ExportsManager } from "../common/exportsManager.js";
 import { ConnectionManager } from "../common/connectionManager.js";
 
@@ -43,16 +42,14 @@ export abstract class TransportRunnerBase {
         }
 
         const logger = new CompositeLogger(...loggers);
-        const sessionId = new ObjectId().toString();
-        const exportsManager = ExportsManager.init(sessionId, userConfig, logger);
+        const exportsManager = ExportsManager.init(userConfig, logger);
         const connectionManager = new ConnectionManager();
 
         const session = new Session({
             apiBaseUrl: userConfig.apiBaseUrl,
             apiClientId: userConfig.apiClientId,
             apiClientSecret: userConfig.apiClientSecret,
             logger,
-            sessionId,
             exportsManager,
             connectionManager,
         });

tests/integration/helpers.ts

@@ -1,4 +1,3 @@
-import { ObjectId } from "bson";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { InMemoryTransport } from "./inMemoryTransport.js";
 import { Server } from "../../src/server.js";
@@ -58,16 +57,14 @@ export function setupIntegrationTest(getUserConfig: () => UserConfig): Integrati
         );
 
         const logger = new CompositeLogger();
-        const sessionId = new ObjectId().toString();
-        const exportsManager = ExportsManager.init(sessionId, userConfig, logger);
+        const exportsManager = ExportsManager.init(userConfig, logger);
         const connectionManager = new ConnectionManager();
 
         const session = new Session({
             apiBaseUrl: userConfig.apiBaseUrl,
             apiClientId: userConfig.apiClientId,
             apiClientSecret: userConfig.apiClientSecret,
             logger,
-            sessionId,
             exportsManager,
             connectionManager,
         });

tests/integration/telemetry.test.ts

@@ -19,8 +19,7 @@ describe("Telemetry", () => {
             new Session({
                 apiBaseUrl: "",
                 logger: new CompositeLogger(),
-                sessionId: "1FOO",
-                exportsManager: ExportsManager.init("1FOO", config, logger),
+                exportsManager: ExportsManager.init(config, logger),
                 connectionManager: new ConnectionManager(),
             }),
             config

tests/unit/common/exportsManager.test.ts

@@ -113,12 +113,10 @@ describe("ExportsManager unit test", () => {
     beforeEach(async () => {
         await fs.mkdir(exportsManagerConfig.exportsPath, { recursive: true });
         const logger = new CompositeLogger();
-        const sessionId = new ObjectId().toString();
         session = new Session({
             apiBaseUrl: "",
             logger,
-            sessionId,
-            exportsManager: ExportsManager.init(sessionId, exportsManagerConfig, logger),
+            exportsManager: ExportsManager.init(exportsManagerConfig, logger),
             connectionManager: new ConnectionManager(),
         });
         manager = session.exportsManager;
@@ -460,13 +458,13 @@ describe("ExportsManager unit test", () => {
         it("should not clean up in-progress exports", async () => {
             const { exportName } = getExportNameAndPath(session.sessionId);
             const manager = ExportsManager.init(
-                session.sessionId,
                 {
                     ...exportsManagerConfig,
                     exportTimeoutMs: 100,
                     exportCleanupIntervalMs: 50,
                 },
-                new CompositeLogger()
+                new CompositeLogger(),
+                session.sessionId
             );
             const { cursor } = createDummyFindCursorWithDelay([{ name: "Test" }], 2000);
             manager.createJSONExport({
@@ -488,13 +486,13 @@ describe("ExportsManager unit test", () => {
         it("should cleanup expired exports", async () => {
             const { exportName, exportPath, exportURI } = getExportNameAndPath(session.sessionId);
             const manager = ExportsManager.init(
-                session.sessionId,
                 {
                     ...exportsManagerConfig,
                     exportTimeoutMs: 100,
                     exportCleanupIntervalMs: 50,
                 },
-                new CompositeLogger()
+                new CompositeLogger(),
+                session.sessionId
             );
             manager.createJSONExport({
                 input: cursor,

tests/unit/common/session.test.ts

@@ -17,8 +17,7 @@ describe("Session", () => {
             apiClientId: "test-client-id",
             apiBaseUrl: "https://api.test.com",
             logger,
-            sessionId: "1FOO",
-            exportsManager: ExportsManager.init("1FOO", config, logger),
+            exportsManager: ExportsManager.init(config, logger),
             connectionManager: new ConnectionManager(),
         });
 

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

@@ -12,8 +12,7 @@ describe("debug resource", () => {
     const session = new Session({
         apiBaseUrl: "",
         logger,
-        sessionId: "1FOO",
-        exportsManager: ExportsManager.init("1FOO", config, logger),
+        exportsManager: ExportsManager.init(config, logger),
         connectionManager: new ConnectionManager(),
     });
     const telemetry = Telemetry.create(session, { ...config, telemetry: "disabled" });