add headers and query params

Author: alexcheng1982

README.md

@@ -22,15 +22,19 @@ Currently supported filter conditions:
 You can run the JAR file to see the CLI help.
 
 ```
-Usage: openapi-mcp [-hV] [--include-http-method=<includeHttpMethods>[,
+Usage: openapi-mcp [-hV] [--header=<headers>[,<headers>...]]...
+                   [--include-http-method=<includeHttpMethods>[,
                    <includeHttpMethods>...]]...
                    [--include-operation-id=<includeOperationIds>[,
                    <includeOperationIds>...]]... [--include-path=<includePaths>
                    [,<includePaths>...]]... [--include-tag=<includeTags>[,
-                   <includeTags>...]]... <openapiSpec>
+                   <includeTags>...]]... [--query-param=<queryParams>[,
+                   <queryParams>...]]... <openapiSpec>
 Run OpenAPI MCP server
       <openapiSpec>   File path or URL of OpenAPI spec
   -h, --help          Show this help message and exit.
+      --header=<headers>[,<headers>...]
+                      Headers (comma separated with format a=b)
       --include-http-method=<includeHttpMethods>[,<includeHttpMethods>...]
                       Include operations with HTTP methods (comma separated)
       --include-operation-id=<includeOperationIds>[,<includeOperationIds>...]
@@ -39,6 +43,8 @@ Run OpenAPI MCP server
                       Include operations with paths (comma separated)
       --include-tag=<includeTags>[,<includeTags>...]
                       Include operations with tags (comma separated)
+      --query-param=<queryParams>[,<queryParams>...]
+                      Query params (comma separated with format a=b)
   -V, --version       Print version information and exit.
 ```
 
@@ -49,7 +55,7 @@ Run OpenAPI MCP server
 Download latest [release JAR file](https://github.com/JavaAIDev/openapi-mcp-server/releases) and run it using `java -jar`.
 
 ```sh
-java -jar openapi-mcp-server-0.1.3-all.jar https://api.apis.guru/v2/specs/exchangerate-api.com/4/openapi.json
+java -jar openapi-mcp-server-0.1.4-all.jar https://api.apis.guru/v2/specs/exchangerate-api.com/4/openapi.json
 ```
 
 ### Container

build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
 }
 
 group = "com.javaaidev"
-version = "0.1.3"
+version = "0.1.4"
 
-val mcpVersion = "0.7.0"
+val mcpVersion = "0.7.2"
 val slf4jVersion = "2.0.17"
 val logbackVersion = "1.5.18"
-val ktorVersion = "3.3.0"
+val ktorVersion = "3.3.1"
 val picocliVersion = "4.7.7"
 val swaggerParserVersion = "2.1.33"
 

src/main/kotlin/com/javaaidev/mcp/openapi/Cli.kt

@@ -7,7 +7,7 @@ import kotlin.system.exitProcess
 @CommandLine.Command(
     name = "openapi-mcp",
     mixinStandardHelpOptions = true,
-    version = ["0.1.3"],
+    version = ["0.1.4"],
     description = ["Run OpenAPI MCP server"],
 )
 class Cli : Callable<Int> {
@@ -42,6 +42,20 @@ class Cli : Callable<Int> {
     )
     private val includeTags: List<String>? = null
 
+    @CommandLine.Option(
+        names = ["--header"],
+        split = ",",
+        description = ["Headers (comma separated with format a=b)"]
+    )
+    private val headers: List<String>? = null
+
+    @CommandLine.Option(
+        names = ["--query-param"],
+        split = ",",
+        description = ["Query params (comma separated with format a=b)"]
+    )
+    private val queryParams: List<String>? = null
+
     override fun call(): Int {
         McpServer.start(
             openapiSpec,
@@ -50,10 +64,16 @@ class Cli : Callable<Int> {
                 includeHttpMethods,
                 includePaths,
                 includeTags
-            )
+            ),
+            parseToMap(queryParams),
+            parseToMap(headers),
         )
         return 0
     }
+
+    private fun parseToMap(values: List<String>?) = values?.map {
+        it.split("=")
+    }?.filter { it.size == 2 }?.associate { it[0] to it[1] }
 }
 
 fun main(args: Array<String>) {

src/main/kotlin/com/javaaidev/mcp/openapi/McpTool.kt

@@ -94,7 +94,9 @@ object McpToolHelper {
 
     fun toTools(
         openAPI: OpenAPI,
-        openAPIOperationFilter: OpenAPIOperationFilter? = null
+        openAPIOperationFilter: OpenAPIOperationFilter? = null,
+        queryParams: Map<String, String>? = null,
+        headers: Map<String, String>? = null,
     ): List<McpTool> {
         logger.info("Create tools with filter {}", openAPIOperationFilter)
         val serverUrl = openAPI.servers.first().url
@@ -114,7 +116,15 @@ object McpToolHelper {
             logger.info("Use {} operations after filtering", it.size)
         }
         return operations?.map {
-            toTool(serverUrl, it.operation, it.httpMethod, it.path, components)
+            toTool(
+                serverUrl,
+                it.operation,
+                it.httpMethod,
+                it.path,
+                components,
+                queryParams,
+                headers
+            )
         } ?: listOf()
     }
 
@@ -123,7 +133,9 @@ object McpToolHelper {
         operation: Operation,
         httpMethod: String,
         path: String,
-        components: Map<String, Schema<*>>?
+        components: Map<String, Schema<*>>?,
+        queryParams: Map<String, String>? = null,
+        headers: Map<String, String>? = null,
     ): McpTool {
         val name = sanitizeToolName(operation.operationId ?: "${httpMethod}_$path")
         val description = operation.description ?: (operation.summary ?: "")
@@ -174,7 +186,7 @@ object McpToolHelper {
         )
         val urlTemplate = serverUrl.removeSuffix("/") + "/" + path.removePrefix("/")
         return McpTool(tool) { request ->
-            callApi(urlTemplate, httpMethod, request)
+            callApi(urlTemplate, httpMethod, request, queryParams, headers)
         }
     }
 
@@ -189,20 +201,36 @@ object McpToolHelper {
     private suspend fun callApi(
         urlTemplate: String,
         httpMethod: String,
-        request: CallToolRequest
+        request: CallToolRequest,
+        queryParams: Map<String, String>? = null,
+        extraHeaders: Map<String, String>? = null,
     ): CallToolResult {
         return httpClient.request {
-            url(
-                parseUrl(expandUriTemplate(urlTemplate, request.arguments))
-                    ?: throw RuntimeException("Invalid url")
-            )
+            url {
+                takeFrom(
+                    parseUrl(expandUriTemplate(urlTemplate, request.arguments))
+                        ?: throw RuntimeException("Invalid url")
+                )
+                queryParams?.let { params ->
+                    params.forEach { (k, v) ->
+                        parameters.append(k, v)
+                    }
+                }
+            }
             method = when (httpMethod) {
                 "PUT" -> HttpMethod.Put
                 "POST" -> HttpMethod.Post
                 "PATCH" -> HttpMethod.Patch
                 "DELETE" -> HttpMethod.Delete
                 else -> HttpMethod.Get
             }
+            extraHeaders?.let {
+                it.forEach { (k, v) ->
+                    headers.append(k, v)
+                }
+            }
+            contentType(ContentType.Application.Json)
+            setBody(request.arguments)
         }.bodyAsText().let { text ->
             CallToolResult(listOf(TextContent(text)))
         }

src/main/kotlin/com/javaaidev/mcp/openapi/Server.kt

@@ -17,7 +17,12 @@ val logger: Logger = LoggerFactory.getLogger("McpServer")
 
 object McpServer {
 
-    fun start(openapiSpec: String, openAPIOperationFilter: OpenAPIOperationFilter? = null) {
+    fun start(
+        openapiSpec: String,
+        openAPIOperationFilter: OpenAPIOperationFilter? = null,
+        queryParams: Map<String, String>? = null,
+        headers: Map<String, String>? = null,
+    ) {
         logger.info("Parse OpenAPI spec {} ", openapiSpec)
         val openAPI = OpenAPIParser.parse(openapiSpec)
 
@@ -34,9 +39,11 @@ object McpServer {
             )
         )
 
-        McpToolHelper.toTools(openAPI, openAPIOperationFilter).forEach { tool ->
-            server.addTool(tool.tool, tool.handler)
-        }
+        logger.info("params: {}", queryParams)
+        McpToolHelper.toTools(openAPI, openAPIOperationFilter, queryParams, headers)
+            .forEach { tool ->
+                server.addTool(tool.tool, tool.handler)
+            }
 
         val transport = StdioServerTransport(
             System.`in`.asInput(),

src/main/resources/logback.xml

@@ -1,6 +1,6 @@
 <configuration>
 
-  <property name="LOG_DIR" value="${LOG_DIR:-/var/log/app}"/>
+  <property name="LOG_DIR" value="${LOG_DIR:-/tmp/openapi-mcp-server}"/>
 
   <appender name="FILE" class="ch.qos.logback.core.FileAppender">
     <file>${LOG_DIR}/server.log</file>