diff --git a/rpc/lib/client/http_client.go b/rpc/lib/client/http_json_client.go
similarity index 99%
rename from rpc/lib/client/http_client.go
rename to rpc/lib/client/http_json_client.go
index 62936abe..4656a450 100644
--- a/rpc/lib/client/http_client.go
+++ b/rpc/lib/client/http_json_client.go
@@ -54,7 +54,7 @@ type JSONRPCClient struct {
client *http.Client
cdc *amino.Codec
- nextReqID uint
+ nextReqID int
}
var _ HTTPClient = (*JSONRPCClient)(nil)
diff --git a/rpc/lib/client/uri_client.go b/rpc/lib/client/http_uri_client.go
similarity index 100%
rename from rpc/lib/client/uri_client.go
rename to rpc/lib/client/http_uri_client.go
diff --git a/rpc/lib/client/ws_client.go b/rpc/lib/client/ws_client.go
index 4b64fd67..7a9a9611 100644
--- a/rpc/lib/client/ws_client.go
+++ b/rpc/lib/client/ws_client.go
@@ -34,7 +34,7 @@ type WSClient struct {
conn *websocket.Conn
cdc *amino.Codec
- nextReqID uint
+ nextReqID int
sentIds map[types.JSONRPCIntID]bool // IDs of the requests currently in flight
Address string // IP:PORT or /path/to/socket
diff --git a/rpc/lib/server/handlers.go b/rpc/lib/server/handlers.go
deleted file mode 100644
index 78bc7b25..00000000
--- a/rpc/lib/server/handlers.go
+++ /dev/null
@@ -1,869 +0,0 @@
-package rpcserver
-
-import (
- "bytes"
- "context"
- "encoding/hex"
- "encoding/json"
- "fmt"
- "io/ioutil"
- "net/http"
- "reflect"
- "runtime/debug"
- "sort"
- "strings"
- "time"
-
- "github.com/gorilla/websocket"
- "github.com/pkg/errors"
-
- amino "github.com/tendermint/go-amino"
- cmn "github.com/tendermint/tendermint/libs/common"
- "github.com/tendermint/tendermint/libs/log"
- types "github.com/tendermint/tendermint/rpc/lib/types"
-)
-
-// RegisterRPCFuncs adds a route for each function in the funcMap, as well as general jsonrpc and websocket handlers for all functions.
-// "result" is the interface on which the result objects are registered, and is popualted with every RPCResponse
-func RegisterRPCFuncs(mux *http.ServeMux, funcMap map[string]*RPCFunc, cdc *amino.Codec, logger log.Logger) {
- // HTTP endpoints
- for funcName, rpcFunc := range funcMap {
- mux.HandleFunc("/"+funcName, makeHTTPHandler(rpcFunc, cdc, logger))
- }
-
- // JSONRPC endpoints
- mux.HandleFunc("/", handleInvalidJSONRPCPaths(makeJSONRPCHandler(funcMap, cdc, logger)))
-}
-
-//-------------------------------------
-// function introspection
-
-// RPCFunc contains the introspected type information for a function
-type RPCFunc struct {
- f reflect.Value // underlying rpc function
- args []reflect.Type // type of each function arg
- returns []reflect.Type // type of each return arg
- argNames []string // name of each argument
- ws bool // websocket only
-}
-
-// NewRPCFunc wraps a function for introspection.
-// f is the function, args are comma separated argument names
-func NewRPCFunc(f interface{}, args string) *RPCFunc {
- return newRPCFunc(f, args, false)
-}
-
-// NewWSRPCFunc wraps a function for introspection and use in the websockets.
-func NewWSRPCFunc(f interface{}, args string) *RPCFunc {
- return newRPCFunc(f, args, true)
-}
-
-func newRPCFunc(f interface{}, args string, ws bool) *RPCFunc {
- var argNames []string
- if args != "" {
- argNames = strings.Split(args, ",")
- }
- return &RPCFunc{
- f: reflect.ValueOf(f),
- args: funcArgTypes(f),
- returns: funcReturnTypes(f),
- argNames: argNames,
- ws: ws,
- }
-}
-
-// return a function's argument types
-func funcArgTypes(f interface{}) []reflect.Type {
- t := reflect.TypeOf(f)
- n := t.NumIn()
- typez := make([]reflect.Type, n)
- for i := 0; i < n; i++ {
- typez[i] = t.In(i)
- }
- return typez
-}
-
-// return a function's return types
-func funcReturnTypes(f interface{}) []reflect.Type {
- t := reflect.TypeOf(f)
- n := t.NumOut()
- typez := make([]reflect.Type, n)
- for i := 0; i < n; i++ {
- typez[i] = t.Out(i)
- }
- return typez
-}
-
-// function introspection
-//-----------------------------------------------------------------------------
-// rpc.json
-
-// jsonrpc calls grab the given method's function info and runs reflect.Call
-func makeJSONRPCHandler(funcMap map[string]*RPCFunc, cdc *amino.Codec, logger log.Logger) http.HandlerFunc {
- return func(w http.ResponseWriter, r *http.Request) {
- b, err := ioutil.ReadAll(r.Body)
- if err != nil {
- WriteRPCResponseHTTP(w, types.RPCInvalidRequestError(types.JSONRPCStringID(""), errors.Wrap(err, "error reading request body")))
- return
- }
- // if its an empty request (like from a browser),
- // just display a list of functions
- if len(b) == 0 {
- writeListOfEndpoints(w, r, funcMap)
- return
- }
-
- // first try to unmarshal the incoming request as an array of RPC requests
- var (
- requests []types.RPCRequest
- responses []types.RPCResponse
- )
- if err := json.Unmarshal(b, &requests); err != nil {
- // next, try to unmarshal as a single request
- var request types.RPCRequest
- if err := json.Unmarshal(b, &request); err != nil {
- WriteRPCResponseHTTP(w, types.RPCParseError(types.JSONRPCStringID(""), errors.Wrap(err, "error unmarshalling request")))
- return
- }
- requests = []types.RPCRequest{request}
- }
-
- for _, request := range requests {
- // A Notification is a Request object without an "id" member.
- // The Server MUST NOT reply to a Notification, including those that are within a batch request.
- if request.ID == types.JSONRPCStringID("") {
- logger.Debug("HTTPJSONRPC received a notification, skipping... (please send a non-empty ID if you want to call a method)")
- continue
- }
- if len(r.URL.Path) > 1 {
- responses = append(responses, types.RPCInvalidRequestError(request.ID, errors.Errorf("path %s is invalid", r.URL.Path)))
- continue
- }
- rpcFunc, ok := funcMap[request.Method]
- if !ok || rpcFunc.ws {
- responses = append(responses, types.RPCMethodNotFoundError(request.ID))
- continue
- }
- ctx := &types.Context{JSONReq: &request, HTTPReq: r}
- args := []reflect.Value{reflect.ValueOf(ctx)}
- if len(request.Params) > 0 {
- fnArgs, err := jsonParamsToArgs(rpcFunc, cdc, request.Params)
- if err != nil {
- responses = append(responses, types.RPCInvalidParamsError(request.ID, errors.Wrap(err, "error converting json params to arguments")))
- continue
- }
- args = append(args, fnArgs...)
- }
- returns := rpcFunc.f.Call(args)
- logger.Info("HTTPJSONRPC", "method", request.Method, "args", args, "returns", returns)
- result, err := unreflectResult(returns)
- if err != nil {
- responses = append(responses, types.RPCInternalError(request.ID, err))
- continue
- }
- responses = append(responses, types.NewRPCSuccessResponse(cdc, request.ID, result))
- }
- if len(responses) > 0 {
- WriteRPCResponseArrayHTTP(w, responses)
- }
- }
-}
-
-func handleInvalidJSONRPCPaths(next http.HandlerFunc) http.HandlerFunc {
- return func(w http.ResponseWriter, r *http.Request) {
- // Since the pattern "/" matches all paths not matched by other registered patterns we check whether the path is indeed
- // "/", otherwise return a 404 error
- if r.URL.Path != "/" {
- http.NotFound(w, r)
- return
- }
-
- next(w, r)
- }
-}
-
-func mapParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, params map[string]json.RawMessage, argsOffset int) ([]reflect.Value, error) {
- values := make([]reflect.Value, len(rpcFunc.argNames))
- for i, argName := range rpcFunc.argNames {
- argType := rpcFunc.args[i+argsOffset]
-
- if p, ok := params[argName]; ok && p != nil && len(p) > 0 {
- val := reflect.New(argType)
- err := cdc.UnmarshalJSON(p, val.Interface())
- if err != nil {
- return nil, err
- }
- values[i] = val.Elem()
- } else { // use default for that type
- values[i] = reflect.Zero(argType)
- }
- }
-
- return values, nil
-}
-
-func arrayParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, params []json.RawMessage, argsOffset int) ([]reflect.Value, error) {
- if len(rpcFunc.argNames) != len(params) {
- return nil, errors.Errorf("expected %v parameters (%v), got %v (%v)",
- len(rpcFunc.argNames), rpcFunc.argNames, len(params), params)
- }
-
- values := make([]reflect.Value, len(params))
- for i, p := range params {
- argType := rpcFunc.args[i+argsOffset]
- val := reflect.New(argType)
- err := cdc.UnmarshalJSON(p, val.Interface())
- if err != nil {
- return nil, err
- }
- values[i] = val.Elem()
- }
- return values, nil
-}
-
-// raw is unparsed json (from json.RawMessage) encoding either a map or an
-// array.
-//
-// Example:
-// rpcFunc.args = [rpctypes.Context string]
-// rpcFunc.argNames = ["arg"]
-func jsonParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, raw []byte) ([]reflect.Value, error) {
- const argsOffset = 1
-
- // TODO: Make more efficient, perhaps by checking the first character for '{' or '['?
- // First, try to get the map.
- var m map[string]json.RawMessage
- err := json.Unmarshal(raw, &m)
- if err == nil {
- return mapParamsToArgs(rpcFunc, cdc, m, argsOffset)
- }
-
- // Otherwise, try an array.
- var a []json.RawMessage
- err = json.Unmarshal(raw, &a)
- if err == nil {
- return arrayParamsToArgs(rpcFunc, cdc, a, argsOffset)
- }
-
- // Otherwise, bad format, we cannot parse
- return nil, errors.Errorf("unknown type for JSON params: %v. Expected map or array", err)
-}
-
-// rpc.json
-//-----------------------------------------------------------------------------
-// rpc.http
-
-// convert from a function name to the http handler
-func makeHTTPHandler(rpcFunc *RPCFunc, cdc *amino.Codec, logger log.Logger) func(http.ResponseWriter, *http.Request) {
- // Exception for websocket endpoints
- if rpcFunc.ws {
- return func(w http.ResponseWriter, r *http.Request) {
- WriteRPCResponseHTTP(w, types.RPCMethodNotFoundError(types.JSONRPCStringID("")))
- }
- }
-
- // All other endpoints
- return func(w http.ResponseWriter, r *http.Request) {
- logger.Debug("HTTP HANDLER", "req", r)
-
- ctx := &types.Context{HTTPReq: r}
- args := []reflect.Value{reflect.ValueOf(ctx)}
-
- fnArgs, err := httpParamsToArgs(rpcFunc, cdc, r)
- if err != nil {
- WriteRPCResponseHTTP(w, types.RPCInvalidParamsError(types.JSONRPCStringID(""), errors.Wrap(err, "error converting http params to arguments")))
- return
- }
- args = append(args, fnArgs...)
-
- returns := rpcFunc.f.Call(args)
-
- logger.Info("HTTPRestRPC", "method", r.URL.Path, "args", args, "returns", returns)
- result, err := unreflectResult(returns)
- if err != nil {
- WriteRPCResponseHTTP(w, types.RPCInternalError(types.JSONRPCStringID(""), err))
- return
- }
- WriteRPCResponseHTTP(w, types.NewRPCSuccessResponse(cdc, types.JSONRPCStringID(""), result))
- }
-}
-
-// Covert an http query to a list of properly typed values.
-// To be properly decoded the arg must be a concrete type from tendermint (if its an interface).
-func httpParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, r *http.Request) ([]reflect.Value, error) {
- // skip types.Context
- const argsOffset = 1
-
- values := make([]reflect.Value, len(rpcFunc.argNames))
-
- for i, name := range rpcFunc.argNames {
- argType := rpcFunc.args[i+argsOffset]
-
- values[i] = reflect.Zero(argType) // set default for that type
-
- arg := GetParam(r, name)
- // log.Notice("param to arg", "argType", argType, "name", name, "arg", arg)
-
- if "" == arg {
- continue
- }
-
- v, err, ok := nonJSONStringToArg(cdc, argType, arg)
- if err != nil {
- return nil, err
- }
- if ok {
- values[i] = v
- continue
- }
-
- values[i], err = jsonStringToArg(cdc, argType, arg)
- if err != nil {
- return nil, err
- }
- }
-
- return values, nil
-}
-
-func jsonStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error) {
- rv := reflect.New(rt)
- err := cdc.UnmarshalJSON([]byte(arg), rv.Interface())
- if err != nil {
- return rv, err
- }
- rv = rv.Elem()
- return rv, nil
-}
-
-func nonJSONStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error, bool) {
- if rt.Kind() == reflect.Ptr {
- rv_, err, ok := nonJSONStringToArg(cdc, rt.Elem(), arg)
- if err != nil {
- return reflect.Value{}, err, false
- } else if ok {
- rv := reflect.New(rt.Elem())
- rv.Elem().Set(rv_)
- return rv, nil, true
- } else {
- return reflect.Value{}, nil, false
- }
- } else {
- return _nonJSONStringToArg(cdc, rt, arg)
- }
-}
-
-// NOTE: rt.Kind() isn't a pointer.
-func _nonJSONStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error, bool) {
- isIntString := RE_INT.Match([]byte(arg))
- isQuotedString := strings.HasPrefix(arg, `"`) && strings.HasSuffix(arg, `"`)
- isHexString := strings.HasPrefix(strings.ToLower(arg), "0x")
-
- var expectingString, expectingByteSlice, expectingInt bool
- switch rt.Kind() {
- case reflect.Int, reflect.Uint, reflect.Int8, reflect.Uint8, reflect.Int16, reflect.Uint16, reflect.Int32, reflect.Uint32, reflect.Int64, reflect.Uint64:
- expectingInt = true
- case reflect.String:
- expectingString = true
- case reflect.Slice:
- expectingByteSlice = rt.Elem().Kind() == reflect.Uint8
- }
-
- if isIntString && expectingInt {
- qarg := `"` + arg + `"`
- // jsonStringToArg
- rv, err := jsonStringToArg(cdc, rt, qarg)
- if err != nil {
- return rv, err, false
- } else {
- return rv, nil, true
- }
- }
-
- if isHexString {
- if !expectingString && !expectingByteSlice {
- err := errors.Errorf("got a hex string arg, but expected '%s'",
- rt.Kind().String())
- return reflect.ValueOf(nil), err, false
- }
-
- var value []byte
- value, err := hex.DecodeString(arg[2:])
- if err != nil {
- return reflect.ValueOf(nil), err, false
- }
- if rt.Kind() == reflect.String {
- return reflect.ValueOf(string(value)), nil, true
- }
- return reflect.ValueOf([]byte(value)), nil, true
- }
-
- if isQuotedString && expectingByteSlice {
- v := reflect.New(reflect.TypeOf(""))
- err := cdc.UnmarshalJSON([]byte(arg), v.Interface())
- if err != nil {
- return reflect.ValueOf(nil), err, false
- }
- v = v.Elem()
- return reflect.ValueOf([]byte(v.String())), nil, true
- }
-
- return reflect.ValueOf(nil), nil, false
-}
-
-// rpc.http
-//-----------------------------------------------------------------------------
-// rpc.websocket
-
-const (
- defaultWSWriteChanCapacity = 1000
- defaultWSWriteWait = 10 * time.Second
- defaultWSReadWait = 30 * time.Second
- defaultWSPingPeriod = (defaultWSReadWait * 9) / 10
-)
-
-// A single websocket connection contains listener id, underlying ws
-// connection, and the event switch for subscribing to events.
-//
-// In case of an error, the connection is stopped.
-type wsConnection struct {
- cmn.BaseService
-
- remoteAddr string
- baseConn *websocket.Conn
- writeChan chan types.RPCResponse
-
- funcMap map[string]*RPCFunc
- cdc *amino.Codec
-
- // write channel capacity
- writeChanCapacity int
-
- // each write times out after this.
- writeWait time.Duration
-
- // Connection times out if we haven't received *anything* in this long, not even pings.
- readWait time.Duration
-
- // Send pings to server with this period. Must be less than readWait, but greater than zero.
- pingPeriod time.Duration
-
- // Maximum message size.
- readLimit int64
-
- // callback which is called upon disconnect
- onDisconnect func(remoteAddr string)
-
- ctx context.Context
- cancel context.CancelFunc
-}
-
-// NewWSConnection wraps websocket.Conn.
-//
-// See the commentary on the func(*wsConnection) functions for a detailed
-// description of how to configure ping period and pong wait time. NOTE: if the
-// write buffer is full, pongs may be dropped, which may cause clients to
-// disconnect. see https://github.com/gorilla/websocket/issues/97
-func NewWSConnection(
- baseConn *websocket.Conn,
- funcMap map[string]*RPCFunc,
- cdc *amino.Codec,
- options ...func(*wsConnection),
-) *wsConnection {
- wsc := &wsConnection{
- remoteAddr: baseConn.RemoteAddr().String(),
- baseConn: baseConn,
- funcMap: funcMap,
- cdc: cdc,
- writeWait: defaultWSWriteWait,
- writeChanCapacity: defaultWSWriteChanCapacity,
- readWait: defaultWSReadWait,
- pingPeriod: defaultWSPingPeriod,
- }
- for _, option := range options {
- option(wsc)
- }
- wsc.baseConn.SetReadLimit(wsc.readLimit)
- wsc.BaseService = *cmn.NewBaseService(nil, "wsConnection", wsc)
- return wsc
-}
-
-// OnDisconnect sets a callback which is used upon disconnect - not
-// Goroutine-safe. Nop by default.
-func OnDisconnect(onDisconnect func(remoteAddr string)) func(*wsConnection) {
- return func(wsc *wsConnection) {
- wsc.onDisconnect = onDisconnect
- }
-}
-
-// WriteWait sets the amount of time to wait before a websocket write times out.
-// It should only be used in the constructor - not Goroutine-safe.
-func WriteWait(writeWait time.Duration) func(*wsConnection) {
- return func(wsc *wsConnection) {
- wsc.writeWait = writeWait
- }
-}
-
-// WriteChanCapacity sets the capacity of the websocket write channel.
-// It should only be used in the constructor - not Goroutine-safe.
-func WriteChanCapacity(cap int) func(*wsConnection) {
- return func(wsc *wsConnection) {
- wsc.writeChanCapacity = cap
- }
-}
-
-// ReadWait sets the amount of time to wait before a websocket read times out.
-// It should only be used in the constructor - not Goroutine-safe.
-func ReadWait(readWait time.Duration) func(*wsConnection) {
- return func(wsc *wsConnection) {
- wsc.readWait = readWait
- }
-}
-
-// PingPeriod sets the duration for sending websocket pings.
-// It should only be used in the constructor - not Goroutine-safe.
-func PingPeriod(pingPeriod time.Duration) func(*wsConnection) {
- return func(wsc *wsConnection) {
- wsc.pingPeriod = pingPeriod
- }
-}
-
-// ReadLimit sets the maximum size for reading message.
-// It should only be used in the constructor - not Goroutine-safe.
-func ReadLimit(readLimit int64) func(*wsConnection) {
- return func(wsc *wsConnection) {
- wsc.readLimit = readLimit
- }
-}
-
-// OnStart implements cmn.Service by starting the read and write routines. It
-// blocks until the connection closes.
-func (wsc *wsConnection) OnStart() error {
- wsc.writeChan = make(chan types.RPCResponse, wsc.writeChanCapacity)
-
- // Read subscriptions/unsubscriptions to events
- go wsc.readRoutine()
- // Write responses, BLOCKING.
- wsc.writeRoutine()
-
- return nil
-}
-
-// OnStop implements cmn.Service by unsubscribing remoteAddr from all subscriptions.
-func (wsc *wsConnection) OnStop() {
- // Both read and write loops close the websocket connection when they exit their loops.
- // The writeChan is never closed, to allow WriteRPCResponse() to fail.
-
- if wsc.onDisconnect != nil {
- wsc.onDisconnect(wsc.remoteAddr)
- }
-
- if wsc.ctx != nil {
- wsc.cancel()
- }
-}
-
-// GetRemoteAddr returns the remote address of the underlying connection.
-// It implements WSRPCConnection
-func (wsc *wsConnection) GetRemoteAddr() string {
- return wsc.remoteAddr
-}
-
-// WriteRPCResponse pushes a response to the writeChan, and blocks until it is accepted.
-// It implements WSRPCConnection. It is Goroutine-safe.
-func (wsc *wsConnection) WriteRPCResponse(resp types.RPCResponse) {
- select {
- case <-wsc.Quit():
- return
- case wsc.writeChan <- resp:
- }
-}
-
-// TryWriteRPCResponse attempts to push a response to the writeChan, but does not block.
-// It implements WSRPCConnection. It is Goroutine-safe
-func (wsc *wsConnection) TryWriteRPCResponse(resp types.RPCResponse) bool {
- select {
- case <-wsc.Quit():
- return false
- case wsc.writeChan <- resp:
- return true
- default:
- return false
- }
-}
-
-// Codec returns an amino codec used to decode parameters and encode results.
-// It implements WSRPCConnection.
-func (wsc *wsConnection) Codec() *amino.Codec {
- return wsc.cdc
-}
-
-// Context returns the connection's context.
-// The context is canceled when the client's connection closes.
-func (wsc *wsConnection) Context() context.Context {
- if wsc.ctx != nil {
- return wsc.ctx
- }
- wsc.ctx, wsc.cancel = context.WithCancel(context.Background())
- return wsc.ctx
-}
-
-// Read from the socket and subscribe to or unsubscribe from events
-func (wsc *wsConnection) readRoutine() {
- defer func() {
- if r := recover(); r != nil {
- err, ok := r.(error)
- if !ok {
- err = fmt.Errorf("WSJSONRPC: %v", r)
- }
- wsc.Logger.Error("Panic in WSJSONRPC handler", "err", err, "stack", string(debug.Stack()))
- wsc.WriteRPCResponse(types.RPCInternalError(types.JSONRPCStringID("unknown"), err))
- go wsc.readRoutine()
- } else {
- wsc.baseConn.Close() // nolint: errcheck
- }
- }()
-
- wsc.baseConn.SetPongHandler(func(m string) error {
- return wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait))
- })
-
- for {
- select {
- case <-wsc.Quit():
- return
- default:
- // reset deadline for every type of message (control or data)
- if err := wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait)); err != nil {
- wsc.Logger.Error("failed to set read deadline", "err", err)
- }
- var in []byte
- _, in, err := wsc.baseConn.ReadMessage()
- if err != nil {
- if websocket.IsCloseError(err, websocket.CloseNormalClosure) {
- wsc.Logger.Info("Client closed the connection")
- } else {
- wsc.Logger.Error("Failed to read request", "err", err)
- }
- wsc.Stop()
- return
- }
-
- var request types.RPCRequest
- err = json.Unmarshal(in, &request)
- if err != nil {
- wsc.WriteRPCResponse(types.RPCParseError(types.JSONRPCStringID(""), errors.Wrap(err, "error unmarshaling request")))
- continue
- }
-
- // A Notification is a Request object without an "id" member.
- // The Server MUST NOT reply to a Notification, including those that are within a batch request.
- if request.ID == types.JSONRPCStringID("") {
- wsc.Logger.Debug("WSJSONRPC received a notification, skipping... (please send a non-empty ID if you want to call a method)")
- continue
- }
-
- // Now, fetch the RPCFunc and execute it.
- rpcFunc := wsc.funcMap[request.Method]
- if rpcFunc == nil {
- wsc.WriteRPCResponse(types.RPCMethodNotFoundError(request.ID))
- continue
- }
-
- ctx := &types.Context{JSONReq: &request, WSConn: wsc}
- args := []reflect.Value{reflect.ValueOf(ctx)}
- if len(request.Params) > 0 {
- fnArgs, err := jsonParamsToArgs(rpcFunc, wsc.cdc, request.Params)
- if err != nil {
- wsc.WriteRPCResponse(types.RPCInternalError(request.ID, errors.Wrap(err, "error converting json params to arguments")))
- continue
- }
- args = append(args, fnArgs...)
- }
-
- returns := rpcFunc.f.Call(args)
-
- // TODO: Need to encode args/returns to string if we want to log them
- wsc.Logger.Info("WSJSONRPC", "method", request.Method)
-
- result, err := unreflectResult(returns)
- if err != nil {
- wsc.WriteRPCResponse(types.RPCInternalError(request.ID, err))
- continue
- }
-
- wsc.WriteRPCResponse(types.NewRPCSuccessResponse(wsc.cdc, request.ID, result))
- }
- }
-}
-
-// receives on a write channel and writes out on the socket
-func (wsc *wsConnection) writeRoutine() {
- pingTicker := time.NewTicker(wsc.pingPeriod)
- defer func() {
- pingTicker.Stop()
- if err := wsc.baseConn.Close(); err != nil {
- wsc.Logger.Error("Error closing connection", "err", err)
- }
- }()
-
- // https://github.com/gorilla/websocket/issues/97
- pongs := make(chan string, 1)
- wsc.baseConn.SetPingHandler(func(m string) error {
- select {
- case pongs <- m:
- default:
- }
- return nil
- })
-
- for {
- select {
- case m := <-pongs:
- err := wsc.writeMessageWithDeadline(websocket.PongMessage, []byte(m))
- if err != nil {
- wsc.Logger.Info("Failed to write pong (client may disconnect)", "err", err)
- }
- case <-pingTicker.C:
- err := wsc.writeMessageWithDeadline(websocket.PingMessage, []byte{})
- if err != nil {
- wsc.Logger.Error("Failed to write ping", "err", err)
- wsc.Stop()
- return
- }
- case msg := <-wsc.writeChan:
- jsonBytes, err := json.MarshalIndent(msg, "", " ")
- if err != nil {
- wsc.Logger.Error("Failed to marshal RPCResponse to JSON", "err", err)
- } else if err = wsc.writeMessageWithDeadline(websocket.TextMessage, jsonBytes); err != nil {
- wsc.Logger.Error("Failed to write response", "err", err)
- wsc.Stop()
- return
- }
- case <-wsc.Quit():
- return
- }
- }
-}
-
-// All writes to the websocket must (re)set the write deadline.
-// If some writes don't set it while others do, they may timeout incorrectly (https://github.com/tendermint/tendermint/issues/553)
-func (wsc *wsConnection) writeMessageWithDeadline(msgType int, msg []byte) error {
- if err := wsc.baseConn.SetWriteDeadline(time.Now().Add(wsc.writeWait)); err != nil {
- return err
- }
- return wsc.baseConn.WriteMessage(msgType, msg)
-}
-
-//----------------------------------------
-
-// WebsocketManager provides a WS handler for incoming connections and passes a
-// map of functions along with any additional params to new connections.
-// NOTE: The websocket path is defined externally, e.g. in node/node.go
-type WebsocketManager struct {
- websocket.Upgrader
-
- funcMap map[string]*RPCFunc
- cdc *amino.Codec
- logger log.Logger
- wsConnOptions []func(*wsConnection)
-}
-
-// NewWebsocketManager returns a new WebsocketManager that passes a map of
-// functions, connection options and logger to new WS connections.
-func NewWebsocketManager(funcMap map[string]*RPCFunc, cdc *amino.Codec, wsConnOptions ...func(*wsConnection)) *WebsocketManager {
- return &WebsocketManager{
- funcMap: funcMap,
- cdc: cdc,
- Upgrader: websocket.Upgrader{
- CheckOrigin: func(r *http.Request) bool {
- // TODO ???
- return true
- },
- },
- logger: log.NewNopLogger(),
- wsConnOptions: wsConnOptions,
- }
-}
-
-// SetLogger sets the logger.
-func (wm *WebsocketManager) SetLogger(l log.Logger) {
- wm.logger = l
-}
-
-// WebsocketHandler upgrades the request/response (via http.Hijack) and starts
-// the wsConnection.
-func (wm *WebsocketManager) WebsocketHandler(w http.ResponseWriter, r *http.Request) {
- wsConn, err := wm.Upgrade(w, r, nil)
- if err != nil {
- // TODO - return http error
- wm.logger.Error("Failed to upgrade to websocket connection", "err", err)
- return
- }
-
- // register connection
- con := NewWSConnection(wsConn, wm.funcMap, wm.cdc, wm.wsConnOptions...)
- con.SetLogger(wm.logger.With("remote", wsConn.RemoteAddr()))
- wm.logger.Info("New websocket connection", "remote", con.remoteAddr)
- err = con.Start() // Blocking
- if err != nil {
- wm.logger.Error("Error starting connection", "err", err)
- }
-}
-
-// rpc.websocket
-//-----------------------------------------------------------------------------
-
-// NOTE: assume returns is result struct and error. If error is not nil, return it
-func unreflectResult(returns []reflect.Value) (interface{}, error) {
- errV := returns[1]
- if errV.Interface() != nil {
- return nil, errors.Errorf("%v", errV.Interface())
- }
- rv := returns[0]
- // the result is a registered interface,
- // we need a pointer to it so we can marshal with type byte
- rvp := reflect.New(rv.Type())
- rvp.Elem().Set(rv)
- return rvp.Interface(), nil
-}
-
-// writes a list of available rpc endpoints as an html page
-func writeListOfEndpoints(w http.ResponseWriter, r *http.Request, funcMap map[string]*RPCFunc) {
- noArgNames := []string{}
- argNames := []string{}
- for name, funcData := range funcMap {
- if len(funcData.args) == 0 {
- noArgNames = append(noArgNames, name)
- } else {
- argNames = append(argNames, name)
- }
- }
- sort.Strings(noArgNames)
- sort.Strings(argNames)
- buf := new(bytes.Buffer)
- buf.WriteString("
")
- buf.WriteString("
Available endpoints:
")
-
- for _, name := range noArgNames {
- link := fmt.Sprintf("//%s/%s", r.Host, name)
- buf.WriteString(fmt.Sprintf("%s", link, link))
- }
-
- buf.WriteString("
Endpoints that require arguments:
")
- for _, name := range argNames {
- link := fmt.Sprintf("//%s/%s?", r.Host, name)
- funcData := funcMap[name]
- for i, argName := range funcData.argNames {
- link += argName + "=_"
- if i < len(funcData.argNames)-1 {
- link += "&"
- }
- }
- buf.WriteString(fmt.Sprintf("%s", link, link))
- }
- buf.WriteString("")
- w.Header().Set("Content-Type", "text/html")
- w.WriteHeader(200)
- w.Write(buf.Bytes()) // nolint: errcheck
-}
diff --git a/rpc/lib/server/http_json_handler.go b/rpc/lib/server/http_json_handler.go
new file mode 100644
index 00000000..6798bb8b
--- /dev/null
+++ b/rpc/lib/server/http_json_handler.go
@@ -0,0 +1,215 @@
+package rpcserver
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "reflect"
+ "sort"
+
+ "github.com/pkg/errors"
+
+ amino "github.com/tendermint/go-amino"
+
+ "github.com/tendermint/tendermint/libs/log"
+ types "github.com/tendermint/tendermint/rpc/lib/types"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// HTTP + JSON handler
+///////////////////////////////////////////////////////////////////////////////
+
+// jsonrpc calls grab the given method's function info and runs reflect.Call
+func makeJSONRPCHandler(funcMap map[string]*RPCFunc, cdc *amino.Codec, logger log.Logger) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ b, err := ioutil.ReadAll(r.Body)
+ if err != nil {
+ WriteRPCResponseHTTP(w, types.RPCInvalidRequestError(nil, errors.Wrap(err, "error reading request body")))
+ return
+ }
+ defer r.Body.Close() // nolint: errcheck
+
+ // if its an empty request (like from a browser),
+ // just display a list of functions
+ if len(b) == 0 {
+ writeListOfEndpoints(w, r, funcMap)
+ return
+ }
+
+ // first try to unmarshal the incoming request as an array of RPC requests
+ var (
+ requests []types.RPCRequest
+ responses []types.RPCResponse
+ )
+ if err := json.Unmarshal(b, &requests); err != nil {
+ // next, try to unmarshal as a single request
+ var request types.RPCRequest
+ if err := json.Unmarshal(b, &request); err != nil {
+ WriteRPCResponseHTTP(w, types.RPCParseError(errors.Wrap(err, "error unmarshalling request")))
+ return
+ }
+ requests = []types.RPCRequest{request}
+ }
+
+ for _, request := range requests {
+ // A Notification is a Request object without an "id" member.
+ // The Server MUST NOT reply to a Notification, including those that are within a batch request.
+ if request.ID == nil {
+ logger.Debug("HTTPJSONRPC received a notification, skipping... (please send a non-empty ID if you want to call a method)")
+ continue
+ }
+ if len(r.URL.Path) > 1 {
+ responses = append(responses, types.RPCInvalidRequestError(request.ID, errors.Errorf("path %s is invalid", r.URL.Path)))
+ continue
+ }
+ rpcFunc, ok := funcMap[request.Method]
+ if !ok || rpcFunc.ws {
+ responses = append(responses, types.RPCMethodNotFoundError(request.ID))
+ continue
+ }
+ ctx := &types.Context{JSONReq: &request, HTTPReq: r}
+ args := []reflect.Value{reflect.ValueOf(ctx)}
+ if len(request.Params) > 0 {
+ fnArgs, err := jsonParamsToArgs(rpcFunc, cdc, request.Params)
+ if err != nil {
+ responses = append(responses, types.RPCInvalidParamsError(request.ID, errors.Wrap(err, "error converting json params to arguments")))
+ continue
+ }
+ args = append(args, fnArgs...)
+ }
+ returns := rpcFunc.f.Call(args)
+ logger.Info("HTTPJSONRPC", "method", request.Method, "args", args, "returns", returns)
+ result, err := unreflectResult(returns)
+ if err != nil {
+ responses = append(responses, types.RPCInternalError(request.ID, err))
+ continue
+ }
+ responses = append(responses, types.NewRPCSuccessResponse(cdc, request.ID, result))
+ }
+ if len(responses) > 0 {
+ WriteRPCResponseArrayHTTP(w, responses)
+ }
+ }
+}
+
+func handleInvalidJSONRPCPaths(next http.HandlerFunc) http.HandlerFunc {
+ return func(w http.ResponseWriter, r *http.Request) {
+ // Since the pattern "/" matches all paths not matched by other registered patterns we check whether the path is indeed
+ // "/", otherwise return a 404 error
+ if r.URL.Path != "/" {
+ http.NotFound(w, r)
+ return
+ }
+
+ next(w, r)
+ }
+}
+
+func mapParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, params map[string]json.RawMessage, argsOffset int) ([]reflect.Value, error) {
+ values := make([]reflect.Value, len(rpcFunc.argNames))
+ for i, argName := range rpcFunc.argNames {
+ argType := rpcFunc.args[i+argsOffset]
+
+ if p, ok := params[argName]; ok && p != nil && len(p) > 0 {
+ val := reflect.New(argType)
+ err := cdc.UnmarshalJSON(p, val.Interface())
+ if err != nil {
+ return nil, err
+ }
+ values[i] = val.Elem()
+ } else { // use default for that type
+ values[i] = reflect.Zero(argType)
+ }
+ }
+
+ return values, nil
+}
+
+func arrayParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, params []json.RawMessage, argsOffset int) ([]reflect.Value, error) {
+ if len(rpcFunc.argNames) != len(params) {
+ return nil, errors.Errorf("expected %v parameters (%v), got %v (%v)",
+ len(rpcFunc.argNames), rpcFunc.argNames, len(params), params)
+ }
+
+ values := make([]reflect.Value, len(params))
+ for i, p := range params {
+ argType := rpcFunc.args[i+argsOffset]
+ val := reflect.New(argType)
+ err := cdc.UnmarshalJSON(p, val.Interface())
+ if err != nil {
+ return nil, err
+ }
+ values[i] = val.Elem()
+ }
+ return values, nil
+}
+
+// raw is unparsed json (from json.RawMessage) encoding either a map or an
+// array.
+//
+// Example:
+// rpcFunc.args = [rpctypes.Context string]
+// rpcFunc.argNames = ["arg"]
+func jsonParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, raw []byte) ([]reflect.Value, error) {
+ const argsOffset = 1
+
+ // TODO: Make more efficient, perhaps by checking the first character for '{' or '['?
+ // First, try to get the map.
+ var m map[string]json.RawMessage
+ err := json.Unmarshal(raw, &m)
+ if err == nil {
+ return mapParamsToArgs(rpcFunc, cdc, m, argsOffset)
+ }
+
+ // Otherwise, try an array.
+ var a []json.RawMessage
+ err = json.Unmarshal(raw, &a)
+ if err == nil {
+ return arrayParamsToArgs(rpcFunc, cdc, a, argsOffset)
+ }
+
+ // Otherwise, bad format, we cannot parse
+ return nil, errors.Errorf("unknown type for JSON params: %v. Expected map or array", err)
+}
+
+// writes a list of available rpc endpoints as an html page
+func writeListOfEndpoints(w http.ResponseWriter, r *http.Request, funcMap map[string]*RPCFunc) {
+ noArgNames := []string{}
+ argNames := []string{}
+ for name, funcData := range funcMap {
+ if len(funcData.args) == 0 {
+ noArgNames = append(noArgNames, name)
+ } else {
+ argNames = append(argNames, name)
+ }
+ }
+ sort.Strings(noArgNames)
+ sort.Strings(argNames)
+ buf := new(bytes.Buffer)
+ buf.WriteString("")
+ buf.WriteString("
Available endpoints:
")
+
+ for _, name := range noArgNames {
+ link := fmt.Sprintf("//%s/%s", r.Host, name)
+ buf.WriteString(fmt.Sprintf("%s", link, link))
+ }
+
+ buf.WriteString("
Endpoints that require arguments:
")
+ for _, name := range argNames {
+ link := fmt.Sprintf("//%s/%s?", r.Host, name)
+ funcData := funcMap[name]
+ for i, argName := range funcData.argNames {
+ link += argName + "=_"
+ if i < len(funcData.argNames)-1 {
+ link += "&"
+ }
+ }
+ buf.WriteString(fmt.Sprintf("%s", link, link))
+ }
+ buf.WriteString("")
+ w.Header().Set("Content-Type", "text/html")
+ w.WriteHeader(200)
+ w.Write(buf.Bytes()) // nolint: errcheck
+}
diff --git a/rpc/lib/server/handlers_test.go b/rpc/lib/server/http_json_handler_test.go
similarity index 78%
rename from rpc/lib/server/handlers_test.go
rename to rpc/lib/server/http_json_handler_test.go
index 9cded295..df4f8bb6 100644
--- a/rpc/lib/server/handlers_test.go
+++ b/rpc/lib/server/http_json_handler_test.go
@@ -1,4 +1,4 @@
-package rpcserver_test
+package rpcserver
import (
"bytes"
@@ -9,32 +9,24 @@ import (
"strings"
"testing"
- "github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
amino "github.com/tendermint/go-amino"
+
"github.com/tendermint/tendermint/libs/log"
- rs "github.com/tendermint/tendermint/rpc/lib/server"
types "github.com/tendermint/tendermint/rpc/lib/types"
)
-//////////////////////////////////////////////////////////////////////////////
-// HTTP REST API
-// TODO
-
-//////////////////////////////////////////////////////////////////////////////
-// JSON-RPC over HTTP
-
func testMux() *http.ServeMux {
- funcMap := map[string]*rs.RPCFunc{
- "c": rs.NewRPCFunc(func(ctx *types.Context, s string, i int) (string, error) { return "foo", nil }, "s,i"),
+ funcMap := map[string]*RPCFunc{
+ "c": NewRPCFunc(func(ctx *types.Context, s string, i int) (string, error) { return "foo", nil }, "s,i"),
}
cdc := amino.NewCodec()
mux := http.NewServeMux()
buf := new(bytes.Buffer)
logger := log.NewTMLogger(buf)
- rs.RegisterRPCFuncs(mux, funcMap, cdc, logger)
+ RegisterRPCFuncs(mux, funcMap, cdc, logger)
return mux
}
@@ -54,7 +46,7 @@ func TestRPCParams(t *testing.T) {
// bad
{`{"jsonrpc": "2.0", "id": "0"}`, "Method not found", types.JSONRPCStringID("0")},
{`{"jsonrpc": "2.0", "method": "y", "id": "0"}`, "Method not found", types.JSONRPCStringID("0")},
- {`{"method": "c", "id": "0", "params": a}`, "invalid character", types.JSONRPCStringID("")}, // id not captured in JSON parsing failures
+ {`{"method": "c", "id": "0", "params": a}`, "invalid character", nil}, // id not captured in JSON parsing failures
{`{"method": "c", "id": "0", "params": ["a"]}`, "got 1", types.JSONRPCStringID("0")},
{`{"method": "c", "id": "0", "params": ["a", "b"]}`, "invalid character", types.JSONRPCStringID("0")},
{`{"method": "c", "id": "0", "params": [1, 1]}`, "of type string", types.JSONRPCStringID("0")},
@@ -97,7 +89,7 @@ func TestJSONRPCID(t *testing.T) {
tests := []struct {
payload string
wantErr bool
- expectedId interface{}
+ expectedID interface{}
}{
// good id
{`{"jsonrpc": "2.0", "method": "c", "id": "0", "params": ["a", "10"]}`, false, types.JSONRPCStringID("0")},
@@ -106,7 +98,9 @@ func TestJSONRPCID(t *testing.T) {
{`{"jsonrpc": "2.0", "method": "c", "id": 1, "params": ["a", "10"]}`, false, types.JSONRPCIntID(1)},
{`{"jsonrpc": "2.0", "method": "c", "id": 1.3, "params": ["a", "10"]}`, false, types.JSONRPCIntID(1)},
{`{"jsonrpc": "2.0", "method": "c", "id": -1, "params": ["a", "10"]}`, false, types.JSONRPCIntID(-1)},
- {`{"jsonrpc": "2.0", "method": "c", "id": null, "params": ["a", "10"]}`, false, nil},
+
+ // no ID - notification
+ {`{"jsonrpc": "2.0", "method": "c", "params": ["a", "10"]}`, false, nil},
// bad id
{`{"jsonrpc": "2.0", "method": "c", "id": {}, "params": ["a", "10"]}`, true, nil},
@@ -131,7 +125,7 @@ func TestJSONRPCID(t *testing.T) {
assert.Nil(t, err, "#%d: expecting successful parsing of an RPCResponse:\nblob: %s", i, blob)
if !tt.wantErr {
assert.NotEqual(t, recv, new(types.RPCResponse), "#%d: not expecting a blank RPCResponse", i)
- assert.Equal(t, tt.expectedId, recv.ID, "#%d: expected ID not matched in RPCResponse", i)
+ assert.Equal(t, tt.expectedID, recv.ID, "#%d: expected ID not matched in RPCResponse", i)
assert.Nil(t, recv.Error, "#%d: not expecting an error", i)
} else {
assert.True(t, recv.Error.Code < 0, "#%d: not expecting a positive JSONRPC code", i)
@@ -230,44 +224,3 @@ func TestUnknownRPCPath(t *testing.T) {
// Always expecting back a 404 error
require.Equal(t, http.StatusNotFound, res.StatusCode, "should always return 404")
}
-
-//////////////////////////////////////////////////////////////////////////////
-// JSON-RPC over WEBSOCKETS
-
-func TestWebsocketManagerHandler(t *testing.T) {
- s := newWSServer()
- defer s.Close()
-
- // check upgrader works
- d := websocket.Dialer{}
- c, dialResp, err := d.Dial("ws://"+s.Listener.Addr().String()+"/websocket", nil)
- require.NoError(t, err)
-
- if got, want := dialResp.StatusCode, http.StatusSwitchingProtocols; got != want {
- t.Errorf("dialResp.StatusCode = %q, want %q", got, want)
- }
-
- // check basic functionality works
- req, err := types.MapToRequest(amino.NewCodec(), types.JSONRPCStringID("TestWebsocketManager"), "c", map[string]interface{}{"s": "a", "i": 10})
- require.NoError(t, err)
- err = c.WriteJSON(req)
- require.NoError(t, err)
-
- var resp types.RPCResponse
- err = c.ReadJSON(&resp)
- require.NoError(t, err)
- require.Nil(t, resp.Error)
-}
-
-func newWSServer() *httptest.Server {
- funcMap := map[string]*rs.RPCFunc{
- "c": rs.NewWSRPCFunc(func(ctx *types.Context, s string, i int) (string, error) { return "foo", nil }, "s,i"),
- }
- wm := rs.NewWebsocketManager(funcMap, amino.NewCodec())
- wm.SetLogger(log.TestingLogger())
-
- mux := http.NewServeMux()
- mux.HandleFunc("/websocket", wm.WebsocketHandler)
-
- return httptest.NewServer(mux)
-}
diff --git a/rpc/lib/server/http_uri_handler.go b/rpc/lib/server/http_uri_handler.go
new file mode 100644
index 00000000..34c3118e
--- /dev/null
+++ b/rpc/lib/server/http_uri_handler.go
@@ -0,0 +1,179 @@
+package rpcserver
+
+import (
+ "encoding/hex"
+ "net/http"
+ "reflect"
+ "strings"
+
+ "github.com/pkg/errors"
+
+ amino "github.com/tendermint/go-amino"
+
+ "github.com/tendermint/tendermint/libs/log"
+ types "github.com/tendermint/tendermint/rpc/lib/types"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// HTTP + URI handler
+///////////////////////////////////////////////////////////////////////////////
+
+// convert from a function name to the http handler
+func makeHTTPHandler(rpcFunc *RPCFunc, cdc *amino.Codec, logger log.Logger) func(http.ResponseWriter, *http.Request) {
+ // Always return 0 as there's no ID here.
+ dummyID := types.JSONRPCIntID(0)
+
+ // Exception for websocket endpoints
+ if rpcFunc.ws {
+ return func(w http.ResponseWriter, r *http.Request) {
+ WriteRPCResponseHTTP(w, types.RPCMethodNotFoundError(dummyID))
+ }
+ }
+
+ // All other endpoints
+ return func(w http.ResponseWriter, r *http.Request) {
+ logger.Debug("HTTP HANDLER", "req", r)
+
+ ctx := &types.Context{HTTPReq: r}
+ args := []reflect.Value{reflect.ValueOf(ctx)}
+
+ fnArgs, err := httpParamsToArgs(rpcFunc, cdc, r)
+ if err != nil {
+ WriteRPCResponseHTTP(w, types.RPCInvalidParamsError(dummyID, errors.Wrap(err, "error converting http params to arguments")))
+ return
+ }
+ args = append(args, fnArgs...)
+
+ returns := rpcFunc.f.Call(args)
+
+ logger.Info("HTTPRestRPC", "method", r.URL.Path, "args", args, "returns", returns)
+ result, err := unreflectResult(returns)
+ if err != nil {
+ WriteRPCResponseHTTP(w, types.RPCInternalError(dummyID, err))
+ return
+ }
+ WriteRPCResponseHTTP(w, types.NewRPCSuccessResponse(cdc, dummyID, result))
+ }
+}
+
+// Covert an http query to a list of properly typed values.
+// To be properly decoded the arg must be a concrete type from tendermint (if its an interface).
+func httpParamsToArgs(rpcFunc *RPCFunc, cdc *amino.Codec, r *http.Request) ([]reflect.Value, error) {
+ // skip types.Context
+ const argsOffset = 1
+
+ values := make([]reflect.Value, len(rpcFunc.argNames))
+
+ for i, name := range rpcFunc.argNames {
+ argType := rpcFunc.args[i+argsOffset]
+
+ values[i] = reflect.Zero(argType) // set default for that type
+
+ arg := GetParam(r, name)
+ // log.Notice("param to arg", "argType", argType, "name", name, "arg", arg)
+
+ if "" == arg {
+ continue
+ }
+
+ v, err, ok := nonJSONStringToArg(cdc, argType, arg)
+ if err != nil {
+ return nil, err
+ }
+ if ok {
+ values[i] = v
+ continue
+ }
+
+ values[i], err = jsonStringToArg(cdc, argType, arg)
+ if err != nil {
+ return nil, err
+ }
+ }
+
+ return values, nil
+}
+
+func jsonStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error) {
+ rv := reflect.New(rt)
+ err := cdc.UnmarshalJSON([]byte(arg), rv.Interface())
+ if err != nil {
+ return rv, err
+ }
+ rv = rv.Elem()
+ return rv, nil
+}
+
+func nonJSONStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error, bool) {
+ if rt.Kind() == reflect.Ptr {
+ rv_, err, ok := nonJSONStringToArg(cdc, rt.Elem(), arg)
+ if err != nil {
+ return reflect.Value{}, err, false
+ } else if ok {
+ rv := reflect.New(rt.Elem())
+ rv.Elem().Set(rv_)
+ return rv, nil, true
+ } else {
+ return reflect.Value{}, nil, false
+ }
+ } else {
+ return _nonJSONStringToArg(cdc, rt, arg)
+ }
+}
+
+// NOTE: rt.Kind() isn't a pointer.
+func _nonJSONStringToArg(cdc *amino.Codec, rt reflect.Type, arg string) (reflect.Value, error, bool) {
+ isIntString := RE_INT.Match([]byte(arg))
+ isQuotedString := strings.HasPrefix(arg, `"`) && strings.HasSuffix(arg, `"`)
+ isHexString := strings.HasPrefix(strings.ToLower(arg), "0x")
+
+ var expectingString, expectingByteSlice, expectingInt bool
+ switch rt.Kind() {
+ case reflect.Int, reflect.Uint, reflect.Int8, reflect.Uint8, reflect.Int16, reflect.Uint16, reflect.Int32, reflect.Uint32, reflect.Int64, reflect.Uint64:
+ expectingInt = true
+ case reflect.String:
+ expectingString = true
+ case reflect.Slice:
+ expectingByteSlice = rt.Elem().Kind() == reflect.Uint8
+ }
+
+ if isIntString && expectingInt {
+ qarg := `"` + arg + `"`
+ // jsonStringToArg
+ rv, err := jsonStringToArg(cdc, rt, qarg)
+ if err != nil {
+ return rv, err, false
+ }
+ return rv, nil, true
+ }
+
+ if isHexString {
+ if !expectingString && !expectingByteSlice {
+ err := errors.Errorf("got a hex string arg, but expected '%s'",
+ rt.Kind().String())
+ return reflect.ValueOf(nil), err, false
+ }
+
+ var value []byte
+ value, err := hex.DecodeString(arg[2:])
+ if err != nil {
+ return reflect.ValueOf(nil), err, false
+ }
+ if rt.Kind() == reflect.String {
+ return reflect.ValueOf(string(value)), nil, true
+ }
+ return reflect.ValueOf([]byte(value)), nil, true
+ }
+
+ if isQuotedString && expectingByteSlice {
+ v := reflect.New(reflect.TypeOf(""))
+ err := cdc.UnmarshalJSON([]byte(arg), v.Interface())
+ if err != nil {
+ return reflect.ValueOf(nil), err, false
+ }
+ v = v.Elem()
+ return reflect.ValueOf([]byte(v.String())), nil, true
+ }
+
+ return reflect.ValueOf(nil), nil, false
+}
diff --git a/rpc/lib/server/rpc_func.go b/rpc/lib/server/rpc_func.go
new file mode 100644
index 00000000..22d1e663
--- /dev/null
+++ b/rpc/lib/server/rpc_func.go
@@ -0,0 +1,101 @@
+package rpcserver
+
+import (
+ "net/http"
+ "reflect"
+ "strings"
+
+ "github.com/pkg/errors"
+
+ amino "github.com/tendermint/go-amino"
+
+ "github.com/tendermint/tendermint/libs/log"
+)
+
+// RegisterRPCFuncs adds a route for each function in the funcMap, as well as general jsonrpc and websocket handlers for all functions.
+// "result" is the interface on which the result objects are registered, and is popualted with every RPCResponse
+func RegisterRPCFuncs(mux *http.ServeMux, funcMap map[string]*RPCFunc, cdc *amino.Codec, logger log.Logger) {
+ // HTTP endpoints
+ for funcName, rpcFunc := range funcMap {
+ mux.HandleFunc("/"+funcName, makeHTTPHandler(rpcFunc, cdc, logger))
+ }
+
+ // JSONRPC endpoints
+ mux.HandleFunc("/", handleInvalidJSONRPCPaths(makeJSONRPCHandler(funcMap, cdc, logger)))
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Function introspection
+///////////////////////////////////////////////////////////////////////////////
+
+// RPCFunc contains the introspected type information for a function.
+type RPCFunc struct {
+ f reflect.Value // underlying rpc function
+ args []reflect.Type // type of each function arg
+ returns []reflect.Type // type of each return arg
+ argNames []string // name of each argument
+ ws bool // websocket only
+}
+
+// NewRPCFunc wraps a function for introspection.
+// f is the function, args are comma separated argument names
+func NewRPCFunc(f interface{}, args string) *RPCFunc {
+ return newRPCFunc(f, args, false)
+}
+
+// NewWSRPCFunc wraps a function for introspection and use in the websockets.
+func NewWSRPCFunc(f interface{}, args string) *RPCFunc {
+ return newRPCFunc(f, args, true)
+}
+
+func newRPCFunc(f interface{}, args string, ws bool) *RPCFunc {
+ var argNames []string
+ if args != "" {
+ argNames = strings.Split(args, ",")
+ }
+ return &RPCFunc{
+ f: reflect.ValueOf(f),
+ args: funcArgTypes(f),
+ returns: funcReturnTypes(f),
+ argNames: argNames,
+ ws: ws,
+ }
+}
+
+// return a function's argument types
+func funcArgTypes(f interface{}) []reflect.Type {
+ t := reflect.TypeOf(f)
+ n := t.NumIn()
+ typez := make([]reflect.Type, n)
+ for i := 0; i < n; i++ {
+ typez[i] = t.In(i)
+ }
+ return typez
+}
+
+// return a function's return types
+func funcReturnTypes(f interface{}) []reflect.Type {
+ t := reflect.TypeOf(f)
+ n := t.NumOut()
+ typez := make([]reflect.Type, n)
+ for i := 0; i < n; i++ {
+ typez[i] = t.Out(i)
+ }
+ return typez
+}
+
+//-------------------------------------------------------------
+
+// NOTE: assume returns is result struct and error. If error is not nil, return it
+func unreflectResult(returns []reflect.Value) (interface{}, error) {
+ errV := returns[1]
+ if errV.Interface() != nil {
+ return nil, errors.Errorf("%v", errV.Interface())
+ }
+ rv := returns[0]
+ // the result is a registered interface,
+ // we need a pointer to it so we can marshal with type byte
+ rvp := reflect.New(rv.Type())
+ rvp.Elem().Set(rv)
+ return rvp.Interface(), nil
+}
diff --git a/rpc/lib/server/ws_handler.go b/rpc/lib/server/ws_handler.go
new file mode 100644
index 00000000..48a489fd
--- /dev/null
+++ b/rpc/lib/server/ws_handler.go
@@ -0,0 +1,422 @@
+package rpcserver
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "net/http"
+ "reflect"
+ "runtime/debug"
+ "time"
+
+ "github.com/gorilla/websocket"
+ "github.com/pkg/errors"
+
+ amino "github.com/tendermint/go-amino"
+
+ cmn "github.com/tendermint/tendermint/libs/common"
+ "github.com/tendermint/tendermint/libs/log"
+ types "github.com/tendermint/tendermint/rpc/lib/types"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// WebSocket handler
+///////////////////////////////////////////////////////////////////////////////
+
+// WebsocketManager provides a WS handler for incoming connections and passes a
+// map of functions along with any additional params to new connections.
+// NOTE: The websocket path is defined externally, e.g. in node/node.go
+type WebsocketManager struct {
+ websocket.Upgrader
+
+ funcMap map[string]*RPCFunc
+ cdc *amino.Codec
+ logger log.Logger
+ wsConnOptions []func(*wsConnection)
+}
+
+// NewWebsocketManager returns a new WebsocketManager that passes a map of
+// functions, connection options and logger to new WS connections.
+func NewWebsocketManager(funcMap map[string]*RPCFunc, cdc *amino.Codec, wsConnOptions ...func(*wsConnection)) *WebsocketManager {
+ return &WebsocketManager{
+ funcMap: funcMap,
+ cdc: cdc,
+ Upgrader: websocket.Upgrader{
+ CheckOrigin: func(r *http.Request) bool {
+ // TODO ???
+ return true
+ },
+ },
+ logger: log.NewNopLogger(),
+ wsConnOptions: wsConnOptions,
+ }
+}
+
+// SetLogger sets the logger.
+func (wm *WebsocketManager) SetLogger(l log.Logger) {
+ wm.logger = l
+}
+
+// WebsocketHandler upgrades the request/response (via http.Hijack) and starts
+// the wsConnection.
+func (wm *WebsocketManager) WebsocketHandler(w http.ResponseWriter, r *http.Request) {
+ wsConn, err := wm.Upgrade(w, r, nil)
+ if err != nil {
+ // TODO - return http error
+ wm.logger.Error("Failed to upgrade to websocket connection", "err", err)
+ return
+ }
+
+ // register connection
+ con := NewWSConnection(wsConn, wm.funcMap, wm.cdc, wm.wsConnOptions...)
+ con.SetLogger(wm.logger.With("remote", wsConn.RemoteAddr()))
+ wm.logger.Info("New websocket connection", "remote", con.remoteAddr)
+ err = con.Start() // Blocking
+ if err != nil {
+ wm.logger.Error("Error starting connection", "err", err)
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// WebSocket connection
+///////////////////////////////////////////////////////////////////////////////
+
+const (
+ defaultWSWriteChanCapacity = 1000
+ defaultWSWriteWait = 10 * time.Second
+ defaultWSReadWait = 30 * time.Second
+ defaultWSPingPeriod = (defaultWSReadWait * 9) / 10
+)
+
+// A single websocket connection contains listener id, underlying ws
+// connection, and the event switch for subscribing to events.
+//
+// In case of an error, the connection is stopped.
+type wsConnection struct {
+ cmn.BaseService
+
+ remoteAddr string
+ baseConn *websocket.Conn
+ writeChan chan types.RPCResponse
+
+ funcMap map[string]*RPCFunc
+ cdc *amino.Codec
+
+ // write channel capacity
+ writeChanCapacity int
+
+ // each write times out after this.
+ writeWait time.Duration
+
+ // Connection times out if we haven't received *anything* in this long, not even pings.
+ readWait time.Duration
+
+ // Send pings to server with this period. Must be less than readWait, but greater than zero.
+ pingPeriod time.Duration
+
+ // Maximum message size.
+ readLimit int64
+
+ // callback which is called upon disconnect
+ onDisconnect func(remoteAddr string)
+
+ ctx context.Context
+ cancel context.CancelFunc
+}
+
+// NewWSConnection wraps websocket.Conn.
+//
+// See the commentary on the func(*wsConnection) functions for a detailed
+// description of how to configure ping period and pong wait time. NOTE: if the
+// write buffer is full, pongs may be dropped, which may cause clients to
+// disconnect. see https://github.com/gorilla/websocket/issues/97
+func NewWSConnection(
+ baseConn *websocket.Conn,
+ funcMap map[string]*RPCFunc,
+ cdc *amino.Codec,
+ options ...func(*wsConnection),
+) *wsConnection {
+ wsc := &wsConnection{
+ remoteAddr: baseConn.RemoteAddr().String(),
+ baseConn: baseConn,
+ funcMap: funcMap,
+ cdc: cdc,
+ writeWait: defaultWSWriteWait,
+ writeChanCapacity: defaultWSWriteChanCapacity,
+ readWait: defaultWSReadWait,
+ pingPeriod: defaultWSPingPeriod,
+ }
+ for _, option := range options {
+ option(wsc)
+ }
+ wsc.baseConn.SetReadLimit(wsc.readLimit)
+ wsc.BaseService = *cmn.NewBaseService(nil, "wsConnection", wsc)
+ return wsc
+}
+
+// OnDisconnect sets a callback which is used upon disconnect - not
+// Goroutine-safe. Nop by default.
+func OnDisconnect(onDisconnect func(remoteAddr string)) func(*wsConnection) {
+ return func(wsc *wsConnection) {
+ wsc.onDisconnect = onDisconnect
+ }
+}
+
+// WriteWait sets the amount of time to wait before a websocket write times out.
+// It should only be used in the constructor - not Goroutine-safe.
+func WriteWait(writeWait time.Duration) func(*wsConnection) {
+ return func(wsc *wsConnection) {
+ wsc.writeWait = writeWait
+ }
+}
+
+// WriteChanCapacity sets the capacity of the websocket write channel.
+// It should only be used in the constructor - not Goroutine-safe.
+func WriteChanCapacity(cap int) func(*wsConnection) {
+ return func(wsc *wsConnection) {
+ wsc.writeChanCapacity = cap
+ }
+}
+
+// ReadWait sets the amount of time to wait before a websocket read times out.
+// It should only be used in the constructor - not Goroutine-safe.
+func ReadWait(readWait time.Duration) func(*wsConnection) {
+ return func(wsc *wsConnection) {
+ wsc.readWait = readWait
+ }
+}
+
+// PingPeriod sets the duration for sending websocket pings.
+// It should only be used in the constructor - not Goroutine-safe.
+func PingPeriod(pingPeriod time.Duration) func(*wsConnection) {
+ return func(wsc *wsConnection) {
+ wsc.pingPeriod = pingPeriod
+ }
+}
+
+// ReadLimit sets the maximum size for reading message.
+// It should only be used in the constructor - not Goroutine-safe.
+func ReadLimit(readLimit int64) func(*wsConnection) {
+ return func(wsc *wsConnection) {
+ wsc.readLimit = readLimit
+ }
+}
+
+// OnStart implements cmn.Service by starting the read and write routines. It
+// blocks until the connection closes.
+func (wsc *wsConnection) OnStart() error {
+ wsc.writeChan = make(chan types.RPCResponse, wsc.writeChanCapacity)
+
+ // Read subscriptions/unsubscriptions to events
+ go wsc.readRoutine()
+ // Write responses, BLOCKING.
+ wsc.writeRoutine()
+
+ return nil
+}
+
+// OnStop implements cmn.Service by unsubscribing remoteAddr from all subscriptions.
+func (wsc *wsConnection) OnStop() {
+ // Both read and write loops close the websocket connection when they exit their loops.
+ // The writeChan is never closed, to allow WriteRPCResponse() to fail.
+
+ if wsc.onDisconnect != nil {
+ wsc.onDisconnect(wsc.remoteAddr)
+ }
+
+ if wsc.ctx != nil {
+ wsc.cancel()
+ }
+}
+
+// GetRemoteAddr returns the remote address of the underlying connection.
+// It implements WSRPCConnection
+func (wsc *wsConnection) GetRemoteAddr() string {
+ return wsc.remoteAddr
+}
+
+// WriteRPCResponse pushes a response to the writeChan, and blocks until it is accepted.
+// It implements WSRPCConnection. It is Goroutine-safe.
+func (wsc *wsConnection) WriteRPCResponse(resp types.RPCResponse) {
+ select {
+ case <-wsc.Quit():
+ return
+ case wsc.writeChan <- resp:
+ }
+}
+
+// TryWriteRPCResponse attempts to push a response to the writeChan, but does not block.
+// It implements WSRPCConnection. It is Goroutine-safe
+func (wsc *wsConnection) TryWriteRPCResponse(resp types.RPCResponse) bool {
+ select {
+ case <-wsc.Quit():
+ return false
+ case wsc.writeChan <- resp:
+ return true
+ default:
+ return false
+ }
+}
+
+// Codec returns an amino codec used to decode parameters and encode results.
+// It implements WSRPCConnection.
+func (wsc *wsConnection) Codec() *amino.Codec {
+ return wsc.cdc
+}
+
+// Context returns the connection's context.
+// The context is canceled when the client's connection closes.
+func (wsc *wsConnection) Context() context.Context {
+ if wsc.ctx != nil {
+ return wsc.ctx
+ }
+ wsc.ctx, wsc.cancel = context.WithCancel(context.Background())
+ return wsc.ctx
+}
+
+// Read from the socket and subscribe to or unsubscribe from events
+func (wsc *wsConnection) readRoutine() {
+ defer func() {
+ if r := recover(); r != nil {
+ err, ok := r.(error)
+ if !ok {
+ err = fmt.Errorf("WSJSONRPC: %v", r)
+ }
+ wsc.Logger.Error("Panic in WSJSONRPC handler", "err", err, "stack", string(debug.Stack()))
+ wsc.WriteRPCResponse(types.RPCInternalError(types.JSONRPCIntID(0), err))
+ go wsc.readRoutine()
+ } else {
+ wsc.baseConn.Close() // nolint: errcheck
+ }
+ }()
+
+ wsc.baseConn.SetPongHandler(func(m string) error {
+ return wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait))
+ })
+
+ for {
+ select {
+ case <-wsc.Quit():
+ return
+ default:
+ // reset deadline for every type of message (control or data)
+ if err := wsc.baseConn.SetReadDeadline(time.Now().Add(wsc.readWait)); err != nil {
+ wsc.Logger.Error("failed to set read deadline", "err", err)
+ }
+ var in []byte
+ _, in, err := wsc.baseConn.ReadMessage()
+ if err != nil {
+ if websocket.IsCloseError(err, websocket.CloseNormalClosure) {
+ wsc.Logger.Info("Client closed the connection")
+ } else {
+ wsc.Logger.Error("Failed to read request", "err", err)
+ }
+ wsc.Stop()
+ return
+ }
+
+ var request types.RPCRequest
+ err = json.Unmarshal(in, &request)
+ if err != nil {
+ wsc.WriteRPCResponse(types.RPCParseError(errors.Wrap(err, "error unmarshalling request")))
+ continue
+ }
+
+ // A Notification is a Request object without an "id" member.
+ // The Server MUST NOT reply to a Notification, including those that are within a batch request.
+ if request.ID == types.JSONRPCIntID(0) {
+ wsc.Logger.Debug("WSJSONRPC received a notification, skipping... (please send a non-empty ID if you want to call a method)")
+ continue
+ }
+
+ // Now, fetch the RPCFunc and execute it.
+ rpcFunc := wsc.funcMap[request.Method]
+ if rpcFunc == nil {
+ wsc.WriteRPCResponse(types.RPCMethodNotFoundError(request.ID))
+ continue
+ }
+
+ ctx := &types.Context{JSONReq: &request, WSConn: wsc}
+ args := []reflect.Value{reflect.ValueOf(ctx)}
+ if len(request.Params) > 0 {
+ fnArgs, err := jsonParamsToArgs(rpcFunc, wsc.cdc, request.Params)
+ if err != nil {
+ wsc.WriteRPCResponse(types.RPCInternalError(request.ID, errors.Wrap(err, "error converting json params to arguments")))
+ continue
+ }
+ args = append(args, fnArgs...)
+ }
+
+ returns := rpcFunc.f.Call(args)
+
+ // TODO: Need to encode args/returns to string if we want to log them
+ wsc.Logger.Info("WSJSONRPC", "method", request.Method)
+
+ result, err := unreflectResult(returns)
+ if err != nil {
+ wsc.WriteRPCResponse(types.RPCInternalError(request.ID, err))
+ continue
+ }
+
+ wsc.WriteRPCResponse(types.NewRPCSuccessResponse(wsc.cdc, request.ID, result))
+ }
+ }
+}
+
+// receives on a write channel and writes out on the socket
+func (wsc *wsConnection) writeRoutine() {
+ pingTicker := time.NewTicker(wsc.pingPeriod)
+ defer func() {
+ pingTicker.Stop()
+ if err := wsc.baseConn.Close(); err != nil {
+ wsc.Logger.Error("Error closing connection", "err", err)
+ }
+ }()
+
+ // https://github.com/gorilla/websocket/issues/97
+ pongs := make(chan string, 1)
+ wsc.baseConn.SetPingHandler(func(m string) error {
+ select {
+ case pongs <- m:
+ default:
+ }
+ return nil
+ })
+
+ for {
+ select {
+ case m := <-pongs:
+ err := wsc.writeMessageWithDeadline(websocket.PongMessage, []byte(m))
+ if err != nil {
+ wsc.Logger.Info("Failed to write pong (client may disconnect)", "err", err)
+ }
+ case <-pingTicker.C:
+ err := wsc.writeMessageWithDeadline(websocket.PingMessage, []byte{})
+ if err != nil {
+ wsc.Logger.Error("Failed to write ping", "err", err)
+ wsc.Stop()
+ return
+ }
+ case msg := <-wsc.writeChan:
+ jsonBytes, err := json.MarshalIndent(msg, "", " ")
+ if err != nil {
+ wsc.Logger.Error("Failed to marshal RPCResponse to JSON", "err", err)
+ } else if err = wsc.writeMessageWithDeadline(websocket.TextMessage, jsonBytes); err != nil {
+ wsc.Logger.Error("Failed to write response", "err", err)
+ wsc.Stop()
+ return
+ }
+ case <-wsc.Quit():
+ return
+ }
+ }
+}
+
+// All writes to the websocket must (re)set the write deadline.
+// If some writes don't set it while others do, they may timeout incorrectly (https://github.com/tendermint/tendermint/issues/553)
+func (wsc *wsConnection) writeMessageWithDeadline(msgType int, msg []byte) error {
+ if err := wsc.baseConn.SetWriteDeadline(time.Now().Add(wsc.writeWait)); err != nil {
+ return err
+ }
+ return wsc.baseConn.WriteMessage(msgType, msg)
+}
diff --git a/rpc/lib/server/ws_handler_test.go b/rpc/lib/server/ws_handler_test.go
new file mode 100644
index 00000000..375ea415
--- /dev/null
+++ b/rpc/lib/server/ws_handler_test.go
@@ -0,0 +1,53 @@
+package rpcserver
+
+import (
+ "net/http"
+ "net/http/httptest"
+ "testing"
+
+ "github.com/gorilla/websocket"
+ "github.com/stretchr/testify/require"
+
+ amino "github.com/tendermint/go-amino"
+
+ "github.com/tendermint/tendermint/libs/log"
+ types "github.com/tendermint/tendermint/rpc/lib/types"
+)
+
+func TestWebsocketManagerHandler(t *testing.T) {
+ s := newWSServer()
+ defer s.Close()
+
+ // check upgrader works
+ d := websocket.Dialer{}
+ c, dialResp, err := d.Dial("ws://"+s.Listener.Addr().String()+"/websocket", nil)
+ require.NoError(t, err)
+
+ if got, want := dialResp.StatusCode, http.StatusSwitchingProtocols; got != want {
+ t.Errorf("dialResp.StatusCode = %q, want %q", got, want)
+ }
+
+ // check basic functionality works
+ req, err := types.MapToRequest(amino.NewCodec(), types.JSONRPCStringID("TestWebsocketManager"), "c", map[string]interface{}{"s": "a", "i": 10})
+ require.NoError(t, err)
+ err = c.WriteJSON(req)
+ require.NoError(t, err)
+
+ var resp types.RPCResponse
+ err = c.ReadJSON(&resp)
+ require.NoError(t, err)
+ require.Nil(t, resp.Error)
+}
+
+func newWSServer() *httptest.Server {
+ funcMap := map[string]*RPCFunc{
+ "c": NewWSRPCFunc(func(ctx *types.Context, s string, i int) (string, error) { return "foo", nil }, "s,i"),
+ }
+ wm := NewWebsocketManager(funcMap, amino.NewCodec())
+ wm.SetLogger(log.TestingLogger())
+
+ mux := http.NewServeMux()
+ mux.HandleFunc("/websocket", wm.WebsocketHandler)
+
+ return httptest.NewServer(mux)
+}
diff --git a/rpc/lib/types/types.go b/rpc/lib/types/types.go
index e3f93a5b..d8faa161 100644
--- a/rpc/lib/types/types.go
+++ b/rpc/lib/types/types.go
@@ -52,7 +52,7 @@ func idFromInterface(idInterface interface{}) (jsonrpcid, error) {
type RPCRequest struct {
JSONRPC string `json:"jsonrpc"`
- ID jsonrpcid `json:"id"`
+ ID jsonrpcid `json:"id,omitempty"`
Method string `json:"method"`
Params json.RawMessage `json:"params"` // must be map[string]interface{} or []interface{}
}
@@ -210,10 +210,16 @@ func (resp RPCResponse) String() string {
return fmt.Sprintf("[%s %s]", resp.ID, resp.Error)
}
-func RPCParseError(id jsonrpcid, err error) RPCResponse {
- return NewRPCErrorResponse(id, -32700, "Parse error. Invalid JSON", err.Error())
+// From the JSON-RPC 2.0 spec:
+// If there was an error in detecting the id in the Request object (e.g. Parse
+// error/Invalid Request), it MUST be Null.
+func RPCParseError(err error) RPCResponse {
+ return NewRPCErrorResponse(nil, -32700, "Parse error. Invalid JSON", err.Error())
}
+// From the JSON-RPC 2.0 spec:
+// If there was an error in detecting the id in the Request object (e.g. Parse
+// error/Invalid Request), it MUST be Null.
func RPCInvalidRequestError(id jsonrpcid, err error) RPCResponse {
return NewRPCErrorResponse(id, -32600, "Invalid Request", err.Error())
}
diff --git a/rpc/lib/types/types_test.go b/rpc/lib/types/types_test.go
index a5b2da9c..3ec76db5 100644
--- a/rpc/lib/types/types_test.go
+++ b/rpc/lib/types/types_test.go
@@ -41,9 +41,9 @@ func TestResponses(t *testing.T) {
s := fmt.Sprintf(`{"jsonrpc":"2.0","id":%v,"result":{"Value":"hello"}}`, tt.expected)
assert.Equal(string(s), string(b))
- d := RPCParseError(jsonid, errors.New("Hello world"))
+ d := RPCParseError(errors.New("Hello world"))
e, _ := json.Marshal(d)
- f := fmt.Sprintf(`{"jsonrpc":"2.0","id":%v,"error":{"code":-32700,"message":"Parse error. Invalid JSON","data":"Hello world"}}`, tt.expected)
+ f := `{"jsonrpc":"2.0","id":null,"error":{"code":-32700,"message":"Parse error. Invalid JSON","data":"Hello world"}}`
assert.Equal(string(f), string(e))
g := RPCMethodNotFoundError(jsonid)