2 files changed, 49 insertions, 12 deletions
diff --git a/rpc/codec/codec.go b/rpc/codec/codec.go
index 5e8f38438..3177f77e4 100644
--- a/rpc/codec/codec.go
+++ b/rpc/codec/codec.go
@@ -12,7 +12,7 @@ type Codec int
 // (de)serialization support for rpc interface
 type ApiCoder interface {
 	// Parse message to request from underlying stream
-	ReadRequest() (*shared.Request, error)
+	ReadRequest() ([]*shared.Request, bool, error)
 	// Parse response message from underlying stream
 	ReadResponse() (interface{}, error)
 	// Encode response to encoded form in underlying stream
diff --git a/rpc/codec/json.go b/rpc/codec/json.go
index 31024ee74..380b4cba7 100644
--- a/rpc/codec/json.go
+++ b/rpc/codec/json.go
@@ -8,33 +8,53 @@ import (
 )
 
 const (
-	MAX_RESPONSE_SIZE = 64 * 1024
+	MAX_REQUEST_SIZE = 1024 * 1024
+	MAX_RESPONSE_SIZE = 1024 * 1024
 )
 
 // Json serialization support
 type JsonCodec struct {
 	c net.Conn
-	d *json.Decoder
-	e *json.Encoder
+	buffer []byte
+	bytesInBuffer int
 }
 
 // Create new JSON coder instance
 func NewJsonCoder(conn net.Conn) ApiCoder {
 	return &JsonCodec{
 		c: conn,
-		d: json.NewDecoder(conn),
-		e: json.NewEncoder(conn),
+		buffer: make([]byte, MAX_REQUEST_SIZE),
+		bytesInBuffer: 0,
 	}
 }
 
 // Serialize obj to JSON and write it to conn
-func (self *JsonCodec) ReadRequest() (*shared.Request, error) {
-	req := shared.Request{}
-	err := self.d.Decode(&req)
+func (self *JsonCodec) ReadRequest() (requests []*shared.Request, isBatch bool, err error) {
+	n, err := self.c.Read(self.buffer[self.bytesInBuffer:])
+	if err != nil {
+		self.bytesInBuffer = 0
+		return nil, false, err
+	}
+
+	self.bytesInBuffer += n
+
+	singleRequest := shared.Request{}
+	err = json.Unmarshal(self.buffer[:self.bytesInBuffer], &singleRequest)
 	if err == nil {
-		return &req, nil
+		self.bytesInBuffer = 0
+		requests := make([]*shared.Request, 1)
+		requests[0] = &singleRequest
+		return requests, false, nil
 	}
-	return nil, err
+
+	requests = make([]*shared.Request, 0)
+	err = json.Unmarshal(self.buffer[:self.bytesInBuffer], &requests)
+	if err == nil {
+		self.bytesInBuffer = 0
+		return requests, true, nil
+	}
+
+	return nil, false, err
 }
 
 func (self *JsonCodec) ReadResponse() (interface{}, error) {
@@ -66,7 +86,24 @@ func (self *JsonCodec) Encode(msg interface{}) ([]byte, error) {
 
 // Parse JSON data from conn to obj
 func (self *JsonCodec) WriteResponse(res interface{}) error {
-	return self.e.Encode(&res)
+	data, err := json.Marshal(res)
+	if err != nil {
+		self.c.Close()
+		return err
+	}
+
+	bytesWritten := 0
+
+	for bytesWritten < len(data) {
+		n, err := self.c.Write(data[bytesWritten:])
+		if err != nil {
+			self.c.Close()
+			return err
+		}
+		bytesWritten += n
+	}
+
+	return nil
 }
 
 // Close decoder and encoder