@rishibhushan/jenkins-mcp-server 1.1.0 → 1.1.3

package/src/jenkins_mcp_server/jenkins_client.py

@@ -40,12 +40,14 @@ class JenkinsClient:
     timeout support.
     """
 
-    def __init__(self, settings: Optional[JenkinsSettings] = None):
+    def __init__(self, settings: Optional[JenkinsSettings] = None, test_connection: bool = False):
         """
         Initialize Jenkins client.
 
         Args:
             settings: JenkinsSettings instance. If None, uses default settings.
+            test_connection: If True, test connection during initialization.
+                            Set to False for MCP list_resources to avoid blocking.
 
         Raises:
             JenkinsConnectionError: If unable to connect to Jenkins
@@ -72,8 +74,10 @@ class JenkinsClient:
         # Cache for python-jenkins server instance
         self._server: Optional[jenkins.Jenkins] = None
 
-        # Test connection
-        self._test_connection()
+        # Only test connection if explicitly requested
+        # This prevents blocking during MCP initialization
+        if test_connection:
+            self._test_connection()
 
     def _test_connection(self) -> None:
         """Test connection to Jenkins server (with configurable timeout)"""
@@ -475,12 +479,16 @@ class JenkinsClient:
 _default_client: Optional[JenkinsClient] = None
 
 
-def get_jenkins_client(settings: Optional[JenkinsSettings] = None) -> JenkinsClient:
+def get_jenkins_client(
+        settings: Optional[JenkinsSettings] = None,
+        test_connection: bool = False
+) -> JenkinsClient:
     """
     Get Jenkins client instance.
 
     Args:
         settings: Optional JenkinsSettings. If None, uses default settings.
+        test_connection: If True, test connection during initialization.
 
     Returns:
         JenkinsClient instance
@@ -492,16 +500,10 @@ def get_jenkins_client(settings: Optional[JenkinsSettings] = None) -> JenkinsCli
 
     if settings is not None:
         # Always create new client with custom settings
-        return JenkinsClient(settings)
+        return JenkinsClient(settings, test_connection=test_connection)
 
     # Use cached default client
     if _default_client is None:
-        _default_client = JenkinsClient()
+        _default_client = JenkinsClient(test_connection=test_connection)
 
     return _default_client
-
-
-def reset_default_client() -> None:
-    """Reset the default client (useful for testing or reconfiguration)"""
-    global _default_client
-    _default_client = None

package/src/jenkins_mcp_server/server.py

@@ -120,10 +120,15 @@ async def handle_list_resources() -> list[types.Resource]:
     """
     List available Jenkins resources.
     Each job is exposed as a resource with jenkins:// URI scheme.
+
+    Enhanced with timeout to prevent MCP initialization delays.
     """
     try:
-        client = get_jenkins_client(get_settings())
-        jobs = client.get_jobs()
+        # Wrap in async timeout to prevent blocking MCP initialization
+        async with asyncio.timeout(3):  # 3 second timeout
+            client = get_jenkins_client(get_settings())
+            # Run blocking get_jobs() in thread pool
+            jobs = await asyncio.to_thread(client.get_jobs)
 
         return [
             types.Resource(
@@ -134,13 +139,24 @@ async def handle_list_resources() -> list[types.Resource]:
             )
             for job in jobs
         ]
+    except asyncio.TimeoutError:
+        # Jenkins server not reachable (probably not on VPN/corporate network)
+        logger.warning("Jenkins server not reachable within 3 seconds - likely not on corporate network")
+        return [
+            types.Resource(
+                uri=AnyUrl("jenkins://offline"),
+                name="Jenkins Server Offline",
+                description="Jenkins server not reachable. Connect to VPN/corporate network and restart. Tools will still work when connected.",
+                mimeType="text/plain",
+            )
+        ]
     except Exception as e:
         logger.error(f"Failed to list resources: {e}")
         return [
             types.Resource(
                 uri=AnyUrl("jenkins://error"),
                 name="Error connecting to Jenkins",
-                description=f"Error: {str(e)}",
+                description=f"Error: {str(e)}. Check your configuration and network connection.",
                 mimeType="text/plain",
             )
         ]