Skip to content

Fix: Added AsyncListener to handle completion, timeout, and error eve… #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −0
Open

Fix: Added AsyncListener to handle completion, timeout, and error eve… #662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .../java/io/modelcontextprotocol/server/transport/HttpServletSseServerTransportProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
import io.modelcontextprotocol.util.Assert;
import io.modelcontextprotocol.util.KeepAliveScheduler;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
Expand Down Expand Up @@ -232,6 +234,40 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
AsyncContext asyncContext = request.startAsync();
asyncContext.setTimeout(0);

asyncContext.addListener(new AsyncListener() {
@Override
public void onComplete(AsyncEvent event) {
logger.debug("AsyncContext completed for session {}", sessionId);
sessions.remove(sessionId);
}

@Override
public void onTimeout(AsyncEvent event) {
logger.warn("Session {} timeout, cleaning up", sessionId);
sessions.remove(sessionId);
try {
event.getAsyncContext().complete();
} catch (Exception e) {
logger.error("Error completing async context on timeout", e);
}
}

@Override
public void onError(AsyncEvent event) {
logger.error("AsyncContext error for session {}: {}", sessionId, event.getThrowable().getMessage());
sessions.remove(sessionId);
try {
event.getAsyncContext().complete();
} catch (Exception e) {
logger.error("Error completing async context on error", e);
}
}

@Override
public void onStartAsync(AsyncEvent event) {
}
});

PrintWriter writer = response.getWriter();

// Create a new session transport
Expand Down
Loading