@ivotoby/openapi-mcp-server 1.10.1 → 1.12.0

package/dist/bundle.js

@@ -18672,9 +18672,7 @@ var ApiClient = class {
           };
         }
       } else {
-        if (Object.keys(paramsCopy).length > 0) {
-          config.data = paramsCopy;
-        }
+        config.data = Object.keys(paramsCopy).length > 0 ? paramsCopy : {};
       }
       const response = await this.axiosInstance(config);
       return response.data;
@@ -23980,6 +23978,18 @@ function loadConfig() {
   }
   const apiBaseUrl = argv["api-base-url"] || process.env.API_BASE_URL;
   const disableAbbreviation = argv["disable-abbreviation"] || (process.env.DISABLE_ABBREVIATION ? process.env.DISABLE_ABBREVIATION === "true" : false);
+  const toolsModeInput = (typeof argv.tools === "string" ? argv.tools : void 0) || process.env.TOOLS_MODE;
+  let toolsMode = "all";
+  if (typeof toolsModeInput === "string" && toolsModeInput.trim().length > 0) {
+    const normalized = toolsModeInput.toLowerCase();
+    if (normalized === "all" || normalized === "dynamic" || normalized === "explicit") {
+      toolsMode = normalized;
+    } else {
+      throw new Error(
+        "Invalid tools mode. Expected one of: all, dynamic, explicit"
+      );
+    }
+  }
   if (!apiBaseUrl) {
     throw new Error("API base URL is required (--api-base-url or API_BASE_URL)");
   }
@@ -24000,7 +24010,7 @@ function loadConfig() {
     includeTags: argv.tag,
     includeResources: argv.resource,
     includeOperations: argv.operation,
-    toolsMode: argv.tools || process.env.TOOLS_MODE || "all",
+    toolsMode,
     disableAbbreviation: disableAbbreviation ? true : void 0
   };
 }
@@ -24014,18 +24024,32 @@ import {
 import * as http2 from "http";
 import { randomUUID } from "crypto";
 var StreamableHttpServerTransport = class {
+  // Track if using an external server
   /**
    * Initialize a new StreamableHttpServerTransport
    *
    * @param port HTTP port to listen on
    * @param host Host to bind to (default: 127.0.0.1)
    * @param endpointPath Endpoint path (default: /mcp)
+   * @param server Optional HTTP server instance. If not provided, a new server will be created.
+   *               If provided, the transport will attach its request handler to the server.
+   *               Note: When using an external server, all handlers added via server.on('request', handler)
+   *               will be called for every request, in the order they were added. Custom handlers should be
+   *               added FIRST and should fully handle their routes (including sending responses) to prevent
+   *               further handlers from running for those requests. The MCP handler should be added after
+   *               custom handlers and will return early for non-MCP paths.
    */
-  constructor(port, host = "127.0.0.1", endpointPath = "/mcp") {
+  constructor(port, host = "127.0.0.1", endpointPath = "/mcp", server) {
     this.port = port;
     this.host = host;
     this.endpointPath = endpointPath;
-    this.server = http2.createServer(this.handleRequest.bind(this));
+    this.isExternalServer = !!server;
+    if (server) {
+      this.server = server;
+      this.server.on("request", this.handleRequest.bind(this));
+    } else {
+      this.server = http2.createServer(this.handleRequest.bind(this));
+    }
   }
   server;
   sessions = /* @__PURE__ */ new Map();
@@ -24036,6 +24060,7 @@ var StreamableHttpServerTransport = class {
   requestSessionMap = /* @__PURE__ */ new Map();
   // Maps request IDs to session IDs
   healthCheckPath = "/health";
+  isExternalServer;
   /**
    * Callback when message is received
    */
@@ -24084,6 +24109,13 @@ var StreamableHttpServerTransport = class {
       }
     }
     this.sessions.clear();
+    if (this.isExternalServer) {
+      this.started = false;
+      if (this.onclose) {
+        this.onclose();
+      }
+      return;
+    }
     return new Promise((resolve5, reject) => {
       this.server.close((err) => {
         if (err) {
@@ -24202,6 +24234,9 @@ var StreamableHttpServerTransport = class {
       return;
     }
     if (req.url !== this.endpointPath) {
+      if (this.isExternalServer) {
+        return;
+      }
       res.writeHead(404);
       res.end();
       return;

package/dist/cli.js

@@ -18672,9 +18672,7 @@ var ApiClient = class {
           };
         }
       } else {
-        if (Object.keys(paramsCopy).length > 0) {
-          config.data = paramsCopy;
-        }
+        config.data = Object.keys(paramsCopy).length > 0 ? paramsCopy : {};
       }
       const response = await this.axiosInstance(config);
       return response.data;
@@ -23980,6 +23978,18 @@ function loadConfig() {
   }
   const apiBaseUrl = argv["api-base-url"] || process.env.API_BASE_URL;
   const disableAbbreviation = argv["disable-abbreviation"] || (process.env.DISABLE_ABBREVIATION ? process.env.DISABLE_ABBREVIATION === "true" : false);
+  const toolsModeInput = (typeof argv.tools === "string" ? argv.tools : void 0) || process.env.TOOLS_MODE;
+  let toolsMode = "all";
+  if (typeof toolsModeInput === "string" && toolsModeInput.trim().length > 0) {
+    const normalized = toolsModeInput.toLowerCase();
+    if (normalized === "all" || normalized === "dynamic" || normalized === "explicit") {
+      toolsMode = normalized;
+    } else {
+      throw new Error(
+        "Invalid tools mode. Expected one of: all, dynamic, explicit"
+      );
+    }
+  }
   if (!apiBaseUrl) {
     throw new Error("API base URL is required (--api-base-url or API_BASE_URL)");
   }
@@ -24000,7 +24010,7 @@ function loadConfig() {
     includeTags: argv.tag,
     includeResources: argv.resource,
     includeOperations: argv.operation,
-    toolsMode: argv.tools || process.env.TOOLS_MODE || "all",
+    toolsMode,
     disableAbbreviation: disableAbbreviation ? true : void 0
   };
 }
@@ -24014,18 +24024,32 @@ import {
 import * as http2 from "http";
 import { randomUUID } from "crypto";
 var StreamableHttpServerTransport = class {
+  // Track if using an external server
   /**
    * Initialize a new StreamableHttpServerTransport
    *
    * @param port HTTP port to listen on
    * @param host Host to bind to (default: 127.0.0.1)
    * @param endpointPath Endpoint path (default: /mcp)
+   * @param server Optional HTTP server instance. If not provided, a new server will be created.
+   *               If provided, the transport will attach its request handler to the server.
+   *               Note: When using an external server, all handlers added via server.on('request', handler)
+   *               will be called for every request, in the order they were added. Custom handlers should be
+   *               added FIRST and should fully handle their routes (including sending responses) to prevent
+   *               further handlers from running for those requests. The MCP handler should be added after
+   *               custom handlers and will return early for non-MCP paths.
    */
-  constructor(port, host = "127.0.0.1", endpointPath = "/mcp") {
+  constructor(port, host = "127.0.0.1", endpointPath = "/mcp", server) {
     this.port = port;
     this.host = host;
     this.endpointPath = endpointPath;
-    this.server = http2.createServer(this.handleRequest.bind(this));
+    this.isExternalServer = !!server;
+    if (server) {
+      this.server = server;
+      this.server.on("request", this.handleRequest.bind(this));
+    } else {
+      this.server = http2.createServer(this.handleRequest.bind(this));
+    }
   }
   server;
   sessions = /* @__PURE__ */ new Map();
@@ -24036,6 +24060,7 @@ var StreamableHttpServerTransport = class {
   requestSessionMap = /* @__PURE__ */ new Map();
   // Maps request IDs to session IDs
   healthCheckPath = "/health";
+  isExternalServer;
   /**
    * Callback when message is received
    */
@@ -24084,6 +24109,13 @@ var StreamableHttpServerTransport = class {
       }
     }
     this.sessions.clear();
+    if (this.isExternalServer) {
+      this.started = false;
+      if (this.onclose) {
+        this.onclose();
+      }
+      return;
+    }
     return new Promise((resolve5, reject) => {
       this.server.close((err) => {
         if (err) {
@@ -24202,6 +24234,9 @@ var StreamableHttpServerTransport = class {
       return;
     }
     if (req.url !== this.endpointPath) {
+      if (this.isExternalServer) {
+        return;
+      }
       res.writeHead(404);
       res.end();
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ivotoby/openapi-mcp-server",
-  "version": "1.10.1",
+  "version": "1.12.0",
   "description": "An MCP server that exposes OpenAPI endpoints as resources",
   "license": "MIT",
   "type": "module",