Working bidirectional streaming example

server/rpc_codec.go

@@ -60,9 +60,20 @@ func newRpcPlusCodec(req *transport.Message, socket transport.Socket, c codec.Ne
 	return r
 }
 
-func (c *rpcPlusCodec) ReadRequestHeader(r *request) error {
-	m := codec.Message{
-		Headers: c.req.Header,
+func (c *rpcPlusCodec) ReadRequestHeader(r *request, first bool) error {
+	m := codec.Message{Headers: c.req.Header}
+
+	if !first {
+		var tm transport.Message
+		if err := c.socket.Recv(&tm); err != nil {
+			return err
+		}
+		c.buf.rbuf.Reset()
+		if _, err := c.buf.rbuf.Write(tm.Body); err != nil {
+			return err
+		}
+
+		m.Headers = tm.Header
 	}
 
 	err := c.codec.ReadHeader(&m, codec.Request)

server/rpc_stream.go

@@ -51,7 +51,7 @@ func (r *rpcStream) Recv(msg interface{}) error {
 
 	req := request{}
 
-	if err := r.codec.ReadRequestHeader(&req); err != nil {
+	if err := r.codec.ReadRequestHeader(&req, false); err != nil {
 		// discard body
 		r.codec.ReadRequestBody(nil)
 		return err

server/rpcplus_server.go

@@ -389,7 +389,6 @@ func (server *server) readRequest(codec serverCodec) (service *service, mtype *m
 		codec.ReadRequestBody(nil)
 		return
 	}
-
 	// is it a streaming request? then we don't read the body
 	if mtype.stream {
 		codec.ReadRequestBody(nil)
@@ -421,7 +420,7 @@ func (server *server) readRequest(codec serverCodec) (service *service, mtype *m
 func (server *server) readRequestHeader(codec serverCodec) (service *service, mtype *methodType, req *request, keepReading bool, err error) {
 	// Grab the request header.
 	req = server.getRequest()
-	err = codec.ReadRequestHeader(req)
+	err = codec.ReadRequestHeader(req, true)
 	if err != nil {
 		req = nil
 		if err == io.EOF || err == io.ErrUnexpectedEOF {
@@ -456,7 +455,7 @@ func (server *server) readRequestHeader(codec serverCodec) (service *service, mt
 }
 
 type serverCodec interface {
-	ReadRequestHeader(*request) error
+	ReadRequestHeader(*request, bool) error
 	ReadRequestBody(interface{}) error
 	WriteResponse(*response, interface{}, bool) error