chore rename SessionExportsManager to ExportsManager

Author: himanshusinghs

src/common/sessionExportsManager.ts renamed to src/common/exportsManager.ts

@@ -55,25 +55,22 @@ type StoredExport = ReadyExport | InProgressExport;
  * JIRA: https://jira.mongodb.org/browse/MCP-104 */
 type AvailableExport = Pick<StoredExport, "exportName" | "exportURI" | "exportPath">;
 
-export type SessionExportsManagerConfig = Pick<
-    UserConfig,
-    "exportsPath" | "exportTimeoutMs" | "exportCleanupIntervalMs"
->;
+export type ExportsManagerConfig = Pick<UserConfig, "exportsPath" | "exportTimeoutMs" | "exportCleanupIntervalMs">;
 
-type SessionExportsManagerEvents = {
+type ExportsManagerEvents = {
     "export-expired": [string];
     "export-available": [string];
 };
 
-export class SessionExportsManager extends EventEmitter<SessionExportsManagerEvents> {
-    private sessionExports: Record<StoredExport["exportName"], StoredExport> = {};
+export class ExportsManager extends EventEmitter<ExportsManagerEvents> {
+    private storedExports: Record<StoredExport["exportName"], StoredExport> = {};
     private exportsCleanupInProgress: boolean = false;
     private exportsCleanupInterval: NodeJS.Timeout;
     private exportsDirectoryPath: string;
 
     constructor(
         sessionId: string,
-        private readonly config: SessionExportsManagerConfig,
+        private readonly config: ExportsManagerConfig,
         private readonly logger: LoggerBase
     ) {
         super();
@@ -85,11 +82,11 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
     }
 
     public get availableExports(): AvailableExport[] {
-        return Object.values(this.sessionExports)
-            .filter((sessionExport) => {
+        return Object.values(this.storedExports)
+            .filter((storedExport) => {
                 return (
-                    sessionExport.exportStatus === "ready" &&
-                    !isExportExpired(sessionExport.exportCreatedAt, this.config.exportTimeoutMs)
+                    storedExport.exportStatus === "ready" &&
+                    !isExportExpired(storedExport.exportCreatedAt, this.config.exportTimeoutMs)
                 );
             })
             .map(({ exportName, exportURI, exportPath }) => ({
@@ -106,7 +103,7 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
         } catch (error) {
             this.logger.error({
                 id: LogId.exportCloseError,
-                context: "Error while closing SessionExportManager",
+                context: "Error while closing ExportsManager",
                 message: error instanceof Error ? error.message : String(error),
             });
         }
@@ -115,7 +112,7 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
     public async readExport(exportName: string): Promise<string> {
         try {
             const exportNameWithExtension = validateExportName(exportName);
-            const exportHandle = this.sessionExports[exportNameWithExtension];
+            const exportHandle = this.storedExports[exportNameWithExtension];
             if (!exportHandle) {
                 throw new Error("Requested export has either expired or does not exist!");
             }
@@ -157,7 +154,7 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
             const exportNameWithExtension = validateExportName(ensureExtension(exportName, "json"));
             const exportURI = `exported-data://${encodeURIComponent(exportNameWithExtension)}`;
             const exportFilePath = path.join(this.exportsDirectoryPath, exportNameWithExtension);
-            const inProgressExport: InProgressExport = (this.sessionExports[exportNameWithExtension] = {
+            const inProgressExport: InProgressExport = (this.storedExports[exportNameWithExtension] = {
                 exportName: exportNameWithExtension,
                 exportPath: exportFilePath,
                 exportURI: exportURI,
@@ -210,10 +207,10 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
                 LogId.exportCreationCleanupError,
                 `Error when removing incomplete export ${inProgressExport.exportName}`
             );
-            delete this.sessionExports[inProgressExport.exportName];
+            delete this.storedExports[inProgressExport.exportName];
         } finally {
             if (pipeSuccessful) {
-                this.sessionExports[inProgressExport.exportName] = {
+                this.storedExports[inProgressExport.exportName] = {
                     ...inProgressExport,
                     exportCreatedAt: Date.now(),
                     exportStatus: "ready",
@@ -263,13 +260,13 @@ export class SessionExportsManager extends EventEmitter<SessionExportsManagerEve
         }
 
         this.exportsCleanupInProgress = true;
-        const exportsForCleanup = Object.values({ ...this.sessionExports }).filter(
-            (sessionExport): sessionExport is ReadyExport => sessionExport.exportStatus === "ready"
+        const exportsForCleanup = Object.values({ ...this.storedExports }).filter(
+            (storedExport): storedExport is ReadyExport => storedExport.exportStatus === "ready"
         );
         try {
             for (const { exportPath, exportCreatedAt, exportURI, exportName } of exportsForCleanup) {
                 if (isExportExpired(exportCreatedAt, this.config.exportTimeoutMs)) {
-                    delete this.sessionExports[exportName];
+                    delete this.storedExports[exportName];
                     await this.silentlyRemoveExport(
                         exportPath,
                         LogId.exportCleanupError,

src/common/session.ts

@@ -10,15 +10,15 @@ import {
 } from "./connectionManager.js";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import { ErrorCodes, MongoDBError } from "./errors.js";
-import { SessionExportsManager } from "./sessionExportsManager.js";
+import { ExportsManager } from "./exportsManager.js";
 
 export interface SessionOptions {
     apiBaseUrl: string;
     apiClientId?: string;
     apiClientSecret?: string;
     logger: CompositeLogger;
     sessionId: string;
-    exportsManager: SessionExportsManager;
+    exportsManager: ExportsManager;
     connectionManager: ConnectionManager;
 }
 
@@ -31,7 +31,7 @@ export type SessionEvents = {
 
 export class Session extends EventEmitter<SessionEvents> {
     readonly sessionId: string;
-    readonly exportsManager: SessionExportsManager;
+    readonly exportsManager: ExportsManager;
     readonly connectionManager: ConnectionManager;
     readonly apiClient: ApiClient;
     agentRunner?: {

src/tools/mongodb/read/export.ts

@@ -2,7 +2,7 @@ import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { OperationType, ToolArgs } from "../../tool.js";
 import { DbOperationArgs, MongoDBToolBase } from "../mongodbTool.js";
 import { FindArgs } from "./find.js";
-import { jsonExportFormat } from "../../../common/sessionExportsManager.js";
+import { jsonExportFormat } from "../../../common/exportsManager.js";
 import z from "zod";
 
 export class ExportTool extends MongoDBToolBase {

src/transports/base.ts

@@ -6,7 +6,7 @@ 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 { SessionExportsManager } from "../common/sessionExportsManager.js";
+import { ExportsManager } from "../common/exportsManager.js";
 import { ConnectionManager } from "../common/connectionManager.js";
 
 export abstract class TransportRunnerBase {
@@ -44,7 +44,7 @@ export abstract class TransportRunnerBase {
 
         const logger = new CompositeLogger(...loggers);
         const sessionId = new ObjectId().toString();
-        const exportsManager = new SessionExportsManager(sessionId, userConfig, logger);
+        const exportsManager = new ExportsManager(sessionId, userConfig, logger);
         const connectionManager = new ConnectionManager();
 
         const session = new Session({

tests/integration/helpers.ts

@@ -11,7 +11,7 @@ import { config } from "../../src/common/config.js";
 import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
 import { ConnectionManager } from "../../src/common/connectionManager.js";
 import { CompositeLogger } from "../../src/common/logger.js";
-import { SessionExportsManager } from "../../src/common/sessionExportsManager.js";
+import { ExportsManager } from "../../src/common/exportsManager.js";
 
 interface ParameterInfo {
     name: string;
@@ -59,7 +59,7 @@ export function setupIntegrationTest(getUserConfig: () => UserConfig): Integrati
 
         const logger = new CompositeLogger();
         const sessionId = new ObjectId().toString();
-        const exportsManager = new SessionExportsManager(sessionId, userConfig, logger);
+        const exportsManager = new ExportsManager(sessionId, userConfig, logger);
         const connectionManager = new ConnectionManager();
 
         const session = new Session({

tests/integration/telemetry.test.ts

@@ -6,7 +6,7 @@ import nodeMachineId from "node-machine-id";
 import { describe, expect, it } from "vitest";
 import { CompositeLogger } from "../../src/common/logger.js";
 import { ConnectionManager } from "../../src/common/connectionManager.js";
-import { SessionExportsManager } from "../../src/common/sessionExportsManager.js";
+import { ExportsManager } from "../../src/common/exportsManager.js";
 
 describe("Telemetry", () => {
     it("should resolve the actual machine ID", async () => {
@@ -20,7 +20,7 @@ describe("Telemetry", () => {
                 apiBaseUrl: "",
                 logger: new CompositeLogger(),
                 sessionId: "1FOO",
-                exportsManager: new SessionExportsManager("1FOO", config, logger),
+                exportsManager: new ExportsManager("1FOO", config, logger),
                 connectionManager: new ConnectionManager(),
             }),
             config

tests/unit/common/sessionExportsManager.test.ts renamed to tests/unit/common/exportsManager.test.ts

@@ -6,10 +6,10 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
     ensureExtension,
     isExportExpired,
-    SessionExportsManager,
-    SessionExportsManagerConfig,
+    ExportsManager,
+    ExportsManagerConfig,
     validateExportName,
-} from "../../../src/common/sessionExportsManager.js";
+} from "../../../src/common/exportsManager.js";
 
 import { config } from "../../../src/common/config.js";
 import { Session } from "../../../src/common/session.js";
@@ -20,7 +20,7 @@ import { CompositeLogger } from "../../../src/common/logger.js";
 import { ConnectionManager } from "../../../src/common/connectionManager.js";
 
 const exportsPath = path.join(ROOT_DIR, "tests", "tmp", "exports");
-const exportsManagerConfig: SessionExportsManagerConfig = {
+const exportsManagerConfig: ExportsManagerConfig = {
     exportsPath,
     exportTimeoutMs: config.exportTimeoutMs,
     exportCleanupIntervalMs: config.exportCleanupIntervalMs,
@@ -99,9 +99,9 @@ async function fileExists(filePath: string): Promise<boolean> {
     }
 }
 
-describe("SessionExportsManager unit test", () => {
+describe("ExportsManager unit test", () => {
     let session: Session;
-    let manager: SessionExportsManager;
+    let manager: ExportsManager;
 
     beforeEach(async () => {
         await manager?.close();
@@ -113,7 +113,7 @@ describe("SessionExportsManager unit test", () => {
             apiBaseUrl: "",
             logger,
             sessionId,
-            exportsManager: new SessionExportsManager(sessionId, config, logger),
+            exportsManager: new ExportsManager(sessionId, config, logger),
             connectionManager: new ConnectionManager(),
         });
         manager = session.exportsManager;
@@ -366,7 +366,7 @@ describe("SessionExportsManager unit test", () => {
 
         it("should not clean up in-progress exports", async () => {
             const { exportName } = getExportNameAndPath(session.sessionId, Date.now());
-            const manager = new SessionExportsManager(
+            const manager = new ExportsManager(
                 session.sessionId,
                 {
                     ...exportsManagerConfig,
@@ -383,17 +383,17 @@ describe("SessionExportsManager unit test", () => {
             });
 
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-            expect((manager as any).sessionExports[exportName]?.exportStatus).toEqual("in-progress");
+            expect((manager as any).storedExports[exportName]?.exportStatus).toEqual("in-progress");
 
             // After clean up interval the export should still be there
             await timeout(200);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-            expect((manager as any).sessionExports[exportName]?.exportStatus).toEqual("in-progress");
+            expect((manager as any).storedExports[exportName]?.exportStatus).toEqual("in-progress");
         });
 
         it("should cleanup expired exports", async () => {
             const { exportName, exportPath, exportURI } = getExportNameAndPath(session.sessionId, Date.now());
-            const manager = new SessionExportsManager(
+            const manager = new ExportsManager(
                 session.sessionId,
                 {
                     ...exportsManagerConfig,

tests/unit/common/session.test.ts

@@ -4,7 +4,7 @@ import { Session } from "../../../src/common/session.js";
 import { config } from "../../../src/common/config.js";
 import { CompositeLogger } from "../../../src/common/logger.js";
 import { ConnectionManager } from "../../../src/common/connectionManager.js";
-import { SessionExportsManager } from "../../../src/common/sessionExportsManager.js";
+import { ExportsManager } from "../../../src/common/exportsManager.js";
 
 vi.mock("@mongosh/service-provider-node-driver");
 const MockNodeDriverServiceProvider = vi.mocked(NodeDriverServiceProvider);
@@ -18,7 +18,7 @@ describe("Session", () => {
             apiBaseUrl: "https://api.test.com",
             logger,
             sessionId: "1FOO",
-            exportsManager: new SessionExportsManager("1FOO", config, logger),
+            exportsManager: new ExportsManager("1FOO", config, logger),
             connectionManager: new ConnectionManager(),
         });
 

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

@@ -5,15 +5,15 @@ import { Telemetry } from "../../../../src/telemetry/telemetry.js";
 import { config } from "../../../../src/common/config.js";
 import { CompositeLogger } from "../../../../src/common/logger.js";
 import { ConnectionManager } from "../../../../src/common/connectionManager.js";
-import { SessionExportsManager } from "../../../../src/common/sessionExportsManager.js";
+import { ExportsManager } from "../../../../src/common/exportsManager.js";
 
 describe("debug resource", () => {
     const logger = new CompositeLogger();
     const session = new Session({
         apiBaseUrl: "",
         logger,
         sessionId: "1FOO",
-        exportsManager: new SessionExportsManager("1FOO", config, logger),
+        exportsManager: new ExportsManager("1FOO", config, logger),
         connectionManager: new ConnectionManager(),
     });
     const telemetry = Telemetry.create(session, { ...config, telemetry: "disabled" });