Merge remote-tracking branch 'origin/main' into MCP-224

Author: blva

README.md

@@ -0,0 +1,11 @@
+{
+  "entry": [
+    "src/index.ts!",
+    "src/lib.ts!",
+    "tests/**/*.ts",
+    "scripts/**/*.ts",
+    "eslint-rules/*.js"
+  ],
+  "ignore": ["tests/integration/fixtures/curl.mjs", "tests/vitest.d.ts"],
+  "ignoreExportsUsedInFile": true
+}

knip.json

@@ -1,7 +1,7 @@
 {
   "name": "mongodb-mcp-server",
   "description": "MongoDB Model Context Protocol Server",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "exports": {
     ".": {
@@ -44,8 +44,9 @@
     "build": "npm run build:clean && npm run build:esm && npm run build:cjs && npm run build:universal-package && npm run build:chmod",
     "inspect": "npm run build && mcp-inspector -- dist/esm/index.js",
     "prettier": "prettier",
-    "check": "npm run build && npm run check:types && npm run check:lint && npm run check:format",
+    "check": "npm run build && npm run check:types && npm run check:lint && npm run check:format && npm run check:dependencies",
     "check:lint": "eslint .",
+    "check:dependencies": "knip --strict",
     "check:format": "prettier -c .",
     "check:types": "tsc --noEmit --project tsconfig.json",
     "fix": "npm run fix:lint && npm run reformat",
@@ -66,19 +67,20 @@
     "@mongodb-js/oidc-mock-provider": "^0.11.3",
     "@redocly/cli": "^2.0.8",
     "@types/express": "^5.0.3",
-    "@types/http-proxy": "^1.17.16",
-    "@types/node": "^24.3.0",
+    "@types/node": "^24.5.2",
     "@types/proper-lockfile": "^4.1.4",
     "@types/semver": "^7.7.0",
-    "@types/simple-oauth2": "^5.0.7",
     "@types/yargs-parser": "^21.0.3",
+    "@typescript-eslint/parser": "^8.44.0",
     "@vitest/coverage-v8": "^3.2.4",
     "ai": "^4.3.17",
     "duplexpair": "^1.0.2",
     "eslint": "^9.34.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "globals": "^16.3.0",
+    "knip": "^5.63.1",
+    "mongodb": "^6.19.0",
     "mongodb-runner": "^5.9.2",
     "ollama-ai-provider": "^1.2.0",
     "openapi-types": "^12.1.3",
@@ -90,22 +92,19 @@
     "tsx": "^4.20.5",
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.41.0",
-    "uuid": "^11.1.0",
-    "vitest": "^3.2.4",
-    "yaml": "^2.8.1"
+    "@vitest/eslint-plugin": "^1.3.4",
+    "uuid": "^13.0.0",
+    "vitest": "^3.2.4"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.17.4",
     "@mongodb-js/device-id": "^0.3.1",
-    "@mongodb-js/devtools-connect": "^3.9.3",
-    "@mongodb-js/devtools-proxy-support": "^0.5.2",
-    "@mongosh/arg-parser": "^3.14.0",
-    "@mongosh/service-provider-node-driver": "~3.12.0",
-    "@vitest/eslint-plugin": "^1.3.4",
+    "@mongodb-js/devtools-proxy-support": "^0.5.3",
+    "@mongosh/arg-parser": "^3.19.0",
+    "@mongosh/service-provider-node-driver": "^3.17.0",
     "bson": "^6.10.4",
     "express": "^5.1.0",
     "lru-cache": "^11.1.0",
-    "mongodb": "^6.19.0",
     "mongodb-connection-string-url": "^3.0.2",
     "mongodb-log-writer": "^2.4.1",
     "mongodb-redact": "^1.2.0",
@@ -115,7 +114,7 @@
     "oauth4webapi": "^3.8.0",
     "openapi-fetch": "^0.14.0",
     "ts-levenshtein": "^1.0.7",
-    "yargs-parser": "^21.1.1",
+    "yargs-parser": "^22.0.0",
     "zod": "^3.25.76"
   },
   "engines": {

package-lock.json

@@ -17,7 +17,7 @@ export MDB_ACCURACY_RUN_ID=$(npx uuid v4)
 # specified in the command line. Such as:
 # npm run test:accuracy -- tests/accuracy/some-test.test.ts
 echo "Running accuracy tests with MDB_ACCURACY_RUN_ID '$MDB_ACCURACY_RUN_ID'"
-vitest --config vitest.config.ts --project=accuracy --coverage=false --run "$@"
+vitest --config vitest.config.ts --project=accuracy --coverage=false --no-file-parallelism --run "$@"
 
 # Preserving the exit code from test run to correctly notify in the CI
 # environments when the tests fail.

package.json

@@ -9,6 +9,7 @@ import levenshtein from "ts-levenshtein";
 
 // From: https://github.com/mongodb-js/mongosh/blob/main/packages/cli-repl/src/arg-parser.ts
 const OPTIONS = {
+    number: ["maxDocumentsPerQuery", "maxBytesPerQuery"],
     string: [
         "apiBaseUrl",
         "apiClientId",
@@ -98,6 +99,7 @@ const OPTIONS = {
 
 interface Options {
     string: string[];
+    number: string[];
     boolean: string[];
     array: string[];
     alias: Record<string, string>;
@@ -106,6 +108,7 @@ interface Options {
 
 export const ALL_CONFIG_KEYS = new Set(
     (OPTIONS.string as readonly string[])
+        .concat(OPTIONS.number)
         .concat(OPTIONS.array)
         .concat(OPTIONS.boolean)
         .concat(Object.keys(OPTIONS.alias))
@@ -175,6 +178,8 @@ export interface UserConfig extends CliOptions {
     loggers: Array<"stderr" | "disk" | "mcp">;
     idleTimeoutMs: number;
     notificationTimeoutMs: number;
+    maxDocumentsPerQuery: number;
+    maxBytesPerQuery: number;
     atlasTemporaryDatabaseUserLifetimeMs: number;
 }
 
@@ -202,6 +207,8 @@ export const defaultUserConfig: UserConfig = {
     idleTimeoutMs: 10 * 60 * 1000, // 10 minutes
     notificationTimeoutMs: 9 * 60 * 1000, // 9 minutes
     httpHeaders: {},
+    maxDocumentsPerQuery: 100, // By default, we only fetch a maximum 100 documents per query / aggregation
+    maxBytesPerQuery: 16 * 1024 * 1024, // By default, we only return ~16 mb of data per query / aggregation
     atlasTemporaryDatabaseUserLifetimeMs: 4 * 60 * 60 * 1000, // 4 hours
 };
 
@@ -231,11 +238,6 @@ export const defaultDriverOptions: DriverOptions = {
     applyProxyToOIDC: true,
 };
 
-export const driverOptions = setupDriverConfig({
-    config,
-    defaults: defaultDriverOptions,
-});
-
 function getLogPath(): string {
     const logPath = path.join(getLocalDataPath(), "mongodb-mcp", ".app-logs");
     return logPath;

scripts/accuracy/runAccuracyTests.sh

@@ -39,7 +39,7 @@ export interface ConnectionStateConnected extends ConnectionState {
 
 export interface ConnectionStateConnecting extends ConnectionState {
     tag: "connecting";
-    serviceProvider: NodeDriverServiceProvider;
+    serviceProvider: Promise<NodeDriverServiceProvider>;
     oidcConnectionType: OIDCConnectionAuthType;
     oidcLoginUrl?: string;
     oidcUserCode?: string;
@@ -68,18 +68,6 @@ export interface ConnectionManagerEvents {
     "connection-error": [ConnectionStateErrored];
 }
 
-/**
- * For a few tests, we need the changeState method to force a connection state
- * which is we have this type to typecast the actual ConnectionManager with
- * public changeState (only to make TS happy).
- */
-export type TestConnectionManager = ConnectionManager & {
-    changeState<Event extends keyof ConnectionManagerEvents, State extends ConnectionManagerEvents[Event][0]>(
-        event: Event,
-        newState: State
-    ): State;
-};
-
 export abstract class ConnectionManager {
     protected clientName: string;
     protected readonly _events: EventEmitter<ConnectionManagerEvents>;
@@ -112,7 +100,6 @@ export abstract class ConnectionManager {
     }
 
     abstract connect(settings: ConnectionSettings): Promise<AnyConnectionState>;
-
     abstract disconnect(): Promise<ConnectionStateDisconnected | ConnectionStateErrored>;
 }
 
@@ -130,6 +117,7 @@ export class MCPConnectionManager extends ConnectionManager {
         super();
         this.bus = bus ?? new EventEmitter();
         this.bus.on("mongodb-oidc-plugin:auth-failed", this.onOidcAuthFailed.bind(this));
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         this.bus.on("mongodb-oidc-plugin:auth-succeeded", this.onOidcAuthSucceeded.bind(this));
         this.deviceId = deviceId;
     }
@@ -141,7 +129,7 @@ export class MCPConnectionManager extends ConnectionManager {
             await this.disconnect();
         }
 
-        let serviceProvider: NodeDriverServiceProvider;
+        let serviceProvider: Promise<NodeDriverServiceProvider>;
         let connectionInfo: ConnectionInfo;
         let connectionStringAuthType: ConnectionStringAuthType = "scram";
 
@@ -177,7 +165,7 @@ export class MCPConnectionManager extends ConnectionManager {
                 connectionInfo
             );
 
-            serviceProvider = await NodeDriverServiceProvider.connect(
+            serviceProvider = NodeDriverServiceProvider.connect(
                 connectionInfo.connectionString,
                 {
                     productDocsLink: "https://github.com/mongodb-js/mongodb-mcp-server/",
@@ -200,23 +188,19 @@ export class MCPConnectionManager extends ConnectionManager {
 
         try {
             if (connectionStringAuthType.startsWith("oidc")) {
-                void this.pingAndForget(serviceProvider);
-
                 return this.changeState("connection-request", {
                     tag: "connecting",
-                    connectedAtlasCluster: settings.atlas,
                     serviceProvider,
+                    connectedAtlasCluster: settings.atlas,
                     connectionStringAuthType,
                     oidcConnectionType: connectionStringAuthType as OIDCConnectionAuthType,
                 });
             }
 
-            await serviceProvider?.runCommand?.("admin", { hello: 1 });
-
             return this.changeState("connection-success", {
                 tag: "connected",
                 connectedAtlasCluster: settings.atlas,
-                serviceProvider,
+                serviceProvider: await serviceProvider,
                 connectionStringAuthType,
             });
         } catch (error: unknown) {
@@ -238,7 +222,13 @@ export class MCPConnectionManager extends ConnectionManager {
 
         if (this.currentConnectionState.tag === "connected" || this.currentConnectionState.tag === "connecting") {
             try {
-                await this.currentConnectionState.serviceProvider?.close(true);
+                if (this.currentConnectionState.tag === "connected") {
+                    await this.currentConnectionState.serviceProvider?.close();
+                }
+                if (this.currentConnectionState.tag === "connecting") {
+                    const serviceProvider = await this.currentConnectionState.serviceProvider;
+                    await serviceProvider.close();
+                }
             } finally {
                 this.changeState("connection-close", {
                     tag: "disconnected",
@@ -258,12 +248,16 @@ export class MCPConnectionManager extends ConnectionManager {
         }
     }
 
-    private onOidcAuthSucceeded(): void {
+    private async onOidcAuthSucceeded(): Promise<void> {
         if (
             this.currentConnectionState.tag === "connecting" &&
             this.currentConnectionState.connectionStringAuthType?.startsWith("oidc")
         ) {
-            this.changeState("connection-success", { ...this.currentConnectionState, tag: "connected" });
+            this.changeState("connection-success", {
+                ...this.currentConnectionState,
+                tag: "connected",
+                serviceProvider: await this.currentConnectionState.serviceProvider,
+            });
         }
 
         this.logger.info({
@@ -330,18 +324,6 @@ export class MCPConnectionManager extends ConnectionManager {
         }
     }
 
-    private async pingAndForget(serviceProvider: NodeDriverServiceProvider): Promise<void> {
-        try {
-            await serviceProvider?.runCommand?.("admin", { hello: 1 });
-        } catch (error: unknown) {
-            this.logger.warning({
-                id: LogId.oidcFlow,
-                context: "pingAndForget",
-                message: String(error),
-            });
-        }
-    }
-
     private async disconnectOnOidcError(error: unknown): Promise<void> {
         try {
             await this.disconnect();

src/common/config.ts

@@ -44,6 +44,7 @@ export const LogId = {
     mongodbConnectFailure: mongoLogId(1_004_001),
     mongodbDisconnectFailure: mongoLogId(1_004_002),
     mongodbConnectTry: mongoLogId(1_004_003),
+    mongodbCursorCloseError: mongoLogId(1_004_004),
 
     toolUpdateFailure: mongoLogId(1_005_001),
     resourceUpdateFailure: mongoLogId(1_005_002),
@@ -340,15 +341,3 @@ export class CompositeLogger extends LoggerBase {
         this.attributes[key] = value;
     }
 }
-
-export class NullLogger extends LoggerBase {
-    protected type?: LoggerType;
-
-    constructor() {
-        super(undefined);
-    }
-
-    protected logCore(): void {
-        // No-op logger, does not log anything
-    }
-}

src/common/connectionManager.ts

@@ -1,5 +1,5 @@
 // This file was generated by scripts/updatePackageVersion.ts - Do not edit it manually.
 export const packageInfo = {
-    version: "1.0.0",
+    version: "1.0.1",
     mcpServerName: "MongoDB MCP Server",
 };