feat(server): Enhance McpHttpServer with NamedThreadFactory for improved thread management and logging

Author: codeboyzhou

src/main/java/com/github/codeboyzhou/mcp/declarative/common/NamedThreadFactory.java

@@ -3,9 +3,13 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class NamedThreadFactory implements ThreadFactory {
 
+  private static final Logger log = LoggerFactory.getLogger(NamedThreadFactory.class);
+
   private static final AtomicInteger poolNumber = new AtomicInteger(1);
 
   private final AtomicInteger threadNumber = new AtomicInteger(1);
@@ -18,6 +22,13 @@ public NamedThreadFactory(String namePrefix) {
 
   @Override
   public Thread newThread(@NotNull Runnable runnable) {
-    return new Thread(runnable, namePrefix + threadNumber.getAndIncrement());
+    Thread thread = new Thread(runnable, namePrefix + threadNumber.getAndIncrement());
+    thread.setUncaughtExceptionHandler(this::handleUncaughtException);
+    thread.setDaemon(true);
+    return thread;
+  }
+
+  private void handleUncaughtException(Thread t, Throwable e) {
+    log.error("Thread {} uncaught exception", t.getName(), e);
   }
 }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/McpHttpServer.java

@@ -1,7 +1,10 @@
 package com.github.codeboyzhou.mcp.declarative.server;
 
+import com.github.codeboyzhou.mcp.declarative.common.NamedThreadFactory;
 import jakarta.servlet.http.HttpServlet;
 import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
 import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
@@ -16,10 +19,16 @@ public class McpHttpServer {
 
   private static final String DEFAULT_SERVLET_PATH = "/*";
 
+  private final ExecutorService threadPool;
+
   private HttpServlet servlet;
 
   private int port;
 
+  public McpHttpServer() {
+    this.threadPool = Executors.newSingleThreadExecutor(new NamedThreadFactory("mcp-http-server"));
+  }
+
   public McpHttpServer use(HttpServlet servlet) {
     this.servlet = servlet;
     return this;
@@ -40,7 +49,7 @@ public void start() {
     Server httpserver = new Server(port);
     httpserver.setHandler(handler);
     httpserver.setStopAtShutdown(true);
-    httpserver.setStopTimeout(Duration.ofSeconds(5).getSeconds());
+    httpserver.setStopTimeout(Duration.ofSeconds(5).toMillis());
 
     try {
       httpserver.start();
@@ -50,6 +59,10 @@ public void start() {
       log.error("Error starting HTTP server on http://127.0.0.1:{}", port, e);
     }
 
+    threadPool.submit(() -> await(httpserver));
+  }
+
+  private void await(Server httpserver) {
     try {
       httpserver.join();
     } catch (InterruptedException e) {
@@ -58,16 +71,18 @@ public void start() {
   }
 
   private void addShutdownHook(Server httpserver) {
-    Runnable runnable =
-        () -> {
-          try {
-            log.info("Shutting down HTTP server and MCP server");
-            httpserver.stop();
-          } catch (Exception e) {
-            log.error("Error stopping HTTP server and MCP server", e);
-          }
-        };
-    Thread shutdownHook = new Thread(runnable);
-    Runtime.getRuntime().addShutdownHook(shutdownHook);
+    Runnable runnable = () -> shutdown(httpserver);
+    Thread shutdownHookThread = new Thread(runnable);
+    Runtime.getRuntime().addShutdownHook(shutdownHookThread);
+  }
+
+  private void shutdown(Server httpserver) {
+    try {
+      log.info("Shutting down HTTP server and MCP server");
+      httpserver.stop();
+      threadPool.shutdown();
+    } catch (Exception e) {
+      log.error("Error stopping HTTP server and MCP server", e);
+    }
   }
 }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/AbstractMcpServerFactory.java

@@ -1,21 +1,15 @@
 package com.github.codeboyzhou.mcp.declarative.server.factory;
 
-import com.github.codeboyzhou.mcp.declarative.common.NamedThreadFactory;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerCapabilities;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerChangeNotification;
 import com.github.codeboyzhou.mcp.declarative.server.McpServerInfo;
 import com.github.codeboyzhou.mcp.declarative.server.component.McpServerComponentRegister;
 import io.modelcontextprotocol.server.McpSyncServer;
 import io.modelcontextprotocol.spec.McpSchema;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public abstract class AbstractMcpServerFactory<S extends McpServerInfo>
     implements McpServerFactory<S> {
 
-  protected final ExecutorService threadPool =
-      Executors.newSingleThreadExecutor(new NamedThreadFactory("mcp-http-server"));
-
   public void startServer(S serverInfo) {
     McpSyncServer server =
         sync(serverInfo)

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpSseServerFactory.java

@@ -20,7 +20,7 @@ public McpServer.SyncSpecification<?> sync(McpSseServerInfo info) {
             .messageEndpoint(info.messageEndpoint())
             .build();
     McpHttpServer httpserver = new McpHttpServer();
-    threadPool.execute(() -> httpserver.use(transportProvider).bind(info.port()).start());
+    httpserver.use(transportProvider).bind(info.port()).start();
     return McpServer.sync(transportProvider);
   }
 }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpStreamableServerFactory.java

@@ -17,7 +17,7 @@ public McpServer.SyncSpecification<?> sync(McpStreamableServerInfo info) {
             .keepAliveInterval(info.keepAliveInterval())
             .build();
     McpHttpServer httpserver = new McpHttpServer();
-    threadPool.execute(() -> httpserver.use(transportProvider).bind(info.port()).start());
+    httpserver.use(transportProvider).bind(info.port()).start();
     return McpServer.sync(transportProvider);
   }
 }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/AbstractConfigurableMcpServerFactory.java

@@ -1,23 +1,17 @@
 package com.github.codeboyzhou.mcp.declarative.server.factory.configurable;
 
-import com.github.codeboyzhou.mcp.declarative.common.NamedThreadFactory;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerCapabilities;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerChangeNotification;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerConfiguration;
 import com.github.codeboyzhou.mcp.declarative.server.component.McpServerComponentRegister;
 import io.modelcontextprotocol.server.McpSyncServer;
 import io.modelcontextprotocol.spec.McpSchema;
 import java.time.Duration;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 public abstract class AbstractConfigurableMcpServerFactory implements ConfigurableMcpServerFactory {
 
   protected final McpServerConfiguration configuration;
 
-  protected final ExecutorService threadPool =
-      Executors.newSingleThreadExecutor(new NamedThreadFactory("configurable-mcp-http-server"));
-
   protected AbstractConfigurableMcpServerFactory(McpServerConfiguration configuration) {
     this.configuration = configuration;
   }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpSseServerFactory.java

@@ -27,7 +27,7 @@ public McpServer.SyncSpecification<?> sync() {
             .messageEndpoint(sse.messageEndpoint())
             .build();
     McpHttpServer httpserver = new McpHttpServer();
-    threadPool.execute(() -> httpserver.use(transportProvider).bind(sse.port()).start());
+    httpserver.use(transportProvider).bind(sse.port()).start();
     return McpServer.sync(transportProvider);
   }
 }

src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpStreamableServerFactory.java

@@ -25,7 +25,7 @@ public McpServer.SyncSpecification<?> sync() {
             .keepAliveInterval(Duration.ofMillis(streamable.keepAliveInterval()))
             .build();
     McpHttpServer httpserver = new McpHttpServer();
-    threadPool.execute(() -> httpserver.use(transportProvider).bind(streamable.port()).start());
+    httpserver.use(transportProvider).bind(streamable.port()).start();
     return McpServer.sync(transportProvider);
   }
 }