starpc 0.33.4 → 0.33.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starpc",
-  "version": "0.33.4",
+  "version": "0.33.6",
   "description": "Streaming protobuf RPC service protocol over any two-way channel.",
   "license": "MIT",
   "author": {

package/srpc/client-rpc.go

@@ -105,7 +105,7 @@ func (r *ClientRPC) HandleCallStart(pkt *CallStart) error {
 // Close releases any resources held by the ClientRPC.
 func (r *ClientRPC) Close() {
 	if r.writer != nil {
-		_ = r.WriteCancel()
+		_ = r.WriteCallCancel()
 	}
 
 	r.bcast.HoldLock(func(broadcast func(), getWaitCh func() <-chan struct{}) {

package/srpc/common-rpc.go

@@ -98,8 +98,12 @@ func (c *commonRPC) ReadOne() ([]byte, error) {
 			waitCh = getWaitCh()
 		})
 
-		if hasMsg || err != nil {
-			return msg, err
+		if hasMsg {
+			return msg, nil
+		}
+
+		if err != nil {
+			return nil, err
 		}
 
 		select {
@@ -169,8 +173,8 @@ func (c *commonRPC) HandleCallData(pkt *CallData) error {
 	return err
 }
 
-// WriteCancel writes a call cancel packet.
-func (c *commonRPC) WriteCancel() error {
+// WriteCallCancel writes a call cancel packet.
+func (c *commonRPC) WriteCallCancel() error {
 	if c.writer != nil {
 		return c.writer.WritePacket(NewCallCancelPacket())
 	}

package/srpc/msg-stream.go

@@ -13,6 +13,9 @@ type MsgStreamRw interface {
 
 	// WriteCallData writes a call data packet.
 	WriteCallData(data []byte, complete bool, err error) error
+
+	// WriteCallCancel writes a call cancel (close) packet.
+	WriteCallCancel() error
 }
 
 // MsgStream implements the stream interface passed to implementations.
@@ -75,12 +78,12 @@ func (r *MsgStream) CloseSend() error {
 
 // Close closes the stream.
 func (r *MsgStream) Close() error {
-	_ = r.CloseSend()
+	err := r.rw.WriteCallCancel()
 	if r.closeCb != nil {
 		r.closeCb()
 	}
 
-	return nil
+	return err
 }
 
 // _ is a type assertion