You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

233 lines
6.6 KiB

rpc: add support for batched requests/responses (#3534) Continues from #3280 in building support for batched requests/responses in the JSON RPC (as per issue #3213). * Add JSON RPC batching for client and server As per #3213, this adds support for [JSON RPC batch requests and responses](https://www.jsonrpc.org/specification#batch). * Add additional checks to ensure client responses are the same as results * Fix case where a notification is sent and no response is expected * Add test to check that JSON RPC notifications in a batch are left out in responses * Update CHANGELOG_PENDING.md * Update PR number now that PR has been created * Make errors start with lowercase letter * Refactor batch functionality to be standalone This refactors the batching functionality to rather act in a standalone way. In light of supporting concurrent goroutines making use of the same client, it would make sense to have batching functionality where one could create a batch of requests per goroutine and send that batch without interfering with a batch from another goroutine. * Add examples for simple and batch HTTP client usage * Check errors from writer and remove nolinter directives * Make error strings start with lowercase letter * Refactor examples to make them testable * Use safer deferred shutdown for example Tendermint test node * Recompose rpcClient interface from pre-existing interface components * Rename WaitGroup for brevity * Replace empty ID string with request ID * Remove extraneous test case * Convert first letter of errors.Wrap() messages to lowercase * Remove extraneous function parameter * Make variable declaration terse * Reorder WaitGroup.Done call to help prevent race conditions in the face of failure * Swap mutex to value representation and remove initialization * Restore empty JSONRPC string ID in response to prevent nil * Make JSONRPCBufferedRequest private * Revert PR hard link in CHANGELOG_PENDING * Add client ID for JSONRPCClient This adds code to automatically generate a randomized client ID for the JSONRPCClient, and adds a check of the IDs in the responses (if one was set in the requests). * Extract response ID validation into separate function * Remove extraneous comments * Reorder fields to indicate clearly which are protected by the mutex * Refactor for loop to remove indexing * Restructure and combine loop * Flatten conditional block for better readability * Make multi-variable declaration slightly more readable * Change for loop style * Compress error check statements * Make function description more generic to show that we support different protocols * Preallocate memory for request and result objects
6 years ago
rpc: add support for batched requests/responses (#3534) Continues from #3280 in building support for batched requests/responses in the JSON RPC (as per issue #3213). * Add JSON RPC batching for client and server As per #3213, this adds support for [JSON RPC batch requests and responses](https://www.jsonrpc.org/specification#batch). * Add additional checks to ensure client responses are the same as results * Fix case where a notification is sent and no response is expected * Add test to check that JSON RPC notifications in a batch are left out in responses * Update CHANGELOG_PENDING.md * Update PR number now that PR has been created * Make errors start with lowercase letter * Refactor batch functionality to be standalone This refactors the batching functionality to rather act in a standalone way. In light of supporting concurrent goroutines making use of the same client, it would make sense to have batching functionality where one could create a batch of requests per goroutine and send that batch without interfering with a batch from another goroutine. * Add examples for simple and batch HTTP client usage * Check errors from writer and remove nolinter directives * Make error strings start with lowercase letter * Refactor examples to make them testable * Use safer deferred shutdown for example Tendermint test node * Recompose rpcClient interface from pre-existing interface components * Rename WaitGroup for brevity * Replace empty ID string with request ID * Remove extraneous test case * Convert first letter of errors.Wrap() messages to lowercase * Remove extraneous function parameter * Make variable declaration terse * Reorder WaitGroup.Done call to help prevent race conditions in the face of failure * Swap mutex to value representation and remove initialization * Restore empty JSONRPC string ID in response to prevent nil * Make JSONRPCBufferedRequest private * Revert PR hard link in CHANGELOG_PENDING * Add client ID for JSONRPCClient This adds code to automatically generate a randomized client ID for the JSONRPCClient, and adds a check of the IDs in the responses (if one was set in the requests). * Extract response ID validation into separate function * Remove extraneous comments * Reorder fields to indicate clearly which are protected by the mutex * Refactor for loop to remove indexing * Restructure and combine loop * Flatten conditional block for better readability * Make multi-variable declaration slightly more readable * Change for loop style * Compress error check statements * Make function description more generic to show that we support different protocols * Preallocate memory for request and result objects
6 years ago
rpc: add support for batched requests/responses (#3534) Continues from #3280 in building support for batched requests/responses in the JSON RPC (as per issue #3213). * Add JSON RPC batching for client and server As per #3213, this adds support for [JSON RPC batch requests and responses](https://www.jsonrpc.org/specification#batch). * Add additional checks to ensure client responses are the same as results * Fix case where a notification is sent and no response is expected * Add test to check that JSON RPC notifications in a batch are left out in responses * Update CHANGELOG_PENDING.md * Update PR number now that PR has been created * Make errors start with lowercase letter * Refactor batch functionality to be standalone This refactors the batching functionality to rather act in a standalone way. In light of supporting concurrent goroutines making use of the same client, it would make sense to have batching functionality where one could create a batch of requests per goroutine and send that batch without interfering with a batch from another goroutine. * Add examples for simple and batch HTTP client usage * Check errors from writer and remove nolinter directives * Make error strings start with lowercase letter * Refactor examples to make them testable * Use safer deferred shutdown for example Tendermint test node * Recompose rpcClient interface from pre-existing interface components * Rename WaitGroup for brevity * Replace empty ID string with request ID * Remove extraneous test case * Convert first letter of errors.Wrap() messages to lowercase * Remove extraneous function parameter * Make variable declaration terse * Reorder WaitGroup.Done call to help prevent race conditions in the face of failure * Swap mutex to value representation and remove initialization * Restore empty JSONRPC string ID in response to prevent nil * Make JSONRPCBufferedRequest private * Revert PR hard link in CHANGELOG_PENDING * Add client ID for JSONRPCClient This adds code to automatically generate a randomized client ID for the JSONRPCClient, and adds a check of the IDs in the responses (if one was set in the requests). * Extract response ID validation into separate function * Remove extraneous comments * Reorder fields to indicate clearly which are protected by the mutex * Refactor for loop to remove indexing * Restructure and combine loop * Flatten conditional block for better readability * Make multi-variable declaration slightly more readable * Change for loop style * Compress error check statements * Make function description more generic to show that we support different protocols * Preallocate memory for request and result objects
6 years ago
8 years ago
rpc/lib/client & server: try to conform to JSON-RPC 2.0 spec (#4141) https://www.jsonrpc.org/specification What is done in this PR: JSONRPCClient: validate that Response.ID matches Request.ID I wanted to do the same for the WSClient, but since we're sending events as responses, not notifications, checking IDs would require storing them in memory indefinitely (and we won't be able to remove them upon client unsubscribing because ID is different then). Request.ID is now optional. Notification is a Request without an ID. Previously "" or 0 were considered as notifications Remove #event suffix from ID from an event response (partially fixes #2949) ID must be either string, int or null AND must be equal to request's ID. Now, because we've implemented events as responses, WS clients are tripping when they see Response.ID("0#event") != Request.ID("0"). Implementing events as requests would require a lot of time (~ 2 days to completely rewrite WS client and server) generate unique ID for each request switch to integer IDs instead of "json-client-XYZ" id=0 method=/subscribe id=0 result=... id=1 method=/abci_query id=1 result=... > send events (resulting from /subscribe) as requests+notifications (not responses) this will require a lot of work. probably not worth it * rpc: generate an unique ID for each request in conformance with JSON-RPC spec * WSClient: check for unsolicited responses * fix golangci warnings * save commit * fix errors * remove ID from responses from subscribe Refs #2949 * clients are safe for concurrent access * tm-bench: switch to int ID * fixes after my own review * comment out sentIDs in WSClient see commit body for the reason * remove body.Close it will be closed automatically * stop ws connection outside of write/read routines also, use t.Rate in tm-bench indexer when calculating ID fix gocritic issues * update swagger.yaml * Apply suggestions from code review * fix stylecheck and golint linter warnings * update changelog * update changelog2
5 years ago
8 years ago
rpc: add support for batched requests/responses (#3534) Continues from #3280 in building support for batched requests/responses in the JSON RPC (as per issue #3213). * Add JSON RPC batching for client and server As per #3213, this adds support for [JSON RPC batch requests and responses](https://www.jsonrpc.org/specification#batch). * Add additional checks to ensure client responses are the same as results * Fix case where a notification is sent and no response is expected * Add test to check that JSON RPC notifications in a batch are left out in responses * Update CHANGELOG_PENDING.md * Update PR number now that PR has been created * Make errors start with lowercase letter * Refactor batch functionality to be standalone This refactors the batching functionality to rather act in a standalone way. In light of supporting concurrent goroutines making use of the same client, it would make sense to have batching functionality where one could create a batch of requests per goroutine and send that batch without interfering with a batch from another goroutine. * Add examples for simple and batch HTTP client usage * Check errors from writer and remove nolinter directives * Make error strings start with lowercase letter * Refactor examples to make them testable * Use safer deferred shutdown for example Tendermint test node * Recompose rpcClient interface from pre-existing interface components * Rename WaitGroup for brevity * Replace empty ID string with request ID * Remove extraneous test case * Convert first letter of errors.Wrap() messages to lowercase * Remove extraneous function parameter * Make variable declaration terse * Reorder WaitGroup.Done call to help prevent race conditions in the face of failure * Swap mutex to value representation and remove initialization * Restore empty JSONRPC string ID in response to prevent nil * Make JSONRPCBufferedRequest private * Revert PR hard link in CHANGELOG_PENDING * Add client ID for JSONRPCClient This adds code to automatically generate a randomized client ID for the JSONRPCClient, and adds a check of the IDs in the responses (if one was set in the requests). * Extract response ID validation into separate function * Remove extraneous comments * Reorder fields to indicate clearly which are protected by the mutex * Refactor for loop to remove indexing * Restructure and combine loop * Flatten conditional block for better readability * Make multi-variable declaration slightly more readable * Change for loop style * Compress error check statements * Make function description more generic to show that we support different protocols * Preallocate memory for request and result objects
6 years ago
rpc: add support for batched requests/responses (#3534) Continues from #3280 in building support for batched requests/responses in the JSON RPC (as per issue #3213). * Add JSON RPC batching for client and server As per #3213, this adds support for [JSON RPC batch requests and responses](https://www.jsonrpc.org/specification#batch). * Add additional checks to ensure client responses are the same as results * Fix case where a notification is sent and no response is expected * Add test to check that JSON RPC notifications in a batch are left out in responses * Update CHANGELOG_PENDING.md * Update PR number now that PR has been created * Make errors start with lowercase letter * Refactor batch functionality to be standalone This refactors the batching functionality to rather act in a standalone way. In light of supporting concurrent goroutines making use of the same client, it would make sense to have batching functionality where one could create a batch of requests per goroutine and send that batch without interfering with a batch from another goroutine. * Add examples for simple and batch HTTP client usage * Check errors from writer and remove nolinter directives * Make error strings start with lowercase letter * Refactor examples to make them testable * Use safer deferred shutdown for example Tendermint test node * Recompose rpcClient interface from pre-existing interface components * Rename WaitGroup for brevity * Replace empty ID string with request ID * Remove extraneous test case * Convert first letter of errors.Wrap() messages to lowercase * Remove extraneous function parameter * Make variable declaration terse * Reorder WaitGroup.Done call to help prevent race conditions in the face of failure * Swap mutex to value representation and remove initialization * Restore empty JSONRPC string ID in response to prevent nil * Make JSONRPCBufferedRequest private * Revert PR hard link in CHANGELOG_PENDING * Add client ID for JSONRPCClient This adds code to automatically generate a randomized client ID for the JSONRPCClient, and adds a check of the IDs in the responses (if one was set in the requests). * Extract response ID validation into separate function * Remove extraneous comments * Reorder fields to indicate clearly which are protected by the mutex * Refactor for loop to remove indexing * Restructure and combine loop * Flatten conditional block for better readability * Make multi-variable declaration slightly more readable * Change for loop style * Compress error check statements * Make function description more generic to show that we support different protocols * Preallocate memory for request and result objects
6 years ago
  1. // Commons for HTTP handling
  2. package rpcserver
  3. import (
  4. "bufio"
  5. "encoding/json"
  6. "fmt"
  7. "net"
  8. "net/http"
  9. "runtime/debug"
  10. "strings"
  11. "time"
  12. "github.com/pkg/errors"
  13. "golang.org/x/net/netutil"
  14. "github.com/tendermint/tendermint/libs/log"
  15. types "github.com/tendermint/tendermint/rpc/lib/types"
  16. )
  17. // Config is a RPC server configuration.
  18. type Config struct {
  19. // see netutil.LimitListener
  20. MaxOpenConnections int
  21. // mirrors http.Server#ReadTimeout
  22. ReadTimeout time.Duration
  23. // mirrors http.Server#WriteTimeout
  24. WriteTimeout time.Duration
  25. // MaxBodyBytes controls the maximum number of bytes the
  26. // server will read parsing the request body.
  27. MaxBodyBytes int64
  28. // mirrors http.Server#MaxHeaderBytes
  29. MaxHeaderBytes int
  30. }
  31. // DefaultConfig returns a default configuration.
  32. func DefaultConfig() *Config {
  33. return &Config{
  34. MaxOpenConnections: 0, // unlimited
  35. ReadTimeout: 10 * time.Second,
  36. WriteTimeout: 10 * time.Second,
  37. MaxBodyBytes: int64(1000000), // 1MB
  38. MaxHeaderBytes: 1 << 20, // same as the net/http default
  39. }
  40. }
  41. // StartHTTPServer takes a listener and starts an HTTP server with the given handler.
  42. // It wraps handler with RecoverAndLogHandler.
  43. // NOTE: This function blocks - you may want to call it in a go-routine.
  44. func StartHTTPServer(listener net.Listener, handler http.Handler, logger log.Logger, config *Config) error {
  45. logger.Info(fmt.Sprintf("Starting RPC HTTP server on %s", listener.Addr()))
  46. s := &http.Server{
  47. Handler: RecoverAndLogHandler(maxBytesHandler{h: handler, n: config.MaxBodyBytes}, logger),
  48. ReadTimeout: config.ReadTimeout,
  49. WriteTimeout: config.WriteTimeout,
  50. MaxHeaderBytes: config.MaxHeaderBytes,
  51. }
  52. err := s.Serve(listener)
  53. logger.Info("RPC HTTP server stopped", "err", err)
  54. return err
  55. }
  56. // StartHTTPAndTLSServer takes a listener and starts an HTTPS server with the given handler.
  57. // It wraps handler with RecoverAndLogHandler.
  58. // NOTE: This function blocks - you may want to call it in a go-routine.
  59. func StartHTTPAndTLSServer(
  60. listener net.Listener,
  61. handler http.Handler,
  62. certFile, keyFile string,
  63. logger log.Logger,
  64. config *Config,
  65. ) error {
  66. logger.Info(fmt.Sprintf("Starting RPC HTTPS server on %s (cert: %q, key: %q)",
  67. listener.Addr(), certFile, keyFile))
  68. s := &http.Server{
  69. Handler: RecoverAndLogHandler(maxBytesHandler{h: handler, n: config.MaxBodyBytes}, logger),
  70. ReadTimeout: config.ReadTimeout,
  71. WriteTimeout: config.WriteTimeout,
  72. MaxHeaderBytes: config.MaxHeaderBytes,
  73. }
  74. err := s.ServeTLS(listener, certFile, keyFile)
  75. logger.Error("RPC HTTPS server stopped", "err", err)
  76. return err
  77. }
  78. func WriteRPCResponseHTTPError(
  79. w http.ResponseWriter,
  80. httpCode int,
  81. res types.RPCResponse,
  82. ) {
  83. jsonBytes, err := json.MarshalIndent(res, "", " ")
  84. if err != nil {
  85. panic(err)
  86. }
  87. w.Header().Set("Content-Type", "application/json")
  88. w.WriteHeader(httpCode)
  89. if _, err := w.Write(jsonBytes); err != nil {
  90. panic(err)
  91. }
  92. }
  93. func WriteRPCResponseHTTP(w http.ResponseWriter, res types.RPCResponse) {
  94. jsonBytes, err := json.MarshalIndent(res, "", " ")
  95. if err != nil {
  96. panic(err)
  97. }
  98. w.Header().Set("Content-Type", "application/json")
  99. w.WriteHeader(200)
  100. if _, err := w.Write(jsonBytes); err != nil {
  101. panic(err)
  102. }
  103. }
  104. // WriteRPCResponseArrayHTTP will do the same as WriteRPCResponseHTTP, except it
  105. // can write arrays of responses for batched request/response interactions via
  106. // the JSON RPC.
  107. func WriteRPCResponseArrayHTTP(w http.ResponseWriter, res []types.RPCResponse) {
  108. if len(res) == 1 {
  109. WriteRPCResponseHTTP(w, res[0])
  110. } else {
  111. jsonBytes, err := json.MarshalIndent(res, "", " ")
  112. if err != nil {
  113. panic(err)
  114. }
  115. w.Header().Set("Content-Type", "application/json")
  116. w.WriteHeader(200)
  117. if _, err := w.Write(jsonBytes); err != nil {
  118. panic(err)
  119. }
  120. }
  121. }
  122. //-----------------------------------------------------------------------------
  123. // RecoverAndLogHandler wraps an HTTP handler, adding error logging.
  124. // If the inner function panics, the outer function recovers, logs, sends an
  125. // HTTP 500 error response.
  126. func RecoverAndLogHandler(handler http.Handler, logger log.Logger) http.Handler {
  127. return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  128. // Wrap the ResponseWriter to remember the status
  129. rww := &ResponseWriterWrapper{-1, w}
  130. begin := time.Now()
  131. rww.Header().Set("X-Server-Time", fmt.Sprintf("%v", begin.Unix()))
  132. defer func() {
  133. // Send a 500 error if a panic happens during a handler.
  134. // Without this, Chrome & Firefox were retrying aborted ajax requests,
  135. // at least to my localhost.
  136. if e := recover(); e != nil {
  137. // If RPCResponse
  138. if res, ok := e.(types.RPCResponse); ok {
  139. WriteRPCResponseHTTP(rww, res)
  140. } else {
  141. // For the rest,
  142. logger.Error(
  143. "Panic in RPC HTTP handler", "err", e, "stack",
  144. string(debug.Stack()),
  145. )
  146. WriteRPCResponseHTTPError(
  147. rww,
  148. http.StatusInternalServerError,
  149. types.RPCInternalError(types.JSONRPCIntID(-1), e.(error)),
  150. )
  151. }
  152. }
  153. // Finally, log.
  154. durationMS := time.Since(begin).Nanoseconds() / 1000000
  155. if rww.Status == -1 {
  156. rww.Status = 200
  157. }
  158. logger.Info("Served RPC HTTP response",
  159. "method", r.Method, "url", r.URL,
  160. "status", rww.Status, "duration", durationMS,
  161. "remoteAddr", r.RemoteAddr,
  162. )
  163. }()
  164. handler.ServeHTTP(rww, r)
  165. })
  166. }
  167. // Remember the status for logging
  168. type ResponseWriterWrapper struct {
  169. Status int
  170. http.ResponseWriter
  171. }
  172. func (w *ResponseWriterWrapper) WriteHeader(status int) {
  173. w.Status = status
  174. w.ResponseWriter.WriteHeader(status)
  175. }
  176. // implements http.Hijacker
  177. func (w *ResponseWriterWrapper) Hijack() (net.Conn, *bufio.ReadWriter, error) {
  178. return w.ResponseWriter.(http.Hijacker).Hijack()
  179. }
  180. type maxBytesHandler struct {
  181. h http.Handler
  182. n int64
  183. }
  184. func (h maxBytesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
  185. r.Body = http.MaxBytesReader(w, r.Body, h.n)
  186. h.h.ServeHTTP(w, r)
  187. }
  188. // Listen starts a new net.Listener on the given address.
  189. // It returns an error if the address is invalid or the call to Listen() fails.
  190. func Listen(addr string, config *Config) (listener net.Listener, err error) {
  191. parts := strings.SplitN(addr, "://", 2)
  192. if len(parts) != 2 {
  193. return nil, errors.Errorf(
  194. "invalid listening address %s (use fully formed addresses, including the tcp:// or unix:// prefix)",
  195. addr,
  196. )
  197. }
  198. proto, addr := parts[0], parts[1]
  199. listener, err = net.Listen(proto, addr)
  200. if err != nil {
  201. return nil, errors.Errorf("failed to listen on %v: %v", addr, err)
  202. }
  203. if config.MaxOpenConnections > 0 {
  204. listener = netutil.LimitListener(listener, config.MaxOpenConnections)
  205. }
  206. return listener, nil
  207. }