@himanshusinghs/mongodb-mcp-server 1.8.0 → 1.11.0-prerelease.3

package/dist/esm/transports/monitoringServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"monitoringServer.js","sourceRoot":"","sources":["../../../src/transports/monitoringServer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAC;AAShE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,OAAO,gBAAmE,SAAQ,sBAAsB;IAI1G,YAAY,EACR,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,OAAO,GAOV;QACG,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,UAAU,CAAmD,EAChE,UAAU,EACV,MAAM,EACN,OAAO,GAKV;QACG,MAAM,IAAI,GAAG,UAAU,CAAC,oBAAoB,IAAI,UAAU,CAAC,eAAe,CAAC;QAC3E,MAAM,IAAI,GAAG,UAAU,CAAC,oBAAoB,IAAI,UAAU,CAAC,eAAe,CAAC;QAC3E,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAC3C,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,IAAI,gBAAgB,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,wBAAwB,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IAChH,CAAC;IAEkB,WAAW;QAC1B,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,IAAqB,EAAE,GAAqB,EAAE,EAAE;gBACrE,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACP,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;YAChE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,IAAqB,EAAE,GAAqB,EAAE,EAAE;gBAC5E,IAAI,CAAC;oBACD,MAAM,MAAM,GAAG,MAAM,UAAU,EAAE,CAAC;oBAClC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;oBACtC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACrB,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;wBACd,EAAE,EAAE,KAAK,CAAC,8BAA8B;wBACxC,OAAO,EAAE,kBAAkB;wBAC3B,OAAO,EAAE,+BAA+B,MAAM,CAAC,KAAK,CAAC,EAAE;qBAC1D,CAAC,CAAC;oBACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC,CAAC;gBAClE,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ;AAUD;;GAEG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAER,CAC9B,IAA+C,EACjD,EAAE,CAAC,IAAI,gBAAgB,CAAW,IAAI,CAAC,CAAC"}

package/dist/esm/transports/stdio.d.ts

@@ -2,9 +2,10 @@ import type { CustomizableServerOptions } from "./base.js";
 import type { CustomizableSessionOptions } from "./base.js";
 import { TransportRunnerBase, type TransportRunnerConfig } from "./base.js";
 import type { UserConfig } from "../lib.js";
-export declare class StdioRunner<TUserConfig extends UserConfig = UserConfig, TContext = unknown> extends TransportRunnerBase<TUserConfig, TContext> {
+import type { DefaultMetrics } from "@mongodb-js/mcp-metrics";
+export declare class StdioRunner<TUserConfig extends UserConfig = UserConfig, TContext = unknown, TMetrics extends DefaultMetrics = DefaultMetrics> extends TransportRunnerBase<TUserConfig, TContext, TMetrics> {
     private server;
-    constructor(config: TransportRunnerConfig<TUserConfig>);
+    constructor(config: TransportRunnerConfig<TUserConfig, TMetrics>);
     start({ serverOptions, sessionOptions, }?: {
         serverOptions?: CustomizableServerOptions<TUserConfig, TContext>;
         sessionOptions?: CustomizableSessionOptions<TUserConfig>;

package/dist/esm/transports/stdio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,qBAAa,WAAW,CAAC,WAAW,SAAS,UAAU,GAAG,UAAU,EAAE,QAAQ,GAAG,OAAO,CAAE,SAAQ,mBAAmB,CACjH,WAAW,EACX,QAAQ,CACX;IACG,OAAO,CAAC,MAAM,CAA4C;gBAE9C,MAAM,EAAE,qBAAqB,CAAC,WAAW,CAAC;IAIhD,KAAK,CAAC,EACR,aAAa,EACb,cAAc,GACjB,GAAE;QACC,aAAa,CAAC,EAAE,yBAAyB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACjE,cAAc,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;KACvD,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBhB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC"}
+{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAC5E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,qBAAa,WAAW,CACpB,WAAW,SAAS,UAAU,GAAG,UAAU,EAC3C,QAAQ,GAAG,OAAO,EAClB,QAAQ,SAAS,cAAc,GAAG,cAAc,CAClD,SAAQ,mBAAmB,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC;IAC1D,OAAO,CAAC,MAAM,CAA4C;gBAE9C,MAAM,EAAE,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC;IAI1D,KAAK,CAAC,EACR,aAAa,EACb,cAAc,GACjB,GAAE;QACC,aAAa,CAAC,EAAE,yBAAyB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACjE,cAAc,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;KACvD,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC"}

package/dist/esm/transports/stdio.js

@@ -1,24 +1,13 @@
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { LogId } from "../common/logging/index.js";
 import { TransportRunnerBase } from "./base.js";
 export class StdioRunner extends TransportRunnerBase {
     constructor(config) {
         super(config);
     }
     async start({ serverOptions, sessionOptions, } = {}) {
-        try {
-            this.server = await this.createServer({ serverOptions, sessionOptions });
-            const transport = new StdioServerTransport();
-            await this.server.connect(transport);
-        }
-        catch (error) {
-            this.logger.emergency({
-                id: LogId.serverStartFailure,
-                context: "server",
-                message: `Fatal error running server: ${error}`,
-            });
-            process.exit(1);
-        }
+        this.server = await this.createServer({ serverOptions, sessionOptions });
+        const transport = new StdioServerTransport();
+        await this.server.connect(transport);
     }
     async closeTransport() {
         await this.server?.close();

package/dist/esm/transports/stdio.js.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AAInD,OAAO,EAAE,mBAAmB,EAA8B,MAAM,WAAW,CAAC;AAG5E,MAAM,OAAO,WAA6E,SAAQ,mBAGjG;IAGG,YAAY,MAA0C;QAClD,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EACR,aAAa,EACb,cAAc,MAId,EAAE;QACF,IAAI,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;YACzE,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;YAE7C,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBAClB,EAAE,EAAE,KAAK,CAAC,kBAAkB;gBAC5B,OAAO,EAAE,QAAQ;gBACjB,OAAO,EAAE,+BAA+B,KAAe,EAAE;aAC5D,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;CACJ"}
+{"version":3,"file":"stdio.js","sourceRoot":"","sources":["../../../src/transports/stdio.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAIjF,OAAO,EAAE,mBAAmB,EAA8B,MAAM,WAAW,CAAC;AAI5E,MAAM,OAAO,WAIX,SAAQ,mBAAoD;IAG1D,YAAY,MAAoD;QAC5D,KAAK,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EACR,aAAa,EACb,cAAc,MAId,EAAE;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAE7C,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,MAAM,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/B,CAAC;CACJ"}

package/dist/esm/transports/streamableHttp.d.ts

@@ -1,9 +1,62 @@
+import type { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import type { LoggerBase } from "../common/logging/index.js";
+import { type CreateSessionStoreFn } from "../common/sessionStore.js";
 import { TransportRunnerBase, type TransportRunnerConfig, type RequestContext, type CustomizableSessionOptions } from "./base.js";
 import type { CustomizableServerOptions, Server, UserConfig } from "../lib.js";
-export declare class StreamableHttpRunner<TUserConfig extends UserConfig = UserConfig, TContext = unknown> extends TransportRunnerBase<TUserConfig, TContext> {
+import type { Metrics, DefaultMetrics } from "@mongodb-js/mcp-metrics";
+import type { MonitoringServerFeature } from "../common/schemas.js";
+import { MCPHttpServer, type CreateMcpHttpServerFn, createDefaultMcpHttpServer, type MCPHttpServerConstructorArgs } from "./mcpHttpServer.js";
+import { MonitoringServer, type CreateMonitoringServerFn, createDefaultMonitoringServer } from "./monitoringServer.js";
+export { createDefaultMonitoringServer, MonitoringServer, createDefaultMcpHttpServer, MCPHttpServer };
+export type { CreateMonitoringServerFn, MonitoringServerFeature, CreateMcpHttpServerFn, MCPHttpServerConstructorArgs };
+/**
+ * Configuration options for extracting monitoring server settings from UserConfig.
+ */
+export type MonitoringServerConfig = {
+    monitoringServerHost?: string;
+    monitoringServerPort?: number;
+    healthCheckHost?: string;
+    healthCheckPort?: number;
+    monitoringServerFeatures: MonitoringServerFeature[];
+};
+/**
+ * Configuration options for the StreamableHttpRunner.
+ * Extends the base TransportRunnerConfig with HTTP-transport-specific options.
+ *
+ * @template TUserConfig - The type of user configuration
+ * @template TMetrics - The type of metrics definitions
+ */
+export type StreamableHttpTransportRunnerConfig<TUserConfig extends UserConfig = UserConfig, TMetrics extends DefaultMetrics = DefaultMetrics, TContext = unknown> = TransportRunnerConfig<TUserConfig, TMetrics> & {
+    /**
+     * When provided, the runner will use this function to create the monitoring server
+     * instead of using the default MonitoringServer constructor. This allows for
+     * customizing the monitoring server (e.g., adding custom routes) while still
+     * receiving the constructor arguments that would normally be used.
+     */
+    createMonitoringServer?: CreateMonitoringServerFn<TMetrics>;
+    /**
+     * When provided, the runner will use this function to create the session store
+     * instead of using the default SessionStore constructor. This allows for
+     * customizing session storage (e.g., Redis-backed storage, custom timeout behavior,
+     * or shared session state across instances) while still receiving the constructor
+     * arguments that would normally be used.
+     */
+    createSessionStore?: CreateSessionStoreFn<StreamableHTTPServerTransport, TMetrics>;
+    /**
+     * When provided, the runner will use this function to create the MCP HTTP server
+     * instead of using the default MCPHttpServer constructor. This allows for
+     * customizing the HTTP server (e.g., adding pre-route middleware) while still
+     * receiving the constructor arguments that would normally be used.
+     */
+    createMcpHttpServer?: CreateMcpHttpServerFn<TUserConfig, TContext>;
+};
+export { JSON_RPC_ERROR_CODE_PROCESSING_REQUEST_FAILED, JSON_RPC_ERROR_CODE_SESSION_ID_REQUIRED, JSON_RPC_ERROR_CODE_SESSION_ID_INVALID, JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND, JSON_RPC_ERROR_CODE_INVALID_REQUEST, JSON_RPC_ERROR_CODE_DISALLOWED_EXTERNAL_SESSION, } from "./jsonRpcErrorCodes.js";
+export declare class StreamableHttpRunner<TUserConfig extends UserConfig = UserConfig, TContext = unknown, TMetrics extends DefaultMetrics = DefaultMetrics> extends TransportRunnerBase<TUserConfig, TContext, TMetrics> {
     private mcpServer;
-    private healthCheckServer;
-    constructor(config: TransportRunnerConfig<TUserConfig>);
+    private readonly monitoringServer;
+    private readonly sessionStore;
+    private readonly createMcpHttpServer;
+    constructor(config: StreamableHttpTransportRunnerConfig<TUserConfig, TMetrics, TContext>);
     /** Starts the transport runner. */
     start({ serverOptions, sessionOptions, }?: {
         /** Server options to use when creating the server. */
@@ -23,8 +76,16 @@ export declare class StreamableHttpRunner<TUserConfig extends UserConfig = UserC
         /** Upstream `sessionOptions` passed from running `runner.start({ sessionOptions })` method */
         sessionOptions?: CustomizableSessionOptions<TUserConfig>;
     }): Promise<Server<TUserConfig, TContext>>;
-    private startMCPServer;
-    private startHealthCheckServer;
     private validateConfig;
 }
+/**
+ * Constructor arguments for creating a MonitoringServer instance.
+ */
+export type MonitoringServerConstructorArgs<TMetrics extends DefaultMetrics = DefaultMetrics> = {
+    host: string;
+    port: number;
+    features: MonitoringServerFeature[];
+    logger: LoggerBase;
+    metrics: Metrics<TMetrics>;
+};
 //# sourceMappingURL=streamableHttp.d.ts.map

package/dist/esm/transports/streamableHttp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streamableHttp.d.ts","sourceRoot":"","sources":["../../../src/transports/streamableHttp.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,mBAAmB,EACnB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAClC,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAU/E,qBAAa,oBAAoB,CAC7B,WAAW,SAAS,UAAU,GAAG,UAAU,EAC3C,QAAQ,GAAG,OAAO,CACpB,SAAQ,mBAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC;IAChD,OAAO,CAAC,SAAS,CAAmD;IACpE,OAAO,CAAC,iBAAiB,CAAgC;gBAE7C,MAAM,EAAE,qBAAqB,CAAC,WAAW,CAAC;IAItD,mCAAmC;IAC7B,KAAK,CAAC,EACR,aAAa,EACb,cAAc,GACjB,GAAE;QACC,sDAAsD;QACtD,aAAa,CAAC,EAAE,yBAAyB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACjE,wDAAwD;QACxD,cAAc,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;KACvD,GAAG,OAAO,CAAC,IAAI,CAAC;IAahB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,OAAO,CAAC,uBAAuB;IAM/B;;OAEG;cACa,sBAAsB,CAAC,EACnC,OAAO,EACP,aAAa,EACb,cAAc,GACjB,EAAE;QACC,OAAO,EAAE,cAAc,CAAC;QACxB,4FAA4F;QAC5F,aAAa,CAAC,EAAE,yBAAyB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACjE,8FAA8F;QAC9F,cAAc,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;KAC5D,GAAG,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YAgD5B,cAAc;YA0Bd,sBAAsB;IASpC,OAAO,CAAC,cAAc;CAoBzB"}
+{"version":3,"file":"streamableHttp.d.ts","sourceRoot":"","sources":["../../../src/transports/streamableHttp.ts"],"names":[],"mappings":"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"}

package/dist/esm/transports/streamableHttp.js

@@ -1,25 +1,49 @@
-import express from "express";
-import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
 import { CompositeLogger, LogId } from "../common/logging/index.js";
-import { SessionStore } from "../common/sessionStore.js";
+import { createDefaultSessionStore } from "../common/sessionStore.js";
 import { TransportRunnerBase, } from "./base.js";
-import { getRandomUUID } from "../helpers/getRandomUUID.js";
 import { applyConfigOverrides } from "../common/config/configOverrides.js";
-const JSON_RPC_ERROR_CODE_PROCESSING_REQUEST_FAILED = -32000;
-const JSON_RPC_ERROR_CODE_SESSION_ID_REQUIRED = -32001;
-const JSON_RPC_ERROR_CODE_SESSION_ID_INVALID = -32002;
-const JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND = -32003;
-const JSON_RPC_ERROR_CODE_INVALID_REQUEST = -32004;
-const JSON_RPC_ERROR_CODE_DISALLOWED_EXTERNAL_SESSION = -32005;
+import { MCPHttpServer, createDefaultMcpHttpServer, } from "./mcpHttpServer.js";
+import { MonitoringServer, createDefaultMonitoringServer } from "./monitoringServer.js";
+export { createDefaultMonitoringServer, MonitoringServer, createDefaultMcpHttpServer, MCPHttpServer };
+export { JSON_RPC_ERROR_CODE_PROCESSING_REQUEST_FAILED, JSON_RPC_ERROR_CODE_SESSION_ID_REQUIRED, JSON_RPC_ERROR_CODE_SESSION_ID_INVALID, JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND, JSON_RPC_ERROR_CODE_INVALID_REQUEST, JSON_RPC_ERROR_CODE_DISALLOWED_EXTERNAL_SESSION, } from "./jsonRpcErrorCodes.js";
 export class StreamableHttpRunner extends TransportRunnerBase {
     constructor(config) {
         super(config);
+        this.createMcpHttpServer = config.createMcpHttpServer ?? createDefaultMcpHttpServer;
+        this.sessionStore = (config.createSessionStore ?? (createDefaultSessionStore))({
+            options: {
+                idleTimeoutMS: this.userConfig.idleTimeoutMs,
+                notificationTimeoutMS: this.userConfig.notificationTimeoutMs,
+            },
+            logger: this.logger,
+            metrics: this.metrics,
+        });
+        // Create monitoring server if host/port are configured
+        const host = config.userConfig.monitoringServerHost ?? config.userConfig.healthCheckHost;
+        const port = config.userConfig.monitoringServerPort ?? config.userConfig.healthCheckPort;
+        if (host !== undefined && port !== undefined) {
+            this.monitoringServer = (config.createMonitoringServer ?? createDefaultMonitoringServer)({
+                host,
+                port,
+                features: config.userConfig.monitoringServerFeatures,
+                logger: this.logger,
+                metrics: this.metrics,
+            });
+        }
     }
     /** Starts the transport runner. */
     async start({ serverOptions, sessionOptions, } = {}) {
         this.validateConfig();
-        await this.startMCPServer({ serverOptions, sessionOptions });
-        await this.startHealthCheckServer();
+        this.mcpServer = this.createMcpHttpServer({
+            userConfig: this.userConfig,
+            createServerForRequest: ({ request }) => this.createServerForRequest({ request, serverOptions, sessionOptions }),
+            logger: this.logger,
+            metrics: this.metrics,
+            sessionStore: this.sessionStore,
+        });
+        await this.mcpServer.start();
+        // Start the monitoring server if one exists (either externally provided or created in constructor)
+        await this.monitoringServer?.start();
         this.logger.info({
             message: "Streamable HTTP Transport started",
             context: "streamableHttpTransport",
@@ -27,7 +51,7 @@ export class StreamableHttpRunner extends TransportRunnerBase {
         });
     }
     async closeTransport() {
-        await Promise.all([this.mcpServer?.stop(), this.healthCheckServer?.stop()]);
+        await Promise.all([this.mcpServer?.stop(), this.monitoringServer?.stop()]);
     }
     shouldWarnAboutHttpHost(httpHost) {
         const host = httpHost.trim();
@@ -77,35 +101,17 @@ export class StreamableHttpRunner extends TransportRunnerBase {
             },
         });
     }
-    async startMCPServer({ serverOptions, sessionOptions, }) {
-        this.mcpServer = new MCPHttpServer({
-            userConfig: this.userConfig,
-            serverOptions,
-            sessionOptions,
-            createServerForRequest: ({ request, serverOptions: requestServerOptions, sessionOptions: requestSessionOptions, }) => this.createServerForRequest({
-                request,
-                serverOptions: requestServerOptions,
-                sessionOptions: requestSessionOptions,
-            }),
-            logger: this.logger,
-        });
-        await this.mcpServer.start();
-    }
-    async startHealthCheckServer() {
-        const { healthCheckHost, healthCheckPort } = this.userConfig;
-        if (healthCheckHost && healthCheckPort !== undefined) {
-            this.healthCheckServer = new HealthCheckServer(healthCheckHost, healthCheckPort, this.logger);
-            await this.healthCheckServer.start();
-        }
-    }
     validateConfig() {
         if ((this.userConfig.healthCheckHost === undefined) !== (this.userConfig.healthCheckPort === undefined)) {
             throw new Error("Both healthCheckHost and healthCheckPort must be defined to enable health checks.");
         }
-        if (this.userConfig.healthCheckHost !== undefined && this.userConfig.healthCheckPort !== undefined) {
-            if (this.userConfig.healthCheckPort === this.userConfig.httpPort && this.userConfig.healthCheckPort !== 0) {
-                throw new Error("healthCheckPort cannot be the same as httpPort.");
-            }
+        if ((this.userConfig.monitoringServerHost === undefined) !==
+            (this.userConfig.monitoringServerPort === undefined)) {
+            throw new Error("Both monitoringServerHost and monitoringServerPort must be defined to enable the monitoring server.");
+        }
+        const effectivePort = this.userConfig.monitoringServerPort ?? this.userConfig.healthCheckPort;
+        if (effectivePort !== undefined && effectivePort !== 0 && effectivePort === this.userConfig.httpPort) {
+            throw new Error("Monitoring server port cannot be the same as httpPort.");
         }
         if (this.shouldWarnAboutHttpHost(this.userConfig.httpHost)) {
             this.logger.warning({
@@ -117,332 +123,4 @@ export class StreamableHttpRunner extends TransportRunnerBase {
         }
     }
 }
-class ExpressBasedHttpServer {
-    constructor(config) {
-        this.app = express();
-        this.app.enable("trust proxy"); // needed for reverse proxy support
-        this.expressConfig = { port: config.port, hostname: config.hostname };
-        this.logger = config.logger;
-        this.logContext = config.logContext;
-    }
-    get serverAddress() {
-        const result = this.httpServer?.address();
-        if (typeof result === "string") {
-            return result;
-        }
-        if (typeof result === "object" && result) {
-            return `http://${result.address}:${result.port}`;
-        }
-        throw new Error("Server is not started yet");
-    }
-    async start() {
-        await this.setupRoutes();
-        const { port, hostname } = this.expressConfig;
-        this.httpServer = await new Promise((resolve, reject) => {
-            const result = this.app.listen(port, hostname, (err) => {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve(result);
-                }
-            });
-        });
-        this.logger.info({
-            message: `Http server started on address: ${this.serverAddress}`,
-            context: this.logContext,
-            noRedaction: true,
-            id: LogId.httpServerStarted,
-        });
-    }
-    async stop() {
-        if (this.httpServer) {
-            this.logger.info({
-                message: "Stopping server...",
-                context: this.logContext,
-                id: LogId.httpServerStopping,
-            });
-            const server = this.httpServer;
-            await new Promise((resolve, reject) => {
-                server.close((err) => {
-                    if (err) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(undefined);
-                    }
-                });
-            });
-            this.logger.info({
-                message: "Server stopped",
-                context: this.logContext,
-                id: LogId.httpServerStopped,
-            });
-        }
-        else {
-            this.logger.info({
-                message: "Server is not running",
-                context: this.logContext,
-                id: LogId.httpServerStopped,
-            });
-        }
-    }
-}
-class MCPHttpServer extends ExpressBasedHttpServer {
-    constructor({ userConfig, createServerForRequest, serverOptions, sessionOptions, logger, }) {
-        super({
-            port: userConfig.httpPort,
-            hostname: userConfig.httpHost,
-            logger,
-            logContext: "mcpHttpServer",
-        });
-        this.serverOptions = serverOptions;
-        this.sessionOptions = sessionOptions;
-        this.createServerForRequest = createServerForRequest;
-        this.userConfig = userConfig;
-    }
-    async stop() {
-        await Promise.all([this.sessionStore.closeAllSessions(), super.stop()]);
-    }
-    async setupRoutes() {
-        const { StreamableHTTPServerTransport } = await import("@modelcontextprotocol/sdk/server/streamableHttp.js");
-        this.sessionStore = new SessionStore(this.userConfig.idleTimeoutMs, this.userConfig.notificationTimeoutMs, this.logger);
-        this.app.use(express.json({ limit: this.userConfig.httpBodyLimit }));
-        this.app.use((req, res, next) => {
-            console.log("Request method = %s, url = %s, headers=%o, body = %o", req.method, req.url, req.headers, req.body);
-            for (const [key, value] of Object.entries(this.userConfig.httpHeaders)) {
-                const header = req.headers[key.toLowerCase()];
-                if (!header || header !== value) {
-                    res.status(403).json({ error: `Invalid value for header "${key}"` });
-                    return;
-                }
-            }
-            next();
-        });
-        const reportSessionError = (res, errorCode) => {
-            let message;
-            let statusCode = 400;
-            switch (errorCode) {
-                case JSON_RPC_ERROR_CODE_SESSION_ID_REQUIRED:
-                    message = "session id is required";
-                    break;
-                case JSON_RPC_ERROR_CODE_SESSION_ID_INVALID:
-                    message = "session id is invalid";
-                    break;
-                case JSON_RPC_ERROR_CODE_INVALID_REQUEST:
-                    message = "invalid request";
-                    break;
-                case JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND:
-                    message = "session not found";
-                    statusCode = 404;
-                    break;
-                case JSON_RPC_ERROR_CODE_DISALLOWED_EXTERNAL_SESSION:
-                    message = "cannot provide sessionId when externally managed sessions are disabled";
-                    break;
-                default:
-                    message = "unknown error";
-                    statusCode = 500;
-            }
-            res.status(statusCode).json({
-                jsonrpc: "2.0",
-                error: {
-                    code: errorCode,
-                    message,
-                },
-            });
-        };
-        const handleSessionRequest = async (req, res) => {
-            const sessionId = req.headers["mcp-session-id"];
-            if (!sessionId) {
-                return reportSessionError(res, JSON_RPC_ERROR_CODE_SESSION_ID_REQUIRED);
-            }
-            if (typeof sessionId !== "string") {
-                return reportSessionError(res, JSON_RPC_ERROR_CODE_SESSION_ID_INVALID);
-            }
-            const transport = this.sessionStore.getSession(sessionId);
-            if (!transport) {
-                if (this.userConfig.externallyManagedSessions) {
-                    this.logger.debug({
-                        id: LogId.streamableHttpTransportSessionNotFound,
-                        context: "streamableHttpTransport",
-                        message: `Session with ID ${sessionId} not found, initializing new session`,
-                    });
-                    console.log("handleSessionRequest - Initializing transport: Session: %s, Client: %s", sessionId, req.headers["mcp-client-id"]);
-                    return await initializeServer(req, res, { sessionId, isImplicitInitialization: true });
-                }
-                this.logger.debug({
-                    id: LogId.streamableHttpTransportSessionNotFound,
-                    context: "streamableHttpTransport",
-                    message: `Session with ID ${sessionId} not found`,
-                });
-                return reportSessionError(res, JSON_RPC_ERROR_CODE_SESSION_NOT_FOUND);
-            }
-            console.log("handleSessionRequest - Handling request: Session: %s, Client = %s Transport: %s", sessionId, req.headers["mcp-client-id"], transport.id);
-            await transport.handleRequest(req, res, req.body);
-        };
-        /**
-         * Initializes a new server and session. This can be done either explicitly via an initialize request
-         * or implicitly when externally managed sessions are enabled and a request is received for a session
-         * that does not exist.
-         */
-        const initializeServer = async (req, res, { sessionId, isImplicitInitialization, }) => {
-            if (isImplicitInitialization && !sessionId) {
-                throw new Error("Implicit initialization requires externally-passed sessionId");
-            }
-            console.log("initializeServer - client = %s, session %s", req.headers["mcp-client-id"], sessionId);
-            const request = {
-                headers: req.headers,
-                query: req.query,
-            };
-            const server = await this.createServerForRequest({
-                request,
-                serverOptions: this.serverOptions,
-                sessionOptions: this.sessionOptions,
-            });
-            if (req.headers["mcp-client-id"] === "client1") {
-                console.log("initializeServer - Waiting for 5 seconds");
-                await new Promise((resolve) => setTimeout(resolve, 5000));
-            }
-            const options = {
-                enableJsonResponse: this.userConfig.httpResponseType === "json",
-            };
-            const sessionInitialized = (sessionId) => {
-                Object.assign(transport, { id: req.headers["mcp-client-id"] });
-                console.log("initializeServer - client = %s, session %s transportId = %s: sessionInitialized called", req.headers["mcp-client-id"], sessionId, transport.id);
-                server.session.logger.setAttribute("sessionId", sessionId);
-                console.log("initializeServer - client = %s, session %s, transportId = %s : sessionInitialized - setting transport", req.headers["mcp-client-id"], sessionId, transport.id);
-                this.sessionStore.setSession(sessionId, transport, server.session.logger);
-            };
-            // When we're implicitly initializing a session, the client is not going through the initialization
-            // flow. This means that it won't do proper session lifecycle management, so we should not add hooks for
-            // onsessioninitialized and onsessionclosed.
-            if (!isImplicitInitialization) {
-                options.sessionIdGenerator = () => sessionId ?? getRandomUUID();
-                options.onsessioninitialized = sessionInitialized.bind(this);
-                options.onsessionclosed = async (sessionId) => {
-                    try {
-                        await this.sessionStore.closeSession(sessionId, false);
-                    }
-                    catch (error) {
-                        this.logger.error({
-                            id: LogId.streamableHttpTransportSessionCloseFailure,
-                            context: "streamableHttpTransport",
-                            message: `Error closing session ${sessionId}: ${error instanceof Error ? error.message : String(error)}`,
-                        });
-                    }
-                };
-            }
-            const transport = new StreamableHTTPServerTransport(options);
-            if (isImplicitInitialization) {
-                sessionInitialized(sessionId);
-            }
-            let failedPings = 0;
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            const keepAliveLoop = setInterval(async () => {
-                try {
-                    server.session.logger.debug({
-                        id: LogId.streamableHttpTransportKeepAlive,
-                        context: "streamableHttpTransport",
-                        message: "Sending ping",
-                    });
-                    await transport.send({
-                        jsonrpc: "2.0",
-                        method: "ping",
-                    });
-                    failedPings = 0;
-                }
-                catch (err) {
-                    try {
-                        failedPings++;
-                        server.session.logger.warning({
-                            id: LogId.streamableHttpTransportKeepAliveFailure,
-                            context: "streamableHttpTransport",
-                            message: `Error sending ping (attempt #${failedPings}): ${err instanceof Error ? err.message : String(err)}`,
-                        });
-                        if (failedPings > 3) {
-                            clearInterval(keepAliveLoop);
-                            await transport.close();
-                        }
-                    }
-                    catch {
-                        // Ignore the error of the transport close as there's nothing else
-                        // we can do at this point.
-                    }
-                }
-            }, 30000);
-            transport.onclose = () => {
-                clearInterval(keepAliveLoop);
-                server.close().catch((error) => {
-                    this.logger.error({
-                        id: LogId.streamableHttpTransportCloseFailure,
-                        context: "streamableHttpTransport",
-                        message: `Error closing server: ${error instanceof Error ? error.message : String(error)}`,
-                    });
-                });
-            };
-            await server.connect(transport);
-            await transport.handleRequest(req, res, req.body);
-        };
-        this.app.post("/mcp", this.withErrorHandling(async (req, res) => {
-            const sessionId = req.headers["mcp-session-id"];
-            if (sessionId && typeof sessionId !== "string") {
-                return reportSessionError(res, JSON_RPC_ERROR_CODE_SESSION_ID_INVALID);
-            }
-            if (isInitializeRequest(req.body)) {
-                if (sessionId && !this.userConfig.externallyManagedSessions) {
-                    this.logger.debug({
-                        id: LogId.streamableHttpTransportDisallowedExternalSessionError,
-                        context: "streamableHttpTransport",
-                        message: `Client provided session ID ${sessionId}, but externallyManagedSessions is disabled`,
-                    });
-                    return reportSessionError(res, JSON_RPC_ERROR_CODE_DISALLOWED_EXTERNAL_SESSION);
-                }
-                return await initializeServer(req, res, { sessionId });
-            }
-            if (sessionId) {
-                return await handleSessionRequest(req, res);
-            }
-            return reportSessionError(res, JSON_RPC_ERROR_CODE_INVALID_REQUEST);
-        }));
-        this.app.get("/mcp", this.withErrorHandling(handleSessionRequest));
-        this.app.delete("/mcp", this.withErrorHandling(handleSessionRequest));
-    }
-    withErrorHandling(fn) {
-        return (req, res, next) => {
-            fn(req, res, next).catch((error) => {
-                this.logger.error({
-                    id: LogId.streamableHttpTransportRequestFailure,
-                    context: "streamableHttpTransport",
-                    message: `Error handling request: ${error instanceof Error ? error.message : String(error)}`,
-                });
-                res.status(400).json({
-                    jsonrpc: "2.0",
-                    error: {
-                        code: JSON_RPC_ERROR_CODE_PROCESSING_REQUEST_FAILED,
-                        message: `failed to handle request`,
-                        data: error instanceof Error ? error.message : String(error),
-                    },
-                });
-            });
-        };
-    }
-}
-class HealthCheckServer extends ExpressBasedHttpServer {
-    constructor(healthCheckHost, healthCheckPort, logger) {
-        super({
-            port: healthCheckPort,
-            hostname: healthCheckHost,
-            logger,
-            logContext: "healthCheckServer",
-        });
-    }
-    setupRoutes() {
-        this.app.get("/health", (_req, res) => {
-            res.json({
-                status: "ok",
-            });
-        });
-        return Promise.resolve();
-    }
-}
 //# sourceMappingURL=streamableHttp.js.map