@ivotoby/openapi-mcp-server 1.10.2 → 1.12.1

package/dist/bundle.js

@@ -14794,8 +14794,31 @@ var OpenAPISpecLoader = class {
             }
           }
         }
-        if (op.requestBody && "content" in op.requestBody) {
-          const requestBodyObj = op.requestBody;
+        if (op.requestBody) {
+          let requestBodyObj;
+          if ("$ref" in op.requestBody && typeof op.requestBody.$ref === "string") {
+            const refMatch = op.requestBody.$ref.match(/^#\/components\/requestBodies\/(.+)$/);
+            if (refMatch && spec.components?.requestBodies) {
+              const requestBodyName = refMatch[1];
+              const resolvedRequestBody = spec.components.requestBodies[requestBodyName];
+              if (resolvedRequestBody && "content" in resolvedRequestBody) {
+                requestBodyObj = resolvedRequestBody;
+              } else {
+                console.warn(
+                  `Could not resolve requestBody reference or invalid structure: ${op.requestBody.$ref}`
+                );
+                continue;
+              }
+            } else {
+              console.warn(`Could not parse requestBody reference: ${op.requestBody.$ref}`);
+              continue;
+            }
+          } else if ("content" in op.requestBody) {
+            requestBodyObj = op.requestBody;
+          } else {
+            console.warn("Skipping requestBody due to invalid structure:", op.requestBody);
+            continue;
+          }
           let mediaTypeObj;
           if (requestBodyObj.content["application/json"]) {
             mediaTypeObj = requestBodyObj.content["application/json"];
@@ -24024,18 +24047,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();
@@ -24046,6 +24083,7 @@ var StreamableHttpServerTransport = class {
   requestSessionMap = /* @__PURE__ */ new Map();
   // Maps request IDs to session IDs
   healthCheckPath = "/health";
+  isExternalServer;
   /**
    * Callback when message is received
    */
@@ -24094,6 +24132,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) {
@@ -24212,6 +24257,9 @@ var StreamableHttpServerTransport = class {
       return;
     }
     if (req.url !== this.endpointPath) {
+      if (this.isExternalServer) {
+        return;
+      }
       res.writeHead(404);
       res.end();
       return;

package/dist/cli.js

@@ -14794,8 +14794,31 @@ var OpenAPISpecLoader = class {
             }
           }
         }
-        if (op.requestBody && "content" in op.requestBody) {
-          const requestBodyObj = op.requestBody;
+        if (op.requestBody) {
+          let requestBodyObj;
+          if ("$ref" in op.requestBody && typeof op.requestBody.$ref === "string") {
+            const refMatch = op.requestBody.$ref.match(/^#\/components\/requestBodies\/(.+)$/);
+            if (refMatch && spec.components?.requestBodies) {
+              const requestBodyName = refMatch[1];
+              const resolvedRequestBody = spec.components.requestBodies[requestBodyName];
+              if (resolvedRequestBody && "content" in resolvedRequestBody) {
+                requestBodyObj = resolvedRequestBody;
+              } else {
+                console.warn(
+                  `Could not resolve requestBody reference or invalid structure: ${op.requestBody.$ref}`
+                );
+                continue;
+              }
+            } else {
+              console.warn(`Could not parse requestBody reference: ${op.requestBody.$ref}`);
+              continue;
+            }
+          } else if ("content" in op.requestBody) {
+            requestBodyObj = op.requestBody;
+          } else {
+            console.warn("Skipping requestBody due to invalid structure:", op.requestBody);
+            continue;
+          }
           let mediaTypeObj;
           if (requestBodyObj.content["application/json"]) {
             mediaTypeObj = requestBodyObj.content["application/json"];
@@ -24024,18 +24047,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();
@@ -24046,6 +24083,7 @@ var StreamableHttpServerTransport = class {
   requestSessionMap = /* @__PURE__ */ new Map();
   // Maps request IDs to session IDs
   healthCheckPath = "/health";
+  isExternalServer;
   /**
    * Callback when message is received
    */
@@ -24094,6 +24132,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) {
@@ -24212,6 +24257,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.2",
+  "version": "1.12.1",
   "description": "An MCP server that exposes OpenAPI endpoints as resources",
   "license": "MIT",
   "type": "module",