Harder timeout

Author: Drummersbrother

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.51"
+version = "0.1.52"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [

src/mcp_importer/api.py

@@ -180,6 +180,7 @@ async def _verify_async() -> bool:  # noqa: C901
 
         # Remote servers
         if server.is_remote_server():
+            connection_timeout = 10.0
             remote_url = server.get_remote_url()
             if remote_url:
                 # If inline headers are specified (e.g., API key), verify via proxy to honor headers
@@ -230,19 +231,25 @@ async def _list_tools_only() -> Any:
                     if oauth_info.status in (OAuthStatus.NEEDS_AUTH, OAuthStatus.AUTHENTICATED):
                         return True
                     # NOT_REQUIRED: quick unauthenticated ping
-                    # print(f"Pinging remote server '{server.name}' without OAuth")
-                    async with FastMCPClient(remote_url, auth=None, timeout=10.0) as client:  # type: ignore
-                        # print(
-                        #    f"Pinging remote server '{server.name}' without OAuth - Inside client with-statement"
-                        # )
-                        await asyncio.wait_for(client.ping(), timeout=10.0)
-                        # print(
-                        #    f"Pinging remote server '{server.name}' without OAuth - Inside client with-statement but after ping"
-                        # )
-                    # print(
-                    #    f"Pinging remote server '{server.name}' without OAuth - After client with-statement"
-                    # )
-                    return True
+                    log.debug(f"Establishing contact with remote server '{server.name}'")
+                    # Async timeout
+                    async with asyncio.timeout(connection_timeout):
+                        async with FastMCPClient(
+                            remote_url,
+                            auth=None,
+                            timeout=connection_timeout,
+                            init_timeout=connection_timeout,
+                        ) as client:  # type: ignore
+                            log.debug(f"Connection established to '{server.name}'; pinging...")
+                            await asyncio.wait_for(client.ping(), timeout=connection_timeout)
+                            log.info(f"Ping received from '{server.name}'; shutting down client")
+                        log.debug(f"Client '{server.name}' shut down")
+                        return True
+                except TimeoutError:
+                    log.error(
+                        f"MCP remote verification timed out (more than {connection_timeout}s) for '{server.name}'"
+                    )
+                    return False
                 except Exception as e:  # noqa: BLE001
                     log.error("MCP remote verification failed for '{}': {}", server.name, e)
                     return False