internal/mcp: simplify session type params
Write a separate constraint for ClientSession | ServerSession, and change the pointerness of the type parameter. There is still a dynamic cast, but overall I think this is a bit simpler: - The exported types have the more readable constraint "Session" instead of "ClientSession | ServerSession". - We can put the unexported methods in Session instead of needing a separate interface (previously "session"). - This CL enables a simplified treatment of sending middleware, in the next CL. Change-Id: I41184fe93ea201d1da29dbfba26ac59f93771277 Reviewed-on: https://go-review.googlesource.com/c/tools/+/676175 Reviewed-by: Sam Thanawalla <samthanawalla@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
parent
e219f323cb
commit
19d58e6955
5 changed files with 67 additions and 72 deletions
|
|
@ -416,11 +416,11 @@ We provide a mechanism to add MCP-level middleware on the both the client and se
|
||||||
// For methods, a MethodHandler must return either an XXResult struct pointer and a nil error, or
|
// For methods, a MethodHandler must return either an XXResult struct pointer and a nil error, or
|
||||||
// nil with a non-nil error.
|
// nil with a non-nil error.
|
||||||
// For notifications, a MethodHandler must return nil, nil.
|
// For notifications, a MethodHandler must return nil, nil.
|
||||||
type MethodHandler[S ClientSession | ServerSession] func(
|
type MethodHandler[S Session] func(
|
||||||
ctx context.Context, _ *S, method string, params any) (result any, err error)
|
ctx context.Context, _ *S, method string, params Params) (result Result, err error)
|
||||||
|
|
||||||
// Middleware is a function from MethodHandlers to MethodHandlers.
|
// Middleware is a function from MethodHandlers to MethodHandlers.
|
||||||
type Middleware[S ClientSession | ServerSession] func(MethodHandler[S]) MethodHandler[S]
|
type Middleware[S Session] func(MethodHandler[S]) MethodHandler[S]
|
||||||
|
|
||||||
// AddMiddleware wraps the client/server's current method handler using the provided
|
// AddMiddleware wraps the client/server's current method handler using the provided
|
||||||
// middleware. Middleware is applied from right to left, so that the first one
|
// middleware. Middleware is applied from right to left, so that the first one
|
||||||
|
|
@ -428,14 +428,14 @@ type Middleware[S ClientSession | ServerSession] func(MethodHandler[S]) MethodHa
|
||||||
//
|
//
|
||||||
// For example, AddMiddleware(m1, m2, m3) augments the server method handler as
|
// For example, AddMiddleware(m1, m2, m3) augments the server method handler as
|
||||||
// m1(m2(m3(handler))).
|
// m1(m2(m3(handler))).
|
||||||
func (c *Client) AddMiddleware(middleware ...Middleware[ClientSession])
|
func (c *Client) AddMiddleware(middleware ...Middleware[*ClientSession])
|
||||||
func (s *Server) AddMiddleware(middleware ...Middleware[ServerSession])
|
func (s *Server) AddMiddleware(middleware ...Middleware[*ServerSession])
|
||||||
```
|
```
|
||||||
|
|
||||||
As an example, this code adds server-side logging:
|
As an example, this code adds server-side logging:
|
||||||
|
|
||||||
```go
|
```go
|
||||||
func withLogging(h mcp.MethodHandler[ServerSession]) mcp.MethodHandler[ServerSession]{
|
func withLogging(h mcp.MethodHandler[*ServerSession]) mcp.MethodHandler[*ServerSession]{
|
||||||
return func(ctx context.Context, s *mcp.ServerSession, method string, params any) (res any, err error) {
|
return func(ctx context.Context, s *mcp.ServerSession, method string, params any) (res any, err error) {
|
||||||
log.Printf("request: %s %v", method, params)
|
log.Printf("request: %s %v", method, params)
|
||||||
defer func() { log.Printf("response: %v, %v", res, err) }()
|
defer func() { log.Printf("response: %v, %v", res, err) }()
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ type Client struct {
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
roots *featureSet[*Root]
|
roots *featureSet[*Root]
|
||||||
sessions []*ClientSession
|
sessions []*ClientSession
|
||||||
methodHandler_ MethodHandler[ClientSession]
|
methodHandler_ MethodHandler[*ClientSession]
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewClient creates a new Client.
|
// NewClient creates a new Client.
|
||||||
|
|
@ -37,7 +37,7 @@ func NewClient(name, version string, opts *ClientOptions) *Client {
|
||||||
name: name,
|
name: name,
|
||||||
version: version,
|
version: version,
|
||||||
roots: newFeatureSet(func(r *Root) string { return r.URI }),
|
roots: newFeatureSet(func(r *Root) string { return r.URI }),
|
||||||
methodHandler_: defaultMethodHandler[ClientSession],
|
methodHandler_: defaultMethodHandler[*ClientSession],
|
||||||
}
|
}
|
||||||
if opts != nil {
|
if opts != nil {
|
||||||
c.opts = *opts
|
c.opts = *opts
|
||||||
|
|
@ -196,14 +196,14 @@ func (c *Client) createMessage(ctx context.Context, cs *ClientSession, params *C
|
||||||
//
|
//
|
||||||
// For example, AddMiddleware(m1, m2, m3) augments the client method handler as
|
// For example, AddMiddleware(m1, m2, m3) augments the client method handler as
|
||||||
// m1(m2(m3(handler))).
|
// m1(m2(m3(handler))).
|
||||||
func (c *Client) AddMiddleware(middleware ...Middleware[ClientSession]) {
|
func (c *Client) AddMiddleware(middleware ...Middleware[*ClientSession]) {
|
||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
defer c.mu.Unlock()
|
defer c.mu.Unlock()
|
||||||
addMiddleware(&c.methodHandler_, middleware)
|
addMiddleware(&c.methodHandler_, middleware)
|
||||||
}
|
}
|
||||||
|
|
||||||
// clientMethodInfos maps from the RPC method name to serverMethodInfos.
|
// clientMethodInfos maps from the RPC method name to serverMethodInfos.
|
||||||
var clientMethodInfos = map[string]methodInfo[ClientSession]{
|
var clientMethodInfos = map[string]methodInfo{
|
||||||
methodPing: newMethodInfo(sessionMethod((*ClientSession).ping)),
|
methodPing: newMethodInfo(sessionMethod((*ClientSession).ping)),
|
||||||
methodListRoots: newMethodInfo(clientMethod((*Client).listRoots)),
|
methodListRoots: newMethodInfo(clientMethod((*Client).listRoots)),
|
||||||
methodCreateMessage: newMethodInfo(clientMethod((*Client).createMessage)),
|
methodCreateMessage: newMethodInfo(clientMethod((*Client).createMessage)),
|
||||||
|
|
@ -213,9 +213,7 @@ var clientMethodInfos = map[string]methodInfo[ClientSession]{
|
||||||
notificationLoggingMessage: newMethodInfo(clientMethod((*Client).callLoggingHandler)),
|
notificationLoggingMessage: newMethodInfo(clientMethod((*Client).callLoggingHandler)),
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ session[ClientSession] = (*ClientSession)(nil)
|
func (cs *ClientSession) methodInfos() map[string]methodInfo {
|
||||||
|
|
||||||
func (cs *ClientSession) methodInfos() map[string]methodInfo[ClientSession] {
|
|
||||||
return clientMethodInfos
|
return clientMethodInfos
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -223,7 +221,7 @@ func (cs *ClientSession) handle(ctx context.Context, req *jsonrpc2.Request) (any
|
||||||
return handleRequest(ctx, req, cs)
|
return handleRequest(ctx, req, cs)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cs *ClientSession) methodHandler() MethodHandler[ClientSession] {
|
func (cs *ClientSession) methodHandler() methodHandler {
|
||||||
cs.client.mu.Lock()
|
cs.client.mu.Lock()
|
||||||
defer cs.client.mu.Unlock()
|
defer cs.client.mu.Unlock()
|
||||||
return cs.client.methodHandler_
|
return cs.client.methodHandler_
|
||||||
|
|
|
||||||
|
|
@ -634,10 +634,10 @@ func TestMiddleware(t *testing.T) {
|
||||||
|
|
||||||
// "1" is the outer middleware layer, called first; then "2" is called, and finally
|
// "1" is the outer middleware layer, called first; then "2" is called, and finally
|
||||||
// the default dispatcher.
|
// the default dispatcher.
|
||||||
s.AddMiddleware(traceCalls[ServerSession](&sbuf, "1"), traceCalls[ServerSession](&sbuf, "2"))
|
s.AddMiddleware(traceCalls[*ServerSession](&sbuf, "1"), traceCalls[*ServerSession](&sbuf, "2"))
|
||||||
|
|
||||||
c := NewClient("testClient", "v1.0.0", nil)
|
c := NewClient("testClient", "v1.0.0", nil)
|
||||||
c.AddMiddleware(traceCalls[ClientSession](&cbuf, "1"), traceCalls[ClientSession](&cbuf, "2"))
|
c.AddMiddleware(traceCalls[*ClientSession](&cbuf, "1"), traceCalls[*ClientSession](&cbuf, "2"))
|
||||||
|
|
||||||
cs, err := c.Connect(ctx, ct)
|
cs, err := c.Connect(ctx, ct)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -679,9 +679,9 @@ func TestMiddleware(t *testing.T) {
|
||||||
|
|
||||||
// traceCalls creates a middleware function that prints the method before and after each call
|
// traceCalls creates a middleware function that prints the method before and after each call
|
||||||
// with the given prefix.
|
// with the given prefix.
|
||||||
func traceCalls[S ClientSession | ServerSession](w io.Writer, prefix string) Middleware[S] {
|
func traceCalls[S Session](w io.Writer, prefix string) Middleware[S] {
|
||||||
return func(h MethodHandler[S]) MethodHandler[S] {
|
return func(h MethodHandler[S]) MethodHandler[S] {
|
||||||
return func(ctx context.Context, sess *S, method string, params Params) (Result, error) {
|
return func(ctx context.Context, sess S, method string, params Params) (Result, error) {
|
||||||
fmt.Fprintf(w, "%s >%s\n", prefix, method)
|
fmt.Fprintf(w, "%s >%s\n", prefix, method)
|
||||||
defer fmt.Fprintf(w, "%s <%s\n", prefix, method)
|
defer fmt.Fprintf(w, "%s <%s\n", prefix, method)
|
||||||
return h(ctx, sess, method, params)
|
return h(ctx, sess, method, params)
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ type Server struct {
|
||||||
tools *featureSet[*ServerTool]
|
tools *featureSet[*ServerTool]
|
||||||
resources *featureSet[*ServerResource]
|
resources *featureSet[*ServerResource]
|
||||||
sessions []*ServerSession
|
sessions []*ServerSession
|
||||||
methodHandler_ MethodHandler[ServerSession]
|
methodHandler_ MethodHandler[*ServerSession]
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServerOptions is used to configure behavior of the server.
|
// ServerOptions is used to configure behavior of the server.
|
||||||
|
|
@ -77,7 +77,7 @@ func NewServer(name, version string, opts *ServerOptions) *Server {
|
||||||
prompts: newFeatureSet(func(p *ServerPrompt) string { return p.Prompt.Name }),
|
prompts: newFeatureSet(func(p *ServerPrompt) string { return p.Prompt.Name }),
|
||||||
tools: newFeatureSet(func(t *ServerTool) string { return t.Tool.Name }),
|
tools: newFeatureSet(func(t *ServerTool) string { return t.Tool.Name }),
|
||||||
resources: newFeatureSet(func(r *ServerResource) string { return r.Resource.URI }),
|
resources: newFeatureSet(func(r *ServerResource) string { return r.Resource.URI }),
|
||||||
methodHandler_: defaultMethodHandler[ServerSession],
|
methodHandler_: defaultMethodHandler[*ServerSession],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -440,14 +440,14 @@ func (ss *ServerSession) LoggingMessage(ctx context.Context, params *LoggingMess
|
||||||
//
|
//
|
||||||
// For example, AddMiddleware(m1, m2, m3) augments the server method handler as
|
// For example, AddMiddleware(m1, m2, m3) augments the server method handler as
|
||||||
// m1(m2(m3(handler))).
|
// m1(m2(m3(handler))).
|
||||||
func (s *Server) AddMiddleware(middleware ...Middleware[ServerSession]) {
|
func (s *Server) AddMiddleware(middleware ...Middleware[*ServerSession]) {
|
||||||
s.mu.Lock()
|
s.mu.Lock()
|
||||||
defer s.mu.Unlock()
|
defer s.mu.Unlock()
|
||||||
addMiddleware(&s.methodHandler_, middleware)
|
addMiddleware(&s.methodHandler_, middleware)
|
||||||
}
|
}
|
||||||
|
|
||||||
// serverMethodInfos maps from the RPC method name to serverMethodInfos.
|
// serverMethodInfos maps from the RPC method name to serverMethodInfos.
|
||||||
var serverMethodInfos = map[string]methodInfo[ServerSession]{
|
var serverMethodInfos = map[string]methodInfo{
|
||||||
methodInitialize: newMethodInfo(sessionMethod((*ServerSession).initialize)),
|
methodInitialize: newMethodInfo(sessionMethod((*ServerSession).initialize)),
|
||||||
methodPing: newMethodInfo(sessionMethod((*ServerSession).ping)),
|
methodPing: newMethodInfo(sessionMethod((*ServerSession).ping)),
|
||||||
methodListPrompts: newMethodInfo(serverMethod((*Server).listPrompts)),
|
methodListPrompts: newMethodInfo(serverMethod((*Server).listPrompts)),
|
||||||
|
|
@ -461,15 +461,11 @@ var serverMethodInfos = map[string]methodInfo[ServerSession]{
|
||||||
notificationRootsListChanged: newMethodInfo(serverMethod((*Server).callRootsListChangedHandler)),
|
notificationRootsListChanged: newMethodInfo(serverMethod((*Server).callRootsListChangedHandler)),
|
||||||
}
|
}
|
||||||
|
|
||||||
// *ServerSession implements the session interface.
|
func (ss *ServerSession) methodInfos() map[string]methodInfo {
|
||||||
// See toSession for why this interface seems to be necessary.
|
|
||||||
var _ session[ServerSession] = (*ServerSession)(nil)
|
|
||||||
|
|
||||||
func (ss *ServerSession) methodInfos() map[string]methodInfo[ServerSession] {
|
|
||||||
return serverMethodInfos
|
return serverMethodInfos
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ss *ServerSession) methodHandler() MethodHandler[ServerSession] {
|
func (ss *ServerSession) methodHandler() methodHandler {
|
||||||
ss.server.mu.Lock()
|
ss.server.mu.Lock()
|
||||||
defer ss.server.mu.Unlock()
|
defer ss.server.mu.Unlock()
|
||||||
return ss.server.methodHandler_
|
return ss.server.methodHandler_
|
||||||
|
|
|
||||||
|
|
@ -24,48 +24,45 @@ import (
|
||||||
// A MethodHandler handles MCP messages.
|
// A MethodHandler handles MCP messages.
|
||||||
// For methods, exactly one of the return values must be nil.
|
// For methods, exactly one of the return values must be nil.
|
||||||
// For notifications, both must be nil.
|
// For notifications, both must be nil.
|
||||||
type MethodHandler[S ClientSession | ServerSession] func(
|
type MethodHandler[S Session] func(
|
||||||
ctx context.Context, _ *S, method string, params Params) (result Result, err error)
|
ctx context.Context, _ S, method string, params Params) (result Result, err error)
|
||||||
|
|
||||||
|
// A methodHandler is a MethodHandler[Session] for some session.
|
||||||
|
// We need to give up type safety here, or we will end up with a type cycle somewhere
|
||||||
|
// else. For example, if Session.methodHandler returned a MethodHandler[Session],
|
||||||
|
// the compiler would complain.
|
||||||
|
type methodHandler any // MethodHandler[*ClientSession] | MethodHandler[*ServerSession]
|
||||||
|
|
||||||
|
// A Session is either a ClientSession or a ServerSession.
|
||||||
|
type Session interface {
|
||||||
|
*ClientSession | *ServerSession
|
||||||
|
methodHandler() methodHandler
|
||||||
|
methodInfos() map[string]methodInfo
|
||||||
|
getConn() *jsonrpc2.Connection
|
||||||
|
}
|
||||||
|
|
||||||
// Middleware is a function from MethodHandlers to MethodHandlers.
|
// Middleware is a function from MethodHandlers to MethodHandlers.
|
||||||
type Middleware[S ClientSession | ServerSession] func(MethodHandler[S]) MethodHandler[S]
|
type Middleware[S Session] func(MethodHandler[S]) MethodHandler[S]
|
||||||
|
|
||||||
// addMiddleware wraps the handler in the middleware functions.
|
// addMiddleware wraps the handler in the middleware functions.
|
||||||
func addMiddleware[S ClientSession | ServerSession](handlerp *MethodHandler[S], middleware []Middleware[S]) {
|
func addMiddleware[S Session](handlerp *MethodHandler[S], middleware []Middleware[S]) {
|
||||||
for _, m := range slices.Backward(middleware) {
|
for _, m := range slices.Backward(middleware) {
|
||||||
*handlerp = m(*handlerp)
|
*handlerp = m(*handlerp)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// session has methods common to both ClientSession and ServerSession.
|
|
||||||
type session[S ClientSession | ServerSession] interface {
|
|
||||||
methodHandler() MethodHandler[S]
|
|
||||||
methodInfos() map[string]methodInfo[S]
|
|
||||||
getConn() *jsonrpc2.Connection
|
|
||||||
}
|
|
||||||
|
|
||||||
// toSession[S] converts its argument to a session[S].
|
|
||||||
// Note that since S is constrained to ClientSession | ServerSession, and pointers to those
|
|
||||||
// types both implement session[S] already, this should be a no-op.
|
|
||||||
// That it is not, is due (I believe) to a deficency in generics, possibly related to core types.
|
|
||||||
// TODO(jba): revisit in Go 1.26; perhaps the change in spec due to the removal of core types
|
|
||||||
// will have resulted by then in a more generous implementation.
|
|
||||||
func toSession[S ClientSession | ServerSession](sess *S) session[S] {
|
|
||||||
return any(sess).(session[S])
|
|
||||||
}
|
|
||||||
|
|
||||||
// defaultMethodHandler is the initial MethodHandler for servers and clients, before being wrapped by middleware.
|
// defaultMethodHandler is the initial MethodHandler for servers and clients, before being wrapped by middleware.
|
||||||
func defaultMethodHandler[S ClientSession | ServerSession](ctx context.Context, sess *S, method string, params Params) (Result, error) {
|
func defaultMethodHandler[S Session](ctx context.Context, session S, method string, params Params) (Result, error) {
|
||||||
info, ok := toSession(sess).methodInfos()[method]
|
info, ok := session.methodInfos()[method]
|
||||||
if !ok {
|
if !ok {
|
||||||
// This can be called from user code, with an arbitrary value for method.
|
// This can be called from user code, with an arbitrary value for method.
|
||||||
return nil, jsonrpc2.ErrNotHandled
|
return nil, jsonrpc2.ErrNotHandled
|
||||||
}
|
}
|
||||||
return info.handleMethod(ctx, sess, method, params)
|
return info.handleMethod.(MethodHandler[S])(ctx, session, method, params)
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleRequest[S ClientSession | ServerSession](ctx context.Context, req *jsonrpc2.Request, sess *S) (any, error) {
|
func handleRequest[S Session](ctx context.Context, req *jsonrpc2.Request, session S) (any, error) {
|
||||||
info, ok := toSession(sess).methodInfos()[req.Method]
|
info, ok := session.methodInfos()[req.Method]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, jsonrpc2.ErrNotHandled
|
return nil, jsonrpc2.ErrNotHandled
|
||||||
}
|
}
|
||||||
|
|
@ -75,8 +72,8 @@ func handleRequest[S ClientSession | ServerSession](ctx context.Context, req *js
|
||||||
}
|
}
|
||||||
|
|
||||||
// mh might be user code, so ensure that it returns the right values for the jsonrpc2 protocol.
|
// mh might be user code, so ensure that it returns the right values for the jsonrpc2 protocol.
|
||||||
mh := toSession(sess).methodHandler()
|
mh := session.methodHandler().(MethodHandler[S])
|
||||||
res, err := mh(ctx, sess, req.Method, params)
|
res, err := mh(ctx, session, req.Method, params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
@ -84,11 +81,11 @@ func handleRequest[S ClientSession | ServerSession](ctx context.Context, req *js
|
||||||
}
|
}
|
||||||
|
|
||||||
// methodInfo is information about invoking a method.
|
// methodInfo is information about invoking a method.
|
||||||
type methodInfo[TSession ClientSession | ServerSession] struct {
|
type methodInfo struct {
|
||||||
// unmarshal params from the wire into an XXXParams struct
|
// unmarshal params from the wire into an XXXParams struct
|
||||||
unmarshalParams func(json.RawMessage) (Params, error)
|
unmarshalParams func(json.RawMessage) (Params, error)
|
||||||
// run the code for the method
|
// run the code for the method
|
||||||
handleMethod MethodHandler[TSession]
|
handleMethod methodHandler
|
||||||
}
|
}
|
||||||
|
|
||||||
// The following definitions support converting from typed to untyped method handlers.
|
// The following definitions support converting from typed to untyped method handlers.
|
||||||
|
|
@ -98,11 +95,11 @@ type methodInfo[TSession ClientSession | ServerSession] struct {
|
||||||
// - R: results
|
// - R: results
|
||||||
|
|
||||||
// A typedMethodHandler is like a MethodHandler, but with type information.
|
// A typedMethodHandler is like a MethodHandler, but with type information.
|
||||||
type typedMethodHandler[S any, P Params, R Result] func(context.Context, *S, P) (R, error)
|
type typedMethodHandler[S Session, P Params, R Result] func(context.Context, S, P) (R, error)
|
||||||
|
|
||||||
// newMethodInfo creates a methodInfo from a typedMethodHandler.
|
// newMethodInfo creates a methodInfo from a typedMethodHandler.
|
||||||
func newMethodInfo[S ClientSession | ServerSession, P Params, R Result](d typedMethodHandler[S, P, R]) methodInfo[S] {
|
func newMethodInfo[S Session, P Params, R Result](d typedMethodHandler[S, P, R]) methodInfo {
|
||||||
return methodInfo[S]{
|
return methodInfo{
|
||||||
unmarshalParams: func(m json.RawMessage) (Params, error) {
|
unmarshalParams: func(m json.RawMessage) (Params, error) {
|
||||||
var p P
|
var p P
|
||||||
if m != nil {
|
if m != nil {
|
||||||
|
|
@ -112,29 +109,33 @@ func newMethodInfo[S ClientSession | ServerSession, P Params, R Result](d typedM
|
||||||
}
|
}
|
||||||
return p, nil
|
return p, nil
|
||||||
},
|
},
|
||||||
handleMethod: func(ctx context.Context, ss *S, _ string, params Params) (Result, error) {
|
handleMethod: MethodHandler[S](func(ctx context.Context, session S, _ string, params Params) (Result, error) {
|
||||||
return d(ctx, ss, params.(P))
|
return d(ctx, session, params.(P))
|
||||||
},
|
}),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// serverMethod is glue for creating a typedMethodHandler from a method on Server.
|
// serverMethod is glue for creating a typedMethodHandler from a method on Server.
|
||||||
func serverMethod[P Params, R Result](f func(*Server, context.Context, *ServerSession, P) (R, error)) typedMethodHandler[ServerSession, P, R] {
|
func serverMethod[P Params, R Result](
|
||||||
|
f func(*Server, context.Context, *ServerSession, P) (R, error),
|
||||||
|
) typedMethodHandler[*ServerSession, P, R] {
|
||||||
return func(ctx context.Context, ss *ServerSession, p P) (R, error) {
|
return func(ctx context.Context, ss *ServerSession, p P) (R, error) {
|
||||||
return f(ss.server, ctx, ss, p)
|
return f(ss.server, ctx, ss, p)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// clientMethod is glue for creating a typedMethodHandler from a method on Server.
|
// clientMethod is glue for creating a typedMethodHandler from a method on Server.
|
||||||
func clientMethod[P Params, R Result](f func(*Client, context.Context, *ClientSession, P) (R, error)) typedMethodHandler[ClientSession, P, R] {
|
func clientMethod[P Params, R Result](
|
||||||
|
f func(*Client, context.Context, *ClientSession, P) (R, error),
|
||||||
|
) typedMethodHandler[*ClientSession, P, R] {
|
||||||
return func(ctx context.Context, cs *ClientSession, p P) (R, error) {
|
return func(ctx context.Context, cs *ClientSession, p P) (R, error) {
|
||||||
return f(cs.client, ctx, cs, p)
|
return f(cs.client, ctx, cs, p)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// sessionMethod is glue for creating a typedMethodHandler from a method on ServerSession.
|
// sessionMethod is glue for creating a typedMethodHandler from a method on ServerSession.
|
||||||
func sessionMethod[S ClientSession | ServerSession, P Params, R Result](f func(*S, context.Context, P) (R, error)) typedMethodHandler[S, P, R] {
|
func sessionMethod[S Session, P Params, R Result](f func(S, context.Context, P) (R, error)) typedMethodHandler[S, P, R] {
|
||||||
return func(ctx context.Context, sess *S, p P) (R, error) {
|
return func(ctx context.Context, sess S, p P) (R, error) {
|
||||||
return f(sess, ctx, p)
|
return f(sess, ctx, p)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -152,7 +153,7 @@ const (
|
||||||
CodeUnsupportedMethod = -31001
|
CodeUnsupportedMethod = -31001
|
||||||
)
|
)
|
||||||
|
|
||||||
func callNotificationHandler[S ClientSession | ServerSession, P any](ctx context.Context, h func(context.Context, *S, *P), sess *S, params *P) (Result, error) {
|
func callNotificationHandler[S Session, P any](ctx context.Context, h func(context.Context, S, *P), sess S, params *P) (Result, error) {
|
||||||
if h != nil {
|
if h != nil {
|
||||||
h(ctx, sess, params)
|
h(ctx, sess, params)
|
||||||
}
|
}
|
||||||
|
|
@ -161,15 +162,15 @@ func callNotificationHandler[S ClientSession | ServerSession, P any](ctx context
|
||||||
|
|
||||||
// notifySessions calls Notify on all the sessions.
|
// notifySessions calls Notify on all the sessions.
|
||||||
// Should be called on a copy of the peer sessions.
|
// Should be called on a copy of the peer sessions.
|
||||||
func notifySessions[S ClientSession | ServerSession](sessions []*S, method string, params Params) {
|
func notifySessions[S Session](sessions []S, method string, params Params) {
|
||||||
if sessions == nil {
|
if sessions == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// TODO: make this timeout configurable, or call Notify asynchronously.
|
// TODO: make this timeout configurable, or call Notify asynchronously.
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
for _, ss := range sessions {
|
for _, s := range sessions {
|
||||||
if err := toSession(ss).getConn().Notify(ctx, method, params); err != nil {
|
if err := s.getConn().Notify(ctx, method, params); err != nil {
|
||||||
// TODO(jba): surface this error better
|
// TODO(jba): surface this error better
|
||||||
log.Printf("calling %s: %v", method, err)
|
log.Printf("calling %s: %v", method, err)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue