chore: some minor refactors and linter checks

Author: kmruiz

src/common/config.ts

@@ -139,7 +139,7 @@ export const config = setupUserConfig({
     env: process.env,
 });
 
-export const defaultDriverOptions: ConnectionInfo["driverOptions"] = {
+const defaultDriverOptions: ConnectionInfo["driverOptions"] = {
     readConcern: {
         level: "local",
     },
@@ -152,6 +152,11 @@ export const defaultDriverOptions: ConnectionInfo["driverOptions"] = {
     applyProxyToOIDC: true,
 };
 
+export const driverOptions = setupDriverConfig({
+    config,
+    defaults: defaultDriverOptions,
+});
+
 function getLogPath(): string {
     const localDataPath =
         process.platform === "win32"
@@ -292,3 +297,17 @@ export function setupUserConfig({
 
     return userConfig;
 }
+
+export function setupDriverConfig({
+    config,
+    defaults,
+}: {
+    config: UserConfig;
+    defaults: ConnectionInfo["driverOptions"];
+}): ConnectionInfo["driverOptions"] {
+    const { driverOptions } = generateConnectionInfoFromCliArgs(config);
+    return {
+        ...defaults,
+        ...driverOptions,
+    };
+}

src/common/connectionManager.ts

@@ -1,4 +1,4 @@
-import { defaultDriverOptions } from "./config.js";
+import { driverOptions } from "./config.js";
 import { NodeDriverServiceProvider } from "@mongosh/service-provider-node-driver";
 import EventEmitter from "events";
 import { setAppNameParamIfMissing } from "../helpers/connectionOptions.js";
@@ -92,7 +92,7 @@ export class ConnectionManager extends EventEmitter<ConnectionManagerEvents> {
             serviceProvider = await NodeDriverServiceProvider.connect(settings.connectionString, {
                 productDocsLink: "https://github.com/mongodb-js/mongodb-mcp-server/",
                 productName: "MongoDB MCP",
-                ...defaultDriverOptions,
+                ...driverOptions,
             });
         } catch (error: unknown) {
             const errorReason = error instanceof Error ? error.message : `${error as string}`;

src/index.ts

@@ -88,7 +88,7 @@ main().catch((error: unknown) => {
     process.exit(1);
 });
 
-function assertFIPSMode() {
+function assertFIPSMode(): void | never {
     let fipsError: Error | undefined = undefined;
     if (config.tlsFIPSMode) {
         if (!fipsError && !crypto.getFips()) {
@@ -110,15 +110,15 @@ function assertFIPSMode() {
     }
 }
 
-function assertHelpMode() {
+function assertHelpMode(): void | never {
     if (config.help) {
         console.log("For usage information refer to the README.md:");
         console.log("https://github.com/mongodb-js/mongodb-mcp-server?tab=readme-ov-file#quick-start");
         process.exit(0);
     }
 }
 
-function assertVersionMode() {
+function assertVersionMode(): void | never {
     if (config.version) {
         console.log(packageInfo.version);
         process.exit(0);

src/resources/common/config.ts

@@ -1,5 +1,5 @@
 import { ReactiveResource } from "../resource.js";
-import { config, defaultDriverOptions } from "../../common/config.js";
+import { config, driverOptions } from "../../common/config.js";
 import type { UserConfig } from "../../common/config.js";
 import type { Server } from "../../server.js";
 import type { Telemetry } from "../../telemetry/telemetry.js";
@@ -37,7 +37,7 @@ export class ConfigResource extends ReactiveResource<UserConfig, readonly []> {
             connectionString: this.current.connectionString
                 ? "set; access to MongoDB tools are currently available to use"
                 : "not set; before using any MongoDB tool, you need to configure a connection string, alternatively you can setup MongoDB Atlas access, more info at 'https://github.com/mongodb-js/mongodb-mcp-server'.",
-            connectOptions: defaultDriverOptions,
+            connectOptions: driverOptions,
             atlas:
                 this.current.apiClientId && this.current.apiClientSecret
                     ? "set; MongoDB Atlas tools are currently available to use"