feat: add configurable timeout parameter to search and esql tools

src/bin/elasticsearch-core-mcp-server.rs

@@ -15,15 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use std::io::ErrorKind;
 use clap::Parser;
 use elasticsearch_core_mcp_server::cli::Cli;
+use std::io::ErrorKind;
 use tracing_subscriber::EnvFilter;
 // To test with stdio, use npx @modelcontextprotocol/inspector cargo run -p elastic-mcp
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-
     // Also accept .env files
     match dotenvy::dotenv() {
         Err(dotenvy::Error::Io(io_err)) if io_err.kind() == ErrorKind::NotFound => {}

src/bin/start_http.rs

@@ -24,12 +24,14 @@ use elasticsearch_core_mcp_server::run_http;
 pub async fn main() -> anyhow::Result<()> {
     println!("Current directory: {:?}", std::env::current_dir()?);
 
-    run_http(HttpCommand {
-        config: Some("elastic-mcp.json5".parse()?),
-        address: None,
-        sse: true,
-    },
-    false)
+    run_http(
+        HttpCommand {
+            config: Some("elastic-mcp.json5".parse()?),
+            address: None,
+            sse: true,
+        },
+        false,
+    )
     .await?;
 
     Ok(())

src/cli.rs

@@ -27,7 +27,7 @@ use std::path::PathBuf;
 #[command(version)]
 pub struct Cli {
     /// Container mode: change default http address, rewrite localhost to the host's address
-    #[clap(global=true, long, env = "CONTAINER_MODE")]
+    #[clap(global = true, long, env = "CONTAINER_MODE")]
     pub container_mode: bool,
 
     #[clap(subcommand)]

src/lib.rs

@@ -88,7 +88,10 @@ pub async fn run_http(cmd: HttpCommand, container_mode: bool) -> anyhow::Result<
     Ok(())
 }
 
-pub async fn setup_services(config: &Option<PathBuf>, container_mode: bool) -> anyhow::Result<impl Service<RoleServer> + Clone> {
+pub async fn setup_services(
+    config: &Option<PathBuf>,
+    container_mode: bool,
+) -> anyhow::Result<impl Service<RoleServer> + Clone> {
     // Read config file and expand variables
 
     let config = if let Some(path) = config {

src/servers/elasticsearch/base_tools.rs

@@ -69,12 +69,24 @@ struct SearchParams {
 
     /// Complete Elasticsearch query DSL object that can include query, size, from, sort, etc.
     query_body: Map<String, Value>, // note: just Value doesn't work, as Claude would send a string
+
+    /// Query timeout (e.g., "30s", "2m", "1m30s"). Defaults to "120s"
+    #[serde(default = "default_timeout")]
+    timeout: String,
+}
+
+fn default_timeout() -> String {
+    "120s".to_string()
 }
 
 #[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
 struct EsqlQueryParams {
     /// Complete Elasticsearch ES|QL query
     query: String,
+
+    /// Query timeout (e.g., "30s", "2m", "1m30s"). Defaults to "120s"
+    #[serde(default = "default_timeout")]
+    timeout: String,
 }
 
 #[derive(Debug, serde::Deserialize, schemars::JsonSchema)]
@@ -158,6 +170,7 @@ impl EsBaseTools {
             index,
             fields,
             query_body,
+            timeout,
         }): Parameters<SearchParams>,
     ) -> Result<CallToolResult, rmcp::Error> {
         let es_client = self.es_client.get(req_ctx);
@@ -178,6 +191,7 @@ impl EsBaseTools {
         let response = es_client
             .search(SearchParts::Index(&[&index]))
             .body(query_body)
+            .timeout(&timeout)
             .send()
             .await;
 
@@ -226,11 +240,14 @@ impl EsBaseTools {
     async fn esql(
         &self,
         req_ctx: RequestContext<RoleServer>,
-        Parameters(EsqlQueryParams { query }): Parameters<EsqlQueryParams>,
+        Parameters(EsqlQueryParams { query, timeout }): Parameters<EsqlQueryParams>,
     ) -> Result<CallToolResult, rmcp::Error> {
         let es_client = self.es_client.get(req_ctx);
 
-        let request = EsqlQueryRequest { query };
+        let request = EsqlQueryRequest {
+            query,
+            query_timeout: Some(timeout),
+        };
 
         let response = es_client.esql().query().body(request).send().await;
         let response: EsqlQueryResponse = read_json(response).await?;
@@ -382,6 +399,8 @@ pub struct MappingProperty {
 #[derive(Serialize, Deserialize)]
 pub struct EsqlQueryRequest {
     pub query: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub query_timeout: Option<String>,
 }
 
 #[derive(Serialize, Deserialize)]

src/servers/elasticsearch/mod.rs

@@ -175,7 +175,10 @@ pub enum SearchTemplate {
 pub struct ElasticsearchMcp {}
 
 impl ElasticsearchMcp {
-    pub fn new_with_config(config: ElasticsearchMcpConfig, container_mode: bool) -> anyhow::Result<base_tools::EsBaseTools> {
+    pub fn new_with_config(
+        config: ElasticsearchMcpConfig,
+        container_mode: bool,
+    ) -> anyhow::Result<base_tools::EsBaseTools> {
         let creds = if let Some(api_key) = config.api_key.clone() {
             Some(Credentials::EncodedApiKey(api_key))
         } else if let Some(username) = config.username.clone() {
@@ -224,13 +227,17 @@ impl ElasticsearchMcp {
 fn rewrite_localhost(url: &mut Url) -> anyhow::Result<()> {
     use std::net::ToSocketAddrs;
     let aliases = &[
-        "host.docker.internal", // Docker
+        "host.docker.internal",     // Docker
         "host.containers.internal", // Podman, maybe others
     ];
 
-    if let Some(host) = url.host_str() && host == "localhost" {
+    if let Some(host) = url.host_str()
+        && host == "localhost"
+    {
         for alias in aliases {
-            if let Ok(mut alias_add) = (*alias, 80).to_socket_addrs() && alias_add.next().is_some() {
+            if let Ok(mut alias_add) = (*alias, 80).to_socket_addrs()
+                && alias_add.next().is_some()
+            {
                 url.set_host(Some(alias))?;
                 tracing::info!("Container mode: using '{alias}' instead of 'localhost'");
                 return Ok(());