Merge pull request #147 from davrodpin/rpc/params

Add support for parameters on rpc

Author: davrodpin

rpc/rpc.go

@@ -16,6 +16,7 @@ var registeredMethods = sync.Map{}
 var listener net.Listener
 
 const (
+	// DefaultAddress is the network address used by the rpc server if none is given.
 	DefaultAddress = "127.0.0.1:0"
 )
 
@@ -79,7 +80,7 @@ func (h *Handler) Handle(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2
 	}
 
 	m, _ := registeredMethods.Load(req.Method)
-	rm, err := m.(Method)()
+	rm, err := m.(Method)(req.Params)
 	if err != nil {
 		log.WithFields(log.Fields{
 			"notification": req.Notif,
@@ -113,11 +114,11 @@ func Register(name string, method Method) {
 }
 
 // Method represents a procedure that can be called remotely.
-type Method func() (json.RawMessage, error)
+type Method func(params interface{}) (json.RawMessage, error)
 
 // Call initiates a JSON-RPC call using the specified method and waits for the
 // response.
-func Call(ctx context.Context, method string) (map[string]interface{}, error) {
+func Call(ctx context.Context, method string, params interface{}) (map[string]interface{}, error) {
 	tc, err := net.Dial("tcp", listener.Addr().String())
 	if err != nil {
 		return nil, err
@@ -128,7 +129,7 @@ func Call(ctx context.Context, method string) (map[string]interface{}, error) {
 	conn := jsonrpc2.NewConn(ctx, stream, h)
 
 	var r map[string]interface{}
-	err = conn.Call(ctx, method, nil, &r)
+	err = conn.Call(ctx, method, params, &r)
 	if err != nil {
 		return nil, err
 	}

rpc/rpc_test.go

@@ -14,11 +14,11 @@ func TestHandler(t *testing.T) {
 	method := "test"
 	expectedResponse := `{"message":"test"}`
 
-	rpc.Register(method, func() (json.RawMessage, error) {
+	rpc.Register(method, func(params interface{}) (json.RawMessage, error) {
 		return json.RawMessage(expectedResponse), nil
 	})
 
-	response, err := rpc.Call(context.Background(), method)
+	response, err := rpc.Call(context.Background(), method, "param")
 	if err != nil {
 		t.Errorf("error while calling remote procedure: %v", err)
 	}
@@ -37,7 +37,7 @@ func TestMethodNotRegistered(t *testing.T) {
 	method := "methodnotregistered"
 	expectedResponse := fmt.Sprintf(`{"code":-32601,"data":null,"message":"method %s not found"}`, method)
 
-	response, err := rpc.Call(context.Background(), method)
+	response, err := rpc.Call(context.Background(), method, "param")
 	if err != nil {
 		t.Errorf("error while calling remote procedure: %v", err)
 	}
@@ -56,11 +56,11 @@ func TestMethodWithError(t *testing.T) {
 	method := "testwitherror"
 	expectedResponse := fmt.Sprintf(`{"code":-32603,"data":null,"message":"error executing rpc method %s"}`, method)
 
-	rpc.Register(method, func() (json.RawMessage, error) {
+	rpc.Register(method, func(params interface{}) (json.RawMessage, error) {
 		return nil, fmt.Errorf("error")
 	})
 
-	response, err := rpc.Call(context.Background(), method)
+	response, err := rpc.Call(context.Background(), method, "param")
 	if err != nil {
 		t.Errorf("error while calling remote procedure: %v", err)
 	}