Merge branch 'main' into fmenezes/use_openapi_fetch

fmenezes · fmenezes · commit 5abb9860ab00 · 2025-04-10T14:30:06.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ This project implements a Model Context Protocol (MCP) server for MongoDB and Mo
 
 ### Prerequisites
 
-- Node.js (v23 or later)
+- Node.js (v20 or later)
 - npm
 
 ### Getting Started
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ A Model Context Protocol server for interacting with MongoDB Atlas. This project
 
 ### Prerequisites
 
-- Node.js (v23 or later)
+- Node.js (v20 or later)
 - MongoDB Atlas account
 
 ### Installation
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -38,6 +38,7 @@
     "@redocly/cli": "^1.34.2",
     "@types/node": "^22.14.0",
     "@types/simple-oauth2": "^5.0.7",
+    "@types/yargs-parser": "^21.0.3",
     "eslint": "^9.24.0",
     "eslint-config-prettier": "^10.1.1",
     "globals": "^16.0.0",
@@ -59,9 +60,10 @@
     "mongodb-redact": "^1.1.6",
     "mongodb-schema": "^12.6.2",
     "openapi-fetch": "^0.13.5",
+    "yargs-parser": "^21.1.1",
     "zod": "^3.24.2"
   },
   "engines": {
-    "node": ">=23.0.0"
+    "node": ">=20.0.0"
   }
 }
diff --git a/src/common/atlas/apiClient.ts b/src/common/atlas/apiClient.ts
@@ -47,7 +47,7 @@ export class ApiClient {
     private token?: OAuthToken;
     private saveToken?: saveTokenFunction;
     private client = createClient<paths>({
-        baseUrl: config.apiBaseURL,
+        baseUrl: config.apiBaseUrl,
         headers: {
             "User-Agent": config.userAgent,
             Accept: `application/vnd.atlas.${config.atlasApiVersion}+json`,
@@ -93,7 +93,7 @@ export class ApiClient {
     async authenticate(): Promise<OauthDeviceCode> {
         const endpoint = "api/private/unauth/account/device/authorize";
 
-        const authUrl = new URL(endpoint, config.apiBaseURL);
+        const authUrl = new URL(endpoint, config.apiBaseUrl);
 
         const response = await fetch(authUrl, {
             method: "POST",
@@ -102,7 +102,7 @@ export class ApiClient {
                 Accept: "application/json",
             },
             body: new URLSearchParams({
-                client_id: config.clientID,
+                client_id: config.clientId,
                 scope: "openid profile offline_access",
                 grant_type: "urn:ietf:params:oauth:grant-type:device_code",
             }).toString(),
@@ -117,14 +117,14 @@ export class ApiClient {
 
     async retrieveToken(device_code: string): Promise<OAuthToken> {
         const endpoint = "api/private/unauth/account/device/token";
-        const url = new URL(endpoint, config.apiBaseURL);
+        const url = new URL(endpoint, config.apiBaseUrl);
         const response = await fetch(url, {
             method: "POST",
             headers: {
                 "Content-Type": "application/x-www-form-urlencoded",
             },
             body: new URLSearchParams({
-                client_id: config.clientID,
+                client_id: config.clientId,
                 device_code: device_code,
                 grant_type: "urn:ietf:params:oauth:grant-type:device_code",
             }).toString(),
@@ -153,15 +153,15 @@ export class ApiClient {
 
     async refreshToken(token?: OAuthToken): Promise<OAuthToken | null> {
         const endpoint = "api/private/unauth/account/device/token";
-        const url = new URL(endpoint, config.apiBaseURL);
+        const url = new URL(endpoint, config.apiBaseUrl);
         const response = await fetch(url, {
             method: "POST",
             headers: {
                 "Content-Type": "application/x-www-form-urlencoded",
                 Accept: "application/json",
             },
             body: new URLSearchParams({
-                client_id: config.clientID,
+                client_id: config.clientId,
                 refresh_token: (token || this.token)?.refresh_token || "",
                 grant_type: "refresh_token",
                 scope: "openid profile offline_access",
@@ -187,7 +187,7 @@ export class ApiClient {
 
     async revokeToken(token?: OAuthToken): Promise<void> {
         const endpoint = "api/private/unauth/account/device/token";
-        const url = new URL(endpoint, config.apiBaseURL);
+        const url = new URL(endpoint, config.apiBaseUrl);
         const response = await fetch(url, {
             method: "POST",
             headers: {
@@ -196,7 +196,7 @@ export class ApiClient {
                 "User-Agent": config.userAgent,
             },
             body: new URLSearchParams({
-                client_id: config.clientID,
+                client_id: config.clientId,
                 token: (token || this.token)?.access_token || "",
                 token_type_hint: "refresh_token",
             }).toString(),
diff --git a/src/common/atlas/auth.ts b/src/common/atlas/auth.ts
@@ -1,5 +1,5 @@
-import { ApiClient } from "./apiClient";
-import { State } from "../../state";
+import { ApiClient } from "./apiClient.js";
+import { State } from "../../state.js";
 
 export async function ensureAuthenticated(state: State, apiClient: ApiClient): Promise<void> {
     if (!(await isAuthenticated(state, apiClient))) {
diff --git a/src/config.ts b/src/config.ts
@@ -1,34 +1,97 @@
 import path from "path";
-import fs from "fs";
-import { fileURLToPath } from "url";
 import os from "os";
+import argv from "yargs-parser";
+
+import packageJson from "../package.json" with { type: "json" };
+import fs from "fs";
+const { localDataPath, configPath } = getLocalDataPath();
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+// If we decide to support non-string config options, we'll need to extend the mechanism for parsing
+// env variables.
+interface UserConfig extends Record<string, string> {
+    apiBaseUrl: string;
+    clientId: string;
+    stateFile: string;
+}
 
-const packageMetadata = fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf8");
-const packageJson = JSON.parse(packageMetadata);
+const defaults: UserConfig = {
+    apiBaseUrl: "https://cloud.mongodb.com/",
+    clientId: "0oabtxactgS3gHIR0297",
+    stateFile: path.join(localDataPath, "state.json"),
+};
 
-export const config = {
+const mergedUserConfig = {
+    ...defaults,
+    ...getFileConfig(),
+    ...getEnvConfig(),
+    ...getCliConfig(),
+};
+
+const config = {
+    ...mergedUserConfig,
     atlasApiVersion: `2025-03-12`,
     version: packageJson.version,
-    apiBaseURL: process.env.API_BASE_URL || "https://cloud.mongodb.com/",
-    clientID: process.env.CLIENT_ID || "0oabtxactgS3gHIR0297",
-    stateFile: process.env.STATE_FILE || path.resolve("./state.json"),
     userAgent: `AtlasMCP/${packageJson.version} (${process.platform}; ${process.arch}; ${process.env.HOSTNAME || "unknown"})`,
-    localDataPath: getLocalDataPath(),
+    localDataPath,
 };
 
 export default config;
 
-function getLocalDataPath() {
+function getLocalDataPath(): { localDataPath: string; configPath: string } {
+    let localDataPath: string | undefined;
+    let configPath: string | undefined;
+
     if (process.platform === "win32") {
         const appData = process.env.APPDATA;
         const localAppData = process.env.LOCALAPPDATA ?? process.env.APPDATA;
         if (localAppData && appData) {
-            return path.join(localAppData, "mongodb", "mongodb-mcp");
+            localDataPath = path.join(localAppData, "mongodb", "mongodb-mcp");
+            configPath = path.join(localDataPath, "mongodb-mcp.conf");
         }
     }
 
-    return path.join(os.homedir(), ".mongodb", "mongodb-mcp");
+    localDataPath ??= path.join(os.homedir(), ".mongodb", "mongodb-mcp");
+    configPath ??= "/etc/mongodb-mcp.conf";
+
+    fs.mkdirSync(localDataPath, { recursive: true });
+
+    return {
+        localDataPath,
+        configPath,
+    };
+}
+
+// Gets the config supplied by the user as environment variables. The variable names
+// are prefixed with `MDB_MCP_` and the keys match the UserConfig keys, but are converted
+// to SNAKE_UPPER_CASE.
+function getEnvConfig(): Partial<UserConfig> {
+    const camelCaseToSNAKE_UPPER_CASE = (str: string): string => {
+        return str.replace(/([a-z])([A-Z])/g, "$1_$2").toUpperCase();
+    };
+
+    const result: Partial<UserConfig> = {};
+    for (const key of Object.keys(defaults)) {
+        const envVarName = `MDB_MCP_${camelCaseToSNAKE_UPPER_CASE(key)}`;
+        if (process.env[envVarName]) {
+            result[key] = process.env[envVarName];
+        }
+    }
+
+    return result;
+}
+
+// Gets the config supplied by the user as a JSON file. The file is expected to be located in the local data path
+// and named `config.json`.
+function getFileConfig(): Partial<UserConfig> {
+    try {
+        const config = fs.readFileSync(configPath, "utf8");
+        return JSON.parse(config);
+    } catch {
+        return {};
+    }
+}
+
+// Reads the cli args and parses them into a UserConfig object.
+function getCliConfig() {
+    return argv(process.argv.slice(2)) as unknown as Partial<UserConfig>;
 }
diff --git a/src/server.ts b/src/server.ts
@@ -4,7 +4,7 @@ import { State, saveState, loadState } 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 { config } from "./config.js";
+import config from "./config.js";
 import logger, { initializeLogger } from "./logger.js";
 import { mongoLogId } from "mongodb-log-writer";
 
@@ -21,14 +21,14 @@ export class Server {
 
         this.apiClient = new ApiClient({
             token: this.state?.auth.token,
-            saveToken: (token) => {
+            saveToken: async (token) => {
                 if (!this.state) {
                     throw new Error("State is not initialized");
                 }
                 this.state.auth.code = undefined;
                 this.state.auth.token = token;
                 this.state.auth.status = "issued";
-                saveState(this.state);
+                await saveState(this.state);
             },
         });
 
diff --git a/src/state.ts b/src/state.ts
@@ -1,4 +1,4 @@
-import fs from "fs";
+import fs from "fs/promises";
 import config from "./config.js";
 import { OauthDeviceCode, OAuthToken } from "./common/atlas/apiClient.js";
 
@@ -8,37 +8,26 @@ export interface State {
         code?: OauthDeviceCode;
         token?: OAuthToken;
     };
+    connectionString?: string;
 }
 
 export async function saveState(state: State): Promise<void> {
-    return new Promise((resolve, reject) => {
-        fs.writeFile(config.stateFile, JSON.stringify(state), function (err) {
-            if (err) {
-                return reject(err);
-            }
-
-            return resolve();
-        });
-    });
+    await fs.writeFile(config.stateFile, JSON.stringify(state), { encoding: "utf-8" });
 }
 
-export async function loadState() {
-    return new Promise<State>((resolve, reject) => {
-        fs.readFile(config.stateFile, "utf-8", (err, data) => {
-            if (err) {
-                if (err.code === "ENOENT") {
-                    // File does not exist, return default state
-                    const defaultState: State = {
-                        auth: {
-                            status: "not_auth",
-                        },
-                    };
-                    return resolve(defaultState);
-                } else {
-                    return reject(err);
-                }
-            }
-            return resolve(JSON.parse(data) as State);
-        });
-    });
+export async function loadState(): Promise<State> {
+    try {
+        const data = await fs.readFile(config.stateFile, "utf-8");
+        return JSON.parse(data) as State;
+    } catch (err: unknown) {
+        if (err && typeof err === "object" && "code" in err && err.code === "ENOENT") {
+            return {
+                auth: {
+                    status: "not_auth",
+                },
+            };
+        }
+
+        throw err;
+    }
 }
diff --git a/src/tools/atlas/auth.ts b/src/tools/atlas/auth.ts
@@ -11,7 +11,7 @@ export class AuthTool extends AtlasToolBase {
     protected argsShape = {};
 
     private async isAuthenticated(): Promise<boolean> {
-        return isAuthenticated(this.state!, this.apiClient);
+        return isAuthenticated(this.state, this.apiClient);
     }
 
     async execute(): Promise<CallToolResult> {
@@ -25,11 +25,11 @@ export class AuthTool extends AtlasToolBase {
         try {
             const code = await this.apiClient.authenticate();
 
-            this.state!.auth.status = "requested";
-            this.state!.auth.code = code;
-            this.state!.auth.token = undefined;
+            this.state.auth.status = "requested";
+            this.state.auth.code = code;
+            this.state.auth.token = undefined;
 
-            await saveState(this.state!);
+            await saveState(this.state);
 
             return {
                 content: [
diff --git a/src/tools/mongodb/connect.ts b/src/tools/mongodb/connect.ts
diff --git a/src/types/mongodb-redact.d.ts b/src/types/mongodb-redact.d.ts
diff --git a/tsconfig.json b/tsconfig.json
