Skip to content

chore: Inline withRequestHandler logic into WithServer #310

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

Merged
meling merged 1 commit into from
Mar 25, 2026
Merged

chore: Inline withRequestHandler logic into WithServer #310

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
22 changes: 7 additions & 15 deletions opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,11 @@ func WithPerNodeMetadata(f func(uint32) metadata.MD) DialOption {
}
}

// withRequestHandler returns a DialOption that sets the RequestHandler used to
// dispatch server-initiated requests arriving on the bidirectional back-channel,
// and records localID as this node's own NodeID. The localID is included in this
// node's outgoing metadata for each connection, enabling the server to identify
// this replica. The handler is not installed for the self-connection (if any) to
// avoid deadlocks in symmetric configurations.
func withRequestHandler(handler stream.RequestHandler, localID uint32) DialOption {
return func(o *dialOptions) {
o.handler = handler
o.localNodeID = localID
o.metadata = metadata.Join(o.metadata, metadataWithNodeID(localID))
}
}

// WithServer returns a [DialOption] that installs srv as the back-channel request
// handler and includes srv.NodeID() in the outgoing metadata, allowing the remote
// endpoint to route server-initiated requests back over the bidirectional connection.
// This option is intended for use in symmetric peer configurations, where each node
// is both a client and a server. It will panic if srv is nil.
//
// NodeID semantics:
// - If srv.NodeID() == 0, the remote will typically treat this connection as an
Expand All @@ -118,7 +106,11 @@ func WithServer(srv *Server) DialOption {
if srv == nil {
panic("gorums: WithServer called with nil server")
}
return withRequestHandler(srv, srv.NodeID())
return func(o *dialOptions) {
o.handler = srv
o.localNodeID = srv.NodeID()
o.metadata = metadata.Join(o.metadata, metadataWithNodeID(srv.NodeID()))
}
}

// splitOptions separates a slice of [Option]s into [ServerOption]s, [DialOption]s,
Expand Down
Loading