datadog-mcp 5.3.2 → 5.3.3

package/dist/index.js

@@ -5607,6 +5607,24 @@ function createServer(config) {
   );
   return server;
 }
+function createServerFactory(config) {
+  const clients = createDatadogClients(config.datadog);
+  return () => {
+    const server = new McpServer({
+      name: config.server.name,
+      version: config.server.version
+    });
+    registerAllTools(
+      server,
+      clients,
+      config.limits,
+      config.features,
+      config.datadog.site,
+      config.datadog
+    );
+    return server;
+  };
+}
 
 // src/transport/stdio.ts
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -5621,11 +5639,11 @@ import express from "express";
 import { randomUUID } from "crypto";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
-var transports = {};
-function createExpressApp(server, config) {
+function createExpressApp(createServer2, config) {
   const app = express();
   app.disable("x-powered-by");
   app.use(express.json());
+  const transports = {};
   app.get("/health", (_req, res) => {
     res.json({ status: "ok", name: config.name, version: config.version });
   });
@@ -5648,7 +5666,15 @@ function createExpressApp(server, config) {
           console.error(`[MCP] Session closed: ${transport.sessionId}`);
         }
       };
-      await server.connect(transport);
+      try {
+        const server = createServer2();
+        await server.connect(transport);
+      } catch (error) {
+        if (transport.sessionId) {
+          delete transports[transport.sessionId];
+        }
+        throw error;
+      }
     } else {
       res.status(400).json({
         jsonrpc: "2.0",
@@ -5679,8 +5705,8 @@ function createExpressApp(server, config) {
   });
   return app;
 }
-async function connectHttp(server, config) {
-  const app = createExpressApp(server, config);
+async function connectHttp(createServer2, config) {
+  const app = createExpressApp(createServer2, config);
   app.listen(config.port, config.host, () => {
     console.error(`[MCP] Datadog MCP server running on http://${config.host}:${config.port}/mcp`);
     console.error(`[MCP] Health check available at http://${config.host}:${config.port}/health`);
@@ -5690,10 +5716,11 @@ async function connectHttp(server, config) {
 // src/index.ts
 try {
   const config = loadConfig();
-  const server = createServer(config);
   if (config.server.transport === "http") {
-    await connectHttp(server, config.server);
+    const factory = createServerFactory(config);
+    await connectHttp(factory, config.server);
   } else {
+    const server = createServer(config);
     await connectStdio(server);
   }
 } catch (error) {