parent
71dfbc0d3e
commit
039119057f
1 changed files with 123 additions and 2 deletions
|
|
@ -18,6 +18,7 @@ import (
|
|||
|
||||
internaljson "github.com/modelcontextprotocol/go-sdk/internal/json"
|
||||
"github.com/modelcontextprotocol/go-sdk/internal/jsonrpc2"
|
||||
"github.com/modelcontextprotocol/go-sdk/internal/mcpgodebug"
|
||||
"github.com/modelcontextprotocol/go-sdk/jsonrpc"
|
||||
)
|
||||
|
||||
|
|
@ -28,6 +29,13 @@ import (
|
|||
// re-trigger expensive recovery on its behalf. See issue #882.
|
||||
const notifyCancellationTimeout = 5 * time.Second
|
||||
|
||||
// blockingcancelnotify, when set to "1" via MCPGODEBUG, restores the previous
|
||||
// behavior of blocking the caller's return on delivery of the best-effort
|
||||
// notifications/cancelled message (up to notifyCancellationTimeout). By
|
||||
// default, the call is retired immediately and the notification is sent
|
||||
// asynchronously so the caller returns as soon as its context is cancelled.
|
||||
var blockingcancelnotify = mcpgodebug.Value("blockingcancelnotify")
|
||||
|
||||
// ErrConnectionClosed is returned when sending a message to a connection that
|
||||
// is closed or in the process of closing.
|
||||
var ErrConnectionClosed = errors.New("connection closed")
|
||||
|
|
@ -276,8 +284,28 @@ func call(ctx context.Context, conn *jsonrpc2.Connection, method string, params
|
|||
case errors.Is(err, jsonrpc2.ErrClientClosing), errors.Is(err, jsonrpc2.ErrServerClosing):
|
||||
return fmt.Errorf("%w: calling %q: %v", ErrConnectionClosed, method, err)
|
||||
case ctx.Err() != nil:
|
||||
err := cancelCall(ctx, conn, call)
|
||||
return errors.Join(ctx.Err(), err)
|
||||
// The notifications/cancelled message is best-effort. Retire the call
|
||||
// immediately (so an unresponsive peer cannot delay the eager
|
||||
// retirement that cancelCall's docstring promises) and send the
|
||||
// notification off the caller's return path so a slow or unresponsive
|
||||
// peer cannot delay the caller past its own deadline. See issue #1150.
|
||||
//
|
||||
// Setting MCPGODEBUG=blockingcancelnotify=1 restores the previous
|
||||
// behavior of waiting synchronously for delivery inside cancelCall.
|
||||
if blockingcancelnotify == "1" {
|
||||
err := cancelCall(ctx, conn, call)
|
||||
return errors.Join(ctx.Err(), err)
|
||||
}
|
||||
conn.Retire(call, ctx.Err())
|
||||
go func() {
|
||||
notifyCtx, stop := context.WithTimeout(context.WithoutCancel(ctx), notifyCancellationTimeout)
|
||||
defer stop()
|
||||
_ = conn.Notify(notifyCtx, notificationCancelled, &CancelledParams{
|
||||
Reason: ctx.Err().Error(),
|
||||
RequestID: call.ID().Raw(),
|
||||
})
|
||||
}()
|
||||
return ctx.Err()
|
||||
case err != nil:
|
||||
return fmt.Errorf("calling %q: %w", method, err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue