Skip to content

Improve go/rpc API #905

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
SteveSandersonMS merged 3 commits into from
Mar 24, 2026
Merged

Improve go/rpc API #905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aca152e
improve go/rpc API
qmuntal Mar 23, 2026
f892699
fix TestMultiClient
qmuntal Mar 23, 2026
de12626
code review feedback
qmuntal Mar 23, 2026
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
28 changes: 20 additions & 8 deletions go/internal/jsonrpc2/jsonrpc2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,23 @@ func (c *Client) Request(method string, params any) (json.RawMessage, error) {
}
}

paramsData, err := json.Marshal(params)
if err != nil {
return nil, fmt.Errorf("failed to marshal params: %w", err)
var paramsData json.RawMessage
if params == nil {
paramsData = json.RawMessage("{}")
} else {
var err error
paramsData, err = json.Marshal(params)
if err != nil {
Comment thread
qmuntal marked this conversation as resolved.
return nil, fmt.Errorf("failed to marshal params: %w", err)
}
}

// Send request
request := Request{
JSONRPC: "2.0",
ID: json.RawMessage(`"` + requestID + `"`),
Method: method,
Params: json.RawMessage(paramsData),
Params: paramsData,
}

if err := c.sendMessage(request); err != nil {
Expand Down Expand Up @@ -261,15 +267,21 @@ func (c *Client) Request(method string, params any) (json.RawMessage, error) {

// Notify sends a JSON-RPC notification (no response expected)
func (c *Client) Notify(method string, params any) error {
paramsData, err := json.Marshal(params)
if err != nil {
return fmt.Errorf("failed to marshal params: %w", err)
var paramsData json.RawMessage
if params == nil {
paramsData = json.RawMessage("{}")
} else {
var err error
paramsData, err = json.Marshal(params)
if err != nil {
return fmt.Errorf("failed to marshal params: %w", err)
}
}

notification := Request{
JSONRPC: "2.0",
Method: method,
Params: json.RawMessage(paramsData),
Params: paramsData,
}
return c.sendMessage(notification)
}
Expand Down
Loading
Loading