aboutsummaryrefslogtreecommitdiffstats
path: root/rpc/codec
diff options
context:
space:
mode:
Diffstat (limited to 'rpc/codec')
-rw-r--r--rpc/codec/codec.go16
-rw-r--r--rpc/codec/json.go74
-rw-r--r--rpc/codec/json_test.go157
3 files changed, 214 insertions, 33 deletions
diff --git a/rpc/codec/codec.go b/rpc/codec/codec.go
index 3177f77e4..733823b4b 100644
--- a/rpc/codec/codec.go
+++ b/rpc/codec/codec.go
@@ -1,3 +1,19 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
package codec
import (
diff --git a/rpc/codec/json.go b/rpc/codec/json.go
index 0b1a90562..c78624430 100644
--- a/rpc/codec/json.go
+++ b/rpc/codec/json.go
@@ -1,3 +1,19 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
package codec
import (
@@ -10,7 +26,7 @@ import (
)
const (
- READ_TIMEOUT = 15 // read timeout in seconds
+ READ_TIMEOUT = 60 // in seconds
MAX_REQUEST_SIZE = 1024 * 1024
MAX_RESPONSE_SIZE = 1024 * 1024
)
@@ -18,51 +34,43 @@ const (
// Json serialization support
type JsonCodec struct {
c net.Conn
+ d *json.Decoder
}
// Create new JSON coder instance
func NewJsonCoder(conn net.Conn) ApiCoder {
return &JsonCodec{
c: conn,
+ d: json.NewDecoder(conn),
}
}
-// Serialize obj to JSON and write it to conn
+// Read incoming request and parse it to RPC request
func (self *JsonCodec) ReadRequest() (requests []*shared.Request, isBatch bool, err error) {
- bytesInBuffer := 0
- buf := make([]byte, MAX_REQUEST_SIZE)
-
deadline := time.Now().Add(READ_TIMEOUT * time.Second)
if err := self.c.SetDeadline(deadline); err != nil {
return nil, false, err
}
- for {
- n, err := self.c.Read(buf[bytesInBuffer:])
- if err != nil {
- self.c.Close()
- return nil, false, err
- }
-
- bytesInBuffer += n
-
- singleRequest := shared.Request{}
- err = json.Unmarshal(buf[:bytesInBuffer], &singleRequest)
- if err == nil {
- requests := make([]*shared.Request, 1)
- requests[0] = &singleRequest
- return requests, false, nil
- }
-
- requests = make([]*shared.Request, 0)
- err = json.Unmarshal(buf[:bytesInBuffer], &requests)
- if err == nil {
- return requests, true, nil
+ var incoming json.RawMessage
+ err = self.d.Decode(&incoming)
+ if err == nil {
+ isBatch = incoming[0] == '['
+ if isBatch {
+ requests = make([]*shared.Request, 0)
+ err = json.Unmarshal(incoming, &requests)
+ } else {
+ requests = make([]*shared.Request, 1)
+ var singleRequest shared.Request
+ if err = json.Unmarshal(incoming, &singleRequest); err == nil {
+ requests[0] = &singleRequest
+ }
}
+ return
}
- self.c.Close() // timeout
- return nil, false, fmt.Errorf("Unable to read response")
+ self.c.Close()
+ return nil, false, err
}
func (self *JsonCodec) ReadResponse() (interface{}, error) {
@@ -81,15 +89,15 @@ func (self *JsonCodec) ReadResponse() (interface{}, error) {
}
bytesInBuffer += n
+ var failure shared.ErrorResponse
+ if err = json.Unmarshal(buf[:bytesInBuffer], &failure); err == nil && failure.Error != nil {
+ return failure, fmt.Errorf(failure.Error.Message)
+ }
+
var success shared.SuccessResponse
if err = json.Unmarshal(buf[:bytesInBuffer], &success); err == nil {
return success, nil
}
-
- var failure shared.ErrorResponse
- if err = json.Unmarshal(buf[:bytesInBuffer], &failure); err == nil && failure.Error != nil {
- return failure, nil
- }
}
self.c.Close()
diff --git a/rpc/codec/json_test.go b/rpc/codec/json_test.go
new file mode 100644
index 000000000..acadfd76b
--- /dev/null
+++ b/rpc/codec/json_test.go
@@ -0,0 +1,157 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
+package codec
+
+import (
+ "bytes"
+ "io"
+ "net"
+ "testing"
+ "time"
+)
+
+type jsonTestConn struct {
+ buffer *bytes.Buffer
+}
+
+func newJsonTestConn(data []byte) *jsonTestConn {
+ return &jsonTestConn{
+ buffer: bytes.NewBuffer(data),
+ }
+}
+
+func (self *jsonTestConn) Read(p []byte) (n int, err error) {
+ return self.buffer.Read(p)
+}
+
+func (self *jsonTestConn) Write(p []byte) (n int, err error) {
+ return self.buffer.Write(p)
+}
+
+func (self *jsonTestConn) Close() error {
+ // not implemented
+ return nil
+}
+
+func (self *jsonTestConn) LocalAddr() net.Addr {
+ // not implemented
+ return nil
+}
+
+func (self *jsonTestConn) RemoteAddr() net.Addr {
+ // not implemented
+ return nil
+}
+
+func (self *jsonTestConn) SetDeadline(t time.Time) error {
+ return nil
+}
+
+func (self *jsonTestConn) SetReadDeadline(t time.Time) error {
+ return nil
+}
+
+func (self *jsonTestConn) SetWriteDeadline(t time.Time) error {
+ return nil
+}
+
+func TestJsonDecoderWithValidRequest(t *testing.T) {
+ reqdata := []byte(`{"jsonrpc":"2.0","method":"modules","params":[],"id":64}`)
+ decoder := newJsonTestConn(reqdata)
+
+ jsonDecoder := NewJsonCoder(decoder)
+ requests, batch, err := jsonDecoder.ReadRequest()
+
+ if err != nil {
+ t.Errorf("Read valid request failed - %v", err)
+ }
+
+ if len(requests) != 1 {
+ t.Errorf("Expected to get a single request but got %d", len(requests))
+ }
+
+ if batch {
+ t.Errorf("Got batch indication while expecting single request")
+ }
+
+ if requests[0].Id != float64(64) {
+ t.Errorf("Expected req.Id == 64 but got %v", requests[0].Id)
+ }
+
+ if requests[0].Method != "modules" {
+ t.Errorf("Expected req.Method == 'modules' got '%s'", requests[0].Method)
+ }
+}
+
+func TestJsonDecoderWithValidBatchRequest(t *testing.T) {
+ reqdata := []byte(`[{"jsonrpc":"2.0","method":"modules","params":[],"id":64},
+ {"jsonrpc":"2.0","method":"modules","params":[],"id":64}]`)
+ decoder := newJsonTestConn(reqdata)
+
+ jsonDecoder := NewJsonCoder(decoder)
+ requests, batch, err := jsonDecoder.ReadRequest()
+
+ if err != nil {
+ t.Errorf("Read valid batch request failed - %v", err)
+ }
+
+ if len(requests) != 2 {
+ t.Errorf("Expected to get two requests but got %d", len(requests))
+ }
+
+ if !batch {
+ t.Errorf("Got no batch indication while expecting batch request")
+ }
+
+ for i := 0; i < len(requests); i++ {
+ if requests[i].Id != float64(64) {
+ t.Errorf("Expected req.Id == 64 but got %v", requests[i].Id)
+ }
+
+ if requests[i].Method != "modules" {
+ t.Errorf("Expected req.Method == 'modules' got '%s'", requests[i].Method)
+ }
+ }
+}
+
+func TestJsonDecoderWithInvalidIncompleteMessage(t *testing.T) {
+ reqdata := []byte(`{"jsonrpc":"2.0","method":"modules","pa`)
+ decoder := newJsonTestConn(reqdata)
+
+ jsonDecoder := NewJsonCoder(decoder)
+ requests, batch, err := jsonDecoder.ReadRequest()
+
+ if err != io.ErrUnexpectedEOF {
+ t.Errorf("Expected to read an incomplete request err but got %v", err)
+ }
+
+ // remaining message
+ decoder.Write([]byte(`rams":[],"id:64"}`))
+ requests, batch, err = jsonDecoder.ReadRequest()
+
+ if err == nil {
+ t.Errorf("Expected an error but got nil")
+ }
+
+ if len(requests) != 0 {
+ t.Errorf("Expected to get no requests but got %d", len(requests))
+ }
+
+ if batch {
+ t.Errorf("Got batch indication while expecting non batch")
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 13:07:11 +0800