Skip to content
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

[Fix] Issue #4 #49

Merged
merged 2 commits into from
Mar 12, 2025
Merged

[Fix] Issue #4 #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e0503
1. Remove the double bang operator and replace it with a null check i…
adi-kmt Mar 8, 2025
453e019
Merge branch 'main' into fix/add_try_catch_block
e5l Mar 12, 2025
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
32 changes: 19 additions & 13 deletions src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public abstract class Protocol(
if (handler === null) {
LOGGER.trace { "No handler found for request: ${request.method}" }
try {
transport!!.send(
transport?.send(
JSONRPCResponse(
id = request.id,
error = JSONRPCError(
Expand All @@ -229,24 +229,30 @@ public abstract class Protocol(
val result = handler(request, RequestHandlerExtra())
LOGGER.trace { "Request handled successfully: ${request.method} (id: ${request.id})" }

val response = JSONRPCResponse(
id = request.id,
result = result
transport?.send(
JSONRPCResponse(
id = request.id,
result = result
)
)
transport!!.send(response)

} catch (cause: Throwable) {
LOGGER.error(cause) { "Error handling request: ${request.method} (id: ${request.id})" }

transport!!.send(
JSONRPCResponse(
id = request.id,
error = JSONRPCError(
ErrorCode.Defined.InternalError,
message = cause.message ?: "Internal error",
try {
transport?.send(
JSONRPCResponse(
id = request.id,
error = JSONRPCError(
code = ErrorCode.Defined.InternalError,
message = cause.message ?: "Internal error"
)
)
)
)
} catch (sendError: Throwable) {
LOGGER.error(sendError) { "Failed to send error response for request: ${request.method} (id: ${request.id})" }
// Optionally implement fallback behavior here
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @e5l, any fallback you have in mind for this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't look like we can recover. lgtm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Open to merge?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, will do after CI run 👍

}
}
}

Expand Down Expand Up @@ -385,7 +391,7 @@ public abstract class Protocol(
try {
withTimeout(timeout) {
LOGGER.trace { "Sending request message with id: $messageId" }
[email protected]!!.send(message)
[email protected]?.send(message)
}
return result.await()
} catch (cause: TimeoutCancellationException) {
Expand Down