rpc: Atomic batch ID counter

Author: wille

internal/http.go

@@ -142,8 +142,8 @@ func IncomingHttpHandler(ctx context.Context, endpoint *Endpoint, w http.Respons
 	}
 
 	if req.IsBatch {
-		rpc.BatchIDCounter++
-		log = log.With("batch_id", rpc.BatchIDCounter, "batch_size", len(req.Requests))
+		batchId := rpc.BatchIDCounter.Add(1)
+		log = log.With("batch_id", batchId, "batch_size", len(req.Requests))
 	} else {
 		log = log.With("rpc_id", req.Requests[0].GetID(), "method", req.Requests[0].Method)
 	}

internal/rpc/response.go

@@ -9,9 +9,11 @@ type Response struct {
 	Version string `json:"jsonrpc"`
 
 	// ID might be a string or number
-	ID     any `json:"id,omitempty"`
-	Result any `json:"result"`
-	Error  any `json:"error,omitempty"`
+	ID     any    `json:"id,omitempty"`
+	Result any    `json:"result"`
+	Method string `json:"method"`
+	Params any    `json:"params"`
+	Error  any    `json:"error,omitempty"`
 }
 
 func (r *Response) GetID() string {

internal/rpc/rpc.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"strconv"
 	"strings"
+	"sync/atomic"
 )
 
 type ReaderFunc func(ctx context.Context, req *Request, errRpcError bool) (*Response, error)
 
-var BatchIDCounter = 0
+var BatchIDCounter atomic.Uint64
 
 // GetRequestIDString returns the request ID as a string.
 // The request ID is commonly a number, but might be a string with a number or a string.

internal/ws.go

@@ -244,15 +244,19 @@ func (proxy *WebSocketProxy) pumpClient(client *Client) {
 			requestLog := proxy.log
 
 			if req.IsBatch {
-				rpc.BatchIDCounter++
-
-				requestLog = requestLog.With("batch_id", rpc.BatchIDCounter, "batch_size", len(req.Requests))
+				batchId := rpc.BatchIDCounter.Add(1)
+				requestLog = requestLog.With("batch_id", batchId, "batch_size", len(req.Requests))
 			}
 
 			// Break up any batched requests into one request per message
-			for i, req := range req.Requests {
-				proxy.Requests <- req
-				requestLog.Debug("request", "batch_index", i, "rpc_id", req.GetID(), "method", req.Method)
+			for i, r := range req.Requests {
+				proxy.Requests <- r
+
+				if req.IsBatch {
+					requestLog.With("batch_index", i, "rpc_id", r.GetID(), "method", r.Method).Debug("request")
+				} else {
+					requestLog.With("rpc_id", r.GetID(), "method", r.Method).Debug("request")
+				}
 			}
 
 		case rpcResponse, ok := <-proxy.Responses: